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 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 F1F08C433F5 for ; Fri, 28 Jan 2022 06:59:55 +0000 (UTC) Received: from localhost ([::1]:41106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nDLEg-0000z6-M9 for qemu-devel@archiver.kernel.org; Fri, 28 Jan 2022 01:59:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDLCJ-0007wy-Lm for qemu-devel@nongnu.org; Fri, 28 Jan 2022 01:57:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57194) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDLCF-0002V3-RS for qemu-devel@nongnu.org; Fri, 28 Jan 2022 01:57:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643353034; 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=hoR9Y1f2jHonl69jIVjtfl1NZy3bn027LYcSouPHOCA=; b=fseR18MDF3Js2CRRhVCEm/irZ4EgTOO0bTwCWwp8+yVT2MH6FLygvTjgWq0wetK7WEOvO/ dSKtI8+o6srqwMSfTIEBdrV5lUNW41uHTEPch5nvXwNmW0fUg6jv9d2flauUD2SzBDbSaQ JpAOPh/5JKJgHuqJmSnlbvWqq1LUI0E= Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-632-vLsXKSQjMS6gisSbm1iKQg-1; Fri, 28 Jan 2022 01:57:13 -0500 X-MC-Unique: vLsXKSQjMS6gisSbm1iKQg-1 Received: by mail-pj1-f72.google.com with SMTP id x4-20020a17090ab00400b001b58c484826so5772809pjq.0 for ; Thu, 27 Jan 2022 22:57:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=hoR9Y1f2jHonl69jIVjtfl1NZy3bn027LYcSouPHOCA=; b=3NZgUJSQplcWUNXj0l4Uo9bxABfYOqlK9hVXilfDebS7LKwsxAKJDztOE69S8MZ4A5 RMSb3ofaJECYGfK/C+phgHmX/wVHqwY80gs+eDFUW0mJBaGtNR+64M2GBQOFsJV26U22 bBuNUpwm6XWwqZaf4AQYp2JXPqRwTYLdvh/0c9jUJywhL841sEcpGbtlGWqr7FCI5Pmc eTh3cBZodOcXyPWQJAmb1T+VpKAI2G8IkLI7u74dXuWli9G8Gc7M1/7FQ7M4IvCnueok 13vNUiFxpN4CJvhEz35HB98f8kYrp9n9g7t9Wnc2wQ2A3aBD4SayUVTYYg3wHE4pa+xO CwOg== X-Gm-Message-State: AOAM533hPPgPba/7SMcwq4QOtyXimyHEjfh32IKug761nvsl2Hu9RKqz Le/wyEdtdfePpIRsMeAmlXMuAORUYl9UWfmL4qdbLsdS39mv3IPcyazS3ai7M3Ngd9OoBSTtteD EnG6sMryPw8E6/Ds= X-Received: by 2002:a17:90b:4a4c:: with SMTP id lb12mr8201281pjb.211.1643353031903; Thu, 27 Jan 2022 22:57:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJzWBbXSw4EH+rGgOI68sTw2G4dwbKWA9R9aZIkj+kSxOGwh1zp8Fv6sWqFo7rwALZOYIqg1aQ== X-Received: by 2002:a17:90b:4a4c:: with SMTP id lb12mr8201250pjb.211.1643353031546; Thu, 27 Jan 2022 22:57:11 -0800 (PST) Received: from [10.72.13.185] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id mi18sm1282013pjb.35.2022.01.27.22.57.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 27 Jan 2022 22:57:10 -0800 (PST) Message-ID: <2cb2415b-7d8b-6187-c202-27e8f26410a4@redhat.com> Date: Fri, 28 Jan 2022 14:56:57 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: Re: [PATCH 06/31] vhost: Route guest->host notification through shadow virtqueue To: =?UTF-8?Q?Eugenio_P=c3=a9rez?= , qemu-devel@nongnu.org References: <20220121202733.404989-1-eperezma@redhat.com> <20220121202733.404989-7-eperezma@redhat.com> From: Jason Wang In-Reply-To: <20220121202733.404989-7-eperezma@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: Laurent Vivier , Parav Pandit , Cindy Lu , "Michael S. Tsirkin" , Juan Quintela , Richard Henderson , Markus Armbruster , Gautam Dawar , virtualization@lists.linux-foundation.org, Eduardo Habkost , Harpreet Singh Anand , Xiao W Wang , Peter Xu , Stefan Hajnoczi , Eli Cohen , Paolo Bonzini , Zhu Lingshan , Eric Blake , Stefano Garzarella Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 在 2022/1/22 上午4:27, Eugenio Pérez 写道: > At this moment no buffer forwarding will be performed in SVQ mode: Qemu > just forward the guest's kicks to the device. This commit also set up > SVQs in the vhost device. > > Host memory notifiers regions are left out for simplicity, and they will > not be addressed in this series. I wonder if it's better to squash this into patch 5 since it gives us a full guest->host forwarding. > > Signed-off-by: Eugenio Pérez > --- > include/hw/virtio/vhost-vdpa.h | 4 ++ > hw/virtio/vhost-vdpa.c | 122 ++++++++++++++++++++++++++++++++- > 2 files changed, 124 insertions(+), 2 deletions(-) > > diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h > index 3ce79a646d..009a9f3b6b 100644 > --- a/include/hw/virtio/vhost-vdpa.h > +++ b/include/hw/virtio/vhost-vdpa.h > @@ -12,6 +12,8 @@ > #ifndef HW_VIRTIO_VHOST_VDPA_H > #define HW_VIRTIO_VHOST_VDPA_H > > +#include > + > #include "hw/virtio/virtio.h" > #include "standard-headers/linux/vhost_types.h" > > @@ -27,6 +29,8 @@ typedef struct vhost_vdpa { > bool iotlb_batch_begin_sent; > MemoryListener listener; > struct vhost_vdpa_iova_range iova_range; > + bool shadow_vqs_enabled; > + GPtrArray *shadow_vqs; > struct vhost_dev *dev; > VhostVDPAHostNotifier notifier[VIRTIO_QUEUE_MAX]; > } VhostVDPA; > diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c > index 6c10a7f05f..18de14f0fb 100644 > --- a/hw/virtio/vhost-vdpa.c > +++ b/hw/virtio/vhost-vdpa.c > @@ -17,12 +17,14 @@ > #include "hw/virtio/vhost.h" > #include "hw/virtio/vhost-backend.h" > #include "hw/virtio/virtio-net.h" > +#include "hw/virtio/vhost-shadow-virtqueue.h" > #include "hw/virtio/vhost-vdpa.h" > #include "exec/address-spaces.h" > #include "qemu/main-loop.h" > #include "cpu.h" > #include "trace.h" > #include "qemu-common.h" > +#include "qapi/error.h" > > /* > * Return one past the end of the end of section. Be careful with uint64_t > @@ -409,8 +411,14 @@ err: > > static void vhost_vdpa_host_notifiers_init(struct vhost_dev *dev) > { > + struct vhost_vdpa *v = dev->opaque; > int i; > > + if (v->shadow_vqs_enabled) { > + /* SVQ is not compatible with host notifiers mr */ I guess there should be a TODO or FIXME here. > + return; > + } > + > for (i = dev->vq_index; i < dev->vq_index + dev->nvqs; i++) { > if (vhost_vdpa_host_notifier_init(dev, i)) { > goto err; > @@ -424,6 +432,17 @@ err: > return; > } > > +static void vhost_vdpa_svq_cleanup(struct vhost_dev *dev) > +{ > + struct vhost_vdpa *v = dev->opaque; > + size_t idx; > + > + for (idx = 0; idx < v->shadow_vqs->len; ++idx) { > + vhost_svq_stop(g_ptr_array_index(v->shadow_vqs, idx)); > + } > + g_ptr_array_free(v->shadow_vqs, true); > +} > + > static int vhost_vdpa_cleanup(struct vhost_dev *dev) > { > struct vhost_vdpa *v; > @@ -432,6 +451,7 @@ static int vhost_vdpa_cleanup(struct vhost_dev *dev) > trace_vhost_vdpa_cleanup(dev, v); > vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs); > memory_listener_unregister(&v->listener); > + vhost_vdpa_svq_cleanup(dev); > > dev->opaque = NULL; > ram_block_discard_disable(false); > @@ -507,9 +527,15 @@ static int vhost_vdpa_get_device_id(struct vhost_dev *dev, > > static int vhost_vdpa_reset_device(struct vhost_dev *dev) > { > + struct vhost_vdpa *v = dev->opaque; > int ret; > uint8_t status = 0; > > + for (unsigned i = 0; i < v->shadow_vqs->len; ++i) { > + VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i); > + vhost_svq_stop(svq); > + } > + > ret = vhost_vdpa_call(dev, VHOST_VDPA_SET_STATUS, &status); > trace_vhost_vdpa_reset_device(dev, status); > return ret; > @@ -639,13 +665,28 @@ static int vhost_vdpa_get_vring_base(struct vhost_dev *dev, > return ret; > } > > -static int vhost_vdpa_set_vring_kick(struct vhost_dev *dev, > - struct vhost_vring_file *file) > +static int vhost_vdpa_set_vring_dev_kick(struct vhost_dev *dev, > + struct vhost_vring_file *file) > { > trace_vhost_vdpa_set_vring_kick(dev, file->index, file->fd); > return vhost_vdpa_call(dev, VHOST_SET_VRING_KICK, file); > } > > +static int vhost_vdpa_set_vring_kick(struct vhost_dev *dev, > + struct vhost_vring_file *file) > +{ > + struct vhost_vdpa *v = dev->opaque; > + int vdpa_idx = vhost_vdpa_get_vq_index(dev, file->index); > + > + if (v->shadow_vqs_enabled) { > + VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, vdpa_idx); > + vhost_svq_set_svq_kick_fd(svq, file->fd); > + return 0; > + } else { > + return vhost_vdpa_set_vring_dev_kick(dev, file); > + } > +} > + > static int vhost_vdpa_set_vring_call(struct vhost_dev *dev, > struct vhost_vring_file *file) > { > @@ -653,6 +694,33 @@ static int vhost_vdpa_set_vring_call(struct vhost_dev *dev, > return vhost_vdpa_call(dev, VHOST_SET_VRING_CALL, file); > } > > +/** > + * Set shadow virtqueue descriptors to the device > + * > + * @dev The vhost device model > + * @svq The shadow virtqueue > + * @idx The index of the virtqueue in the vhost device > + */ > +static bool vhost_vdpa_svq_setup(struct vhost_dev *dev, > + VhostShadowVirtqueue *svq, > + unsigned idx) > +{ > + struct vhost_vring_file file = { > + .index = dev->vq_index + idx, > + }; > + const EventNotifier *event_notifier; > + int r; > + > + event_notifier = vhost_svq_get_dev_kick_notifier(svq); A question, any reason for making VhostShadowVirtqueue private? If we export it in .h we don't need helper to access its member like vhost_svq_get_dev_kick_notifier(). Note that vhost_dev is a public structure. > + file.fd = event_notifier_get_fd(event_notifier); > + r = vhost_vdpa_set_vring_dev_kick(dev, &file); > + if (unlikely(r != 0)) { > + error_report("Can't set device kick fd (%d)", -r); > + } I wonder whether or not we can generalize the logic here and vhost_vdpa_set_vring_kick(). There's nothing vdpa specific unless the vhost_ops->set_vring_kick(). > + > + return r == 0; > +} > + > static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started) > { > struct vhost_vdpa *v = dev->opaque; > @@ -660,6 +728,13 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started) > > if (started) { > vhost_vdpa_host_notifiers_init(dev); > + for (unsigned i = 0; i < v->shadow_vqs->len; ++i) { > + VhostShadowVirtqueue *svq = g_ptr_array_index(v->shadow_vqs, i); > + bool ok = vhost_vdpa_svq_setup(dev, svq, i); > + if (unlikely(!ok)) { > + return -1; > + } > + } > vhost_vdpa_set_vring_ready(dev); > } else { > vhost_vdpa_host_notifiers_uninit(dev, dev->nvqs); > @@ -737,6 +812,41 @@ static bool vhost_vdpa_force_iommu(struct vhost_dev *dev) > return true; > } > > +/** > + * Adaptor function to free shadow virtqueue through gpointer > + * > + * @svq The Shadow Virtqueue > + */ > +static void vhost_psvq_free(gpointer svq) > +{ > + vhost_svq_free(svq); > +} Any reason for such indirection? Can we simply use vhost_svq_free()? Thanks > + > +static int vhost_vdpa_init_svq(struct vhost_dev *hdev, struct vhost_vdpa *v, > + Error **errp) > +{ > + size_t n_svqs = v->shadow_vqs_enabled ? hdev->nvqs : 0; > + g_autoptr(GPtrArray) shadow_vqs = g_ptr_array_new_full(n_svqs, > + vhost_psvq_free); > + if (!v->shadow_vqs_enabled) { > + goto out; > + } > + > + for (unsigned n = 0; n < hdev->nvqs; ++n) { > + VhostShadowVirtqueue *svq = vhost_svq_new(); > + > + if (unlikely(!svq)) { > + error_setg(errp, "Cannot create svq %u", n); > + return -1; > + } > + g_ptr_array_add(v->shadow_vqs, svq); > + } > + > +out: > + v->shadow_vqs = g_steal_pointer(&shadow_vqs); > + return 0; > +} > + > static int vhost_vdpa_init(struct vhost_dev *dev, void *opaque, Error **errp) > { > struct vhost_vdpa *v; > @@ -759,6 +869,10 @@ static int vhost_vdpa_init(struct vhost_dev *dev, void *opaque, Error **errp) > dev->opaque = opaque ; > v->listener = vhost_vdpa_memory_listener; > v->msg_type = VHOST_IOTLB_MSG_V2; > + ret = vhost_vdpa_init_svq(dev, v, errp); > + if (ret) { > + goto err; > + } > > vhost_vdpa_get_iova_range(v); > > @@ -770,6 +884,10 @@ static int vhost_vdpa_init(struct vhost_dev *dev, void *opaque, Error **errp) > VIRTIO_CONFIG_S_DRIVER); > > return 0; > + > +err: > + ram_block_discard_disable(false); > + return ret; > } > > const VhostOps vdpa_ops = {