ktls, sockmap: Fix missing uncharge operation and add selfttest #8842
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: 46eb012 |
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
c7849f3 to
a041a61
Compare
|
Upstream branch: 91dbac4 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/956848=>bpf-next
branch
from
d801c2a to
559d0ff
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
a041a61 to
b2666a3
Compare
|
Upstream branch: 224ee86 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/956848=>bpf-next
branch
from
559d0ff to
1051db7
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
b2666a3 to
9afa005
Compare
|
Upstream branch: 8e64c38 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/956848=>bpf-next
branch
from
1051db7 to
40cc149
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
9afa005 to
993c0c1
Compare
|
Upstream branch: 38d976c |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/956848=>bpf-next
branch
from
40cc149 to
c145d88
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
993c0c1 to
97831b9
Compare
|
Upstream branch: 358b1c0 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/956848=>bpf-next
branch
from
c145d88 to
6b95510
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
97831b9 to
c60a0e6
Compare
|
Upstream branch: 358b1c0 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/956848=>bpf-next
branch
from
6b95510 to
10e7337
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
c60a0e6 to
bebc5be
Compare
|
Upstream branch: 7b05f43 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/956848=>bpf-next
branch
from
10e7337 to
b955588
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
bebc5be to
bc80b4f
Compare
|
Upstream branch: 7b05f43 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/956848=>bpf-next
branch
from
b955588 to
f0bbdcb
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
bc80b4f to
ad4665c
Compare
|
Upstream branch: 7b05f43 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/956848=>bpf-next
branch
from
f0bbdcb to
1054270
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
ad4665c to
f363929
Compare
|
Upstream branch: 86870d0 |
kernel-patches-daemon-bpf
bot
force-pushed
the
series/956848=>bpf-next
branch
from
1054270 to
9695dc2
Compare
kernel-patches-daemon-bpf
bot
force-pushed
the
bpf-next_base
branch
from
f363929 to
632a377
Compare
|
Upstream branch: f263336 |
When we specify apply_bytes, we divide the msg into multiple segments, each with a length of 'send', and every time we send this part of the data using tcp_bpf_sendmsg_redir(), we use sk_msg_return_zero() to uncharge the memory of the specified 'send' size. However, if the first segment of data fails to send, for example, the peer's buffer is full, we need to release all of the msg. When releasing the msg, we haven't uncharged the memory of the subsequent segments. This modification does not make significant logical changes, but only fills in the missing uncharge places. This issue has existed all along, until it was exposed after we added the apply test in test_sockmap: commit 3448ad2 ("selftests/bpf: Add apply_bytes test to test_txmsg_redir_wait_sndmem in test_sockmap") Reported-by: Cong Wang <xiyou.wangcong@gmail.com> Closes: https://lore.kernel.org/bpf/aAmIi0vlycHtbXeb@pop-os.localdomain/T/#t Fixes: d3b18ad ("tls: add bpf support to sk_msg handling") Signed-off-by: Jiayuan Chen <jiayuan.chen@linux.dev>
The selftest can reproduce an issue where we miss the uncharge operation when freeing msg, which will cause the following warning. We fixed the issue and added this reproducer to selftest to ensure it will not happen again. ------------[ cut here ]------------ WARNING: CPU: 1 PID: 40 at net/ipv4/af_inet.c inet_sock_destruct+0x173/0x1d5 Tainted: [W]=WARN Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.15.0-1 04/01/2014 Workqueue: events sk_psock_destroy RIP: 0010:inet_sock_destruct+0x173/0x1d5 RSP: 0018:ffff8880085cfc18 EFLAGS: 00010202 RAX: 1ffff11003dbfc00 RBX: ffff88801edfe3e8 RCX: ffffffff822f5af4 RDX: 0000000000000007 RSI: dffffc0000000000 RDI: ffff88801edfe16c RBP: ffff88801edfe184 R08: ffffed1003dbfc31 R09: 0000000000000000 R10: ffffffff822f5ab7 R11: ffff88801edfe187 R12: ffff88801edfdec0 R13: ffff888020376ac0 R14: ffff888020376ac0 R15: ffff888020376a60 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000556365155830 CR3: 000000001d6aa000 CR4: 0000000000350ef0 Call Trace: <TASK> __sk_destruct+0x46/0x222 sk_psock_destroy+0x22f/0x242 process_one_work+0x504/0x8a8 ? process_one_work+0x39d/0x8a8 ? __pfx_process_one_work+0x10/0x10 ? worker_thread+0x44/0x2ae ? __list_add_valid_or_report+0x83/0xea ? srso_return_thunk+0x5/0x5f ? __list_add+0x45/0x52 process_scheduled_works+0x73/0x82 worker_thread+0x1ce/0x2ae Signed-off-by: Jiayuan Chen <jiayuan.chen@linux.dev>
kernel-patches-daemon-bpf
bot
force-pushed
the
series/956848=>bpf-next
branch
from
9695dc2 to
f063844
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: ktls, sockmap: Fix missing uncharge operation and add selfttest
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=956848