sockmap: Fix reading with splice(2) #9280
Open
+118
−4
Conversation
This file contains hidden or 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: ad97cb2 |
kernel-patches-daemon-bpf
bot
added
new
bpf-next
V3
V3-ci-pass
needs-ack
and removed
new
labels
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
2 times, most recently
from
128441d to
f818fa8
Compare
|
Upstream branch: ea2aecd |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
c4e62b6 to
5d24620
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
f818fa8 to
d1180f2
Compare
|
Upstream branch: e860a98 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
5d24620 to
5031bdc
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
d1180f2 to
a3964d2
Compare
|
Upstream branch: 1f48966 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
5031bdc to
ef3cd25
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
a3964d2 to
ec33c8e
Compare
|
Upstream branch: 62ef449 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
ef3cd25 to
46d2c4a
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
ec33c8e to
1c89975
Compare
|
Upstream branch: 0768e98 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
46d2c4a to
da2e198
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
1c89975 to
2bf6e60
Compare
|
Upstream branch: 0768e98 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
da2e198 to
6de3d57
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
2bf6e60 to
63bd3e4
Compare
|
Upstream branch: 0ee30d9 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
6de3d57 to
fe444ce
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
63bd3e4 to
1c4f46e
Compare
|
Upstream branch: 0ee30d9 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
fe444ce to
cedaa95
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
1c4f46e to
b5a617e
Compare
|
Upstream branch: beb1097 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
cedaa95 to
1bde990
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
b5a617e to
ffefc6d
Compare
|
Upstream branch: 42be23e |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
1bde990 to
1ffc2c8
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
ffefc6d to
4ccf98a
Compare
|
Upstream branch: 42be23e |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
1ffc2c8 to
b2476ed
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
4ccf98a to
95edab2
Compare
The TCP BPF code will need to override splice_read(), so add it to prot. Signed-off-by: Vincent Whitchurch <[email protected]>
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 <[email protected]>
|
Upstream branch: 95993dc |
If any tests failed, exit the program with a non-zero error code. Signed-off-by: Vincent Whitchurch <[email protected]>
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 <[email protected]>
Add a test which checks that splice(2) is still able to read data from the socket if it is added to a verdict program which returns SK_PASS. Signed-off-by: Vincent Whitchurch <[email protected]>
kernel-patches-daemon-bpf
bot
force-pushed
the
series/859429=>bpf-next
branch
from
b2476ed to
1ef4d12
Compare
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: 3
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=980517