Skip to content

Commit fbb6a80

Browse files
kmjohansenintel-lab-lkp
authored andcommitted
mptcp: fix 'scheduling while atomic' in mptcp_pm_nl_append_new_local_addr
If multiple connection requests attempt to create an implicit mptcp endpoint in parallel, more than one caller may end up in mptcp_pm_nl_append_new_local_addr because none found the address in local_addr_list during their call to mptcp_pm_nl_get_local_id. In this case, the concurrent new_local_addr calls may delete the address entry created by the previous caller. These deletes use synchronize_rcu, but this is not permitted in some of the contexts where this function may be called. During packet recv, the caller may be in a rcu read critical section and have preemption disabled. An example stack: BUG: scheduling while atomic: swapper/2/0/0x00000302 Call Trace: <IRQ> dump_stack_lvl+0x76/0xa0 dump_stack+0x10/0x20 __schedule_bug+0x64/0x80 schedule_debug.constprop.0+0xdb/0x130 __schedule+0x69/0x6a0 schedule+0x33/0x110 schedule_timeout+0x157/0x170 wait_for_completion+0x88/0x150 __wait_rcu_gp+0x150/0x160 synchronize_rcu+0x12d/0x140 mptcp_pm_nl_append_new_local_addr+0x1bd/0x280 mptcp_pm_nl_get_local_id+0x121/0x160 mptcp_pm_get_local_id+0x9d/0xe0 subflow_check_req+0x1a8/0x460 subflow_v4_route_req+0xb5/0x110 tcp_conn_request+0x3a4/0xd00 subflow_v4_conn_request+0x42/0xa0 tcp_rcv_state_process+0x1e3/0x7e0 tcp_v4_do_rcv+0xd3/0x2a0 tcp_v4_rcv+0xbb8/0xbf0 ip_protocol_deliver_rcu+0x3c/0x210 ip_local_deliver_finish+0x77/0xa0 ip_local_deliver+0x6e/0x120 ip_sublist_rcv_finish+0x6f/0x80 ip_sublist_rcv+0x178/0x230 ip_list_rcv+0x102/0x140 __netif_receive_skb_list_core+0x22d/0x250 netif_receive_skb_list_internal+0x1a3/0x2d0 napi_complete_done+0x74/0x1c0 igb_poll+0x6c/0xe0 [igb] __napi_poll+0x30/0x200 net_rx_action+0x181/0x2e0 handle_softirqs+0xd8/0x340 __irq_exit_rcu+0xd9/0x100 irq_exit_rcu+0xe/0x20 common_interrupt+0xa4/0xb0 </IRQ> This problem seems particularly prevalent if the user advertises an endpoint that has a different external vs internal address. In the case where the external address is advertised and multiple connections already exist, multiple subflow SYNs arrive in parallel which tends to trigger the race during creation of the first local_addr_list entries which have the internal address instead. Fix this problem by switching mptcp_pm_nl_append_new_local_addr to use call_rcu . As part of plumbing this up, make __mptcp_pm_release_addr_entry take a rcu_head which is used by all callers regardless of cleanup method. Cc: [email protected] Fixes: d045b9e ("mptcp: introduce implicit endpoints") Signed-off-by: Krister Johansen <[email protected]>
1 parent e62e41e commit fbb6a80

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

net/mptcp/pm_netlink.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -967,9 +967,15 @@ static bool address_use_port(struct mptcp_pm_addr_entry *entry)
967967
MPTCP_PM_ADDR_FLAG_SIGNAL;
968968
}
969969

970-
/* caller must ensure the RCU grace period is already elapsed */
971-
static void __mptcp_pm_release_addr_entry(struct mptcp_pm_addr_entry *entry)
970+
/*
971+
* Caller must ensure the RCU grace period is already elapsed or call this
972+
* via a RCU callback.
973+
*/
974+
static void __mptcp_pm_release_addr_entry(struct rcu_head *head)
972975
{
976+
struct mptcp_pm_addr_entry *entry;
977+
978+
entry = container_of(head, struct mptcp_pm_addr_entry, rcu_head);
973979
if (entry->lsk)
974980
sock_release(entry->lsk);
975981
kfree(entry);
@@ -1064,8 +1070,7 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet,
10641070

10651071
/* just replaced an existing entry, free it */
10661072
if (del_entry) {
1067-
synchronize_rcu();
1068-
__mptcp_pm_release_addr_entry(del_entry);
1073+
call_rcu(&del_entry->rcu_head, __mptcp_pm_release_addr_entry);
10691074
}
10701075
return ret;
10711076
}
@@ -1450,7 +1455,7 @@ int mptcp_pm_nl_add_addr_doit(struct sk_buff *skb, struct genl_info *info)
14501455
return 0;
14511456

14521457
out_free:
1453-
__mptcp_pm_release_addr_entry(entry);
1458+
__mptcp_pm_release_addr_entry(&entry->rcu_head);
14541459
return ret;
14551460
}
14561461

@@ -1634,7 +1639,7 @@ int mptcp_pm_nl_del_addr_doit(struct sk_buff *skb, struct genl_info *info)
16341639

16351640
mptcp_nl_remove_subflow_and_signal_addr(sock_net(skb->sk), entry);
16361641
synchronize_rcu();
1637-
__mptcp_pm_release_addr_entry(entry);
1642+
__mptcp_pm_release_addr_entry(&entry->rcu_head);
16381643

16391644
return ret;
16401645
}
@@ -1700,7 +1705,7 @@ static void __flush_addrs(struct list_head *list)
17001705
cur = list_entry(list->next,
17011706
struct mptcp_pm_addr_entry, list);
17021707
list_del_rcu(&cur->list);
1703-
__mptcp_pm_release_addr_entry(cur);
1708+
__mptcp_pm_release_addr_entry(&cur->rcu_head);
17041709
}
17051710
}
17061711

net/mptcp/protocol.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ struct mptcp_pm_addr_entry {
252252
u8 flags;
253253
int ifindex;
254254
struct socket *lsk;
255+
struct rcu_head rcu_head;
255256
};
256257

257258
struct mptcp_data_frag {

0 commit comments

Comments
 (0)