From nobody Wed May 15 13:46:39 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 2C3252D603 for ; Thu, 18 Jan 2024 18:27:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602476; cv=none; b=R0ySEVZGYBFz1zlJ5T1KhOwmmERVdYcwD1nCbuZB0cb3grvtahgzCz4T49WjK63Vy72ZjJG/gr6bH6Aplw2sesT75MGHAMA/Z0QEw7QGUmbfob2nJHfaveFLPbnMhidDL7WDyyEhlWdFgIQIjE/LuorsZ78VjHU0QOCY1mh9Ruk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602476; c=relaxed/simple; bh=SDBb6RXrWYX1luv9PnOcPtbZMucA995tbj8SOsqw+Gg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KcDWyqv0cOhzCW3mjB4rpc29uP5IrGyZd+KAxNwVLAkr+x/HIgJuW20QHfe0VHiWjiPC/YG2eagC8zrMs9YuHP4s0SIe41OOPZYVD+rcyW6QN07wBh0IamByO+lLVbRV4GPQsOwnwgNITORSyfzhyEaaaeng21O00x6URS4V32w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=egt8+hpE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="egt8+hpE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 329D3C43390; Thu, 18 Jan 2024 18:27:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705602475; bh=SDBb6RXrWYX1luv9PnOcPtbZMucA995tbj8SOsqw+Gg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=egt8+hpEquL4zj++AS/TSWiyudBmlGOQ5gGKAut7rbJyTPWRhiwA5OMHNUl8jDfHd VnIblGmft9E8/UagR764kjWJ0YwQswsjRY9KctvOgkNnWsJZbtv44XFlKRmahOj1+9 beAsB7ry28VgWaKNI1I+/ViQiDuQ9Hd3CaM2E7EfiWzeBPABf8dqGvN5os3aJ1OcD5 ++2OaRz5YFZUhDZWgi2kpr9GQ/q/pkdk1uMJAXN/XSjcT0aWj36xeF4AMi6C4EjQhu ZtVz8p35HpOGhdo+Z9hcMICxHgq/t4B9Kmiq/rbd2u3KaxOzLAHl2iNissZTBe40c+ EjuonmRZcCUJA== From: "Matthieu Baerts (NGI0)" Date: Thu, 18 Jan 2024 19:27:31 +0100 Subject: [PATCH mptcp-next 1/7] selftests: mptcp: add missing kconfig for NF Filter Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-1-f3a4db41c3be@kernel.org> References: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> In-Reply-To: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1024; i=matttbe@kernel.org; h=from:subject:message-id; bh=SDBb6RXrWYX1luv9PnOcPtbZMucA995tbj8SOsqw+Gg=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlqW2pS6Nrz4FdLil6jAX5zq16e6lAjZwlTNrTJ 8oI4H3mHNaJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZaltqQAKCRD2t4JPQmmg c3A6EAC4lafHwhn+OCZm8V4nIHQvvYEuh7ir1uqdxC1IdgNcDFTd0d3Ah6Z12iNp4183CA/t/u6 rmqko6bQzv5OA3H6PD4Hwy33LdWPSOwqlLB1UJO5AMMPeNiJdIzddBM879BNDpRpOOTPE4RGUUv ZIRcJGGvqUyKs2trZcGixRTBcbCGWlC2mEIM8kSi7uynA2budRiiA5caJKNH7ycbSCPSQbJeC9X MS8RECeSRlGwepaAc+7EXcanJpia6UBLU5MBd/rLI/NjFdyfy8L8VKsz6ceBg6h80Gt0j8KVFJK 8skF+AfAgWorTbIuvlkirHJuzefyLCbC4QmRL8RFxS7dMroTGi2mEtokvgw6REJ08N/yGhRsnTM 9sMgwEZvBYhUrgeSoZoxYy+0Cs4FUXyP7gmAZEK48IczsTgq7syohGTjUeNq6fU8N42V/jd3TBO NXL/3ZgagwZXyYwT5MGAJfHy0qcTWJE937YZQ5Mnc4j4/xpWT1Oj4qcIzWzdJ9vJpp1lECwmQu+ tLnnuq1eUViy3YdfHLXn3wZBdHdGGELO1MhMXP49HgxzYm7rv5b8WsK5OpuxQRn1b2/OC/2/Qi5 NTzu6bN/t0YtxfBPgOSdu/1wzvLSYdZhofA6UVz12JK+daHNxILRMYoAgK1FMTQsATH6ZP6Wtvp al+SBA7Nht91wTA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Since the commit mentioned below, 'mptcp_join' selftests is using IPTables to add rules to the Filter table. It is then required to have IP_NF_FILTER KConfig. This KConfig is usually enabled by default in many defconfig, but we recently noticed that some CI were running our selftests without them enabled. Fixes: 8d014eaa9254 ("selftests: mptcp: add ADD_ADDR timeout test case") Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/config | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index e317c2e44dae..2a00bf4acdfa 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -22,6 +22,7 @@ CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SOCKET=3Dm CONFIG_IP_ADVANCED_ROUTER=3Dy CONFIG_IP_MULTIPLE_TABLES=3Dy +CONFIG_IP_NF_FILTER=3Dm CONFIG_IP_NF_TARGET_REJECT=3Dm CONFIG_IPV6_MULTIPLE_TABLES=3Dy CONFIG_NET_ACT_CSUM=3Dm --=20 2.43.0 From nobody Wed May 15 13:46:39 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 18E752D60E for ; Thu, 18 Jan 2024 18:27:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602478; cv=none; b=Y0BWyrn0LRIW5b7Ac3puz2RUUaNSKOU1ilSOr31bli+MFJNZ62M4WNIPZQQyvqtRXDffTH/4e22zq3gvcdCUgUisCdTuHWij+NZuEd93aC+DvgyERmOQ0qUGHAkPk44FHc7bqwjKFDXQpJtpeJhuou8xGC+Y3Ep51jQs3vFiiyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602478; c=relaxed/simple; bh=CBxGEhmYoe2IXYemBuahKjX4uInIvhUF6dVMSB1vXAA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rw2TwjHMfp1dnW+a/ej6Q9Gkw43ipBDx2urprUeuK1UPRSzeq1naaYLZXJ20A9slYnKXyXmCJCIIt9ylD1jgr7i4JbSjl5d/hhWXYqpxurNf4OKByUUXYo2Hp4FGlbZW45R0zLfZs6wBCB0Cufe1GqgxmU5Nkh2HqeNryeKpNys= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TBb83ofy; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TBb83ofy" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DB1AC433A6; Thu, 18 Jan 2024 18:27:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705602476; bh=CBxGEhmYoe2IXYemBuahKjX4uInIvhUF6dVMSB1vXAA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=TBb83ofyUEq8IQcHDAev/ZVQxD7FB8CqvqTc/bVBTwePQGlQhv5YE3mi85+kWkbM5 SeRVRuCcS3aBLBZoGdkx9X7cRnG3dSYoI6Q9M0pUaUykO/7U+Kcg2y+FKfxnUtjTaU 9j/LlifsSOqouvx/vD+xapYA7hVoba1TTYzh/R3X11J9TXEzrKBFMaQ26PDo4cKSS3 A8AXJwBQbjkJVeQvuLI1zIGmxoPvyb2lKb2ZSOuws9bfeyeoRee5hpxLLBCbqwJe9x f9xbYFLsSTkLvh0ZzESuD3bF8cKDs223YkeRbXAMw47d8RsOh9oB2Zh1TctJdkSkbF w4hP5niiB49Yg== From: "Matthieu Baerts (NGI0)" Date: Thu, 18 Jan 2024 19:27:32 +0100 Subject: [PATCH mptcp-next 2/7] selftests: mptcp: add missing kconfig for NF Filter in v6 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-2-f3a4db41c3be@kernel.org> References: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> In-Reply-To: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1032; i=matttbe@kernel.org; h=from:subject:message-id; bh=CBxGEhmYoe2IXYemBuahKjX4uInIvhUF6dVMSB1vXAA=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlqW2pFRKvYqqPNbPZx1OLu6Bt6ZdEzjxLzCP6V 9KbIX5XwJiJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZaltqQAKCRD2t4JPQmmg c+4JD/4sII7A1N+V5fgJ11FyYOjKFe0sk4CKeQtL4G/avs3uZ6ZMYnEIyVKZv1PVnaeCAjk9eGO JLenOWvYEaW6Pio2GdEBPFNJBgSgaKnVKwkT+vp6FOhMZc9FPXO5J87saVuTwx4fcFOxsG3BPT+ BudXKnKLGKjCV2+J+5wtVAAxUX2zGh1MsIMwvXMuNGxTdLz5dYK7QBAZrsHatA+QZZVgVC1Ts2J yJtyRegJn8jbOMcqmIgRdk8Lnimc0kDFfeCiVvI5hTrRNladeTuqJrbvKEIZ8ertgowUtTHGGe6 txSJxPheaXWXdQD8ajS6KQCZWtrroAU9QDtU7tToll/1a7vzhKhGtgE+kslrlkjUCXKGq8vhbaD 8pzUKPDN3o3Jv7aIJlxtBo9nXaqEFjgPj2svIHkeupO063djWIg+M7n1h1Rmdv2tRrepCkKkb98 +KSuv7e+UVG3FpG14OpXB7HzmLail4v/FBz1heQdosYKwM1kbwtoWeaieqwKYn0kdquCGdTSYC1 jENeSulkuGG3Eb28xXnxlwvFZb/NPkH7w0EaTEBj4jsmZol1diy+Eyc7iuzbSOfrWPg3DxP0QW8 pvaUqj1eyShDJBh9gsfFoQcAwIwsYeCComGAYy0l6kvU3kNNJkplY8ob5ZuiAQyyTQETsXYNps8 cVFzrZNb5zr8vaQ== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Since the commit mentioned below, 'mptcp_join' selftests is using IPTables to add rules to the Filter table for IPv6. It is then required to have IP6_NF_FILTER KConfig. This KConfig is usually enabled by default in many defconfig, but we recently noticed that some CI were running our selftests without them enabled. Fixes: 523514ed0a99 ("selftests: mptcp: add ADD_ADDR IPv6 test cases") Signed-off-by: Matthieu Baerts (NGI0) Reviewed-by: Geliang Tang --- tools/testing/selftests/net/mptcp/config | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index 2a00bf4acdfa..ec70b27288fc 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -20,6 +20,7 @@ CONFIG_NETFILTER_XT_TARGET_MARK=3Dm CONFIG_NF_TABLES_INET=3Dy CONFIG_NFT_TPROXY=3Dm CONFIG_NFT_SOCKET=3Dm +CONFIG_IP6_NF_FILTER=3Dm CONFIG_IP_ADVANCED_ROUTER=3Dy CONFIG_IP_MULTIPLE_TABLES=3Dy CONFIG_IP_NF_FILTER=3Dm --=20 2.43.0 From nobody Wed May 15 13:46:39 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 18E3B2D603 for ; Thu, 18 Jan 2024 18:27:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602478; cv=none; b=Ob/nH+RyJoPBA+e6n7fh5QPnbjTZaWWyomSdj/wTUNClOWT3x5KHlxB2xBTHrYZDgYMrHArIDOxD4CnIxYH4By7o2io/H136e06GbMpg253BWWGskuRRa9eQps/91UEnirlDcUBUnIbT0z/NeBzMDg/iVqJ0yY2L0/yE0QqtPnI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602478; c=relaxed/simple; bh=yGQW07/OLFPLHEyWRsJLTsl21Hqp31bREfr5/x9Udyo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=O5Ii1F/QgulHnq1uVF0qE9hTx4adxgWo9zbe4i0K5aI//ywLVX0ACibllx0T6+Cescj/amCxNpK4W5sMoga0hOmL9rL8PNSJasy11+sVd5Zv8RP9CChu6tDhQEE4na9H5cqaSJ0FJKWkqG3tf40AvL46eAHQQ/6pDUfUNOqXQmo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oxNt9A4P; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oxNt9A4P" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29A0FC433C7; Thu, 18 Jan 2024 18:27:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705602477; bh=yGQW07/OLFPLHEyWRsJLTsl21Hqp31bREfr5/x9Udyo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oxNt9A4PfjfgxdI+CC2vO1RvDAjntVb6uw/mcw31wup0b+z0j9wvGpMJQ343mRhPX dpWgE7+kP+1rYTxhEufudZQVmuwCCXJU3/5UETPO3kbiSvM+2ABQ3XwAtkYnRlw0RT yUxU0UzTwH8HkiwzJ2tV4CmZ1Cej5+ZV/NrbmV2YQ5Fa1T9QKcGAP4IiRAqwhAvqp2 kxQS6DmiA63Zg4iUs7s3fm5VhFa+wu4rUn4xdcpQqLfziwciQhiuDKTnOqVwypDdWh OWrVZ5t0RMjucUDLLmV9NiFaGaw5YXjTtwB2ypl6wFGytAqpa+0qwVQn1FL9Fyy5hI iGLB7BINe1QSQ== From: "Matthieu Baerts (NGI0)" Date: Thu, 18 Jan 2024 19:27:33 +0100 Subject: [PATCH mptcp-next 3/7] selftests: mptcp: add missing kconfig for NF Mangle Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-3-f3a4db41c3be@kernel.org> References: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> In-Reply-To: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=985; i=matttbe@kernel.org; h=from:subject:message-id; bh=yGQW07/OLFPLHEyWRsJLTsl21Hqp31bREfr5/x9Udyo=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlqW2pDih2aGGoQa0dXi8On09xesvalS6CSWMbJ Ms8PAKEi2iJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZaltqQAKCRD2t4JPQmmg c2/1EACwDmc3KMGszTZ442nL7/Okdq/i2z0Mozg0TTXcVTxGk+o7VF+hgKXQulcxigAvwJ62zIN tT1c4y9YqhDDqQvBoMPm8a5LWXjCF3CSqXA+y6sjsWvd1h6yVL6BoUlRNuaH9zPDv0tCFT6JYIY QPt1kOhFqY2oZshMuIms+tET4PwljouwqOEAS2HtEMi3B2GlAXPVLcBTW4uzzEfKbzj/6dVdgZA XFlcSNLirZ5BJB+xJ3Kz/mjypgE2x4vbQLFHOnH+HInqF8iUiuuQ3jFFYOB0D46x6CLztV4OZ42 w1w65HKlDMW+Po4qZ9FftYZHc2bws65sMQzzQX/3WCn8n8anVsI6AkM0oFWZSX5jE+rNgp/6lUS 5Uh/uYNa6hUzuGxIY0Ui/rafI642DzKsafzmil4d/Qs6cd7aBdKzC1udKVpuQTSraqyWqJXjUsM +JBpZlHnuR72TThRJwRQOfPQzE+mWeefte3+gxkvhHQNCpaRjgpxLEHpT+XgHyNTbSkdRc8zsYS y6hqcM4ZZGmA1xxLsaeX4yANCJlf7tJoIVfc/WzNRXtUmIhsMOUpBD7EwBm3jpGjMgpKaoxmSW2 ONwlzryAhYPxOCXA3GgJ62haqa1chkZ1V7bR0bvhR56Wrw11B5HxZP6juxRrI5Qn6W+l6ynIZMw NDIuPCcnAXANrRw== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Since the commit mentioned below, 'mptcp_join' selftests is using IPTables to add rules to the Mangle table, only in IPv4. This KConfig is usually enabled by default in many defconfig, but we recently noticed that some CI were running our selftests without them enabled. Fixes: b6e074e171bc ("selftests: mptcp: add infinite map testcase") Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/config | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index ec70b27288fc..dfc8bdd0a11e 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -24,6 +24,7 @@ CONFIG_IP6_NF_FILTER=3Dm CONFIG_IP_ADVANCED_ROUTER=3Dy CONFIG_IP_MULTIPLE_TABLES=3Dy CONFIG_IP_NF_FILTER=3Dm +CONFIG_IP_NF_MANGLE=3Dm CONFIG_IP_NF_TARGET_REJECT=3Dm CONFIG_IPV6_MULTIPLE_TABLES=3Dy CONFIG_NET_ACT_CSUM=3Dm --=20 2.43.0 From nobody Wed May 15 13:46:39 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 CD2132D603 for ; Thu, 18 Jan 2024 18:27:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602478; cv=none; b=KwkKvBTpHh/jDn0LonQ1Vk0OpUNN5iH8ViPAoMtrYCe9j48xI3E7LITV0dR2eL0Fgz0yFJIyHIdv5hxoNpOYHS/J4iN025Xi5tOqL32noGLmuBTytSJV5VqEezAI2g9y3TFhhogrX+MVaCYuvVgwj6K4tohn9Xzspkfes/R0tqI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602478; c=relaxed/simple; bh=rEc/vMG0kPWnlPR2IEYPbxgDRACprv3BruKwqZ3xHl4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TP/Fb1kiBjew2+Xc9+rWJXcrl3aG/PfTBPLyCWbNPBe55MYRmjROiPBc4z67x0OWVVtUHT619lOhEtSCjuQcNCiDA0TK+5H3J37ZvnmQQghbJmX8GB4OR1iXyRJ3RIx+52pgcAyfhWdVy8tWEUYyshB/ukUobZcvLA7ZA+NJGTw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=P9Ka34Q8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="P9Ka34Q8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24A65C433F1; Thu, 18 Jan 2024 18:27:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705602478; bh=rEc/vMG0kPWnlPR2IEYPbxgDRACprv3BruKwqZ3xHl4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=P9Ka34Q8joy9stCB8gTz0TIRbj4BbikSOPSLzHpjl+H6dY+7YpsspQlOHxqEtbYcU aABd54iXkLcUBheMFsdwbAHY8U2906C+PHMl8M3lgIOMSnLIjrdRDqL9vKsNSQKxii ETFAD61EYWXG8WaqdmvZl1AcDEXMIYOUHfkAe70tP7tlY5+13alWMdpk6a78CsFwme shWJhhRbVM42YAcg/FPtL9olI52IkrjDbFzkSUeSy7HEJnxjJkKQpaAQsQD2wn18v1 mM9Jwk+v3HkPxkU3dNzdQ3WMfYotRzwWfiJVJR9bbHtJbODu0P4BK8F/Pnht32/FzA owyOgFaai+/wA== From: "Matthieu Baerts (NGI0)" Date: Thu, 18 Jan 2024 19:27:34 +0100 Subject: [PATCH mptcp-next 4/7] selftests: mptcp: increase timeout to 30 min Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-4-f3a4db41c3be@kernel.org> References: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> In-Reply-To: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1145; i=matttbe@kernel.org; h=from:subject:message-id; bh=rEc/vMG0kPWnlPR2IEYPbxgDRACprv3BruKwqZ3xHl4=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlqW2pPCuEbIM9K8oFuHCFcKZOQUf+dkHKYr8hB uIdq+oqUfGJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZaltqQAKCRD2t4JPQmmg c/8bD/9T+GgT1GQ5EBq5SGcoX7bF/f7cgruIMtL3JK6cKPAiKFxtdHWiSKQ7TAb8HN+QqajFFYz h6yLCB8zHNINmLyEbsRX3dwIcy0fiNvJbD0law9jkqtZekVMdHiFhNi4LFrur3k0ENOrytPcP90 Ox86q9ZHGGj+SrMNxmND8b6l9EGqqAyhD4g+GMJmcc2hJ+mp7xRXeTz6ueDLDwQr8wO33kMcWCc I7GVo7EngTWO9I9O4vzZQ9YltAFo2WZTU6/Xm62kA5mMKxto+FgdoDeeQoB4JC8ry8ODxwAWXwv TqBmm+W+h7mUeRAQdlZSQCiPeLyewWHVLVkx9D2XDuMSMwfAx69nFw6hU6wtPxUrsbvrXUSo9Ii gpecN4TDMXIRH4hXvkFLdssCg6IOPyZXaxzuwJ9UszGRlItB1BZ6ab/2NFI8hTw9mZWyvJpyTCA yXpIPoxhOQr/hzw4IN91GT+teYElVvgie0cb42928Y/rKfyOgn92NtF8krF1OgfkbnFwPv8lDFW RB/ulOfMUssQpxOU1C4f9JCpq5asZTZSAMw923lGUGL8XyhiP2Y03Gh9i+sCiYC+w4efMOhZ2Dl F2VkNVn2GkOJQEq6ctltE4wysKaiAHPuVxy55GoFSfpRfep5IonG63Qx9HZYAC09H8s4zUdXvR8 HR4sH1TvsATe+NA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 On very slow environments -- e.g. when QEmu is used without KVM --, mptcp_join.sh selftest can take a bit more than 20 minutes. Bump the default timeout by 50% as it seems normal to take that long on some environments. When a debug kernel config is used, this selftest will take even longer, but that's certainly not a common test env to consider for the timeout. The Fixes tag that has been picked here is there simply to help having this patch backported to older stable versions. It is difficult to point to the exact commit that made some env reaching the timeout from time to time. Fixes: d17b968b9876 ("selftests: mptcp: increase timeout to 20 minutes") Signed-off-by: Matthieu Baerts (NGI0) Acked-by: Paolo Abeni --- tools/testing/selftests/net/mptcp/settings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/settings b/tools/testing/sel= ftests/net/mptcp/settings index 79b65bdf05db..abc5648b59ab 100644 --- a/tools/testing/selftests/net/mptcp/settings +++ b/tools/testing/selftests/net/mptcp/settings @@ -1 +1 @@ -timeout=3D1200 +timeout=3D1800 --=20 2.43.0 From nobody Wed May 15 13:46:39 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 F40A42D058 for ; Thu, 18 Jan 2024 18:27:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602480; cv=none; b=clyCzw5+G/z5/0x9j1nU7ZgG9oEvNtuv+pkVDBOnGmVhj7Um5G+wzk9HDklcSrcxlt6fn1iRloB3hH0Eri6GINX88H9qCEEo0JT+vg9vgzX7jZNmc6QvQhXKaMpZFIxiX6hzKxK8OsmpPV3tpn1dF++93YmJgHk/sS8XcwpgLBc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602480; c=relaxed/simple; bh=dneBnyriZaBVW1JOVF38WivmNrdLbziecO4haB8MS5s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=J7faJxhK4Gr9VB+1m7873HDqtTBPWBLQWTw0/OY8WouFHstpY7cZTNVfpcC7hbzqJETvcZykH2Rys5HI71j8LMVpXKYdTo2x0YXQoBQ7D2JqBcwdxsuOnVNORUt6h6NvavmFbhw5SVmpodMoxFRJXyB/MAsR50EpFXzGX3eJIdY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LrLMuL74; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LrLMuL74" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 202D7C43390; Thu, 18 Jan 2024 18:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705602479; bh=dneBnyriZaBVW1JOVF38WivmNrdLbziecO4haB8MS5s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LrLMuL74h+0gxG2mzWO3E+TIRfBF9reOO9ONxABVw1nLq8O5oUYqIQ+C4sEihOHWJ ZJo3SWK+McThh0NNV3SrxTJejzOiiHEsz4wq/Rpafb7xinQa7HmBP0HkbwKxPC09u8 zv8By609/0f4pgm9bgmmqzohIkM3PGCaO4UA3fnDYcE6jDFEaaZug4I12he4pMxzvF NcgRA4oY6Ei9Xo02douXU4+9pTAUhibi7bnyB+W4aQgac/pxYY3Wie3FiRSMkbXVHR GxVMT9cy4xDRa0+9/WW0b5hosEB9veAJZaxfP1qkjHN6JATwXY/XNofDunEDk/hzpn rFLBBLI5kVvJg== From: "Matthieu Baerts (NGI0)" Date: Thu, 18 Jan 2024 19:27:35 +0100 Subject: [PATCH mptcp-next 5/7] selftests: mptcp: decrease BW in simult flows Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-5-f3a4db41c3be@kernel.org> References: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> In-Reply-To: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" , Paolo Abeni X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1707; i=matttbe@kernel.org; h=from:subject:message-id; bh=dneBnyriZaBVW1JOVF38WivmNrdLbziecO4haB8MS5s=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlqW2pRk5z8eErGnJaThxxjoExtWTbcAQoWxqP2 fjSbqd78Q6JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZaltqQAKCRD2t4JPQmmg c1ZFD/9kB73gRDh/tFMs5Si3V+N8Jr71EbrodMf6l4W6mSTOb7eHy/65YQj5ln/tyzL06YlmEL+ WP4fTbkquGAM4MWpPHUhnV8PMi/qeOQh1tAUoWXYNCdMhQMcnK7jujrrzHd4BH2BXvHQR40Gj/v 1qG4496DVZfNV3V2shdlD+OoaSCPXNU3e6b8GbarvUZCpKBufpndwc4OOx93uy2eQCzBmDKnRaA Oxm1ps0h/90Gti445bRBHU1HbD8URsExebUU8LgF2EpuOV1y7aQaEdV7RRduhNoK1a10DVg6pcP +7sNv8IzXP7Ek7/liClKbSVcF0ATcaQhHTkRCbZZj7WZj468yd28y5LXITj6owf2I79hAHqYf3h vGMszv4AxR50Fkw1S15ujVQKeSVjoUbvgdJqjh4SQx885vS8dcLwP7Tb8oaxxlmPOlCf3rhYmjF 4b/L9EkvaXzRd8BM1acj4AXnTOR0AOp8+yOQBo2rMvUWEtfOcdEB1izwzd+2fsVooTuOF0ZaHgu 6zIZ8zIuq8xtz1GTR+ORsXoFUDfOAxET/lzYmLGcRugBTitlfisC9AOriLqPpKBYclc2/LlgWtc jW7iKlNO1ddwxVAoHU9aWvwbqov3FyseAJCMyYbyi43M/7XvAlBc8GqsYUhkRFGdyWwOvcDC3Rh V+wEJJiOXEYkMuQ== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 When running the simult_flow selftest in slow environments -- e.g. QEmu without KVM support --, the results can be unstable. This selftest checks if the aggregated bandwidth is (almost) fully used as expected. To help improving the stability while still keeping the same validation in place, the BW and the delay are reduced to lower the pressure on the CPU. Fixes: 1a418cb8e888 ("mptcp: simult flow self-tests") Fixes: 219d04992b68 ("mptcp: push pending frames when subflow has free spac= e") Suggested-by: Paolo Abeni Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/simult_flows.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index ae8ad5d6fb9d..0cc964e6f2c1 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -284,12 +284,12 @@ done =20 setup run_test 10 10 0 0 "balanced bwidth" -run_test 10 10 1 50 "balanced bwidth with unbalanced delay" +run_test 10 10 1 25 "balanced bwidth with unbalanced delay" =20 # we still need some additional infrastructure to pass the following test-= cases -run_test 30 10 0 0 "unbalanced bwidth" -run_test 30 10 1 50 "unbalanced bwidth with unbalanced delay" -run_test 30 10 50 1 "unbalanced bwidth with opposed, unbalanced delay" +run_test 10 3 0 0 "unbalanced bwidth" +run_test 10 3 1 25 "unbalanced bwidth with unbalanced delay" +run_test 10 3 25 1 "unbalanced bwidth with opposed, unbalanced delay" =20 mptcp_lib_result_print_all_tap exit $ret --=20 2.43.0 From nobody Wed May 15 13:46:39 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 F157A2D058 for ; Thu, 18 Jan 2024 18:28:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602481; cv=none; b=scBB1jeybFXfce/7WMCPrJrTA5AeLpm3DB37LRn54oRTVSFVHYyqSa4os6vNjebFEpUSIZ6FOuXhCta0duoMJW0ykkRRnpwGv02fRSROzAADNavJvVlgVp6jA4eNSVbMw2+0KATI2Mbj9Ny+s1FfjMthQGkmCMcv6byg2tDU/xI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602481; c=relaxed/simple; bh=TaKW0dPOmIMHHiuk/y6q33mLFQ5s6XutEGm6y0J4tBg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hiIJx8iub9INHjSsiWB87NSK/Y4zq9+1mAu6z1fIWMHrHHBSzrWeOqDpwoVQqGsmItqOZtjmPOIv+bBpDtvGjsSbcX0Z1iPV5fRf/sXyptheIi/NnivyBVJHG0aNtjRXrei9c+ncEJ2z9RnEOz9GwZ/CL2lDBE4/yh1V4UBYvAA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JKiNjvX5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JKiNjvX5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49983C43390; Thu, 18 Jan 2024 18:28:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705602480; bh=TaKW0dPOmIMHHiuk/y6q33mLFQ5s6XutEGm6y0J4tBg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=JKiNjvX5Xgt5GR4xeUPKPgUmAp+AN7OuQRbmBiaZPQD7cVR9/rl+EwHulMo8oQygR WuZt4FPqJyUbUdYGBel6K10/XWq8Uo6XAD0S+HuMWc7np00J3XGDnHWdeIh4Uiju3k NvBEKBuTQODOkSDfp3ETQp8iVG88+fTxqJWUBH8/fVlPE6cgfhrhFPagTAIZpsbaIJ Ff07na+Us5WNKBF4iCJ5djo0pguIxZoNKJNbNoFSlScUNDTskT4UVOkTGKgDOwMopw 9NomQlxXf1QRj843d75SS5eVz4Hzg67fx1fxVyLwRj9gsLgl67gNFZIWhiaM9HgAMX WmZHkzUBHw5Gw== From: "Matthieu Baerts (NGI0)" Date: Thu, 18 Jan 2024 19:27:36 +0100 Subject: [PATCH mptcp-next 6/7] selftests: mptcp: allow changing subtests prefix Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-6-f3a4db41c3be@kernel.org> References: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> In-Reply-To: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1259; i=matttbe@kernel.org; h=from:subject:message-id; bh=TaKW0dPOmIMHHiuk/y6q33mLFQ5s6XutEGm6y0J4tBg=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlqW2pkvLLubMhy7niPJG84cPddEuKfk/8pnLSP RtA4mCpb1iJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZaltqQAKCRD2t4JPQmmg cxRfEACPd2+hmW7WU2rD9tIBGuofqH/tCnTR0gMZobpzKVXP27a2OkJqH2NaL7YxV/tIVPt8xFU TG9gEzyk6PYnfL+IJDNfNoLYiqSLMJREWf63Ms0KO1P5SF9jC1gQXUC5+mDi7wt/YwCzUY72WGY uKCegLrvak3JdnRFfpkZVYVLPYcAoQuZchApzCKzF298U41kLYlZ+A8WfYKxRgZHn4qJK/ycqyl wtsDr/htvQAgWUX7jaJFNxCvquv9FxHRJxV3LQzNqYEUCI8siYWyWnjE7HYA7FbWyPIztB6qSYC uHjkssZRNUPjm6oF6rh9hwDUsN6hK8IlWV6vOr1a0UsNhWWJEk4xzF971DTOYwvroImGiFpkVf0 XhAqvILY1JvIx7IsS3b+G3g3HtfQuLF1bEz61G1h/b37CJxLqyTd1o8wwV2i6/+8yaFMKaC0hFx l5HPgselJHKCXLO/jR7XEX6dZj7cVkaZNprhYSGLoFNLE3yn7st7xUeo/P0Gka4lSZ4yrgLOv3m Uu7CIcBXPORIQ5PzDuzYq6o8P8+5Iif0yPytrM9KC7cEs87jmrUt7VwST8u5bi5YOMpF3SJW6V+ eQt6ba9goW06dQT6ghk47VbHqja462mdkGgNEJPNfZxIo475vfOOIQNustrHR+zhJZSfhv2bej3 28uIWbW+YXLyX4Q== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 If a CI executes the same selftest multiple times with different options, all results from the same subtests will have the same title, which confuse the CI. With the same title printed in TAP, the tests are considered as the same ones. Now, it is possible to override this prefix by using MPTCP_LIB_KSFT_TEST env var, and have a different title. While at it, use 'basename' to remove the suffix as well instead of using an extra 'sed'. Fixes: c4192967e62f ("selftests: mptcp: lib: format subtests results in TAP= ") Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 022262a2cfe0..3a2abae5993e 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -6,7 +6,7 @@ readonly KSFT_FAIL=3D1 readonly KSFT_SKIP=3D4 =20 # shellcheck disable=3DSC2155 # declare and assign separately -readonly KSFT_TEST=3D$(basename "${0}" | sed 's/\.sh$//g') +readonly KSFT_TEST=3D"${MPTCP_LIB_KSFT_TEST:-$(basename "${0}" .sh)}" =20 MPTCP_LIB_SUBTESTS=3D() =20 --=20 2.43.0 From nobody Wed May 15 13:46:39 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 46BC42D058 for ; Thu, 18 Jan 2024 18:28:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602482; cv=none; b=mHWRWezSf5Vlkm6laCiF9TCrrAQENe9Si6ucEkmnaoUCbaGOdB1ypMPYnxEXdJ0WIUo2eMnbRnIZOAzd6Q/SYcHntLpw8/03d8bhzf/1YiQZgBKFLCHsAQis0Tke29HZa8cDmdpkfa5/Su3ca49pNrd8jQXL4vrVEnXpMKjDmMA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705602482; c=relaxed/simple; bh=Zx8ztWLbl0Ls8/1ZWr3YYT7es5suQ4BXikDCsEYKYe8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NKJgVzlgKyKuN5opCCe5tRLEGSK+Qlg0RE0aUuC8EeNeIej356HdZRIfFxcryGyjUSL2xXkDmpHAQy/sHc930Nw/LjOQARhdfzsBshhVGsYlPPREyWm1AT2n3ZGacfUJJRMoDxi9EJZ7hhp5P+ri8Vncye1MSANnypA2ll0JOH0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XEhuBR3s; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XEhuBR3s" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44597C43390; Thu, 18 Jan 2024 18:28:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705602481; bh=Zx8ztWLbl0Ls8/1ZWr3YYT7es5suQ4BXikDCsEYKYe8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=XEhuBR3sh0cgK1hmQOOAbdC9+wdxjjNDnQwCYWBXd10B6miXw9kQu2JDuFtC3gXxT H1cxbqLJqrjMT+xLNSnWun1aFL+JXIE7WUYHkB9kSTKdJL5mQLOw5Q1W73Vjk8WOQf D0j98A8EuFW+iWfQvDTwFYHh6vh6tijkehBuEI80p5NuRtLGTD9JNC4nNcyG9wT8kY 1d0SsuYbi7ZM+JhKK30D3AtT5Nm43r6Ke2zJvjhTCRqkWQGG8l6wsF/1WXI676RQh8 JRqugD5Pqo1U4JmvZepyeEtzodoPKDjaZvWuv+eb3tCYmg4StliekjLAwHJ8v5EmvY lhTHHHy/cV6Nw== From: "Matthieu Baerts (NGI0)" Date: Thu, 18 Jan 2024 19:27:37 +0100 Subject: [PATCH mptcp-next 7/7] selftests: mptcp: join: stop transfer when check is done Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-7-f3a4db41c3be@kernel.org> References: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> In-Reply-To: <20240118-selftests-mptcp-simult-slack-qemu-no-kvm-v1-0-f3a4db41c3be@kernel.org> To: mptcp@lists.linux.dev Cc: "Matthieu Baerts (NGI0)" X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=3655; i=matttbe@kernel.org; h=from:subject:message-id; bh=Zx8ztWLbl0Ls8/1ZWr3YYT7es5suQ4BXikDCsEYKYe8=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBlqW2pgKGq3532IYnGb4eQT9iFh/Rx/DGdKU7Ct Erc4GOctLGJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZaltqQAKCRD2t4JPQmmg c1I6D/9s8raZRnnKN0mFWlckOs1E+sDrFHYkuo2E6flGWvrrXaNn/aTU54XVw+imE/GuGn7gJgT 5uC9FJSlKBsozDHhpi0Gf/oy8x1DctLureS+FGY9ZEkU4buPgM50l5KNg6786nKwbkgPBQUBXXH jnar13MNzh8DsJfmEH2D7Au7aoHjzRkHZpxvZk9h+K2ercx7ZW0aFCKGmtGWYsUNkUEeyPbRXQ7 j4WKAhzHhrLk4bapgQSP77XQUbOJjR8FK4fPoJtTpz8YL+kQybIXBi4AFjKkPK599y0YTLm2RNq vlj9syAx0ujFg2kq4sPZEAGP2Ce+roakTHwYnMg3OzugrouoENmoFWYbt+95luZ1/6Cnjh0RTvf k7noWcdf8mKm5QXa7asqACuhbMYsRRwLTosYAG5BMxmaEaisII+fII9l/P6Ow4pBoheshxTcK2j DeIb6lI1PZlF/9cZBNy7GW5SNP6Jgu7Lu01DfmO4uxSZ3RnmqUGh+CS2SBOjIrte9SF9C+nQz6v lOYKtKYHeRWHS6d8Fgf5EH2LVDfGHs2t3PdmJscmK6NfHiAhrqQjmbClQ0yyoyt6n+Na+bUMUMO qmsOLK50ogcJRFma5kFnR/046/f8I9cXIIlbx3PWpw5qBCGCGfC2WTfuXxJhxrOBEXIJKPennCu wt6DguqoEai/UaQ== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Since the mentioned commit, the "userspace pm" tests of mptcp_join selftests are launching the whole transfer in the background, do the required checks, then wait for the end of transfer. There is no need to wait longer, especially because the checks at the end of the transfer are ignored (which is fine). This saves quite a few seconds on slow environments. While at it, use 'mptcp_lib_kill_wait()' helper everywhere, instead of on a specific one with 'kill_tests_wait()'. Note that old versions will need commit bdbef0a6ff10 ("selftests: mptcp: add mptcp_lib_kill_wait") as well. Fixes: 4369c198e599 ("selftests: mptcp: test userspace pm out of transfer") Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 27 ++++++++++-----------= ---- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 3a5b63026191..c07386e21e0a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -643,13 +643,6 @@ kill_events_pids() mptcp_lib_kill_wait $evts_ns2_pid } =20 -kill_tests_wait() -{ - #shellcheck disable=3DSC2046 - kill -SIGUSR1 $(ip netns pids $ns2) $(ip netns pids $ns1) - wait -} - pm_nl_set_limits() { local ns=3D$1 @@ -3453,7 +3446,7 @@ userspace_tests() chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 kill_events_pids - wait $tests_pid + mptcp_lib_kill_wait $tests_pid fi =20 # userspace pm create destroy subflow @@ -3475,7 +3468,7 @@ userspace_tests() chk_mptcp_info subflows 0 subflows 0 chk_subflows_total 1 1 kill_events_pids - wait $tests_pid + mptcp_lib_kill_wait $tests_pid fi =20 # userspace pm create id 0 subflow @@ -3494,7 +3487,7 @@ userspace_tests() chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 2 2 kill_events_pids - wait $tests_pid + mptcp_lib_kill_wait $tests_pid fi =20 # userspace pm remove initial subflow @@ -3518,7 +3511,7 @@ userspace_tests() chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 1 1 kill_events_pids - wait $tests_pid + mptcp_lib_kill_wait $tests_pid fi =20 # userspace pm send RM_ADDR for ID 0 @@ -3544,7 +3537,7 @@ userspace_tests() chk_mptcp_info subflows 1 subflows 1 chk_subflows_total 1 1 kill_events_pids - wait $tests_pid + mptcp_lib_kill_wait $tests_pid fi } =20 @@ -3558,7 +3551,8 @@ endpoint_tests() pm_nl_set_limits $ns2 2 2 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal speed=3Dslow \ - run_tests $ns1 $ns2 10.0.1.1 2>/dev/null & + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! =20 wait_mpj $ns1 pm_nl_check_endpoint "creation" \ @@ -3573,7 +3567,7 @@ endpoint_tests() pm_nl_add_endpoint $ns2 10.0.2.2 flags signal pm_nl_check_endpoint "modif is allowed" \ $ns2 10.0.2.2 id 1 flags signal - kill_tests_wait + mptcp_lib_kill_wait $tests_pid fi =20 if reset "delete and re-add" && @@ -3582,7 +3576,8 @@ endpoint_tests() pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow test_linkfail=3D4 speed=3D20 \ - run_tests $ns1 $ns2 10.0.1.1 2>/dev/null & + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! =20 wait_mpj $ns2 chk_subflow_nr "before delete" 2 @@ -3597,7 +3592,7 @@ endpoint_tests() wait_mpj $ns2 chk_subflow_nr "after re-add" 2 chk_mptcp_info subflows 1 subflows 1 - kill_tests_wait + mptcp_lib_kill_wait $tests_pid fi } =20 --=20 2.43.0