Implement accept4 on x86 android with `socketcall` syscall. #2079

de-vri-es · 2021-02-24T10:52:14Z

Linux x86 kernels before 4.3 only support the socketcall syscall rather than individual syscalls for socket operations. Since libc does a raw syscall for accept4 on Android, it doesn't work on x86 systems.

This PR instead implements accept4 for x86 android using socketcall. The value for SYS_ACCEPT4 (in contrast to SYS_accept4 👀) is taken from the linux/net.h header.

Also note that the socketcall syscall takes all arguments as array of long ints. I've double checked with glibc to check how they pass arguments, since the Linux man page only says this: "args points to a block containing the actual arguments" and "only standard library implementors and kernel hackers need to know about socketcall()".

This should fix rust-lang/rust#82400

rust-highfive · 2021-02-24T10:52:17Z

r? @JohnTitor

(rust-highfive has picked a reviewer for you, use r? to override)

src/unix/linux_like/android/b32/x86/mod.rs

joshtriplett · 2021-02-24T17:30:48Z

Looks good to me.

@bors r+

joshtriplett · 2021-02-25T22:38:23Z

@bors r+

bors · 2021-02-25T22:38:25Z

📌 Commit 64614cf has been approved by joshtriplett

bors · 2021-02-25T23:09:30Z

⌛ Testing commit 64614cf with merge 71663bc...

Implement accept4 on x86 android with `socketcall` syscall. Linux x86 kernels before 4.3 only support the `socketcall` syscall rather than individual syscalls for socket operations. Since `libc` does a raw syscall for `accept4` on Android, it doesn't work on x86 systems. This PR instead implements `accept4` for x86 android using `socketcall`. The value for `SYS_ACCEPT4` (in contrast to `SYS_accept4` 👀) is taken from the `linux/net.h` header. Also note that the `socketcall` syscall takes all arguments as array of long ints. I've double checked with `glibc` to check how they pass arguments, since the Linux man page only says this: "args points to a block containing the actual arguments" and "only standard library implementors and kernel hackers need to know about socketcall()". This should fix rust-lang/rust#82400

bors · 2021-02-25T23:25:25Z

💔 Test failed - checks-actions

de-vri-es · 2021-02-26T10:12:28Z

Pushed a fix, passes a local build for i686-linux-android (can't run the tests though).

JohnTitor · 2021-02-26T16:50:15Z

@bors r=joshtriplett

bors · 2021-02-26T16:50:16Z

📌 Commit df5f0de has been approved by joshtriplett

Implement accept4 on x86 android with `socketcall` syscall. Linux x86 kernels before 4.3 only support the `socketcall` syscall rather than individual syscalls for socket operations. Since `libc` does a raw syscall for `accept4` on Android, it doesn't work on x86 systems. This PR instead implements `accept4` for x86 android using `socketcall`. The value for `SYS_ACCEPT4` (in contrast to `SYS_accept4` 👀) is taken from the `linux/net.h` header. Also note that the `socketcall` syscall takes all arguments as array of long ints. I've double checked with `glibc` to check how they pass arguments, since the Linux man page only says this: "args points to a block containing the actual arguments" and "only standard library implementors and kernel hackers need to know about socketcall()". This should fix rust-lang/rust#82400

bors · 2021-02-26T16:50:24Z

⌛ Testing commit df5f0de with merge ffbdaaa...

bors · 2021-02-26T17:09:02Z

💔 Test failed - checks-actions

JohnTitor · 2021-02-26T18:26:51Z

Failure:

   cargo:warning=/checkout/target/i686-linux-android/debug/build/libc-test-0ad756840b253b95/out/main.c:34804:24: error: use of undeclared identifier 'socketcall'; did you mean 'socketpair'?
  cargo:warning=                return socketcall;
  cargo:warning=                       ^~~~~~~~~~
  cargo:warning=                       socketpair
  cargo:warning=/android/ndk-i686/bin/../sysroot/usr/include/sys/socket.h:329:18: note: 'socketpair' declared here
  cargo:warning=__socketcall int socketpair(int __af, int __type, int __protocol, int __fds[2]);
  cargo:warning=                 ^
  cargo:warning=/checkout/target/i686-linux-android/debug/build/libc-test-0ad756840b253b95/out/main.c:34804:24: error: incompatible pointer types returning 'int (int, int, int, int *) __attribute__((cdecl))' from a function with result type 'int (*)(int, long *)' [-Werror,-Wincompatible-pointer-types]
  cargo:warning=                return socketcall;
  cargo:warning=                       ^~~~~~~~~~
  cargo:warning=2 errors generated.
  exit code: 1

  --- stderr
  rust version: 1.52.0-nightly

We should tweak the test.

JohnTitor · 2021-02-27T11:05:52Z

Thanks, let's try again :)

@bors r=joshtriplett,JohnTitor

bors · 2021-02-27T11:05:53Z

📌 Commit 446f7a7 has been approved by joshtriplett,JohnTitor

bors · 2021-02-27T11:06:00Z

⌛ Testing commit 446f7a7 with merge 843db55...

…ohnTitor Implement accept4 on x86 android with `socketcall` syscall. Linux x86 kernels before 4.3 only support the `socketcall` syscall rather than individual syscalls for socket operations. Since `libc` does a raw syscall for `accept4` on Android, it doesn't work on x86 systems. This PR instead implements `accept4` for x86 android using `socketcall`. The value for `SYS_ACCEPT4` (in contrast to `SYS_accept4` 👀) is taken from the `linux/net.h` header. Also note that the `socketcall` syscall takes all arguments as array of long ints. I've double checked with `glibc` to check how they pass arguments, since the Linux man page only says this: "args points to a block containing the actual arguments" and "only standard library implementors and kernel hackers need to know about socketcall()". This should fix rust-lang/rust#82400

bors · 2021-02-27T11:26:53Z

💔 Test failed - checks-actions

src/unix/linux_like/android/b64/mod.rs

Co-authored-by: Yuki Okushi <huyuumi.dev@gmail.com>

JohnTitor · 2021-02-27T13:11:15Z

@bors r=joshtriplett,JohnTitor

bors · 2021-02-27T13:11:16Z

📌 Commit 629b518 has been approved by joshtriplett,JohnTitor

…ohnTitor Implement accept4 on x86 android with `socketcall` syscall. Linux x86 kernels before 4.3 only support the `socketcall` syscall rather than individual syscalls for socket operations. Since `libc` does a raw syscall for `accept4` on Android, it doesn't work on x86 systems. This PR instead implements `accept4` for x86 android using `socketcall`. The value for `SYS_ACCEPT4` (in contrast to `SYS_accept4` 👀) is taken from the `linux/net.h` header. Also note that the `socketcall` syscall takes all arguments as array of long ints. I've double checked with `glibc` to check how they pass arguments, since the Linux man page only says this: "args points to a block containing the actual arguments" and "only standard library implementors and kernel hackers need to know about socketcall()". This should fix rust-lang/rust#82400

bors · 2021-02-27T13:11:24Z

⌛ Testing commit 629b518 with merge add9726...

bors · 2021-02-27T14:19:57Z

☀️ Test successful - checks-actions, checks-cirrus-freebsd-11, checks-cirrus-freebsd-12, checks-cirrus-freebsd-13
Approved by: joshtriplett,JohnTitor
Pushing add9726 to master...

JohnTitor · 2021-02-27T14:32:43Z

This is merged on master now but bors doesn't close it, manually closing.

de-vri-es · 2021-02-27T16:39:38Z

Awesome, thanks for the reviews! ❤️

libc removed it in version 0.2.87. rust-lang/libc#2079

Re-add accept4 for Android on 32 bit ARM. `accept4` was accidentally removed from 32 bit Android targets except for x86 in #2079. This PR adds it back using the same definition as other non-x86 platforms.

rust-highfive assigned JohnTitor Feb 24, 2021

rust-highfive added the S-waiting-on-review label Feb 24, 2021

de-vri-es mentioned this pull request Feb 24, 2021

Accepting Incoming TCP Connections fails on Android rust-lang/rust#82400

Closed

sdroege reviewed Feb 24, 2021

View reviewed changes

src/unix/linux_like/android/b32/x86/mod.rs Outdated Show resolved Hide resolved

de-vri-es mentioned this pull request Feb 24, 2021

Use libc::accept4 on Android instead of raw syscall. rust-lang/rust#82473

Merged

wngr reviewed Feb 24, 2021

View reviewed changes

src/unix/linux_like/android/b32/x86/mod.rs Show resolved Hide resolved

de-vri-es mentioned this pull request Feb 24, 2021

[stable] Fix TcpListener::accept() on x86 Android on stable by disabling the use of accept4. rust-lang/rust#82475

Closed

bors added S-waiting-on-bors and removed S-waiting-on-review labels Feb 25, 2021

bors added S-waiting-on-review and removed S-waiting-on-bors labels Feb 25, 2021

bors added S-waiting-on-bors and removed S-waiting-on-review labels Feb 26, 2021

bors added S-waiting-on-review and removed S-waiting-on-bors labels Feb 26, 2021

JohnTitor removed the S-waiting-on-review label Feb 26, 2021

Implement accept4 on x86 android with socketcall syscall.

446f7a7

de-vri-es force-pushed the android-x86-accept4 branch from e3ccd75 to 446f7a7 Compare February 27, 2021 10:17

bors added S-waiting-on-bors and removed S-waiting-on-review labels Feb 27, 2021

bors added S-waiting-on-review and removed S-waiting-on-bors labels Feb 27, 2021

JohnTitor reviewed Feb 27, 2021

View reviewed changes

src/unix/linux_like/android/b64/mod.rs Outdated Show resolved Hide resolved

Fix call to syscall for 64 bit Android.

629b518

Co-authored-by: Yuki Okushi <huyuumi.dev@gmail.com>

bors added S-waiting-on-bors and removed S-waiting-on-review labels Feb 27, 2021

bors mentioned this pull request Feb 27, 2021

Add memfd_create to linux and android #2069

Merged

JohnTitor closed this Feb 27, 2021

de-vri-es deleted the android-x86-accept4 branch March 1, 2021 21:50

asomers added a commit to asomers/nix that referenced this pull request Mar 5, 2021

Remove accept4 on Android arm

a3592a4

libc removed it in version 0.2.87. rust-lang/libc#2079

asomers mentioned this pull request Mar 5, 2021

Remove accept4 on Android arm nix-rust/nix#1399

Merged

JohnTitor mentioned this pull request Mar 5, 2021

Regression: missing accept4(2) in 0.2.87 for arm-linux-androideabi target #2101

Closed

de-vri-es mentioned this pull request Mar 5, 2021

Re-add accept4 for Android on 32 bit ARM. #2102

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement accept4 on x86 android with `socketcall` syscall. #2079

Implement accept4 on x86 android with `socketcall` syscall. #2079

de-vri-es commented Feb 24, 2021

rust-highfive commented Feb 24, 2021

joshtriplett commented Feb 24, 2021 •

edited

joshtriplett commented Feb 25, 2021

bors commented Feb 25, 2021

bors commented Feb 25, 2021

bors commented Feb 25, 2021

de-vri-es commented Feb 26, 2021 •

edited

JohnTitor commented Feb 26, 2021

bors commented Feb 26, 2021

bors commented Feb 26, 2021

bors commented Feb 26, 2021

JohnTitor commented Feb 26, 2021

JohnTitor commented Feb 27, 2021

bors commented Feb 27, 2021

bors commented Feb 27, 2021

bors commented Feb 27, 2021

JohnTitor commented Feb 27, 2021

bors commented Feb 27, 2021

bors commented Feb 27, 2021

bors commented Feb 27, 2021

JohnTitor commented Feb 27, 2021

de-vri-es commented Feb 27, 2021

Implement accept4 on x86 android with socketcall syscall. #2079

Implement accept4 on x86 android with socketcall syscall. #2079

Conversation

de-vri-es commented Feb 24, 2021

rust-highfive commented Feb 24, 2021

joshtriplett commented Feb 24, 2021 • edited

joshtriplett commented Feb 25, 2021

bors commented Feb 25, 2021

bors commented Feb 25, 2021

bors commented Feb 25, 2021

de-vri-es commented Feb 26, 2021 • edited

JohnTitor commented Feb 26, 2021

bors commented Feb 26, 2021

bors commented Feb 26, 2021

bors commented Feb 26, 2021

JohnTitor commented Feb 26, 2021

JohnTitor commented Feb 27, 2021

bors commented Feb 27, 2021

bors commented Feb 27, 2021

bors commented Feb 27, 2021

JohnTitor commented Feb 27, 2021

bors commented Feb 27, 2021

bors commented Feb 27, 2021

bors commented Feb 27, 2021

JohnTitor commented Feb 27, 2021

de-vri-es commented Feb 27, 2021

Implement accept4 on x86 android with `socketcall` syscall. #2079

Implement accept4 on x86 android with `socketcall` syscall. #2079

joshtriplett commented Feb 24, 2021 •

edited

de-vri-es commented Feb 26, 2021 •

edited