From nobody Mon Feb 9 18:43:37 2026 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (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 0BD6E189F45 for ; Tue, 3 Dec 2024 07:31:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733211065; cv=none; b=mAKbQ71NTR2aWUzJPv0lWHIc/7YZU6daLrsP2uScoh535OrlggwP/QDtEbo59rfgobIMz5j/xnMCgnGJH87B2TUWJoOwN4fuNk88YC1YcjdzkAuMaI3WObN0X+OIGT0z0SzCRNC7k9W4gED/K8fCjR7cJ6fFvn38t1tc45UNHE0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733211065; c=relaxed/simple; bh=w5AGnCRzxvkv5uIQocaLa71YmtI6LxwVdo9vgigsjyc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D9R7UK3WOfKE5THzMzk30tQRJ8EfNvcda7WJ9VYfoitqQMeUzquvviPv4BypCBU+P+jbia020I8KqokiAl5ibBtc/6uXFX/GYvM6erh067S6cgMoGWAy6E5JdmmWWxPsArWGjHL6qWyfqRJbLaQV+EcvnCAz+MfyTuX96mMLPTk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=QoSkUbSG; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="QoSkUbSG" Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 89D303FDB1 for ; Tue, 3 Dec 2024 07:31:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1733211061; bh=fW9S3ivOx/vCR/Vpb6zGlhQWyPtyKwj/7WKI3Nel5z4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QoSkUbSG4sn0AdiFfXD0l9vSJzLdEnz5weCkV+IhLUyhySqlIuzFD9x6EXuCkjbot iHMhpGpaAPjBwZaHOWgjclclDBJwNRzPUCwpgpBXc4Asgx5EtSIB0LiRQDKVHCnBMz CQVvJSizHFDNLR2ZTZYm91IsB3qnXgctPZj2Um3lMYtX8LfMb8G8TANLPcSULUArfs j9j04/CLmUniB3i2jwufIFiVszieQjX6E0TMa4XN5PKcV2sehraAS4H01/OmYV024c ExB14VxSSb+dl8lIsF5yhwMmckM7foLzaxAN+1hI3ns7X37VwmGJXmrFnjpCLygK5c 8oxitsmza5UwA== Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-215576aca41so23173575ad.0 for ; Mon, 02 Dec 2024 23:31:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733211060; x=1733815860; 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=fW9S3ivOx/vCR/Vpb6zGlhQWyPtyKwj/7WKI3Nel5z4=; b=D5NTOOE5Tu17zDiK0PPHP3hCv0bAEHmlC7lhdq4kzHQcXvpJtJKFQyBqBVhXnOtgeW jwuiI7duok8dTn0nCDGyytxSCQ+H03eGFO6/QAynOjXf+xU5Q0QBOMD0pV416QoS3dH9 k1XWnxzkm4g5ikzRFK3mprZSvnujZ969nwVAlq+g5GEuKiX2AIy5SYeo1fZWJ50D+7+1 me3yf5+83RGYEoLojni8U+duMpYqj1rWV7AobmLz9qkehZbeqNlK7lpqRQMV97wdLOkv dNYANxHHvG4JAw1onVtaab2f9sOj0zsFJ8L7Hmbq2n8tXszOT3TxKAFmROAAYx008XO7 gnwA== X-Forwarded-Encrypted: i=1; AJvYcCXYQzhnsyeozbyOf8na16EEcbA3OT/Vc42fS5iEXo4BRBwLg0p39rSP+P47aw+n6Nx+jV7tF6amKhD98Es=@vger.kernel.org X-Gm-Message-State: AOJu0Ywq1mTjXYbqQs4idrB3IOryfi+JHV3ZOvxap0Du3tGj54evrqNw 45M4hfvLbm9xEITsThTm64WBUEN7dpZ4HBK6bsJQG64PZg0gOzEjTKg6pr+4paamm6nr8E0T1g0 D/B6bG77+gDyPMeyFmTPg66ui7bg8pgvWnED/BG1YyQBh5rzXqlLyBY6gqLVfKrHlb3VoMqpMJ/ S7KQ== X-Gm-Gg: ASbGncvKmGMdxwVD66OQsYPhA0yRybSU4N0NG7hQLmRLwUlegfYkFJs5alKOCrMRKJf PDgEtl/KM20AiRQxslRI7sZtIPHBOW1FuqNsQ7xCpaYjf6beCGju2qCdDWPoW2CsRgQZF3uvAYt 1Pv6FKhzZ7MU3tUx81wCw50HTa1rXQ1ZToPXovdMRxtmdoQT3/iNovTkgxXDKGdngk6xZZF9mDl qWE9u+paqloct9B0TARv0QM/pLWMtxJGeJ+DbtVzGU4vCyIC5QsBOIkGWn3AITkL8at X-Received: by 2002:a17:902:cec7:b0:215:a3e4:d26b with SMTP id d9443c01a7336-215a3e4dc89mr79434805ad.0.1733211060068; Mon, 02 Dec 2024 23:31:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IEwtFDsd1WSbUlFVtINv5gpljD9oqMcZ9HvNspEp3AWCkY/mGPNDUp8oHCemJTryvY2p/FvlA== X-Received: by 2002:a17:902:cec7:b0:215:a3e4:d26b with SMTP id d9443c01a7336-215a3e4dc89mr79434565ad.0.1733211059765; Mon, 02 Dec 2024 23:30:59 -0800 (PST) Received: from localhost.localdomain ([240f:74:7be:1:b2b6:e8c2:50d0:c558]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21586d40afasm35735165ad.270.2024.12.02.23.30.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Dec 2024 23:30:59 -0800 (PST) From: Koichiro Den To: virtualization@lists.linux.dev Cc: mst@redhat.com, jasowang@redhat.com, xuanzhuo@linux.alibaba.com, eperezma@redhat.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, jiri@resnulli.us, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH net-next v2 2/5] virtio_ring: add 'flushed' as an argument to virtqueue_resize() Date: Tue, 3 Dec 2024 16:30:22 +0900 Message-ID: <20241203073025.67065-3-koichiro.den@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241203073025.67065-1-koichiro.den@canonical.com> References: <20241203073025.67065-1-koichiro.den@canonical.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 virtqueue_resize() has actually recycled all unused buffers, additional work may be required in some cases. Relying solely on its return status is fragile, so introduce a new argument 'flushed' to explicitly indicate whether it has really occurred. Signed-off-by: Koichiro Den Acked-by: Jason Wang --- drivers/net/virtio_net.c | 6 ++++-- drivers/virtio/virtio_ring.c | 7 ++++++- include/linux/virtio.h | 3 ++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 48ce8b3881b6..df9bfe31aa6d 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3326,12 +3326,13 @@ static int virtnet_rx_resize(struct virtnet_info *v= i, struct receive_queue *rq, u32 ring_num) { int err, qindex; + bool flushed; =20 qindex =3D rq - vi->rq; =20 virtnet_rx_pause(vi, rq); =20 - err =3D virtqueue_resize(rq->vq, ring_num, virtnet_rq_unmap_free_buf); + err =3D virtqueue_resize(rq->vq, ring_num, virtnet_rq_unmap_free_buf, &fl= ushed); if (err) netdev_err(vi->dev, "resize rx fail: rx queue index: %d err: %d\n", qind= ex, err); =20 @@ -3389,12 +3390,13 @@ static int virtnet_tx_resize(struct virtnet_info *v= i, struct send_queue *sq, u32 ring_num) { int qindex, err; + bool flushed; =20 qindex =3D sq - vi->sq; =20 virtnet_tx_pause(vi, sq); =20 - err =3D virtqueue_resize(sq->vq, ring_num, virtnet_sq_free_unused_buf); + err =3D virtqueue_resize(sq->vq, ring_num, virtnet_sq_free_unused_buf, &f= lushed); if (err) netdev_err(vi->dev, "resize tx fail: tx queue index: %d err: %d\n", qind= ex, err); =20 diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 82a7d2cbc704..34a068d401ec 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c @@ -2772,6 +2772,7 @@ EXPORT_SYMBOL_GPL(vring_create_virtqueue_dma); * @_vq: the struct virtqueue we're talking about. * @num: new ring num * @recycle: callback to recycle unused buffers + * @flushed: whether or not unused buffers are all flushed * * When it is really necessary to create a new vring, it will set the curr= ent vq * into the reset state. Then call the passed callback to recycle the buff= er @@ -2792,11 +2793,14 @@ EXPORT_SYMBOL_GPL(vring_create_virtqueue_dma); * */ int virtqueue_resize(struct virtqueue *_vq, u32 num, - void (*recycle)(struct virtqueue *vq, void *buf)) + void (*recycle)(struct virtqueue *vq, void *buf), + bool *flushed) { struct vring_virtqueue *vq =3D to_vvq(_vq); int err; =20 + *flushed =3D false; + if (num > vq->vq.num_max) return -E2BIG; =20 @@ -2809,6 +2813,7 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num, err =3D virtqueue_disable_and_recycle(_vq, recycle); if (err) return err; + *flushed =3D true; =20 if (vq->packed_ring) err =3D virtqueue_resize_packed(_vq, num); diff --git a/include/linux/virtio.h b/include/linux/virtio.h index 57cc4b07fd17..878feda08af9 100644 --- a/include/linux/virtio.h +++ b/include/linux/virtio.h @@ -109,7 +109,8 @@ dma_addr_t virtqueue_get_avail_addr(const struct virtqu= eue *vq); dma_addr_t virtqueue_get_used_addr(const struct virtqueue *vq); =20 int virtqueue_resize(struct virtqueue *vq, u32 num, - void (*recycle)(struct virtqueue *vq, void *buf)); + void (*recycle)(struct virtqueue *vq, void *buf), + bool *flushed); int virtqueue_reset(struct virtqueue *vq, void (*recycle)(struct virtqueue *vq, void *buf)); =20 --=20 2.43.0