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 CBF95C04A6A for ; Thu, 27 Jul 2023 11:50:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOzRg-0005yX-Pm; Thu, 27 Jul 2023 07:46:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qOzRd-0005xG-HX for qemu-devel@nongnu.org; Thu, 27 Jul 2023 07:46:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qOzRb-0005Xn-Ax for qemu-devel@nongnu.org; Thu, 27 Jul 2023 07:46:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690458370; h=from:from:reply-to: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=tFt9tnFAwUVlbpL00qtRIKGorelz4/JgjJPdrX2Ykc4=; b=A6BG7F9jjxqHJBrUHjNpfS4IUr916lDaFGMneH3T1V3VTiWWfIHSVKWxvMhvj1NRJIOA2K ev/xeb0HIgn+pgA8GgJv3sMLAYdVWAPfM+xpE3BxkuI0fFYOLvUkNCdr1EjQ9XlFvv32Pw AVC1Fc9AMdlL4iG1pEqrYHiQRgwl7lQ= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-615--w-8QNYRPzy6Xxus_orz8Q-1; Thu, 27 Jul 2023 07:46:06 -0400 X-MC-Unique: -w-8QNYRPzy6Xxus_orz8Q-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 293603C108DD; Thu, 27 Jul 2023 11:46:06 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DB7F72166B25; Thu, 27 Jul 2023 11:46:03 +0000 (UTC) Date: Thu, 27 Jul 2023 12:46:01 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Jonah Palmer Cc: qemu-devel@nongnu.org, philmd@linaro.org, laurent@vivier.eu, mst@redhat.com, boris.ostrovsky@oracle.com, alex.bennee@linaro.org, viresh.kumar@linaro.org, armbru@redhat.com, pbonzini@redhat.com, eduardo@habkost.net Subject: Re: [PATCH v2 1/2] qmp: remove virtio_list, search QOM tree instead Message-ID: References: <20230609132040.2180710-1-jonah.palmer@oracle.com> <20230609132040.2180710-2-jonah.palmer@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230609132040.2180710-2-jonah.palmer@oracle.com> User-Agent: Mutt/2.2.9 (2022-11-12) X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -19 X-Spam_score: -2.0 X-Spam_bar: -- X-Spam_report: (-2.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, URIBL_SBL_A=0.1 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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Fri, Jun 09, 2023 at 09:20:39AM -0400, Jonah Palmer wrote: > The virtio_list duplicates information about virtio devices that already > exist in the QOM composition tree. Instead of creating this list of > realized virtio devices, search the QOM composition tree instead. > > This patch modifies the QMP command qmp_x_query_virtio to instead search > the partial paths of '/machine/peripheral/' & > '/machine/peripheral-anon/' in the QOM composition tree for virtio > devices. > > A device is found to be a valid virtio device if (1) its canonical path > is of 'TYPE_VIRTIO_DEVICE' and (2) the device has been realized. > > [Jonah: In the previous commit I had written that a device is found to > be a valid virtio device if (1) it has a canonical path ending with > 'virtio-backend'. > > The code now determines if it's a virtio device by appending > 'virtio-backend' (if needed) to a given canonical path and then > checking that path to see if the device is of type > 'TYPE_VIRTIO_DEVICE'. > > The patch also instead now checks to make sure it's a virtio device > before attempting to check whether the device is realized or not.] > > Signed-off-by: Jonah Palmer > --- > hw/virtio/virtio-qmp.c | 128 ++++++++++++++++++++++++++--------------- > hw/virtio/virtio-qmp.h | 8 +-- > hw/virtio/virtio.c | 6 -- > 3 files changed, 82 insertions(+), 60 deletions(-) > > diff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c > index b5e1835299..e936cc8ce5 100644 > --- a/hw/virtio/virtio-qmp.c > +++ b/hw/virtio/virtio-qmp.c > @@ -668,67 +668,101 @@ VirtioDeviceFeatures *qmp_decode_features(uint16_t device_id, uint64_t bitmap) > VirtioInfoList *qmp_x_query_virtio(Error **errp) > { > VirtioInfoList *list = NULL; > - VirtioInfo *node; > - VirtIODevice *vdev; > > - QTAILQ_FOREACH(vdev, &virtio_list, next) { > - DeviceState *dev = DEVICE(vdev); > - Error *err = NULL; > - QObject *obj = qmp_qom_get(dev->canonical_path, "realized", &err); > - > - if (err == NULL) { > - GString *is_realized = qobject_to_json_pretty(obj, true); > - /* virtio device is NOT realized, remove it from list */ > - if (!strncmp(is_realized->str, "false", 4)) { > - QTAILQ_REMOVE(&virtio_list, vdev, next); > - } else { > - node = g_new(VirtioInfo, 1); > - node->path = g_strdup(dev->canonical_path); > - node->name = g_strdup(vdev->name); > - QAPI_LIST_PREPEND(list, node); > + /* Query the QOM composition tree for virtio devices */ > + qmp_set_virtio_device_list("/machine/peripheral/", &list); > + qmp_set_virtio_device_list("/machine/peripheral-anon/", &list); > + if (list == NULL) { > + error_setg(errp, "No virtio devices found"); > + return NULL; > + } > + return list; > +} > + > +/* qmp_set_virtio_device_list: > + * @ppath: An incomplete peripheral path to search from. > + * @list: A list of realized virtio devices. > + * Searches a given incomplete peripheral path (e.g. '/machine/peripheral/' > + * or '/machine/peripheral-anon/') for realized virtio devices and adds them > + * to a given list of virtio devices. > + */ > +void qmp_set_virtio_device_list(const char *ppath, VirtioInfoList **list) > +{ > + ObjectPropertyInfoList *plist; > + VirtioInfoList *node; > + Error *err = NULL; > + > + /* Search an incomplete path for virtio devices */ > + plist = qmp_qom_list(ppath, &err); > + if (err == NULL) { > + ObjectPropertyInfoList *start = plist; > + while (plist != NULL) { > + ObjectPropertyInfo *value = plist->value; > + GString *path = g_string_new(ppath); > + g_string_append(path, value->name); > + g_string_append(path, "/virtio-backend"); > + > + /* Determine if full path is a realized virtio device */ > + VirtIODevice *vdev = qmp_find_virtio_device(path->str); > + if (vdev != NULL) { > + node = g_new0(VirtioInfoList, 1); > + node->value = g_new(VirtioInfo, 1); > + node->value->path = g_strdup(path->str); > + node->value->name = g_strdup(vdev->name); > + QAPI_LIST_PREPEND(*list, node->value); > } > - g_string_free(is_realized, true); > + g_string_free(path, true); > + plist = plist->next; > } > - qobject_unref(obj); > + qapi_free_ObjectPropertyInfoList(start); > } > - > - return list; > } This is all way too complicated. AFAICT, it shouldn't require much more than this: static int one_child(Object *child, void *opaque) { VirtioInfoList **devs = opaque; VirtIODevice *dev = object_dynamic_cast(child, TYPE_VIRTIO_DEVICE); if (dev != NULL) { VirtioInfo *info =g_new(VirtioInfo, 1); info->path = g_strdup(path->str); info->name = g_strdup(vdev->name); QAPI_LIST_PREPEND(*devs, info); } return 0; } VirtioInfoList *qmp_x_query_virtio(Error **errp) { VirtioInfoList *devs = NULL; object_child_foreach_recursive(object_get_root(), one_child, &devs); if (devs == NULL) { error_setg(errp, "No virtio devices found"); return NULL; } return devs; } > > VirtIODevice *qmp_find_virtio_device(const char *path) > { > - VirtIODevice *vdev; > - > - QTAILQ_FOREACH(vdev, &virtio_list, next) { > - DeviceState *dev = DEVICE(vdev); > - > - if (strcmp(dev->canonical_path, path) != 0) { > - continue; > + Error *err = NULL; > + char *basename; > + > + /* Append 'virtio-backend' to path if needed */ > + basename = g_path_get_basename(path); > + if (strcmp(basename, "virtio-backend")) { > + GString *temp = g_string_new(path); > + char *last = strrchr(path, '/'); > + if (g_strcmp0(last, "/")) { > + g_string_append(temp, "/virtio-backend"); > + } else { > + g_string_append(temp, "virtio-backend"); > } > + path = g_strdup(temp->str); > + g_string_free(temp, true); > + } > > - Error *err = NULL; > - QObject *obj = qmp_qom_get(dev->canonical_path, "realized", &err); > - if (err == NULL) { > - GString *is_realized = qobject_to_json_pretty(obj, true); > - /* virtio device is NOT realized, remove it from list */ > - if (!strncmp(is_realized->str, "false", 4)) { > - g_string_free(is_realized, true); > - qobject_unref(obj); > - QTAILQ_REMOVE(&virtio_list, vdev, next); > - return NULL; > - } > + /* Verify the canonical path is a virtio device */ > + Object *obj = object_resolve_path(path, NULL); > + if (!obj || !object_dynamic_cast(obj, TYPE_VIRTIO_DEVICE)) { > + object_unref(obj); > + return NULL; > + } > + > + /* Verify the virtio device is realized */ > + QObject *qobj = qmp_qom_get(path, "realized", &err); > + if (err == NULL) { > + GString *is_realized = qobject_to_json_pretty(qobj, true); > + if (!strncmp(is_realized->str, "false", 4)) { > g_string_free(is_realized, true); > - } else { > - /* virtio device doesn't exist in QOM tree */ > - QTAILQ_REMOVE(&virtio_list, vdev, next); > - qobject_unref(obj); > + qobject_unref(qobj); > return NULL; > } > - /* device exists in QOM tree & is realized */ > - qobject_unref(obj); > - return vdev; > + g_string_free(is_realized, true); > + } else { > + qobject_unref(qobj); > + return NULL; > } > - return NULL; > + qobject_unref(qobj); > + > + /* Get VirtIODevice object */ > + VirtIODevice *vdev = VIRTIO_DEVICE(obj); > + return vdev; > } > > VirtioStatus *qmp_x_query_virtio_status(const char *path, Error **errp) > diff --git a/hw/virtio/virtio-qmp.h b/hw/virtio/virtio-qmp.h > index 8af5f5e65a..4b2b7875b4 100644 > --- a/hw/virtio/virtio-qmp.h > +++ b/hw/virtio/virtio-qmp.h > @@ -15,13 +15,7 @@ > #include "hw/virtio/virtio.h" > #include "hw/virtio/vhost.h" > > -#include "qemu/queue.h" > - > -typedef QTAILQ_HEAD(QmpVirtIODeviceList, VirtIODevice) QmpVirtIODeviceList; > - > -/* QAPI list of realized VirtIODevices */ > -extern QmpVirtIODeviceList virtio_list; > - > +void qmp_set_virtio_device_list(const char *ppath, VirtioInfoList **list); > VirtIODevice *qmp_find_virtio_device(const char *path); > VirtioDeviceStatus *qmp_decode_status(uint8_t bitmap); > VhostDeviceProtocols *qmp_decode_protocols(uint64_t bitmap); > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index 295a603e58..83c5db3d26 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -45,8 +45,6 @@ > #include "standard-headers/linux/virtio_mem.h" > #include "standard-headers/linux/virtio_vsock.h" > > -QmpVirtIODeviceList virtio_list; > - > /* > * Maximum size of virtio device config space > */ > @@ -3616,7 +3614,6 @@ static void virtio_device_realize(DeviceState *dev, Error **errp) > vdev->listener.commit = virtio_memory_listener_commit; > vdev->listener.name = "virtio"; > memory_listener_register(&vdev->listener, vdev->dma_as); > - QTAILQ_INSERT_TAIL(&virtio_list, vdev, next); > } > > static void virtio_device_unrealize(DeviceState *dev) > @@ -3631,7 +3628,6 @@ static void virtio_device_unrealize(DeviceState *dev) > vdc->unrealize(dev); > } > > - QTAILQ_REMOVE(&virtio_list, vdev, next); > g_free(vdev->bus_name); > vdev->bus_name = NULL; > } > @@ -3805,8 +3801,6 @@ static void virtio_device_class_init(ObjectClass *klass, void *data) > vdc->stop_ioeventfd = virtio_device_stop_ioeventfd_impl; > > vdc->legacy_features |= VIRTIO_LEGACY_FEATURES; > - > - QTAILQ_INIT(&virtio_list); > } > > bool virtio_device_ioeventfd_enabled(VirtIODevice *vdev) > -- > 2.39.3 > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|