From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6474A254B18 for ; Sun, 4 Jan 2026 15:12:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767539540; cv=none; b=iCapyckeW3ic6mTx3irLVSAfgLJrMIAv/SmNRGaHPOYpjG/q2QsW6XGnElR9dFJlv9hQjfdsTiQZ4hownXbrlegIQjXm844TxLCyI5R7Paoe/rgoW9ObOJT4pRm+XRMKA0BC/mP2aDYr4DRYynfjIB5rwrT5GmkQRjIfJ8yTglk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767539540; c=relaxed/simple; bh=ivSKrAjEuo87zsIpP4fLpsMS7rh54Ruil9quREK39z4=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=pQ2p5VGM3uc3P6lSLDuHrcCknp3CLXyP89PUrOIlJVAk54V8dwg5+zW8RuzP717TmDHK9SjAtj5hpT9W8AMVjuq/YQE8HfCMNlYRH2JgbFS4tHIRLUc43q09Q6kXp3WA4udFrOq/H8occpNFZ5rEX5+7cBOhVZQ+qOBY5xBHEUs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=P9q4OZjY; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=sEv44GBa; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="P9q4OZjY"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="sEv44GBa" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767539537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T5TkTWeq6jaFzrRXX3A7+dH64VF44s1wAHgRFH91w28=; b=P9q4OZjY2LF/3BJ+96Z6RSBypWyOaEXjzXUtWKXJjQONsFRhyUGaHFQaugYCyfRIUdmb2G kAmyrBNBmxnUZkhRZaZbNEVZdd/+XguBspoJN765vEiJpg8gWuKaqUSnSbSsOVxkWN1Wfo pzPw/36OGNO6cA6bhVKpKOIGGFUDMAw= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-606-AzD-Mw-5NN-BvdPpPJi5qg-1; Sun, 04 Jan 2026 10:12:16 -0500 X-MC-Unique: AzD-Mw-5NN-BvdPpPJi5qg-1 X-Mimecast-MFC-AGG-ID: AzD-Mw-5NN-BvdPpPJi5qg_1767539535 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-47d5c7a2f54so4198715e9.1 for ; Sun, 04 Jan 2026 07:12:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1767539535; x=1768144335; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=T5TkTWeq6jaFzrRXX3A7+dH64VF44s1wAHgRFH91w28=; b=sEv44GBa0iYBpkO9Cfx5Lz0X/nfG4tQasupNP6sBj+lCOLuEeSpWQsmmF/dFU/opii OxHrvfXqcFOR1D2E7JS+aZRrqbU47gqgnEz0NctLo9IBAG8cJw+FbHsXasWVl6U92fxf yTt8nKQhqoxxD7gjMAy6rKSgW4klsmVLxx5z8OnSkJBDBFozibGfAutAqKItRlt4yJU6 jg+B5b6YR+11aIfYpBQS36u49Fl0VHRbEN+qGQdDP48hBaMCKWrnmIvgyW9wcfIxt1Yi vxPHnOChyBbqob/DIRPyfEyqI/V5aX3YP8YergWGiqz1pmOL2eEz2Ex7k53HUET1C4YJ X6gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767539535; x=1768144335; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=T5TkTWeq6jaFzrRXX3A7+dH64VF44s1wAHgRFH91w28=; b=HMdss1g5S04so87YoztzQ+FNLzYh/C0M9gVQ/RLu3kjGkXHk7bc7Y6hw8PC+uatjnP PAb89xsPxVkXZwWhh+0yMmW1tIdLMxvKz+snFzFhjIh7u2BWYwsaz4rWQI4nf/wXLjKA V+HImT18bm0tr8zwbNY1xh71Iu9d5tPozZAytqgFKQ1Zq0KA36+6WsxdUwzleZoVozQv iKkUfopNB4m/S2eQGdOqxDoyvU2eB3/3mFaKFWybV+qVWMo7QBdHMfrgsZu+tPfwz8HT 4RyqWak5mqIP2e+/K+XEZWfml7xvqJMs3d7Gp/PxK/xR82mzd9OpgKsTzF+97Z5DA1EB yfqQ== X-Forwarded-Encrypted: i=1; AJvYcCW7EDAj+6KvCoeIGJf7DRw/AkTxvAn5hHFV62z6H0PcyAkDwRg71+jx6eOh4fUs8nsPhPdwbIY=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2AReyrm1hPHpcCmSt3mkljF7sTJTAZTWlAVJlbhtRc06fbaoO MsIajM90uwKN/17kaIrI/F0H7z7qKpNnXOrqzHp7d27oQQFeswkHBIz9HXdnaVEu02QrPXyWFs+ qW94V/SeGkyuI1914J4RN1UvF8+3cghXmlimhCI90DBC9U8+85rJroRXxrg== X-Gm-Gg: AY/fxX40Vwvik+u79ghlHQh/t0Fk/rX1IvzVukmfZM0dFaHJ66Ey5sHhC5YTw56abkV NGLJO7JRYenR7sAoo0Im2mhpA5I3FAyWLIgh5kFRYyWBaKUUtHobXRI4gF2KyhSa/F+u+GNErKm rsyrYvuxbSuFq55krtKsiufLioFBbaRHitQlZPJ4u+1JnaFR4ZIMOz8X/AqLTFaZLmsa8iB8/1x pwRC/dBk6u+5/+cMrRlbKT7L0pccTlBTtKfG/44v15E2YI4SmnbRd+b5r3LJALIUZ3re/PEhWL6 P7r3nWBjHyFlKHr7peJJQ+TLWLrgL8yS5d49oCsa85n5g+lSsdlUlHtOL9o3lCBfZ+wOPiQv6lE pkvBTTCzTWxKC7FPrYrzWnaNIcGL9Lr2t0g== X-Received: by 2002:a05:600c:3110:b0:477:9e0c:f59 with SMTP id 5b1f17b1804b1-47d6ba7e485mr77196235e9.2.1767539534877; Sun, 04 Jan 2026 07:12:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7ldtBLYyar1dg4HVtYcMou56fKGNyqx8S/v6V2dXlCUsBEJhaIvTgLxT54uYwfafwq6yhSg== X-Received: by 2002:a05:600c:3110:b0:477:9e0c:f59 with SMTP id 5b1f17b1804b1-47d6ba7e485mr77195805e9.2.1767539534337; Sun, 04 Jan 2026 07:12:14 -0800 (PST) Received: from redhat.com (IGLD-80-230-31-118.inter.net.il. [80.230.31.118]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47d6ba7090esm38542455e9.7.2026.01.04.07.12.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jan 2026 07:12:13 -0800 (PST) Date: Sun, 4 Jan 2026 10:12:10 -0500 From: "Michael S. Tsirkin" To: Bui Quang Minh Cc: Jason Wang , netdev@vger.kernel.org, Xuan Zhuo , Eugenio =?iso-8859-1?Q?P=E9rez?= , 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, stable@vger.kernel.org Subject: Re: [PATCH net v2 1/3] virtio-net: don't schedule delayed refill worker Message-ID: <20260104100912-mutt-send-email-mst@kernel.org> References: <20260102152023.10773-1-minhquangbui99@gmail.com> <20260102152023.10773-2-minhquangbui99@gmail.com> <6bac1895-d4a3-4e98-8f39-358fa14102db@gmail.com> <20260104085846-mutt-send-email-mst@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Sun, Jan 04, 2026 at 09:54:30PM +0700, Bui Quang Minh wrote: > On 1/4/26 21:03, Michael S. Tsirkin wrote: > > On Sun, Jan 04, 2026 at 03:34:52PM +0700, Bui Quang Minh wrote: > > > On 1/4/26 13:09, Jason Wang wrote: > > > > On Fri, Jan 2, 2026 at 11:20 PM Bui Quang Minh wrote: > > > > > When we fail to refill the receive buffers, we schedule a delayed worker > > > > > to retry later. However, this worker creates some concurrency issues > > > > > such as races and deadlocks. 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/400961/3-xdp-py/stderr > > > > > Cc: stable@vger.kernel.org > > > > > Suggested-by: Xuan Zhuo > > > > > Signed-off-by: Bui Quang Minh > > > > > --- > > > > > drivers/net/virtio_net.c | 55 ++++++++++++++++++++++------------------ > > > > > 1 file changed, 30 insertions(+), 25 deletions(-) > > > > > > > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > > > > index 1bb3aeca66c6..ac514c9383ae 100644 > > > > > --- a/drivers/net/virtio_net.c > > > > > +++ b/drivers/net/virtio_net.c > > > > > @@ -3035,7 +3035,7 @@ static int virtnet_receive_packets(struct virtnet_info *vi, > > > > > } > > > > > > > > > > static int virtnet_receive(struct receive_queue *rq, int budget, > > > > > - unsigned int *xdp_xmit) > > > > > + unsigned int *xdp_xmit, bool *retry_refill) > > > > > { > > > > > struct virtnet_info *vi = rq->vq->vdev->priv; > > > > > struct virtnet_rq_stats stats = {}; > > > > > @@ -3047,12 +3047,8 @@ static int virtnet_receive(struct receive_queue *rq, int budget, > > > > > packets = virtnet_receive_packets(vi, rq, budget, xdp_xmit, &stats); > > > > > > > > > > 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)) > > > > > + *retry_refill = true; > > > > > } > > > > > > > > > > u64_stats_set(&stats.packets, packets); > > > > > @@ -3129,18 +3125,18 @@ static int virtnet_poll(struct napi_struct *napi, int budget) > > > > > struct send_queue *sq; > > > > > unsigned int received; > > > > > unsigned int xdp_xmit = 0; > > > > > - bool napi_complete; > > > > > + bool napi_complete, retry_refill = false; > > > > > > > > > > virtnet_poll_cleantx(rq, budget); > > > > > > > > > > - received = virtnet_receive(rq, budget, &xdp_xmit); > > > > > + received = virtnet_receive(rq, budget, &xdp_xmit, &retry_refill); > > > > I think we can simply let virtnet_receive() to return the budget when > > > > reill fails. > > > That makes sense, I'll change it. > > > > > > > > rq->packets_in_napi += received; > > > > > > > > > > if (xdp_xmit & VIRTIO_XDP_REDIR) > > > > > xdp_do_flush(); > > > > > > > > > > /* Out of packets? */ > > > > > - if (received < budget) { > > > > > + if (received < budget && !retry_refill) { > > > > > napi_complete = virtqueue_napi_complete(napi, rq->vq, received); > > > > > /* Intentionally not taking dim_lock here. This may result in a > > > > > * spurious net_dim call. But if that happens virtnet_rx_dim_work > > > > > @@ -3160,7 +3156,7 @@ static int virtnet_poll(struct napi_struct *napi, int budget) > > > > > virtnet_xdp_put_sq(vi, sq); > > > > > } > > > > > > > > > > - return received; > > > > > + return retry_refill ? budget : received; > > > > > } > > > > > > > > > > static void virtnet_disable_queue_pair(struct virtnet_info *vi, int qp_index) > > > > > @@ -3230,9 +3226,11 @@ static int virtnet_open(struct net_device *dev) > > > > > > > > > > for (i = 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); > > > > > + /* If this fails, we will retry later in > > > > > + * NAPI poll, which is scheduled in the below > > > > > + * virtnet_enable_queue_pair > > > > > + */ > > > > > + try_fill_recv(vi, &vi->rq[i], GFP_KERNEL); > > > > Consider NAPI will be eventually scheduled, I wonder if it's still > > > > worth to refill here. > > > With GFP_KERNEL here, I think it's more likely to succeed than GFP_ATOMIC in > > > NAPI poll. Another small benefit is that the actual packet can happen > > > earlier. In case the receive buffer is empty and we don't refill here, the > > > #1 NAPI poll refill the buffer and the #2 NAPI poll can receive packets. The > > > #2 NAPI poll is scheduled in the interrupt handler because the #1 NAPI poll > > > will deschedule the NAPI and enable the device interrupt. In case we > > > successfully refill here, the #1 NAPI poll can receive packets right away. > > > > > Right. But I think this is a part that needs elucidating, not > > error handling. > > > > /* Pre-fill rq agressively, to make sure we are ready to get packets > > * immediately. > > * */ > > > > > > > err = virtnet_enable_queue_pair(vi, i); > > > > > if (err < 0) > > > > > @@ -3473,15 +3471,15 @@ static void __virtnet_rx_resume(struct virtnet_info *vi, > > > > > bool refill) > > > > > { > > > > > bool running = netif_running(vi->dev); > > > > > - bool schedule_refill = false; > > > > > > > > > > - if (refill && !try_fill_recv(vi, rq, GFP_KERNEL)) > > > > > - schedule_refill = true; > > > > > + if (refill) > > > > > + /* If this fails, we will retry later in NAPI poll, which is > > > > > + * scheduled in the below virtnet_napi_enable > > > > > + */ > > > > > + try_fill_recv(vi, rq, GFP_KERNEL); > > > > and here. > > > > > > > > > + > > > > > if (running) > > > > > virtnet_napi_enable(rq); > > here the part that isn't clear is why are we refilling if !running > > and what handles failures in that case. > > You are right, we should not refill when !running. I'll move the if (refill) > inside the if (running). Sounds like a helper that does refill+virtnet_napi_enable would be in order then? fill_recv_aggressively(vi, rq) ? > > > > > > > - > > > > > - if (schedule_refill) > > > > > - schedule_delayed_work(&vi->refill, 0); > > > > > } > > > > > > > > > > static void virtnet_rx_resume_all(struct virtnet_info *vi) > > > > > @@ -3777,6 +3775,7 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) > > > > > struct virtio_net_rss_config_trailer old_rss_trailer; > > > > > struct net_device *dev = vi->dev; > > > > > struct scatterlist sg; > > > > > + int i; > > > > > > > > > > if (!vi->has_cvq || !virtio_has_feature(vi->vdev, VIRTIO_NET_F_MQ)) > > > > > return 0; > > > > > @@ -3829,11 +3828,17 @@ static int virtnet_set_queues(struct virtnet_info *vi, u16 queue_pairs) > > > > > } > > > > > succ: > > > > > vi->curr_queue_pairs = 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) { > > > > > + /* Let the NAPI poll refill the receive buffer for us. We can't > > > > > + * safely call try_fill_recv() here because the NAPI might be > > > > > + * enabled already. > > > > > + */ > > > > > + local_bh_disable(); > > > > > + for (i = 0; i < vi->curr_queue_pairs; i++) > > > > > + virtqueue_napi_schedule(&vi->rq[i].napi, vi->rq[i].vq); > > > > > + > > > > > + local_bh_enable(); > > > > > + } > > > > > > > > > > return 0; > > > > > } > > > > > -- > > > > > 2.43.0 > > > > > > > > > Thanks > > > > > > > Thanks, > > > Quang Minh.