Skip to content

Commit 8ec95b9

Browse files
wangyufen316borkmann
authored andcommitted
bpf, sockmap: Fix the sk->sk_forward_alloc warning of sk_stream_kill_queues
When running `test_sockmap` selftests, the following warning appears: WARNING: CPU: 2 PID: 197 at net/core/stream.c:205 sk_stream_kill_queues+0xd3/0xf0 Call Trace: <TASK> inet_csk_destroy_sock+0x55/0x110 tcp_rcv_state_process+0xd28/0x1380 ? tcp_v4_do_rcv+0x77/0x2c0 tcp_v4_do_rcv+0x77/0x2c0 __release_sock+0x106/0x130 __tcp_close+0x1a7/0x4e0 tcp_close+0x20/0x70 inet_release+0x3c/0x80 __sock_release+0x3a/0xb0 sock_close+0x14/0x20 __fput+0xa3/0x260 task_work_run+0x59/0xb0 exit_to_user_mode_prepare+0x1b3/0x1c0 syscall_exit_to_user_mode+0x19/0x50 do_syscall_64+0x48/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae The root case is in commit 84472b4 ("bpf, sockmap: Fix more uncharged while msg has more_data"), where I used msg->sg.size to replace the tosend, causing breakage: if (msg->apply_bytes && msg->apply_bytes < tosend) tosend = psock->apply_bytes; Fixes: 84472b4 ("bpf, sockmap: Fix more uncharged while msg has more_data") Reported-by: Jakub Sitnicki <[email protected]> Signed-off-by: Wang Yufen <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Acked-by: John Fastabend <[email protected]> Acked-by: Jakub Sitnicki <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent 42378a9 commit 8ec95b9

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

net/ipv4/tcp_bpf.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,
278278
{
279279
bool cork = false, enospc = sk_msg_full(msg);
280280
struct sock *sk_redir;
281-
u32 tosend, delta = 0;
281+
u32 tosend, origsize, sent, delta = 0;
282282
u32 eval = __SK_NONE;
283283
int ret;
284284

@@ -333,10 +333,12 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,
333333
cork = true;
334334
psock->cork = NULL;
335335
}
336-
sk_msg_return(sk, msg, msg->sg.size);
336+
sk_msg_return(sk, msg, tosend);
337337
release_sock(sk);
338338

339+
origsize = msg->sg.size;
339340
ret = tcp_bpf_sendmsg_redir(sk_redir, msg, tosend, flags);
341+
sent = origsize - msg->sg.size;
340342

341343
if (eval == __SK_REDIRECT)
342344
sock_put(sk_redir);
@@ -375,7 +377,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock,
375377
msg->sg.data[msg->sg.start].page_link &&
376378
msg->sg.data[msg->sg.start].length) {
377379
if (eval == __SK_REDIRECT)
378-
sk_mem_charge(sk, msg->sg.size);
380+
sk_mem_charge(sk, tosend - sent);
379381
goto more_data;
380382
}
381383
}

0 commit comments

Comments
 (0)