From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
qemu-devel@nongnu.org, qemu-arm@nongnu.org,
peter.maydell@linaro.org, prem.mallappa@gmail.com
Cc: alex.williamson@redhat.com, tn@semihalf.com, mst@redhat.com,
cdall@kernel.org, bharat.bhushan@nxp.com,
jean-philippe.brucker@arm.com, linuc.decode@gmail.com,
peterx@redhat.com, jintack@cs.columbia.edu
Subject: [Qemu-devel] [PATCH v12 02/17] hw/arm/smmu-common: IOMMU memory region and address space setup
Date: Wed, 25 Apr 2018 16:15:47 +0200 [thread overview]
Message-ID: <1524665762-31355-3-git-send-email-eric.auger@redhat.com> (raw)
In-Reply-To: <1524665762-31355-1-git-send-email-eric.auger@redhat.com>
We set up the infrastructure to enumerate all the PCI devices
attached to the SMMU and create an associated IOMMU memory
region and address space.
Those info are stored in SMMUDevice objects. The devices are
grouped according to the PCIBus they belong to. A hash table
indexed by the PCIBus pointer is used. Also an array indexed by
the bus number allows to find the list of SMMUDevices.
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Prem Mallappa <prem.mallappa@broadcom.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
v11 -> v12:
- use PCI_BUILD_BDF in smmu_get_sid and add Peter's R-b
v9 -> v10:
- comment functions added to the header
- g_free(name)
- renamed smmu_find_as_from_bus_num into smmu_find_smmu_pcibus
- add a comment about lazy init in smmu_find_smmu_pcibus
- add a trace event when creating the smmu iommu mr
v8 -> v9:
- fix key value for lookup
v7 -> v8:
- introduce SMMU_MAX_VA_BITS
- use PCI bus handle as a key
- do not clear s->smmu_as_by_bus_num
- use g_new0 instead of g_malloc0
- use primary_bus field
---
hw/arm/smmu-common.c | 69 ++++++++++++++++++++++++++++++++++++++++++++
hw/arm/trace-events | 3 ++
include/hw/arm/smmu-common.h | 8 +++++
3 files changed, 80 insertions(+)
diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
index e086ff5..3d64bcf 100644
--- a/hw/arm/smmu-common.c
+++ b/hw/arm/smmu-common.c
@@ -28,8 +28,69 @@
#include "qemu/error-report.h"
#include "hw/arm/smmu-common.h"
+/**
+ * The bus number is used for lookup when SID based invalidation occurs.
+ * In that case we lazily populate the SMMUPciBus array from the bus hash
+ * table. At the time the SMMUPciBus is created (smmu_find_add_as), the bus
+ * numbers may not be always initialized yet.
+ */
+SMMUPciBus *smmu_find_smmu_pcibus(SMMUState *s, uint8_t bus_num)
+{
+ SMMUPciBus *smmu_pci_bus = s->smmu_pcibus_by_bus_num[bus_num];
+
+ if (!smmu_pci_bus) {
+ GHashTableIter iter;
+
+ g_hash_table_iter_init(&iter, s->smmu_pcibus_by_busptr);
+ while (g_hash_table_iter_next(&iter, NULL, (void **)&smmu_pci_bus)) {
+ if (pci_bus_num(smmu_pci_bus->bus) == bus_num) {
+ s->smmu_pcibus_by_bus_num[bus_num] = smmu_pci_bus;
+ return smmu_pci_bus;
+ }
+ }
+ }
+ return smmu_pci_bus;
+}
+
+static AddressSpace *smmu_find_add_as(PCIBus *bus, void *opaque, int devfn)
+{
+ SMMUState *s = opaque;
+ SMMUPciBus *sbus = g_hash_table_lookup(s->smmu_pcibus_by_busptr, bus);
+ SMMUDevice *sdev;
+
+ if (!sbus) {
+ sbus = g_malloc0(sizeof(SMMUPciBus) +
+ sizeof(SMMUDevice *) * SMMU_PCI_DEVFN_MAX);
+ sbus->bus = bus;
+ g_hash_table_insert(s->smmu_pcibus_by_busptr, bus, sbus);
+ }
+
+ sdev = sbus->pbdev[devfn];
+ if (!sdev) {
+ char *name = g_strdup_printf("%s-%d-%d",
+ s->mrtypename,
+ pci_bus_num(bus), devfn);
+ sdev = sbus->pbdev[devfn] = g_new0(SMMUDevice, 1);
+
+ sdev->smmu = s;
+ sdev->bus = bus;
+ sdev->devfn = devfn;
+
+ memory_region_init_iommu(&sdev->iommu, sizeof(sdev->iommu),
+ s->mrtypename,
+ OBJECT(s), name, 1ULL << SMMU_MAX_VA_BITS);
+ address_space_init(&sdev->as,
+ MEMORY_REGION(&sdev->iommu), name);
+ trace_smmu_add_mr(name);
+ g_free(name);
+ }
+
+ return &sdev->as;
+}
+
static void smmu_base_realize(DeviceState *dev, Error **errp)
{
+ SMMUState *s = ARM_SMMU(dev);
SMMUBaseClass *sbc = ARM_SMMU_GET_CLASS(dev);
Error *local_err = NULL;
@@ -38,6 +99,14 @@ static void smmu_base_realize(DeviceState *dev, Error **errp)
error_propagate(errp, local_err);
return;
}
+
+ s->smmu_pcibus_by_busptr = g_hash_table_new(NULL, NULL);
+
+ if (s->primary_bus) {
+ pci_setup_iommu(s->primary_bus, smmu_find_add_as, s);
+ } else {
+ error_setg(errp, "SMMU is not attached to any PCI bus!");
+ }
}
static void smmu_base_reset(DeviceState *dev)
diff --git a/hw/arm/trace-events b/hw/arm/trace-events
index 193063e..8e8b53c 100644
--- a/hw/arm/trace-events
+++ b/hw/arm/trace-events
@@ -2,3 +2,6 @@
# hw/arm/virt-acpi-build.c
virt_acpi_setup(void) "No fw cfg or ACPI disabled. Bailing out."
+
+# hw/arm/smmu-common.c
+smmu_add_mr(const char *name) "%s"
\ No newline at end of file
diff --git a/include/hw/arm/smmu-common.h b/include/hw/arm/smmu-common.h
index d682be8..8b94777 100644
--- a/include/hw/arm/smmu-common.h
+++ b/include/hw/arm/smmu-common.h
@@ -120,4 +120,12 @@ typedef struct {
#define ARM_SMMU_GET_CLASS(obj) \
OBJECT_GET_CLASS(SMMUBaseClass, (obj), TYPE_ARM_SMMU)
+/* Return the SMMUPciBus handle associated to a PCI bus number */
+SMMUPciBus *smmu_find_smmu_pcibus(SMMUState *s, uint8_t bus_num);
+
+/* Return the stream ID of an SMMU device */
+static inline uint16_t smmu_get_sid(SMMUDevice *sdev)
+{
+ return PCI_BUILD_BDF(pci_bus_num(sdev->bus), sdev->devfn);
+}
#endif /* HW_ARM_SMMU_COMMON */
--
2.5.5
next prev parent reply other threads:[~2018-04-25 14:16 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-25 14:15 [Qemu-devel] [PATCH v12 00/17] ARM SMMUv3 Emulation Support Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 01/17] hw/arm/smmu-common: smmu base device and datatypes Eric Auger
2018-04-25 14:15 ` Eric Auger [this message]
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 03/17] hw/arm/smmu-common: VMSAv8-64 page table walk Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 04/17] hw/arm/smmuv3: Skeleton Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 05/17] hw/arm/smmuv3: Wired IRQ and GERROR helpers Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 06/17] hw/arm/smmuv3: Queue helpers Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 07/17] hw/arm/smmuv3: Implement MMIO write operations Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 08/17] hw/arm/smmuv3: Event queue recording helper Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 09/17] hw/arm/smmuv3: Implement translate callback Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 10/17] hw/arm/smmuv3: Abort on vfio or vhost case Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 11/17] target/arm/kvm: Translate the MSI doorbell in kvm_arch_fixup_msi_route Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 12/17] hw/arm/virt: Add SMMUv3 to the virt board Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 13/17] hw/arm/virt-acpi-build: Add smmuv3 node in IORT table Eric Auger
2018-04-25 14:15 ` [Qemu-devel] [PATCH v12 14/17] hw/arm/virt: Introduce the iommu option Eric Auger
2018-04-25 14:16 ` [Qemu-devel] [PATCH v12 15/17] hw/arm/smmuv3: Cache/invalidate config data Eric Auger
2018-04-25 14:16 ` [Qemu-devel] [PATCH v12 16/17] hw/arm/smmuv3: IOTLB emulation Eric Auger
2018-04-25 14:16 ` [Qemu-devel] [PATCH v12 17/17] hw/arm/smmuv3: Add notifications on invalidation Eric Auger
2018-05-04 16:51 ` [Qemu-devel] [PATCH v12 00/17] ARM SMMUv3 Emulation Support Peter Maydell
2018-05-04 16:52 ` Auger Eric
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=1524665762-31355-3-git-send-email-eric.auger@redhat.com \
--to=eric.auger@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=bharat.bhushan@nxp.com \
--cc=cdall@kernel.org \
--cc=eric.auger.pro@gmail.com \
--cc=jean-philippe.brucker@arm.com \
--cc=jintack@cs.columbia.edu \
--cc=linuc.decode@gmail.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=prem.mallappa@gmail.com \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=tn@semihalf.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).