sockmap: Fix reading with splice(2) #7158
Closed
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
![kernel-patches-daemon-bpf[bot]](https://avatars.githubusercontent.com/u/70728002?s=60&v=4){kind=small}
|
Upstream branch: 0720887 |
kernel-patches-daemon-bpf
bot
added
new
bpf-next
V1
V1-ci-pass
needs-ack
and removed
new
labels
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
cf94588
to
7ea168b
Compare
|
Upstream branch: 7015843 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
27c390e
to
adbfef4
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
7ea168b
to
988ce34
Compare
|
Upstream branch: b24862b |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
adbfef4
to
e9eb832
Compare
|
Upstream branch: 08ac454 |
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
988ce34
to
d4f6810
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
e9eb832
to
e053865
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
d4f6810
to
2c69871
Compare
|
Upstream branch: f85af9d |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
e053865
to
ec97d4d
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
2c69871
to
efc6995
Compare
|
Upstream branch: 2ebb87f |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
ec97d4d
to
bf4b3fa
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
efc6995
to
2d4d540
Compare
|
Upstream branch: bb678f0 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
bf4b3fa
to
276113b
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
2d4d540
to
6a90984
Compare
|
Upstream branch: 98b303c |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
276113b
to
584700c
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
6a90984
to
4abe0a1
Compare
The TCP BPF code will need to override splice_read(), so add it to prot. Signed-off-by: Vincent Whitchurch <vincent.whitchurch@datadoghq.com>
If a socket is added to a sockmap with a verdict program which returns SK_PASS, splice(2) is not able to read from the socket. The verdict code removes skbs from the receive queue, checks them using the bpf program, and then re-queues them onto a separate queue (psock->ingress_msg). The sockmap code modifies the TCP recvmsg hook to check this second queue also so that works. But the splice_read hooks is not modified and the default tcp_read_splice() only reads the normal receive queue so it never sees the skbs which have been re-queued. Fix it by using copy_splice_read() when replacing the proto for the sockmap. This could eventually be replaced with a more efficient custom version. Signed-off-by: Vincent Whitchurch <vincent.whitchurch@datadoghq.com>
If any tests failed, exit the program with a non-zero error code. Signed-off-by: Vincent Whitchurch <vincent.whitchurch@datadoghq.com>
Add an option to always return SK_PASS in the verdict callback instead of redirecting the skb. This allows testing cases which are not covered by the test program as of now. Signed-off-by: Vincent Whitchurch <vincent.whitchurch@datadoghq.com>
Add a test mode which uses splice(2) to do a read from the socket. Can be run with something like the below: ./test_sockmap -t splice --txmsg_omit_skb_parser --txmsg_pass_skb Signed-off-by: Vincent Whitchurch <vincent.whitchurch@datadoghq.com>
|
Upstream branch: 4ff5747 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
584700c
to
863d6bc
Compare
|
At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=859429 expired. Closing PR. |
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.
Pull request for series with
subject: sockmap: Fix reading with splice(2)
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=859429