From nobody Fri Oct 18 08:30:57 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 27E263D551 for ; Wed, 15 May 2024 06:44:33 +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=1715755474; cv=none; b=B7e8pItlU6nOEEmX5TPFwKzvsD7P+CmvSLpD715LErdqbalqchwsdWMFlkIIb/g9s5NbmGCc0apYxB4puhBRCbnPjM+JbYBzYjs8V4hWX1mwN2bPmuuncEc6k60c3OgBILIBxvO5wWsxjjFtxuuqcvO32fvzndK56dlJ9GPChcY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715755474; c=relaxed/simple; bh=fwioNH5HhE48LN7rMrbpuKVb52W01ZEVcJdkcOLSq/o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pu65CndtvTFoL74cyo1cNdFF7J9t+IZSLmkhQBInDKXnOgRdcgdcSTopnp1hMONNwBXD7aRv2UbbMIGpjr++S2V7U4Hv4BnVQnp2reAOeI10PvZvxi5qxKoa2bhYkYjstvd1vjT5YwdY3ZzojYN4UzVmjYkcuyWUe1WAqkBv2HY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ev85alCK; 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="Ev85alCK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7C1EFC2BD11; Wed, 15 May 2024 06:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715755473; bh=fwioNH5HhE48LN7rMrbpuKVb52W01ZEVcJdkcOLSq/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ev85alCKPS+K1RCVuI+JmDIF0Dij/toy54hdToNlupC2btL2+0HUecMuDocu3VQIC fq9nn2brExmg7WJ31TbXuRDpVRw3lNESDqlaV0oo1Cotjvh+5aEfk5hrLSWa7sSZiC kaClLlTPoMdwfdxTVRBAVNUxHGUKealum9YxemlwYXC4uEovichCElWeJFXvJXu9DY FQwB/pq2zihiTMyXVzVB1sxQChUFBbcFmaGurAvr7tkoKGcRj7cSjX+Pyq8fyJNIdi l8y2L+6DBA//EMXhEh0OyuSTU06XvbCWi3vSGQMlQQ5O0jbCGOZUxuuR3Yga4GodO2 Ri6h/dxyUGciA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 1/3] selftests/bpf: Handle SIGINT when creating netns Date: Wed, 15 May 2024 14:44:21 +0800 Message-ID: <8c4198e7855045559ab746be7d90f72fd550a857.1715755275.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 It's necessary to delete netns during BPF selftests interrupt, otherwise the next tests run will fail due to unable to create netns. This patch adds a new SIGINT handle netns_sig_handler() in create_netns(), and deletes NS_TEST in this handler. For passing argument to signal handler, a trick mentioned in [1] is used. [1] https://stackoverflow.com/questions/6970224/providing-passing-argument-to-s= ignal-handler Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/network_helpers.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/testing/selftests/bpf/network_helpers.c b/tools/testing/= selftests/bpf/network_helpers.c index 0b25b008f4f6..7e233b8c75d9 100644 --- a/tools/testing/selftests/bpf/network_helpers.c +++ b/tools/testing/selftests/bpf/network_helpers.c @@ -519,6 +519,16 @@ void cleanup_netns(struct nstoken *token) close_netns(token); } =20 +static int netns_sig_handler(const int sig, void *ptr) +{ + struct nstoken *token =3D (struct nstoken *)ptr; + + signal(sig, SIG_IGN); + if (sig =3D=3D SIGINT) + cleanup_netns(token); + return 0; +} + struct nstoken *create_netns(const char *name) { struct nstoken *token =3D NULL; @@ -539,6 +549,8 @@ struct nstoken *create_netns(const char *name) goto fail; } =20 + signal(SIGINT, (__sighandler_t)netns_sig_handler); + netns_sig_handler(SIGUSR1, (void *)token); return token; =20 fail: --=20 2.43.0 From nobody Fri Oct 18 08:30:57 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 A32563A8D0 for ; Wed, 15 May 2024 06:44:35 +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=1715755475; cv=none; b=XUr2IZfo4nvZnJ8Q7Nh41qvKh1fKD0rAcJ2Y+N93ok/hBaxX6G0MTB80a7KPQG6xyzio26eOH8FPRTYFOXIhynt7BAWMOCP+Pnxg5IwH8XmS8EPuSHM4qQ8YiLc0lrOEtFlML7+17y0l9AGgvDhNTMwiAI+abSLzFWRGXKvV1mQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715755475; c=relaxed/simple; bh=udG9vWPF00neKQVSuqKavYO999fBQVr3vJjG/gBGAtM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nU/cyk5NQJCGVGGcvNnPOp1JyF4hUSvlcMEXPPKG6hMvrJDC4FNDjgcIJ9utw6jVvcDkQxB8eUl1aLDOdrbIa6IdNn61jQkxwMfeb4W83e9V9daLf2uomAd0i57tRuJypNq7iq5rj+VtjWWt2OE/xjOwBv5JuN+ANTVp7EMa2Us= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MlTo/HJl; 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="MlTo/HJl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 564F2C116B1; Wed, 15 May 2024 06:44:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715755475; bh=udG9vWPF00neKQVSuqKavYO999fBQVr3vJjG/gBGAtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MlTo/HJlIyYNiEQrJCMxz+wOnut7mAcuVZeDvKcR7KBP7P/ccNkCBkHSlxGQFaBR0 54wEGnrwIPPG2yLYSY3Kvjc71iy+5YdszHyWFG1J64NfrsQJOLL7trFsnC9c53A2QT a7AmJrxx4vO5zUDxT2Z6lqMl70QZxrFy8qiAt7T9giyLuaa8blRXcKGIqLtQJxp6Bz cAMu4QEG40xAC7CtKbfjZG53mOpJLDQbSvpD/xMo9EbhsTzNa2dB+f/xSnS4uBLrF8 00959hedGWNmIZKEhd3zFXZB39zYE8+y7ImvQs6oRYBpmdoYp1h3weL5zNxDA0QFzv JJkqka6hawClA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/3] Squash to "selftests/bpf: Add mptcp subflow subtest" Date: Wed, 15 May 2024 14:44:22 +0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 create_netns() is updated in "bpf-next add netns helpers" series, test_subflow() needs to be updated too. That means v3 of "selftests/bpf: new MPTCP subflow subtest" cannot be sent to bpf-next at the moment until this "bpf-next add netns helpers" series is accepted. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index c7f61fd9e7a5..a4863328d2c7 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -418,7 +418,7 @@ static void test_subflow(void) if (!ASSERT_OK(err, "prog_attach")) goto skel_destroy; =20 - nstoken =3D create_netns(); + nstoken =3D create_netns(NS_TEST); if (!ASSERT_OK_PTR(nstoken, "create_netns: mptcp_subflow")) goto skel_destroy; =20 --=20 2.43.0 From nobody Fri Oct 18 08:30:57 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 C4A5B3D994 for ; Wed, 15 May 2024 06:44:37 +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=1715755477; cv=none; b=g9Wmh0jhKbT5diV0i6TJpYznFYPQFZ/tTOrNZu7cJxq1/jo5XIqoE5KGuaRdzGWHlwWZzwBBCDy0KR+72EeDmmIZ1pvgPwlfKAxWJsabczMGVQLLZB2lsl/TBMbl/wnOeXs1pWQMBpnJZCMFpdYIMMZZ3jC/NDrtSa28yUPu7JE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715755477; c=relaxed/simple; bh=XDDN2Ayb9LBIzE7Gsbex2RBDsfP7vJLCt++bv7OxyZw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cxL+9I7YY7Qs2ocESDpm6daSs4CyVUHUNbwQJfVHUmttzcdoAzOk1xvWuPGnu9i2Cj4Yyb/U3v83LYp16hvFLYqK8vX9DS1KuAeZ6e3aFrCA5C6DZ3J+GrShH3j8/GIJ6N1c1hJeMk5K5+lR2xp0+q+KIFiWDwR+6aZRRaqTyWM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QL+Xr/+l; 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="QL+Xr/+l" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F4FDC2BD11; Wed, 15 May 2024 06:44:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715755477; bh=XDDN2Ayb9LBIzE7Gsbex2RBDsfP7vJLCt++bv7OxyZw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QL+Xr/+lPn8A8tFILmnM3Cvayw1rS2yQhUqr1N7JrexyaClSeoK3XmrNQL6A7Dcjr ISXckT//iu5dlP2JL47H2qB+BhZUyfi5KS1wkj301sRv/fTmgSU6IFeJR9W09jTUYM IjUSi3MfJTkYkskdCJ4QIUFLSf4Ktge1Iyl7zN0Oai6FEmH80pACTMnQyklBn1jGDr JS3ShGlx6G6Or1JtaR4oZvRX4AGA34wJtblE+k3bjk59lND5skyI/Vii24ZrJMct/3 uB/EVPfuJid7sZ8tjXc9m/JPuQtAXnvoMiB3IJlqe43pdo2QATYeh2HfcFa3s5Hg9F 9s4KoHPKLZ0wA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 3/3] Squash to "selftests/bpf: Add bpf scheduler test" Date: Wed, 15 May 2024 14:44:23 +0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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 create_netns() is updated in "bpf-next add netns helpers" series, sched_init() needs to be updated too. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index a4863328d2c7..1b2ffc5211ea 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -439,7 +439,7 @@ static struct nstoken *sched_init(char *flags, char *sc= hed) { struct nstoken *nstoken; =20 - nstoken =3D create_netns(); + nstoken =3D create_netns(NS_TEST); if (!ASSERT_OK_PTR(nstoken, "create_netns")) return NULL; =20 --=20 2.43.0