From: John Fastabend <john.fastabend@gmail.com>
To: Wang Yufen <wangyufen@huawei.com>,
john.fastabend@gmail.com, daniel@iogearbox.net,
jakub@cloudflare.com, lmb@cloudflare.com, davem@davemloft.net,
bpf@vger.kernel.org
Cc: edumazet@google.com, yoshfuji@linux-ipv6.org, dsahern@kernel.org,
kuba@kernel.org, ast@kernel.org, andrii@kernel.org, kafai@fb.com,
songliubraving@fb.com, yhs@fb.com, kpsingh@kernel.org,
netdev@vger.kernel.org, Wang Yufen <wangyufen@huawei.com>
Subject: RE: [PATCH bpf-next 3/4] bpf, sockmap: Fix more uncharged while msg has more_data
Date: Mon, 28 Feb 2022 20:20:11 -0800 [thread overview]
Message-ID: <621d9efbec66f_8c479208eb@john.notmuch> (raw)
In-Reply-To: <20220225014929.942444-4-wangyufen@huawei.com>
Wang Yufen wrote:
> In tcp_bpf_send_verdict(), if msg has more data after
> tcp_bpf_sendmsg_redir():
>
> tcp_bpf_send_verdict()
> tosend = msg->sg.size //msg->sg.size = 22220
> case __SK_REDIRECT:
> sk_msg_return() //uncharged msg->sg.size(22220) sk->sk_forward_alloc
> tcp_bpf_sendmsg_redir() //after tcp_bpf_sendmsg_redir, msg->sg.size=11000
> goto more_data;
> tosend = msg->sg.size //msg->sg.size = 11000
> case __SK_REDIRECT:
> sk_msg_return() //uncharged msg->sg.size(11000) to sk->sk_forward_alloc
>
> The msg->sg.size(11000) has been uncharged twice, to fix we can charge the
> remaining msg->sg.size before goto more data.
>
> This issue can cause the following info:
> WARNING: CPU: 0 PID: 9860 at net/core/stream.c:208 sk_stream_kill_queues+0xd4/0x1a0
> Call Trace:
> <TASK>
> inet_csk_destroy_sock+0x55/0x110
> __tcp_close+0x279/0x470
> tcp_close+0x1f/0x60
> inet_release+0x3f/0x80
> __sock_release+0x3d/0xb0
> sock_close+0x11/0x20
> __fput+0x92/0x250
> task_work_run+0x6a/0xa0
> do_exit+0x33b/0xb60
> do_group_exit+0x2f/0xa0
> get_signal+0xb6/0x950
> arch_do_signal_or_restart+0xac/0x2a0
> ? vfs_write+0x237/0x290
> exit_to_user_mode_prepare+0xa9/0x200
> syscall_exit_to_user_mode+0x12/0x30
> do_syscall_64+0x46/0x80
> entry_SYSCALL_64_after_hwframe+0x44/0xae
> </TASK>
>
> WARNING: CPU: 0 PID: 2136 at net/ipv4/af_inet.c:155 inet_sock_destruct+0x13c/0x260
> Call Trace:
> <TASK>
> __sk_destruct+0x24/0x1f0
> sk_psock_destroy+0x19b/0x1c0
> process_one_work+0x1b3/0x3c0
> worker_thread+0x30/0x350
> ? process_one_work+0x3c0/0x3c0
> kthread+0xe6/0x110
> ? kthread_complete_and_exit+0x20/0x20
> ret_from_fork+0x22/0x30
> </TASK>
>
> Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface")
> Signed-off-by: Wang Yufen <wangyufen@huawei.com>
> ---
LGTM also fixes another charge error when going through the error path with
apply set where it looks like we would have left some bytes charged to the
socket.
Acked-by: John Fastabend <john.fastabend@gmail.com>
next prev parent reply other threads:[~2022-03-01 4:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-25 1:49 [PATCH bpf-next 0/4] bpf, sockmap: Fix memleaks and issues of mem charge/uncharge Wang Yufen
2022-02-25 1:49 ` [PATCH bpf-next 1/4] bpf, sockmap: Fix memleak in sk_psock_queue_msg Wang Yufen
2022-02-27 19:21 ` Cong Wang
2022-03-01 1:49 ` wangyufen
2022-03-01 3:44 ` John Fastabend
2022-03-03 0:31 ` Cong Wang
2022-02-25 1:49 ` [PATCH bpf-next 2/4] bpf, sockmap: Fix memleak in tcp_bpf_sendmsg while sk msg is full Wang Yufen
2022-03-01 4:02 ` John Fastabend
2022-03-01 7:05 ` wangyufen
2022-02-25 1:49 ` [PATCH bpf-next 3/4] bpf, sockmap: Fix more uncharged while msg has more_data Wang Yufen
2022-03-01 4:20 ` John Fastabend [this message]
2022-02-25 1:49 ` [PATCH bpf-next 4/4] bpf, sockmap: Fix double uncharge the mem of sk_msg Wang Yufen
2022-03-01 4:11 ` John Fastabend
2022-03-01 7:24 ` wangyufen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=621d9efbec66f_8c479208eb@john.notmuch \
--to=john.fastabend@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=jakub@cloudflare.com \
--cc=kafai@fb.com \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=lmb@cloudflare.com \
--cc=netdev@vger.kernel.org \
--cc=songliubraving@fb.com \
--cc=wangyufen@huawei.com \
--cc=yhs@fb.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.