From nobody Fri Oct 3 11:22:25 2025 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (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 169D13043BC; Tue, 2 Sep 2025 12:54:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756817663; cv=none; b=upyR+pW4sqnwsmn3A0nSbT4i1ACNENdDP4hQ1agkH4eAErOLXq7K1p79ux8R7pP3lQDQ9sim4YFrSO22pgWGnW13BvIgvuqmOcZbK4Xw6OkLJeUVc0NbXOkmjn8aJd1xcqFzBPh7g50jWzVwbld2lRSnljP84Sa9MqItS6BYA5M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756817663; c=relaxed/simple; bh=s/73fyjHxJ5Y9R+laQCQB1ztSpJvMfxBWK+M7CRVLNc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RIORfZinYdHDxFQkRxds3nGn4bSK7znu6/qIJyHGxz/OMLPkXHalSnQefEDYTJ4WThDBagIJvCDkS6Dny9V2yWC7yHYNpuuTRA2HKETN/209I+k9Uc3mAA2DHqejsfXO0UACpO1voHI/Il7jyNds+vpDTkz76Xya8tl62Toc73w= 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=ys6XmphR; arc=none smtp.client-ip=185.246.84.56 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="ys6XmphR" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id B41D81A0D98; Tue, 2 Sep 2025 12:54:19 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 8BF7160695; Tue, 2 Sep 2025 12:54:19 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 5BBF61C22A376; Tue, 2 Sep 2025 14:54:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1756817658; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=13aUAv+FMrbf0NWEwVey80HyLY8aQFrz1TzrER4xzCA=; b=ys6XmphRGWUyPlaHES/znsAGpdc5kLk9q3Fvu+sJMSFT1IHdON4qXLtK/Mg9b9EEZkNMqN EGZrCRo4I4/N6t5ew1HSRE/7AqE+A+yZXW8a+7Bmpic3V54q6MY4VBcEAogai3aCUKTwrt 0HIk+VFw6WIsv1Fz2/TTptH5WCE4hnAqMZX9XbI+atK6twvX0W62NUppI2HDlSLPeauoil jdGj0d1S3Uo2EKwTpg320GhElCpgG3DNL5EBTHrP3DmKobviJteCnol9yMQQnLQ2al5bNq +iRcsF2qy8YTDBznkY/d8txC1Ldgo0sMAOzfTA5ilDHOKkQyjkPLuOOYTXyslQ== From: "Bastien Curutchet (eBPF Foundation)" Date: Tue, 02 Sep 2025 14:50:01 +0200 Subject: [PATCH bpf-next v2 11/14] selftests/bpf: test_xsk: Don't exit immediately on allocation failures 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: <20250902-xsk-v2-11-17c6345d5215@bootlin.com> References: <20250902-xsk-v2-0-17c6345d5215@bootlin.com> In-Reply-To: <20250902-xsk-v2-0-17c6345d5215@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 If any allocation in the pkt_stream_*() helpers fail, exit_with_error() is called. This terminates the program immediately. It prevents the following tests from running and isn't compliant with the CI. Return NULL in case of allocation failure. Return TEST_FAILURE when something goes wrong in the packet generation. Clean up the resources if a failure happens between two steps of a test. Signed-off-by: Bastien Curutchet (eBPF Foundation) --- tools/testing/selftests/bpf/test_xsk.c | 136 ++++++++++++++++++++++++-----= ---- 1 file changed, 101 insertions(+), 35 deletions(-) diff --git a/tools/testing/selftests/bpf/test_xsk.c b/tools/testing/selftes= ts/bpf/test_xsk.c index b22b99f2e4acb528928654ec00995dc892487068..dac057866c8521da9ca592afa82= 93164e7c43d48 100644 --- a/tools/testing/selftests/bpf/test_xsk.c +++ b/tools/testing/selftests/bpf/test_xsk.c @@ -489,7 +489,7 @@ static struct pkt_stream *__pkt_stream_generate(u32 nb_= pkts, u32 pkt_len, u32 nb =20 pkt_stream =3D __pkt_stream_alloc(nb_pkts); if (!pkt_stream) - exit_with_error(ENOMEM); + return NULL; =20 pkt_stream->nb_pkts =3D nb_pkts; pkt_stream->max_pkt_len =3D pkt_len; @@ -513,37 +513,56 @@ static struct pkt_stream *pkt_stream_clone(struct pkt= _stream *pkt_stream) return pkt_stream_generate(pkt_stream->nb_pkts, pkt_stream->pkts[0].len); } =20 -static void pkt_stream_replace_ifobject(struct ifobject *ifobj, u32 nb_pkt= s, u32 pkt_len) +static int pkt_stream_replace_ifobject(struct ifobject *ifobj, u32 nb_pkts= , u32 pkt_len) { ifobj->xsk->pkt_stream =3D pkt_stream_generate(nb_pkts, pkt_len); + + if (!ifobj->xsk->pkt_stream) + return -ENOMEM; + + return 0; } =20 -static void pkt_stream_replace(struct test_spec *test, u32 nb_pkts, u32 pk= t_len) +static int pkt_stream_replace(struct test_spec *test, u32 nb_pkts, u32 pkt= _len) { - pkt_stream_replace_ifobject(test->ifobj_tx, nb_pkts, pkt_len); - pkt_stream_replace_ifobject(test->ifobj_rx, nb_pkts, pkt_len); + int ret; + + ret =3D pkt_stream_replace_ifobject(test->ifobj_tx, nb_pkts, pkt_len); + if (ret) + return ret; + + return pkt_stream_replace_ifobject(test->ifobj_rx, nb_pkts, pkt_len); } =20 -static void __pkt_stream_replace_half(struct ifobject *ifobj, u32 pkt_len, +static int __pkt_stream_replace_half(struct ifobject *ifobj, u32 pkt_len, int offset) { struct pkt_stream *pkt_stream; u32 i; =20 pkt_stream =3D pkt_stream_clone(ifobj->xsk->pkt_stream); + if (!pkt_stream) + return -ENOMEM; + for (i =3D 1; i < ifobj->xsk->pkt_stream->nb_pkts; i +=3D 2) pkt_stream_pkt_set(pkt_stream, &pkt_stream->pkts[i], offset, pkt_len); =20 ifobj->xsk->pkt_stream =3D pkt_stream; + + return 0; } =20 -static void pkt_stream_replace_half(struct test_spec *test, u32 pkt_len, i= nt offset) +static int pkt_stream_replace_half(struct test_spec *test, u32 pkt_len, in= t offset) { - __pkt_stream_replace_half(test->ifobj_tx, pkt_len, offset); - __pkt_stream_replace_half(test->ifobj_rx, pkt_len, offset); + int ret =3D __pkt_stream_replace_half(test->ifobj_tx, pkt_len, offset); + + if (ret) + return ret; + + return __pkt_stream_replace_half(test->ifobj_rx, pkt_len, offset); } =20 -static void pkt_stream_receive_half(struct test_spec *test) +static int pkt_stream_receive_half(struct test_spec *test) { struct pkt_stream *pkt_stream =3D test->ifobj_tx->xsk->pkt_stream; u32 i; @@ -557,14 +576,19 @@ static void pkt_stream_receive_half(struct test_spec = *test) =20 test->ifobj_rx->xsk->pkt_stream =3D pkt_stream_generate(pkt_stream->nb_pk= ts, pkt_stream->pkts[0].len); + if (!test->ifobj_rx->xsk->pkt_stream) + return -ENOMEM; + pkt_stream =3D test->ifobj_rx->xsk->pkt_stream; for (i =3D 1; i < pkt_stream->nb_pkts; i +=3D 2) pkt_stream->pkts[i].valid =3D false; =20 pkt_stream->nb_valid_entries /=3D 2; + + return 0; } =20 -static void pkt_stream_even_odd_sequence(struct test_spec *test) +static int pkt_stream_even_odd_sequence(struct test_spec *test) { struct pkt_stream *pkt_stream; u32 i; @@ -573,13 +597,19 @@ static void pkt_stream_even_odd_sequence(struct test_= spec *test) pkt_stream =3D test->ifobj_tx->xsk_arr[i].pkt_stream; pkt_stream =3D __pkt_stream_generate(pkt_stream->nb_pkts / 2, pkt_stream->pkts[0].len, i, 2); + if (!pkt_stream) + return -ENOMEM; test->ifobj_tx->xsk_arr[i].pkt_stream =3D pkt_stream; =20 pkt_stream =3D test->ifobj_rx->xsk_arr[i].pkt_stream; pkt_stream =3D __pkt_stream_generate(pkt_stream->nb_pkts / 2, pkt_stream->pkts[0].len, i, 2); + if (!pkt_stream) + return -ENOMEM; test->ifobj_rx->xsk_arr[i].pkt_stream =3D pkt_stream; } + + return 0; } =20 static void release_even_odd_sequence(struct test_spec *test) @@ -638,7 +668,7 @@ static struct pkt_stream *__pkt_stream_generate_custom(= struct ifobject *ifobj, s =20 pkt_stream =3D __pkt_stream_alloc(nb_frames); if (!pkt_stream) - exit_with_error(ENOMEM); + return NULL; =20 for (i =3D 0; i < nb_frames; i++) { struct pkt *pkt =3D &pkt_stream->pkts[pkt_nb]; @@ -681,15 +711,21 @@ static struct pkt_stream *__pkt_stream_generate_custo= m(struct ifobject *ifobj, s return pkt_stream; } =20 -static void pkt_stream_generate_custom(struct test_spec *test, struct pkt = *pkts, u32 nb_pkts) +static int pkt_stream_generate_custom(struct test_spec *test, struct pkt *= pkts, u32 nb_pkts) { struct pkt_stream *pkt_stream; =20 pkt_stream =3D __pkt_stream_generate_custom(test->ifobj_tx, pkts, nb_pkts= , true); + if (!pkt_stream) + return -ENOMEM; test->ifobj_tx->xsk->pkt_stream =3D pkt_stream; =20 pkt_stream =3D __pkt_stream_generate_custom(test->ifobj_rx, pkts, nb_pkts= , false); + if (!pkt_stream) + return -ENOMEM; test->ifobj_rx->xsk->pkt_stream =3D pkt_stream; + + return 0; } =20 static void pkt_print_data(u32 *data, u32 cnt) @@ -1951,24 +1987,28 @@ int testapp_stats_rx_dropped(struct test_spec *test) return TEST_SKIP; } =20 - pkt_stream_replace_half(test, MIN_PKT_SIZE * 4, 0); + if (pkt_stream_replace_half(test, MIN_PKT_SIZE * 4, 0)) + return TEST_FAILURE; test->ifobj_rx->umem->frame_headroom =3D test->ifobj_rx->umem->frame_size= - XDP_PACKET_HEADROOM - MIN_PKT_SIZE * 3; - pkt_stream_receive_half(test); + if (pkt_stream_receive_half(test)) + return TEST_FAILURE; test->ifobj_rx->validation_func =3D validate_rx_dropped; return testapp_validate_traffic(test); } =20 int testapp_stats_tx_invalid_descs(struct test_spec *test) { - pkt_stream_replace_half(test, XSK_UMEM__INVALID_FRAME_SIZE, 0); + if (pkt_stream_replace_half(test, XSK_UMEM__INVALID_FRAME_SIZE, 0)) + return TEST_FAILURE; test->ifobj_tx->validation_func =3D validate_tx_invalid_descs; return testapp_validate_traffic(test); } =20 int testapp_stats_rx_full(struct test_spec *test) { - pkt_stream_replace(test, DEFAULT_UMEM_BUFFERS + DEFAULT_UMEM_BUFFERS / 2,= MIN_PKT_SIZE); + if (pkt_stream_replace(test, DEFAULT_UMEM_BUFFERS + DEFAULT_UMEM_BUFFERS = / 2, MIN_PKT_SIZE)) + return TEST_FAILURE; pkt_stream_delete(test->ifobj_rx->xsk->pkt_stream); test->ifobj_rx->xsk->pkt_stream =3D pkt_stream_generate(DEFAULT_UMEM_BUFF= ERS, MIN_PKT_SIZE); =20 @@ -1980,7 +2020,8 @@ int testapp_stats_rx_full(struct test_spec *test) =20 int testapp_stats_fill_empty(struct test_spec *test) { - pkt_stream_replace(test, DEFAULT_UMEM_BUFFERS + DEFAULT_UMEM_BUFFERS / 2,= MIN_PKT_SIZE); + if (pkt_stream_replace(test, DEFAULT_UMEM_BUFFERS + DEFAULT_UMEM_BUFFERS = / 2, MIN_PKT_SIZE)) + return TEST_FAILURE; pkt_stream_delete(test->ifobj_rx->xsk->pkt_stream); test->ifobj_rx->xsk->pkt_stream =3D pkt_stream_generate(DEFAULT_UMEM_BUFF= ERS, MIN_PKT_SIZE); =20 @@ -1994,7 +2035,8 @@ int testapp_send_receive_unaligned(struct test_spec *= test) test->ifobj_tx->umem->unaligned_mode =3D true; test->ifobj_rx->umem->unaligned_mode =3D true; /* Let half of the packets straddle a 4K buffer boundary */ - pkt_stream_replace_half(test, MIN_PKT_SIZE, -MIN_PKT_SIZE / 2); + if (pkt_stream_replace_half(test, MIN_PKT_SIZE, -MIN_PKT_SIZE / 2)) + return TEST_FAILURE; =20 return testapp_validate_traffic(test); } @@ -2004,7 +2046,8 @@ int testapp_send_receive_unaligned_mb(struct test_spe= c *test) test->mtu =3D MAX_ETH_JUMBO_SIZE; test->ifobj_tx->umem->unaligned_mode =3D true; test->ifobj_rx->umem->unaligned_mode =3D true; - pkt_stream_replace(test, DEFAULT_PKT_CNT, MAX_ETH_JUMBO_SIZE); + if (pkt_stream_replace(test, DEFAULT_PKT_CNT, MAX_ETH_JUMBO_SIZE)) + return TEST_FAILURE; return testapp_validate_traffic(test); } =20 @@ -2012,14 +2055,16 @@ int testapp_single_pkt(struct test_spec *test) { struct pkt pkts[] =3D {{0, MIN_PKT_SIZE, 0, true}}; =20 - pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts)); + if (pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts))) + return TEST_FAILURE; return testapp_validate_traffic(test); } =20 int testapp_send_receive_mb(struct test_spec *test) { test->mtu =3D MAX_ETH_JUMBO_SIZE; - pkt_stream_replace(test, DEFAULT_PKT_CNT, MAX_ETH_JUMBO_SIZE); + if (pkt_stream_replace(test, DEFAULT_PKT_CNT, MAX_ETH_JUMBO_SIZE)) + return TEST_FAILURE; =20 return testapp_validate_traffic(test); } @@ -2060,7 +2105,8 @@ int testapp_invalid_desc_mb(struct test_spec *test) } =20 test->mtu =3D MAX_ETH_JUMBO_SIZE; - pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts)); + if (pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts))) + return TEST_FAILURE; return testapp_validate_traffic(test); } =20 @@ -2105,7 +2151,8 @@ int testapp_invalid_desc(struct test_spec *test) pkts[6].offset +=3D umem_size; } =20 - pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts)); + if (pkt_stream_generate_custom(test, pkts, ARRAY_SIZE(pkts))) + return TEST_FAILURE; return testapp_validate_traffic(test); } =20 @@ -2117,7 +2164,8 @@ int testapp_xdp_drop(struct test_spec *test) test_spec_set_xdp_prog(test, skel_rx->progs.xsk_xdp_drop, skel_tx->progs.= xsk_xdp_drop, skel_rx->maps.xsk, skel_tx->maps.xsk); =20 - pkt_stream_receive_half(test); + if (pkt_stream_receive_half(test)) + return TEST_FAILURE; return testapp_validate_traffic(test); } =20 @@ -2161,7 +2209,8 @@ int testapp_xdp_shared_umem(struct test_spec *test) skel_tx->progs.xsk_xdp_shared_umem, skel_rx->maps.xsk, skel_tx->maps.xsk); =20 - pkt_stream_even_odd_sequence(test); + if (pkt_stream_even_odd_sequence(test)) + return TEST_FAILURE; =20 ret =3D testapp_validate_traffic(test); =20 @@ -2175,7 +2224,8 @@ int testapp_poll_txq_tmout(struct test_spec *test) test->ifobj_tx->use_poll =3D true; /* create invalid frame by set umem frame_size and pkt length equal to 20= 48 */ test->ifobj_tx->umem->frame_size =3D 2048; - pkt_stream_replace(test, 2 * DEFAULT_PKT_CNT, 2048); + if (pkt_stream_replace(test, 2 * DEFAULT_PKT_CNT, 2048)) + return TEST_FAILURE; return testapp_validate_traffic_single_thread(test, test->ifobj_tx); } =20 @@ -2189,7 +2239,7 @@ int testapp_too_many_frags(struct test_spec *test) { struct pkt *pkts; u32 max_frags, i; - int ret; + int ret =3D TEST_FAILURE; =20 if (test->mode =3D=3D TEST_MODE_ZC) { max_frags =3D test->ifobj_tx->xdp_zc_max_segs; @@ -2233,9 +2283,12 @@ int testapp_too_many_frags(struct test_spec *test) pkts[2 * max_frags + 1].len =3D MIN_PKT_SIZE; pkts[2 * max_frags + 1].valid =3D true; =20 - pkt_stream_generate_custom(test, pkts, 2 * max_frags + 2); - ret =3D testapp_validate_traffic(test); + if (pkt_stream_generate_custom(test, pkts, 2 * max_frags + 2)) { + free(pkts); + return TEST_FAILURE; + } =20 + ret =3D testapp_validate_traffic(test); free(pkts); return ret; } @@ -2309,7 +2362,8 @@ int testapp_send_receive_2k_frame(struct test_spec *t= est) { test->ifobj_tx->umem->frame_size =3D 2048; test->ifobj_rx->umem->frame_size =3D 2048; - pkt_stream_replace(test, DEFAULT_PKT_CNT, MIN_PKT_SIZE); + if (pkt_stream_replace(test, DEFAULT_PKT_CNT, MIN_PKT_SIZE)) + return TEST_FAILURE; return testapp_validate_traffic(test); } =20 @@ -2431,7 +2485,13 @@ int testapp_hw_sw_max_ring_size(struct test_spec *te= st) */ test->ifobj_tx->xsk->batch_size =3D test->ifobj_tx->ring.tx_max_pending -= 8; test->ifobj_rx->xsk->batch_size =3D test->ifobj_tx->ring.tx_max_pending -= 8; - pkt_stream_replace(test, max_descs, MIN_PKT_SIZE); + if (pkt_stream_replace(test, max_descs, MIN_PKT_SIZE)) { + clean_sockets(test, test->ifobj_tx); + clean_sockets(test, test->ifobj_rx); + clean_umem(test, test->ifobj_rx, test->ifobj_tx); + return TEST_FAILURE; + } + return testapp_validate_traffic(test); } =20 @@ -2457,8 +2517,13 @@ static int testapp_adjust_tail(struct test_spec *tes= t, u32 value, u32 pkt_len) test->adjust_tail =3D true; test->total_steps =3D 1; =20 - pkt_stream_replace_ifobject(test->ifobj_tx, DEFAULT_BATCH_SIZE, pkt_len); - pkt_stream_replace_ifobject(test->ifobj_rx, DEFAULT_BATCH_SIZE, pkt_len += value); + ret =3D pkt_stream_replace_ifobject(test->ifobj_tx, DEFAULT_BATCH_SIZE, p= kt_len); + if (ret) + return TEST_FAILURE; + + ret =3D pkt_stream_replace_ifobject(test->ifobj_rx, DEFAULT_BATCH_SIZE, p= kt_len + value); + if (ret) + return TEST_FAILURE; =20 ret =3D testapp_xdp_adjust_tail(test, value); if (ret) @@ -2510,7 +2575,8 @@ int testapp_tx_queue_consumer(struct test_spec *test) } =20 nr_packets =3D MAX_TX_BUDGET_DEFAULT + 1; - pkt_stream_replace(test, nr_packets, MIN_PKT_SIZE); + if (pkt_stream_replace(test, nr_packets, MIN_PKT_SIZE)) + return TEST_FAILURE; test->ifobj_tx->xsk->batch_size =3D nr_packets; test->ifobj_tx->xsk->check_consumer =3D true; =20 --=20 2.50.1