From patchwork Wed Mar 3 13:13:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1446635 X-Patchwork-Delegate: mathew.j.martineau@linux.intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=198.145.21.10; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mB3Dn/AJ; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DrDw24Cprz9sPf for ; Thu, 4 Mar 2021 00:13:37 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3DB53100EB333; Wed, 3 Mar 2021 05:13:35 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::62e; helo=mail-pl1-x62e.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id F1B0B100EB332 for ; Wed, 3 Mar 2021 05:13:31 -0800 (PST) Received: by mail-pl1-x62e.google.com with SMTP id p5so14024928plo.4 for ; Wed, 03 Mar 2021 05:13:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cKmKdUL9WFpzf7z0QgxF9eAqCqqeV8ytl4yvIzPWVrU=; b=mB3Dn/AJz4vnXbVyPZ71l6XQRZf7C/I8eDaQgsDKd/S/5AGGzi4kMZWCuXtsRPTwo9 1fdyNgkfhn4a9E8/NE0i14AqpkyHpjiwsPFRgE0MzoYsGjs5zMjItx4AreLDygJPmj/L vcns2Eoz5L/cCvN0CRYFgcgUO7HjUwidYIRDqBfLIEw5Jjj4Zv4nBpNvyoL14A8IFLcb 6I82XB2sjHU4py3nkNZmWpyIVV1HpWSTrTEy/84mg77Ne7Tzz8o1pyE2+HAyWbihlD0q 3lqMKdyCX7YY9bhpEj3FidK3uJ1zJNsrJV/QRt0IDGMycTZ9y8og37GanQNwq5IWcbUb 8hjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cKmKdUL9WFpzf7z0QgxF9eAqCqqeV8ytl4yvIzPWVrU=; b=LEQUtenjhI9J+jhIUSfX1Zp0CSHu4oE5h3oqFTXTIyVkIZZ8IhVROemYF+uG7Tys9J UNEfQtUpz9ktNGOxbOs5DbsagQ3BqP2VunthE6IPRTmWYdSTZUMZNrvdRSmRD3b6qZj3 nKbPxXf6j58zYyRMkL56frMVVlnXWZv2GEBCL04bPJENUhRpu5NKsKBLLDR49GaDuk8O CPD0sabP5575mlagslOdiuCjXzBbhk3ByMxWNNopw49WLqMG3/0dEfjP2XoSmoKonCXj z5roXdCc9LyUKqWbT6ean+UASEOfrMpL8qwxhX4LF93gcMsKqIXWKKfmph176uQB23PP g3jw== X-Gm-Message-State: AOAM531lqjfhiEeySsuJMZOF6lEedZeSbpF7MtGR1Dob2MuGiFcAPqGF sTvKkYlU/vgx10MCJCe3aBDjfciuGlaklA== X-Google-Smtp-Source: ABdhPJz9wO/3wFBgBEZgLTk/MsaJmifN1vVVdSC5EOkupQmLtviyjDIiOs4xsgwAWNTQFGvD/8fLtA== X-Received: by 2002:a17:902:9304:b029:e4:12f4:bdb0 with SMTP id bc4-20020a1709029304b02900e412f4bdb0mr2749562plb.55.1614777210794; Wed, 03 Mar 2021 05:13:30 -0800 (PST) Received: from localhost ([209.9.72.213]) by smtp.gmail.com with ESMTPSA id i7sm6740757pjs.1.2021.03.03.05.13.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 05:13:30 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Wed, 3 Mar 2021 21:13:16 +0800 Message-Id: <3e2dc12697da18322648e21f245c0072871c1acd.1614776769.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Message-ID-Hash: ZHXX3DMML42XRRTJL4C3HG3JO74ZCTKS X-Message-ID-Hash: ZHXX3DMML42XRRTJL4C3HG3JO74ZCTKS X-MailFrom: geliangtang@gmail.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address CC: Geliang Tang X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [MPTCP][PATCH v5 mptcp-next 1/5] mptcp: avoid passing rm_list as a struct List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: This patch changed the type of argument rm_list from "struct mptcp_rm_list rm_list" to "const struct mptcp_rm_list *rm_list". Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang --- net/mptcp/options.c | 4 ++-- net/mptcp/pm.c | 23 ++++++++++++----------- net/mptcp/pm_netlink.c | 21 +++++++++++---------- net/mptcp/protocol.h | 16 +++++++++------- 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index f95643d820fe..9600b4f4caa5 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -698,7 +698,7 @@ static bool mptcp_established_options_rm_addr(struct sock *sk, !(mptcp_pm_rm_addr_signal(msk, remaining, &rm_list))) return false; - len = mptcp_rm_addr_len(rm_list); + len = mptcp_rm_addr_len(&rm_list); if (len < 0) return false; if (remaining < len) @@ -1076,7 +1076,7 @@ void mptcp_incoming_options(struct sock *sk, struct sk_buff *skb) } if (mp_opt.rm_addr) { - mptcp_pm_rm_addr_received(msk, mp_opt.rm_list); + mptcp_pm_rm_addr_received(msk, &mp_opt.rm_list); mp_opt.rm_addr = 0; } diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 51534bed5dbe..966942d1013f 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -39,26 +39,26 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, return 0; } -int mptcp_pm_remove_addr(struct mptcp_sock *msk, struct mptcp_rm_list rm_list) +int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list) { u8 rm_addr = READ_ONCE(msk->pm.addr_signal); - pr_debug("msk=%p, rm_list_nr=%d", msk, rm_list.nr); + pr_debug("msk=%p, rm_list_nr=%d", msk, rm_list->nr); if (rm_addr) { pr_warn("addr_signal error, rm_addr=%d", rm_addr); return -EINVAL; } - msk->pm.rm_list_tx = rm_list; + msk->pm.rm_list_tx = *rm_list; rm_addr |= BIT(MPTCP_RM_ADDR_SIGNAL); WRITE_ONCE(msk->pm.addr_signal, rm_addr); return 0; } -int mptcp_pm_remove_subflow(struct mptcp_sock *msk, struct mptcp_rm_list rm_list) +int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list) { - pr_debug("msk=%p, rm_list_nr=%d", msk, rm_list.nr); + pr_debug("msk=%p, rm_list_nr=%d", msk, rm_list->nr); spin_lock_bh(&msk->pm.lock); mptcp_pm_nl_rm_subflow_received(msk, rm_list); @@ -219,19 +219,20 @@ void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk) mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_SEND_ACK); } -void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, struct mptcp_rm_list rm_list) +void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, + const struct mptcp_rm_list *rm_list) { struct mptcp_pm_data *pm = &msk->pm; u8 i; - pr_debug("msk=%p remote_ids_nr=%d", msk, rm_list.nr); + pr_debug("msk=%p remote_ids_nr=%d", msk, rm_list->nr); - for (i = 0; i < rm_list.nr; i++) - mptcp_event_addr_removed(msk, rm_list.ids[i]); + for (i = 0; i < rm_list->nr; i++) + mptcp_event_addr_removed(msk, rm_list->ids[i]); spin_lock_bh(&pm->lock); mptcp_pm_schedule_work(msk, MPTCP_PM_RM_ADDR_RECEIVED); - pm->rm_list_rx = rm_list; + pm->rm_list_rx = *rm_list; spin_unlock_bh(&pm->lock); } @@ -284,7 +285,7 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, if (!mptcp_pm_should_rm_signal(msk)) goto out_unlock; - len = mptcp_rm_addr_len(msk->pm.rm_list_tx); + len = mptcp_rm_addr_len(&msk->pm.rm_list_tx); if (len < 0) { WRITE_ONCE(msk->pm.addr_signal, 0); goto out_unlock; diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 328fdcc35bfd..fa1dd6b8ec2f 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -668,31 +668,32 @@ void mptcp_pm_nl_work(struct mptcp_sock *msk) spin_unlock_bh(&msk->pm.lock); } -void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, struct mptcp_rm_list rm_list) +void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, + const struct mptcp_rm_list *rm_list) { struct mptcp_subflow_context *subflow, *tmp; struct sock *sk = (struct sock *)msk; u8 i; - pr_debug("subflow rm_list_nr %d", rm_list.nr); + pr_debug("subflow rm_list_nr %d", rm_list->nr); msk_owned_by_me(msk); - if (!rm_list.nr) + if (!rm_list->nr) return; if (list_empty(&msk->conn_list)) return; - for (i = 0; i < rm_list.nr; i++) { + for (i = 0; i < rm_list->nr; i++) { list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) { struct sock *ssk = mptcp_subflow_tcp_sock(subflow); int how = RCV_SHUTDOWN | SEND_SHUTDOWN; - if (rm_list.ids[i] != subflow->local_id) + if (rm_list->ids[i] != subflow->local_id) continue; - pr_debug(" -> subflow rm_list_ids[%d]=%u", i, rm_list.ids[i]); + pr_debug(" -> subflow rm_list_ids[%d]=%u", i, rm_list->ids[i]); spin_unlock_bh(&msk->pm.lock); mptcp_subflow_shutdown(sk, ssk, how); mptcp_close_ssk(sk, ssk, subflow); @@ -1110,7 +1111,7 @@ static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk, ret = remove_anno_list_by_saddr(msk, addr); if (ret || force) { spin_lock_bh(&msk->pm.lock); - mptcp_pm_remove_addr(msk, list); + mptcp_pm_remove_addr(msk, &list); spin_unlock_bh(&msk->pm.lock); } return ret; @@ -1140,7 +1141,7 @@ static int mptcp_nl_remove_subflow_and_signal_addr(struct net *net, remove_subflow = lookup_subflow_by_saddr(&msk->conn_list, addr); mptcp_pm_remove_anno_addr(msk, addr, remove_subflow); if (remove_subflow) - mptcp_pm_remove_subflow(msk, list); + mptcp_pm_remove_subflow(msk, &list); release_sock(sk); next: @@ -1242,11 +1243,11 @@ static void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, if (alist.nr) { spin_lock_bh(&msk->pm.lock); - mptcp_pm_remove_addr(msk, alist); + mptcp_pm_remove_addr(msk, &alist); spin_unlock_bh(&msk->pm.lock); } if (slist.nr) - mptcp_pm_remove_subflow(msk, slist); + mptcp_pm_remove_subflow(msk, &slist); } static void mptcp_nl_remove_addrs_list(struct net *net, diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 4bf8536b7406..d9b403c4b338 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -661,7 +661,8 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, void mptcp_pm_add_addr_echoed(struct mptcp_sock *msk, struct mptcp_addr_info *addr); void mptcp_pm_add_addr_send_ack(struct mptcp_sock *msk); -void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, struct mptcp_rm_list rm_list); +void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, + const struct mptcp_rm_list *rm_list); void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup); int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, struct mptcp_addr_info *addr, @@ -678,8 +679,8 @@ mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk, int mptcp_pm_announce_addr(struct mptcp_sock *msk, const struct mptcp_addr_info *addr, bool echo); -int mptcp_pm_remove_addr(struct mptcp_sock *msk, struct mptcp_rm_list rm_list); -int mptcp_pm_remove_subflow(struct mptcp_sock *msk, struct mptcp_rm_list rm_list); +int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list); +int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list); void mptcp_event(enum mptcp_event_type type, const struct mptcp_sock *msk, const struct sock *ssk, gfp_t gfp); @@ -725,12 +726,12 @@ static inline unsigned int mptcp_add_addr_len(int family, bool echo, bool port) return len; } -static inline int mptcp_rm_addr_len(struct mptcp_rm_list rm_list) +static inline int mptcp_rm_addr_len(const struct mptcp_rm_list *rm_list) { - if (rm_list.nr == 0 || rm_list.nr >= MPTCP_RM_IDS_MAX) + if (rm_list->nr == 0 || rm_list->nr >= MPTCP_RM_IDS_MAX) return -EINVAL; - return TCPOLEN_MPTCP_RM_ADDR_BASE + roundup(rm_list.nr - 1, 4) + 1; + return TCPOLEN_MPTCP_RM_ADDR_BASE + roundup(rm_list->nr - 1, 4) + 1; } bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, unsigned int remaining, @@ -742,7 +743,8 @@ int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); void __init mptcp_pm_nl_init(void); void mptcp_pm_nl_data_init(struct mptcp_sock *msk); void mptcp_pm_nl_work(struct mptcp_sock *msk); -void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, struct mptcp_rm_list rm_list); +void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, + const struct mptcp_rm_list *rm_list); int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); unsigned int mptcp_pm_get_add_addr_signal_max(struct mptcp_sock *msk); unsigned int mptcp_pm_get_add_addr_accept_max(struct mptcp_sock *msk); From patchwork Wed Mar 3 13:13:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1446637 X-Patchwork-Delegate: mathew.j.martineau@linux.intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=198.145.21.10; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=rOT+KXq6; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DrDw5502tz9sPf for ; Thu, 4 Mar 2021 00:13:41 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 3DAA6100EB330; Wed, 3 Mar 2021 05:13:40 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::633; helo=mail-pl1-x633.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 576B1100EB335 for ; Wed, 3 Mar 2021 05:13:35 -0800 (PST) Received: by mail-pl1-x633.google.com with SMTP id d8so3596118plg.10 for ; Wed, 03 Mar 2021 05:13:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3xNzTZQC+vgzz1F7RF3hcLXCno4SdVTKBb8BBF3At80=; b=rOT+KXq682FCvP54GtKojxbV+kCrQ3fc/OD6YynD1JPwwKN1btXO1bqwOG7fBQoFU5 fh1n9CkRGZl3Ggw4fqm0YsiTEmj5/F/p+0EV+oNAiUt/jJu+xyKB2X/MPY7ZlOWkglFu tM1G97npQnNErPB8VqfxDkTZGuJHowtZhpLFSr8s3pITpTeXWVYjJkygBJQSSq+X7Kzp DWTzfj6wrqkq01rNe9EIoWt7OOT2wfF5/Yu6eWJ7e0B3iNhZ4PktI07z+atoNVDVPfq2 27F1OC34iaigLMbC+ZwH/6kTbatbg0dlTwyEOW7zLAdnPh9I1sFVkywZxcs91cjHs5E6 wGSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3xNzTZQC+vgzz1F7RF3hcLXCno4SdVTKBb8BBF3At80=; b=DjKN9WA2lKZ9aYcOrkCHf0vY63KBlY9b9mmJugoLnSgnLABI73y+BM/SG0rH8Pk2BM GwWLXtsYc0Ib6GlZRowjhk1IToJwVREdUIge/SKgst2uohQvV4pNOS6/ybAuEFaOQh0u DjY9nhXdBT6BjrRps/lYVVUnekifTQ7JYMjzst7r85v8OTb+QpAh+kO4UC7hnG6azYNm ucB9Kz3fFaOXSaoVpqIHDlk7nl6xHQ9IkFXYyXCZb3gjaQoChwSpjWR9EifE8ApYdt1h TY3STzyFXdv7ghxrunIsno+swHmUKqluIRtVAyJGwoGIsSND9Ez+4f3htZ5+w5lOiWUR hoRw== X-Gm-Message-State: AOAM532rMY8g33zKW1GtquyjLRukiP71fod+hyNwIvFn7o0cc/qNnR9R +AkLgpMooak24S36JdSm0gSp8q6CJ4Cq7w== X-Google-Smtp-Source: ABdhPJyulPAedF2mhJ4B64eWKopuKlpPEMIirn9ZJGJAmYfyOxJvL0jZAosH4QSJssBF5sf8/HWmyg== X-Received: by 2002:a17:90b:354e:: with SMTP id lt14mr9581593pjb.216.1614777214649; Wed, 03 Mar 2021 05:13:34 -0800 (PST) Received: from localhost ([209.9.72.213]) by smtp.gmail.com with ESMTPSA id g8sm26189896pfu.13.2021.03.03.05.13.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 05:13:33 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Wed, 3 Mar 2021 21:13:17 +0800 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: <3e2dc12697da18322648e21f245c0072871c1acd.1614776769.git.geliangtang@gmail.com> References: <3e2dc12697da18322648e21f245c0072871c1acd.1614776769.git.geliangtang@gmail.com> MIME-Version: 1.0 Message-ID-Hash: FLXKWWKECCLYCUHCNZEI26OCCQKMZJVT X-Message-ID-Hash: FLXKWWKECCLYCUHCNZEI26OCCQKMZJVT X-MailFrom: geliangtang@gmail.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address CC: Geliang Tang X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [MPTCP][PATCH v5 mptcp-next 2/5] mptcp: remove all subflows involving id 0 address List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: There's only one subflow involving the non-zero id address, but there may be multi subflows involving the id 0 address. Here's an example: local_id=0, remote_id=0 local_id=1, remote_id=0 local_id=0, remote_id=1 If the removing address id is 0, all the subflows involving the id 0 address need to be removed. In mptcp_pm_nl_rm_addr_received/mptcp_pm_nl_rm_subflow_received, the "break" prevents the iteration to the next subflow, so this patch dropped them. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index fa1dd6b8ec2f..12e75ad29dc4 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -629,8 +629,6 @@ static void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk) WRITE_ONCE(msk->pm.accept_addr, true); __MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMADDR); - - break; } } } @@ -703,8 +701,6 @@ void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, msk->pm.subflows--; __MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMSUBFLOW); - - break; } } } From patchwork Wed Mar 3 13:13:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1446638 X-Patchwork-Delegate: mathew.j.martineau@linux.intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=2001:19d0:306:5::1; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=EwORGzHo; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DrDw76xsqz9sPf for ; Thu, 4 Mar 2021 00:13:43 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 478DB100EB337; Wed, 3 Mar 2021 05:13:42 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::1029; helo=mail-pj1-x1029.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 4B6D8100EB335 for ; Wed, 3 Mar 2021 05:13:40 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id jx13so4139689pjb.1 for ; Wed, 03 Mar 2021 05:13:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HmjBF4ceAf8z3G3kt8jZ12BMC2XrqD5bqHbEh8jpSWs=; b=EwORGzHomrKufyl14q6HYELh9vOn/OZ5D5wikXm4sWcQy3ptf5wP+F0TbkmkVaVRo0 mphV3feAW/WP1KhbydQcmnyyqhyzeuhX4tICCCJ42kOVudspYx1DGP909261qxXvF4oO JcY/T91JsvQIi6HKsJeF/u/TyCKE6x3NRmeMrL6kI3KLRuL6CHQIFcABV3dIe86pa8EC vKtTtUbmdTofvXyD9jtrFwB52nZzbk/a6l0v/joRN1k4NqcSiqDGjc+8rMdWP/Bv0UyF 7VSz6lBHfOlGplt45a2QEnJWzEt6Yv0POBhq2gvQKkJPRWKvR1rmLXqCNpgRgaLOY0So 8mOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HmjBF4ceAf8z3G3kt8jZ12BMC2XrqD5bqHbEh8jpSWs=; b=jhnqHFuIUV3PCVtQyY8IPmCEY/GLXmljsFiW9TmRNCOGb5uWxcwldRFCYOLBxKGJpM Wy8CZXUgUlMgU3lMaw8/yIilsk/rI344xBypEoRL6OrS7CL0mVL7cbfzIX+vYGgwlkcH Md44/j4ybBEPCDt+Ju7cv7QF70eDE3kBG3eEKGWuQ5KTZrVcRQ5wyfWMJpSsX82OM4RF CYzvDileiXu9t76QZVcpL8yAcyzgpUDpTUNyMWiYzAH2B+Bb8ISVymUrWyntzaZefmvv I/x9MhOy4epOUXjonUE6GxXyaPeu7JF8BnThSbas1rT4Ayv8Q/2pe8gBTadDrk5Ad2Pp exjQ== X-Gm-Message-State: AOAM531BfgxTIsD1pxe56v1wbol3tf8yNtGop+aexpbf7YoVXm0h+Kln qF8JBQF2R5riGO2Fpo4nIeFH+ULyiNUtOg== X-Google-Smtp-Source: ABdhPJxDK6pXSHCn85+AJ9QYbzd7xwbVxLVeOaG9YciH4ifsf1/dckfESesqR7gKK0SCER92kJhCiA== X-Received: by 2002:a17:90a:bd97:: with SMTP id z23mr9918073pjr.189.1614777217950; Wed, 03 Mar 2021 05:13:37 -0800 (PST) Received: from localhost ([209.9.72.213]) by smtp.gmail.com with ESMTPSA id 14sm25157061pfo.141.2021.03.03.05.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 05:13:37 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Wed, 3 Mar 2021 21:13:18 +0800 Message-Id: <602b1c215976d27b4a70bc6af5eb02a7e52cb877.1614776769.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: <3e2dc12697da18322648e21f245c0072871c1acd.1614776769.git.geliangtang@gmail.com> MIME-Version: 1.0 Message-ID-Hash: TANV22DFFNS2ALOHQYRLFEB2EMEERIWO X-Message-ID-Hash: TANV22DFFNS2ALOHQYRLFEB2EMEERIWO X-MailFrom: geliangtang@gmail.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address CC: Geliang Tang X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [MPTCP][PATCH v5 mptcp-next 3/5] mptcp: unify RM_ADDR and RM_SUBFLOW receiving List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: There are some duplicate code in mptcp_pm_nl_rm_addr_received and mptcp_pm_nl_rm_subflow_received. This patch unifies them into a new function named mptcp_pm_nl_rm_addr_or_subflow. In it, use the input parameter rm_type to identify it's now removing an address or a subflow. Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 82 +++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 49 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 12e75ad29dc4..2bd61d55186b 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -594,45 +594,68 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, return -EINVAL; } -static void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk) +static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk, + const struct mptcp_rm_list *rm_list, + enum linux_mptcp_mib_field rm_type) { struct mptcp_subflow_context *subflow, *tmp; struct sock *sk = (struct sock *)msk; u8 i; - pr_debug("address rm_list_nr %d", msk->pm.rm_list_rx.nr); + pr_debug("%s rm_list_nr %d", + rm_type == MPTCP_MIB_RMADDR ? "address" : "subflow", rm_list->nr); msk_owned_by_me(msk); - if (!msk->pm.rm_list_rx.nr) + if (!rm_list->nr) return; if (list_empty(&msk->conn_list)) return; - for (i = 0; i < msk->pm.rm_list_rx.nr; i++) { + for (i = 0; i < rm_list->nr; i++) { list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) { struct sock *ssk = mptcp_subflow_tcp_sock(subflow); int how = RCV_SHUTDOWN | SEND_SHUTDOWN; + u8 id = subflow->local_id; + + if (rm_type == MPTCP_MIB_RMADDR) + id = subflow->remote_id; - if (msk->pm.rm_list_rx.ids[i] != subflow->remote_id) + if (rm_list->ids[i] != id) continue; - pr_debug(" -> address rm_list_ids[%d]=%u", i, msk->pm.rm_list_rx.ids[i]); + pr_debug(" -> %s rm_list_ids[%d]=%u local_id=%u remote_id=%u", + rm_type == MPTCP_MIB_RMADDR ? "address" : "subflow", + i, rm_list->ids[i], subflow->local_id, subflow->remote_id); spin_unlock_bh(&msk->pm.lock); mptcp_subflow_shutdown(sk, ssk, how); mptcp_close_ssk(sk, ssk, subflow); spin_lock_bh(&msk->pm.lock); - msk->pm.add_addr_accepted--; + if (rm_type == MPTCP_MIB_RMADDR) { + msk->pm.add_addr_accepted--; + WRITE_ONCE(msk->pm.accept_addr, true); + } else if (rm_type == MPTCP_MIB_RMSUBFLOW) { + msk->pm.local_addr_used--; + } msk->pm.subflows--; - WRITE_ONCE(msk->pm.accept_addr, true); - - __MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMADDR); + __MPTCP_INC_STATS(sock_net(sk), rm_type); } } } +static void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk) +{ + mptcp_pm_nl_rm_addr_or_subflow(msk, &msk->pm.rm_list_rx, MPTCP_MIB_RMADDR); +} + +void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, + const struct mptcp_rm_list *rm_list) +{ + mptcp_pm_nl_rm_addr_or_subflow(msk, rm_list, MPTCP_MIB_RMSUBFLOW); +} + void mptcp_pm_nl_work(struct mptcp_sock *msk) { struct mptcp_pm_data *pm = &msk->pm; @@ -666,45 +689,6 @@ void mptcp_pm_nl_work(struct mptcp_sock *msk) spin_unlock_bh(&msk->pm.lock); } -void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, - const struct mptcp_rm_list *rm_list) -{ - struct mptcp_subflow_context *subflow, *tmp; - struct sock *sk = (struct sock *)msk; - u8 i; - - pr_debug("subflow rm_list_nr %d", rm_list->nr); - - msk_owned_by_me(msk); - - if (!rm_list->nr) - return; - - if (list_empty(&msk->conn_list)) - return; - - for (i = 0; i < rm_list->nr; i++) { - list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) { - struct sock *ssk = mptcp_subflow_tcp_sock(subflow); - int how = RCV_SHUTDOWN | SEND_SHUTDOWN; - - if (rm_list->ids[i] != subflow->local_id) - continue; - - pr_debug(" -> subflow rm_list_ids[%d]=%u", i, rm_list->ids[i]); - spin_unlock_bh(&msk->pm.lock); - mptcp_subflow_shutdown(sk, ssk, how); - mptcp_close_ssk(sk, ssk, subflow); - spin_lock_bh(&msk->pm.lock); - - msk->pm.local_addr_used--; - msk->pm.subflows--; - - __MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMSUBFLOW); - } - } -} - static bool address_use_port(struct mptcp_pm_addr_entry *entry) { return (entry->addr.flags & From patchwork Wed Mar 3 13:13:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1446639 X-Patchwork-Delegate: mathew.j.martineau@linux.intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=198.145.21.10; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=rvxQuqTV; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DrDwB1NNpz9sPf for ; Thu, 4 Mar 2021 00:13:46 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 52193100EB339; Wed, 3 Mar 2021 05:13:44 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::534; helo=mail-pg1-x534.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8C230100EB330 for ; Wed, 3 Mar 2021 05:13:42 -0800 (PST) Received: by mail-pg1-x534.google.com with SMTP id g4so16354483pgj.0 for ; Wed, 03 Mar 2021 05:13:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VhadW/ReLndcz07MRNCBZJk3ludbJ0MGr+4e7LQ80Pc=; b=rvxQuqTV9vUC+KMZ9SdLjCxX2YA/tW+aENJVDnB8cDJiuf0hMNVOFE/2qX/h8pudFN TEREHpiWC8Ojd9spyZxfk/BtSLk0oGpXGvB10FbBt/j30+PW+YjTbyzeKaZik1hdcVkI a+p9FqVUkfhwsvZdIODBxFXR9EyV8122yZFZcEMIW4u8wFK8+mKcnRFIF19mrODTs9Iw Nz7vc6eibRTp0KRsJBq+PuPPcErmRhazMbZ6dgo/A967B3IMkyxVNZqaj/hAfGxMG4gr 5KScLD1rO/mbs3KqhYwuw02bu5I1bH+RyeW1uPYiVs33S1Im33tU1EfdE8pTTG801QSv NGfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VhadW/ReLndcz07MRNCBZJk3ludbJ0MGr+4e7LQ80Pc=; b=D31YK1GQqqBe2EINqgsD62B9pWybg2faQolzYK9ITAouv7EHsjF5ac9wDYvCN8hPJg UhfCMuO/3dU8iQLi/P/rjlfIkWF67AfCMTmzNLfsjGs+P0LKaHauTE4UDnzLefsEVPar j28k3de6FlR7CAMPJBnsAIt3oZamQqh17Ii6mx9C58pzjAHCHKMf0+CmjkT3otACXj5L ShMHbRXpHSrT/rpX/qeFEqOnYwvVjfiC94JZ9WJywulS2Eup9Xo4xqGlhPfD7aawjD0j FfsoqycDEfvAbNzOUJlHqkwS1a7LrM3IaDuMVpjqjCTaVorkR83ZtoDksAEFjCdIpJf0 loCA== X-Gm-Message-State: AOAM531cfWJ5JuytEOnkZZa9Hvtead/EfqDfCSTEJymb6uvfvNRLefBB z+FIiOTWr251vSSXU+tSPkqGB9jxg421Ng== X-Google-Smtp-Source: ABdhPJxndQtwiLLl0vzsW4b2kEbIL7P3X2qWYdxsiK6BgfDC0FYkIxdItqHUaSHaYk3lDceWm8s+OQ== X-Received: by 2002:a65:610f:: with SMTP id z15mr17776130pgu.360.1614777221767; Wed, 03 Mar 2021 05:13:41 -0800 (PST) Received: from localhost ([209.9.72.213]) by smtp.gmail.com with ESMTPSA id 190sm24841910pfv.155.2021.03.03.05.13.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 05:13:41 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Wed, 3 Mar 2021 21:13:19 +0800 Message-Id: <96af88c9f74f6c75d307d1297d3c7293495b930f.1614776769.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <602b1c215976d27b4a70bc6af5eb02a7e52cb877.1614776769.git.geliangtang@gmail.com> References: <3e2dc12697da18322648e21f245c0072871c1acd.1614776769.git.geliangtang@gmail.com> <602b1c215976d27b4a70bc6af5eb02a7e52cb877.1614776769.git.geliangtang@gmail.com> MIME-Version: 1.0 Message-ID-Hash: IP4KRN2HS6YN55ZYS4YPU463DAIK5KMW X-Message-ID-Hash: IP4KRN2HS6YN55ZYS4YPU463DAIK5KMW X-MailFrom: geliangtang@gmail.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address CC: Geliang Tang X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [MPTCP][PATCH v5 mptcp-next 4/5] mptcp: remove id 0 address List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: This patch added a new function mptcp_nl_remove_id_zero_address to remove the id 0 address. In this function, fill the remove list with the id 0, and pass it to mptcp_pm_remove_addr and mptcp_pm_remove_subflow. Suggested-by: Paolo Abeni Suggested-by: Matthieu Baerts Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 2bd61d55186b..6d04f5f77c61 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1164,6 +1164,33 @@ static void mptcp_pm_free_addr_entry(struct mptcp_pm_addr_entry *entry) } } +static int mptcp_nl_remove_id_zero_address(struct net *net) +{ + struct mptcp_sock *msk; + long s_slot = 0, s_num = 0; + struct mptcp_rm_list list = { .nr = 0 }; + + list.ids[list.nr++] = 0; + + while ((msk = mptcp_token_iter_next(net, &s_slot, &s_num)) != NULL) { + struct sock *sk = (struct sock *)msk; + + if (list_empty(&msk->conn_list)) + goto next; + + lock_sock(sk); + mptcp_pm_remove_addr(msk, &list); + mptcp_pm_remove_subflow(msk, &list); + release_sock(sk); + +next: + sock_put(sk); + cond_resched(); + } + + return 0; +} + static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info) { struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR]; @@ -1176,6 +1203,14 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb, struct genl_info *info) if (ret < 0) return ret; + /* the zero id address is special: the first address used by the msk + * always gets such an id, so different subflows can have different zero + * id addresses. Additionally zero id is not accounted for in id_bitmap. + * Let's use an 'mptcp_rm_list' instead of the common remove code. + */ + if (addr.addr.id == 0) + return mptcp_nl_remove_id_zero_address(sock_net(skb->sk)); + spin_lock_bh(&pernet->lock); entry = __lookup_addr_by_id(pernet, addr.addr.id); if (!entry) { From patchwork Wed Mar 3 13:13:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1446640 X-Patchwork-Delegate: mathew.j.martineau@linux.intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=2001:19d0:306:5::1; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=QNwxkCE4; dkim-atps=neutral Received: from ml01.01.org (ml01.01.org [IPv6:2001:19d0:306:5::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DrDwF1CNqz9sPf for ; Thu, 4 Mar 2021 00:13:49 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 620FD100EB33A; Wed, 3 Mar 2021 05:13:47 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::102d; helo=mail-pj1-x102d.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0353C100EB337 for ; Wed, 3 Mar 2021 05:13:45 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id t9so4118823pjl.5 for ; Wed, 03 Mar 2021 05:13:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jrSLiS6v3le6L9B6KrXdEs8qv8HoXW8ZKwgFcVT2rmg=; b=QNwxkCE4BdjXUJ38XbWpnI4f8EBxXsQMLYF60oBtPAuia7CMeUA9bXpY9kZLqeEyYL QHbLSO+XPLe9sbbGXjMZwh7tMp5koSKw/0XcMHebCcHCFUbM60T6Y65lGUvvTqZAj8NT 6GNnv7Vh3Dvcx4DXeNPgjSOTPEtOjpPJBJVBtnExkCNqRz908BIzKvEA8ZTobsq25wNE zEBuuOrLRfy5qgiGF8zsP1bBZjtLMVjr3yiudOFaiPHPoIhFK/gSJWR6CSkowzJkO+Oe gl6/JgsQXZ9xB/iGE8dBDZGUElNSGY59yQOXVDw25D5eBV9hMnjzn/dIoaSb0HDG07SU SPSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jrSLiS6v3le6L9B6KrXdEs8qv8HoXW8ZKwgFcVT2rmg=; b=V0zhQQUHSpQAXUTKmvF80fbbaUwVq1wWlBK7oiwvGZiCiE2AHHp7xTCr6u5o5UiqlH Z98nDKH8BVa1uFWNgHaM2woofA3DqbpDMLWVStBkz+OF0tpu/VZ7GZU6Pr2Q+X3xyGiO fi/DSVvJMiTXI9jbe+47TDpTPdqXKGsdg6gwmjV7vLH/RnUcRZEfiiRBq3Eb64FOyEux F4PhJowV3AQ+RQJs/fW9K39vpJS0xDPiTxIAIiarYLeA0Jy0AZi0cNagRkG7gDk956MX Vmpq13CLFb96uU7nB4N+CAHDHw+PPr5xp1/ODchZOISUf35EsjNDY3n9JB0PpVI78BFZ 9+xA== X-Gm-Message-State: AOAM5338BBKRk1zMubS64MIZsoSBluyEoHGtv5Yh7VejRRFFbDBj4fC4 vj+kACnkRAf+nbCi48K5BASCkPHhXm9Avg== X-Google-Smtp-Source: ABdhPJwXvFX9XDzqoeIL/fpmCbUsCHB9Rk30m1DKoI0gz9UtJ/b74TU8SBTusnRkD3gwxJQZHWUvlA== X-Received: by 2002:a17:90b:164c:: with SMTP id il12mr9813374pjb.32.1614777225148; Wed, 03 Mar 2021 05:13:45 -0800 (PST) Received: from localhost ([209.9.72.213]) by smtp.gmail.com with ESMTPSA id d27sm25071690pfq.40.2021.03.03.05.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 05:13:44 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Wed, 3 Mar 2021 21:13:20 +0800 Message-Id: <753a5900e402e2d133bb28a5e4a5190198f39fd8.1614776769.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <96af88c9f74f6c75d307d1297d3c7293495b930f.1614776769.git.geliangtang@gmail.com> References: <3e2dc12697da18322648e21f245c0072871c1acd.1614776769.git.geliangtang@gmail.com> <602b1c215976d27b4a70bc6af5eb02a7e52cb877.1614776769.git.geliangtang@gmail.com> <96af88c9f74f6c75d307d1297d3c7293495b930f.1614776769.git.geliangtang@gmail.com> MIME-Version: 1.0 Message-ID-Hash: A5LBEW47DYC6SJWEVSWS46F75W35DE7Y X-Message-ID-Hash: A5LBEW47DYC6SJWEVSWS46F75W35DE7Y X-MailFrom: geliangtang@gmail.com X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address CC: Geliang Tang X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [MPTCP][PATCH v5 mptcp-next 5/5] selftests: mptcp: remove id 0 address testcases List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: This patch added the testcases for removing the id 0 subflow and the id 0 address. In do_transfer, use the removing addresses number '9' for deleting the id 0 address. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 96379ede5925..471a8870c40d 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -315,9 +315,12 @@ do_transfer() let id+=1 done fi - else + elif [ $rm_nr_ns1 -eq 8 ]; then sleep 1 ip netns exec ${listener_ns} ./pm_nl_ctl flush + elif [ $rm_nr_ns1 -eq 9 ]; then + sleep 1 + ip netns exec ${listener_ns} ./pm_nl_ctl del 0 fi fi @@ -354,9 +357,12 @@ do_transfer() let id+=1 done fi - else + elif [ $rm_nr_ns2 -eq 8 ]; then sleep 1 ip netns exec ${connector_ns} ./pm_nl_ctl flush + elif [ $rm_nr_ns2 -eq 9 ]; then + sleep 1 + ip netns exec ${connector_ns} ./pm_nl_ctl del 0 fi fi @@ -1016,6 +1022,25 @@ remove_tests() chk_join_nr "flush invalid addresses" 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert + + # remove id 0 subflow + reset + ip netns exec $ns1 ./pm_nl_ctl limits 0 1 + ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + run_tests $ns1 $ns2 10.0.1.1 0 0 -9 slow + chk_join_nr "remove id 0 subflow" 1 1 1 + chk_rm_nr 1 1 + + # remove id 0 address + reset + ip netns exec $ns1 ./pm_nl_ctl limits 0 1 + ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + run_tests $ns1 $ns2 10.0.1.1 0 -9 0 slow + chk_join_nr "remove id 0 address" 1 1 1 + chk_add_nr 1 1 + chk_rm_nr 1 1 invert } add_tests()