From patchwork Tue Feb 23 08:26:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1443422 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=cr8RPOUv; 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 4DlBwL2s4Wz9sSC for ; Tue, 23 Feb 2021 19:26:26 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 50854100EB33C; Tue, 23 Feb 2021 00:26:23 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::632; helo=mail-pl1-x632.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) (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 06ACF100EB33B for ; Tue, 23 Feb 2021 00:26:22 -0800 (PST) Received: by mail-pl1-x632.google.com with SMTP id 17so6071472pli.10 for ; Tue, 23 Feb 2021 00:26:22 -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=5tpF+1d87GbFfc1qpkJxOY7Hq8J3DyyvAy+XD9gg7b0=; b=cr8RPOUvc+yp14Fohp6Ao9SKiiTLbcRnA6YmRAPkcy+sQmpr7GT48D/R/EUleaierv TXX1SdOjoT4XPe73H+ZTpfYKWWSmiauAx8711xp1mN14yemi8I4VbM3JGHpwuDkwtdNI s1wsTQMdCvzHFootMJURZU+fWmnfliVRjmvbcWWuEoF3VWmuD3dcwukhhoM2tMvQuXdm pvCm4TeaBW0LHSxZMJ+P93b/kBHCuoR7ZWtzGeAFH10rHOWqz+1pF5fD3N7ZZocT8ZHx FyTyiHzW7jsHpe7xHv3NnqBd1jFHfyf+bNjuKJAgxQP1Ay4yQFZ1Rva7FbE6E/Tf0qRP /ypA== 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=5tpF+1d87GbFfc1qpkJxOY7Hq8J3DyyvAy+XD9gg7b0=; b=gQrnbyceBzM3M19lfJ7kmaKodnSn96U7KhSI2CSD1O3InTTjY4DSro9xzFaOXEepI3 vCF3SohHEd8PqnkirRWxWr51MJkdYyggbXTVXPhF3c6p/TfCvrnpZRsQAuV4y/KfjHzC EwfG9gKkbAOziAfO/m4/9UVnszayd216nZC2mMNQDELfL3twmNV5Nf1pGIjSEGEnn2EK p8HBv79AfqRLPIqEmSsypJOKQLTTlvPLxQQqaRuVj2oL9dqmHOgrTzfseBN1NrE8JSKa xxGEr96bYv1EXHAh+yYVu9lyKl90I11hggIsEC3/DJOd5oRDpJJ50WwAVyHCDXPJhrTS f3ZQ== X-Gm-Message-State: AOAM533R1dFR0fn3WLDQi6q3m1+yevnY/aAKfsFS0paz2uob4OLiNsJH UICa2WHHiMcPqBQKKS6K1iy75+DWlBIJJA== X-Google-Smtp-Source: ABdhPJxXUyHMCDRm483UBsIaWROx8PIuQpPgqU4FWZMqnrUvTKGhNKeg0AxqLPPGZ6YBjEB+29u9zA== X-Received: by 2002:a17:90a:c004:: with SMTP id p4mr16612632pjt.231.1614068781324; Tue, 23 Feb 2021 00:26:21 -0800 (PST) Received: from localhost ([43.224.245.180]) by smtp.gmail.com with ESMTPSA id z28sm10129189pfr.38.2021.02.23.00.26.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 00:26:20 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Tue, 23 Feb 2021 16:26:12 +0800 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Message-ID-Hash: AU524FQE7ONNEVDDKRZ3BDPB7YMG4FIA X-Message-ID-Hash: AU524FQE7ONNEVDDKRZ3BDPB7YMG4FIA 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 v2 mptcp-next 1/3] 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 type to identify it's now removing an address or a subflow. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 89 ++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 50 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 492cb0338e8d..85417b0e73fe 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -592,47 +592,76 @@ 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) +enum rm_type { + RM_ADDR, + RM_SUBFLOW, +}; + +static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk, + struct mptcp_rm_list rm_list, + enum rm_type 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", type == RM_ADDR ? "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 (type == RM_ADDR) + 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", + type == RM_ADDR ? "address" : "subflow", 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.add_addr_accepted--; - msk->pm.subflows--; - WRITE_ONCE(msk->pm.accept_addr, true); + if (type == RM_ADDR) { + msk->pm.add_addr_accepted--; + 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), MPTCP_MIB_RMADDR); + } else if (type == RM_SUBFLOW) { + msk->pm.local_addr_used--; + msk->pm.subflows--; + + __MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMSUBFLOW); + } break; } } } +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, RM_ADDR); +} + +void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, struct mptcp_rm_list rm_list) +{ + mptcp_pm_nl_rm_addr_or_subflow(msk, rm_list, RM_SUBFLOW); +} + void mptcp_pm_nl_work(struct mptcp_sock *msk) { struct mptcp_pm_data *pm = &msk->pm; @@ -666,46 +695,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, 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); - - break; - } - } -} - static bool address_use_port(struct mptcp_pm_addr_entry *entry) { return (entry->addr.flags & From patchwork Tue Feb 23 08:26:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1443423 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=Akx+OyQp; 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 4DlBwP0S53z9sSC for ; Tue, 23 Feb 2021 19:26:28 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 60562100EB340; Tue, 23 Feb 2021 00:26:27 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::631; helo=mail-pl1-x631.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) (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 BE1B4100EB33D for ; Tue, 23 Feb 2021 00:26:25 -0800 (PST) Received: by mail-pl1-x631.google.com with SMTP id k22so9378904pll.6 for ; Tue, 23 Feb 2021 00:26:25 -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=8+m5YCnmPOSkIvkhDfRmwD/VX3IbaU6wbwhRiH3daBE=; b=Akx+OyQpVROrqZfA4Rdn5IWMEAx33mb5zA1Hdn4pcgYQ2IHn+9MZRgQaaPVspSJAQP gAInYESk9lWGSP6lpayY66wCnrQXWtiNxCe4+6NIHSsCKMl+yPZIyf4GdBk/U0KWmhkI tq58HDlF80o//lQsN0X+LINdcnwy1NGkZ7LVAEg5eMo6zJ4eZ5REs5X9WZTFTt9qxjCa XYF+b4WBmnesMD6sfzBz/7JYRSuK3AnzPRxSNH+nZ2E2B7vHggz+Fu3hrVM5rkvzvAOA vlcnxS2nug805LsxGJ6HB25sYPd9p75owyWLKAlbhHPkO+KL9v7fRa1nIivPRxBHx67l e4Yw== 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=8+m5YCnmPOSkIvkhDfRmwD/VX3IbaU6wbwhRiH3daBE=; b=SGWhwLeKcl5pqkcvCaZub2tjJL8WTBPQaSqKju4htzEqe02SUeN2Pl/ekxOdgP88fy r5sGRyo06/sBx9zGzD5WmP0rfIrIPzAHKOBgF8xBwmTgIgg/jiWyk5s1Aebkt+6v7y0E DqNRSIvkxYcW2IoJkvVvvhgyjD3k14s8wUwlivHCMgQOIWO38QhAiWVLCDfTHAHK0O0D heZk4DN+QKUIVc77+cD9MjbuKU3Zu3yXw8q27lvcEKKj2NYxQoo8na1DpYT8TKsAvuhN YggYyZTeLlNtFxqZEenDxs4KgNTxyhHxL+VO4NZnwY+H14OMUWpGl9QyQS6Fbh425L34 pxOA== X-Gm-Message-State: AOAM532mJ+eKVUcSkV+zDty1lpKpwQ+5ZB+5RZ8DTiEeFl0Ob1AhulT+ 06AWqdOqR3Jp9H+UzTb9JSU9aSBX9lNKXA== X-Google-Smtp-Source: ABdhPJwiLw6wfxCrwcaaS/zmySC+mvODplycbU12/9cI0My7JEGFNshYk6tU3OhX6Rj2lNKDUnsm2w== X-Received: by 2002:a17:90b:30c9:: with SMTP id hi9mr28629947pjb.81.1614068785037; Tue, 23 Feb 2021 00:26:25 -0800 (PST) Received: from localhost ([43.224.245.180]) by smtp.gmail.com with ESMTPSA id x14sm6492018pfm.207.2021.02.23.00.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 00:26:24 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Tue, 23 Feb 2021 16:26:13 +0800 Message-Id: <25ac6aa2d37f0a06f0c6df69419bfe707bf90fc5.1614068181.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Message-ID-Hash: 6NPGEZBA5NYEKVUHCC722TEBPN4M7ZN7 X-Message-ID-Hash: 6NPGEZBA5NYEKVUHCC722TEBPN4M7ZN7 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 v2 mptcp-next 2/3] mptcp: skip closing the initial subsocket List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: If the removing address id is 0, skip invoking mptcp_close_ssk to close the initial subsocket. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 85417b0e73fe..b5cee3c66e5c 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -631,7 +631,8 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp_sock *msk, type == RM_ADDR ? "address" : "subflow", i, rm_list.ids[i]); spin_unlock_bh(&msk->pm.lock); mptcp_subflow_shutdown(sk, ssk, how); - mptcp_close_ssk(sk, ssk, subflow); + if (rm_list.ids[i]) + mptcp_close_ssk(sk, ssk, subflow); spin_lock_bh(&msk->pm.lock); if (type == RM_ADDR) { From patchwork Tue Feb 23 08:26:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 1443424 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=smWEAsHt; 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 4DlBwT2pVtz9sSC for ; Tue, 23 Feb 2021 19:26:33 +1100 (AEDT) Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6BCED100EB33C; Tue, 23 Feb 2021 00:26:31 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::52e; helo=mail-pg1-x52e.google.com; envelope-from=geliangtang@gmail.com; receiver= Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) (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 0A979100EB33A for ; Tue, 23 Feb 2021 00:26:28 -0800 (PST) Received: by mail-pg1-x52e.google.com with SMTP id e6so2278457pgk.5 for ; Tue, 23 Feb 2021 00:26:28 -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=vsPtI60/lcOEBVVSA1ecXCCWw0Z8xKY7q841AqjUPes=; b=smWEAsHt8EImit8cUCLqeyn7jqEtWF6eAsf+NqGRo9e39uptm4CLLEa9WmXMq2yB3K XLAnv2rMH26dXqCDpVavs/4uyxPGGjeqnzUL9PTegViRv/dBEd6VceW5vaB3VXdPteq9 tZNn0ZnTI6O4VTv2HKkLlEwzq72kjAgseFEWbN7XMs2odW7Lnx0bsTEZxnU6IdpuQ1LM DLaCKkGnn9Zoe8BySaWixryZc6Z+BwETFK7k0v3/sx0N7jnY6y5/sKaulU0q46f4NsWk 3kAY86PdpjCZpGumHUa7/Hh0vkWZlxa7eM5grtcNCNE+nkDC7kJqWljYdUd1HGyYZbrM MAVQ== 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=vsPtI60/lcOEBVVSA1ecXCCWw0Z8xKY7q841AqjUPes=; b=JuA8XOQbYoU18LdY5qB82wVRSv9kJsqTajbFj/PnfqNcY2gD+A92ALLEEfaa3cIglV rIcd5U346yxMzqdr6G7c8AZ1VnlKVyvtlxG+G2ImCLSJqKqQ4P5amemsWrqaVKgnKlqU Zq6yM1l+MxDM2g1kjFBaoIMWGP+J8pBOfQicP2K404mvIrJE3ZAKasJaREgN4xJ2tvEM bOrgM0IHi9o3BiNm/dhN3DHuLQ2IGILbhQZcilL+6eRErDBu5cDqS8Kdf1immvAA75D6 bYjwG9XQq+xMbtYIuiQFUKp/jHKkVkuXzTdxGsSyFjW78rlOo3WuEWoK0EzKg3k2VdQH zT/Q== X-Gm-Message-State: AOAM530mzzilR4flCUlAwV4EAZOppRBP927qyeV4NYKJEGVbiAOc7qja fMGXu548kVl2hauogbIt+RvOzLfg0RfzuA== X-Google-Smtp-Source: ABdhPJwnqCW3aE9h5g9Qmr8GL9KfgbGfoN3zT9oCKcBGUunj4FwqssNOk7rsiWFon8ZNYKj1UDeIXQ== X-Received: by 2002:a63:214e:: with SMTP id s14mr23292743pgm.101.1614068788345; Tue, 23 Feb 2021 00:26:28 -0800 (PST) Received: from localhost ([43.224.245.180]) by smtp.gmail.com with ESMTPSA id 3sm2234233pjk.26.2021.02.23.00.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 00:26:27 -0800 (PST) From: Geliang Tang To: mptcp@lists.01.org Date: Tue, 23 Feb 2021 16:26:14 +0800 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: <25ac6aa2d37f0a06f0c6df69419bfe707bf90fc5.1614068181.git.geliangtang@gmail.com> References: <25ac6aa2d37f0a06f0c6df69419bfe707bf90fc5.1614068181.git.geliangtang@gmail.com> MIME-Version: 1.0 Message-ID-Hash: BLVIJIWKYCREOD4BRHYTR2DAMPZZ7AEW X-Message-ID-Hash: BLVIJIWKYCREOD4BRHYTR2DAMPZZ7AEW 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 v2 mptcp-next 3/3] DO-NOT-MERGE: mptcp: remove id 0 test List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Just for test. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 2 ++ tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index b5cee3c66e5c..72c16e807bf6 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1228,6 +1228,8 @@ static void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, } } + alist.ids[alist.nr++] = 0; + if (alist.nr) { spin_lock_bh(&msk->pm.lock); mptcp_pm_remove_addr(msk, alist); diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 62f4fb046645..5f7793b0e252 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -957,7 +957,7 @@ remove_tests() 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 + chk_rm_nr 3 2 # subflows flush reset @@ -968,7 +968,7 @@ remove_tests() 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" 3 3 3 - chk_rm_nr 3 3 + chk_rm_nr 4 3 # addresses flush reset @@ -980,7 +980,7 @@ remove_tests() run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow chk_join_nr "flush addresses" 3 3 3 chk_add_nr 3 3 - chk_rm_nr 3 3 invert + chk_rm_nr 4 3 invert # invalid addresses flush reset @@ -992,7 +992,7 @@ remove_tests() run_tests $ns1 $ns2 10.0.1.1 0 -8 0 slow chk_join_nr "flush invalid addresses" 1 1 1 chk_add_nr 3 3 - chk_rm_nr 3 1 invert + chk_rm_nr 4 1 invert } add_tests()