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 59A7330BB88 for ; Sat, 3 Jan 2026 16:58:05 +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=1767459487; cv=none; b=SBLoZXrVyx7MSoBWJqCXMEZBGSc1GDOZVULCLb+wa3WH4UvRwswSPtmKxM/cWvrhpuo7pXR8PqSF/qjTpM9JtTPPQcBXgQsjumNkUXfcNNAaOZQ37yXED0Uh6xp5gwSkZcCaKijgeOfduPVnl5b/hgUQhB8c/WIgCM478TQiaKE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767459487; c=relaxed/simple; bh=m7kFC8NLRqMykIfn43teN/tTE91nR1HuG4dJPWsxS3M=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=tGcvYxCcr0Dh1qWxJrC4sob8dcJtTMrpMtSpN+7DHGrn4E668bxDzZLVSlCyCUW95YvWs27DOdDeTma+vZPckBkI7zedzqWt9yHNpK74/FJCh5HlJyikOYp4tOL7fQ9NashE9mW5DM1X/lSwwmbvUru31JM//Z6ydD7GG9UiAI8= 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=OykGUCxX; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=sTmvxn9h; 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="OykGUCxX"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="sTmvxn9h" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767459478; 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: in-reply-to:in-reply-to:references:references; bh=+wZkUF3NRhUPtxghhUm6LslapHbc+LfpmZjiNA6s+nU=; b=OykGUCxXDHD1EUhg7mOZM3QOhwdWsyobQzlBaENoIpRFZkJ2LCkYAMND3UJVu6SE33oWEU XYPjEzTvF5cmTk3q8b57ySYOfVKwcDTAadSWSgMGewwOFjj8HdfdnfASIr5eWr9LtPtRT2 77+8OK/zISV1u6fDVCDnL95mXcf2Dy4= 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-686-GKzUrVfxP2-48F8zT1L3cw-1; Sat, 03 Jan 2026 11:57:49 -0500 X-MC-Unique: GKzUrVfxP2-48F8zT1L3cw-1 X-Mimecast-MFC-AGG-ID: GKzUrVfxP2-48F8zT1L3cw_1767459464 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-47d5bd981c8so29147725e9.0 for ; Sat, 03 Jan 2026 08:57:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1767459464; x=1768064264; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=+wZkUF3NRhUPtxghhUm6LslapHbc+LfpmZjiNA6s+nU=; b=sTmvxn9hRs3v8FlGVYo4XHal9FCHx2qlKjcIIYxw4YUcjWG8fhhozamd+NnvpxkScP fCCiCzR2LW4ht/jOMzXxIyeUAngVL4DbnU0+y7m4hkZpd++RZ4N4KeIIUkrQbMvFHZVu 5lEiC1EwuuT6nDEP+af3llr2bN5MPR2z5rvwYA0IzalRs73NI8P8VigOQfLPKJSMwZfu NQ1T+m9zKeILrmsFQ2b8sTg64uP/1gxnZj2mVBktRsu2yLvOPuJ+3rEmu5pqRSCihwZ/ QfQfBTL3Qx8RgWkqGiOxVCASOYrib2VptnTJbDt+7XcKPmKKFiC+ED73TRWtiNUMgpjT sLaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767459464; x=1768064264; h=in-reply-to: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=+wZkUF3NRhUPtxghhUm6LslapHbc+LfpmZjiNA6s+nU=; b=hZmxF7qmepFFFvdtlCQp9rWtp71wowfiqpbeUbg8QB9rUHSgB7nk81gWKTFiNOTNdS IMywZOHYLND0qqx0qIBwc6dby/WTB/gAP2f1ZKFSAmcXwFOTN5BswwysbmUsMeuC4Zlq 9LwgjLq2COAmHyMnC5y+MjWs+Cr90nXI+wfqh+MXXbXHvbPejKRvUv+S3/ZAKINsHgzC of1VYwTHMButnLrlJOgxUWA7oY0yVYtIxp9uo+of9h88MXzWjTjgBYu8tKFjF8v0gpbl FqzRvGLEwfwqMNzDvsCFzaxuxm3i68AZnjgwOB6hHEiKO++VX0iPAa4SMvmyzzpKH+Gw 6cpA== X-Forwarded-Encrypted: i=1; AJvYcCXOvTiyQmypgIksZy+YzM+fXCWS910l8twSc6l5I0J74Uqha8sA603FsX5O+y2j+ugaoAUJKUc=@vger.kernel.org X-Gm-Message-State: AOJu0YzMEDIFuMeK4WAXoqmRgKFeVKurDZjFnqeYGvptxCPcn4mJhRcl fpbev/UNRw/4pjmtJyMnrboF4nI6Ekg56pRcRy+LQ5LlBAmlQ/SupKciesPCXXfNDgQgZf+bk+F bgPLxE+CXNmEHkfKWC7NsAqOOHpRbtXbwtepnd/jlwiN4AkSSu0hCh4f6Uw== X-Gm-Gg: AY/fxX7IYc/Jd3oZtCZPucIkptNlj7yl10AaksQga7DsplaU/BtDUPdDEbzFEqiVgxG SU4UEeyp4ZQAu1+J9Qtk16L31VmFtOgCyfjNPW0znXersw5ymfOy0Lj1+zXQIcpJUUBDVPO3tKx 6Ax4g+hBuTHrY5WNECSXrr3/pArFcPtbPS260uwVF+DqLtbfe/GZgLoE0OzBxDgjiE6NrrK7Ndg eJIiuvYudXVpjLjF+V9+yBxBvIxNosvMfua2jzSXSfFI7B6+mSv7PrPhv68o0QwJnbBtJBbGRBU O3bJgsNQtsPZ1co9tGQd5l9YzeZNyvcDf6JGJwnS035g4Dx7Fa8jIxgdEZHO57EjmIJzvE9YIeY Wew8= X-Received: by 2002:a05:600c:818f:b0:477:7b16:5f77 with SMTP id 5b1f17b1804b1-47d19538725mr584363145e9.3.1767459464021; Sat, 03 Jan 2026 08:57:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IHusWZ//FZ52Om4ta3xZ2SqfyTWAAUvd8rHgZYV++2oDeDeRRcln+Ih/5srZxMz/V4FtoawtQ== X-Received: by 2002:a05:600c:818f:b0:477:7b16:5f77 with SMTP id 5b1f17b1804b1-47d19538725mr584362855e9.3.1767459463570; Sat, 03 Jan 2026 08:57:43 -0800 (PST) Received: from redhat.com ([147.235.217.121]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324eab2a94sm90750023f8f.43.2026.01.03.08.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jan 2026 08:57:42 -0800 (PST) Date: Sat, 3 Jan 2026 11:57:37 -0500 From: "Michael S. Tsirkin" To: Bui Quang Minh Cc: netdev@vger.kernel.org, Jason Wang , 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: <20260103115424-mutt-send-email-mst@kernel.org> References: <20260102152023.10773-1-minhquangbui99@gmail.com> <20260102152023.10773-2-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260102152023.10773-2-minhquangbui99@gmail.com> On Fri, Jan 02, 2026 at 10:20:21PM +0700, 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); > 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 hmm do we even need this, then? > + */ > + try_fill_recv(vi, &vi->rq[i], GFP_KERNEL); > > 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); hmm do we even need this, then? > + > if (running) > virtnet_napi_enable(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. > + */ I'd drop this comment, it does not clarify much. > + 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