bpf: fix ktls panic with sockmap and add tests #8509
+205
−3
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: 654765b |
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
a814b9b to
c4bbe91
Compare
|
Upstream branch: d0da259 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
9c228ae to
e3cc193
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
c4bbe91 to
072f756
Compare
|
Upstream branch: e8af068 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
e3cc193 to
41a6f3e
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
072f756 to
d5f119f
Compare
|
Upstream branch: ac13c50 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
41a6f3e to
ca1d7a9
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
d5f119f to
038d931
Compare
|
Upstream branch: 7042882 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
ca1d7a9 to
ca30cc6
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
038d931 to
57dcc3a
Compare
|
Upstream branch: bd4319b |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
ca30cc6 to
9b31daf
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
57dcc3a to
d7a737b
Compare
|
Upstream branch: e0525cd |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
9b31daf to
8be5a14
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
d7a737b to
74bd319
Compare
|
Upstream branch: 63817c7 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
8be5a14 to
1cc98ba
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
74bd319 to
5ed7ad7
Compare
|
Upstream branch: 201b62c |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
1cc98ba to
c587fb7
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
5ed7ad7 to
1be57b8
Compare
|
Upstream branch: 7e437dc |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
fa7e2bb to
a0beb50
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
a49d23f to
88feb0d
Compare
|
Upstream branch: f282146 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
a0beb50 to
62e8a63
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
88feb0d to
eb5d065
Compare
|
Upstream branch: 79d93c8 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
62e8a63 to
5517913
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
eb5d065 to
1ceb0d9
Compare
|
Upstream branch: 74f36a9 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
5517913 to
dc99248
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
1ceb0d9 to
b7965ce
Compare
|
Upstream branch: 157a502 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
dc99248 to
f248236
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
b7965ce to
084fae2
Compare
|
Upstream branch: 233732b |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
f248236 to
a53c5dc
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
084fae2 to
474f6ed
Compare
|
Upstream branch: a68894a |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
a53c5dc to
6b10560
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
474f6ed to
44c3a1d
Compare
|
Upstream branch: be741c7 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
6b10560 to
837ba02
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
44c3a1d to
720c696
Compare
[ 2172.936997] ------------[ cut here ]------------
[ 2172.936999] kernel BUG at lib/iov_iter.c:629!
......
[ 2172.944996] PKRU: 55555554
[ 2172.945155] Call Trace:
[ 2172.945299] <TASK>
[ 2172.945428] ? die+0x36/0x90
[ 2172.945601] ? do_trap+0xdd/0x100
[ 2172.945795] ? iov_iter_revert+0x178/0x180
[ 2172.946031] ? iov_iter_revert+0x178/0x180
[ 2172.946267] ? do_error_trap+0x7d/0x110
[ 2172.946499] ? iov_iter_revert+0x178/0x180
[ 2172.946736] ? exc_invalid_op+0x50/0x70
[ 2172.946961] ? iov_iter_revert+0x178/0x180
[ 2172.947197] ? asm_exc_invalid_op+0x1a/0x20
[ 2172.947446] ? iov_iter_revert+0x178/0x180
[ 2172.947683] ? iov_iter_revert+0x5c/0x180
[ 2172.947913] tls_sw_sendmsg_locked.isra.0+0x794/0x840
[ 2172.948206] tls_sw_sendmsg+0x52/0x80
[ 2172.948420] ? inet_sendmsg+0x1f/0x70
[ 2172.948634] __sys_sendto+0x1cd/0x200
[ 2172.948848] ? find_held_lock+0x2b/0x80
[ 2172.949072] ? syscall_trace_enter+0x140/0x270
[ 2172.949330] ? __lock_release.isra.0+0x5e/0x170
[ 2172.949595] ? find_held_lock+0x2b/0x80
[ 2172.949817] ? syscall_trace_enter+0x140/0x270
[ 2172.950211] ? lockdep_hardirqs_on_prepare+0xda/0x190
[ 2172.950632] ? ktime_get_coarse_real_ts64+0xc2/0xd0
[ 2172.951036] __x64_sys_sendto+0x24/0x30
[ 2172.951382] do_syscall_64+0x90/0x170
......
After calling bpf_exec_tx_verdict(), the size of msg_pl->sg may increase,
e.g., when the BPF program executes bpf_msg_push_data().
If the BPF program sets cork_bytes and sg.size is smaller than cork_bytes,
it will return -ENOSPC and attempt to roll back to the non-zero copy
logic. However, during rollback, msg->msg_iter is reset, but since
msg_pl->sg.size has been increased, subsequent executions will exceed the
actual size of msg_iter.
'''
iov_iter_revert(&msg->msg_iter, msg_pl->sg.size - orig_size);
'''
The changes in this commit are based on the following considerations:
1. When cork_bytes is set, rolling back to non-zero copy logic is
pointless and can directly go to zero-copy logic.
2. We can not calculate the correct number of bytes to revert msg_iter.
Assume the original data is "abcdefgh" (8 bytes), and after 3 pushes
by the BPF program, it becomes 11-byte data: "abc?de?fgh?".
Then, we set cork_bytes to 6, which means the first 6 bytes have been
processed, and the remaining 5 bytes "?fgh?" will be cached until the
length meets the cork_bytes requirement.
However, some data in "?fgh?" is not within 'sg->msg_iter'
(but in msg_pl instead), especially the data "?" we pushed.
So it doesn't seem as simple as just reverting through an offset of
msg_iter.
3. For non-TLS sockets in tcp_bpf_sendmsg, when a "cork" situation occurs,
the user-space send() doesn't return an error, and the returned length is
the same as the input length parameter, even if some data is cached.
Additionally, I saw that the current non-zero-copy logic for handling
corking is written as:
'''
line 1177
else if (ret != -EAGAIN) {
if (ret == -ENOSPC)
ret = 0;
goto send_end;
'''
So it's ok to just return 'copied' without error when a "cork" situation
occurs.
Fixes: fcb14cb ("new iov_iter flavour - ITER_UBUF")
Fixes: d3b18ad ("tls: add bpf support to sk_msg handling")
Signed-off-by: Jiayuan Chen <[email protected]>
add ktls selftest for sockmap Test results: sockmap_ktls/sockmap_ktls disconnect_after_delete IPv4 SOCKMAP:OK sockmap_ktls/sockmap_ktls update_fails_when_sock_has_ulp IPv4 SOCKMAP:OK sockmap_ktls/sockmap_ktls disconnect_after_delete IPv4 SOCKMAP:OK sockmap_ktls/sockmap_ktls update_fails_when_sock_has_ulp IPv4 SOCKMAP:OK sockmap_ktls/sockmap_ktls disconnect_after_delete IPv4 SOCKMAP:OK sockmap_ktls/sockmap_ktls update_fails_when_sock_has_ulp IPv4 SOCKMAP:OK sockmap_ktls/sockmap_ktls disconnect_after_delete IPv4 SOCKMAP:OK sockmap_ktls/sockmap_ktls update_fails_when_sock_has_ulp IPv4 SOCKMAP:OK sockmap_ktls/tls simple offload:OK sockmap_ktls/tls tx cork:OK sockmap_ktls/tls tx cork with push:OK sockmap_ktls/tls simple offload:OK sockmap_ktls/tls tx cork:OK sockmap_ktls/tls tx cork with push:OK sockmap_ktls:OK Signed-off-by: Jiayuan Chen <[email protected]>
|
Upstream branch: 46d38f4 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/935422=>bpf-next
branch
from
837ba02 to
5ee2028
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: bpf: fix ktls panic with sockmap and add tests
version: 2
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=935422