remove address when netlink flush addrs and testcase
Subsystems (3)
Geliang Tang
cover remove address when netlink flush addrs and testcase
This patchset removes address when netlink do flush addrs command, and adds the testcase for flush addrs command.
Geliang Tang (2):
mptcp: remove address when netlink flush addrs
selftests: mptcp: add the flush addrs testcase
net/mptcp/pm_netlink.c | 15 ++++-- .../testing/selftests/net/mptcp/mptcp_join.sh | 52 +++++++++++++------ 2 files changed, 47 insertions(+), 20 deletions(-)
Signature · 1 line
2.26.2
Geliang Tang
PATCH 1/2 mptcp: remove address when netlink flush addrs
When the PM netlink flushs the addresses, invoke the remove address function mptcp_nl_remove_subflow_and_signal_addr to remove the addresses and the subflows.
--- net/mptcp/pm_netlink.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
net/mptcp/pm_netlink.c +10 -5
@@ -962,13 +962,14 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info)return ret; } -static void __flush_addrs (struct pm_nl_pernet *pernet) +static void __flush_addrs (struct net *net,struct list_head *list) { -while (!list_empty (&pernet->local_addr_list)) { +while (!list_empty (list)) {struct mptcp_pm_addr_entry *cur; - cur =list_entry (pernet->local_addr_list.next, + cur =list_entry (list->next, struct mptcp_pm_addr_entry, list); +mptcp_nl_remove_subflow_and_signal_addr (net, &cur->addr);list_del_rcu (&cur->list);kfree_rcu (cur, rcu); }
@@ -985,11 +986,13 @@ static void __reset_counters(struct pm_nl_pernet *pernet)static int mptcp_nl_cmd_flush_addrs (struct sk_buff *skb,struct genl_info *info) {struct pm_nl_pernet *pernet =genl_info_pm_nl (info); +LIST_HEAD (free_list);spin_lock_bh (&pernet->lock); -__flush_addrs (pernet); +list_splice_init (&pernet->local_addr_list, &free_list);__reset_counters (pernet);spin_unlock_bh (&pernet->lock); +__flush_addrs (sock_net (skb->sk), &free_list);return 0 ; }
@@ -1253,10 +1256,12 @@ static void __net_exit pm_nl_exit_net(struct list_head *net_list)struct net *net;list_for_each_entry (net, net_list, exit_list) { +struct pm_nl_pernet *pernet =net_generic (net, pm_nl_pernet_id); +/* net is removed from namespace list, can't race with * other modifiers */ -__flush_addrs (net_generic (net, pm_nl_pernet_id)); +__flush_addrs (net, &pernet->local_addr_list); } }
Signature · 1 line
2.26.2
Geliang Tang
PATCH 2/2 selftests: mptcp: add the flush addrs testcase
This patch added the flush addrs testcase. In do_transfer, if the number of removing addresses is less than 8, use the del addr command to remove the addresses one by one. If the number is more than 8, use the flush addrs command to remove the addresses.
--- .../testing/selftests/net/mptcp/mptcp_join.sh | 52 +++++++++++++------ 1 file changed, 37 insertions(+), 15 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_join.sh +37 -15
@@ -264,27 +264,37 @@ do_transfer() cpid=$! if [ $rm_nr_ns1 -gt 0 ]; then - counter=1 - sleep 1 + if [ $rm_nr_ns1 -lt 8 ]; then + counter=1 + sleep 1 - while [ $counter -le $rm_nr_ns1 ] - do - ip netns exec ${listener_ns} ./pm_nl_ctl del $counter + while [ $counter -le $rm_nr_ns1 ] + do + ip netns exec ${listener_ns} ./pm_nl_ctl del $counter + sleep 1 + let counter+=1 + done + else sleep 1 - let counter+=1 - done + ip netns exec ${listener_ns} ./pm_nl_ctl flush + fi fi if [ $rm_nr_ns2 -gt 0 ]; then - counter=1 - sleep 1 + if [ $rm_nr_ns2 -lt 8 ]; then + counter=1 + sleep 1 - while [ $counter -le $rm_nr_ns2 ] - do - ip netns exec ${connector_ns} ./pm_nl_ctl del $counter + while [ $counter -le $rm_nr_ns2 ] + do + ip netns exec ${connector_ns} ./pm_nl_ctl del $counter + sleep 1 + let counter+=1 + done + else sleep 1 - let counter+=1 - done + ip netns exec ${connector_ns} ./pm_nl_ctl flush + fi fi wait $cpid
@@ -684,7 +694,7 @@ ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal ip netns exec $ns2 ./pm_nl_ctl limits 1 3 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow -run_tests $ns1 $ns2 10.0.1.1 1 +run_tests $ns1 $ns2 10.0.1.1 0 chk_join_nr "multiple flows, signal, link failure" 3 3 3 chk_add_nr 1 1
@@ -749,6 +759,18 @@ chk_join_nr "remove subflows and signal" 3 3 3 chk_add_nr 1 1 chk_rm_nr 2 2 +# subflows and signal, flush +reset +ip netns exec $ns1 ./pm_nl_ctl limits 0 3 +ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal +ip netns exec $ns2 ./pm_nl_ctl limits 1 3 +ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow +ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow +run_tests $ns1 $ns2 10.0.1.1 0 8 8 slow +chk_join_nr "flush subflows and signal" 3 3 3 +chk_add_nr 1 1 +chk_rm_nr 2 2 + # subflow IPv6 reset ip netns exec $ns1 ./pm_nl_ctl limits 0 1
Signature · 1 line
2.26.2