From nobody Sun Apr 28 19:22:54 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp2592639jam; Wed, 9 Feb 2022 17:25:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJwGdby0jaQBVpYSxL0+W5hJ+pTFrbxybaVhUi9cNHv+sMlkI0s/lySlxyWy8h2jfQckhYUh X-Received: by 2002:a05:6214:27e7:: with SMTP id jt7mr3539925qvb.113.1644456320257; Wed, 09 Feb 2022 17:25:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644456320; cv=none; d=google.com; s=arc-20160816; b=DEguveD99ZCY0YuuXn6xUV17zeR+tDTBUVbFi2Pupmv+s8QEG7AQ7hlY+DELPBQNi5 z2Gx7JRESMz9cYmnUESLfYwK8RW8/kJl7IprlWTxYZEgbt5jV+qcBzbBLSkcWpTVF766 rTlmbIy3O+Ayuobq5DDjxGlTtHLkTYv1/CEyFtWWYB5exQUlELOvfSjQBlcNVuxs4UOr gZhMQrUbcboBnkcOAz2oL4Kyy606M3LjsVhR5OHFWu61mRaDDvpW2an032Pdk1kZmpiU MXPboSbO/qbX5zbVczSVXl3XFZW87aqy3iX24YN1cqFw8uODNsc1/biW9m6uruXS5/1o TcWA== 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=bDbZGJgntUOYPbXWTKq07ahEO5I5GB9bRtrdQJ53DJI=; b=CvyaWN0qY0lL5w61MIp1FgUiRFfspAYaCrWVKrq4WzhWDZZKZOeNbfw3RINsA4sQzs MQHoGIXkzvT9SmV/cm8noJ4B0+R1x4h3y6ua0pt/H1eplQc2ag3KAbmM2MEQLHWnRLAK jYYkaQfJ1k3FGSirqmzs4R5CYe7ZctdqETlMWu6yAL1+uu6Q32TLyVQJuG8YMUhBBS2n pZjJwVmcPUBfgadbcKu1m1SXZzPtdetPEL4sKUjxzhZuu6892iup7ggJnG4sRtx5URul Xw/bCs0Rjf/+G2hH9YwnDYYgrrQCv56f61uQGXTnH0ki0AbpeCT1g1Wr3UzIT2+Lq4rF 6A7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TJY9HZsm; spf=pass (google.com: domain of mptcp+bounces-3611-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3611-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 b4si4105067qtx.719.2022.02.09.17.25.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 17:25:20 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3611-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=TJY9HZsm; spf=pass (google.com: domain of mptcp+bounces-3611-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3611-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 F1C7F1C08EC for ; Thu, 10 Feb 2022 01:25:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E1FC32CA1; Thu, 10 Feb 2022 01:25:18 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 86C0B2C80 for ; Thu, 10 Feb 2022 01:25:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644456317; x=1675992317; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ki68UMGj3/IhMfG82pNOMPf9Hgiw3imD98DaNC35q+Y=; b=TJY9HZsmSMbBDsElRFpeHFcvDCahh2qqcnlJhloj1ZBWATr8Hu5aadKa CbZgR27OsON2b8OrVTwAEQK0mRX5/A+gdQZnawQCn5eC89tISXrvIviIS p+P8YQ9Y9o04EnDHSs5nBb7yhktrBOpHF+Oqzs+NJJrBd/NcziClxLdQs bV2w2rMnKfKwFJQ6VbGocz3dbvaK2zPUtVSUllz3ayfFTgPBCrElnsvwT Bieysqe1IkGdp9jzhSIcTYxPMPpUV46lScp2mpW4rTcmjB2h8qpUDXEma +VPqDMvNESKzgywv0TOY/EihYvmFJcXOskx8SbPBuozyeTwB1YuHo3/0U Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10253"; a="249136291" X-IronPort-AV: E=Sophos;i="5.88,357,1635231600"; d="scan'208";a="249136291" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2022 17:25:15 -0800 X-IronPort-AV: E=Sophos;i="5.88,357,1635231600"; d="scan'208";a="526263244" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.251.22.101]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2022 17:25:15 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Matthieu Baerts , davem@davemloft.net, kuba@kernel.org, liyonglong@chinatelecom.cn, mptcp@lists.linux.dev, Paolo Abeni , Mat Martineau Subject: [PATCH net 1/2] selftests: mptcp: add missing join check Date: Wed, 9 Feb 2022 17:25:07 -0800 Message-Id: <20220210012508.226880-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220210012508.226880-1-mathew.j.martineau@linux.intel.com> References: <20220210012508.226880-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: Matthieu Baerts This function also writes the name of the test with its ID, making clear a new test has been executed. Without that, the ADD_ADDR results from this test was appended at the end of the previous test causing confusions. Especially when the second test was failing, we had: 17 signal invalid addresses syn[ ok ] - synack[ ok ] - ack[ ok ] add[ ok ] - echo [ ok ] add[fail] got 2 ADD_ADDR[s] expected 3 In fact, this 17th test was OK but not the 18th one. Now we have: 17 signal invalid addresses syn[ ok ] - synack[ ok ] - ack[ ok ] add[ ok ] - echo [ ok ] 18 signal addresses race test syn[fail] got 2 JOIN[s] syn expected 3 - synack[fail] got 2 JOIN[s] synack expected - ack[fail] got 2 JOIN[s] ack expected 3 add[fail] got 2 ADD_ADDR[s] expected 3 Fixes: 33c563ad28e3 ("selftests: mptcp: add_addr and echo race test") Reported-by: Paolo Abeni Signed-off-by: Matthieu Baerts Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index b8bdbec0cf69..c0801df15f54 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1159,6 +1159,7 @@ signal_address_tests() ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags signal ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags signal run_tests $ns1 $ns2 10.0.1.1 + chk_join_nr "signal addresses race test" 3 3 3 =20 # the server will not signal the address terminating # the MPC subflow --=20 2.35.1 From nobody Sun Apr 28 19:22:54 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp2592658jam; Wed, 9 Feb 2022 17:25:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJyv20ENpOq8KlHsCUkYLiYwmFASmda5Y7j3gkD4aNSdUBitCH1USGlkSS2V369DgulICqrr X-Received: by 2002:a05:622a:10f:: with SMTP id u15mr3286316qtw.339.1644456321416; Wed, 09 Feb 2022 17:25:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644456321; cv=none; d=google.com; s=arc-20160816; b=yUGtEirm+5w1PUBRl2YYQZA5WwuSJzNjNQahOs+hMt3yWyG57X5qb0wuuib5djxKq2 5qvwnwEySpgqJsdI0mpS6/0iGuhQulRauOgliH4LfF/mIDY1/XEWxoT5oGkp4UTNVZex K/UqCybTAr1hiYLXalUYZTlURogzYDndr2DxXpdc1wyL9y/FHXmJe0+gxvkU6zwiALLF /CrYti2bxpfznhKk7PP6mem3kY6NQruPw1KNuUQk7AyBsSKolhnFPjMFO5I+df21QmAm EsL7BQ/zjtE2TqcfazucqjzPgo4scjluDP5YOXw1rGe+98jFQHgyuW25yHkZ9BqE8Glw fj5w== 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=EaHHm99kNbZBfc5fvE0gZgUtJ4u7M7wxbYs64Vxw80w=; b=HsEhy86dkPO550wx9c/OhY8JWBOHVPFV+Hh/RWL3ZZFgHsY06N5/CC1lierS7vP8zR Xa8HpY6N6tRYBsDV4ZaAumaZGMTZXsEswap2Fmeyyk1ZZ6PGBpehSgAxW+vygHmj518g F4c01tBhG4Gdf4SjgQPiEKSqBHKx7xhxaglh1KfbGSVA8rxLRTjn3IW7954bo2S9RzDK V1aRdWbWi9d83edB4QKYw4rUoCrJBpq//LK5plXni1tbnHb30r02vo+2zezTAHklmpr6 G8YoZHb9AF2gb7pOIcLc4igCGYOxnE6N03FYlNBqHbFgx4wdOOU0lczMx81OwW+a0mRs wL4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=K5T4istc; spf=pass (google.com: domain of mptcp+bounces-3612-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3612-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 c2si4540692qtx.129.2022.02.09.17.25.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 17:25:21 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3612-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=K5T4istc; spf=pass (google.com: domain of mptcp+bounces-3612-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3612-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 1C4551C0C60 for ; Thu, 10 Feb 2022 01:25:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1B11D2C80; Thu, 10 Feb 2022 01:25:20 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 B19EB2C9E for ; Thu, 10 Feb 2022 01:25:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644456317; x=1675992317; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=G0+MAlrnsf/greE/vEdVzWDF/aTaDZ7Y2QTg6LX8frg=; b=K5T4istc9NtHwrMOBxIPEMzDvDPmSEaFvdBK0IPPU75ul9jixKwKokcb FaOhWtRUVXdg0Txk9aBmukRDoibG+nYaJHBYN+I8rrIinW+fDNE0zRZu6 5Ra/PJ+/TOrhWR5iFKBtZfLIGVtlEfNXS+Ozp8JOWHtzsMVUHaIcKoyRl hwEW9KRYiJmXafU2aWSkQBFdKQOCwc1Gk8xk7qRuEmcRw1Ni99Sw9hGyw 3kWZTgNC6EhPLf69Stuja/Uz0XPLi/012rOLyb3jjsgBlDs/8KbsjKbQk LWBqpyFjzRSxBpCvLjwAKpeAVSD5d0+YiPWLsyA98ZHLykHjs7oQjK6Nd A==; X-IronPort-AV: E=McAfee;i="6200,9189,10253"; a="249136293" X-IronPort-AV: E=Sophos;i="5.88,357,1635231600"; d="scan'208";a="249136293" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2022 17:25:15 -0800 X-IronPort-AV: E=Sophos;i="5.88,357,1635231600"; d="scan'208";a="526263247" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.251.22.101]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2022 17:25:15 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Kishen Maloor , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, stable@vger.kernel.org, Geliang Tang , Mat Martineau Subject: [PATCH net 2/2] mptcp: netlink: process IPv6 addrs in creating listening sockets Date: Wed, 9 Feb 2022 17:25:08 -0800 Message-Id: <20220210012508.226880-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220210012508.226880-1-mathew.j.martineau@linux.intel.com> References: <20220210012508.226880-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: Kishen Maloor This change updates mptcp_pm_nl_create_listen_socket() to create listening sockets bound to IPv6 addresses (where IPv6 is supported). Cc: stable@vger.kernel.org Fixes: 1729cf186d8a ("mptcp: create the listening socket for new port") Acked-by: Geliang Tang Signed-off-by: Kishen Maloor Signed-off-by: Mat Martineau --- net/mptcp/pm_netlink.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 782b1d452269..356f596e2032 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -925,6 +925,7 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm_= nl_pernet *pernet, static int mptcp_pm_nl_create_listen_socket(struct sock *sk, struct mptcp_pm_addr_entry *entry) { + int addrlen =3D sizeof(struct sockaddr_in); struct sockaddr_storage addr; struct mptcp_sock *msk; struct socket *ssock; @@ -949,8 +950,11 @@ static int mptcp_pm_nl_create_listen_socket(struct soc= k *sk, } =20 mptcp_info2sockaddr(&entry->addr, &addr, entry->addr.family); - err =3D kernel_bind(ssock, (struct sockaddr *)&addr, - sizeof(struct sockaddr_in)); +#if IS_ENABLED(CONFIG_MPTCP_IPV6) + if (entry->addr.family =3D=3D AF_INET6) + addrlen =3D sizeof(struct sockaddr_in6); +#endif + err =3D kernel_bind(ssock, (struct sockaddr *)&addr, addrlen); if (err) { pr_warn("kernel_bind error, err=3D%d", err); goto out; --=20 2.35.1