From nobody Fri Oct 3 11:22:26 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 627A22DCBF4 for ; Tue, 2 Sep 2025 12:54:02 +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=1756817644; cv=none; b=m66mo0EBfHRNnfV1Pqlcy1bbFft221VV1hNu6MpPYJRmXVxJdMBKnOUetfJRyS40y9A9Lk+Z0ipffTBv6CRrqSSzAZiV99LWd4mqcHYTSA5+a+SYaqMHOHbfifQM8WLr8fTU8vjbCuOCYvvF13alpN8pQZls0NYX5AY6JnRC6kY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756817644; c=relaxed/simple; bh=jbwyX8Pv/r9G8HGLbfomIMAf8qfNVVeRgQKhdS0mBFI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WkPjrTCGbrU+Wafw/bNMLkKJRHLMhFrrHNrj4PZ77lQupw3WIdgwMBjEz4rqLae3CtcXaxY2Wn4HI1ey+Omq+Rri/UhO7VtSVuIxeSBq7OnxgPoqoDBBbJagq6euNp8SF/eBkK4IvOxtOCnxtdohtul//kvoNLJtMNtUyGqArTM= 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=o34fEPke; 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="o34fEPke" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id EE597C8EC66; Tue, 2 Sep 2025 12:53:45 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id E2B9E60695; Tue, 2 Sep 2025 12:54:00 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 1B4991C228A5D; Tue, 2 Sep 2025 14:53:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1756817638; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=JmrrjAsMsSmzWD7G/h8wp1LIy9K4Mv6aWYyPKQAPvQ8=; b=o34fEPkehiA9hkmfUFr5af7Zx5GflduQr4HiaUKgfaA2mZeYUi+NG2InpVr0pYO9NWcTLD +Hn5NANq4GGZRJgKxmKwCkSr2yYwtomUMC1kgXSa0v/DvxZ0DHS1Uw4DH2OFr0McZQQRtu 4hEgN2khYeGbPMttFNQAj9Qjr51TwNC8ImwTWHNjGgVhtV/CiPWlSE/UAG9PyQxD6d+atS 9kOaddg2XJtMhtKCY3lqg9PVdd4b0GPlE6ci7Z0PmPmR1ESWM9NcOTRf3bnwyARt+sEuUe l43sKM/0nN9iycGavuOWC9HmwD9wvpOJzkEHPZ3uCplcshnJ47hOgBI2rZkbOg== From: "Bastien Curutchet (eBPF Foundation)" Date: Tue, 02 Sep 2025 14:49:55 +0200 Subject: [PATCH bpf-next v2 05/14] selftests/bpf: test_xsk: Release resources when swap 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: <20250902-xsk-v2-5-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 testapp_validate_traffic() doesn't release the sockets and the umem created by the threads if the test isn't currently in its last step. Thus, if the swap_xsk_resources() fails before the last step, the created resources aren't cleaned up. Clean the sockets and the umem in case of swap_xsk_resources() failure. Signed-off-by: Bastien Curutchet (eBPF Foundation) --- tools/testing/selftests/bpf/test_xsk.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_xsk.c b/tools/testing/selftes= ts/bpf/test_xsk.c index 978a72b477e0e37836eb3bb7b869dab09252d287..074cb8f9487e489834b4bd081cb= 58b51c73c3b75 100644 --- a/tools/testing/selftests/bpf/test_xsk.c +++ b/tools/testing/selftests/bpf/test_xsk.c @@ -1873,8 +1873,13 @@ int testapp_xdp_prog_cleanup(struct test_spec *test) if (testapp_validate_traffic(test)) return TEST_FAILURE; =20 - if (swap_xsk_resources(test)) + if (swap_xsk_resources(test)) { + clean_sockets(test, test->ifobj_rx); + clean_sockets(test, test->ifobj_tx); + clean_umem(test, test->ifobj_rx, test->ifobj_tx); return TEST_FAILURE; + } + return testapp_validate_traffic(test); } =20 --=20 2.50.1