From nobody Sun Feb 8 21:33:58 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