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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47C84C32793 for ; Wed, 24 Aug 2022 02:48:09 +0000 (UTC) Received: from localhost ([::1]:59124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQgR6-0004EU-Ay for qemu-devel@archiver.kernel.org; Tue, 23 Aug 2022 22:48:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQgPt-000290-AH for qemu-devel@nongnu.org; Tue, 23 Aug 2022 22:46:53 -0400 Received: from out30-42.freemail.mail.aliyun.com ([115.124.30.42]:40022) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQgPr-0006Zi-9i for qemu-devel@nongnu.org; Tue, 23 Aug 2022 22:46:53 -0400 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=ay29a033018046056; MF=kangjie.xu@linux.alibaba.com; NM=1; PH=DS; RN=9; SR=0; TI=SMTPD_---0VN5LIt6_1661309204; Received: from 30.227.72.120(mailfrom:kangjie.xu@linux.alibaba.com fp:SMTPD_---0VN5LIt6_1661309204) by smtp.aliyun-inc.com; Wed, 24 Aug 2022 10:46:45 +0800 Content-Type: multipart/alternative; boundary="------------TTVNMiUfemaiXnGTY5vbqXio" Message-ID: <7fd73535-b101-d5f9-93da-62800f86b308@linux.alibaba.com> Date: Wed, 24 Aug 2022 10:46:43 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [PATCH v2 11/24] vhost-net: vhost-kernel: introduce vhost_net_virtqueue_stop() To: Jason Wang References: <9f5f233aaef3096fa1715095f3c436bb3c855fe5.1660611460.git.kangjie.xu@linux.alibaba.com> <11f8a57c-96e0-6bea-2a1d-f0c7269fa75f@redhat.com> Cc: "Michael S. Tsirkin" , qemu-devel@nongnu.org, eduardo@habkost.net, marcel.apfelbaum@gmail.com, f4bug@amsat.org, wangyanan55@huawei.com, hengqi@linux.alibaba.com, Xuan Zhuo From: Kangjie Xu In-Reply-To: <11f8a57c-96e0-6bea-2a1d-f0c7269fa75f@redhat.com> Received-SPF: pass client-ip=115.124.30.42; envelope-from=kangjie.xu@linux.alibaba.com; helo=out30-42.freemail.mail.aliyun.com X-Spam_score_int: -98 X-Spam_score: -9.9 X-Spam_bar: --------- X-Spam_report: (-9.9 / 5.0 requ) BAYES_00=-1.9, ENV_AND_HDR_SPF_MATCH=-0.5, HTML_MESSAGE=0.001, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_SPF_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is a multi-part message in MIME format. --------------TTVNMiUfemaiXnGTY5vbqXio Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 在 2022/8/24 10:40, Jason Wang 写道: > > 在 2022/8/16 09:06, Kangjie Xu 写道: >> Introduce vhost_virtqueue_stop(), which can reset the virtqueue >> in the device. Then it will unmap vrings and the desc of the >> virtqueue. >> >> This patch only considers the case for vhost-kernel, when >> NetClientDriver is NET_CLIENT_DRIVER_TAP. >> >> Signed-off-by: Kangjie Xu >> Signed-off-by: Xuan Zhuo >> --- >>   hw/net/vhost_net.c      | 21 +++++++++++++++++++++ >>   include/net/vhost_net.h |  2 ++ >>   2 files changed, 23 insertions(+) >> >> diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c >> index ccac5b7a64..aa60dd901c 100644 >> --- a/hw/net/vhost_net.c >> +++ b/hw/net/vhost_net.c >> @@ -514,3 +514,24 @@ int vhost_net_set_mtu(struct vhost_net *net, >> uint16_t mtu) >>         return vhost_ops->vhost_net_set_mtu(&net->dev, mtu); >>   } >> + >> +void vhost_net_virtqueue_stop(VirtIODevice *vdev, NetClientState *nc, >> +                              int vq_index) >> +{ >> +    VHostNetState *net = get_vhost_net(nc->peer); >> +    const VhostOps *vhost_ops = net->dev.vhost_ops; >> +    struct vhost_vring_file file = { .fd = -1 }; >> +    int idx; >> + >> +    assert(vhost_ops); >> + >> +    idx = vhost_ops->vhost_get_vq_index(&net->dev, vq_index); >> + >> +    if (net->nc->info->type == NET_CLIENT_DRIVER_TAP) { >> +        file.index = idx; >> +        int r = vhost_net_set_backend(&net->dev, &file); >> +        assert(r >= 0); >> +    } > > > Let's have a vhost_ops here instead of open code it. > > Thanks > I share your view. Thanks > >> + >> +    vhost_dev_virtqueue_stop(&net->dev, vdev, idx); >> +} >> diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h >> index 387e913e4e..9b3aaf3814 100644 >> --- a/include/net/vhost_net.h >> +++ b/include/net/vhost_net.h >> @@ -48,4 +48,6 @@ uint64_t vhost_net_get_acked_features(VHostNetState >> *net); >>     int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu); >>   +void vhost_net_virtqueue_stop(VirtIODevice *vdev, NetClientState *nc, >> +                              int vq_index); >>   #endif --------------TTVNMiUfemaiXnGTY5vbqXio Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit


在 2022/8/24 10:40, Jason Wang 写道:

在 2022/8/16 09:06, Kangjie Xu 写道:
Introduce vhost_virtqueue_stop(), which can reset the virtqueue
in the device. Then it will unmap vrings and the desc of the
virtqueue.

This patch only considers the case for vhost-kernel, when
NetClientDriver is NET_CLIENT_DRIVER_TAP.

Signed-off-by: Kangjie Xu <kangjie.xu@linux.alibaba.com>
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
  hw/net/vhost_net.c      | 21 +++++++++++++++++++++
  include/net/vhost_net.h |  2 ++
  2 files changed, 23 insertions(+)

diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index ccac5b7a64..aa60dd901c 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -514,3 +514,24 @@ int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu)
        return vhost_ops->vhost_net_set_mtu(&net->dev, mtu);
  }
+
+void vhost_net_virtqueue_stop(VirtIODevice *vdev, NetClientState *nc,
+                              int vq_index)
+{
+    VHostNetState *net = get_vhost_net(nc->peer);
+    const VhostOps *vhost_ops = net->dev.vhost_ops;
+    struct vhost_vring_file file = { .fd = -1 };
+    int idx;
+
+    assert(vhost_ops);
+
+    idx = vhost_ops->vhost_get_vq_index(&net->dev, vq_index);
+
+    if (net->nc->info->type == NET_CLIENT_DRIVER_TAP) {
+        file.index = idx;
+        int r = vhost_net_set_backend(&net->dev, &file);
+        assert(r >= 0);
+    }


Let's have a vhost_ops here instead of open code it.

Thanks

 I share your view.

Thanks


+
+    vhost_dev_virtqueue_stop(&net->dev, vdev, idx);
+}
diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h
index 387e913e4e..9b3aaf3814 100644
--- a/include/net/vhost_net.h
+++ b/include/net/vhost_net.h
@@ -48,4 +48,6 @@ uint64_t vhost_net_get_acked_features(VHostNetState *net);
    int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu);
  +void vhost_net_virtqueue_stop(VirtIODevice *vdev, NetClientState *nc,
+                              int vq_index);
  #endif
--------------TTVNMiUfemaiXnGTY5vbqXio--