From nobody Sun Feb 8 02:56:07 2026 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72B331E5B6A; Thu, 24 Apr 2025 10:49:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745491797; cv=none; b=lTg1NZufpFWmM4ejHFhJaz9+pPF8Eh2ijpUdj/vAdVo6W5Z10d3/1C0+NbssTnJUV4Y4nqCyN+X4188G8wN4Zs22LsiSdzy+eI2T6fUBhAnHQmWsQlUfLOAixtcG/wO0QqQ0aQkM8cXjx8IAETN6dxo3HfNb0QOlK+Z4pgkypjg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745491797; c=relaxed/simple; bh=fm0FD+nFpM4KIujT0zC25XQeJrJxwhYW3rijMoqQ0r0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lJOB/kayNjmMapIc1FAV7aqEwAIZkurAestWmEYGc4lIGyGDrQGv/0NSiSYRaiw6lsU15rqWJX/ThGcvzgWTvG2uEwrz7vZfPTXz6KNYjHvCCXzocFn4nxCmhGQRPWaTU9jG+TjkNJ66KUAlw8hCNgJyzTJG+8UOI1VsyTdjFnQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=f7nhxhND; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="f7nhxhND" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-736b350a22cso622629b3a.1; Thu, 24 Apr 2025 03:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745491794; x=1746096594; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CcTGqksFhMMv7htGFoe+A1pXwVfny33zxtLopOer7xA=; b=f7nhxhNDglAs37ZqEliaHQ3DQ/xgTgkVuB97kHTBy7g2CeGbiMD9iTYNFDFgS7i985 +9pJkyyogQqejml75kzYhhAjRCiq/N1WGPuDCWNaAjcJws//X/VrP1P4A5Cfrreynk7e oYlhGG5SOqlNBYQIFS2cHKgZrsZX+Rh/BL1trOo34LCQjGfvZ04IIqrbB6jRs671ANaE ohx09CuveM0tXKvaV4UMb+1F8cGjmonvApijkVJDknH34NppBoIKjfisCHEi1mVSZ3d4 9lkaF9iS130p7LckHIlsn4PeF5/FRb09OFKgFm3sg7XZpnBPeliwWDGC21jfNQm6yYtY Te9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745491795; x=1746096595; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CcTGqksFhMMv7htGFoe+A1pXwVfny33zxtLopOer7xA=; b=TWZpuYvJuSbqeFf20kjkQ5niGLuxAlGC7XlxmYuvHrpHApBCksdjFYn/xaAT3n3PRT HTk/N1I8IFT6idAlFRD9nICJ+unMDyvcQVKcHT6J1o0DFtdqEGnsY/tQlRgZag4fp+WS g9gWf9hieyKgyV72OwySAS9KQgHgQEC36ckxXRDIY6OAtSdN770PV6yiq4nghoMDdq8d ksoXbNuM8PvNe+iXmgRBHLdV1F0V/OJAkSOjNF/DUFC5p2QXrFBBdTgS2doDM34LzPyt Ox1Q5mCjgjxN2Vq3Zgh+UpcBkAMamzUuRLKT6ZaGDePDdWe1xy1AXunc9Uot9HrUiBHk JnkQ== X-Forwarded-Encrypted: i=1; AJvYcCVbUWmcLGQlCILadWjMidJw64WdUcIKX0btEwWsw8Xk8ZwUNx4PDhKE4Cf99hxBjy1gBNYd1V+Y@vger.kernel.org, AJvYcCVdb2w44dIUO6NlKGhn8psP7ZE1WvuwQlozCXfDba+JGY7KZX9kmbNjr2dNXZf3KvOEMMcgeIPRlqDy9sJC@vger.kernel.org, AJvYcCXfbUj+nKCPb/VXTnz+Vk83JJCGqcZ6Wk+qBlbPJiTMtqA1pNc5ifl0mwSfYLyePic/cws=@vger.kernel.org X-Gm-Message-State: AOJu0Yyl254z2PHUbZ6RyMeTJjA+TnZOjSQ1DbmigSfocElekn+0X9pF Lsa4DUKsI/nO/9BP4icDWjiHv8Vn/vhyZlghTKPdLkvrHbs4UJS1 X-Gm-Gg: ASbGncstHXYA7R7uVEKwvM7hTnzvPvF+5GS2IqKRi7WeFn9Z14HB8IXIInw79BdfOU1 sIvLrecXvC7L5XKrPP4ZhRuFV9b066a50hmdjzk6mNMVyiT32I+I0zKmQNmiOBwZU68AomRc7CT t4v6bfBzZxmuAQhme37yaqUlHlA2ZK/qObB2V//bMMSp8msac1N4g7s0XgfzHS4Yyiz+oWaC8Zt 6lzzktRL8wfFYR11RlhAwY82tMIeqJJ6EKtl8t7nK1Dv02O0xsFHASF2JT/bigpNegNTDbl/Q7W d+MDvEAW5cpn3OMBf5BC7ijZV/lMEyvOzKy52J46iQVWoJ95zBykWIqI8F+TRasesoM= X-Google-Smtp-Source: AGHT+IGs1NWG02trRr5fLXhr7umLQzDhYVTGMHaf9AQpRz+KF7MH5lJcU6z/o7zq0i7To22znOcydQ== X-Received: by 2002:a05:6a20:ce44:b0:1ee:b8bc:3d2e with SMTP id adf61e73a8af0-20444e70080mr3316057637.8.1745491794602; Thu, 24 Apr 2025 03:49:54 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:f632:6238:46f4:702e]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-73e25941bbbsm1120138b3a.65.2025.04.24.03.49.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 03:49:54 -0700 (PDT) From: Bui Quang Minh To: virtualization@lists.linux.dev Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Andrew Lunn , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH v5 1/3] selftests: net: move xdp_helper to net/lib Date: Thu, 24 Apr 2025 17:47:14 +0700 Message-ID: <20250424104716.40453-2-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424104716.40453-1-minhquangbui99@gmail.com> References: <20250424104716.40453-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move xdp_helper to net/lib to make it easier for other selftests to use the helper. Signed-off-by: Bui Quang Minh Acked-by: Michael S. Tsirkin --- tools/testing/selftests/drivers/net/Makefile | 2 -- tools/testing/selftests/drivers/net/queues.py | 4 ++-- tools/testing/selftests/net/lib/.gitignore | 1 + tools/testing/selftests/net/lib/Makefile | 1 + tools/testing/selftests/{drivers/net =3D> net/lib}/xdp_helper.c | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename tools/testing/selftests/{drivers/net =3D> net/lib}/xdp_helper.c (10= 0%) diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/s= elftests/drivers/net/Makefile index 0c95bd944d56..cd74f1eb3193 100644 --- a/tools/testing/selftests/drivers/net/Makefile +++ b/tools/testing/selftests/drivers/net/Makefile @@ -6,8 +6,6 @@ TEST_INCLUDES :=3D $(wildcard lib/py/*.py) \ ../../net/net_helper.sh \ ../../net/lib.sh \ =20 -TEST_GEN_FILES :=3D xdp_helper - TEST_PROGS :=3D \ netcons_basic.sh \ netcons_fragmented_msg.sh \ diff --git a/tools/testing/selftests/drivers/net/queues.py b/tools/testing/= selftests/drivers/net/queues.py index 06abd3f233e1..236005290a33 100755 --- a/tools/testing/selftests/drivers/net/queues.py +++ b/tools/testing/selftests/drivers/net/queues.py @@ -26,13 +26,13 @@ def nl_get_queues(cfg, nl, qtype=3D'rx'): =20 def check_xsk(cfg, nl, xdp_queue_id=3D0) -> None: # Probe for support - xdp =3D cmd(f'{cfg.test_dir / "xdp_helper"} - -', fail=3DFalse) + xdp =3D cmd(f'{cfg.net_lib_dir / "xdp_helper"} - -', fail=3DFalse) if xdp.ret =3D=3D 255: raise KsftSkipEx('AF_XDP unsupported') elif xdp.ret > 0: raise KsftFailEx('unable to create AF_XDP socket') =20 - with bkg(f'{cfg.test_dir / "xdp_helper"} {cfg.ifindex} {xdp_queue_id}', + with bkg(f'{cfg.net_lib_dir / "xdp_helper"} {cfg.ifindex} {xdp_queue_i= d}', ksft_wait=3D3): =20 rx =3D tx =3D False diff --git a/tools/testing/selftests/net/lib/.gitignore b/tools/testing/sel= ftests/net/lib/.gitignore index 1ebc6187f421..bbc97d6bf556 100644 --- a/tools/testing/selftests/net/lib/.gitignore +++ b/tools/testing/selftests/net/lib/.gitignore @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only csum +xdp_helper diff --git a/tools/testing/selftests/net/lib/Makefile b/tools/testing/selft= ests/net/lib/Makefile index c22623b9a2a5..88c4bc461459 100644 --- a/tools/testing/selftests/net/lib/Makefile +++ b/tools/testing/selftests/net/lib/Makefile @@ -10,6 +10,7 @@ TEST_FILES +=3D ../../../../net/ynl =20 TEST_GEN_FILES +=3D csum TEST_GEN_FILES +=3D $(patsubst %.c,%.o,$(wildcard *.bpf.c)) +TEST_GEN_FILES +=3D xdp_helper =20 TEST_INCLUDES :=3D $(wildcard py/*.py sh/*.sh) =20 diff --git a/tools/testing/selftests/drivers/net/xdp_helper.c b/tools/testi= ng/selftests/net/lib/xdp_helper.c similarity index 100% rename from tools/testing/selftests/drivers/net/xdp_helper.c rename to tools/testing/selftests/net/lib/xdp_helper.c --=20 2.43.0 From nobody Sun Feb 8 02:56:07 2026 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9876B221260; Thu, 24 Apr 2025 10:50:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745491803; cv=none; b=SiWEAycNuzDeuRi+HTVamt0CBeXjGCTPsOjNdcLgEosKJ92mbjRvexA6oRJbRI/fq65Rdx46wFdfbNQGdpUrO/sj4TPjMAdtOrDNKWPp/IIgj+sQ+L6x955bjaZFCepYT9gu4dy+/dfvdZK+q+f1lIZBHPlQFarOseVV2gjj6FU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745491803; c=relaxed/simple; bh=wA8lVB4aYxVAiaL/w8CUnf3RB0WE0OrhGgeiAdwLQDo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P1z8Ill/a7Lhn1PAPe8NkkhDfYYiDo+UoG0FK0IzUgMGcjymB6/9bS+Hkunq8WZ8eSHN24NZgwc0/rnumbD33D+giiOo+WoYgNtJhh3eZ2nbgFO9HbdwKodUCzSwlSyvPm7YABrh+DtodI9Uf2pLz2d7qwWiPbbWCpPGu9EU3Ug= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Z8Oh4uvi; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Z8Oh4uvi" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-736ab1c43c4so782817b3a.1; Thu, 24 Apr 2025 03:50:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745491801; x=1746096601; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GBx30bACzPdvynzARNCXR72Us1nQHSIhvQyy+Kz/fPk=; b=Z8Oh4uviq4Vlle9Ytc31Idx8xsgE698scpwOcmR97VQvaFadb6kD1zhwbV56zx6pvn 0Whr2tqt6rzuSEHDEOJog/wjTf3jXG6nHrpZZOXzCFAYkWpct5y0RNZrN9wVmkcykIdH CQaWdhmzybv5qmI5MDP+0l0IM1lmBmDXHj+kgkeCI8ERW8ZhM0vUildx4vcRoAVEX9Ln QLmA8QCuv5UE9or5FEj+sYIUFFf8nUFI9VBB4ApCMXvDcO4MO/GYOEjWhTIQGW8VihmQ RIJ+gs1mzFh2cvE7aozUgm19TBBrl8Nd3Jh7kk9skM6tzA+ntvEwERBU2sTFelJJzKEH Msyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745491801; x=1746096601; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GBx30bACzPdvynzARNCXR72Us1nQHSIhvQyy+Kz/fPk=; b=j6KOIA5y/koaIVo/81k7fYXPoWavRBWDTyTW0lUtkL8uz9/hoH3LRuG6dirLobP0P2 J2x0seLpe99SIRK1pqilDfGMkz2IwGPaC46sZX/WxEYirn3aTPZSN/K2ItxZWEetRblg NCzfDyjiaDtig/72GqHV/a9J/Ho/wq2A9gJqMOFR2KsFMnhVROooPGOJ8NpObL6u8E0d hqhK+MSIJUlDVx+ULrmq207FZdgMQqJ0p9k1Vxn2M2S19729ReRLSdMLgjCXJxj0leVr X1HUvPksnIATbS3KHNvfX0XmiBtVz7U3n5APPh1X3Uuaa58k9RVIuabAMftxyz9S0Kst SrpQ== X-Forwarded-Encrypted: i=1; AJvYcCVpdFlJgTNd+e9jRPGgj/5BAGJdIB7FLV0bNbCNOcsajZfObeppxyinNfW5leauMklOSDLxub6b@vger.kernel.org, AJvYcCW3WsxbxUCk+3pqkuS2+FOtiocR6/vyUZMkUKh0/8PRrllrJChwXQZU05Zs2cwc3M3Oz4DUDnQ2bybQrXKq@vger.kernel.org, AJvYcCXkLPTEoGaBWzcnPuvyLl3Wg9mzksvF1gyqLHUjapa+jFUravusUNXbOwUFNbYGaNfF91M=@vger.kernel.org X-Gm-Message-State: AOJu0YyFZrEzuQDkgsZ87YE6LHYiKueKrda+uNBqYqIl2t9jrrjHEXek /fuwiyUZ9LZg9KzzlVlqTNRvTg76w9eVQV6Nd4611LHYHDdIjBgE X-Gm-Gg: ASbGncsPe9IXHhMNZm/9G0wC0NvVI2a5qI+ZV/JUpg/AmKHbnxHQPsLYvVAt4vr6IT6 K2S6jvnqSAyO0dCKLt8PH0HiZSBLEdsACbc7twHauwFmoLnczNBcPhLsD35X6FlwVqibhQ+KaVh 6oGAfR9nByppqMjF+/kEwZWdvwP5MA7+AV4gcv9rSbkhkLe4j1si24hH+Ldpljc/kYurryd8c9/ 97AeOAi8LAjGzUzEYcFq2Nq4N/k7znafO9Qjf2QB/uPMIDk+eu1faHccI6wXa139ksN2K3cpcu2 4tgJgsGXE66u1neOo985LetqLOHawgFixgdmjRhrUVU9LAuYsZAx0OD3 X-Google-Smtp-Source: AGHT+IEKfU0nmB/5B++mOPco6o12mEI223xQ9pX0CSxCbN6AdMo/5JJmz5Z+hAnFqSKkbj1bMDNHrA== X-Received: by 2002:a05:6a00:278f:b0:736:31cf:2590 with SMTP id d2e1a72fcca58-73e247d82e6mr3056625b3a.16.1745491800945; Thu, 24 Apr 2025 03:50:00 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:f632:6238:46f4:702e]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-73e25941bbbsm1120138b3a.65.2025.04.24.03.49.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 03:50:00 -0700 (PDT) From: Bui Quang Minh To: virtualization@lists.linux.dev Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Andrew Lunn , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH v5 2/3] selftests: net: add flag to force zerocopy mode in xdp_helper Date: Thu, 24 Apr 2025 17:47:15 +0700 Message-ID: <20250424104716.40453-3-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424104716.40453-1-minhquangbui99@gmail.com> References: <20250424104716.40453-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This commit adds an optional -z flag to xdp_helper. When this flag is provided, the XDP socket binding is forced to be in zerocopy mode. Signed-off-by: Bui Quang Minh Acked-by: Michael S. Tsirkin --- tools/testing/selftests/net/lib/xdp_helper.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/lib/xdp_helper.c b/tools/testing/s= elftests/net/lib/xdp_helper.c index aeed25914104..f21536ab95ba 100644 --- a/tools/testing/selftests/net/lib/xdp_helper.c +++ b/tools/testing/selftests/net/lib/xdp_helper.c @@ -62,6 +62,12 @@ static void ksft_wait(void) close(fd); } =20 +static void print_usage(const char *bin) +{ + fprintf(stderr, "Usage: %s ifindex queue_id [-z]\n\n" + "where:\n\t-z: force zerocopy mode", bin); +} + /* this is a simple helper program that creates an XDP socket and does the * minimum necessary to get bind() to succeed. * @@ -81,8 +87,8 @@ int main(int argc, char **argv) int sock_fd; int queue; =20 - if (argc !=3D 3) { - fprintf(stderr, "Usage: %s ifindex queue_id\n", argv[0]); + if (argc !=3D 3 && argc !=3D 4) { + print_usage(argv[0]); return 1; } =20 @@ -132,6 +138,15 @@ int main(int argc, char **argv) sxdp.sxdp_queue_id =3D queue; sxdp.sxdp_flags =3D 0; =20 + if (argc > 3) { + if (!strcmp(argv[3], "-z")) { + sxdp.sxdp_flags =3D XDP_ZEROCOPY; + } else { + print_usage(argv[0]); + return 1; + } + } + if (bind(sock_fd, (struct sockaddr *)&sxdp, sizeof(sxdp)) !=3D 0) { munmap(umem_area, UMEM_SZ); perror("bind failed"); --=20 2.43.0 From nobody Sun Feb 8 02:56:07 2026 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F3791214813; Thu, 24 Apr 2025 10:50:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745491809; cv=none; b=fepRGVYK/30iOUxC42bOdo6hwkWW7l1EkFIWbmff4fYGfWlnG2uPZoD1HL+l5vlkUCcLckdA/7rp+4z3JuOqKS3PCDrXcZscp0xO2D/Ysyvh8JiQVxt6vkFDKSHNX3swfteWuD9wXAG6nlOQBCTMQEziJNqJBmHW2zaZttd5+OM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745491809; c=relaxed/simple; bh=MnqykwymzwHERo6nKnawUDD2AsCMTGXbvqod8pxseEc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X3uqwtXTP7FzQzCYGZgPW+CBK/OepfQDF8fik5EfGlV4wyewEWy8CNaLlQK7J9sUjfxjzeJRlWBhC+zI3DpIWUJwtstrwEogFUcH+Qrt77aQe978NmnX2smWcWT+3S27Dm70EBrQjD0PBPO18YkUnrjTFzPUbn0x3gXP1GW+Zqg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kROr0HKm; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kROr0HKm" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-736a72220edso853007b3a.3; Thu, 24 Apr 2025 03:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745491807; x=1746096607; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=otKFGdVb+uXNzYPZbaE8wgcboqR2b2qzgL6mIMQa4V8=; b=kROr0HKmWLVVs7sEVTEB9374U+w5XFy0aNb27OXwo28n+O2VMfdVbxuHI2xG8ueDqF nmH/yOvGfY6PaCAIhkphAMwZDJAqxUQ/3vDtheJlPERVk+N1xBl/vhi0co3Q5qOn29uj 1sWJUSkEf7WHkQKo6uhJzHe1z1P8lNRXVI5IFSOFCb7cA5oRG832f5Tfi71xnDQaFmup 9mE3kSIpZQUod78ZzBXj3quYhNfP/6ZioPDS5pK7fwddE3OHiNuvxx5KPr3leL+BlCkA WaLaT1sO/05Y6t1feglH8h94qQIxqmq0How7eYN1DCIFvhuvwFUHgD0tWt82A16y9BJf Ov4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745491807; x=1746096607; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=otKFGdVb+uXNzYPZbaE8wgcboqR2b2qzgL6mIMQa4V8=; b=oNX5KgLQWS3u+rUW4pB1EtKGoYDZXzaWOaB064S3bJl4jEi4hKr3Il3/wFNEdhr0Ay Ljq3VfD1/jhCegxtrKxRnY2TeXF26tXAuAFP3E9xIKbmuwrLGc3zJ9w3qdIzKStM95Dl o4vVHvKmhvSvoQ02A65+zrdjUENRf8Zb97QW5ljwRqZS124O3SLjMUHbwXEIYa9CcWzx y73smhJEFlEyqee7MtXhjI9SKOraBUsfft1FoHo5feNtzbff3sK/4bgNnR8FUrPa9327 R3cyRASiU16ANb89Rd6Yo+iaUuPT4WNJcKXx5x8lZ+ccuES/UbuezbxHdYEvAI+BPWtZ /4eg== X-Forwarded-Encrypted: i=1; AJvYcCUE2ZoRex5Nj7KBFR2ycK3EIhuBaaZn0PF0Oinfwz8k6SFLn155Rs3r2ibPLvgopN4muPA=@vger.kernel.org, AJvYcCVPjIYih1a1qqmuNukYVBMYmKnY8HM42GZ0xvdCk2P4S2N4OZLvG/eEhx4eEnXcyClezteXwjvhummC9K0R@vger.kernel.org, AJvYcCWiGuUa2NH16fraoZ1N3CRFuFxfwzXD0unxrBqg+Z1oJzAMqxfObElX+5w2lkMXxKHTO4XHJSkM@vger.kernel.org X-Gm-Message-State: AOJu0Yx7a/KpVGdpw7XT26R7I58n8gjnlXer7CzOfJg88fMrtatOtC2J +DYwyTJZ0fxf6+2oP3ZXAoyFuWbUGBOjsR16KEgy7HBa1QaT1y2H X-Gm-Gg: ASbGnctCBUfLNAG2cLExsroer/UtoXpo2oxAIgEy1j9SkoqJBw++z/bKPbyJydtchCY JOC/hURwAKUvPthXfynBxRyNnTIyKaL/dgAOA6dJAhdDXddW7T78Pldur3ojL5myIghvfrrPQEt AGSVFhMEI2FgzbIJlHTtZVEec0R+lPaQCooGoOTZa73nEdvBSUHhzK0AMgqqX6F6cuDIy783wts ZvCzFka7y15nZGoS2HufcwCbKO3sULkFpT5IhijoYuCfs74uK1sKDZXujQJ+guvCi+ZNyI9WeRU SdaFwbJ7EEVO+pbkSEzK8VKopAAyClCucAXjQI1XHEiByF60AbsPRBXp X-Google-Smtp-Source: AGHT+IGgeHDm6WkVamJnp/W1II7ZDrehvPmtPJEYMjp/1PGWmVR9+feWN1Ivt1NcPJM+kVc7pr6mIQ== X-Received: by 2002:a05:6a00:2410:b0:73e:1e21:b653 with SMTP id d2e1a72fcca58-73e243c6011mr2778211b3a.5.1745491807205; Thu, 24 Apr 2025 03:50:07 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:f632:6238:46f4:702e]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-73e25941bbbsm1120138b3a.65.2025.04.24.03.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 03:50:06 -0700 (PDT) From: Bui Quang Minh To: virtualization@lists.linux.dev Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , Andrew Lunn , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , "David S. Miller" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH v5 3/3] selftests: net: add a virtio_net deadlock selftest Date: Thu, 24 Apr 2025 17:47:16 +0700 Message-ID: <20250424104716.40453-4-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250424104716.40453-1-minhquangbui99@gmail.com> References: <20250424104716.40453-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The selftest reproduces the deadlock scenario when binding/unbinding XDP program, XDP socket, rx ring resize on virtio_net interface. Signed-off-by: Bui Quang Minh Acked-by: Michael S. Tsirkin --- .../testing/selftests/drivers/net/hw/Makefile | 1 + .../selftests/drivers/net/hw/xsk_reconfig.py | 68 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100755 tools/testing/selftests/drivers/net/hw/xsk_reconfig.py diff --git a/tools/testing/selftests/drivers/net/hw/Makefile b/tools/testin= g/selftests/drivers/net/hw/Makefile index 07cddb19ba35..5447785c286e 100644 --- a/tools/testing/selftests/drivers/net/hw/Makefile +++ b/tools/testing/selftests/drivers/net/hw/Makefile @@ -21,6 +21,7 @@ TEST_PROGS =3D \ rss_ctx.py \ rss_input_xfrm.py \ tso.py \ + xsk_reconfig.py \ # =20 TEST_FILES :=3D \ diff --git a/tools/testing/selftests/drivers/net/hw/xsk_reconfig.py b/tools= /testing/selftests/drivers/net/hw/xsk_reconfig.py new file mode 100755 index 000000000000..031de97a974d --- /dev/null +++ b/tools/testing/selftests/drivers/net/hw/xsk_reconfig.py @@ -0,0 +1,68 @@ +#!/usr/bin/env python3 +# SPDX-License-Identifier: GPL-2.0 + +# This is intended to be run on a virtio-net guest interface. +# The test binds the XDP socket to the interface without setting +# the fill ring to trigger delayed refill_work. This helps to +# make it easier to reproduce the deadlock when XDP program, +# XDP socket bind/unbind, rx ring resize race with refill_work on +# the buggy kernel. +# +# The Qemu command to setup virtio-net +# -netdev tap,id=3Dhostnet1,vhost=3Don,script=3Dno,downscript=3Dno +# -device virtio-net-pci,netdev=3Dhostnet1,iommu_platform=3Don,disable-leg= acy=3Don + +from lib.py import ksft_exit, ksft_run +from lib.py import KsftSkipEx, KsftFailEx +from lib.py import NetDrvEnv +from lib.py import bkg, ip, cmd, ethtool +import time + +def _get_rx_ring_entries(cfg): + output =3D ethtool(f"-g {cfg.ifname}", json=3DTrue) + return output[0]["rx"] + +def setup_xsk(cfg, xdp_queue_id =3D 0) -> bkg: + # Probe for support + xdp =3D cmd(f'{cfg.net_lib_dir / "xdp_helper"} - -', fail=3DFalse) + if xdp.ret =3D=3D 255: + raise KsftSkipEx('AF_XDP unsupported') + elif xdp.ret > 0: + raise KsftFailEx('unable to create AF_XDP socket') + + # Retry xsk setup 3 times + i =3D 0 + while True: + try: + return bkg(f'{cfg.net_lib_dir / "xdp_helper"} {cfg.ifindex} ' \ + '{xdp_queue_id} -z', ksft_wait=3D3) + except: + if i =3D=3D 3: + raise KsftSkipEx('Failed to bind XDP socket in zerocopy.\n= ' \ + 'Please consider adding iommu_platform=3D= on ' \ + 'when setting up virtio-net-pci') + else: + i +=3D 1 + time.sleep(1) + continue + +def check_xdp_bind(cfg): + with setup_xsk(cfg): + ip(f"link set dev %s xdp obj %s sec xdp" % + (cfg.ifname, cfg.net_lib_dir / "xdp_dummy.bpf.o")) + ip(f"link set dev %s xdp off" % cfg.ifname) + +def check_rx_resize(cfg): + with setup_xsk(cfg): + rx_ring =3D _get_rx_ring_entries(cfg) + ethtool(f"-G %s rx %d" % (cfg.ifname, rx_ring // 2)) + ethtool(f"-G %s rx %d" % (cfg.ifname, rx_ring)) + +def main(): + with NetDrvEnv(__file__, nsim_test=3DFalse) as cfg: + ksft_run([check_xdp_bind, check_rx_resize], + args=3D(cfg, )) + ksft_exit() + +if __name__ =3D=3D "__main__": + main() --=20 2.43.0