From: Eric Auger <eric.auger@redhat.com>
To: Peter Xu <peterx@redhat.com>, qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
"Daniel P . Berrange" <berrange@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
David Hildenbrand <david@redhat.com>,
Markus Armbruster <armbru@redhat.com>,
Shannon Zhao <shannon.zhaosl@gmail.com>,
Alex Williamson <alex.williamson@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
David Gibson <david@gibson.dropbear.id.au>
Subject: Re: [PATCH 6/8] pci: Use pci_for_each_root_bus() in current code
Date: Thu, 21 Oct 2021 14:28:20 +0200 [thread overview]
Message-ID: <c3962f8c-5504-6653-b76c-0cbca6cd5b0f@redhat.com> (raw)
In-Reply-To: <20211021104259.57754-7-peterx@redhat.com>
Hi Peter,
On 10/21/21 12:42 PM, Peter Xu wrote:
> There're three places that can be rewritten with the pci_for_each_root_bus()
> helper that we just introduced. De-dup the code.
>
> Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Eric
> ---
> hw/arm/virt-acpi-build.c | 31 +++++++++++--------------------
> hw/i386/acpi-build.c | 38 ++++++++++----------------------------
> 2 files changed, 21 insertions(+), 48 deletions(-)
>
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 6cec97352b..54b82aa863 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -263,28 +263,20 @@ struct AcpiIortIdMapping {
> typedef struct AcpiIortIdMapping AcpiIortIdMapping;
>
> /* Build the iort ID mapping to SMMUv3 for a given PCI host bridge */
> -static int
> -iort_host_bridges(Object *obj, void *opaque)
> +static void
> +iort_host_bridges(PCIBus *bus, void *opaque)
> {
> - GArray *idmap_blob = opaque;
> -
> - if (object_dynamic_cast(obj, TYPE_PCI_HOST_BRIDGE)) {
> - PCIBus *bus = PCI_HOST_BRIDGE(obj)->bus;
> -
> - if (bus && !pci_bus_bypass_iommu(bus)) {
> - int min_bus, max_bus;
> + if (!pci_bus_bypass_iommu(bus)) {
> + int min_bus, max_bus;
>
> - pci_bus_range(bus, &min_bus, &max_bus);
> + pci_bus_range(bus, &min_bus, &max_bus);
>
> - AcpiIortIdMapping idmap = {
> - .input_base = min_bus << 8,
> - .id_count = (max_bus - min_bus + 1) << 8,
> - };
> - g_array_append_val(idmap_blob, idmap);
> - }
> + AcpiIortIdMapping idmap = {
> + .input_base = min_bus << 8,
> + .id_count = (max_bus - min_bus + 1) << 8,
> + };
> + g_array_append_val((GArray *)opaque, idmap);
> }
> -
> - return 0;
> }
>
> static int iort_idmap_compare(gconstpointer a, gconstpointer b)
> @@ -318,8 +310,7 @@ build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
> if (vms->iommu == VIRT_IOMMU_SMMUV3) {
> AcpiIortIdMapping next_range = {0};
>
> - object_child_foreach_recursive(object_get_root(),
> - iort_host_bridges, smmu_idmaps);
> + pci_for_each_root_bus(iort_host_bridges, smmu_idmaps);
>
> /* Sort the smmu idmap by input_base */
> g_array_sort(smmu_idmaps, iort_idmap_compare);
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index a76b17ed92..3e50acfe35 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -2123,20 +2123,12 @@ insert_scope(PCIBus *bus, PCIDevice *dev, void *opaque)
> }
>
> /* For a given PCI host bridge, walk and insert DMAR scope */
> -static int
> -dmar_host_bridges(Object *obj, void *opaque)
> +static void
> +dmar_host_bridges(PCIBus *bus, void *opaque)
> {
> - GArray *scope_blob = opaque;
> -
> - if (object_dynamic_cast(obj, TYPE_PCI_HOST_BRIDGE)) {
> - PCIBus *bus = PCI_HOST_BRIDGE(obj)->bus;
> -
> - if (bus && !pci_bus_bypass_iommu(bus)) {
> - pci_for_each_device_under_bus(bus, insert_scope, scope_blob);
> - }
> + if (!pci_bus_bypass_iommu(bus)) {
> + pci_for_each_device_under_bus(bus, insert_scope, opaque);
> }
> -
> - return 0;
> }
>
> /*
> @@ -2165,8 +2157,7 @@ build_dmar_q35(GArray *table_data, BIOSLinker *linker, const char *oem_id,
> * Insert scope for each PCI bridge and endpoint device which
> * is attached to a bus with iommu enabled.
> */
> - object_child_foreach_recursive(object_get_root(),
> - dmar_host_bridges, scope_blob);
> + pci_for_each_root_bus(dmar_host_bridges, scope_blob);
>
> assert(iommu);
> if (x86_iommu_ir_supported(iommu)) {
> @@ -2329,20 +2320,12 @@ insert_ivhd(PCIBus *bus, PCIDevice *dev, void *opaque)
> }
>
> /* For all PCI host bridges, walk and insert IVHD entries */
> -static int
> -ivrs_host_bridges(Object *obj, void *opaque)
> +static void
> +ivrs_host_bridges(PCIBus *bus, void *opaque)
> {
> - GArray *ivhd_blob = opaque;
> -
> - if (object_dynamic_cast(obj, TYPE_PCI_HOST_BRIDGE)) {
> - PCIBus *bus = PCI_HOST_BRIDGE(obj)->bus;
> -
> - if (bus && !pci_bus_bypass_iommu(bus)) {
> - pci_for_each_device_under_bus(bus, insert_ivhd, ivhd_blob);
> - }
> + if (!pci_bus_bypass_iommu(bus)) {
> + pci_for_each_device_under_bus(bus, insert_ivhd, opaque);
> }
> -
> - return 0;
> }
>
> static void
> @@ -2380,8 +2363,7 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,
> * blob further below. Fall back to an entry covering all devices, which
> * is sufficient when no aliases are present.
> */
> - object_child_foreach_recursive(object_get_root(),
> - ivrs_host_bridges, ivhd_blob);
> + pci_for_each_root_bus(ivrs_host_bridges, ivhd_blob);
>
> if (!ivhd_blob->len) {
> /*
next prev parent reply other threads:[~2021-10-21 12:32 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 10:42 [PATCH 0/8] pci/iommu: Fail early if vfio-pci detected before vIOMMU Peter Xu
2021-10-21 10:42 ` [PATCH 1/8] pci: Define pci_bus_dev_fn type Peter Xu
2021-10-21 10:53 ` David Hildenbrand
2021-10-21 11:15 ` Eric Auger
2021-10-22 2:16 ` Peter Xu
2021-10-21 11:36 ` Philippe Mathieu-Daudé
2021-10-21 10:42 ` [PATCH 2/8] pci: Export pci_for_each_device_under_bus*() Peter Xu
2021-10-21 10:54 ` David Hildenbrand
2021-10-21 11:32 ` Eric Auger
2021-10-21 11:39 ` Philippe Mathieu-Daudé
2021-10-21 10:42 ` [PATCH 3/8] pci: Use pci_for_each_device_under_bus*() Peter Xu
2021-10-21 10:56 ` David Hildenbrand
2021-10-21 11:34 ` Eric Auger
2021-10-22 2:19 ` Peter Xu
2021-10-21 10:42 ` [PATCH 4/8] pci: Define pci_bus_fn/pci_bus_ret_fn type Peter Xu
2021-10-21 10:57 ` David Hildenbrand
2021-10-21 11:37 ` Eric Auger
2021-10-21 11:44 ` Philippe Mathieu-Daudé
2021-10-21 12:54 ` Philippe Mathieu-Daudé
2021-10-22 2:24 ` Peter Xu
2021-10-21 10:42 ` [PATCH 5/8] pci: Add pci_for_each_root_bus() Peter Xu
2021-10-21 11:00 ` David Hildenbrand
2021-10-21 12:22 ` Eric Auger
2021-10-25 13:16 ` Michael S. Tsirkin
2021-10-28 2:56 ` Peter Xu
2021-10-21 10:42 ` [PATCH 6/8] pci: Use pci_for_each_root_bus() in current code Peter Xu
2021-10-21 11:06 ` David Hildenbrand
2021-10-21 12:28 ` Eric Auger [this message]
2021-10-21 10:42 ` [PATCH 7/8] pci: Add pci_for_each_device_all() Peter Xu
2021-10-21 10:54 ` Michael S. Tsirkin
2021-10-22 2:33 ` Peter Xu
2021-10-22 8:43 ` Michael S. Tsirkin
2021-10-25 12:57 ` Peter Xu
2021-10-25 13:13 ` Michael S. Tsirkin
2021-10-21 10:42 ` [PATCH 8/8] x86-iommu: Fail early if vIOMMU specified after vfio-pci Peter Xu
2021-10-21 10:49 ` Michael S. Tsirkin
2021-10-21 12:38 ` Eric Auger
2021-10-22 2:37 ` Peter Xu
2021-10-21 22:30 ` Alex Williamson
2021-10-22 2:14 ` Peter Xu
2021-10-26 15:11 ` Igor Mammedov
2021-10-26 15:38 ` Alex Williamson
2021-10-27 8:30 ` Peter Xu
2021-10-28 2:30 ` Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c3962f8c-5504-6653-b76c-0cbca6cd5b0f@redhat.com \
--to=eric.auger@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=shannon.zhaosl@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).