From nobody Sat Feb 7 18:21:16 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 65E3933374B for ; Tue, 6 Jan 2026 15:05:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767711904; cv=none; b=siMIsrNjc3TJisInG0IfoaNXC8sQw7FgDiGRa3ZEl1zIYiOFAueOxBfIc582Goc0d/WkgfVBD49GPuoeYF+3CBnRGXk+CsqeSJwlrZ9Z99tTCLkY/JLfzALqihVlOHPmdEJGH0u9lCyDysF+0YZETl4++7WMeeD2nkpinwcGfVo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767711904; c=relaxed/simple; bh=xszaQ3qzOot1odzGyBA0Zkfa9b0Ivks3e8yQFqhs2jc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y3OILabwY4BcS/2PWf3N91dGM/rVe3b2jK8lVanbPPUAx/v7sVfsR5TqtxDrE44u7066VBKoTM24MWH7hIFpR0RE9r30sSj3ZwFRsMel3jwyFjQHj46xVyy7rF9WuanSNKM9bobNpWzOeh/kCL7O57TGHjTHr+E9TfWrSk9oBEw= 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=InUmX2Tc; arc=none smtp.client-ip=209.85.210.179 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="InUmX2Tc" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-7bc248dc16aso936053b3a.0 for ; Tue, 06 Jan 2026 07:05:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767711901; x=1768316701; 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=HCgDdsFcTcXxf+qbWNQRt/nwxivkvn3dRLkqvh820N0=; b=InUmX2Tc85X+x4r1XsBfynIkmazzuKxkR4u+dpkAHvul0xSw+BeGD/9SAhp9Bq77Go XGqgUM5aZJeylku7TEDr4kYRwbnH8Uln41jW3De/Yc0G0BfCc7GD+Qz2L0XxQdqyfyHK ugpnj9OtaUgXdhfIozd3XfVq9K0QX8Qf+V4dx+3oEhuMpDxPds7pjibwrJ30yUGnj23O sXCQxNFAKbkAFPnM1noZzT39K2I/x2VvHINveqRBwpIp7CV/YrSzQpip9HhkurwGBSAQ wCV8t06fGv28Id8n65INMNw2+8ahemFmK76qQvt5qfxCi7axA6Wa1OFnbfsmZG00G99A AwmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767711901; x=1768316701; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=HCgDdsFcTcXxf+qbWNQRt/nwxivkvn3dRLkqvh820N0=; b=jhSq5w6iUL22KgR8ZOcXa10RGb1LirRSF9gQkl0yxHYnCfVJBnWKOT7n+AW/qXwq36 NkM1qpp/9NkEeG5IjQY44XfIS96vYAWPqldNYJGW2vxWG1bNm7gTBIs42u9zyMzj8cSX ALz75uHWuJ/rRDYvhxx09XnDkLeOvYNzpEc5SqQx/7mNzsBVX1WE/RHDM9iXlWFF2VA1 V25k8sTxv2zHEeqztDECynzVjA3XZMJWFD3W/kTqYWhkzCDn7jsaBRgQlW/1Nn5TgUw7 cCJTWvgspuYd3JolTshUFOnYloKBbUWfh7H7q2tuG8oqsitdJqQfwbxj6a9pDvAKIAW3 fz4g== X-Forwarded-Encrypted: i=1; AJvYcCUR8P3YKS2vsjlwmZQ3gsYwfH05cU86TOmw14yoMs4rgT3OcF6xPhxzyQpibD0jhA+1phYSW3nuoLeBRq4=@vger.kernel.org X-Gm-Message-State: AOJu0Yxg5CbfcVUoiATrjzE+oNTC/4Lxdb+7mCexoTT/dvOWNiMB7FkD Y71eevJdgkBXTFaSFE9e/fi2KDmdjhN3bNCSEsyTw5hCdoycmFG6diz673PTzw== X-Gm-Gg: AY/fxX5fdf7RddZIetfAJHhgt+dwpzr7EM5RSLasn8neogUJbxnomKRV8zSBvlnFyO9 bZAbg0KSlu6qP9OgPzgftwNL5N8vlMbzxKppE6gsNsP9C8YPej5kRDeRLDlnWBuKuTJQoTkRCeX eC2IJNS4gslWpkmXrPZ9h0u8aeyrmKLHCTk1JpEFALiLp5S/1aQiyto2v8/e3y3pV9VIAyPXjQP 23mVAx9H6nZRoL1Orgr9B5rGXnOGGJLu8wV2abA1XeXUxHRFvUzuUdYENGQ1OrleZpfaMxnUI7H hrQPN5K7tZpkS3h9+U7MmVYJZy1Zc/l6OM07FBBSMqQgURf6FOng5/Hfs+NfZtee1d449sqSY9W gbAujdbqdvhefkeKillYUkeO0TLeKC+hGIlfsOGmfEOumSbv03xFcRsvsCzEod15cy4G7BfmDOA 2K8WelfFWe6CN+/9PlYmw= X-Google-Smtp-Source: AGHT+IHDogIdZKcYrYsV8f80P4yM3C43vbE23Xgd+qTKk7rTQsoMMRcLT36sPlF6l2euTU7zw8ZVRA== X-Received: by 2002:a05:6a20:244a:b0:34f:2070:89d5 with SMTP id adf61e73a8af0-389822449d3mr2785149637.11.1767711901107; Tue, 06 Jan 2026 07:05:01 -0800 (PST) Received: from minh.. ([14.187.47.150]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-c4cbfc2f481sm2674231a12.10.2026.01.06.07.04.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jan 2026 07:05:00 -0800 (PST) From: Bui Quang Minh To: netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh , stable@vger.kernel.org Subject: [PATCH net v3 1/3] virtio-net: don't schedule delayed refill worker Date: Tue, 6 Jan 2026 22:04:36 +0700 Message-ID: <20260106150438.7425-2-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260106150438.7425-1-minhquangbui99@gmail.com> References: <20260106150438.7425-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 we fail to refill the receive buffers, we schedule a delayed worker to retry later. However, this worker creates some concurrency issues. For example, when the worker runs concurrently with virtnet_xdp_set, both need to temporarily disable queue's NAPI before enabling again. Without proper synchronization, a deadlock can happen when napi_disable() is called on an already disabled NAPI. That napi_disable() call will be stuck and so will the subsequent napi_enable() call. To simplify the logic and avoid further problems, we will instead retry refilling in the next NAPI poll. Fixes: 4bc12818b363 ("virtio-net: disable delayed refill when pausing rx") Reported-by: Paolo Abeni Closes: https://netdev-ctrl.bots.linux.dev/logs/vmksft/drv-hw-dbg/results/4= 00961/3-xdp-py/stderr Cc: stable@vger.kernel.org Suggested-by: Xuan Zhuo Signed-off-by: Bui Quang Minh Acked-by: Michael S. Tsirkin --- drivers/net/virtio_net.c | 48 +++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 1bb3aeca66c6..f986abf0c236 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3046,16 +3046,16 @@ static int virtnet_receive(struct receive_queue *rq= , int budget, else packets =3D virtnet_receive_packets(vi, rq, budget, xdp_xmit, &stats); =20 + u64_stats_set(&stats.packets, packets); if (rq->vq->num_free > min((unsigned int)budget, virtqueue_get_vring_size= (rq->vq)) / 2) { - if (!try_fill_recv(vi, rq, GFP_ATOMIC)) { - spin_lock(&vi->refill_lock); - if (vi->refill_enabled) - schedule_delayed_work(&vi->refill, 0); - spin_unlock(&vi->refill_lock); - } + if (!try_fill_recv(vi, rq, GFP_ATOMIC)) + /* We need to retry refilling in the next NAPI poll so + * we must return budget to make sure the NAPI is + * repolled. + */ + packets =3D budget; } =20 - u64_stats_set(&stats.packets, packets); u64_stats_update_begin(&rq->stats.syncp); for (i =3D 0; i < ARRAY_SIZE(virtnet_rq_stats_desc); i++) { size_t offset =3D virtnet_rq_stats_desc[i].offset; @@ -3230,9 +3230,10 @@ static int virtnet_open(struct net_device *dev) =20 for (i =3D 0; i < vi->max_queue_pairs; i++) { if (i < vi->curr_queue_pairs) - /* Make sure we have some buffers: if oom use wq. */ - if (!try_fill_recv(vi, &vi->rq[i], GFP_KERNEL)) - schedule_delayed_work(&vi->refill, 0); + /* Pre-fill rq agressively, to make sure we are ready to + * get packets immediately. + */ + try_fill_recv(vi, &vi->rq[i], GFP_KERNEL); =20 err =3D virtnet_enable_queue_pair(vi, i); if (err < 0) @@ -3472,16 +3473,15 @@ static void __virtnet_rx_resume(struct virtnet_info= *vi, struct receive_queue *rq, bool refill) { - bool running =3D netif_running(vi->dev); - bool schedule_refill =3D false; + if (netif_running(vi->dev)) { + /* Pre-fill rq agressively, to make sure we are ready to get + * packets immediately. + */ + if (refill) + try_fill_recv(vi, rq, GFP_KERNEL); =20 - if (refill && !try_fill_recv(vi, rq, GFP_KERNEL)) - schedule_refill =3D true; - if (running) virtnet_napi_enable(rq); - - if (schedule_refill) - schedule_delayed_work(&vi->refill, 0); + } } =20 static void virtnet_rx_resume_all(struct virtnet_info *vi) @@ -3829,11 +3829,13 @@ static int virtnet_set_queues(struct virtnet_info *= vi, u16 queue_pairs) } succ: vi->curr_queue_pairs =3D queue_pairs; - /* virtnet_open() will refill when device is going to up. */ - spin_lock_bh(&vi->refill_lock); - if (dev->flags & IFF_UP && vi->refill_enabled) - schedule_delayed_work(&vi->refill, 0); - spin_unlock_bh(&vi->refill_lock); + if (dev->flags & IFF_UP) { + local_bh_disable(); + for (int i =3D 0; i < vi->curr_queue_pairs; ++i) + virtqueue_napi_schedule(&vi->rq[i].napi, vi->rq[i].vq); + + local_bh_enable(); + } =20 return 0; } --=20 2.43.0 From nobody Sat Feb 7 18:21:16 2026 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (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 EE0D43385B8 for ; Tue, 6 Jan 2026 15:05:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767711909; cv=none; b=ZcDJWnbBT2366xyEj+MnFUGxZJafaV/XOhrCfj2+Pik4yw+AwvMUPNQMtcU7PvTPqL6DScfez3JDwH8MJ5Kc28lBEJAqhOE0n++AJ7op2qXX9exbeyoSWIh3T9QxuvKj/p3UqWe+WHyMdE2SamzLsfQN8OYasPsXpMlLobo6DwU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767711909; c=relaxed/simple; bh=8+XWm0MkuACUvng7Kj4q22bZFUfjvp4RMxeN/ue62pI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GhsicIg/dCTtPO1Mnl5AAZ35/y65EQof5qVN3c3/palPAu/8iymQLPXgdjhgmNqrYIkbQncS5/tAhn+IGihoqx5H7D/RmXhEkAJD6EsI1QERGuecfPGQwlR7lqJyCn/aSVX9j1qPScxjqukDgfFxAksSHftsYqHwE7osICWSVhQ= 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=ZBcDHY3g; arc=none smtp.client-ip=209.85.216.46 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="ZBcDHY3g" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-34c2f335681so859508a91.1 for ; Tue, 06 Jan 2026 07:05:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767711907; x=1768316707; 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=3dx88BuQonAnFzYSa3hWDepRze012ELPUSAZLctBXB8=; b=ZBcDHY3grU+OaiYHyJwwC5Dwol29KGgZw3W/XHDUtxaeYZ/WhkJ+cpbGJzK0/yaWOa e5BpobvGHn/beIO3S+rXqP63cnvvN2KtpqV5jYlPUj//Z5H1cmK+zKeixGQNGaInXDx5 lljR9Xop2JdBOM1V4RFl74xcrP5mKWek+xHYNPbmHda8qLEnc62abAxdlCdouqRwglqx Ac0B7cEkBj1Ojo8QhkiGXsr/r/xRhvO5ZABv9D/NRKfEIISp7ThdepSm0pE9sr0Xaf0q Dl0U4rZ77AwTOJjikSim/Xx2NlQnV8FalzulFdd30T6aPGBeCSrYin6oH+NjR5JRiPBS POQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767711907; x=1768316707; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3dx88BuQonAnFzYSa3hWDepRze012ELPUSAZLctBXB8=; b=DOgRyBGiLkX0APgK8NUikElf8Pu8vOHJH3F/HGPNzBJgjvmZOm/RurkNWX5MBoJjJx /e7TcRK2LdbgdplIeryWkNjAlLIkH3CZfAzGxLhYFSS2SdIawgrc/vi4WOgI9UhC4NJ/ NQu77H3PJ4A7gIuLivowClmzJk3YZrjKtUYLbH8AdWH4O9omYWfKTj6xa2YEn85MTVZh czxxW6SQ3g5AudsQJvFWrUTOoqYM/qRypdpXDadmXQvyJDoppx01JgvbC5nIghJXZ7mc fVt3CCC4tUhtFBSCHfdHe+KjzE1cTqmL2mVhK62JT8xN9slcKSAdkoaW2WfHASMT3Azt AShw== X-Forwarded-Encrypted: i=1; AJvYcCV4lpsCRHr0crnnEPgVdUX8z2q7a3j7GZ5IMgAfOu3brv/iIFAjcbUJNhqZF4iwgpDbjcGRp3z4kfTPQEI=@vger.kernel.org X-Gm-Message-State: AOJu0YxmgzRC93EgE9v+qhGilSEWOZbOA+wPD1j7q1LjvcqHjsLY5DzG Bbx6Ya4lXbVpaKNgGlxlwbN4sdfQXQvRxOHZA6MrESvZrQlg2LVhaXka X-Gm-Gg: AY/fxX6YPI1GC/5lj9j7fN6DBLG/oQh095ynfFplq4Q280vYSiwSgnaBY9PBNDfEkcR sc1gwVzhOOTe2D0Gimlem+4H+Rnw9i9MciGjXalxfvDqRKZW0GYcY27LSGm9fcQUHKCj+qXv7wg +n5dWcEypWkQ9nkriYp++4Y+bojidV2/HLMkVOHDZjbEmAaAfbtG4WvIk1dXUZy28VTvGq8ALvn XA94iANAflVUbcTLun1CLg0QAgTi78EF53pbGRX/abgHWVka7AbdEtnGoP14Eo9MhgYi5G7s8Gj jOVSyeCYSMwAKt8MapiEPGsWEaqbZLHUO4MxkmkYCvX07eKOnQAYM9GCcUQuGQZwp0LGEydHBu5 ohnyGjrLCRCD/fuPu2VMA4As6BWD6TaThrxhHCPysS7BJLaHISqX6lXRufT56JZJZCi717ZPyra jCMHd3do3nL37xFiOkMsg= X-Google-Smtp-Source: AGHT+IGb/fa1WaHzo7cAnun0Ah7pdwWSpOYpISNRLWZukJJRzWm7hWnHLE4Xc81NGkVkfkP9FNYbHA== X-Received: by 2002:a17:90b:2dc3:b0:340:d578:f2a2 with SMTP id 98e67ed59e1d1-34f5f26df41mr2777359a91.6.1767711907045; Tue, 06 Jan 2026 07:05:07 -0800 (PST) Received: from minh.. ([14.187.47.150]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-c4cbfc2f481sm2674231a12.10.2026.01.06.07.05.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jan 2026 07:05:06 -0800 (PST) From: Bui Quang Minh To: netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH net v3 2/3] virtio-net: remove unused delayed refill worker Date: Tue, 6 Jan 2026 22:04:37 +0700 Message-ID: <20260106150438.7425-3-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260106150438.7425-1-minhquangbui99@gmail.com> References: <20260106150438.7425-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" Since we switched to retry refilling receive buffer in NAPI poll instead of delayed worker, remove all now unused delayed refill worker code. Acked-by: Michael S. Tsirkin Signed-off-by: Bui Quang Minh --- drivers/net/virtio_net.c | 86 ---------------------------------------- 1 file changed, 86 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index f986abf0c236..a4dbc958689b 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -441,9 +441,6 @@ struct virtnet_info { /* Packet virtio header size */ u8 hdr_len; =20 - /* Work struct for delayed refilling if we run low on memory. */ - struct delayed_work refill; - /* UDP tunnel support */ bool tx_tnl; =20 @@ -451,12 +448,6 @@ struct virtnet_info { =20 bool rx_tnl_csum; =20 - /* Is delayed refill enabled? */ - bool refill_enabled; - - /* The lock to synchronize the access to refill_enabled */ - spinlock_t refill_lock; - /* Work struct for config space updates */ struct work_struct config_work; =20 @@ -720,20 +711,6 @@ static void virtnet_rq_free_buf(struct virtnet_info *v= i, put_page(virt_to_head_page(buf)); } =20 -static void enable_delayed_refill(struct virtnet_info *vi) -{ - spin_lock_bh(&vi->refill_lock); - vi->refill_enabled =3D true; - spin_unlock_bh(&vi->refill_lock); -} - -static void disable_delayed_refill(struct virtnet_info *vi) -{ - spin_lock_bh(&vi->refill_lock); - vi->refill_enabled =3D false; - spin_unlock_bh(&vi->refill_lock); -} - static void enable_rx_mode_work(struct virtnet_info *vi) { rtnl_lock(); @@ -2948,42 +2925,6 @@ static void virtnet_napi_disable(struct receive_queu= e *rq) napi_disable(napi); } =20 -static void refill_work(struct work_struct *work) -{ - struct virtnet_info *vi =3D - container_of(work, struct virtnet_info, refill.work); - bool still_empty; - int i; - - for (i =3D 0; i < vi->curr_queue_pairs; i++) { - struct receive_queue *rq =3D &vi->rq[i]; - - /* - * When queue API support is added in the future and the call - * below becomes napi_disable_locked, this driver will need to - * be refactored. - * - * One possible solution would be to: - * - cancel refill_work with cancel_delayed_work (note: - * non-sync) - * - cancel refill_work with cancel_delayed_work_sync in - * virtnet_remove after the netdev is unregistered - * - wrap all of the work in a lock (perhaps the netdev - * instance lock) - * - check netif_running() and return early to avoid a race - */ - napi_disable(&rq->napi); - still_empty =3D !try_fill_recv(vi, rq, GFP_KERNEL); - virtnet_napi_do_enable(rq->vq, &rq->napi); - - /* In theory, this can happen: if we don't get any buffers in - * we will *never* try to fill again. - */ - if (still_empty) - schedule_delayed_work(&vi->refill, HZ/2); - } -} - static int virtnet_receive_xsk_bufs(struct virtnet_info *vi, struct receive_queue *rq, int budget, @@ -3226,8 +3167,6 @@ static int virtnet_open(struct net_device *dev) struct virtnet_info *vi =3D netdev_priv(dev); int i, err; =20 - enable_delayed_refill(vi); - for (i =3D 0; i < vi->max_queue_pairs; i++) { if (i < vi->curr_queue_pairs) /* Pre-fill rq agressively, to make sure we are ready to @@ -3252,9 +3191,6 @@ static int virtnet_open(struct net_device *dev) return 0; =20 err_enable_qp: - disable_delayed_refill(vi); - cancel_delayed_work_sync(&vi->refill); - for (i--; i >=3D 0; i--) { virtnet_disable_queue_pair(vi, i); virtnet_cancel_dim(vi, &vi->rq[i].dim); @@ -3448,24 +3384,12 @@ static void virtnet_rx_pause_all(struct virtnet_inf= o *vi) { int i; =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); for (i =3D 0; i < vi->max_queue_pairs; i++) __virtnet_rx_pause(vi, &vi->rq[i]); } =20 static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue= *rq) { - /* - * 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); __virtnet_rx_pause(vi, rq); } =20 @@ -3488,7 +3412,6 @@ static void virtnet_rx_resume_all(struct virtnet_info= *vi) { int i; =20 - enable_delayed_refill(vi); for (i =3D 0; i < vi->max_queue_pairs; i++) { if (i < vi->curr_queue_pairs) __virtnet_rx_resume(vi, &vi->rq[i], true); @@ -3499,7 +3422,6 @@ static void virtnet_rx_resume_all(struct virtnet_info= *vi) =20 static void virtnet_rx_resume(struct virtnet_info *vi, struct receive_queu= e *rq) { - enable_delayed_refill(vi); __virtnet_rx_resume(vi, rq, true); } =20 @@ -3845,10 +3767,6 @@ static int virtnet_close(struct net_device *dev) struct virtnet_info *vi =3D netdev_priv(dev); int i; =20 - /* Make sure NAPI doesn't schedule refill work */ - disable_delayed_refill(vi); - /* Make sure refill_work doesn't re-enable napi! */ - cancel_delayed_work_sync(&vi->refill); /* Prevent the config change callback from changing carrier * after close */ @@ -5804,7 +5722,6 @@ static int virtnet_restore_up(struct virtio_device *v= dev) =20 virtio_device_ready(vdev); =20 - enable_delayed_refill(vi); enable_rx_mode_work(vi); =20 if (netif_running(vi->dev)) { @@ -6561,7 +6478,6 @@ static int virtnet_alloc_queues(struct virtnet_info *= vi) if (!vi->rq) goto err_rq; =20 - INIT_DELAYED_WORK(&vi->refill, refill_work); for (i =3D 0; i < vi->max_queue_pairs; i++) { vi->rq[i].pages =3D NULL; netif_napi_add_config(vi->dev, &vi->rq[i].napi, virtnet_poll, @@ -6903,7 +6819,6 @@ static int virtnet_probe(struct virtio_device *vdev) =20 INIT_WORK(&vi->config_work, virtnet_config_changed_work); INIT_WORK(&vi->rx_mode_work, virtnet_rx_mode_work); - spin_lock_init(&vi->refill_lock); =20 if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) { vi->mergeable_rx_bufs =3D true; @@ -7167,7 +7082,6 @@ static int virtnet_probe(struct virtio_device *vdev) net_failover_destroy(vi->failover); free_vqs: virtio_reset_device(vdev); - cancel_delayed_work_sync(&vi->refill); free_receive_page_frags(vi); virtnet_del_vqs(vi); free: --=20 2.43.0 From nobody Sat Feb 7 18:21:16 2026 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 6A8043346AC for ; Tue, 6 Jan 2026 15:05:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767711915; cv=none; b=rRUmFSXQt1PthdvFvn2OsHRBYwnyFNuNBRgYsL++WsEHS4THT18cxFPpSFNvGq4yYwoWxrP4OMaoQu7S9ptCsr5oG93qC9qTQFM9WAOiH/SXeQfBcvnYLkRkal1phVa5jKaEfK8ptD2Z+FqJRnS7v3cRoI9hyL832/fXJbM2O60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767711915; c=relaxed/simple; bh=iakYf4ocTYJ7pB+W5zvpfHG5k1a398Tzn3uAlEF7lF8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=todb5coHr/Jl/o0BwXZOxzseLj6tQiMY4okwW+JN+KQWqDpXvGGdiFPccibXJBOq8/yXLOoCWtwu2Pc1AVLyHJ0ptj7m8QLsmyqucF/5tZMsIyGHXKtpsotOuFiQ5By+d0K3nA8DEK8j2auOjKgB0nfSp8PbxstzFkxncoihBME= 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=HJ+6srUx; arc=none smtp.client-ip=209.85.210.175 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="HJ+6srUx" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-7b9c17dd591so916059b3a.3 for ; Tue, 06 Jan 2026 07:05:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767711914; x=1768316714; 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=tC197L1plDdByX5sXGNPm444DjHNEfSXtphhEaSIChs=; b=HJ+6srUxc0B6lbhk29dbeB8itqsVzV+e3e6No4yk10VYagLjPzoDqErPYENPTVqg8W 2jVE7mNl3vWxpvDjexCocIbXtqOsJuzsZwDsJ/0VzkmvENFKqTZBI7Bv9pQi4J0cIKJn HiOeTn49McPHCBHUuf5Yyy4FBtqz3i+dOlghUEoJbjW/cXZ8jJingCrbUC0cwZSob7bY 5ezwDP35mDWaZs8b9tcH0l2ZoOC0scwNRPL7+WiLo4vS7tfVsMFCd8CUaxsWTYVggdr/ UwGw6UGsBKsr6ClSevAdi7hk/KBTWZLVwng6YpI/oyNTskEXERCQx5ZPlgYZzvLnCjxg 27Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767711914; x=1768316714; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tC197L1plDdByX5sXGNPm444DjHNEfSXtphhEaSIChs=; b=kmyMexOnlyqgdIBAXcGR2hYdfMOdp+432MitY+unBO0hMQPRJci3T+4iAT4nWSI9a7 R2wO1Spd0QK8ZasSoXB6byKYFdQxyPEb/xN6neDyFN5VhahvRfjj1eC0CeZ5IBUVNvLt plaD6lLMGEKKFn8gBG0oj/Hhz9PyScAgSeJnLe3M17ElgtfDudmKt3UE8wyOFHDfO+zI GJOJs9QIdD6pVgqjYW/SsaJg5YY2pcfQyz8GEd9N5pptgmeHcJkHUbc2etowuIBx/odO y1OZ0YAoJY7xNn+KMHZOv5RQ3UFeppL2ycOXaLa8iaB31HBGlWTxU/MrYQPSxylgphT0 oG2g== X-Forwarded-Encrypted: i=1; AJvYcCX9eEjXTQst5Xh/GZaypQcO7ms985NYT7baHywTk6FP/ObnYZdWVbuthNsRS0GcCcj6AujpBODDFgQEDbI=@vger.kernel.org X-Gm-Message-State: AOJu0YwUxt3HJWLc2V0ZwKuG08A7p2kfxOxAKnJ5HUbh8o8QpjSDQquv oLsoH5iQtJkPALrmYKlcPwA3QVskTg7yt1eSn39e74Fp39TyrJzCTZ+Q X-Gm-Gg: AY/fxX4sI57hR1KM7LWN8XhB/cBe0xOqZj0sjTXf/KcMrGNnIjUDP84n7g/Un8L8rkK 8sOBgjTQ79YLSX8jIhz4//jbAY2I4eXzTPUtrq9cM+AhuGteSbv0Q736OOFRtWPvY5g8xn0DsfH nUGn6T/jTVnkzRnKeLvJ80TshUcNFuEp/HCmqWFxaSFgO6Ar+mIlebkBNU1S+JcN/5PezVD1t1B a4/EEddqjCF8frkPFg+g11Eq0MT2rQcNT+FuLV3EzNkehkuc9KabR6NS4tyCeF7pyUXhIPyYfhJ g5i++eWfB8LKFUw2/Uvm9OXhCnY6N8NLFs/4PuF8BYnKitFhr3xn/tuIkEHvA/i/VdNfgEkL5DN PfxMKxfP8OoTmKdm/+te99F3zYAzunYAQ6nnqJ3hSThR5pCZnZ38NqthjTKolZGnRwzFM4aqtrw Oh8y54TzNw X-Google-Smtp-Source: AGHT+IGhJ2thPSuMeCWJuvxELL17nB4aCL3Ngpi+wjeWS3G5XiZYgyewYqUsGwlAYN2kTVU2XU2ttQ== X-Received: by 2002:a05:6a21:3290:b0:366:14b2:313 with SMTP id adf61e73a8af0-389823cbca6mr3147694637.70.1767711913785; Tue, 06 Jan 2026 07:05:13 -0800 (PST) Received: from minh.. ([14.187.47.150]) by smtp.googlemail.com with ESMTPSA id 41be03b00d2f7-c4cbfc2f481sm2674231a12.10.2026.01.06.07.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jan 2026 07:05:13 -0800 (PST) From: Bui Quang Minh To: netdev@vger.kernel.org Cc: "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Bui Quang Minh Subject: [PATCH net v3 3/3] virtio-net: clean up __virtnet_rx_pause/resume Date: Tue, 6 Jan 2026 22:04:38 +0700 Message-ID: <20260106150438.7425-4-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260106150438.7425-1-minhquangbui99@gmail.com> References: <20260106150438.7425-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 delayed refill worker is removed which makes virtnet_rx_pause/resume quite the same as __virtnet_rx_pause/resume. So remove __virtnet_rx_pause/resume and move the code to virtnet_rx_pause/resume. Acked-by: Michael S. Tsirkin Signed-off-by: Bui Quang Minh --- drivers/net/virtio_net.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index a4dbc958689b..745bae756920 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3369,8 +3369,8 @@ static netdev_tx_t start_xmit(struct sk_buff *skb, st= ruct net_device *dev) return NETDEV_TX_OK; } =20 -static void __virtnet_rx_pause(struct virtnet_info *vi, - struct receive_queue *rq) +static void virtnet_rx_pause(struct virtnet_info *vi, + struct receive_queue *rq) { bool running =3D netif_running(vi->dev); =20 @@ -3385,17 +3385,12 @@ static void virtnet_rx_pause_all(struct virtnet_inf= o *vi) int i; =20 for (i =3D 0; i < vi->max_queue_pairs; i++) - __virtnet_rx_pause(vi, &vi->rq[i]); + virtnet_rx_pause(vi, &vi->rq[i]); } =20 -static void virtnet_rx_pause(struct virtnet_info *vi, struct receive_queue= *rq) -{ - __virtnet_rx_pause(vi, rq); -} - -static void __virtnet_rx_resume(struct virtnet_info *vi, - struct receive_queue *rq, - bool refill) +static void virtnet_rx_resume(struct virtnet_info *vi, + struct receive_queue *rq, + bool refill) { if (netif_running(vi->dev)) { /* Pre-fill rq agressively, to make sure we are ready to get @@ -3414,17 +3409,12 @@ static void virtnet_rx_resume_all(struct virtnet_in= fo *vi) =20 for (i =3D 0; i < vi->max_queue_pairs; i++) { if (i < vi->curr_queue_pairs) - __virtnet_rx_resume(vi, &vi->rq[i], true); + virtnet_rx_resume(vi, &vi->rq[i], true); else - __virtnet_rx_resume(vi, &vi->rq[i], false); + virtnet_rx_resume(vi, &vi->rq[i], false); } } =20 -static void virtnet_rx_resume(struct virtnet_info *vi, struct receive_queu= e *rq) -{ - __virtnet_rx_resume(vi, rq, true); -} - static int virtnet_rx_resize(struct virtnet_info *vi, struct receive_queue *rq, u32 ring_num) { @@ -3438,7 +3428,7 @@ static int virtnet_rx_resize(struct virtnet_info *vi, if (err) netdev_err(vi->dev, "resize rx fail: rx queue index: %d err: %d\n", qind= ex, err); =20 - virtnet_rx_resume(vi, rq); + virtnet_rx_resume(vi, rq, true); return err; } =20 @@ -5811,7 +5801,7 @@ static int virtnet_rq_bind_xsk_pool(struct virtnet_in= fo *vi, struct receive_queu =20 rq->xsk_pool =3D pool; =20 - virtnet_rx_resume(vi, rq); + virtnet_rx_resume(vi, rq, true); =20 if (pool) return 0; --=20 2.43.0