From nobody Thu Oct 2 02:15:04 2025 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (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 7C53A3126D8 for ; Wed, 24 Sep 2025 14:50:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758725429; cv=none; b=jcqzCPyUys9Ntrg0jhPZnSJpbApc4n3HeE1H0/Kn8JvmMy7H+ml1/UhSN+XkEwaY58p6doPNKKjyag4uxkRKLQeOVqVCqgh/w6PopTH5QjV5nh8muOaQorqpfngPMOmvAx1/lhmruVzMnFIKJRRkTiyAVc98TgiPA+zydsQwxec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758725429; c=relaxed/simple; bh=tN+KK502mRn5IU2MfOua2IbsgatQICalJNBq1gn4xBU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OnYHJMPF4DhsOiAjRCc22fNfq0eYTY+Ajo0KWcLVyP//+Pj3fdKYk5JZTj/mgsuZHku+WJ845PlXfmKnVhrn3jw8h0Y8dLVdFJW1TmICZJNx1tIAi3D2aih27Ik9xILdT7ovo7CDbHq2rdqkrBVn4kZaLPDJntXp/rDEpLCHmGw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=PjJ2y6oG; arc=none smtp.client-ip=185.171.202.116 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="PjJ2y6oG" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id E5620C011C1; Wed, 24 Sep 2025 14:50:08 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 1E7A160634; Wed, 24 Sep 2025 14:50:26 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id C92D8102F1972; Wed, 24 Sep 2025 16:50:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1758725424; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=WGWlPkl4pGG2y4n8r70mjy/ZV+JI6orK8Oq0psEM/Wg=; b=PjJ2y6oGs6Qy4QsMcuo7ez/7P7hirhWs0vo3ASxlceKQXUjvwEH7SIUwtkRXuV7kuxJxzv +8pQd/UndoztOAApaekuHPImdUIjvtEffqwdd0SVcH9titqy7gX45h21SefuRRPbaDva02 fHTD0LLsgpMDjBTrUNFRpxAe/2lXIT5+OUHhg3OuTuSwMlyHNsn5HFhrDS54xC70aSIg3J XFVBo1ruDketINLFj6DpQ2OiFlf8kcxB7gLcWd1vDejUKfV1QB+1q0TdYlvNC/MPYOZbWB wIhmRuxI1MF3HWjIHi67PefIEH8iJey7cThLsQ4qiirsGVcT4IMR0X1tCcTRRg== From: "Bastien Curutchet (eBPF Foundation)" Date: Wed, 24 Sep 2025 16:49:44 +0200 Subject: [PATCH bpf-next v4 09/15] selftests/bpf: test_xsk: Don't exit immediately when xsk_attach fails Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250924-xsk-v4-9-20e57537b876@bootlin.com> References: <20250924-xsk-v4-0-20e57537b876@bootlin.com> In-Reply-To: <20250924-xsk-v4-0-20e57537b876@bootlin.com> To: =?utf-8?q?Bj=C3=B6rn_T=C3=B6pel?= , Magnus Karlsson , Maciej Fijalkowski , Jonathan Lemon , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer Cc: Thomas Petazzoni , Alexis Lothore , netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, "Bastien Curutchet (eBPF Foundation)" X-Mailer: b4 0.14.2 X-Last-TLS-Session-Version: TLSv1.3 xsk_reattach_xdp calls exit_with_error() on failures. This exits the program immediately. It prevents the following tests from being run and isn't compliant with the CI. Add a return value to the functions handling XDP attachments to handle errors more smoothly. Signed-off-by: Bastien Curutchet (eBPF Foundation) --- tools/testing/selftests/bpf/test_xsk.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/bpf/test_xsk.c b/tools/testing/selftes= ts/bpf/test_xsk.c index 7db1d974e31511e93b05bf70be991cee4cd444c6..0adb6c0b948f6216b24d0562bcd= a26097dbb9dbc 100644 --- a/tools/testing/selftests/bpf/test_xsk.c +++ b/tools/testing/selftests/bpf/test_xsk.c @@ -1643,7 +1643,7 @@ static bool xdp_prog_changed_tx(struct test_spec *tes= t) return ifobj->xdp_prog !=3D test->xdp_prog_tx || ifobj->mode !=3D test->m= ode; } =20 -static void xsk_reattach_xdp(struct ifobject *ifobj, struct bpf_program *x= dp_prog, +static int xsk_reattach_xdp(struct ifobject *ifobj, struct bpf_program *xd= p_prog, struct bpf_map *xskmap, enum test_mode mode) { int err; @@ -1652,31 +1652,40 @@ static void xsk_reattach_xdp(struct ifobject *ifobj= , struct bpf_program *xdp_pro err =3D xsk_attach_xdp_program(xdp_prog, ifobj->ifindex, mode_to_xdp_flag= s(mode)); if (err) { ksft_print_msg("Error attaching XDP program\n"); - exit_with_error(-err); + return err; } =20 if (ifobj->mode !=3D mode && (mode =3D=3D TEST_MODE_DRV || mode =3D=3D TE= ST_MODE_ZC)) if (!xsk_is_in_mode(ifobj->ifindex, XDP_FLAGS_DRV_MODE)) { ksft_print_msg("ERROR: XDP prog not in DRV mode\n"); - exit_with_error(EINVAL); + return -EINVAL; } =20 ifobj->xdp_prog =3D xdp_prog; ifobj->xskmap =3D xskmap; ifobj->mode =3D mode; + + return 0; } =20 -static void xsk_attach_xdp_progs(struct test_spec *test, struct ifobject *= ifobj_rx, +static int xsk_attach_xdp_progs(struct test_spec *test, struct ifobject *i= fobj_rx, struct ifobject *ifobj_tx) { - if (xdp_prog_changed_rx(test)) - xsk_reattach_xdp(ifobj_rx, test->xdp_prog_rx, test->xskmap_rx, test->mod= e); + int err =3D 0; + + if (xdp_prog_changed_rx(test)) { + err =3D xsk_reattach_xdp(ifobj_rx, test->xdp_prog_rx, test->xskmap_rx, t= est->mode); + if (err) + return err; + } =20 if (!ifobj_tx || ifobj_tx->shared_umem) - return; + return 0; =20 if (xdp_prog_changed_tx(test)) - xsk_reattach_xdp(ifobj_tx, test->xdp_prog_tx, test->xskmap_tx, test->mod= e); + err =3D xsk_reattach_xdp(ifobj_tx, test->xdp_prog_tx, test->xskmap_tx, t= est->mode); + + return err; } =20 static void clean_sockets(struct test_spec *test, struct ifobject *ifobj) @@ -1789,7 +1798,8 @@ static int testapp_validate_traffic(struct test_spec = *test) } } =20 - xsk_attach_xdp_progs(test, ifobj_rx, ifobj_tx); + if (xsk_attach_xdp_progs(test, ifobj_rx, ifobj_tx)) + return TEST_FAILURE; return __testapp_validate_traffic(test, ifobj_rx, ifobj_tx); } =20 --=20 2.51.0