From nobody Fri Dec 19 12:48:28 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 2B89413E02A; Mon, 14 Apr 2025 05:09:24 +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=1744607366; cv=none; b=dC/GDnVzZY6PdbE9ymJisSIJ+xn6GncOTjUgg3Mk0/6Bu8UuKX3yzLEqHfFgSLENrhMud+I5z6CQLEiuxgJkQTbmOC9QYjYwiPbG/PFR+Aj2wU/h4kYSH9V5JxWKa6nvFtL+GCDBEkzPPjSr9kww4uBtMVtMaANIVwnOxNcbkSI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744607366; c=relaxed/simple; bh=LAqM7pdFY5uYBhtKsTe5wOlUvRbdtlTtvnMwlz4eVRw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u3Q9F8WcQ1EAgpOrckbPM2mRzaXWNL9GC0dgm+mtI7wttOqSZsw7cbJYD+ttDT6AZux7rC3pLsAvGF9qDnAacDJoIFE1ZkAtva/4i9IvQzeAOCQezXUE7jXDkrJKSq9cIn1lxa60J06PXieOZtLglVnX2ELo0enmnUSAxHCfhSk= 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=hAhHm4Od; 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="hAhHm4Od" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2295d78b45cso53994405ad.0; Sun, 13 Apr 2025 22:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744607364; x=1745212164; 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=LTXn7wUxtDAnsVPk+xJ6XC8d5pS18e6iNJS/eIvyuiA=; b=hAhHm4OdSfNjMJ3vT+/KuD2xGXMoSHvMzq7+SHu5bew0UNfRwpTonTgfUaIHZA/bVv 6X4w8iE1FlUFJAYsT2WmtcvKeH83kAkNZ2VSUpnHVchUiy2Nu7DPcA4wQnGQsMa66xlD Hsm89utRej4C/c98YN/9dQAnFzGxWnwMYvwTiFkMbKDvPIfvhFMA4U9KKqPsnUVKppbp EVRe6+ta9HErl+ZN9lStDw/pje0Bsdps6FY0w973ZH6BpwD1b42um2uKfW4I9JfJWzJA Z3Fpg1/AUjJJQdJ8e5OHJbFjIdf8J2vr1ODPtVR3NeAVIm/qQfEbwyM9g4IwDUafVkPU 8+Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744607364; x=1745212164; 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=LTXn7wUxtDAnsVPk+xJ6XC8d5pS18e6iNJS/eIvyuiA=; b=rEA41UxhQBoO6Iux4w/gmmVL9ExpLm2Au4+Q3XiTq9zBQDm+yHiJR7QYhwksh9V4rc hv0XDE14Z0kltg+ce9JINezeNbiNzj5nIBKIx3TznokoT4cxYgiCBWLfpm33JIz1eGUm n8Jgw4Zk08Py9OJTahqOzqnVrreUBjo82n5Z8O+w7SMEBCZVTJveJEQfmQUZX/jqvP9a SAL9ozWsWWAN7FoiwwkfaZYQdSrsQ3Ez4jhtR0QJojixGakZPPp9LbwlVHhO1g9t8Y+A N9YNJSojwhTPTd+l8I4kLbQ3UqdmkDasVdtdFGEVcbaof4VpFF30fc+RK5Yuw/aEZrHj XjLQ== X-Forwarded-Encrypted: i=1; AJvYcCUM3hGjwN9OQnXuk3ngExrKwkmS56zfcDLB2j6WWSuON7lbXShEDmjd5/egJo3JuEsWE+U=@vger.kernel.org, AJvYcCVx3wMK+43/t1+sO/ciGkC2gPByxrdXUf52UCoCVqj519dawoDO2tMnhMUEINRgKanUOQYaqUhX7O9BccTE@vger.kernel.org, AJvYcCWdikEH0wxGM96VbvsH7YXkwBqFdUj+0HA+5pv/1PLN4CWnWdO3T2g40hlPRapdIMP33OS5zvxu@vger.kernel.org X-Gm-Message-State: AOJu0YxBQXh5BkSRIzYEriMLSM0wLhXYWr1NR5+jhUh+x26iyAko2j3Y qCxtpuKRr9pwKONiQuaEA2nLlDW5pbAvpPqotgZFkXhoXERzmzy9 X-Gm-Gg: ASbGncvnUc8bl6tGEhlnS0mCA+9Mn+cCjWSBV1g2K/5yTQR8cCrCXQJqgX5FIlFU3Uf o9HeXHNSGMdGsyrdmqgHMRYC193/Km1/kGfZllfuvpXEi7JxwCcNp2xGgFEqp+dYa0zTWe06cUL /xCP0R7EspDikuTDk6Wj/hS3+hgjxA2t9//V7IraeWHchF14XwhPTDjnArx1SKmqrCjo+Bnm7CU hPNWWbdHVJj8JpvBXpL+kagcUi99BFfkQnSQHz3U2Uofn1wSGtxX8obKbSTGEHgbVFvt7+esKQv nPsWUBh9/Fnnqg1tj3CntAs/MPzdMhwvKFYIRo0+O/pk8Nye7X7AZxZYkrc6KlRKvA== X-Google-Smtp-Source: AGHT+IH7f0CknUb+6MEjVojl4lI4iFs1kPGlPHbcWFIW45FscoSes5CP7bnZxlO1IqjFQUpKfftBEA== X-Received: by 2002:a17:902:d2d1:b0:223:f928:4553 with SMTP id d9443c01a7336-22bea50bb7dmr157537155ad.44.1744607364148; Sun, 13 Apr 2025 22:09:24 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Apr 2025 22:09:23 -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 1/3] virtio-net: disable delayed refill when pausing rx Date: Mon, 14 Apr 2025 12:08:35 +0700 Message-ID: <20250414050837.31213-2-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" When pausing rx (e.g. set up xdp, xsk pool, rx resize), we call napi_disable() on the receive queue's napi. In delayed refill_work, it also calls napi_disable() on the receive queue's napi. When napi_disable() is called on an already disabled napi, it will sleep in napi_disable_locked while still holding the netdev_lock. As a result, later napi_enable gets stuck too as it cannot acquire the netdev_lock. This leads to refill_work and the pause-then-resume tx are stuck altogether. This scenario can be reproducible by binding a XDP socket to virtio-net interface without setting up the fill ring. As a result, try_fill_recv will fail until the fill ring is set up and refill_work is scheduled. This commit adds virtnet_rx_(pause/resume)_all helpers and fixes up the virtnet_rx_resume to disable future and cancel all inflights delayed refill_work before calling napi_disable() to pause the rx. Fixes: 413f0271f396 ("net: protect NAPI enablement with netdev_lock()") Signed-off-by: Bui Quang Minh --- drivers/net/virtio_net.c | 60 ++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 7e4617216a4b..4361b91ccc64 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3342,10 +3342,53 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, = struct net_device *dev) return NETDEV_TX_OK; } =20 +static void virtnet_rx_pause_all(struct virtnet_info *vi) +{ + bool running =3D netif_running(vi->dev); + + /* + * Make sure refill_work does not run concurrently to + * avoid napi_disable race which leads to deadlock. + */ + disable_delayed_refill(vi); + cancel_delayed_work_sync(&vi->refill); + if (running) { + int i; + + for (i =3D 0; i < vi->max_queue_pairs; i++) { + virtnet_napi_disable(&vi->rq[i]); + virtnet_cancel_dim(vi, &vi->rq[i].dim); + } + } +} + +static void virtnet_rx_resume_all(struct virtnet_info *vi) +{ + bool running =3D netif_running(vi->dev); + int i; + + enable_delayed_refill(vi); + for (i =3D 0; i < vi->max_queue_pairs; i++) { + if (i < vi->curr_queue_pairs) { + if (!try_fill_recv(vi, &vi->rq[i], GFP_KERNEL)) + schedule_delayed_work(&vi->refill, 0); + } + + if (running) + virtnet_napi_enable(&vi->rq[i]); + } +} + static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue= *rq) { bool running =3D netif_running(vi->dev); =20 + /* + * Make sure refill_work does not run concurrently to + * avoid napi_disable race which leads to deadlock. + */ + disable_delayed_refill(vi); + cancel_delayed_work_sync(&vi->refill); if (running) { virtnet_napi_disable(rq); virtnet_cancel_dim(vi, &rq->dim); @@ -3356,6 +3399,7 @@ static void virtnet_rx_resume(struct virtnet_info *vi= , struct receive_queue *rq) { bool running =3D netif_running(vi->dev); =20 + enable_delayed_refill(vi); if (!try_fill_recv(vi, rq, GFP_KERNEL)) schedule_delayed_work(&vi->refill, 0); =20 @@ -5959,12 +6003,12 @@ static int virtnet_xdp_set(struct net_device *dev, = struct bpf_prog *prog, if (prog) bpf_prog_add(prog, vi->max_queue_pairs - 1); =20 + virtnet_rx_pause_all(vi); + /* Make sure NAPI is not using any XDP TX queues for RX. */ if (netif_running(dev)) { - for (i =3D 0; i < vi->max_queue_pairs; i++) { - virtnet_napi_disable(&vi->rq[i]); + for (i =3D 0; i < vi->max_queue_pairs; i++) virtnet_napi_tx_disable(&vi->sq[i]); - } } =20 if (!prog) { @@ -5996,13 +6040,12 @@ static int virtnet_xdp_set(struct net_device *dev, = struct bpf_prog *prog, vi->xdp_enabled =3D false; } =20 + virtnet_rx_resume_all(vi); for (i =3D 0; i < vi->max_queue_pairs; i++) { if (old_prog) bpf_prog_put(old_prog); - if (netif_running(dev)) { - virtnet_napi_enable(&vi->rq[i]); + if (netif_running(dev)) virtnet_napi_tx_enable(&vi->sq[i]); - } } =20 return 0; @@ -6014,11 +6057,10 @@ static int virtnet_xdp_set(struct net_device *dev, = struct bpf_prog *prog, rcu_assign_pointer(vi->rq[i].xdp_prog, old_prog); } =20 + virtnet_rx_resume_all(vi); if (netif_running(dev)) { - for (i =3D 0; i < vi->max_queue_pairs; i++) { - virtnet_napi_enable(&vi->rq[i]); + for (i =3D 0; i < vi->max_queue_pairs; i++) virtnet_napi_tx_enable(&vi->sq[i]); - } } if (prog) bpf_prog_sub(prog, vi->max_queue_pairs - 1); --=20 2.43.0 From nobody Fri Dec 19 12:48:28 2025 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 ADE5019CCF5; Mon, 14 Apr 2025 05:09:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744607384; cv=none; b=p8VcnL/jnYQvq0I/cGhJlrzZOmLhjcLLLeKDhSR6zczTIcrxm871TbM9vNVtmoUidtnro4IbP6BvWscP0Ih49DNFxpFAJLBZf/GtJGC6aWGsYALQntfTdCurm32059pvFEhc1Y7yvkIN5cCZnF+KCSgfQmoydRR2ki3wo3q1h60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744607384; c=relaxed/simple; bh=fm0FD+nFpM4KIujT0zC25XQeJrJxwhYW3rijMoqQ0r0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TDwrvgigXYyFE3WocrHzg54mWzmgmD4UHgxic4ve53R8mjxFaHbavIJ9/yYM0gDE40Qte/egI7/lwR1vU47K6FQJx+LuR35bCqoBDu6zTRY5k3J76HLEGO78yYG3b3qiPLYCwnaD2acEwc9XzOO7OPMDcWs+Lq0FJNWdsHIr4RY= 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=W8mdm2Fo; arc=none smtp.client-ip=209.85.214.176 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="W8mdm2Fo" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2240b4de12bso52473275ad.2; Sun, 13 Apr 2025 22:09:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744607382; x=1745212182; 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=W8mdm2FoON46bEMBaY/L7RHoxF+CVWttLr1nsgwwkiyKO2FH9wl5OZkD9iotY3/qI6 jXztN4mgl1xvPxXqakITe6AUyrDmBOl48ig/LKT3HpmumNyGTHN4qD0SYzpDMGFpEz5t 8xy2ewLPV7/qJogHeR27niAfKMQWUdbi+WtDkmoFmgys7h/V0eZaAsTYWsxFqYDWGgai xmSW02qHmzngXKzJUXDnMvscqQMacazrpZT6gtuA8RaHN8mJsSKazioQd39R2y03V2QH a+SOpc34X++hhmSQTJUBQBuaZea2IlQeA4Y4GDbZjy+yKiYGNkSGndDaeKDpSCUxx9Od EbMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744607382; x=1745212182; 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=nDMGLenbWtCpbNfZmvOeGVGX4h8pkSNHdMwz09i+2urd+K7ePJqOq7QfR4duA80BCu Yvp4cnJO28kEH4/FRb/pJ9wC4Wu1WbaxX1WciTENaSA5tGKa6Mdo43NEiww7ohPADOhy pRSeFFBb0Z+zGj8HttQbV4JYe/0Se/5YIrA+c1skQl5NyFTFtkYpZ3q2aGpyv4myFNy1 1sk/g0YwrOI+CyLtOSzgS5K9cBhgkZvARP39n4vZJlVnWq0rAmEBdv0W48iBW2yu1WHX e82TLVNRkCFW89aONdp4SycuJqcpVWyUTB57hzZoQ2LLgeIWNqo74vwxAPAp8zzNVIC1 6+Bw== X-Forwarded-Encrypted: i=1; AJvYcCURTm3hN2AiFI/Ylt81bkM9Z5itib/vxGkywzza1GHZKxBQmd5aesqSt91D++iE102nmn0=@vger.kernel.org, AJvYcCVa8qyXTtuARl5Rya5Ta7zwvz82V8xsFO5Zyi/Q5ukxttA8XAf/zy3V4rSyGkeVamrU7zP2U88E8qpoX6NN@vger.kernel.org, AJvYcCWtLpo0L9uz0bPTEMTjqLrZ62Gtr6bfUOCbHtTSdbJBITamBh84j8B0Y/C+I3cxGV6FzBzxNhPt@vger.kernel.org X-Gm-Message-State: AOJu0YypXAZV9+tcZLDLhHBH6f2ttl5BXKloZA5UZ/iF+oaw47RCF24u WtnOQGd3tgdroOHiei++k9OUftTUDTxpfr4rSGXJvJXhBywMI9Bk X-Gm-Gg: ASbGnctGpBDRVnQ6dpbhIx71hR0e95ypRpGJG24cmE417xh7nGQ2sOMVFUQWybGP3iS +U55pT1iIk50jSUy73a6m+jVFp9fgmBFnfVa/RuRB6pxtxeT9Z09UV1N+nkphvfQVZt2q9UoKNJ r+dPsMHuDfPWLB37t6tT1jTcczo3gm07E7gE9gEy8R5abLxN8ZHjE3aFsqgPWfFX6ghCHGO6Wuj op5G0BwUemT8QfnVV0Mnp5xZkjRgUaZwMk1A+hDkw58qQ76xDOu/0hShJSjAEIaixcD2UHmJ12N vvr1Q18WWMPunbphaLkrhbbyk8fn4CmGhMCJf8V91Jb2QB0/Qd+RdtI= X-Google-Smtp-Source: AGHT+IFRDdR+y7fnmSVY24vGxnYcOYF2oSqO5tUVnC8sp//HSH6HJAZuXejI1iqoNQq9MH59YuatVA== X-Received: by 2002:a17:902:e5cc:b0:21f:7e12:5642 with SMTP id d9443c01a7336-22bea4b5f93mr124668945ad.18.1744607381927; Sun, 13 Apr 2025 22:09:41 -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.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Apr 2025 22:09:41 -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 2/3] selftests: net: move xdp_helper to net/lib Date: Mon, 14 Apr 2025 12:08:36 +0700 Message-ID: <20250414050837.31213-3-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" Move xdp_helper to net/lib to make it easier for other selftests to use the helper. Signed-off-by: Bui Quang Minh --- 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 Fri Dec 19 12:48:28 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