fix(udp): handle multiple datagrams on GRO #1708
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mxinden
force-pushed
the
handle-gro
branch
4 times, most recently
from
7437ca5
to
8645e07
Compare
mxinden
changed the title
Previously `Socket::recv` would at most return a single `Datagram` (i.e. `-> Result<Option<Datagram>, io::Error>`). When supported by the OS, the underlying `quinn-udp` can use both recvMmsg and GRO, each with the ability to return one or more datagrams. As of today, `neqo_common::udp` does not make use of recvmmsg, i.e. it only provides a single `IoSliceMut` to write into. That said, that single `IoSliceMut` might contain multiple `Datagram`s through GRO. Previously this would have been provided as a single `Datagram` to the caller of `Socket::recv`. This commit makes sure to handle the case where many `Datagram`s are retrieved via GRO (see `meta.stride` flag). It updates `neqo_common::udp::Socket::recv` and `neqo-server` and `neqo-client` accordingly.
E.g. the case on CI on windows runner.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1708 +/- ##
==========================================
+ Coverage 92.97% 92.98% +0.01%
==========================================
Files 120 120
Lines 37342 37399 +57
==========================================
+ Hits 34718 34775 +57
Misses 2624 2624 ☔ View full report in Codecov by Sentry. |
mxinden
requested review from
KershawChang,
martinthomson and
larseggert
as code owners
This was referenced Mar 5, 2024
larseggert
approved these changes
Mar 5, 2024
mxinden
added a commit
to mxinden/neqo
that referenced
this pull request
May 4, 2024
There are two server implementations based on neqo: 1. https://github.com/mozilla/neqo/tree/main/neqo-bin/src/server - http3 and http09 implementation - used for manual testing and QUIC Interop 2. https://searchfox.org/mozilla-central/source/netwerk/test/http3server/src/main.rs - used to test Firefox I assume one was once an exact copy of the other. Both implement their own I/O, event loop, ... Since then, the two implementations diverged significantly. Especially (1) saw a lot of improvements in recent months: - mozilla#1564 - mozilla#1569 - mozilla#1578 - mozilla#1581 - mozilla#1604 - mozilla#1612 - mozilla#1676 - mozilla#1692 - mozilla#1707 - mozilla#1708 - mozilla#1727 - mozilla#1753 - mozilla#1756 - mozilla#1766 - mozilla#1772 - mozilla#1786 - mozilla#1787 - mozilla#1788 - mozilla#1794 - mozilla#1806 - mozilla#1808 - mozilla#1848 - mozilla#1866 At this point, bugs in (2) are hard to fix, see e.g. mozilla#1801. This commit merges (2) into (1), thus removing all duplicate logic and having (2) benefit from all the recent improvements to (1).
KershawChang
pushed a commit
to KershawChang/neqo
that referenced
this pull request
May 7, 2024
There are two server implementations based on neqo: 1. https://github.com/mozilla/neqo/tree/main/neqo-bin/src/server - http3 and http09 implementation - used for manual testing and QUIC Interop 2. https://searchfox.org/mozilla-central/source/netwerk/test/http3server/src/main.rs - used to test Firefox I assume one was once an exact copy of the other. Both implement their own I/O, event loop, ... Since then, the two implementations diverged significantly. Especially (1) saw a lot of improvements in recent months: - mozilla#1564 - mozilla#1569 - mozilla#1578 - mozilla#1581 - mozilla#1604 - mozilla#1612 - mozilla#1676 - mozilla#1692 - mozilla#1707 - mozilla#1708 - mozilla#1727 - mozilla#1753 - mozilla#1756 - mozilla#1766 - mozilla#1772 - mozilla#1786 - mozilla#1787 - mozilla#1788 - mozilla#1794 - mozilla#1806 - mozilla#1808 - mozilla#1848 - mozilla#1866 At this point, bugs in (2) are hard to fix, see e.g. mozilla#1801. This commit merges (2) into (1), thus removing all duplicate logic and having (2) benefit from all the recent improvements to (1).
github-merge-queue bot
pushed a commit
that referenced
this pull request
May 8, 2024
* refactor(bin): introduce server/http3.rs and server/http09.rs The QUIC Interop Runner requires an http3 and http09 implementation for both client and server. The client code is already structured into an http3 and an http09 implementation since #1727. This commit does the same for the server side, i.e. splits the http3 and http09 implementation into separate Rust modules. * refactor: merge mozilla-central http3 server into neqo-bin There are two server implementations based on neqo: 1. https://github.com/mozilla/neqo/tree/main/neqo-bin/src/server - http3 and http09 implementation - used for manual testing and QUIC Interop 2. https://searchfox.org/mozilla-central/source/netwerk/test/http3server/src/main.rs - used to test Firefox I assume one was once an exact copy of the other. Both implement their own I/O, event loop, ... Since then, the two implementations diverged significantly. Especially (1) saw a lot of improvements in recent months: - #1564 - #1569 - #1578 - #1581 - #1604 - #1612 - #1676 - #1692 - #1707 - #1708 - #1727 - #1753 - #1756 - #1766 - #1772 - #1786 - #1787 - #1788 - #1794 - #1806 - #1808 - #1848 - #1866 At this point, bugs in (2) are hard to fix, see e.g. #1801. This commit merges (2) into (1), thus removing all duplicate logic and having (2) benefit from all the recent improvements to (1). * Move firefox.rs to mozilla-central * Reduce HttpServer trait functions * Extract constructor * Remove unused deps * Remove clap color feature Nice to have. Adds multiple dependencies. Hard to justify for mozilla-central.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously
Socket::recvwould at most return a singleDatagram(i.e.-> Result<Option<Datagram>, io::Error>). When supported by the OS, the underlyingquinn-udpcan use both recvMmsg and GRO, each with the ability to return one or more datagrams.As of today,
neqo_common::udpdoes not make use of recvmmsg effectively, i.e. it only provides a singleIoSliceMutto write into. That said, that singleIoSliceMutmight contain multipleDatagrams through GRO. Previously this would have been provided as a singleDatagramto the caller ofSocket::recv.This commit makes sure to handle the case where many
Datagrams are retrieved via GRO. I.e. wheremeta.stride < meta.len, indicating that theIoSliceMutcontains more than one datagram. In addition it updatesneqo_common::udp::Socket::recvandneqo-serverandneqo-clientaccordingly.See also the
quinn-udpimplementation and its usage inquinn:This pull request has two commits:
quinn-udpto send set of uniform datagrams via single GSO sendmmsg, to then be received via single GRO recvmmsg call.Socket::recvreturn multipleDatagrams on GRO read.Bug introduced in #1604. Note however that since
neqo_common::udp::Socket::sendwould never do GSO, this bug is unlikely to occur betweenneqo-clientandneqo-server. It can however occur when connecting to other implementations.Given that this is a bug fix only, diff is kept at a minimum. Proper GRO (and GSO) support coming with #1693.