SMMUv3 nested translation support
v4 cover SMMUv3 nested translation support
Currently, QEMU supports emulating either stage-1 or stage-2 SMMUs but not nested instances.
This patch series adds support for nested translation in SMMUv3, this is controlled by property “arm-smmuv3.stage=nested”, and advertised to guests as (IDR0.S1P == 1 && IDR0.S2P == 2)
Main changes(architecture):
============================
1) CDs are considered IPA and translated with stage-2.
2) TTBx and tables for stage-1 are considered IPA and translated with stage-2.
3) Translate the IPA address with stage-2.
TLBs:
======
TLBs are the most tricky part.
1) General design
Unified(Combined) design is used, where entries with ASID=-1 are IPAs(cached from stage-2 config)
TLBs are also modified to cache 2 permissions, a new permission added "parent_perm."
For non-nested configuration, perm == parent_perm and nothing changes. This is used to know which stage to use in case there is a permission fault from a TLB entry.
2) Caching in TLB
Stage-1 and stage-2 are inserted in the TLB as is.
For nested translation, both entries are combined into one TLB entry. The size (level and granule) are chosen from the smallest entries. That means that a stage-1 translation can be cached with sage-2 granule in key, this is taken into account for lookup.
3) TLB Lookup
TLB lookup already uses ASID in key, so it can distinguish between stage-1 and stage-2.
And as mentioned above, the granule for stage-1 can be different, If stage-1 lookup failed, we try again with the stage-2 granule.
4) TLB invalidation
- Address invalidation is split, for IOVA(CMD_TLBI_NH_VA /CMD_TLBI_NH_VAA) and IPA(CMD_TLBI_S2_IPA) based on ASID value
- CMD_TLBI_NH_ASID/CMD_TLBI_NH_ALL: Consider VMID if stage-2 is supported, and invalidate stage-1 only by VMIDs
As far as I understand, this is compliant with the ARM architecture:
- ARM ARM DDI 0487J.a: RLGSCG, RTVTYQ, RGNJPZ
- ARM IHI 0070F.b: 16.2 Caching
An alternative approach would be to instantiate 2 TLBs, one per each stage. I haven’t investigated that.
Others
=======
- Advertise SMMUv3.2-S2FWB, it is NOP for QEMU as it doesn’t support attributes.
- OAS: A typical setup with nesting is to share CPU stage-2 with the SMMU, and according to the user manual, SMMU OAS must match the system physical address.
This was discussed before in
https://lore.kernel.org/all/[email protected]/
This series doesn’t implement that, but reworks OAS to make it easier to configure in the future.
- For nested configuration, IOVA notifier only notifies for stage-1 invalidations (as far as I understand this is the intended behaviour as it notifies for IOVA).
- Stop ignoring VMID for stage-1 if stage-2 is also supported.
Future improvements:
=====================
1) One small improvement, that I don’t think it’s worth the extra complexity, is in case of Stage-1 TLB miss for nested translation, we can do stage-1 walk and lookup for stage-2 TLBs, instead of doing the full walk.
Testing
========
1) IOMMUFD + VFIO
Kernel: https://lore.kernel.org/all/[email protected]/
VMM: https://qemu-devel.nongnu.narkive.com/o815DqpI/rfc-v5-0-8-arm-smmuv3-emulation-support
By assigning “virtio-net-pci,netdev=net0,disable-legacy=on,iommu_platform=on,ats=on”, to a guest VM (on top of QEMU guest) with VIFO and IOMMUFD.
2) Work in progress prototype I am hacking on for nesting on KVM (this is nowhere near complete, and misses many stuff but it doesn't require VMs/VFIO) also with virtio-net-pci and git cloning a bunch of stuff and also observing traces.
https://android-kvm.googlesource.com/linux/+log/refs/heads/smostafa/android15-6.6-smmu-nesting-wip
Overall I tested the following configurations
(S1 = 4k, S2 =4k):
- S1 level = 1 and S2 level = 1
- S1 level = 1 and S2 level = 2
- S1 level = 1 and S2 level = 3
- S1 level = 2 and S2 level = 1
- S1 level = 2 and S2 level = 2
- S1 level = 2 and S2 level = 3
- S1 level = 3 and S2 level = 2
- S1 level = 3 and S2 level = 3
Also did some testing with
(S1 = 16k, S2= 4k)
(S1 = 4K, S2= 16k)
hw/arm/smmuv3: Split smmuv3_translate() better viewed with --color-moved
The first 3 patches are fixes.
Changes in v4:
v3: https://lore.kernel.org/qemu-devel/[email protected]/
- Collected Eric and Alex Rbs
- Rebased on master
- Dropped RFC tag
- Dropped last 2 patches about oas changes to avoid blocking this series and I will post them after as RFC
- Split patch 7, and introduce CACHED_ENTRY_TO_ADDR in a separate patch
- Reorder patch 8 and 9 (combine tlb and tlb lookup)
- Split patch 12, and introduce smmu_iotlb_inv_asid_vmid in a separate patch
- Split patch 14, to have fault changes in a separate patch
- Update commit messages and include Fixes sha
- Minor updates, renames and a lot of comments based on review
Changes in v3
v2: https://lore.kernel.org/qemu-devel/[email protected]/
- Collected Eric Rbs.
- Rebased on master.
- Fix an existing bug in class encoding.
- Fix an existing bug in S2 events missing IPA.
- Fix nesting event population (missing class and wrong events)
- Remove CALL_FUNC_CFG_S2.
- Rework TLB combination logic to cache the largest possible entries.
- Refactor nested translation code to be more clear.
- Split patch 05 to 4 patches.
- Convert asid/vmid in trace events to int also.
- Remove some extra traces as it was not needed.
- Improve commit messages.
Changes in v2:
v1: https://lore.kernel.org/qemu-devel/[email protected]/
- Collected Eric Rbs
- Rework TLB to rely on VMID/ASID instead of an extra key.
- Fixed TLB issue with large stage-1 reported by Julian.
- Cap the OAS to 48 bits as PTW doesn’t support 52 bits.
- Fix ASID/VMID representation in some contexts as 16 bits while
they can be -1
- Increase visibility in trace points
Mostafa Saleh (19):
hw/arm/smmu-common: Add missing size check for stage-1 hw/arm/smmu: Fix IPA for stage-2 events
hw/arm/smmuv3: Fix encoding of CLASS in events hw/arm/smmu: Use enum for SMMU stage
hw/arm/smmu: Split smmuv3_translate()
hw/arm/smmu: Consolidate ASID and VMID types
hw/arm/smmu: Introduce CACHED_ENTRY_TO_ADDR
hw/arm/smmuv3: Translate CD and TT using stage-2 table hw/arm/smmu-common: Rework TLB lookup for nesting hw/arm/smmu-common: Add support for nested TLB hw/arm/smmu-common: Support nested translation hw/arm/smmu: Support nesting in smmuv3_range_inval() hw/arm/smmu: Introduce smmu_iotlb_inv_asid_vmid hw/arm/smmu: Support nesting in the rest of commands hw/arm/smmuv3: Support nested SMMUs in smmuv3_notify_iova() hw/arm/smmuv3: Handle translation faults according to SMMUPTWEventInfo hw/arm/smmuv3: Support and advertise nesting hw/arm/smmuv3: Advertise S2FWB
hw/arm/smmu: Refactor SMMU OAS
hw/arm/smmu-common.c | 320 +++++++++++++++++++++++--- hw/arm/smmuv3-internal.h | 19 +- hw/arm/smmuv3.c | 432 ++++++++++++++++++++++------------- hw/arm/trace-events | 26 ++- include/hw/arm/smmu-common.h | 43 +++- 5 files changed, 617 insertions(+), 223 deletions(-)
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 1/19 hw/arm/smmu-common: Add missing size check for stage-1
According to the SMMU architecture specification (ARM IHI 0070 F.b), in “3.4 Address sizes”
The address output from the translation causes a stage 1 Address Size fault if it exceeds the range of the effective IPA size for the given CD.
However, this check was missing.
There is already a similar check for stage-2 against effective PA.
--- hw/arm/smmu-common.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
hw/arm/smmu-common.c +10 -0
@@ -381,6 +381,16 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, goto error; } +/* +* The address output from the translation causes a stage 1 Address +* Size fault if it exceeds the range of the effective IPA size for +* the given CD. +*/ +if (gpa >= (1ULL << cfg->oas)) { + info->type =SMMU_PTW_ERR_ADDR_SIZE ; + goto error; + } + tlbe->entry.translated_addr = gpa; tlbe->entry.iova = iova & ~mask; tlbe->entry.addr_mask = mask;
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 2/19 hw/arm/smmu: Fix IPA for stage-2 events
In reply to Mostafa SalehFor the following events (ARM IHI 0070 F.b - 7.3 Event records):
- F_TRANSLATION
- F_ACCESS
- F_PERMISSION
- F_ADDR_SIZE
If fault occurs at stage 2, S2 == 1 and:
- If translating an IPA for a transaction (whether by input to stage 2-only configuration, or after successful stage 1 translation), CLASS == IN, and IPA is provided.
At the moment only CLASS == IN is used which indicates input translation.
However, this was not implemented correctly, as for stage 2, the code only sets the S2 bit but not the IPA.
This field has the same bits as FetchAddr in F_WALK_EABT which is populated correctly, so we don’t change that.
The setting of this field should be done from the walker as the IPA address wouldn't be known in case of nesting.
For stage 1, the spec says:
If fault occurs at stage 1, S2 == 0 and:
CLASS == IN, IPA is UNKNOWN.
So, no need to set it to for stage 1, as ptw_info is initialised by zero in smmuv3_translate().
--- hw/arm/smmu-common.c | 10 ++++++---- hw/arm/smmuv3.c | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-)
hw/arm/smmu-common.c +6 -4
@@ -448,7 +448,7 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg,*/ if (ipa >= (1ULL << inputsize)) { info->type =SMMU_PTW_ERR_TRANSLATION ; - goto error; + goto error_ipa; }while (level <VMSA_LEVELS ) {
@@ -494,13 +494,13 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg,*/ if (!PTE_AF (pte) && !cfg->s2cfg.affd) { info->type =SMMU_PTW_ERR_ACCESS ; - goto error; + goto error_ipa; } s2ap =PTE_AP (pte);if (is_permission_fault_s2 (s2ap, perm)) { info->type =SMMU_PTW_ERR_PERMISSION ; - goto error; + goto error_ipa; }/*
@@ -509,7 +509,7 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg,*/ if (gpa >= (1ULL << cfg->s2cfg.eff_ps)) { info->type =SMMU_PTW_ERR_ADDR_SIZE ; - goto error; + goto error_ipa; } tlbe->entry.translated_addr = gpa;
@@ -522,6 +522,8 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg, } info->type =SMMU_PTW_ERR_TRANSLATION ; +error_ipa: + info->addr = ipa; error: info->stage =2 ; tlbe->entry.perm =IOMMU_NONE ;
hw/arm/smmuv3.c +4 -0
@@ -949,6 +949,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr,if (PTW_RECORD_FAULT (cfg)) { event.type =SMMU_EVT_F_TRANSLATION ; event.u.f_translation.addr = addr; + event.u.f_translation.addr2 = ptw_info.addr; event.u.f_translation.rnw = flag &0x1 ; }break ;
@@ -956,6 +957,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr,if (PTW_RECORD_FAULT (cfg)) { event.type =SMMU_EVT_F_ADDR_SIZE ; event.u.f_addr_size.addr = addr; + event.u.f_addr_size.addr2 = ptw_info.addr; event.u.f_addr_size.rnw = flag &0x1 ; }break ;
@@ -963,6 +965,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr,if (PTW_RECORD_FAULT (cfg)) { event.type =SMMU_EVT_F_ACCESS ; event.u.f_access.addr = addr; + event.u.f_access.addr2 = ptw_info.addr; event.u.f_access.rnw = flag &0x1 ; }break ;
@@ -970,6 +973,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr,if (PTW_RECORD_FAULT (cfg)) { event.type =SMMU_EVT_F_PERMISSION ; event.u.f_permission.addr = addr; + event.u.f_permission.addr2 = ptw_info.addr; event.u.f_permission.rnw = flag &0x1 ; }break ;
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 3/19 hw/arm/smmuv3: Fix encoding of CLASS in events
In reply to Mostafa SalehThe SMMUv3 spec (ARM IHI 0070 F.b - 7.3 Event records) defines the class of events faults as:
CLASS: The class of the operation that caused the fault:
- 0b00: CD, CD fetch.
- 0b01: TTD, Stage 1 translation table fetch.
- 0b10: IN, Input address
However, this value was not set and left as 0 which means CD and not IN (0b10).
While at it, add an enum for class as it would be used for nesting. However, at the moment stage-1 and stage-2 use the same class values.
--- hw/arm/smmuv3-internal.h | 6 ++++++ hw/arm/smmuv3.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-)
hw/arm/smmuv3-internal.h +6 -0
@@ -32,6 +32,12 @@ typedef enum SMMUTranslationStatus {SMMU_TRANS_SUCCESS , } SMMUTranslationStatus; +typedef enum SMMUTranslationClass { +SMMU_CLASS_CD , +SMMU_CLASS_TT , +SMMU_CLASS_IN , +}SMMUTranslationClass ; +/* MMIO Registers */ REG32 (IDR0 ,0x0 )
hw/arm/smmuv3.c +5 -1
@@ -942,7 +942,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, 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.class =SMMU_CLASS_TT ; event.u.f_walk_eabt.addr2 = ptw_info.addr;break ;case SMMU_PTW_ERR_TRANSLATION :
@@ -950,6 +950,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, event.type =SMMU_EVT_F_TRANSLATION ; event.u.f_translation.addr = addr; event.u.f_translation.addr2 = ptw_info.addr; + event.u.f_translation.class =SMMU_CLASS_IN ; event.u.f_translation.rnw = flag &0x1 ; }break ;
@@ -958,6 +959,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, event.type =SMMU_EVT_F_ADDR_SIZE ; event.u.f_addr_size.addr = addr; event.u.f_addr_size.addr2 = ptw_info.addr; + event.u.f_translation.class =SMMU_CLASS_IN ; event.u.f_addr_size.rnw = flag &0x1 ; }break ;
@@ -966,6 +968,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, event.type =SMMU_EVT_F_ACCESS ; event.u.f_access.addr = addr; event.u.f_access.addr2 = ptw_info.addr; + event.u.f_translation.class =SMMU_CLASS_IN ; event.u.f_access.rnw = flag &0x1 ; }break ;
@@ -974,6 +977,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, event.type =SMMU_EVT_F_PERMISSION ; event.u.f_permission.addr = addr; event.u.f_permission.addr2 = ptw_info.addr; + event.u.f_translation.class =SMMU_CLASS_IN ; event.u.f_permission.rnw = flag &0x1 ; }break ;
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 4/19 hw/arm/smmu: Use enum for SMMU stage
In reply to Mostafa SalehCurrently, translation stage is represented as an int, where 1 is stage-1 and 2 is stage-2, when nested is added, 3 would be confusing to represent nesting, so we use an enum instead.
While keeping the same values, this is useful for:
- Doing tricks with bit masks, where BIT(0) is stage-1 and BIT(1) is stage-2 and both is nested.
- Tracing, as stage is printed as int.
--- hw/arm/smmu-common.c | 14 +++++++------- hw/arm/smmuv3.c | 15 ++++++++------- include/hw/arm/smmu-common.h | 11 +++++++++-- 3 files changed, 24 insertions(+), 16 deletions(-)
hw/arm/smmu-common.c +7 -7
@@ -304,7 +304,7 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, SMMUTLBEntry *tlbe, SMMUPTWEventInfo *info) {dma_addr_t baseaddr, indexmask; -int stage = cfg->stage; +SMMUStage stage = cfg->stage;SMMUTransTableInfo *tt =select_tt (cfg, iova);uint8_t level, granule_sz, inputsize, stride;
@@ -402,7 +402,7 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, info->type =SMMU_PTW_ERR_TRANSLATION ; error: - info->stage =1 ; + info->stage =SMMU_STAGE_1 ; tlbe->entry.perm =IOMMU_NONE ;return -EINVAL ; }
@@ -425,7 +425,7 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg, dma_addr_t ipa, IOMMUAccessFlags perm, SMMUTLBEntry *tlbe, SMMUPTWEventInfo *info) { - const int stage = 2; + const SMMUStage stage = SMMU_STAGE_2;int granule_sz = cfg->s2cfg.granule_sz;/* ARM DDI0487I.a: Table D8-7. */ int inputsize =64 - cfg->s2cfg.tsz;
@@ -525,7 +525,7 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg, error_ipa: info->addr = ipa; error: - info->stage =2 ; + info->stage =SMMU_STAGE_2 ; tlbe->entry.perm =IOMMU_NONE ;return -EINVAL ; }
@@ -544,9 +544,9 @@ error:int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm,SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) { -if (cfg->stage ==1 ) { +if (cfg->stage ==SMMU_STAGE_1 ) {return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info); - }else if (cfg->stage ==2 ) { + }else if (cfg->stage ==SMMU_STAGE_2 ) {/* * If bypassing stage 1(or unimplemented), the input address is passed * directly to stage 2 as IPA. If the input address of a transaction
@@ -555,7 +555,7 @@ int smmu_ptw(SMMUTransCfg *cfg, dma_addr_t iova, IOMMUAccessFlags perm,*/ if (iova >= (1ULL << cfg->oas)) { info->type =SMMU_PTW_ERR_ADDR_SIZE ; - info->stage =1 ; + info->stage =SMMU_STAGE_1 ; tlbe->entry.perm =IOMMU_NONE ;return -EINVAL ; }
hw/arm/smmuv3.c +8 -7
@@ -34,7 +34,8 @@#include "smmuv3-internal.h" #include "smmu-internal.h" -#define PTW_RECORD_FAULT (cfg) (((cfg)->stage == 1) ? (cfg)->record_faults : \ +#define PTW_RECORD_FAULT (cfg) (((cfg)->stage == SMMU_STAGE_1) ? \ + (cfg)->record_faults : \ (cfg)->s2cfg.record_faults)/**
@@ -402,7 +403,7 @@ static bool s2_pgtable_config_valid(uint8_t sl0, uint8_t t0sz, uint8_t gran)static int decode_ste_s2_cfg (SMMUTransCfg *cfg,STE *ste) { - cfg->stage =2 ; + cfg->stage =SMMU_STAGE_2 ;if (STE_S2AA64 (ste) ==0x0 ) { qemu_log_mask(LOG_UNIMP,
@@ -678,7 +679,7 @@ static int decode_cd(SMMUTransCfg *cfg, CD *cd, SMMUEventInfo *event)/* we support only those at the moment */ cfg->aa64 = true; - cfg->stage =1 ; + cfg->stage =SMMU_STAGE_1 ; cfg->oas =oas2bits (CD_IPS (cd)); cfg->oas =MIN (oas2bits (SMMU_IDR5_OAS ), cfg->oas);
@@ -762,7 +763,7 @@ static int smmuv3_decode_config(IOMMUMemoryRegion *mr, SMMUTransCfg *cfg,return ret; } -if (cfg->aborted || cfg->bypassed || (cfg->stage ==2 )) { +if (cfg->aborted || cfg->bypassed || (cfg->stage ==SMMU_STAGE_2 )) {return 0 ; }
@@ -882,7 +883,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, goto epilogue; } -if (cfg->stage ==1 ) { +if (cfg->stage ==SMMU_STAGE_1 ) {/* Select stage1 translation table. */ tt =select_tt (cfg, addr);if (!tt) {
@@ -919,7 +920,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr,* nesting is not supported. So it is sufficient to check the * translation stage to know the TLB stage for now. */ - event.u.f_walk_eabt.s2 = (cfg->stage ==2 ); + event.u.f_walk_eabt.s2 = (cfg->stage ==SMMU_STAGE_2 );if (PTW_RECORD_FAULT (cfg)) { event.type =SMMU_EVT_F_PERMISSION ; event.u.f_permission.addr = addr;
@@ -935,7 +936,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr,if (smmu_ptw (cfg, aligned_addr, flag, cached_entry, &ptw_info)) {/* All faults from PTW has S2 field. */ - event.u.f_walk_eabt.s2 = (ptw_info.stage ==2 ); + event.u.f_walk_eabt.s2 = (ptw_info.stage ==SMMU_STAGE_2 );g_free (cached_entry);switch (ptw_info.type) {case SMMU_PTW_ERR_WALK_EABT :
include/hw/arm/smmu-common.h +9 -2
@@ -49,8 +49,15 @@ typedef enum {SMMU_PTW_ERR_PERMISSION ,/* Permission fault */ } SMMUPTWEventType; +/* SMMU Stage */ +typedef enum { +SMMU_STAGE_1 =1 , +SMMU_STAGE_2 , +SMMU_NESTED , +}SMMUStage ; +typedef struct SMMUPTWEventInfo { -int stage; +SMMUStage stage;SMMUPTWEventType type;dma_addr_t addr;/* fetched address that induced an abort, if any */ }SMMUPTWEventInfo ;
@@ -88,7 +95,7 @@ typedef struct SMMUS2Cfg {*/ typedef struct SMMUTransCfg { /* Shared fields between stage-1 and stage-2. */ - int stage; /* translation stage */ + SMMUStage stage; /* translation stage */ bool disabled; /* smmu is disabled */ bool bypassed; /* translation is bypassed */ bool aborted; /* translation is aborted */
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 5/19 hw/arm/smmu: Split smmuv3_translate()
In reply to Mostafa Salehsmmuv3_translate() does everything from STE/CD parsing to TLB lookup and PTW.
Soon, when nesting is supported, stage-1 data (tt, CD) needs to be translated using stage-2.
Split smmuv3_translate() to 3 functions:
- smmu_translate(): in smmu-common.c, which does the TLB lookup, PTW, TLB insertion, all the functions are already there, this just puts them together.
This also simplifies the code as it consolidates event generation in case of TLB lookup permission failure or in TT selection.
- smmuv3_do_translate(): in smmuv3.c, Calls smmu_translate() and does the event population in case of errors.
- smmuv3_translate(), now calls smmuv3_do_translate() for translation while the rest is the same.
Also, add stage in trace_smmuv3_translate_success()
--- hw/arm/smmu-common.c | 59 +++++++++++ hw/arm/smmuv3.c | 191 +++++++++++++---------------------- hw/arm/trace-events | 2 +- include/hw/arm/smmu-common.h | 8 ++ 4 files changed, 141 insertions(+), 119 deletions(-)
hw/arm/smmu-common.c +59 -0
@@ -566,6 +566,65 @@ int smmu_ptw(SMMUTransCfg *cfg, dma_addr_t iova, IOMMUAccessFlags perm,g_assert_not_reached (); } +SMMUTLBEntry *smmu_translate (SMMUState *bs,SMMUTransCfg *cfg,dma_addr_t addr, +IOMMUAccessFlags flag,SMMUPTWEventInfo *info) +{ +uint64_t page_mask, aligned_addr; +SMMUTLBEntry *cached_entry =NULL ; +SMMUTransTableInfo *tt; +int status; + +/* +* Combined attributes used for TLB lookup, as only one stage is supported, +* it will hold attributes based on the enabled stage. +*/ +SMMUTransTableInfo tt_combined; + +if (cfg->stage ==SMMU_STAGE_1 ) { +/* Select stage1 translation table. */ + tt =select_tt (cfg, addr); +if (!tt) { + info->type =SMMU_PTW_ERR_TRANSLATION ; + info->stage =SMMU_STAGE_1 ; +return NULL ; + } + tt_combined.granule_sz = tt->granule_sz; + tt_combined.tsz = tt->tsz; + + }else { +/* Stage2. */ + tt_combined.granule_sz = cfg->s2cfg.granule_sz; + tt_combined.tsz = cfg->s2cfg.tsz; + } + +/* +* TLB lookup looks for granule and input size for a translation stage, +* as only one stage is supported right now, choose the right values +* from the configuration. +*/ + page_mask = (1ULL << tt_combined.granule_sz) -1 ; + aligned_addr = addr & ~page_mask; + + cached_entry =smmu_iotlb_lookup (bs, cfg, &tt_combined, aligned_addr); +if (cached_entry) { +if ((flag &IOMMU_WO ) && !(cached_entry->entry.perm &IOMMU_WO )) { + info->type =SMMU_PTW_ERR_PERMISSION ; + info->stage = cfg->stage; +return NULL ; + } +return cached_entry; + } + + cached_entry =g_new0 (SMMUTLBEntry,1 ); + status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info); +if (status) { +g_free (cached_entry); +return NULL ; + } +smmu_iotlb_insert (bs, cfg, cached_entry); +return cached_entry; +} +/** * The bus number is used for lookup when SID based invalidation occurs. * In that case we lazily populate the SMMUPciBus array from the bus hash
hw/arm/smmuv3.c +73 -118
222 lines not on this page · raw message
hw/arm/trace-events +1 -1
@@ -37,7 +37,7 @@ smmuv3_get_ste(uint64_t addr) "STE addr: 0x%"PRIx64 smmuv3_translate_disable(const char *n, uint16_t sid, uint64_t addr, bool is_write) "%s sid=0x%x bypass (smmu disabled) iova:0x%"PRIx64" is_write=%d" smmuv3_translate_bypass(const char *n, uint16_t sid, uint64_t addr, bool is_write) "%s sid=0x%x STE bypass iova:0x%"PRIx64" is_write=%d" smmuv3_translate_abort(const char *n, uint16_t sid, uint64_t addr, bool is_write) "%s sid=0x%x abort on iova:0x%"PRIx64" is_write=%d" -smmuv3_translate_success(const char *n, uint16_t sid, uint64_t iova, uint64_t translated, int perm) "%s sid=0x%x iova=0x%"PRIx64" translated=0x%"PRIx64" perm=0x%x" +smmuv3_translate_success(const char *n, uint16_t sid, uint64_t iova, uint64_t translated, int perm, int stage) "%s sid=0x%x iova=0x%"PRIx64" translated=0x%"PRIx64" perm=0x%x stage=%d" smmuv3_get_cd(uint64_t addr) "CD addr: 0x%"PRIx64 smmuv3_decode_cd(uint32_t oas) "oas=%d" smmuv3_decode_cd_tt(int i, uint32_t tsz, uint64_t ttb, uint32_t granule_sz, bool had) "TT[%d]:tsz:%d ttb:0x%"PRIx64" granule_sz:%d had:%d"
include/hw/arm/smmu-common.h +8 -0
@@ -183,6 +183,14 @@ static inline uint16_t smmu_get_sid(SMMUDevice *sdev)int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm,SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info); + +/* +* smmu_translate - Look for a translation in TLB, if not, do a PTW. +* Returns NULL on PTW error or incase of TLB permission errors. +*/ +SMMUTLBEntry *smmu_translate (SMMUState *bs,SMMUTransCfg *cfg,dma_addr_t addr, +IOMMUAccessFlags flag,SMMUPTWEventInfo *info); +/** * select_tt - compute which translation table shall be used according to * the input iova and translation config and return the TT specific info
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 6/19 hw/arm/smmu: Consolidate ASID and VMID types
In reply to Mostafa SalehASID and VMID used to be uint16_t in the translation config, however, in other contexts they can be int as -1 in case of TLB invalidation, to represent all (don’t care).
When stage-2 was added asid was set to -1 in stage-2 and vmid to -1 in stage-1 configs. However, that meant they were set as (65536), this was not an issue as nesting was not supported and no commands/lookup uses both.
With nesting, it’s critical to get this right as translation must be tagged correctly with ASID/VMID, and with ASID=-1 meaning stage-2. Represent ASID/VMID everywhere as int.
--- hw/arm/smmu-common.c | 10 +++++----- hw/arm/smmuv3.c | 4 ++-- hw/arm/trace-events | 18 +++++++++--------- include/hw/arm/smmu-common.h | 14 +++++++------- 4 files changed, 23 insertions(+), 23 deletions(-)
hw/arm/smmu-common.c +5 -5
@@ -57,7 +57,7 @@ static gboolean smmu_iotlb_key_equal(gconstpointer v1, gconstpointer v2) (k1->vmid == k2->vmid); } -SMMUIOTLBKey smmu_get_iotlb_key (uint16_t asid,uint16_t vmid,uint64_t iova, +SMMUIOTLBKey smmu_get_iotlb_key (int asid,int vmid,uint64_t iova,uint8_t tg,uint8_t level) {SMMUIOTLBKey key = {.asid = asid, .vmid = vmid, .iova = iova,
@@ -130,7 +130,7 @@ void smmu_iotlb_inv_all(SMMUState *s)static gboolean smmu_hash_remove_by_asid (gpointer key,gpointer value,gpointer user_data) { -uint16_t asid = *(uint16_t *)user_data; +int asid = *(int *)user_data;SMMUIOTLBKey *iotlb_key = (SMMUIOTLBKey *)key;return SMMU_IOTLB_ASID (*iotlb_key) == asid;
@@ -139,7 +139,7 @@ static gboolean smmu_hash_remove_by_asid(gpointer key, gpointer value,static gboolean smmu_hash_remove_by_vmid (gpointer key,gpointer value,gpointer user_data) { -uint16_t vmid = *(uint16_t *)user_data; +int vmid = *(int *)user_data;SMMUIOTLBKey *iotlb_key = (SMMUIOTLBKey *)key;return SMMU_IOTLB_VMID (*iotlb_key) == vmid;
@@ -191,13 +191,13 @@ void smmu_iotlb_inv_iova(SMMUState *s, int asid, int vmid, dma_addr_t iova, &info); } -void smmu_iotlb_inv_asid (SMMUState *s,uint16_t asid) +void smmu_iotlb_inv_asid (SMMUState *s,int asid) {trace_smmu_iotlb_inv_asid (asid);g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_asid, &asid); } -void smmu_iotlb_inv_vmid (SMMUState *s,uint16_t vmid) +void smmu_iotlb_inv_vmid (SMMUState *s,int vmid) {trace_smmu_iotlb_inv_vmid (vmid);g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_vmid, &vmid);
hw/arm/smmuv3.c +2 -2
@@ -1243,7 +1243,7 @@ static int smmuv3_cmdq_consume(SMMUv3State *s) }case SMMU_CMD_TLBI_NH_ASID : { -uint16_t asid =CMD_ASID (&cmd); +int asid =CMD_ASID (&cmd);if (!STAGE1_SUPPORTED (s)) { cmd_error =SMMU_CERROR_ILL ;
@@ -1276,7 +1276,7 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)break ;case SMMU_CMD_TLBI_S12_VMALL : { -uint16_t vmid =CMD_VMID (&cmd); +int vmid =CMD_VMID (&cmd);if (!STAGE2_SUPPORTED (s)) { cmd_error =SMMU_CERROR_ILL ;
hw/arm/trace-events +9 -9
@@ -11,13 +11,13 @@ smmu_ptw_page_pte(int stage, int level, uint64_t iova, uint64_t baseaddr, uint6 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 smmu_iotlb_inv_all(void) "IOTLB invalidate all" -smmu_iotlb_inv_asid(uint16_t asid) "IOTLB invalidate asid=%d" -smmu_iotlb_inv_vmid(uint16_t vmid) "IOTLB invalidate vmid=%d" -smmu_iotlb_inv_iova(uint16_t asid, uint64_t addr) "IOTLB invalidate asid=%d addr=0x%"PRIx64 +smmu_iotlb_inv_asid(int asid) "IOTLB invalidate asid=%d" +smmu_iotlb_inv_vmid(int vmid) "IOTLB invalidate vmid=%d" +smmu_iotlb_inv_iova(int asid, uint64_t addr) "IOTLB invalidate asid=%d addr=0x%"PRIx64 smmu_inv_notifiers_mr(const char *name) "iommu mr=%s" -smmu_iotlb_lookup_hit(uint16_t asid, uint16_t vmid, uint64_t addr, uint32_t hit, uint32_t miss, uint32_t p) "IOTLB cache HIT asid=%d vmid=%d addr=0x%"PRIx64" hit=%d miss=%d hit rate=%d" -smmu_iotlb_lookup_miss(uint16_t asid, uint16_t vmid, uint64_t addr, uint32_t hit, uint32_t miss, uint32_t p) "IOTLB cache MISS asid=%d vmid=%d addr=0x%"PRIx64" hit=%d miss=%d hit rate=%d" -smmu_iotlb_insert(uint16_t asid, uint16_t vmid, uint64_t addr, uint8_t tg, uint8_t level) "IOTLB ++ asid=%d vmid=%d addr=0x%"PRIx64" tg=%d level=%d" +smmu_iotlb_lookup_hit(int asid, int vmid, uint64_t addr, uint32_t hit, uint32_t miss, uint32_t p) "IOTLB cache HIT asid=%d vmid=%d addr=0x%"PRIx64" hit=%d miss=%d hit rate=%d" +smmu_iotlb_lookup_miss(int asid, int vmid, uint64_t addr, uint32_t hit, uint32_t miss, uint32_t p) "IOTLB cache MISS asid=%d vmid=%d addr=0x%"PRIx64" hit=%d miss=%d hit rate=%d" +smmu_iotlb_insert(int asid, int vmid, uint64_t addr, uint8_t tg, uint8_t level) "IOTLB ++ asid=%d vmid=%d addr=0x%"PRIx64" tg=%d level=%d" # smmuv3.c smmuv3_read_mmio(uint64_t addr, uint64_t val, unsigned size, uint32_t r) "addr: 0x%"PRIx64" val:0x%"PRIx64" size: 0x%x(%d)"
@@ -48,12 +48,12 @@ smmuv3_config_cache_hit(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t p smmuv3_config_cache_miss(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache MISS for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" smmuv3_range_inval(int vmid, int asid, uint64_t addr, uint8_t tg, uint64_t num_pages, uint8_t ttl, bool leaf) "vmid=%d asid=%d addr=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" ttl=%d leaf=%d" smmuv3_cmdq_tlbi_nh(void) "" -smmuv3_cmdq_tlbi_nh_asid(uint16_t asid) "asid=%d" -smmuv3_cmdq_tlbi_s12_vmid(uint16_t vmid) "vmid=%d" +smmuv3_cmdq_tlbi_nh_asid(int asid) "asid=%d" +smmuv3_cmdq_tlbi_s12_vmid(int vmid) "vmid=%d" smmuv3_config_cache_inv(uint32_t sid) "Config cache INV for sid=0x%x" smmuv3_notify_flag_add(const char *iommu) "ADD SMMUNotifier node for iommu mr=%s" smmuv3_notify_flag_del(const char *iommu) "DEL SMMUNotifier node for iommu mr=%s" -smmuv3_inv_notifiers_iova(const char *name, uint16_t asid, uint16_t vmid, uint64_t iova, uint8_t tg, uint64_t num_pages) "iommu mr=%s asid=%d vmid=%d iova=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64 +smmuv3_inv_notifiers_iova(const char *name, int asid, int vmid, uint64_t iova, uint8_t tg, uint64_t num_pages) "iommu mr=%s asid=%d vmid=%d iova=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64 # strongarm.c strongarm_uart_update_parameters(const char *label, int speed, char parity, int data_bits, int stop_bits) "%s speed=%d parity=%c data=%d stop=%d"
include/hw/arm/smmu-common.h +7 -7
@@ -84,7 +84,7 @@ typedef struct SMMUS2Cfg {bool record_faults;/* Record fault events (S2R) */ uint8_t granule_sz;/* Granule page shift (based on S2TG) */ uint8_t eff_ps;/* Effective PA output range (based on S2PS) */ -uint16_t vmid;/* Virtual Machine ID (S2VMID) */ +int vmid;/* Virtual Machine ID (S2VMID) */ uint64_t vttb;/* Address of translation table base (S2TTB) */ } SMMUS2Cfg;
@@ -108,7 +108,7 @@ typedef struct SMMUTransCfg {uint64_t ttb;/* TT base address */ uint8_t oas;/* output address width */ uint8_t tbi;/* Top Byte Ignore */ -uint16_t asid; +int asid;SMMUTransTableInfo tt[2 ];/* Used by stage-2 only. */ struct SMMUS2Cfg s2cfg;
@@ -132,8 +132,8 @@ typedef struct SMMUPciBus {typedef struct SMMUIOTLBKey {uint64_t iova; -uint16_t asid; -uint16_t vmid; +int asid; +int vmid;uint8_t tg;uint8_t level; }SMMUIOTLBKey ;
@@ -205,11 +205,11 @@ IOMMUMemoryRegion *smmu_iommu_mr(SMMUState *s, uint32_t sid);SMMUTLBEntry *smmu_iotlb_lookup (SMMUState *bs,SMMUTransCfg *cfg,SMMUTransTableInfo *tt,hwaddr iova);void smmu_iotlb_insert (SMMUState *bs,SMMUTransCfg *cfg,SMMUTLBEntry *entry); -SMMUIOTLBKey smmu_get_iotlb_key (uint16_t asid,uint16_t vmid,uint64_t iova, +SMMUIOTLBKey smmu_get_iotlb_key (int asid,int vmid,uint64_t iova,uint8_t tg,uint8_t level);void smmu_iotlb_inv_all (SMMUState *s); -void smmu_iotlb_inv_asid (SMMUState *s,uint16_t asid); -void smmu_iotlb_inv_vmid (SMMUState *s,uint16_t vmid); +void smmu_iotlb_inv_asid (SMMUState *s,int asid); +void smmu_iotlb_inv_vmid (SMMUState *s,int vmid);void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl);
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 7/19 hw/arm/smmu: Introduce CACHED_ENTRY_TO_ADDR
In reply to Mostafa SalehSoon, smmuv3_do_translate() will be used to translate the CD and the TTBx, instead of re-writting the same logic to convert the returned cached entry to an address, add a new macro CACHED_ENTRY_TO_ADDR.
--- hw/arm/smmuv3.c | 3 +-- include/hw/arm/smmu-common.h | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-)
hw/arm/smmuv3.c +1 -2
@@ -950,8 +950,7 @@ epilogue:switch (status) {case SMMU_TRANS_SUCCESS : entry.perm = cached_entry->entry.perm; - entry.translated_addr = cached_entry->entry.translated_addr + - (addr & cached_entry->entry.addr_mask); + entry.translated_addr =CACHED_ENTRY_TO_ADDR (cached_entry, addr); entry.addr_mask = cached_entry->entry.addr_mask; trace_smmuv3_translate_success(mr->parent_obj.name, sid, addr, entry.translated_addr, entry.perm,
include/hw/arm/smmu-common.h +3 -0
@@ -37,6 +37,9 @@#define VMSA_IDXMSK (isz, strd, lvl) ((1ULL << \ VMSA_BIT_LVL(isz, strd, lvl)) - 1) +#define CACHED_ENTRY_TO_ADDR (ent, addr) (ent)->entry.translated_addr + \ + ((addr) & (ent)->entry.addr_mask); +/* * Page table walk error types */
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 8/19 hw/arm/smmuv3: Translate CD and TT using stage-2 table
In reply to Mostafa SalehAccording to ARM SMMU architecture specification (ARM IHI 0070 F.b), In "5.2 Stream Table Entry":
[51:6] S1ContextPtr
If Config[1] == 1 (stage 2 enabled), this pointer is an IPA translated by stage 2 and the programmed value must be within the range of the IAS.
In "5.4.1 CD notes":
The translation table walks performed from TTB0 or TTB1 are always performed in IPA space if stage 2 translations are enabled.
This patch implements translation of the S1 context descriptor pointer and TTBx base addresses through the S2 stage (IPA -> PA)
smmuv3_do_translate() is updated to have one arg which is translation class, this is useful to:
- Decide wether a translation is stage-2 only or use the STE config.
- Populate the class in case of faults, WALK_EABT is left unchanged, as it is always triggered from TT access so no need to use the input class.
In case for stage-2 only translation, used in the context of nested translation, the stage and asid are saved and restored before and after calling smmu_translate().
Translating CD or TTBx can fail for the following reasons:
1) Large address size: This is described in
(3.4.3 Address sizes of SMMU-originated accesses)
- For CD ptr larger than IAS, for SMMUv3.1, it can trigger either C_BAD_STE or Translation fault, we implement the latter as it requires no extra code.
- For TTBx, if larger than the effective stage 1 output address size, it triggers C_BAD_CD.
2) Faults from PTWs (7.3 Event records)
- F_ADDR_SIZE: large address size after first level causes stage 2 Address Size fault (Also in 3.4.3 Address sizes of SMMU-originated accesses)
- F_PERMISSION: Same as an address translation. However, when
CLASS == CD, the access is implicitly Data and a read.
- F_ACCESS: Same as an address translation.
- F_TRANSLATION: Same as an address translation.
- F_WALK_EABT: Same as an address translation.
These are already implemented in the PTW logic, so no extra handling required.
--- hw/arm/smmuv3.c | 91 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 80 insertions(+), 11 deletions(-)
hw/arm/smmuv3.c +80 -11
@@ -337,14 +337,35 @@ static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf, } +static SMMUTranslationStatus smmuv3_do_translate (SMMUv3State *s,hwaddr addr, +SMMUTransCfg *cfg, +SMMUEventInfo *event, +IOMMUAccessFlags flag, +SMMUTLBEntry **out_entry, +SMMUTranslationClass class);/* @ssid > 0 not supported yet */ -static int smmu_get_cd (SMMUv3State *s,STE *ste,uint32_t ssid, -CD *buf,SMMUEventInfo *event) +static int smmu_get_cd (SMMUv3State *s,STE *ste,SMMUTransCfg *cfg, +uint32_t ssid,CD *buf,SMMUEventInfo *event) {dma_addr_t addr =STE_CTXPTR (ste);int ret, i; +SMMUTranslationStatus status; +SMMUTLBEntry *entry;trace_smmuv3_get_cd (addr); + +if (cfg->stage ==SMMU_NESTED ) { + status =smmuv3_do_translate (s, addr, cfg, event, +IOMMU_RO , &entry,SMMU_CLASS_CD ); + +/* Same PTW faults are reported but with CLASS = CD. */ +if (status !=SMMU_TRANS_SUCCESS ) { +return -EINVAL ; + } + + addr =CACHED_ENTRY_TO_ADDR (entry, addr); + } +/* TODO: guarantee 64-bit single-copy atomicity */ ret =dma_memory_read (&address_space_memory, addr, buf,sizeof (*buf),MEMTXATTRS_UNSPECIFIED );
@@ -659,10 +680,13 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste,return 0 ; } -static int decode_cd (SMMUTransCfg *cfg,CD *cd,SMMUEventInfo *event) +static int decode_cd (SMMUv3State *s,SMMUTransCfg *cfg, +CD *cd,SMMUEventInfo *event) {int ret = -EINVAL ;int i; +SMMUTranslationStatus status; +SMMUTLBEntry *entry;if (!CD_VALID (cd) || !CD_AARCH64 (cd)) { goto bad_cd;
@@ -713,9 +737,26 @@ static int decode_cd(SMMUTransCfg *cfg, CD *cd, SMMUEventInfo *event) tt->tsz = tsz; tt->ttb =CD_TTB (cd, i); +if (tt->ttb & ~(MAKE_64BIT_MASK (0 , cfg->oas))) { goto bad_cd; } + +/* Translate the TTBx, from IPA to PA if nesting is enabled. */ +if (cfg->stage ==SMMU_NESTED ) { + status =smmuv3_do_translate (s, tt->ttb, cfg, event,IOMMU_RO , + &entry,SMMU_CLASS_TT ); +/* +* Same PTW faults are reported but with CLASS = TT. +* If TTBx is larger than the effective stage 1 output addres +* size, it reports C_BAD_CD, which is handled by the above case. +*/ +if (status !=SMMU_TRANS_SUCCESS ) { +return -EINVAL ; + } + tt->ttb =CACHED_ENTRY_TO_ADDR (entry, tt->ttb); + } + tt->had =CD_HAD (cd, i);trace_smmuv3_decode_cd_tt (i, tt->tsz, tt->ttb, tt->granule_sz, tt->had); }
@@ -767,12 +808,12 @@ static int smmuv3_decode_config(IOMMUMemoryRegion *mr, SMMUTransCfg *cfg,return 0 ; } - ret =smmu_get_cd (s, &ste,0 /* ssid */ , &cd, event); + ret =smmu_get_cd (s, &ste, cfg,0 /* ssid */ , &cd, event);if (ret) {return ret; } -return decode_cd (cfg, &cd, event); +return decode_cd (s, cfg, &cd, event); }/**
@@ -832,13 +873,40 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, SMMUTransCfg *cfg, SMMUEventInfo *event, IOMMUAccessFlags flag, - SMMUTLBEntry **out_entry) + SMMUTLBEntry **out_entry, + SMMUTranslationClass class) {SMMUPTWEventInfo ptw_info = {};SMMUState *bs =ARM_SMMU (s);SMMUTLBEntry *cached_entry =NULL ; +int asid, stage; +bool S2_only = class !=SMMU_CLASS_IN ; + +/* +* The function uses the argument class to indentify which stage is used: +* - CLASS = IN: Means an input translation, determine the stage from STE. +* - CLASS = CD: Means the addr is an IPA of the CD, and it would be +* tranlsated using the stage-2. +* - CLASS = TT: Means the addr is an IPA of the stage-1 translation table +* and it would be tranlsated using the stage-2. +* For the last 2 cases instead of having intrusive changes in the common +* logic, we modify the cfg to be a stage-2 translation only in case of +* nested, and then restore it after. +*/ +if (S2_only) { + asid = cfg->asid; + stage = cfg->stage; + cfg->asid =-1 ; + cfg->stage =SMMU_STAGE_2 ; + } cached_entry =smmu_translate (bs, cfg, addr, flag, &ptw_info); + +if (S2_only) { + cfg->asid = asid; + cfg->stage = stage; + } +if (!cached_entry) {/* All faults from PTW has S2 field. */ event->u.f_walk_eabt.s2 = (ptw_info.stage ==SMMU_STAGE_2 );
@@ -855,7 +923,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_TRANSLATION ; event->u.f_translation.addr = addr; event->u.f_translation.addr2 = ptw_info.addr; - event->u.f_translation.class =SMMU_CLASS_IN ; + event->u.f_translation.class = class; event->u.f_translation.rnw = flag &0x1 ; }break ;
@@ -864,7 +932,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_ADDR_SIZE ; event->u.f_addr_size.addr = addr; event->u.f_addr_size.addr2 = ptw_info.addr; - event->u.f_addr_size.class =SMMU_CLASS_IN ; + event->u.f_addr_size.class = class; event->u.f_addr_size.rnw = flag &0x1 ; }break ;
@@ -873,7 +941,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_ACCESS ; event->u.f_access.addr = addr; event->u.f_access.addr2 = ptw_info.addr; - event->u.f_access.class =SMMU_CLASS_IN ; + event->u.f_access.class = class; event->u.f_access.rnw = flag &0x1 ; }break ;
@@ -882,7 +950,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_PERMISSION ; event->u.f_permission.addr = addr; event->u.f_permission.addr2 = ptw_info.addr; - event->u.f_permission.class =SMMU_CLASS_IN ; + event->u.f_permission.class = class; event->u.f_permission.rnw = flag &0x1 ; }break ;
@@ -943,7 +1011,8 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, goto epilogue; } - status =smmuv3_do_translate (s, addr, cfg, &event, flag, &cached_entry); + status =smmuv3_do_translate (s, addr, cfg, &event, flag, + &cached_entry,SMMU_CLASS_IN ); epilogue:qemu_mutex_unlock (&s->mutex);
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 9/19 hw/arm/smmu-common: Rework TLB lookup for nesting
In reply to Mostafa SalehIn the next patch, combine_tlb() will be added which combines 2 TLB entries into one for nested translations, which chooses the granule and level from the smallest entry.
This means that with nested translation, an entry can be cached with the granule of stage-2 and not stage-1.
However, currently, the lookup for an IOVA is done with input stage granule, which is stage-1 for nested configuration, which will not work with the above logic.
This patch reworks lookup in that case, so it falls back to stage-2 granule if no entry is found using stage-1 granule.
--- hw/arm/smmu-common.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)
hw/arm/smmu-common.c +34 -2
@@ -66,8 +66,10 @@ SMMUIOTLBKey smmu_get_iotlb_key(int asid, int vmid, uint64_t iova,return key; } -SMMUTLBEntry *smmu_iotlb_lookup (SMMUState *bs,SMMUTransCfg *cfg, -SMMUTransTableInfo *tt,hwaddr iova) +static SMMUTLBEntry *smmu_iotlb_lookup_all_levels (SMMUState *bs, +SMMUTransCfg *cfg, +SMMUTransTableInfo *tt, +hwaddr iova) {uint8_t tg = (tt->granule_sz -10 ) /2 ;uint8_t inputsize =64 - tt->tsz;
@@ -88,6 +90,36 @@ SMMUTLBEntry *smmu_iotlb_lookup(SMMUState *bs, SMMUTransCfg *cfg, } level++; } +return entry; +} + +/** +* smmu_iotlb_lookup - Look up for a TLB entry. +* @bs: SMMU state which includes the TLB instance +* @cfg: Configuration of the translation +* @tt: Translation table info (granule and tsz) +* @iova: IOVA address to lookup +* +* returns a valid entry on success, otherwise NULL. +* In case of nested translation, tt can be updated to include +* the granule of the found entry as it might different from +* the IOVA granule. +*/ +SMMUTLBEntry *smmu_iotlb_lookup (SMMUState *bs,SMMUTransCfg *cfg, +SMMUTransTableInfo *tt,hwaddr iova) +{ +SMMUTLBEntry *entry =NULL ; + + entry =smmu_iotlb_lookup_all_levels (bs, cfg, tt, iova); +/* +* For nested translation also try the s2 granule, as the TLB will insert +* it if the size of s2 tlb entry was smaller. +*/ +if (!entry && (cfg->stage ==SMMU_NESTED ) && + (cfg->s2cfg.granule_sz != tt->granule_sz)) { + tt->granule_sz = cfg->s2cfg.granule_sz; + entry =smmu_iotlb_lookup_all_levels (bs, cfg, tt, iova); + }if (entry) { cfg->iotlb_hits++;
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 10/19 hw/arm/smmu-common: Add support for nested TLB
In reply to Mostafa SalehThis patch adds support for nested (combined) TLB entries. The main function combine_tlb() is not used here but in the next patches, but to simplify the patches it is introduced first.
Main changes:
1) New field added in the SMMUTLBEntry struct: parent_perm, for nested TLB, holds the stage-2 permission, this can be used to know the origin of a permission fault from a cached entry as caching the “and” of the permissions loses this information.
SMMUPTWEventInfo is used to hold information about PTW faults so the event can be populated, the value of stage used to be set based on the current stage for TLB permission faults, however with the parent_perm, it is now set based on which perm has the missing permission
When nesting is not enabled it has the same value as perm which doesn't change the logic.
2) As combined TLB implementation is used, the combination logic chooses:
- tg and level from the entry which has the smallest addr_mask.
- Based on that the iova that would be cached is recalculated.
- Translated_addr is chosen from stage-2.
--- hw/arm/smmu-common.c | 37 ++++++++++++++++++++++++++++++++---- include/hw/arm/smmu-common.h | 1 + 2 files changed, 34 insertions(+), 4 deletions(-)
hw/arm/smmu-common.c +33 -4
@@ -426,7 +426,8 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, tlbe->entry.translated_addr = gpa; tlbe->entry.iova = iova & ~mask; tlbe->entry.addr_mask = mask; - tlbe->entry.perm =PTE_AP_TO_PERM (ap); + tlbe->parent_perm =PTE_AP_TO_PERM (ap); + tlbe->entry.perm = tlbe->parent_perm; tlbe->level = level; tlbe->granule = granule_sz;return 0 ;
@@ -547,7 +548,8 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg, tlbe->entry.translated_addr = gpa; tlbe->entry.iova = ipa & ~mask; tlbe->entry.addr_mask = mask; - tlbe->entry.perm = s2ap; + tlbe->parent_perm = s2ap; + tlbe->entry.perm = tlbe->parent_perm; tlbe->level = level; tlbe->granule = granule_sz;return 0 ;
@@ -562,6 +564,30 @@ error:return -EINVAL ; } +/* +* combine S1 and S2 TLB entries into a single entry. +* As a result the S1 entry is overriden with combined data. +*/ +static void __attribute__((unused))combine_tlb (SMMUTLBEntry *tlbe, +SMMUTLBEntry *tlbe_s2, +dma_addr_t iova, +SMMUTransCfg *cfg) +{ +if (tlbe_s2->entry.addr_mask < tlbe->entry.addr_mask) { + tlbe->entry.addr_mask = tlbe_s2->entry.addr_mask; + tlbe->granule = tlbe_s2->granule; + tlbe->level = tlbe_s2->level; + } + + tlbe->entry.translated_addr =CACHED_ENTRY_TO_ADDR (tlbe_s2, + tlbe->entry.translated_addr); + + tlbe->entry.iova = iova & ~tlbe->entry.addr_mask; +/* parent_perm has s2 perm while perm keeps s1 perm. */ + tlbe->parent_perm = tlbe_s2->entry.perm; +return ; +} +/** * smmu_ptw - Walk the page tables for an IOVA, according to @cfg *
@@ -639,9 +665,12 @@ SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr, cached_entry =smmu_iotlb_lookup (bs, cfg, &tt_combined, aligned_addr);if (cached_entry) { -if ((flag &IOMMU_WO ) && !(cached_entry->entry.perm &IOMMU_WO )) { +if ((flag &IOMMU_WO ) && !(cached_entry->entry.perm & + cached_entry->parent_perm &IOMMU_WO )) { info->type =SMMU_PTW_ERR_PERMISSION ; - info->stage = cfg->stage; + info->stage = !(cached_entry->entry.perm &IOMMU_WO ) ? +SMMU_STAGE_1 : +SMMU_STAGE_2 ;return NULL ; }return cached_entry;
include/hw/arm/smmu-common.h +1 -0
@@ -77,6 +77,7 @@ typedef struct SMMUTLBEntry {IOMMUTLBEntry entry;uint8_t level;uint8_t granule; +IOMMUAccessFlags parent_perm; } SMMUTLBEntry;/* Stage-2 configuration. */
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 11/19 hw/arm/smmu-common: Support nested translation
In reply to Mostafa SalehWhen nested translation is requested, do the following:
- Translate stage-1 table address IPA into PA through stage-2.
- Translate stage-1 table walk output (IPA) through stage-2.
- Create a single TLB entry from stage-1 and stage-2 translations using logic introduced before.
For stage-1 table translation, the spec (ARM IHI 0070 F.b) says in:
7.3.12 F_WALK_EABT:
Translation of an IPA for Stage 1 descriptor fetch:
S2 == 1 (stage 2), CLASS == TSo, F_WALK_EABT is used which propagtes to CLASS == TT.
smmu_ptw() has a new argument SMMUState which include the TLB as stage-1 table address can be cached in there.
Also in smmu_ptw() a separate path used for nesting to simplify the code, although some logic can be combined.
--- hw/arm/smmu-common.c | 72 +++++++++++++++++++++++++++++++----- include/hw/arm/smmu-common.h | 2 +- 2 files changed, 64 insertions(+), 10 deletions(-)
hw/arm/smmu-common.c +63 -9
@@ -318,6 +318,38 @@ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova)return NULL ; } +/* Translate stage-1 table address using stage-2 page table. */ +static inline int translate_table_addr_ipa (dma_addr_t *table_addr, +SMMUTransCfg *cfg, +SMMUPTWEventInfo *info, +SMMUState *bs) +{ +dma_addr_t addr = *table_addr; +SMMUTLBEntry *cached_entry; +int asid; + +/* +* The translation table walks performed from TTB0 or TTB1 are always +* performed in IPA space if stage 2 translations are enabled. +*/ + asid = cfg->asid; + cfg->stage =SMMU_STAGE_2 ; + cfg->asid =-1 ; + cached_entry =smmu_translate (bs, cfg, addr,IOMMU_RO , info); + cfg->asid = asid; + cfg->stage =SMMU_NESTED ; + +if (cached_entry) { + *table_addr =CACHED_ENTRY_TO_ADDR (cached_entry, addr); +return 0 ; + } + + info->stage =SMMU_STAGE_2 ; + info->type =SMMU_PTW_ERR_WALK_EABT ; + info->addr = addr; +return -EINVAL ; +} +/** * smmu_ptw_64_s1 - VMSAv8-64 Walk of the page tables for a given IOVA * @cfg: translation config
@@ -333,7 +365,8 @@ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova)*/ static int smmu_ptw_64_s1 (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info, +SMMUState *bs) {dma_addr_t baseaddr, indexmask;SMMUStage stage = cfg->stage;
@@ -381,6 +414,11 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, goto error; } baseaddr =get_table_pte_address (pte, granule_sz); +if (cfg->stage ==SMMU_NESTED ) { +if (translate_table_addr_ipa (&baseaddr, cfg, info, bs)) { + goto error; + } + } level++;continue ; }else if (is_page_pte (pte, level)) {
@@ -568,10 +606,8 @@ error:* combine S1 and S2 TLB entries into a single entry. * As a result the S1 entry is overriden with combined data. */ -static void __attribute__((unused))combine_tlb (SMMUTLBEntry *tlbe, -SMMUTLBEntry *tlbe_s2, -dma_addr_t iova, -SMMUTransCfg *cfg) +static void combine_tlb (SMMUTLBEntry *tlbe,SMMUTLBEntry *tlbe_s2, +dma_addr_t iova,SMMUTransCfg *cfg) {if (tlbe_s2->entry.addr_mask < tlbe->entry.addr_mask) { tlbe->entry.addr_mask = tlbe_s2->entry.addr_mask;
@@ -596,14 +632,19 @@ static void __attribute__((unused)) combine_tlb(SMMUTLBEntry *tlbe,* @perm: tentative access type * @tlbe: returned entry * @info: ptw event handle +* @bs: smmu state which includes TLB instance * * return 0 on success */ int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info,SMMUState *bs) { +int ret; +SMMUTLBEntry tlbe_s2; +dma_addr_t ipa; +if (cfg->stage ==SMMU_STAGE_1 ) { -return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info); +return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info, bs); }else if (cfg->stage ==SMMU_STAGE_2 ) {/* * If bypassing stage 1(or unimplemented), the input address is passed
@@ -621,7 +662,20 @@ int smmu_ptw(SMMUTransCfg *cfg, dma_addr_t iova, IOMMUAccessFlags perm,return smmu_ptw_64_s2 (cfg, iova, perm, tlbe, info); } -g_assert_not_reached (); +/* SMMU_NESTED. */ + ret =smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info, bs); +if (ret) { +return ret; + } + + ipa =CACHED_ENTRY_TO_ADDR (tlbe, iova); + ret =smmu_ptw_64_s2 (cfg, ipa, perm, &tlbe_s2, info); +if (ret) { +return ret; + } + +combine_tlb (tlbe, &tlbe_s2, iova, cfg); +return 0 ; } SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr,
@@ -677,7 +731,7 @@ SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr, } cached_entry =g_new0 (SMMUTLBEntry,1 ); - status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info); + status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info, bs);if (status) {g_free (cached_entry);return NULL ;
include/hw/arm/smmu-common.h +1 -1
@@ -185,7 +185,7 @@ static inline uint16_t smmu_get_sid(SMMUDevice *sdev)* pair, according to @cfg translation config */ int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info); +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info,SMMUState *bs);/*
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 12/19 hw/arm/smmu: Support nesting in smmuv3_range_inval()
In reply to Mostafa SalehWith nesting, we would need to invalidate IPAs without over-invalidating stage-1 IOVAs. This can be done by distinguishing IPAs in the TLBs by having ASID=-1. To achieve that, rework the invalidation for IPAs to have a separate function, while for IOVA invalidation ASID=-1 means invalidate for all ASIDs.
--- hw/arm/smmu-common.c | 47 ++++++++++++++++++++++++++++++++++++ hw/arm/smmuv3.c | 23 ++++++++++++------ hw/arm/trace-events | 2 +- include/hw/arm/smmu-common.h | 3 ++- 4 files changed, 66 insertions(+), 9 deletions(-)
hw/arm/smmu-common.c +47 -0
@@ -195,6 +195,25 @@ static gboolean smmu_hash_remove_by_asid_vmid_iova(gpointer key, gpointer value, ((entry->iova & ~info->mask) == info->iova); } +static gboolean smmu_hash_remove_by_vmid_ipa (gpointer key,gpointer value, +gpointer user_data) +{ +SMMUTLBEntry *iter = (SMMUTLBEntry *)value; +IOMMUTLBEntry *entry = &iter->entry; +SMMUIOTLBPageInvInfo *info = (SMMUIOTLBPageInvInfo *)user_data; +SMMUIOTLBKey iotlb_key = *(SMMUIOTLBKey *)key; + +if (info->asid >=0 ) { +/* This is a stage-1 address. */ +return false; + } +if (info->vmid !=SMMU_IOTLB_VMID (iotlb_key)) { +return false; + } +return ((info->iova & ~entry->addr_mask) == entry->iova) || + ((entry->iova & ~info->mask) == info->iova); +} +void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl) {
@@ -223,6 +242,34 @@ void smmu_iotlb_inv_iova(SMMUState *s, int asid, int vmid, dma_addr_t iova, &info); } +/* +* Similar to smmu_iotlb_inv_iova(), but for Stage-2, ASID is always -1, +* in Stage-1 invalidation ASID = -1, means don't care. +*/ +void smmu_iotlb_inv_ipa (SMMUState *s,int vmid,dma_addr_t ipa,uint8_t tg, +uint64_t num_pages,uint8_t ttl) +{ +uint8_t granule = tg ? tg *2 +10 :12 ; +int asid =-1 ; + +if (ttl && (num_pages ==1 )) { +SMMUIOTLBKey key =smmu_get_iotlb_key (asid, vmid, ipa, tg, ttl); + +if (g_hash_table_remove (s->iotlb, &key)) { +return ; + } + } + +SMMUIOTLBPageInvInfo info = { + .iova = ipa, + .vmid = vmid, + .mask = (num_pages *1 << granule) -1 }; + +g_hash_table_foreach_remove (s->iotlb, + smmu_hash_remove_by_vmid_ipa, + &info); +} +void smmu_iotlb_inv_asid (SMMUState *s,int asid) {trace_smmu_iotlb_inv_asid (asid);
hw/arm/smmuv3.c +16 -7
@@ -1136,7 +1136,7 @@ static void smmuv3_inv_notifiers_iova(SMMUState *s, int asid, int vmid, } } -static void smmuv3_range_inval (SMMUState *s,Cmd *cmd) +static void smmuv3_range_inval (SMMUState *s,Cmd *cmd,SMMUStage stage) {dma_addr_t end, addr =CMD_ADDR (cmd);uint8_t type =CMD_TYPE (cmd);
@@ -1161,9 +1161,13 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd) }if (!tg) { -trace_smmuv3_range_inval (vmid, asid, addr, tg,1 , ttl, leaf); +trace_smmuv3_range_inval (vmid, asid, addr, tg,1 , ttl, leaf, stage);smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg,1 ); -smmu_iotlb_inv_iova (s, asid, vmid, addr, tg,1 , ttl); +if (stage ==SMMU_STAGE_1 ) { +smmu_iotlb_inv_iova (s, asid, vmid, addr, tg,1 , ttl); + }else { +smmu_iotlb_inv_ipa (s, vmid, addr, tg,1 , ttl); + }return ; }
@@ -1179,9 +1183,14 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd)uint64_t mask =dma_aligned_pow2_mask (addr, end,64 ); num_pages = (mask +1 ) >> granule; -trace_smmuv3_range_inval (vmid, asid, addr, tg, num_pages, ttl, leaf); +trace_smmuv3_range_inval (vmid, asid, addr, tg, num_pages, + ttl, leaf, stage);smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg, num_pages); -smmu_iotlb_inv_iova (s, asid, vmid, addr, tg, num_pages, ttl); +if (stage ==SMMU_STAGE_1 ) { +smmu_iotlb_inv_iova (s, asid, vmid, addr, tg, num_pages, ttl); + }else { +smmu_iotlb_inv_ipa (s, vmid, addr, tg, num_pages, ttl); + } addr += mask +1 ; } }
@@ -1340,7 +1349,7 @@ static int smmuv3_cmdq_consume(SMMUv3State *s) cmd_error =SMMU_CERROR_ILL ;break ; } -smmuv3_range_inval (bs, &cmd); +smmuv3_range_inval (bs, &cmd,SMMU_STAGE_1 );break ;case SMMU_CMD_TLBI_S12_VMALL : {
@@ -1365,7 +1374,7 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)* As currently only either s1 or s2 are supported * we can reuse same function for s2. */ -smmuv3_range_inval (bs, &cmd); +smmuv3_range_inval (bs, &cmd,SMMU_STAGE_2 );break ;case SMMU_CMD_TLBI_EL3_ALL :case SMMU_CMD_TLBI_EL3_VA :
hw/arm/trace-events +1 -1
@@ -46,7 +46,7 @@ smmuv3_cmdq_cfgi_ste_range(int start, int end) "start=0x%x - end=0x%x" smmuv3_cmdq_cfgi_cd(uint32_t sid) "sid=0x%x" smmuv3_config_cache_hit(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache HIT for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" smmuv3_config_cache_miss(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache MISS for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" -smmuv3_range_inval(int vmid, int asid, uint64_t addr, uint8_t tg, uint64_t num_pages, uint8_t ttl, bool leaf) "vmid=%d asid=%d addr=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" ttl=%d leaf=%d" +smmuv3_range_inval(int vmid, int asid, uint64_t addr, uint8_t tg, uint64_t num_pages, uint8_t ttl, bool leaf, int stage) "vmid=%d asid=%d addr=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" ttl=%d leaf=%d stage=%d" smmuv3_cmdq_tlbi_nh(void) "" smmuv3_cmdq_tlbi_nh_asid(int asid) "asid=%d" smmuv3_cmdq_tlbi_s12_vmid(int vmid) "vmid=%d"
include/hw/arm/smmu-common.h +2 -1
@@ -216,7 +216,8 @@ void smmu_iotlb_inv_asid(SMMUState *s, int asid);void smmu_iotlb_inv_vmid (SMMUState *s,int vmid);void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl); - +void smmu_iotlb_inv_ipa (SMMUState *s,int vmid,dma_addr_t ipa,uint8_t tg, +uint64_t num_pages,uint8_t ttl);/* Unmap the range of all the notifiers registered to any IOMMU mr */ void smmu_inv_notifiers_all (SMMUState *s);
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 13/19 hw/arm/smmu: Introduce smmu_iotlb_inv_asid_vmid
In reply to Mostafa SalehSoon, Instead of doing TLB invalidation by ASID only, VMID will be also required.
Add smmu_iotlb_inv_asid_vmid() which invalidates by both ASID and VMID.
However, at the moment this function is only used in SMMU_CMD_TLBI_NH_ASID which is a stage-1 command, so passing VMID = -1 keeps the original behaviour.
--- hw/arm/smmu-common.c | 20 +++++++++++++------- hw/arm/smmuv3.c | 2 +- include/hw/arm/smmu-common.h | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-)
hw/arm/smmu-common.c +13 -7
@@ -159,13 +159,14 @@ void smmu_iotlb_inv_all(SMMUState *s)g_hash_table_remove_all (s->iotlb); } -static gboolean smmu_hash_remove_by_asid (gpointer key,gpointer value, -gpointer user_data) +static gboolean smmu_hash_remove_by_asid_vmid (gpointer key,gpointer value, +gpointer user_data) { -int asid = *(int *)user_data; +SMMUIOTLBPageInvInfo *info = (SMMUIOTLBPageInvInfo *)user_data;SMMUIOTLBKey *iotlb_key = (SMMUIOTLBKey *)key; -return SMMU_IOTLB_ASID (*iotlb_key) == asid; +return (SMMU_IOTLB_ASID (*iotlb_key) == info->asid) && + (SMMU_IOTLB_VMID (*iotlb_key) == info->vmid); } static gboolean smmu_hash_remove_by_vmid(gpointer key, gpointer value,
@@ -270,10 +271,15 @@ void smmu_iotlb_inv_ipa(SMMUState *s, int vmid, dma_addr_t ipa, uint8_t tg, &info); } -void smmu_iotlb_inv_asid (SMMUState *s,int asid) +void smmu_iotlb_inv_asid_vmid (SMMUState *s,int asid,int vmid) { -trace_smmu_iotlb_inv_asid (asid); -g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_asid, &asid); +SMMUIOTLBPageInvInfo info = { + .asid = asid, + .vmid = vmid, + }; + +trace_smmu_iotlb_inv_asid_vmid (asid, vmid); +g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_asid_vmid, &info); }void smmu_iotlb_inv_vmid (SMMUState *s,int vmid)
hw/arm/smmuv3.c +1 -1
@@ -1329,7 +1329,7 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)trace_smmuv3_cmdq_tlbi_nh_asid (asid);smmu_inv_notifiers_all (&s->smmu_state); -smmu_iotlb_inv_asid (bs, asid); +smmu_iotlb_inv_asid_vmid (bs, asid,-1 );break ; }case SMMU_CMD_TLBI_NH_ALL :
include/hw/arm/smmu-common.h +1 -1
@@ -212,7 +212,7 @@ void smmu_iotlb_insert(SMMUState *bs, SMMUTransCfg *cfg, SMMUTLBEntry *entry);SMMUIOTLBKey smmu_get_iotlb_key (int asid,int vmid,uint64_t iova,uint8_t tg,uint8_t level);void smmu_iotlb_inv_all (SMMUState *s); -void smmu_iotlb_inv_asid (SMMUState *s,int asid); +void smmu_iotlb_inv_asid_vmid (SMMUState *s,int asid,int vmid);void smmu_iotlb_inv_vmid (SMMUState *s,int vmid);void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl);
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 14/19 hw/arm/smmu: Support nesting in the rest of commands
In reply to Mostafa SalehSome commands need rework for nesting, as they used to assume S1 and S2 are mutually exclusive:
- CMD_TLBI_NH_ASID: Consider VMID if stage-2 is supported
- CMD_TLBI_NH_ALL: Consider VMID if stage-2 is supported, otherwise invalidate everything, this required a new vmid invalidation function for stage-1 only (ASID >= 0)
Also, rework trace events to reflect the new implementation.
--- hw/arm/smmu-common.c | 16 ++++++++++++++++ hw/arm/smmuv3.c | 28 ++++++++++++++++++++++++++-- hw/arm/trace-events | 6 ++++-- include/hw/arm/smmu-common.h | 1 + 4 files changed, 47 insertions(+), 4 deletions(-)
hw/arm/smmu-common.c +16 -0
@@ -178,6 +178,16 @@ static gboolean smmu_hash_remove_by_vmid(gpointer key, gpointer value,return SMMU_IOTLB_VMID (*iotlb_key) == vmid; } +static gboolean smmu_hash_remove_by_vmid_s1 (gpointer key,gpointer value, +gpointer user_data) +{ +int vmid = *(int *)user_data; +SMMUIOTLBKey *iotlb_key = (SMMUIOTLBKey *)key; + +return (SMMU_IOTLB_VMID (*iotlb_key) == vmid) && + (SMMU_IOTLB_ASID (*iotlb_key) >=0 ); +} +static gboolean smmu_hash_remove_by_asid_vmid_iova (gpointer key,gpointer value,gpointer user_data) {
@@ -288,6 +298,12 @@ void smmu_iotlb_inv_vmid(SMMUState *s, int vmid)g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_vmid, &vmid); } +inline void smmu_iotlb_inv_vmid_s1 (SMMUState *s,int vmid) +{ +trace_smmu_iotlb_inv_vmid_s1 (vmid); +g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_vmid_s1, &vmid); +} +/* VMSAv8-64 Translation */ /**
hw/arm/smmuv3.c +26 -2
@@ -1321,25 +1321,49 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)case SMMU_CMD_TLBI_NH_ASID : {int asid =CMD_ASID (&cmd); +int vmid =-1 ;if (!STAGE1_SUPPORTED (s)) { cmd_error =SMMU_CERROR_ILL ;break ; } +/* +* VMID is only matched when stage 2 is supported, otherwise set it +* to -1 as the value used for stage-1 only VMIDs. +*/ +if (STAGE2_SUPPORTED (s)) { + vmid =CMD_VMID (&cmd); + } +trace_smmuv3_cmdq_tlbi_nh_asid (asid);smmu_inv_notifiers_all (&s->smmu_state); -smmu_iotlb_inv_asid_vmid (bs, asid,-1 ); +smmu_iotlb_inv_asid_vmid (bs, asid, vmid);break ; }case SMMU_CMD_TLBI_NH_ALL : + { +int vmid =-1 ; +if (!STAGE1_SUPPORTED (s)) { cmd_error =SMMU_CERROR_ILL ;break ; } + +/* +* If stage-2 is supported, invalidate for this VMID only, otherwise +* invalidate the whole thing. +*/ +if (STAGE2_SUPPORTED (s)) { + vmid =CMD_VMID (&cmd); +trace_smmuv3_cmdq_tlbi_nh (vmid); +smmu_iotlb_inv_vmid_s1 (bs, vmid); +break ; + }QEMU_FALLTHROUGH ; + }case SMMU_CMD_TLBI_NSNH_ALL : -trace_smmuv3_cmdq_tlbi_nh (); +trace_smmuv3_cmdq_tlbi_nsnh ();smmu_inv_notifiers_all (&s->smmu_state);smmu_iotlb_inv_all (bs);break ;
hw/arm/trace-events +4 -2
@@ -11,8 +11,9 @@ smmu_ptw_page_pte(int stage, int level, uint64_t iova, uint64_t baseaddr, uint6 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 smmu_iotlb_inv_all(void) "IOTLB invalidate all" -smmu_iotlb_inv_asid(int asid) "IOTLB invalidate asid=%d" +smmu_iotlb_inv_asid_vmid(int asid, int vmid) "IOTLB invalidate asid=%d vmid=%d" smmu_iotlb_inv_vmid(int vmid) "IOTLB invalidate vmid=%d" +smmu_iotlb_inv_vmid_s1(int vmid) "IOTLB invalidate vmid=%d" smmu_iotlb_inv_iova(int asid, uint64_t addr) "IOTLB invalidate asid=%d addr=0x%"PRIx64 smmu_inv_notifiers_mr(const char *name) "iommu mr=%s" smmu_iotlb_lookup_hit(int asid, int vmid, uint64_t addr, uint32_t hit, uint32_t miss, uint32_t p) "IOTLB cache HIT asid=%d vmid=%d addr=0x%"PRIx64" hit=%d miss=%d hit rate=%d"
@@ -47,7 +48,8 @@ smmuv3_cmdq_cfgi_cd(uint32_t sid) "sid=0x%x" smmuv3_config_cache_hit(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache HIT for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" smmuv3_config_cache_miss(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache MISS for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" smmuv3_range_inval(int vmid, int asid, uint64_t addr, uint8_t tg, uint64_t num_pages, uint8_t ttl, bool leaf, int stage) "vmid=%d asid=%d addr=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" ttl=%d leaf=%d stage=%d" -smmuv3_cmdq_tlbi_nh(void) "" +smmuv3_cmdq_tlbi_nh(int vmid) "vmid=%d" +smmuv3_cmdq_tlbi_nsnh(void) "" smmuv3_cmdq_tlbi_nh_asid(int asid) "asid=%d" smmuv3_cmdq_tlbi_s12_vmid(int vmid) "vmid=%d" smmuv3_config_cache_inv(uint32_t sid) "Config cache INV for sid=0x%x"
include/hw/arm/smmu-common.h +1 -0
@@ -214,6 +214,7 @@ SMMUIOTLBKey smmu_get_iotlb_key(int asid, int vmid, uint64_t iova,void smmu_iotlb_inv_all (SMMUState *s);void smmu_iotlb_inv_asid_vmid (SMMUState *s,int asid,int vmid);void smmu_iotlb_inv_vmid (SMMUState *s,int vmid); +void smmu_iotlb_inv_vmid_s1 (SMMUState *s,int vmid);void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl); void smmu_iotlb_inv_ipa(SMMUState *s, int vmid, dma_addr_t ipa, uint8_t tg,
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 15/19 hw/arm/smmuv3: Support nested SMMUs in smmuv3_notify_iova()
In reply to Mostafa SalehIOMMUTLBEvent only understands IOVA, for stage-1 or stage-2 SMMU instances we consider the input address as the IOVA, but when nesting is used, we can't mix stage-1 and stage-2 addresses, so for nesting only stage-1 is considered the IOVA and would be notified.
--- hw/arm/smmuv3.c | 28 +++++++++++++++++++--------- hw/arm/trace-events | 2 +- 2 files changed, 20 insertions(+), 10 deletions(-)
hw/arm/smmuv3.c +19 -9
@@ -1064,17 +1064,17 @@ epilogue:* @iova: iova * @tg: translation granule (if communicated through range invalidation) * @num_pages: number of @granule sized pages (if tg != 0), otherwise 1 +* @stage: Which stage(1 or 2) is used */ static void smmuv3_notify_iova (IOMMUMemoryRegion *mr,IOMMUNotifier *n,int asid,int vmid,dma_addr_t iova,uint8_t tg, -uint64_t num_pages) +uint64_t num_pages,int stage) {SMMUDevice *sdev =container_of (mr, SMMUDevice, iommu);IOMMUTLBEvent event;uint8_t granule; -SMMUv3State *s = sdev->smmu;if (!tg) {SMMUEventInfo eventinfo = {.inval_ste_allowed = true};
@@ -1093,14 +1093,24 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,return ; } -if (STAGE1_SUPPORTED (s)) { +/* +* stage is passed from TLB invalidation commands which can be either +* stage-1 or stage-2. +* However, IOMMUTLBEvent only understands IOVA, for stage-1 or stage-2 +* SMMU instances we consider the input address as the IOVA, but when +* nesting is used, we can't mix stage-1 and stage-2 addresses, so for +* nesting only stage-1 is considered the IOVA and would be notified. +*/ +if (stage ==SMMU_STAGE_1 ) { tt =select_tt (cfg, iova);if (!tt) {return ; } granule = tt->granule_sz; - }else { + }else if ((stage ==SMMU_STAGE_2 ) && (cfg->stage !=SMMU_NESTED )) { granule = cfg->s2cfg.granule_sz; + }else { +return ; } }else {
@@ -1119,7 +1129,7 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,/* invalidate an asid/vmid/iova range tuple in all mr's */ static void smmuv3_inv_notifiers_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg, -uint64_t num_pages) +uint64_t num_pages,int stage) {SMMUDevice *sdev;
@@ -1128,10 +1138,10 @@ static void smmuv3_inv_notifiers_iova(SMMUState *s, int asid, int vmid,IOMMUNotifier *n;trace_smmuv3_inv_notifiers_iova (mr->parent_obj.name, asid, vmid, - iova, tg, num_pages); + iova, tg, num_pages, stage); IOMMU_NOTIFIER_FOREACH(n, mr) { -smmuv3_notify_iova (mr, n, asid, vmid, iova, tg, num_pages); +smmuv3_notify_iova (mr, n, asid, vmid, iova, tg, num_pages, stage); } } }
@@ -1162,7 +1172,7 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd, SMMUStage stage)if (!tg) {trace_smmuv3_range_inval (vmid, asid, addr, tg,1 , ttl, leaf, stage); -smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg,1 ); +smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg,1 , stage);if (stage ==SMMU_STAGE_1 ) {smmu_iotlb_inv_iova (s, asid, vmid, addr, tg,1 , ttl); }else {
@@ -1185,7 +1195,7 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd, SMMUStage stage) num_pages = (mask +1 ) >> granule;trace_smmuv3_range_inval (vmid, asid, addr, tg, num_pages, ttl, leaf, stage); -smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg, num_pages); +smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg, num_pages, stage);if (stage ==SMMU_STAGE_1 ) {smmu_iotlb_inv_iova (s, asid, vmid, addr, tg, num_pages, ttl); }else {
hw/arm/trace-events +1 -1
@@ -55,7 +55,7 @@ smmuv3_cmdq_tlbi_s12_vmid(int vmid) "vmid=%d" smmuv3_config_cache_inv(uint32_t sid) "Config cache INV for sid=0x%x" smmuv3_notify_flag_add(const char *iommu) "ADD SMMUNotifier node for iommu mr=%s" smmuv3_notify_flag_del(const char *iommu) "DEL SMMUNotifier node for iommu mr=%s" -smmuv3_inv_notifiers_iova(const char *name, int asid, int vmid, uint64_t iova, uint8_t tg, uint64_t num_pages) "iommu mr=%s asid=%d vmid=%d iova=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64 +smmuv3_inv_notifiers_iova(const char *name, int asid, int vmid, uint64_t iova, uint8_t tg, uint64_t num_pages, int stage) "iommu mr=%s asid=%d vmid=%d iova=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" stage=%d" # strongarm.c strongarm_uart_update_parameters(const char *label, int speed, char parity, int data_bits, int stop_bits) "%s speed=%d parity=%c data=%d stop=%d"
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 16/19 hw/arm/smmuv3: Handle translation faults according to SMMUPTWEventInfo
In reply to Mostafa SalehPreviously, to check if faults are enabled, it was sufficient to check the current stage of translation and check the corresponding record_faults flag.
However, with nesting, it is possible for stage-1 (nested) translation to trigger a stage-2 fault, so we check SMMUPTWEventInfo as it would have the correct stage set from the page table walk.
--- hw/arm/smmuv3.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
hw/arm/smmuv3.c +8 -7
@@ -34,9 +34,10 @@#include "smmuv3-internal.h" #include "smmu-internal.h" -#define PTW_RECORD_FAULT (cfg) (((cfg)->stage == SMMU_STAGE_1) ? \ - (cfg)->record_faults : \ - (cfg)->s2cfg.record_faults) +#define PTW_RECORD_FAULT (ptw_info, cfg) (((ptw_info).stage == SMMU_STAGE_1 && \ + (cfg)->record_faults) || \ + ((ptw_info).stage == SMMU_STAGE_2 && \ + (cfg)->s2cfg.record_faults))/** * smmuv3_trigger_irq - pulse @irq if enabled and update
@@ -919,7 +920,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->u.f_walk_eabt.addr2 = ptw_info.addr;break ;case SMMU_PTW_ERR_TRANSLATION : -if (PTW_RECORD_FAULT (cfg)) { +if (PTW_RECORD_FAULT (ptw_info, cfg)) { event->type =SMMU_EVT_F_TRANSLATION ; event->u.f_translation.addr = addr; event->u.f_translation.addr2 = ptw_info.addr;
@@ -928,7 +929,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, }break ;case SMMU_PTW_ERR_ADDR_SIZE : -if (PTW_RECORD_FAULT (cfg)) { +if (PTW_RECORD_FAULT (ptw_info, cfg)) { event->type =SMMU_EVT_F_ADDR_SIZE ; event->u.f_addr_size.addr = addr; event->u.f_addr_size.addr2 = ptw_info.addr;
@@ -937,7 +938,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, }break ;case SMMU_PTW_ERR_ACCESS : -if (PTW_RECORD_FAULT (cfg)) { +if (PTW_RECORD_FAULT (ptw_info, cfg)) { event->type =SMMU_EVT_F_ACCESS ; event->u.f_access.addr = addr; event->u.f_access.addr2 = ptw_info.addr;
@@ -946,7 +947,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, }break ;case SMMU_PTW_ERR_PERMISSION : -if (PTW_RECORD_FAULT (cfg)) { +if (PTW_RECORD_FAULT (ptw_info, cfg)) { event->type =SMMU_EVT_F_PERMISSION ; event->u.f_permission.addr = addr; event->u.f_permission.addr2 = ptw_info.addr;
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 17/19 hw/arm/smmuv3: Support and advertise nesting
In reply to Mostafa SalehEverything is in place, consolidate parsing of STE cfg and setting translation stage.
Advertise nesting if stage requested is "nested".
--- hw/arm/smmuv3.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-)
hw/arm/smmuv3.c +26 -9
@@ -261,6 +261,9 @@ static void smmuv3_init_regs(SMMUv3State *s)/* Based on sys property, the stages supported in smmu will be advertised.*/ if (s->stage && !strcmp ("2" , s->stage)) { s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S2P ,1 ); + }else if (s->stage && !strcmp ("nested" , s->stage)) { + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S1P ,1 ); + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S2P ,1 ); }else { s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S1P ,1 ); }
@@ -425,8 +428,6 @@ static bool s2_pgtable_config_valid(uint8_t sl0, uint8_t t0sz, uint8_t gran)static int decode_ste_s2_cfg (SMMUTransCfg *cfg,STE *ste) { - cfg->stage =SMMU_STAGE_2 ; -if (STE_S2AA64 (ste) ==0x0 ) {qemu_log_mask (LOG_UNIMP ,"SMMUv3 AArch32 tables not supported\n" );
@@ -509,6 +510,27 @@ bad_ste:return -EINVAL ; } +static void decode_ste_config (SMMUTransCfg *cfg,uint32_t config) +{ + +if (STE_CFG_ABORT (config)) { + cfg->aborted = true; +return ; + } +if (STE_CFG_BYPASS (config)) { + cfg->bypassed = true; +return ; + } + +if (STE_CFG_S1_ENABLED (config)) { + cfg->stage =SMMU_STAGE_1 ; + } + +if (STE_CFG_S2_ENABLED (config)) { + cfg->stage |=SMMU_STAGE_2 ; + } +} +/* Returns < 0 in case of invalid STE, 0 otherwise */ static int decode_ste (SMMUv3State *s,SMMUTransCfg *cfg,STE *ste,SMMUEventInfo *event)
@@ -525,13 +547,9 @@ static int decode_ste(SMMUv3State *s, SMMUTransCfg *cfg, config =STE_CONFIG (ste); -if (STE_CFG_ABORT (config)) { - cfg->aborted = true; -return 0 ; - } +decode_ste_config (cfg, config); -if (STE_CFG_BYPASS (config)) { - cfg->bypassed = true; +if (cfg->aborted || cfg->bypassed) {return 0 ; }
@@ -704,7 +722,6 @@ static int decode_cd(SMMUv3State *s, SMMUTransCfg *cfg,/* we support only those at the moment */ cfg->aa64 = true; - cfg->stage =SMMU_STAGE_1 ; cfg->oas =oas2bits (CD_IPS (cd)); cfg->oas =MIN (oas2bits (SMMU_IDR5_OAS ), cfg->oas);
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 18/19 hw/arm/smmuv3: Advertise S2FWB
In reply to Mostafa SalehQEMU doesn's support memory attributes, so FWB is NOP, this might change in the future if memory attributre would be supported.
--- hw/arm/smmuv3.c | 8 ++++++++ 1 file changed, 8 insertions(+)
hw/arm/smmuv3.c +8 -0
@@ -287,6 +287,14 @@ static void smmuv3_init_regs(SMMUv3State *s)if (FIELD_EX32 (s->idr[0 ],IDR0 ,S2P )) {/* XNX is a stage-2-specific feature */ s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,XNX ,1 ); +if (FIELD_EX32 (s->idr[0 ],IDR0 ,S1P )) { +/* +* QEMU doesn's support memory attributes, so FWB is NOP, this +* might change in the future if memory attributre would be +* supported. +*/ + s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,FWB ,1 ); + } } s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,RIL ,1 ); s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,BBML ,2 );
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
PATCH v4 19/19 hw/arm/smmu: Refactor SMMU OAS
In reply to Mostafa SalehSMMUv3 OAS is currently hardcoded in the code to 44 bits, for nested configurations that can be a problem, as stage-2 might be shared with the CPU which might have different PARANGE, and according to SMMU manual ARM IHI 0070F.b:
6.3.6 SMMU_IDR5, OAS must match the system physical address size.
This patch doesn't change the SMMU OAS, but refactors the code to make it easier to do that:
- Rely everywhere on IDR5 for reading OAS instead of using the SMMU_IDR5_OAS macro, so, it is easier just to change IDR5 and it propagages correctly.
- Add additional checks when OAS is greater than 48bits.
- Remove unused functions/macros: pa_range/MAX_PA.
--- hw/arm/smmu-common.c | 7 ++++--- hw/arm/smmuv3-internal.h | 13 ------------- hw/arm/smmuv3.c | 35 ++++++++++++++++++++++++++++------- 3 files changed, 32 insertions(+), 23 deletions(-)
hw/arm/smmu-common.c +4 -3
@@ -452,7 +452,8 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, inputsize =64 - tt->tsz; level =4 - (inputsize -4 ) / stride; indexmask =VMSA_IDXMSK (inputsize, stride, level); - baseaddr =extract64 (tt->ttb,0 ,48 ); + + baseaddr =extract64 (tt->ttb,0 , cfg->oas); baseaddr &= ~indexmask;while (level <VMSA_LEVELS ) {
@@ -576,8 +577,8 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg,* Get the ttb from concatenated structure. * The offset is the idx * size of each ttb(number of ptes * (sizeof(pte)) */ -uint64_t baseaddr =extract64 (cfg->s2cfg.vttb,0 ,48 ) + (1 << stride) * - idx *sizeof (uint64_t ); +uint64_t baseaddr =extract64 (cfg->s2cfg.vttb,0 , cfg->s2cfg.eff_ps) + + (1 << stride) * idx *sizeof (uint64_t );dma_addr_t indexmask =VMSA_IDXMSK (inputsize, stride, level); baseaddr &= ~indexmask;
hw/arm/smmuv3-internal.h +0 -13
@@ -602,19 +602,6 @@ static inline int oas2bits(int oas_field)return -1 ; } -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], 31, 1)
hw/arm/smmuv3.c +28 -7
@@ -410,10 +410,10 @@ static bool s2t0sz_valid(SMMUTransCfg *cfg) }if (cfg->s2cfg.granule_sz ==16 ) { -return (cfg->s2cfg.tsz >=64 -oas2bits (SMMU_IDR5_OAS )); +return (cfg->s2cfg.tsz >=64 - cfg->s2cfg.eff_ps); } -return (cfg->s2cfg.tsz >=MAX (64 -oas2bits (SMMU_IDR5_OAS ),16 )); +return (cfg->s2cfg.tsz >=MAX (64 - cfg->s2cfg.eff_ps,16 )); }/*
@@ -434,8 +434,11 @@ static bool s2_pgtable_config_valid(uint8_t sl0, uint8_t t0sz, uint8_t gran)return nr_concat <=VMSA_MAX_S2_CONCAT ; } -static int decode_ste_s2_cfg (SMMUTransCfg *cfg,STE *ste) +static int decode_ste_s2_cfg (SMMUv3State *s,SMMUTransCfg *cfg, +STE *ste) { +uint8_t oas =FIELD_EX32 (s->idr[5 ],IDR5 ,OAS ); +if (STE_S2AA64 (ste) ==0x0 ) {qemu_log_mask (LOG_UNIMP ,"SMMUv3 AArch32 tables not supported\n" );
@@ -468,7 +471,15 @@ static int decode_ste_s2_cfg(SMMUTransCfg *cfg, STE *ste) }/* For AA64, The effective S2PS size is capped to the OAS. */ - cfg->s2cfg.eff_ps =oas2bits (MIN (STE_S2PS (ste),SMMU_IDR5_OAS )); + cfg->s2cfg.eff_ps =oas2bits (MIN (STE_S2PS (ste), oas)); +/* +* For SMMUv3.1 and later, when OAS == IAS == 52, the stage 2 input +* range is further limited to 48 bits unless STE.S2TG indicates a +* 64KB granule. +*/ +if (cfg->s2cfg.granule_sz !=16 ) { + cfg->s2cfg.eff_ps =MIN (cfg->s2cfg.eff_ps,48 ); + }/* * It is ILLEGAL for the address in S2TTB to be outside the range * described by the effective S2PS value.
@@ -544,6 +555,7 @@ static int decode_ste(SMMUv3State *s, SMMUTransCfg *cfg, STE *ste, SMMUEventInfo *event) {uint32_t config; +uint8_t oas =FIELD_EX32 (s->idr[5 ],IDR5 ,OAS );int ret;if (!STE_VALID (ste)) {
@@ -587,8 +599,8 @@ static int decode_ste(SMMUv3State *s, SMMUTransCfg *cfg,* Stage-1 OAS defaults to OAS even if not enabled as it would be used * in input address check for stage-2. */ - cfg->oas =oas2bits (SMMU_IDR5_OAS ); - ret =decode_ste_s2_cfg (cfg, ste); + cfg->oas =oas2bits (oas); + ret =decode_ste_s2_cfg (s, cfg, ste);if (ret) { goto bad_ste; }
@@ -714,6 +726,7 @@ static int decode_cd(SMMUv3State *s, SMMUTransCfg *cfg,int i;SMMUTranslationStatus status;SMMUTLBEntry *entry; +uint8_t oas =FIELD_EX32 (s->idr[5 ],IDR5 ,OAS );if (!CD_VALID (cd) || !CD_AARCH64 (cd)) { goto bad_cd;
@@ -732,7 +745,7 @@ static int decode_cd(SMMUv3State *s, SMMUTransCfg *cfg, cfg->aa64 = true; cfg->oas =oas2bits (CD_IPS (cd)); - cfg->oas =MIN (oas2bits (SMMU_IDR5_OAS ), cfg->oas); + cfg->oas =MIN (oas2bits (oas), cfg->oas); cfg->tbi =CD_TBI (cd); cfg->asid =CD_ASID (cd); cfg->affd =CD_AFFD (cd);
@@ -761,6 +774,14 @@ static int decode_cd(SMMUv3State *s, SMMUTransCfg *cfg, goto bad_cd; } +/* +* An address greater than 48 bits in size can only be output from a +* TTD when, in SMMUv3.1 and later, the effective IPS is 52 and a 64KB +* granule is in use for that translation table +*/ +if (tt->granule_sz !=16 ) { + cfg->oas =MIN (cfg->oas,48 ); + } tt->tsz = tsz; tt->ttb =CD_TTB (cd, i);
Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 01/19] hw/arm/smmu-common: Add missing size check for stage-1
In reply to Mostafa SalehQuoted 11 lines · Mostafa Saleh
According to the SMMU architecture specification (ARM IHI 0070 F.b), in “3.4 Address sizes”
The address output from the translation causes a stage 1 Address Size fault if it exceeds the range of the effective IPA size for the given CD.However, this check was missing.
There is already a similar check for stage-2 against effective PA.
Reviewed-by Eric Auger <[email protected]>Signed-off-by Mostafa Saleh <[email protected]>
Quoted 28 lines
--- hw/arm/smmu-common.c | 10 ++++++++++ 1 file changed, 10 insertions(+)hw/arm/smmu-common.c +10
-0@@ -381,6 +381,16 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, goto error; } +/* +* The address output from the translation causes a stage 1 Address +* Size fault if it exceeds the range of the effective IPA size for +* the given CD. +*/ +if (gpa >= (1ULL << cfg->oas)) { + info->type =SMMU_PTW_ERR_ADDR_SIZE ; + goto error; + } + tlbe->entry.translated_addr = gpa; tlbe->entry.iova = iova & ~mask; tlbe->entry.addr_mask = mask;Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 02/19] hw/arm/smmu: Fix IPA for stage-2 events
In reply to Mostafa SalehQuoted 26 lines · Mostafa Saleh
For the following events (ARM IHI 0070 F.b - 7.3 Event records):
-F_TRANSLATION
-F_ACCESS
-F_PERMISSION
-F_ADDR_SIZEIf fault occurs at stage 2, S2 == 1 and:
- If translating an IPA for a transaction (whether by input to stage 2-only configuration, or after successful stage 1 translation), CLASS == IN, and IPA is provided.At the moment only CLASS == IN is used which indicates input translation.
However, this was not implemented correctly, as for stage 2, the code only sets the S2 bit but not the IPA.
This field has the same bits as FetchAddr in
F_WALK_EABTwhich is populated correctly, so we don’t change that.
The setting of this field should be done from the walker as the IPA address wouldn't be known in case of nesting.For stage 1, the spec says:
If fault occurs at stage 1, S2 == 0 and:
CLASS == IN, IPA is UNKNOWN.
Quoted 6 lines
So, no need to set it to for stage 1, as
ptw_infois initialised by zero insmmuv3_translate().Fixes e703f7076a “hw/arm/smmuv3: Add page table walk for stage-2”Reviewed-by Eric Auger <[email protected]>Signed-off-by Mostafa Saleh <[email protected]>
Quoted 91 lines
--- hw/arm/smmu-common.c | 10 ++++++---- hw/arm/smmuv3.c | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-)hw/arm/smmu-common.c +6
-4@@ -448,7 +448,7 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg,*/ if (ipa >= (1ULL << inputsize)) { info->type =SMMU_PTW_ERR_TRANSLATION ; - goto error; + goto error_ipa; }while (level <VMSA_LEVELS ) {@@ -494,13 +494,13 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg,*/ if (!PTE_AF (pte) && !cfg->s2cfg.affd) { info->type =SMMU_PTW_ERR_ACCESS ; - goto error; + goto error_ipa; } s2ap =PTE_AP (pte);if (is_permission_fault_s2 (s2ap, perm)) { info->type =SMMU_PTW_ERR_PERMISSION ; - goto error; + goto error_ipa; }/* @@ -509,7 +509,7 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg,*/ if (gpa >= (1ULL << cfg->s2cfg.eff_ps)) { info->type =SMMU_PTW_ERR_ADDR_SIZE ; - goto error; + goto error_ipa; } tlbe->entry.translated_addr = gpa;@@ -522,6 +522,8 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg, } info->type =SMMU_PTW_ERR_TRANSLATION ; +error_ipa: + info->addr = ipa; error: info->stage =2 ; tlbe->entry.perm =IOMMU_NONE ;hw/arm/smmuv3.c +4
-0@@ -949,6 +949,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr,if (PTW_RECORD_FAULT (cfg)) { event.type =SMMU_EVT_F_TRANSLATION ; event.u.f_translation.addr = addr; + event.u.f_translation.addr2 = ptw_info.addr; event.u.f_translation.rnw = flag &0x1 ; }break ;@@ -956,6 +957,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr,if (PTW_RECORD_FAULT (cfg)) { event.type =SMMU_EVT_F_ADDR_SIZE ; event.u.f_addr_size.addr = addr; + event.u.f_addr_size.addr2 = ptw_info.addr; event.u.f_addr_size.rnw = flag &0x1 ; }break ;@@ -963,6 +965,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr,if (PTW_RECORD_FAULT (cfg)) { event.type =SMMU_EVT_F_ACCESS ; event.u.f_access.addr = addr; + event.u.f_access.addr2 = ptw_info.addr; event.u.f_access.rnw = flag &0x1 ; }break ;@@ -970,6 +973,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr,if (PTW_RECORD_FAULT (cfg)) { event.type =SMMU_EVT_F_PERMISSION ; event.u.f_permission.addr = addr; + event.u.f_permission.addr2 = ptw_info.addr; event.u.f_permission.rnw = flag &0x1 ; }break ;Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 03/19] hw/arm/smmuv3: Fix encoding of CLASS in events
In reply to Mostafa SalehQuoted 43 lines · Mostafa Saleh
The SMMUv3 spec (ARM IHI 0070 F.b - 7.3 Event records) defines the class of events faults as:
CLASS: The class of the operation that caused the fault:
- 0b00: CD, CD fetch.
- 0b01: TTD, Stage 1 translation table fetch.
- 0b10: IN, Input addressHowever, this value was not set and left as 0 which means CD and not IN (0b10).
While at it, add an enum for class as it would be used for nesting. However, at the moment stage-1 and stage-2 use the same class values.Fixes 9bde7f0674 “hw/arm/smmuv3: Implement translate callback”Reviewed-by Eric Auger <[email protected]>Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3-internal.h | 6 ++++++ hw/arm/smmuv3.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-)hw/arm/smmuv3-internal.h +6
-0@@ -32,6 +32,12 @@ typedef enum SMMUTranslationStatus {SMMU_TRANS_SUCCESS , } SMMUTranslationStatus; +typedef enum SMMUTranslationClass { +SMMU_CLASS_CD , +SMMU_CLASS_TT , +SMMU_CLASS_IN , +}SMMUTranslationClass ; +/* MMIO Registers */ REG32 (IDR0 ,0x0 )hw/arm/smmuv3.c +0
-0
hw/arm/smmuv3.c static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, · line 945
Quoted 5 lines
hw/arm/smmuv3.c +1
-1@@ -942,7 +942,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, 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.class =SMMU_CLASS_TT ;
For EABT I think we have to differentiate S1/S2:
* s1-only walk that encounters EABT on S1 descriptor access is reported as class=TT,
* s2 walk that encounters EABT on S2 descriptor while translating non-descriptor IPA is reported as class=IN, even when doing s2-only.
Maybe it can be done in the later patch where you propagate the different classes, because it's a minor detail.
Thanks,
Jean
Quoted 38 lines
hw/arm/smmuv3.c +4
-0event.u.f_walk_eabt.addr2 = ptw_info.addr;break ;case SMMU_PTW_ERR_TRANSLATION :@@ -950,6 +950,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, event.type =SMMU_EVT_F_TRANSLATION ; event.u.f_translation.addr = addr; event.u.f_translation.addr2 = ptw_info.addr; + event.u.f_translation.class =SMMU_CLASS_IN ; event.u.f_translation.rnw = flag &0x1 ; }break ;@@ -958,6 +959,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, event.type =SMMU_EVT_F_ADDR_SIZE ; event.u.f_addr_size.addr = addr; event.u.f_addr_size.addr2 = ptw_info.addr; + event.u.f_translation.class =SMMU_CLASS_IN ; event.u.f_addr_size.rnw = flag &0x1 ; }break ;@@ -966,6 +968,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, event.type =SMMU_EVT_F_ACCESS ; event.u.f_access.addr = addr; event.u.f_access.addr2 = ptw_info.addr; + event.u.f_translation.class =SMMU_CLASS_IN ; event.u.f_access.rnw = flag &0x1 ; }break ;@@ -974,6 +977,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, event.type =SMMU_EVT_F_PERMISSION ; event.u.f_permission.addr = addr; event.u.f_permission.addr2 = ptw_info.addr; + event.u.f_translation.class =SMMU_CLASS_IN ; event.u.f_permission.rnw = flag &0x1 ; }break ;Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 07/19] hw/arm/smmu: Introduce CACHED_ENTRY_TO_ADDR
In reply to Mostafa SalehQuoted 29 lines · Mostafa Saleh
Soon,
smmuv3_do_translate()will be used to translate the CD and the TTBx, instead of re-writting the same logic to convert the returned cached entry to an address, add a new macroCACHED_ENTRY_TO_ADDR.Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 3 +-- include/hw/arm/smmu-common.h | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-)hw/arm/smmuv3.c +1
-2@@ -950,8 +950,7 @@ epilogue:switch (status) {case SMMU_TRANS_SUCCESS : entry.perm = cached_entry->entry.perm; - entry.translated_addr = cached_entry->entry.translated_addr + - (addr & cached_entry->entry.addr_mask); + entry.translated_addr =CACHED_ENTRY_TO_ADDR (cached_entry, addr); entry.addr_mask = cached_entry->entry.addr_mask; trace_smmuv3_translate_success(mr->parent_obj.name, sid, addr, entry.translated_addr, entry.perm,include/hw/arm/smmu-common.h +0
-0
include/hw/arm/smmu-common.h line 41
Quoted 5 lines
include/hw/arm/smmu-common.h +2
-0@@ -37,6 +37,9 @@#define VMSA_IDXMSK (isz, strd, lvl) ((1ULL << \ VMSA_BIT_LVL(isz, strd, lvl)) - 1) +#define CACHED_ENTRY_TO_ADDR (ent, addr) (ent)->entry.translated_addr + \ + ((addr) & (ent)->entry.addr_mask);
nit: maybe wrap this in parenthesis to avoid future usage mistakes and drop the semicolon
Thanks,
Jean
Quoted 7 lines
include/hw/arm/smmu-common.h +1
-0+/* * Page table walk error types */ Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 08/19] hw/arm/smmuv3: Translate CD and TT using stage-2 table
In reply to Mostafa SalehQuoted 73 lines · Mostafa Saleh
According to ARM SMMU architecture specification (ARM IHI 0070 F.b), In "5.2 Stream Table Entry":
[51:6] S1ContextPtr
If Config[1] == 1 (stage 2 enabled), this pointer is an IPA translated by stage 2 and the programmed value must be within the range of the IAS.In "5.4.1 CD notes":
The translation table walks performed from TTB0 or TTB1 are always performed in IPA space if stage 2 translations are enabled.This patch implements translation of the S1 context descriptor pointer and TTBx base addresses through the S2 stage (IPA -> PA)
smmuv3_do_translate()is updated to have one arg which is translation class, this is useful to:
- Decide wether a translation is stage-2 only or use the STE config.
- Populate the class in case of faults,WALK_EABTis left unchanged, as it is always triggered from TT access so no need to use the input class.In case for stage-2 only translation, used in the context of nested translation, the stage and asid are saved and restored before and after calling
smmu_translate().Translating CD or TTBx can fail for the following reasons:
1) Large address size: This is described in
(3.4.3 Address sizes of SMMU-originated accesses)
- For CD ptr larger than IAS, for SMMUv3.1, it can trigger eitherC_BAD_STEor Translation fault, we implement the latter as it requires no extra code.
- For TTBx, if larger than the effective stage 1 output address size, it triggersC_BAD_CD.2) Faults from PTWs (7.3 Event records)
-F_ADDR_SIZE: large address size after first level causes stage 2 Address Size fault (Also in 3.4.3 Address sizes of SMMU-originated accesses)
-F_PERMISSION: Same as an address translation. However, whenCLASS == CD, the access is implicitly Data and a read.-
F_ACCESS: Same as an address translation.
-F_TRANSLATION: Same as an address translation.
-F_WALK_EABT: Same as an address translation.
These are already implemented in the PTW logic, so no extra handling required.Reviewed-by Eric Auger <[email protected]>Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 91 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 80 insertions(+), 11 deletions(-)hw/arm/smmuv3.c +9
-2@@ -337,14 +337,35 @@ static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf, } +static SMMUTranslationStatus smmuv3_do_translate (SMMUv3State *s,hwaddr addr, +SMMUTransCfg *cfg, +SMMUEventInfo *event, +IOMMUAccessFlags flag, +SMMUTLBEntry **out_entry, +SMMUTranslationClass class);/* @ssid > 0 not supported yet */ -static int smmu_get_cd (SMMUv3State *s,STE *ste,uint32_t ssid, -CD *buf,SMMUEventInfo *event) +static int smmu_get_cd (SMMUv3State *s,STE *ste,SMMUTransCfg *cfg, +uint32_t ssid,CD *buf,SMMUEventInfo *event) {dma_addr_t addr =STE_CTXPTR (ste);int ret, i; +SMMUTranslationStatus status;
hw/arm/smmuv3.c static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf, · line 362
Quoted 10 lines
hw/arm/smmuv3.c +8
-0+SMMUTLBEntry *entry;trace_smmuv3_get_cd (addr); + +if (cfg->stage ==SMMU_NESTED ) { + status =smmuv3_do_translate (s, addr, cfg, event, +IOMMU_RO , &entry,SMMU_CLASS_CD ); + +/* Same PTW faults are reported but with CLASS = CD. */ +if (status !=SMMU_TRANS_SUCCESS ) {
In this case I think we're reporting InputAddr as the CD address, but it should be the IOVA
Quoted 33 lines
hw/arm/smmuv3.c +12
-1+return -EINVAL ; + } + + addr =CACHED_ENTRY_TO_ADDR (entry, addr); + } +/* TODO: guarantee 64-bit single-copy atomicity */ ret =dma_memory_read (&address_space_memory, addr, buf,sizeof (*buf),MEMTXATTRS_UNSPECIFIED );@@ -659,10 +680,13 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste,return 0 ; } -static int decode_cd (SMMUTransCfg *cfg,CD *cd,SMMUEventInfo *event) +static int decode_cd (SMMUv3State *s,SMMUTransCfg *cfg, +CD *cd,SMMUEventInfo *event) {int ret = -EINVAL ;int i; +SMMUTranslationStatus status; +SMMUTLBEntry *entry;if (!CD_VALID (cd) || !CD_AARCH64 (cd)) { goto bad_cd;@@ -713,9 +737,26 @@ static int decode_cd(SMMUTransCfg *cfg, CD *cd, SMMUEventInfo *event) tt->tsz = tsz; tt->ttb =CD_TTB (cd, i); +if (tt->ttb & ~(MAKE_64BIT_MASK (0 , cfg->oas))) { goto bad_cd; } +
hw/arm/smmuv3.c static int decode_cd(SMMUTransCfg *cfg, CD *cd, SMMUEventInfo *event) · line 754
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+/* Translate the TTBx, from IPA to PA if nesting is enabled. */ +if (cfg->stage ==SMMU_NESTED ) { + status =smmuv3_do_translate (s, tt->ttb, cfg, event,IOMMU_RO , + &entry,SMMU_CLASS_TT ); +/* +* Same PTW faults are reported but with CLASS = TT. +* If TTBx is larger than the effective stage 1 output addres +* size, it reports C_BAD_CD, which is handled by the above case. +*/ +if (status !=SMMU_TRANS_SUCCESS ) {
Here too, we should report InputAddr as the IOVA
Quoted 29 lines
hw/arm/smmuv3.c +8
-3+return -EINVAL ; + } + tt->ttb =CACHED_ENTRY_TO_ADDR (entry, tt->ttb); + } + tt->had =CD_HAD (cd, i);trace_smmuv3_decode_cd_tt (i, tt->tsz, tt->ttb, tt->granule_sz, tt->had); }@@ -767,12 +808,12 @@ static int smmuv3_decode_config(IOMMUMemoryRegion *mr, SMMUTransCfg *cfg,return 0 ; } - ret =smmu_get_cd (s, &ste,0 /* ssid */ , &cd, event); + ret =smmu_get_cd (s, &ste, cfg,0 /* ssid */ , &cd, event);if (ret) {return ret; } -return decode_cd (cfg, &cd, event); +return decode_cd (s, cfg, &cd, event); }/** @@ -832,13 +873,40 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, SMMUTransCfg *cfg, SMMUEventInfo *event, IOMMUAccessFlags flag, - SMMUTLBEntry **out_entry) + SMMUTLBEntry **out_entry,
hw/arm/smmuv3.c static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, · line 886
Quoted 10 lines
hw/arm/smmuv3.c +6
-0+ SMMUTranslationClass class) {SMMUPTWEventInfo ptw_info = {};SMMUState *bs =ARM_SMMU (s);SMMUTLBEntry *cached_entry =NULL ; +int asid, stage; +bool S2_only = class !=SMMU_CLASS_IN ; + +/* +* The function uses the argument class to indentify which stage is used:
identify
hw/arm/smmuv3.c static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, · line 889
Quoted 3 lines
hw/arm/smmuv3.c +3
-0+* - CLASS = IN: Means an input translation, determine the stage from STE. +* - CLASS = CD: Means the addr is an IPA of the CD, and it would be +* tranlsated using the stage-2.
translated
hw/arm/smmuv3.c static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, · line 891
Quoted 2 lines
hw/arm/smmuv3.c +2
-0+* - CLASS = TT: Means the addr is an IPA of the stage-1 translation table +* and it would be tranlsated using the stage-2.
translated
hw/arm/smmuv3.c static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, · line 896
Quoted 5 lines
hw/arm/smmuv3.c +5
-0+* For the last 2 cases instead of having intrusive changes in the common +* logic, we modify the cfg to be a stage-2 translation only in case of +* nested, and then restore it after. +*/ +if (S2_only) {
"S2_only" seems a bit confusing because in the spec "stage 2-only" means absence of nesting, which is the opposite of what we're handling here. I don't have a good alternative though, maybe "desc_s2_translation"
Thanks,
Jean
Quoted 65 lines
hw/arm/smmuv3.c +17
-5+ asid = cfg->asid; + stage = cfg->stage; + cfg->asid =-1 ; + cfg->stage =SMMU_STAGE_2 ; + } cached_entry =smmu_translate (bs, cfg, addr, flag, &ptw_info); + +if (S2_only) { + cfg->asid = asid; + cfg->stage = stage; + } +if (!cached_entry) {/* All faults from PTW has S2 field. */ event->u.f_walk_eabt.s2 = (ptw_info.stage ==SMMU_STAGE_2 );@@ -855,7 +923,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_TRANSLATION ; event->u.f_translation.addr = addr; event->u.f_translation.addr2 = ptw_info.addr; - event->u.f_translation.class =SMMU_CLASS_IN ; + event->u.f_translation.class = class; event->u.f_translation.rnw = flag &0x1 ; }break ;@@ -864,7 +932,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_ADDR_SIZE ; event->u.f_addr_size.addr = addr; event->u.f_addr_size.addr2 = ptw_info.addr; - event->u.f_addr_size.class =SMMU_CLASS_IN ; + event->u.f_addr_size.class = class; event->u.f_addr_size.rnw = flag &0x1 ; }break ;@@ -873,7 +941,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_ACCESS ; event->u.f_access.addr = addr; event->u.f_access.addr2 = ptw_info.addr; - event->u.f_access.class =SMMU_CLASS_IN ; + event->u.f_access.class = class; event->u.f_access.rnw = flag &0x1 ; }break ;@@ -882,7 +950,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_PERMISSION ; event->u.f_permission.addr = addr; event->u.f_permission.addr2 = ptw_info.addr; - event->u.f_permission.class =SMMU_CLASS_IN ; + event->u.f_permission.class = class; event->u.f_permission.rnw = flag &0x1 ; }break ;@@ -943,7 +1011,8 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, goto epilogue; } - status =smmuv3_do_translate (s, addr, cfg, &event, flag, &cached_entry); + status =smmuv3_do_translate (s, addr, cfg, &event, flag, + &cached_entry,SMMU_CLASS_IN ); epilogue:qemu_mutex_unlock (&s->mutex);Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 09/19] hw/arm/smmu-common: Rework TLB lookup for nesting
In reply to Mostafa SalehQuoted 4 lines · Mostafa Saleh
In the next patch,
combine_tlb()will be added which combines 2 TLB entries into one for nested translations, which chooses the granule and level from the smallest entry.
Quoted 8 lines
This means that with nested translation, an entry can be cached with the granule of stage-2 and not stage-1.
However, currently, the lookup for an IOVA is done with input stage granule, which is stage-1 for nested configuration, which will not work with the above logic.
This patch reworks lookup in that case, so it falls back to stage-2 granule if no entry is found using stage-1 granule.
Why not initialize tt_combined to the minimum granule of stages 1 and 2? It looks like you introduced it for this. I'm wondering if we lookup the wrong IOVA if changing the granule size after the address is masked in smmu_translate()
Thanks,
Jean
Quoted 63 lines
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmu-common.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)hw/arm/smmu-common.c +34
-2@@ -66,8 +66,10 @@ SMMUIOTLBKey smmu_get_iotlb_key(int asid, int vmid, uint64_t iova,return key; } -SMMUTLBEntry *smmu_iotlb_lookup (SMMUState *bs,SMMUTransCfg *cfg, -SMMUTransTableInfo *tt,hwaddr iova) +static SMMUTLBEntry *smmu_iotlb_lookup_all_levels (SMMUState *bs, +SMMUTransCfg *cfg, +SMMUTransTableInfo *tt, +hwaddr iova) {uint8_t tg = (tt->granule_sz -10 ) /2 ;uint8_t inputsize =64 - tt->tsz;@@ -88,6 +90,36 @@ SMMUTLBEntry *smmu_iotlb_lookup(SMMUState *bs, SMMUTransCfg *cfg, } level++; } +return entry; +} + +/** +* smmu_iotlb_lookup - Look up for a TLB entry. +* @bs: SMMU state which includes the TLB instance +* @cfg: Configuration of the translation +* @tt: Translation table info (granule and tsz) +* @iova: IOVA address to lookup +* +* returns a valid entry on success, otherwise NULL. +* In case of nested translation, tt can be updated to include +* the granule of the found entry as it might different from +* the IOVA granule. +*/ +SMMUTLBEntry *smmu_iotlb_lookup (SMMUState *bs,SMMUTransCfg *cfg, +SMMUTransTableInfo *tt,hwaddr iova) +{ +SMMUTLBEntry *entry =NULL ; + + entry =smmu_iotlb_lookup_all_levels (bs, cfg, tt, iova); +/* +* For nested translation also try the s2 granule, as the TLB will insert +* it if the size of s2 tlb entry was smaller. +*/ +if (!entry && (cfg->stage ==SMMU_NESTED ) && + (cfg->s2cfg.granule_sz != tt->granule_sz)) { + tt->granule_sz = cfg->s2cfg.granule_sz; + entry =smmu_iotlb_lookup_all_levels (bs, cfg, tt, iova); + }if (entry) { cfg->iotlb_hits++;Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 10/19] hw/arm/smmu-common: Add support for nested TLB
In reply to Mostafa SalehQuoted 19 lines · Mostafa Saleh
This patch adds support for nested (combined) TLB entries. The main function
combine_tlb()is not used here but in the next patches, but to simplify the patches it is introduced first.Main changes:
1) New field added in the SMMUTLBEntry struct:parent_perm, for nested TLB, holds the stage-2 permission, this can be used to know the origin of a permission fault from a cached entry as caching the “and” of the permissions loses this information.SMMUPTWEventInfo is used to hold information about PTW faults so the event can be populated, the value of stage used to be set based on the current stage for TLB permission faults, however with the
parent_perm, it is now set based on which perm has the missing permissionWhen nesting is not enabled it has the same value as perm which doesn't change the logic.
Quoted 7 lines
2) As combined TLB implementation is used, the combination logic chooses:
- tg and level from the entry which has the smallestaddr_mask.
- Based on that the iova that would be cached is recalculated.
-Translated_addris chosen from stage-2.Signed-off-by Mostafa Saleh <[email protected]>
Quoted 90 lines
--- hw/arm/smmu-common.c | 37 ++++++++++++++++++++++++++++++++---- include/hw/arm/smmu-common.h | 1 + 2 files changed, 34 insertions(+), 4 deletions(-)hw/arm/smmu-common.c +33
-4@@ -426,7 +426,8 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, tlbe->entry.translated_addr = gpa; tlbe->entry.iova = iova & ~mask; tlbe->entry.addr_mask = mask; - tlbe->entry.perm =PTE_AP_TO_PERM (ap); + tlbe->parent_perm =PTE_AP_TO_PERM (ap); + tlbe->entry.perm = tlbe->parent_perm; tlbe->level = level; tlbe->granule = granule_sz;return 0 ;@@ -547,7 +548,8 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg, tlbe->entry.translated_addr = gpa; tlbe->entry.iova = ipa & ~mask; tlbe->entry.addr_mask = mask; - tlbe->entry.perm = s2ap; + tlbe->parent_perm = s2ap; + tlbe->entry.perm = tlbe->parent_perm; tlbe->level = level; tlbe->granule = granule_sz;return 0 ;@@ -562,6 +564,30 @@ error:return -EINVAL ; } +/* +* combine S1 and S2 TLB entries into a single entry. +* As a result the S1 entry is overriden with combined data. +*/ +static void __attribute__((unused))combine_tlb (SMMUTLBEntry *tlbe, +SMMUTLBEntry *tlbe_s2, +dma_addr_t iova, +SMMUTransCfg *cfg) +{ +if (tlbe_s2->entry.addr_mask < tlbe->entry.addr_mask) { + tlbe->entry.addr_mask = tlbe_s2->entry.addr_mask; + tlbe->granule = tlbe_s2->granule; + tlbe->level = tlbe_s2->level; + } + + tlbe->entry.translated_addr =CACHED_ENTRY_TO_ADDR (tlbe_s2, + tlbe->entry.translated_addr); + + tlbe->entry.iova = iova & ~tlbe->entry.addr_mask; +/* parent_perm has s2 perm while perm keeps s1 perm. */ + tlbe->parent_perm = tlbe_s2->entry.perm; +return ; +} +/** * smmu_ptw - Walk the page tables for an IOVA, according to @cfg * @@ -639,9 +665,12 @@ SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr, cached_entry =smmu_iotlb_lookup (bs, cfg, &tt_combined, aligned_addr);if (cached_entry) { -if ((flag &IOMMU_WO ) && !(cached_entry->entry.perm &IOMMU_WO )) { +if ((flag &IOMMU_WO ) && !(cached_entry->entry.perm & + cached_entry->parent_perm &IOMMU_WO )) { info->type =SMMU_PTW_ERR_PERMISSION ; - info->stage = cfg->stage; + info->stage = !(cached_entry->entry.perm &IOMMU_WO ) ? +SMMU_STAGE_1 : +SMMU_STAGE_2 ;return NULL ; }return cached_entry;include/hw/arm/smmu-common.h +1
-0@@ -77,6 +77,7 @@ typedef struct SMMUTLBEntry {IOMMUTLBEntry entry;uint8_t level;uint8_t granule; +IOMMUAccessFlags parent_perm; } SMMUTLBEntry;/* Stage-2 configuration. */ Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 11/19] hw/arm/smmu-common: Support nested translation
In reply to Mostafa SalehQuoted 7 lines · Mostafa Saleh
When nested translation is requested, do the following:
- Translate stage-1 table address IPA into PA through stage-2.
- Translate stage-1 table walk output (IPA) through stage-2.
- Create a single TLB entry from stage-1 and stage-2 translations using logic introduced before.
Quoted 5 lines
For stage-1 table translation, the spec (ARM IHI 0070 F.b) says in:
7.3.12 F_WALK_EABT: Translation of an IPA for Stage 1 descriptor fetch: S2 == 1 (stage 2), CLASS == TSo,
F_WALK_EABTis used which propagtes to CLASS == TT.
I don't think the text applies to this case, the context is:
A stage 2 table walk can encounter EABT accessing the physical address of a stage 2 descriptor, because of a:
[...]
* Translation of an IPA for Stage 1 descriptor fetch
So EABT is when failing to load the stage 2 descriptor. I can't find exact text for this case but looking at the flowchart 15.5, I think this should be F_TRANSLATION/F_ADDR_SIZE/F_PERMISSION/F_ACCESS with CLASS=TT and S2.
Thanks,
Jean
Quoted 160 lines
smmu_ptw()has a new argument SMMUState which include the TLB as stage-1 table address can be cached in there.Also in
smmu_ptw()a separate path used for nesting to simplify the code, although some logic can be combined.Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmu-common.c | 72 +++++++++++++++++++++++++++++++----- include/hw/arm/smmu-common.h | 2 +- 2 files changed, 64 insertions(+), 10 deletions(-)hw/arm/smmu-common.c +63
-9@@ -318,6 +318,38 @@ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova)return NULL ; } +/* Translate stage-1 table address using stage-2 page table. */ +static inline int translate_table_addr_ipa (dma_addr_t *table_addr, +SMMUTransCfg *cfg, +SMMUPTWEventInfo *info, +SMMUState *bs) +{ +dma_addr_t addr = *table_addr; +SMMUTLBEntry *cached_entry; +int asid; + +/* +* The translation table walks performed from TTB0 or TTB1 are always +* performed in IPA space if stage 2 translations are enabled. +*/ + asid = cfg->asid; + cfg->stage =SMMU_STAGE_2 ; + cfg->asid =-1 ; + cached_entry =smmu_translate (bs, cfg, addr,IOMMU_RO , info); + cfg->asid = asid; + cfg->stage =SMMU_NESTED ; + +if (cached_entry) { + *table_addr =CACHED_ENTRY_TO_ADDR (cached_entry, addr); +return 0 ; + } + + info->stage =SMMU_STAGE_2 ; + info->type =SMMU_PTW_ERR_WALK_EABT ; + info->addr = addr; +return -EINVAL ; +} +/** * smmu_ptw_64_s1 - VMSAv8-64 Walk of the page tables for a given IOVA * @cfg: translation config @@ -333,7 +365,8 @@ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova)*/ static int smmu_ptw_64_s1 (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info, +SMMUState *bs) {dma_addr_t baseaddr, indexmask;SMMUStage stage = cfg->stage;@@ -381,6 +414,11 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, goto error; } baseaddr =get_table_pte_address (pte, granule_sz); +if (cfg->stage ==SMMU_NESTED ) { +if (translate_table_addr_ipa (&baseaddr, cfg, info, bs)) { + goto error; + } + } level++;continue ; }else if (is_page_pte (pte, level)) {@@ -568,10 +606,8 @@ error:* combine S1 and S2 TLB entries into a single entry. * As a result the S1 entry is overriden with combined data. */ -static void __attribute__((unused))combine_tlb (SMMUTLBEntry *tlbe, -SMMUTLBEntry *tlbe_s2, -dma_addr_t iova, -SMMUTransCfg *cfg) +static void combine_tlb (SMMUTLBEntry *tlbe,SMMUTLBEntry *tlbe_s2, +dma_addr_t iova,SMMUTransCfg *cfg) {if (tlbe_s2->entry.addr_mask < tlbe->entry.addr_mask) { tlbe->entry.addr_mask = tlbe_s2->entry.addr_mask;@@ -596,14 +632,19 @@ static void __attribute__((unused)) combine_tlb(SMMUTLBEntry *tlbe,* @perm: tentative access type * @tlbe: returned entry * @info: ptw event handle +* @bs: smmu state which includes TLB instance * * return 0 on success */ int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info,SMMUState *bs) { +int ret; +SMMUTLBEntry tlbe_s2; +dma_addr_t ipa; +if (cfg->stage ==SMMU_STAGE_1 ) { -return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info); +return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info, bs); }else if (cfg->stage ==SMMU_STAGE_2 ) {/* * If bypassing stage 1(or unimplemented), the input address is passed @@ -621,7 +662,20 @@ int smmu_ptw(SMMUTransCfg *cfg, dma_addr_t iova, IOMMUAccessFlags perm,return smmu_ptw_64_s2 (cfg, iova, perm, tlbe, info); } -g_assert_not_reached (); +/* SMMU_NESTED. */ + ret =smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info, bs); +if (ret) { +return ret; + } + + ipa =CACHED_ENTRY_TO_ADDR (tlbe, iova); + ret =smmu_ptw_64_s2 (cfg, ipa, perm, &tlbe_s2, info); +if (ret) { +return ret; + } + +combine_tlb (tlbe, &tlbe_s2, iova, cfg); +return 0 ; } SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr,@@ -677,7 +731,7 @@ SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr, } cached_entry =g_new0 (SMMUTLBEntry,1 ); - status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info); + status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info, bs);if (status) {g_free (cached_entry);return NULL ;include/hw/arm/smmu-common.h +1
-1@@ -185,7 +185,7 @@ static inline uint16_t smmu_get_sid(SMMUDevice *sdev)* pair, according to @cfg translation config */ int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info); +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info,SMMUState *bs);/* Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 12/19] hw/arm/smmu: Support nesting in smmuv3_range_inval()
In reply to Mostafa SalehQuoted 23 lines · Mostafa Saleh
With nesting, we would need to invalidate IPAs without over-invalidating stage-1 IOVAs. This can be done by distinguishing IPAs in the TLBs by having ASID=-1. To achieve that, rework the invalidation for IPAs to have a separate function, while for IOVA invalidation ASID=-1 means invalidate for all ASIDs.
Reviewed-by Eric Auger <[email protected]>Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmu-common.c | 47 ++++++++++++++++++++++++++++++++++++ hw/arm/smmuv3.c | 23 ++++++++++++------ hw/arm/trace-events | 2 +- include/hw/arm/smmu-common.h | 3 ++- 4 files changed, 66 insertions(+), 9 deletions(-)hw/arm/smmu-common.c +0
-0@@ -195,6 +195,25 @@ static gboolean smmu_hash_remove_by_asid_vmid_iova(gpointer key, gpointer value, ((entry->iova & ~info->mask) == info->iova); }
hw/arm/smmu-common.c static gboolean smmu_hash_remove_by_asid_vmid_iova(gpointer key, gpointer value, · line 206
Quoted 10 lines
hw/arm/smmu-common.c +9
-0+static gboolean smmu_hash_remove_by_vmid_ipa (gpointer key,gpointer value, +gpointer user_data) +{ +SMMUTLBEntry *iter = (SMMUTLBEntry *)value; +IOMMUTLBEntry *entry = &iter->entry; +SMMUIOTLBPageInvInfo *info = (SMMUIOTLBPageInvInfo *)user_data; +SMMUIOTLBKey iotlb_key = *(SMMUIOTLBKey *)key; + +if (info->asid >=0 ) {
Should this test SMMU_IOTLB_ASID(iotlb_key) instead?
Quoted 29 lines
hw/arm/smmu-common.c +22
-0+/* This is a stage-1 address. */ +return false; + } +if (info->vmid !=SMMU_IOTLB_VMID (iotlb_key)) { +return false; + } +return ((info->iova & ~entry->addr_mask) == entry->iova) || + ((entry->iova & ~info->mask) == info->iova); +} +void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl) {@@ -223,6 +242,34 @@ void smmu_iotlb_inv_iova(SMMUState *s, int asid, int vmid, dma_addr_t iova, &info); } +/* +* Similar to smmu_iotlb_inv_iova(), but for Stage-2, ASID is always -1, +* in Stage-1 invalidation ASID = -1, means don't care. +*/ +void smmu_iotlb_inv_ipa (SMMUState *s,int vmid,dma_addr_t ipa,uint8_t tg, +uint64_t num_pages,uint8_t ttl) +{ +uint8_t granule = tg ? tg *2 +10 :12 ; +int asid =-1 ; + +if (ttl && (num_pages ==1 )) { +SMMUIOTLBKey key =smmu_get_iotlb_key (asid, vmid, ipa, tg, ttl);
hw/arm/smmu-common.c void smmu_iotlb_inv_iova(SMMUState *s, int asid, int vmid, dma_addr_t iova, · line 266
Quoted 10 lines
hw/arm/smmu-common.c +10
-0+ +if (g_hash_table_remove (s->iotlb, &key)) { +return ; + } + } + +SMMUIOTLBPageInvInfo info = { + .iova = ipa, + .vmid = vmid, + .mask = (num_pages *1 << granule) -1 };
Since multiplication takes precedence over shift this looks strange. We could just remove "* 1" here and in smmu_iotlb_inv_iova() to avoid the confusion?
Thanks,
Jean
Quoted 103 lines
hw/arm/smmu-common.c +6
-0+ +g_hash_table_foreach_remove (s->iotlb, + smmu_hash_remove_by_vmid_ipa, + &info); +} +void smmu_iotlb_inv_asid (SMMUState *s,int asid) {trace_smmu_iotlb_inv_asid (asid);hw/arm/smmuv3.c +16
-7@@ -1136,7 +1136,7 @@ static void smmuv3_inv_notifiers_iova(SMMUState *s, int asid, int vmid, } } -static void smmuv3_range_inval (SMMUState *s,Cmd *cmd) +static void smmuv3_range_inval (SMMUState *s,Cmd *cmd,SMMUStage stage) {dma_addr_t end, addr =CMD_ADDR (cmd);uint8_t type =CMD_TYPE (cmd);@@ -1161,9 +1161,13 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd) }if (!tg) { -trace_smmuv3_range_inval (vmid, asid, addr, tg,1 , ttl, leaf); +trace_smmuv3_range_inval (vmid, asid, addr, tg,1 , ttl, leaf, stage);smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg,1 ); -smmu_iotlb_inv_iova (s, asid, vmid, addr, tg,1 , ttl); +if (stage ==SMMU_STAGE_1 ) { +smmu_iotlb_inv_iova (s, asid, vmid, addr, tg,1 , ttl); + }else { +smmu_iotlb_inv_ipa (s, vmid, addr, tg,1 , ttl); + }return ; }@@ -1179,9 +1183,14 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd)uint64_t mask =dma_aligned_pow2_mask (addr, end,64 ); num_pages = (mask +1 ) >> granule; -trace_smmuv3_range_inval (vmid, asid, addr, tg, num_pages, ttl, leaf); +trace_smmuv3_range_inval (vmid, asid, addr, tg, num_pages, + ttl, leaf, stage);smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg, num_pages); -smmu_iotlb_inv_iova (s, asid, vmid, addr, tg, num_pages, ttl); +if (stage ==SMMU_STAGE_1 ) { +smmu_iotlb_inv_iova (s, asid, vmid, addr, tg, num_pages, ttl); + }else { +smmu_iotlb_inv_ipa (s, vmid, addr, tg, num_pages, ttl); + } addr += mask +1 ; } }@@ -1340,7 +1349,7 @@ static int smmuv3_cmdq_consume(SMMUv3State *s) cmd_error =SMMU_CERROR_ILL ;break ; } -smmuv3_range_inval (bs, &cmd); +smmuv3_range_inval (bs, &cmd,SMMU_STAGE_1 );break ;case SMMU_CMD_TLBI_S12_VMALL : {@@ -1365,7 +1374,7 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)* As currently only either s1 or s2 are supported * we can reuse same function for s2. */ -smmuv3_range_inval (bs, &cmd); +smmuv3_range_inval (bs, &cmd,SMMU_STAGE_2 );break ;case SMMU_CMD_TLBI_EL3_ALL :case SMMU_CMD_TLBI_EL3_VA :hw/arm/trace-events +1
-1@@ -46,7 +46,7 @@ smmuv3_cmdq_cfgi_ste_range(int start, int end) "start=0x%x - end=0x%x" smmuv3_cmdq_cfgi_cd(uint32_t sid) "sid=0x%x" smmuv3_config_cache_hit(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache HIT for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" smmuv3_config_cache_miss(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache MISS for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" -smmuv3_range_inval(int vmid, int asid, uint64_t addr, uint8_t tg, uint64_t num_pages, uint8_t ttl, bool leaf) "vmid=%d asid=%d addr=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" ttl=%d leaf=%d" +smmuv3_range_inval(int vmid, int asid, uint64_t addr, uint8_t tg, uint64_t num_pages, uint8_t ttl, bool leaf, int stage) "vmid=%d asid=%d addr=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" ttl=%d leaf=%d stage=%d" smmuv3_cmdq_tlbi_nh(void) "" smmuv3_cmdq_tlbi_nh_asid(int asid) "asid=%d" smmuv3_cmdq_tlbi_s12_vmid(int vmid) "vmid=%d"include/hw/arm/smmu-common.h +2
-1@@ -216,7 +216,8 @@ void smmu_iotlb_inv_asid(SMMUState *s, int asid);void smmu_iotlb_inv_vmid (SMMUState *s,int vmid);void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl); - +void smmu_iotlb_inv_ipa (SMMUState *s,int vmid,dma_addr_t ipa,uint8_t tg, +uint64_t num_pages,uint8_t ttl);/* Unmap the range of all the notifiers registered to any IOMMU mr */ void smmu_inv_notifiers_all (SMMUState *s);Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 13/19] hw/arm/smmu: Introduce smmu_iotlb_inv_asid_vmid
In reply to Mostafa SalehQuoted 9 lines · Mostafa Saleh
Soon, Instead of doing TLB invalidation by ASID only, VMID will be also required.
Addsmmu_iotlb_inv_asid_vmid()which invalidates by both ASID and VMID.However, at the moment this function is only used in
SMMU_CMD_TLBI_NH_ASIDwhich is a stage-1 command, so passing VMID = -1 keeps the original behaviour.Signed-off-by Mostafa Saleh <[email protected]>
One small issue: the change to hw/arm/trace-events for trace_smmu_iotlb_inv_asid_vmid() should be in patch 13 rather than 14, otherwise the series isn't bisectable.
Quoted 77 lines
--- hw/arm/smmu-common.c | 20 +++++++++++++------- hw/arm/smmuv3.c | 2 +- include/hw/arm/smmu-common.h | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-)hw/arm/smmu-common.c +13
-7@@ -159,13 +159,14 @@ void smmu_iotlb_inv_all(SMMUState *s)g_hash_table_remove_all (s->iotlb); } -static gboolean smmu_hash_remove_by_asid (gpointer key,gpointer value, -gpointer user_data) +static gboolean smmu_hash_remove_by_asid_vmid (gpointer key,gpointer value, +gpointer user_data) { -int asid = *(int *)user_data; +SMMUIOTLBPageInvInfo *info = (SMMUIOTLBPageInvInfo *)user_data;SMMUIOTLBKey *iotlb_key = (SMMUIOTLBKey *)key; -return SMMU_IOTLB_ASID (*iotlb_key) == asid; +return (SMMU_IOTLB_ASID (*iotlb_key) == info->asid) && + (SMMU_IOTLB_VMID (*iotlb_key) == info->vmid); } static gboolean smmu_hash_remove_by_vmid(gpointer key, gpointer value,@@ -270,10 +271,15 @@ void smmu_iotlb_inv_ipa(SMMUState *s, int vmid, dma_addr_t ipa, uint8_t tg, &info); } -void smmu_iotlb_inv_asid (SMMUState *s,int asid) +void smmu_iotlb_inv_asid_vmid (SMMUState *s,int asid,int vmid) { -trace_smmu_iotlb_inv_asid (asid); -g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_asid, &asid); +SMMUIOTLBPageInvInfo info = { + .asid = asid, + .vmid = vmid, + }; + +trace_smmu_iotlb_inv_asid_vmid (asid, vmid); +g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_asid_vmid, &info); }void smmu_iotlb_inv_vmid (SMMUState *s,int vmid)hw/arm/smmuv3.c +1
-1@@ -1329,7 +1329,7 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)trace_smmuv3_cmdq_tlbi_nh_asid (asid);smmu_inv_notifiers_all (&s->smmu_state); -smmu_iotlb_inv_asid (bs, asid); +smmu_iotlb_inv_asid_vmid (bs, asid,-1 );break ; }case SMMU_CMD_TLBI_NH_ALL :include/hw/arm/smmu-common.h +1
-1@@ -212,7 +212,7 @@ void smmu_iotlb_insert(SMMUState *bs, SMMUTransCfg *cfg, SMMUTLBEntry *entry);SMMUIOTLBKey smmu_get_iotlb_key (int asid,int vmid,uint64_t iova,uint8_t tg,uint8_t level);void smmu_iotlb_inv_all (SMMUState *s); -void smmu_iotlb_inv_asid (SMMUState *s,int asid); +void smmu_iotlb_inv_asid_vmid (SMMUState *s,int asid,int vmid);void smmu_iotlb_inv_vmid (SMMUState *s,int vmid);void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl);Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 14/19] hw/arm/smmu: Support nesting in the rest of commands
In reply to Mostafa SalehQuoted 11 lines · Mostafa Saleh
Some commands need rework for nesting, as they used to assume S1 and S2 are mutually exclusive:
-
CMD_TLBI_NH_ASID: Consider VMID if stage-2 is supported
-CMD_TLBI_NH_ALL: Consider VMID if stage-2 is supported, otherwise invalidate everything, this required a new vmid invalidation function for stage-1 only (ASID >= 0)Also, rework trace events to reflect the new implementation.
Signed-off-by Mostafa Saleh <[email protected]>
Quoted 137 lines
--- hw/arm/smmu-common.c | 16 ++++++++++++++++ hw/arm/smmuv3.c | 28 ++++++++++++++++++++++++++-- hw/arm/trace-events | 6 ++++-- include/hw/arm/smmu-common.h | 1 + 4 files changed, 47 insertions(+), 4 deletions(-)hw/arm/smmu-common.c +16
-0@@ -178,6 +178,16 @@ static gboolean smmu_hash_remove_by_vmid(gpointer key, gpointer value,return SMMU_IOTLB_VMID (*iotlb_key) == vmid; } +static gboolean smmu_hash_remove_by_vmid_s1 (gpointer key,gpointer value, +gpointer user_data) +{ +int vmid = *(int *)user_data; +SMMUIOTLBKey *iotlb_key = (SMMUIOTLBKey *)key; + +return (SMMU_IOTLB_VMID (*iotlb_key) == vmid) && + (SMMU_IOTLB_ASID (*iotlb_key) >=0 ); +} +static gboolean smmu_hash_remove_by_asid_vmid_iova (gpointer key,gpointer value,gpointer user_data) {@@ -288,6 +298,12 @@ void smmu_iotlb_inv_vmid(SMMUState *s, int vmid)g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_vmid, &vmid); } +inline void smmu_iotlb_inv_vmid_s1 (SMMUState *s,int vmid) +{ +trace_smmu_iotlb_inv_vmid_s1 (vmid); +g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_vmid_s1, &vmid); +} +/* VMSAv8-64 Translation */ /** hw/arm/smmuv3.c +26
-2@@ -1321,25 +1321,49 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)case SMMU_CMD_TLBI_NH_ASID : {int asid =CMD_ASID (&cmd); +int vmid =-1 ;if (!STAGE1_SUPPORTED (s)) { cmd_error =SMMU_CERROR_ILL ;break ; } +/* +* VMID is only matched when stage 2 is supported, otherwise set it +* to -1 as the value used for stage-1 only VMIDs. +*/ +if (STAGE2_SUPPORTED (s)) { + vmid =CMD_VMID (&cmd); + } +trace_smmuv3_cmdq_tlbi_nh_asid (asid);smmu_inv_notifiers_all (&s->smmu_state); -smmu_iotlb_inv_asid_vmid (bs, asid,-1 ); +smmu_iotlb_inv_asid_vmid (bs, asid, vmid);break ; }case SMMU_CMD_TLBI_NH_ALL : + { +int vmid =-1 ; +if (!STAGE1_SUPPORTED (s)) { cmd_error =SMMU_CERROR_ILL ;break ; } + +/* +* If stage-2 is supported, invalidate for this VMID only, otherwise +* invalidate the whole thing. +*/ +if (STAGE2_SUPPORTED (s)) { + vmid =CMD_VMID (&cmd); +trace_smmuv3_cmdq_tlbi_nh (vmid); +smmu_iotlb_inv_vmid_s1 (bs, vmid); +break ; + }QEMU_FALLTHROUGH ; + }case SMMU_CMD_TLBI_NSNH_ALL : -trace_smmuv3_cmdq_tlbi_nh (); +trace_smmuv3_cmdq_tlbi_nsnh ();smmu_inv_notifiers_all (&s->smmu_state);smmu_iotlb_inv_all (bs);break ;hw/arm/trace-events +4
-2@@ -11,8 +11,9 @@ smmu_ptw_page_pte(int stage, int level, uint64_t iova, uint64_t baseaddr, uint6 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 smmu_iotlb_inv_all(void) "IOTLB invalidate all" -smmu_iotlb_inv_asid(int asid) "IOTLB invalidate asid=%d" +smmu_iotlb_inv_asid_vmid(int asid, int vmid) "IOTLB invalidate asid=%d vmid=%d" smmu_iotlb_inv_vmid(int vmid) "IOTLB invalidate vmid=%d" +smmu_iotlb_inv_vmid_s1(int vmid) "IOTLB invalidate vmid=%d" smmu_iotlb_inv_iova(int asid, uint64_t addr) "IOTLB invalidate asid=%d addr=0x%"PRIx64 smmu_inv_notifiers_mr(const char *name) "iommu mr=%s" smmu_iotlb_lookup_hit(int asid, int vmid, uint64_t addr, uint32_t hit, uint32_t miss, uint32_t p) "IOTLB cache HIT asid=%d vmid=%d addr=0x%"PRIx64" hit=%d miss=%d hit rate=%d"@@ -47,7 +48,8 @@ smmuv3_cmdq_cfgi_cd(uint32_t sid) "sid=0x%x" smmuv3_config_cache_hit(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache HIT for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" smmuv3_config_cache_miss(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache MISS for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" smmuv3_range_inval(int vmid, int asid, uint64_t addr, uint8_t tg, uint64_t num_pages, uint8_t ttl, bool leaf, int stage) "vmid=%d asid=%d addr=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" ttl=%d leaf=%d stage=%d" -smmuv3_cmdq_tlbi_nh(void) "" +smmuv3_cmdq_tlbi_nh(int vmid) "vmid=%d" +smmuv3_cmdq_tlbi_nsnh(void) "" smmuv3_cmdq_tlbi_nh_asid(int asid) "asid=%d" smmuv3_cmdq_tlbi_s12_vmid(int vmid) "vmid=%d" smmuv3_config_cache_inv(uint32_t sid) "Config cache INV for sid=0x%x"include/hw/arm/smmu-common.h +1
-0@@ -214,6 +214,7 @@ SMMUIOTLBKey smmu_get_iotlb_key(int asid, int vmid, uint64_t iova,void smmu_iotlb_inv_all (SMMUState *s);void smmu_iotlb_inv_asid_vmid (SMMUState *s,int asid,int vmid);void smmu_iotlb_inv_vmid (SMMUState *s,int vmid); +void smmu_iotlb_inv_vmid_s1 (SMMUState *s,int vmid);void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl); void smmu_iotlb_inv_ipa(SMMUState *s, int vmid, dma_addr_t ipa, uint8_t tg,Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 15/19] hw/arm/smmuv3: Support nested SMMUs in smmuv3_notify_iova()
In reply to Mostafa SalehQuoted 24 lines · Mostafa Saleh
IOMMUTLBEvent only understands IOVA, for stage-1 or stage-2 SMMU instances we consider the input address as the IOVA, but when nesting is used, we can't mix stage-1 and stage-2 addresses, so for nesting only stage-1 is considered the IOVA and would be notified.
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 28 +++++++++++++++++++--------- hw/arm/trace-events | 2 +- 2 files changed, 20 insertions(+), 10 deletions(-)hw/arm/smmuv3.c +1
-0@@ -1064,17 +1064,17 @@ epilogue:* @iova: iova * @tg: translation granule (if communicated through range invalidation) * @num_pages: number of @granule sized pages (if tg != 0), otherwise 1 +* @stage: Which stage(1 or 2) is used */ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr, IOMMUNotifier *n, int asid, int vmid,
hw/arm/smmuv3.c epilogue: · line 1079
Quoted 10 lines
hw/arm/smmuv3.c +1
-2dma_addr_t iova, uint8_t tg, - uint64_t num_pages) + uint64_t num_pages, int stage) { SMMUDevice *sdev = container_of(mr, SMMUDevice, iommu);IOMMUTLBEvent event;uint8_t granule; -SMMUv3State *s = sdev->smmu;if (!tg) {
Should the stage check be outside of the TG test? I think CMD_TLBI_S2_IPA with TG != 0 and nesting enabled would still go through.
Thanks,
Jean
Quoted 84 lines
hw/arm/smmuv3.c +17
-7SMMUEventInfo eventinfo = {.inval_ste_allowed = true};@@ -1093,14 +1093,24 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,return ; } -if (STAGE1_SUPPORTED (s)) { +/* +* stage is passed from TLB invalidation commands which can be either +* stage-1 or stage-2. +* However, IOMMUTLBEvent only understands IOVA, for stage-1 or stage-2 +* SMMU instances we consider the input address as the IOVA, but when +* nesting is used, we can't mix stage-1 and stage-2 addresses, so for +* nesting only stage-1 is considered the IOVA and would be notified. +*/ +if (stage ==SMMU_STAGE_1 ) { tt =select_tt (cfg, iova);if (!tt) {return ; } granule = tt->granule_sz; - }else { + }else if ((stage ==SMMU_STAGE_2 ) && (cfg->stage !=SMMU_NESTED )) { granule = cfg->s2cfg.granule_sz; + }else { +return ; } }else {@@ -1119,7 +1129,7 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,/* invalidate an asid/vmid/iova range tuple in all mr's */ static void smmuv3_inv_notifiers_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg, -uint64_t num_pages) +uint64_t num_pages,int stage) {SMMUDevice *sdev;@@ -1128,10 +1138,10 @@ static void smmuv3_inv_notifiers_iova(SMMUState *s, int asid, int vmid,IOMMUNotifier *n;trace_smmuv3_inv_notifiers_iova (mr->parent_obj.name, asid, vmid, - iova, tg, num_pages); + iova, tg, num_pages, stage); IOMMU_NOTIFIER_FOREACH(n, mr) { -smmuv3_notify_iova (mr, n, asid, vmid, iova, tg, num_pages); +smmuv3_notify_iova (mr, n, asid, vmid, iova, tg, num_pages, stage); } } }@@ -1162,7 +1172,7 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd, SMMUStage stage)if (!tg) {trace_smmuv3_range_inval (vmid, asid, addr, tg,1 , ttl, leaf, stage); -smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg,1 ); +smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg,1 , stage);if (stage ==SMMU_STAGE_1 ) {smmu_iotlb_inv_iova (s, asid, vmid, addr, tg,1 , ttl); }else {@@ -1185,7 +1195,7 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd, SMMUStage stage) num_pages = (mask +1 ) >> granule;trace_smmuv3_range_inval (vmid, asid, addr, tg, num_pages, ttl, leaf, stage); -smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg, num_pages); +smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg, num_pages, stage);if (stage ==SMMU_STAGE_1 ) {smmu_iotlb_inv_iova (s, asid, vmid, addr, tg, num_pages, ttl); }else {hw/arm/trace-events +1
-1@@ -55,7 +55,7 @@ smmuv3_cmdq_tlbi_s12_vmid(int vmid) "vmid=%d" smmuv3_config_cache_inv(uint32_t sid) "Config cache INV for sid=0x%x" smmuv3_notify_flag_add(const char *iommu) "ADD SMMUNotifier node for iommu mr=%s" smmuv3_notify_flag_del(const char *iommu) "DEL SMMUNotifier node for iommu mr=%s" -smmuv3_inv_notifiers_iova(const char *name, int asid, int vmid, uint64_t iova, uint8_t tg, uint64_t num_pages) "iommu mr=%s asid=%d vmid=%d iova=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64 +smmuv3_inv_notifiers_iova(const char *name, int asid, int vmid, uint64_t iova, uint8_t tg, uint64_t num_pages, int stage) "iommu mr=%s asid=%d vmid=%d iova=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" stage=%d" # strongarm.c strongarm_uart_update_parameters(const char *label, int speed, char parity, int data_bits, int stop_bits) "%s speed=%d parity=%c data=%d stop=%d"Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 16/19] hw/arm/smmuv3: Handle translation faults according to SMMUPTWEventInfo
In reply to Mostafa SalehQuoted 18 lines · Mostafa Saleh
Previously, to check if faults are enabled, it was sufficient to check the current stage of translation and check the corresponding
record_faultsflag.However, with nesting, it is possible for stage-1 (nested) translation to trigger a stage-2 fault, so we check SMMUPTWEventInfo as it would have the correct stage set from the page table walk.
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)hw/arm/smmuv3.c +0
-0
hw/arm/smmuv3.c line 40
Quoted 10 lines
hw/arm/smmuv3.c +4
-3@@ -34,9 +34,10 @@#include "smmuv3-internal.h" #include "smmu-internal.h" -#define PTW_RECORD_FAULT (cfg) (((cfg)->stage == SMMU_STAGE_1) ? \ - (cfg)->record_faults : \ - (cfg)->s2cfg.record_faults) +#define PTW_RECORD_FAULT (ptw_info, cfg) (((ptw_info).stage == SMMU_STAGE_1 && \ + (cfg)->record_faults) || \ + ((ptw_info).stage == SMMU_STAGE_2 && \ + (cfg)->s2cfg.record_faults))
I guess this could be simplified as "(info.stage == STAGE_1) ? s1cfg : s2cfg" Anyway:
Quoted 42 lines
hw/arm/smmuv3.c +4
-4/** * smmuv3_trigger_irq - pulse @irq if enabled and update @@ -919,7 +920,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->u.f_walk_eabt.addr2 = ptw_info.addr;break ;case SMMU_PTW_ERR_TRANSLATION : -if (PTW_RECORD_FAULT (cfg)) { +if (PTW_RECORD_FAULT (ptw_info, cfg)) { event->type =SMMU_EVT_F_TRANSLATION ; event->u.f_translation.addr = addr; event->u.f_translation.addr2 = ptw_info.addr;@@ -928,7 +929,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, }break ;case SMMU_PTW_ERR_ADDR_SIZE : -if (PTW_RECORD_FAULT (cfg)) { +if (PTW_RECORD_FAULT (ptw_info, cfg)) { event->type =SMMU_EVT_F_ADDR_SIZE ; event->u.f_addr_size.addr = addr; event->u.f_addr_size.addr2 = ptw_info.addr;@@ -937,7 +938,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, }break ;case SMMU_PTW_ERR_ACCESS : -if (PTW_RECORD_FAULT (cfg)) { +if (PTW_RECORD_FAULT (ptw_info, cfg)) { event->type =SMMU_EVT_F_ACCESS ; event->u.f_access.addr = addr; event->u.f_access.addr2 = ptw_info.addr;@@ -946,7 +947,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, }break ;case SMMU_PTW_ERR_PERMISSION : -if (PTW_RECORD_FAULT (cfg)) { +if (PTW_RECORD_FAULT (ptw_info, cfg)) { event->type =SMMU_EVT_F_PERMISSION ; event->u.f_permission.addr = addr; event->u.f_permission.addr2 = ptw_info.addr;Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 17/19] hw/arm/smmuv3: Support and advertise nesting
In reply to Mostafa SalehQuoted 6 lines · Mostafa Saleh
Everything is in place, consolidate parsing of STE cfg and setting translation stage.
Advertise nesting if stage requested is "nested".
Signed-off-by Mostafa Saleh <[email protected]>
Quoted 82 lines
--- hw/arm/smmuv3.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-)hw/arm/smmuv3.c +26
-9@@ -261,6 +261,9 @@ static void smmuv3_init_regs(SMMUv3State *s)/* Based on sys property, the stages supported in smmu will be advertised.*/ if (s->stage && !strcmp ("2" , s->stage)) { s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S2P ,1 ); + }else if (s->stage && !strcmp ("nested" , s->stage)) { + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S1P ,1 ); + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S2P ,1 ); }else { s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S1P ,1 ); }@@ -425,8 +428,6 @@ static bool s2_pgtable_config_valid(uint8_t sl0, uint8_t t0sz, uint8_t gran)static int decode_ste_s2_cfg (SMMUTransCfg *cfg,STE *ste) { - cfg->stage =SMMU_STAGE_2 ; -if (STE_S2AA64 (ste) ==0x0 ) {qemu_log_mask (LOG_UNIMP ,"SMMUv3 AArch32 tables not supported\n" );@@ -509,6 +510,27 @@ bad_ste:return -EINVAL ; } +static void decode_ste_config (SMMUTransCfg *cfg,uint32_t config) +{ + +if (STE_CFG_ABORT (config)) { + cfg->aborted = true; +return ; + } +if (STE_CFG_BYPASS (config)) { + cfg->bypassed = true; +return ; + } + +if (STE_CFG_S1_ENABLED (config)) { + cfg->stage =SMMU_STAGE_1 ; + } + +if (STE_CFG_S2_ENABLED (config)) { + cfg->stage |=SMMU_STAGE_2 ; + } +} +/* Returns < 0 in case of invalid STE, 0 otherwise */ static int decode_ste (SMMUv3State *s,SMMUTransCfg *cfg,STE *ste,SMMUEventInfo *event)@@ -525,13 +547,9 @@ static int decode_ste(SMMUv3State *s, SMMUTransCfg *cfg, config =STE_CONFIG (ste); -if (STE_CFG_ABORT (config)) { - cfg->aborted = true; -return 0 ; - } +decode_ste_config (cfg, config); -if (STE_CFG_BYPASS (config)) { - cfg->bypassed = true; +if (cfg->aborted || cfg->bypassed) {return 0 ; }@@ -704,7 +722,6 @@ static int decode_cd(SMMUv3State *s, SMMUTransCfg *cfg,/* we support only those at the moment */ cfg->aa64 = true; - cfg->stage =SMMU_STAGE_1 ; cfg->oas =oas2bits (CD_IPS (cd)); cfg->oas =MIN (oas2bits (SMMU_IDR5_OAS ), cfg->oas);Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 18/19] hw/arm/smmuv3: Advertise S2FWB
In reply to Mostafa SalehQuoted 13 lines · Mostafa Saleh
QEMU doesn's support memory attributes, so FWB is NOP, this might change in the future if memory attributre would be supported.
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 8 ++++++++ 1 file changed, 8 insertions(+)hw/arm/smmuv3.c +0
-0
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 290
Quoted 4 lines
hw/arm/smmuv3.c +1
-0@@ -287,6 +287,14 @@ static void smmuv3_init_regs(SMMUv3State *s)if (FIELD_EX32 (s->idr[0 ],IDR0 ,S2P )) {/* XNX is a stage-2-specific feature */ s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,XNX ,1 ); +if (FIELD_EX32 (s->idr[0 ],IDR0 ,S1P )) {
Why is this check needed?
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 292
Quoted 2 lines
hw/arm/smmuv3.c +2
-0+/* +* QEMU doesn's support memory attributes, so FWB is NOP, this
doesn't
Thanks,
Jean
Quoted 11 lines
hw/arm/smmuv3.c +5
-0+* might change in the future if memory attributre would be +* supported. +*/ + s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,FWB ,1 ); + } } s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,RIL ,1 ); s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,BBML ,2 );Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 19/19] hw/arm/smmu: Refactor SMMU OAS
In reply to Mostafa SalehQuoted 14 lines · Mostafa Saleh
SMMUv3 OAS is currently hardcoded in the code to 44 bits, for nested configurations that can be a problem, as stage-2 might be shared with the CPU which might have different PARANGE, and according to SMMU manual ARM IHI 0070F.b:
6.3.6SMMU_IDR5, OAS must match the system physical address size.This patch doesn't change the SMMU OAS, but refactors the code to make it easier to do that:
- Rely everywhere on IDR5 for reading OAS instead of using theSMMU_IDR5_OASmacro, so, it is easier just to change IDR5 and it propagages correctly.
- Add additional checks when OAS is greater than 48bits.
- Remove unused functions/macros: pa_range/MAX_PA.
Quoted 2 lines
Reviewed-by Eric Auger <[email protected]>Signed-off-by Mostafa Saleh <[email protected]>
Quoted 156 lines
--- hw/arm/smmu-common.c | 7 ++++--- hw/arm/smmuv3-internal.h | 13 ------------- hw/arm/smmuv3.c | 35 ++++++++++++++++++++++++++++------- 3 files changed, 32 insertions(+), 23 deletions(-)hw/arm/smmu-common.c +4
-3@@ -452,7 +452,8 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, inputsize =64 - tt->tsz; level =4 - (inputsize -4 ) / stride; indexmask =VMSA_IDXMSK (inputsize, stride, level); - baseaddr =extract64 (tt->ttb,0 ,48 ); + + baseaddr =extract64 (tt->ttb,0 , cfg->oas); baseaddr &= ~indexmask;while (level <VMSA_LEVELS ) {@@ -576,8 +577,8 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg,* Get the ttb from concatenated structure. * The offset is the idx * size of each ttb(number of ptes * (sizeof(pte)) */ -uint64_t baseaddr =extract64 (cfg->s2cfg.vttb,0 ,48 ) + (1 << stride) * - idx *sizeof (uint64_t ); +uint64_t baseaddr =extract64 (cfg->s2cfg.vttb,0 , cfg->s2cfg.eff_ps) + + (1 << stride) * idx *sizeof (uint64_t );dma_addr_t indexmask =VMSA_IDXMSK (inputsize, stride, level); baseaddr &= ~indexmask;hw/arm/smmuv3-internal.h +0
-13@@ -602,19 +602,6 @@ static inline int oas2bits(int oas_field)return -1 ; } -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], 31, 1)hw/arm/smmuv3.c +28
-7@@ -410,10 +410,10 @@ static bool s2t0sz_valid(SMMUTransCfg *cfg) }if (cfg->s2cfg.granule_sz ==16 ) { -return (cfg->s2cfg.tsz >=64 -oas2bits (SMMU_IDR5_OAS )); +return (cfg->s2cfg.tsz >=64 - cfg->s2cfg.eff_ps); } -return (cfg->s2cfg.tsz >=MAX (64 -oas2bits (SMMU_IDR5_OAS ),16 )); +return (cfg->s2cfg.tsz >=MAX (64 - cfg->s2cfg.eff_ps,16 )); }/* @@ -434,8 +434,11 @@ static bool s2_pgtable_config_valid(uint8_t sl0, uint8_t t0sz, uint8_t gran)return nr_concat <=VMSA_MAX_S2_CONCAT ; } -static int decode_ste_s2_cfg (SMMUTransCfg *cfg,STE *ste) +static int decode_ste_s2_cfg (SMMUv3State *s,SMMUTransCfg *cfg, +STE *ste) { +uint8_t oas =FIELD_EX32 (s->idr[5 ],IDR5 ,OAS ); +if (STE_S2AA64 (ste) ==0x0 ) {qemu_log_mask (LOG_UNIMP ,"SMMUv3 AArch32 tables not supported\n" );@@ -468,7 +471,15 @@ static int decode_ste_s2_cfg(SMMUTransCfg *cfg, STE *ste) }/* For AA64, The effective S2PS size is capped to the OAS. */ - cfg->s2cfg.eff_ps =oas2bits (MIN (STE_S2PS (ste),SMMU_IDR5_OAS )); + cfg->s2cfg.eff_ps =oas2bits (MIN (STE_S2PS (ste), oas)); +/* +* For SMMUv3.1 and later, when OAS == IAS == 52, the stage 2 input +* range is further limited to 48 bits unless STE.S2TG indicates a +* 64KB granule. +*/ +if (cfg->s2cfg.granule_sz !=16 ) { + cfg->s2cfg.eff_ps =MIN (cfg->s2cfg.eff_ps,48 ); + }/* * It is ILLEGAL for the address in S2TTB to be outside the range * described by the effective S2PS value. @@ -544,6 +555,7 @@ static int decode_ste(SMMUv3State *s, SMMUTransCfg *cfg, STE *ste, SMMUEventInfo *event) {uint32_t config; +uint8_t oas =FIELD_EX32 (s->idr[5 ],IDR5 ,OAS );int ret;if (!STE_VALID (ste)) {@@ -587,8 +599,8 @@ static int decode_ste(SMMUv3State *s, SMMUTransCfg *cfg,* Stage-1 OAS defaults to OAS even if not enabled as it would be used * in input address check for stage-2. */ - cfg->oas =oas2bits (SMMU_IDR5_OAS ); - ret =decode_ste_s2_cfg (cfg, ste); + cfg->oas =oas2bits (oas); + ret =decode_ste_s2_cfg (s, cfg, ste);if (ret) { goto bad_ste; }@@ -714,6 +726,7 @@ static int decode_cd(SMMUv3State *s, SMMUTransCfg *cfg,int i;SMMUTranslationStatus status;SMMUTLBEntry *entry; +uint8_t oas =FIELD_EX32 (s->idr[5 ],IDR5 ,OAS );if (!CD_VALID (cd) || !CD_AARCH64 (cd)) { goto bad_cd;@@ -732,7 +745,7 @@ static int decode_cd(SMMUv3State *s, SMMUTransCfg *cfg, cfg->aa64 = true; cfg->oas =oas2bits (CD_IPS (cd)); - cfg->oas =MIN (oas2bits (SMMU_IDR5_OAS ), cfg->oas); + cfg->oas =MIN (oas2bits (oas), cfg->oas); cfg->tbi =CD_TBI (cd); cfg->asid =CD_ASID (cd); cfg->affd =CD_AFFD (cd);@@ -761,6 +774,14 @@ static int decode_cd(SMMUv3State *s, SMMUTransCfg *cfg, goto bad_cd; } +/* +* An address greater than 48 bits in size can only be output from a +* TTD when, in SMMUv3.1 and later, the effective IPS is 52 and a 64KB +* granule is in use for that translation table +*/ +if (tt->granule_sz !=16 ) { + cfg->oas =MIN (cfg->oas,48 ); + } tt->tsz = tsz; tt->ttb =CD_TTB (cd, i);Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Eric Auger
Reviewed-byRe: [PATCH v4 07/19] hw/arm/smmu: Introduce CACHED_ENTRY_TO_ADDR
In reply to Jean-Philippe BruckerHi Mostafa,
Quoted 33 lines · Jean-Philippe Brucker
Quoted 32 lines · Mostafa Saleh
Soon,
smmuv3_do_translate()will be used to translate the CD and the TTBx, instead of re-writting the same logic to convert the returned cached entry to an address, add a new macroCACHED_ENTRY_TO_ADDR.Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 3 +-- include/hw/arm/smmu-common.h | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-)hw/arm/smmuv3.c +1
-2@@ -950,8 +950,7 @@ epilogue:switch (status) {case SMMU_TRANS_SUCCESS : entry.perm = cached_entry->entry.perm; - entry.translated_addr = cached_entry->entry.translated_addr + - (addr & cached_entry->entry.addr_mask); + entry.translated_addr =CACHED_ENTRY_TO_ADDR (cached_entry, addr); entry.addr_mask = cached_entry->entry.addr_mask; trace_smmuv3_translate_success(mr->parent_obj.name, sid, addr, entry.translated_addr, entry.perm,include/hw/arm/smmu-common.h +0
-0@@ -37,6 +37,9 @@#define VMSA_IDXMSK (isz, strd, lvl) ((1ULL << \ VMSA_BIT_LVL(isz, strd, lvl)) - 1)
Quoted 4 lines
include/hw/arm/smmu-common.h line 41
Quoted 2 lines
include/hw/arm/smmu-common.h +2
-0+#define CACHED_ENTRY_TO_ADDR (ent, addr) (ent)->entry.translated_addr + \ + ((addr) & (ent)->entry.addr_mask);nit: maybe wrap this in parenthesis to avoid future usage mistakes and drop the semicolon
With Jean's comments taken into account,
Eric
Quoted 11 lines
Thanks,
JeanQuoted 7 lines
include/hw/arm/smmu-common.h +1
-0+/* * Page table walk error types */ Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 08/19] hw/arm/smmuv3: Translate CD and TT using stage-2 table
In reply to Jean-Philippe BruckerQuoted 76 lines · Jean-Philippe Brucker
Quoted 75 lines · Mostafa Saleh
According to ARM SMMU architecture specification (ARM IHI 0070 F.b), In "5.2 Stream Table Entry":
[51:6] S1ContextPtr
If Config[1] == 1 (stage 2 enabled), this pointer is an IPA translated by stage 2 and the programmed value must be within the range of the IAS.In "5.4.1 CD notes":
The translation table walks performed from TTB0 or TTB1 are always performed in IPA space if stage 2 translations are enabled.This patch implements translation of the S1 context descriptor pointer and TTBx base addresses through the S2 stage (IPA -> PA)
smmuv3_do_translate()is updated to have one arg which is translation class, this is useful to:
- Decide wether a translation is stage-2 only or use the STE config.
- Populate the class in case of faults,WALK_EABTis left unchanged, as it is always triggered from TT access so no need to use the input class.In case for stage-2 only translation, used in the context of nested translation, the stage and asid are saved and restored before and after calling
smmu_translate().Translating CD or TTBx can fail for the following reasons:
1) Large address size: This is described in
(3.4.3 Address sizes of SMMU-originated accesses)
- For CD ptr larger than IAS, for SMMUv3.1, it can trigger eitherC_BAD_STEor Translation fault, we implement the latter as it requires no extra code.
- For TTBx, if larger than the effective stage 1 output address size, it triggersC_BAD_CD.2) Faults from PTWs (7.3 Event records)
-F_ADDR_SIZE: large address size after first level causes stage 2 Address Size fault (Also in 3.4.3 Address sizes of SMMU-originated accesses)
-F_PERMISSION: Same as an address translation. However, whenCLASS == CD, the access is implicitly Data and a read.-
F_ACCESS: Same as an address translation.
-F_TRANSLATION: Same as an address translation.
-F_WALK_EABT: Same as an address translation.
These are already implemented in the PTW logic, so no extra handling required.Reviewed-by Eric Auger <[email protected]>Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 91 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 80 insertions(+), 11 deletions(-)hw/arm/smmuv3.c +10
-2@@ -337,14 +337,35 @@ static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf, } +static SMMUTranslationStatus smmuv3_do_translate (SMMUv3State *s,hwaddr addr, +SMMUTransCfg *cfg, +SMMUEventInfo *event, +IOMMUAccessFlags flag, +SMMUTLBEntry **out_entry, +SMMUTranslationClass class);/* @ssid > 0 not supported yet */ -static int smmu_get_cd (SMMUv3State *s,STE *ste,uint32_t ssid, -CD *buf,SMMUEventInfo *event) +static int smmu_get_cd (SMMUv3State *s,STE *ste,SMMUTransCfg *cfg, +uint32_t ssid,CD *buf,SMMUEventInfo *event) {dma_addr_t addr =STE_CTXPTR (ste);int ret, i; +SMMUTranslationStatus status; +SMMUTLBEntry *entry;
Quoted 10 lines
hw/arm/smmuv3.c static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf, · line 362
Quoted 8 lines
hw/arm/smmuv3.c +7
-0trace_smmuv3_get_cd (addr); + +if (cfg->stage ==SMMU_NESTED ) { + status =smmuv3_do_translate (s, addr, cfg, event, +IOMMU_RO , &entry,SMMU_CLASS_CD ); + +/* Same PTW faults are reported but with CLASS = CD. */ +if (status !=SMMU_TRANS_SUCCESS ) {In this case I think we're reporting InputAddr as the CD address, but it should be the IOVA
you're right. the InputAddr is defined as
The 64-bit address input to the SMMU for the transaction that led to the event.
Unfortunately we don't have an easy access to the IOVA in those functions. This suggest that we need to rework structs or calls.
Quoted 96 lines
Quoted 34 lines
hw/arm/smmuv3.c +12
-1+return -EINVAL ; + } + + addr =CACHED_ENTRY_TO_ADDR (entry, addr); + } +/* TODO: guarantee 64-bit single-copy atomicity */ ret =dma_memory_read (&address_space_memory, addr, buf,sizeof (*buf),MEMTXATTRS_UNSPECIFIED );@@ -659,10 +680,13 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste,return 0 ; } -static int decode_cd (SMMUTransCfg *cfg,CD *cd,SMMUEventInfo *event) +static int decode_cd (SMMUv3State *s,SMMUTransCfg *cfg, +CD *cd,SMMUEventInfo *event) {int ret = -EINVAL ;int i; +SMMUTranslationStatus status; +SMMUTLBEntry *entry;if (!CD_VALID (cd) || !CD_AARCH64 (cd)) { goto bad_cd;@@ -713,9 +737,26 @@ static int decode_cd(SMMUTransCfg *cfg, CD *cd, SMMUEventInfo *event) tt->tsz = tsz; tt->ttb =CD_TTB (cd, i); +if (tt->ttb & ~(MAKE_64BIT_MASK (0 , cfg->oas))) { goto bad_cd; } +hw/arm/smmuv3.c static int decode_cd(SMMUTransCfg *cfg, CD *cd, SMMUEventInfo *event) · line 754
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+/* Translate the TTBx, from IPA to PA if nesting is enabled. */ +if (cfg->stage ==SMMU_NESTED ) { + status =smmuv3_do_translate (s, tt->ttb, cfg, event,IOMMU_RO , + &entry,SMMU_CLASS_TT ); +/* +* Same PTW faults are reported but with CLASS = TT. +* If TTBx is larger than the effective stage 1 output addres +* size, it reports C_BAD_CD, which is handled by the above case. +*/ +if (status !=SMMU_TRANS_SUCCESS ) {Here too, we should report InputAddr as the IOVA
Quoted 29 lines
hw/arm/smmuv3.c +8
-3+return -EINVAL ; + } + tt->ttb =CACHED_ENTRY_TO_ADDR (entry, tt->ttb); + } + tt->had =CD_HAD (cd, i);trace_smmuv3_decode_cd_tt (i, tt->tsz, tt->ttb, tt->granule_sz, tt->had); }@@ -767,12 +808,12 @@ static int smmuv3_decode_config(IOMMUMemoryRegion *mr, SMMUTransCfg *cfg,return 0 ; } - ret =smmu_get_cd (s, &ste,0 /* ssid */ , &cd, event); + ret =smmu_get_cd (s, &ste, cfg,0 /* ssid */ , &cd, event);if (ret) {return ret; } -return decode_cd (cfg, &cd, event); +return decode_cd (s, cfg, &cd, event); }/** @@ -832,13 +873,40 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, SMMUTransCfg *cfg, SMMUEventInfo *event, IOMMUAccessFlags flag, - SMMUTLBEntry **out_entry) + SMMUTLBEntry **out_entry,hw/arm/smmuv3.c static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, · line 886
Quoted 10 lines
hw/arm/smmuv3.c +6
-0+ SMMUTranslationClass class) {SMMUPTWEventInfo ptw_info = {};SMMUState *bs =ARM_SMMU (s);SMMUTLBEntry *cached_entry =NULL ; +int asid, stage; +bool S2_only = class !=SMMU_CLASS_IN ; + +/* +* The function uses the argument class to indentify which stage is used: identify
hw/arm/smmuv3.c static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, · line 889
Quoted 3 lines
hw/arm/smmuv3.c +3
-0+* - CLASS = IN: Means an input translation, determine the stage from STE. +* - CLASS = CD: Means the addr is an IPA of the CD, and it would be +* tranlsated using the stage-2. translated
hw/arm/smmuv3.c static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, · line 891
Quoted 2 lines
hw/arm/smmuv3.c +2
-0+* - CLASS = TT: Means the addr is an IPA of the stage-1 translation table +* and it would be tranlsated using the stage-2. translated
Quoted 8 lines
hw/arm/smmuv3.c static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, · line 896
Quoted 5 lines
hw/arm/smmuv3.c +5
-0+* For the last 2 cases instead of having intrusive changes in the common +* logic, we modify the cfg to be a stage-2 translation only in case of +* nested, and then restore it after. +*/ +if (S2_only) {"
S2_only" seems a bit confusing because in the spec "stage 2-only" means absence of nesting, which is the opposite of what we're handling here. I don't have a good alternative though, maybe "desc_s2_translation"
In 7.3.13 F_WALK_EABT, "S2 descriptor fetch" terminology is used.
Thanks
Eric
Quoted 69 lines
Thanks,
JeanQuoted 65 lines
hw/arm/smmuv3.c +17
-5+ asid = cfg->asid; + stage = cfg->stage; + cfg->asid =-1 ; + cfg->stage =SMMU_STAGE_2 ; + } cached_entry =smmu_translate (bs, cfg, addr, flag, &ptw_info); + +if (S2_only) { + cfg->asid = asid; + cfg->stage = stage; + } +if (!cached_entry) {/* All faults from PTW has S2 field. */ event->u.f_walk_eabt.s2 = (ptw_info.stage ==SMMU_STAGE_2 );@@ -855,7 +923,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_TRANSLATION ; event->u.f_translation.addr = addr; event->u.f_translation.addr2 = ptw_info.addr; - event->u.f_translation.class =SMMU_CLASS_IN ; + event->u.f_translation.class = class; event->u.f_translation.rnw = flag &0x1 ; }break ;@@ -864,7 +932,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_ADDR_SIZE ; event->u.f_addr_size.addr = addr; event->u.f_addr_size.addr2 = ptw_info.addr; - event->u.f_addr_size.class =SMMU_CLASS_IN ; + event->u.f_addr_size.class = class; event->u.f_addr_size.rnw = flag &0x1 ; }break ;@@ -873,7 +941,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_ACCESS ; event->u.f_access.addr = addr; event->u.f_access.addr2 = ptw_info.addr; - event->u.f_access.class =SMMU_CLASS_IN ; + event->u.f_access.class = class; event->u.f_access.rnw = flag &0x1 ; }break ;@@ -882,7 +950,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_PERMISSION ; event->u.f_permission.addr = addr; event->u.f_permission.addr2 = ptw_info.addr; - event->u.f_permission.class =SMMU_CLASS_IN ; + event->u.f_permission.class = class; event->u.f_permission.rnw = flag &0x1 ; }break ;@@ -943,7 +1011,8 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, goto epilogue; } - status =smmuv3_do_translate (s, addr, cfg, &event, flag, &cached_entry); + status =smmuv3_do_translate (s, addr, cfg, &event, flag, + &cached_entry,SMMU_CLASS_IN ); epilogue:qemu_mutex_unlock (&s->mutex);Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 10/19] hw/arm/smmu-common: Add support for nested TLB
In reply to Mostafa SalehQuoted 19 lines · Mostafa Saleh
This patch adds support for nested (combined) TLB entries. The main function
combine_tlb()is not used here but in the next patches, but to simplify the patches it is introduced first.Main changes:
1) New field added in the SMMUTLBEntry struct:parent_perm, for nested TLB, holds the stage-2 permission, this can be used to know the origin of a permission fault from a cached entry as caching the “and” of the permissions loses this information.SMMUPTWEventInfo is used to hold information about PTW faults so the event can be populated, the value of stage used to be set based on the current stage for TLB permission faults, however with the
parent_perm, it is now set based on which perm has the missing permissionWhen nesting is not enabled it has the same value as perm which doesn't change the logic.
Quoted 7 lines
2) As combined TLB implementation is used, the combination logic chooses:
- tg and level from the entry which has the smallestaddr_mask.
- Based on that the iova that would be cached is recalculated.
-Translated_addris chosen from stage-2.Signed-off-by Mostafa Saleh <[email protected]>
Eric
Quoted 87 lines
--- hw/arm/smmu-common.c | 37 ++++++++++++++++++++++++++++++++---- include/hw/arm/smmu-common.h | 1 + 2 files changed, 34 insertions(+), 4 deletions(-)hw/arm/smmu-common.c +33
-4@@ -426,7 +426,8 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, tlbe->entry.translated_addr = gpa; tlbe->entry.iova = iova & ~mask; tlbe->entry.addr_mask = mask; - tlbe->entry.perm =PTE_AP_TO_PERM (ap); + tlbe->parent_perm =PTE_AP_TO_PERM (ap); + tlbe->entry.perm = tlbe->parent_perm; tlbe->level = level; tlbe->granule = granule_sz;return 0 ;@@ -547,7 +548,8 @@ static int smmu_ptw_64_s2(SMMUTransCfg *cfg, tlbe->entry.translated_addr = gpa; tlbe->entry.iova = ipa & ~mask; tlbe->entry.addr_mask = mask; - tlbe->entry.perm = s2ap; + tlbe->parent_perm = s2ap; + tlbe->entry.perm = tlbe->parent_perm; tlbe->level = level; tlbe->granule = granule_sz;return 0 ;@@ -562,6 +564,30 @@ error:return -EINVAL ; } +/* +* combine S1 and S2 TLB entries into a single entry. +* As a result the S1 entry is overriden with combined data. +*/ +static void __attribute__((unused))combine_tlb (SMMUTLBEntry *tlbe, +SMMUTLBEntry *tlbe_s2, +dma_addr_t iova, +SMMUTransCfg *cfg) +{ +if (tlbe_s2->entry.addr_mask < tlbe->entry.addr_mask) { + tlbe->entry.addr_mask = tlbe_s2->entry.addr_mask; + tlbe->granule = tlbe_s2->granule; + tlbe->level = tlbe_s2->level; + } + + tlbe->entry.translated_addr =CACHED_ENTRY_TO_ADDR (tlbe_s2, + tlbe->entry.translated_addr); + + tlbe->entry.iova = iova & ~tlbe->entry.addr_mask; +/* parent_perm has s2 perm while perm keeps s1 perm. */ + tlbe->parent_perm = tlbe_s2->entry.perm; +return ; +} +/** * smmu_ptw - Walk the page tables for an IOVA, according to @cfg * @@ -639,9 +665,12 @@ SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr, cached_entry =smmu_iotlb_lookup (bs, cfg, &tt_combined, aligned_addr);if (cached_entry) { -if ((flag &IOMMU_WO ) && !(cached_entry->entry.perm &IOMMU_WO )) { +if ((flag &IOMMU_WO ) && !(cached_entry->entry.perm & + cached_entry->parent_perm &IOMMU_WO )) { info->type =SMMU_PTW_ERR_PERMISSION ; - info->stage = cfg->stage; + info->stage = !(cached_entry->entry.perm &IOMMU_WO ) ? +SMMU_STAGE_1 : +SMMU_STAGE_2 ;return NULL ; }return cached_entry;include/hw/arm/smmu-common.h +1
-0@@ -77,6 +77,7 @@ typedef struct SMMUTLBEntry {IOMMUTLBEntry entry;uint8_t level;uint8_t granule; +IOMMUAccessFlags parent_perm; } SMMUTLBEntry;/* Stage-2 configuration. */
Re: [PATCH v4 11/19] hw/arm/smmu-common: Support nested translation
In reply to Mostafa SalehHi Mostafa,
Quoted 30 lines · Mostafa Saleh
When nested translation is requested, do the following:
- Translate stage-1 table address IPA into PA through stage-2.
- Translate stage-1 table walk output (IPA) through stage-2.
- Create a single TLB entry from stage-1 and stage-2 translations using logic introduced before.For stage-1 table translation, the spec (ARM IHI 0070 F.b) says in:
7.3.12 F_WALK_EABT: Translation of an IPA for Stage 1 descriptor fetch: S2 == 1 (stage 2), CLASS == TSo,
F_WALK_EABTis used which propagtes to CLASS == TT.
smmu_ptw()has a new argument SMMUState which include the TLB as stage-1 table address can be cached in there.Also in
smmu_ptw()a separate path used for nesting to simplify the code, although some logic can be combined.Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmu-common.c | 72 +++++++++++++++++++++++++++++++----- include/hw/arm/smmu-common.h | 2 +- 2 files changed, 64 insertions(+), 10 deletions(-)hw/arm/smmu-common.c +0
-0
hw/arm/smmu-common.c SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova) · line 325
Quoted 8 lines
hw/arm/smmu-common.c +5
-0@@ -318,6 +318,38 @@ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova)return NULL ; } +/* Translate stage-1 table address using stage-2 page table. */ +static inline int translate_table_addr_ipa (dma_addr_t *table_addr, +SMMUTransCfg *cfg, +SMMUPTWEventInfo *info, +SMMUState *bs)
Nit: in general the SMMUState if the 1st arg, as the most global state.
Quoted 14 lines
hw/arm/smmu-common.c +14
-0+{ +dma_addr_t addr = *table_addr; +SMMUTLBEntry *cached_entry; +int asid; + +/* +* The translation table walks performed from TTB0 or TTB1 are always +* performed in IPA space if stage 2 translations are enabled. +*/ + asid = cfg->asid; + cfg->stage =SMMU_STAGE_2 ; + cfg->asid =-1 ; + cached_entry =smmu_translate (bs, cfg, addr,IOMMU_RO , info); + cfg->asid = asid;
hw/arm/smmu-common.c SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova) · line 349
Quoted 10 lines
hw/arm/smmu-common.c +10
-0+ cfg->stage =SMMU_NESTED ; + +if (cached_entry) { + *table_addr =CACHED_ENTRY_TO_ADDR (cached_entry, addr); +return 0 ; + } + + info->stage =SMMU_STAGE_2 ; + info->type =SMMU_PTW_ERR_WALK_EABT ; + info->addr = addr;
so I guess also here the recorded address should be the IOVA (Jean's previous comment)?
Eric
Quoted 107 lines
hw/arm/smmu-common.c +34
-9+return -EINVAL ; +} +/** * smmu_ptw_64_s1 - VMSAv8-64 Walk of the page tables for a given IOVA * @cfg: translation config @@ -333,7 +365,8 @@ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova)*/ static int smmu_ptw_64_s1 (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info, +SMMUState *bs) {dma_addr_t baseaddr, indexmask;SMMUStage stage = cfg->stage;@@ -381,6 +414,11 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, goto error; } baseaddr =get_table_pte_address (pte, granule_sz); +if (cfg->stage ==SMMU_NESTED ) { +if (translate_table_addr_ipa (&baseaddr, cfg, info, bs)) { + goto error; + } + } level++;continue ; }else if (is_page_pte (pte, level)) {@@ -568,10 +606,8 @@ error:* combine S1 and S2 TLB entries into a single entry. * As a result the S1 entry is overriden with combined data. */ -static void __attribute__((unused))combine_tlb (SMMUTLBEntry *tlbe, -SMMUTLBEntry *tlbe_s2, -dma_addr_t iova, -SMMUTransCfg *cfg) +static void combine_tlb (SMMUTLBEntry *tlbe,SMMUTLBEntry *tlbe_s2, +dma_addr_t iova,SMMUTransCfg *cfg) {if (tlbe_s2->entry.addr_mask < tlbe->entry.addr_mask) { tlbe->entry.addr_mask = tlbe_s2->entry.addr_mask;@@ -596,14 +632,19 @@ static void __attribute__((unused)) combine_tlb(SMMUTLBEntry *tlbe,* @perm: tentative access type * @tlbe: returned entry * @info: ptw event handle +* @bs: smmu state which includes TLB instance * * return 0 on success */ int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info,SMMUState *bs) { +int ret; +SMMUTLBEntry tlbe_s2; +dma_addr_t ipa; +if (cfg->stage ==SMMU_STAGE_1 ) { -return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info); +return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info, bs); }else if (cfg->stage ==SMMU_STAGE_2 ) {/* * If bypassing stage 1(or unimplemented), the input address is passed @@ -621,7 +662,20 @@ int smmu_ptw(SMMUTransCfg *cfg, dma_addr_t iova, IOMMUAccessFlags perm,return smmu_ptw_64_s2 (cfg, iova, perm, tlbe, info); } -g_assert_not_reached (); +/* SMMU_NESTED. */ + ret =smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info, bs); +if (ret) { +return ret; + } + + ipa =CACHED_ENTRY_TO_ADDR (tlbe, iova); + ret =smmu_ptw_64_s2 (cfg, ipa, perm, &tlbe_s2, info); +if (ret) { +return ret; + } + +combine_tlb (tlbe, &tlbe_s2, iova, cfg); +return 0 ; } SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr,@@ -677,7 +731,7 @@ SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr, } cached_entry =g_new0 (SMMUTLBEntry,1 ); - status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info); + status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info, bs);if (status) {g_free (cached_entry);return NULL ;include/hw/arm/smmu-common.h +1
-1@@ -185,7 +185,7 @@ static inline uint16_t smmu_get_sid(SMMUDevice *sdev)* pair, according to @cfg translation config */ int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info); +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info,SMMUState *bs);/*
Eric Auger
Reviewed-byRe: [PATCH v4 13/19] hw/arm/smmu: Introduce smmu_iotlb_inv_asid_vmid
In reply to Jean-Philippe BruckerQuoted 9 lines · Jean-Philippe Brucker
Quoted 8 lines · Mostafa Saleh
Soon, Instead of doing TLB invalidation by ASID only, VMID will be also required.
Addsmmu_iotlb_inv_asid_vmid()which invalidates by both ASID and VMID.However, at the moment this function is only used in
SMMU_CMD_TLBI_NH_ASIDwhich is a stage-1 command, so passing VMID = -1 keeps the original behaviour.
Quoted 6 lines
Quoted 1 line
Signed-off-by Mostafa Saleh <[email protected]>One small issue: the change to hw/arm/trace-events for
trace_smmu_iotlb_inv_asid_vmid()should be in patch 13 rather than 14, otherwise the series isn't bisectable.Reviewed-by Jean-Philippe Brucker <[email protected]>
With Jean's comment addressed
Eric
Quoted 78 lines
Quoted 78 lines
--- hw/arm/smmu-common.c | 20 +++++++++++++------- hw/arm/smmuv3.c | 2 +- include/hw/arm/smmu-common.h | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-)hw/arm/smmu-common.c +13
-7@@ -159,13 +159,14 @@ void smmu_iotlb_inv_all(SMMUState *s)g_hash_table_remove_all (s->iotlb); } -static gboolean smmu_hash_remove_by_asid (gpointer key,gpointer value, -gpointer user_data) +static gboolean smmu_hash_remove_by_asid_vmid (gpointer key,gpointer value, +gpointer user_data) { -int asid = *(int *)user_data; +SMMUIOTLBPageInvInfo *info = (SMMUIOTLBPageInvInfo *)user_data;SMMUIOTLBKey *iotlb_key = (SMMUIOTLBKey *)key; -return SMMU_IOTLB_ASID (*iotlb_key) == asid; +return (SMMU_IOTLB_ASID (*iotlb_key) == info->asid) && + (SMMU_IOTLB_VMID (*iotlb_key) == info->vmid); } static gboolean smmu_hash_remove_by_vmid(gpointer key, gpointer value,@@ -270,10 +271,15 @@ void smmu_iotlb_inv_ipa(SMMUState *s, int vmid, dma_addr_t ipa, uint8_t tg, &info); } -void smmu_iotlb_inv_asid (SMMUState *s,int asid) +void smmu_iotlb_inv_asid_vmid (SMMUState *s,int asid,int vmid) { -trace_smmu_iotlb_inv_asid (asid); -g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_asid, &asid); +SMMUIOTLBPageInvInfo info = { + .asid = asid, + .vmid = vmid, + }; + +trace_smmu_iotlb_inv_asid_vmid (asid, vmid); +g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_asid_vmid, &info); }void smmu_iotlb_inv_vmid (SMMUState *s,int vmid)hw/arm/smmuv3.c +1
-1@@ -1329,7 +1329,7 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)trace_smmuv3_cmdq_tlbi_nh_asid (asid);smmu_inv_notifiers_all (&s->smmu_state); -smmu_iotlb_inv_asid (bs, asid); +smmu_iotlb_inv_asid_vmid (bs, asid,-1 );break ; }case SMMU_CMD_TLBI_NH_ALL :include/hw/arm/smmu-common.h +1
-1@@ -212,7 +212,7 @@ void smmu_iotlb_insert(SMMUState *bs, SMMUTransCfg *cfg, SMMUTLBEntry *entry);SMMUIOTLBKey smmu_get_iotlb_key (int asid,int vmid,uint64_t iova,uint8_t tg,uint8_t level);void smmu_iotlb_inv_all (SMMUState *s); -void smmu_iotlb_inv_asid (SMMUState *s,int asid); +void smmu_iotlb_inv_asid_vmid (SMMUState *s,int asid,int vmid);void smmu_iotlb_inv_vmid (SMMUState *s,int vmid);void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl);Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 14/19] hw/arm/smmu: Support nesting in the rest of commands
In reply to Mostafa SalehQuoted 11 lines · Mostafa Saleh
Some commands need rework for nesting, as they used to assume S1 and S2 are mutually exclusive:
-
CMD_TLBI_NH_ASID: Consider VMID if stage-2 is supported
-CMD_TLBI_NH_ALL: Consider VMID if stage-2 is supported, otherwise invalidate everything, this required a new vmid invalidation function for stage-1 only (ASID >= 0)Also, rework trace events to reflect the new implementation.
Signed-off-by Mostafa Saleh <[email protected]>
Eric
Quoted 134 lines
--- hw/arm/smmu-common.c | 16 ++++++++++++++++ hw/arm/smmuv3.c | 28 ++++++++++++++++++++++++++-- hw/arm/trace-events | 6 ++++-- include/hw/arm/smmu-common.h | 1 + 4 files changed, 47 insertions(+), 4 deletions(-)hw/arm/smmu-common.c +16
-0@@ -178,6 +178,16 @@ static gboolean smmu_hash_remove_by_vmid(gpointer key, gpointer value,return SMMU_IOTLB_VMID (*iotlb_key) == vmid; } +static gboolean smmu_hash_remove_by_vmid_s1 (gpointer key,gpointer value, +gpointer user_data) +{ +int vmid = *(int *)user_data; +SMMUIOTLBKey *iotlb_key = (SMMUIOTLBKey *)key; + +return (SMMU_IOTLB_VMID (*iotlb_key) == vmid) && + (SMMU_IOTLB_ASID (*iotlb_key) >=0 ); +} +static gboolean smmu_hash_remove_by_asid_vmid_iova (gpointer key,gpointer value,gpointer user_data) {@@ -288,6 +298,12 @@ void smmu_iotlb_inv_vmid(SMMUState *s, int vmid)g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_vmid, &vmid); } +inline void smmu_iotlb_inv_vmid_s1 (SMMUState *s,int vmid) +{ +trace_smmu_iotlb_inv_vmid_s1 (vmid); +g_hash_table_foreach_remove (s->iotlb, smmu_hash_remove_by_vmid_s1, &vmid); +} +/* VMSAv8-64 Translation */ /** hw/arm/smmuv3.c +26
-2@@ -1321,25 +1321,49 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)case SMMU_CMD_TLBI_NH_ASID : {int asid =CMD_ASID (&cmd); +int vmid =-1 ;if (!STAGE1_SUPPORTED (s)) { cmd_error =SMMU_CERROR_ILL ;break ; } +/* +* VMID is only matched when stage 2 is supported, otherwise set it +* to -1 as the value used for stage-1 only VMIDs. +*/ +if (STAGE2_SUPPORTED (s)) { + vmid =CMD_VMID (&cmd); + } +trace_smmuv3_cmdq_tlbi_nh_asid (asid);smmu_inv_notifiers_all (&s->smmu_state); -smmu_iotlb_inv_asid_vmid (bs, asid,-1 ); +smmu_iotlb_inv_asid_vmid (bs, asid, vmid);break ; }case SMMU_CMD_TLBI_NH_ALL : + { +int vmid =-1 ; +if (!STAGE1_SUPPORTED (s)) { cmd_error =SMMU_CERROR_ILL ;break ; } + +/* +* If stage-2 is supported, invalidate for this VMID only, otherwise +* invalidate the whole thing. +*/ +if (STAGE2_SUPPORTED (s)) { + vmid =CMD_VMID (&cmd); +trace_smmuv3_cmdq_tlbi_nh (vmid); +smmu_iotlb_inv_vmid_s1 (bs, vmid); +break ; + }QEMU_FALLTHROUGH ; + }case SMMU_CMD_TLBI_NSNH_ALL : -trace_smmuv3_cmdq_tlbi_nh (); +trace_smmuv3_cmdq_tlbi_nsnh ();smmu_inv_notifiers_all (&s->smmu_state);smmu_iotlb_inv_all (bs);break ;hw/arm/trace-events +4
-2@@ -11,8 +11,9 @@ smmu_ptw_page_pte(int stage, int level, uint64_t iova, uint64_t baseaddr, uint6 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 smmu_iotlb_inv_all(void) "IOTLB invalidate all" -smmu_iotlb_inv_asid(int asid) "IOTLB invalidate asid=%d" +smmu_iotlb_inv_asid_vmid(int asid, int vmid) "IOTLB invalidate asid=%d vmid=%d" smmu_iotlb_inv_vmid(int vmid) "IOTLB invalidate vmid=%d" +smmu_iotlb_inv_vmid_s1(int vmid) "IOTLB invalidate vmid=%d" smmu_iotlb_inv_iova(int asid, uint64_t addr) "IOTLB invalidate asid=%d addr=0x%"PRIx64 smmu_inv_notifiers_mr(const char *name) "iommu mr=%s" smmu_iotlb_lookup_hit(int asid, int vmid, uint64_t addr, uint32_t hit, uint32_t miss, uint32_t p) "IOTLB cache HIT asid=%d vmid=%d addr=0x%"PRIx64" hit=%d miss=%d hit rate=%d"@@ -47,7 +48,8 @@ smmuv3_cmdq_cfgi_cd(uint32_t sid) "sid=0x%x" smmuv3_config_cache_hit(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache HIT for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" smmuv3_config_cache_miss(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache MISS for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" smmuv3_range_inval(int vmid, int asid, uint64_t addr, uint8_t tg, uint64_t num_pages, uint8_t ttl, bool leaf, int stage) "vmid=%d asid=%d addr=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" ttl=%d leaf=%d stage=%d" -smmuv3_cmdq_tlbi_nh(void) "" +smmuv3_cmdq_tlbi_nh(int vmid) "vmid=%d" +smmuv3_cmdq_tlbi_nsnh(void) "" smmuv3_cmdq_tlbi_nh_asid(int asid) "asid=%d" smmuv3_cmdq_tlbi_s12_vmid(int vmid) "vmid=%d" smmuv3_config_cache_inv(uint32_t sid) "Config cache INV for sid=0x%x"include/hw/arm/smmu-common.h +1
-0@@ -214,6 +214,7 @@ SMMUIOTLBKey smmu_get_iotlb_key(int asid, int vmid, uint64_t iova,void smmu_iotlb_inv_all (SMMUState *s);void smmu_iotlb_inv_asid_vmid (SMMUState *s,int asid,int vmid);void smmu_iotlb_inv_vmid (SMMUState *s,int vmid); +void smmu_iotlb_inv_vmid_s1 (SMMUState *s,int vmid);void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl); void smmu_iotlb_inv_ipa(SMMUState *s, int vmid, dma_addr_t ipa, uint8_t tg,
Eric Auger
Reviewed-byRe: [PATCH v4 16/19] hw/arm/smmuv3: Handle translation faults according to SMMUPTWEventInfo
In reply to Jean-Philippe BruckerQuoted 32 lines · Jean-Philippe Brucker
Quoted 18 lines · Mostafa Saleh
Previously, to check if faults are enabled, it was sufficient to check the current stage of translation and check the corresponding
record_faultsflag.However, with nesting, it is possible for stage-1 (nested) translation to trigger a stage-2 fault, so we check SMMUPTWEventInfo as it would have the correct stage set from the page table walk.
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)hw/arm/smmuv3.c +0
-0hw/arm/smmuv3.c line 40
Quoted 10 lines
hw/arm/smmuv3.c +4
-3@@ -34,9 +34,10 @@#include "smmuv3-internal.h" #include "smmu-internal.h" -#define PTW_RECORD_FAULT (cfg) (((cfg)->stage == SMMU_STAGE_1) ? \ - (cfg)->record_faults : \ - (cfg)->s2cfg.record_faults) +#define PTW_RECORD_FAULT (ptw_info, cfg) (((ptw_info).stage == SMMU_STAGE_1 && \ + (cfg)->record_faults) || \ + ((ptw_info).stage == SMMU_STAGE_2 && \ + (cfg)->s2cfg.record_faults))I guess this could be simplified as "(info.stage ==
STAGE_1) ? s1cfg : s2cfg" Anyway:
Quoted 1 line
Reviewed-by Jean-Philippe Brucker <[email protected]>
Eric
Quoted 43 lines
Quoted 43 lines
hw/arm/smmuv3.c +4
-4/** * smmuv3_trigger_irq - pulse @irq if enabled and update @@ -919,7 +920,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->u.f_walk_eabt.addr2 = ptw_info.addr;break ;case SMMU_PTW_ERR_TRANSLATION : -if (PTW_RECORD_FAULT (cfg)) { +if (PTW_RECORD_FAULT (ptw_info, cfg)) { event->type =SMMU_EVT_F_TRANSLATION ; event->u.f_translation.addr = addr; event->u.f_translation.addr2 = ptw_info.addr;@@ -928,7 +929,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, }break ;case SMMU_PTW_ERR_ADDR_SIZE : -if (PTW_RECORD_FAULT (cfg)) { +if (PTW_RECORD_FAULT (ptw_info, cfg)) { event->type =SMMU_EVT_F_ADDR_SIZE ; event->u.f_addr_size.addr = addr; event->u.f_addr_size.addr2 = ptw_info.addr;@@ -937,7 +938,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, }break ;case SMMU_PTW_ERR_ACCESS : -if (PTW_RECORD_FAULT (cfg)) { +if (PTW_RECORD_FAULT (ptw_info, cfg)) { event->type =SMMU_EVT_F_ACCESS ; event->u.f_access.addr = addr; event->u.f_access.addr2 = ptw_info.addr;@@ -946,7 +947,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, }break ;case SMMU_PTW_ERR_PERMISSION : -if (PTW_RECORD_FAULT (cfg)) { +if (PTW_RECORD_FAULT (ptw_info, cfg)) { event->type =SMMU_EVT_F_PERMISSION ; event->u.f_permission.addr = addr; event->u.f_permission.addr2 = ptw_info.addr;Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 17/19] hw/arm/smmuv3: Support and advertise nesting
In reply to Mostafa SalehHi Mostafa,
Quoted 4 lines · Mostafa Saleh
Everything is in place, consolidate parsing of STE cfg and setting translation stage.
Advertise nesting if stage requested is "nested".
Eric
Quoted 81 lines
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-)hw/arm/smmuv3.c +26
-9@@ -261,6 +261,9 @@ static void smmuv3_init_regs(SMMUv3State *s)/* Based on sys property, the stages supported in smmu will be advertised.*/ if (s->stage && !strcmp ("2" , s->stage)) { s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S2P ,1 ); + }else if (s->stage && !strcmp ("nested" , s->stage)) { + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S1P ,1 ); + s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S2P ,1 ); }else { s->idr[0 ] =FIELD_DP32 (s->idr[0 ],IDR0 ,S1P ,1 ); }@@ -425,8 +428,6 @@ static bool s2_pgtable_config_valid(uint8_t sl0, uint8_t t0sz, uint8_t gran)static int decode_ste_s2_cfg (SMMUTransCfg *cfg,STE *ste) { - cfg->stage =SMMU_STAGE_2 ; -if (STE_S2AA64 (ste) ==0x0 ) {qemu_log_mask (LOG_UNIMP ,"SMMUv3 AArch32 tables not supported\n" );@@ -509,6 +510,27 @@ bad_ste:return -EINVAL ; } +static void decode_ste_config (SMMUTransCfg *cfg,uint32_t config) +{ + +if (STE_CFG_ABORT (config)) { + cfg->aborted = true; +return ; + } +if (STE_CFG_BYPASS (config)) { + cfg->bypassed = true; +return ; + } + +if (STE_CFG_S1_ENABLED (config)) { + cfg->stage =SMMU_STAGE_1 ; + } + +if (STE_CFG_S2_ENABLED (config)) { + cfg->stage |=SMMU_STAGE_2 ; + } +} +/* Returns < 0 in case of invalid STE, 0 otherwise */ static int decode_ste (SMMUv3State *s,SMMUTransCfg *cfg,STE *ste,SMMUEventInfo *event)@@ -525,13 +547,9 @@ static int decode_ste(SMMUv3State *s, SMMUTransCfg *cfg, config =STE_CONFIG (ste); -if (STE_CFG_ABORT (config)) { - cfg->aborted = true; -return 0 ; - } +decode_ste_config (cfg, config); -if (STE_CFG_BYPASS (config)) { - cfg->bypassed = true; +if (cfg->aborted || cfg->bypassed) {return 0 ; }@@ -704,7 +722,6 @@ static int decode_cd(SMMUv3State *s, SMMUTransCfg *cfg,/* we support only those at the moment */ cfg->aa64 = true; - cfg->stage =SMMU_STAGE_1 ; cfg->oas =oas2bits (CD_IPS (cd)); cfg->oas =MIN (oas2bits (SMMU_IDR5_OAS ), cfg->oas);
Re: [PATCH v4 18/19] hw/arm/smmuv3: Advertise S2FWB
In reply to Jean-Philippe BruckerHi Mostafa,
Quoted 3 lines · Jean-Philippe Brucker
Quoted 2 lines · Mostafa Saleh
QEMU doesn's support memory attributes, so FWB is NOP, this might change in the future if memory attributre would be supported.
attributes here and below as reported along with v3
Quoted 17 lines
Quoted 11 lines
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 8 ++++++++ 1 file changed, 8 insertions(+)hw/arm/smmuv3.c +0
-0hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 290
Quoted 4 lines
hw/arm/smmuv3.c +1
-0@@ -287,6 +287,14 @@ static void smmuv3_init_regs(SMMUv3State *s)if (FIELD_EX32 (s->idr[0 ],IDR0 ,S2P )) {/* XNX is a stage-2-specific feature */ s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,XNX ,1 ); +if (FIELD_EX32 (s->idr[0 ],IDR0 ,S1P )) {Why is this check needed?
Quoted 3 lines
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 292
Quoted 2 lines
hw/arm/smmuv3.c +2
-0+/* +* QEMU doesn's support memory attributes, so FWB is NOP, this doesn't
I have just seen your reply on my v3 comments. I still do not understand why we expose this bit at this stage.
Thanks
Eric
Quoted 15 lines
Thanks,
JeanQuoted 11 lines
hw/arm/smmuv3.c +5
-0+* might change in the future if memory attributre would be +* supported. +*/ + s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,FWB ,1 ); + } } s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,RIL ,1 ); s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,BBML ,2 );Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Hi Mostafa,
Quoted 6 lines · Mostafa Saleh
Currently, QEMU supports emulating either stage-1 or stage-2 SMMUs but not nested instances.
This patch series adds support for nested translation in SMMUv3, this is controlled by property “arm-smmuv3.stage=nested”, and advertised to guests as (IDR0.S1P == 1 && IDR0.S2P == 2)
Quoted 6 lines
Main changes(architecture):
============================
1) CDs are considered IPA and translated with stage-2.
2) TTBx and tables for stage-1 are considered IPA and translated with stage-2.
3) Translate the IPA address with stage-2.
If you respin quickly you may have a chance to get this in 9.1 (as a reminder the soft freeze is on 2024-07-23). Is it your target?
Thanks
Eric
Quoted 172 lines
TLBs:
======
TLBs are the most tricky part.1) General design
Unified(Combined) design is used, where entries with ASID=-1 are IPAs(cached from stage-2 config)TLBs are also modified to cache 2 permissions, a new permission added "
parent_perm."For non-nested configuration, perm ==
parent_permand nothing changes. This is used to know which stage to use in case there is a permission fault from a TLB entry.2) Caching in TLB
Stage-1 and stage-2 are inserted in the TLB as is.
For nested translation, both entries are combined into one TLB entry. The size (level and granule) are chosen from the smallest entries. That means that a stage-1 translation can be cached with sage-2 granule in key, this is taken into account for lookup.3) TLB Lookup
TLB lookup already uses ASID in key, so it can distinguish between stage-1 and stage-2.
And as mentioned above, the granule for stage-1 can be different, If stage-1 lookup failed, we try again with the stage-2 granule.4) TLB invalidation
- Address invalidation is split, forIOVA(CMD_TLBI_NH_VA /CMD_TLBI_NH_VAA)andIPA(CMD_TLBI_S2_IPA)based on ASID value
- CMD_TLBI_NH_ASID/CMD_TLBI_NH_ALL: Consider VMID if stage-2 is supported, and invalidate stage-1 only by VMIDsAs far as I understand, this is compliant with the ARM architecture:
- ARM ARM DDI 0487J.a: RLGSCG, RTVTYQ, RGNJPZ
- ARM IHI 0070F.b: 16.2 CachingAn alternative approach would be to instantiate 2 TLBs, one per each stage. I haven’t investigated that.
Others
=======
- Advertise SMMUv3.2-S2FWB, it is NOP for QEMU as it doesn’t support attributes.- OAS: A typical setup with nesting is to share CPU stage-2 with the SMMU, and according to the user manual, SMMU OAS must match the system physical address.
This was discussed before in
https://lore.kernel.org/all/[email protected]/
This series doesn’t implement that, but reworks OAS to make it easier to configure in the future.- For nested configuration, IOVA notifier only notifies for stage-1 invalidations (as far as I understand this is the intended behaviour as it notifies for IOVA).
- Stop ignoring VMID for stage-1 if stage-2 is also supported.
Future improvements:
=====================
1) One small improvement, that I don’t think it’s worth the extra complexity, is in case of Stage-1 TLB miss for nested translation, we can do stage-1 walk and lookup for stage-2 TLBs, instead of doing the full walk.Testing
========
1) IOMMUFD + VFIO
Kernel: https://lore.kernel.org/all/[email protected]/
VMM: https://qemu-devel.nongnu.narkive.com/o815DqpI/rfc-v5-0-8-arm-smmuv3-emulation-supportBy assigning “virtio-net-pci,netdev=net0,disable-legacy=on,iommu_platform=on,ats=on”, to a guest VM (on top of QEMU guest) with VIFO and IOMMUFD.
2) Work in progress prototype I am hacking on for nesting on KVM (this is nowhere near complete, and misses many stuff but it doesn't require VMs/VFIO) also with virtio-net-pci and git cloning a bunch of stuff and also observing traces.
https://android-kvm.googlesource.com/linux/+log/refs/heads/smostafa/android15-6.6-smmu-nesting-wipOverall I tested the following configurations
(S1 = 4k, S2 =4k):
- S1 level = 1 and S2 level = 1
- S1 level = 1 and S2 level = 2
- S1 level = 1 and S2 level = 3
- S1 level = 2 and S2 level = 1
- S1 level = 2 and S2 level = 2
- S1 level = 2 and S2 level = 3
- S1 level = 3 and S2 level = 2
- S1 level = 3 and S2 level = 3
Also did some testing with
(S1 = 16k, S2= 4k)
(S1 = 4K, S2= 16k)hw/arm/smmuv3: Split
smmuv3_translate()better viewed with --color-movedThe first 3 patches are fixes.
Changes in v4:
v3: https://lore.kernel.org/qemu-devel/[email protected]/
- Collected Eric and Alex Rbs
- Rebased on master
- Dropped RFC tag
- Dropped last 2 patches about oas changes to avoid blocking this series and I will post them after as RFC
- Split patch 7, and introduceCACHED_ENTRY_TO_ADDRin a separate patch
- Reorder patch 8 and 9 (combine tlb and tlb lookup)
- Split patch 12, and introducesmmu_iotlb_inv_asid_vmidin a separate patch
- Split patch 14, to have fault changes in a separate patch
- Update commit messages and include Fixes sha
- Minor updates, renames and a lot of comments based on reviewChanges in v3
v2: https://lore.kernel.org/qemu-devel/[email protected]/
- Collected Eric Rbs.
- Rebased on master.
- Fix an existing bug in class encoding.
- Fix an existing bug in S2 events missing IPA.
- Fix nesting event population (missing class and wrong events)
- RemoveCALL_FUNC_CFG_S2.
- Rework TLB combination logic to cache the largest possible entries.
- Refactor nested translation code to be more clear.
- Split patch 05 to 4 patches.
- Convert asid/vmid in trace events to int also.
- Remove some extra traces as it was not needed.
- Improve commit messages.Changes in v2:
v1: https://lore.kernel.org/qemu-devel/[email protected]/
- Collected Eric Rbs
- Rework TLB to rely on VMID/ASID instead of an extra key.
- Fixed TLB issue with large stage-1 reported by Julian.
- Cap the OAS to 48 bits as PTW doesn’t support 52 bits.
- Fix ASID/VMID representation in some contexts as 16 bits while
they can be -1
- Increase visibility in trace pointsMostafa Saleh (19):
hw/arm/smmu-common: Add missing size check for stage-1 hw/arm/smmu: Fix IPA for stage-2 events
hw/arm/smmuv3: Fix encoding of CLASS in events hw/arm/smmu: Use enum for SMMU stage
hw/arm/smmu: Splitsmmuv3_translate()
hw/arm/smmu: Consolidate ASID and VMID types
hw/arm/smmu: IntroduceCACHED_ENTRY_TO_ADDR
hw/arm/smmuv3: Translate CD and TT using stage-2 table hw/arm/smmu-common: Rework TLB lookup for nesting hw/arm/smmu-common: Add support for nested TLB hw/arm/smmu-common: Support nested translation hw/arm/smmu: Support nesting insmmuv3_range_inval()hw/arm/smmu: Introducesmmu_iotlb_inv_asid_vmidhw/arm/smmu: Support nesting in the rest of commands hw/arm/smmuv3: Support nested SMMUs insmmuv3_notify_iova()hw/arm/smmuv3: Handle translation faults according to SMMUPTWEventInfo hw/arm/smmuv3: Support and advertise nesting hw/arm/smmuv3: Advertise S2FWB
hw/arm/smmu: Refactor SMMU OAShw/arm/smmu-common.c | 320 +++++++++++++++++++++++--- hw/arm/smmuv3-internal.h | 19 +- hw/arm/smmuv3.c | 432 ++++++++++++++++++++++------------- hw/arm/trace-events | 26 ++- include/hw/arm/smmu-common.h | 43 +++- 5 files changed, 617 insertions(+), 223 deletions(-)
Hi Eric,
Quoted 16 lines · Eric Auger
Hi Mostafa,
Quoted 6 lines · Mostafa Saleh
Currently, QEMU supports emulating either stage-1 or stage-2 SMMUs but not nested instances.
This patch series adds support for nested translation in SMMUv3, this is controlled by property “arm-smmuv3.stage=nested”, and advertised to guests as (IDR0.S1P == 1 && IDR0.S2P == 2)Quoted 6 lines
Main changes(architecture):
============================
1) CDs are considered IPA and translated with stage-2.
2) TTBx and tables for stage-1 are considered IPA and translated with stage-2.
3) Translate the IPA address with stage-2.
Quoted 2 lines
If you respin quickly you may have a chance to get this in 9.1 (as a reminder the soft freeze is on 2024-07-23). Is it your target?
Thanks for the heads up, I will prioritize this and I will try to post v5 by this week.
Thanks,
Mostafa
Quoted 177 lines
Thanks
Eric
Quoted 172 lines
TLBs:
======
TLBs are the most tricky part.1) General design
Unified(Combined) design is used, where entries with ASID=-1 are IPAs(cached from stage-2 config)TLBs are also modified to cache 2 permissions, a new permission added "
parent_perm."For non-nested configuration, perm ==
parent_permand nothing changes. This is used to know which stage to use in case there is a permission fault from a TLB entry.2) Caching in TLB
Stage-1 and stage-2 are inserted in the TLB as is.
For nested translation, both entries are combined into one TLB entry. The size (level and granule) are chosen from the smallest entries. That means that a stage-1 translation can be cached with sage-2 granule in key, this is taken into account for lookup.3) TLB Lookup
TLB lookup already uses ASID in key, so it can distinguish between stage-1 and stage-2.
And as mentioned above, the granule for stage-1 can be different, If stage-1 lookup failed, we try again with the stage-2 granule.4) TLB invalidation
- Address invalidation is split, forIOVA(CMD_TLBI_NH_VA /CMD_TLBI_NH_VAA)andIPA(CMD_TLBI_S2_IPA)based on ASID value
- CMD_TLBI_NH_ASID/CMD_TLBI_NH_ALL: Consider VMID if stage-2 is supported, and invalidate stage-1 only by VMIDsAs far as I understand, this is compliant with the ARM architecture:
- ARM ARM DDI 0487J.a: RLGSCG, RTVTYQ, RGNJPZ
- ARM IHI 0070F.b: 16.2 CachingAn alternative approach would be to instantiate 2 TLBs, one per each stage. I haven’t investigated that.
Others
=======
- Advertise SMMUv3.2-S2FWB, it is NOP for QEMU as it doesn’t support attributes.- OAS: A typical setup with nesting is to share CPU stage-2 with the SMMU, and according to the user manual, SMMU OAS must match the system physical address.
This was discussed before in
https://lore.kernel.org/all/[email protected]/
This series doesn’t implement that, but reworks OAS to make it easier to configure in the future.- For nested configuration, IOVA notifier only notifies for stage-1 invalidations (as far as I understand this is the intended behaviour as it notifies for IOVA).
- Stop ignoring VMID for stage-1 if stage-2 is also supported.
Future improvements:
=====================
1) One small improvement, that I don’t think it’s worth the extra complexity, is in case of Stage-1 TLB miss for nested translation, we can do stage-1 walk and lookup for stage-2 TLBs, instead of doing the full walk.Testing
========
1) IOMMUFD + VFIO
Kernel: https://lore.kernel.org/all/[email protected]/
VMM: https://qemu-devel.nongnu.narkive.com/o815DqpI/rfc-v5-0-8-arm-smmuv3-emulation-supportBy assigning “virtio-net-pci,netdev=net0,disable-legacy=on,iommu_platform=on,ats=on”, to a guest VM (on top of QEMU guest) with VIFO and IOMMUFD.
2) Work in progress prototype I am hacking on for nesting on KVM (this is nowhere near complete, and misses many stuff but it doesn't require VMs/VFIO) also with virtio-net-pci and git cloning a bunch of stuff and also observing traces.
https://android-kvm.googlesource.com/linux/+log/refs/heads/smostafa/android15-6.6-smmu-nesting-wipOverall I tested the following configurations
(S1 = 4k, S2 =4k):
- S1 level = 1 and S2 level = 1
- S1 level = 1 and S2 level = 2
- S1 level = 1 and S2 level = 3
- S1 level = 2 and S2 level = 1
- S1 level = 2 and S2 level = 2
- S1 level = 2 and S2 level = 3
- S1 level = 3 and S2 level = 2
- S1 level = 3 and S2 level = 3
Also did some testing with
(S1 = 16k, S2= 4k)
(S1 = 4K, S2= 16k)hw/arm/smmuv3: Split
smmuv3_translate()better viewed with --color-movedThe first 3 patches are fixes.
Changes in v4:
v3: https://lore.kernel.org/qemu-devel/[email protected]/
- Collected Eric and Alex Rbs
- Rebased on master
- Dropped RFC tag
- Dropped last 2 patches about oas changes to avoid blocking this series and I will post them after as RFC
- Split patch 7, and introduceCACHED_ENTRY_TO_ADDRin a separate patch
- Reorder patch 8 and 9 (combine tlb and tlb lookup)
- Split patch 12, and introducesmmu_iotlb_inv_asid_vmidin a separate patch
- Split patch 14, to have fault changes in a separate patch
- Update commit messages and include Fixes sha
- Minor updates, renames and a lot of comments based on reviewChanges in v3
v2: https://lore.kernel.org/qemu-devel/[email protected]/
- Collected Eric Rbs.
- Rebased on master.
- Fix an existing bug in class encoding.
- Fix an existing bug in S2 events missing IPA.
- Fix nesting event population (missing class and wrong events)
- RemoveCALL_FUNC_CFG_S2.
- Rework TLB combination logic to cache the largest possible entries.
- Refactor nested translation code to be more clear.
- Split patch 05 to 4 patches.
- Convert asid/vmid in trace events to int also.
- Remove some extra traces as it was not needed.
- Improve commit messages.Changes in v2:
v1: https://lore.kernel.org/qemu-devel/[email protected]/
- Collected Eric Rbs
- Rework TLB to rely on VMID/ASID instead of an extra key.
- Fixed TLB issue with large stage-1 reported by Julian.
- Cap the OAS to 48 bits as PTW doesn’t support 52 bits.
- Fix ASID/VMID representation in some contexts as 16 bits while
they can be -1
- Increase visibility in trace pointsMostafa Saleh (19):
hw/arm/smmu-common: Add missing size check for stage-1 hw/arm/smmu: Fix IPA for stage-2 events
hw/arm/smmuv3: Fix encoding of CLASS in events hw/arm/smmu: Use enum for SMMU stage
hw/arm/smmu: Splitsmmuv3_translate()
hw/arm/smmu: Consolidate ASID and VMID types
hw/arm/smmu: IntroduceCACHED_ENTRY_TO_ADDR
hw/arm/smmuv3: Translate CD and TT using stage-2 table hw/arm/smmu-common: Rework TLB lookup for nesting hw/arm/smmu-common: Add support for nested TLB hw/arm/smmu-common: Support nested translation hw/arm/smmu: Support nesting insmmuv3_range_inval()hw/arm/smmu: Introducesmmu_iotlb_inv_asid_vmidhw/arm/smmu: Support nesting in the rest of commands hw/arm/smmuv3: Support nested SMMUs insmmuv3_notify_iova()hw/arm/smmuv3: Handle translation faults according to SMMUPTWEventInfo hw/arm/smmuv3: Support and advertise nesting hw/arm/smmuv3: Advertise S2FWB
hw/arm/smmu: Refactor SMMU OAShw/arm/smmu-common.c | 320 +++++++++++++++++++++++--- hw/arm/smmuv3-internal.h | 19 +- hw/arm/smmuv3.c | 432 ++++++++++++++++++++++------------- hw/arm/trace-events | 26 ++- include/hw/arm/smmu-common.h | 43 +++- 5 files changed, 617 insertions(+), 223 deletions(-)
Re: [PATCH v4 03/19] hw/arm/smmuv3: Fix encoding of CLASS in events
In reply to Jean-Philippe BruckerHi Jean,
Quoted 52 lines · Jean-Philippe Brucker
Quoted 43 lines · Mostafa Saleh
The SMMUv3 spec (ARM IHI 0070 F.b - 7.3 Event records) defines the class of events faults as:
CLASS: The class of the operation that caused the fault:
- 0b00: CD, CD fetch.
- 0b01: TTD, Stage 1 translation table fetch.
- 0b10: IN, Input addressHowever, this value was not set and left as 0 which means CD and not IN (0b10).
While at it, add an enum for class as it would be used for nesting. However, at the moment stage-1 and stage-2 use the same class values.Fixes 9bde7f0674 “hw/arm/smmuv3: Implement translate callback”Reviewed-by Eric Auger <[email protected]>Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3-internal.h | 6 ++++++ hw/arm/smmuv3.c | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-)hw/arm/smmuv3-internal.h +6
-0@@ -32,6 +32,12 @@ typedef enum SMMUTranslationStatus {SMMU_TRANS_SUCCESS , } SMMUTranslationStatus; +typedef enum SMMUTranslationClass { +SMMU_CLASS_CD , +SMMU_CLASS_TT , +SMMU_CLASS_IN , +}SMMUTranslationClass ; +/* MMIO Registers */ REG32 (IDR0 ,0x0 )hw/arm/smmuv3.c +0
-0hw/arm/smmuv3.c static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, · line 945
Quoted 5 lines
hw/arm/smmuv3.c +1
-1@@ -942,7 +942,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, 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.class =SMMU_CLASS_TT ;For EABT I think we have to differentiate S1/S2:
Quoted 7 lines
* s1-only walk that encounters EABT on S1 descriptor access is reported as class=TT,
* s2 walk that encounters EABT on S2 descriptor while translating non-descriptor IPA is reported as class=IN, even when doing s2-only.Maybe it can be done in the later patch where you propagate the different classes, because it's a minor detail.
Thanks, for pointing it out. It is a bit tricky, for s2 only we need class = IN which is easy.
But for nested, if we get a fault with s2 == 1 and EABT, we need to know if it’s from:
- Translation of a s1 table IPA (translate_table_addr_ipa) as class => TT
- Access for s2 table as class = IN
We might need a new member in SMMUPTWEventInfo to distinguish this as bool is_ipa_descriptor
Thanks,
Mostafa
Quoted 42 lines
Thanks,
JeanQuoted 38 lines
hw/arm/smmuv3.c +4
-0event.u.f_walk_eabt.addr2 = ptw_info.addr;break ;case SMMU_PTW_ERR_TRANSLATION :@@ -950,6 +950,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, event.type =SMMU_EVT_F_TRANSLATION ; event.u.f_translation.addr = addr; event.u.f_translation.addr2 = ptw_info.addr; + event.u.f_translation.class =SMMU_CLASS_IN ; event.u.f_translation.rnw = flag &0x1 ; }break ;@@ -958,6 +959,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, event.type =SMMU_EVT_F_ADDR_SIZE ; event.u.f_addr_size.addr = addr; event.u.f_addr_size.addr2 = ptw_info.addr; + event.u.f_translation.class =SMMU_CLASS_IN ; event.u.f_addr_size.rnw = flag &0x1 ; }break ;@@ -966,6 +968,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, event.type =SMMU_EVT_F_ACCESS ; event.u.f_access.addr = addr; event.u.f_access.addr2 = ptw_info.addr; + event.u.f_translation.class =SMMU_CLASS_IN ; event.u.f_access.rnw = flag &0x1 ; }break ;@@ -974,6 +977,7 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, event.type =SMMU_EVT_F_PERMISSION ; event.u.f_permission.addr = addr; event.u.f_permission.addr2 = ptw_info.addr; + event.u.f_translation.class =SMMU_CLASS_IN ; event.u.f_permission.rnw = flag &0x1 ; }break ;Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 08/19] hw/arm/smmuv3: Translate CD and TT using stage-2 table
In reply to Jean-Philippe BruckerHi Jean,
Quoted 76 lines · Jean-Philippe Brucker
Quoted 75 lines · Mostafa Saleh
According to ARM SMMU architecture specification (ARM IHI 0070 F.b), In "5.2 Stream Table Entry":
[51:6] S1ContextPtr
If Config[1] == 1 (stage 2 enabled), this pointer is an IPA translated by stage 2 and the programmed value must be within the range of the IAS.In "5.4.1 CD notes":
The translation table walks performed from TTB0 or TTB1 are always performed in IPA space if stage 2 translations are enabled.This patch implements translation of the S1 context descriptor pointer and TTBx base addresses through the S2 stage (IPA -> PA)
smmuv3_do_translate()is updated to have one arg which is translation class, this is useful to:
- Decide wether a translation is stage-2 only or use the STE config.
- Populate the class in case of faults,WALK_EABTis left unchanged, as it is always triggered from TT access so no need to use the input class.In case for stage-2 only translation, used in the context of nested translation, the stage and asid are saved and restored before and after calling
smmu_translate().Translating CD or TTBx can fail for the following reasons:
1) Large address size: This is described in
(3.4.3 Address sizes of SMMU-originated accesses)
- For CD ptr larger than IAS, for SMMUv3.1, it can trigger eitherC_BAD_STEor Translation fault, we implement the latter as it requires no extra code.
- For TTBx, if larger than the effective stage 1 output address size, it triggersC_BAD_CD.2) Faults from PTWs (7.3 Event records)
-F_ADDR_SIZE: large address size after first level causes stage 2 Address Size fault (Also in 3.4.3 Address sizes of SMMU-originated accesses)
-F_PERMISSION: Same as an address translation. However, whenCLASS == CD, the access is implicitly Data and a read.-
F_ACCESS: Same as an address translation.
-F_TRANSLATION: Same as an address translation.
-F_WALK_EABT: Same as an address translation.
These are already implemented in the PTW logic, so no extra handling required.Reviewed-by Eric Auger <[email protected]>Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 91 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 80 insertions(+), 11 deletions(-)hw/arm/smmuv3.c +10
-2@@ -337,14 +337,35 @@ static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf, } +static SMMUTranslationStatus smmuv3_do_translate (SMMUv3State *s,hwaddr addr, +SMMUTransCfg *cfg, +SMMUEventInfo *event, +IOMMUAccessFlags flag, +SMMUTLBEntry **out_entry, +SMMUTranslationClass class);/* @ssid > 0 not supported yet */ -static int smmu_get_cd (SMMUv3State *s,STE *ste,uint32_t ssid, -CD *buf,SMMUEventInfo *event) +static int smmu_get_cd (SMMUv3State *s,STE *ste,SMMUTransCfg *cfg, +uint32_t ssid,CD *buf,SMMUEventInfo *event) {dma_addr_t addr =STE_CTXPTR (ste);int ret, i; +SMMUTranslationStatus status; +SMMUTLBEntry *entry;
Quoted 11 lines
hw/arm/smmuv3.c static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf, · line 362
Quoted 8 lines
hw/arm/smmuv3.c +7
-0trace_smmuv3_get_cd (addr); + +if (cfg->stage ==SMMU_NESTED ) { + status =smmuv3_do_translate (s, addr, cfg, event, +IOMMU_RO , &entry,SMMU_CLASS_CD ); + +/* Same PTW faults are reported but with CLASS = CD. */ +if (status !=SMMU_TRANS_SUCCESS ) {In this case I think we're reporting InputAddr as the CD address, but it should be the IOVA
As Eric mentioned this would require some rework to propagate the iova, but what I am more worried about is the readability in that case, may be we can just fixup the event after smmuv3_get_config() in case of errors, something like:
/*
* smmuv3_get_config() Only return translation faults in case of
* nested translation, otherwise it can only return C_BAD_CD,
* C_BAD_STE, C_BAD_STREAMID or F_STE_FETCH.
* But in case of translation fault, we need to fixup the
* InputAddr to be the IOVA of the translation as the decode
* functions don't know about it.
*/
static void smmuv3_config_fixup_event(SMMUEventInfo *event, hwaddr iova) {
switch (event->type) {
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:
event->u.f_walk_eabt.addr = iova;
break;
default:
break; }
}
What do you think?
Thanks,
Mostafa
Quoted 178 lines
Quoted 34 lines
hw/arm/smmuv3.c +12
-1+return -EINVAL ; + } + + addr =CACHED_ENTRY_TO_ADDR (entry, addr); + } +/* TODO: guarantee 64-bit single-copy atomicity */ ret =dma_memory_read (&address_space_memory, addr, buf,sizeof (*buf),MEMTXATTRS_UNSPECIFIED );@@ -659,10 +680,13 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste,return 0 ; } -static int decode_cd (SMMUTransCfg *cfg,CD *cd,SMMUEventInfo *event) +static int decode_cd (SMMUv3State *s,SMMUTransCfg *cfg, +CD *cd,SMMUEventInfo *event) {int ret = -EINVAL ;int i; +SMMUTranslationStatus status; +SMMUTLBEntry *entry;if (!CD_VALID (cd) || !CD_AARCH64 (cd)) { goto bad_cd;@@ -713,9 +737,26 @@ static int decode_cd(SMMUTransCfg *cfg, CD *cd, SMMUEventInfo *event) tt->tsz = tsz; tt->ttb =CD_TTB (cd, i); +if (tt->ttb & ~(MAKE_64BIT_MASK (0 , cfg->oas))) { goto bad_cd; } +hw/arm/smmuv3.c static int decode_cd(SMMUTransCfg *cfg, CD *cd, SMMUEventInfo *event) · line 754
Quoted 10 lines
hw/arm/smmuv3.c +10
-0+/* Translate the TTBx, from IPA to PA if nesting is enabled. */ +if (cfg->stage ==SMMU_NESTED ) { + status =smmuv3_do_translate (s, tt->ttb, cfg, event,IOMMU_RO , + &entry,SMMU_CLASS_TT ); +/* +* Same PTW faults are reported but with CLASS = TT. +* If TTBx is larger than the effective stage 1 output addres +* size, it reports C_BAD_CD, which is handled by the above case. +*/ +if (status !=SMMU_TRANS_SUCCESS ) {Here too, we should report InputAddr as the IOVA
Quoted 29 lines
hw/arm/smmuv3.c +8
-3+return -EINVAL ; + } + tt->ttb =CACHED_ENTRY_TO_ADDR (entry, tt->ttb); + } + tt->had =CD_HAD (cd, i);trace_smmuv3_decode_cd_tt (i, tt->tsz, tt->ttb, tt->granule_sz, tt->had); }@@ -767,12 +808,12 @@ static int smmuv3_decode_config(IOMMUMemoryRegion *mr, SMMUTransCfg *cfg,return 0 ; } - ret =smmu_get_cd (s, &ste,0 /* ssid */ , &cd, event); + ret =smmu_get_cd (s, &ste, cfg,0 /* ssid */ , &cd, event);if (ret) {return ret; } -return decode_cd (cfg, &cd, event); +return decode_cd (s, cfg, &cd, event); }/** @@ -832,13 +873,40 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, SMMUTransCfg *cfg, SMMUEventInfo *event, IOMMUAccessFlags flag, - SMMUTLBEntry **out_entry) + SMMUTLBEntry **out_entry,hw/arm/smmuv3.c static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, · line 886
Quoted 10 lines
hw/arm/smmuv3.c +6
-0+ SMMUTranslationClass class) {SMMUPTWEventInfo ptw_info = {};SMMUState *bs =ARM_SMMU (s);SMMUTLBEntry *cached_entry =NULL ; +int asid, stage; +bool S2_only = class !=SMMU_CLASS_IN ; + +/* +* The function uses the argument class to indentify which stage is used: identify
hw/arm/smmuv3.c static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, · line 889
Quoted 3 lines
hw/arm/smmuv3.c +3
-0+* - CLASS = IN: Means an input translation, determine the stage from STE. +* - CLASS = CD: Means the addr is an IPA of the CD, and it would be +* tranlsated using the stage-2. translated
hw/arm/smmuv3.c static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, · line 891
Quoted 2 lines
hw/arm/smmuv3.c +2
-0+* - CLASS = TT: Means the addr is an IPA of the stage-1 translation table +* and it would be tranlsated using the stage-2. translated
hw/arm/smmuv3.c static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, · line 896
Quoted 5 lines
hw/arm/smmuv3.c +5
-0+* For the last 2 cases instead of having intrusive changes in the common +* logic, we modify the cfg to be a stage-2 translation only in case of +* nested, and then restore it after. +*/ +if (S2_only) {"
S2_only" seems a bit confusing because in the spec "stage 2-only" means absence of nesting, which is the opposite of what we're handling here. I don't have a good alternative though, maybe "desc_s2_translation"Thanks,
JeanQuoted 65 lines
hw/arm/smmuv3.c +17
-5+ asid = cfg->asid; + stage = cfg->stage; + cfg->asid =-1 ; + cfg->stage =SMMU_STAGE_2 ; + } cached_entry =smmu_translate (bs, cfg, addr, flag, &ptw_info); + +if (S2_only) { + cfg->asid = asid; + cfg->stage = stage; + } +if (!cached_entry) {/* All faults from PTW has S2 field. */ event->u.f_walk_eabt.s2 = (ptw_info.stage ==SMMU_STAGE_2 );@@ -855,7 +923,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_TRANSLATION ; event->u.f_translation.addr = addr; event->u.f_translation.addr2 = ptw_info.addr; - event->u.f_translation.class =SMMU_CLASS_IN ; + event->u.f_translation.class = class; event->u.f_translation.rnw = flag &0x1 ; }break ;@@ -864,7 +932,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_ADDR_SIZE ; event->u.f_addr_size.addr = addr; event->u.f_addr_size.addr2 = ptw_info.addr; - event->u.f_addr_size.class =SMMU_CLASS_IN ; + event->u.f_addr_size.class = class; event->u.f_addr_size.rnw = flag &0x1 ; }break ;@@ -873,7 +941,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_ACCESS ; event->u.f_access.addr = addr; event->u.f_access.addr2 = ptw_info.addr; - event->u.f_access.class =SMMU_CLASS_IN ; + event->u.f_access.class = class; event->u.f_access.rnw = flag &0x1 ; }break ;@@ -882,7 +950,7 @@ static SMMUTranslationStatus smmuv3_do_translate(SMMUv3State *s, hwaddr addr, event->type =SMMU_EVT_F_PERMISSION ; event->u.f_permission.addr = addr; event->u.f_permission.addr2 = ptw_info.addr; - event->u.f_permission.class =SMMU_CLASS_IN ; + event->u.f_permission.class = class; event->u.f_permission.rnw = flag &0x1 ; }break ;@@ -943,7 +1011,8 @@ static IOMMUTLBEntry smmuv3_translate(IOMMUMemoryRegion *mr, hwaddr addr, goto epilogue; } - status =smmuv3_do_translate (s, addr, cfg, &event, flag, &cached_entry); + status =smmuv3_do_translate (s, addr, cfg, &event, flag, + &cached_entry,SMMU_CLASS_IN ); epilogue:qemu_mutex_unlock (&s->mutex);Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 09/19] hw/arm/smmu-common: Rework TLB lookup for nesting
In reply to Jean-Philippe BruckerHi Jean,
Quoted 14 lines · Jean-Philippe Brucker
Quoted 4 lines · Mostafa Saleh
In the next patch,
combine_tlb()will be added which combines 2 TLB entries into one for nested translations, which chooses the granule and level from the smallest entry.Quoted 8 lines
This means that with nested translation, an entry can be cached with the granule of stage-2 and not stage-1.
However, currently, the lookup for an IOVA is done with input stage granule, which is stage-1 for nested configuration, which will not work with the above logic.
This patch reworks lookup in that case, so it falls back to stage-2 granule if no entry is found using stage-1 granule.
Quoted 4 lines
Why not initialize
tt_combinedto the minimum granule of stages 1 and 2? It looks like you introduced it for this. I'm wondering if we lookup the wrong IOVA if changing the granule size after the address is masked insmmu_translate()
I am not sure I fully understand, but I don’t think that would work as it is not guaranteed that the minimum granule is the one that would be cached, as we might hit block mappings.
The IOVA at first is masked with the first stage mask for the expected page address, and the lookup logic would mask the address for each level look up, so It should match the alignment of the cached page of that granule and level, and as the combine logic is done with the aligned_addr it is guaranteed by construction that it has to be aligned with stage-1.
Thanks,
Mostafa
Quoted 67 lines
Thanks,
JeanQuoted 63 lines
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmu-common.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)hw/arm/smmu-common.c +34
-2@@ -66,8 +66,10 @@ SMMUIOTLBKey smmu_get_iotlb_key(int asid, int vmid, uint64_t iova,return key; } -SMMUTLBEntry *smmu_iotlb_lookup (SMMUState *bs,SMMUTransCfg *cfg, -SMMUTransTableInfo *tt,hwaddr iova) +static SMMUTLBEntry *smmu_iotlb_lookup_all_levels (SMMUState *bs, +SMMUTransCfg *cfg, +SMMUTransTableInfo *tt, +hwaddr iova) {uint8_t tg = (tt->granule_sz -10 ) /2 ;uint8_t inputsize =64 - tt->tsz;@@ -88,6 +90,36 @@ SMMUTLBEntry *smmu_iotlb_lookup(SMMUState *bs, SMMUTransCfg *cfg, } level++; } +return entry; +} + +/** +* smmu_iotlb_lookup - Look up for a TLB entry. +* @bs: SMMU state which includes the TLB instance +* @cfg: Configuration of the translation +* @tt: Translation table info (granule and tsz) +* @iova: IOVA address to lookup +* +* returns a valid entry on success, otherwise NULL. +* In case of nested translation, tt can be updated to include +* the granule of the found entry as it might different from +* the IOVA granule. +*/ +SMMUTLBEntry *smmu_iotlb_lookup (SMMUState *bs,SMMUTransCfg *cfg, +SMMUTransTableInfo *tt,hwaddr iova) +{ +SMMUTLBEntry *entry =NULL ; + + entry =smmu_iotlb_lookup_all_levels (bs, cfg, tt, iova); +/* +* For nested translation also try the s2 granule, as the TLB will insert +* it if the size of s2 tlb entry was smaller. +*/ +if (!entry && (cfg->stage ==SMMU_NESTED ) && + (cfg->s2cfg.granule_sz != tt->granule_sz)) { + tt->granule_sz = cfg->s2cfg.granule_sz; + entry =smmu_iotlb_lookup_all_levels (bs, cfg, tt, iova); + }if (entry) { cfg->iotlb_hits++;Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 11/19] hw/arm/smmu-common: Support nested translation
In reply to Jean-Philippe BruckerHi Jean,
Quoted 21 lines · Jean-Philippe Brucker
Quoted 7 lines · Mostafa Saleh
When nested translation is requested, do the following:
- Translate stage-1 table address IPA into PA through stage-2.
- Translate stage-1 table walk output (IPA) through stage-2.
- Create a single TLB entry from stage-1 and stage-2 translations using logic introduced before.Quoted 5 lines
For stage-1 table translation, the spec (ARM IHI 0070 F.b) says in:
7.3.12 F_WALK_EABT: Translation of an IPA for Stage 1 descriptor fetch: S2 == 1 (stage 2), CLASS == TSo,
F_WALK_EABTis used which propagtes to CLASS == TT.I don't think the text applies to this case, the context is:
A stage 2 table walk can encounter EABT accessing the physical address of a stage 2 descriptor, because of a:
[...]
* Translation of an IPA for Stage 1 descriptor fetch
Quoted 4 lines
So EABT is when failing to load the stage 2 descriptor. I can't find exact text for this case but looking at the flowchart 15.5, I think this should be F_TRANSLATION/F_ADDR_SIZE/F_PERMISSION/F_ACCESS with CLASS=TT and S2.
I see, thanks for clarifying, I guess that would be another argument that we propagate more info in SMMUPTWEventInfo so we can set the fault CLASS.
Thanks,
Mostafa
Quoted 164 lines
Thanks,
JeanQuoted 160 lines
smmu_ptw()has a new argument SMMUState which include the TLB as stage-1 table address can be cached in there.Also in
smmu_ptw()a separate path used for nesting to simplify the code, although some logic can be combined.Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmu-common.c | 72 +++++++++++++++++++++++++++++++----- include/hw/arm/smmu-common.h | 2 +- 2 files changed, 64 insertions(+), 10 deletions(-)hw/arm/smmu-common.c +63
-9@@ -318,6 +318,38 @@ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova)return NULL ; } +/* Translate stage-1 table address using stage-2 page table. */ +static inline int translate_table_addr_ipa (dma_addr_t *table_addr, +SMMUTransCfg *cfg, +SMMUPTWEventInfo *info, +SMMUState *bs) +{ +dma_addr_t addr = *table_addr; +SMMUTLBEntry *cached_entry; +int asid; + +/* +* The translation table walks performed from TTB0 or TTB1 are always +* performed in IPA space if stage 2 translations are enabled. +*/ + asid = cfg->asid; + cfg->stage =SMMU_STAGE_2 ; + cfg->asid =-1 ; + cached_entry =smmu_translate (bs, cfg, addr,IOMMU_RO , info); + cfg->asid = asid; + cfg->stage =SMMU_NESTED ; + +if (cached_entry) { + *table_addr =CACHED_ENTRY_TO_ADDR (cached_entry, addr); +return 0 ; + } + + info->stage =SMMU_STAGE_2 ; + info->type =SMMU_PTW_ERR_WALK_EABT ; + info->addr = addr; +return -EINVAL ; +} +/** * smmu_ptw_64_s1 - VMSAv8-64 Walk of the page tables for a given IOVA * @cfg: translation config @@ -333,7 +365,8 @@ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova)*/ static int smmu_ptw_64_s1 (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info, +SMMUState *bs) {dma_addr_t baseaddr, indexmask;SMMUStage stage = cfg->stage;@@ -381,6 +414,11 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, goto error; } baseaddr =get_table_pte_address (pte, granule_sz); +if (cfg->stage ==SMMU_NESTED ) { +if (translate_table_addr_ipa (&baseaddr, cfg, info, bs)) { + goto error; + } + } level++;continue ; }else if (is_page_pte (pte, level)) {@@ -568,10 +606,8 @@ error:* combine S1 and S2 TLB entries into a single entry. * As a result the S1 entry is overriden with combined data. */ -static void __attribute__((unused))combine_tlb (SMMUTLBEntry *tlbe, -SMMUTLBEntry *tlbe_s2, -dma_addr_t iova, -SMMUTransCfg *cfg) +static void combine_tlb (SMMUTLBEntry *tlbe,SMMUTLBEntry *tlbe_s2, +dma_addr_t iova,SMMUTransCfg *cfg) {if (tlbe_s2->entry.addr_mask < tlbe->entry.addr_mask) { tlbe->entry.addr_mask = tlbe_s2->entry.addr_mask;@@ -596,14 +632,19 @@ static void __attribute__((unused)) combine_tlb(SMMUTLBEntry *tlbe,* @perm: tentative access type * @tlbe: returned entry * @info: ptw event handle +* @bs: smmu state which includes TLB instance * * return 0 on success */ int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info,SMMUState *bs) { +int ret; +SMMUTLBEntry tlbe_s2; +dma_addr_t ipa; +if (cfg->stage ==SMMU_STAGE_1 ) { -return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info); +return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info, bs); }else if (cfg->stage ==SMMU_STAGE_2 ) {/* * If bypassing stage 1(or unimplemented), the input address is passed @@ -621,7 +662,20 @@ int smmu_ptw(SMMUTransCfg *cfg, dma_addr_t iova, IOMMUAccessFlags perm,return smmu_ptw_64_s2 (cfg, iova, perm, tlbe, info); } -g_assert_not_reached (); +/* SMMU_NESTED. */ + ret =smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info, bs); +if (ret) { +return ret; + } + + ipa =CACHED_ENTRY_TO_ADDR (tlbe, iova); + ret =smmu_ptw_64_s2 (cfg, ipa, perm, &tlbe_s2, info); +if (ret) { +return ret; + } + +combine_tlb (tlbe, &tlbe_s2, iova, cfg); +return 0 ; } SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr,@@ -677,7 +731,7 @@ SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr, } cached_entry =g_new0 (SMMUTLBEntry,1 ); - status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info); + status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info, bs);if (status) {g_free (cached_entry);return NULL ;include/hw/arm/smmu-common.h +1
-1@@ -185,7 +185,7 @@ static inline uint16_t smmu_get_sid(SMMUDevice *sdev)* pair, according to @cfg translation config */ int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info); +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info,SMMUState *bs);/* Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 11/19] hw/arm/smmu-common: Support nested translation
In reply to Eric AugerHi Eric,
Quoted 60 lines · Eric Auger
Hi Mostafa,
Quoted 30 lines · Mostafa Saleh
When nested translation is requested, do the following:
- Translate stage-1 table address IPA into PA through stage-2.
- Translate stage-1 table walk output (IPA) through stage-2.
- Create a single TLB entry from stage-1 and stage-2 translations using logic introduced before.For stage-1 table translation, the spec (ARM IHI 0070 F.b) says in:
7.3.12 F_WALK_EABT: Translation of an IPA for Stage 1 descriptor fetch: S2 == 1 (stage 2), CLASS == TSo,
F_WALK_EABTis used which propagtes to CLASS == TT.
smmu_ptw()has a new argument SMMUState which include the TLB as stage-1 table address can be cached in there.Also in
smmu_ptw()a separate path used for nesting to simplify the code, although some logic can be combined.Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmu-common.c | 72 +++++++++++++++++++++++++++++++----- include/hw/arm/smmu-common.h | 2 +- 2 files changed, 64 insertions(+), 10 deletions(-)hw/arm/smmu-common.c +0
-0hw/arm/smmu-common.c SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova) · line 325
Quoted 8 lines
hw/arm/smmu-common.c +5
-0@@ -318,6 +318,38 @@ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova)return NULL ; } +/* Translate stage-1 table address using stage-2 page table. */ +static inline int translate_table_addr_ipa (dma_addr_t *table_addr, +SMMUTransCfg *cfg, +SMMUPTWEventInfo *info, +SMMUState *bs)Nit: in general the SMMUState if the 1st arg, as the most global state.
Quoted 18 lines
hw/arm/smmu-common.c +18
-0+{ +dma_addr_t addr = *table_addr; +SMMUTLBEntry *cached_entry; +int asid; + +/* +* The translation table walks performed from TTB0 or TTB1 are always +* performed in IPA space if stage 2 translations are enabled. +*/ + asid = cfg->asid; + cfg->stage =SMMU_STAGE_2 ; + cfg->asid =-1 ; + cached_entry =smmu_translate (bs, cfg, addr,IOMMU_RO , info); + cfg->asid = asid; + cfg->stage =SMMU_NESTED ; + +if (cached_entry) { + *table_addr =CACHED_ENTRY_TO_ADDR (cached_entry, addr);
Quoted 8 lines
hw/arm/smmu-common.c SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova) · line 349
Quoted 6 lines
hw/arm/smmu-common.c +6
-0+return 0 ; + } + + info->stage =SMMU_STAGE_2 ; + info->type =SMMU_PTW_ERR_WALK_EABT ; + info->addr = addr;so I guess also here the recorded address should be the IOVA (Jean's previous comment)?
This address maps to FetchAddr and not InputAddr, which is set from the calling function, so that should be correct. (besides event type as Jean mentioned it needs be fixed).
Thanks,
Mostafa
Quoted 110 lines
Eric
Quoted 107 lines
hw/arm/smmu-common.c +34
-9+return -EINVAL ; +} +/** * smmu_ptw_64_s1 - VMSAv8-64 Walk of the page tables for a given IOVA * @cfg: translation config @@ -333,7 +365,8 @@ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova)*/ static int smmu_ptw_64_s1 (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info, +SMMUState *bs) {dma_addr_t baseaddr, indexmask;SMMUStage stage = cfg->stage;@@ -381,6 +414,11 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, goto error; } baseaddr =get_table_pte_address (pte, granule_sz); +if (cfg->stage ==SMMU_NESTED ) { +if (translate_table_addr_ipa (&baseaddr, cfg, info, bs)) { + goto error; + } + } level++;continue ; }else if (is_page_pte (pte, level)) {@@ -568,10 +606,8 @@ error:* combine S1 and S2 TLB entries into a single entry. * As a result the S1 entry is overriden with combined data. */ -static void __attribute__((unused))combine_tlb (SMMUTLBEntry *tlbe, -SMMUTLBEntry *tlbe_s2, -dma_addr_t iova, -SMMUTransCfg *cfg) +static void combine_tlb (SMMUTLBEntry *tlbe,SMMUTLBEntry *tlbe_s2, +dma_addr_t iova,SMMUTransCfg *cfg) {if (tlbe_s2->entry.addr_mask < tlbe->entry.addr_mask) { tlbe->entry.addr_mask = tlbe_s2->entry.addr_mask;@@ -596,14 +632,19 @@ static void __attribute__((unused)) combine_tlb(SMMUTLBEntry *tlbe,* @perm: tentative access type * @tlbe: returned entry * @info: ptw event handle +* @bs: smmu state which includes TLB instance * * return 0 on success */ int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info,SMMUState *bs) { +int ret; +SMMUTLBEntry tlbe_s2; +dma_addr_t ipa; +if (cfg->stage ==SMMU_STAGE_1 ) { -return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info); +return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info, bs); }else if (cfg->stage ==SMMU_STAGE_2 ) {/* * If bypassing stage 1(or unimplemented), the input address is passed @@ -621,7 +662,20 @@ int smmu_ptw(SMMUTransCfg *cfg, dma_addr_t iova, IOMMUAccessFlags perm,return smmu_ptw_64_s2 (cfg, iova, perm, tlbe, info); } -g_assert_not_reached (); +/* SMMU_NESTED. */ + ret =smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info, bs); +if (ret) { +return ret; + } + + ipa =CACHED_ENTRY_TO_ADDR (tlbe, iova); + ret =smmu_ptw_64_s2 (cfg, ipa, perm, &tlbe_s2, info); +if (ret) { +return ret; + } + +combine_tlb (tlbe, &tlbe_s2, iova, cfg); +return 0 ; } SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr,@@ -677,7 +731,7 @@ SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr, } cached_entry =g_new0 (SMMUTLBEntry,1 ); - status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info); + status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info, bs);if (status) {g_free (cached_entry);return NULL ;include/hw/arm/smmu-common.h +1
-1@@ -185,7 +185,7 @@ static inline uint16_t smmu_get_sid(SMMUDevice *sdev)* pair, according to @cfg translation config */ int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info); +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info,SMMUState *bs);/*
Re: [PATCH v4 12/19] hw/arm/smmu: Support nesting in smmuv3_range_inval()
In reply to Jean-Philippe BruckerHi Jean,
Quoted 25 lines · Jean-Philippe Brucker
Quoted 24 lines · Mostafa Saleh
With nesting, we would need to invalidate IPAs without over-invalidating stage-1 IOVAs. This can be done by distinguishing IPAs in the TLBs by having ASID=-1. To achieve that, rework the invalidation for IPAs to have a separate function, while for IOVA invalidation ASID=-1 means invalidate for all ASIDs.
Reviewed-by Eric Auger <[email protected]>Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmu-common.c | 47 ++++++++++++++++++++++++++++++++++++ hw/arm/smmuv3.c | 23 ++++++++++++------ hw/arm/trace-events | 2 +- include/hw/arm/smmu-common.h | 3 ++- 4 files changed, 66 insertions(+), 9 deletions(-)hw/arm/smmu-common.c +0
-0@@ -195,6 +195,25 @@ static gboolean smmu_hash_remove_by_asid_vmid_iova(gpointer key, gpointer value, ((entry->iova & ~info->mask) == info->iova); }
Quoted 12 lines
hw/arm/smmu-common.c static gboolean smmu_hash_remove_by_asid_vmid_iova(gpointer key, gpointer value, · line 206
Quoted 9 lines
hw/arm/smmu-common.c +9
-0+static gboolean smmu_hash_remove_by_vmid_ipa (gpointer key,gpointer value, +gpointer user_data) +{ +SMMUTLBEntry *iter = (SMMUTLBEntry *)value; +IOMMUTLBEntry *entry = &iter->entry; +SMMUIOTLBPageInvInfo *info = (SMMUIOTLBPageInvInfo *)user_data; +SMMUIOTLBKey iotlb_key = *(SMMUIOTLBKey *)key; + +if (info->asid >=0 ) {Should this test
SMMU_IOTLB_ASID(iotlb_key)instead?
Yes, nice catch!
Quoted 35 lines
Quoted 35 lines
hw/arm/smmu-common.c +28
-0+/* This is a stage-1 address. */ +return false; + } +if (info->vmid !=SMMU_IOTLB_VMID (iotlb_key)) { +return false; + } +return ((info->iova & ~entry->addr_mask) == entry->iova) || + ((entry->iova & ~info->mask) == info->iova); +} +void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl) {@@ -223,6 +242,34 @@ void smmu_iotlb_inv_iova(SMMUState *s, int asid, int vmid, dma_addr_t iova, &info); } +/* +* Similar to smmu_iotlb_inv_iova(), but for Stage-2, ASID is always -1, +* in Stage-1 invalidation ASID = -1, means don't care. +*/ +void smmu_iotlb_inv_ipa (SMMUState *s,int vmid,dma_addr_t ipa,uint8_t tg, +uint64_t num_pages,uint8_t ttl) +{ +uint8_t granule = tg ? tg *2 +10 :12 ; +int asid =-1 ; + +if (ttl && (num_pages ==1 )) { +SMMUIOTLBKey key =smmu_get_iotlb_key (asid, vmid, ipa, tg, ttl); + +if (g_hash_table_remove (s->iotlb, &key)) { +return ; + } + } +
Quoted 8 lines
hw/arm/smmu-common.c void smmu_iotlb_inv_iova(SMMUState *s, int asid, int vmid, dma_addr_t iova, · line 266
Quoted 4 lines
hw/arm/smmu-common.c +4
-0+SMMUIOTLBPageInvInfo info = { + .iova = ipa, + .vmid = vmid, + .mask = (num_pages *1 << granule) -1 };Since multiplication takes precedence over shift this looks strange. We could just remove "* 1" here and in
smmu_iotlb_inv_iova()to avoid the confusion?
Agh, I just copied this and didn’t notice, that makes sense, I will fix it here for smmu_iotlb_inv_ipa and maybe iova can be fixed separately?
Thanks,
Mostafa
Quoted 107 lines
Thanks,
JeanQuoted 103 lines
hw/arm/smmu-common.c +6
-0+ +g_hash_table_foreach_remove (s->iotlb, + smmu_hash_remove_by_vmid_ipa, + &info); +} +void smmu_iotlb_inv_asid (SMMUState *s,int asid) {trace_smmu_iotlb_inv_asid (asid);hw/arm/smmuv3.c +16
-7@@ -1136,7 +1136,7 @@ static void smmuv3_inv_notifiers_iova(SMMUState *s, int asid, int vmid, } } -static void smmuv3_range_inval (SMMUState *s,Cmd *cmd) +static void smmuv3_range_inval (SMMUState *s,Cmd *cmd,SMMUStage stage) {dma_addr_t end, addr =CMD_ADDR (cmd);uint8_t type =CMD_TYPE (cmd);@@ -1161,9 +1161,13 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd) }if (!tg) { -trace_smmuv3_range_inval (vmid, asid, addr, tg,1 , ttl, leaf); +trace_smmuv3_range_inval (vmid, asid, addr, tg,1 , ttl, leaf, stage);smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg,1 ); -smmu_iotlb_inv_iova (s, asid, vmid, addr, tg,1 , ttl); +if (stage ==SMMU_STAGE_1 ) { +smmu_iotlb_inv_iova (s, asid, vmid, addr, tg,1 , ttl); + }else { +smmu_iotlb_inv_ipa (s, vmid, addr, tg,1 , ttl); + }return ; }@@ -1179,9 +1183,14 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd)uint64_t mask =dma_aligned_pow2_mask (addr, end,64 ); num_pages = (mask +1 ) >> granule; -trace_smmuv3_range_inval (vmid, asid, addr, tg, num_pages, ttl, leaf); +trace_smmuv3_range_inval (vmid, asid, addr, tg, num_pages, + ttl, leaf, stage);smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg, num_pages); -smmu_iotlb_inv_iova (s, asid, vmid, addr, tg, num_pages, ttl); +if (stage ==SMMU_STAGE_1 ) { +smmu_iotlb_inv_iova (s, asid, vmid, addr, tg, num_pages, ttl); + }else { +smmu_iotlb_inv_ipa (s, vmid, addr, tg, num_pages, ttl); + } addr += mask +1 ; } }@@ -1340,7 +1349,7 @@ static int smmuv3_cmdq_consume(SMMUv3State *s) cmd_error =SMMU_CERROR_ILL ;break ; } -smmuv3_range_inval (bs, &cmd); +smmuv3_range_inval (bs, &cmd,SMMU_STAGE_1 );break ;case SMMU_CMD_TLBI_S12_VMALL : {@@ -1365,7 +1374,7 @@ static int smmuv3_cmdq_consume(SMMUv3State *s)* As currently only either s1 or s2 are supported * we can reuse same function for s2. */ -smmuv3_range_inval (bs, &cmd); +smmuv3_range_inval (bs, &cmd,SMMU_STAGE_2 );break ;case SMMU_CMD_TLBI_EL3_ALL :case SMMU_CMD_TLBI_EL3_VA :hw/arm/trace-events +1
-1@@ -46,7 +46,7 @@ smmuv3_cmdq_cfgi_ste_range(int start, int end) "start=0x%x - end=0x%x" smmuv3_cmdq_cfgi_cd(uint32_t sid) "sid=0x%x" smmuv3_config_cache_hit(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache HIT for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" smmuv3_config_cache_miss(uint32_t sid, uint32_t hits, uint32_t misses, uint32_t perc) "Config cache MISS for sid=0x%x (hits=%d, misses=%d, hit rate=%d)" -smmuv3_range_inval(int vmid, int asid, uint64_t addr, uint8_t tg, uint64_t num_pages, uint8_t ttl, bool leaf) "vmid=%d asid=%d addr=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" ttl=%d leaf=%d" +smmuv3_range_inval(int vmid, int asid, uint64_t addr, uint8_t tg, uint64_t num_pages, uint8_t ttl, bool leaf, int stage) "vmid=%d asid=%d addr=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" ttl=%d leaf=%d stage=%d" smmuv3_cmdq_tlbi_nh(void) "" smmuv3_cmdq_tlbi_nh_asid(int asid) "asid=%d" smmuv3_cmdq_tlbi_s12_vmid(int vmid) "vmid=%d"include/hw/arm/smmu-common.h +2
-1@@ -216,7 +216,8 @@ void smmu_iotlb_inv_asid(SMMUState *s, int asid);void smmu_iotlb_inv_vmid (SMMUState *s,int vmid);void smmu_iotlb_inv_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg,uint64_t num_pages,uint8_t ttl); - +void smmu_iotlb_inv_ipa (SMMUState *s,int vmid,dma_addr_t ipa,uint8_t tg, +uint64_t num_pages,uint8_t ttl);/* Unmap the range of all the notifiers registered to any IOMMU mr */ void smmu_inv_notifiers_all (SMMUState *s);Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 15/19] hw/arm/smmuv3: Support nested SMMUs in smmuv3_notify_iova()
In reply to Jean-Philippe BruckerHi Jean,
Quoted 34 lines · Jean-Philippe Brucker
Quoted 33 lines · Mostafa Saleh
IOMMUTLBEvent only understands IOVA, for stage-1 or stage-2 SMMU instances we consider the input address as the IOVA, but when nesting is used, we can't mix stage-1 and stage-2 addresses, so for nesting only stage-1 is considered the IOVA and would be notified.
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 28 +++++++++++++++++++--------- hw/arm/trace-events | 2 +- 2 files changed, 20 insertions(+), 10 deletions(-)hw/arm/smmuv3.c +2
-2@@ -1064,17 +1064,17 @@ epilogue:* @iova: iova * @tg: translation granule (if communicated through range invalidation) * @num_pages: number of @granule sized pages (if tg != 0), otherwise 1 +* @stage: Which stage(1 or 2) is used */ static void smmuv3_notify_iova (IOMMUMemoryRegion *mr,IOMMUNotifier *n,int asid,int vmid,dma_addr_t iova,uint8_t tg, -uint64_t num_pages) +uint64_t num_pages,int stage) {SMMUDevice *sdev =container_of (mr, SMMUDevice, iommu);IOMMUTLBEvent event;uint8_t granule; -SMMUv3State *s = sdev->smmu;
Quoted 4 lines
hw/arm/smmuv3.c epilogue: · line 1079
Quoted 1 line
hw/arm/smmuv3.c +0
-0if (!tg) {Should the stage check be outside of the TG test? I think
CMD_TLBI_S2_IPAwith TG != 0 and nesting enabled would still go through.
Ah yes, I will fix it.
Thanks,
Mostafa
Quoted 88 lines
Thanks,
JeanQuoted 84 lines
hw/arm/smmuv3.c +17
-7SMMUEventInfo eventinfo = {.inval_ste_allowed = true};@@ -1093,14 +1093,24 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,return ; } -if (STAGE1_SUPPORTED (s)) { +/* +* stage is passed from TLB invalidation commands which can be either +* stage-1 or stage-2. +* However, IOMMUTLBEvent only understands IOVA, for stage-1 or stage-2 +* SMMU instances we consider the input address as the IOVA, but when +* nesting is used, we can't mix stage-1 and stage-2 addresses, so for +* nesting only stage-1 is considered the IOVA and would be notified. +*/ +if (stage ==SMMU_STAGE_1 ) { tt =select_tt (cfg, iova);if (!tt) {return ; } granule = tt->granule_sz; - }else { + }else if ((stage ==SMMU_STAGE_2 ) && (cfg->stage !=SMMU_NESTED )) { granule = cfg->s2cfg.granule_sz; + }else { +return ; } }else {@@ -1119,7 +1129,7 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,/* invalidate an asid/vmid/iova range tuple in all mr's */ static void smmuv3_inv_notifiers_iova (SMMUState *s,int asid,int vmid,dma_addr_t iova,uint8_t tg, -uint64_t num_pages) +uint64_t num_pages,int stage) {SMMUDevice *sdev;@@ -1128,10 +1138,10 @@ static void smmuv3_inv_notifiers_iova(SMMUState *s, int asid, int vmid,IOMMUNotifier *n;trace_smmuv3_inv_notifiers_iova (mr->parent_obj.name, asid, vmid, - iova, tg, num_pages); + iova, tg, num_pages, stage); IOMMU_NOTIFIER_FOREACH(n, mr) { -smmuv3_notify_iova (mr, n, asid, vmid, iova, tg, num_pages); +smmuv3_notify_iova (mr, n, asid, vmid, iova, tg, num_pages, stage); } } }@@ -1162,7 +1172,7 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd, SMMUStage stage)if (!tg) {trace_smmuv3_range_inval (vmid, asid, addr, tg,1 , ttl, leaf, stage); -smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg,1 ); +smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg,1 , stage);if (stage ==SMMU_STAGE_1 ) {smmu_iotlb_inv_iova (s, asid, vmid, addr, tg,1 , ttl); }else {@@ -1185,7 +1195,7 @@ static void smmuv3_range_inval(SMMUState *s, Cmd *cmd, SMMUStage stage) num_pages = (mask +1 ) >> granule;trace_smmuv3_range_inval (vmid, asid, addr, tg, num_pages, ttl, leaf, stage); -smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg, num_pages); +smmuv3_inv_notifiers_iova (s, asid, vmid, addr, tg, num_pages, stage);if (stage ==SMMU_STAGE_1 ) {smmu_iotlb_inv_iova (s, asid, vmid, addr, tg, num_pages, ttl); }else {hw/arm/trace-events +1
-1@@ -55,7 +55,7 @@ smmuv3_cmdq_tlbi_s12_vmid(int vmid) "vmid=%d" smmuv3_config_cache_inv(uint32_t sid) "Config cache INV for sid=0x%x" smmuv3_notify_flag_add(const char *iommu) "ADD SMMUNotifier node for iommu mr=%s" smmuv3_notify_flag_del(const char *iommu) "DEL SMMUNotifier node for iommu mr=%s" -smmuv3_inv_notifiers_iova(const char *name, int asid, int vmid, uint64_t iova, uint8_t tg, uint64_t num_pages) "iommu mr=%s asid=%d vmid=%d iova=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64 +smmuv3_inv_notifiers_iova(const char *name, int asid, int vmid, uint64_t iova, uint8_t tg, uint64_t num_pages, int stage) "iommu mr=%s asid=%d vmid=%d iova=0x%"PRIx64" tg=%d num_pages=0x%"PRIx64" stage=%d" # strongarm.c strongarm_uart_update_parameters(const char *label, int speed, char parity, int data_bits, int stop_bits) "%s speed=%d parity=%c data=%d stop=%d"Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 18/19] hw/arm/smmuv3: Advertise S2FWB
In reply to Jean-Philippe BruckerHi Jean,
Quoted 9 lines · Jean-Philippe Brucker
Quoted 8 lines · Mostafa Saleh
QEMU doesn's support memory attributes, so FWB is NOP, this might change in the future if memory attributre would be supported.
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 8 ++++++++ 1 file changed, 8 insertions(+)
Quoted 12 lines
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 290
Quoted 9 lines
hw/arm/smmuv3.c +1
-0@@ -287,6 +287,14 @@ static void smmuv3_init_regs(SMMUv3State *s)if (FIELD_EX32 (s->idr[0 ],IDR0 ,S2P )) {/* XNX is a stage-2-specific feature */ s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,XNX ,1 ); +if (FIELD_EX32 (s->idr[0 ],IDR0 ,S1P )) {Why is this check needed?
I thought that only made sense only for nested SMMUs, but I guess in practice it’s not important for qemu and Linux doesn’t use it, I can just drop this patch.
Thanks,
Mostafa
Quoted 20 lines
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 292
Quoted 3 lines
hw/arm/smmuv3.c +2
-0+/* +* QEMU doesn's support memory attributes, so FWB is NOP, this doesn't
Thanks,
JeanQuoted 11 lines
hw/arm/smmuv3.c +5
-0+* might change in the future if memory attributre would be +* supported. +*/ + s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,FWB ,1 ); + } } s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,RIL ,1 ); s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,BBML ,2 );Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 18/19] hw/arm/smmuv3: Advertise S2FWB
In reply to Eric AugerHi Eric,
Quoted 24 lines · Eric Auger
Hi Mostafa,
Quoted 3 lines · Jean-Philippe Brucker
Quoted 2 lines · Mostafa Saleh
QEMU doesn's support memory attributes, so FWB is NOP, this might change in the future if memory attributre would be supported.
attributes here and below as reported along with v3
Quoted 17 lines
Quoted 11 lines
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmuv3.c | 8 ++++++++ 1 file changed, 8 insertions(+)hw/arm/smmuv3.c +0
-0hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 290
Quoted 4 lines
hw/arm/smmuv3.c +1
-0@@ -287,6 +287,14 @@ static void smmuv3_init_regs(SMMUv3State *s)if (FIELD_EX32 (s->idr[0 ],IDR0 ,S2P )) {/* XNX is a stage-2-specific feature */ s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,XNX ,1 ); +if (FIELD_EX32 (s->idr[0 ],IDR0 ,S1P )) {Why is this check needed?
Quoted 5 lines
Quoted 3 lines
hw/arm/smmuv3.c static void smmuv3_init_regs(SMMUv3State *s) · line 292
Quoted 2 lines
hw/arm/smmuv3.c +2
-0+/* +* QEMU doesn's support memory attributes, so FWB is NOP, this doesn't
I have just seen your reply on my v3 comments. I still do not understand why we expose this bit at this stage.
As I replied to Jean, I will drop this patch for now, we can always add it later, as it doens't add much value.
Thanks,
Mostafa
Quoted 20 lines
Thanks
Eric
Quoted 15 lines
Thanks,
JeanQuoted 11 lines
hw/arm/smmuv3.c +5
-0+* might change in the future if memory attributre would be +* supported. +*/ + s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,FWB ,1 ); + } } s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,RIL ,1 ); s->idr[3 ] =FIELD_DP32 (s->idr[3 ],IDR3 ,BBML ,2 );Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 11/19] hw/arm/smmu-common: Support nested translation
In reply to Mostafa SalehHi Mostafa,
Quoted 71 lines · Mostafa Saleh
Hi Eric,
Quoted 60 lines · Eric Auger
Hi Mostafa,
Quoted 30 lines · Mostafa Saleh
When nested translation is requested, do the following:
- Translate stage-1 table address IPA into PA through stage-2.
- Translate stage-1 table walk output (IPA) through stage-2.
- Create a single TLB entry from stage-1 and stage-2 translations using logic introduced before.For stage-1 table translation, the spec (ARM IHI 0070 F.b) says in:
7.3.12 F_WALK_EABT: Translation of an IPA for Stage 1 descriptor fetch: S2 == 1 (stage 2), CLASS == TSo,
F_WALK_EABTis used which propagtes to CLASS == TT.
smmu_ptw()has a new argument SMMUState which include the TLB as stage-1 table address can be cached in there.Also in
smmu_ptw()a separate path used for nesting to simplify the code, although some logic can be combined.Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmu-common.c | 72 +++++++++++++++++++++++++++++++----- include/hw/arm/smmu-common.h | 2 +- 2 files changed, 64 insertions(+), 10 deletions(-)hw/arm/smmu-common.c +0
-0hw/arm/smmu-common.c SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova) · line 325
Quoted 8 lines
hw/arm/smmu-common.c +5
-0@@ -318,6 +318,38 @@ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova)return NULL ; } +/* Translate stage-1 table address using stage-2 page table. */ +static inline int translate_table_addr_ipa (dma_addr_t *table_addr, +SMMUTransCfg *cfg, +SMMUPTWEventInfo *info, +SMMUState *bs)Nit: in general the SMMUState if the 1st arg, as the most global state.
Quoted 18 lines
hw/arm/smmu-common.c +18
-0+{ +dma_addr_t addr = *table_addr; +SMMUTLBEntry *cached_entry; +int asid; + +/* +* The translation table walks performed from TTB0 or TTB1 are always +* performed in IPA space if stage 2 translations are enabled. +*/ + asid = cfg->asid; + cfg->stage =SMMU_STAGE_2 ; + cfg->asid =-1 ; + cached_entry =smmu_translate (bs, cfg, addr,IOMMU_RO , info); + cfg->asid = asid; + cfg->stage =SMMU_NESTED ; + +if (cached_entry) { + *table_addr =CACHED_ENTRY_TO_ADDR (cached_entry, addr);Quoted 8 lines
hw/arm/smmu-common.c SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova) · line 349
Quoted 6 lines
hw/arm/smmu-common.c +6
-0+return 0 ; + } + + info->stage =SMMU_STAGE_2 ; + info->type =SMMU_PTW_ERR_WALK_EABT ; + info->addr = addr;so I guess also here the recorded address should be the IOVA (Jean's previous comment)?
Quoted 3 lines
This address maps to FetchAddr and not InputAddr, which is set from the calling function, so that should be correct. (besides event type as Jean mentioned it needs be fixed).
Ah OK I mixed them up. Sorry for the noise then
Eric
Quoted 112 lines
Thanks,
MostafaQuoted 108 lines
Eric
Quoted 107 lines
hw/arm/smmu-common.c +34
-9+return -EINVAL ; +} +/** * smmu_ptw_64_s1 - VMSAv8-64 Walk of the page tables for a given IOVA * @cfg: translation config @@ -333,7 +365,8 @@ SMMUTransTableInfo *select_tt(SMMUTransCfg *cfg, dma_addr_t iova)*/ static int smmu_ptw_64_s1 (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info, +SMMUState *bs) {dma_addr_t baseaddr, indexmask;SMMUStage stage = cfg->stage;@@ -381,6 +414,11 @@ static int smmu_ptw_64_s1(SMMUTransCfg *cfg, goto error; } baseaddr =get_table_pte_address (pte, granule_sz); +if (cfg->stage ==SMMU_NESTED ) { +if (translate_table_addr_ipa (&baseaddr, cfg, info, bs)) { + goto error; + } + } level++;continue ; }else if (is_page_pte (pte, level)) {@@ -568,10 +606,8 @@ error:* combine S1 and S2 TLB entries into a single entry. * As a result the S1 entry is overriden with combined data. */ -static void __attribute__((unused))combine_tlb (SMMUTLBEntry *tlbe, -SMMUTLBEntry *tlbe_s2, -dma_addr_t iova, -SMMUTransCfg *cfg) +static void combine_tlb (SMMUTLBEntry *tlbe,SMMUTLBEntry *tlbe_s2, +dma_addr_t iova,SMMUTransCfg *cfg) {if (tlbe_s2->entry.addr_mask < tlbe->entry.addr_mask) { tlbe->entry.addr_mask = tlbe_s2->entry.addr_mask;@@ -596,14 +632,19 @@ static void __attribute__((unused)) combine_tlb(SMMUTLBEntry *tlbe,* @perm: tentative access type * @tlbe: returned entry * @info: ptw event handle +* @bs: smmu state which includes TLB instance * * return 0 on success */ int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info) +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info,SMMUState *bs) { +int ret; +SMMUTLBEntry tlbe_s2; +dma_addr_t ipa; +if (cfg->stage ==SMMU_STAGE_1 ) { -return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info); +return smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info, bs); }else if (cfg->stage ==SMMU_STAGE_2 ) {/* * If bypassing stage 1(or unimplemented), the input address is passed @@ -621,7 +662,20 @@ int smmu_ptw(SMMUTransCfg *cfg, dma_addr_t iova, IOMMUAccessFlags perm,return smmu_ptw_64_s2 (cfg, iova, perm, tlbe, info); } -g_assert_not_reached (); +/* SMMU_NESTED. */ + ret =smmu_ptw_64_s1 (cfg, iova, perm, tlbe, info, bs); +if (ret) { +return ret; + } + + ipa =CACHED_ENTRY_TO_ADDR (tlbe, iova); + ret =smmu_ptw_64_s2 (cfg, ipa, perm, &tlbe_s2, info); +if (ret) { +return ret; + } + +combine_tlb (tlbe, &tlbe_s2, iova, cfg); +return 0 ; } SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr,@@ -677,7 +731,7 @@ SMMUTLBEntry *smmu_translate(SMMUState *bs, SMMUTransCfg *cfg, dma_addr_t addr, } cached_entry =g_new0 (SMMUTLBEntry,1 ); - status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info); + status =smmu_ptw (cfg, aligned_addr, flag, cached_entry, info, bs);if (status) {g_free (cached_entry);return NULL ;include/hw/arm/smmu-common.h +1
-1@@ -185,7 +185,7 @@ static inline uint16_t smmu_get_sid(SMMUDevice *sdev)* pair, according to @cfg translation config */ int smmu_ptw (SMMUTransCfg *cfg,dma_addr_t iova,IOMMUAccessFlags perm, -SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info); +SMMUTLBEntry *tlbe,SMMUPTWEventInfo *info,SMMUState *bs);/*
Re: [PATCH v4 08/19] hw/arm/smmuv3: Translate CD and TT using stage-2 table
In reply to Mostafa SalehHi Mostafa,
Quoted 31 lines · Mostafa Saleh
Quoted 2 lines
In this case I think we're reporting InputAddr as the CD address, but it should be the IOVA
As Eric mentioned this would require some rework to propagate the iova, but what I am more worried about is the readability in that case, may be we can just fixup the event after
smmuv3_get_config()in case of errors, something like:/*
*smmuv3_get_config()Only return translation faults in case of
* nested translation, otherwise it can only returnC_BAD_CD,
*C_BAD_STE,C_BAD_STREAMIDorF_STE_FETCH.
* But in case of translation fault, we need to fixup the
* InputAddr to be the IOVA of the translation as the decode
* functions don't know about it.
*/
static voidsmmuv3_config_fixup_event(SMMUEventInfo *event, hwaddr iova){ switch (event->type) { 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: event->u.f_walk_eabt.addr = iova; break; default: break; } }
Quoted 1 line
What do you think?
Yes, I think that's also what I came up with. Maybe it would be simpler to unconditionally do the fixup at the end of smmuv3_translate() and remove .addr write from smmuv3_do_translate()?
A separate union field "f_common" rather than f_walk_eabt may be clearer.
Thanks,
Jean
Re: [PATCH v4 09/19] hw/arm/smmu-common: Rework TLB lookup for nesting
In reply to Mostafa SalehQuoted 26 lines · Mostafa Saleh
Hi Jean,
Quoted 14 lines · Jean-Philippe Brucker
Quoted 4 lines · Mostafa Saleh
In the next patch,
combine_tlb()will be added which combines 2 TLB entries into one for nested translations, which chooses the granule and level from the smallest entry.Quoted 8 lines
This means that with nested translation, an entry can be cached with the granule of stage-2 and not stage-1.
However, currently, the lookup for an IOVA is done with input stage granule, which is stage-1 for nested configuration, which will not work with the above logic.
This patch reworks lookup in that case, so it falls back to stage-2 granule if no entry is found using stage-1 granule.Quoted 4 lines
Why not initialize
tt_combinedto the minimum granule of stages 1 and 2? It looks like you introduced it for this. I'm wondering if we lookup the wrong IOVA if changing the granule size after the address is masked insmmu_translate()I am not sure I fully understand, but I don’t think that would work as it is not guaranteed that the minimum granule is the one that would be cached, as we might hit block mappings.
Quoted 5 lines
The IOVA at first is masked with the first stage mask for the expected page address, and the lookup logic would mask the address for each level look up, so It should match the alignment of the cached page of that granule and level, and as the combine logic is done with the
aligned_addrit is guaranteed by construction that it has to be aligned with stage-1.
I missed something, this is what I had in mind initially:
* s1 granule is 64k, s2 granule is 4k
* the tlb already contains a translations for IOVA 0x30000, tg=4k
* now we lookup IOVA 0x31000. Masked with the s1 granule, aligned_addr is 0x30000. Not found at first because lookup is with tg=64k, but then we call smmu_iotlb_lookup_all_levels() again with the s2 granule and the same IOVA, which returns the wrong translation
But it's not actually possible, because if cfg->stage == SMMU_NESTED, then in smmu_translate() we end up with
} else {
/* Stage2. */
tt_combined.granule_sz = cfg->s2cfg.granule_sz;So I think the condition
(cfg->stage == SMMU_NESTED) && (cfg->s2cfg.granule_sz != tt->granule_sz)
in this patch is never true?
Then the following scenario:
* s1 granule is 4k, s2 granule is 64k
* we lookup IOVA A, miss. The translation gets cached with granule 4k
* we lookup IOVA A again, but with tt->granule_sz = 64k so we'll never find the entry?
I guess we want to start the lookup with the smallest granule, and then if the s1 and s2 granules differ, retry with the other one. Or with SMMU_NESTED, start with the s1 granule and keep this patch to fallback to s2 granule, but without masking the IOVA in smmu_translate() (it will be masked correctly by smmu_iotlb_lookup_all_levels()).
Thanks,
Jean
Quoted 71 lines
Thanks,
MostafaQuoted 67 lines
Thanks,
JeanQuoted 63 lines
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmu-common.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)hw/arm/smmu-common.c +34
-2@@ -66,8 +66,10 @@ SMMUIOTLBKey smmu_get_iotlb_key(int asid, int vmid, uint64_t iova,return key; } -SMMUTLBEntry *smmu_iotlb_lookup (SMMUState *bs,SMMUTransCfg *cfg, -SMMUTransTableInfo *tt,hwaddr iova) +static SMMUTLBEntry *smmu_iotlb_lookup_all_levels (SMMUState *bs, +SMMUTransCfg *cfg, +SMMUTransTableInfo *tt, +hwaddr iova) {uint8_t tg = (tt->granule_sz -10 ) /2 ;uint8_t inputsize =64 - tt->tsz;@@ -88,6 +90,36 @@ SMMUTLBEntry *smmu_iotlb_lookup(SMMUState *bs, SMMUTransCfg *cfg, } level++; } +return entry; +} + +/** +* smmu_iotlb_lookup - Look up for a TLB entry. +* @bs: SMMU state which includes the TLB instance +* @cfg: Configuration of the translation +* @tt: Translation table info (granule and tsz) +* @iova: IOVA address to lookup +* +* returns a valid entry on success, otherwise NULL. +* In case of nested translation, tt can be updated to include +* the granule of the found entry as it might different from +* the IOVA granule. +*/ +SMMUTLBEntry *smmu_iotlb_lookup (SMMUState *bs,SMMUTransCfg *cfg, +SMMUTransTableInfo *tt,hwaddr iova) +{ +SMMUTLBEntry *entry =NULL ; + + entry =smmu_iotlb_lookup_all_levels (bs, cfg, tt, iova); +/* +* For nested translation also try the s2 granule, as the TLB will insert +* it if the size of s2 tlb entry was smaller. +*/ +if (!entry && (cfg->stage ==SMMU_NESTED ) && + (cfg->s2cfg.granule_sz != tt->granule_sz)) { + tt->granule_sz = cfg->s2cfg.granule_sz; + entry =smmu_iotlb_lookup_all_levels (bs, cfg, tt, iova); + }if (entry) { cfg->iotlb_hits++;Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 09/19] hw/arm/smmu-common: Rework TLB lookup for nesting
Hi Jean,
Quoted 33 lines · Jean-Philippe Brucker
Quoted 26 lines · Mostafa Saleh
Hi Jean,
Quoted 14 lines · Jean-Philippe Brucker
Quoted 4 lines · Mostafa Saleh
In the next patch,
combine_tlb()will be added which combines 2 TLB entries into one for nested translations, which chooses the granule and level from the smallest entry.Quoted 8 lines
This means that with nested translation, an entry can be cached with the granule of stage-2 and not stage-1.
However, currently, the lookup for an IOVA is done with input stage granule, which is stage-1 for nested configuration, which will not work with the above logic.
This patch reworks lookup in that case, so it falls back to stage-2 granule if no entry is found using stage-1 granule.Quoted 4 lines
Why not initialize
tt_combinedto the minimum granule of stages 1 and 2? It looks like you introduced it for this. I'm wondering if we lookup the wrong IOVA if changing the granule size after the address is masked insmmu_translate()I am not sure I fully understand, but I don’t think that would work as it is not guaranteed that the minimum granule is the one that would be cached, as we might hit block mappings.
Quoted 5 lines
The IOVA at first is masked with the first stage mask for the expected page address, and the lookup logic would mask the address for each level look up, so It should match the alignment of the cached page of that granule and level, and as the combine logic is done with the
aligned_addrit is guaranteed by construction that it has to be aligned with stage-1.
Quoted 8 lines
I missed something, this is what I had in mind initially:
* s1 granule is 64k, s2 granule is 4k
* the tlb already contains a translations for IOVA0x30000, tg=4k
* now we lookup IOVA0x31000. Masked with the s1 granule,aligned_addris0x30000. Not found at first because lookup is with tg=64k, but then we callsmmu_iotlb_lookup_all_levels()again with the s2 granule and the same IOVA, which returns the wrong translation
If the granules are s1=64k, s2=4k, the only way we get a cached entry as (IOVA 0x30000, tg=4k) would be for s2 and level-3 as for level-2 it has to be aligned with 0x200000
So when we look up for 0x31000, there is no entry for it anyway.
But I can see some problems here:
In case also s1 granule is 64k, s2 granule is 4k
- Translation A: 0x31000
- TLB is empty => PTW, entry s1 = 64k 0x30000, s2 = 4k, 0x30000 and the cached entry would be 0x30000,tg=4k as the combine logic also uses the aligned address
- Translation B: 0x31000 => also misses as the only cached entry is 0x30000, 4k
I think this is actually a bug and not just a TLB inefficiency, I need to think more about it, but my initial thought is not to align the iova until it’s used by a stage so it can use its granule.
Quoted 8 lines
But it's not actually possible, because if
cfg->stage==SMMU_NESTED, then insmmu_translate()we end up with} else { /* Stage2. */ tt_combined.granule_sz = cfg->s2cfg.granule_sz;
Quoted 6 lines
So I think the condition
(cfg->stage == SMMU_NESTED) && (cfg->s2cfg.granule_sz != tt->granule_sz)in this patch is never true?
Ah, that’s a bug, I will fix it, NESTED should use stage-1 granule.
Quoted 9 lines
Then the following scenario:
* s1 granule is 4k, s2 granule is 64k
* we lookup IOVA A, miss. The translation gets cached with granule 4k
* we lookup IOVA A again, but withtt->granule_sz= 64k so we'll never find the entry?
Quoted 5 lines
I guess we want to start the lookup with the smallest granule, and then if the s1 and s2 granules differ, retry with the other one. Or with
SMMU_NESTED, start with the s1 granule and keep this patch to fallback to s2 granule, but without masking the IOVA insmmu_translate()(it will be masked correctly bysmmu_iotlb_lookup_all_levels()).
Thanks for pointing that out, I will think more about it but I sense that we would need to modify where we align the iova, for translation and lookup.
Thanks,
Mostafa
Quoted 75 lines
Thanks,
JeanQuoted 71 lines
Thanks,
MostafaQuoted 67 lines
Thanks,
JeanQuoted 63 lines
Signed-off-by Mostafa Saleh <[email protected]>--- hw/arm/smmu-common.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)hw/arm/smmu-common.c +34
-2@@ -66,8 +66,10 @@ SMMUIOTLBKey smmu_get_iotlb_key(int asid, int vmid, uint64_t iova,return key; } -SMMUTLBEntry *smmu_iotlb_lookup (SMMUState *bs,SMMUTransCfg *cfg, -SMMUTransTableInfo *tt,hwaddr iova) +static SMMUTLBEntry *smmu_iotlb_lookup_all_levels (SMMUState *bs, +SMMUTransCfg *cfg, +SMMUTransTableInfo *tt, +hwaddr iova) {uint8_t tg = (tt->granule_sz -10 ) /2 ;uint8_t inputsize =64 - tt->tsz;@@ -88,6 +90,36 @@ SMMUTLBEntry *smmu_iotlb_lookup(SMMUState *bs, SMMUTransCfg *cfg, } level++; } +return entry; +} + +/** +* smmu_iotlb_lookup - Look up for a TLB entry. +* @bs: SMMU state which includes the TLB instance +* @cfg: Configuration of the translation +* @tt: Translation table info (granule and tsz) +* @iova: IOVA address to lookup +* +* returns a valid entry on success, otherwise NULL. +* In case of nested translation, tt can be updated to include +* the granule of the found entry as it might different from +* the IOVA granule. +*/ +SMMUTLBEntry *smmu_iotlb_lookup (SMMUState *bs,SMMUTransCfg *cfg, +SMMUTransTableInfo *tt,hwaddr iova) +{ +SMMUTLBEntry *entry =NULL ; + + entry =smmu_iotlb_lookup_all_levels (bs, cfg, tt, iova); +/* +* For nested translation also try the s2 granule, as the TLB will insert +* it if the size of s2 tlb entry was smaller. +*/ +if (!entry && (cfg->stage ==SMMU_NESTED ) && + (cfg->s2cfg.granule_sz != tt->granule_sz)) { + tt->granule_sz = cfg->s2cfg.granule_sz; + entry =smmu_iotlb_lookup_all_levels (bs, cfg, tt, iova); + }if (entry) { cfg->iotlb_hits++;Signature · 1 line
2.45.2.803.g4e1b14247a-goog
Re: [PATCH v4 08/19] hw/arm/smmuv3: Translate CD and TT using stage-2 table
In reply to Jean-Philippe BruckerHi Jean,
Quoted 34 lines · Jean-Philippe Brucker
Hi Mostafa,
Quoted 31 lines · Mostafa Saleh
Quoted 2 lines
In this case I think we're reporting InputAddr as the CD address, but it should be the IOVA
As Eric mentioned this would require some rework to propagate the iova, but what I am more worried about is the readability in that case, may be we can just fixup the event after
smmuv3_get_config()in case of errors, something like:/*
*smmuv3_get_config()Only return translation faults in case of
* nested translation, otherwise it can only returnC_BAD_CD,
*C_BAD_STE,C_BAD_STREAMIDorF_STE_FETCH.
* But in case of translation fault, we need to fixup the
* InputAddr to be the IOVA of the translation as the decode
* functions don't know about it.
*/
static voidsmmuv3_config_fixup_event(SMMUEventInfo *event, hwaddr iova){ switch (event->type) { 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: event->u.f_walk_eabt.addr = iova; break; default: break; } }
Quoted 5 lines
Quoted 1 line
What do you think?
Yes, I think that's also what I came up with. Maybe it would be simpler to unconditionally do the fixup at the end of
smmuv3_translate()and remove .addr write fromsmmuv3_do_translate()?
I wanted to make it clear what case causes the IOVA to be missing, but I guess if we unify the setup for the InputAddr it would be easier to read and just add a comment instead.
Quoted 3 lines
A separate union field "
f_common" rather thanf_walk_eabtmay be clearer.
Makes sense, but I will not do it in this patch to avoid making it larger and harder to review, and this can be a separate cleanup as I see in other places we use eabt already (smmuv3_record_event and for s2 population).
Thanks,
Mostafa
Quoted 2 lines
Thanks,
Jean