ARM SMMUv3 Emulation Support
v9 cover ARM SMMUv3 Emulation Support
This series implements the emulation code for ARM SMMUv3.
SMMUv3 gets instantiated by adding ",iommu=smmuv3" to the virt machine option.
VHOST integration will be handled in a separate series. VFIO integration is not targeted at the moment. Only stage 1 and AArch64 PTW are supported.
Main changes since v8:
- fix mingw compilation (qemu/log.h)
- put gpl v2 license on all files to respect initial license
- change proto of smmu_ptw* to clarify inputs/outputs and prepare for iotlb emulation
- fix hash table lookup
- cleanup access type handling during ptw
- cleanup reset infra (parent_reset)
- replace some inline functions by macros
- fix some CMD fields
- increment cmdq cons only after cmd execution
- replace some remaining error_report by qemu_log_mask
Best Regards
Eric
This series can be found at:
v9: https://github.com/eauger/qemu/tree/v2.11.0-SMMU-v9
Previous version at:
v8: https://github.com/eauger/qemu/tree/v2.11.0-SMMU-v8
History:
v8 -> v9:
- see above description
v7 -> v8:
Took into account Peter's comments:
- revisit queue data structures
- use registerfields.h and got rid of reg array
- use dma_memory_read for all descriptor fetches
- got rid of page table walk for an iova range and implemented standard page table walk for single IOVA
- revisit event data structure
- report events in many more situations and pass the event handle all along the decode and ptw phases
- fix gerror/gerron computations
- completely got rid of stage2 decoding
- use a machine option for instantiation
- get rid of VFIO integration
- get rid of VHOST integration (this will be added in a
- abort in case vhost/vfio notifiers get detected second step together with TLB emulation)
- Tested migration
- fixed TTBR index computation (issue reported by Tomasz)
v6 -> v7:
- DPDK testpmd now running on guest with 2 assigned VFs
- Changed the instantiation method: add the following option to the QEMU command line
-device smmu # for virtio/vhost use cases
-device smmu,caching-mode # for vfio use cases (based on [1])
- splitted the series into smaller patches to allow the review
- the VFIO integration based on "ltlbi-on-map" smmuv3 driver is isolated from the rest: last 2 patches, not for upstream. This is shipped for testing/bench until a better solution is found.
- Reworked permission flag checks and event generation
v5 -> v6:
- Rebase on 2.10 and IOMMUMemoryRegion
- add ACPI TLBI_ON_MAP support (VFIO integration also works in ACPI mode)
- fix block replay
- handle implementation defined SMMU_CMD_TLBI_NH_VA_AM cmd (goes along with TLBI_ON_MAP FW quirk)
- replay systematically unmap the whole range first
- smmuv3_map_hook does not unmap anymore and the unmap is done before the replay
- add and use smmuv3_context_device_invalidate instead of blindly replaying everything
v4 -> v5:
- initial_level now part of SMMUTransCfg
- smmu_page_walk_64 takes into account the max input size
- implement sys->iommu_ops.replay and sys->iommu_ops.notify_flag_changed
- smmuv3_translate: bug fix: don't walk on bypass
- smmu_update_qreg: fix PROD index update
- I did not yet address Peter's comments as the code is not mature enough to be split into sub patches.
v3 -> v4 [Eric]:
- page table walk rewritten to allow scan of the page table within a range of IOVA. This prepares for VFIO integration and replay.
- configuration parsing partially reworked.
- do not advertise unsupported/untested features: S2, S1 + S2, HYP, PRI, ATS, ..
- added ACPI table generation
- migrated to dynamic traces
- mingw compilation fix
v2 -> v3 [Eric]:
- rebased on 2.9
- mostly code and patch reorganization to ease the review process
- optional patches removed. They may be handled separately. I am currently working on ACPI enablement.
- optional instantiation of the smmu in mach-virt
- removed [2/9] (fdt functions) since not mandated
- start splitting main patch into base and derived object
- no new function feature added
v1 -> v2 [Prem]:
- Adopted review comments from Eric Auger
- Make SMMU_DPRINTF to internally call qemu_log (since translation requests are too many, we need control on the type of log we want)
- SMMUTransCfg modified to suite simplicity
- Change RegInfo to uint64 register array
- Code cleanup
- Test cleanups
- Reshuffled patches
v0 -> v1 [Prem]:
- As per SMMUv3 spec 16.0 (only is_ste_consistant() is noticeable)
- Reworked register access/update logic
- Factored out translation code for
- single point bug fix
- sharing/removal in future
- (optional) Unit tests added, with PCI test device
- S1 with 4k/64k, S1+S2 with 4k/64k
- (S1 or S2) only can be verified by Linux 4.7 driver
- (optional) Priliminary ACPI support
v0 [Prem]:
- Implements SMMUv3 spec 11.0
- Supported for PCIe devices,
- Command Queue and Event Queue supported
- LPAE only, S1 is supported and Tested, S2 not tested
- BE mode Translation not supported
- IRQ support (legacy, no MSI)
- Tested with DPDK and e1000
Eric Auger (11):
hw/arm/smmu-common: smmu base device and datatypes hw/arm/smmu-common: IOMMU memory region and address space setup hw/arm/smmu-common: VMSAv8-64 page table walk hw/arm/smmuv3: Wired IRQ and GERROR helpers
hw/arm/smmuv3: Queue helpers
hw/arm/smmuv3: Implement MMIO write operations hw/arm/smmuv3: Event queue recording helper
hw/arm/smmuv3: Implement translate callback
hw/arm/smmuv3: Abort on vfio or vhost case
target/arm/kvm: Translate the MSI doorbell in kvm_arch_fixup_msi_route hw/arm/virt: Handle iommu in 2.12 machine type
Prem Mallappa (3):
hw/arm/smmuv3: Skeleton
hw/arm/virt: Add SMMUv3 to the virt board hw/arm/virt-acpi-build: Add smmuv3 node in IORT table
default-configs/aarch64-softmmu.mak | 1 + hw/arm/Makefile.objs | 1 + hw/arm/smmu-common.c | 371 ++++++++++++ hw/arm/smmu-internal.h | 96 +++ hw/arm/smmuv3-internal.h | 611 +++++++++++++++++++ hw/arm/smmuv3.c | 1118 +++++++++++++++++++++++++++++++++++ hw/arm/trace-events | 36 ++ hw/arm/virt-acpi-build.c | 56 +- hw/arm/virt.c | 109 +++- include/hw/acpi/acpi-defs.h | 15 + include/hw/arm/smmu-common.h | 136 +++++ include/hw/arm/smmuv3.h | 91 +++ include/hw/arm/virt.h | 11 + target/arm/kvm.c | 27 + target/arm/trace-events | 3 + 15 files changed, 2674 insertions(+), 8 deletions(-) create mode 100644 hw/arm/smmu-common.c create mode 100644 hw/arm/smmu-internal.h create mode 100644 hw/arm/smmuv3-internal.h create mode 100644 hw/arm/smmuv3.c create mode 100644 include/hw/arm/smmu-common.h create mode 100644 include/hw/arm/smmuv3.h
Signature · 1 line
2.5.5
PATCH v9 1/14 hw/arm/smmu-common: smmu base device and datatypes
The patch introduces the smmu base device and class for the ARM smmu. Devices for specific versions will be derived from this base device.
We also introduce some important datatypes.
---
v8 -> v9:
- remove page walk callback type from this patch (vhost related)
- add a new hash table for caching configuration data
- add reset function
- add asid
v7 -> v8:
- add bus_num property
- add primary-bus property
- add realize and remove instance_init
- rename TYPE and related macros to match naming convention using for GIC
- add SMMUPageTableWalkEventInfo
- tt[2] in translation config
v3 -> v4:
- added smmu_find_as_from_bus_num
- SMMU_PCI_BUS_MAX and SMMU_PCI_DEVFN_MAX in smmu-common header
- new fields in SMMUState:
- iommu_ops, smmu_as_by_busptr, smmu_as_by_bus_num
- add aa64[] field in SMMUTransCfg
v3:
- moved the base code in a separate patch to ease the review.
- clearer separation between base class and smmuv3 class
- translate_* only implemented as class methods
Conflicts:
default-configs/aarch64-softmmu.mak
--- default-configs/aarch64-softmmu.mak | 1 + hw/arm/Makefile.objs | 1 + hw/arm/smmu-common.c | 80 +++++++++++++++++++++++ include/hw/arm/smmu-common.h | 124 ++++++++++++++++++++++++++++++++++++ 4 files changed, 206 insertions(+) create mode 100644 hw/arm/smmu-common.c create mode 100644 include/hw/arm/smmu-common.h
default-configs/aarch64-softmmu.mak +1 -0
@@ -8,3 +8,4 @@ CONFIG_DDC=y CONFIG_DPCD=y CONFIG_XLNX_ZYNQMP=y CONFIG_XLNX_ZYNQMP_ARM=y +CONFIG_ARM_SMMUV3=y
hw/arm/Makefile.objs +1 -0
@@ -20,3 +20,4 @@ obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o obj-$(CONFIG_MPS2) += mps2.o obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o +obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o
hw/arm/smmu-common.c new file +80 -0
80 lines not on this page · raw message
include/hw/arm/smmu-common.h new file +124 -0
124 lines not on this page · raw message
Signature · 1 line
2.5.5
Re: [Qemu-arm] [PATCH v9 01/14] hw/arm/smmu-common: smmu base device and datatypes
Quoted 22 lines · Eric Auger
The patch introduces the smmu base device and class for the ARM smmu. Devices for specific versions will be derived from this base device.
We also introduce some important datatypes.
Signed-off-by Eric Auger <[email protected]>Signed-off-by Prem Mallappa <[email protected]>+ * Author: Prem Mallappa <[email protected]>
+ *
+ */hw/arm/smmu-common.c new file +9
-0+ +#include "qemu/osdep.h" +#include "sysemu/sysemu.h" +#include "exec/address-spaces.h" +#include "trace.h" +#include "exec/target_page.h" +#include "qom/cpu.h" +#include "hw/qdev-properties.h" +#include "qapi/error.h"
hw/arm/smmu-common.c line 36
Quoted 10 lines
hw/arm/smmu-common.c new file +10
-0+ +#include "qemu/error-report.h" +#include "hw/arm/smmu-common.h" + +static void smmu_base_realize (DeviceState *dev,Error **errp) +{ +SMMUState *s =ARM_SMMU (dev); + + s->configs =g_hash_table_new_full (NULL ,NULL ,NULL , g_free); + s->iotlb =g_hash_table_new_full (NULL ,NULL ,NULL , g_free);
Shouldn't we also invoke the parent_realize ?
Quoted 14 lines
hw/arm/smmu-common.c new file +14
-0+} + +static void smmu_base_reset (DeviceState *dev) +{ +SMMUState *s =ARM_SMMU (dev); + +g_hash_table_remove_all (s->configs); +g_hash_table_remove_all (s->iotlb); +} + +static Property smmu_dev_properties[] = { +DEFINE_PROP_UINT8 ("bus_num" , SMMUState, bus_num,0 ), + DEFINE_PROP_LINK("primary-bus", SMMUState, primary_bus, "PCI", PCIBus *), +DEFINE_PROP_END_OF_LIST (),
hw/arm/smmu-common.c line 60
Quoted 10 lines
hw/arm/smmu-common.c new file +10
-0+}; + +static void smmu_base_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +SMMUBaseClass *sbc =ARM_SMMU_CLASS (klass); + + dc->props = smmu_dev_properties; + sbc->parent_realize = dc->realize; + dc->realize = smmu_base_realize;
There's a device_class_set_parent_realize() in the tree now that we should probably use instead of these 2 lines:
device_class_set_parent_realize(dc, smmu_base_realize,
&sbc->parent_realize);Quoted 38 lines
hw/arm/smmu-common.c new file +20
-0+ dc->reset = smmu_base_reset; +} + +static const TypeInfo smmu_base_info = { + .name =TYPE_ARM_SMMU , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (SMMUState), + .class_data =NULL , + .class_size =sizeof (SMMUBaseClass), + .class_init = smmu_base_class_init, + .abstract = true, +}; + +static void smmu_base_register_types (void ) +{ +type_register_static (&smmu_base_info); +} + +type_init (smmu_base_register_types) +include/hw/arm/smmu-common.h new file +12
-0@@ -0,0 +1,124 @@ +/* +* ARM SMMU Support +* +* Copyright (C) 2015-2016 Broadcom Corporation +* Copyright (c) 2017 Red Hat, Inc. +* Written by Prem Mallappa, Eric Auger +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful,
include/hw/arm/smmu-common.h line 22
Quoted 10 lines
include/hw/arm/smmu-common.h new file +10
-0+* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#ifndef HW_ARM_SMMU_COMMON_H +#define HW_ARM_SMMU_COMMON_H + +#include <hw/sysbus.h>
QEMU headers should be included using "", not <>.
Quoted 38 lines
include/hw/arm/smmu-common.h new file +38
-0+#include "hw/pci/pci.h" + +#define SMMU_PCI_BUS_MAX 256 +#define SMMU_PCI_DEVFN_MAX 256 + +#define SMMU_MAX_VA_BITS 48 + +/* +* Page table walk error types +*/ +typedef enum { +SMMU_PTW_ERR_NONE , +SMMU_PTW_ERR_WALK_EABT ,/* Translation walk external abort */ +SMMU_PTW_ERR_TRANSLATION ,/* Translation fault */ +SMMU_PTW_ERR_ADDR_SIZE ,/* Address Size fault */ +SMMU_PTW_ERR_ACCESS ,/* Access fault */ +SMMU_PTW_ERR_PERMISSION ,/* Permission fault */ +}SMMUPTWEventType ; + +typedef struct SMMUPTWEventInfo { +SMMUPTWEventType type; +dma_addr_t addr;/* fetched address that induced an abort, if any */ +}SMMUPTWEventInfo ; + +typedef struct SMMUTransTableInfo { +bool disabled;/* is the translation table disabled? */ +uint64_t ttb;/* TT base address */ +uint8_t tsz;/* input range, ie. 2^(64 -tsz)*/ +uint8_t granule_sz;/* granule page shift */ +uint8_t initial_level;/* initial lookup level */ +}SMMUTransTableInfo ; + +/* +* Generic structure populated by derived SMMU devices +* after decoding the configuration information and used as +* input to the page table walk +*/ +typedef struct SMMUTransCfg {
include/hw/arm/smmu-common.h line 70
Quoted 10 lines
include/hw/arm/smmu-common.h new file +10
-0+int stage;/* translation stage */ +bool aa64;/* arch64 or aarch32 translation table */ +bool disabled;/* smmu is disabled */ +bool bypassed;/* translation is bypassed */ +bool aborted;/* translation is aborted */ +uint64_t ttb;/* TT base address */ +uint8_t oas;/* output address width */ +uint8_t tbi;/* Top Byte Ignore */ +uint16_t asid; +SMMUTransTableInfo tt[2 ];
Can you be consistent about either lining up the field names or not doing so, please? (I would suggest going for 'not'.)
include/hw/arm/smmu-common.h line 71
Quoted 1 line
include/hw/arm/smmu-common.h new file +1
-0+} SMMUTransCfg;
Otherwise
thanks
-- PMM
Re: [Qemu-arm] [Qemu-devel] [PATCH v9 01/14] hw/arm/smmu-common: smmu base device and datatypes
Hi Peter,
Quoted 27 lines · Peter Maydell
Quoted 26 lines · Eric Auger
The patch introduces the smmu base device and class for the ARM smmu. Devices for specific versions will be derived from this base device.
We also introduce some important datatypes.
Signed-off-by Eric Auger <[email protected]>Signed-off-by Prem Mallappa <[email protected]>+ * Author: Prem Mallappa <[email protected]>
+ *
+ */hw/arm/smmu-common.c new file +13
-0+ +#include "qemu/osdep.h" +#include "sysemu/sysemu.h" +#include "exec/address-spaces.h" +#include "trace.h" +#include "exec/target_page.h" +#include "qom/cpu.h" +#include "hw/qdev-properties.h" +#include "qapi/error.h" + +#include "qemu/error-report.h" +#include "hw/arm/smmu-common.h" +
Quoted 8 lines
hw/arm/smmu-common.c line 36
Quoted 6 lines
hw/arm/smmu-common.c new file +6
-0+static void smmu_base_realize (DeviceState *dev,Error **errp) +{ +SMMUState *s =ARM_SMMU (dev); + + s->configs =g_hash_table_new_full (NULL ,NULL ,NULL , g_free); + s->iotlb =g_hash_table_new_full (NULL ,NULL ,NULL , g_free);Shouldn't we also invoke the
parent_realize?
Yes will fix that.
note that those hash tables are not yet used. However I kept those in this series to illustrate the split between the generic and smmuv3 part. configs will be used to cache config data whereas iotlb will be used to cache IOTLB entries. I can remove them at the moment and keep the realize function void.
Quoted 28 lines
Quoted 15 lines
hw/arm/smmu-common.c new file +14
-0+} + +static void smmu_base_reset (DeviceState *dev) +{ +SMMUState *s =ARM_SMMU (dev); + +g_hash_table_remove_all (s->configs); +g_hash_table_remove_all (s->iotlb); +} + +static Property smmu_dev_properties[] = { +DEFINE_PROP_UINT8 ("bus_num" , SMMUState, bus_num,0 ), + DEFINE_PROP_LINK("primary-bus", SMMUState, primary_bus, "PCI", PCIBus *), +DEFINE_PROP_END_OF_LIST (),hw/arm/smmu-common.c line 60
Quoted 10 lines
hw/arm/smmu-common.c new file +10
-0+}; + +static void smmu_base_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +SMMUBaseClass *sbc =ARM_SMMU_CLASS (klass); + + dc->props = smmu_dev_properties; + sbc->parent_realize = dc->realize; + dc->realize = smmu_base_realize;There's a
device_class_set_parent_realize()in the tree now that we should probably use instead of these 2 lines:
Quoted 2 lines
device_class_set_parent_realize(dc, smmu_base_realize,
&sbc->parent_realize);OK. Will do that as well for smmuv3 class. I used the fellow reset setter but not that one.
Quoted 95 lines
Quoted 39 lines
hw/arm/smmu-common.c new file +20
-0+ dc->reset = smmu_base_reset; +} + +static const TypeInfo smmu_base_info = { + .name =TYPE_ARM_SMMU , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (SMMUState), + .class_data =NULL , + .class_size =sizeof (SMMUBaseClass), + .class_init = smmu_base_class_init, + .abstract = true, +}; + +static void smmu_base_register_types (void ) +{ +type_register_static (&smmu_base_info); +} + +type_init (smmu_base_register_types) +include/hw/arm/smmu-common.h new file +12
-0@@ -0,0 +1,124 @@ +/* +* ARM SMMU Support +* +* Copyright (C) 2015-2016 Broadcom Corporation +* Copyright (c) 2017 Red Hat, Inc. +* Written by Prem Mallappa, Eric Auger +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, include/hw/arm/smmu-common.h line 22
Quoted 10 lines
include/hw/arm/smmu-common.h new file +10
-0+* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +*/ + +#ifndef HW_ARM_SMMU_COMMON_H +#define HW_ARM_SMMU_COMMON_H + +#include <hw/sysbus.h> QEMU headers should be included using "", not <>.
Quoted 43 lines
include/hw/arm/smmu-common.h new file +43
-0+#include "hw/pci/pci.h" + +#define SMMU_PCI_BUS_MAX 256 +#define SMMU_PCI_DEVFN_MAX 256 + +#define SMMU_MAX_VA_BITS 48 + +/* +* Page table walk error types +*/ +typedef enum { +SMMU_PTW_ERR_NONE , +SMMU_PTW_ERR_WALK_EABT ,/* Translation walk external abort */ +SMMU_PTW_ERR_TRANSLATION ,/* Translation fault */ +SMMU_PTW_ERR_ADDR_SIZE ,/* Address Size fault */ +SMMU_PTW_ERR_ACCESS ,/* Access fault */ +SMMU_PTW_ERR_PERMISSION ,/* Permission fault */ +}SMMUPTWEventType ; + +typedef struct SMMUPTWEventInfo { +SMMUPTWEventType type; +dma_addr_t addr;/* fetched address that induced an abort, if any */ +}SMMUPTWEventInfo ; + +typedef struct SMMUTransTableInfo { +bool disabled;/* is the translation table disabled? */ +uint64_t ttb;/* TT base address */ +uint8_t tsz;/* input range, ie. 2^(64 -tsz)*/ +uint8_t granule_sz;/* granule page shift */ +uint8_t initial_level;/* initial lookup level */ +}SMMUTransTableInfo ; + +/* +* Generic structure populated by derived SMMU devices +* after decoding the configuration information and used as +* input to the page table walk +*/ +typedef struct SMMUTransCfg { + int stage; /* translation stage */ + bool aa64; /* arch64 or aarch32 translation table */ + bool disabled; /* smmu is disabled */ + bool bypassed; /* translation is bypassed */ + bool aborted; /* translation is aborted */
Quoted 8 lines
include/hw/arm/smmu-common.h line 70
Quoted 5 lines
include/hw/arm/smmu-common.h new file +5
-0+uint64_t ttb;/* TT base address */ +uint8_t oas;/* output address width */ +uint8_t tbi;/* Top Byte Ignore */ +uint16_t asid; +SMMUTransTableInfo tt[2 ];Can you be consistent about either lining up the field names or not doing so, please? (I would suggest going for 'not'.)
OK
Quoted 5 lines
include/hw/arm/smmu-common.h line 71
Quoted 2 lines
include/hw/arm/smmu-common.h new file +1
-0+} SMMUTransCfg;Otherwise
Reviewed-by Peter Maydell <[email protected]>
thanks!
Eric
Quoted 4 lines
thanks
-- PMM
PATCH v9 2/14 hw/arm/smmu-common: IOMMU memory region and address space setup
In reply to Eric AugerWe enumerate all the PCI devices attached to the SMMU and initialize an associated IOMMU memory region and address space. This happens on SMMU base instance init.
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 poinet is used. Also an array indexed by the bus number allows to find the list of SMMUDevices.
---
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 | 59 ++++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/smmu-common.h | 6 +++++ 2 files changed, 65 insertions(+)
hw/arm/smmu-common.c +59 -0
@@ -28,12 +28,71 @@#include "qemu/error-report.h" #include "hw/arm/smmu-common.h" +SMMUPciBus *smmu_find_as_from_bus_num (SMMUState *s,uint8_t bus_num) +{ +SMMUPciBus *smmu_pci_bus = s->smmu_as_by_bus_num[bus_num]; + +if (!smmu_pci_bus) { +GHashTableIter iter; + +g_hash_table_iter_init (&iter, s->smmu_as_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_as_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_as_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_as_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); + } + +return &sdev->as; +} +static void smmu_base_realize (DeviceState *dev,Error **errp) {SMMUState *s =ARM_SMMU (dev); s->configs =g_hash_table_new_full (NULL ,NULL ,NULL , g_free); s->iotlb =g_hash_table_new_full (NULL ,NULL ,NULL , g_free); + s->smmu_as_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)
include/hw/arm/smmu-common.h +6 -0
@@ -121,4 +121,10 @@ typedef struct {#define ARM_SMMU_GET_CLASS (obj) \ OBJECT_GET_CLASS(SMMUBaseClass, (obj), TYPE_ARM_SMMU) +SMMUPciBus *smmu_find_as_from_bus_num (SMMUState *s,uint8_t bus_num); + +static inline uint16_t smmu_get_sid (SMMUDevice *sdev) +{ +return ((pci_bus_num (sdev->bus) &0xff ) <<8 ) | sdev->devfn; +}#endif /* HW_ARM_SMMU_COMMON */
Signature · 1 line
2.5.5
Re: [Qemu-arm] [PATCH v9 02/14] hw/arm/smmu-common: IOMMU memory region and address space setup
Quoted 7 lines · Eric Auger
We enumerate all the PCI devices attached to the SMMU and initialize an associated IOMMU memory region and address space. This happens on SMMU base instance init.
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 poinet is used. Also an array indexed by
"pointer".
Quoted 24 lines
the bus number allows to find the list of SMMUDevices.
Signed-off-by Eric Auger <[email protected]>---
v8 -> v9:
- fix key value for lookupv7 -> v8:
- introduceSMMU_MAX_VA_BITS
- use PCI bus handle as a key
- do not clears->smmu_as_by_bus_num
- useg_new0instead ofg_malloc0
- useprimary_busfield--- hw/arm/smmu-common.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/smmu-common.h | 6 +++++ 2 files changed, 65 insertions(+)hw/arm/smmu-common.c +0
-0
hw/arm/smmu-common.c line 33
Quoted 6 lines
hw/arm/smmu-common.c +3
-0@@ -28,12 +28,71 @@#include "qemu/error-report.h" #include "hw/arm/smmu-common.h" +SMMUPciBus *smmu_find_as_from_bus_num (SMMUState *s,uint8_t bus_num) +{ +SMMUPciBus *smmu_pci_bus = s->smmu_as_by_bus_num[bus_num];
Variable name suggests this is a table of AddressSpaces indexed by bus number, but the code says we're getting SMMUPCIBus objects from it?
hw/arm/smmu-common.c line 44
Quoted 11 lines
hw/arm/smmu-common.c +11
-0+ +if (!smmu_pci_bus) { +GHashTableIter iter; + +g_hash_table_iter_init (&iter, s->smmu_as_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_as_by_bus_num[bus_num] = smmu_pci_bus; +return smmu_pci_bus; + } + }
Why do we populate this hashtable lazily rather than when we put the SMMUPciBus in the smmu_as_by_busptr table? Do we expect this function not to ordinarily be called?
Quoted 23 lines
hw/arm/smmu-common.c +23
-0+ } +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_as_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_as_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 );
hw/arm/smmu-common.c line 77
Quoted 10 lines
hw/arm/smmu-common.c +10
-0+ + 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);
This leaks the memory pointed to by name, doesn't it? (address_space_init() takes a copy of the name string, so you want to g_free(name) here.)
Quoted 26 lines
hw/arm/smmu-common.c +12
-0+ } + +return &sdev->as; +} +static void smmu_base_realize (DeviceState *dev,Error **errp) {SMMUState *s =ARM_SMMU (dev); s->configs =g_hash_table_new_full (NULL ,NULL ,NULL , g_free); s->iotlb =g_hash_table_new_full (NULL ,NULL ,NULL , g_free); + s->smmu_as_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)include/hw/arm/smmu-common.h +0
-0
include/hw/arm/smmu-common.h typedef struct { · line 129
Quoted 9 lines
include/hw/arm/smmu-common.h +6
-0@@ -121,4 +121,10 @@ typedef struct {#define ARM_SMMU_GET_CLASS (obj) \ OBJECT_GET_CLASS(SMMUBaseClass, (obj), TYPE_ARM_SMMU) +SMMUPciBus *smmu_find_as_from_bus_num (SMMUState *s,uint8_t bus_num); + +static inline uint16_t smmu_get_sid (SMMUDevice *sdev) +{ +return ((pci_bus_num (sdev->bus) &0xff ) <<8 ) | sdev->devfn; +}
Can we have at least brief documentation comments for any new functions or prototypes added to header files, please?
include/hw/arm/smmu-common.h typedef struct {
Quoted 2 lines
include/hw/arm/smmu-common.h +0
-1#endif /* HW_ARM_SMMU_COMMON */ --
thanks
-- PMM
Re: [Qemu-arm] [Qemu-devel] [PATCH v9 02/14] hw/arm/smmu-common: IOMMU memory region and address space setup
Hi Peter,
Quoted 10 lines · Peter Maydell
Quoted 7 lines · Eric Auger
We enumerate all the PCI devices attached to the SMMU and initialize an associated IOMMU memory region and address space. This happens on SMMU base instance init.
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 poinet is used. Also an array indexed by
"pointer".
OK
Quoted 28 lines
Quoted 28 lines
the bus number allows to find the list of SMMUDevices.
Signed-off-by Eric Auger <[email protected]>---
v8 -> v9:
- fix key value for lookupv7 -> v8:
- introduceSMMU_MAX_VA_BITS
- use PCI bus handle as a key
- do not clears->smmu_as_by_bus_num
- useg_new0instead ofg_malloc0
- useprimary_busfield--- hw/arm/smmu-common.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/smmu-common.h | 6 +++++ 2 files changed, 65 insertions(+)hw/arm/smmu-common.c +0
-0@@ -28,12 +28,71 @@#include "qemu/error-report.h" #include "hw/arm/smmu-common.h"
Quoted 6 lines
hw/arm/smmu-common.c line 33
Quoted 3 lines
hw/arm/smmu-common.c +3
-0+SMMUPciBus *smmu_find_as_from_bus_num (SMMUState *s,uint8_t bus_num) +{ +SMMUPciBus *smmu_pci_bus = s->smmu_as_by_bus_num[bus_num];Variable name suggests this is a table of AddressSpaces indexed by bus number, but the code says we're getting SMMUPCIBus objects from it?
Yes I can rename this variable. It stems from x86 naming (see hw/intel_iommu.c vtd_find_as_from_bus_num). The code here does the same functionality with arm smmu datatypes.
SMMUPciBus ~ VTDBus and smmu_as_by_bus_num ~ vtd_as_by_bus_num
purpose is to find the SMUPciBus which matches the bus number passed in parameter.
Quoted 16 lines
hw/arm/smmu-common.c line 44
Quoted 12 lines
hw/arm/smmu-common.c +11
-0+ +if (!smmu_pci_bus) { +GHashTableIter iter; + +g_hash_table_iter_init (&iter, s->smmu_as_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_as_by_bus_num[bus_num] = smmu_pci_bus; +return smmu_pci_bus; + } + }Why do we populate this hashtable lazily rather than when we put the SMMUPciBus in the
smmu_as_by_busptrtable? Do we expect this function not to ordinarily be called?
This function only is used when handling invalidations (vhost/vfio). I can even remove it from this series at this stage and re-introduce latter on. From the SID, you retrieve bus_num, retrieve the SMMUPciBus. Andd from the function number you can then retrieve the IOMMU mr at smmu_bus->pbdev[devfn]
That's the purpose of ths function. But I will remove it.
Quoted 30 lines
Quoted 30 lines
hw/arm/smmu-common.c +29
-0+ } +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_as_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_as_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),
Quoted 8 lines
hw/arm/smmu-common.c line 77
Quoted 4 lines
hw/arm/smmu-common.c +4
-0+ s->mrtypename, + OBJECT(s), name, 1ULL << SMMU_MAX_VA_BITS); +address_space_init (&sdev->as, +MEMORY_REGION (&sdev->iommu), name);This leaks the memory pointed to by name, doesn't it? (
address_space_init()takes a copy of the name string, so you want tog_free(name)here.)
Hum yes. Will free it.
Quoted 30 lines
Quoted 30 lines
hw/arm/smmu-common.c +12
-0+ } + +return &sdev->as; +} +static void smmu_base_realize (DeviceState *dev,Error **errp) {SMMUState *s =ARM_SMMU (dev); s->configs =g_hash_table_new_full (NULL ,NULL ,NULL , g_free); s->iotlb =g_hash_table_new_full (NULL ,NULL ,NULL , g_free); + s->smmu_as_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)include/hw/arm/smmu-common.h +0
-0@@ -121,4 +121,10 @@ typedef struct {#define ARM_SMMU_GET_CLASS (obj) \ OBJECT_GET_CLASS(SMMUBaseClass, (obj), TYPE_ARM_SMMU)
Quoted 9 lines
include/hw/arm/smmu-common.h typedef struct { · line 129
Quoted 6 lines
include/hw/arm/smmu-common.h +6
-0+SMMUPciBus *smmu_find_as_from_bus_num (SMMUState *s,uint8_t bus_num); + +static inline uint16_t smmu_get_sid (SMMUDevice *sdev) +{ +return ((pci_bus_num (sdev->bus) &0xff ) <<8 ) | sdev->devfn; +}Can we have at least brief documentation comments for any new functions or prototypes added to header files, please?
Sure.
Thanks
Eric
Quoted 7 lines
include/hw/arm/smmu-common.h typedef struct {
Quoted 3 lines
include/hw/arm/smmu-common.h +0
-1#endif /* HW_ARM_SMMU_COMMON */ --thanks
-- PMM
Re: [Qemu-arm] [Qemu-devel] [PATCH v9 02/14] hw/arm/smmu-common: IOMMU memory region and address space setup
Quoted 19 lines · Auger Eric
Hi Peter,
Quoted 12 lines · Peter Maydell
hw/arm/smmu-common.c line 44
Quoted 10 lines · Eric Auger
hw/arm/smmu-common.c +10
-0+if (!smmu_pci_bus) { +GHashTableIter iter; + +g_hash_table_iter_init (&iter, s->smmu_as_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_as_by_bus_num[bus_num] = smmu_pci_bus; +return smmu_pci_bus; + } + }Quoted 3 lines
Why do we populate this hashtable lazily rather than when we put the SMMUPciBus in the
smmu_as_by_busptrtable? Do we expect this function not to ordinarily be called?
Quoted 7 lines
This function only is used when handling invalidations (vhost/vfio). I can even remove it from this series at this stage and re-introduce latter on. From the SID, you retrieve
bus_num, retrieve the SMMUPciBus. Andd from the function number you can then retrieve the IOMMU mr at smmu_bus->pbdev[devfn]That's the purpose of ths function. But I will remove it.
No, it's fine here. You should just have a comment about why it makes sense to lazily populate the hashtable (it's overall going to be slower than if we populated it up front), to document the rationale for the design decision.
thanks
-- PMM
PATCH v9 3/14 hw/arm/smmu-common: VMSAv8-64 page table walk
In reply to Eric AugerThis patch implements the page table walk for VMSAv8-64.
---
v8 -> v9:
- remove guest error log on PTE fetch fault
- rename trace functions
- fix smmu_page_walk_level_res_invalid_pte last arg
- fix PTE_ADDRESS
- turn functions into macros
- make sure to return the actual pte access permission into tlbe->perm
- change proto of smmu_ptw*
v7 -> v8:
- rework get_pte
- use LOG_LEVEL_ERROR
- remove error checking in get_block_pte_address
- page table walk simplified (no VFIO replay anymore)
- handle PTW error events
- use dma_memory_read
v6 -> v7:
- fix wrong error handling in walk_page_table
- check perm in smmu_translate
v5 -> v6:
- use IOMMUMemoryRegion
- remove initial_lookup_level()
- fix block replay
v4 -> v5:
- add initial level in translation config
- implement block pte
- rename must_translate into nofail
- introduce call_entry_hook
- small changes to dynamic traces
- smmu_page_walk code moved from smmuv3.c to this file
- remove smmu_translate*
v3 -> v4:
- reworked page table walk to prepare for VFIO integration (capability to scan a range of IOVA). Same function is used for translate for a single iova. This is largely inspired from intel_iommu.c
- as the translate function was not straightforward to me, I tried to stick more closely to the VMSA spec.
- remove support of nested stage (kernel driver does not support it anyway)
- use error_report and trace events
- add aa64[] field in SMMUTransCfg
--- hw/arm/smmu-common.c | 232 +++++++++++++++++++++++++++++++++++++++++++ hw/arm/smmu-internal.h | 96 ++++++++++++++++++ hw/arm/trace-events | 10 ++ include/hw/arm/smmu-common.h | 6 ++ 4 files changed, 344 insertions(+) create mode 100644 hw/arm/smmu-internal.h
hw/arm/smmu-common.c +232 -0
@@ -27,6 +27,238 @@#include "qemu/error-report.h" #include "hw/arm/smmu-common.h" +#include "smmu-internal.h" + +/* VMSAv8-64 Translation */ + +/** +* get_pte - Get the content of a page table entry located t +* @base_addr[@index] +*/ +static int get_pte (dma_addr_t baseaddr,uint32_t index,uint64_t *pte, +SMMUPTWEventInfo *info) +{ +int ret; +dma_addr_t addr = baseaddr + index *sizeof (*pte); + + ret =dma_memory_read (&address_space_memory, addr, + (uint8_t *)pte,sizeof (*pte)); + +if (ret !=MEMTX_OK ) { + info->type =SMMU_PTW_ERR_WALK_EABT ; + info->addr = addr; +return -EINVAL ; + } +trace_smmu_get_pte (baseaddr, index, addr, *pte); +return 0 ; +} + +/* VMSAv8-64 Translation Table Format Descriptor Decoding */ + +/** +* get_page_pte_address - returns the L3 descriptor output address, +* ie. the page frame +* ARM ARM spec: Figure D4-17 VMSAv8-64 level 3 descriptor format +*/ +static inline hwaddr get_page_pte_address (uint64_t pte,int granule_sz) +{ +return PTE_ADDRESS (pte, granule_sz); +} + +/** +* get_table_pte_address - return table descriptor output address, +* ie. address of next level table +* ARM ARM Figure D4-16 VMSAv8-64 level0, level1, and level 2 descriptor formats +*/ +static inline hwaddr get_table_pte_address (uint64_t pte,int granule_sz) +{ +return PTE_ADDRESS (pte, granule_sz); +} + +/** +* get_block_pte_address - return block descriptor output address and block size +* ARM ARM Figure D4-16 VMSAv8-64 level0, level1, and level 2 descriptor formats +*/ +static hwaddr get_block_pte_address (uint64_t pte,int level,int granule_sz, +uint64_t *bsz) +{ +int n =0 ; + +switch (granule_sz) { +case 12 : +if (level ==1 ) { + n =30 ; + }else if (level ==2 ) { + n =21 ; + } +break ; +case 14 : +if (level ==2 ) { + n =25 ; + } +break ; +case 16 : +if (level ==2 ) { + n =29 ; + } +break ; + } +if (!n) { +error_setg (&error_fatal, +"wrong granule/level combination (%d/%d)" , + granule_sz, level); + } + *bsz =1 << n; +return PTE_ADDRESS (pte, n); +} + +static inline bool check_perm (int access_attrs,int mem_attrs) +{ +if (((access_attrs &IOMMU_RO ) && !(mem_attrs &IOMMU_RO )) || + ((access_attrs &IOMMU_WO ) && !(mem_attrs &IOMMU_WO ))) { +return false; + } +return true; +} + +SMMUTransTableInfo *select_tt (SMMUTransCfg *cfg,dma_addr_t iova) +{ +if (!extract64 (iova,64 - cfg->tt[0 ].tsz, cfg->tt[0 ].tsz - cfg->tbi)) { +return &cfg->tt[0 ]; + } +return &cfg->tt[1 ]; +} + +/** +* smmu_ptw_64 - VMSAv8-64 Walk of the page tables for a given IOVA +* @cfg: translation config +* @iova: iova to translate +* @perm: access type +* @tlbe: IOMMUTLBEntry (out) +* @info: handle to an error info +* +* Return 0 on success, < 0 on error. In case of error, @info is filled +* and tlbe->perm is set to IOMMU_NONE. +* Upon success, @tlbe is filled with translated_addr and entry +* permission rights. +*/ +static int smmu_ptw_64 (SMMUTransCfg *cfg, +dma_addr_t iova,IOMMUAccessFlags perm, +IOMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +{ +dma_addr_t baseaddr; +int stage = cfg->stage; +SMMUTransTableInfo *tt =select_tt (cfg, iova); +uint8_t level; +uint8_t granule_sz; + +if (tt->disabled) { + info->type =SMMU_PTW_ERR_TRANSLATION ; + goto error; + } + + level = tt->initial_level; + granule_sz = tt->granule_sz; + baseaddr =extract64 (tt->ttb,0 ,48 ); + + tlbe->iova = iova; + tlbe->addr_mask = (1 << tt->granule_sz) -1 ; + +while (level <=3 ) { +uint64_t subpage_size =1ULL <<level_shift (level, granule_sz); +uint64_t mask = subpage_size -1 ; +uint32_t offset =iova_level_offset (iova, level, granule_sz); +uint64_t pte; +dma_addr_t pte_addr = baseaddr + offset *sizeof (pte); +uint8_t ap; + +if (get_pte (baseaddr, offset, &pte, info)) { + goto error; + } +trace_smmu_ptw_level (level, iova, subpage_size, + baseaddr, offset, pte); + +if (is_invalid_pte (pte) ||is_reserved_pte (pte, level)) { +trace_smmu_ptw_invalid_pte (stage, level, baseaddr, + pte_addr, offset, pte); + info->type =SMMU_PTW_ERR_TRANSLATION ; + goto error; + } + +if (is_page_pte (pte, level)) { +uint64_t gpa =get_page_pte_address (pte, granule_sz); + + ap =PTE_AP (pte); +if (is_permission_fault (ap, perm)) { + info->type =SMMU_PTW_ERR_PERMISSION ; + goto error; + } + + tlbe->translated_addr = gpa + (iova & mask); + tlbe->perm =PTE_AP_TO_PERM (ap); +trace_smmu_ptw_page_pte (stage, level, iova, + baseaddr, pte_addr, pte, gpa); +return 0 ; + } +if (is_block_pte (pte, level)) { +uint64_t block_size; +hwaddr gpa =get_block_pte_address (pte, level, granule_sz, + &block_size); + + ap =PTE_AP (pte); +if (is_permission_fault (ap, perm)) { + info->type =SMMU_PTW_ERR_PERMISSION ; + goto error; + } + +trace_smmu_ptw_block_pte (stage, level, baseaddr, + pte_addr, pte, iova, gpa, + (int )(block_size >>20 )); + + tlbe->translated_addr = gpa + (iova & mask); + tlbe->perm =PTE_AP_TO_PERM (ap); +return 0 ; + } + +/* table pte */ + ap =PTE_APTABLE (pte); + +if (is_permission_fault (ap, perm)) { + info->type =SMMU_PTW_ERR_PERMISSION ; + goto error; + } + baseaddr =get_table_pte_address (pte, granule_sz); + level++; + } + + info->type =SMMU_PTW_ERR_TRANSLATION ; + +error: + tlbe->perm =IOMMU_NONE ; +return -EINVAL ; +} + +/** +* smmu_ptw - Walk the page tables for an IOVA, according to @cfg +* +* @cfg: translation configuration +* @iova: iova to translate +* @perm: tentative access type +* @tlbe: returned entry +* @info: ptw event handle +* +* return 0 on success +*/ +int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, +IOMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +{ +if (!cfg->aa64) { +error_setg (&error_fatal, +"SMMUv3 model does not support VMSAv8-32 page walk yet" ); + } + +return smmu_ptw_64 (cfg, iova, perm, tlbe, info); +}SMMUPciBus *smmu_find_as_from_bus_num (SMMUState *s,uint8_t bus_num) {
hw/arm/smmu-internal.h new file +96 -0
96 lines not on this page · raw message
hw/arm/trace-events +10 -0
@@ -2,3 +2,13 @@ # hw/arm/virt-acpi-build.c virt_acpi_setup(void) "No fw cfg or ACPI disabled. Bailing out." + +# hw/arm/smmu-common.c + +smmu_page_walk(int stage, uint64_t baseaddr, int first_level, uint64_t start, uint64_t end) "stage=%d, baseaddr=0x%"PRIx64", first level=%d, start=0x%"PRIx64", end=0x%"PRIx64 +smmu_lookup_table(int level, uint64_t baseaddr, int granule_sz, uint64_t start, uint64_t end, int flags, uint64_t subpage_size) "level=%d baseaddr=0x%"PRIx64" granule=%d, start=0x%"PRIx64" end=0x%"PRIx64" flags=%d subpage_size=0x%lx" +smmu_ptw_level(int level, uint64_t iova, size_t subpage_size, uint64_t baseaddr, uint32_t offset, uint64_t pte) "level=%d iova=0x%lx subpage_sz=0x%lx baseaddr=0x%"PRIx64" offset=%d => pte=0x%lx" +smmu_ptw_invalid_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, uint32_t offset, uint64_t pte) "stage=%d level=%d base@=0x%"PRIx64" pte@=0x%"PRIx64" offset=%d pte=0x%"PRIx64 +smmu_ptw_page_pte(int stage, int level, uint64_t iova, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t address) "stage=%d level=%d iova=0x%"PRIx64" base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" page address = 0x%"PRIx64 +smmu_ptw_block_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t iova, uint64_t gpa, int bsize_mb) "stage=%d level=%d base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" iova=0x%"PRIx64" block address = 0x%"PRIx64" block size = %d MiB" +smmu_get_pte(uint64_t baseaddr, int index, uint64_t pteaddr, uint64_t pte) "baseaddr=0x%"PRIx64" index=0x%x, pteaddr=0x%"PRIx64", pte=0x%"PRIx64
include/hw/arm/smmu-common.h +6 -0
@@ -127,4 +127,10 @@ static inline uint16_t smmu_get_sid(SMMUDevice *sdev) {return ((pci_bus_num (sdev->bus) &0xff ) <<8 ) | sdev->devfn; } + +int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, +IOMMUTLBEntry *tlbe,SMMUPTWEventInfo *info); + +SMMUTransTableInfo *select_tt (SMMUTransCfg *cfg,dma_addr_t iova); +#endif /* HW_ARM_SMMU_COMMON */
Signature · 1 line
2.5.5
Re: [Qemu-arm] [PATCH v9 03/14] hw/arm/smmu-common: VMSAv8-64 page table walk
Quoted 74 lines · Eric Auger
This patch implements the page table walk for VMSAv8-64.
Signed-off-by Eric Auger <[email protected]>---
v8 -> v9:
- remove guest error log on PTE fetch fault
- rename trace functions
- fixsmmu_page_walk_level_res_invalid_ptelast arg
- fixPTE_ADDRESS
- turn functions into macros
- make sure to return the actual pte access permission intotlbe->perm
- change proto of smmu_ptw*v7 -> v8:
- reworkget_pte
- useLOG_LEVEL_ERROR
- remove error checking inget_block_pte_address
- page table walk simplified (no VFIO replay anymore)
- handle PTW error events
- usedma_memory_readv6 -> v7:
- fix wrong error handling inwalk_page_table
- check perm insmmu_translatev5 -> v6:
- use IOMMUMemoryRegion
- removeinitial_lookup_level()
- fix block replayv4 -> v5:
- add initial level in translation config
- implement block pte
- renamemust_translateinto nofail
- introducecall_entry_hook
- small changes to dynamic traces
-smmu_page_walkcode moved fromsmmuv3.cto this file
- remove smmu_translate*v3 -> v4:
- reworked page table walk to prepare for VFIO integration (capability to scan a range of IOVA). Same function is used for translate for a single iova. This is largely inspired fromintel_iommu.c
- as the translate function was not straightforward to me, I tried to stick more closely to the VMSA spec.
- remove support of nested stage (kernel driver does not support it anyway)
- useerror_reportand trace events
- add aa64[] field in SMMUTransCfg--- hw/arm/smmu-common.c | 232 +++++++++++++++++++++++++++++++++++++++++++ hw/arm/smmu-internal.h | 96 ++++++++++++++++++ hw/arm/trace-events | 10 ++ include/hw/arm/smmu-common.h | 6 ++ 4 files changed, 344 insertions(+) create mode 100644 hw/arm/smmu-internal.hhw/arm/smmu-common.c +6
-0@@ -27,6 +27,238 @@#include "qemu/error-report.h" #include "hw/arm/smmu-common.h" +#include "smmu-internal.h" + +/* VMSAv8-64 Translation */ + +/** +* get_pte - Get the content of a page table entry located t
hw/arm/smmu-common.c line 45
Quoted 10 lines
hw/arm/smmu-common.c +10
-0+* @base_addr[@index] +*/ +static int get_pte (dma_addr_t baseaddr,uint32_t index,uint64_t *pte, +SMMUPTWEventInfo *info) +{ +int ret; +dma_addr_t addr = baseaddr + index *sizeof (*pte); + + ret =dma_memory_read (&address_space_memory, addr, + (uint8_t *)pte,sizeof (*pte));
I think last time round I asked that these be done with the "read a 64-bit quantity" APIs and a comment that they're supposed to be atomic.
Quoted 54 lines
hw/arm/smmu-common.c +54
-0+ +if (ret !=MEMTX_OK ) { + info->type =SMMU_PTW_ERR_WALK_EABT ; + info->addr = addr; +return -EINVAL ; + } +trace_smmu_get_pte (baseaddr, index, addr, *pte); +return 0 ; +} + +/* VMSAv8-64 Translation Table Format Descriptor Decoding */ + +/** +* get_page_pte_address - returns the L3 descriptor output address, +* ie. the page frame +* ARM ARM spec: Figure D4-17 VMSAv8-64 level 3 descriptor format +*/ +static inline hwaddr get_page_pte_address (uint64_t pte,int granule_sz) +{ +return PTE_ADDRESS (pte, granule_sz); +} + +/** +* get_table_pte_address - return table descriptor output address, +* ie. address of next level table +* ARM ARM Figure D4-16 VMSAv8-64 level0, level1, and level 2 descriptor formats +*/ +static inline hwaddr get_table_pte_address (uint64_t pte,int granule_sz) +{ +return PTE_ADDRESS (pte, granule_sz); +} + +/** +* get_block_pte_address - return block descriptor output address and block size +* ARM ARM Figure D4-16 VMSAv8-64 level0, level1, and level 2 descriptor formats +*/ +static hwaddr get_block_pte_address (uint64_t pte,int level,int granule_sz, +uint64_t *bsz) +{ +int n =0 ; + +switch (granule_sz) { +case 12 : +if (level ==1 ) { + n =30 ; + }else if (level ==2 ) { + n =21 ; + } +break ; +case 14 : +if (level ==2 ) { + n =25 ; + } +break ;
hw/arm/smmu-common.c line 109
Quoted 10 lines
hw/arm/smmu-common.c +10
-0+case 16 : +if (level ==2 ) { + n =29 ; + } +break ; + } +if (!n) { +error_setg (&error_fatal, +"wrong granule/level combination (%d/%d)" , + granule_sz, level);
If this is guest-provokable then it shouldn't be a fatal error. If it isn't guest provokable then you can just assert.
I think you should be able to sanitize the SMUTransTableInfo when you construct it from the CD (and give a C_BAD_CD event), and then you can trust the granule_sz and level when you're doing table walks.
You can calculate n as
n = (granule_sz - 3) * (4 - level) + 3;
(compare target/arm/helper.c:get_phys_addr_lpae() calculation
of page_size, and in the pseudocode the line
addrselectbottom = (3-level)*stride + grainsize;where stride is grainsize-3 and so comes out to the same thing.)
hw/arm/smmu-common.c line 122
Quoted 13 lines
hw/arm/smmu-common.c +13
-0+ } + *bsz =1 << n; +return PTE_ADDRESS (pte, n); +} + +static inline bool check_perm (int access_attrs,int mem_attrs) +{ +if (((access_attrs &IOMMU_RO ) && !(mem_attrs &IOMMU_RO )) || + ((access_attrs &IOMMU_WO ) && !(mem_attrs &IOMMU_WO ))) { +return false; + } +return true; +}
This function doesn't seem to ever be used in this patchset? (clang will complain about that, though gcc won't.)
hw/arm/smmu-common.c line 129
Quoted 7 lines
hw/arm/smmu-common.c +7
-0+ +SMMUTransTableInfo *select_tt (SMMUTransCfg *cfg,dma_addr_t iova) +{ +if (!extract64 (iova,64 - cfg->tt[0 ].tsz, cfg->tt[0 ].tsz - cfg->tbi)) { +return &cfg->tt[0 ]; + } +return &cfg->tt[1 ];
I'm confused by your handling of the TBI bits here. In decode_cd() you take the 2-bit TBI field into cfg->tbi. That's a pair of bits, one of which is "top byte ignore" for TTB0 and the other is "top byte ignore" for TTB1. But here you're subtracting the whole field from cfg->tt[0].tsz. Which of the two tbi bits you need to use depends on bit 55 of the iova (compare the code in get_phys_addr_lpae() and the pseudocode function AddrTop()), and then if that bit is 1 it means that 8 bits of address should be ignored when determining whether to use TTB0 or TTB1.
You also need to consider the case where the input address is in neither the TTB0 range nor the TTb1 range (cf fig D4-14 in the v8A Arm ARM DDI0487C.a, and the code in get_phys_addr_lpae()).
Quoted 23 lines
hw/arm/smmu-common.c +23
-0+} + +/** +* smmu_ptw_64 - VMSAv8-64 Walk of the page tables for a given IOVA +* @cfg: translation config +* @iova: iova to translate +* @perm: access type +* @tlbe: IOMMUTLBEntry (out) +* @info: handle to an error info +* +* Return 0 on success, < 0 on error. In case of error, @info is filled +* and tlbe->perm is set to IOMMU_NONE. +* Upon success, @tlbe is filled with translated_addr and entry +* permission rights. +*/ +static int smmu_ptw_64 (SMMUTransCfg *cfg, +dma_addr_t iova,IOMMUAccessFlags perm, +IOMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +{ +dma_addr_t baseaddr; +int stage = cfg->stage; +SMMUTransTableInfo *tt =select_tt (cfg, iova); +uint8_t level;
hw/arm/smmu-common.c line 162
Quoted 10 lines
hw/arm/smmu-common.c +10
-0+uint8_t granule_sz; + +if (tt->disabled) { + info->type =SMMU_PTW_ERR_TRANSLATION ; + goto error; + } + + level = tt->initial_level; + granule_sz = tt->granule_sz; + baseaddr =extract64 (tt->ttb,0 ,48 );
The spec says that bits specified by the TTB0/TTB1 fields in a CD that are outside the effective IPS range are ILLEGAL; you should detect that when you set up tt->ttb and then you don't need the extract64() here, I think.
hw/arm/smmu-common.c line 165
Quoted 3 lines
hw/arm/smmu-common.c +3
-0+ + tlbe->iova = iova; + tlbe->addr_mask = (1 << tt->granule_sz) -1 ;
you could just use "granule_sz" here since you have it in a local.
Quoted 41 lines
hw/arm/smmu-common.c +41
-0+ +while (level <=3 ) { +uint64_t subpage_size =1ULL <<level_shift (level, granule_sz); +uint64_t mask = subpage_size -1 ; +uint32_t offset =iova_level_offset (iova, level, granule_sz); +uint64_t pte; +dma_addr_t pte_addr = baseaddr + offset *sizeof (pte); +uint8_t ap; + +if (get_pte (baseaddr, offset, &pte, info)) { + goto error; + } +trace_smmu_ptw_level (level, iova, subpage_size, + baseaddr, offset, pte); + +if (is_invalid_pte (pte) ||is_reserved_pte (pte, level)) { +trace_smmu_ptw_invalid_pte (stage, level, baseaddr, + pte_addr, offset, pte); + info->type =SMMU_PTW_ERR_TRANSLATION ; + goto error; + } + +if (is_page_pte (pte, level)) { +uint64_t gpa =get_page_pte_address (pte, granule_sz); + + ap =PTE_AP (pte); +if (is_permission_fault (ap, perm)) { + info->type =SMMU_PTW_ERR_PERMISSION ; + goto error; + } + + tlbe->translated_addr = gpa + (iova & mask); + tlbe->perm =PTE_AP_TO_PERM (ap); +trace_smmu_ptw_page_pte (stage, level, iova, + baseaddr, pte_addr, pte, gpa); +return 0 ; + } +if (is_block_pte (pte, level)) { +uint64_t block_size; +hwaddr gpa =get_block_pte_address (pte, level, granule_sz, + &block_size);
hw/arm/smmu-common.c line 216
Quoted 10 lines
hw/arm/smmu-common.c +10
-0+ + ap =PTE_AP (pte); +if (is_permission_fault (ap, perm)) { + info->type =SMMU_PTW_ERR_PERMISSION ; + goto error; + } + +trace_smmu_ptw_block_pte (stage, level, baseaddr, + pte_addr, pte, iova, gpa, + (int )(block_size >>20 ));
I don't think you should need this cast, because the argument to the trace function is an int anyway ?
Quoted 31 lines
hw/arm/smmu-common.c +31
-0+ + tlbe->translated_addr = gpa + (iova & mask); + tlbe->perm =PTE_AP_TO_PERM (ap); +return 0 ; + } + +/* table pte */ + ap =PTE_APTABLE (pte); + +if (is_permission_fault (ap, perm)) { + info->type =SMMU_PTW_ERR_PERMISSION ; + goto error; + } + baseaddr =get_table_pte_address (pte, granule_sz); + level++; + } + + info->type =SMMU_PTW_ERR_TRANSLATION ; + +error: + tlbe->perm =IOMMU_NONE ; +return -EINVAL ; +} + +/** +* smmu_ptw - Walk the page tables for an IOVA, according to @cfg +* +* @cfg: translation configuration +* @iova: iova to translate +* @perm: tentative access type +* @tlbe: returned entry
hw/arm/smmu-common.c line 257
Quoted 10 lines
hw/arm/smmu-common.c +10
-0+* @info: ptw event handle +* +* return 0 on success +*/ +int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, +IOMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +{ +if (!cfg->aa64) { +error_setg (&error_fatal, +"SMMUv3 model does not support VMSAv8-32 page walk yet" );
This sort of guest-provokable error should not be fatal -- log it with LOG_UNIMP and carry on as best you can (in this case the spec should say what happens for SMMUv3 implementations which don't support AArch32 tables).
Quoted 27 lines
hw/arm/smmu-common.c +4
-0+ } + +return smmu_ptw_64 (cfg, iova, perm, tlbe, info); +}SMMUPciBus *smmu_find_as_from_bus_num (SMMUState *s,uint8_t bus_num) {hw/arm/smmu-internal.h new file +14
-0@@ -0,0 +1,96 @@ +/* +* ARM SMMU support - Internal API +* +* Copyright (c) 2017 Red Hat, Inc. +* Copyright (C) 2014-2016 Broadcom Corporation +* Written by Prem Mallappa, Eric Auger +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
hw/arm/smmu-internal.h line 24
Quoted 10 lines
hw/arm/smmu-internal.h new file +10
-0+* General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef HW_ARM_SMMU_INTERNAL_H +#define HW_ARM_SMMU_INTERNAL_H + +#define ARM_LPAE_MAX_ADDR_BITS 48
You define this, but nothing in the series uses it.
Also, from an SMMU perspective, it would be helpful to clarify exactly what addresses are involved here (input addresses, intermediate addresses, output addresses?) -- cf the spec section 3.4.
hw/arm/smmu-internal.h line 25
Quoted 1 line
hw/arm/smmu-internal.h new file +1
-0+#define ARM_LPAE_MAX_LEVELS 4
This doesn't seem to be used either.
Quoted 33 lines
hw/arm/smmu-internal.h new file +33
-0+ +/* PTE Manipulation */ + +#define ARM_LPAE_PTE_TYPE_SHIFT 0 +#define ARM_LPAE_PTE_TYPE_MASK 0x3 + +#define ARM_LPAE_PTE_TYPE_BLOCK 1 +#define ARM_LPAE_PTE_TYPE_TABLE 3 + +#define ARM_LPAE_L3_PTE_TYPE_RESERVED 1 +#define ARM_LPAE_L3_PTE_TYPE_PAGE 3 + +#define ARM_LPAE_PTE_VALID (1 << 0) + +#define PTE_ADDRESS (pte, shift) \ + (extract64(pte, shift, 47 - shift + 1) << shift) + +#define is_invalid_pte (pte) (!(pte & ARM_LPAE_PTE_VALID)) + +#define is_reserved_pte (pte, level) \ + ((level == 3) && \ + ((pte & ARM_LPAE_PTE_TYPE_MASK) == ARM_LPAE_L3_PTE_TYPE_RESERVED)) + +#define is_block_pte (pte, level) \ + ((level < 3) && \ + ((pte & ARM_LPAE_PTE_TYPE_MASK) == ARM_LPAE_PTE_TYPE_BLOCK)) + +#define is_table_pte (pte, level) \ + ((level < 3) && \ + ((pte & ARM_LPAE_PTE_TYPE_MASK) == ARM_LPAE_PTE_TYPE_TABLE)) + +#define is_page_pte (pte, level) \ + ((level == 3) && \
hw/arm/smmu-internal.h line 68
Quoted 10 lines
hw/arm/smmu-internal.h new file +10
-0+ ((pte & ARM_LPAE_PTE_TYPE_MASK) == ARM_LPAE_L3_PTE_TYPE_PAGE)) + +#define PTE_AP (pte) \ + (extract64(pte, 6, 2)) + +#define PTE_APTABLE (pte) \ + (extract64(pte, 61, 2)) + +#define is_permission_fault (ap, perm) \ + (((perm) & IOMMU_WO) && ((ap) & 0x2))
Don't we also need to check AP bit 1 in some cases? (when the StreamWorld is S or NS EL1 and either (a) the incoming transaction has its attrs.user = 1 and STE.PRIVCFG is 0b0x, or
(b) STE.PRIVCFG is 0b10).
hw/arm/smmu-internal.h line 71
Quoted 3 lines
hw/arm/smmu-internal.h new file +3
-0+ +#define PTE_AP_TO_PERM (ap) \ + (IOMMU_ACCESS_FLAG(true, !((ap) & 0x2)))
Similarly here.
Quoted 12 lines
hw/arm/smmu-internal.h new file +12
-0+ +/* Level Indexing */ + +static inline int level_shift (int level,int granule_sz) +{ +return granule_sz + (3 - level) * (granule_sz -3 ); +} + +static inline uint64_t level_page_mask (int level,int granule_sz) +{ +return ~((1ULL <<level_shift (level, granule_sz)) -1 ); +}
hw/arm/smmu-internal.h line 93
Quoted 10 lines
hw/arm/smmu-internal.h new file +10
-0+ +/** +* TODO: handle the case where the level resolves less than +* granule_sz -3 IA bits. +*/ +static inline +uint64_t iova_level_offset (uint64_t iova,int level,int granule_sz) +{ +return (iova >>level_shift (level, granule_sz)) & + ((1ULL << (granule_sz -3 )) -1 );
Maybe "... & MAKE_64BIT_MASK(0, granule_sz - 3)" ?
Quoted 11 lines
hw/arm/smmu-internal.h new file +3
-0+} + +#endif hw/arm/trace-events +0
-0@@ -2,3 +2,13 @@ # hw/arm/virt-acpi-build.c virt_acpi_setup(void) "No fw cfg or ACPI disabled. Bailing out."
hw/arm/trace-events line 14
Quoted 10 lines
hw/arm/trace-events +10
-0+ +# hw/arm/smmu-common.c + +smmu_page_walk(int stage, uint64_t baseaddr, int first_level, uint64_t start, uint64_t end) "stage=%d, baseaddr=0x%"PRIx64", first level=%d, start=0x%"PRIx64", end=0x%"PRIx64 +smmu_lookup_table(int level, uint64_t baseaddr, int granule_sz, uint64_t start, uint64_t end, int flags, uint64_t subpage_size) "level=%d baseaddr=0x%"PRIx64" granule=%d, start=0x%"PRIx64" end=0x%"PRIx64" flags=%d subpage_size=0x%lx" +smmu_ptw_level(int level, uint64_t iova, size_t subpage_size, uint64_t baseaddr, uint32_t offset, uint64_t pte) "level=%d iova=0x%lx subpage_sz=0x%lx baseaddr=0x%"PRIx64" offset=%d => pte=0x%lx" +smmu_ptw_invalid_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, uint32_t offset, uint64_t pte) "stage=%d level=%d base@=0x%"PRIx64" pte@=0x%"PRIx64" offset=%d pte=0x%"PRIx64 +smmu_ptw_page_pte(int stage, int level, uint64_t iova, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t address) "stage=%d level=%d iova=0x%"PRIx64" base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" page address = 0x%"PRIx64 +smmu_ptw_block_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t iova, uint64_t gpa, int bsize_mb) "stage=%d level=%d base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" iova=0x%"PRIx64" block address = 0x%"PRIx64" block size = %d MiB" +smmu_get_pte(uint64_t baseaddr, int index, uint64_t pteaddr, uint64_t pte) "baseaddr=0x%"PRIx64" index=0x%x, pteaddr=0x%"PRIx64", pte=0x%"PRIx64
These have some uses of "%lx" for uint64_t, which should use PRIx64 to avoid compile issues on 32 bit systems.
Quoted 16 lines
include/hw/arm/smmu-common.h +6
-1@@ -127,4 +127,10 @@ static inline uint16_t smmu_get_sid(SMMUDevice *sdev) {return ((pci_bus_num (sdev->bus) &0xff ) <<8 ) | sdev->devfn; } + +int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, +IOMMUTLBEntry *tlbe,SMMUPTWEventInfo *info); + +SMMUTransTableInfo *select_tt (SMMUTransCfg *cfg,dma_addr_t iova); +#endif /* HW_ARM_SMMU_COMMON */ --
Quoted 1 line
2.5.5
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 03/14] hw/arm/smmu-common: VMSAv8-64 page table walk
Hi Peter,
Quoted 81 lines · Peter Maydell
Quoted 80 lines · Eric Auger
This patch implements the page table walk for VMSAv8-64.
Signed-off-by Eric Auger <[email protected]>---
v8 -> v9:
- remove guest error log on PTE fetch fault
- rename trace functions
- fixsmmu_page_walk_level_res_invalid_ptelast arg
- fixPTE_ADDRESS
- turn functions into macros
- make sure to return the actual pte access permission intotlbe->perm
- change proto of smmu_ptw*v7 -> v8:
- reworkget_pte
- useLOG_LEVEL_ERROR
- remove error checking inget_block_pte_address
- page table walk simplified (no VFIO replay anymore)
- handle PTW error events
- usedma_memory_readv6 -> v7:
- fix wrong error handling inwalk_page_table
- check perm insmmu_translatev5 -> v6:
- use IOMMUMemoryRegion
- removeinitial_lookup_level()
- fix block replayv4 -> v5:
- add initial level in translation config
- implement block pte
- renamemust_translateinto nofail
- introducecall_entry_hook
- small changes to dynamic traces
-smmu_page_walkcode moved fromsmmuv3.cto this file
- remove smmu_translate*v3 -> v4:
- reworked page table walk to prepare for VFIO integration (capability to scan a range of IOVA). Same function is used for translate for a single iova. This is largely inspired fromintel_iommu.c
- as the translate function was not straightforward to me, I tried to stick more closely to the VMSA spec.
- remove support of nested stage (kernel driver does not support it anyway)
- useerror_reportand trace events
- add aa64[] field in SMMUTransCfg--- hw/arm/smmu-common.c | 232 +++++++++++++++++++++++++++++++++++++++++++ hw/arm/smmu-internal.h | 96 ++++++++++++++++++ hw/arm/trace-events | 10 ++ include/hw/arm/smmu-common.h | 6 ++ 4 files changed, 344 insertions(+) create mode 100644 hw/arm/smmu-internal.hhw/arm/smmu-common.c +12
-0@@ -27,6 +27,238 @@#include "qemu/error-report.h" #include "hw/arm/smmu-common.h" +#include "smmu-internal.h" + +/* VMSAv8-64 Translation */ + +/** +* get_pte - Get the content of a page table entry located t +* @base_addr[@index] +*/ +static int get_pte (dma_addr_t baseaddr,uint32_t index,uint64_t *pte, +SMMUPTWEventInfo *info) +{ +int ret;
Quoted 8 lines
hw/arm/smmu-common.c line 45
Quoted 4 lines
hw/arm/smmu-common.c +4
-0+dma_addr_t addr = baseaddr + index *sizeof (*pte); + + ret =dma_memory_read (&address_space_memory, addr, + (uint8_t *)pte,sizeof (*pte));I think last time round I asked that these be done with the "read a 64-bit quantity" APIs and a comment that they're supposed to be atomic.
I was unsure about the fetch of the page descriptors themselves. I added the comment on the fetch of STE, CD. 3.21.3 deals with configuration structures. I will add the comment here as well.
Quoted 63 lines
Quoted 63 lines
hw/arm/smmu-common.c +62
-0+ +if (ret !=MEMTX_OK ) { + info->type =SMMU_PTW_ERR_WALK_EABT ; + info->addr = addr; +return -EINVAL ; + } +trace_smmu_get_pte (baseaddr, index, addr, *pte); +return 0 ; +} + +/* VMSAv8-64 Translation Table Format Descriptor Decoding */ + +/** +* get_page_pte_address - returns the L3 descriptor output address, +* ie. the page frame +* ARM ARM spec: Figure D4-17 VMSAv8-64 level 3 descriptor format +*/ +static inline hwaddr get_page_pte_address (uint64_t pte,int granule_sz) +{ +return PTE_ADDRESS (pte, granule_sz); +} + +/** +* get_table_pte_address - return table descriptor output address, +* ie. address of next level table +* ARM ARM Figure D4-16 VMSAv8-64 level0, level1, and level 2 descriptor formats +*/ +static inline hwaddr get_table_pte_address (uint64_t pte,int granule_sz) +{ +return PTE_ADDRESS (pte, granule_sz); +} + +/** +* get_block_pte_address - return block descriptor output address and block size +* ARM ARM Figure D4-16 VMSAv8-64 level0, level1, and level 2 descriptor formats +*/ +static hwaddr get_block_pte_address (uint64_t pte,int level,int granule_sz, +uint64_t *bsz) +{ +int n =0 ; + +switch (granule_sz) { +case 12 : +if (level ==1 ) { + n =30 ; + }else if (level ==2 ) { + n =21 ; + } +break ; +case 14 : +if (level ==2 ) { + n =25 ; + } +break ; +case 16 : +if (level ==2 ) { + n =29 ; + } +break ; + } +if (!n) { + error_setg(&error_fatal,
Quoted 8 lines
hw/arm/smmu-common.c line 109
Quoted 2 lines
hw/arm/smmu-common.c +2
-0+"wrong granule/level combination (%d/%d)" , + granule_sz, level);If this is guest-provokable then it shouldn't be a fatal error. If it isn't guest provokable then you can just assert.
I think you should be able to sanitize the SMUTransTableInfo when you construct it from the CD (and give aC_BAD_CDevent), and then you can trust thegranule_szand level when you're doing table walks.
OK.
Quoted 7 lines
You can calculate n as
n = (granule_sz - 3) * (4 - level) + 3; (compare target/arm/helper.c:get_phys_addr_lpae() calculation of page_size, and in the pseudocode the line addrselectbottom = (3-level)*stride + grainsize;where stride is grainsize-3 and so comes out to the same thing.)
OK. I will simplify it and check when decoding the CD.
Quoted 17 lines
Quoted 4 lines
hw/arm/smmu-common.c +3
-0+ } + *bsz =1 << n; +return PTE_ADDRESS (pte, n);hw/arm/smmu-common.c line 122
Quoted 10 lines
hw/arm/smmu-common.c +10
-0+} + +static inline bool check_perm (int access_attrs,int mem_attrs) +{ +if (((access_attrs &IOMMU_RO ) && !(mem_attrs &IOMMU_RO )) || + ((access_attrs &IOMMU_WO ) && !(mem_attrs &IOMMU_WO ))) { +return false; + } +return true; +}This function doesn't seem to ever be used in this patchset? (clang will complain about that, though gcc won't.)
OK, will remove that.
Quoted 19 lines
hw/arm/smmu-common.c line 129
Quoted 8 lines
hw/arm/smmu-common.c +7
-0+ +SMMUTransTableInfo *select_tt (SMMUTransCfg *cfg,dma_addr_t iova) +{ +if (!extract64 (iova,64 - cfg->tt[0 ].tsz, cfg->tt[0 ].tsz - cfg->tbi)) { +return &cfg->tt[0 ]; + } +return &cfg->tt[1 ];I'm confused by your handling of the TBI bits here. In
decode_cd()you take the 2-bit TBI field intocfg->tbi. That's a pair of bits, one of which is "top byte ignore" for TTB0 and the other is "top byte ignore" for TTB1. But here you're subtracting the whole field from cfg->tt[0].tsz. Which of the two tbi bits you need to use depends on bit 55 of the iova (compare the code inget_phys_addr_lpae()and the pseudocode functionAddrTop()), and then if that bit is 1 it means that 8 bits of address should be ignored when determining whether to use TTB0 or TTB1.
Quoted 3 lines
You also need to consider the case where the input address is in neither the TTB0 range nor the TTb1 range (cf fig D4-14 in the v8A Arm ARM DDI0487C.a, and the code in
get_phys_addr_lpae()).
Yes I totally misunderstood the way to decode that :-(
Quoted 31 lines
Quoted 31 lines
hw/arm/smmu-common.c +30
-0+} + +/** +* smmu_ptw_64 - VMSAv8-64 Walk of the page tables for a given IOVA +* @cfg: translation config +* @iova: iova to translate +* @perm: access type +* @tlbe: IOMMUTLBEntry (out) +* @info: handle to an error info +* +* Return 0 on success, < 0 on error. In case of error, @info is filled +* and tlbe->perm is set to IOMMU_NONE. +* Upon success, @tlbe is filled with translated_addr and entry +* permission rights. +*/ +static int smmu_ptw_64 (SMMUTransCfg *cfg, +dma_addr_t iova,IOMMUAccessFlags perm, +IOMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +{ +dma_addr_t baseaddr; +int stage = cfg->stage; +SMMUTransTableInfo *tt =select_tt (cfg, iova); +uint8_t level; +uint8_t granule_sz; + +if (tt->disabled) { + info->type =SMMU_PTW_ERR_TRANSLATION ; + goto error; + } +
Quoted 8 lines
hw/arm/smmu-common.c line 162
Quoted 3 lines
hw/arm/smmu-common.c +3
-0+ level = tt->initial_level; + granule_sz = tt->granule_sz; + baseaddr =extract64 (tt->ttb,0 ,48 );The spec says that bits specified by the TTB0/TTB1 fields in a CD that are outside the effective IPS range are ILLEGAL; you should detect that when you set up
tt->ttband then you don't need theextract64()here, I think.
OK
Quoted 6 lines
hw/arm/smmu-common.c line 165
Quoted 4 lines
hw/arm/smmu-common.c +3
-0+ + tlbe->iova = iova; + tlbe->addr_mask = (1 << tt->granule_sz) -1 ;you could just use "
granule_sz" here since you have it in a local.
sure
Quoted 47 lines
Quoted 47 lines
hw/arm/smmu-common.c +46
-0+ +while (level <=3 ) { +uint64_t subpage_size =1ULL <<level_shift (level, granule_sz); +uint64_t mask = subpage_size -1 ; +uint32_t offset =iova_level_offset (iova, level, granule_sz); +uint64_t pte; +dma_addr_t pte_addr = baseaddr + offset *sizeof (pte); +uint8_t ap; + +if (get_pte (baseaddr, offset, &pte, info)) { + goto error; + } +trace_smmu_ptw_level (level, iova, subpage_size, + baseaddr, offset, pte); + +if (is_invalid_pte (pte) ||is_reserved_pte (pte, level)) { +trace_smmu_ptw_invalid_pte (stage, level, baseaddr, + pte_addr, offset, pte); + info->type =SMMU_PTW_ERR_TRANSLATION ; + goto error; + } + +if (is_page_pte (pte, level)) { +uint64_t gpa =get_page_pte_address (pte, granule_sz); + + ap =PTE_AP (pte); +if (is_permission_fault (ap, perm)) { + info->type =SMMU_PTW_ERR_PERMISSION ; + goto error; + } + + tlbe->translated_addr = gpa + (iova & mask); + tlbe->perm =PTE_AP_TO_PERM (ap); +trace_smmu_ptw_page_pte (stage, level, iova, + baseaddr, pte_addr, pte, gpa); +return 0 ; + } +if (is_block_pte (pte, level)) { +uint64_t block_size; +hwaddr gpa =get_block_pte_address (pte, level, granule_sz, + &block_size); + + ap =PTE_AP (pte); +if (is_permission_fault (ap, perm)) { + info->type =SMMU_PTW_ERR_PERMISSION ; + goto error;
Quoted 8 lines
hw/arm/smmu-common.c line 216
Quoted 5 lines
hw/arm/smmu-common.c +5
-0+ } + +trace_smmu_ptw_block_pte (stage, level, baseaddr, + pte_addr, pte, iova, gpa, + (int )(block_size >>20 ));I don't think you should need this cast, because the argument to the trace function is an int anyway ?
indeed
Quoted 39 lines
Quoted 39 lines
hw/arm/smmu-common.c +38
-0+ + tlbe->translated_addr = gpa + (iova & mask); + tlbe->perm =PTE_AP_TO_PERM (ap); +return 0 ; + } + +/* table pte */ + ap =PTE_APTABLE (pte); + +if (is_permission_fault (ap, perm)) { + info->type =SMMU_PTW_ERR_PERMISSION ; + goto error; + } + baseaddr =get_table_pte_address (pte, granule_sz); + level++; + } + + info->type =SMMU_PTW_ERR_TRANSLATION ; + +error: + tlbe->perm =IOMMU_NONE ; +return -EINVAL ; +} + +/** +* smmu_ptw - Walk the page tables for an IOVA, according to @cfg +* +* @cfg: translation configuration +* @iova: iova to translate +* @perm: tentative access type +* @tlbe: returned entry +* @info: ptw event handle +* +* return 0 on success +*/ +int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, +IOMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +{
Quoted 8 lines
hw/arm/smmu-common.c line 257
Quoted 3 lines
hw/arm/smmu-common.c +3
-0+if (!cfg->aa64) { +error_setg (&error_fatal, +"SMMUv3 model does not support VMSAv8-32 page walk yet" );This sort of guest-provokable error should not be fatal -- log it with
LOG_UNIMPand carry on as best you can (in this case the spec should say what happens for SMMUv3 implementations which don't support AArch32 tables).
This code should never been entered as the check is done when decoding the CD in the smmuv3. However since it is a base class I wanted to enphase the ptw was only supporting AArch32.
Quoted 32 lines
Quoted 32 lines
hw/arm/smmu-common.c +4
-0+ } + +return smmu_ptw_64 (cfg, iova, perm, tlbe, info); +}SMMUPciBus *smmu_find_as_from_bus_num (SMMUState *s,uint8_t bus_num) {hw/arm/smmu-internal.h new file +18
-0@@ -0,0 +1,96 @@ +/* +* ARM SMMU support - Internal API +* +* Copyright (c) 2017 Red Hat, Inc. +* Copyright (C) 2014-2016 Broadcom Corporation +* Written by Prem Mallappa, Eric Auger +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, see <http://www.gnu.org/licenses/>.
Quoted 8 lines
hw/arm/smmu-internal.h line 24
Quoted 6 lines
hw/arm/smmu-internal.h new file +6
-0+*/ + +#ifndef HW_ARM_SMMU_INTERNAL_H +#define HW_ARM_SMMU_INTERNAL_H + +#define ARM_LPAE_MAX_ADDR_BITS 48You define this, but nothing in the series uses it.
removed. Actually we don't seem to need that anymore.
Quoted 8 lines
Also, from an SMMU perspective, it would be helpful to clarify exactly what addresses are involved here (input addresses, intermediate addresses, output addresses?) -- cf the spec section 3.4.
hw/arm/smmu-internal.h line 25
Quoted 1 line
hw/arm/smmu-internal.h new file +1
-0+#define ARM_LPAE_MAX_LEVELS 4This doesn't seem to be used either.
removed
Quoted 41 lines
Quoted 41 lines
hw/arm/smmu-internal.h new file +40
-0+ +/* PTE Manipulation */ + +#define ARM_LPAE_PTE_TYPE_SHIFT 0 +#define ARM_LPAE_PTE_TYPE_MASK 0x3 + +#define ARM_LPAE_PTE_TYPE_BLOCK 1 +#define ARM_LPAE_PTE_TYPE_TABLE 3 + +#define ARM_LPAE_L3_PTE_TYPE_RESERVED 1 +#define ARM_LPAE_L3_PTE_TYPE_PAGE 3 + +#define ARM_LPAE_PTE_VALID (1 << 0) + +#define PTE_ADDRESS (pte, shift) \ + (extract64(pte, shift, 47 - shift + 1) << shift) + +#define is_invalid_pte (pte) (!(pte & ARM_LPAE_PTE_VALID)) + +#define is_reserved_pte (pte, level) \ + ((level == 3) && \ + ((pte & ARM_LPAE_PTE_TYPE_MASK) == ARM_LPAE_L3_PTE_TYPE_RESERVED)) + +#define is_block_pte (pte, level) \ + ((level < 3) && \ + ((pte & ARM_LPAE_PTE_TYPE_MASK) == ARM_LPAE_PTE_TYPE_BLOCK)) + +#define is_table_pte (pte, level) \ + ((level < 3) && \ + ((pte & ARM_LPAE_PTE_TYPE_MASK) == ARM_LPAE_PTE_TYPE_TABLE)) + +#define is_page_pte (pte, level) \ + ((level == 3) && \ + ((pte & ARM_LPAE_PTE_TYPE_MASK) == ARM_LPAE_L3_PTE_TYPE_PAGE)) + +#define PTE_AP (pte) \ + (extract64(pte, 6, 2)) + +#define PTE_APTABLE (pte) \ + (extract64(pte, 61, 2))
Quoted 8 lines
hw/arm/smmu-internal.h line 68
Quoted 3 lines
hw/arm/smmu-internal.h new file +3
-0+ +#define is_permission_fault (ap, perm) \ + (((perm) & IOMMU_WO) && ((ap) & 0x2))Don't we also need to check AP bit 1 in some cases? (when the StreamWorld is S or NS EL1 and either (a) the incoming transaction has its attrs.user = 1 and STE.PRIVCFG is 0b0x, or
(b) STE.PRIVCFG is 0b10).
I think I don't need to as I don't support this feature at the moment:
spec says:
"When SMMU_IDR1.ATTR_PERMS_OVR=0, this field is RES0 and the incoming PRIV attribute is used."
But to be honest I was not aware this existed ;()
Quoted 6 lines
hw/arm/smmu-internal.h line 71
Quoted 4 lines
hw/arm/smmu-internal.h new file +3
-0+ +#define PTE_AP_TO_PERM (ap) \ + (IOMMU_ACCESS_FLAG(true, !((ap) & 0x2)))Similarly here.
?
Quoted 17 lines
Quoted 17 lines
hw/arm/smmu-internal.h new file +16
-0+ +/* Level Indexing */ + +static inline int level_shift (int level,int granule_sz) +{ +return granule_sz + (3 - level) * (granule_sz -3 ); +} + +static inline uint64_t level_page_mask (int level,int granule_sz) +{ +return ~((1ULL <<level_shift (level, granule_sz)) -1 ); +} + +/** +* TODO: handle the case where the level resolves less than +* granule_sz -3 IA bits.
Quoted 8 lines
hw/arm/smmu-internal.h line 93
Quoted 6 lines
hw/arm/smmu-internal.h new file +6
-0+*/ +static inline +uint64_t iova_level_offset (uint64_t iova,int level,int granule_sz) +{ +return (iova >>level_shift (level, granule_sz)) & + ((1ULL << (granule_sz -3 )) -1 );Maybe "... &
MAKE_64BIT_MASK(0, granule_sz - 3)" ?
OK
Quoted 10 lines
Quoted 10 lines
hw/arm/smmu-internal.h new file +3
-0+} + +#endif hw/arm/trace-events +0
-0@@ -2,3 +2,13 @@
Quoted 15 lines
hw/arm/trace-events line 14
Quoted 12 lines
hw/arm/trace-events +10
-0# hw/arm/virt-acpi-build.c virt_acpi_setup(void) "No fw cfg or ACPI disabled. Bailing out." + +# hw/arm/smmu-common.c + +smmu_page_walk(int stage, uint64_t baseaddr, int first_level, uint64_t start, uint64_t end) "stage=%d, baseaddr=0x%"PRIx64", first level=%d, start=0x%"PRIx64", end=0x%"PRIx64 +smmu_lookup_table(int level, uint64_t baseaddr, int granule_sz, uint64_t start, uint64_t end, int flags, uint64_t subpage_size) "level=%d baseaddr=0x%"PRIx64" granule=%d, start=0x%"PRIx64" end=0x%"PRIx64" flags=%d subpage_size=0x%lx" +smmu_ptw_level(int level, uint64_t iova, size_t subpage_size, uint64_t baseaddr, uint32_t offset, uint64_t pte) "level=%d iova=0x%lx subpage_sz=0x%lx baseaddr=0x%"PRIx64" offset=%d => pte=0x%lx" +smmu_ptw_invalid_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, uint32_t offset, uint64_t pte) "stage=%d level=%d base@=0x%"PRIx64" pte@=0x%"PRIx64" offset=%d pte=0x%"PRIx64 +smmu_ptw_page_pte(int stage, int level, uint64_t iova, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t address) "stage=%d level=%d iova=0x%"PRIx64" base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" page address = 0x%"PRIx64 +smmu_ptw_block_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t iova, uint64_t gpa, int bsize_mb) "stage=%d level=%d base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" iova=0x%"PRIx64" block address = 0x%"PRIx64" block size = %d MiB" +smmu_get_pte(uint64_t baseaddr, int index, uint64_t pteaddr, uint64_t pte) "baseaddr=0x%"PRIx64" index=0x%x, pteaddr=0x%"PRIx64", pte=0x%"PRIx64These have some uses of "%lx" for
uint64_t, which should use PRIx64 to avoid compile issues on 32 bit systems.
OK
Thanks
Eric
Quoted 22 lines
Quoted 17 lines
include/hw/arm/smmu-common.h +6
-1@@ -127,4 +127,10 @@ static inline uint16_t smmu_get_sid(SMMUDevice *sdev) {return ((pci_bus_num (sdev->bus) &0xff ) <<8 ) | sdev->devfn; } + +int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, +IOMMUTLBEntry *tlbe,SMMUPTWEventInfo *info); + +SMMUTransTableInfo *select_tt (SMMUTransCfg *cfg,dma_addr_t iova); +#endif /* HW_ARM_SMMU_COMMON */ --Quoted 1 line
2.5.5
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 03/14] hw/arm/smmu-common: VMSAv8-64 page table walk
Quoted 16 lines · Auger Eric
Hi Peter,
Quoted 13 lines · Peter Maydell
hw/arm/smmu-common.c line 257
Quoted 6 lines · Eric Auger
hw/arm/smmu-common.c +6
-0+int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, +IOMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +{ +if (!cfg->aa64) { +error_setg (&error_fatal, +"SMMUv3 model does not support VMSAv8-32 page walk yet" );This sort of guest-provokable error should not be fatal -- log it with
LOG_UNIMPand carry on as best you can (in this case the spec should say what happens for SMMUv3 implementations which don't support AArch32 tables).
Quoted 3 lines
This code should never been entered as the check is done when decoding the CD in the smmuv3. However since it is a base class I wanted to enphase the ptw was only supporting AArch32.
Ah, right. That should be an assert() with a brief comment about why the condition will never trigger.
Quoted 7 lines
Quoted 7 lines
hw/arm/smmu-internal.h line 68
Quoted 2 lines
hw/arm/smmu-internal.h new file +2
-0+#define is_permission_fault (ap, perm) \ + (((perm) & IOMMU_WO) && ((ap) & 0x2))Don't we also need to check AP bit 1 in some cases? (when the StreamWorld is S or NS EL1 and either (a) the incoming transaction has its attrs.user = 1 and STE.PRIVCFG is 0b0x, or
(b) STE.PRIVCFG is 0b10).
Quoted 5 lines
I think I don't need to as I don't support this feature at the moment:
spec says:
"When SMMU_IDR1.ATTR_PERMS_OVR=0, this field is RES0 and the incoming PRIV attribute is used."
But to be honest I was not aware this existed ;()
I think you still need to check the incoming transaction for user vs priv, even if you don't support STE.PRIVCFG.
Quoted 6 lines
Quoted 5 lines
hw/arm/smmu-internal.h line 71
Quoted 3 lines
hw/arm/smmu-internal.h new file +3
-0+ +#define PTE_AP_TO_PERM (ap) \ + (IOMMU_ACCESS_FLAG(true, !((ap) & 0x2)))Similarly here.
?
Can't just ignore AP bit 1 (or 0, if you're counting it that way).
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 03/14] hw/arm/smmu-common: VMSAv8-64 page table walk
Hi Peter,
Quoted 32 lines · Peter Maydell
Quoted 16 lines · Auger Eric
Hi Peter,
Quoted 13 lines · Peter Maydell
hw/arm/smmu-common.c line 257
Quoted 6 lines · Eric Auger
hw/arm/smmu-common.c +6
-0+int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, +IOMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +{ +if (!cfg->aa64) { +error_setg (&error_fatal, +"SMMUv3 model does not support VMSAv8-32 page walk yet" );This sort of guest-provokable error should not be fatal -- log it with
LOG_UNIMPand carry on as best you can (in this case the spec should say what happens for SMMUv3 implementations which don't support AArch32 tables).Quoted 3 lines
This code should never been entered as the check is done when decoding the CD in the smmuv3. However since it is a base class I wanted to enphase the ptw was only supporting AArch32.
Ah, right. That should be an
assert()with a brief comment about why the condition will never trigger.Quoted 7 lines
Quoted 7 lines
hw/arm/smmu-internal.h line 68
Quoted 2 lines
hw/arm/smmu-internal.h new file +2
-0+#define is_permission_fault (ap, perm) \ + (((perm) & IOMMU_WO) && ((ap) & 0x2))Don't we also need to check AP bit 1 in some cases? (when the StreamWorld is S or NS EL1 and either (a) the incoming transaction has its attrs.user = 1 and STE.PRIVCFG is 0b0x, or
(b) STE.PRIVCFG is 0b10).
Quoted 8 lines
Quoted 5 lines
I think I don't need to as I don't support this feature at the moment:
spec says:
"When SMMU_IDR1.ATTR_PERMS_OVR=0, this field is RES0 and the incoming PRIV attribute is used."
But to be honest I was not aware this existed ;()I think you still need to check the incoming transaction for user vs priv, even if you don't support STE.PRIVCFG.
On the CPU side, you have MemTxAttrs as input from get_phys_addr_lpae().
On IOMMU side, the current input callback for translation is
static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, IOMMUAccessFlags flag)
where IOMMUAccessFlags just is R/W access flag.
So I am not sure I have acess to those user/priv attributes.
Quoted 9 lines
Quoted 7 lines
Quoted 6 lines
hw/arm/smmu-internal.h line 71
Quoted 4 lines
hw/arm/smmu-internal.h new file +3
-0+ +#define PTE_AP_TO_PERM (ap) \ + (IOMMU_ACCESS_FLAG(true, !((ap) & 0x2)))Similarly here.
?
Can't just ignore AP bit 1 (or 0, if you're counting it that way).
with AP, the LSB is associated to EL0 rights. Similarly, given the translation callback in use, is it something relevant as of now?
with APTable, the LSB bit is associated to EL0 as well APTable[1] = 1, access at EL0 not permitted
In my case, can't I consider all accesses are priviledged?
Thanks
Eric
Quoted 5 lines
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 03/14] hw/arm/smmu-common: VMSAv8-64 page table walk
Quoted 25 lines · Auger Eric
Hi Peter,
Quoted 12 lines · Peter Maydell
Quoted 11 lines · Auger Eric
Hi Peter,
Quoted 8 lines · Peter Maydell
hw/arm/smmu-internal.h line 68
Quoted 2 lines · Eric Auger
hw/arm/smmu-internal.h new file +2
-0+#define is_permission_fault (ap, perm) \ + (((perm) & IOMMU_WO) && ((ap) & 0x2))Don't we also need to check AP bit 1 in some cases? (when the StreamWorld is S or NS EL1 and either (a) the incoming transaction has its attrs.user = 1 and STE.PRIVCFG is 0b0x, or
(b) STE.PRIVCFG is 0b10).Quoted 8 lines
Quoted 5 lines
I think I don't need to as I don't support this feature at the moment:
spec says:
"When SMMU_IDR1.ATTR_PERMS_OVR=0, this field is RES0 and the incoming PRIV attribute is used."
But to be honest I was not aware this existed ;()I think you still need to check the incoming transaction for user vs priv, even if you don't support STE.PRIVCFG.
On the CPU side, you have MemTxAttrs as input from
get_phys_addr_lpae().
Quoted 8 lines
On IOMMU side, the current input callback for translation is
static IOMMUTLBEntry
smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, IOMMUAccessFlags flag)where IOMMUAccessFlags just is R/W access flag.
So I am not sure I have acess to those user/priv attributes.
Hmm, yes. This looks like a deficiency in our IOMMU framework. For the moment put a TODO note that we treat all transactions as privileged because QEMU's IOMMU code doesn't pass transaction attributes around correctly.
(This will also be an issue for secure/nonsecure eventually.)
thanks
-- PMM
PATCH v9 4/14 hw/arm/smmuv3: Skeleton
In reply to Eric AugerFrom: Prem Mallappa <[email protected]>
This patch implements a skeleton for the smmuv3 device. Datatypes and register definitions are introduced. The MMIO region, the interrupts and the queue are initialized.
Only the MMIO read operation is implemented here.
---
v8 -> v9:
- add #include "qemu/log.h"
- add parent_reset
v7 -> v8:
- remove __smmu_data structs
- revisit struct SMMUQueue
- do not advertise stage 2 support anymore
- use the register definition API and get rid of REG array
- get read of queue structs
v6 -> v7:
- split into several patches
v5 -> v6:
- Use IOMMUMemoryregion
- regs become uint32_t and fix 64b MMIO access (.impl)
- trace_smmuv3_write/read_mmio take the size param
v4 -> v5:
- change smmuv3_translate proto (IOMMUAccessFlags flag)
- has_stagex replaced by is_ste_stagex
- smmu_cfg_populate removed
- added smmuv3_decode_config and reworked error management
- remwork the naming of IOMMU mrs
- fix SMMU_CMDQ_CONS offset
v3 -> v4
- smmu_irq_update
- fix hash key allocation
- set smmu_iommu_ops
- set SMMU_REG_CR0,
- smmuv3_translate: ret.perm not set in bypass mode
- use trace events
- renamed STM2U64 into L1STD_L2PTR and STMSPAN into L1STD_SPAN
- rework smmu_find_ste
- fix tg2granule in TT0/0b10 corresponds to 16kB
v2 -> v3:
- move creation of include/hw/arm/smmuv3.h to this patch to fix compil issue
- compilation allowed
- fix sbus allocation in smmu_init_pci_iommu
- restructure code into headers
- misc cleanups
--- hw/arm/Makefile.objs | 2 +- hw/arm/smmuv3-internal.h | 155 +++++++++++++++++++++ hw/arm/smmuv3.c | 348 +++++++++++++++++++++++++++++++++++++++++++++++ hw/arm/trace-events | 3 + include/hw/arm/smmuv3.h | 91 +++++++++++++ 5 files changed, 598 insertions(+), 1 deletion(-) create mode 100644 hw/arm/smmuv3-internal.h create mode 100644 hw/arm/smmuv3.c create mode 100644 include/hw/arm/smmuv3.h
hw/arm/Makefile.objs +1 -1
@@ -20,4 +20,4 @@ obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o obj-$(CONFIG_MPS2) += mps2.o obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o -obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o +obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o
hw/arm/smmuv3-internal.h new file +155 -0
155 lines not on this page · raw message
hw/arm/smmuv3.c new file +348 -0
348 lines not on this page · raw message
hw/arm/trace-events +3 -0
@@ -12,3 +12,6 @@ smmu_ptw_invalid_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, smmu_ptw_page_pte(int stage, int level, uint64_t iova, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t address) "stage=%d level=%d iova=0x%"PRIx64" base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" page address = 0x%"PRIx64 smmu_ptw_block_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t iova, uint64_t gpa, int bsize_mb) "stage=%d level=%d base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" iova=0x%"PRIx64" block address = 0x%"PRIx64" block size = %d MiB" smmu_get_pte(uint64_t baseaddr, int index, uint64_t pteaddr, uint64_t pte) "baseaddr=0x%"PRIx64" index=0x%x, pteaddr=0x%"PRIx64", pte=0x%"PRIx64 + +#hw/arm/smmuv3.c +smmuv3_read_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" val:0x%"PRIx64" size: 0x%x"
include/hw/arm/smmuv3.h new file +91 -0
91 lines not on this page · raw message
Signature · 1 line
2.5.5
Re: [Qemu-arm] [PATCH v9 04/14] hw/arm/smmuv3: Skeleton
Quoted 10 lines · Eric Auger
From: Prem Mallappa <[email protected]>
This patch implements a skeleton for the smmuv3 device. Datatypes and register definitions are introduced. The MMIO region, the interrupts and the queue are initialized.
Only the MMIO read operation is implemented here.
Signed-off-by Prem Mallappa <[email protected]>Signed-off-by Eric Auger <[email protected]>
I just have a few minor nits on this one...
hw/arm/smmuv3-internal.h line 134
Quoted 12 lines
hw/arm/smmuv3-internal.h new file +12
-0+static inline int smmu_enabled (SMMUv3State *s) +{ +return FIELD_EX32 (s->cr[0 ],CR0 ,SMMU_ENABLE ); +} + +typedef struct Cmd { +uint32_t word[4 ]; +}Cmd ; + +typedef struct Evt { +uint32_t word[8 ]; +}Evt ;
Some one-liner comments noting what these structs are for would be helpful.
hw/arm/smmuv3-internal.h line 137
Quoted 3 lines
hw/arm/smmuv3-internal.h new file +3
-0+ +static inline uint64_t smmu_read64 (uint64_t r,unsigned offset, +unsigned size)
A doc comment here would help in describing what the purpose of this utility function is.
hw/arm/smmuv3-internal.h line 140
Quoted 3 lines
hw/arm/smmuv3-internal.h new file +3
-0+{ +if (size ==8 && !offset) { +return r;
If you take my advice a bit further down about just checking up front that 8-byte accesses are to definitely permitted 64 bit register offsets, you won't need the check on offset.
hw/arm/smmuv3-internal.h line 148
Quoted 8 lines
hw/arm/smmuv3-internal.h new file +8
-0+ } + +/* 32 bit access */ + +if (offset && offset !=4 ) { +qemu_log_mask (LOG_GUEST_ERROR , +"SMMUv3 MMIO read: bad offset/size %u/%u\n" , + offset, size);
This isn't a guest error, because the function is only ever called with constant values for the 'offset' parameter. You should just assert that the offset is 0 or 4.
Quoted 29 lines
hw/arm/smmuv3.c new file +28
-0+ return 0; + } + +return extract64 (r, offset <<3 ,32 ); +} + +#endif +static void smmuv3_init_regs (SMMUv3State *s) +{ +/** +* IDR0: stage1 only, AArch64 only, coherent access, 16b ASID, +* multi-level stream table +*/ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S1P ,1 );/* stage 1 supported */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,TTF ,2 );/* AArch64 PTW only */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,COHACC ,1 );/* IO coherent */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,ASID16 ,1 );/* 16-bit ASID */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,TTENDIAN ,2 );/* little endian */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,STALL_MODEL ,1 );/* No stall */ +/* terminated transaction will always be aborted/error returned */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,TERM_MODEL ,1 ); +/* 2-level stream table supported */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,STLEVEL ,1 ); + + s->idr[1 ] =FIELD_DP32 (s->idr[1 ],IDR1 ,SIDSIZE ,SMMU_IDR1_SIDSIZE ); + s->idr[1 ] =FIELD_DP32 (s->idr[1 ],IDR1 ,EVENTQS ,19 ); + s->idr[1 ] =FIELD_DP32 (s->idr[1 ],IDR1 ,CMDQS ,19 ); +
hw/arm/smmuv3.c line 63
Quoted 10 lines
hw/arm/smmuv3.c new file +10
-0+/* 4K and 64K granule support */ + s->idr[5 ] =FIELD_DP32 (s->idr[5 ],IDR5 ,GRAN4K ,1 ); + s->idr[5 ] =FIELD_DP32 (s->idr[5 ],IDR5 ,GRAN64K ,1 ); + s->idr[5 ] =FIELD_DP32 (s->idr[5 ],IDR5 ,OAS ,SMMU_IDR5_OAS );/* 44 bits */ + + s->cmdq.base =deposit64 (s->cmdq.base,0 ,5 ,19 );/* LOG2SIZE = 19 */ + s->cmdq.prod =0 ; + s->cmdq.cons =0 ; + s->cmdq.entry_size =sizeof (struct Cmd ); + s->eventq.base =deposit64 (s->eventq.base,0 ,5 ,19 );/* LOG2SIZE = 19 */
Have some #defines for max cmd queue and event queue size, since we use them here and also above in filling in the IDR fields ?
Quoted 15 lines
hw/arm/smmuv3.c new file +15
-0+ s->eventq.prod =0 ; + s->eventq.cons =0 ; + s->eventq.entry_size =sizeof (struct Evt ); + + s->features =0 ; + s->sid_split =0 ; +} + +static void smmu_write_mmio (void *opaque,hwaddr addr, +uint64_t val,unsigned size) +{ +/* not yet implemented */ +} + +static uint64_t smmu_read_mmio (void *opaque,hwaddr addr,unsigned size)
hw/arm/smmuv3.c line 88
Quoted 10 lines
hw/arm/smmuv3.c new file +10
-0+{ +SMMUState *sys = opaque; +SMMUv3State *s =ARM_SMMUV3 (sys); +uint64_t val; + +/* CONSTRAINED UNPREDICTABLE choice to have page0/1 be exact aliases */ + addr &= ~0x10000 ; + +if (size !=4 && size !=8 ) { +qemu_log_mask (LOG_GUEST_ERROR ,"SMMUv3 MMIO read: bad size %u\n" , size);
Your MemoryRegionOps settings mean this can never happen, so you don't need to check it at runtime.
Review
Quoted 2 lines
(quoted diff) +2
-0+ return 0; + }
Consider specifically catching 8-byte accesses to non-64-bit registers? This is CONSTRAINED UNPREDICTABLE (see spec section 6.2), and "one of the registers is read/written and other half is RAZ/WI" is permitted behaviour, but it does mean you need to be a little careful about not letting the top 32 bits of val become non-zero for the 32-bit register codepaths. Logging bad 64-bit accesses as LOG_GUEST_ERROR and making them RAZ/WI might be nicer for guest software developers.
Quoted 20 lines
hw/arm/smmuv3.c new file +20
-0+ +/* Primecell/Corelink ID registers */ +switch (addr) { +case A_CIDR0 : + val =0x0D ; +break ; +case A_CIDR1 : + val =0xF0 ; +break ; +case A_CIDR2 : + val =0x05 ; +break ; +case A_CIDR3 : + val =0xB1 ; +break ; +case A_PIDR0 : + val =0x84 ;/* Part Number */ +break ; +case A_PIDR1 : + val =0xB4 ;/* JEP106 ID code[3:0] for Arm and Part numver[11:8] */
hw/arm/smmuv3.c line 120
Quoted 10 lines
hw/arm/smmuv3.c new file +10
-0+break ; +case A_PIDR3 : + val =0x10 ;/* MMU600 p1 */ +break ; +case A_PIDR4 : + val =0x4 ;/* 4KB region count, JEP106 continuation code for Arm */ +break ; + case 0xFD4 ... 0xFDC: /* SMMU_PDIR 5-7 */ + val =0 ; +break ;
I usually put all the const CIDR/PIDR values in a const array, since there are always 12 of them next to each other, but since you already have this code it's fine.
Quoted 70 lines
hw/arm/smmuv3.c new file +70
-0+ case A_IDR0 ... A_IDR5: + val = s->idr[(addr -A_IDR0 ) /4 ]; +break ; +case A_IIDR : + val = s->iidr; +break ; +case A_CR0 : + val = s->cr[0 ]; +break ; +case A_CR0ACK : + val = s->cr0ack; +break ; +case A_CR1 : + val = s->cr[1 ]; +break ; +case A_CR2 : + val = s->cr[2 ]; +break ; +case A_STATUSR : + val = s->statusr; +break ; +case A_IRQ_CTRL : + val = s->irq_ctrl; +break ; +case A_IRQ_CTRL_ACK : + val = s->irq_ctrl_ack; +break ; +case A_GERROR : + val = s->gerror; +break ; +case A_GERRORN : + val = s->gerrorn; +break ; +case A_GERROR_IRQ_CFG0 :/* 64b */ + val =smmu_read64 (s->gerror_irq_cfg0,0 , size); +break ; +case A_GERROR_IRQ_CFG0 +4 : + val =smmu_read64 (s->gerror_irq_cfg0,4 , size); +break ; +case A_GERROR_IRQ_CFG1 : + val = s->gerror_irq_cfg1; +break ; +case A_GERROR_IRQ_CFG2 : + val = s->gerror_irq_cfg2; +break ; +case A_STRTAB_BASE :/* 64b */ + val =smmu_read64 (s->strtab_base,0 , size); +break ; +case A_STRTAB_BASE +4 :/* 64b */ + val =smmu_read64 (s->strtab_base,4 , size); +break ; +case A_STRTAB_BASE_CFG : + val = s->strtab_base_cfg; +break ; +case A_CMDQ_BASE :/* 64b */ + val =smmu_read64 (s->cmdq.base,0 , size); +break ; +case A_CMDQ_BASE +4 : + val =smmu_read64 (s->cmdq.base,4 , size); +break ; +case A_CMDQ_PROD : + val = s->cmdq.prod; +break ; +case A_CMDQ_CONS : + val = s->cmdq.cons; +break ; +case A_EVENTQ_BASE :/* 64b */ + val =smmu_read64 (s->eventq.base,0 , size); +break ; +case A_EVENTQ_BASE +4 :/* 64b */
hw/arm/smmuv3.c line 200
Quoted 10 lines
hw/arm/smmuv3.c new file +10
-0+ val =smmu_read64 (s->eventq.base,4 , size); +break ; +case A_EVENTQ_PROD : + val = s->eventq.prod; +break ; +case A_EVENTQ_CONS : + val = s->eventq.cons; +break ; +default : +error_report ("%s unhandled access at 0x%" PRIx64, __func__, addr);
This should be a LOG_GUEST_ERROR (if there are registers we don't implement, you can define the A_* constants for them and have those do a LOG_UNIMP.)
Quoted 16 lines
hw/arm/smmuv3.c new file +15
-0+break ; + } + +trace_smmuv3_read_mmio (addr, val, size); +return val; +} + +static void smmu_realize (DeviceState *d,Error **errp) +{ +SMMUState *sys =ARM_SMMU (d); +SMMUv3State *s =ARM_SMMUV3 (sys); +SMMUv3Class *c =ARM_SMMUV3_GET_CLASS (s); +SysBusDevice *dev =SYS_BUS_DEVICE (d); +Error *local_err =NULL ; +
hw/arm/smmuv3.c line 258
Quoted 10 lines
hw/arm/smmuv3.c new file +10
-0+ c->parent_realize (d, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + +memory_region_init_io (&sys->iomem,OBJECT (s), + &smmu_mem_ops, sys,TYPE_ARM_SMMUV3 ,0x20000 ); + + sys->mrtypename =g_strdup (TYPE_SMMUV3_IOMMU_MEMORY_REGION );
Nothing ever modifies this later, so I don't think you nede to do the g_strdup() ? (The declaration of the struct field should probably have a 'const'.)
Quoted 6 lines
hw/arm/smmuv3.c new file +6
-0+ +sysbus_init_mmio (dev, &sys->iomem); + +smmu_init_irq (s, dev); +} +
hw/arm/smmuv3.c line 274
Quoted 10 lines
hw/arm/smmuv3.c new file +10
-0+static const VMStateDescription vmstate_smmuv3 = { + .name ="smmuv3" , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_UINT32 (features, SMMUv3State), +VMSTATE_UINT8 (sid_size, SMMUv3State), +VMSTATE_UINT8 (sid_split, SMMUv3State), + +VMSTATE_UINT32_ARRAY (idr, SMMUv3State,6 ),
These are constant ID registers, right? You don't need to migrate anything that's a fixed value set when the device is created and never modified.
Quoted 15 lines
hw/arm/smmuv3.c new file +15
-0+VMSTATE_UINT32 (iidr, SMMUv3State), +VMSTATE_UINT32_ARRAY (cr, SMMUv3State,3 ), +VMSTATE_UINT32 (cr0ack, SMMUv3State), +VMSTATE_UINT32 (statusr, SMMUv3State), +VMSTATE_UINT32 (irq_ctrl, SMMUv3State), +VMSTATE_UINT32 (irq_ctrl_ack, SMMUv3State), +VMSTATE_UINT32 (gerror, SMMUv3State), +VMSTATE_UINT32 (gerrorn, SMMUv3State), +VMSTATE_UINT64 (gerror_irq_cfg0, SMMUv3State), +VMSTATE_UINT32 (gerror_irq_cfg1, SMMUv3State), +VMSTATE_UINT32 (gerror_irq_cfg2, SMMUv3State), +VMSTATE_UINT64 (strtab_base, SMMUv3State), +VMSTATE_UINT32 (strtab_base_cfg, SMMUv3State), +VMSTATE_UINT64 (eventq_irq_cfg0, SMMUv3State), + VMSTATE_UINT32(eventq_irq_cfg1, SMMUv3State),
hw/arm/smmuv3.c line 299
Quoted 10 lines
hw/arm/smmuv3.c new file +10
-0+VMSTATE_UINT32 (eventq_irq_cfg2, SMMUv3State), + +VMSTATE_UINT64 (cmdq.base, SMMUv3State), +VMSTATE_UINT32 (cmdq.prod, SMMUv3State), +VMSTATE_UINT32 (cmdq.cons, SMMUv3State), +VMSTATE_UINT8 (cmdq.entry_size, SMMUv3State), +VMSTATE_UINT64 (eventq.base, SMMUv3State), +VMSTATE_UINT32 (eventq.prod, SMMUv3State), +VMSTATE_UINT32 (eventq.cons, SMMUv3State), + VMSTATE_UINT8(eventq.entry_size, SMMUv3State),
It's a little neater to define a separate VMStateDescription for the SMMUQueue struct and then just use it twice here with VMSTATE_STRUCT. (Example in hw/dma/pl330.c for vmstate_pl330_chan.)
Also, isn't the entry_size constant and fixed at device creation? If so, you don't need to migrate it.
Quoted 6 lines
hw/arm/smmuv3.c new file +6
-0+ + VMSTATE_END_OF_LIST(), + }, +}; + +static void smmuv3_instance_init (Object *obj)
hw/arm/smmuv3.c line 315
Quoted 10 lines
hw/arm/smmuv3.c new file +10
-0+{ +/* Nothing much to do here as of now */ +} + +static void smmuv3_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +SMMUv3Class *c =ARM_SMMUV3_CLASS (klass); + + dc->vmsd = &vmstate_smmuv3;
It would be nice to go through the patchset and remove these unnecessary extra spaces in various assignments and declarations.
hw/arm/smmuv3.c line 348
Quoted 8 lines
hw/arm/smmuv3.c new file +6
-0+device_class_set_parent_reset (dc, smmu_reset, &c->parent_reset); + c->parent_realize = dc->realize; + dc->realize = smmu_realize; +} +type_init (smmuv3_register_types) +
Stray blank line at end of file.
hw/arm/trace-events smmu_ptw_invalid_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, · line 17
Quoted 11 lines
hw/arm/trace-events +3
-0@@ -12,3 +12,6 @@ smmu_ptw_invalid_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, smmu_ptw_page_pte(int stage, int level, uint64_t iova, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t address) "stage=%d level=%d iova=0x%"PRIx64" base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" page address = 0x%"PRIx64 smmu_ptw_block_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t iova, uint64_t gpa, int bsize_mb) "stage=%d level=%d base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" iova=0x%"PRIx64" block address = 0x%"PRIx64" block size = %d MiB" smmu_get_pte(uint64_t baseaddr, int index, uint64_t pteaddr, uint64_t pte) "baseaddr=0x%"PRIx64" index=0x%x, pteaddr=0x%"PRIx64", pte=0x%"PRIx64 + +#hw/arm/smmuv3.c +smmuv3_read_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" val:0x%"PRIx64" size: 0x%x"
"hwaddr" isn't valid as a type for trace event parameters. This should be uint64_t; otherwise trace backends like 'ust' won't build. (There's a patch on list to tracetool that will make this mistake a compile error for all backends, so it's easier to catch.)
Quoted 12 lines
hw/arm/trace-events +12
-0+#ifndef HW_ARM_SMMUV3_H +#define HW_ARM_SMMUV3_H + +#include "hw/arm/smmu-common.h" +#include "hw/registerfields.h" + +#define TYPE_SMMUV3_IOMMU_MEMORY_REGION "smmuv3-iommu-memory-region" + +#define SMMU_NREGS 0x200 + +typedef struct SMMUQueue { + hwaddr base;
hw/arm/trace-events
Quoted 10 lines
hw/arm/trace-events +10
-0+ uint32_t prod; + uint32_t cons; + uint8_t entry_size; +} SMMUQueue; + +typedef struct SMMUv3State { + SMMUState smmu_state; + + /* Local cache of most-frequently used registers */ +#define SMMU_FEATURE_2LVL_STE (1 << 0)
Minor thing, I think it would be better for this define to not be in the middle of the struct definition.
Quoted 41 lines
hw/arm/trace-events +41
-0+ uint32_t features; + uint8_t sid_size; + uint8_t sid_split; + + uint32_t idr[6]; + uint32_t iidr; + uint32_t cr[3]; + uint32_t cr0ack; + uint32_t statusr; + uint32_t irq_ctrl; + uint32_t irq_ctrl_ack; + uint32_t gerror; + uint32_t gerrorn; + uint64_t gerror_irq_cfg0; + uint32_t gerror_irq_cfg1; + uint32_t gerror_irq_cfg2; + uint64_t strtab_base; + uint32_t strtab_base_cfg; + uint64_t eventq_irq_cfg0; + uint32_t eventq_irq_cfg1; + uint32_t eventq_irq_cfg2; + + SMMUQueue eventq, cmdq; + + qemu_irq irq[4]; +} SMMUv3State; + +typedef enum { + SMMU_IRQ_EVTQ, + SMMU_IRQ_PRIQ, + SMMU_IRQ_CMD_SYNC, + SMMU_IRQ_GERROR, +} SMMUIrq; + +typedef struct { + /*< private >*/ + SMMUBaseClass smmu_base_class; + /*< public >*/ + + DeviceRealize parent_realize; + DeviceReset parent_reset;
hw/arm/trace-events
Quoted 10 lines
hw/arm/trace-events +10
-0+} SMMUv3Class; + +#define TYPE_ARM_SMMUV3 "arm-smmuv3" +#define ARM_SMMUV3(obj) OBJECT_CHECK(SMMUv3State, (obj), TYPE_ARM_SMMUV3) +#define ARM_SMMUV3_CLASS(klass) \ + OBJECT_CLASS_CHECK(SMMUv3Class, (klass), TYPE_ARM_SMMUV3) +#define ARM_SMMUV3_GET_CLASS(obj) \ + OBJECT_GET_CLASS(SMMUv3Class, (obj), TYPE_ARM_SMMUV3) + +#endif
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 04/14] hw/arm/smmuv3: Skeleton
Hi Peter,
Quoted 16 lines · Peter Maydell
Quoted 10 lines · Eric Auger
From: Prem Mallappa <[email protected]>
This patch implements a skeleton for the smmuv3 device. Datatypes and register definitions are introduced. The MMIO region, the interrupts and the queue are initialized.
Only the MMIO read operation is implemented here.
Signed-off-by Prem Mallappa <[email protected]>Signed-off-by Eric Auger <[email protected]>I just have a few minor nits on this one...
Quoted 15 lines
hw/arm/smmuv3-internal.h line 134
Quoted 12 lines
hw/arm/smmuv3-internal.h new file +12
-0+static inline int smmu_enabled (SMMUv3State *s) +{ +return FIELD_EX32 (s->cr[0 ],CR0 ,SMMU_ENABLE ); +} + +typedef struct Cmd { +uint32_t word[4 ]; +}Cmd ; + +typedef struct Evt { +uint32_t word[8 ]; +}Evt ;Some one-liner comments noting what these structs are for would be helpful.
sure
Quoted 7 lines
hw/arm/smmuv3-internal.h line 137
Quoted 4 lines
hw/arm/smmuv3-internal.h new file +3
-0+ +static inline uint64_t smmu_read64 (uint64_t r,unsigned offset, +unsigned size)A doc comment here would help in describing what the purpose of this utility function is.
done
Quoted 8 lines
hw/arm/smmuv3-internal.h line 140
Quoted 4 lines
hw/arm/smmuv3-internal.h new file +3
-0+{ +if (size ==8 && !offset) { +return r;If you take my advice a bit further down about just checking up front that 8-byte accesses are to definitely permitted 64 bit register offsets, you won't need the check on offset.
OK. I created a readl and readll to check this as done in gic. So eventually removed smmu_read64().
Quoted 13 lines
hw/arm/smmuv3-internal.h line 148
Quoted 9 lines
hw/arm/smmuv3-internal.h new file +8
-0+ } + +/* 32 bit access */ + +if (offset && offset !=4 ) { +qemu_log_mask (LOG_GUEST_ERROR , +"SMMUv3 MMIO read: bad offset/size %u/%u\n" , + offset, size);This isn't a guest error, because the function is only ever called with constant values for the 'offset' parameter. You should just assert that the offset is 0 or 4.
indeed
Quoted 35 lines
Quoted 35 lines
hw/arm/smmuv3.c new file +33
-0+ return 0; + } + +return extract64 (r, offset <<3 ,32 ); +} + +#endif +static void smmuv3_init_regs (SMMUv3State *s) +{ +/** +* IDR0: stage1 only, AArch64 only, coherent access, 16b ASID, +* multi-level stream table +*/ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S1P ,1 );/* stage 1 supported */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,TTF ,2 );/* AArch64 PTW only */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,COHACC ,1 );/* IO coherent */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,ASID16 ,1 );/* 16-bit ASID */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,TTENDIAN ,2 );/* little endian */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,STALL_MODEL ,1 );/* No stall */ +/* terminated transaction will always be aborted/error returned */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,TERM_MODEL ,1 ); +/* 2-level stream table supported */ + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,STLEVEL ,1 ); + + s->idr[1 ] =FIELD_DP32 (s->idr[1 ],IDR1 ,SIDSIZE ,SMMU_IDR1_SIDSIZE ); + s->idr[1 ] =FIELD_DP32 (s->idr[1 ],IDR1 ,EVENTQS ,19 ); + s->idr[1 ] =FIELD_DP32 (s->idr[1 ],IDR1 ,CMDQS ,19 ); + +/* 4K and 64K granule support */ + s->idr[5 ] =FIELD_DP32 (s->idr[5 ],IDR5 ,GRAN4K ,1 ); + s->idr[5 ] =FIELD_DP32 (s->idr[5 ],IDR5 ,GRAN64K ,1 ); + s->idr[5 ] =FIELD_DP32 (s->idr[5 ],IDR5 ,OAS ,SMMU_IDR5_OAS );/* 44 bits */ +
Quoted 8 lines
hw/arm/smmuv3.c line 63
Quoted 5 lines
hw/arm/smmuv3.c new file +5
-0+ s->cmdq.base =deposit64 (s->cmdq.base,0 ,5 ,19 );/* LOG2SIZE = 19 */ + s->cmdq.prod =0 ; + s->cmdq.cons =0 ; + s->cmdq.entry_size =sizeof (struct Cmd ); + s->eventq.base =deposit64 (s->eventq.base,0 ,5 ,19 );/* LOG2SIZE = 19 */ Have some #defines for max cmd queue and event queue size, since we use them here and also above in filling in the IDR fields ?
done
Quoted 21 lines
Quoted 21 lines
hw/arm/smmuv3.c new file +20
-0+ s->eventq.prod =0 ; + s->eventq.cons =0 ; + s->eventq.entry_size =sizeof (struct Evt ); + + s->features =0 ; + s->sid_split =0 ; +} + +static void smmu_write_mmio (void *opaque,hwaddr addr, +uint64_t val,unsigned size) +{ +/* not yet implemented */ +} + +static uint64_t smmu_read_mmio (void *opaque,hwaddr addr,unsigned size) +{ +SMMUState *sys = opaque; +SMMUv3State *s =ARM_SMMUV3 (sys); +uint64_t val; +
Quoted 8 lines
hw/arm/smmuv3.c line 88
Quoted 5 lines
hw/arm/smmuv3.c new file +5
-0+/* CONSTRAINED UNPREDICTABLE choice to have page0/1 be exact aliases */ + addr &= ~0x10000 ; + +if (size !=4 && size !=8 ) { +qemu_log_mask (LOG_GUEST_ERROR ,"SMMUv3 MMIO read: bad size %u\n" , size);Your MemoryRegionOps settings mean this can never happen, so you don't need to check it at runtime.
OK
Quoted 11 lines
Review
Quoted 3 lines
(quoted diff) +2
-0+ return 0; + }Consider specifically catching 8-byte accesses to non-64-bit registers? This is CONSTRAINED UNPREDICTABLE (see spec section 6.2), and "one of the registers is read/written and other half is RAZ/WI" is permitted behaviour, but it does mean you need to be a little careful about not letting the top 32 bits of val become non-zero for the 32-bit register codepaths. Logging bad 64-bit accesses as
LOG_GUEST_ERRORand making them RAZ/WI might be nicer for guest software developers.
I moved to ops with attrs and if a 64-bit access is attempted on something not a 64b reg base, I return an error + log a guest error.
Quoted 32 lines
Quoted 21 lines
hw/arm/smmuv3.c new file +20
-0+ +/* Primecell/Corelink ID registers */ +switch (addr) { +case A_CIDR0 : + val =0x0D ; +break ; +case A_CIDR1 : + val =0xF0 ; +break ; +case A_CIDR2 : + val =0x05 ; +break ; +case A_CIDR3 : + val =0xB1 ; +break ; +case A_PIDR0 : + val =0x84 ;/* Part Number */ +break ; +case A_PIDR1 : + val =0xB4 ;/* JEP106 ID code[3:0] for Arm and Part numver[11:8] */ hw/arm/smmuv3.c line 120
Quoted 10 lines
hw/arm/smmuv3.c new file +10
-0+break ; +case A_PIDR3 : + val =0x10 ;/* MMU600 p1 */ +break ; +case A_PIDR4 : + val =0x4 ;/* 4KB region count, JEP106 continuation code for Arm */ +break ; + case 0xFD4 ... 0xFDC: /* SMMU_PDIR 5-7 */ + val =0 ; +break ;
Quoted 3 lines
I usually put all the const CIDR/PIDR values in a const array, since there are always 12 of them next to each other, but since you already have this code it's fine.
Switched to the array as suggested.
Quoted 82 lines
Quoted 71 lines
hw/arm/smmuv3.c new file +70
-0+ case A_IDR0 ... A_IDR5: + val = s->idr[(addr -A_IDR0 ) /4 ]; +break ; +case A_IIDR : + val = s->iidr; +break ; +case A_CR0 : + val = s->cr[0 ]; +break ; +case A_CR0ACK : + val = s->cr0ack; +break ; +case A_CR1 : + val = s->cr[1 ]; +break ; +case A_CR2 : + val = s->cr[2 ]; +break ; +case A_STATUSR : + val = s->statusr; +break ; +case A_IRQ_CTRL : + val = s->irq_ctrl; +break ; +case A_IRQ_CTRL_ACK : + val = s->irq_ctrl_ack; +break ; +case A_GERROR : + val = s->gerror; +break ; +case A_GERRORN : + val = s->gerrorn; +break ; +case A_GERROR_IRQ_CFG0 :/* 64b */ + val =smmu_read64 (s->gerror_irq_cfg0,0 , size); +break ; +case A_GERROR_IRQ_CFG0 +4 : + val =smmu_read64 (s->gerror_irq_cfg0,4 , size); +break ; +case A_GERROR_IRQ_CFG1 : + val = s->gerror_irq_cfg1; +break ; +case A_GERROR_IRQ_CFG2 : + val = s->gerror_irq_cfg2; +break ; +case A_STRTAB_BASE :/* 64b */ + val =smmu_read64 (s->strtab_base,0 , size); +break ; +case A_STRTAB_BASE +4 :/* 64b */ + val =smmu_read64 (s->strtab_base,4 , size); +break ; +case A_STRTAB_BASE_CFG : + val = s->strtab_base_cfg; +break ; +case A_CMDQ_BASE :/* 64b */ + val =smmu_read64 (s->cmdq.base,0 , size); +break ; +case A_CMDQ_BASE +4 : + val =smmu_read64 (s->cmdq.base,4 , size); +break ; +case A_CMDQ_PROD : + val = s->cmdq.prod; +break ; +case A_CMDQ_CONS : + val = s->cmdq.cons; +break ; +case A_EVENTQ_BASE :/* 64b */ + val =smmu_read64 (s->eventq.base,0 , size); +break ; +case A_EVENTQ_BASE +4 :/* 64b */ hw/arm/smmuv3.c line 200
Quoted 10 lines
hw/arm/smmuv3.c new file +10
-0+ val =smmu_read64 (s->eventq.base,4 , size); +break ; +case A_EVENTQ_PROD : + val = s->eventq.prod; +break ; +case A_EVENTQ_CONS : + val = s->eventq.cons; +break ; +default : +error_report ("%s unhandled access at 0x%" PRIx64, __func__, addr);
Quoted 3 lines
This should be a
LOG_GUEST_ERROR(if there are registers we don't implement, you can define the A_* constants for them and have those do aLOG_UNIMP.)
changed to LOG_GUEST_ERROR
Quoted 23 lines
Quoted 23 lines
hw/arm/smmuv3.c new file +21
-0+break ; + } + +trace_smmuv3_read_mmio (addr, val, size); +return val; +} + +static void smmu_realize (DeviceState *d,Error **errp) +{ +SMMUState *sys =ARM_SMMU (d); +SMMUv3State *s =ARM_SMMUV3 (sys); +SMMUv3Class *c =ARM_SMMUV3_GET_CLASS (s); +SysBusDevice *dev =SYS_BUS_DEVICE (d); +Error *local_err =NULL ; + + c->parent_realize (d, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } +
Quoted 8 lines
hw/arm/smmuv3.c line 258
Quoted 4 lines
hw/arm/smmuv3.c new file +4
-0+memory_region_init_io (&sys->iomem,OBJECT (s), + &smmu_mem_ops, sys,TYPE_ARM_SMMUV3 ,0x20000 ); + + sys->mrtypename =g_strdup (TYPE_SMMUV3_IOMMU_MEMORY_REGION );Nothing ever modifies this later, so I don't think you nede to do the
g_strdup()? (The declaration of the struct field should probably have a 'const'.)
done
Quoted 13 lines
Quoted 13 lines
hw/arm/smmuv3.c new file +12
-0+ +sysbus_init_mmio (dev, &sys->iomem); + +smmu_init_irq (s, dev); +} + +static const VMStateDescription vmstate_smmuv3 = { + .name ="smmuv3" , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_UINT32 (features, SMMUv3State),
Quoted 8 lines
hw/arm/smmuv3.c line 274
Quoted 4 lines
hw/arm/smmuv3.c new file +4
-0+VMSTATE_UINT8 (sid_size, SMMUv3State), +VMSTATE_UINT8 (sid_split, SMMUv3State), + + VMSTATE_UINT32_ARRAY(idr, SMMUv3State, 6),These are constant ID registers, right? You don't need to migrate anything that's a fixed value set when the device is created and never modified.
yes correct, removed idr and iidr
Quoted 27 lines
Quoted 16 lines
hw/arm/smmuv3.c new file +15
-0+VMSTATE_UINT32 (iidr, SMMUv3State), +VMSTATE_UINT32_ARRAY (cr, SMMUv3State,3 ), +VMSTATE_UINT32 (cr0ack, SMMUv3State), +VMSTATE_UINT32 (statusr, SMMUv3State), +VMSTATE_UINT32 (irq_ctrl, SMMUv3State), +VMSTATE_UINT32 (irq_ctrl_ack, SMMUv3State), +VMSTATE_UINT32 (gerror, SMMUv3State), +VMSTATE_UINT32 (gerrorn, SMMUv3State), +VMSTATE_UINT64 (gerror_irq_cfg0, SMMUv3State), +VMSTATE_UINT32 (gerror_irq_cfg1, SMMUv3State), +VMSTATE_UINT32 (gerror_irq_cfg2, SMMUv3State), +VMSTATE_UINT64 (strtab_base, SMMUv3State), +VMSTATE_UINT32 (strtab_base_cfg, SMMUv3State), +VMSTATE_UINT64 (eventq_irq_cfg0, SMMUv3State), + VMSTATE_UINT32(eventq_irq_cfg1, SMMUv3State),hw/arm/smmuv3.c line 299
Quoted 10 lines
hw/arm/smmuv3.c new file +10
-0+VMSTATE_UINT32 (eventq_irq_cfg2, SMMUv3State), + +VMSTATE_UINT64 (cmdq.base, SMMUv3State), +VMSTATE_UINT32 (cmdq.prod, SMMUv3State), +VMSTATE_UINT32 (cmdq.cons, SMMUv3State), +VMSTATE_UINT8 (cmdq.entry_size, SMMUv3State), +VMSTATE_UINT64 (eventq.base, SMMUv3State), +VMSTATE_UINT32 (eventq.prod, SMMUv3State), +VMSTATE_UINT32 (eventq.cons, SMMUv3State), + VMSTATE_UINT8(eventq.entry_size, SMMUv3State),
Quoted 3 lines
It's a little neater to define a separate VMStateDescription for the SMMUQueue struct and then just use it twice here with
VMSTATE_STRUCT. (Example inhw/dma/pl330.cforvmstate_pl330_chan.)
done.
Quoted 3 lines
Also, isn't the
entry_sizeconstant and fixed at device creation? If so, you don't need to migrate it.
yes, removed
Quoted 12 lines
Quoted 12 lines
hw/arm/smmuv3.c new file +11
-0+ + VMSTATE_END_OF_LIST(), + }, +}; + +static void smmuv3_instance_init (Object *obj) +{ +/* Nothing much to do here as of now */ +} + +static void smmuv3_class_init (ObjectClass *klass,void *data)
Quoted 8 lines
hw/arm/smmuv3.c line 315
Quoted 5 lines
hw/arm/smmuv3.c new file +5
-0+{ +DeviceClass *dc =DEVICE_CLASS (klass); +SMMUv3Class *c =ARM_SMMUV3_CLASS (klass); + + dc->vmsd = &vmstate_smmuv3;It would be nice to go through the patchset and remove these unnecessary extra spaces in various assignments and declarations.
attempted ;-)
Quoted 12 lines
hw/arm/smmuv3.c line 348
Quoted 9 lines
hw/arm/smmuv3.c new file +6
-0+device_class_set_parent_reset (dc, smmu_reset, &c->parent_reset); + c->parent_realize = dc->realize; + dc->realize = smmu_realize; +} +type_init (smmuv3_register_types) +Stray blank line at end of file.
Quoted 16 lines
hw/arm/trace-events smmu_ptw_invalid_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, · line 17
Quoted 11 lines
hw/arm/trace-events +3
-0@@ -12,3 +12,6 @@ smmu_ptw_invalid_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, smmu_ptw_page_pte(int stage, int level, uint64_t iova, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t address) "stage=%d level=%d iova=0x%"PRIx64" base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" page address = 0x%"PRIx64 smmu_ptw_block_pte(int stage, int level, uint64_t baseaddr, uint64_t pteaddr, uint64_t pte, uint64_t iova, uint64_t gpa, int bsize_mb) "stage=%d level=%d base@=0x%"PRIx64" pte@=0x%"PRIx64" pte=0x%"PRIx64" iova=0x%"PRIx64" block address = 0x%"PRIx64" block size = %d MiB" smmu_get_pte(uint64_t baseaddr, int index, uint64_t pteaddr, uint64_t pte) "baseaddr=0x%"PRIx64" index=0x%x, pteaddr=0x%"PRIx64", pte=0x%"PRIx64 + +#hw/arm/smmuv3.c +smmuv3_read_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" val:0x%"PRIx64" size: 0x%x""hwaddr" isn't valid as a type for trace event parameters. This should be
uint64_t; otherwise trace backends like 'ust' won't build. (There's a patch on list to tracetool that will make this mistake a compile error for all backends, so it's easier to catch.)
Yes changed all of those to uint64_t.
Quoted 19 lines
Quoted 19 lines
hw/arm/trace-events +17
-0+#ifndef HW_ARM_SMMUV3_H +#define HW_ARM_SMMUV3_H + +#include "hw/arm/smmu-common.h" +#include "hw/registerfields.h" + +#define TYPE_SMMUV3_IOMMU_MEMORY_REGION "smmuv3-iommu-memory-region" + +#define SMMU_NREGS 0x200 + +typedef struct SMMUQueue { + hwaddr base; + uint32_t prod; + uint32_t cons; + uint8_t entry_size; +} SMMUQueue; +
Quoted 8 lines
hw/arm/trace-events
Quoted 5 lines
hw/arm/trace-events +5
-0+typedef struct SMMUv3State { + SMMUState smmu_state; + + /* Local cache of most-frequently used registers */ +#define SMMU_FEATURE_2LVL_STE (1 << 0)Minor thing, I think it would be better for this define to not be in the middle of the struct definition.
OK moved to smmuv3-internal in patch adding write ops.
Thanks
Eric
Quoted 56 lines
Quoted 42 lines
hw/arm/trace-events +41
-0+ uint32_t features; + uint8_t sid_size; + uint8_t sid_split; + + uint32_t idr[6]; + uint32_t iidr; + uint32_t cr[3]; + uint32_t cr0ack; + uint32_t statusr; + uint32_t irq_ctrl; + uint32_t irq_ctrl_ack; + uint32_t gerror; + uint32_t gerrorn; + uint64_t gerror_irq_cfg0; + uint32_t gerror_irq_cfg1; + uint32_t gerror_irq_cfg2; + uint64_t strtab_base; + uint32_t strtab_base_cfg; + uint64_t eventq_irq_cfg0; + uint32_t eventq_irq_cfg1; + uint32_t eventq_irq_cfg2; + + SMMUQueue eventq, cmdq; + + qemu_irq irq[4]; +} SMMUv3State; + +typedef enum { + SMMU_IRQ_EVTQ, + SMMU_IRQ_PRIQ, + SMMU_IRQ_CMD_SYNC, + SMMU_IRQ_GERROR, +} SMMUIrq; + +typedef struct { + /*< private >*/ + SMMUBaseClass smmu_base_class; + /*< public >*/ + + DeviceRealize parent_realize; + DeviceReset parent_reset;hw/arm/trace-events
Quoted 10 lines
hw/arm/trace-events +10
-0+} SMMUv3Class; + +#define TYPE_ARM_SMMUV3 "arm-smmuv3" +#define ARM_SMMUV3(obj) OBJECT_CHECK(SMMUv3State, (obj), TYPE_ARM_SMMUV3) +#define ARM_SMMUV3_CLASS(klass) \ + OBJECT_CLASS_CHECK(SMMUv3Class, (klass), TYPE_ARM_SMMUV3) +#define ARM_SMMUV3_GET_CLASS(obj) \ + OBJECT_GET_CLASS(SMMUv3Class, (obj), TYPE_ARM_SMMUV3) + +#endifthanks
-- PMM
Re: [Qemu-arm] [PATCH v9 04/14] hw/arm/smmuv3: Skeleton
Quoted 11 lines · Auger Eric
Quoted 7 lines · Peter Maydell
Consider specifically catching 8-byte accesses to non-64-bit registers? This is CONSTRAINED UNPREDICTABLE (see spec section 6.2), and "one of the registers is read/written and other half is RAZ/WI" is permitted behaviour, but it does mean you need to be a little careful about not letting the top 32 bits of val become non-zero for the 32-bit register codepaths. Logging bad 64-bit accesses as
LOG_GUEST_ERRORand making them RAZ/WI might be nicer for guest software developers.I moved to ops with attrs and if a 64-bit access is attempted on something not a 64b reg base, I return an error + log a guest error.
Ah, you probably don't want to return MEMTX_ERROR, because that becomes a guest CPU external-abort exception. An abort is listed as one of the permitted constrained-unpredictable behaviours for bad 64-bit accesses, but there is a note that "strongly recommends" not to abort for cases where the registers might be used by software associated with lower exception levels. Rather than trying to decide which registers do or don't get to return MEMTX_ERROR, it's probably easier just to RAZ/WI and return MEMTX_OK.
(We had to fix a bug like this in the gicv3 in commits f1945632b43e3 and 0cf09852015e when we started making MEMTX_ERROR generate aborts, though in that case the spec is more definite that abort is not a permitted behaviour.)
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 04/14] hw/arm/smmuv3: Skeleton
Hi Peter,
Quoted 22 lines · Peter Maydell
Quoted 11 lines · Auger Eric
Quoted 7 lines · Peter Maydell
Consider specifically catching 8-byte accesses to non-64-bit registers? This is CONSTRAINED UNPREDICTABLE (see spec section 6.2), and "one of the registers is read/written and other half is RAZ/WI" is permitted behaviour, but it does mean you need to be a little careful about not letting the top 32 bits of val become non-zero for the 32-bit register codepaths. Logging bad 64-bit accesses as
LOG_GUEST_ERRORand making them RAZ/WI might be nicer for guest software developers.I moved to ops with attrs and if a 64-bit access is attempted on something not a 64b reg base, I return an error + log a guest error.
Ah, you probably don't want to return
MEMTX_ERROR, because that becomes a guest CPU external-abort exception. An abort is listed as one of the permitted constrained-unpredictable behaviours for bad 64-bit accesses, but there is a note that "strongly recommends" not to abort for cases where the registers might be used by software associated with lower exception levels. Rather than trying to decide which registers do or don't get to returnMEMTX_ERROR, it's probably easier just to RAZ/WI and returnMEMTX_OK.
Quoted 4 lines
(We had to fix a bug like this in the gicv3 in commits
f1945632b43e3and0cf09852015ewhen we started makingMEMTX_ERRORgenerate aborts, though in that case the spec is more definite that abort is not a permitted behaviour.)
Yes saw those modifs in gic. I will check & fix this.
Thanks
Eric
Quoted 4 lines
thanks
-- PMM
PATCH v9 5/14 hw/arm/smmuv3: Wired IRQ and GERROR helpers
In reply to Eric AugerWe introduce some helpers to handle wired IRQs and especially GERROR interrupt. SMMU writes GERROR register on GERROR event and SW acks GERROR interrupts by setting GERRORn.
The Wired interrupts are edge sensitive hence the pulse usage.
---
v7 -> v8:
- remove SMMU_PENDING_GERRORS macro
- properly toggle gerror
- properly sanitize gerrorn write
--- hw/arm/smmuv3-internal.h | 10 ++++++++ hw/arm/smmuv3.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ hw/arm/trace-events | 3 +++ 3 files changed, 77 insertions(+)
hw/arm/smmuv3-internal.h +10 -0
@@ -152,4 +152,14 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset, return extract64(r, offset << 3, 32); } +/* Interrupts */ + +#define smmuv3_eventq_irq_enabled (s) \ + (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, EVENTQ_IRQEN)) +#define smmuv3_gerror_irq_enabled (s) \ + (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, GERROR_IRQEN)) + +void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask); +void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t gerrorn); +#endif
hw/arm/smmuv3.c +64 -0
70 lines not on this page · raw message
hw/arm/trace-events +3 -0
@@ -15,3 +15,6 @@ smmu_get_pte(uint64_t baseaddr, int index, uint64_t pteaddr, uint64_t pte) "base #hw/arm/smmuv3.c smmuv3_read_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" val:0x%"PRIx64" size: 0x%x" +smmuv3_trigger_irq(int irq) "irq=%d" +smmuv3_write_gerror(uint32_t toggled, uint32_t gerror) "toggled=0x%x, new gerror=0x%x" +smmuv3_write_gerrorn(uint32_t acked, uint32_t gerrorn) "acked=0x%x, new gerrorn=0x%x"
Signature · 1 line
2.5.5
Re: [Qemu-arm] [PATCH v9 05/14] hw/arm/smmuv3: Wired IRQ and GERROR helpers
Quoted 25 lines · Eric Auger
We introduce some helpers to handle wired IRQs and especially GERROR interrupt. SMMU writes GERROR register on GERROR event and SW acks GERROR interrupts by setting GERRORn.
The Wired interrupts are edge sensitive hence the pulse usage.
Signed-off-by Eric Auger <[email protected]>---
v7 -> v8:
- removeSMMU_PENDING_GERRORSmacro
- properly toggle gerror
- properly sanitize gerrorn write--- hw/arm/smmuv3-internal.h | 10 ++++++++ hw/arm/smmuv3.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ hw/arm/trace-events | 3 +++ 3 files changed, 77 insertions(+)hw/arm/smmuv3-internal.h +0
-0
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 160
Quoted 9 lines
hw/arm/smmuv3-internal.h +6
-0@@ -152,4 +152,14 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,return extract64 (r, offset <<3 ,32 ); } +/* Interrupts */ + +#define smmuv3_eventq_irq_enabled (s) \ + (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, EVENTQ_IRQEN)) +#define smmuv3_gerror_irq_enabled (s) \ + (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, GERROR_IRQEN))
These are only ever used in smmuv3.c, so you can just move them to there (and make them inline functions, ideally).
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 163
Quoted 3 lines
hw/arm/smmuv3-internal.h +3
-0+ +void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask); +void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t gerrorn);
I guess these are global to avoid the compiler complaining about unused static functions at this point? If so, add a comment saying so, and flip them back to being static functions when their callers get added. (Or just add the callers here, if they're not too complicated.)
Quoted 18 lines
hw/arm/smmuv3-internal.h +1
-0+#endif hw/arm/smmuv3.c +8
-0@@ -30,6 +30,70 @@#include "hw/arm/smmuv3.h" #include "smmuv3-internal.h" +/** +* smmuv3_trigger_irq - pulse @irq if enabled and update +* GERROR register in case of GERROR interrupt +* +* @irq: irq type +* @gerror_mask: mask of gerrors to toggle (relevant if @irq is GERROR) +*/ +void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask)
hw/arm/smmuv3.c line 50
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+{ + +bool pulse = false; + +switch (irq) { +case SMMU_IRQ_EVTQ : + pulse =smmuv3_eventq_irq_enabled (s); +break ; +case SMMU_IRQ_PRIQ : +error_setg (&error_fatal,"PRI not supported" );
This should either assert() if it would be a bug in the rest of the smmu code, or LOG_UNIMP if the guest can trigger it.
Quoted 7 lines
hw/arm/smmuv3.c +7
-0+break ; +case SMMU_IRQ_CMD_SYNC : + pulse = true; +break ; +case SMMU_IRQ_GERROR : + { +uint32_t pending = s->gerror ^ s->gerrorn;
hw/arm/smmuv3.c line 67
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+uint32_t new_gerrors = ~pending & gerror_mask; + +if (!new_gerrors) { +/* only toggle non pending errors */ +return ; + } + s->gerror ^= new_gerrors; +trace_smmuv3_write_gerror (new_gerrors, s->gerror); + +/* pulse the GERROR irq only if all previous gerrors were acked */
It's not entirely clear to me that this is correct; should we generate only one pulse if the implementation raises error A, and then later raises error B before software acknowledges A ? There's some language in 3.18 about the SMMU implementation being able to coalesce events and identical interrupts, but I think that would mean that we could skip raising the first pulse for error A if error B arrived sufficiently quickly after it. (Not something we're going to care about for a s/w model.)
I think the right behaviour is probably that we should pulse the interrupt if there are any new gerrors, which is to say to drop this !pending test:
Quoted 16 lines
hw/arm/smmuv3.c +16
-0+ pulse =smmuv3_gerror_irq_enabled (s) && !pending; +break ; + } + } +if (pulse) { +trace_smmuv3_trigger_irq (irq); +qemu_irq_pulse (s->irq[irq]); + } +} + +void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t new_gerrorn) +{ +uint32_t pending = s->gerror ^ s->gerrorn; +uint32_t toggled = s->gerrorn ^ new_gerrorn; +uint32_t acked; +
hw/arm/smmuv3.c line 93
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+if (toggled & ~pending) { +qemu_log_mask (LOG_GUEST_ERROR , +"guest toggles non pending errors = 0x%x\n" , + toggled & ~pending); + } + +/* Make sure SW does not toggle irqs that are not active */ + acked = toggled & pending; + s->gerrorn ^= acked; +
I don't think this behaviour is correct. From the hardware's perspective, we should just take the value the user writes to SMMU_GERRORN and put it in the register (and update the status of the irq accordingly).
It is CONSTRAINED UNPREDICTABLE whether we actually raise an interrupt if the guest toggles a field that corresponds to an inactive error, so we should just do whatever is easiest.
Quoted 11 lines
hw/arm/smmuv3.c +3
-0+trace_smmuv3_write_gerrorn (acked, s->gerrorn); +} +static void smmuv3_init_regs (SMMUv3State *s) {/** hw/arm/trace-events +0
-0
hw/arm/trace-events smmu_get_pte(uint64_t baseaddr, int index, uint64_t pteaddr, uint64_t pte) "base · line 20
Quoted 6 lines
hw/arm/trace-events +3
-0@@ -15,3 +15,6 @@ smmu_get_pte(uint64_t baseaddr, int index, uint64_t pteaddr, uint64_t pte) "base #hw/arm/smmuv3.c smmuv3_read_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" val:0x%"PRIx64" size: 0x%x" +smmuv3_trigger_irq(int irq) "irq=%d" +smmuv3_write_gerror(uint32_t toggled, uint32_t gerror) "toggled=0x%x, new gerror=0x%x" +smmuv3_write_gerrorn(uint32_t acked, uint32_t gerrorn) "acked=0x%x, new gerrorn=0x%x"
Capitalizing names of registers like GERROR in trace messages would make them match the convention in the SMMUv3 spec.
Quoted 3 lines
--
2.5.5
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 05/14] hw/arm/smmuv3: Wired IRQ and GERROR helpers
Hi Peter,
Quoted 29 lines · Peter Maydell
Quoted 28 lines · Eric Auger
We introduce some helpers to handle wired IRQs and especially GERROR interrupt. SMMU writes GERROR register on GERROR event and SW acks GERROR interrupts by setting GERRORn.
The Wired interrupts are edge sensitive hence the pulse usage.
Signed-off-by Eric Auger <[email protected]>---
v7 -> v8:
- removeSMMU_PENDING_GERRORSmacro
- properly toggle gerror
- properly sanitize gerrorn write--- hw/arm/smmuv3-internal.h | 10 ++++++++ hw/arm/smmuv3.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++ hw/arm/trace-events | 3 +++ 3 files changed, 77 insertions(+)hw/arm/smmuv3-internal.h +0
-0@@ -152,4 +152,14 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,return extract64 (r, offset <<3 ,32 ); }
Quoted 9 lines
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 160
Quoted 6 lines
hw/arm/smmuv3-internal.h +6
-0+/* Interrupts */ + +#define smmuv3_eventq_irq_enabled (s) \ + (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, EVENTQ_IRQEN)) +#define smmuv3_gerror_irq_enabled (s) \ + (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, GERROR_IRQEN))These are only ever used in
smmuv3.c, so you can just move them to there (and make them inline functions, ideally).
smmuv3-internal.h contains helpers, macros which are only used by smmuv3.c . I though this could avoid putting too much code in smmuv3.c and would help in the readability.
what is the exact benefit of transforming those into inline functions instead of macros. Not meaning I don't want to take this into account but to improve my coding style ;-)
Quoted 10 lines
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 163
Quoted 4 lines
hw/arm/smmuv3-internal.h +3
-0+ +void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask); +void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t gerrorn);I guess these are global to avoid the compiler complaining about unused static functions at this point? If so, add a comment saying so, and flip them back to being static functions when their callers get added. (Or just add the callers here, if they're not too complicated.)
Yes they becomes static in "hw/arm/smmuv3: Implement MMIO write operations". Added a comment
Quoted 24 lines
Quoted 24 lines
hw/arm/smmuv3-internal.h +1
-0+#endif hw/arm/smmuv3.c +13
-0@@ -30,6 +30,70 @@#include "hw/arm/smmuv3.h" #include "smmuv3-internal.h" +/** +* smmuv3_trigger_irq - pulse @irq if enabled and update +* GERROR register in case of GERROR interrupt +* +* @irq: irq type +* @gerror_mask: mask of gerrors to toggle (relevant if @irq is GERROR) +*/ +void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask) +{ + +bool pulse = false; + +switch (irq) {
Quoted 8 lines
hw/arm/smmuv3.c line 50
Quoted 5 lines
hw/arm/smmuv3.c +5
-0+case SMMU_IRQ_EVTQ : + pulse =smmuv3_eventq_irq_enabled (s); +break ; +case SMMU_IRQ_PRIQ : +error_setg (&error_fatal,"PRI not supported" );This should either
assert()if it would be a bug in the rest of the smmu code, orLOG_UNIMPif the guest can trigger it.
replaced by LOG_UNIMP
Quoted 19 lines
Quoted 8 lines
hw/arm/smmuv3.c +7
-0+break ; +case SMMU_IRQ_CMD_SYNC : + pulse = true; +break ; +case SMMU_IRQ_GERROR : + { +uint32_t pending = s->gerror ^ s->gerrorn;hw/arm/smmuv3.c line 67
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+uint32_t new_gerrors = ~pending & gerror_mask; + +if (!new_gerrors) { +/* only toggle non pending errors */ +return ; + } + s->gerror ^= new_gerrors; +trace_smmuv3_write_gerror (new_gerrors, s->gerror); + +/* pulse the GERROR irq only if all previous gerrors were acked */
Quoted 8 lines
It's not entirely clear to me that this is correct; should we generate only one pulse if the implementation raises error A, and then later raises error B before software acknowledges A ? There's some language in 3.18 about the SMMU implementation being able to coalesce events and identical interrupts, but I think that would mean that we could skip raising the first pulse for error A if error B arrived sufficiently quickly after it. (Not something we're going to care about for a s/w model.)
I don't implement event merging atm.
Quoted 4 lines
I think the right behaviour is probably that we should pulse the interrupt if there are any new gerrors, which is to say to drop this !pending test:
I agree with your interpretation.
Quoted 24 lines
Quoted 24 lines
hw/arm/smmuv3.c +23
-0+ pulse =smmuv3_gerror_irq_enabled (s) && !pending; +break ; + } + } +if (pulse) { +trace_smmuv3_trigger_irq (irq); +qemu_irq_pulse (s->irq[irq]); + } +} + +void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t new_gerrorn) +{ +uint32_t pending = s->gerror ^ s->gerrorn; +uint32_t toggled = s->gerrorn ^ new_gerrorn; +uint32_t acked; + +if (toggled & ~pending) { +qemu_log_mask (LOG_GUEST_ERROR , +"guest toggles non pending errors = 0x%x\n" , + toggled & ~pending); + } + +/* Make sure SW does not toggle irqs that are not active */
Quoted 8 lines
hw/arm/smmuv3.c line 93
Quoted 3 lines
hw/arm/smmuv3.c +3
-0+ acked = toggled & pending; + s->gerrorn ^= acked; +I don't think this behaviour is correct. From the hardware's perspective, we should just take the value the user writes to
SMMU_GERRORNand put it in the register (and update the status of the irq accordingly).
OK
Quoted 4 lines
It is CONSTRAINED UNPREDICTABLE whether we actually raise an interrupt if the guest toggles a field that corresponds to an inactive error, so we should just do whatever is easiest.
OK: nothing except reporting a LOG_GUEST_ERROR ;-)
Thanks
Eric
Quoted 13 lines
Quoted 13 lines
hw/arm/smmuv3.c +3
-0+trace_smmuv3_write_gerrorn (acked, s->gerrorn); +} +static void smmuv3_init_regs (SMMUv3State *s) {/** hw/arm/trace-events +0
-0@@ -15,3 +15,6 @@ smmu_get_pte(uint64_t baseaddr, int index, uint64_t pteaddr, uint64_t pte) "base
Quoted 8 lines
hw/arm/trace-events smmu_get_pte(uint64_t baseaddr, int index, uint64_t pteaddr, uint64_t pte) "base · line 20
Quoted 5 lines
hw/arm/trace-events +3
-0#hw/arm/smmuv3.c smmuv3_read_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" val:0x%"PRIx64" size: 0x%x" +smmuv3_trigger_irq(int irq) "irq=%d" +smmuv3_write_gerror(uint32_t toggled, uint32_t gerror) "toggled=0x%x, new gerror=0x%x" +smmuv3_write_gerrorn(uint32_t acked, uint32_t gerrorn) "acked=0x%x, new gerrorn=0x%x"Capitalizing names of registers like GERROR in trace messages would make them match the convention in the SMMUv3 spec.
done
Thanks
Eric
Quoted 8 lines
Quoted 4 lines
--
2.5.5thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 05/14] hw/arm/smmuv3: Wired IRQ and GERROR helpers
Quoted 8 lines · Auger Eric
Quoted 7 lines · Peter Maydell
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 160
Quoted 4 lines
hw/arm/smmuv3-internal.h +4
-0+#define smmuv3_eventq_irq_enabled (s) \ + (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, EVENTQ_IRQEN)) +#define smmuv3_gerror_irq_enabled (s) \ + (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, GERROR_IRQEN))These are only ever used in
smmuv3.c, so you can just move them to there (and make them inline functions, ideally).
Quoted 7 lines
smmuv3-internal.hcontains helpers, macros which are only used bysmmuv3.c. I though this could avoid putting too much code insmmuv3.cand would help in the readability.what is the exact benefit of transforming those into inline functions instead of macros. Not meaning I don't want to take this into account but to improve my coding style ;-)
You get the benefit of type checking (and it self-documents that the macros want to be passed an SMMUv3State*). You don't have to worry about trying to write your macro to not evaluate arguments multiple times. These are one-liners so they're fairly easy to read, but when you get to 3 or 4 lines you end up with a lot of '\' lines and the inline function is I think more clearly better. I prefer to save macros for cases where you really need a macro and can't get the same effect with a function.
thanks
-- PMM
Re: [Qemu-arm] [Qemu-devel] [PATCH v9 05/14] hw/arm/smmuv3: Wired IRQ and GERROR helpers
Hi Peter,
Quoted 17 lines · Peter Maydell
Quoted 8 lines · Auger Eric
Quoted 7 lines · Peter Maydell
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 160
Quoted 4 lines
hw/arm/smmuv3-internal.h +4
-0+#define smmuv3_eventq_irq_enabled (s) \ + (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, EVENTQ_IRQEN)) +#define smmuv3_gerror_irq_enabled (s) \ + (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, GERROR_IRQEN))These are only ever used in
smmuv3.c, so you can just move them to there (and make them inline functions, ideally).Quoted 7 lines
smmuv3-internal.hcontains helpers, macros which are only used bysmmuv3.c. I though this could avoid putting too much code insmmuv3.cand would help in the readability.what is the exact benefit of transforming those into inline functions instead of macros. Not meaning I don't want to take this into account but to improve my coding style ;-)
Quoted 8 lines
You get the benefit of type checking (and it self-documents that the macros want to be passed an SMMUv3State*). You don't have to worry about trying to write your macro to not evaluate arguments multiple times. These are one-liners so they're fairly easy to read, but when you get to 3 or 4 lines you end up with a lot of '\' lines and the inline function is I think more clearly better. I prefer to save macros for cases where you really need a macro and can't get the same effect with a function.
OK. Thank you for the explanation
Eric
Quoted 4 lines
thanks
-- PMM
PATCH v9 6/14 hw/arm/smmuv3: Queue helpers
In reply to Eric AugerWe introduce helpers to read/write into the command and event circular queues.
smmuv3_write_eventq and smmuv3_cmq_consume will become static in subsequent patches.
Invalidation commands are not yet dealt with. We do not cache data that need to be invalidated. This will change with vhost integration.
---
v8 -> v9:
- fix CMD_SSID & CMD_ADDR + some renamings
- do cons increment after the execution of the command
- add Q_INCONSISTENT()
v7 -> v8
- use address_space_rw
- helpers inspired from spec
--- hw/arm/smmuv3-internal.h | 150 +++++++++++++++++++++++++++++++++++++++++++ hw/arm/smmuv3.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++ hw/arm/trace-events | 4 ++ 3 files changed, 316 insertions(+)
hw/arm/smmuv3-internal.h +150 -0
@@ -162,4 +162,154 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask);void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t gerrorn); +/* Queue Handling */ + +#define LOG2SIZE (q) extract64((q)->base, 0, 5) +#define BASE (q) ((q)->base & SMMU_BASE_ADDR_MASK) +#define WRAP_MASK (q) (1 << LOG2SIZE(q)) +#define INDEX_MASK (q) ((1 << LOG2SIZE(q)) - 1) +#define WRAP_INDEX_MASK (q) ((1 << (LOG2SIZE(q) + 1)) - 1) + +#define Q_CONS_ENTRY (q) (BASE(q) + \ + (q)->entry_size * ((q)->cons & INDEX_MASK(q))) +#define Q_PROD_ENTRY (q) (BASE(q) + \ + (q)->entry_size * ((q)->prod & INDEX_MASK(q))) + +#define Q_CONS (q) ((q)->cons & INDEX_MASK(q)) +#define Q_PROD (q) ((q)->prod & INDEX_MASK(q)) + +#define Q_CONS_WRAP (q) (((q)->cons & WRAP_MASK(q)) >> LOG2SIZE(q)) +#define Q_PROD_WRAP (q) (((q)->prod & WRAP_MASK(q)) >> LOG2SIZE(q)) + +#define Q_FULL (q) \ + (((((q)->cons) & INDEX_MASK(q)) == \ + (((q)->prod) & INDEX_MASK(q))) && \ + ((((q)->cons) & WRAP_MASK(q)) != \ + (((q)->prod) & WRAP_MASK(q)))) + +#define Q_EMPTY (q) \ + (((((q)->cons) & INDEX_MASK(q)) == \ + (((q)->prod) & INDEX_MASK(q))) && \ + ((((q)->cons) & WRAP_MASK(q)) == \ + (((q)->prod) & WRAP_MASK(q)))) + +#define Q_INCONSISTENT (q) \ +((((((q)->prod) & INDEX_MASK(q)) > (((q)->cons) & INDEX_MASK(q))) && \ +((((q)->prod) & WRAP_MASK(q)) != (((q)->cons) & WRAP_MASK(q)))) || \ +(((((q)->prod) & INDEX_MASK(q)) < (((q)->cons) & INDEX_MASK(q))) && \ +((((q)->prod) & WRAP_MASK(q)) == (((q)->cons) & WRAP_MASK(q))))) \ + +#define SMMUV3_CMDQ_ENABLED (s) \ + (FIELD_EX32(s->cr[0], CR0, CMDQEN)) + +#define SMMUV3_EVENTQ_ENABLED (s) \ + (FIELD_EX32(s->cr[0], CR0, EVENTQEN)) + +static inline void smmu_write_cmdq_err (SMMUv3State *s,uint32_t err_type) +{ + s->cmdq.cons =FIELD_DP32 (s->cmdq.cons,CMDQ_CONS ,ERR , err_type); +} + +void smmuv3_write_eventq (SMMUv3State *s,Evt *evt); + +/* Commands */ + +enum { +SMMU_CMD_PREFETCH_CONFIG =0x01 , +SMMU_CMD_PREFETCH_ADDR , +SMMU_CMD_CFGI_STE , +SMMU_CMD_CFGI_STE_RANGE , +SMMU_CMD_CFGI_CD , +SMMU_CMD_CFGI_CD_ALL , +SMMU_CMD_CFGI_ALL , +SMMU_CMD_TLBI_NH_ALL =0x10 , +SMMU_CMD_TLBI_NH_ASID , +SMMU_CMD_TLBI_NH_VA , +SMMU_CMD_TLBI_NH_VAA , +SMMU_CMD_TLBI_EL3_ALL =0x18 , +SMMU_CMD_TLBI_EL3_VA =0x1a , +SMMU_CMD_TLBI_EL2_ALL =0x20 , +SMMU_CMD_TLBI_EL2_ASID , +SMMU_CMD_TLBI_EL2_VA , +SMMU_CMD_TLBI_EL2_VAA ,/* 0x23 */ +SMMU_CMD_TLBI_S12_VMALL =0x28 , +SMMU_CMD_TLBI_S2_IPA =0x2a , +SMMU_CMD_TLBI_NSNH_ALL =0x30 , +SMMU_CMD_ATC_INV =0x40 , +SMMU_CMD_PRI_RESP , +SMMU_CMD_RESUME =0x44 , +SMMU_CMD_STALL_TERM , +SMMU_CMD_SYNC ,/* 0x46 */ +}; + +static const char *cmd_stringify[] = { + [SMMU_CMD_PREFETCH_CONFIG ] ="SMMU_CMD_PREFETCH_CONFIG" , + [SMMU_CMD_PREFETCH_ADDR ] ="SMMU_CMD_PREFETCH_ADDR" , + [SMMU_CMD_CFGI_STE ] ="SMMU_CMD_CFGI_STE" , + [SMMU_CMD_CFGI_STE_RANGE ] ="SMMU_CMD_CFGI_STE_RANGE" , + [SMMU_CMD_CFGI_CD ] ="SMMU_CMD_CFGI_CD" , + [SMMU_CMD_CFGI_CD_ALL ] ="SMMU_CMD_CFGI_CD_ALL" , + [SMMU_CMD_CFGI_ALL ] ="SMMU_CMD_CFGI_ALL" , + [SMMU_CMD_TLBI_NH_ALL ] ="SMMU_CMD_TLBI_NH_ALL" , + [SMMU_CMD_TLBI_NH_ASID ] ="SMMU_CMD_TLBI_NH_ASID" , + [SMMU_CMD_TLBI_NH_VA ] ="SMMU_CMD_TLBI_NH_VA" , + [SMMU_CMD_TLBI_NH_VAA ] ="SMMU_CMD_TLBI_NH_VAA" , + [SMMU_CMD_TLBI_EL3_ALL ] ="SMMU_CMD_TLBI_EL3_ALL" , + [SMMU_CMD_TLBI_EL3_VA ] ="SMMU_CMD_TLBI_EL3_VA" , + [SMMU_CMD_TLBI_EL2_ALL ] ="SMMU_CMD_TLBI_EL2_ALL" , + [SMMU_CMD_TLBI_EL2_ASID ] ="SMMU_CMD_TLBI_EL2_ASID" , + [SMMU_CMD_TLBI_EL2_VA ] ="SMMU_CMD_TLBI_EL2_VA" , + [SMMU_CMD_TLBI_EL2_VAA ] ="SMMU_CMD_TLBI_EL2_VAA" , + [SMMU_CMD_TLBI_S12_VMALL ] ="SMMU_CMD_TLBI_S12_VMALL" , + [SMMU_CMD_TLBI_S2_IPA ] ="SMMU_CMD_TLBI_S2_IPA" , + [SMMU_CMD_TLBI_NSNH_ALL ] ="SMMU_CMD_TLBI_NSNH_ALL" , + [SMMU_CMD_ATC_INV ] ="SMMU_CMD_ATC_INV" , + [SMMU_CMD_PRI_RESP ] ="SMMU_CMD_PRI_RESP" , + [SMMU_CMD_RESUME ] ="SMMU_CMD_RESUME" , + [SMMU_CMD_STALL_TERM ] ="SMMU_CMD_STALL_TERM" , + [SMMU_CMD_SYNC ] ="SMMU_CMD_SYNC" , +}; + +#define SMMU_CMD_STRING (type) ( \ +(type < ARRAY_SIZE(cmd_stringify)) ? cmd_stringify[type] : "UNKNOWN" \ +) + +/* CMDQ fields */ + +typedef enum { +SMMU_CERROR_NONE =0 , +SMMU_CERROR_ILL , +SMMU_CERROR_ABT , +SMMU_CERROR_ATC_INV_SYNC , +}SMMUCmdError ; + +enum {/* Command completion notification */ +CMD_SYNC_SIG_NONE , +CMD_SYNC_SIG_IRQ , +CMD_SYNC_SIG_SEV , +}; + +#define CMD_TYPE (x) extract32((x)->word[0], 0 , 8) +#define CMD_SSEC (x) extract32((x)->word[0], 10, 1) +#define CMD_SSV (x) extract32((x)->word[0], 11, 1) +#define CMD_RESUME_AC (x) extract32((x)->word[0], 12, 1) +#define CMD_RESUME_AB (x) extract32((x)->word[0], 13, 1) +#define CMD_SYNC_CS (x) extract32((x)->word[0], 12, 2) +#define CMD_SSID (x) extract32((x)->word[0], 12, 20) +#define CMD_SID (x) ((x)->word[1]) +#define CMD_VMID (x) extract32((x)->word[1], 0 , 16) +#define CMD_ASID (x) extract32((x)->word[1], 16, 16) +#define CMD_RESUME_STAG (x) extract32((x)->word[2], 0 , 16) +#define CMD_RESP (x) extract32((x)->word[2], 11, 2) +#define CMD_LEAF (x) extract32((x)->word[2], 0 , 1) +#define CMD_STE_RANGE (x) extract32((x)->word[2], 0 , 5) +#define CMD_ADDR (x) ({ \ + uint64_t high = (uint64_t)(x)->word[3]; \ + uint64_t low = extract32((x)->word[2], 12, 20); \ + uint64_t addr = high << 32 | (low << 12); \ + addr; \ + }) + +int smmuv3_cmdq_consume (SMMUv3State *s); +#endif
hw/arm/smmuv3.c +162 -0
174 lines not on this page · raw message
hw/arm/trace-events +4 -0
@@ -18,3 +18,7 @@ smmuv3_read_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" va smmuv3_trigger_irq(int irq) "irq=%d" smmuv3_write_gerror(uint32_t toggled, uint32_t gerror) "toggled=0x%x, new gerror=0x%x" smmuv3_write_gerrorn(uint32_t acked, uint32_t gerrorn) "acked=0x%x, new gerrorn=0x%x" +smmuv3_unhandled_cmd(uint32_t type) "Unhandled command type=%d" +smmuv3_cmdq_consume(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod=%d cons=%d prod.wrap=%d cons.wrap=%d" +smmuv3_cmdq_opcode(const char *opcode) "<--- %s" +smmuv3_cmdq_consume_out(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod:%d, cons:%d, prod_wrap:%d, cons_wrap:%d "
Signature · 1 line
2.5.5
Re: [Qemu-arm] [PATCH v9 06/14] hw/arm/smmuv3: Queue helpers
Quoted 33 lines · Eric Auger
We introduce helpers to read/write into the command and event circular queues.
smmuv3_write_eventqandsmmuv3_cmq_consumewill become static in subsequent patches.Invalidation commands are not yet dealt with. We do not cache data that need to be invalidated. This will change with vhost integration.
Signed-off-by Eric Auger <[email protected]>---
v8 -> v9:
- fixCMD_SSID&CMD_ADDR+ some renamings
- do cons increment after the execution of the command
- addQ_INCONSISTENT()v7 -> v8
- useaddress_space_rw
- helpers inspired from spec--- hw/arm/smmuv3-internal.h | 150 +++++++++++++++++++++++++++++++++++++++++++ hw/arm/smmuv3.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++ hw/arm/trace-events | 4 ++ 3 files changed, 316 insertions(+)hw/arm/smmuv3-internal.h +0
-0
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 168
Quoted 7 lines
hw/arm/smmuv3-internal.h +4
-0@@ -162,4 +162,154 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask);void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t gerrorn); +/* Queue Handling */ + +#define LOG2SIZE (q) extract64((q)->base, 0, 5) +#define BASE (q) ((q)->base & SMMU_BASE_ADDR_MASK)
These are both very generic names for things in header files.
Looking at the required behaviour of the *_BASE registers, if the LOG2SIZE field is written to a value larger than the maximum, it is supposed to read back as the value written but must behave as if it was set to the maximum. That suggests to me that your SMMUQueue struct should have a "log2size" field which is set when the guest writes to *_BASE (which is where you can cap it to the max value).
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 171
Quoted 3 lines
hw/arm/smmuv3-internal.h +3
-0+#define WRAP_MASK (q) (1 << LOG2SIZE(q)) +#define INDEX_MASK (q) ((1 << LOG2SIZE(q)) - 1) +#define WRAP_INDEX_MASK (q) ((1 << (LOG2SIZE(q) + 1)) - 1)
WRAP_INDEX_MASK is unused (but see below for a possible use)
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 179
Quoted 8 lines
hw/arm/smmuv3-internal.h +8
-0+ +#define Q_CONS_ENTRY (q) (BASE(q) + \ + (q)->entry_size * ((q)->cons & INDEX_MASK(q))) +#define Q_PROD_ENTRY (q) (BASE(q) + \ + (q)->entry_size * ((q)->prod & INDEX_MASK(q))) + +#define Q_CONS (q) ((q)->cons & INDEX_MASK(q)) +#define Q_PROD (q) ((q)->prod & INDEX_MASK(q))
If you put these a bit earlier you can use them in the definitions of Q_CONS_ENTRY and Q_PROD_ENTRY.
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 188
Quoted 9 lines
hw/arm/smmuv3-internal.h +9
-0+ +#define Q_CONS_WRAP (q) (((q)->cons & WRAP_MASK(q)) >> LOG2SIZE(q)) +#define Q_PROD_WRAP (q) (((q)->prod & WRAP_MASK(q)) >> LOG2SIZE(q)) + +#define Q_FULL (q) \ + (((((q)->cons) & INDEX_MASK(q)) == \ + (((q)->prod) & INDEX_MASK(q))) && \ + ((((q)->cons) & WRAP_MASK(q)) != \ + (((q)->prod) & WRAP_MASK(q))))
You could write this as
((cons ^ prod) & WRAP_INDEX_MASK) == WRAP_MASK
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 194
Quoted 6 lines
hw/arm/smmuv3-internal.h +6
-0+ +#define Q_EMPTY (q) \ + (((((q)->cons) & INDEX_MASK(q)) == \ + (((q)->prod) & INDEX_MASK(q))) && \ + ((((q)->cons) & WRAP_MASK(q)) == \ + (((q)->prod) & WRAP_MASK(q))))
and this as
(cons & WRAP_INDEX_MASK) == (prod & WRAP_INDEX_MASK)
(or as ((cons ^ prod) & WRAP_INDEX_MASK) == 0, but that's unnecessarily obscure I think.)
This is all a bit macro-heavy. Do these really all need to be macros rather than functions?
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 201
Quoted 7 lines
hw/arm/smmuv3-internal.h +7
-0+ +#define Q_INCONSISTENT (q) \ +((((((q)->prod) & INDEX_MASK(q)) > (((q)->cons) & INDEX_MASK(q))) && \ +((((q)->prod) & WRAP_MASK(q)) != (((q)->cons) & WRAP_MASK(q)))) || \ +(((((q)->prod) & INDEX_MASK(q)) < (((q)->cons) & INDEX_MASK(q))) && \ +((((q)->prod) & WRAP_MASK(q)) == (((q)->cons) & WRAP_MASK(q))))) \ +
This never seems to be used. (Also it has a stray trailing '\', and isn't indented very clearly.
Quoted 64 lines
hw/arm/smmuv3-internal.h +64
-0+#define SMMUV3_CMDQ_ENABLED (s) \ + (FIELD_EX32(s->cr[0], CR0, CMDQEN)) + +#define SMMUV3_EVENTQ_ENABLED (s) \ + (FIELD_EX32(s->cr[0], CR0, EVENTQEN)) + +static inline void smmu_write_cmdq_err (SMMUv3State *s,uint32_t err_type) +{ + s->cmdq.cons =FIELD_DP32 (s->cmdq.cons,CMDQ_CONS ,ERR , err_type); +} + +void smmuv3_write_eventq (SMMUv3State *s,Evt *evt); + +/* Commands */ + +enum { +SMMU_CMD_PREFETCH_CONFIG =0x01 , +SMMU_CMD_PREFETCH_ADDR , +SMMU_CMD_CFGI_STE , +SMMU_CMD_CFGI_STE_RANGE , +SMMU_CMD_CFGI_CD , +SMMU_CMD_CFGI_CD_ALL , +SMMU_CMD_CFGI_ALL , +SMMU_CMD_TLBI_NH_ALL =0x10 , +SMMU_CMD_TLBI_NH_ASID , +SMMU_CMD_TLBI_NH_VA , +SMMU_CMD_TLBI_NH_VAA , +SMMU_CMD_TLBI_EL3_ALL =0x18 , +SMMU_CMD_TLBI_EL3_VA =0x1a , +SMMU_CMD_TLBI_EL2_ALL =0x20 , +SMMU_CMD_TLBI_EL2_ASID , +SMMU_CMD_TLBI_EL2_VA , +SMMU_CMD_TLBI_EL2_VAA ,/* 0x23 */ +SMMU_CMD_TLBI_S12_VMALL =0x28 , +SMMU_CMD_TLBI_S2_IPA =0x2a , +SMMU_CMD_TLBI_NSNH_ALL =0x30 , +SMMU_CMD_ATC_INV =0x40 , +SMMU_CMD_PRI_RESP , +SMMU_CMD_RESUME =0x44 , +SMMU_CMD_STALL_TERM , +SMMU_CMD_SYNC ,/* 0x46 */ +}; + +static const char *cmd_stringify[] = { + [SMMU_CMD_PREFETCH_CONFIG ] ="SMMU_CMD_PREFETCH_CONFIG" , + [SMMU_CMD_PREFETCH_ADDR ] ="SMMU_CMD_PREFETCH_ADDR" , + [SMMU_CMD_CFGI_STE ] ="SMMU_CMD_CFGI_STE" , + [SMMU_CMD_CFGI_STE_RANGE ] ="SMMU_CMD_CFGI_STE_RANGE" , + [SMMU_CMD_CFGI_CD ] ="SMMU_CMD_CFGI_CD" , + [SMMU_CMD_CFGI_CD_ALL ] ="SMMU_CMD_CFGI_CD_ALL" , + [SMMU_CMD_CFGI_ALL ] ="SMMU_CMD_CFGI_ALL" , + [SMMU_CMD_TLBI_NH_ALL ] ="SMMU_CMD_TLBI_NH_ALL" , + [SMMU_CMD_TLBI_NH_ASID ] ="SMMU_CMD_TLBI_NH_ASID" , + [SMMU_CMD_TLBI_NH_VA ] ="SMMU_CMD_TLBI_NH_VA" , + [SMMU_CMD_TLBI_NH_VAA ] ="SMMU_CMD_TLBI_NH_VAA" , + [SMMU_CMD_TLBI_EL3_ALL ] ="SMMU_CMD_TLBI_EL3_ALL" , + [SMMU_CMD_TLBI_EL3_VA ] ="SMMU_CMD_TLBI_EL3_VA" , + [SMMU_CMD_TLBI_EL2_ALL ] ="SMMU_CMD_TLBI_EL2_ALL" , + [SMMU_CMD_TLBI_EL2_ASID ] ="SMMU_CMD_TLBI_EL2_ASID" , + [SMMU_CMD_TLBI_EL2_VA ] ="SMMU_CMD_TLBI_EL2_VA" , + [SMMU_CMD_TLBI_EL2_VAA ] ="SMMU_CMD_TLBI_EL2_VAA" , + [SMMU_CMD_TLBI_S12_VMALL ] ="SMMU_CMD_TLBI_S12_VMALL" , + [SMMU_CMD_TLBI_S2_IPA ] ="SMMU_CMD_TLBI_S2_IPA" , + [SMMU_CMD_TLBI_NSNH_ALL ] ="SMMU_CMD_TLBI_NSNH_ALL" ,
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 275
Quoted 10 lines
hw/arm/smmuv3-internal.h +10
-0+ [SMMU_CMD_ATC_INV] = "SMMU_CMD_ATC_INV", + [SMMU_CMD_PRI_RESP] = "SMMU_CMD_PRI_RESP", + [SMMU_CMD_RESUME] = "SMMU_CMD_RESUME", + [SMMU_CMD_STALL_TERM] = "SMMU_CMD_STALL_TERM", + [SMMU_CMD_SYNC] = "SMMU_CMD_SYNC", +}; + +#define SMMU_CMD_STRING (type) ( \ +(type < ARRAY_SIZE(cmd_stringify)) ? cmd_stringify[type] : "UNKNOWN" \ +)
If this was a function you'd know what the type of 'type' is and so whether it needed to have a >= 0 check on it. Also it will hand you a NULL pointer for a value that's inside the array size but not initialized, like 0x24.
Quoted 49 lines
hw/arm/smmuv3-internal.h +39
-0+ +/* CMDQ fields */ + +typedef enum { +SMMU_CERROR_NONE =0 , +SMMU_CERROR_ILL , +SMMU_CERROR_ABT , +SMMU_CERROR_ATC_INV_SYNC , +}SMMUCmdError ; + +enum {/* Command completion notification */ +CMD_SYNC_SIG_NONE , +CMD_SYNC_SIG_IRQ , +CMD_SYNC_SIG_SEV , +}; + +#define CMD_TYPE (x) extract32((x)->word[0], 0 , 8) +#define CMD_SSEC (x) extract32((x)->word[0], 10, 1) +#define CMD_SSV (x) extract32((x)->word[0], 11, 1) +#define CMD_RESUME_AC (x) extract32((x)->word[0], 12, 1) +#define CMD_RESUME_AB (x) extract32((x)->word[0], 13, 1) +#define CMD_SYNC_CS (x) extract32((x)->word[0], 12, 2) +#define CMD_SSID (x) extract32((x)->word[0], 12, 20) +#define CMD_SID (x) ((x)->word[1]) +#define CMD_VMID (x) extract32((x)->word[1], 0 , 16) +#define CMD_ASID (x) extract32((x)->word[1], 16, 16) +#define CMD_RESUME_STAG (x) extract32((x)->word[2], 0 , 16) +#define CMD_RESP (x) extract32((x)->word[2], 11, 2) +#define CMD_LEAF (x) extract32((x)->word[2], 0 , 1) +#define CMD_STE_RANGE (x) extract32((x)->word[2], 0 , 5) +#define CMD_ADDR (x) ({ \ + uint64_t high = (uint64_t)(x)->word[3]; \ + uint64_t low = extract32((x)->word[2], 12, 20); \ + uint64_t addr = high << 32 | (low << 12); \ + addr; \ + }) + +int smmuv3_cmdq_consume (SMMUv3State *s); +#endif hw/arm/smmuv3.c +1
-0@@ -94,6 +94,72 @@ void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn)trace_smmuv3_write_gerrorn (acked, s->gerrorn); } +static uint32_t queue_index_inc(uint32_t val,
hw/arm/smmuv3.c void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn) · line 107
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+ uint32_t qidx_mask, uint32_t qwrap_mask) +{ + uint32_t i = (val + 1) & qidx_mask; + +if (i <= (val & qidx_mask)) { + i = ((val & qwrap_mask) ^ qwrap_mask) | i; + }else { + i = (val & qwrap_mask) | i; + } +return i;
This is unnecessarily complicated -- an index increment is just
val = (val + 1) & INDEX_WRAP_MASK;
which will automatically flip the wrap bit as required.
hw/arm/smmuv3.c void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn) · line 112
Quoted 5 lines
hw/arm/smmuv3.c +5
-0+} + +static inline void queue_prod_incr (SMMUQueue *q) +{ + q->prod =queue_index_inc (q->prod,INDEX_MASK (q),WRAP_MASK (q));
Doesn't this trash the ERR code in bits [30:24], or are you keeping that somewhere else for efficiency?
hw/arm/smmuv3.c void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn) · line 125
Quoted 13 lines
hw/arm/smmuv3.c +13
-0+} + +static inline void queue_cons_incr (SMMUQueue *q) +{ + q->cons =queue_index_inc (q->cons,INDEX_MASK (q),WRAP_MASK (q)); +} + +static inline MemTxResult queue_read (SMMUQueue *q,void *data) +{ +dma_addr_t addr =Q_CONS_ENTRY (q); + +return dma_memory_read (&address_space_memory, addr, + (uint8_t *)data, q->entry_size);
Does the compiler complain if you don't provide this cast?
hw/arm/smmuv3.c void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn) · line 136
Quoted 11 lines
hw/arm/smmuv3.c +11
-0+} + +static void queue_write (SMMUQueue *q,void *data) +{ +dma_addr_t addr =Q_PROD_ENTRY (q); +MemTxResult ret; + + ret =dma_memory_write (&address_space_memory, addr, + (uint8_t *)data, q->entry_size); +if (ret !=MEMTX_OK ) { +return ;
Shouldn't we record or return this error to the caller, like queue_read() does, rather than throwing it away? I think that for the event queue (which is the only user here ) this should cause an EVENTQ_ABT_ERR.
hw/arm/smmuv3.c void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn) · line 146
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+ } + +queue_prod_incr (q); +} + +void smmuv3_write_eventq (SMMUv3State *s,Evt *evt) +{ +SMMUQueue *q = &s->eventq; +bool q_empty =Q_EMPTY (q); +bool q_full =Q_FULL (q);
You only use these once each, and they're not very complicated expressions, so you might as well just have the uses be "if (Q_FULL(q)) { ..." &c.
Quoted 24 lines
hw/arm/smmuv3.c +17
-0+ +if (!SMMUV3_EVENTQ_ENABLED (s)) { +return ; + } + +if (q_full) { +return ; + } + +queue_write (q, evt); + +if (q_empty) { +smmuv3_trigger_irq (s,SMMU_IRQ_EVTQ ,0 ); + } +} +static void smmuv3_init_regs (SMMUv3State *s) {/** @@ -133,6 +199,102 @@ static void smmuv3_init_regs(SMMUv3State *s) s->sid_split =0 ; } +int smmuv3_cmdq_consume (SMMUv3State *s)
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 212
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+{ +SMMUCmdError cmd_error =SMMU_CERROR_NONE ; +SMMUQueue *q = &s->cmdq; +uint32_t type =0 ; + +if (!SMMUV3_CMDQ_ENABLED (s)) { +return 0 ; + } +/* +* some commands depend on register values, as above. In case those
Where is "as above" referring to ?
Quoted 49 lines
hw/arm/smmuv3.c +49
-0+* register values change while handling the command, spec says it +* is UNPREDICTABLE whether the command is interpreted under the new +* or old value. +*/ + +while (!Q_EMPTY (q)) { +uint32_t pending = s->gerror ^ s->gerrorn; +Cmd cmd; + +trace_smmuv3_cmdq_consume (Q_PROD (q),Q_CONS (q), +Q_PROD_WRAP (q),Q_CONS_WRAP (q)); + +if (FIELD_EX32 (pending,GERROR ,CMDQ_ERR )) { +break ; + } + +if (queue_read (q, &cmd) !=MEMTX_OK ) { + cmd_error =SMMU_CERROR_ABT ; +break ; + } + + type =CMD_TYPE (&cmd); + +trace_smmuv3_cmdq_opcode (SMMU_CMD_STRING (type)); + +switch (type) { +case SMMU_CMD_SYNC : +if (CMD_SYNC_CS (&cmd) &CMD_SYNC_SIG_IRQ ) { +smmuv3_trigger_irq (s,SMMU_IRQ_CMD_SYNC ,0 ); + } +break ; +case SMMU_CMD_PREFETCH_CONFIG : +case SMMU_CMD_PREFETCH_ADDR : +case SMMU_CMD_CFGI_STE : +case SMMU_CMD_CFGI_STE_RANGE :/* same as SMMU_CMD_CFGI_ALL */ +case SMMU_CMD_CFGI_CD : +case SMMU_CMD_CFGI_CD_ALL : +case SMMU_CMD_TLBI_NH_ALL : +case SMMU_CMD_TLBI_NH_ASID : +case SMMU_CMD_TLBI_NH_VA : +case SMMU_CMD_TLBI_NH_VAA : +case SMMU_CMD_TLBI_EL3_ALL : +case SMMU_CMD_TLBI_EL3_VA : +case SMMU_CMD_TLBI_EL2_ALL : +case SMMU_CMD_TLBI_EL2_ASID : +case SMMU_CMD_TLBI_EL2_VA : +case SMMU_CMD_TLBI_EL2_VAA : +case SMMU_CMD_TLBI_S12_VMALL : +case SMMU_CMD_TLBI_S2_IPA :
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 271
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+case SMMU_CMD_TLBI_NSNH_ALL : +case SMMU_CMD_ATC_INV : +case SMMU_CMD_PRI_RESP : +case SMMU_CMD_RESUME : +case SMMU_CMD_STALL_TERM : +trace_smmuv3_unhandled_cmd (type); +break ; +default : + cmd_error =SMMU_CERROR_ILL ; +error_report ("Illegal command type: %d" ,CMD_TYPE (&cmd));
This isn't what error_report() is for. You can log it as a GUEST_ERROR.
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 279
Quoted 8 lines
hw/arm/smmuv3.c +8
-0+break ; + } +if (cmd_error) { +break ; + } +/* +* We only increment the cons index after the completion of +* the command. We do that because the SYNC returns immediatly
"immediately"
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 280
Quoted 1 line
hw/arm/smmuv3.c +1
-0+* and do not check the completion of previous commands
"does not"
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 287
Quoted 7 lines
hw/arm/smmuv3.c +7
-0+*/ +queue_cons_incr (q); + } + +if (cmd_error) { +error_report ("Error on %s command execution: %d" , +SMMU_CMD_STRING (type), cmd_error);
Again, not error_report(). Probably a good location for a trace_ point.
Quoted 26 lines
hw/arm/smmuv3.c +10
-0+smmu_write_cmdq_err (s, cmd_error); +smmuv3_trigger_irq (s,SMMU_IRQ_GERROR ,R_GERROR_CMDQ_ERR_MASK ); + } + +trace_smmuv3_cmdq_consume_out (Q_PROD (q),Q_CONS (q), +Q_PROD_WRAP (q),Q_CONS_WRAP (q)); + +return 0 ; +} +static void smmu_write_mmio (void *opaque,hwaddr addr,uint64_t val,unsigned size) {hw/arm/trace-events +4
-1@@ -18,3 +18,7 @@ smmuv3_read_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" va smmuv3_trigger_irq(int irq) "irq=%d" smmuv3_write_gerror(uint32_t toggled, uint32_t gerror) "toggled=0x%x, new gerror=0x%x" smmuv3_write_gerrorn(uint32_t acked, uint32_t gerrorn) "acked=0x%x, new gerrorn=0x%x" +smmuv3_unhandled_cmd(uint32_t type) "Unhandled command type=%d" +smmuv3_cmdq_consume(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod=%d cons=%d prod.wrap=%d cons.wrap=%d" +smmuv3_cmdq_opcode(const char *opcode) "<--- %s" +smmuv3_cmdq_consume_out(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod:%d, cons:%d, prod_wrap:%d, cons_wrap:%d " --
Quoted 2 lines
2.5.5
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 06/14] hw/arm/smmuv3: Queue helpers
Hi Peter,
Quoted 37 lines · Peter Maydell
Quoted 36 lines · Eric Auger
We introduce helpers to read/write into the command and event circular queues.
smmuv3_write_eventqandsmmuv3_cmq_consumewill become static in subsequent patches.Invalidation commands are not yet dealt with. We do not cache data that need to be invalidated. This will change with vhost integration.
Signed-off-by Eric Auger <[email protected]>---
v8 -> v9:
- fixCMD_SSID&CMD_ADDR+ some renamings
- do cons increment after the execution of the command
- addQ_INCONSISTENT()v7 -> v8
- useaddress_space_rw
- helpers inspired from spec--- hw/arm/smmuv3-internal.h | 150 +++++++++++++++++++++++++++++++++++++++++++ hw/arm/smmuv3.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++ hw/arm/trace-events | 4 ++ 3 files changed, 316 insertions(+)hw/arm/smmuv3-internal.h +0
-0@@ -162,4 +162,154 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask);void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t gerrorn);
Quoted 4 lines
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 168
Quoted 4 lines
hw/arm/smmuv3-internal.h +4
-0+/* Queue Handling */ + +#define LOG2SIZE (q) extract64((q)->base, 0, 5) +#define BASE (q) ((q)->base & SMMU_BASE_ADDR_MASK)
renamed Q_LOG2SIZE and Q_BASE respectively
Quoted 10 lines
These are both very generic names for things in header files.
Looking at the required behaviour of the
*_BASEregisters, if the LOG2SIZE field is written to a value larger than the maximum, it is supposed to read back as the value written but must behave as if it was set to the maximum. That suggests to me that your SMMUQueue struct should have a "log2size" field which is set when the guest writes to*_BASE(which is where you can cap it to the max value).
done
Quoted 6 lines
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 171
Quoted 4 lines
hw/arm/smmuv3-internal.h +3
-0+#define WRAP_MASK (q) (1 << LOG2SIZE(q)) +#define INDEX_MASK (q) ((1 << LOG2SIZE(q)) - 1) +#define WRAP_INDEX_MASK (q) ((1 << (LOG2SIZE(q) + 1)) - 1)
WRAP_INDEX_MASKis unused (but see below for a possible use)
kept and adopted your suggestions below
Quoted 12 lines
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 179
Quoted 9 lines
hw/arm/smmuv3-internal.h +8
-0+ +#define Q_CONS_ENTRY (q) (BASE(q) + \ + (q)->entry_size * ((q)->cons & INDEX_MASK(q))) +#define Q_PROD_ENTRY (q) (BASE(q) + \ + (q)->entry_size * ((q)->prod & INDEX_MASK(q))) + +#define Q_CONS (q) ((q)->cons & INDEX_MASK(q)) +#define Q_PROD (q) ((q)->prod & INDEX_MASK(q))If you put these a bit earlier you can use them in the definitions of
Q_CONS_ENTRYandQ_PROD_ENTRY.
done
Quoted 13 lines
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 188
Quoted 10 lines
hw/arm/smmuv3-internal.h +9
-0+ +#define Q_CONS_WRAP (q) (((q)->cons & WRAP_MASK(q)) >> LOG2SIZE(q)) +#define Q_PROD_WRAP (q) (((q)->prod & WRAP_MASK(q)) >> LOG2SIZE(q)) + +#define Q_FULL (q) \ + (((((q)->cons) & INDEX_MASK(q)) == \ + (((q)->prod) & INDEX_MASK(q))) && \ + ((((q)->cons) & WRAP_MASK(q)) != \ + (((q)->prod) & WRAP_MASK(q))))You could write this as
((cons ^ prod) &WRAP_INDEX_MASK) ==WRAP_MASK
done
Quoted 10 lines
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 194
Quoted 7 lines
hw/arm/smmuv3-internal.h +6
-0+ +#define Q_EMPTY (q) \ + (((((q)->cons) & INDEX_MASK(q)) == \ + (((q)->prod) & INDEX_MASK(q))) && \ + ((((q)->cons) & WRAP_MASK(q)) == \ + (((q)->prod) & WRAP_MASK(q))))and this as
(cons &WRAP_INDEX_MASK) == (prod &WRAP_INDEX_MASK)
done
Quoted 8 lines
(or as ((cons ^ prod) &
WRAP_INDEX_MASK) == 0, but that's unnecessarily obscure I think.)This is all a bit macro-heavy. Do these really all need to be macros rather than functions?
Quoted 10 lines
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 201
Quoted 7 lines
hw/arm/smmuv3-internal.h +7
-0+ +#define Q_INCONSISTENT (q) \ +((((((q)->prod) & INDEX_MASK(q)) > (((q)->cons) & INDEX_MASK(q))) && \ +((((q)->prod) & WRAP_MASK(q)) != (((q)->cons) & WRAP_MASK(q)))) || \ +(((((q)->prod) & INDEX_MASK(q)) < (((q)->cons) & INDEX_MASK(q))) && \ +((((q)->prod) & WRAP_MASK(q)) == (((q)->cons) & WRAP_MASK(q))))) \ +This never seems to be used. (Also it has a stray trailing '\', and isn't indented very clearly.
removed
Quoted 6 lines
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 206
Quoted 6 lines
hw/arm/smmuv3-internal.h +5
-0+#define SMMUV3_CMDQ_ENABLED (s) \ + (FIELD_EX32(s->cr[0], CR0, CMDQEN)) + +#define SMMUV3_EVENTQ_ENABLED (s) \ + (FIELD_EX32(s->cr[0], CR0, EVENTQEN))
Those were moved to static inline functions
Quoted 66 lines
Quoted 66 lines
hw/arm/smmuv3-internal.h +66
-0+ +static inline void smmu_write_cmdq_err (SMMUv3State *s,uint32_t err_type) +{ + s->cmdq.cons =FIELD_DP32 (s->cmdq.cons,CMDQ_CONS ,ERR , err_type); +} + +void smmuv3_write_eventq (SMMUv3State *s,Evt *evt); + +/* Commands */ + +enum { +SMMU_CMD_PREFETCH_CONFIG =0x01 , +SMMU_CMD_PREFETCH_ADDR , +SMMU_CMD_CFGI_STE , +SMMU_CMD_CFGI_STE_RANGE , +SMMU_CMD_CFGI_CD , +SMMU_CMD_CFGI_CD_ALL , +SMMU_CMD_CFGI_ALL , +SMMU_CMD_TLBI_NH_ALL =0x10 , +SMMU_CMD_TLBI_NH_ASID , +SMMU_CMD_TLBI_NH_VA , +SMMU_CMD_TLBI_NH_VAA , +SMMU_CMD_TLBI_EL3_ALL =0x18 , +SMMU_CMD_TLBI_EL3_VA =0x1a , +SMMU_CMD_TLBI_EL2_ALL =0x20 , +SMMU_CMD_TLBI_EL2_ASID , +SMMU_CMD_TLBI_EL2_VA , +SMMU_CMD_TLBI_EL2_VAA ,/* 0x23 */ +SMMU_CMD_TLBI_S12_VMALL =0x28 , +SMMU_CMD_TLBI_S2_IPA =0x2a , +SMMU_CMD_TLBI_NSNH_ALL =0x30 , +SMMU_CMD_ATC_INV =0x40 , +SMMU_CMD_PRI_RESP , +SMMU_CMD_RESUME =0x44 , +SMMU_CMD_STALL_TERM , +SMMU_CMD_SYNC ,/* 0x46 */ +}; + +static const char *cmd_stringify[] = { + [SMMU_CMD_PREFETCH_CONFIG ] ="SMMU_CMD_PREFETCH_CONFIG" , + [SMMU_CMD_PREFETCH_ADDR ] ="SMMU_CMD_PREFETCH_ADDR" , + [SMMU_CMD_CFGI_STE ] ="SMMU_CMD_CFGI_STE" , + [SMMU_CMD_CFGI_STE_RANGE ] ="SMMU_CMD_CFGI_STE_RANGE" , + [SMMU_CMD_CFGI_CD ] ="SMMU_CMD_CFGI_CD" , + [SMMU_CMD_CFGI_CD_ALL ] ="SMMU_CMD_CFGI_CD_ALL" , + [SMMU_CMD_CFGI_ALL ] ="SMMU_CMD_CFGI_ALL" , + [SMMU_CMD_TLBI_NH_ALL ] ="SMMU_CMD_TLBI_NH_ALL" , + [SMMU_CMD_TLBI_NH_ASID ] ="SMMU_CMD_TLBI_NH_ASID" , + [SMMU_CMD_TLBI_NH_VA ] ="SMMU_CMD_TLBI_NH_VA" , + [SMMU_CMD_TLBI_NH_VAA ] ="SMMU_CMD_TLBI_NH_VAA" , + [SMMU_CMD_TLBI_EL3_ALL ] ="SMMU_CMD_TLBI_EL3_ALL" , + [SMMU_CMD_TLBI_EL3_VA ] ="SMMU_CMD_TLBI_EL3_VA" , + [SMMU_CMD_TLBI_EL2_ALL ] ="SMMU_CMD_TLBI_EL2_ALL" , + [SMMU_CMD_TLBI_EL2_ASID ] ="SMMU_CMD_TLBI_EL2_ASID" , + [SMMU_CMD_TLBI_EL2_VA ] ="SMMU_CMD_TLBI_EL2_VA" , + [SMMU_CMD_TLBI_EL2_VAA ] ="SMMU_CMD_TLBI_EL2_VAA" , + [SMMU_CMD_TLBI_S12_VMALL ] ="SMMU_CMD_TLBI_S12_VMALL" , + [SMMU_CMD_TLBI_S2_IPA ] ="SMMU_CMD_TLBI_S2_IPA" , + [SMMU_CMD_TLBI_NSNH_ALL ] ="SMMU_CMD_TLBI_NSNH_ALL" , + [SMMU_CMD_ATC_INV ] ="SMMU_CMD_ATC_INV" , + [SMMU_CMD_PRI_RESP ] ="SMMU_CMD_PRI_RESP" , + [SMMU_CMD_RESUME ] ="SMMU_CMD_RESUME" , + [SMMU_CMD_STALL_TERM ] ="SMMU_CMD_STALL_TERM" , + [SMMU_CMD_SYNC ] ="SMMU_CMD_SYNC" , +}; +
Quoted 8 lines
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 275
Quoted 3 lines
hw/arm/smmuv3-internal.h +3
-0+#define SMMU_CMD_STRING (type) ( \ +(type < ARRAY_SIZE(cmd_stringify)) ? cmd_stringify[type] : "UNKNOWN" \ +)If this was a function you'd know what the type of 'type' is and so whether it needed to have a >= 0 check on it. Also it will hand you a NULL pointer for a value that's inside the array size but not initialized, like
0x24.
OK
Quoted 49 lines
Quoted 49 lines
hw/arm/smmuv3-internal.h +39
-0+ +/* CMDQ fields */ + +typedef enum { +SMMU_CERROR_NONE =0 , +SMMU_CERROR_ILL , +SMMU_CERROR_ABT , +SMMU_CERROR_ATC_INV_SYNC , +}SMMUCmdError ; + +enum {/* Command completion notification */ +CMD_SYNC_SIG_NONE , +CMD_SYNC_SIG_IRQ , +CMD_SYNC_SIG_SEV , +}; + +#define CMD_TYPE (x) extract32((x)->word[0], 0 , 8) +#define CMD_SSEC (x) extract32((x)->word[0], 10, 1) +#define CMD_SSV (x) extract32((x)->word[0], 11, 1) +#define CMD_RESUME_AC (x) extract32((x)->word[0], 12, 1) +#define CMD_RESUME_AB (x) extract32((x)->word[0], 13, 1) +#define CMD_SYNC_CS (x) extract32((x)->word[0], 12, 2) +#define CMD_SSID (x) extract32((x)->word[0], 12, 20) +#define CMD_SID (x) ((x)->word[1]) +#define CMD_VMID (x) extract32((x)->word[1], 0 , 16) +#define CMD_ASID (x) extract32((x)->word[1], 16, 16) +#define CMD_RESUME_STAG (x) extract32((x)->word[2], 0 , 16) +#define CMD_RESP (x) extract32((x)->word[2], 11, 2) +#define CMD_LEAF (x) extract32((x)->word[2], 0 , 1) +#define CMD_STE_RANGE (x) extract32((x)->word[2], 0 , 5) +#define CMD_ADDR (x) ({ \ + uint64_t high = (uint64_t)(x)->word[3]; \ + uint64_t low = extract32((x)->word[2], 12, 20); \ + uint64_t addr = high << 32 | (low << 12); \ + addr; \ + }) + +int smmuv3_cmdq_consume (SMMUv3State *s); +#endif hw/arm/smmuv3.c +0
-0@@ -94,6 +94,72 @@ void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn)trace_smmuv3_write_gerrorn (acked, s->gerrorn); }
Quoted 16 lines
hw/arm/smmuv3.c void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn) · line 107
Quoted 11 lines
hw/arm/smmuv3.c +11
-0+static uint32_t queue_index_inc (uint32_t val, +uint32_t qidx_mask,uint32_t qwrap_mask) +{ +uint32_t i = (val +1 ) & qidx_mask; + +if (i <= (val & qidx_mask)) { + i = ((val & qwrap_mask) ^ qwrap_mask) | i; + }else { + i = (val & qwrap_mask) | i; + } +return i;This is unnecessarily complicated -- an index increment is just
val = (val + 1) &INDEX_WRAP_MASK;
which will automatically flip the wrap bit as required.
OK
Quoted 8 lines
hw/arm/smmuv3.c void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn) · line 112
Quoted 5 lines
hw/arm/smmuv3.c +5
-0+} + +static inline void queue_prod_incr (SMMUQueue *q) +{ + q->prod =queue_index_inc (q->prod,INDEX_MASK (q),WRAP_MASK (q));Doesn't this trash the ERR code in bits [30:24], or are you keeping that somewhere else for efficiency?
in case there is an error we don't increment. But switching to deposit32 as it looks saner.
Quoted 16 lines
Quoted 4 lines
hw/arm/smmuv3.c +3
-0+} + +static inline void queue_cons_incr (SMMUQueue *q)hw/arm/smmuv3.c void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn) · line 125
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+{ + q->cons =queue_index_inc (q->cons,INDEX_MASK (q),WRAP_MASK (q)); +} + +static inline MemTxResult queue_read (SMMUQueue *q,void *data) +{ +dma_addr_t addr =Q_CONS_ENTRY (q); + +return dma_memory_read (&address_space_memory, addr, + (uint8_t *)data, q->entry_size);Does the compiler complain if you don't provide this cast?
no
Quoted 17 lines
hw/arm/smmuv3.c void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn) · line 136
Quoted 12 lines
hw/arm/smmuv3.c +11
-0+} + +static void queue_write (SMMUQueue *q,void *data) +{ +dma_addr_t addr =Q_PROD_ENTRY (q); +MemTxResult ret; + + ret =dma_memory_write (&address_space_memory, addr, + (uint8_t *)data, q->entry_size); +if (ret !=MEMTX_OK ) { +return ;Shouldn't we record or return this error to the caller, like
queue_read()does, rather than throwing it away? I think that for the event queue (which is the only user here ) this should cause anEVENTQ_ABT_ERR.
done
Quoted 15 lines
hw/arm/smmuv3.c void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn) · line 146
Quoted 11 lines
hw/arm/smmuv3.c +10
-0+ } + +queue_prod_incr (q); +} + +void smmuv3_write_eventq (SMMUv3State *s,Evt *evt) +{ +SMMUQueue *q = &s->eventq; +bool q_empty =Q_EMPTY (q); +bool q_full =Q_FULL (q);You only use these once each, and they're not very complicated expressions, so you might as well just have the uses be "if (
Q_FULL(q)) { ..." &c.
done
Quoted 24 lines
Quoted 24 lines
hw/arm/smmuv3.c +16
-0+ +if (!SMMUV3_EVENTQ_ENABLED (s)) { +return ; + } + +if (q_full) { +return ; + } + +queue_write (q, evt); + +if (q_empty) { +smmuv3_trigger_irq (s,SMMU_IRQ_EVTQ ,0 ); + } +} +static void smmuv3_init_regs (SMMUv3State *s) {/** @@ -133,6 +199,102 @@ static void smmuv3_init_regs(SMMUv3State *s) s->sid_split =0 ; }
Quoted 13 lines
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 212
Quoted 11 lines
hw/arm/smmuv3.c +11
-0+int smmuv3_cmdq_consume (SMMUv3State *s) +{ +SMMUCmdError cmd_error =SMMU_CERROR_NONE ; +SMMUQueue *q = &s->cmdq; +uint32_t type =0 ; + +if (!SMMUV3_CMDQ_ENABLED (s)) { +return 0 ; + } +/* +* some commands depend on register values, as above. In case those Where is "as above" referring to ?
I meant CMDQ enabled (CR0).
Quoted 54 lines
Quoted 54 lines
hw/arm/smmuv3.c +53
-0+* register values change while handling the command, spec says it +* is UNPREDICTABLE whether the command is interpreted under the new +* or old value. +*/ + +while (!Q_EMPTY (q)) { +uint32_t pending = s->gerror ^ s->gerrorn; +Cmd cmd; + +trace_smmuv3_cmdq_consume (Q_PROD (q),Q_CONS (q), +Q_PROD_WRAP (q),Q_CONS_WRAP (q)); + +if (FIELD_EX32 (pending,GERROR ,CMDQ_ERR )) { +break ; + } + +if (queue_read (q, &cmd) !=MEMTX_OK ) { + cmd_error =SMMU_CERROR_ABT ; +break ; + } + + type =CMD_TYPE (&cmd); + +trace_smmuv3_cmdq_opcode (SMMU_CMD_STRING (type)); + +switch (type) { +case SMMU_CMD_SYNC : +if (CMD_SYNC_CS (&cmd) &CMD_SYNC_SIG_IRQ ) { +smmuv3_trigger_irq (s,SMMU_IRQ_CMD_SYNC ,0 ); + } +break ; +case SMMU_CMD_PREFETCH_CONFIG : +case SMMU_CMD_PREFETCH_ADDR : +case SMMU_CMD_CFGI_STE : +case SMMU_CMD_CFGI_STE_RANGE :/* same as SMMU_CMD_CFGI_ALL */ +case SMMU_CMD_CFGI_CD : +case SMMU_CMD_CFGI_CD_ALL : +case SMMU_CMD_TLBI_NH_ALL : +case SMMU_CMD_TLBI_NH_ASID : +case SMMU_CMD_TLBI_NH_VA : +case SMMU_CMD_TLBI_NH_VAA : +case SMMU_CMD_TLBI_EL3_ALL : +case SMMU_CMD_TLBI_EL3_VA : +case SMMU_CMD_TLBI_EL2_ALL : +case SMMU_CMD_TLBI_EL2_ASID : +case SMMU_CMD_TLBI_EL2_VA : +case SMMU_CMD_TLBI_EL2_VAA : +case SMMU_CMD_TLBI_S12_VMALL : +case SMMU_CMD_TLBI_S2_IPA : +case SMMU_CMD_TLBI_NSNH_ALL : +case SMMU_CMD_ATC_INV : +case SMMU_CMD_PRI_RESP : +case SMMU_CMD_RESUME :
Quoted 8 lines
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 271
Quoted 6 lines
hw/arm/smmuv3.c +6
-0+case SMMU_CMD_STALL_TERM : +trace_smmuv3_unhandled_cmd (type); +break ; +default : + cmd_error =SMMU_CERROR_ILL ; +error_report ("Illegal command type: %d" ,CMD_TYPE (&cmd));This isn't what
error_report()is for. You can log it as aGUEST_ERROR.
OK
Quoted 24 lines
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 279
Quoted 9 lines
hw/arm/smmuv3.c +8
-0+break ; + } +if (cmd_error) { +break ; + } +/* +* We only increment the cons index after the completion of +* the command. We do that because the SYNC returns immediatly "immediately"
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 280
Quoted 1 line
hw/arm/smmuv3.c +1
-0+* and do not check the completion of previous commands "does not"
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 287
Quoted 7 lines
hw/arm/smmuv3.c +7
-0+*/ +queue_cons_incr (q); + } + +if (cmd_error) { +error_report ("Error on %s command execution: %d" , +SMMU_CMD_STRING (type), cmd_error);
Quoted 1 line
Again, not
error_report(). Probably a good location for atrace_point.
OK
Quoted 33 lines
Quoted 27 lines
hw/arm/smmuv3.c +10
-0+smmu_write_cmdq_err (s, cmd_error); +smmuv3_trigger_irq (s,SMMU_IRQ_GERROR ,R_GERROR_CMDQ_ERR_MASK ); + } + +trace_smmuv3_cmdq_consume_out (Q_PROD (q),Q_CONS (q), +Q_PROD_WRAP (q),Q_CONS_WRAP (q)); + +return 0 ; +} +static void smmu_write_mmio (void *opaque,hwaddr addr,uint64_t val,unsigned size) {hw/arm/trace-events +4
-1@@ -18,3 +18,7 @@ smmuv3_read_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" va smmuv3_trigger_irq(int irq) "irq=%d" smmuv3_write_gerror(uint32_t toggled, uint32_t gerror) "toggled=0x%x, new gerror=0x%x" smmuv3_write_gerrorn(uint32_t acked, uint32_t gerrorn) "acked=0x%x, new gerrorn=0x%x" +smmuv3_unhandled_cmd(uint32_t type) "Unhandled command type=%d" +smmuv3_cmdq_consume(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod=%d cons=%d prod.wrap=%d cons.wrap=%d" +smmuv3_cmdq_opcode(const char *opcode) "<--- %s" +smmuv3_cmdq_consume_out(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod:%d, cons:%d, prod_wrap:%d, cons_wrap:%d " --Quoted 2 lines
2.5.5
thanks
-- PMM
PATCH v9 7/14 hw/arm/smmuv3: Implement MMIO write operations
In reply to Eric AugerNow we have relevant helpers for queue and irq management, let's implement MMIO write operations.
---
v7 -> v8:
- precise in the commit message invalidation commands are not yet treated.
- use new queue helpers
- do not decode unhandled commands at this stage
--- hw/arm/smmuv3-internal.h | 24 +++++++--- hw/arm/smmuv3.c | 111 +++++++++++++++++++++++++++++++++++++++++++++-- hw/arm/trace-events | 6 +++ 3 files changed, 132 insertions(+), 9 deletions(-)
hw/arm/smmuv3-internal.h +19 -5
@@ -152,6 +152,25 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,return extract64 (r, offset <<3 ,32 ); } +static inline void smmu_write64 (uint64_t *r,unsigned offset, +unsigned size,uint64_t value) +{ +if (size ==8 && !offset) { + *r = value; + } + +/* 32 bit access */ + +if (offset && offset !=4 ) { +qemu_log_mask (LOG_GUEST_ERROR , +"SMMUv3 MMIO write: bad offset/size %u/%u\n" , + offset, size); +return ; + } + + *r =deposit64 (*r, offset <<3 ,32 , value); +} +/* Interrupts */ #define smmuv3_eventq_irq_enabled (s) \
@@ -159,9 +178,6 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,#define smmuv3_gerror_irq_enabled (s) \ (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, GERROR_IRQEN)) -void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask); -void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t gerrorn); -/* Queue Handling */ #define LOG2SIZE (q) extract64((q)->base, 0, 5)
@@ -310,6 +326,4 @@ enum { /* Command completion notification */ addr; \ }) -int smmuv3_cmdq_consume (SMMUv3State *s); -#endif
hw/arm/smmuv3.c +107 -4
135 lines not on this page · raw message
hw/arm/trace-events +6 -0
@@ -22,3 +22,9 @@ smmuv3_unhandled_cmd(uint32_t type) "Unhandled command type=%d" smmuv3_cmdq_consume(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod=%d cons=%d prod.wrap=%d cons.wrap=%d" smmuv3_cmdq_opcode(const char *opcode) "<--- %s" smmuv3_cmdq_consume_out(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod:%d, cons:%d, prod_wrap:%d, cons_wrap:%d " +smmuv3_update(bool is_empty, uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "q empty:%d prod:%d cons:%d p.wrap:%d p.cons:%d" +smmuv3_update_check_cmd(int error) "cmdq not enabled or error :0x%x" +smmuv3_write_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" val:0x%"PRIx64" size: 0x%x" +smmuv3_write_mmio_idr(hwaddr addr, uint64_t val) "write to RO/Unimpl reg 0x%lx val64:0x%lx" +smmuv3_write_mmio_evtq_cons_bef_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "Before clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" +smmuv3_write_mmio_evtq_cons_after_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "after clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d"
Signature · 1 line
2.5.5
Re: [Qemu-arm] [PATCH v9 07/14] hw/arm/smmuv3: Implement MMIO write operations
Quoted 33 lines · Eric Auger
Now we have relevant helpers for queue and irq management, let's implement MMIO write operations.
Signed-off-by Eric Auger <[email protected]>---
v7 -> v8:
- precise in the commit message invalidation commands are not yet treated.
- use new queue helpers
- do not decode unhandled commands at this stage--- hw/arm/smmuv3-internal.h | 24 +++++++--- hw/arm/smmuv3.c | 111 +++++++++++++++++++++++++++++++++++++++++++++-- hw/arm/trace-events | 6 +++ 3 files changed, 132 insertions(+), 9 deletions(-)hw/arm/smmuv3-internal.h +7
-0@@ -152,6 +152,25 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,return extract64 (r, offset <<3 ,32 ); } +static inline void smmu_write64 (uint64_t *r,unsigned offset, +unsigned size,uint64_t value) +{ +if (size ==8 && !offset) { + *r = value; + } +
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 171
Quoted 10 lines
hw/arm/smmuv3-internal.h +10
-0+/* 32 bit access */ + +if (offset && offset !=4 ) { +qemu_log_mask (LOG_GUEST_ERROR , +"SMMUv3 MMIO write: bad offset/size %u/%u\n" , + offset, size); +return ; + } + + *r =deposit64 (*r, offset <<3 ,32 , value);
Similar remarks apply to this helper as to smmu_read64 in the earlier patch.
Quoted 59 lines
hw/arm/smmuv3-internal.h +2
-5+} +/* Interrupts */ #define smmuv3_eventq_irq_enabled (s) \@@ -159,9 +178,6 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,#define smmuv3_gerror_irq_enabled (s) \ (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, GERROR_IRQEN)) -void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask); -void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t gerrorn); -/* Queue Handling */ #define LOG2SIZE (q) extract64((q)->base, 0, 5)@@ -310,6 +326,4 @@ enum { /* Command completion notification */ addr; \ }) -int smmuv3_cmdq_consume (SMMUv3State *s); -#endif hw/arm/smmuv3.c +4
-4@@ -37,7 +37,8 @@* @irq: irq type * @gerror_mask: mask of gerrors to toggle (relevant if @irq is GERROR) */ -void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask) +static void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq, +uint32_t gerror_mask) {bool pulse = false;@@ -75,7 +76,7 @@ void smmuv3_trigger_irq(SMMUv3State *s, SMMUIrq irq, uint32_t gerror_mask) } } -void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t new_gerrorn) +static void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t new_gerrorn) {uint32_t pending = s->gerror ^ s->gerrorn;uint32_t toggled = s->gerrorn ^ new_gerrorn;@@ -199,7 +200,7 @@ static void smmuv3_init_regs(SMMUv3State *s) s->sid_split =0 ; } -int smmuv3_cmdq_consume (SMMUv3State *s) +static int smmuv3_cmdq_consume (SMMUv3State *s) {SMMUCmdError cmd_error =SMMU_CERROR_NONE ;SMMUQueue *q = &s->cmdq;@@ -298,7 +299,109 @@ int smmuv3_cmdq_consume(SMMUv3State *s)static void smmu_write_mmio (void *opaque,hwaddr addr,uint64_t val,unsigned size) { -/* not yet implemented */
hw/arm/smmuv3.c int smmuv3_cmdq_consume(SMMUv3State *s) · line 311
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+SMMUState *sys = opaque; +SMMUv3State *s =ARM_SMMUV3 (sys); + +/* CONSTRAINED UNPREDICTABLE choice to have page0/1 be exact aliases */ + addr &= ~0x10000 ; + +if (size !=4 && size !=8 ) { +qemu_log_mask (LOG_GUEST_ERROR , +"SMMUv3 MMIO write: bad size %u\n" , size); + }
As with read, this can never happen so you don't need to check for it.
As with read, probably better to explicitly whitelist the 64-bit accessible offsets, and LOG_GUEST_ERROR and write-ignore the others.
hw/arm/smmuv3.c int smmuv3_cmdq_consume(SMMUv3State *s) · line 318
Quoted 7 lines
hw/arm/smmuv3.c +7
-0+ +trace_smmuv3_write_mmio (addr, val, size); + +switch (addr) { +case A_CR0 : + s->cr[0 ] = val; + s->cr0ack = val;
Spec says "reserved fields in SMMU_CR0 are not reflected in SMMU_CR0ACK", so you probably need to mask those out.
Quoted 75 lines
hw/arm/smmuv3.c +75
-0+/* in case the command queue has been enabled */ +smmuv3_cmdq_consume (s); +return ; +case A_CR1 : + s->cr[1 ] = val; +return ; +case A_CR2 : + s->cr[2 ] = val; +return ; +case A_IRQ_CTRL : + s->irq_ctrl = val; +return ; +case A_GERRORN : +smmuv3_write_gerrorn (s, val); +/* +* By acknowledging the CMDQ_ERR, SW may notify cmds can +* be processed again +*/ +smmuv3_cmdq_consume (s); +return ; +case A_GERROR_IRQ_CFG0 :/* 64b */ +smmu_write64 (&s->gerror_irq_cfg0,0 , size, val); +return ; +case A_GERROR_IRQ_CFG0 +4 : +smmu_write64 (&s->gerror_irq_cfg0,4 , size, val); +return ; +case A_GERROR_IRQ_CFG1 : + s->gerror_irq_cfg1 = val; +return ; +case A_GERROR_IRQ_CFG2 : + s->gerror_irq_cfg2 = val; +return ; +case A_STRTAB_BASE :/* 64b */ +smmu_write64 (&s->strtab_base,0 , size, val); +return ; +case A_STRTAB_BASE +4 : +smmu_write64 (&s->strtab_base,4 , size, val); +return ; +case A_STRTAB_BASE_CFG : + s->strtab_base_cfg = val; +if (FIELD_EX32 (val,STRTAB_BASE_CFG ,FMT ) ==1 ) { + s->sid_split =FIELD_EX32 (val,STRTAB_BASE_CFG ,SPLIT ); + s->features |=SMMU_FEATURE_2LVL_STE ; + } +return ; +case A_CMDQ_BASE :/* 64b */ +smmu_write64 (&s->cmdq.base,0 , size, val); +return ; +case A_CMDQ_BASE +4 :/* 64b */ +smmu_write64 (&s->cmdq.base,4 , size, val); +return ; +case A_CMDQ_PROD : + s->cmdq.prod = val; +smmuv3_cmdq_consume (s); +return ; +case A_CMDQ_CONS : + s->cmdq.cons = val; +return ; +case A_EVENTQ_BASE :/* 64b */ +smmu_write64 (&s->eventq.base,0 , size, val); +return ; +case A_EVENTQ_BASE +4 : +smmu_write64 (&s->eventq.base,4 , size, val); +return ; +case A_EVENTQ_PROD : + s->eventq.prod = val; +return ; +case A_EVENTQ_CONS : + s->eventq.cons = val; +return ; +case A_EVENTQ_IRQ_CFG0 :/* 64b */ + s->eventq.prod = val; +smmu_write64 (&s->eventq_irq_cfg0,0 , size, val); +return ; +case A_EVENTQ_IRQ_CFG0 +4 :
hw/arm/smmuv3.c int smmuv3_cmdq_consume(SMMUv3State *s) · line 403
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+smmu_write64 (&s->eventq_irq_cfg0,4 , size, val); +return ; +case A_EVENTQ_IRQ_CFG1 : + s->eventq_irq_cfg1 = val; +return ; +case A_EVENTQ_IRQ_CFG2 : + s->eventq_irq_cfg2 = val; +return ; +default : +error_report ("%s unhandled access at 0x%" PRIx64, __func__, addr);
Tracepoint or LOG_GUEST_ERROR, not error_report(), please.
Quoted 9 lines
hw/arm/smmuv3.c +1
-0+ } }static uint64_t smmu_read_mmio (void *opaque,hwaddr addr,unsigned size)hw/arm/trace-events +0
-0
hw/arm/trace-events smmuv3_unhandled_cmd(uint32_t type) "Unhandled command type=%d" · line 30
Quoted 9 lines
hw/arm/trace-events +6
-0@@ -22,3 +22,9 @@ smmuv3_unhandled_cmd(uint32_t type) "Unhandled command type=%d" smmuv3_cmdq_consume(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod=%d cons=%d prod.wrap=%d cons.wrap=%d" smmuv3_cmdq_opcode(const char *opcode) "<--- %s" smmuv3_cmdq_consume_out(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod:%d, cons:%d, prod_wrap:%d, cons_wrap:%d " +smmuv3_update(bool is_empty, uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "q empty:%d prod:%d cons:%d p.wrap:%d p.cons:%d" +smmuv3_update_check_cmd(int error) "cmdq not enabled or error :0x%x" +smmuv3_write_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" val:0x%"PRIx64" size: 0x%x" +smmuv3_write_mmio_idr(hwaddr addr, uint64_t val) "write to RO/Unimpl reg 0x%lx val64:0x%lx" +smmuv3_write_mmio_evtq_cons_bef_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "Before clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" +smmuv3_write_mmio_evtq_cons_after_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "after clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d"
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 07/14] hw/arm/smmuv3: Implement MMIO write operations
Hi Peter,
Quoted 38 lines · Peter Maydell
Quoted 37 lines · Eric Auger
Now we have relevant helpers for queue and irq management, let's implement MMIO write operations.
Signed-off-by Eric Auger <[email protected]>---
v7 -> v8:
- precise in the commit message invalidation commands are not yet treated.
- use new queue helpers
- do not decode unhandled commands at this stage--- hw/arm/smmuv3-internal.h | 24 +++++++--- hw/arm/smmuv3.c | 111 +++++++++++++++++++++++++++++++++++++++++++++-- hw/arm/trace-events | 6 +++ 3 files changed, 132 insertions(+), 9 deletions(-)hw/arm/smmuv3-internal.h +11
-0@@ -152,6 +152,25 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,return extract64 (r, offset <<3 ,32 ); } +static inline void smmu_write64 (uint64_t *r,unsigned offset, +unsigned size,uint64_t value) +{ +if (size ==8 && !offset) { + *r = value; + } + +/* 32 bit access */ + +if (offset && offset !=4 ) { + qemu_log_mask(LOG_GUEST_ERROR,
Quoted 8 lines
hw/arm/smmuv3-internal.h static inline uint64_t smmu_read64(uint64_t r, unsigned offset, · line 171
Quoted 6 lines
hw/arm/smmuv3-internal.h +6
-0+"SMMUv3 MMIO write: bad offset/size %u/%u\n" , + offset, size); +return ; + } + + *r =deposit64 (*r, offset <<3 ,32 , value);Similar remarks apply to this helper as to
smmu_read64in the earlier patch.
removed
Quoted 73 lines
Quoted 60 lines
hw/arm/smmuv3-internal.h +2
-5+} +/* Interrupts */ #define smmuv3_eventq_irq_enabled (s) \@@ -159,9 +178,6 @@ static inline uint64_t smmu_read64(uint64_t r, unsigned offset,#define smmuv3_gerror_irq_enabled (s) \ (FIELD_EX32(s->irq_ctrl, IRQ_CTRL, GERROR_IRQEN)) -void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask); -void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t gerrorn); -/* Queue Handling */ #define LOG2SIZE (q) extract64((q)->base, 0, 5)@@ -310,6 +326,4 @@ enum { /* Command completion notification */ addr; \ }) -int smmuv3_cmdq_consume (SMMUv3State *s); -#endif hw/arm/smmuv3.c +4
-4@@ -37,7 +37,8 @@* @irq: irq type * @gerror_mask: mask of gerrors to toggle (relevant if @irq is GERROR) */ -void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq,uint32_t gerror_mask) +static void smmuv3_trigger_irq (SMMUv3State *s,SMMUIrq irq, +uint32_t gerror_mask) {bool pulse = false;@@ -75,7 +76,7 @@ void smmuv3_trigger_irq(SMMUv3State *s, SMMUIrq irq, uint32_t gerror_mask) } } -void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t new_gerrorn) +static void smmuv3_write_gerrorn (SMMUv3State *s,uint32_t new_gerrorn) {uint32_t pending = s->gerror ^ s->gerrorn;uint32_t toggled = s->gerrorn ^ new_gerrorn;@@ -199,7 +200,7 @@ static void smmuv3_init_regs(SMMUv3State *s) s->sid_split =0 ; } -int smmuv3_cmdq_consume (SMMUv3State *s) +static int smmuv3_cmdq_consume (SMMUv3State *s) {SMMUCmdError cmd_error =SMMU_CERROR_NONE ;SMMUQueue *q = &s->cmdq;@@ -298,7 +299,109 @@ int smmuv3_cmdq_consume(SMMUv3State *s)static void smmu_write_mmio (void *opaque,hwaddr addr,uint64_t val,unsigned size) { -/* not yet implemented */ hw/arm/smmuv3.c int smmuv3_cmdq_consume(SMMUv3State *s) · line 311
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+SMMUState *sys = opaque; +SMMUv3State *s =ARM_SMMUV3 (sys); + +/* CONSTRAINED UNPREDICTABLE choice to have page0/1 be exact aliases */ + addr &= ~0x10000 ; + +if (size !=4 && size !=8 ) { +qemu_log_mask (LOG_GUEST_ERROR , +"SMMUv3 MMIO write: bad size %u\n" , size); + }As with read, this can never happen so you don't need to check for it.
Quoted 2 lines
As with read, probably better to explicitly whitelist the 64-bit accessible offsets, and
LOG_GUEST_ERRORand write-ignore the others.
done
Quoted 11 lines
hw/arm/smmuv3.c int smmuv3_cmdq_consume(SMMUv3State *s) · line 318
Quoted 8 lines
hw/arm/smmuv3.c +7
-0+ +trace_smmuv3_write_mmio (addr, val, size); + +switch (addr) { +case A_CR0 : + s->cr[0 ] = val; + s->cr0ack = val;Spec says "reserved fields in
SMMU_CR0are not reflected inSMMU_CR0ACK", so you probably need to mask those out.
OK
Quoted 87 lines
Quoted 76 lines
hw/arm/smmuv3.c +75
-0+/* in case the command queue has been enabled */ +smmuv3_cmdq_consume (s); +return ; +case A_CR1 : + s->cr[1 ] = val; +return ; +case A_CR2 : + s->cr[2 ] = val; +return ; +case A_IRQ_CTRL : + s->irq_ctrl = val; +return ; +case A_GERRORN : +smmuv3_write_gerrorn (s, val); +/* +* By acknowledging the CMDQ_ERR, SW may notify cmds can +* be processed again +*/ +smmuv3_cmdq_consume (s); +return ; +case A_GERROR_IRQ_CFG0 :/* 64b */ +smmu_write64 (&s->gerror_irq_cfg0,0 , size, val); +return ; +case A_GERROR_IRQ_CFG0 +4 : +smmu_write64 (&s->gerror_irq_cfg0,4 , size, val); +return ; +case A_GERROR_IRQ_CFG1 : + s->gerror_irq_cfg1 = val; +return ; +case A_GERROR_IRQ_CFG2 : + s->gerror_irq_cfg2 = val; +return ; +case A_STRTAB_BASE :/* 64b */ +smmu_write64 (&s->strtab_base,0 , size, val); +return ; +case A_STRTAB_BASE +4 : +smmu_write64 (&s->strtab_base,4 , size, val); +return ; +case A_STRTAB_BASE_CFG : + s->strtab_base_cfg = val; +if (FIELD_EX32 (val,STRTAB_BASE_CFG ,FMT ) ==1 ) { + s->sid_split =FIELD_EX32 (val,STRTAB_BASE_CFG ,SPLIT ); + s->features |=SMMU_FEATURE_2LVL_STE ; + } +return ; +case A_CMDQ_BASE :/* 64b */ +smmu_write64 (&s->cmdq.base,0 , size, val); +return ; +case A_CMDQ_BASE +4 :/* 64b */ +smmu_write64 (&s->cmdq.base,4 , size, val); +return ; +case A_CMDQ_PROD : + s->cmdq.prod = val; +smmuv3_cmdq_consume (s); +return ; +case A_CMDQ_CONS : + s->cmdq.cons = val; +return ; +case A_EVENTQ_BASE :/* 64b */ +smmu_write64 (&s->eventq.base,0 , size, val); +return ; +case A_EVENTQ_BASE +4 : +smmu_write64 (&s->eventq.base,4 , size, val); +return ; +case A_EVENTQ_PROD : + s->eventq.prod = val; +return ; +case A_EVENTQ_CONS : + s->eventq.cons = val; +return ; +case A_EVENTQ_IRQ_CFG0 :/* 64b */ + s->eventq.prod = val; +smmu_write64 (&s->eventq_irq_cfg0,0 , size, val); +return ; +case A_EVENTQ_IRQ_CFG0 +4 :hw/arm/smmuv3.c int smmuv3_cmdq_consume(SMMUv3State *s) · line 403
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+smmu_write64 (&s->eventq_irq_cfg0,4 , size, val); +return ; +case A_EVENTQ_IRQ_CFG1 : + s->eventq_irq_cfg1 = val; +return ; +case A_EVENTQ_IRQ_CFG2 : + s->eventq_irq_cfg2 = val; +return ; +default : +error_report ("%s unhandled access at 0x%" PRIx64, __func__, addr);
Quoted 1 line
Tracepoint or
LOG_GUEST_ERROR, noterror_report(), please.
OK
Thanks
Eric
Quoted 24 lines
Quoted 10 lines
hw/arm/smmuv3.c +1
-0+ } }static uint64_t smmu_read_mmio (void *opaque,hwaddr addr,unsigned size)hw/arm/trace-events +0
-0hw/arm/trace-events smmuv3_unhandled_cmd(uint32_t type) "Unhandled command type=%d" · line 30
Quoted 9 lines
hw/arm/trace-events +6
-0@@ -22,3 +22,9 @@ smmuv3_unhandled_cmd(uint32_t type) "Unhandled command type=%d" smmuv3_cmdq_consume(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod=%d cons=%d prod.wrap=%d cons.wrap=%d" smmuv3_cmdq_opcode(const char *opcode) "<--- %s" smmuv3_cmdq_consume_out(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "prod:%d, cons:%d, prod_wrap:%d, cons_wrap:%d " +smmuv3_update(bool is_empty, uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "q empty:%d prod:%d cons:%d p.wrap:%d p.cons:%d" +smmuv3_update_check_cmd(int error) "cmdq not enabled or error :0x%x" +smmuv3_write_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" val:0x%"PRIx64" size: 0x%x" +smmuv3_write_mmio_idr(hwaddr addr, uint64_t val) "write to RO/Unimpl reg 0x%lx val64:0x%lx" +smmuv3_write_mmio_evtq_cons_bef_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "Before clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" +smmuv3_write_mmio_evtq_cons_after_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "after clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d"thanks
-- PMM
PATCH v9 8/14 hw/arm/smmuv3: Event queue recording helper
In reply to Eric AugerLet's introduce a helper function aiming at recording an event in the event queue.
---
v8 -> v9:
- add SMMU_EVENT_STRING
v7 -> v8:
- use dma_addr_t instead of hwaddr in smmuv3_record_event()
- introduce struct SMMUEventInfo
- add event_stringify + helpers for all fields
--- hw/arm/smmuv3-internal.h | 140 ++++++++++++++++++++++++++++++++++++++++++++++- hw/arm/smmuv3.c | 91 +++++++++++++++++++++++++++++- hw/arm/trace-events | 1 + 3 files changed, 229 insertions(+), 3 deletions(-)
hw/arm/smmuv3-internal.h +138 -2
@@ -226,8 +226,6 @@ static inline void smmu_write_cmdq_err(SMMUv3State *s, uint32_t err_type) s->cmdq.cons =FIELD_DP32 (s->cmdq.cons,CMDQ_CONS ,ERR , err_type); } -void smmuv3_write_eventq (SMMUv3State *s,Evt *evt); -/* Commands */ enum {
@@ -326,4 +324,142 @@ enum { /* Command completion notification */ addr; \ }) +/* Events */ + +typedef enum SMMUEventType { +SMMU_EVT_OK =0x00 , +SMMU_EVT_F_UUT =0x01 , +SMMU_EVT_C_BAD_STREAMID =0x02 , +SMMU_EVT_F_STE_FETCH =0x03 , +SMMU_EVT_C_BAD_STE =0x04 , +SMMU_EVT_F_BAD_ATS_TREQ =0x05 , +SMMU_EVT_F_STREAM_DISABLED =0x06 , +SMMU_EVT_F_TRANS_FORBIDDEN =0x07 , +SMMU_EVT_C_BAD_SUBSTREAMID =0x08 , +SMMU_EVT_F_CD_FETCH =0x09 , +SMMU_EVT_C_BAD_CD =0x0a , +SMMU_EVT_F_WALK_EABT =0x0b , +SMMU_EVT_F_TRANSLATION =0x10 , +SMMU_EVT_F_ADDR_SIZE =0x11 , +SMMU_EVT_F_ACCESS =0x12 , +SMMU_EVT_F_PERMISSION =0x13 , +SMMU_EVT_F_TLB_CONFLICT =0x20 , +SMMU_EVT_F_CFG_CONFLICT =0x21 , +SMMU_EVT_E_PAGE_REQ =0x24 , +}SMMUEventType ; + +static const char *event_stringify[] = { + [SMMU_EVT_OK ] ="SMMU_EVT_OK" , + [SMMU_EVT_F_UUT ] ="SMMU_EVT_F_UUT" , + [SMMU_EVT_C_BAD_STREAMID ] ="SMMU_EVT_C_BAD_STREAMID" , + [SMMU_EVT_F_STE_FETCH ] ="SMMU_EVT_F_STE_FETCH" , + [SMMU_EVT_C_BAD_STE ] ="SMMU_EVT_C_BAD_STE" , + [SMMU_EVT_F_BAD_ATS_TREQ ] ="SMMU_EVT_F_BAD_ATS_TREQ" , + [SMMU_EVT_F_STREAM_DISABLED ] ="SMMU_EVT_F_STREAM_DISABLED" , + [SMMU_EVT_F_TRANS_FORBIDDEN ] ="SMMU_EVT_F_TRANS_FORBIDDEN" , + [SMMU_EVT_C_BAD_SUBSTREAMID ] ="SMMU_EVT_C_BAD_SUBSTREAMID" , + [SMMU_EVT_F_CD_FETCH ] ="SMMU_EVT_F_CD_FETCH" , + [SMMU_EVT_C_BAD_CD ] ="SMMU_EVT_C_BAD_CD" , + [SMMU_EVT_F_WALK_EABT ] ="SMMU_EVT_F_WALK_EABT" , + [SMMU_EVT_F_TRANSLATION ] ="SMMU_EVT_F_TRANSLATION" , + [SMMU_EVT_F_ADDR_SIZE ] ="SMMU_EVT_F_ADDR_SIZE" , + [SMMU_EVT_F_ACCESS ] ="SMMU_EVT_F_ACCESS" , + [SMMU_EVT_F_PERMISSION ] ="SMMU_EVT_F_PERMISSION" , + [SMMU_EVT_F_TLB_CONFLICT ] ="SMMU_EVT_F_TLB_CONFLICT" , + [SMMU_EVT_F_CFG_CONFLICT ] ="SMMU_EVT_F_CFG_CONFLICT" , + [SMMU_EVT_E_PAGE_REQ ] ="SMMU_EVT_E_PAGE_REQ" , +}; + +#define SMMU_EVENT_STRING (event) ( \ +(event < ARRAY_SIZE(event_stringify)) ? event_stringify[event] : "UNKNOWN" \ +) + +typedef struct SMMUEventInfo { +SMMUEventType type; +uint32_t sid; +bool recorded; +bool record_trans_faults; +union { +struct { +uint32_t ssid; +bool ssv; +dma_addr_t addr; +bool rnw; +bool pnu; +bool ind; + } f_uut; +struct ssid_info { +uint32_t ssid; +bool ssv; + } c_bad_streamid; +struct ssid_addr_info { +uint32_t ssid; +bool ssv; +dma_addr_t addr; + } f_ste_fetch; +struct ssid_info c_bad_ste; +struct { +dma_addr_t addr; +bool rnw; + } f_transl_forbidden; +struct { +uint32_t ssid; + } c_bad_substream; +struct ssid_addr_info f_cd_fetch; +struct ssid_info c_bad_cd; +struct full_info { +bool stall; +uint16_t stag; +uint32_t ssid; +bool ssv; +bool s2; +dma_addr_t addr; +bool rnw; +bool pnu; +bool ind; +uint8_t class; +dma_addr_t addr2; + } f_walk_eabt; +struct full_info f_translation; +struct full_info f_addr_size; +struct full_info f_access; +struct full_info f_permission; +struct ssid_info f_cfg_conflict; +/** +* not supported yet: +* F_BAD_ATS_TREQ +* F_BAD_ATS_TREQ +* F_TLB_CONFLICT +* E_PAGE_REQUEST +* IMPDEF_EVENTn +*/ + } u; +}SMMUEventInfo ; + +/* EVTQ fields */ + +#define EVT_Q_OVERFLOW (1 << 31) + +#define EVT_SET_TYPE (x, v) deposit32((x)->word[0], 0 , 8 , v) +#define EVT_SET_SSV (x, v) deposit32((x)->word[0], 11, 1 , v) +#define EVT_SET_SSID (x, v) deposit32((x)->word[0], 12, 20, v) +#define EVT_SET_SID (x, v) ((x)->word[1] = v) +#define EVT_SET_STAG (x, v) deposit32((x)->word[2], 0 , 16, v) +#define EVT_SET_STALL (x, v) deposit32((x)->word[2], 31, 1 , v) +#define EVT_SET_PNU (x, v) deposit32((x)->word[3], 1 , 1 , v) +#define EVT_SET_IND (x, v) deposit32((x)->word[3], 2 , 1 , v) +#define EVT_SET_RNW (x, v) deposit32((x)->word[3], 3 , 1 , v) +#define EVT_SET_S2 (x, v) deposit32((x)->word[3], 7 , 1 , v) +#define EVT_SET_CLASS (x, v) deposit32((x)->word[3], 8 , 2 , v) +#define EVT_SET_ADDR (x, addr) ({ \ + (x)->word[5] = (uint32_t)(addr >> 32); \ + (x)->word[4] = (uint32_t)(addr & 0xffffffff); \ + }) +#define EVT_SET_ADDR2 (x, addr) ({ \ + deposit32((x)->word[7], 3, 29, addr >> 16); \ + deposit32((x)->word[7], 0, 16, addr & 0xffff); \ + }) + +void smmuv3_record_event (SMMUv3State *s,SMMUEventInfo *event); +#endif
hw/arm/smmuv3.c +90 -1
103 lines not on this page · raw message
hw/arm/trace-events +1 -0
@@ -28,3 +28,4 @@ smmuv3_write_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" v smmuv3_write_mmio_idr(hwaddr addr, uint64_t val) "write to RO/Unimpl reg 0x%lx val64:0x%lx" smmuv3_write_mmio_evtq_cons_bef_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "Before clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" smmuv3_write_mmio_evtq_cons_after_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "after clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" +smmuv3_record_event(const char *type, uint32_t sid) "%s sid=%d"
Signature · 1 line
2.5.5
Re: [Qemu-arm] [PATCH v9 08/14] hw/arm/smmuv3: Event queue recording helper
Quoted 76 lines · Eric Auger
Let's introduce a helper function aiming at recording an event in the event queue.
Signed-off-by Eric Auger <[email protected]>---
v8 -> v9:
- addSMMU_EVENT_STRINGv7 -> v8:
- usedma_addr_tinstead of hwaddr insmmuv3_record_event()
- introduce struct SMMUEventInfo
- addevent_stringify+ helpers for all fields--- hw/arm/smmuv3-internal.h | 140 ++++++++++++++++++++++++++++++++++++++++++++++- hw/arm/smmuv3.c | 91 +++++++++++++++++++++++++++++- hw/arm/trace-events | 1 + 3 files changed, 229 insertions(+), 3 deletions(-)hw/arm/smmuv3-internal.h +39
-2@@ -226,8 +226,6 @@ static inline void smmu_write_cmdq_err(SMMUv3State *s, uint32_t err_type) s->cmdq.cons =FIELD_DP32 (s->cmdq.cons,CMDQ_CONS ,ERR , err_type); } -void smmuv3_write_eventq (SMMUv3State *s,Evt *evt); -/* Commands */ enum {@@ -326,4 +324,142 @@ enum { /* Command completion notification */ addr; \ }) +/* Events */ + +typedef enum SMMUEventType { +SMMU_EVT_OK =0x00 , +SMMU_EVT_F_UUT =0x01 , +SMMU_EVT_C_BAD_STREAMID =0x02 , +SMMU_EVT_F_STE_FETCH =0x03 , +SMMU_EVT_C_BAD_STE =0x04 , +SMMU_EVT_F_BAD_ATS_TREQ =0x05 , +SMMU_EVT_F_STREAM_DISABLED =0x06 , +SMMU_EVT_F_TRANS_FORBIDDEN =0x07 , +SMMU_EVT_C_BAD_SUBSTREAMID =0x08 , +SMMU_EVT_F_CD_FETCH =0x09 , +SMMU_EVT_C_BAD_CD =0x0a , +SMMU_EVT_F_WALK_EABT =0x0b , +SMMU_EVT_F_TRANSLATION =0x10 , +SMMU_EVT_F_ADDR_SIZE =0x11 , +SMMU_EVT_F_ACCESS =0x12 , +SMMU_EVT_F_PERMISSION =0x13 , +SMMU_EVT_F_TLB_CONFLICT =0x20 , +SMMU_EVT_F_CFG_CONFLICT =0x21 , +SMMU_EVT_E_PAGE_REQ =0x24 , +}SMMUEventType ; + +static const char *event_stringify[] = { + [SMMU_EVT_OK ] ="SMMU_EVT_OK" , + [SMMU_EVT_F_UUT ] ="SMMU_EVT_F_UUT" , + [SMMU_EVT_C_BAD_STREAMID ] ="SMMU_EVT_C_BAD_STREAMID" , + [SMMU_EVT_F_STE_FETCH ] ="SMMU_EVT_F_STE_FETCH" , + [SMMU_EVT_C_BAD_STE ] ="SMMU_EVT_C_BAD_STE" , + [SMMU_EVT_F_BAD_ATS_TREQ ] ="SMMU_EVT_F_BAD_ATS_TREQ" , + [SMMU_EVT_F_STREAM_DISABLED ] ="SMMU_EVT_F_STREAM_DISABLED" , + [SMMU_EVT_F_TRANS_FORBIDDEN ] ="SMMU_EVT_F_TRANS_FORBIDDEN" , + [SMMU_EVT_C_BAD_SUBSTREAMID ] ="SMMU_EVT_C_BAD_SUBSTREAMID" , + [SMMU_EVT_F_CD_FETCH ] ="SMMU_EVT_F_CD_FETCH" , + [SMMU_EVT_C_BAD_CD ] ="SMMU_EVT_C_BAD_CD" , + [SMMU_EVT_F_WALK_EABT ] ="SMMU_EVT_F_WALK_EABT" , + [SMMU_EVT_F_TRANSLATION ] ="SMMU_EVT_F_TRANSLATION" , + [SMMU_EVT_F_ADDR_SIZE ] ="SMMU_EVT_F_ADDR_SIZE" ,
hw/arm/smmuv3-internal.h enum { /* Command completion notification */ · line 375
Quoted 10 lines
hw/arm/smmuv3-internal.h +10
-0+ [SMMU_EVT_F_ACCESS] = "SMMU_EVT_F_ACCESS", + [SMMU_EVT_F_PERMISSION] = "SMMU_EVT_F_PERMISSION", + [SMMU_EVT_F_TLB_CONFLICT] = "SMMU_EVT_F_TLB_CONFLICT", + [SMMU_EVT_F_CFG_CONFLICT] = "SMMU_EVT_F_CFG_CONFLICT", + [SMMU_EVT_E_PAGE_REQ] = "SMMU_EVT_E_PAGE_REQ", +}; + +#define SMMU_EVENT_STRING (event) ( \ +(event < ARRAY_SIZE(event_stringify)) ? event_stringify[event] : "UNKNOWN" \ +)
Same remarks as for the other value-to-string helper.
hw/arm/smmuv3-internal.h enum { /* Command completion notification */ · line 377
Quoted 2 lines
hw/arm/smmuv3-internal.h +2
-0+ +typedef struct SMMUEventInfo {
This struct could use a comment summmarizing what it's for.
Quoted 176 lines
hw/arm/smmuv3-internal.h +87
-0+SMMUEventType type; +uint32_t sid; +bool recorded; +bool record_trans_faults; +union { +struct { +uint32_t ssid; +bool ssv; +dma_addr_t addr; +bool rnw; +bool pnu; +bool ind; + } f_uut; +struct ssid_info { +uint32_t ssid; +bool ssv; + } c_bad_streamid; +struct ssid_addr_info { +uint32_t ssid; +bool ssv; +dma_addr_t addr; + } f_ste_fetch; +struct ssid_info c_bad_ste; +struct { +dma_addr_t addr; +bool rnw; + } f_transl_forbidden; +struct { +uint32_t ssid; + } c_bad_substream; +struct ssid_addr_info f_cd_fetch; +struct ssid_info c_bad_cd; +struct full_info { +bool stall; +uint16_t stag; +uint32_t ssid; +bool ssv; +bool s2; +dma_addr_t addr; +bool rnw; +bool pnu; +bool ind; +uint8_t class; +dma_addr_t addr2; + } f_walk_eabt; +struct full_info f_translation; +struct full_info f_addr_size; +struct full_info f_access; +struct full_info f_permission; +struct ssid_info f_cfg_conflict; +/** +* not supported yet: +* F_BAD_ATS_TREQ +* F_BAD_ATS_TREQ +* F_TLB_CONFLICT +* E_PAGE_REQUEST +* IMPDEF_EVENTn +*/ + } u; +} SMMUEventInfo; + +/* EVTQ fields */ + +#define EVT_Q_OVERFLOW (1 << 31) + +#define EVT_SET_TYPE (x, v) deposit32((x)->word[0], 0 , 8 , v) +#define EVT_SET_SSV (x, v) deposit32((x)->word[0], 11, 1 , v) +#define EVT_SET_SSID (x, v) deposit32((x)->word[0], 12, 20, v) +#define EVT_SET_SID (x, v) ((x)->word[1] = v) +#define EVT_SET_STAG (x, v) deposit32((x)->word[2], 0 , 16, v) +#define EVT_SET_STALL (x, v) deposit32((x)->word[2], 31, 1 , v) +#define EVT_SET_PNU (x, v) deposit32((x)->word[3], 1 , 1 , v) +#define EVT_SET_IND (x, v) deposit32((x)->word[3], 2 , 1 , v) +#define EVT_SET_RNW (x, v) deposit32((x)->word[3], 3 , 1 , v) +#define EVT_SET_S2 (x, v) deposit32((x)->word[3], 7 , 1 , v) +#define EVT_SET_CLASS (x, v) deposit32((x)->word[3], 8 , 2 , v) +#define EVT_SET_ADDR (x, addr) ({ \ + (x)->word[5] = (uint32_t)(addr >> 32); \ + (x)->word[4] = (uint32_t)(addr & 0xffffffff); \ + }) +#define EVT_SET_ADDR2 (x, addr) ({ \ + deposit32((x)->word[7], 3, 29, addr >> 16); \ + deposit32((x)->word[7], 0, 16, addr & 0xffff); \ + }) + +void smmuv3_record_event (SMMUv3State *s,SMMUEventInfo *event); +#endif hw/arm/smmuv3.c +72
-1@@ -140,7 +140,7 @@ static void queue_write(SMMUQueue *q, void *data)queue_prod_incr (q); } -void smmuv3_write_eventq (SMMUv3State *s,Evt *evt) +static void smmuv3_write_eventq (SMMUv3State *s,Evt *evt) {SMMUQueue *q = &s->eventq;bool q_empty =Q_EMPTY (q);@@ -161,6 +161,95 @@ void smmuv3_write_eventq(SMMUv3State *s, Evt *evt) } } +void smmuv3_record_event (SMMUv3State *s,SMMUEventInfo *info) +{ +Evt evt; + +if (!SMMUV3_EVENTQ_ENABLED (s)) { +return ; + } + +EVT_SET_TYPE (&evt, info->type); +EVT_SET_SID (&evt, info->sid); + +switch (info->type) { +case SMMU_EVT_OK : +return ; +case SMMU_EVT_F_UUT : +EVT_SET_SSID (&evt, info->u.f_uut.ssid); +EVT_SET_SSV (&evt, info->u.f_uut.ssv); +EVT_SET_ADDR (&evt, info->u.f_uut.addr); +EVT_SET_RNW (&evt, info->u.f_uut.rnw); +EVT_SET_PNU (&evt, info->u.f_uut.pnu); +EVT_SET_IND (&evt, info->u.f_uut.ind); +break ; +case SMMU_EVT_C_BAD_STREAMID : +EVT_SET_SSID (&evt, info->u.c_bad_streamid.ssid); +EVT_SET_SSV (&evt, info->u.c_bad_streamid.ssv); +break ; +case SMMU_EVT_F_STE_FETCH : +EVT_SET_SSID (&evt, info->u.f_ste_fetch.ssid); +EVT_SET_SSV (&evt, info->u.f_ste_fetch.ssv); +EVT_SET_ADDR (&evt, info->u.f_ste_fetch.addr); +break ; +case SMMU_EVT_C_BAD_STE : +EVT_SET_SSID (&evt, info->u.c_bad_ste.ssid); +EVT_SET_SSV (&evt, info->u.c_bad_ste.ssv); +break ; +case SMMU_EVT_F_STREAM_DISABLED : +break ; +case SMMU_EVT_F_TRANS_FORBIDDEN : +EVT_SET_ADDR (&evt, info->u.f_transl_forbidden.addr); +EVT_SET_RNW (&evt, info->u.f_transl_forbidden.rnw); +break ; +case SMMU_EVT_C_BAD_SUBSTREAMID : +EVT_SET_SSID (&evt, info->u.c_bad_substream.ssid); +break ; +case SMMU_EVT_F_CD_FETCH : +EVT_SET_SSID (&evt, info->u.f_cd_fetch.ssid); +EVT_SET_SSV (&evt, info->u.f_cd_fetch.ssv); +EVT_SET_ADDR (&evt, info->u.f_cd_fetch.addr); +break ; +case SMMU_EVT_C_BAD_CD : +EVT_SET_SSID (&evt, info->u.c_bad_cd.ssid); +EVT_SET_SSV (&evt, info->u.c_bad_cd.ssv); +break ; +case SMMU_EVT_F_WALK_EABT : +case SMMU_EVT_F_TRANSLATION : +case SMMU_EVT_F_ADDR_SIZE : +case SMMU_EVT_F_ACCESS : +case SMMU_EVT_F_PERMISSION : +EVT_SET_STALL (&evt, info->u.f_walk_eabt.stall); +EVT_SET_STAG (&evt, info->u.f_walk_eabt.stag); +EVT_SET_SSID (&evt, info->u.f_walk_eabt.ssid); +EVT_SET_SSV (&evt, info->u.f_walk_eabt.ssv); +EVT_SET_S2 (&evt, info->u.f_walk_eabt.s2); +EVT_SET_ADDR (&evt, info->u.f_walk_eabt.addr); +EVT_SET_RNW (&evt, info->u.f_walk_eabt.rnw); +EVT_SET_PNU (&evt, info->u.f_walk_eabt.pnu); +EVT_SET_IND (&evt, info->u.f_walk_eabt.ind); +EVT_SET_CLASS (&evt, info->u.f_walk_eabt.class); +EVT_SET_ADDR2 (&evt, info->u.f_walk_eabt.addr2); +break ; +case SMMU_EVT_F_CFG_CONFLICT :
hw/arm/smmuv3.c void smmuv3_write_eventq(SMMUv3State *s, Evt *evt) · line 244
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+EVT_SET_SSID (&evt, info->u.f_cfg_conflict.ssid); +EVT_SET_SSV (&evt, info->u.f_cfg_conflict.ssv); +break ; +/* rest is not implemented */ +case SMMU_EVT_F_BAD_ATS_TREQ : +case SMMU_EVT_F_TLB_CONFLICT : +case SMMU_EVT_E_PAGE_REQ : +default : +error_report ("%s event %d not supported" , __func__, + info->type);
Not error_report, please.
hw/arm/smmuv3.c void smmuv3_write_eventq(SMMUv3State *s, Evt *evt) · line 249
Quoted 5 lines
hw/arm/smmuv3.c +5
-0+return ; + } + +trace_smmuv3_record_event (SMMU_EVENT_STRING (info->type), info->sid); +smmuv3_write_eventq (s, &evt);
This should be handling the "oops, the write to memory failed" case.
Quoted 11 lines
hw/arm/smmuv3.c +3
-0+ info->recorded = true; +} +static void smmuv3_init_regs (SMMUv3State *s) {/** hw/arm/trace-events +0
-0
hw/arm/trace-events smmuv3_write_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" v
Quoted 5 lines
hw/arm/trace-events +1
-1@@ -28,3 +28,4 @@ smmuv3_write_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" v smmuv3_write_mmio_idr(hwaddr addr, uint64_t val) "write to RO/Unimpl reg 0x%lx val64:0x%lx" smmuv3_write_mmio_evtq_cons_bef_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "Before clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" smmuv3_write_mmio_evtq_cons_after_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "after clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" +smmuv3_record_event(const char *type, uint32_t sid) "%s sid=%d" --
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 08/14] hw/arm/smmuv3: Event queue recording helper
Hi Peter,
Quoted 81 lines · Peter Maydell
Quoted 80 lines · Eric Auger
Let's introduce a helper function aiming at recording an event in the event queue.
Signed-off-by Eric Auger <[email protected]>---
v8 -> v9:
- addSMMU_EVENT_STRINGv7 -> v8:
- usedma_addr_tinstead of hwaddr insmmuv3_record_event()
- introduce struct SMMUEventInfo
- addevent_stringify+ helpers for all fields--- hw/arm/smmuv3-internal.h | 140 ++++++++++++++++++++++++++++++++++++++++++++++- hw/arm/smmuv3.c | 91 +++++++++++++++++++++++++++++- hw/arm/trace-events | 1 + 3 files changed, 229 insertions(+), 3 deletions(-)hw/arm/smmuv3-internal.h +43
-2@@ -226,8 +226,6 @@ static inline void smmu_write_cmdq_err(SMMUv3State *s, uint32_t err_type) s->cmdq.cons =FIELD_DP32 (s->cmdq.cons,CMDQ_CONS ,ERR , err_type); } -void smmuv3_write_eventq (SMMUv3State *s,Evt *evt); -/* Commands */ enum {@@ -326,4 +324,142 @@ enum { /* Command completion notification */ addr; \ }) +/* Events */ + +typedef enum SMMUEventType { +SMMU_EVT_OK =0x00 , +SMMU_EVT_F_UUT =0x01 , +SMMU_EVT_C_BAD_STREAMID =0x02 , +SMMU_EVT_F_STE_FETCH =0x03 , +SMMU_EVT_C_BAD_STE =0x04 , +SMMU_EVT_F_BAD_ATS_TREQ =0x05 , +SMMU_EVT_F_STREAM_DISABLED =0x06 , +SMMU_EVT_F_TRANS_FORBIDDEN =0x07 , +SMMU_EVT_C_BAD_SUBSTREAMID =0x08 , +SMMU_EVT_F_CD_FETCH =0x09 , +SMMU_EVT_C_BAD_CD =0x0a , +SMMU_EVT_F_WALK_EABT =0x0b , +SMMU_EVT_F_TRANSLATION =0x10 , +SMMU_EVT_F_ADDR_SIZE =0x11 , +SMMU_EVT_F_ACCESS =0x12 , +SMMU_EVT_F_PERMISSION =0x13 , +SMMU_EVT_F_TLB_CONFLICT =0x20 , +SMMU_EVT_F_CFG_CONFLICT =0x21 , +SMMU_EVT_E_PAGE_REQ =0x24 , +}SMMUEventType ; + +static const char *event_stringify[] = { + [SMMU_EVT_OK ] ="SMMU_EVT_OK" , + [SMMU_EVT_F_UUT ] ="SMMU_EVT_F_UUT" , + [SMMU_EVT_C_BAD_STREAMID ] ="SMMU_EVT_C_BAD_STREAMID" , + [SMMU_EVT_F_STE_FETCH ] ="SMMU_EVT_F_STE_FETCH" , + [SMMU_EVT_C_BAD_STE ] ="SMMU_EVT_C_BAD_STE" , + [SMMU_EVT_F_BAD_ATS_TREQ ] ="SMMU_EVT_F_BAD_ATS_TREQ" , + [SMMU_EVT_F_STREAM_DISABLED ] ="SMMU_EVT_F_STREAM_DISABLED" , + [SMMU_EVT_F_TRANS_FORBIDDEN ] ="SMMU_EVT_F_TRANS_FORBIDDEN" , + [SMMU_EVT_C_BAD_SUBSTREAMID ] ="SMMU_EVT_C_BAD_SUBSTREAMID" , + [SMMU_EVT_F_CD_FETCH ] ="SMMU_EVT_F_CD_FETCH" , + [SMMU_EVT_C_BAD_CD ] ="SMMU_EVT_C_BAD_CD" , + [SMMU_EVT_F_WALK_EABT ] ="SMMU_EVT_F_WALK_EABT" , + [SMMU_EVT_F_TRANSLATION ] ="SMMU_EVT_F_TRANSLATION" , + [SMMU_EVT_F_ADDR_SIZE ] ="SMMU_EVT_F_ADDR_SIZE" , + [SMMU_EVT_F_ACCESS ] ="SMMU_EVT_F_ACCESS" , + [SMMU_EVT_F_PERMISSION ] ="SMMU_EVT_F_PERMISSION" , + [SMMU_EVT_F_TLB_CONFLICT ] ="SMMU_EVT_F_TLB_CONFLICT" , + [SMMU_EVT_F_CFG_CONFLICT ] ="SMMU_EVT_F_CFG_CONFLICT" ,
Quoted 8 lines
hw/arm/smmuv3-internal.h enum { /* Command completion notification */ · line 375
Quoted 6 lines
hw/arm/smmuv3-internal.h +6
-0+ [SMMU_EVT_E_PAGE_REQ] = "SMMU_EVT_E_PAGE_REQ", +}; + +#define SMMU_EVENT_STRING (event) ( \ +(event < ARRAY_SIZE(event_stringify)) ? event_stringify[event] : "UNKNOWN" \ +)Same remarks as for the other value-to-string helper.
OK
Quoted 5 lines
hw/arm/smmuv3-internal.h enum { /* Command completion notification */ · line 377
Quoted 3 lines
hw/arm/smmuv3-internal.h +2
-0+ +typedef struct SMMUEventInfo {This struct could use a comment summmarizing what it's for.
OK
Quoted 181 lines
Quoted 181 lines
hw/arm/smmuv3-internal.h +87
-0+SMMUEventType type; +uint32_t sid; +bool recorded; +bool record_trans_faults; +union { +struct { +uint32_t ssid; +bool ssv; +dma_addr_t addr; +bool rnw; +bool pnu; +bool ind; + } f_uut; +struct ssid_info { +uint32_t ssid; +bool ssv; + } c_bad_streamid; +struct ssid_addr_info { +uint32_t ssid; +bool ssv; +dma_addr_t addr; + } f_ste_fetch; +struct ssid_info c_bad_ste; +struct { +dma_addr_t addr; +bool rnw; + } f_transl_forbidden; +struct { +uint32_t ssid; + } c_bad_substream; +struct ssid_addr_info f_cd_fetch; +struct ssid_info c_bad_cd; +struct full_info { +bool stall; +uint16_t stag; +uint32_t ssid; +bool ssv; +bool s2; +dma_addr_t addr; +bool rnw; +bool pnu; +bool ind; +uint8_t class; +dma_addr_t addr2; + } f_walk_eabt; +struct full_info f_translation; +struct full_info f_addr_size; +struct full_info f_access; +struct full_info f_permission; +struct ssid_info f_cfg_conflict; +/** +* not supported yet: +* F_BAD_ATS_TREQ +* F_BAD_ATS_TREQ +* F_TLB_CONFLICT +* E_PAGE_REQUEST +* IMPDEF_EVENTn +*/ + } u; +} SMMUEventInfo; + +/* EVTQ fields */ + +#define EVT_Q_OVERFLOW (1 << 31) + +#define EVT_SET_TYPE (x, v) deposit32((x)->word[0], 0 , 8 , v) +#define EVT_SET_SSV (x, v) deposit32((x)->word[0], 11, 1 , v) +#define EVT_SET_SSID (x, v) deposit32((x)->word[0], 12, 20, v) +#define EVT_SET_SID (x, v) ((x)->word[1] = v) +#define EVT_SET_STAG (x, v) deposit32((x)->word[2], 0 , 16, v) +#define EVT_SET_STALL (x, v) deposit32((x)->word[2], 31, 1 , v) +#define EVT_SET_PNU (x, v) deposit32((x)->word[3], 1 , 1 , v) +#define EVT_SET_IND (x, v) deposit32((x)->word[3], 2 , 1 , v) +#define EVT_SET_RNW (x, v) deposit32((x)->word[3], 3 , 1 , v) +#define EVT_SET_S2 (x, v) deposit32((x)->word[3], 7 , 1 , v) +#define EVT_SET_CLASS (x, v) deposit32((x)->word[3], 8 , 2 , v) +#define EVT_SET_ADDR (x, addr) ({ \ + (x)->word[5] = (uint32_t)(addr >> 32); \ + (x)->word[4] = (uint32_t)(addr & 0xffffffff); \ + }) +#define EVT_SET_ADDR2 (x, addr) ({ \ + deposit32((x)->word[7], 3, 29, addr >> 16); \ + deposit32((x)->word[7], 0, 16, addr & 0xffff); \ + }) + +void smmuv3_record_event (SMMUv3State *s,SMMUEventInfo *event); +#endif hw/arm/smmuv3.c +76
-1@@ -140,7 +140,7 @@ static void queue_write(SMMUQueue *q, void *data)queue_prod_incr (q); } -void smmuv3_write_eventq (SMMUv3State *s,Evt *evt) +static void smmuv3_write_eventq (SMMUv3State *s,Evt *evt) {SMMUQueue *q = &s->eventq;bool q_empty =Q_EMPTY (q);@@ -161,6 +161,95 @@ void smmuv3_write_eventq(SMMUv3State *s, Evt *evt) } } +void smmuv3_record_event (SMMUv3State *s,SMMUEventInfo *info) +{ +Evt evt; + +if (!SMMUV3_EVENTQ_ENABLED (s)) { +return ; + } + +EVT_SET_TYPE (&evt, info->type); +EVT_SET_SID (&evt, info->sid); + +switch (info->type) { +case SMMU_EVT_OK : +return ; +case SMMU_EVT_F_UUT : +EVT_SET_SSID (&evt, info->u.f_uut.ssid); +EVT_SET_SSV (&evt, info->u.f_uut.ssv); +EVT_SET_ADDR (&evt, info->u.f_uut.addr); +EVT_SET_RNW (&evt, info->u.f_uut.rnw); +EVT_SET_PNU (&evt, info->u.f_uut.pnu); +EVT_SET_IND (&evt, info->u.f_uut.ind); +break ; +case SMMU_EVT_C_BAD_STREAMID : +EVT_SET_SSID (&evt, info->u.c_bad_streamid.ssid); +EVT_SET_SSV (&evt, info->u.c_bad_streamid.ssv); +break ; +case SMMU_EVT_F_STE_FETCH : +EVT_SET_SSID (&evt, info->u.f_ste_fetch.ssid); +EVT_SET_SSV (&evt, info->u.f_ste_fetch.ssv); +EVT_SET_ADDR (&evt, info->u.f_ste_fetch.addr); +break ; +case SMMU_EVT_C_BAD_STE : +EVT_SET_SSID (&evt, info->u.c_bad_ste.ssid); +EVT_SET_SSV (&evt, info->u.c_bad_ste.ssv); +break ; +case SMMU_EVT_F_STREAM_DISABLED : +break ; +case SMMU_EVT_F_TRANS_FORBIDDEN : +EVT_SET_ADDR (&evt, info->u.f_transl_forbidden.addr); +EVT_SET_RNW (&evt, info->u.f_transl_forbidden.rnw); +break ; +case SMMU_EVT_C_BAD_SUBSTREAMID : +EVT_SET_SSID (&evt, info->u.c_bad_substream.ssid); +break ; +case SMMU_EVT_F_CD_FETCH : +EVT_SET_SSID (&evt, info->u.f_cd_fetch.ssid); +EVT_SET_SSV (&evt, info->u.f_cd_fetch.ssv); +EVT_SET_ADDR (&evt, info->u.f_cd_fetch.addr); +break ; +case SMMU_EVT_C_BAD_CD : +EVT_SET_SSID (&evt, info->u.c_bad_cd.ssid); +EVT_SET_SSV (&evt, info->u.c_bad_cd.ssv); +break ; +case SMMU_EVT_F_WALK_EABT : +case SMMU_EVT_F_TRANSLATION : +case SMMU_EVT_F_ADDR_SIZE : +case SMMU_EVT_F_ACCESS : +case SMMU_EVT_F_PERMISSION : +EVT_SET_STALL (&evt, info->u.f_walk_eabt.stall); +EVT_SET_STAG (&evt, info->u.f_walk_eabt.stag); +EVT_SET_SSID (&evt, info->u.f_walk_eabt.ssid); +EVT_SET_SSV (&evt, info->u.f_walk_eabt.ssv); +EVT_SET_S2 (&evt, info->u.f_walk_eabt.s2); +EVT_SET_ADDR (&evt, info->u.f_walk_eabt.addr); +EVT_SET_RNW (&evt, info->u.f_walk_eabt.rnw); +EVT_SET_PNU (&evt, info->u.f_walk_eabt.pnu); +EVT_SET_IND (&evt, info->u.f_walk_eabt.ind); +EVT_SET_CLASS (&evt, info->u.f_walk_eabt.class); +EVT_SET_ADDR2 (&evt, info->u.f_walk_eabt.addr2); +break ; +case SMMU_EVT_F_CFG_CONFLICT : +EVT_SET_SSID (&evt, info->u.f_cfg_conflict.ssid); +EVT_SET_SSV (&evt, info->u.f_cfg_conflict.ssv); +break ; +/* rest is not implemented */
Quoted 8 lines
hw/arm/smmuv3.c void smmuv3_write_eventq(SMMUv3State *s, Evt *evt) · line 244
Quoted 6 lines
hw/arm/smmuv3.c +6
-0+case SMMU_EVT_F_BAD_ATS_TREQ : +case SMMU_EVT_F_TLB_CONFLICT : +case SMMU_EVT_E_PAGE_REQ : +default : +error_report ("%s event %d not supported" , __func__, + info->type);Not
error_report, please.
replaced by g_assert_not_reached();
Quoted 8 lines
hw/arm/smmuv3.c void smmuv3_write_eventq(SMMUv3State *s, Evt *evt) · line 249
Quoted 6 lines
hw/arm/smmuv3.c +5
-0+return ; + } + +trace_smmuv3_record_event (SMMU_EVENT_STRING (info->type), info->sid); +smmuv3_write_eventq (s, &evt);This should be handling the "oops, the write to memory failed" case.
OK
Thanks
Eric
Quoted 21 lines
Quoted 12 lines
hw/arm/smmuv3.c +3
-0+ info->recorded = true; +} +static void smmuv3_init_regs (SMMUv3State *s) {/** hw/arm/trace-events +0
-0hw/arm/trace-events smmuv3_write_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" v
Quoted 5 lines
hw/arm/trace-events +1
-1@@ -28,3 +28,4 @@ smmuv3_write_mmio(hwaddr addr, uint64_t val, unsigned size) "addr: 0x%"PRIx64" v smmuv3_write_mmio_idr(hwaddr addr, uint64_t val) "write to RO/Unimpl reg 0x%lx val64:0x%lx" smmuv3_write_mmio_evtq_cons_bef_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "Before clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" smmuv3_write_mmio_evtq_cons_after_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "after clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" +smmuv3_record_event(const char *type, uint32_t sid) "%s sid=%d" --thanks
-- PMM
PATCH v9 9/14 hw/arm/smmuv3: Implement translate callback
In reply to Eric AugerThis patch implements the IOMMU Memory Region translate() callback. Most of the code relates to the translation configuration decoding and check (STE, CD).
---
v8 -> v9:
- use SMMU_EVENT_STRING macro
- get rid of last erro_report's
- decode asid
- handle config abort before ptw
- add 64-bit single-copy atomic comment
v7 -> v8:
- use address_space_rw
- s/Ste/STE, s/Cd/CD
- use dma_memory_read
- remove everything related to stage 2
- collect data for both TTx
- renamings
- pass the event handle all along the config decoding path
- decode tbi, ars
--- hw/arm/smmuv3-internal.h | 146 ++++++++++++++++++++ hw/arm/smmuv3.c | 341 +++++++++++++++++++++++++++++++++++++++++++++++ hw/arm/trace-events | 9 ++ 3 files changed, 496 insertions(+)
hw/arm/smmuv3-internal.h +146 -0
@@ -462,4 +462,150 @@ typedef struct SMMUEventInfo {void smmuv3_record_event (SMMUv3State *s,SMMUEventInfo *event); +/* Configuration Data */ + +/* STE Level 1 Descriptor */ +typedef struct STEDesc { +uint32_t word[2 ]; +}STEDesc ; + +/* CD Level 1 Descriptor */ +typedef struct CDDesc { +uint32_t word[2 ]; +}CDDesc ; + +/* Stream Table Entry(STE) */ +typedef struct STE { +uint32_t word[16 ]; +}STE ; + +/* Context Descriptor(CD) */ +typedef struct CD { +uint32_t word[16 ]; +}CD ; + +/* STE fields */ + +#define STE_VALID (x) extract32((x)->word[0], 0, 1)/* 0 */ + +#define STE_CONFIG (x) extract32((x)->word[0], 1, 3) +#define STE_CFG_S1_ENABLED (config) (config & 0x1) +#define STE_CFG_S2_ENABLED (config) (config & 0x2) +#define STE_CFG_ABORT (config) (!(config & 0x4)) +#define STE_CFG_BYPASS (config) (config == 0x4) + +#define STE_S1FMT (x) extract32((x)->word[0], 4 , 2) +#define STE_S1CDMAX (x) extract32((x)->word[1], 27, 5) +#define STE_EATS (x) extract32((x)->word[2], 28, 2) +#define STE_STRW (x) extract32((x)->word[2], 30, 2) +#define STE_S2VMID (x) extract32((x)->word[4], 0 , 16) +#define STE_S2T0SZ (x) extract32((x)->word[5], 0 , 6) +#define STE_S2SL0 (x) extract32((x)->word[5], 6 , 2) +#define STE_S2TG (x) extract32((x)->word[5], 14, 2) +#define STE_S2PS (x) extract32((x)->word[5], 16, 3) +#define STE_S2AA64 (x) extract32((x)->word[5], 19, 1) +#define STE_S2HD (x) extract32((x)->word[5], 24, 1) +#define STE_S2HA (x) extract32((x)->word[5], 25, 1) +#define STE_S2S (x) extract32((x)->word[5], 26, 1) +#define STE_CTXPTR (x) \ + ({ \ + unsigned long addr; \ + addr = (uint64_t)extract32((x)->word[1], 0, 16) << 32; \ + addr |= (uint64_t)((x)->word[0] & 0xffffffc0); \ + addr; \ + }) + +#define STE_S2TTB (x) \ + ({ \ + unsigned long addr; \ + addr = (uint64_t)extract32((x)->word[7], 0, 16) << 32; \ + addr |= (uint64_t)((x)->word[6] & 0xfffffff0); \ + addr; \ + }) + +static inline int oas2bits (int oas_field) +{ +switch (oas_field) { +case 0b011 : +return 42 ; +case 0b100 : +return 44 ; +default : +return 32 + (1 << oas_field); + } +} + +static inline int pa_range (STE *ste) +{ +int oas_field =MIN (STE_S2PS (ste),SMMU_IDR5_OAS ); + +if (!STE_S2AA64 (ste)) { +return 40 ; + } + +return oas2bits (oas_field); +} + +#define MAX_PA (ste) ((1 << pa_range(ste)) - 1) + +/* CD fields */ + +#define CD_VALID (x) extract32((x)->word[0], 30, 1) +#define CD_ASID (x) extract32((x)->word[1], 16, 16) +#define CD_TTB (x, sel) \ + ({ \ + uint64_t hi, lo; \ + hi = extract32((x)->word[(sel) * 2 + 3], 0, 16); \ + hi <<= 32; \ + lo = (x)->word[(sel) * 2 + 2] & ~0xf; \ + hi | lo; \ + }) + +#define CD_TSZ (x, sel) extract32((x)->word[0], (16 * (sel)) + 0, 6) +#define CD_TG (x, sel) extract32((x)->word[0], (16 * (sel)) + 6, 2) +#define CD_EPD (x, sel) extract32((x)->word[0], (16 * (sel)) + 14, 1) +#define CD_ENDI (x) extract32((x)->word[0], 15, 1) +#define CD_IPS (x) extract32((x)->word[1], 0 , 3) +#define CD_TBI (x) extract32((x)->word[1], 6 , 2) +#define CD_S (x) extract32((x)->word[1], 12, 1) +#define CD_R (x) extract32((x)->word[1], 13, 1) +#define CD_A (x) extract32((x)->word[1], 14, 1) +#define CD_AARCH64 (x) extract32((x)->word[1], 9 , 1) + +#define CDM_VALID (x) ((x)->word[0] & 0x1) + +static inline int is_cd_valid (SMMUv3State *s,STE *ste,CD *cd) +{ +return CD_VALID (cd); +} + +/** +* tg2granule - Decodes the CD translation granule size field according +* to the ttbr in use +* @bits: TG0/1 fields +* @ttbr: ttbr index in use +*/ +static inline int tg2granule (int bits,int ttbr) +{ +switch (bits) { +case 1 : +return ttbr ?14 :16 ; +case 2 : +return ttbr ?12 :14 ; +case 3 : +return ttbr ?16 :12 ; +default : +return 12 ; + } +} + +#define L1STD_L2PTR (stm) ({ \ + uint64_t hi, lo; \ + hi = (stm)->word[1]; \ + lo = (stm)->word[0] & ~(uint64_t)0x1f; \ + hi << 32 | lo; \ + }) + +#define L1STD_SPAN (stm) (extract32((stm)->word[0], 0, 4)) +#endif
hw/arm/smmuv3.c +341 -0
353 lines not on this page · raw message
hw/arm/trace-events +9 -0
@@ -29,3 +29,12 @@ smmuv3_write_mmio_idr(hwaddr addr, uint64_t val) "write to RO/Unimpl reg 0x%lx v smmuv3_write_mmio_evtq_cons_bef_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "Before clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" smmuv3_write_mmio_evtq_cons_after_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "after clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" smmuv3_record_event(const char *type, uint32_t sid) "%s sid=%d" +smmuv3_find_ste(uint16_t sid, uint32_t features, uint16_t sid_split) "SID:0x%x features:0x%x, sid_split:0x%x" +smmuv3_find_ste_2lvl(uint64_t strtab_base, hwaddr l1ptr, int l1_ste_offset, hwaddr l2ptr, int l2_ste_offset, int max_l2_ste) "strtab_base:0x%lx l1ptr:0x%"PRIx64" l1_off:0x%x, l2ptr:0x%"PRIx64" l2_off:0x%x max_l2_ste:%d" +smmuv3_get_ste(hwaddr addr) "STE addr: 0x%"PRIx64 +smmuv3_translate_bypass(const char *n, uint16_t sid, hwaddr addr, bool is_write) "%s sid=%d bypass iova:0x%"PRIx64" is_write=%d" +smmuv3_translate_in(uint16_t sid, int pci_bus_num, hwaddr strtab_base) "SID:0x%x bus:%d strtab_base:0x%"PRIx64 +smmuv3_get_cd(hwaddr addr) "CD addr: 0x%"PRIx64 +smmuv3_translate(const char *n, uint16_t sid, hwaddr iova, hwaddr translated, int perm) "%s sid=%d iova=0x%"PRIx64" translated=0x%"PRIx64" perm=0x%x" +smmuv3_decode_cd(uint32_t oas) "oas=%d" +smmuv3_decode_cd_tt(int i, uint32_t tsz, uint64_t ttb, uint32_t granule_sz, int initial_level) "TT[%d]:tsz:%d ttb:0x%"PRIx64" granule_sz:%d, initial_level = %d"
Signature · 1 line
2.5.5
Re: [Qemu-arm] [PATCH v9 09/14] hw/arm/smmuv3: Implement translate callback
Quoted 52 lines · Eric Auger
This patch implements the IOMMU Memory Region
translate()callback. Most of the code relates to the translation configuration decoding and check (STE, CD).Signed-off-by Eric Auger <[email protected]>---
v8 -> v9:
- useSMMU_EVENT_STRINGmacro
- get rid of last erro_report's
- decode asid
- handle config abort before ptw
- add 64-bit single-copy atomic commentv7 -> v8:
- useaddress_space_rw
- s/Ste/STE, s/Cd/CD
- usedma_memory_read
- remove everything related to stage 2
- collect data for both TTx
- renamings
- pass the event handle all along the config decoding path
- decode tbi, ars--- hw/arm/smmuv3-internal.h | 146 ++++++++++++++++++++ hw/arm/smmuv3.c | 341 +++++++++++++++++++++++++++++++++++++++++++++++ hw/arm/trace-events | 9 ++ 3 files changed, 496 insertions(+)hw/arm/smmuv3-internal.h +15
-0@@ -462,4 +462,150 @@ typedef struct SMMUEventInfo {void smmuv3_record_event (SMMUv3State *s,SMMUEventInfo *event); +/* Configuration Data */ + +/* STE Level 1 Descriptor */ +typedef struct STEDesc { +uint32_t word[2 ]; +}STEDesc ; + +/* CD Level 1 Descriptor */ +typedef struct CDDesc { +uint32_t word[2 ]; +}CDDesc ; + +/* Stream Table Entry(STE) */ +typedef struct STE { + uint32_t word[16];
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 489
Quoted 10 lines
hw/arm/smmuv3-internal.h +10
-0+}STE ; + +/* Context Descriptor(CD) */ +typedef struct CD { +uint32_t word[16 ]; +}CD ; + +/* STE fields */ + +#define STE_VALID (x) extract32((x)->word[0], 0, 1)/* 0 */
I'm not sure what the comment is supposed to be telling me ?
Quoted 35 lines
hw/arm/smmuv3-internal.h +35
-0+ +#define STE_CONFIG (x) extract32((x)->word[0], 1, 3) +#define STE_CFG_S1_ENABLED (config) (config & 0x1) +#define STE_CFG_S2_ENABLED (config) (config & 0x2) +#define STE_CFG_ABORT (config) (!(config & 0x4)) +#define STE_CFG_BYPASS (config) (config == 0x4) + +#define STE_S1FMT (x) extract32((x)->word[0], 4 , 2) +#define STE_S1CDMAX (x) extract32((x)->word[1], 27, 5) +#define STE_EATS (x) extract32((x)->word[2], 28, 2) +#define STE_STRW (x) extract32((x)->word[2], 30, 2) +#define STE_S2VMID (x) extract32((x)->word[4], 0 , 16) +#define STE_S2T0SZ (x) extract32((x)->word[5], 0 , 6) +#define STE_S2SL0 (x) extract32((x)->word[5], 6 , 2) +#define STE_S2TG (x) extract32((x)->word[5], 14, 2) +#define STE_S2PS (x) extract32((x)->word[5], 16, 3) +#define STE_S2AA64 (x) extract32((x)->word[5], 19, 1) +#define STE_S2HD (x) extract32((x)->word[5], 24, 1) +#define STE_S2HA (x) extract32((x)->word[5], 25, 1) +#define STE_S2S (x) extract32((x)->word[5], 26, 1) +#define STE_CTXPTR (x) \ + ({ \ + unsigned long addr; \ + addr = (uint64_t)extract32((x)->word[1], 0, 16) << 32; \ + addr |= (uint64_t)((x)->word[0] & 0xffffffc0); \ + addr; \ + }) + +#define STE_S2TTB (x) \ + ({ \ + unsigned long addr; \ + addr = (uint64_t)extract32((x)->word[7], 0, 16) << 32; \ + addr |= (uint64_t)((x)->word[6] & 0xfffffff0); \ + addr; \ + })
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 534
Quoted 10 lines
hw/arm/smmuv3-internal.h +10
-0+ +static inline int oas2bits (int oas_field) +{ +switch (oas_field) { +case 0b011 : +return 42 ; +case 0b100 : +return 44 ; +default : +return 32 + (1 << oas_field);
Is this right? For instance OAS == 0b001 should be 36, but 32 + (1 << 1) == 34 ? 0b110 should be 52, but 32 + (1 << 6) == 96 ?
I'm not sure there's a neat relationship between the field values and the address sizes here, so maybe we should just have a switch with a case for each value?
Quoted 14 lines
hw/arm/smmuv3-internal.h +14
-0+ } +} + +static inline int pa_range (STE *ste) +{ +int oas_field =MIN (STE_S2PS (ste),SMMU_IDR5_OAS ); + +if (!STE_S2AA64 (ste)) { +return 40 ; + } + +return oas2bits (oas_field); +} +
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 558
Quoted 10 lines
hw/arm/smmuv3-internal.h +10
-0+#define MAX_PA (ste) ((1 << pa_range(ste)) - 1) + +/* CD fields */ + +#define CD_VALID (x) extract32((x)->word[0], 30, 1) +#define CD_ASID (x) extract32((x)->word[1], 16, 16) +#define CD_TTB (x, sel) \ + ({ \ + uint64_t hi, lo; \ + hi = extract32((x)->word[(sel) * 2 + 3], 0, 16); \
Spec says TTB0/1 fields go up to bit 19. You want the whole lot even if we don't support address sizes that wide because out of range high bits should cause an illegal CD error, not be ignored.
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 560
Quoted 2 lines
hw/arm/smmuv3-internal.h +2
-0+ hi <<=32 ; \ + lo = (x)->word[(sel) *2 +2 ] & ~0xf ; \
Does this ~0xf end up correctly sign extending up into the top 32 bits? ULL suffix would make it certain.
Quoted 28 lines
hw/arm/smmuv3-internal.h +28
-0+ hi | lo; \ + }) + +#define CD_TSZ (x, sel) extract32((x)->word[0], (16 * (sel)) + 0, 6) +#define CD_TG (x, sel) extract32((x)->word[0], (16 * (sel)) + 6, 2) +#define CD_EPD (x, sel) extract32((x)->word[0], (16 * (sel)) + 14, 1) +#define CD_ENDI (x) extract32((x)->word[0], 15, 1) +#define CD_IPS (x) extract32((x)->word[1], 0 , 3) +#define CD_TBI (x) extract32((x)->word[1], 6 , 2) +#define CD_S (x) extract32((x)->word[1], 12, 1) +#define CD_R (x) extract32((x)->word[1], 13, 1) +#define CD_A (x) extract32((x)->word[1], 14, 1) +#define CD_AARCH64 (x) extract32((x)->word[1], 9 , 1) + +#define CDM_VALID (x) ((x)->word[0] & 0x1) + +static inline int is_cd_valid (SMMUv3State *s,STE *ste,CD *cd) +{ +return CD_VALID (cd); +} + +/** +* tg2granule - Decodes the CD translation granule size field according +* to the ttbr in use +* @bits: TG0/1 fields +* @ttbr: ttbr index in use +*/ +static inline int tg2granule (int bits,int ttbr)
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 598
Quoted 10 lines
hw/arm/smmuv3-internal.h +10
-0+{ +switch (bits) { +case 1 : +return ttbr ?14 :16 ; +case 2 : +return ttbr ?12 :14 ; +case 3 : +return ttbr ?16 :12 ; +default : +return 12 ;
TG0 == 0b11 and TG1 == 0b00 are reserved and should cause an illegal CD error if the config means they would be used, not be treated as if they were one of the other values.
The spec has a definition of a CD_ILLEGAL expression which specifies what conditions should cause an illegal CD error. It might be useful to have something in the patchset that looks like that, and then later you can just assert that you're not dealing with illegal values, or ignore them.
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 605
Quoted 7 lines
hw/arm/smmuv3-internal.h +7
-0+ } +} + +#define L1STD_L2PTR (stm) ({ \ + uint64_t hi, lo; \ + hi = (stm)->word[1]; \ + lo = (stm)->word[0] & ~(uint64_t)0x1f; \
I see here you have a cast to force the mask to 64-bits wide. ULL suffix would be shorter, but in any case do the same thing in all places.
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 607
Quoted 2 lines
hw/arm/smmuv3-internal.h +2
-0+ hi <<32 | lo; \ + })
This would definitely be better as an inline function rather than a multiline macro that has to use the GCC extension to define macro-local variables and return a value.
Quoted 66 lines
hw/arm/smmuv3-internal.h +3
-0+ +#define L1STD_SPAN (stm) (extract32((stm)->word[0], 0, 4)) +#endif hw/arm/smmuv3.c +54
-0@@ -289,6 +289,344 @@ static void smmuv3_init_regs(SMMUv3State *s) s->sid_split =0 ; } +static int smmu_get_ste (SMMUv3State *s,dma_addr_t addr,STE *buf, +SMMUEventInfo *event) +{ +int ret; + +trace_smmuv3_get_ste (addr); +/* TODO: guarantee 64-bit single-copy atomicity */ + ret =dma_memory_read (&address_space_memory, addr, + (void *)buf,sizeof (*buf)); +if (ret !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"Cannot fetch pte at address=0x%" PRIx64"\n" , addr); + event->type =SMMU_EVT_F_STE_FETCH ; + event->u.f_ste_fetch.addr = addr; +return -EINVAL ; + } +return 0 ; + +} + +/* @ssid > 0 not supported yet */ +static int smmu_get_cd (SMMUv3State *s,STE *ste,uint32_t ssid, +CD *buf,SMMUEventInfo *event) +{ +dma_addr_t addr =STE_CTXPTR (ste); +int ret; + +trace_smmuv3_get_cd (addr); +/* TODO: guarantee 64-bit single-copy atomicity */ + ret =dma_memory_read (&address_space_memory, addr, + (void *)buf,sizeof (*buf)); +if (ret !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"Cannot fetch pte at address=0x%" PRIx64"\n" , addr); + event->type =SMMU_EVT_F_CD_FETCH ; + event->u.f_ste_fetch.addr = addr; +return -EINVAL ; + } +return 0 ; +} + +static int decode_ste (SMMUv3State *s,SMMUTransCfg *cfg, +STE *ste,SMMUEventInfo *event) +{ +uint32_t config =STE_CONFIG (ste); +int ret = -EINVAL ; + +if (STE_CFG_ABORT (config)) { +/* abort but don't record any event */ + cfg->aborted = true; +return ret; + } + +if (STE_CFG_BYPASS (config)) {
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 355
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+ cfg->bypassed = true; +return ret; + } + +if (!STE_VALID (ste)) { + goto bad_ste; + } + +if (STE_CFG_S2_ENABLED (config)) { +error_setg (&error_fatal,"SMMUv3 does not support stage 2 yet" );
Usual remarks about not using error_setg() for this kind of thing.
Quoted 144 lines
hw/arm/smmuv3.c +144
-0+ } + +if (STE_S1CDMAX (ste) !=0 ) { +error_setg (&error_fatal, +"SMMUv3 does not support multiple context descriptors yet" ); + goto bad_ste; + } +return 0 ; + +bad_ste: + event->type =SMMU_EVT_C_BAD_STE ; +return -EINVAL ; +} + +/** +* smmu_find_ste - Return the stream table entry associated +* to the sid +* +* @s: smmuv3 handle +* @sid: stream ID +* @ste: returned stream table entry +* @event: handle to an event info +* +* Supports linear and 2-level stream table +* Return 0 on success, -EINVAL otherwise +*/ +static int smmu_find_ste (SMMUv3State *s,uint32_t sid,STE *ste, +SMMUEventInfo *event) +{ +dma_addr_t addr; +int ret; + +trace_smmuv3_find_ste (sid, s->features, s->sid_split); +/* Check SID range */ +if (sid > (1 <<SMMU_IDR1_SIDSIZE )) { + event->type =SMMU_EVT_C_BAD_STREAMID ; +return -EINVAL ; + } +if (s->features &SMMU_FEATURE_2LVL_STE ) { +int l1_ste_offset, l2_ste_offset, max_l2_ste, span; +dma_addr_t strtab_base, l1ptr, l2ptr; +STEDesc l1std; + + strtab_base = s->strtab_base &SMMU_BASE_ADDR_MASK ; + l1_ste_offset = sid >> s->sid_split; + l2_ste_offset = sid & ((1 << s->sid_split) -1 ); + l1ptr = (dma_addr_t)(strtab_base + l1_ste_offset *sizeof (l1std)); +/* TODO: guarantee 64-bit single-copy atomicity */ + ret =dma_memory_read (&address_space_memory, l1ptr, + (uint8_t *)&l1std,sizeof (l1std)); +if (ret !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"Could not read L1PTR at 0X%" PRIx64"\n" , l1ptr); + event->type =SMMU_EVT_F_STE_FETCH ; + event->u.f_ste_fetch.addr = l1ptr; +return -EINVAL ; + } + + span =L1STD_SPAN (&l1std); + +if (!span) { +/* l2ptr is not valid */ +qemu_log_mask (LOG_GUEST_ERROR , +"invalid sid=%d (L1STD span=0)\n" , sid); + event->type =SMMU_EVT_C_BAD_STREAMID ; +return -EINVAL ; + } + max_l2_ste = (1 << span) -1 ; + l2ptr =L1STD_L2PTR (&l1std); +trace_smmuv3_find_ste_2lvl (s->strtab_base, l1ptr, l1_ste_offset, + l2ptr, l2_ste_offset, max_l2_ste); +if (l2_ste_offset > max_l2_ste) { +qemu_log_mask (LOG_GUEST_ERROR , +"l2_ste_offset=%d > max_l2_ste=%d\n" , + l2_ste_offset, max_l2_ste); + event->type =SMMU_EVT_C_BAD_STE ; +return -EINVAL ; + } + addr =L1STD_L2PTR (&l1std) + l2_ste_offset *sizeof (*ste); + }else { + addr = s->strtab_base + sid *sizeof (*ste); + } + +if (smmu_get_ste (s, addr, ste, event)) { +return -EINVAL ; + } + +return 0 ; +} + +static int decode_cd (SMMUTransCfg *cfg,CD *cd,SMMUEventInfo *event) +{ +int ret = -EINVAL ; +int i; + +if (!CD_VALID (cd) || !CD_AARCH64 (cd)) { + goto error; + } + +/* we support only those at the moment */ + cfg->aa64 = true; + cfg->stage =1 ; + + cfg->oas =oas2bits (CD_IPS (cd)); + cfg->oas =MIN (oas2bits (SMMU_IDR5_OAS ), cfg->oas); + cfg->tbi =CD_TBI (cd); + cfg->asid =CD_ASID (cd); + +trace_smmuv3_decode_cd (cfg->oas); + +/* decode data dependent on TT */ +for (i =0 ; i <=1 ; i++) { +int tg, tsz; +SMMUTransTableInfo *tt = &cfg->tt[i]; + + cfg->tt[i].disabled =CD_EPD (cd, i); +if (cfg->tt[i].disabled) { +continue ; + } + + tsz =CD_TSZ (cd, i); +if (tsz <16 || tsz >39 ) { + goto error; + } + + tg =CD_TG (cd, i); + tt->granule_sz =tg2granule (tg, i); +if ((tt->granule_sz !=12 && tt->granule_sz !=16 ) ||CD_ENDI (cd)) { + goto error; + } + + tt->tsz = tsz; + tt->initial_level =4 - (64 - tsz -4 ) / (tt->granule_sz -3 ); + tt->ttb =CD_TTB (cd, i); + tt->ttb =extract64 (tt->ttb,0 , cfg->oas); +trace_smmuv3_decode_cd_tt (i, tt->tsz, tt->ttb, + tt->granule_sz, tt->initial_level); + } + + event->record_trans_faults =CD_R (cd); + +return 0 ; + +error:
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 509
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+ event->type =SMMU_EVT_C_BAD_CD ; +return ret; +} + +/** +* smmuv3_decode_config - Prepare the translation configuration +* for the @mr iommu region +* @mr: iommu memory region the translation config must be prepared for +* @cfg: output translation configuration which is populated through +* the different configuration decodng steps
"decoding"
Quoted 91 lines
hw/arm/smmuv3.c +91
-0+* @event: must be zero'ed by the caller +* +* return < 0 if the translation needs to be aborted (@event is filled +* accordingly). Return 0 otherwise. +*/ +static int smmuv3_decode_config (IOMMUMemoryRegion *mr,SMMUTransCfg *cfg, +SMMUEventInfo *event) +{ +SMMUDevice *sdev =container_of (mr, SMMUDevice, iommu); +uint32_t sid =smmu_get_sid (sdev); +SMMUv3State *s = sdev->smmu; +int ret = -EINVAL ; +STE ste; +CD cd; + +if (smmu_find_ste (s, sid, &ste, event)) { +return ret; + } + +if (decode_ste (s, cfg, &ste, event)) { +return ret; + } + +if (smmu_get_cd (s, &ste,0 /* ssid */ , &cd, event)) { +return ret; + } + +return decode_cd (cfg, &cd, event); +} + +static IOMMUTLBEntry smmuv3_translate (IOMMUMemoryRegion *mr,hwaddr addr, +IOMMUAccessFlags flag) +{ +SMMUDevice *sdev =container_of (mr, SMMUDevice, iommu); +SMMUv3State *s = sdev->smmu; +uint32_t sid =smmu_get_sid (sdev); +SMMUEventInfo event = {.type =SMMU_EVT_OK , .sid = sid}; +SMMUPTWEventInfo ptw_info = {}; +SMMUTransCfg cfg = {}; +IOMMUTLBEntry entry = { + .target_as = &address_space_memory, + .iova = addr, + .translated_addr = addr, + .addr_mask = ~(hwaddr )0 , + .perm =IOMMU_NONE , + }; +int ret =0 ; + +if (!smmu_enabled (s)) { + goto out; + } + + ret =smmuv3_decode_config (mr, &cfg, &event); +if (ret) { + goto out; + } + +if (cfg.aborted) { + goto out; + } + + ret =smmu_ptw (&cfg, addr, flag, &entry, &ptw_info); +if (ret) { +switch (ptw_info.type) { +case SMMU_PTW_ERR_WALK_EABT : + event.type =SMMU_EVT_F_WALK_EABT ; + event.u.f_walk_eabt.addr = addr; + event.u.f_walk_eabt.rnw = flag &0x1 ; + event.u.f_walk_eabt.class =0x1 ; + event.u.f_walk_eabt.addr2 = ptw_info.addr; +break ; +case SMMU_PTW_ERR_TRANSLATION : +if (event.record_trans_faults) { + event.type =SMMU_EVT_F_TRANSLATION ; + event.u.f_translation.addr = addr; + event.u.f_translation.rnw = flag &0x1 ; + } +break ; +case SMMU_PTW_ERR_ADDR_SIZE : +if (event.record_trans_faults) { + event.type =SMMU_EVT_F_ADDR_SIZE ; + event.u.f_addr_size.addr = addr; + event.u.f_addr_size.rnw = flag &0x1 ; + } +break ; +case SMMU_PTW_ERR_ACCESS : +if (event.record_trans_faults) { + event.type =SMMU_EVT_F_ACCESS ; + event.u.f_access.addr = addr; + event.u.f_access.rnw = flag &0x1 ; + }
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 610
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+break ; +case SMMU_PTW_ERR_PERMISSION : +if (event.record_trans_faults) { + event.type =SMMU_EVT_F_PERMISSION ; + event.u.f_permission.addr = addr; + event.u.f_permission.rnw = flag &0x1 ; + } +break ; +default : +error_setg (&error_fatal,"SMMUV3 BUG" );
g_assert_not_reached(), I guess ?
Quoted 40 lines
hw/arm/smmuv3.c +22
-0+ } + } + +trace_smmuv3_translate (mr->parent_obj.name, sid, addr, + entry.translated_addr, entry.perm); +out: +if (ret) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s translation failed for iova=0x%" PRIx64" (%s)\n" , + mr->parent_obj.name, addr,SMMU_EVENT_STRING (event.type)); + entry.perm =IOMMU_NONE ; +smmuv3_record_event (s, &event); + }else if (!cfg.aborted) { + entry.perm = flag; + } + +return entry; +} +static int smmuv3_cmdq_consume (SMMUv3State *s) {SMMUCmdError cmd_error =SMMU_CERROR_NONE ;@@ -739,6 +1077,9 @@ static void smmuv3_class_init(ObjectClass *klass, void *data)static void smmuv3_iommu_memory_region_class_init (ObjectClass *klass,void *data) { +IOMMUMemoryRegionClass *imrc =IOMMU_MEMORY_REGION_CLASS (klass); + + imrc->translate = smmuv3_translate; }static const TypeInfo smmuv3_type_info = {hw/arm/trace-events +0
-0@@ -29,3 +29,12 @@ smmuv3_write_mmio_idr(hwaddr addr, uint64_t val) "write to RO/Unimpl reg 0x%lx v smmuv3_write_mmio_evtq_cons_bef_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "Before clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" smmuv3_write_mmio_evtq_cons_after_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "after clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" smmuv3_record_event(const char *type, uint32_t sid) "%s sid=%d"
hw/arm/trace-events smmuv3_write_mmio_idr(hwaddr addr, uint64_t val) "write to RO/Unimpl reg 0x%lx v
Quoted 10 lines
hw/arm/trace-events +9
-1+smmuv3_find_ste(uint16_t sid, uint32_t features, uint16_t sid_split) "SID:0x%x features:0x%x, sid_split:0x%x" +smmuv3_find_ste_2lvl(uint64_t strtab_base, hwaddr l1ptr, int l1_ste_offset, hwaddr l2ptr, int l2_ste_offset, int max_l2_ste) "strtab_base:0x%lx l1ptr:0x%"PRIx64" l1_off:0x%x, l2ptr:0x%"PRIx64" l2_off:0x%x max_l2_ste:%d" +smmuv3_get_ste(hwaddr addr) "STE addr: 0x%"PRIx64 +smmuv3_translate_bypass(const char *n, uint16_t sid, hwaddr addr, bool is_write) "%s sid=%d bypass iova:0x%"PRIx64" is_write=%d" +smmuv3_translate_in(uint16_t sid, int pci_bus_num, hwaddr strtab_base) "SID:0x%x bus:%d strtab_base:0x%"PRIx64 +smmuv3_get_cd(hwaddr addr) "CD addr: 0x%"PRIx64 +smmuv3_translate(const char *n, uint16_t sid, hwaddr iova, hwaddr translated, int perm) "%s sid=%d iova=0x%"PRIx64" translated=0x%"PRIx64" perm=0x%x" +smmuv3_decode_cd(uint32_t oas) "oas=%d" +smmuv3_decode_cd_tt(int i, uint32_t tsz, uint64_t ttb, uint32_t granule_sz, int initial_level) "TT[%d]:tsz:%d ttb:0x%"PRIx64" granule_sz:%d, initial_level = %d" --
More hwaddrs in here that should be uint64_t.
thanks
-- PMM
Re: [Qemu-devel] [PATCH v9 09/14] hw/arm/smmuv3: Implement translate callback
Hi Peter,
Quoted 57 lines · Peter Maydell
Quoted 56 lines · Eric Auger
This patch implements the IOMMU Memory Region
translate()callback. Most of the code relates to the translation configuration decoding and check (STE, CD).Signed-off-by Eric Auger <[email protected]>---
v8 -> v9:
- useSMMU_EVENT_STRINGmacro
- get rid of last erro_report's
- decode asid
- handle config abort before ptw
- add 64-bit single-copy atomic commentv7 -> v8:
- useaddress_space_rw
- s/Ste/STE, s/Cd/CD
- usedma_memory_read
- remove everything related to stage 2
- collect data for both TTx
- renamings
- pass the event handle all along the config decoding path
- decode tbi, ars--- hw/arm/smmuv3-internal.h | 146 ++++++++++++++++++++ hw/arm/smmuv3.c | 341 +++++++++++++++++++++++++++++++++++++++++++++++ hw/arm/trace-events | 9 ++ 3 files changed, 496 insertions(+)hw/arm/smmuv3-internal.h +19
-0@@ -462,4 +462,150 @@ typedef struct SMMUEventInfo {void smmuv3_record_event (SMMUv3State *s,SMMUEventInfo *event); +/* Configuration Data */ + +/* STE Level 1 Descriptor */ +typedef struct STEDesc { +uint32_t word[2 ]; +}STEDesc ; + +/* CD Level 1 Descriptor */ +typedef struct CDDesc { +uint32_t word[2 ]; +}CDDesc ; + +/* Stream Table Entry(STE) */ +typedef struct STE { +uint32_t word[16 ]; +}STE ; + +/* Context Descriptor(CD) */ +typedef struct CD {
Quoted 8 lines
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 489
Quoted 6 lines
hw/arm/smmuv3-internal.h +6
-0+uint32_t word[16 ]; +}CD ; + +/* STE fields */ + +#define STE_VALID (x) extract32((x)->word[0], 0, 1)/* 0 */ I'm not sure what the comment is supposed to be telling me ?
removed
Quoted 51 lines
Quoted 36 lines
hw/arm/smmuv3-internal.h +35
-0+ +#define STE_CONFIG (x) extract32((x)->word[0], 1, 3) +#define STE_CFG_S1_ENABLED (config) (config & 0x1) +#define STE_CFG_S2_ENABLED (config) (config & 0x2) +#define STE_CFG_ABORT (config) (!(config & 0x4)) +#define STE_CFG_BYPASS (config) (config == 0x4) + +#define STE_S1FMT (x) extract32((x)->word[0], 4 , 2) +#define STE_S1CDMAX (x) extract32((x)->word[1], 27, 5) +#define STE_EATS (x) extract32((x)->word[2], 28, 2) +#define STE_STRW (x) extract32((x)->word[2], 30, 2) +#define STE_S2VMID (x) extract32((x)->word[4], 0 , 16) +#define STE_S2T0SZ (x) extract32((x)->word[5], 0 , 6) +#define STE_S2SL0 (x) extract32((x)->word[5], 6 , 2) +#define STE_S2TG (x) extract32((x)->word[5], 14, 2) +#define STE_S2PS (x) extract32((x)->word[5], 16, 3) +#define STE_S2AA64 (x) extract32((x)->word[5], 19, 1) +#define STE_S2HD (x) extract32((x)->word[5], 24, 1) +#define STE_S2HA (x) extract32((x)->word[5], 25, 1) +#define STE_S2S (x) extract32((x)->word[5], 26, 1) +#define STE_CTXPTR (x) \ + ({ \ + unsigned long addr; \ + addr = (uint64_t)extract32((x)->word[1], 0, 16) << 32; \ + addr |= (uint64_t)((x)->word[0] & 0xffffffc0); \ + addr; \ + }) + +#define STE_S2TTB (x) \ + ({ \ + unsigned long addr; \ + addr = (uint64_t)extract32((x)->word[7], 0, 16) << 32; \ + addr |= (uint64_t)((x)->word[6] & 0xfffffff0); \ + addr; \ + })hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 534
Quoted 10 lines
hw/arm/smmuv3-internal.h +10
-0+ +static inline int oas2bits (int oas_field) +{ +switch (oas_field) { +case 0b011 : +return 42 ; +case 0b100 : +return 44 ; +default : +return 32 + (1 << oas_field);Is this right? For instance OAS == 0b001 should be 36, but 32 + (1 << 1) == 34 ? 0b110 should be 52, but 32 + (1 << 6) == 96 ?
Quoted 3 lines
I'm not sure there's a neat relationship between the field values and the address sizes here, so maybe we should just have a switch with a case for each value?
indeed, done
Quoted 21 lines
Quoted 21 lines
hw/arm/smmuv3-internal.h +20
-0+ } +} + +static inline int pa_range (STE *ste) +{ +int oas_field =MIN (STE_S2PS (ste),SMMU_IDR5_OAS ); + +if (!STE_S2AA64 (ste)) { +return 40 ; + } + +return oas2bits (oas_field); +} + +#define MAX_PA (ste) ((1 << pa_range(ste)) - 1) + +/* CD fields */ + +#define CD_VALID (x) extract32((x)->word[0], 30, 1) +#define CD_ASID (x) extract32((x)->word[1], 16, 16)
Quoted 8 lines
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 558
Quoted 4 lines
hw/arm/smmuv3-internal.h +4
-0+#define CD_TTB (x, sel) \ + ({ \ + uint64_t hi, lo; \ + hi = extract32((x)->word[(sel) * 2 + 3], 0, 16); \Spec says TTB0/1 fields go up to bit 19. You want the whole lot even if we don't support address sizes that wide because out of range high bits should cause an illegal CD error, not be ignored.
Hum I used an older version of the spec where it stopped at bit 15.
Quoted 6 lines
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 560
Quoted 3 lines
hw/arm/smmuv3-internal.h +2
-0+ hi <<=32 ; \ + lo = (x)->word[(sel) *2 +2 ] & ~0xf ; \Does this ~0xf end up correctly sign extending up into the top 32 bits? ULL suffix would make it certain.
OK
Quoted 35 lines
Quoted 35 lines
hw/arm/smmuv3-internal.h +34
-0+ hi | lo; \ + }) + +#define CD_TSZ (x, sel) extract32((x)->word[0], (16 * (sel)) + 0, 6) +#define CD_TG (x, sel) extract32((x)->word[0], (16 * (sel)) + 6, 2) +#define CD_EPD (x, sel) extract32((x)->word[0], (16 * (sel)) + 14, 1) +#define CD_ENDI (x) extract32((x)->word[0], 15, 1) +#define CD_IPS (x) extract32((x)->word[1], 0 , 3) +#define CD_TBI (x) extract32((x)->word[1], 6 , 2) +#define CD_S (x) extract32((x)->word[1], 12, 1) +#define CD_R (x) extract32((x)->word[1], 13, 1) +#define CD_A (x) extract32((x)->word[1], 14, 1) +#define CD_AARCH64 (x) extract32((x)->word[1], 9 , 1) + +#define CDM_VALID (x) ((x)->word[0] & 0x1) + +static inline int is_cd_valid (SMMUv3State *s,STE *ste,CD *cd) +{ +return CD_VALID (cd); +} + +/** +* tg2granule - Decodes the CD translation granule size field according +* to the ttbr in use +* @bits: TG0/1 fields +* @ttbr: ttbr index in use +*/ +static inline int tg2granule (int bits,int ttbr) +{ +switch (bits) { +case 1 : +return ttbr ?14 :16 ; +case 2 : +return ttbr ?12 :14 ;
Quoted 8 lines
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 598
Quoted 4 lines
hw/arm/smmuv3-internal.h +4
-0+case 3 : +return ttbr ?16 :12 ; +default : +return 12 ;TG0 == 0b11 and TG1 == 0b00 are reserved and should cause an illegal CD error if the config means they would be used, not be treated as if they were one of the other values.
OK modified
Quoted 6 lines
The spec has a definition of a
CD_ILLEGALexpression which specifies what conditions should cause an illegal CD error. It might be useful to have something in the patchset that looks like that, and then later you can just assert that you're not dealing with illegal values, or ignore them.
At the moment I added some additional checks on S1STALLD, CD_A, CD_S, CD_HA, CD_HD to match the formulae. My concern is I am filling the config struct while checking the data so it was easier for me to split into several checks.
Quoted 12 lines
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 605
Quoted 8 lines
hw/arm/smmuv3-internal.h +7
-0+ } +} + +#define L1STD_L2PTR (stm) ({ \ + uint64_t hi, lo; \ + hi = (stm)->word[1]; \ + lo = (stm)->word[0] & ~(uint64_t)0x1f; \I see here you have a cast to force the mask to 64-bits wide. ULL suffix would be shorter, but in any case do the same thing in all places.
OK
Quoted 7 lines
hw/arm/smmuv3-internal.h typedef struct SMMUEventInfo { · line 607
Quoted 3 lines
hw/arm/smmuv3-internal.h +2
-0+ hi <<32 | lo; \ + })This would definitely be better as an inline function rather than a multiline macro that has to use the GCC extension to define macro-local variables and return a value.
done
Quoted 71 lines
Quoted 71 lines
hw/arm/smmuv3-internal.h +3
-0+ +#define L1STD_SPAN (stm) (extract32((stm)->word[0], 0, 4)) +#endif hw/arm/smmuv3.c +58
-0@@ -289,6 +289,344 @@ static void smmuv3_init_regs(SMMUv3State *s) s->sid_split =0 ; } +static int smmu_get_ste (SMMUv3State *s,dma_addr_t addr,STE *buf, +SMMUEventInfo *event) +{ +int ret; + +trace_smmuv3_get_ste (addr); +/* TODO: guarantee 64-bit single-copy atomicity */ + ret =dma_memory_read (&address_space_memory, addr, + (void *)buf,sizeof (*buf)); +if (ret !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"Cannot fetch pte at address=0x%" PRIx64"\n" , addr); + event->type =SMMU_EVT_F_STE_FETCH ; + event->u.f_ste_fetch.addr = addr; +return -EINVAL ; + } +return 0 ; + +} + +/* @ssid > 0 not supported yet */ +static int smmu_get_cd (SMMUv3State *s,STE *ste,uint32_t ssid, +CD *buf,SMMUEventInfo *event) +{ +dma_addr_t addr =STE_CTXPTR (ste); +int ret; + +trace_smmuv3_get_cd (addr); +/* TODO: guarantee 64-bit single-copy atomicity */ + ret =dma_memory_read (&address_space_memory, addr, + (void *)buf,sizeof (*buf)); +if (ret !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"Cannot fetch pte at address=0x%" PRIx64"\n" , addr); + event->type =SMMU_EVT_F_CD_FETCH ; + event->u.f_ste_fetch.addr = addr; +return -EINVAL ; + } +return 0 ; +} + +static int decode_ste (SMMUv3State *s,SMMUTransCfg *cfg, +STE *ste,SMMUEventInfo *event) +{ +uint32_t config =STE_CONFIG (ste); +int ret = -EINVAL ; + +if (STE_CFG_ABORT (config)) { +/* abort but don't record any event */ + cfg->aborted = true; +return ret; + } + +if (STE_CFG_BYPASS (config)) { + cfg->bypassed = true; +return ret; + } +
Quoted 8 lines
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 355
Quoted 6 lines
hw/arm/smmuv3.c +6
-0+if (!STE_VALID (ste)) { + goto bad_ste; + } + +if (STE_CFG_S2_ENABLED (config)) { +error_setg (&error_fatal,"SMMUv3 does not support stage 2 yet" );Usual remarks about not using
error_setg()for this kind of thing.
done
Quoted 149 lines
Quoted 149 lines
hw/arm/smmuv3.c +148
-0+ } + +if (STE_S1CDMAX (ste) !=0 ) { +error_setg (&error_fatal, +"SMMUv3 does not support multiple context descriptors yet" ); + goto bad_ste; + } +return 0 ; + +bad_ste: + event->type =SMMU_EVT_C_BAD_STE ; +return -EINVAL ; +} + +/** +* smmu_find_ste - Return the stream table entry associated +* to the sid +* +* @s: smmuv3 handle +* @sid: stream ID +* @ste: returned stream table entry +* @event: handle to an event info +* +* Supports linear and 2-level stream table +* Return 0 on success, -EINVAL otherwise +*/ +static int smmu_find_ste (SMMUv3State *s,uint32_t sid,STE *ste, +SMMUEventInfo *event) +{ +dma_addr_t addr; +int ret; + +trace_smmuv3_find_ste (sid, s->features, s->sid_split); +/* Check SID range */ +if (sid > (1 <<SMMU_IDR1_SIDSIZE )) { + event->type =SMMU_EVT_C_BAD_STREAMID ; +return -EINVAL ; + } +if (s->features &SMMU_FEATURE_2LVL_STE ) { +int l1_ste_offset, l2_ste_offset, max_l2_ste, span; +dma_addr_t strtab_base, l1ptr, l2ptr; +STEDesc l1std; + + strtab_base = s->strtab_base &SMMU_BASE_ADDR_MASK ; + l1_ste_offset = sid >> s->sid_split; + l2_ste_offset = sid & ((1 << s->sid_split) -1 ); + l1ptr = (dma_addr_t)(strtab_base + l1_ste_offset *sizeof (l1std)); +/* TODO: guarantee 64-bit single-copy atomicity */ + ret =dma_memory_read (&address_space_memory, l1ptr, + (uint8_t *)&l1std,sizeof (l1std)); +if (ret !=MEMTX_OK ) { +qemu_log_mask (LOG_GUEST_ERROR , +"Could not read L1PTR at 0X%" PRIx64"\n" , l1ptr); + event->type =SMMU_EVT_F_STE_FETCH ; + event->u.f_ste_fetch.addr = l1ptr; +return -EINVAL ; + } + + span =L1STD_SPAN (&l1std); + +if (!span) { +/* l2ptr is not valid */ +qemu_log_mask (LOG_GUEST_ERROR , +"invalid sid=%d (L1STD span=0)\n" , sid); + event->type =SMMU_EVT_C_BAD_STREAMID ; +return -EINVAL ; + } + max_l2_ste = (1 << span) -1 ; + l2ptr =L1STD_L2PTR (&l1std); +trace_smmuv3_find_ste_2lvl (s->strtab_base, l1ptr, l1_ste_offset, + l2ptr, l2_ste_offset, max_l2_ste); +if (l2_ste_offset > max_l2_ste) { +qemu_log_mask (LOG_GUEST_ERROR , +"l2_ste_offset=%d > max_l2_ste=%d\n" , + l2_ste_offset, max_l2_ste); + event->type =SMMU_EVT_C_BAD_STE ; +return -EINVAL ; + } + addr =L1STD_L2PTR (&l1std) + l2_ste_offset *sizeof (*ste); + }else { + addr = s->strtab_base + sid *sizeof (*ste); + } + +if (smmu_get_ste (s, addr, ste, event)) { +return -EINVAL ; + } + +return 0 ; +} + +static int decode_cd (SMMUTransCfg *cfg,CD *cd,SMMUEventInfo *event) +{ +int ret = -EINVAL ; +int i; + +if (!CD_VALID (cd) || !CD_AARCH64 (cd)) { + goto error; + } + +/* we support only those at the moment */ + cfg->aa64 = true; + cfg->stage =1 ; + + cfg->oas =oas2bits (CD_IPS (cd)); + cfg->oas =MIN (oas2bits (SMMU_IDR5_OAS ), cfg->oas); + cfg->tbi =CD_TBI (cd); + cfg->asid =CD_ASID (cd); + +trace_smmuv3_decode_cd (cfg->oas); + +/* decode data dependent on TT */ +for (i =0 ; i <=1 ; i++) { +int tg, tsz; +SMMUTransTableInfo *tt = &cfg->tt[i]; + + cfg->tt[i].disabled =CD_EPD (cd, i); +if (cfg->tt[i].disabled) { +continue ; + } + + tsz =CD_TSZ (cd, i); +if (tsz <16 || tsz >39 ) { + goto error; + } + + tg =CD_TG (cd, i); + tt->granule_sz =tg2granule (tg, i); +if ((tt->granule_sz !=12 && tt->granule_sz !=16 ) ||CD_ENDI (cd)) { + goto error; + } + + tt->tsz = tsz; + tt->initial_level =4 - (64 - tsz -4 ) / (tt->granule_sz -3 ); + tt->ttb =CD_TTB (cd, i); + tt->ttb =extract64 (tt->ttb,0 , cfg->oas); +trace_smmuv3_decode_cd_tt (i, tt->tsz, tt->ttb, + tt->granule_sz, tt->initial_level); + } + + event->record_trans_faults =CD_R (cd); + +return 0 ; + +error: + event->type =SMMU_EVT_C_BAD_CD ; +return ret; +} +
Quoted 8 lines
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 509
Quoted 6 lines
hw/arm/smmuv3.c +6
-0+/** +* smmuv3_decode_config - Prepare the translation configuration +* for the @mr iommu region +* @mr: iommu memory region the translation config must be prepared for +* @cfg: output translation configuration which is populated through +* the different configuration decodng steps "decoding"
ok
Quoted 96 lines
Quoted 96 lines
hw/arm/smmuv3.c +95
-0+* @event: must be zero'ed by the callerj +* +* return < 0 if the translation needs to be aborted (@event is filled +* accordingly). Return 0 otherwise. +*/ +static int smmuv3_decode_config (IOMMUMemoryRegion *mr,SMMUTransCfg *cfg, +SMMUEventInfo *event) +{ +SMMUDevice *sdev =container_of (mr, SMMUDevice, iommu); +uint32_t sid =smmu_get_sid (sdev); +SMMUv3State *s = sdev->smmu; +int ret = -EINVAL ; +STE ste; +CD cd; + +if (smmu_find_ste (s, sid, &ste, event)) { +return ret; + } + +if (decode_ste (s, cfg, &ste, event)) { +return ret; + } + +if (smmu_get_cd (s, &ste,0 /* ssid */ , &cd, event)) { +return ret; + } + +return decode_cd (cfg, &cd, event); +} + +static IOMMUTLBEntry smmuv3_translate (IOMMUMemoryRegion *mr,hwaddr addr, +IOMMUAccessFlags flag) +{ +SMMUDevice *sdev =container_of (mr, SMMUDevice, iommu); +SMMUv3State *s = sdev->smmu; +uint32_t sid =smmu_get_sid (sdev); +SMMUEventInfo event = {.type =SMMU_EVT_OK , .sid = sid}; +SMMUPTWEventInfo ptw_info = {}; +SMMUTransCfg cfg = {}; +IOMMUTLBEntry entry = { + .target_as = &address_space_memory, + .iova = addr, + .translated_addr = addr, + .addr_mask = ~(hwaddr )0 , + .perm =IOMMU_NONE , + }; +int ret =0 ; + +if (!smmu_enabled (s)) { + goto out; + } + + ret =smmuv3_decode_config (mr, &cfg, &event); +if (ret) { + goto out; + } + +if (cfg.aborted) { + goto out; + } + + ret =smmu_ptw (&cfg, addr, flag, &entry, &ptw_info); +if (ret) { +switch (ptw_info.type) { +case SMMU_PTW_ERR_WALK_EABT : + event.type =SMMU_EVT_F_WALK_EABT ; + event.u.f_walk_eabt.addr = addr; + event.u.f_walk_eabt.rnw = flag &0x1 ; + event.u.f_walk_eabt.class =0x1 ; + event.u.f_walk_eabt.addr2 = ptw_info.addr; +break ; +case SMMU_PTW_ERR_TRANSLATION : +if (event.record_trans_faults) { + event.type =SMMU_EVT_F_TRANSLATION ; + event.u.f_translation.addr = addr; + event.u.f_translation.rnw = flag &0x1 ; + } +break ; +case SMMU_PTW_ERR_ADDR_SIZE : +if (event.record_trans_faults) { + event.type =SMMU_EVT_F_ADDR_SIZE ; + event.u.f_addr_size.addr = addr; + event.u.f_addr_size.rnw = flag &0x1 ; + } +break ; +case SMMU_PTW_ERR_ACCESS : +if (event.record_trans_faults) { + event.type =SMMU_EVT_F_ACCESS ; + event.u.f_access.addr = addr; + event.u.f_access.rnw = flag &0x1 ; + } +break ; +case SMMU_PTW_ERR_PERMISSION : +if (event.record_trans_faults) { + event.type =SMMU_EVT_F_PERMISSION ;
Quoted 8 lines
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 610
Quoted 6 lines
hw/arm/smmuv3.c +6
-0+ event.u.f_permission.addr = addr; + event.u.f_permission.rnw = flag &0x1 ; + } +break ; +default : +error_setg (&error_fatal,"SMMUV3 BUG" );
g_assert_not_reached(), I guess ?
yes
Quoted 45 lines
Quoted 45 lines
hw/arm/smmuv3.c +22
-0+ } + } + +trace_smmuv3_translate (mr->parent_obj.name, sid, addr, + entry.translated_addr, entry.perm); +out: +if (ret) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s translation failed for iova=0x%" PRIx64" (%s)\n" , + mr->parent_obj.name, addr,SMMU_EVENT_STRING (event.type)); + entry.perm =IOMMU_NONE ; +smmuv3_record_event (s, &event); + }else if (!cfg.aborted) { + entry.perm = flag; + } + +return entry; +} +static int smmuv3_cmdq_consume (SMMUv3State *s) {SMMUCmdError cmd_error =SMMU_CERROR_NONE ;@@ -739,6 +1077,9 @@ static void smmuv3_class_init(ObjectClass *klass, void *data)static void smmuv3_iommu_memory_region_class_init (ObjectClass *klass,void *data) { +IOMMUMemoryRegionClass *imrc =IOMMU_MEMORY_REGION_CLASS (klass); + + imrc->translate = smmuv3_translate; }static const TypeInfo smmuv3_type_info = {hw/arm/trace-events +4
-0@@ -29,3 +29,12 @@ smmuv3_write_mmio_idr(hwaddr addr, uint64_t val) "write to RO/Unimpl reg 0x%lx v smmuv3_write_mmio_evtq_cons_bef_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "Before clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" smmuv3_write_mmio_evtq_cons_after_clear(uint32_t prod, uint32_t cons, uint8_t prod_wrap, uint8_t cons_wrap) "after clearing interrupt prod:0x%x cons:0x%x prod.w:%d cons.w:%d" smmuv3_record_event(const char *type, uint32_t sid) "%s sid=%d" +smmuv3_find_ste(uint16_t sid, uint32_t features, uint16_t sid_split) "SID:0x%x features:0x%x, sid_split:0x%x" +smmuv3_find_ste_2lvl(uint64_t strtab_base, hwaddr l1ptr, int l1_ste_offset, hwaddr l2ptr, int l2_ste_offset, int max_l2_ste) "strtab_base:0x%lx l1ptr:0x%"PRIx64" l1_off:0x%x, l2ptr:0x%"PRIx64" l2_off:0x%x max_l2_ste:%d" +smmuv3_get_ste(hwaddr addr) "STE addr: 0x%"PRIx64 +smmuv3_translate_bypass(const char *n, uint16_t sid, hwaddr addr, bool is_write) "%s sid=%d bypass iova:0x%"PRIx64" is_write=%d"
Quoted 8 lines
hw/arm/trace-events smmuv3_write_mmio_idr(hwaddr addr, uint64_t val) "write to RO/Unimpl reg 0x%lx v
Quoted 6 lines
hw/arm/trace-events +5
-1+smmuv3_translate_in(uint16_t sid, int pci_bus_num, hwaddr strtab_base) "SID:0x%x bus:%d strtab_base:0x%"PRIx64 +smmuv3_get_cd(hwaddr addr) "CD addr: 0x%"PRIx64 +smmuv3_translate(const char *n, uint16_t sid, hwaddr iova, hwaddr translated, int perm) "%s sid=%d iova=0x%"PRIx64" translated=0x%"PRIx64" perm=0x%x" +smmuv3_decode_cd(uint32_t oas) "oas=%d" +smmuv3_decode_cd_tt(int i, uint32_t tsz, uint64_t ttb, uint32_t granule_sz, int initial_level) "TT[%d]:tsz:%d ttb:0x%"PRIx64" granule_sz:%d, initial_level = %d" --More hwaddrs in here that should be
uint64_t.
fixed
Thanks
Eric
Quoted 4 lines
thanks
-- PMM
PATCH v9 10/14 hw/arm/smmuv3: Abort on vfio or vhost case
In reply to Eric AugerAt the moment, the SMMUv3 does not support notification on TLB invalidation. So let's abort as soon as such notifier gets enabled.
--- hw/arm/smmuv3.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
hw/arm/smmuv3.c +11 -0
@@ -1074,12 +1074,23 @@ static void smmuv3_class_init(ObjectClass *klass, void *data) dc->realize = smmu_realize; } +static void smmuv3_notify_flag_changed (IOMMUMemoryRegion *iommu, +IOMMUNotifierFlag old, +IOMMUNotifierFlag new) +{ +if (old ==IOMMU_NOTIFIER_NONE ) { +error_setg (&error_fatal, +"SMMUV3: vhost and vfio notifiers not yet supported" ); + } +} +static void smmuv3_iommu_memory_region_class_init (ObjectClass *klass,void *data) {IOMMUMemoryRegionClass *imrc =IOMMU_MEMORY_REGION_CLASS (klass); imrc->translate = smmuv3_translate; + imrc->notify_flag_changed = smmuv3_notify_flag_changed; }static const TypeInfo smmuv3_type_info = {
Signature · 1 line
2.5.5
Re: [Qemu-devel] [PATCH v9 10/14] hw/arm/smmuv3: Abort on vfio or vhost case
Quoted 16 lines · Eric Auger
At the moment, the SMMUv3 does not support notification on TLB invalidation. So let's abort as soon as such notifier gets enabled.
Signed-off-by Eric Auger <[email protected]>--- hw/arm/smmuv3.c | 11 +++++++++++ 1 file changed, 11 insertions(+)hw/arm/smmuv3.c +0
-0@@ -1074,12 +1074,23 @@ static void smmuv3_class_init(ObjectClass *klass, void *data) dc->realize = smmu_realize; }
hw/arm/smmuv3.c static void smmuv3_class_init(ObjectClass *klass, void *data) · line 1085
Quoted 10 lines
hw/arm/smmuv3.c +9
-0+static void smmuv3_notify_flag_changed (IOMMUMemoryRegion *iommu, +IOMMUNotifierFlag old, +IOMMUNotifierFlag new) +{ +if (old ==IOMMU_NOTIFIER_NONE ) { +error_setg (&error_fatal, +"SMMUV3: vhost and vfio notifiers not yet supported" ); + } +}
Is this triggerable by the guest, or by the user on the command line, or only by a bug in the board or other QEMU code?
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 10/14] hw/arm/smmuv3: Abort on vfio or vhost case
Hi Peter,
Quoted 18 lines · Peter Maydell
Quoted 17 lines · Eric Auger
At the moment, the SMMUv3 does not support notification on TLB invalidation. So let's abort as soon as such notifier gets enabled.
Signed-off-by Eric Auger <[email protected]>--- hw/arm/smmuv3.c | 11 +++++++++++ 1 file changed, 11 insertions(+)hw/arm/smmuv3.c +0
-0@@ -1074,12 +1074,23 @@ static void smmuv3_class_init(ObjectClass *klass, void *data) dc->realize = smmu_realize; }
Quoted 12 lines
hw/arm/smmuv3.c static void smmuv3_class_init(ObjectClass *klass, void *data) · line 1085
Quoted 9 lines
hw/arm/smmuv3.c +9
-0+static void smmuv3_notify_flag_changed (IOMMUMemoryRegion *iommu, +IOMMUNotifierFlag old, +IOMMUNotifierFlag new) +{ +if (old ==IOMMU_NOTIFIER_NONE ) { +error_setg (&error_fatal, +"SMMUV3: vhost and vfio notifiers not yet supported" ); + } +}Is this triggerable by the guest, or by the user on the command line, or only by a bug in the board or other QEMU code?
by the user on the command line.
Thanks
Eric
Quoted 4 lines
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 10/14] hw/arm/smmuv3: Abort on vfio or vhost case
Quoted 32 lines · Auger Eric
Hi Peter,
Quoted 18 lines · Peter Maydell
Quoted 17 lines · Eric Auger
At the moment, the SMMUv3 does not support notification on TLB invalidation. So let's abort as soon as such notifier gets enabled.
Signed-off-by Eric Auger <[email protected]>--- hw/arm/smmuv3.c | 11 +++++++++++ 1 file changed, 11 insertions(+)hw/arm/smmuv3.c +0
-0@@ -1074,12 +1074,23 @@ static void smmuv3_class_init(ObjectClass *klass, void *data) dc->realize = smmu_realize; }Quoted 12 lines
hw/arm/smmuv3.c static void smmuv3_class_init(ObjectClass *klass, void *data) · line 1085
Quoted 9 lines
hw/arm/smmuv3.c +9
-0+static void smmuv3_notify_flag_changed (IOMMUMemoryRegion *iommu, +IOMMUNotifierFlag old, +IOMMUNotifierFlag new) +{ +if (old ==IOMMU_NOTIFIER_NONE ) { +error_setg (&error_fatal, +"SMMUV3: vhost and vfio notifiers not yet supported" ); + } +}Is this triggerable by the guest, or by the user on the command line, or only by a bug in the board or other QEMU code?
Quoted 1 line
by the user on the command line.
OK. Do they get this error immediately on startup, or only later in execution? (If the latter, is it possible to make the error happen earlier?)
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 10/14] hw/arm/smmuv3: Abort on vfio or vhost case
Hi Peter,
Quoted 33 lines · Peter Maydell
Quoted 32 lines · Auger Eric
Hi Peter,
Quoted 30 lines · Peter Maydell
Quoted 16 lines · Eric Auger
At the moment, the SMMUv3 does not support notification on TLB invalidation. So let's abort as soon as such notifier gets enabled.
Signed-off-by Eric Auger <[email protected]>--- hw/arm/smmuv3.c | 11 +++++++++++ 1 file changed, 11 insertions(+)hw/arm/smmuv3.c +0
-0@@ -1074,12 +1074,23 @@ static void smmuv3_class_init(ObjectClass *klass, void *data) dc->realize = smmu_realize; }hw/arm/smmuv3.c static void smmuv3_class_init(ObjectClass *klass, void *data) · line 1085
Quoted 10 lines
hw/arm/smmuv3.c +9
-0+static void smmuv3_notify_flag_changed (IOMMUMemoryRegion *iommu, +IOMMUNotifierFlag old, +IOMMUNotifierFlag new) +{ +if (old ==IOMMU_NOTIFIER_NONE ) { +error_setg (&error_fatal, +"SMMUV3: vhost and vfio notifiers not yet supported" ); + } +}Is this triggerable by the guest, or by the user on the command line, or only by a bug in the board or other QEMU code?
Quoted 5 lines
Quoted 1 line
by the user on the command line.
OK. Do they get this error immediately on startup, or only later in execution? (If the latter, is it possible to make the error happen earlier?)
later in execution. We also have to handle the case where such device is hot-plugged. At best if could be done on smmu_find_add_as() by checking the type of attached device but this wouldn't happen much earlier. By the way we will soon support vhost and we will just rule out vfio integration by detecting map notifiers.
Thanks
Eric
Quoted 4 lines
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 10/14] hw/arm/smmuv3: Abort on vfio or vhost case
Quoted 25 lines · Eric Auger
Hi Peter,
Quoted 16 lines · Peter Maydell
Quoted 15 lines · Auger Eric
Hi Peter,
Quoted 13 lines · Peter Maydell
hw/arm/smmuv3.c static void smmuv3_class_init(ObjectClass *klass, void *data) · line 1085
Quoted 9 lines · Eric Auger
hw/arm/smmuv3.c +9
-0+static void smmuv3_notify_flag_changed (IOMMUMemoryRegion *iommu, +IOMMUNotifierFlag old, +IOMMUNotifierFlag new) +{ +if (old ==IOMMU_NOTIFIER_NONE ) { +error_setg (&error_fatal, +"SMMUV3: vhost and vfio notifiers not yet supported" ); + } +}Is this triggerable by the guest, or by the user on the command line, or only by a bug in the board or other QEMU code?
Quoted 5 lines
Quoted 1 line
by the user on the command line.
OK. Do they get this error immediately on startup, or only later in execution? (If the latter, is it possible to make the error happen earlier?)
Quoted 5 lines
later in execution. We also have to handle the case where such device is hot-plugged. At best if could be done on
smmu_find_add_as()by checking the type of attached device but this wouldn't happen much earlier. By the way we will soon support vhost and we will just rule out vfio integration by detecting map notifiers.
Hmm. error_fatal is a bit unfortunate for a hotplug event -- ideally you would want to cause the hotplug to cleanly fail without aborting the running QEMU session.
thanks
-- PMM
Re: [Qemu-arm] [Qemu-devel] [PATCH v9 10/14] hw/arm/smmuv3: Abort on vfio or vhost case
Hi Peter,
Quoted 32 lines · Peter Maydell
Quoted 25 lines · Eric Auger
Hi Peter,
Quoted 16 lines · Peter Maydell
Quoted 15 lines · Auger Eric
Hi Peter,
Quoted 13 lines · Peter Maydell
hw/arm/smmuv3.c static void smmuv3_class_init(ObjectClass *klass, void *data) · line 1085
Quoted 9 lines · Eric Auger
hw/arm/smmuv3.c +9
-0+static void smmuv3_notify_flag_changed (IOMMUMemoryRegion *iommu, +IOMMUNotifierFlag old, +IOMMUNotifierFlag new) +{ +if (old ==IOMMU_NOTIFIER_NONE ) { +error_setg (&error_fatal, +"SMMUV3: vhost and vfio notifiers not yet supported" ); + } +}Is this triggerable by the guest, or by the user on the command line, or only by a bug in the board or other QEMU code?
Quoted 5 lines
Quoted 1 line
by the user on the command line.
OK. Do they get this error immediately on startup, or only later in execution? (If the latter, is it possible to make the error happen earlier?)
Quoted 5 lines
later in execution. We also have to handle the case where such device is hot-plugged. At best if could be done on
smmu_find_add_as()by checking the type of attached device but this wouldn't happen much earlier. By the way we will soon support vhost and we will just rule out vfio integration by detecting map notifiers.
Quoted 3 lines
Hmm.
error_fatalis a bit unfortunate for a hotplug event -- ideally you would want to cause the hotplug to cleanly fail without aborting the running QEMU session.
At the moment I suggest I replace the assert by a warn_report saying vhost/vfio devices will not function properly.
Normally in short term the restriction will only apply to VFIO devices.
Having something more elegant would imply some modifications in the pci subsystem I think:
pci_init_bus_master
-> pci_device_iommu_address_space ->iommu_fn = smmu_find_add_as
pci_init_bus_master is called in pcibus_machine_done and pci_qdev_realize/do_pci_register_device. But it is a void at the moment.
in smmu_find_add_as I could check whether the device is a VFIO
In case of a VFIO device smmu_find_add_as could return NULL; test this in pci_init_bus_master and propagate the error upstream?
Thanks
Eric
Quoted 4 lines
thanks
-- PMM
PATCH v9 11/14 target/arm/kvm: Translate the MSI doorbell in kvm_arch_fixup_msi_route
In reply to Eric AugerIn case the MSI is translated by an IOMMU we need to fixup the MSI route with the translated address.
---
v5 -> v6:
- use IOMMUMemoryRegionClass API
It is still unclear to me if we need to register an IOMMUNotifier to handle any change in the MSI doorbell which would occur behind the scene and would not lead to any call to kvm_arch_fixup_msi_route().
--- target/arm/kvm.c | 27 +++++++++++++++++++++++++++ target/arm/trace-events | 3 +++ 2 files changed, 30 insertions(+)
target/arm/kvm.c +27 -0
@@ -20,8 +20,13 @@#include "sysemu/kvm.h" #include "kvm_arm.h" #include "cpu.h" +#include "trace.h" #include "internals.h" #include "hw/arm/arm.h" +#include "hw/pci/pci.h" +#include "hw/pci/msi.h" +#include "hw/arm/smmu-common.h" +#include "hw/arm/smmuv3.h" #include "exec/memattrs.h" #include "exec/address-spaces.h" #include "hw/boards.h"
@@ -666,6 +671,28 @@ int kvm_arm_vgic_probe(void)int kvm_arch_fixup_msi_route (struct kvm_irq_routing_entry *route,uint64_t address,uint32_t data,PCIDevice *dev) { +AddressSpace *as =pci_device_iommu_address_space (dev); +IOMMUMemoryRegionClass *imrc; +IOMMUTLBEntry entry; +SMMUDevice *sdev; + +if (as == &address_space_memory) { +return 0 ; + } + +/* MSI doorbell address is translated by an IOMMU */ + sdev =container_of (as, SMMUDevice, as); + imrc =IOMMU_MEMORY_REGION_GET_CLASS (&sdev->iommu); + + entry = imrc->translate (&sdev->iommu, address,IOMMU_WO ); + + route->u.msi.address_lo = entry.translated_addr; + route->u.msi.address_hi = entry.translated_addr >>32 ; + +trace_kvm_arm_fixup_msi_route (address, sdev->devfn, + sdev->iommu.parent_obj.name, + entry.translated_addr); +return 0 ; }
target/arm/trace-events +3 -0
@@ -8,3 +8,6 @@ arm_gt_tval_write(int timer, uint64_t value) "gt_tval_write: timer %d value 0x%" arm_gt_ctl_write(int timer, uint64_t value) "gt_ctl_write: timer %d value 0x%" PRIx64 arm_gt_imask_toggle(int timer, int irqstate) "gt_ctl_write: timer %d IMASK toggle, new irqstate %d" arm_gt_cntvoff_write(uint64_t value) "gt_cntvoff_write: value 0x%" PRIx64 + +# target/arm/kvm.c +kvm_arm_fixup_msi_route(uint64_t iova, uint32_t devid, const char *name, uint64_t gpa) "MSI addr = 0x%"PRIx64" is translated for devfn=%d through %s into 0x%"PRIx64
Signature · 1 line
2.5.5
Re: [Qemu-arm] [PATCH v9 11/14] target/arm/kvm: Translate the MSI doorbell in kvm_arch_fixup_msi_route
Quoted 5 lines · Eric Auger
In case the MSI is translated by an IOMMU we need to fixup the MSI route with the translated address.
Signed-off-by Eric Auger <[email protected]>
Quoted 8 lines
---
v5 -> v6:
- use IOMMUMemoryRegionClass APIIt is still unclear to me if we need to register an IOMMUNotifier to handle any change in the MSI doorbell which would occur behind the scene and would not lead to any call to
kvm_arch_fixup_msi_route().
Paolo, do you know the answer to this question ?
Quoted 41 lines
--- target/arm/kvm.c | 27 +++++++++++++++++++++++++++ target/arm/trace-events | 3 +++ 2 files changed, 30 insertions(+)target/arm/kvm.c +19
-0@@ -20,8 +20,13 @@#include "sysemu/kvm.h" #include "kvm_arm.h" #include "cpu.h" +#include "trace.h" #include "internals.h" #include "hw/arm/arm.h" +#include "hw/pci/pci.h" +#include "hw/pci/msi.h" +#include "hw/arm/smmu-common.h" +#include "hw/arm/smmuv3.h" #include "exec/memattrs.h" #include "exec/address-spaces.h" #include "hw/boards.h" @@ -666,6 +671,28 @@ int kvm_arm_vgic_probe(void)int kvm_arch_fixup_msi_route (struct kvm_irq_routing_entry *route,uint64_t address,uint32_t data,PCIDevice *dev) { +AddressSpace *as =pci_device_iommu_address_space (dev); +IOMMUMemoryRegionClass *imrc; +IOMMUTLBEntry entry; +SMMUDevice *sdev; + +if (as == &address_space_memory) { +return 0 ; + } + +/* MSI doorbell address is translated by an IOMMU */ + sdev =container_of (as, SMMUDevice, as); + imrc =IOMMU_MEMORY_REGION_GET_CLASS (&sdev->iommu); + + entry = imrc->translate (&sdev->iommu, address,IOMMU_WO );
target/arm/kvm.c int kvm_arm_vgic_probe(void) · line 697
Quoted 10 lines
target/arm/kvm.c +8
-0+ + route->u.msi.address_lo = entry.translated_addr; + route->u.msi.address_hi = entry.translated_addr >>32 ; + +trace_kvm_arm_fixup_msi_route (address, sdev->devfn, + sdev->iommu.parent_obj.name, + entry.translated_addr); +return 0 ; }
It seems a bit odd that:
* the code for arm for "PCI devices behind IOMMU need to have the MSI doorbell writes go through the IOMMU" looks rather different from the code for x86 for the same thing
* the code here needs to know specifically that this is an SMMU and not some other kind of IOMMU
I would have expected this to be more generic-to-all-IOMMU APIs and maybe even implemented in the generic KVM support code...
The x86 code seems to be similarly x86-specific though, so this is more of a "perhaps there is a cleanup opportunity here" observation I guess.
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 11/14] target/arm/kvm: Translate the MSI doorbell in kvm_arch_fixup_msi_route
Hi Peter,
Quoted 65 lines · Peter Maydell
Quoted 5 lines · Eric Auger
In case the MSI is translated by an IOMMU we need to fixup the MSI route with the translated address.
Signed-off-by Eric Auger <[email protected]>Quoted 8 lines
---
v5 -> v6:
- use IOMMUMemoryRegionClass APIIt is still unclear to me if we need to register an IOMMUNotifier to handle any change in the MSI doorbell which would occur behind the scene and would not lead to any call to
kvm_arch_fixup_msi_route().Paolo, do you know the answer to this question ?
Quoted 48 lines
--- target/arm/kvm.c | 27 +++++++++++++++++++++++++++ target/arm/trace-events | 3 +++ 2 files changed, 30 insertions(+)target/arm/kvm.c +26
-0@@ -20,8 +20,13 @@#include "sysemu/kvm.h" #include "kvm_arm.h" #include "cpu.h" +#include "trace.h" #include "internals.h" #include "hw/arm/arm.h" +#include "hw/pci/pci.h" +#include "hw/pci/msi.h" +#include "hw/arm/smmu-common.h" +#include "hw/arm/smmuv3.h" #include "exec/memattrs.h" #include "exec/address-spaces.h" #include "hw/boards.h" @@ -666,6 +671,28 @@ int kvm_arm_vgic_probe(void)int kvm_arch_fixup_msi_route (struct kvm_irq_routing_entry *route,uint64_t address,uint32_t data,PCIDevice *dev) { +AddressSpace *as =pci_device_iommu_address_space (dev); +IOMMUMemoryRegionClass *imrc; +IOMMUTLBEntry entry; +SMMUDevice *sdev; + +if (as == &address_space_memory) { +return 0 ; + } + +/* MSI doorbell address is translated by an IOMMU */ + sdev =container_of (as, SMMUDevice, as); + imrc =IOMMU_MEMORY_REGION_GET_CLASS (&sdev->iommu); + + entry = imrc->translate (&sdev->iommu, address,IOMMU_WO ); + + route->u.msi.address_lo = entry.translated_addr; + route->u.msi.address_hi = entry.translated_addr >>32 ; + +trace_kvm_arm_fixup_msi_route (address, sdev->devfn, + sdev->iommu.parent_obj.name, + entry.translated_addr);
Quoted 8 lines
target/arm/kvm.c int kvm_arm_vgic_probe(void) · line 697
Quoted 3 lines
target/arm/kvm.c +1
-0+return 0 ; }It seems a bit odd that:
* the code for arm for "PCI devices behind IOMMU need to have the MSI doorbell writes go through the IOMMU" looks rather different from the code for x86 for the same thing
ARM SMMU translates MSIs whereas Intel/AMD IOMMU do not translate them. Hence this implementation
Quoted 2 lines
* the code here needs to know specifically that this is an SMMU and not some other kind of IOMMU
Yes when introducing virtio-iommu we will need to get this fixed. We need a way to retrieve the iommu mr from the as. I will work on this concurrently.
Quoted 7 lines
I would have expected this to be more generic-to-all-IOMMU APIs and maybe even implemented in the generic KVM support code...
The x86 code seems to be similarly x86-specific though, so this is more of a "perhaps there is a cleanup opportunity here" observation I guess.
OK
Thanks
Eric
Quoted 4 lines
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 11/14] target/arm/kvm: Translate the MSI doorbell in kvm_arch_fixup_msi_route
Quoted 5 lines · Auger Eric
Quoted 3 lines
It is still unclear to me if we need to register an IOMMUNotifier to handle any change in the MSI doorbell which would occur behind the scene and would not lead to any call to
kvm_arch_fixup_msi_route().Paolo, do you know the answer to this question ?
Yes, x86 is wrong in this respect (it wouldn't use an IOMMUNotifier, but it still should process Interrupt Entry Cache invalidations).
Quoted 7 lines
Quoted 4 lines
It seems a bit odd that:
* the code for arm for "PCI devices behind IOMMU need to have the MSI doorbell writes go through the IOMMU" looks rather different from the code for x86 for the same thingARM SMMU translates MSIs whereas Intel/AMD IOMMU do not translate them. Hence this implementation
More precisely, Intel IOMMU implements interrupt remapping through an MMIO region instead of an IOMMU region, because on x86 interrupt remapping can also change the MSI value and not just the address.
Quoted 5 lines
Quoted 2 lines
* the code here needs to know specifically that this is an SMMU and not some other kind of IOMMU
Yes when introducing virtio-iommu we will need to get this fixed. We need a way to retrieve the iommu mr from the as. I will work on this concurrently.
Probably something like address_space_translate can be used?
Paolo
Re: [Qemu-arm] [PATCH v9 11/14] target/arm/kvm: Translate the MSI doorbell in kvm_arch_fixup_msi_route
Hi Paolo,
Quoted 9 lines · Paolo Bonzini
Quoted 5 lines · Auger Eric
Quoted 3 lines
It is still unclear to me if we need to register an IOMMUNotifier to handle any change in the MSI doorbell which would occur behind the scene and would not lead to any call to
kvm_arch_fixup_msi_route().Paolo, do you know the answer to this question ?
Yes, x86 is wrong in this respect (it wouldn't use an IOMMUNotifier, but it still should process Interrupt Entry Cache invalidations).
I am not sure anymore of the issue we want to fix. The concen I had in mind was: what if the MSI doorbell gets unmapped. We would need to be notified in some way. As the doorbell lies in MMIO space, no IOMMUNotifier is attached to it at the moment. On the other hand, if the doorbell gets unmapped, can't we expect some kind of tear down of the route? Paolo, is it the use case you are talking about here?
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
It seems a bit odd that:
* the code for arm for "PCI devices behind IOMMU need to have the MSI doorbell writes go through the IOMMU" looks rather different from the code for x86 for the same thing
Quoted 6 lines
Quoted 2 lines
ARM SMMU translates MSIs whereas Intel/AMD IOMMU do not translate them. Hence this implementation
More precisely, Intel IOMMU implements interrupt remapping through an MMIO region instead of an IOMMU region, because on x86 interrupt remapping can also change the MSI value and not just the address.
thank you for the clarification. Yes I too much focused on IOMMU DMA translation and forgot the x86 interrupt remapping stuff which corresponds to what is done here.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
* the code here needs to know specifically that this is an SMMU and not some other kind of IOMMU
Yes when introducing virtio-iommu we will need to get this fixed. We need a way to retrieve the iommu mr from the as. I will work on this concurrently.
Probably something like
address_space_translatecan be used?
Yes achieved with address_space_translate + memory_region_find
Thanks
Eric
Quoted 3 lines
Paolo
PATCH v9 12/14 hw/arm/virt: Add SMMUv3 to the virt board
In reply to Eric AugerFrom: Prem Mallappa <[email protected]>
Add code to instantiate an smmuv3 in virt machine. A new iommu integer member is introduced in VirtMachineState to store the type of the iommu in use.
---
v7 -> v8:
- integer iommu member
- add primary-bus property
v4 -> v5:
- add dma-coherent property
v2 -> v3:
- vbi was removed. Use vms instead
- migrate to new smmu binding format (iommu-map)
- don't use appendprop anymore
- add vms->smmu and guard instantiation with this latter
- interrupts type changed to edge
Conflicts:
hw/arm/smmuv3.c --- hw/arm/virt.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++- include/hw/arm/virt.h | 10 ++++++++ 2 files changed, 73 insertions(+), 1 deletion(-)
hw/arm/virt.c +63 -1
@@ -58,6 +58,7 @@#include "hw/smbios/smbios.h" #include "qapi/visitor.h" #include "standard-headers/linux/input.h" +#include "hw/arm/smmuv3.h" #define DEFINE_VIRT_MACHINE_LATEST (major, minor, latest) \ static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
@@ -141,6 +142,7 @@ static const MemMapEntry a15memmap[] = { [VIRT_FW_CFG] = { 0x09020000, 0x00000018 }, [VIRT_GPIO] = { 0x09030000, 0x00001000 }, [VIRT_SECURE_UART] = { 0x09040000, 0x00001000 }, + [VIRT_SMMU] = { 0x09050000, 0x00020000 }, /* 128K, needed */ [VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
@@ -161,6 +163,7 @@ static const int a15irqmap[] = { [VIRT_SECURE_UART] = 8, [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ [VIRT_GIC_V2M] = 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */ + [VIRT_SMMU] = 74, /* ...to 74 + NUM_SMMU_IRQS - 1 */ [VIRT_PLATFORM_BUS] = 112, /* ...to 112 + PLATFORM_BUS_NUM_IRQS -1 */ };
@@ -941,7 +944,57 @@ static void create_pcie_irq_map(const VirtMachineState *vms, 0x7 /* PCI irq */); } -static void create_pcie (const VirtMachineState *vms,qemu_irq *pic) +static void create_smmu (const VirtMachineState *vms,qemu_irq *pic, +PCIBus *bus) +{ +char *node; +const char compat[] ="arm,smmu-v3" ; +int irq = vms->irqmap[VIRT_SMMU ]; +int i; +hwaddr base = vms->memmap[VIRT_SMMU ].base; +hwaddr size = vms->memmap[VIRT_SMMU ].size; +const char irq_names[] ="eventq\0priq\0cmdq-sync\0gerror" ; +DeviceState *dev; + +if (vms->iommu !=VIRT_IOMMU_SMMUV3 || !vms->iommu_phandle) { +return ; + } + + dev =qdev_create (NULL ,"arm-smmuv3" ); + +object_property_set_link (OBJECT (dev),OBJECT (bus),"primary-bus" , + &error_abort); +qdev_init_nofail (dev); +sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); +for (i =0 ; i <NUM_SMMU_IRQS ; i++) { +sysbus_connect_irq (SYS_BUS_DEVICE (dev), i, pic[irq + i]); + } + + node =g_strdup_printf ("/smmuv3@%" PRIx64, base); +qemu_fdt_add_subnode (vms->fdt, node); +qemu_fdt_setprop (vms->fdt, node,"compatible" , compat,sizeof (compat)); +qemu_fdt_setprop_sized_cells (vms->fdt, node,"reg" ,2 , base,2 , size); + +qemu_fdt_setprop_cells (vms->fdt, node,"interrupts" , +GIC_FDT_IRQ_TYPE_SPI , irq ,GIC_FDT_IRQ_FLAGS_EDGE_LO_HI , +GIC_FDT_IRQ_TYPE_SPI , irq +1 ,GIC_FDT_IRQ_FLAGS_EDGE_LO_HI , +GIC_FDT_IRQ_TYPE_SPI , irq +2 ,GIC_FDT_IRQ_FLAGS_EDGE_LO_HI , +GIC_FDT_IRQ_TYPE_SPI , irq +3 ,GIC_FDT_IRQ_FLAGS_EDGE_LO_HI ); + +qemu_fdt_setprop (vms->fdt, node,"interrupt-names" , irq_names, +sizeof (irq_names)); + +qemu_fdt_setprop_cell (vms->fdt, node,"clocks" , vms->clock_phandle); +qemu_fdt_setprop_string (vms->fdt, node,"clock-names" ,"apb_pclk" ); +qemu_fdt_setprop (vms->fdt, node,"dma-coherent" ,NULL ,0 ); + +qemu_fdt_setprop_cell (vms->fdt, node,"#iommu-cells" ,1 ); + +qemu_fdt_setprop_cell (vms->fdt, node,"phandle" , vms->iommu_phandle); +g_free (node); +} + +static void create_pcie (VirtMachineState *vms,qemu_irq *pic) {hwaddr base_mmio = vms->memmap[VIRT_PCIE_MMIO ].base;hwaddr size_mmio = vms->memmap[VIRT_PCIE_MMIO ].size;
@@ -1054,6 +1107,15 @@ static void create_pcie(const VirtMachineState *vms, qemu_irq *pic)qemu_fdt_setprop_cell (vms->fdt, nodename,"#interrupt-cells" ,1 );create_pcie_irq_map (vms, vms->gic_phandle, irq, nodename); +if (vms->iommu) { + vms->iommu_phandle =qemu_fdt_alloc_phandle (vms->fdt); + +create_smmu (vms, pic, pci->bus); + +qemu_fdt_setprop_cells (vms->fdt, nodename,"iommu-map" , +0x0 , vms->iommu_phandle,0x0 ,0x10000 ); + } +g_free (nodename); }
include/hw/arm/virt.h +10 -0
@@ -38,6 +38,7 @@#define NUM_GICV2M_SPIS 64#define NUM_VIRTIO_TRANSPORTS 32 +#define NUM_SMMU_IRQS 4#define ARCH_GICV3_MAINT_IRQ 9
@@ -59,6 +60,7 @@ enum {VIRT_GIC_V2M ,VIRT_GIC_ITS ,VIRT_GIC_REDIST , +VIRT_SMMU ,VIRT_UART ,VIRT_MMIO , VIRT_RTC,
@@ -74,6 +76,12 @@ enum { VIRT_SECURE_MEM, }; +enum { +VIRT_IOMMU_NONE , +VIRT_IOMMU_SMMUV3 , +VIRT_IOMMU_VIRTIO , +}; + typedef struct MemMapEntry { hwaddr base; hwaddr size;
@@ -96,6 +104,7 @@ typedef struct {bool its;bool virt;int32_t gic_version; +int32_t iommu;struct arm_boot_info bootinfo;const MemMapEntry *memmap;const int *irqmap;
@@ -105,6 +114,7 @@ typedef struct {uint32_t clock_phandle;uint32_t gic_phandle;uint32_t msi_phandle; +uint32_t iommu_phandle;int psci_conduit; } VirtMachineState;
Signature · 1 line
2.5.5
Re: [Qemu-arm] [PATCH v9 12/14] hw/arm/virt: Add SMMUv3 to the virt board
Quoted 44 lines · Eric Auger
From: Prem Mallappa <[email protected]>
Add code to instantiate an smmuv3 in virt machine. A new iommu integer member is introduced in VirtMachineState to store the type of the iommu in use.
Signed-off-by Prem Mallappa <[email protected]>Signed-off-by Eric Auger <[email protected]>---
v7 -> v8:
- integer iommu member
- add primary-bus propertyv4 -> v5:
- add dma-coherent propertyv2 -> v3:
- vbi was removed. Use vms instead
- migrate to new smmu binding format (iommu-map)
- don't use appendprop anymore
- addvms->smmuand guard instantiation with this latter
- interrupts type changed to edgeConflicts:
hw/arm/smmuv3.c --- hw/arm/virt.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++- include/hw/arm/virt.h | 10 ++++++++ 2 files changed, 73 insertions(+), 1 deletion(-)hw/arm/virt.c +1
-0@@ -58,6 +58,7 @@#include "hw/smbios/smbios.h" #include "qapi/visitor.h" #include "standard-headers/linux/input.h" +#include "hw/arm/smmuv3.h" #define DEFINE_VIRT_MACHINE_LATEST (major, minor, latest) \ static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
hw/arm/virt.c static const MemMapEntry a15memmap[] = { · line 145
Quoted 4 lines
hw/arm/virt.c +1
-0@@ -141,6 +142,7 @@ static const MemMapEntry a15memmap[] = { [VIRT_FW_CFG] = { 0x09020000, 0x00000018 }, [VIRT_GPIO] = { 0x09030000, 0x00001000 }, [VIRT_SECURE_UART] = { 0x09040000, 0x00001000 }, + [VIRT_SMMU] = { 0x09050000, 0x00020000 }, /* 128K, needed */
What does the "needed" comment mean here?
Quoted 12 lines
hw/arm/virt.c +1
-0[VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },@@ -161,6 +163,7 @@ static const int a15irqmap[] = { [VIRT_SECURE_UART] = 8, [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ [VIRT_GIC_V2M] = 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */ + [VIRT_SMMU] = 74, /* ...to 74 + NUM_SMMU_IRQS - 1 */ [VIRT_PLATFORM_BUS] = 112, /* ...to 112 + PLATFORM_BUS_NUM_IRQS -1 */ };
hw/arm/virt.c static void create_pcie_irq_map(const VirtMachineState *vms, · line 948
Quoted 6 lines
hw/arm/virt.c +2
-1@@ -941,7 +944,57 @@ static void create_pcie_irq_map(const VirtMachineState *vms, 0x7 /* PCI irq */); } -static void create_pcie (const VirtMachineState *vms,qemu_irq *pic) +static void create_smmu (const VirtMachineState *vms,qemu_irq *pic, +PCIBus *bus)
Side suggestion: if you add "algorithm = histogram" to the [diff] section of your .gitconfig, you will probably find that it doesn't generate patches with this sort of silly patch hunk any more. I only discovered this config setting recently but I think it's better than the default.
Quoted 31 lines
hw/arm/virt.c +31
-0+{ +char *node; +const char compat[] ="arm,smmu-v3" ; +int irq = vms->irqmap[VIRT_SMMU ]; +int i; +hwaddr base = vms->memmap[VIRT_SMMU ].base; +hwaddr size = vms->memmap[VIRT_SMMU ].size; +const char irq_names[] ="eventq\0priq\0cmdq-sync\0gerror" ; +DeviceState *dev; + +if (vms->iommu !=VIRT_IOMMU_SMMUV3 || !vms->iommu_phandle) { +return ; + } + + dev =qdev_create (NULL ,"arm-smmuv3" ); + +object_property_set_link (OBJECT (dev),OBJECT (bus),"primary-bus" , + &error_abort); +qdev_init_nofail (dev); +sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); +for (i =0 ; i <NUM_SMMU_IRQS ; i++) { +sysbus_connect_irq (SYS_BUS_DEVICE (dev), i, pic[irq + i]); + } + + node =g_strdup_printf ("/smmuv3@%" PRIx64, base); +qemu_fdt_add_subnode (vms->fdt, node); +qemu_fdt_setprop (vms->fdt, node,"compatible" , compat,sizeof (compat)); +qemu_fdt_setprop_sized_cells (vms->fdt, node,"reg" ,2 , base,2 , size); + + qemu_fdt_setprop_cells(vms->fdt, node, "interrupts", + GIC_FDT_IRQ_TYPE_SPI, irq , GIC_FDT_IRQ_FLAGS_EDGE_LO_HI,
hw/arm/virt.c static void create_pcie_irq_map(const VirtMachineState *vms, · line 989
Quoted 10 lines
hw/arm/virt.c +10
-0+GIC_FDT_IRQ_TYPE_SPI , irq +1 ,GIC_FDT_IRQ_FLAGS_EDGE_LO_HI , +GIC_FDT_IRQ_TYPE_SPI , irq +2 ,GIC_FDT_IRQ_FLAGS_EDGE_LO_HI , + GIC_FDT_IRQ_TYPE_SPI, irq + 3, GIC_FDT_IRQ_FLAGS_EDGE_LO_HI); + +qemu_fdt_setprop (vms->fdt, node,"interrupt-names" , irq_names, +sizeof (irq_names)); + +qemu_fdt_setprop_cell (vms->fdt, node,"clocks" , vms->clock_phandle); +qemu_fdt_setprop_string (vms->fdt, node,"clock-names" ,"apb_pclk" ); +qemu_fdt_setprop (vms->fdt, node,"dma-coherent" ,NULL ,0 );
Is this definitely the right setting for dma-coherent? My (possibly naive) thought is that for an emulated SMMU our page-table walks are going to be coherent with the CPU's view.
Quoted 17 lines
hw/arm/virt.c +12
-0+ +qemu_fdt_setprop_cell (vms->fdt, node,"#iommu-cells" ,1 ); + +qemu_fdt_setprop_cell (vms->fdt, node,"phandle" , vms->iommu_phandle); +g_free (node); +} +enum { +VIRT_IOMMU_NONE , +VIRT_IOMMU_SMMUV3 , +VIRT_IOMMU_VIRTIO , +}; + typedef struct MemMapEntry { hwaddr base; hwaddr size;
hw/arm/virt.c typedef struct { · line 107
Quoted 4 lines
hw/arm/virt.c +1
-0@@ -96,6 +104,7 @@ typedef struct {bool its;bool virt;int32_t gic_version; +int32_t iommu;
This is always one of the VIRT_IOMMU_* values, right? I think we should give that enum a typedef name and then use the type here.
hw/arm/virt.c typedef struct { · line 120
Quoted 11 lines
hw/arm/virt.c +1
-0struct arm_boot_info bootinfo;const MemMapEntry *memmap;const int *irqmap;@@ -105,6 +114,7 @@ typedef struct {uint32_t clock_phandle;uint32_t gic_phandle;uint32_t msi_phandle; +uint32_t iommu_phandle;int psci_conduit; } VirtMachineState;
Otherwise
thanks
-- PMM
Re: [Qemu-arm] [Qemu-devel] [PATCH v9 12/14] hw/arm/virt: Add SMMUv3 to the virt board
Hi Peter,
Quoted 42 lines · Peter Maydell
Quoted 41 lines · Eric Auger
From: Prem Mallappa <[email protected]>
Add code to instantiate an smmuv3 in virt machine. A new iommu integer member is introduced in VirtMachineState to store the type of the iommu in use.
Signed-off-by Prem Mallappa <[email protected]>Signed-off-by Eric Auger <[email protected]>---
v7 -> v8:
- integer iommu member
- add primary-bus propertyv4 -> v5:
- add dma-coherent propertyv2 -> v3:
- vbi was removed. Use vms instead
- migrate to new smmu binding format (iommu-map)
- don't use appendprop anymore
- addvms->smmuand guard instantiation with this latter
- interrupts type changed to edgeConflicts:
hw/arm/smmuv3.c --- hw/arm/virt.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++- include/hw/arm/virt.h | 10 ++++++++ 2 files changed, 73 insertions(+), 1 deletion(-)hw/arm/virt.c +1
-0@@ -58,6 +58,7 @@#include "hw/smbios/smbios.h" #include "qapi/visitor.h" #include "standard-headers/linux/input.h" +#include "hw/arm/smmuv3.h"
Quoted 9 lines
hw/arm/virt.c static const MemMapEntry a15memmap[] = { · line 145
Quoted 7 lines
hw/arm/virt.c +1
-0#define DEFINE_VIRT_MACHINE_LATEST (major, minor, latest) \ static void virt_##major##_##minor##_class_init(ObjectClass *oc, \@@ -141,6 +142,7 @@ static const MemMapEntry a15memmap[] = { [VIRT_FW_CFG] = { 0x09020000, 0x00000018 }, [VIRT_GPIO] = { 0x09030000, 0x00001000 }, [VIRT_SECURE_UART] = { 0x09040000, 0x00001000 }, + [VIRT_SMMU] = { 0x09050000, 0x00020000 }, /* 128K, needed */What does the "needed" comment mean here?
removed
Quoted 16 lines
Quoted 16 lines
hw/arm/virt.c +1
-0[VIRT_MMIO] = { 0x0a000000, 0x00000200 }, /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */ [VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },@@ -161,6 +163,7 @@ static const int a15irqmap[] = { [VIRT_SECURE_UART] = 8, [VIRT_MMIO] = 16, /* ...to 16 + NUM_VIRTIO_TRANSPORTS - 1 */ [VIRT_GIC_V2M] = 48, /* ...to 48 + NUM_GICV2M_SPIS - 1 */ + [VIRT_SMMU] = 74, /* ...to 74 + NUM_SMMU_IRQS - 1 */ [VIRT_PLATFORM_BUS] = 112, /* ...to 112 + PLATFORM_BUS_NUM_IRQS -1 */ };@@ -941,7 +944,57 @@ static void create_pcie_irq_map(const VirtMachineState *vms, 0x7 /* PCI irq */); }
Quoted 8 lines
hw/arm/virt.c static void create_pcie_irq_map(const VirtMachineState *vms, · line 948
Quoted 3 lines
hw/arm/virt.c +2
-1-static void create_pcie (const VirtMachineState *vms,qemu_irq *pic) +static void create_smmu (const VirtMachineState *vms,qemu_irq *pic, +PCIBus *bus)Side suggestion: if you add "algorithm = histogram" to the [diff] section of your .gitconfig, you will probably find that it doesn't generate patches with this sort of silly patch hunk any more. I only discovered this config setting recently but I think it's better than the default.
ah OK thanks for the advice.
Quoted 38 lines
Quoted 38 lines
hw/arm/virt.c +37
-0+{ +char *node; +const char compat[] ="arm,smmu-v3" ; +int irq = vms->irqmap[VIRT_SMMU ]; +int i; +hwaddr base = vms->memmap[VIRT_SMMU ].base; +hwaddr size = vms->memmap[VIRT_SMMU ].size; +const char irq_names[] ="eventq\0priq\0cmdq-sync\0gerror" ; +DeviceState *dev; + +if (vms->iommu !=VIRT_IOMMU_SMMUV3 || !vms->iommu_phandle) { +return ; + } + + dev =qdev_create (NULL ,"arm-smmuv3" ); + +object_property_set_link (OBJECT (dev),OBJECT (bus),"primary-bus" , + &error_abort); +qdev_init_nofail (dev); +sysbus_mmio_map (SYS_BUS_DEVICE (dev),0 , base); +for (i =0 ; i <NUM_SMMU_IRQS ; i++) { +sysbus_connect_irq (SYS_BUS_DEVICE (dev), i, pic[irq + i]); + } + + node =g_strdup_printf ("/smmuv3@%" PRIx64, base); +qemu_fdt_add_subnode (vms->fdt, node); +qemu_fdt_setprop (vms->fdt, node,"compatible" , compat,sizeof (compat)); +qemu_fdt_setprop_sized_cells (vms->fdt, node,"reg" ,2 , base,2 , size); + +qemu_fdt_setprop_cells (vms->fdt, node,"interrupts" , +GIC_FDT_IRQ_TYPE_SPI , irq ,GIC_FDT_IRQ_FLAGS_EDGE_LO_HI , +GIC_FDT_IRQ_TYPE_SPI , irq +1 ,GIC_FDT_IRQ_FLAGS_EDGE_LO_HI , +GIC_FDT_IRQ_TYPE_SPI , irq +2 ,GIC_FDT_IRQ_FLAGS_EDGE_LO_HI , +GIC_FDT_IRQ_TYPE_SPI , irq +3 ,GIC_FDT_IRQ_FLAGS_EDGE_LO_HI ); + +qemu_fdt_setprop (vms->fdt, node,"interrupt-names" , irq_names, +sizeof (irq_names));
Quoted 8 lines
hw/arm/virt.c static void create_pcie_irq_map(const VirtMachineState *vms, · line 989
Quoted 4 lines
hw/arm/virt.c +4
-0+ +qemu_fdt_setprop_cell (vms->fdt, node,"clocks" , vms->clock_phandle); +qemu_fdt_setprop_string (vms->fdt, node,"clock-names" ,"apb_pclk" ); +qemu_fdt_setprop (vms->fdt, node,"dma-coherent" ,NULL ,0 );Is this definitely the right setting for dma-coherent? My (possibly naive) thought is that for an emulated SMMU our page-table walks are going to be coherent with the CPU's view.
Indeed we add the dma-capable property to make the DMA ops of the SMMU cache coherent with the CPU. We pass NULL/O since there is just dma-coherent in the dt property. What am I missing?
Quoted 18 lines
Quoted 18 lines
hw/arm/virt.c +12
-0+ +qemu_fdt_setprop_cell (vms->fdt, node,"#iommu-cells" ,1 ); + +qemu_fdt_setprop_cell (vms->fdt, node,"phandle" , vms->iommu_phandle); +g_free (node); +} +enum { +VIRT_IOMMU_NONE , +VIRT_IOMMU_SMMUV3 , +VIRT_IOMMU_VIRTIO , +}; + typedef struct MemMapEntry { hwaddr base; hwaddr size;@@ -96,6 +104,7 @@ typedef struct {
Quoted 8 lines
hw/arm/virt.c typedef struct { · line 107
Quoted 4 lines
hw/arm/virt.c +1
-0bool its;bool virt;int32_t gic_version; +int32_t iommu;This is always one of the VIRT_IOMMU_* values, right? I think we should give that enum a typedef name and then use the type here.
yes, done.
Quoted 14 lines
hw/arm/virt.c typedef struct { · line 120
Quoted 12 lines
hw/arm/virt.c +1
-0struct arm_boot_info bootinfo;const MemMapEntry *memmap;const int *irqmap;@@ -105,6 +114,7 @@ typedef struct {uint32_t clock_phandle;uint32_t gic_phandle;uint32_t msi_phandle; +uint32_t iommu_phandle;int psci_conduit; } VirtMachineState;Otherwise
Quoted 1 line
Reviewed-by Peter Maydell <[email protected]>
Thanks!
Eric
Quoted 4 lines
thanks
-- PMM
Re: [Qemu-arm] [Qemu-devel] [PATCH v9 12/14] hw/arm/virt: Add SMMUv3 to the virt board
Quoted 6 lines · Auger Eric
Hi Peter,
Quoted 3 lines · Peter Maydell
Quoted 1 line · Eric Auger
+
qemu_fdt_setprop(vms->fdt, node, "dma-coherent", NULL, 0);
Quoted 7 lines
Quoted 3 lines
Is this definitely the right setting for dma-coherent? My (possibly naive) thought is that for an emulated SMMU our page-table walks are going to be coherent with the CPU's view.
Indeed we add the dma-capable property to make the DMA ops of the SMMU cache coherent with the CPU. We pass NULL/O since there is just dma-coherent in the dt property. What am I missing?
My mistake, I thought this was the equivalent of "dma-coherent = 0;".
thanks
-- PMM
PATCH v9 13/14 hw/arm/virt-acpi-build: Add smmuv3 node in IORT table
In reply to Eric AugerFrom: Prem Mallappa <[email protected]>
This patch builds the smmuv3 node in the ACPI IORT table.
The RID space of the root complex, which spans 0x0-0x10000 maps to streamid space 0x0-0x10000 in smmuv3, which in turn maps to deviceid space 0x0-0x10000 in the ITS group.
The guest must feature the IOMMU probe deferral series
(https://lkml.org/lkml/2017/4/10/214) which fixes streamid multiple lookup. This bug is not related to the SMMU emulation.
---
v2 -> v3:
- integrate into the existing IORT table made up of ITS, RC nodes
- take into account vms->smmu
- match linux actbl2.h acpi_iort_smmu_v3 field names
--- hw/arm/virt-acpi-build.c | 56 +++++++++++++++++++++++++++++++++++++++------ include/hw/acpi/acpi-defs.h | 15 ++++++++++++ 2 files changed, 64 insertions(+), 7 deletions(-)
hw/arm/virt-acpi-build.c +49 -7
@@ -393,19 +393,26 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) }static void -build_iort (GArray *table_data,BIOSLinker *linker) +build_iort (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms) { -int iort_start = table_data->len; +int nb_nodes, iort_start = table_data->len;AcpiIortIdMapping *idmap;AcpiIortItsGroup *its;AcpiIortTable *iort; -size_t node_size, iort_length; +AcpiIortSmmu3 *smmu; +size_t node_size, iort_length, smmu_offset =0 ;AcpiIortRC *rc; iort =acpi_data_push (table_data,sizeof (*iort)); +if (vms->iommu) { + nb_nodes =3 ;/* RC, ITS, SMMUv3 */ + }else { + nb_nodes =2 ;/* RC, ITS */ + } + iort_length =sizeof (*iort); - iort->node_count =cpu_to_le32 (2 );/* RC and ITS nodes */ + iort->node_count =cpu_to_le32 (nb_nodes); iort->node_offset =cpu_to_le32 (sizeof (*iort));/* ITS group node */
@@ -418,6 +425,35 @@ build_iort(GArray *table_data, BIOSLinker *linker) its->its_count =cpu_to_le32 (1 ); its->identifiers[0 ] =0 ;/* MADT translation_id */ +if (vms->iommu ==VIRT_IOMMU_SMMUV3 ) { +int irq = vms->irqmap[VIRT_SMMU ]; + +/* SMMUv3 node */ + smmu_offset =cpu_to_le32 (iort->node_offset + node_size); + node_size =sizeof (*smmu) +sizeof (*idmap); + iort_length += node_size; + smmu =acpi_data_push (table_data, node_size); + + + smmu->type =ACPI_IORT_NODE_SMMU_V3 ; + smmu->length =cpu_to_le16 (node_size); + smmu->mapping_count =cpu_to_le32 (1 ); + smmu->mapping_offset =cpu_to_le32 (sizeof (*smmu)); + smmu->base_address =cpu_to_le64 (vms->memmap[VIRT_SMMU ].base); + smmu->event_gsiv =cpu_to_le32 (irq); + smmu->pri_gsiv =cpu_to_le32 (irq +1 ); + smmu->gerr_gsiv =cpu_to_le32 (irq +2 ); + smmu->sync_gsiv =cpu_to_le32 (irq +3 ); + +/* Identity RID mapping covering the whole input RID range */ + idmap = &smmu->id_mapping_array[0 ]; + idmap->input_base =0 ; + idmap->id_count =cpu_to_le32 (0xFFFF ); + idmap->output_base =0 ; +/* output IORT node is the ITS group node (the first node) */ + idmap->output_reference =cpu_to_le32 (iort->node_offset); + } +/* Root Complex Node */ node_size =sizeof (*rc) +sizeof (*idmap); iort_length += node_size;
@@ -438,8 +474,14 @@ build_iort(GArray *table_data, BIOSLinker *linker) idmap->input_base =0 ; idmap->id_count =cpu_to_le32 (0xFFFF ); idmap->output_base =0 ; -/* output IORT node is the ITS group node (the first node) */ - idmap->output_reference =cpu_to_le32 (iort->node_offset); + +if (vms->iommu) { +/* output IORT node is the smmuv3 node */ + idmap->output_reference =cpu_to_le32 (smmu_offset); + }else { +/* output IORT node is the ITS group node (the first node) */ + idmap->output_reference =cpu_to_le32 (iort->node_offset); + } iort->length =cpu_to_le32 (iort_length);
@@ -786,7 +828,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (its_class_name () && !vmc->no_its) {acpi_add_table (table_offsets, tables_blob); -build_iort (tables_blob, tables->linker); +build_iort (tables_blob, tables->linker, vms); }/* XSDT is pointed to by RSDP */
include/hw/acpi/acpi-defs.h +15 -0
@@ -700,6 +700,21 @@ struct AcpiIortItsGroup { }QEMU_PACKED ;typedef struct AcpiIortItsGroup AcpiIortItsGroup ; +struct AcpiIortSmmu3 { +ACPI_IORT_NODE_HEADER_DEF + uint64_t base_address; +uint32_t flags; +uint32_t reserved2; +uint64_t vatos_address; +uint32_t model; +uint32_t event_gsiv; +uint32_t pri_gsiv; +uint32_t gerr_gsiv; +uint32_t sync_gsiv; +AcpiIortIdMapping id_mapping_array[0 ]; +}QEMU_PACKED ; +typedef struct AcpiIortSmmu3 AcpiIortSmmu3 ; +struct AcpiIortRC {ACPI_IORT_NODE_HEADER_DEF AcpiIortMemoryAccess memory_properties;
Signature · 1 line
2.5.5
Re: [Qemu-arm] [PATCH v9 13/14] hw/arm/virt-acpi-build: Add smmuv3 node in IORT table
Quoted 17 lines · Eric Auger
From: Prem Mallappa <[email protected]>
This patch builds the smmuv3 node in the ACPI IORT table.
The RID space of the root complex, which spans 0x0-0x10000 maps to streamid space 0x0-0x10000 in smmuv3, which in turn maps to deviceid space 0x0-0x10000 in the ITS group.
The guest must feature the IOMMU probe deferral series
(https://lkml.org/lkml/2017/4/10/214) which fixes streamid multiple lookup. This bug is not related to the SMMU emulation.Signed-off-by Prem Mallappa <[email protected]>Signed-off-by Eric Auger <[email protected]>---
Quoted 8 lines
v2 -> v3:
- integrate into the existing IORT table made up of ITS, RC nodes
- take into accountvms->smmu
- match linuxactbl2.hacpi_iort_smmu_v3field names--- hw/arm/virt-acpi-build.c | 56 +++++++++++++++++++++++++++++++++++++++------ include/hw/acpi/acpi-defs.h | 15 ++++++++++++ 2 files changed, 64 insertions(+), 7 deletions(-)
Since ACPI is definitely not my area of expertise, I've cc'd Shannon on this patch. Shannon, could you take a look at it, please?
Quoted 124 lines
hw/arm/virt-acpi-build.c +49
-7@@ -393,19 +393,26 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) }static void -build_iort (GArray *table_data,BIOSLinker *linker) +build_iort (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms) { -int iort_start = table_data->len; +int nb_nodes, iort_start = table_data->len;AcpiIortIdMapping *idmap;AcpiIortItsGroup *its;AcpiIortTable *iort; -size_t node_size, iort_length; +AcpiIortSmmu3 *smmu; +size_t node_size, iort_length, smmu_offset =0 ;AcpiIortRC *rc; iort =acpi_data_push (table_data,sizeof (*iort)); +if (vms->iommu) { + nb_nodes =3 ;/* RC, ITS, SMMUv3 */ + }else { + nb_nodes =2 ;/* RC, ITS */ + } + iort_length =sizeof (*iort); - iort->node_count =cpu_to_le32 (2 );/* RC and ITS nodes */ + iort->node_count =cpu_to_le32 (nb_nodes); iort->node_offset =cpu_to_le32 (sizeof (*iort));/* ITS group node */ @@ -418,6 +425,35 @@ build_iort(GArray *table_data, BIOSLinker *linker) its->its_count =cpu_to_le32 (1 ); its->identifiers[0 ] =0 ;/* MADT translation_id */ +if (vms->iommu ==VIRT_IOMMU_SMMUV3 ) { +int irq = vms->irqmap[VIRT_SMMU ]; + +/* SMMUv3 node */ + smmu_offset =cpu_to_le32 (iort->node_offset + node_size); + node_size =sizeof (*smmu) +sizeof (*idmap); + iort_length += node_size; + smmu =acpi_data_push (table_data, node_size); + + + smmu->type =ACPI_IORT_NODE_SMMU_V3 ; + smmu->length =cpu_to_le16 (node_size); + smmu->mapping_count =cpu_to_le32 (1 ); + smmu->mapping_offset =cpu_to_le32 (sizeof (*smmu)); + smmu->base_address =cpu_to_le64 (vms->memmap[VIRT_SMMU ].base); + smmu->event_gsiv =cpu_to_le32 (irq); + smmu->pri_gsiv =cpu_to_le32 (irq +1 ); + smmu->gerr_gsiv =cpu_to_le32 (irq +2 ); + smmu->sync_gsiv =cpu_to_le32 (irq +3 ); + +/* Identity RID mapping covering the whole input RID range */ + idmap = &smmu->id_mapping_array[0 ]; + idmap->input_base =0 ; + idmap->id_count =cpu_to_le32 (0xFFFF ); + idmap->output_base =0 ; +/* output IORT node is the ITS group node (the first node) */ + idmap->output_reference =cpu_to_le32 (iort->node_offset); + } +/* Root Complex Node */ node_size =sizeof (*rc) +sizeof (*idmap); iort_length += node_size;@@ -438,8 +474,14 @@ build_iort(GArray *table_data, BIOSLinker *linker) idmap->input_base =0 ; idmap->id_count =cpu_to_le32 (0xFFFF ); idmap->output_base =0 ; -/* output IORT node is the ITS group node (the first node) */ - idmap->output_reference =cpu_to_le32 (iort->node_offset); + +if (vms->iommu) { +/* output IORT node is the smmuv3 node */ + idmap->output_reference =cpu_to_le32 (smmu_offset); + }else { +/* output IORT node is the ITS group node (the first node) */ + idmap->output_reference =cpu_to_le32 (iort->node_offset); + } iort->length =cpu_to_le32 (iort_length);@@ -786,7 +828,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (its_class_name () && !vmc->no_its) {acpi_add_table (table_offsets, tables_blob); -build_iort (tables_blob, tables->linker); +build_iort (tables_blob, tables->linker, vms); }/* XSDT is pointed to by RSDP */ include/hw/acpi/acpi-defs.h +15
-1@@ -700,6 +700,21 @@ struct AcpiIortItsGroup { }QEMU_PACKED ;typedef struct AcpiIortItsGroup AcpiIortItsGroup ; +struct AcpiIortSmmu3 { +ACPI_IORT_NODE_HEADER_DEF + uint64_t base_address; +uint32_t flags; +uint32_t reserved2; +uint64_t vatos_address; +uint32_t model; +uint32_t event_gsiv; +uint32_t pri_gsiv; +uint32_t gerr_gsiv; +uint32_t sync_gsiv; +AcpiIortIdMapping id_mapping_array[0 ]; +}QEMU_PACKED ; +typedef struct AcpiIortSmmu3 AcpiIortSmmu3 ; +struct AcpiIortRC {ACPI_IORT_NODE_HEADER_DEF AcpiIortMemoryAccess memory_properties; --
Quoted 2 lines
2.5.5
thanks
-- PMM
Re: [Qemu-arm] [Qemu-devel] [PATCH v9 13/14] hw/arm/virt-acpi-build: Add smmuv3 node in IORT table
Quoted 27 lines · Peter Maydell
Quoted 17 lines · Eric Auger
From: Prem Mallappa <[email protected]>
This patch builds the smmuv3 node in the ACPI IORT table.
The RID space of the root complex, which spans 0x0-0x10000 maps to streamid space 0x0-0x10000 in smmuv3, which in turn maps to deviceid space 0x0-0x10000 in the ITS group.
The guest must feature the IOMMU probe deferral series
(https://lkml.org/lkml/2017/4/10/214) which fixes streamid multiple lookup. This bug is not related to the SMMU emulation.Signed-off-by Prem Mallappa <[email protected]>Signed-off-by Eric Auger <[email protected]>---
Quoted 8 lines
v2 -> v3:
- integrate into the existing IORT table made up of ITS, RC nodes
- take into accountvms->smmu
- match linuxactbl2.hacpi_iort_smmu_v3field names--- hw/arm/virt-acpi-build.c | 56 +++++++++++++++++++++++++++++++++++++++------ include/hw/acpi/acpi-defs.h | 15 ++++++++++++ 2 files changed, 64 insertions(+), 7 deletions(-)
Quoted 3 lines
Since ACPI is definitely not my area of expertise, I've cc'd Shannon on this patch. Shannon, could you take a look at it, please?
Sure.
Quoted 21 lines
Quoted 21 lines
hw/arm/virt-acpi-build.c +4
-3@@ -393,19 +393,26 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) }static void -build_iort (GArray *table_data,BIOSLinker *linker) +build_iort (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms) { -int iort_start = table_data->len; +int nb_nodes, iort_start = table_data->len;AcpiIortIdMapping *idmap;AcpiIortItsGroup *its;AcpiIortTable *iort; -size_t node_size, iort_length; +AcpiIortSmmu3 *smmu; +size_t node_size, iort_length, smmu_offset =0 ;AcpiIortRC *rc;
Quoted 3 lines
hw/arm/virt-acpi-build.c build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) · line 408
Quoted 3 lines
hw/arm/virt-acpi-build.c +1
-0iort =acpi_data_push (table_data,sizeof (*iort)); +if (vms->iommu) {
use if (vms->iommu == VIRT_IOMMU_SMMUV3) ? in case we support other types of SMMU.
Quoted 15 lines
Quoted 15 lines
hw/arm/virt-acpi-build.c +6
-1+ nb_nodes =3 ;/* RC, ITS, SMMUv3 */ + }else { + nb_nodes =2 ;/* RC, ITS */ + } + iort_length =sizeof (*iort); - iort->node_count =cpu_to_le32 (2 );/* RC and ITS nodes */ + iort->node_count =cpu_to_le32 (nb_nodes); iort->node_offset =cpu_to_le32 (sizeof (*iort));/* ITS group node */ @@ -418,6 +425,35 @@ build_iort(GArray *table_data, BIOSLinker *linker) its->its_count =cpu_to_le32 (1 ); its->identifiers[0 ] =0 ;/* MADT translation_id */
Quoted 5 lines
hw/arm/virt-acpi-build.c build_iort(GArray *table_data, BIOSLinker *linker) · line 432
Quoted 5 lines
hw/arm/virt-acpi-build.c +5
-0+if (vms->iommu ==VIRT_IOMMU_SMMUV3 ) { +int irq = vms->irqmap[VIRT_SMMU ]; + +/* SMMUv3 node */ + smmu_offset =cpu_to_le32 (iort->node_offset + node_size);
no need cpu_to_le32 here.
Otherwise: Reviewed-by: Shannon Zhao <[email protected]>
Quoted 89 lines
Quoted 80 lines
hw/arm/virt-acpi-build.c +33
-3+ node_size =sizeof (*smmu) +sizeof (*idmap); + iort_length += node_size; + smmu =acpi_data_push (table_data, node_size); + + + smmu->type =ACPI_IORT_NODE_SMMU_V3 ; + smmu->length =cpu_to_le16 (node_size); + smmu->mapping_count =cpu_to_le32 (1 ); + smmu->mapping_offset =cpu_to_le32 (sizeof (*smmu)); + smmu->base_address =cpu_to_le64 (vms->memmap[VIRT_SMMU ].base); + smmu->event_gsiv =cpu_to_le32 (irq); + smmu->pri_gsiv =cpu_to_le32 (irq +1 ); + smmu->gerr_gsiv =cpu_to_le32 (irq +2 ); + smmu->sync_gsiv =cpu_to_le32 (irq +3 ); + +/* Identity RID mapping covering the whole input RID range */ + idmap = &smmu->id_mapping_array[0 ]; + idmap->input_base =0 ; + idmap->id_count =cpu_to_le32 (0xFFFF ); + idmap->output_base =0 ; +/* output IORT node is the ITS group node (the first node) */ + idmap->output_reference =cpu_to_le32 (iort->node_offset); + } +/* Root Complex Node */ node_size =sizeof (*rc) +sizeof (*idmap); iort_length += node_size;@@ -438,8 +474,14 @@ build_iort(GArray *table_data, BIOSLinker *linker) idmap->input_base =0 ; idmap->id_count =cpu_to_le32 (0xFFFF ); idmap->output_base =0 ; -/* output IORT node is the ITS group node (the first node) */ - idmap->output_reference =cpu_to_le32 (iort->node_offset); + +if (vms->iommu) { +/* output IORT node is the smmuv3 node */ + idmap->output_reference =cpu_to_le32 (smmu_offset); + }else { +/* output IORT node is the ITS group node (the first node) */ + idmap->output_reference =cpu_to_le32 (iort->node_offset); + } iort->length =cpu_to_le32 (iort_length);@@ -786,7 +828,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (its_class_name () && !vmc->no_its) {acpi_add_table (table_offsets, tables_blob); -build_iort (tables_blob, tables->linker); +build_iort (tables_blob, tables->linker, vms); }/* XSDT is pointed to by RSDP */ include/hw/acpi/acpi-defs.h +15
-1@@ -700,6 +700,21 @@ struct AcpiIortItsGroup { }QEMU_PACKED ;typedef struct AcpiIortItsGroup AcpiIortItsGroup ; +struct AcpiIortSmmu3 { +ACPI_IORT_NODE_HEADER_DEF + uint64_t base_address; +uint32_t flags; +uint32_t reserved2; +uint64_t vatos_address; +uint32_t model; +uint32_t event_gsiv; +uint32_t pri_gsiv; +uint32_t gerr_gsiv; +uint32_t sync_gsiv; +AcpiIortIdMapping id_mapping_array[0 ]; +}QEMU_PACKED ; +typedef struct AcpiIortSmmu3 AcpiIortSmmu3 ; +struct AcpiIortRC {ACPI_IORT_NODE_HEADER_DEF AcpiIortMemoryAccess memory_properties; --Quoted 2 lines
2.5.5
thanks
-- PMM.
Signature · 1 line
Shannon
Re: [Qemu-arm] [Qemu-devel] [PATCH v9 13/14] hw/arm/virt-acpi-build: Add smmuv3 node in IORT table
Hi Shannon,
Quoted 56 lines · Shannon Zhao
Quoted 27 lines · Peter Maydell
Quoted 17 lines · Eric Auger
From: Prem Mallappa <[email protected]>
This patch builds the smmuv3 node in the ACPI IORT table.
The RID space of the root complex, which spans 0x0-0x10000 maps to streamid space 0x0-0x10000 in smmuv3, which in turn maps to deviceid space 0x0-0x10000 in the ITS group.
The guest must feature the IOMMU probe deferral series
(https://lkml.org/lkml/2017/4/10/214) which fixes streamid multiple lookup. This bug is not related to the SMMU emulation.Signed-off-by Prem Mallappa <[email protected]>Signed-off-by Eric Auger <[email protected]>---
Quoted 8 lines
v2 -> v3:
- integrate into the existing IORT table made up of ITS, RC nodes
- take into accountvms->smmu
- match linuxactbl2.hacpi_iort_smmu_v3field names--- hw/arm/virt-acpi-build.c | 56 +++++++++++++++++++++++++++++++++++++++------ include/hw/acpi/acpi-defs.h | 15 ++++++++++++ 2 files changed, 64 insertions(+), 7 deletions(-)Quoted 3 lines
Since ACPI is definitely not my area of expertise, I've cc'd Shannon on this patch. Shannon, could you take a look at it, please?
Sure.
Quoted 21 lines
Quoted 21 lines
hw/arm/virt-acpi-build.c +4
-3@@ -393,19 +393,26 @@ build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) }static void -build_iort (GArray *table_data,BIOSLinker *linker) +build_iort (GArray *table_data,BIOSLinker *linker,VirtMachineState *vms) { -int iort_start = table_data->len; +int nb_nodes, iort_start = table_data->len;AcpiIortIdMapping *idmap;AcpiIortItsGroup *its;AcpiIortTable *iort; -size_t node_size, iort_length; +AcpiIortSmmu3 *smmu; +size_t node_size, iort_length, smmu_offset =0 ;AcpiIortRC *rc;
Quoted 5 lines
Quoted 3 lines
hw/arm/virt-acpi-build.c build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned xsdt_tbl_offset) · line 408
Quoted 3 lines
hw/arm/virt-acpi-build.c +1
-0iort =acpi_data_push (table_data,sizeof (*iort)); +if (vms->iommu) {use if (
vms->iommu==VIRT_IOMMU_SMMUV3) ? in case we support other types of SMMU.
OK
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
hw/arm/virt-acpi-build.c +6
-1+ nb_nodes =3 ;/* RC, ITS, SMMUv3 */ + }else { + nb_nodes =2 ;/* RC, ITS */ + } + iort_length =sizeof (*iort); - iort->node_count =cpu_to_le32 (2 );/* RC and ITS nodes */ + iort->node_count =cpu_to_le32 (nb_nodes); iort->node_offset =cpu_to_le32 (sizeof (*iort));/* ITS group node */ @@ -418,6 +425,35 @@ build_iort(GArray *table_data, BIOSLinker *linker) its->its_count =cpu_to_le32 (1 ); its->identifiers[0 ] =0 ;/* MADT translation_id */
Quoted 7 lines
Quoted 5 lines
hw/arm/virt-acpi-build.c build_iort(GArray *table_data, BIOSLinker *linker) · line 432
Quoted 5 lines
hw/arm/virt-acpi-build.c +5
-0+if (vms->iommu ==VIRT_IOMMU_SMMUV3 ) { +int irq = vms->irqmap[VIRT_SMMU ]; + +/* SMMUv3 node */ + smmu_offset =cpu_to_le32 (iort->node_offset + node_size);no need
cpu_to_le32here.
Otherwise: Reviewed-by: Shannon Zhao <[email protected]>
OK. Thank you for the review!
Thanks
Eric
Quoted 91 lines
Quoted 90 lines
Quoted 81 lines
hw/arm/virt-acpi-build.c +33
-3+ node_size =sizeof (*smmu) +sizeof (*idmap); + iort_length += node_size; + smmu =acpi_data_push (table_data, node_size); + + + smmu->type =ACPI_IORT_NODE_SMMU_V3 ; + smmu->length =cpu_to_le16 (node_size); + smmu->mapping_count =cpu_to_le32 (1 ); + smmu->mapping_offset =cpu_to_le32 (sizeof (*smmu)); + smmu->base_address =cpu_to_le64 (vms->memmap[VIRT_SMMU ].base); + smmu->event_gsiv =cpu_to_le32 (irq); + smmu->pri_gsiv =cpu_to_le32 (irq +1 ); + smmu->gerr_gsiv =cpu_to_le32 (irq +2 ); + smmu->sync_gsiv =cpu_to_le32 (irq +3 ); + +/* Identity RID mapping covering the whole input RID range */ + idmap = &smmu->id_mapping_array[0 ]; + idmap->input_base =0 ; + idmap->id_count =cpu_to_le32 (0xFFFF ); + idmap->output_base =0 ; +/* output IORT node is the ITS group node (the first node) */ + idmap->output_reference =cpu_to_le32 (iort->node_offset); + } +/* Root Complex Node */ node_size =sizeof (*rc) +sizeof (*idmap); iort_length += node_size;@@ -438,8 +474,14 @@ build_iort(GArray *table_data, BIOSLinker *linker) idmap->input_base =0 ; idmap->id_count =cpu_to_le32 (0xFFFF ); idmap->output_base =0 ; -/* output IORT node is the ITS group node (the first node) */ - idmap->output_reference =cpu_to_le32 (iort->node_offset); + +if (vms->iommu) { +/* output IORT node is the smmuv3 node */ + idmap->output_reference =cpu_to_le32 (smmu_offset); + }else { +/* output IORT node is the ITS group node (the first node) */ + idmap->output_reference =cpu_to_le32 (iort->node_offset); + } iort->length =cpu_to_le32 (iort_length);@@ -786,7 +828,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)if (its_class_name () && !vmc->no_its) {acpi_add_table (table_offsets, tables_blob); -build_iort (tables_blob, tables->linker); +build_iort (tables_blob, tables->linker, vms); }/* XSDT is pointed to by RSDP */ include/hw/acpi/acpi-defs.h +15
-1@@ -700,6 +700,21 @@ struct AcpiIortItsGroup { }QEMU_PACKED ;typedef struct AcpiIortItsGroup AcpiIortItsGroup ; +struct AcpiIortSmmu3 { +ACPI_IORT_NODE_HEADER_DEF + uint64_t base_address; +uint32_t flags; +uint32_t reserved2; +uint64_t vatos_address; +uint32_t model; +uint32_t event_gsiv; +uint32_t pri_gsiv; +uint32_t gerr_gsiv; +uint32_t sync_gsiv; +AcpiIortIdMapping id_mapping_array[0 ]; +}QEMU_PACKED ; +typedef struct AcpiIortSmmu3 AcpiIortSmmu3 ; +struct AcpiIortRC {ACPI_IORT_NODE_HEADER_DEF AcpiIortMemoryAccess memory_properties; --Quoted 2 lines
2.5.5
thanks
-- PMM.
PATCH v9 14/14 hw/arm/virt: Handle iommu in 2.12 machine type
In reply to Eric AugerThe new machine type exposes a new "iommu" virt machine option. The SMMUv3 IOMMU is instantiated using -machine virt,iommu=smmuv3.
---
v7 -> v8:
- Revert to machine option, now dubbed "iommu", preparing for virtio instantiation.
v5 -> v6: machine 2_11
Another alternative would be to use the -device option as done on x86. As the smmu is a sysbus device, we would need to use the platform bus framework.
--- hw/arm/virt.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/virt.h | 1 + 2 files changed, 46 insertions(+)
hw/arm/virt.c +45 -0
@@ -1547,6 +1547,34 @@ static void virt_set_gic_version(Object *obj, const char *value, Error **errp) } } +static char *virt_get_iommu (Object *obj,Error **errp) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +switch (vms->iommu) { +case VIRT_IOMMU_NONE : +return g_strdup ("none" ); +case VIRT_IOMMU_SMMUV3 : +return g_strdup ("smmuv3" ); +default : +return g_strdup ("none" ); + } +} + +static void virt_set_iommu (Object *obj,const char *value,Error **errp) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +if (!strcmp (value,"smmuv3" )) { + vms->iommu =VIRT_IOMMU_SMMUV3 ; + }else if (!strcmp (value,"none" )) { + vms->iommu =VIRT_IOMMU_NONE ; + }else { +error_setg (errp,"Invalid iommu value" ); +error_append_hint (errp,"Valid value are none, smmuv3\n" ); + } +} +static CpuInstanceProperties virt_cpu_index_to_props (MachineState *ms,unsigned cpu_index) {
@@ -1679,6 +1707,19 @@ static void virt_2_12_instance_init(Object *obj) NULL); } +if (vmc->no_iommu) { + vms->iommu =VIRT_IOMMU_NONE ; + }else { +/* Default disallows smmu instantiation */ + vms->iommu =VIRT_IOMMU_NONE ; +object_property_add_str (obj,"iommu" , virt_get_iommu, + virt_set_iommu,NULL ); +object_property_set_description (obj,"iommu" , +"Set the IOMMU model among " +"none, smmuv3 (default none)" , +NULL ); + } + vms->memmap = a15memmap; vms->irqmap = a15irqmap; }
@@ -1698,8 +1739,12 @@ static void virt_2_11_instance_init(Object *obj)static void virt_machine_2_11_options (MachineClass *mc) { +VirtMachineClass *vmc =VIRT_MACHINE_CLASS (OBJECT_CLASS (mc)); +virt_machine_2_12_options (mc);SET_MACHINE_COMPAT (mc,VIRT_COMPAT_2_11 ); + + vmc->no_iommu = true; }DEFINE_VIRT_MACHINE (2 ,11 )
include/hw/arm/virt.h +1 -0
@@ -92,6 +92,7 @@ typedef struct {bool disallow_affinity_adjustment;bool no_its;bool no_pmu; +bool no_iommu;bool claim_edge_triggered_timers; } VirtMachineClass;
Signature · 1 line
2.5.5
Re: [Qemu-devel] [PATCH v9 14/14] hw/arm/virt: Handle iommu in 2.12 machine type
Quoted 29 lines · Eric Auger
The new machine type exposes a new "iommu" virt machine option. The SMMUv3 IOMMU is instantiated using -machine virt,iommu=smmuv3.
Signed-off-by Eric Auger <[email protected]>---
v7 -> v8:
- Revert to machine option, now dubbed "iommu", preparing for virtio instantiation.v5 -> v6: machine 2_11
Another alternative would be to use the -device option as done on x86. As the smmu is a sysbus device, we would need to use the platform bus framework.
--- hw/arm/virt.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/virt.h | 1 + 2 files changed, 46 insertions(+)hw/arm/virt.c +1
-0@@ -1547,6 +1547,34 @@ static void virt_set_gic_version(Object *obj, const char *value, Error **errp) } } +static char *virt_get_iommu (Object *obj,Error **errp)
hw/arm/virt.c static void virt_set_gic_version(Object *obj, const char *value, Error **errp) · line 1560
Quoted 10 lines
hw/arm/virt.c +10
-0+{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +switch (vms->iommu) { +case VIRT_IOMMU_NONE : +return g_strdup ("none" ); +case VIRT_IOMMU_SMMUV3 : +return g_strdup ("smmuv3" ); +default : +return g_strdup ("none" );
Isn't this a "can't happen" case? If so, g_assert_not_reached().
Quoted 4 lines
hw/arm/virt.c +4
-0+ } +} + +static void virt_set_iommu (Object *obj,const char *value,Error **errp)
hw/arm/virt.c static void virt_set_gic_version(Object *obj, const char *value, Error **errp) · line 1574
Quoted 10 lines
hw/arm/virt.c +10
-0+{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +if (!strcmp (value,"smmuv3" )) { + vms->iommu =VIRT_IOMMU_SMMUV3 ; + }else if (!strcmp (value,"none" )) { + vms->iommu =VIRT_IOMMU_NONE ; + }else { +error_setg (errp,"Invalid iommu value" ); +error_append_hint (errp,"Valid value are none, smmuv3\n" );
"Valid values are", and add trailing "." to the hint string (matches virt_set_gic_version() phrasing.)
Quoted 7 lines
hw/arm/virt.c +3
-0+ } +} +static CpuInstanceProperties virt_cpu_index_to_props (MachineState *ms,unsigned cpu_index) {
hw/arm/virt.c static void virt_2_12_instance_init(Object *obj) · line 1714
Quoted 8 lines
hw/arm/virt.c +5
-0@@ -1679,6 +1707,19 @@ static void virt_2_12_instance_init(Object *obj) NULL); } +if (vmc->no_iommu) { + vms->iommu =VIRT_IOMMU_NONE ; + }else { +/* Default disallows smmu instantiation */ + vms->iommu =VIRT_IOMMU_NONE ;
If the default is "none" then you don't need the no_iommu field in the VirtMachineClass. You can just have the property exist on all virt machines, the way we do for "secure" and "virtualization". It's only if we want to have the default for newer virt-n.nn versions be something other than what the older machines had that we need to have the VirtMachineClass field that lets us distinguish the older and newer machine types.
Quoted 37 lines
hw/arm/virt.c +12
-0+object_property_add_str (obj,"iommu" , virt_get_iommu, + virt_set_iommu,NULL ); +object_property_set_description (obj,"iommu" , +"Set the IOMMU model among " +"none, smmuv3 (default none)" , +NULL ); + } + vms->memmap = a15memmap; vms->irqmap = a15irqmap; }@@ -1698,8 +1739,12 @@ static void virt_2_11_instance_init(Object *obj)static void virt_machine_2_11_options (MachineClass *mc) { +VirtMachineClass *vmc =VIRT_MACHINE_CLASS (OBJECT_CLASS (mc)); +virt_machine_2_12_options (mc);SET_MACHINE_COMPAT (mc,VIRT_COMPAT_2_11 ); + + vmc->no_iommu = true; }DEFINE_VIRT_MACHINE (2 ,11 )include/hw/arm/virt.h +1
-1@@ -92,6 +92,7 @@ typedef struct {bool disallow_affinity_adjustment;bool no_its;bool no_pmu; +bool no_iommu;bool claim_edge_triggered_timers; } VirtMachineClass; --
Quoted 2 lines
2.5.5
thanks
-- PMM
Re: [Qemu-arm] [PATCH v9 14/14] hw/arm/virt: Handle iommu in 2.12 machine type
Hi Peter,
Quoted 29 lines · Peter Maydell
Quoted 28 lines · Eric Auger
The new machine type exposes a new "iommu" virt machine option. The SMMUv3 IOMMU is instantiated using -machine virt,iommu=smmuv3.
Signed-off-by Eric Auger <[email protected]>---
v7 -> v8:
- Revert to machine option, now dubbed "iommu", preparing for virtio instantiation.v5 -> v6: machine 2_11
Another alternative would be to use the -device option as done on x86. As the smmu is a sysbus device, we would need to use the platform bus framework.
--- hw/arm/virt.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/virt.h | 1 + 2 files changed, 46 insertions(+)hw/arm/virt.c +0
-0@@ -1547,6 +1547,34 @@ static void virt_set_gic_version(Object *obj, const char *value, Error **errp) } }
Quoted 13 lines
hw/arm/virt.c static void virt_set_gic_version(Object *obj, const char *value, Error **errp) · line 1560
Quoted 11 lines
hw/arm/virt.c +11
-0+static char *virt_get_iommu (Object *obj,Error **errp) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +switch (vms->iommu) { +case VIRT_IOMMU_NONE : +return g_strdup ("none" ); +case VIRT_IOMMU_SMMUV3 : +return g_strdup ("smmuv3" ); +default : +return g_strdup ("none" );Isn't this a "can't happen" case? If so,
g_assert_not_reached().
yes, done
Quoted 10 lines
Quoted 10 lines
hw/arm/virt.c +9
-0+ } +} + +static void virt_set_iommu (Object *obj,const char *value,Error **errp) +{ +VirtMachineState *vms =VIRT_MACHINE (obj); + +if (!strcmp (value,"smmuv3" )) { + vms->iommu =VIRT_IOMMU_SMMUV3 ;
Quoted 8 lines
hw/arm/virt.c static void virt_set_gic_version(Object *obj, const char *value, Error **errp) · line 1574
Quoted 5 lines
hw/arm/virt.c +5
-0+ }else if (!strcmp (value,"none" )) { + vms->iommu =VIRT_IOMMU_NONE ; + }else { +error_setg (errp,"Invalid iommu value" ); +error_append_hint (errp,"Valid value are none, smmuv3\n" );"Valid values are", and add trailing "." to the hint string (matches
virt_set_gic_version()phrasing.)
OK
Quoted 11 lines
Quoted 11 lines
hw/arm/virt.c +3
-0+ } +} +static CpuInstanceProperties virt_cpu_index_to_props (MachineState *ms,unsigned cpu_index) {@@ -1679,6 +1707,19 @@ static void virt_2_12_instance_init(Object *obj) NULL); }
Quoted 13 lines
hw/arm/virt.c static void virt_2_12_instance_init(Object *obj) · line 1714
Quoted 5 lines
hw/arm/virt.c +5
-0+if (vmc->no_iommu) { + vms->iommu =VIRT_IOMMU_NONE ; + }else { +/* Default disallows smmu instantiation */ + vms->iommu =VIRT_IOMMU_NONE ;If the default is "none" then you don't need the
no_iommufield in the VirtMachineClass. You can just have the property exist on all virt machines, the way we do for "secure" and "virtualization". It's only if we want to have the default for newer virt-n.nn versions be something other than what the older machines had that we need to have the VirtMachineClass field that lets us distinguish the older and newer machine types.
OK
Thanks
Eric
Quoted 44 lines
Quoted 38 lines
hw/arm/virt.c +12
-0+object_property_add_str (obj,"iommu" , virt_get_iommu, + virt_set_iommu,NULL ); +object_property_set_description (obj,"iommu" , +"Set the IOMMU model among " +"none, smmuv3 (default none)" , +NULL ); + } + vms->memmap = a15memmap; vms->irqmap = a15irqmap; }@@ -1698,8 +1739,12 @@ static void virt_2_11_instance_init(Object *obj)static void virt_machine_2_11_options (MachineClass *mc) { +VirtMachineClass *vmc =VIRT_MACHINE_CLASS (OBJECT_CLASS (mc)); +virt_machine_2_12_options (mc);SET_MACHINE_COMPAT (mc,VIRT_COMPAT_2_11 ); + + vmc->no_iommu = true; }DEFINE_VIRT_MACHINE (2 ,11 )include/hw/arm/virt.h +1
-1@@ -92,6 +92,7 @@ typedef struct {bool disallow_affinity_adjustment;bool no_its;bool no_pmu; +bool no_iommu;bool claim_edge_triggered_timers; } VirtMachineClass; --Quoted 2 lines
2.5.5
thanks
-- PMM
Quoted 9 lines · Eric Auger
This series implements the emulation code for ARM SMMUv3.
SMMUv3 gets instantiated by adding ",iommu=smmuv3" to the virt machine option.
VHOST integration will be handled in a separate series. VFIO integration is not targeted at the moment. Only stage 1 and AArch64 PTW are supported.
Quoted 12 lines
Main changes since v8:
- fix mingw compilation (qemu/log.h)
- put gpl v2 license on all files to respect initial license
- change proto of smmu_ptw* to clarify inputs/outputs and prepare for iotlb emulation
- fix hash table lookup
- cleanup access type handling during ptw
- cleanup reset infra (parent_reset)
- replace some inline functions by macros
- fix some CMD fields
- increment cmdq cons only after cmd execution
- replace some remainingerror_reportbyqemu_log_mask
What state is this series in now? Is it "seems ready to go, needs review"? Are you hoping it might get in for 2.12, or targeting 2.13 ?
thanks
-- PMM
Hi Peter,
Quoted 23 lines · Peter Maydell
Quoted 9 lines · Eric Auger
This series implements the emulation code for ARM SMMUv3.
SMMUv3 gets instantiated by adding ",iommu=smmuv3" to the virt machine option.
VHOST integration will be handled in a separate series. VFIO integration is not targeted at the moment. Only stage 1 and AArch64 PTW are supported.
Quoted 12 lines
Main changes since v8:
- fix mingw compilation (qemu/log.h)
- put gpl v2 license on all files to respect initial license
- change proto of smmu_ptw* to clarify inputs/outputs and prepare for iotlb emulation
- fix hash table lookup
- cleanup access type handling during ptw
- cleanup reset infra (parent_reset)
- replace some inline functions by macros
- fix some CMD fields
- increment cmdq cons only after cmd execution
- replace some remainingerror_reportbyqemu_log_mask
Quoted 3 lines
What state is this series in now? Is it "seems ready to go, needs review"? Are you hoping it might get in for 2.12, or targeting 2.13 ?
Yes I think it is in a decent state and I would be happy to get some new reviews, for a tentative pull in 2.12. In any case I will be reactive on any comment in that prospect.
Thanks
Eric
Quoted 4 lines
thanks
-- PMM
Quoted 11 lines · Auger Eric
Quoted 6 lines · Peter Maydell
Quoted 1 line · Eric Auger
This series implements the emulation code for ARM SMMUv3.
What state is this series in now? Is it "seems ready to go, needs review"? Are you hoping it might get in for 2.12, or targeting 2.13 ?
Yes I think it is in a decent state and I would be happy to get some new reviews, for a tentative pull in 2.12. In any case I will be reactive on any comment in that prospect.
Hi, Eric. I've now gone through the patchset and reviewed it. Sorry I didn't manage to get to this in time to be able to put it into 2.12, but there weren't any major or structural issues, so we should be able to get this into the tree early in the 2.13 dev cycle.
thanks
-- PMM
Hi Peter,
Quoted 9 lines · Peter Maydell
Quoted 7 lines · Auger Eric
Quoted 6 lines · Peter Maydell
Quoted 1 line · Eric Auger
This series implements the emulation code for ARM SMMUv3.
What state is this series in now? Is it "seems ready to go, needs review"? Are you hoping it might get in for 2.12, or targeting 2.13 ?
Quoted 8 lines
Quoted 3 lines
Yes I think it is in a decent state and I would be happy to get some new reviews, for a tentative pull in 2.12. In any case I will be reactive on any comment in that prospect.
Hi, Eric. I've now gone through the patchset and reviewed it. Sorry I didn't manage to get to this in time to be able to put it into 2.12, but there weren't any major or structural issues, so we should be able to get this into the tree early in the 2.13 dev cycle.
No worries. I am already really grateful to you for the time you spent on this comprehensive review.
I have taken into account most of your comments already. I will run some more tests and post v10 this week then.
Thanks
Eric
Quoted 4 lines
thanks
-- PMM