X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSyscall.pm;h=530ee93bbb39a88e4be4415810bb5a87845a83e1;hb=refs%2Fheads%2Fmaster;hp=2e3d9cb32c548a340835127f8e4c5f4757fa9fa0;hpb=d8f1a9f189f0d74887cbb896caacaf7f1f256607;p=public-inbox.git diff --git a/lib/PublicInbox/Syscall.pm b/lib/PublicInbox/Syscall.pm index 2e3d9cb3..530ee93b 100644 --- a/lib/PublicInbox/Syscall.pm +++ b/lib/PublicInbox/Syscall.pm @@ -2,6 +2,10 @@ # specifically the Debian libsys-syscall-perl 0.25-6 version to # fix upstream regressions in 0.25. # +# See devel/syscall-list in the public-inbox source tree for maintenance +# , and machines from the GCC Farm: +# +# # This license differs from the rest of public-inbox # # This module is Copyright (c) 2005 Six Apart, Ltd. @@ -12,18 +16,19 @@ # You may distribute under the terms of either the GNU General Public # License or the Artistic License, as specified in the Perl README file. package PublicInbox::Syscall; -use strict; -use v5.10.1; +use v5.12; use parent qw(Exporter); -use POSIX qw(ENOENT EEXIST ENOSYS EINVAL O_NONBLOCK); +use POSIX qw(ENOENT ENOSYS EINVAL O_NONBLOCK); +use Socket qw(SOL_SOCKET SCM_RIGHTS); use Config; +our %SIGNUM = (WINCH => 28); # most Linux, {Free,Net,Open}BSD, *Darwin # $VERSION = '0.25'; # Sys::Syscall version our @EXPORT_OK = qw(epoll_ctl epoll_create epoll_wait EPOLLIN EPOLLOUT EPOLLET EPOLL_CTL_ADD EPOLL_CTL_DEL EPOLL_CTL_MOD EPOLLONESHOT EPOLLEXCLUSIVE - signalfd rename_noreplace); + signalfd rename_noreplace %SIGNUM); our %EXPORT_TAGS = (epoll => [qw(epoll_ctl epoll_create epoll_wait EPOLLIN EPOLLOUT EPOLL_CTL_ADD EPOLL_CTL_DEL EPOLL_CTL_MOD @@ -42,23 +47,19 @@ use constant { EPOLL_CTL_ADD => 1, EPOLL_CTL_DEL => 2, EPOLL_CTL_MOD => 3, + SIZEOF_int => $Config{intsize}, + SIZEOF_size_t => $Config{sizesize}, + NUL => "\0", }; -our $loaded_syscall = 0; - -sub _load_syscall { - # props to Gaal for this! - return if $loaded_syscall++; - my $clean = sub { - delete @INC{qw}; - }; - $clean->(); # don't trust modules before us - my $rv = eval { require 'syscall.ph'; 1 } || eval { require 'sys/syscall.ph'; 1 }; - $clean->(); # don't require modules after us trust us - $rv; -} +use constant { + TMPL_size_t => SIZEOF_size_t == 8 ? 'Q' : 'L', + BYTES_4_hole => SIZEOF_size_t == 8 ? 'L' : '', + # cmsg_len, cmsg_level, cmsg_type + SIZEOF_cmsghdr => SIZEOF_int * 2 + SIZEOF_size_t, +}; +my @BYTES_4_hole = BYTES_4_hole ? (0) : (); our ( $SYS_epoll_create, @@ -68,7 +69,9 @@ our ( $SYS_renameat2, ); +my ($SYS_sendmsg, $SYS_recvmsg); my $SYS_fstatfs; # don't need fstatfs64, just statfs.f_type +my ($FS_IOC_GETFLAGS, $FS_IOC_SETFLAGS); my $SFD_CLOEXEC = 02000000; # Perl does not expose O_CLOEXEC our $no_deprecated = 0; @@ -80,15 +83,16 @@ if ($^O eq "linux") { # boundaries. my $u64_mod_8 = 0; - # if we're running on an x86_64 kernel, but a 32-bit process, - # we need to use the x32 or i386 syscall numbers. - if ($machine eq "x86_64" && $Config{ptrsize} == 4) { - $machine = $Config{cppsymbols} =~ /\b__ILP32__=1\b/ ? 'x32' : 'i386'; - } - - # Similarly for mips64 vs mips - if ($machine eq "mips64" && $Config{ptrsize} == 4) { - $machine = "mips"; + if ($Config{ptrsize} == 4) { + # if we're running on an x86_64 kernel, but a 32-bit process, + # we need to use the x32 or i386 syscall numbers. + if ($machine eq 'x86_64') { + my $s = $Config{cppsymbols}; + $machine = ($s =~ /\b__ILP32__=1\b/ && $s =~ /\b__x86_64__=1\b/) ? + 'x32' : 'i386' + } elsif ($machine eq 'mips64') { # similarly for mips64 vs mips + $machine = 'mips'; + } } if ($machine =~ m/^i[3456]86$/) { @@ -98,6 +102,10 @@ if ($^O eq "linux") { $SYS_signalfd4 = 327; $SYS_renameat2 //= 353; $SYS_fstatfs = 100; + $SYS_sendmsg = 370; + $SYS_recvmsg = 372; + $FS_IOC_GETFLAGS = 0x80046601; + $FS_IOC_SETFLAGS = 0x40046602; } elsif ($machine eq "x86_64") { $SYS_epoll_create = 213; $SYS_epoll_ctl = 233; @@ -105,6 +113,10 @@ if ($^O eq "linux") { $SYS_signalfd4 = 289; $SYS_renameat2 //= 316; $SYS_fstatfs = 138; + $SYS_sendmsg = 46; + $SYS_recvmsg = 47; + $FS_IOC_GETFLAGS = 0x80086601; + $FS_IOC_SETFLAGS = 0x40086602; } elsif ($machine eq 'x32') { $SYS_epoll_create = 1073742037; $SYS_epoll_ctl = 1073742057; @@ -112,6 +124,10 @@ if ($^O eq "linux") { $SYS_signalfd4 = 1073742113; $SYS_renameat2 //= 0x40000000 + 316; $SYS_fstatfs = 138; + $SYS_sendmsg = 0x40000206; + $SYS_recvmsg = 0x40000207; + $FS_IOC_GETFLAGS = 0x80046601; + $FS_IOC_SETFLAGS = 0x40046602; } elsif ($machine eq 'sparc64') { $SYS_epoll_create = 193; $SYS_epoll_ctl = 194; @@ -121,12 +137,17 @@ if ($^O eq "linux") { $SYS_renameat2 //= 345; $SFD_CLOEXEC = 020000000; $SYS_fstatfs = 158; + $SYS_sendmsg = 114; + $SYS_recvmsg = 113; + $FS_IOC_GETFLAGS = 0x40086601; + $FS_IOC_SETFLAGS = 0x80086602; } elsif ($machine =~ m/^parisc/) { $SYS_epoll_create = 224; $SYS_epoll_ctl = 225; $SYS_epoll_wait = 226; $u64_mod_8 = 1; $SYS_signalfd4 = 309; + $SIGNUM{WINCH} = 23; } elsif ($machine =~ m/^ppc64/) { $SYS_epoll_create = 236; $SYS_epoll_ctl = 237; @@ -135,6 +156,10 @@ if ($^O eq "linux") { $SYS_signalfd4 = 313; $SYS_renameat2 //= 357; $SYS_fstatfs = 100; + $SYS_sendmsg = 341; + $SYS_recvmsg = 342; + $FS_IOC_GETFLAGS = 0x40086601; + $FS_IOC_SETFLAGS = 0x80086602; } elsif ($machine eq "ppc") { $SYS_epoll_create = 236; $SYS_epoll_ctl = 237; @@ -143,7 +168,9 @@ if ($^O eq "linux") { $SYS_signalfd4 = 313; $SYS_renameat2 //= 357; $SYS_fstatfs = 100; - } elsif ($machine =~ m/^s390/) { + $FS_IOC_GETFLAGS = 0x40086601; + $FS_IOC_SETFLAGS = 0x80086602; + } elsif ($machine =~ m/^s390/) { # untested, no machine on cfarm $SYS_epoll_create = 249; $SYS_epoll_ctl = 250; $SYS_epoll_wait = 251; @@ -151,13 +178,15 @@ if ($^O eq "linux") { $SYS_signalfd4 = 322; $SYS_renameat2 //= 347; $SYS_fstatfs = 100; - } elsif ($machine eq "ia64") { + $SYS_sendmsg = 370; + $SYS_recvmsg = 372; + } elsif ($machine eq 'ia64') { # untested, no machine on cfarm $SYS_epoll_create = 1243; $SYS_epoll_ctl = 1244; $SYS_epoll_wait = 1245; $u64_mod_8 = 1; $SYS_signalfd4 = 289; - } elsif ($machine eq "alpha") { + } elsif ($machine eq "alpha") { # untested, no machine on cfarm # natural alignment, ints are 32-bits $SYS_epoll_create = 407; $SYS_epoll_ctl = 408; @@ -165,7 +194,7 @@ if ($^O eq "linux") { $u64_mod_8 = 1; $SYS_signalfd4 = 484; $SFD_CLOEXEC = 010000000; - } elsif ($machine eq "aarch64") { + } elsif ($machine =~ /\A(?:loong)?aarch64\z/ || $machine eq 'riscv64') { $SYS_epoll_create = 20; # (sys_epoll_create1) $SYS_epoll_ctl = 21; $SYS_epoll_wait = 22; # (sys_epoll_pwait) @@ -174,8 +203,11 @@ if ($^O eq "linux") { $SYS_signalfd4 = 74; $SYS_renameat2 //= 276; $SYS_fstatfs = 44; - } elsif ($machine =~ m/arm(v\d+)?.*l/) { - # ARM OABI + $SYS_sendmsg = 211; + $SYS_recvmsg = 212; + $FS_IOC_GETFLAGS = 0x80086601; + $FS_IOC_SETFLAGS = 0x40086602; + } elsif ($machine =~ m/arm(v\d+)?.*l/) { # ARM OABI (untested on cfarm) $SYS_epoll_create = 250; $SYS_epoll_ctl = 251; $SYS_epoll_wait = 252; @@ -183,7 +215,9 @@ if ($^O eq "linux") { $SYS_signalfd4 = 355; $SYS_renameat2 //= 382; $SYS_fstatfs = 100; - } elsif ($machine =~ m/^mips64/) { + $SYS_sendmsg = 296; + $SYS_recvmsg = 297; + } elsif ($machine =~ m/^mips64/) { # cfarm only has 32-bit userspace $SYS_epoll_create = 5207; $SYS_epoll_ctl = 5208; $SYS_epoll_wait = 5209; @@ -191,7 +225,11 @@ if ($^O eq "linux") { $SYS_signalfd4 = 5283; $SYS_renameat2 //= 5311; $SYS_fstatfs = 5135; - } elsif ($machine =~ m/^mips/) { + $SYS_sendmsg = 5045; + $SYS_recvmsg = 5046; + $FS_IOC_GETFLAGS = 0x40046601; + $FS_IOC_SETFLAGS = 0x80046602; + } elsif ($machine =~ m/^mips/) { # 32-bit, tested on mips64 cfarm machine $SYS_epoll_create = 4248; $SYS_epoll_ctl = 4249; $SYS_epoll_wait = 4250; @@ -199,20 +237,18 @@ if ($^O eq "linux") { $SYS_signalfd4 = 4324; $SYS_renameat2 //= 4351; $SYS_fstatfs = 4100; + $SYS_sendmsg = 4179; + $SYS_recvmsg = 4177; + $FS_IOC_GETFLAGS = 0x40046601; + $FS_IOC_SETFLAGS = 0x80046602; + $SIGNUM{WINCH} = 20; } else { - # as a last resort, try using the *.ph files which may not - # exist or may be wrong - _load_syscall(); - $SYS_epoll_create = eval { &SYS_epoll_create; } || 0; - $SYS_epoll_ctl = eval { &SYS_epoll_ctl; } || 0; - $SYS_epoll_wait = eval { &SYS_epoll_wait; } || 0; - - # Note: do NOT add new syscalls to depend on *.ph, here. - # Better to miss syscalls (so we can fallback to IO::Poll) - # than to use wrong ones, since the names are not stable - # (at least not on FreeBSD), if the actual numbers are. + warn < CMSG_ALIGN(SIZEOF_cmsghdr); +sub CMSG_SPACE ($) { CMSG_ALIGN($_[0]) + CMSG_ALIGN_SIZEOF_cmsghdr } +sub CMSG_LEN ($) { CMSG_ALIGN_SIZEOF_cmsghdr + $_[0] } +use constant msg_controllen => CMSG_SPACE(10 * SIZEOF_int) + 16; # 10 FDs + +if (defined($SYS_sendmsg) && defined($SYS_recvmsg)) { +no warnings 'once'; +*send_cmd4 = sub ($$$$) { + my ($sock, $fds, undef, $flags) = @_; + my $iov = pack('P'.TMPL_size_t, + $_[2] // NUL, length($_[2] // NUL) || 1); + my $cmsghdr = pack(TMPL_size_t . # cmsg_len + 'LL' . # cmsg_level, cmsg_type, + ('i' x scalar(@$fds)), + CMSG_LEN(scalar(@$fds) * SIZEOF_int), # cmsg_len + SOL_SOCKET, SCM_RIGHTS, # cmsg_{level,type} + @$fds); # CMSG_DATA + my $mh = pack('PL' . # msg_name, msg_namelen (socklen_t (U32)) + BYTES_4_hole . # 4-byte padding on 64-bit + 'P'.TMPL_size_t . # msg_iov, msg_iovlen, + 'P'.TMPL_size_t . # msg_control, msg_controllen, + 'i', # msg_flags + NUL, 0, # msg_name, msg_namelen (unused) + @BYTES_4_hole, + $iov, 1, # msg_iov, msg_iovlen + $cmsghdr, # msg_control + CMSG_SPACE(scalar(@$fds) * SIZEOF_int), # msg_controllen + 0); # msg_flags + my $sent; + my $try = 0; + do { + $sent = syscall($SYS_sendmsg, fileno($sock), $mh, $flags); + } while ($sent < 0 && + ($!{ENOBUFS} || $!{ENOMEM} || $!{ETOOMANYREFS}) && + (++$try < 50) && + warn "sleeping on sendmsg: $! (#$try)\n" && + select(undef, undef, undef, 0.1) == 0); + $sent >= 0 ? $sent : undef; +}; + +*recv_cmd4 = sub ($$$) { + my ($sock, undef, $len) = @_; + vec($_[1] //= '', ($len + 1) * 8, 1) = 0; + my $cmsghdr = "\0" x msg_controllen; # 10 * sizeof(int) + my $iov = pack('P'.TMPL_size_t, $_[1], $len); + my $mh = pack('PL' . # msg_name, msg_namelen (socklen_t (U32)) + BYTES_4_hole . # 4-byte padding on 64-bit + 'P'.TMPL_size_t . # msg_iov, msg_iovlen, + 'P'.TMPL_size_t . # msg_control, msg_controllen, + 'i', # msg_flags + NUL, 0, # msg_name, msg_namelen (unused) + @BYTES_4_hole, + $iov, 1, # msg_iov, msg_iovlen + $cmsghdr, # msg_control + msg_controllen, + 0); # msg_flags + my $r = syscall($SYS_recvmsg, fileno($sock), $mh, 0); + return (undef) if $r < 0; # $! set + substr($_[1], $r, length($_[1]), ''); + my @ret; + if ($r > 0) { + my ($len, $lvl, $type, @fds) = unpack(TMPL_size_t . # cmsg_len + 'LLi*', # cmsg_level, cmsg_type, @fds + $cmsghdr); + if ($lvl == SOL_SOCKET && $type == SCM_RIGHTS) { + $len -= CMSG_ALIGN_SIZEOF_cmsghdr; + @ret = @fds[0..(($len / SIZEOF_int) - 1)]; + } + } + @ret; +}; +} + 1; =head1 WARRANTY