| Message ID | cover.1659676823.git.yin31149@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | net: enhancements to sk_user_data field | expand |
On Fri, Aug 05, 2022 at 03:36 PM +08, Hawkins Jiawei wrote: > This patchset fixes refcount bug by adding SK_USER_DATA_PSOCK flag bit in > sk_user_data field. The bug cause following info: > > WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 > Modules linked in: > CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 > <TASK> > __refcount_add_not_zero include/linux/refcount.h:163 [inline] > __refcount_inc_not_zero include/linux/refcount.h:227 [inline] > refcount_inc_not_zero include/linux/refcount.h:245 [inline] > sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 > tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 > tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 > tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 > tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 > tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 > sk_backlog_rcv include/net/sock.h:1061 [inline] > __release_sock+0x134/0x3b0 net/core/sock.c:2849 > release_sock+0x54/0x1b0 net/core/sock.c:3404 > inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 > __sys_shutdown_sock net/socket.c:2331 [inline] > __sys_shutdown_sock net/socket.c:2325 [inline] > __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 > __do_sys_shutdown net/socket.c:2351 [inline] > __se_sys_shutdown net/socket.c:2349 [inline] > __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 > do_syscall_x64 arch/x86/entry/common.c:50 [inline] > do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 > entry_SYSCALL_64_after_hwframe+0x46/0xb0 > </TASK> > > To improve code maintainability, this patchset refactors sk_user_data > flags code to be more generic. > > Hawkins Jiawei (2): > net: fix refcount bug in sk_psock_get (2) > net: refactor bpf_sk_reuseport_detach() > > include/linux/skmsg.h | 3 +- > include/net/sock.h | 68 +++++++++++++++++++++++++----------- > kernel/bpf/reuseport_array.c | 9 ++--- > net/core/skmsg.c | 4 ++- > 4 files changed, 56 insertions(+), 28 deletions(-) Thank you for the fix. For the series: Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
On Fri, 5 Aug 2022 at 18:30, Jakub Sitnicki <jakub@cloudflare.com> wrote: > > Thank you for the fix. > > For the series: > > Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com> Thanks for your patience, it really helps me a lot!
Hello: This series was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Fri, 5 Aug 2022 15:36:48 +0800 you wrote: > This patchset fixes refcount bug by adding SK_USER_DATA_PSOCK flag bit in > sk_user_data field. The bug cause following info: > > WARNING: CPU: 1 PID: 3605 at lib/refcount.c:19 refcount_warn_saturate+0xf4/0x1e0 lib/refcount.c:19 > Modules linked in: > CPU: 1 PID: 3605 Comm: syz-executor208 Not tainted 5.18.0-syzkaller-03023-g7e062cda7d90 #0 > <TASK> > __refcount_add_not_zero include/linux/refcount.h:163 [inline] > __refcount_inc_not_zero include/linux/refcount.h:227 [inline] > refcount_inc_not_zero include/linux/refcount.h:245 [inline] > sk_psock_get+0x3bc/0x410 include/linux/skmsg.h:439 > tls_data_ready+0x6d/0x1b0 net/tls/tls_sw.c:2091 > tcp_data_ready+0x106/0x520 net/ipv4/tcp_input.c:4983 > tcp_data_queue+0x25f2/0x4c90 net/ipv4/tcp_input.c:5057 > tcp_rcv_state_process+0x1774/0x4e80 net/ipv4/tcp_input.c:6659 > tcp_v4_do_rcv+0x339/0x980 net/ipv4/tcp_ipv4.c:1682 > sk_backlog_rcv include/net/sock.h:1061 [inline] > __release_sock+0x134/0x3b0 net/core/sock.c:2849 > release_sock+0x54/0x1b0 net/core/sock.c:3404 > inet_shutdown+0x1e0/0x430 net/ipv4/af_inet.c:909 > __sys_shutdown_sock net/socket.c:2331 [inline] > __sys_shutdown_sock net/socket.c:2325 [inline] > __sys_shutdown+0xf1/0x1b0 net/socket.c:2343 > __do_sys_shutdown net/socket.c:2351 [inline] > __se_sys_shutdown net/socket.c:2349 [inline] > __x64_sys_shutdown+0x50/0x70 net/socket.c:2349 > do_syscall_x64 arch/x86/entry/common.c:50 [inline] > do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 > entry_SYSCALL_64_after_hwframe+0x46/0xb0 > </TASK> > > [...] Here is the summary with links: - [net,v5,1/2] net: fix refcount bug in sk_psock_get (2) https://git.kernel.org/netdev/net/c/2a0133723f9e - [net,v5,2/2] net: refactor bpf_sk_reuseport_detach() https://git.kernel.org/netdev/net/c/cf8c1e967224 You are awesome, thank you!