From nobody Fri Dec 19 14:38:21 2025 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.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 6C9941714C0; Mon, 14 Apr 2025 05:09:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744607392; cv=none; b=aij61syNp7f0NnfHnyiw1LNu9hw3L9kHx+6qF9lMkB27xl697P5VyARu6WM/D8bLK5McI6ndMhCVqqA4FQcttwOEBJPW5+Lf/YKM+QflO44kx4ZkCTEkltE6VyiPg7EgVSvAJgmpe5CjYZudj9fo7VFkKShvILh8UGvQ0dVSGFQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744607392; c=relaxed/simple; bh=1niKW98sQ32RMpVs4DRJjX8QJwWQRiEGm9x2KiIx0VM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jZlLKjJqeGf22bwkQ/ubipesXvmiAMTknx86/gkw02a/be04Rm5fdZgAAyHkWFX4pZ1s4/2GNWjRO2Ip3ZmUvSt3zJv93BD+02CQuJaPFEziU6AXHrSekyVwzMVponkp2RDo6k9v21FEOty1zu6B7P7TIO7VOAEE6EhX9cTp/cQ= 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=kuxTVK24; arc=none smtp.client-ip=209.85.214.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="kuxTVK24" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2241053582dso52160805ad.1; Sun, 13 Apr 2025 22:09:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744607390; x=1745212190; 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=693uulZB/KQcPYpgvsd2vMghBxNx5O/cumoSUcuA5cA=; b=kuxTVK24Sg2+jq4W+raf6kKUL3xYvuLHvhFrx0+eLJddU7jTU0k7vJcZ26o+nBxFzB frNQEZabg6rJKzey6dcV/3N1oJ5qzVr7cAYPV2z6/qKYvR3+w2FHWAt3KqJ/CAHgb27h 9IdbCU9tNQX+6E3xsDNtTr9qzX3QW4GW+bKGIIPIl8asaG+sY3LhMLnEOUchXUhintJD jjy/EWqXFK6M8wRukFjV5ZBWFz2Lzr3LEFynbR31hhtNP7eFfngPf1d1m9xkA/iSmsUJ ONZ5fWhDdQJqsv51wLnqzbhH6kifDE6qnkUboxP0Vzyk7lRiAcVgrrFMUEocAKS+DKJ6 Kf6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744607390; x=1745212190; 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=693uulZB/KQcPYpgvsd2vMghBxNx5O/cumoSUcuA5cA=; b=f2aeKWRKDiKlbZ0f2+xUHZKr0MSRUik/RYM9GJydcOgrnsfir/BHtX3Dd0FaDrWpI2 LkPTFZBIQJ9iCq+rDI0qSMQBVadNMNBNVbWffxUuIlTjpmY325Eo8XJS1V6EnjME2/WO 3VYU/BYVBmXL3AUeEh51zxOUtbrig2CFJugkYdoaeFu/XFoh37IAgiGU3uID5GwYZyUU jodox6CfS63U/dl6o3DTTCpmLquNuk+jSBVm9eCV1JcbCZD5wq2jCs64YWik+MQm/njC K9NxN4bxt4pPyxU5ZJkRv3QQ2pgrU/mWSeTvrMrw9RLPCiDfVn2CrOcDtrINVnRQ+idf FVqw== X-Forwarded-Encrypted: i=1; AJvYcCUsu3ewS4Hxa029bV5MVZZG1aX2ffSLkBI/D4XmHY5gJ7YfPIRMSgx33FEXW67cBtpZwbbj5set@vger.kernel.org, AJvYcCXH7QYdDgedSNdJYUH6WF/UMXz2OtBel+/+5Z35uLzWyXvAf8cRQME7f3E6E+8QjRSyl3M=@vger.kernel.org, AJvYcCXMKi7WqFBKzB3jmIjjhR4k/8xS/NlYwc6yNhSwXnHDL5MsQlPsMo+KGVf6yCjYYUiCZBv6DCp5zXexcUgC@vger.kernel.org X-Gm-Message-State: AOJu0YwIY4JHvVQHGkB5DE3aoorhly1G0SrTZhFGLxxuCv+o8C5IA87P KwDrxoJvQ7TvG6g3TMtLRdIf5FM52LZzJT+eI7jFzpi24PDywIH9 X-Gm-Gg: ASbGncsmx+gwGr2indNi6rQseWKjfB/3A1VFnoVkueNVSDIhawOeTQMsoJEov8OzlbJ g5P0PQTYzwaEPe8Gj7wTacYbph0m/LOAOoR69X0K0s99LfvYw4LVFayVk6qNGB3+i/1PVe4rbU0 upKd5NQtXLH4bxBSrhCBIELBkLL+q9oLK+6V7QKvGfk59jgjHDsYmSDicaZkrXFY60MGaleZFfy 4KarVSShDlDZoNyA1c/wkHQyZpxuQfxTAURhfhsT1lpHStDNBHMBbM4kOmlYrVNAm1T77RHJkpx hLHZcUM0Xrfqr3Tea/XoUpTyk5KLwSddbppMAh88yMhjONOOmc9abWf6KFgzGYdgdw== X-Google-Smtp-Source: AGHT+IFZXGJl9vCA/38nvO5q4mKzdH+dsnkuUuXFqvhgmC9J/jIRkCxTQToRLnncH8s2H/loWvS+7Q== X-Received: by 2002:a17:903:fae:b0:223:37ec:63d5 with SMTP id d9443c01a7336-22bea4c6beemr181805855ad.28.1744607389401; Sun, 13 Apr 2025 22:09:49 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:b80:9edb:557f:f8a7]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-22ac7cb5047sm90778665ad.170.2025.04.13.22.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Apr 2025 22:09:49 -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 v2 3/3] selftests: net: add a virtio_net deadlock selftest Date: Mon, 14 Apr 2025 12:08:37 +0700 Message-ID: <20250414050837.31213-4-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250414050837.31213-1-minhquangbui99@gmail.com> References: <20250414050837.31213-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 --- tools/testing/selftests/Makefile | 2 +- .../selftests/drivers/net/virtio_net/Makefile | 2 + .../selftests/drivers/net/virtio_net/config | 1 + .../drivers/net/virtio_net/lib/py/__init__.py | 16 ++++++ .../drivers/net/virtio_net/xsk_pool.py | 52 +++++++++++++++++++ 5 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/drivers/net/virtio_net/lib/py/_= _init__.py create mode 100755 tools/testing/selftests/drivers/net/virtio_net/xsk_pool= .py diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Mak= efile index c77c8c8e3d9b..0a6b096f98b7 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -130,7 +130,7 @@ TARGETS_HOTPLUG =3D cpu-hotplug TARGETS_HOTPLUG +=3D memory-hotplug =20 # Networking tests want the net/lib target, include it automatically -ifneq ($(filter net drivers/net drivers/net/hw,$(TARGETS)),) +ifneq ($(filter net drivers/net drivers/net/hw drivers/net/virtio_net,$(TA= RGETS)),) ifeq ($(filter net/lib,$(TARGETS)),) INSTALL_DEP_TARGETS :=3D net/lib endif diff --git a/tools/testing/selftests/drivers/net/virtio_net/Makefile b/tool= s/testing/selftests/drivers/net/virtio_net/Makefile index 7ec7cd3ab2cc..82adda96ef15 100644 --- a/tools/testing/selftests/drivers/net/virtio_net/Makefile +++ b/tools/testing/selftests/drivers/net/virtio_net/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ OR MIT =20 TEST_PROGS =3D basic_features.sh \ + xsk_pool.py \ # =20 TEST_FILES =3D \ @@ -8,6 +9,7 @@ TEST_FILES =3D \ # =20 TEST_INCLUDES =3D \ + $(wildcard lib/py/*.py ../lib/py/*.py) \ ../../../net/forwarding/lib.sh \ ../../../net/lib.sh \ # diff --git a/tools/testing/selftests/drivers/net/virtio_net/config b/tools/= testing/selftests/drivers/net/virtio_net/config index bcf7555eaffe..12e8caa22613 100644 --- a/tools/testing/selftests/drivers/net/virtio_net/config +++ b/tools/testing/selftests/drivers/net/virtio_net/config @@ -6,3 +6,4 @@ CONFIG_NET_L3_MASTER_DEV=3Dy CONFIG_NET_VRF=3Dm CONFIG_VIRTIO_DEBUG=3Dy CONFIG_VIRTIO_NET=3Dy +CONFIG_XDP_SOCKETS=3Dy diff --git a/tools/testing/selftests/drivers/net/virtio_net/lib/py/__init__= .py b/tools/testing/selftests/drivers/net/virtio_net/lib/py/__init__.py new file mode 100644 index 000000000000..b582885786f5 --- /dev/null +++ b/tools/testing/selftests/drivers/net/virtio_net/lib/py/__init__.py @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0 + +import sys +from pathlib import Path + +KSFT_DIR =3D (Path(__file__).parent / "../../../../..").resolve() + +try: + sys.path.append(KSFT_DIR.as_posix()) + from net.lib.py import * + from drivers.net.lib.py import * +except ModuleNotFoundError as e: + ksft_pr("Failed importing `net` library from kernel sources") + ksft_pr(str(e)) + ktap_result(True, comment=3D"SKIP") + sys.exit(4) diff --git a/tools/testing/selftests/drivers/net/virtio_net/xsk_pool.py b/t= ools/testing/selftests/drivers/net/virtio_net/xsk_pool.py new file mode 100755 index 000000000000..3f80afd97d4e --- /dev/null +++ b/tools/testing/selftests/drivers/net/virtio_net/xsk_pool.py @@ -0,0 +1,52 @@ +#!/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. + +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 re + +def _get_rx_ring_entries(cfg): + output =3D ethtool(f"-g {cfg.ifname}").stdout + values =3D re.findall(r'RX:\s+(\d+)', output) + return int(values[1]) + +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') + + return bkg(f'{cfg.net_lib_dir / "xdp_helper"} {cfg.ifindex} {xdp_queue= _id}', + ksft_wait=3D3) + +def check_xdp_bind(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, queue_size =3D 128): + rx_ring =3D _get_rx_ring_entries(cfg) + ethtool(f"-G %s rx %d" % (cfg.ifname, queue_size)) + ethtool(f"-G %s rx %d" % (cfg.ifname, rx_ring)) + +def main(): + with NetDrvEnv(__file__, nsim_test=3DFalse) as cfg: + xsk_bkg =3D setup_xsk(cfg) + + ksft_run([check_xdp_bind, check_rx_resize], + args=3D(cfg, )) + ksft_exit() + +if __name__ =3D=3D "__main__": + main() --=20 2.43.0