From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80864C636CC for ; Tue, 14 Feb 2023 01:55:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229686AbjBNBzR (ORCPT ); Mon, 13 Feb 2023 20:55:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229593AbjBNBzQ (ORCPT ); Mon, 13 Feb 2023 20:55:16 -0500 Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB3DAB46F; Mon, 13 Feb 2023 17:55:14 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=xuanzhuo@linux.alibaba.com;NM=1;PH=DS;RN=21;SR=0;TI=SMTPD_---0VbdVT4O_1676339710; Received: from localhost(mailfrom:xuanzhuo@linux.alibaba.com fp:SMTPD_---0VbdVT4O_1676339710) by smtp.aliyun-inc.com; Tue, 14 Feb 2023 09:55:11 +0800 Message-ID: <1676339608.6848226-1-xuanzhuo@linux.alibaba.com> Subject: Re: [PATCH 06/33] virtio_ring: introduce virtqueue_reset() Date: Tue, 14 Feb 2023 09:53:28 +0800 From: Xuan Zhuo To: "Michael S. Tsirkin" Cc: netdev@vger.kernel.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jason Wang , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Magnus Karlsson , Maciej Fijalkowski , Jonathan Lemon , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Sebastian Andrzej Siewior , Menglong Dong , Kuniyuki Iwashima , Petr Machata , virtualization@lists.linux-foundation.org, bpf@vger.kernel.org References: <20230202110058.130695-1-xuanzhuo@linux.alibaba.com> <20230202110058.130695-7-xuanzhuo@linux.alibaba.com> <20230203040041-mutt-send-email-mst@kernel.org> <1675415352.3250086-8-xuanzhuo@linux.alibaba.com> <20230213071430-mutt-send-email-mst@kernel.org> In-Reply-To: <20230213071430-mutt-send-email-mst@kernel.org> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, 13 Feb 2023 07:15:02 -0500, "Michael S. Tsirkin" wrote: > On Fri, Feb 03, 2023 at 05:09:12PM +0800, Xuan Zhuo wrote: > > On Fri, 3 Feb 2023 04:05:38 -0500, "Michael S. Tsirkin" wrote: > > > On Thu, Feb 02, 2023 at 07:00:31PM +0800, Xuan Zhuo wrote: > > > > Introduce virtqueue_reset() to release all buffer inside vq. > > > > > > > > Signed-off-by: Xuan Zhuo > > > > --- > > > > drivers/virtio/virtio_ring.c | 50 ++++++++++++++++++++++++++++++++++++ > > > > include/linux/virtio.h | 2 ++ > > > > 2 files changed, 52 insertions(+) > > > > > > > > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > > > > index e32046fd15a5..7dfce7001f9f 100644 > > > > --- a/drivers/virtio/virtio_ring.c > > > > +++ b/drivers/virtio/virtio_ring.c > > > > @@ -2735,6 +2735,56 @@ int virtqueue_resize(struct virtqueue *_vq, u32 num, > > > > } > > > > EXPORT_SYMBOL_GPL(virtqueue_resize); > > > > > > > > +/** > > > > + * virtqueue_reset - reset the vring of vq > > > > > > ..., detach and recycle all unused buffers > > > > > > after all this is why we are doing this reset, right? > > > > > > > + * @_vq: the struct virtqueue we're talking about. > > > > + * @recycle: callback for recycle the useless buffer > > > > > > not useless :) unused: > > > > > > callback to recycle unused buffers > > > > > > I agree. Will fix. > > > > Thanks. > > Probably too late for this merge cycle then. Oh well. It's ok for next. I plan to push the virtio ring code to the vhost branch firstly. Thanks. > > > > > > > > I know we have the same confusion in virtqueue_resize, I will fix > > > that. > > > > > > > + * > > > > + * Caller must ensure we don't call this with other virtqueue operations > > > > + * at the same time (except where noted). > > > > + * > > > > + * Returns zero or a negative error. > > > > + * 0: success. > > > > + * -EBUSY: Failed to sync with device, vq may not work properly > > > > + * -ENOENT: Transport or device not supported > > > > + * -EPERM: Operation not permitted > > > > + */ > > > > +int virtqueue_reset(struct virtqueue *_vq, > > > > + void (*recycle)(struct virtqueue *vq, void *buf)) > > > > +{ > > > > + struct vring_virtqueue *vq = to_vvq(_vq); > > > > + struct virtio_device *vdev = vq->vq.vdev; > > > > + void *buf; > > > > + int err; > > > > + > > > > + if (!vq->we_own_ring) > > > > + return -EPERM; > > > > + > > > > + if (!vdev->config->disable_vq_and_reset) > > > > + return -ENOENT; > > > > + > > > > + if (!vdev->config->enable_vq_after_reset) > > > > + return -ENOENT; > > > > + > > > > + err = vdev->config->disable_vq_and_reset(_vq); > > > > + if (err) > > > > + return err; > > > > + > > > > + while ((buf = virtqueue_detach_unused_buf(_vq)) != NULL) > > > > + recycle(_vq, buf); > > > > + > > > > + if (vq->packed_ring) > > > > + virtqueue_reinit_packed(vq); > > > > + else > > > > + virtqueue_reinit_split(vq); > > > > + > > > > + if (vdev->config->enable_vq_after_reset(_vq)) > > > > + return -EBUSY; > > > > + > > > > + return 0; > > > > +} > > > > +EXPORT_SYMBOL_GPL(virtqueue_reset); > > > > + > > > > /* Only available for split ring */ > > > > struct virtqueue *vring_new_virtqueue(unsigned int index, > > > > unsigned int num, > > > > diff --git a/include/linux/virtio.h b/include/linux/virtio.h > > > > index 3ebb346ebb7c..3ca2edb1aef3 100644 > > > > --- a/include/linux/virtio.h > > > > +++ b/include/linux/virtio.h > > > > @@ -105,6 +105,8 @@ dma_addr_t virtqueue_get_used_addr(struct virtqueue *vq); > > > > > > > > int virtqueue_resize(struct virtqueue *vq, u32 num, > > > > void (*recycle)(struct virtqueue *vq, void *buf)); > > > > +int virtqueue_reset(struct virtqueue *vq, > > > > + void (*recycle)(struct virtqueue *vq, void *buf)); > > > > > > > > /** > > > > * struct virtio_device - representation of a device using virtio > > > > -- > > > > 2.32.0.3.g01195cf9f > > > >