* [PATCH 1/2] syscall: update formatting to match our codebase
@ 2024-01-29 20:59 Eric Wong
2024-01-29 20:59 ` [PATCH 2/2] syscall: use pure Perl sendmsg/recvmsg on *BSD Eric Wong
0 siblings, 1 reply; 2+ messages in thread
From: Eric Wong @ 2024-01-29 20:59 UTC (permalink / raw)
To: spew
Sys::Syscall needs separate patches anyways (if it gets updated),
and having a mix of indentation styles in our codebase gets
confusing.
---
lib/PublicInbox/Syscall.pm | 427 ++++++++++++++++++-------------------
1 file changed, 213 insertions(+), 214 deletions(-)
diff --git a/lib/PublicInbox/Syscall.pm b/lib/PublicInbox/Syscall.pm
index 96af2b22..9071e6b1 100644
--- a/lib/PublicInbox/Syscall.pm
+++ b/lib/PublicInbox/Syscall.pm
@@ -4,7 +4,7 @@
#
# See devel/sysdefs-list in the public-inbox source tree for maintenance
# <https://80x24.org/public-inbox.git>, and machines from the GCC Farm:
-# <https://cfarm.tetaneutral.net/>
+# <https://portal.cfarm.net/>
#
# This license differs from the rest of public-inbox
#
@@ -26,10 +26,10 @@ our $INOTIFY;
# $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 %SIGNUM $F_SETPIPE_SZ);
+ EPOLLIN EPOLLOUT EPOLLET
+ EPOLL_CTL_ADD EPOLL_CTL_DEL EPOLL_CTL_MOD
+ EPOLLONESHOT EPOLLEXCLUSIVE
+ signalfd rename_noreplace %SIGNUM $F_SETPIPE_SZ);
use constant {
EPOLLIN => 1,
EPOLLOUT => 4,
@@ -71,216 +71,216 @@ our $no_deprecated = 0;
if ($^O eq "linux") {
$F_SETPIPE_SZ = 1031;
- my (undef, undef, $release, undef, $machine) = POSIX::uname();
- my ($maj, $min) = ($release =~ /\A([0-9]+)\.([0-9]+)/);
- $SYS_renameat2 = 0 if "$maj.$min" < 3.15;
- # whether the machine requires 64-bit numbers to be on 8-byte
- # boundaries.
- my $u64_mod_8 = 0;
+ my (undef, undef, $release, undef, $machine) = POSIX::uname();
+ my ($maj, $min) = ($release =~ /\A([0-9]+)\.([0-9]+)/);
+ $SYS_renameat2 = 0 if "$maj.$min" < 3.15;
+ # whether the machine requires 64-bit numbers to be on 8-byte
+ # boundaries.
+ my $u64_mod_8 = 0;
- 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/) ?
+ 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';
+ } elsif ($machine eq 'mips64') { # similarly for mips64 vs mips
+ $machine = 'mips';
+ }
}
- }
-
- if ($machine =~ m/^i[3456]86$/) {
- $SYS_epoll_create = 254;
- $SYS_epoll_ctl = 255;
- $SYS_epoll_wait = 256;
- $SYS_signalfd4 = 327;
- $SYS_renameat2 //= 353;
- $SYS_fstatfs = 100;
- $SYS_sendmsg = 370;
- $SYS_recvmsg = 372;
- $INOTIFY = { # usage: `use constant $PublicInbox::Syscall::INOTIFY'
- SYS_inotify_init1 => 332,
- SYS_inotify_add_watch => 292,
- SYS_inotify_rm_watch => 293,
- };
- $FS_IOC_GETFLAGS = 0x80046601;
- $FS_IOC_SETFLAGS = 0x40046602;
- } elsif ($machine eq "x86_64") {
- $SYS_epoll_create = 213;
- $SYS_epoll_ctl = 233;
- $SYS_epoll_wait = 232;
- $SYS_signalfd4 = 289;
- $SYS_renameat2 //= 316;
- $SYS_fstatfs = 138;
- $SYS_sendmsg = 46;
- $SYS_recvmsg = 47;
- $INOTIFY = {
- SYS_inotify_init1 => 294,
- SYS_inotify_add_watch => 254,
- SYS_inotify_rm_watch => 255,
- };
- $FS_IOC_GETFLAGS = 0x80086601;
- $FS_IOC_SETFLAGS = 0x40086602;
- } elsif ($machine eq 'x32') {
- $SYS_epoll_create = 1073742037;
- $SYS_epoll_ctl = 1073742057;
- $SYS_epoll_wait = 1073742056;
- $SYS_signalfd4 = 1073742113;
- $SYS_renameat2 //= 0x40000000 + 316;
- $SYS_fstatfs = 138;
- $SYS_sendmsg = 0x40000206;
- $SYS_recvmsg = 0x40000207;
- $FS_IOC_GETFLAGS = 0x80046601;
- $FS_IOC_SETFLAGS = 0x40046602;
- $INOTIFY = {
- SYS_inotify_init1 => 1073742118,
- SYS_inotify_add_watch => 1073742078,
- SYS_inotify_rm_watch => 1073742079,
- };
- } elsif ($machine eq 'sparc64') {
- $SYS_epoll_create = 193;
- $SYS_epoll_ctl = 194;
- $SYS_epoll_wait = 195;
- $u64_mod_8 = 1;
- $SYS_signalfd4 = 317;
- $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;
- $SYS_epoll_wait = 238;
- $u64_mod_8 = 1;
- $SYS_signalfd4 = 313;
- $SYS_renameat2 //= 357;
- $SYS_fstatfs = 100;
- $SYS_sendmsg = 341;
- $SYS_recvmsg = 342;
- $FS_IOC_GETFLAGS = 0x40086601;
- $FS_IOC_SETFLAGS = 0x80086602;
- $INOTIFY = {
- SYS_inotify_init1 => 318,
- SYS_inotify_add_watch => 276,
- SYS_inotify_rm_watch => 277,
- };
- } elsif ($machine eq "ppc") {
- $SYS_epoll_create = 236;
- $SYS_epoll_ctl = 237;
- $SYS_epoll_wait = 238;
- $u64_mod_8 = 1;
- $SYS_signalfd4 = 313;
- $SYS_renameat2 //= 357;
- $SYS_fstatfs = 100;
- $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;
- $u64_mod_8 = 1;
- $SYS_signalfd4 = 322;
- $SYS_renameat2 //= 347;
- $SYS_fstatfs = 100;
- $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") { # untested, no machine on cfarm
- # natural alignment, ints are 32-bits
- $SYS_epoll_create = 407;
- $SYS_epoll_ctl = 408;
- $SYS_epoll_wait = 409;
- $u64_mod_8 = 1;
- $SYS_signalfd4 = 484;
- $SFD_CLOEXEC = 010000000;
- } elsif ($machine =~ /\A(?:loong|a)arch64\z/ || $machine eq 'riscv64') {
- $SYS_epoll_create = 20; # (sys_epoll_create1)
- $SYS_epoll_ctl = 21;
- $SYS_epoll_wait = 22; # (sys_epoll_pwait)
- $u64_mod_8 = 1;
- $no_deprecated = 1;
- $SYS_signalfd4 = 74;
- $SYS_renameat2 //= 276;
- $SYS_fstatfs = 44;
- $SYS_sendmsg = 211;
- $SYS_recvmsg = 212;
- $INOTIFY = {
- SYS_inotify_init1 => 26,
- SYS_inotify_add_watch => 27,
- SYS_inotify_rm_watch => 28,
- };
- $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;
- $u64_mod_8 = 1;
- $SYS_signalfd4 = 355;
- $SYS_renameat2 //= 382;
- $SYS_fstatfs = 100;
- $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;
- $u64_mod_8 = 1;
- $SYS_signalfd4 = 5283;
- $SYS_renameat2 //= 5311;
- $SYS_fstatfs = 5135;
- $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;
- $u64_mod_8 = 1;
- $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;
- $INOTIFY = {
- SYS_inotify_init1 => 4329,
- SYS_inotify_add_watch => 4285,
- SYS_inotify_rm_watch => 4286,
- };
- } else {
- warn <<EOM;
+ if ($machine =~ m/^i[3456]86$/) {
+ $SYS_epoll_create = 254;
+ $SYS_epoll_ctl = 255;
+ $SYS_epoll_wait = 256;
+ $SYS_signalfd4 = 327;
+ $SYS_renameat2 //= 353;
+ $SYS_fstatfs = 100;
+ $SYS_sendmsg = 370;
+ $SYS_recvmsg = 372;
+ $INOTIFY = { # usage: `use constant $PublicInbox::Syscall::INOTIFY'
+ SYS_inotify_init1 => 332,
+ SYS_inotify_add_watch => 292,
+ SYS_inotify_rm_watch => 293,
+ };
+ $FS_IOC_GETFLAGS = 0x80046601;
+ $FS_IOC_SETFLAGS = 0x40046602;
+ } elsif ($machine eq "x86_64") {
+ $SYS_epoll_create = 213;
+ $SYS_epoll_ctl = 233;
+ $SYS_epoll_wait = 232;
+ $SYS_signalfd4 = 289;
+ $SYS_renameat2 //= 316;
+ $SYS_fstatfs = 138;
+ $SYS_sendmsg = 46;
+ $SYS_recvmsg = 47;
+ $INOTIFY = {
+ SYS_inotify_init1 => 294,
+ SYS_inotify_add_watch => 254,
+ SYS_inotify_rm_watch => 255,
+ };
+ $FS_IOC_GETFLAGS = 0x80086601;
+ $FS_IOC_SETFLAGS = 0x40086602;
+ } elsif ($machine eq 'x32') {
+ $SYS_epoll_create = 1073742037;
+ $SYS_epoll_ctl = 1073742057;
+ $SYS_epoll_wait = 1073742056;
+ $SYS_signalfd4 = 1073742113;
+ $SYS_renameat2 //= 0x40000000 + 316;
+ $SYS_fstatfs = 138;
+ $SYS_sendmsg = 0x40000206;
+ $SYS_recvmsg = 0x40000207;
+ $FS_IOC_GETFLAGS = 0x80046601;
+ $FS_IOC_SETFLAGS = 0x40046602;
+ $INOTIFY = {
+ SYS_inotify_init1 => 1073742118,
+ SYS_inotify_add_watch => 1073742078,
+ SYS_inotify_rm_watch => 1073742079,
+ };
+ } elsif ($machine eq 'sparc64') {
+ $SYS_epoll_create = 193;
+ $SYS_epoll_ctl = 194;
+ $SYS_epoll_wait = 195;
+ $u64_mod_8 = 1;
+ $SYS_signalfd4 = 317;
+ $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/) { # untested, no machine on cfarm
+ $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;
+ $SYS_epoll_wait = 238;
+ $u64_mod_8 = 1;
+ $SYS_signalfd4 = 313;
+ $SYS_renameat2 //= 357;
+ $SYS_fstatfs = 100;
+ $SYS_sendmsg = 341;
+ $SYS_recvmsg = 342;
+ $FS_IOC_GETFLAGS = 0x40086601;
+ $FS_IOC_SETFLAGS = 0x80086602;
+ $INOTIFY = {
+ SYS_inotify_init1 => 318,
+ SYS_inotify_add_watch => 276,
+ SYS_inotify_rm_watch => 277,
+ };
+ } elsif ($machine eq "ppc") { # untested, no machine on cfarm
+ $SYS_epoll_create = 236;
+ $SYS_epoll_ctl = 237;
+ $SYS_epoll_wait = 238;
+ $u64_mod_8 = 1;
+ $SYS_signalfd4 = 313;
+ $SYS_renameat2 //= 357;
+ $SYS_fstatfs = 100;
+ $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;
+ $u64_mod_8 = 1;
+ $SYS_signalfd4 = 322;
+ $SYS_renameat2 //= 347;
+ $SYS_fstatfs = 100;
+ $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") { # untested, no machine on cfarm
+ # natural alignment, ints are 32-bits
+ $SYS_epoll_create = 407;
+ $SYS_epoll_ctl = 408;
+ $SYS_epoll_wait = 409;
+ $u64_mod_8 = 1;
+ $SYS_signalfd4 = 484;
+ $SFD_CLOEXEC = 010000000;
+ } elsif ($machine =~ /\A(?:loong|a)arch64\z/ || $machine eq 'riscv64') {
+ $SYS_epoll_create = 20; # (sys_epoll_create1)
+ $SYS_epoll_ctl = 21;
+ $SYS_epoll_wait = 22; # (sys_epoll_pwait)
+ $u64_mod_8 = 1;
+ $no_deprecated = 1;
+ $SYS_signalfd4 = 74;
+ $SYS_renameat2 //= 276;
+ $SYS_fstatfs = 44;
+ $SYS_sendmsg = 211;
+ $SYS_recvmsg = 212;
+ $INOTIFY = {
+ SYS_inotify_init1 => 26,
+ SYS_inotify_add_watch => 27,
+ SYS_inotify_rm_watch => 28,
+ };
+ $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;
+ $u64_mod_8 = 1;
+ $SYS_signalfd4 = 355;
+ $SYS_renameat2 //= 382;
+ $SYS_fstatfs = 100;
+ $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;
+ $u64_mod_8 = 1;
+ $SYS_signalfd4 = 5283;
+ $SYS_renameat2 //= 5311;
+ $SYS_fstatfs = 5135;
+ $SYS_sendmsg = 5045;
+ $SYS_recvmsg = 5046;
+ $FS_IOC_GETFLAGS = 0x40046601;
+ $FS_IOC_SETFLAGS = 0x80046602;
+ } elsif ($machine =~ m/^mips/) { # 32-bit, tested on mips64 cfarm host
+ $SYS_epoll_create = 4248;
+ $SYS_epoll_ctl = 4249;
+ $SYS_epoll_wait = 4250;
+ $u64_mod_8 = 1;
+ $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;
+ $INOTIFY = {
+ SYS_inotify_init1 => 4329,
+ SYS_inotify_add_watch => 4285,
+ SYS_inotify_rm_watch => 4286,
+ };
+ } else {
+ warn <<EOM;
machine=$machine ptrsize=$Config{ptrsize} has no syscall definitions
git clone https://80x24.org/public-inbox.git and
Send the output of ./devel/sysdefs-list to meta\@public-inbox.org
EOM
- }
- if ($u64_mod_8) {
- *epoll_wait = \&epoll_wait_mod8;
- *epoll_ctl = \&epoll_ctl_mod8;
- } else {
- *epoll_wait = \&epoll_wait_mod4;
- *epoll_ctl = \&epoll_ctl_mod4;
- }
+ }
+ if ($u64_mod_8) {
+ *epoll_wait = \&epoll_wait_mod8;
+ *epoll_ctl = \&epoll_ctl_mod8;
+ } else {
+ *epoll_wait = \&epoll_wait_mod4;
+ *epoll_ctl = \&epoll_ctl_mod4;
+ }
}
# SFD_CLOEXEC is arch-dependent, so IN_CLOEXEC may be, too
@@ -291,10 +291,6 @@ $INOTIFY->{IN_CLOEXEC} //= 0x80000 if $INOTIFY;
# use devel/sysdefs-list on Linux to detect new syscall numbers and
# other system constants
-############################################################################
-# epoll functions
-############################################################################
-
sub epoll_create {
syscall($SYS_epoll_create, $no_deprecated ? 0 : 100);
}
@@ -302,10 +298,13 @@ sub epoll_create {
# epoll_ctl wrapper
# ARGS: (epfd, op, fd, events_mask)
sub epoll_ctl_mod4 {
- syscall($SYS_epoll_ctl, $_[0]+0, $_[1]+0, $_[2]+0, pack("LLL", $_[3], $_[2], 0));
+ syscall($SYS_epoll_ctl, $_[0]+0, $_[1]+0, $_[2]+0,
+ pack("LLL", $_[3], $_[2], 0));
}
+
sub epoll_ctl_mod8 {
- syscall($SYS_epoll_ctl, $_[0]+0, $_[1]+0, $_[2]+0, pack("LLLL", $_[3], 0, $_[2], 0));
+ syscall($SYS_epoll_ctl, $_[0]+0, $_[1]+0, $_[2]+0,
+ pack("LLLL", $_[3], 0, $_[2], 0));
}
# epoll_wait wrapper
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] syscall: use pure Perl sendmsg/recvmsg on *BSD
2024-01-29 20:59 [PATCH 1/2] syscall: update formatting to match our codebase Eric Wong
@ 2024-01-29 20:59 ` Eric Wong
0 siblings, 0 replies; 2+ messages in thread
From: Eric Wong @ 2024-01-29 20:59 UTC (permalink / raw)
To: spew
While syscall symbols (e.g. SYS_*) have changed on us in FreeBSD
during the history of Sys::Syscall and this project and did bite
us in some cases; the actual numbers don't get recycled for new
syscalls. We're also fortunate that sendmsg and recvmsg syscalls
and associated msghdr and cmsg structs predate the BSD forks and
are compatible across all the BSDs I've tried.
OpenBSD routes Perl `syscall' through libc; and NetBSD + FreeBSD
document procedures for maintaining backwards compatibility.
[1] https://cvsweb.openbsd.org/src/gnu/usr.bin/perl/gen_syscall_emulator.pl
[2] https://www.netbsd.org/docs/internals/en/chap-processes.html#syscall_versioning
[3] https://wiki.freebsd.org/AddingSyscalls#Backward_compatibily
---
devel/sysdefs-list | 9 +++-
lib/PublicInbox/Syscall.pm | 101 +++++++++++++++++++++++--------------
t/cmd_ipc.t | 9 ++--
3 files changed, 73 insertions(+), 46 deletions(-)
diff --git a/devel/sysdefs-list b/devel/sysdefs-list
index 61532cf2..ba51de6c 100755
--- a/devel/sysdefs-list
+++ b/devel/sysdefs-list
@@ -2,8 +2,6 @@
# License: AGPL-3.0+ <http://www.gnu.org/licenses/agpl-3.0.txt>
# Dump system-specific constant numbers this is to maintain
# PublicInbox::Syscall and any other system-specific pieces.
-# DO NOT USE syscall numbers for *BSDs, none of the current BSD kernels
-# we know about promise stable syscall numbers (unlike Linux).
# However, sysconf(3) constants are stable ABI on all safe to dump.
eval 'exec perl -S $0 ${1+"$@"}' # no shebang
if 0; # running under some shell
@@ -179,5 +177,12 @@ int main(void)
PR_NUM(cmsg_type);
STRUCT_END;
+ {
+ struct cmsghdr cmsg;
+ uintptr_t cmsg_data_off;
+ cmsg_data_off = (uintptr_t)CMSG_DATA(&cmsg) - (uintptr_t)&cmsg;
+ D(cmsg_data_off);
+ }
+
return 0;
}
diff --git a/lib/PublicInbox/Syscall.pm b/lib/PublicInbox/Syscall.pm
index 9071e6b1..3d4ed1f6 100644
--- a/lib/PublicInbox/Syscall.pm
+++ b/lib/PublicInbox/Syscall.pm
@@ -22,7 +22,7 @@ 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
-our $INOTIFY;
+our ($INOTIFY, %PACK);
# $VERSION = '0.25'; # Sys::Syscall version
our @EXPORT_OK = qw(epoll_ctl epoll_create epoll_wait
@@ -44,26 +44,21 @@ use constant {
EPOLL_CTL_MOD => 3,
SIZEOF_int => $Config{intsize},
SIZEOF_size_t => $Config{sizesize},
+ SIZEOF_ptr => $Config{ptrsize},
NUL => "\0",
};
-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) : ();
+use constant TMPL_size_t => SIZEOF_size_t == 8 ? 'Q' : 'L';
our ($SYS_epoll_create,
$SYS_epoll_ctl,
$SYS_epoll_wait,
$SYS_signalfd4,
$SYS_renameat2,
- $F_SETPIPE_SZ);
+ $F_SETPIPE_SZ,
+ $SYS_sendmsg,
+ $SYS_recvmsg);
-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
@@ -78,7 +73,7 @@ if ($^O eq "linux") {
# boundaries.
my $u64_mod_8 = 0;
- if ($Config{ptrsize} == 4) {
+ if (SIZEOF_ptr == 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') {
@@ -281,16 +276,51 @@ EOM
*epoll_wait = \&epoll_wait_mod4;
*epoll_ctl = \&epoll_ctl_mod4;
}
+} elsif ($^O =~ /\A(?:freebsd|openbsd|netbsd|dragonfly)\z/) {
+ # don't use syscall.ph here, name => number mappings are not stable;
+ # but the actual numbers are.
+ # OpenBSD perl redirects syscall perlop to libc functions
+ # https://www.netbsd.org/docs/internals/en/chap-processes.html#syscall_versioning
+ # https://wiki.freebsd.org/AddingSyscalls#Backward_compatibily
+ # (assuming Dragonfly copies FreeBSD, here).
+ $SYS_recvmsg = 27;
+ $SYS_sendmsg = 28;
+}
+
+BEGIN {
+ if ($^O eq 'linux') {
+ %PACK = (
+ TMPL_cmsg_len => TMPL_size_t,
+ # cmsg_len, cmsg_level, cmsg_type
+ SIZEOF_cmsghdr => SIZEOF_int * 2 + SIZEOF_size_t,
+ CMSG_DATA_off => '',
+ TMPL_msghdr => 'PL' . # msg_name, msg_namelen
+ '@'.(2 * SIZEOF_ptr).'P'. # msg_iov
+ 'i'. # msg_iovlen
+ '@'.(4 * SIZEOF_ptr).'P'. # msg_control
+ 'L'. # msg_controllen (socklen_t)
+ 'i', # msg_flags
+ );
+ } elsif ($^O =~ /\A(?:freebsd|openbsd|netbsd|dragonfly)\z/) {
+ %PACK = (
+ TMPL_cmsg_len => 'L', # socklen_t
+ SIZEOF_cmsghdr => SIZEOF_int * 3,
+ CMSG_DATA_off => SIZEOF_ptr == 8 ? '@16' : '',
+ TMPL_msghdr => 'PL' . # msg_name, msg_namelen
+ '@'.(2 * SIZEOF_ptr).'P'. # msg_iov
+ TMPL_size_t. # msg_iovlen
+ '@'.(4 * SIZEOF_ptr).'P'. # msg_control
+ TMPL_size_t. # msg_controllen
+ 'i', # msg_flags
+
+ )
+ }
+ $PACK{CMSG_ALIGN_size} = SIZEOF_size_t;
}
# SFD_CLOEXEC is arch-dependent, so IN_CLOEXEC may be, too
$INOTIFY->{IN_CLOEXEC} //= 0x80000 if $INOTIFY;
-# use Inline::C for *BSD-only or general POSIX stuff.
-# Linux guarantees stable syscall numbering, BSDs only offer a stable libc
-# use devel/sysdefs-list on Linux to detect new syscall numbers and
-# other system constants
-
sub epoll_create {
syscall($SYS_epoll_create, $no_deprecated ? 0 : 100);
}
@@ -420,11 +450,13 @@ sub nodatacow_dir {
if (open my $fh, '<', $_[0]) { nodatacow_fh($fh) }
}
-sub CMSG_ALIGN ($) { ($_[0] + SIZEOF_size_t - 1) & ~(SIZEOF_size_t - 1) }
+use constant \%PACK;
+sub CMSG_ALIGN ($) { ($_[0] + CMSG_ALIGN_size - 1) & ~(CMSG_ALIGN_size - 1) }
use constant CMSG_ALIGN_SIZEOF_cmsghdr => 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
+use constant msg_controllen_max =>
+ CMSG_SPACE(10 * SIZEOF_int) + SIZEOF_cmsghdr; # space for 10 FDs
if (defined($SYS_sendmsg) && defined($SYS_recvmsg)) {
no warnings 'once';
@@ -436,20 +468,15 @@ require PublicInbox::CmdIPC4;
$_[2] // NUL, length($_[2] // NUL) || 1);
my $fd_space = scalar(@$fds) * SIZEOF_int;
my $msg_controllen = CMSG_SPACE($fd_space);
- my $cmsghdr = pack(TMPL_size_t . # cmsg_len
+ my $cmsghdr = pack(TMPL_cmsg_len .
'LL' . # cmsg_level, cmsg_type,
- ('i' x scalar(@$fds)) . # CMSG_DATA
+ CMSG_DATA_off.('i' x scalar(@$fds)). # CMSG_DATA
'@'.($msg_controllen - 1).'x1', # pad to space, not len
CMSG_LEN($fd_space), # 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,
+ my $mh = pack(TMPL_msghdr,
+ undef, 0, # msg_name, msg_namelen (unused)
$iov, 1, # msg_iov, msg_iovlen
$cmsghdr, # msg_control
$msg_controllen,
@@ -465,18 +492,13 @@ require PublicInbox::CmdIPC4;
*recv_cmd4 = sub ($$$) {
my ($sock, undef, $len) = @_;
vec($_[1] //= '', $len - 1, 8) = 0;
- my $cmsghdr = "\0" x msg_controllen; # 10 * sizeof(int)
+ my $cmsghdr = "\0" x msg_controllen_max; # 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,
+ my $mh = pack(TMPL_msghdr,
+ undef, 0, # msg_name, msg_namelen (unused)
$iov, 1, # msg_iov, msg_iovlen
$cmsghdr, # msg_control
- msg_controllen,
+ msg_controllen_max,
0); # msg_flags
my $r;
do {
@@ -489,8 +511,9 @@ require PublicInbox::CmdIPC4;
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
+ my ($len, $lvl, $type, @fds) = unpack(TMPL_cmsg_len.
+ 'LL'. # cmsg_level, cmsg_type
+ CMSG_DATA_off.'i*', # @fds
$cmsghdr);
if ($lvl == SOL_SOCKET && $type == SCM_RIGHTS) {
$len -= CMSG_ALIGN_SIZEOF_cmsghdr;
diff --git a/t/cmd_ipc.t b/t/cmd_ipc.t
index 08a4dcc3..c973c6f0 100644
--- a/t/cmd_ipc.t
+++ b/t/cmd_ipc.t
@@ -143,14 +143,13 @@ SKIP: {
}
SKIP: {
- skip 'not Linux', 1 if $^O ne 'linux';
require_ok 'PublicInbox::Syscall';
$send = PublicInbox::Syscall->can('send_cmd4') or
- skip 'send_cmd4 not defined for arch', 1;
+ skip "send_cmd4 not defined for $^O arch", 1;
$recv = PublicInbox::Syscall->can('recv_cmd4') or
- skip 'recv_cmd4 not defined for arch', 1;
- $do_test->(SOCK_STREAM, 0, 'PP Linux stream');
- $do_test->(SOCK_SEQPACKET, 0, 'PP Linux seqpacket');
+ skip "recv_cmd4 not defined for $^O arch", 1;
+ $do_test->(SOCK_STREAM, 0, 'pure Perl stream');
+ $do_test->(SOCK_SEQPACKET, 0, 'pure Perl seqpacket');
}
done_testing;
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-29 21:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-29 20:59 [PATCH 1/2] syscall: update formatting to match our codebase Eric Wong
2024-01-29 20:59 ` [PATCH 2/2] syscall: use pure Perl sendmsg/recvmsg on *BSD Eric Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).