Revert "Implement fallback for `sendmmsg` and `recvmmsg`" #1966

mxinden · 2024-08-14T12:23:29Z

This reverts commit e6f1844.

e6f1844 called sendmmsg and recvmmsg through libc::syscall instead of libc::sendmmsg and libc::recvmmsg, thus preventing linking issues on old Android systems where libc::sendmmsg and libc::recvmmsg isn't available.

In #1503 (comment) the suggestion was made to no longer support these old Android systems (API level 16).

This commit reverts e6f1844. Given that sendmmsg support was previously dropped in ee08826, only the recvmmsg calls are reverted.

Alternative to #1964. Given the additional simplicity, my preference is for this change.

quinn-udp/src/unix.rs

mxinden · 2024-08-21T06:30:43Z

@djc @Ralith do you have some time to give this pull request a review?

djc

This makes sense to me, but I'll want to wait for @Ralith's opinion.

mxinden · 2024-08-27T07:15:42Z

Friendly ping @Ralith. Do you have some time to take a look?

Ralith

Do we still need the ENOSYS path and the recvmmsg_fallback definition? Prior to e6f1844 we just called libc::recvmmgs directly rather than wrapping it at all -- can we return to that?

This reverts commit e6f1844. e6f1844 called `sendmmsg` and `recvmmsg` through `libc::syscall` instead of `libc::sendmmsg` and `libc::recvmmsg`, thus preventing linking issues on old Android systems where `libc::sendmmsg` and `libc::recvmmsg` isn't available. In quinn-rs#1503 (comment) the decision was made to no longer support these old Android systems (API level 16). This commit reverts e6f1844. Given that `sendmmsg` support was previously dropped in ee08826, only the `recvmmsg` calls are reverted.

mxinden · 2024-09-02T10:17:27Z

Thank you for the review!

I am fine with no longer supporting both:

Android API Level 16 (i.e. Android 4)
Linux Kernel < 2.6.33

(1) allows us to drop indirection libc::syscall(libc::SYS_sendmmsg in favor of a direct call to libc::recvmmsg. (2) allows us to drop recvmsg (one m) fallback.

I updated this pull request accordingly.

@Ralith would you mind taking another look?

Ralith

LGTM! I don't think Rust officially supports targeting linux 2.x anyway.

djc · 2024-09-03T09:23:01Z

Published quinn-udp v0.5.5 at registry crates-io
[new tag] quinn-udp-0.5.5 -> quinn-udp-0.5.5
Release notes

mxinden · 2024-09-03T09:31:39Z

Thank you @djc for the prompt release. Very much appreciated 🙏

Currently we use `quinn-udp` `v0.5.4`. `quinn-udp` `v0.5.5` fixes [`recvmmsg` calls on Android x86](quinn-rs/quinn#1966). `quinn-udp` `v0.5.6` adds [experimental multi-message support on Apple platforms](quinn-rs/quinn#1993) and [fixes an unnecessary `windows-sys` version restriction](quinn-rs/quinn#2021). While not strictly necessary, given that our current version specification (i.e. `version = "0.5.4"`) already allows users to use Neqo with `quinn-udp` `v0.5.6`, this commit updates to `quinn-udp` `v0.5.6` anyways, thus making sure CI tests with latest version. In case mozilla#2208 lands, future compatible version updates would touch the `Cargo.lock` file, not `Cargo.toml`.

Currently we use `quinn-udp` `v0.5.4`. `quinn-udp` `v0.5.5` fixes [`recvmmsg` calls on Android x86](quinn-rs/quinn#1966). `quinn-udp` `v0.5.6` adds [experimental multi-message support on Apple platforms](quinn-rs/quinn#1993) and [fixes an unnecessary `windows-sys` version restriction](quinn-rs/quinn#2021). While not strictly necessary, given that our current version specification (i.e. `version = "0.5.4"`) already allows users to use Neqo with `quinn-udp` `v0.5.6`, this commit updates to `quinn-udp` `v0.5.6` anyways, thus making sure CI tests with latest version. In case #2208 lands, future compatible version updates would touch the `Cargo.lock` file, not `Cargo.toml`.

Currently we use `quinn-udp` `v0.5.4`. `quinn-udp` `v0.5.5` fixes [`recvmmsg` calls on Android x86](quinn-rs/quinn#1966). `quinn-udp` `v0.5.6` adds [experimental multi-message support on Apple platforms](quinn-rs/quinn#1993) and [fixes an unnecessary `windows-sys` version restriction](quinn-rs/quinn#2021). While not strictly necessary, given that our current version specification (i.e. `version = "0.5.4"`) already allows users to use Neqo with `quinn-udp` `v0.5.6`, this commit updates to `quinn-udp` `v0.5.6` anyways, thus making sure CI tests with latest version. In case #2208 lands, future compatible version updates would touch the `Cargo.lock` file, not `Cargo.toml`. Co-authored-by: Lars Eggert <lars@eggert.org>

…ply-chain-reviewers,sunil https://bugzilla.mozilla.org/show_bug.cgi?id=1910360 replaced NSPR with quinn-udp for HTTP3 QUIC UDP IO on Firefox Nightly. Calls to `recvmmsg` were prohibited by seccomp on Android x86. See https://bugzilla.mozilla.org/show_bug.cgi?id=1910594, upstream quinn-udp tracking issue: quinn-rs/quinn#1947 and upstream quinn-udp fix: quinn-rs/quinn#1966 Now that the upstream fix is merged and released, this commit upgrads neqo_glue to use quinn-udp `v0.5.6`. In addition, given the fix, quinn-udp can now be used on Android x86 Firefox Nightly. Thus this commit also removes the conditional around the `network.http.http3.use_nspr_for_io` pref. Differential Revision: https://phabricator.services.mozilla.com/D220890

…ply-chain-reviewers,sunil https://bugzilla.mozilla.org/show_bug.cgi?id=1910360 replaced NSPR with quinn-udp for HTTP3 QUIC UDP IO on Firefox Nightly. Calls to `recvmmsg` were prohibited by seccomp on Android x86. See https://bugzilla.mozilla.org/show_bug.cgi?id=1910594, upstream quinn-udp tracking issue: quinn-rs/quinn#1947 and upstream quinn-udp fix: quinn-rs/quinn#1966 Now that the upstream fix is merged and released, this commit upgrads neqo_glue to use quinn-udp `v0.5.6`. In addition, given the fix, quinn-udp can now be used on Android x86 Firefox Nightly. Thus this commit also removes the conditional around the `network.http.http3.use_nspr_for_io` pref. Differential Revision: https://phabricator.services.mozilla.com/D220890 UltraBlame original commit: 768c0cdc9453e75f3adca22194c725f78d314cf2

Currently we use `quinn-udp` `v0.5.4`. `quinn-udp` `v0.5.5` fixes [`recvmmsg` calls on Android x86](quinn-rs/quinn#1966). `quinn-udp` `v0.5.6` adds [experimental multi-message support on Apple platforms](quinn-rs/quinn#1993) and [fixes an unnecessary `windows-sys` version restriction](quinn-rs/quinn#2021). While not strictly necessary, given that our current version specification (i.e. `version = "0.5.4"`) already allows users to use Neqo with `quinn-udp` `v0.5.6`, this commit updates to `quinn-udp` `v0.5.6` anyways, thus making sure CI tests with latest version. In case #2208 lands, future compatible version updates would touch the `Cargo.lock` file, not `Cargo.toml`. Co-authored-by: Lars Eggert <lars@eggert.org>

…ply-chain-reviewers,sunil https://bugzilla.mozilla.org/show_bug.cgi?id=1910360 replaced NSPR with quinn-udp for HTTP3 QUIC UDP IO on Firefox Nightly. Calls to `recvmmsg` were prohibited by seccomp on Android x86. See https://bugzilla.mozilla.org/show_bug.cgi?id=1910594, upstream quinn-udp tracking issue: quinn-rs/quinn#1947 and upstream quinn-udp fix: quinn-rs/quinn#1966 Now that the upstream fix is merged and released, this commit upgrads neqo_glue to use quinn-udp `v0.5.6`. In addition, given the fix, quinn-udp can now be used on Android x86 Firefox Nightly. Thus this commit also removes the conditional around the `network.http.http3.use_nspr_for_io` pref. Differential Revision: https://phabricator.services.mozilla.com/D220890

mxinden force-pushed the libc-recvmmsg-directly branch from 026adea to b1fc3b2 Compare August 14, 2024 12:57

mxinden commented Aug 14, 2024

View reviewed changes

quinn-udp/src/unix.rs Outdated Show resolved Hide resolved

mxinden mentioned this pull request Aug 14, 2024

fix(udp): use libc::recvmmsg on Android x86 #1964

Closed

mxinden force-pushed the libc-recvmmsg-directly branch from e8934b7 to 7680e38 Compare August 19, 2024 12:15

djc approved these changes Aug 21, 2024

View reviewed changes

Ralith requested changes Sep 1, 2024

View reviewed changes

mxinden added 2 commits September 2, 2024 11:52

chore(quinn-udp): increase crate patch version to v0.5.5

fb44c77

mxinden force-pushed the libc-recvmmsg-directly branch from bf31877 to fb44c77 Compare September 2, 2024 09:53

Ralith approved these changes Sep 2, 2024

View reviewed changes

djc added this pull request to the merge queue Sep 3, 2024

Merged via the queue into quinn-rs:main with commit 8bdbf42 Sep 3, 2024
13 checks passed

mxinden mentioned this pull request Sep 3, 2024

recvmmsg is disallowed by seccomp on Android x86 #1947

Closed

mxinden mentioned this pull request Oct 28, 2024

feat(quinn-udp): support both windows-sys v0.52 and v0.59 #2021

Merged

mxinden mentioned this pull request Oct 30, 2024

chore: update to quinn-udp v0.5.6 mozilla/neqo#2209

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revert "Implement fallback for `sendmmsg` and `recvmmsg`" #1966

Revert "Implement fallback for `sendmmsg` and `recvmmsg`" #1966

mxinden commented Aug 14, 2024 •

edited

Loading

mxinden commented Aug 21, 2024

djc left a comment

mxinden commented Aug 27, 2024

Ralith left a comment

mxinden commented Sep 2, 2024

Ralith left a comment

djc commented Sep 3, 2024

mxinden commented Sep 3, 2024

Revert "Implement fallback for sendmmsg and recvmmsg" #1966

Revert "Implement fallback for sendmmsg and recvmmsg" #1966

Conversation

mxinden commented Aug 14, 2024 • edited Loading

mxinden commented Aug 21, 2024

djc left a comment

Choose a reason for hiding this comment

mxinden commented Aug 27, 2024

Ralith left a comment

Choose a reason for hiding this comment

mxinden commented Sep 2, 2024

Ralith left a comment

Choose a reason for hiding this comment

djc commented Sep 3, 2024

mxinden commented Sep 3, 2024

Revert "Implement fallback for `sendmmsg` and `recvmmsg`" #1966

Revert "Implement fallback for `sendmmsg` and `recvmmsg`" #1966

mxinden commented Aug 14, 2024 •

edited

Loading