Paolo Abeni 499ada5073 mptcp: fix soft lookup in subflow_error_report() ... Maxim reported a soft lookup in subflow_error_report(): watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [swapper/0:0] RIP: 0010:native_queued_spin_lock_slowpath RSP: 0018:ffffa859c0003bc0 EFLAGS: 00000202 RAX: 0000000000000101 RBX: 0000000000000001 RCX: 0000000000000000 RDX: ffff9195c2772d88 RSI: 0000000000000000 RDI: ffff9195c2772d88 RBP: ffff9195c2772d00 R08: 00000000000067b0 R09: c6e31da9eb1e44f4 R10: ffff9195ef379700 R11: ffff9195edb50710 R12: ffff9195c2772d88 R13: ffff9195f500e3d0 R14: ffff9195ef379700 R15: ffff9195ef379700 FS: 0000000000000000(0000) GS:ffff91961f400000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000000c000407000 CR3: 0000000002988000 CR4: 00000000000006f0 Call Trace: <IRQ> _raw_spin_lock_bh subflow_error_report mptcp_subflow_data_available __mptcp_move_skbs_from_subflow mptcp_data_ready tcp_data_queue tcp_rcv_established tcp_v4_do_rcv tcp_v4_rcv ip_protocol_deliver_rcu ip_local_deliver_finish __netif_receive_skb_one_core netif_receive_skb rtl8139_poll 8139too __napi_poll net_rx_action __do_softirq __irq_exit_rcu common_interrupt </IRQ> The calling function - mptcp_subflow_data_available() - can be invoked from different contexts: - plain ssk socket lock - ssk socket lock + mptcp_data_lock - ssk socket lock + mptcp_data_lock + msk socket lock. Since subflow_error_report() tries to acquire the mptcp_data_lock, the latter two call chains will cause soft lookup. This change addresses the issue moving the error reporting call to outer functions, where the held locks list is known and the we can acquire only the needed one. Reported-by: Maxim Galaganov <max@internet.ru> Fixes: 15cc104533 ("mptcp: deliver ssk errors to msk") Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/199 Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2021-06-10 16:47:45 -07:00
..
Kconfig	kunit: mptcp: adhere to KUNIT formatting standard	2021-04-16 17:10:40 -07:00
Makefile	kunit: mptcp: adhere to KUNIT formatting standard	2021-04-16 17:10:40 -07:00
crypto.c	kunit: mptcp: adhere to KUNIT formatting standard	2021-04-16 17:10:40 -07:00
crypto_test.c	mptcp: move crypto test to KUNIT	2020-06-26 16:21:39 -07:00
ctrl.c	mptcp: add a new sysctl add_addr_timeout	2020-11-04 17:45:53 -08:00
diag.c	mptcp: allow dumping subflow context to userspace	2020-03-29 22:14:48 -07:00
mib.c	mptcp: add active MPC mibs	2021-04-02 14:21:50 -07:00
mib.h	mptcp: add active MPC mibs	2021-04-02 14:21:50 -07:00
mptcp_diag.c	mptcp: add local addr info in mptcp_info	2021-02-15 15:09:14 -08:00
options.c	mptcp: Fix out of bounds when parsing TCP options	2021-06-10 14:26:18 -07:00
pm.c	mptcp: rename mptcp_pm_nl_add_addr_send_ack	2021-03-26 15:05:15 -07:00
pm_netlink.c	mptcp: validate 'id' when stopping the ADD_ADDR retransmit timer	2021-05-25 15:56:20 -07:00
protocol.c	mptcp: fix soft lookup in subflow_error_report()	2021-06-10 16:47:45 -07:00
protocol.h	mptcp: wake-up readers only for in sequence data	2021-06-10 16:47:44 -07:00
sockopt.c	mptcp: avoid OOB access in setsockopt()	2021-05-25 15:56:20 -07:00
subflow.c	mptcp: fix soft lookup in subflow_error_report()	2021-06-10 16:47:45 -07:00
syncookies.c	mptcp: fix syncookie build error on UP	2020-08-01 11:52:55 -07:00
token.c	kunit: mptcp: adhere to KUNIT formatting standard	2021-04-16 17:10:40 -07:00
token_test.c	mptcp: introduce token KUNIT self-tests	2020-06-26 16:21:39 -07:00