From nobody Mon Apr 29 15:12:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:84cc:0:0:0:0:0 with SMTP id f70csp330954jai; Thu, 20 Jan 2022 16:35:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJz03+lZE+EiNXH9PauMfPLTNbdHJHIcM7Pht4jzA3j/HOuppiCGuBYBAe4dLQ/V9iSUt9gA X-Received: by 2002:a17:902:d4c3:b0:14a:3575:2843 with SMTP id o3-20020a170902d4c300b0014a35752843mr1609140plg.40.1642725342981; Thu, 20 Jan 2022 16:35:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642725342; cv=none; d=google.com; s=arc-20160816; b=I8baIhKgcKO0k1UQKEj+FiRf2WbvEOBl9ca+Jxvch6VbDNKvh9yLylxtvkNc/L8T3B LJmW74CsJdTbDmKvSt7X8NkdUBCCssnB1AdUXBd5h7Geqk0BCOQaq57LbIEvNvwVcZPF RvILjFTKIZFl61JcnSkJqknmTHWyJmi13glu08KdcjPa+HvKKPNiSjz2S33mfbLbkcp0 RZyLUHqTRkrYlGWY8Xm+EMfVv92jwRqZB6GZW/FSYLxDnfVUh+l5JSbihyXi4Rj/259C oIFos2xXclRceiaO1TIYVnt6hPAWn6Wf5rGz5xuqSFs62fE7G46iJhrVf6Sd2sLSs02x 7nzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=JcRzd9iXWRPQxzz+FLBQl4eE18YWX7ypx6Dquq9WYko=; b=FBP4RLAI3yAN2n9wePXiSRlHJo73DN+xo2YR+qapvlEN4K5IvVClob072IBDGX2HJx xBXSDEJhzwXshdDxmszWZRPYk0aoYjbgsckdIo4zgQyksBZpB6TdS1LiinqXPkMQCoga 81Rl52n9joXAsdCgY5obG4reOARtFjL508W6VsKQGusEGirVD6wJGH8Dd80b98NCtRr/ uxwnu0lIQpUIUlE8TZzsdNzb5x+335d5QbgJFGT2gphPNS00+0ovqX89LuTQ41mO6Xzl rjP2CM/Ds+oeyibzEPKeuP8GsU8N+zwARpz2c/f0t1b6BPF9rKfRemhkHJMV0qQj3ckd 7Aug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="cOc/+usJ"; spf=pass (google.com: domain of mptcp+bounces-3266-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3266-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id mq17si13579848pjb.175.2022.01.20.16.35.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jan 2022 16:35:42 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3266-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="cOc/+usJ"; spf=pass (google.com: domain of mptcp+bounces-3266-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3266-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 6C5863E0E52 for ; Fri, 21 Jan 2022 00:35:42 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8A5342CAB; Fri, 21 Jan 2022 00:35:40 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F9EE2CA9 for ; Fri, 21 Jan 2022 00:35:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642725339; x=1674261339; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0BGbOTx/lurssaXCoUHuwmVPIkh6j2wbdvVsR1sRXc0=; b=cOc/+usJ2BqzBcpqZ8Aq7Vi+Q1US+x7IJauqfAp7oynWVKfSpFCF598s FC+mZ9eon5iTAmm2PuI8h6SxPFbLGHnwTz4bSKDeKQ9DoJMDG4XbsdVaZ IqfPt/sZB1DaVVJjws8GuuPNPjUOHSDZtnDunzrw4aCQn80TrH/gfpHZ/ QkKaVpnxTqbE2IGPu4FXCgppLyfnt9V0sGY+UghLwurK3U/GFCzlIRj9E InKOUtxySgWONBCo6OR5xZVo9zH+HJIOqWFVYOXkiKaZ/o1hXEGZU4BT+ aSz+qDWKln+/l0ZyUWHQtSh8OGQv8l7M3OyFH2odbdL4xJlpegQ7tJIaN g==; X-IronPort-AV: E=McAfee;i="6200,9189,10233"; a="232886196" X-IronPort-AV: E=Sophos;i="5.88,303,1635231600"; d="scan'208";a="232886196" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2022 16:35:37 -0800 X-IronPort-AV: E=Sophos;i="5.88,303,1635231600"; d="scan'208";a="531215215" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.220.167]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2022 16:35:37 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Paolo Abeni , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, geliang.tang@suse.com, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net 1/3] mptcp: fix msk traversal in mptcp_nl_cmd_set_flags() Date: Thu, 20 Jan 2022 16:35:27 -0800 Message-Id: <20220121003529.54930-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121003529.54930-1-mathew.j.martineau@linux.intel.com> References: <20220121003529.54930-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Paolo Abeni The MPTCP endpoint list is under RCU protection, guarded by the pernet spinlock. mptcp_nl_cmd_set_flags() traverses the list without acquiring the spin-lock nor under the RCU critical section. This change addresses the issue performing the lookup and the endpoint update under the pernet spinlock. Fixes: 0f9f696a502e ("mptcp: add set_flags command in PM netlink") Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- net/mptcp/pm_netlink.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 75af1f701e1d..f17a09f7fbf9 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -478,6 +478,20 @@ __lookup_addr_by_id(struct pm_nl_pernet *pernet, unsig= ned int id) return NULL; } =20 +static struct mptcp_pm_addr_entry * +__lookup_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_info *i= nfo, + bool lookup_by_id) +{ + struct mptcp_pm_addr_entry *entry; + + list_for_each_entry(entry, &pernet->local_addr_list, list) { + if ((!lookup_by_id && addresses_equal(&entry->addr, info, true)) || + (lookup_by_id && entry->addr.id =3D=3D info->id)) + return entry; + } + return NULL; +} + static int lookup_id_by_addr(struct pm_nl_pernet *pernet, const struct mptcp_addr_inf= o *addr) { @@ -1763,18 +1777,21 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *s= kb, struct genl_info *info) return -EOPNOTSUPP; } =20 - list_for_each_entry(entry, &pernet->local_addr_list, list) { - if ((!lookup_by_id && addresses_equal(&entry->addr, &addr.addr, true)) || - (lookup_by_id && entry->addr.id =3D=3D addr.addr.id)) { - mptcp_nl_addr_backup(net, &entry->addr, bkup); - - if (bkup) - entry->flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; - else - entry->flags &=3D ~MPTCP_PM_ADDR_FLAG_BACKUP; - } + spin_lock_bh(&pernet->lock); + entry =3D __lookup_addr(pernet, &addr.addr, lookup_by_id); + if (!entry) { + spin_unlock_bh(&pernet->lock); + return -EINVAL; } =20 + if (bkup) + entry->flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; + else + entry->flags &=3D ~MPTCP_PM_ADDR_FLAG_BACKUP; + addr =3D *entry; + spin_unlock_bh(&pernet->lock); + + mptcp_nl_addr_backup(net, &addr.addr, bkup); return 0; } =20 --=20 2.34.1 From nobody Mon Apr 29 15:12:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:84cc:0:0:0:0:0 with SMTP id f70csp330935jai; Thu, 20 Jan 2022 16:35:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJwiksGIwXCH45gok80mnxMZUw+K6Y2GM6N+xgtXGi3QZtVke0cFg94Ts+3T4ry7BLBB4NvA X-Received: by 2002:a05:622a:1a84:: with SMTP id s4mr1439011qtc.651.1642725341917; Thu, 20 Jan 2022 16:35:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642725341; cv=none; d=google.com; s=arc-20160816; b=XW4HTMTBXeb/7JSNHlP6Wsw9/7Rr/B15/6vl8bJ2ICbk4WKcOoSF4QW+hfAe4Y5dOB DmOjRoE1MRB2lMKAF/xHWv3Sh8Q0D2fO65p3diM03mcHxDjfqqOQgVw1qektSg/SzrfG /dVPAn7DrPBfN7I+b5gJ5zupra2iPXUABHNyKRvf6/JtB26nURPsdjMlDF5rUV2NKOkq 7VRb4PsePRdqGJ9/AFeOfKwyMjEdaEMPyp18pSv8pl9D17qcoBnSzwGCrTEn8C+Wb67E ylHk+uir3I0pVhSVcKvqRDDeW+cj1RcKJlKE5+ch9vRYCrzCHF82g669+5GDF4EwuNtK ZoMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=TJkqZNOP1YbHajTepKc9Uw8jC1YGTh6ZwNQ7zvAwyZs=; b=SiCduVDark7Nl4cESmx2cIGPi0n65gI4DoURkns/R0dTxUELGuXGU4BuJzx0E87xhA mnbpU3SJjUBwr6z4L8YmqX65zHS99W56Id0aSIGI6heEuabG/ablbylnjX1eJ5E/knMe Sq0diD9v3XcLR3PyQVeyeDSqsNSaIQ+4lO+6Oat2kyA//eDk9KQfi3BVQ+ItUowtil/x 5uOZbDhavyqPiFjhoTbZr+FBxDJOAqm6g7pLovHQ2SYQnxGT26FBHJzWorvW1paV79+G IZ81QKWhw/gk0yYlezaDHuAkqjb4+oybNvEwJsTPVQrguzz7Myx7hucBLcmaoLBcHJIK VUYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YFrFCRrO; spf=pass (google.com: domain of mptcp+bounces-3265-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3265-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id js11si1671504qvb.91.2022.01.20.16.35.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jan 2022 16:35:41 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3265-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=YFrFCRrO; spf=pass (google.com: domain of mptcp+bounces-3265-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3265-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id A1B191C09E9 for ; Fri, 21 Jan 2022 00:35:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 421CF2CAC; Fri, 21 Jan 2022 00:35:40 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40B3D2CAB for ; Fri, 21 Jan 2022 00:35:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642725339; x=1674261339; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=K6d0wzumL2zpgrbwhNb2ExiuQQiRc8+qhYIDnlEKDhk=; b=YFrFCRrOs31fP7LReAir4Lp3cbaEy7oT6ZxcmwmZ9RgMKPSRdwxlhZF3 AEqM+GBchpNals95Tm7Z0VU8+cPs1r5htnlmnn6OZc/c5OyA7QyoXNlFH Pcj/JG+ZkfdjkGKFVByzXGMN+e28mkp2TIKtVA3XXryb839dJFB9KbIyD WThMZIWqspkJfZBrDDOCpuB8p0EZpB+8exPD630HFk4weFYUCTJOpm1U7 ZJbKYPAR2CfiAdTpj+KFplqRt1J/e4GPm/2XyCcfcGqDNuxCAiva9SJXA 2sPIUCJSJoubHgaXt0nAj09W6rHZfJGP5/HcUyIQ8eebCPvX/5T+670Al Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10233"; a="232886197" X-IronPort-AV: E=Sophos;i="5.88,303,1635231600"; d="scan'208";a="232886197" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2022 16:35:37 -0800 X-IronPort-AV: E=Sophos;i="5.88,303,1635231600"; d="scan'208";a="531215218" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.220.167]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2022 16:35:37 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Paolo Abeni , Mat Martineau Subject: [PATCH net 2/3] mptcp: fix removing ids bitmap setting Date: Thu, 20 Jan 2022 16:35:28 -0800 Message-Id: <20220121003529.54930-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121003529.54930-1-mathew.j.martineau@linux.intel.com> References: <20220121003529.54930-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang In mptcp_pm_nl_rm_addr_or_subflow(), the bit of rm_list->ids[i] in the id_avail_bitmap should be set, not rm_list->ids[1]. This patch fixed it. Fixes: 86e39e04482b ("mptcp: keep track of local endpoint still available f= or each msk") Acked-by: Paolo Abeni Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/pm_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index f17a09f7fbf9..782b1d452269 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -791,7 +791,7 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp= _sock *msk, removed =3D true; __MPTCP_INC_STATS(sock_net(sk), rm_type); } - __set_bit(rm_list->ids[1], msk->pm.id_avail_bitmap); + __set_bit(rm_list->ids[i], msk->pm.id_avail_bitmap); if (!removed) continue; =20 --=20 2.34.1 From nobody Mon Apr 29 15:12:07 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:84cc:0:0:0:0:0 with SMTP id f70csp330967jai; Thu, 20 Jan 2022 16:35:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJyScMwKViemVNV+mwpK3YsXdNfadx4bv1cgK0vGY5UZGUq59XIBnmsVa769GkKEAy5L/sYs X-Received: by 2002:a05:620a:2114:: with SMTP id l20mr1142517qkl.61.1642725344246; Thu, 20 Jan 2022 16:35:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642725344; cv=none; d=google.com; s=arc-20160816; b=VtWc70TbFZWuJ8UUVghb5yoa8d/mKZ3dn/hONm+TXE9yLBnFsemaBszZ+YbpcNWLt3 32UCWfWIUuMAU4+Tlwbi608KIhxaAZcjPKhGXXlN5+PIRP/x11TLM9HREy9Ma4p9Nfal 7vUOKDVDfx1Fkv15FQXRFEfV2vnjmWmb9Cqt3Ey07nSFVBbcJuPfieVVhubIgdJmV09G pXkrHnYQiVunTH2jM/M/mMvrj0WDYo4uoB/KwhBE2/xDhXj80+jYtiqd003XysXVNERu iWL2Qgwvoyt9+v9BtCGTEHkSMKY9hBT0mij2q7kCXCY3gTtceEVuxnrQaaJyj5Zwbvug 9C5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=GwPFwrMwSYSiMWbYwfIqEmcrryIus5cqv+snuEcJAxY=; b=UAmbFYNyiTDVcsWbCDZeFRl6G6YK6CSELCANrl4siIk5q9gxpEhKPAft1SqnL3NnBa E1OqGWpCQge1/Ok6VCJ2gPg5J+ho+TQQywmuoFmGFHNvcIAYRfUmF4ZvO2VD8emKIPzK LYBoCF2G1XXHGTwXN9kBqX6cJpl6NnhjIjVWVMlyDkno2KhD5y5pl5wXz44A5BNHtWp4 vyEFjdCBT6oRyYURCIfpuGHXbsMdsrxuaTRwdM5eYtuLo+SJQtztCfKWFxJZsQBvCz6X xbkVQejfe83i+ABC59yAuihJ39NbrCA2VFbsxmvHf7C09OorUBVokLcppTVkSYyNFJ1A HYaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HI604TMb; spf=pass (google.com: domain of mptcp+bounces-3267-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3267-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id u126si1450298qkb.654.2022.01.20.16.35.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jan 2022 16:35:44 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3267-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HI604TMb; spf=pass (google.com: domain of mptcp+bounces-3267-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3267-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id 027CB1C09BD for ; Fri, 21 Jan 2022 00:35:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2F0842CA9; Fri, 21 Jan 2022 00:35:41 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 450C92CAD for ; Fri, 21 Jan 2022 00:35:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642725340; x=1674261340; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=37OiH+ekDV4sczue07YU3KYi/b272WtlcVytdrNcBoc=; b=HI604TMb9tLk0QTwIAkalZ8kRViGhKo3p9bN5c7OEtcPDLcP6wg4PcHu Dz6HKjJvaWn0odg90MJJzh2E5lnrE76lryvmEG3a7EGqw4a9S1batsqr8 yCt0DS7rOeIpxKIZhYP5DRcs9iG5MNR+IyoFnR9XprJGWB1LvVE5WAWlO COK/dPivgis3sZaQvDI8rPnS/Lb+o4T0/oNaVL21TYB1tHMx2NgekrQit CwIgxqu6rHCjiJhbMF50CqFhvqtM027wsx0XzlquPwjaIOZJJdXIApyNY WYVSBsAxgeA89wew/ibpT1jFOckqhUAFMAdmQxbKnuNIBbK6KzjZcKzJD Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10233"; a="232886198" X-IronPort-AV: E=Sophos;i="5.88,303,1635231600"; d="scan'208";a="232886198" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2022 16:35:38 -0800 X-IronPort-AV: E=Sophos;i="5.88,303,1635231600"; d="scan'208";a="531215221" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.220.167]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2022 16:35:37 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Paolo Abeni , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Geliang Tang , Mat Martineau Subject: [PATCH net 3/3] selftests: mptcp: fix ipv6 routing setup Date: Thu, 20 Jan 2022 16:35:29 -0800 Message-Id: <20220121003529.54930-4-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121003529.54930-1-mathew.j.martineau@linux.intel.com> References: <20220121003529.54930-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Paolo Abeni MPJ ipv6 selftests currently lack per link route to the server net. Additionally, ipv6 subflows endpoints are created without any interface specified. The end-result is that in ipv6 self-tests subflows are created all on the same link, leading to expected delays and sporadic self-tests failures. Fix the issue by adding the missing setup bits. Fixes: 523514ed0a99 ("selftests: mptcp: add ADD_ADDR IPv6 test cases") Reported-and-tested-by: Geliang Tang Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 27d0eb9afdca..b8bdbec0cf69 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -75,6 +75,7 @@ init() =20 # let $ns2 reach any $ns1 address from any interface ip -net "$ns2" route add default via 10.0.$i.1 dev ns2eth$i metric 10$i + ip -net "$ns2" route add default via dead:beef:$i::1 dev ns2eth$i metric= 10$i done } =20 @@ -1476,7 +1477,7 @@ ipv6_tests() 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 dead:beef:3::2 flags subflow + ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 dev ns2eth3 flags subfl= ow run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow chk_join_nr "single subflow IPv6" 1 1 1 =20 @@ -1511,7 +1512,7 @@ ipv6_tests() ip netns exec $ns1 ./pm_nl_ctl limits 0 2 ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal ip netns exec $ns2 ./pm_nl_ctl limits 1 2 - ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow + ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 dev ns2eth3 flags subfl= ow run_tests $ns1 $ns2 dead:beef:1::1 0 -1 -1 slow chk_join_nr "remove subflow and signal IPv6" 2 2 2 chk_add_nr 1 1 --=20 2.34.1