intel_iommu: TM field should not be in reserved bits
PATCH v2 1/1 intel_iommu: TM field should not be in reserved bits
From: "Zhang, Qi" <[email protected]>
When dt is supported, TM field should not be Reserved(0).
Refer to VT-d Spec 9.8
--- hw/i386/intel_iommu.c | 12 ++++++------ hw/i386/intel_iommu_internal.h | 25 +++++++++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-)
---
Changelog V2:
move dt_supported flag to VTD_SPTE_PAGE_LX_RSVD_MASK and VTD_SPTE_LPAGE_LX_RSVD_MASK
hw/i386/intel_iommu.c +6 -6
@@ -3548,13 +3548,13 @@ static void vtd_init(IntelIOMMUState *s)* Rsvd field masks for spte */ vtd_paging_entry_rsvd_field[0 ] = ~0ULL ; - vtd_paging_entry_rsvd_field[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[3 ] =VTD_SPTE_PAGE_L3_RSVD_MASK (s->aw_bits); + vtd_paging_entry_rsvd_field[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[3 ] =VTD_SPTE_PAGE_L3_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); vtd_paging_entry_rsvd_field[4 ] =VTD_SPTE_PAGE_L4_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[5 ] =VTD_SPTE_LPAGE_L1_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[6 ] =VTD_SPTE_LPAGE_L2_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[7 ] =VTD_SPTE_LPAGE_L3_RSVD_MASK (s->aw_bits); + vtd_paging_entry_rsvd_field[5 ] =VTD_SPTE_LPAGE_L1_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[6 ] =VTD_SPTE_LPAGE_L2_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[7 ] =VTD_SPTE_LPAGE_L3_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); vtd_paging_entry_rsvd_field[8 ] =VTD_SPTE_LPAGE_L4_RSVD_MASK (s->aw_bits);if (x86_iommu_ir_supported (x86_iommu)) {
hw/i386/intel_iommu_internal.h +19 -6
@@ -387,19 +387,31 @@ typedef union VTDInvDesc VTDInvDesc;#define VTD_INV_DESC_DEVICE_IOTLB_RSVD_LO 0xffff0000ffe0fff8/* Rsvd field masks for spte */ -#define VTD_SPTE_PAGE_L1_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L1_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_PAGE_L2_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L2_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_PAGE_L3_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L3_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))#define VTD_SPTE_PAGE_L4_RSVD_MASK (aw) \ (0x880ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_LPAGE_L1_RSVD_MASK (aw) \ +#define VTD_SPTE_LPAGE_L1_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_LPAGE_L2_RSVD_MASK (aw) \ +#define VTD_SPTE_LPAGE_L2_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x1ff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x1ff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_LPAGE_L3_RSVD_MASK (aw) \ +#define VTD_SPTE_LPAGE_L3_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x3ffff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x3ffff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))#define VTD_SPTE_LPAGE_L4_RSVD_MASK (aw) \ (0x880ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))
@@ -506,5 +518,6 @@ typedef struct VTDRootEntry VTDRootEntry;#define VTD_SL_W (1ULL << 1)#define VTD_SL_PT_BASE_ADDR_MASK (aw) (~(VTD_PAGE_SIZE - 1) & VTD_HAW_MASK(aw))#define VTD_SL_IGN_COM 0xbff0000000000000ULL +#define VTD_SL_TM (1ULL << 62)#endif
Signature · 1 line
2.20.1
Quoted 28 lines · On Fri, Sep 27, 2019 at 12:58:38PM +0800, [email protected] wrote:
From: "Zhang, Qi" <[email protected]>
When dt is supported, TM field should not be Reserved(0).
Refer to VT-d Spec 9.8
Signed-off-by Zhang, Qi <[email protected]>Signed-off-by Qi, Yadong <[email protected]>--- hw/i386/intel_iommu.c | 12 ++++++------ hw/i386/intel_iommu_internal.h | 25 +++++++++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-)---
Changelog V2:
movedt_supportedflag toVTD_SPTE_PAGE_LX_RSVD_MASKandVTD_SPTE_LPAGE_LX_RSVD_MASKhw/i386/intel_iommu.c +1
-3@@ -3548,13 +3548,13 @@ static void vtd_init(IntelIOMMUState *s)* Rsvd field masks for spte */ vtd_paging_entry_rsvd_field[0 ] = ~0ULL ; - vtd_paging_entry_rsvd_field[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[3 ] =VTD_SPTE_PAGE_L3_RSVD_MASK (s->aw_bits); + vtd_paging_entry_rsvd_field[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported);
hw/i386/intel_iommu.c static void vtd_init(IntelIOMMUState *s) · line 3558
Quoted 10 lines
hw/i386/intel_iommu.c +5
-3+ vtd_paging_entry_rsvd_field[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[3 ] =VTD_SPTE_PAGE_L3_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); vtd_paging_entry_rsvd_field[4 ] =VTD_SPTE_PAGE_L4_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[5 ] =VTD_SPTE_LPAGE_L1_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[6 ] =VTD_SPTE_LPAGE_L2_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[7 ] =VTD_SPTE_LPAGE_L3_RSVD_MASK (s->aw_bits); + vtd_paging_entry_rsvd_field[5 ] =VTD_SPTE_LPAGE_L1_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[6 ] =VTD_SPTE_LPAGE_L2_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[7 ] =VTD_SPTE_LPAGE_L3_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); vtd_paging_entry_rsvd_field[8 ] =VTD_SPTE_LPAGE_L4_RSVD_MASK (s->aw_bits);
Should this TM bit only affects leaves? Say, entry 1 (4K), 5 (2M), 6 (1G). While this reminded me that I'm totally confused on why we have had entry 7, 8 after all... Are they really used?
Quoted 7 lines
hw/i386/intel_iommu.c +0
-0if (x86_iommu_ir_supported (x86_iommu)) {hw/i386/intel_iommu_internal.h +0
-0
hw/i386/intel_iommu_internal.h typedef union VTDInvDesc VTDInvDesc; · line 393
Quoted 8 lines
hw/i386/intel_iommu_internal.h +3
-1@@ -387,19 +387,31 @@ typedef union VTDInvDesc VTDInvDesc;#define VTD_INV_DESC_DEVICE_IOTLB_RSVD_LO 0xffff0000ffe0fff8/* Rsvd field masks for spte */ -#define VTD_SPTE_PAGE_L1_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L1_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))
This seems strange too in that ~VTD_HAW_MASK(aw) probably covered bits 63-48 for aw==48 case so it should already cover VTD_SL_TM?
Meanwhile when I'm reading the spec I see at least bits 61-52 ignored rather than reserved.
Thanks,
Quoted 40 lines
hw/i386/intel_iommu_internal.h +16
-5-#define VTD_SPTE_PAGE_L2_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L2_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_PAGE_L3_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L3_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))#define VTD_SPTE_PAGE_L4_RSVD_MASK (aw) \ (0x880ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_LPAGE_L1_RSVD_MASK (aw) \ +#define VTD_SPTE_LPAGE_L1_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_LPAGE_L2_RSVD_MASK (aw) \ +#define VTD_SPTE_LPAGE_L2_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x1ff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x1ff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_LPAGE_L3_RSVD_MASK (aw) \ +#define VTD_SPTE_LPAGE_L3_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x3ffff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x3ffff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))#define VTD_SPTE_LPAGE_L4_RSVD_MASK (aw) \ (0x880ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))@@ -506,5 +518,6 @@ typedef struct VTDRootEntry VTDRootEntry;#define VTD_SL_W (1ULL << 1)#define VTD_SL_PT_BASE_ADDR_MASK (aw) (~(VTD_PAGE_SIZE - 1) & VTD_HAW_MASK(aw))#define VTD_SL_IGN_COM 0xbff0000000000000ULL +#define VTD_SL_TM (1ULL << 62)#endif Signature · 1 line
2.20.1
Signature · 1 line
Peter Xu
Quoted 69 lines
-----Original Message-----
From: Peter Xu <[email protected]>
Sent: Friday, September 27, 2019 2:10 PM
To: Zhang, Qi1 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH V2]intel_iommu: TM field should not be in reserved bitsQuoted 39 lines · On Fri, Sep 27, 2019 at 12:58:38PM +0800, [email protected] wrote:
From: "Zhang, Qi" <[email protected]>
When dt is supported, TM field should not be Reserved(0).
Refer to VT-d Spec 9.8
Signed-off-by Zhang, Qi <[email protected]>Signed-off-by Qi, Yadong <[email protected]>--- hw/i386/intel_iommu.c | 12 ++++++------ hw/i386/intel_iommu_internal.h | 25 +++++++++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-)---
Changelog V2:
movedt_supportedflag toVTD_SPTE_PAGE_LX_RSVD_MASKandVTD_SPTE_LPAGE_LX_RSVD_MASKhw/i386/intel_iommu.c index renamed from hw/i386/intel_iommu.c +0
-0
f1de8fdb75..35222cf55c100644hw/i386/intel_iommu.c +4
-3@@ -3548,13 +3548,13 @@ static void vtd_init(IntelIOMMUState *s)* Rsvd field masks for spte */ vtd_paging_entry_rsvd_field[0 ] = ~0ULL ; - vtd_paging_entry_rsvd_field[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s- aw_bits); - vtd_paging_entry_rsvd_field[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s- aw_bits); - vtd_paging_entry_rsvd_field[3 ] =VTD_SPTE_PAGE_L3_RSVD_MASK (s- aw_bits); + vtd_paging_entry_rsvd_field[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s- aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s- aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[3 ] = +VTD_SPTE_PAGE_L3_RSVD_MASK (s->aw_bits, x86_iommu- dt_supported); vtd_paging_entry_rsvd_field[4] = VTD_SPTE_PAGE_L4_RSVD_MASK(s-Quoted 8 lines
aw_bits);
- vtd_paging_entry_rsvd_field[5] = VTD_SPTE_LPAGE_L1_RSVD_MASK(s-aw_bits);
- vtd_paging_entry_rsvd_field[6] = VTD_SPTE_LPAGE_L2_RSVD_MASK(s-aw_bits);
- vtd_paging_entry_rsvd_field[7] = VTD_SPTE_LPAGE_L3_RSVD_MASK(s-aw_bits);
+ vtd_paging_entry_rsvd_field[5] =VTD_SPTE_LPAGE_L1_RSVD_MASK(s->aw_bits, x86_iommu-
Quoted 2 lines
dt_supported);
+ vtd_paging_entry_rsvd_field[6] =VTD_SPTE_LPAGE_L2_RSVD_MASK(s->aw_bits, x86_iommu-
Quoted 6 lines
dt_supported);
+ vtd_paging_entry_rsvd_field[7] =
+VTD_SPTE_LPAGE_L3_RSVD_MASK(s->aw_bits, x86_iommu- dt_supported); vtd_paging_entry_rsvd_field[8] =VTD_SPTE_LPAGE_L4_RSVD_MASK(s->aw_bits);
Quoted 3 lines
Should this TM bit only affects leaves? Say, entry 1 (4K), 5 (2M), 6 (1G). While this reminded me that I'm totally confused on why we have had entry 7, 8 after all... Are they really used?
Yes. TM bit only affects. To this array, index 1, 5,6,7 may be leaf. Will update a new patchset for it.
Quoted 16 lines
Quoted 11 lines
if (x86_iommu_ir_supported(x86_iommu)) { diff --git
a/hw/i386/intel_iommu_internal.hb/hw/i386/intel_iommu_internal.hindexc1235a7063..01f1aa6c86100644hw/i386/intel_iommu_internal.h +0
-0@@ -387,19 +387,31 @@ typedef union VTDInvDesc VTDInvDesc; #define
VTD_INV_DESC_DEVICE_IOTLB_RSVD_LO0xffff0000ffe0fff8/* Rsvd field masks for spte */
hw/i386/intel_iommu_internal.h typedef union VTDInvDesc VTDInvDesc;
Quoted 4 lines
hw/i386/intel_iommu_internal.h +3
-1-#define VTD_SPTE_PAGE_L1_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L1_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM |
VTD_SL_TM))
Quoted 5 lines
Quoted 2 lines
+: \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))This seems strange too in that ~VTD_HAW_MASK(aw) probably covered bits 63-48 for aw==48 case so it should already cover
VTD_SL_TM?
VTD_SL_IGN_COM 0xbff0000000000000ULL, TM field is cleared by ~ VTD_SL_IGN_COM
Quoted 3 lines
Meanwhile when I'm reading the spec I see at least bits 61-52 ignored rather than reserved.
Yes. Bit 61~52 is ignored. Such as the index 5 of this array is 0xfff8000000800.
Quoted 57 lines
Thanks,
hw/i386/intel_iommu_internal.h typedef union VTDInvDesc VTDInvDesc;
Quoted 4 lines
hw/i386/intel_iommu_internal.h +3
-1-#define VTD_SPTE_PAGE_L2_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L2_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM |
VTD_SL_TM))hw/i386/intel_iommu_internal.h typedef union VTDInvDesc VTDInvDesc;
Quoted 6 lines
+: \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define
VTD_SPTE_PAGE_L3_RSVD_MASK(aw)\hw/i386/intel_iommu_internal.h +3
-0+#define VTD_SPTE_PAGE_L3_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM |
VTD_SL_TM))hw/i386/intel_iommu_internal.h typedef union VTDInvDesc VTDInvDesc;
Quoted 8 lines
+: \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) #define VTD_SPTE_PAGE_L4_RSVD_MASK(aw) \ (0x880ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define
VTD_SPTE_LPAGE_L1_RSVD_MASK(aw)\hw/i386/intel_iommu_internal.h +3
-0+#define VTD_SPTE_LPAGE_L1_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM |
VTD_SL_TM))hw/i386/intel_iommu_internal.h
Quoted 8 lines
+: \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define
VTD_SPTE_LPAGE_L2_RSVD_MASK(aw)\hw/i386/intel_iommu_internal.h +4
-0+#define VTD_SPTE_LPAGE_L2_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x1ff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | +VTD_SL_TM)) : \ (0x1ff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define
Quoted 8 lines
VTD_SPTE_LPAGE_L3_RSVD_MASK(aw)\hw/i386/intel_iommu_internal.h +4
-0+#define VTD_SPTE_LPAGE_L3_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x3ffff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | +VTD_SL_TM)) : \ (0x3ffff800ULL | ~(VTD_HAW_MASK (aw) |VTD_SL_IGN_COM ))#define VTD_SPTE_LPAGE_L4_RSVD_MASK(aw) \ (0x880ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) @@ -506,5
Quoted 3 lines
+518,6 @@ typedef struct VTDRootEntry VTDRootEntry;
#defineVTD_SL_W(1ULL << 1)
#defineVTD_SL_PT_BASE_ADDR_MASK(aw)(~(VTD_PAGE_SIZE - 1) &
VTD_HAW_MASK(aw))Quoted 8 lines
#define
VTD_SL_IGN_COM0xbff0000000000000ULL
+#defineVTD_SL_TM(1ULL << 62)#endif
--
2.20.1--
Peter Xu
Quoted 69 lines · On Fri, Sep 27, 2019 at 08:03:21AM +0000, Zhang, Qi1 wrote:
Quoted 69 lines
-----Original Message-----
From: Peter Xu <[email protected]>
Sent: Friday, September 27, 2019 2:10 PM
To: Zhang, Qi1 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH V2]intel_iommu: TM field should not be in reserved bitsQuoted 39 lines · On Fri, Sep 27, 2019 at 12:58:38PM +0800, [email protected] wrote:
From: "Zhang, Qi" <[email protected]>
When dt is supported, TM field should not be Reserved(0).
Refer to VT-d Spec 9.8
Signed-off-by Zhang, Qi <[email protected]>Signed-off-by Qi, Yadong <[email protected]>--- hw/i386/intel_iommu.c | 12 ++++++------ hw/i386/intel_iommu_internal.h | 25 +++++++++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-)---
Changelog V2:
movedt_supportedflag toVTD_SPTE_PAGE_LX_RSVD_MASKandVTD_SPTE_LPAGE_LX_RSVD_MASKhw/i386/intel_iommu.c index renamed from hw/i386/intel_iommu.c +0
-0
f1de8fdb75..35222cf55c100644hw/i386/intel_iommu.c +4
-3@@ -3548,13 +3548,13 @@ static void vtd_init(IntelIOMMUState *s)* Rsvd field masks for spte */ vtd_paging_entry_rsvd_field[0 ] = ~0ULL ; - vtd_paging_entry_rsvd_field[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s- aw_bits); - vtd_paging_entry_rsvd_field[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s- aw_bits); - vtd_paging_entry_rsvd_field[3 ] =VTD_SPTE_PAGE_L3_RSVD_MASK (s- aw_bits); + vtd_paging_entry_rsvd_field[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s- aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s- aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[3 ] = +VTD_SPTE_PAGE_L3_RSVD_MASK (s->aw_bits, x86_iommu- dt_supported); vtd_paging_entry_rsvd_field[4] = VTD_SPTE_PAGE_L4_RSVD_MASK(s-Quoted 8 lines
aw_bits);
- vtd_paging_entry_rsvd_field[5] = VTD_SPTE_LPAGE_L1_RSVD_MASK(s-aw_bits);
- vtd_paging_entry_rsvd_field[6] = VTD_SPTE_LPAGE_L2_RSVD_MASK(s-aw_bits);
- vtd_paging_entry_rsvd_field[7] = VTD_SPTE_LPAGE_L3_RSVD_MASK(s-aw_bits);
+ vtd_paging_entry_rsvd_field[5] =VTD_SPTE_LPAGE_L1_RSVD_MASK(s->aw_bits, x86_iommu-
Quoted 2 lines
dt_supported);
+ vtd_paging_entry_rsvd_field[6] =VTD_SPTE_LPAGE_L2_RSVD_MASK(s->aw_bits, x86_iommu-
Quoted 6 lines
dt_supported);
+ vtd_paging_entry_rsvd_field[7] =
+VTD_SPTE_LPAGE_L3_RSVD_MASK(s->aw_bits, x86_iommu- dt_supported); vtd_paging_entry_rsvd_field[8] =VTD_SPTE_LPAGE_L4_RSVD_MASK(s->aw_bits);
Quoted 4 lines
Quoted 3 lines
Should this TM bit only affects leaves? Say, entry 1 (4K), 5 (2M), 6 (1G). While this reminded me that I'm totally confused on why we have had entry 7, 8 after all... Are they really used?
Yes. TM bit only affects. To this array, index 1, 5,6,7 may be leaf. Will update a new patchset for it.
Could I ask why index 7 may be leaf?
Quoted 19 lines
Quoted 19 lines
Quoted 11 lines
if (x86_iommu_ir_supported(x86_iommu)) { diff --git
a/hw/i386/intel_iommu_internal.hb/hw/i386/intel_iommu_internal.hindexc1235a7063..01f1aa6c86100644hw/i386/intel_iommu_internal.h +0
-0@@ -387,19 +387,31 @@ typedef union VTDInvDesc VTDInvDesc; #define
VTD_INV_DESC_DEVICE_IOTLB_RSVD_LO0xffff0000ffe0fff8/* Rsvd field masks for spte */
hw/i386/intel_iommu_internal.h typedef union VTDInvDesc VTDInvDesc;
Quoted 4 lines
hw/i386/intel_iommu_internal.h +3
-1-#define VTD_SPTE_PAGE_L1_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L1_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM |
VTD_SL_TM))Quoted 2 lines
+: \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))
Quoted 7 lines
Quoted 2 lines
This seems strange too in that ~VTD_HAW_MASK(aw) probably covered bits 63-48 for aw==48 case so it should already cover
VTD_SL_TM?
VTD_SL_IGN_COM0xbff0000000000000ULL, TM field is cleared by ~VTD_SL_IGN_COMQuoted 3 lines
Meanwhile when I'm reading the spec I see at least bits 61-52 ignored rather than reserved.
Yes. Bit 61~52 is ignored. Such as the index 5 of this array is
0xfff8000000800.
Oops, my poor eye obviously didn't see that the "~" operator is applied over the whole (VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)... :)
Btw, you should only touch up the macros that are leaves here. Non-leaves should still keep that bit as reserved.
Thanks,
Signature · 1 line
Peter Xu
Quoted 52 lines
-----Original Message-----
From: Peter Xu <[email protected]>
Sent: Friday, September 27, 2019 5:32 PM
To: Zhang, Qi1 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Qi, Yadong <[email protected]>
Subject: Re: [PATCH V2]intel_iommu: TM field should not be in reserved bitsQuoted 18 lines · On Fri, Sep 27, 2019 at 08:03:21AM +0000, Zhang, Qi1 wrote:
Quoted 18 lines
-----Original Message-----
From: Peter Xu <[email protected]>
Sent: Friday, September 27, 2019 2:10 PM
To: Zhang, Qi1 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH V2]intel_iommu: TM field should not be in reserved bitsQuoted 6 lines · On Fri, Sep 27, 2019 at 12:58:38PM +0800, [email protected] wrote:
From: "Zhang, Qi" <[email protected]>
When dt is supported, TM field should not be Reserved(0).
Refer to VT-d Spec 9.8
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Signed-off-by Zhang, Qi <[email protected]>Signed-off-by Qi, Yadong <[email protected]>--- hw/i386/intel_iommu.c | 12 ++++++------ hw/i386/intel_iommu_internal.h | 25 +++++++++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-)---
VTD_SPTE_PAGE_L2_RSVD_MASK(s-
Quoted 15 lines
Quoted 15 lines
Quoted 4 lines
aw_bits);
- vtd_paging_entry_rsvd_field[3] =aw_bits);
+ vtd_paging_entry_rsvd_field[5] =VTD_SPTE_LPAGE_L1_RSVD_MASK(s->aw_bits, x86_iommu-
Quoted 2 lines
dt_supported);
+ vtd_paging_entry_rsvd_field[6] =VTD_SPTE_LPAGE_L2_RSVD_MASK(s->aw_bits, x86_iommu-
Quoted 6 lines
dt_supported);
+ vtd_paging_entry_rsvd_field[7] =
+VTD_SPTE_LPAGE_L3_RSVD_MASK(s->aw_bits, x86_iommu- dt_supported); vtd_paging_entry_rsvd_field[8] =VTD_SPTE_LPAGE_L4_RSVD_MASK(s->aw_bits);
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
Should this TM bit only affects leaves? Say, entry 1 (4K), 5 (2M), 6 (1G). While this reminded me that I'm totally confused on why we have had entry 7, 8 after all... Are they really used?
Yes. TM bit only affects. To this array, index 1, 5,6,7 may be leaf. Will update
a new patchset for it.
Could I ask why index 7 may be leaf?
Index 7 is PDPE 1G GB leaf.
Quoted 28 lines
Quoted 28 lines
Quoted 17 lines
Quoted 9 lines
if (x86_iommu_ir_supported(x86_iommu)) { diff --git
a/hw/i386/intel_iommu_internal.hb/hw/i386/intel_iommu_internal.hindexc1235a7063..01f1aa6c86100644hw/i386/intel_iommu_internal.h typedef union VTDInvDesc VTDInvDesc; · line 392
Quoted 7 lines
hw/i386/intel_iommu_internal.h +3
-1@@ -387,19 +387,31 @@ typedef union VTDInvDesc VTDInvDesc;#define VTD_INV_DESC_DEVICE_IOTLB_RSVD_LO 0xffff0000ffe0fff8/* Rsvd field masks for spte */ -#define VTD_SPTE_PAGE_L1_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L1_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM |
VTD_SL_TM))Quoted 6 lines
hw/i386/intel_iommu_internal.h typedef union VTDInvDesc VTDInvDesc; · line 394
Quoted 2 lines
hw/i386/intel_iommu_internal.h +1
-0+: \ (0x800ULL | ~(VTD_HAW_MASK (aw) |VTD_SL_IGN_COM ))This seems strange too in that ~VTD_HAW_MASK(aw) probably covered bits
63-48 for aw==48 case so it should already coverVTD_SL_TM?
VTD_SL_IGN_COM0xbff0000000000000ULL, TM field is cleared by ~VTD_SL_IGN_COMQuoted 3 lines
Meanwhile when I'm reading the spec I see at least bits 61-52 ignored rather than reserved.
Quoted 7 lines
Quoted 1 line
Yes. Bit 61~52 is ignored. Such as the index 5 of this array is
0xfff8000000800.Oops, my poor eye obviously didn't see that the "~" operator is applied over the whole (
VTD_HAW_MASK(aw)|VTD_SL_IGN_COM)... :)Btw, you should only touch up the macros that are leaves here. Non-leaves should still keep that bit as reserved.
Yes. I will.
Quoted 5 lines
Thanks,
--
Peter Xu
Quoted 45 lines · On Sun, Sep 29, 2019 at 01:11:12AM +0000, Zhang, Qi1 wrote:
Quoted 45 lines
-----Original Message-----
From: Peter Xu <[email protected]>
Sent: Friday, September 27, 2019 5:32 PM
To: Zhang, Qi1 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Qi, Yadong <[email protected]>
Subject: Re: [PATCH V2]intel_iommu: TM field should not be in reserved bitsQuoted 18 lines · On Fri, Sep 27, 2019 at 08:03:21AM +0000, Zhang, Qi1 wrote:
Quoted 18 lines
-----Original Message-----
From: Peter Xu <[email protected]>
Sent: Friday, September 27, 2019 2:10 PM
To: Zhang, Qi1 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH V2]intel_iommu: TM field should not be in reserved bitsQuoted 6 lines · On Fri, Sep 27, 2019 at 12:58:38PM +0800, [email protected] wrote:
From: "Zhang, Qi" <[email protected]>
When dt is supported, TM field should not be Reserved(0).
Refer to VT-d Spec 9.8
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Signed-off-by Zhang, Qi <[email protected]>Signed-off-by Qi, Yadong <[email protected]>--- hw/i386/intel_iommu.c | 12 ++++++------ hw/i386/intel_iommu_internal.h | 25 +++++++++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-)---
VTD_SPTE_PAGE_L2_RSVD_MASK(s-
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
aw_bits);
- vtd_paging_entry_rsvd_field[3] =aw_bits);
+ vtd_paging_entry_rsvd_field[5] =VTD_SPTE_LPAGE_L1_RSVD_MASK(s->aw_bits, x86_iommu-
Quoted 2 lines
dt_supported);
+ vtd_paging_entry_rsvd_field[6] =VTD_SPTE_LPAGE_L2_RSVD_MASK(s->aw_bits, x86_iommu-
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
dt_supported);
+ vtd_paging_entry_rsvd_field[7] =
+VTD_SPTE_LPAGE_L3_RSVD_MASK(s->aw_bits, x86_iommu- dt_supported); vtd_paging_entry_rsvd_field[8] =VTD_SPTE_LPAGE_L4_RSVD_MASK(s->aw_bits);Should this TM bit only affects leaves? Say, entry 1 (4K), 5 (2M), 6 (1G).
[1]
Quoted 7 lines
Quoted 6 lines
Quoted 3 lines
Quoted 2 lines
While this reminded me that I'm totally confused on why we have had entry 7, 8 after all... Are they really used?
Yes. TM bit only affects. To this array, index 1, 5,6,7 may be leaf. Will update
a new patchset for it.
Could I ask why index 7 may be leaf?
Index 7 is PDPE 1G GB leaf.
I thought 1G was index 6. I've listed my understanding above [1]. Would you please double confirm? Thanks,
Signature · 1 line
Peter Xu
Quoted 75 lines
-----Original Message-----
From: Peter Xu <[email protected]>
Sent: Sunday, September 29, 2019 10:02 AM
To: Zhang, Qi1 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Qi, Yadong <[email protected]>
Subject: Re: [PATCH V2]intel_iommu: TM field should not be in reserved bitsQuoted 12 lines · On Sun, Sep 29, 2019 at 01:11:12AM +0000, Zhang, Qi1 wrote:
Quoted 12 lines
-----Original Message-----
From: Peter Xu <[email protected]>
Sent: Friday, September 27, 2019 5:32 PM
To: Zhang, Qi1 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Qi, Yadong <[email protected]>
Subject: Re: [PATCH V2]intel_iommu: TM field should not be in reserved bitsQuoted 8 lines
Quoted 8 lines · On Fri, Sep 27, 2019 at 08:03:21AM +0000, Zhang, Qi1 wrote:
Quoted 7 lines
Quoted 7 lines
-----Original Message-----
From: Peter Xu <[email protected]>
Sent: Friday, September 27, 2019 2:10 PM
To: Zhang, Qi1 <[email protected]>
Cc: [email protected]; [email protected];Quoted 27 lines
Quoted 27 lines
Quoted 11 lines
Quoted 11 lines
[email protected]; [email protected]
Subject: Re: [PATCH V2]intel_iommu: TM field should not be in reserved bitsQuoted 6 lines · On Fri, Sep 27, 2019 at 12:58:38PM +0800, [email protected] wrote:
From: "Zhang, Qi" <[email protected]>
When dt is supported, TM field should not be Reserved(0).
Refer to VT-d Spec 9.8
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Signed-off-by Zhang, Qi <[email protected]>Signed-off-by Qi, Yadong <[email protected]>--- hw/i386/intel_iommu.c | 12 ++++++------ hw/i386/intel_iommu_internal.h | 25 +++++++++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-)---
VTD_SPTE_PAGE_L2_RSVD_MASK(s-
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
aw_bits);
- vtd_paging_entry_rsvd_field[3] =aw_bits);
+ vtd_paging_entry_rsvd_field[5] =VTD_SPTE_LPAGE_L1_RSVD_MASK(s->aw_bits, x86_iommu-
Quoted 2 lines
dt_supported);
+ vtd_paging_entry_rsvd_field[6] =VTD_SPTE_LPAGE_L2_RSVD_MASK(s->aw_bits, x86_iommu-
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
dt_supported);
+ vtd_paging_entry_rsvd_field[7] =
+VTD_SPTE_LPAGE_L3_RSVD_MASK(s->aw_bits, x86_iommu- dt_supported); vtd_paging_entry_rsvd_field[8] =VTD_SPTE_LPAGE_L4_RSVD_MASK(s->aw_bits);Should this TM bit only affects leaves? Say, entry 1 (4K), 5 (2M), 6
(1G).
[1]
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 2 lines
While this reminded me that I'm totally confused on why we have had entry 7, 8 after all... Are they really used?
Yes. TM bit only affects. To this array, index 1, 5,6,7 may be leaf. Will update
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
a new patchset for it.
Could I ask why index 7 may be leaf?
Index 7 is PDPE 1G GB leaf.
I thought 1G was index 6. I've listed my understanding above [1]. Would you please double confirm? Thanks,
Check the existing function. When level is 3 VTD_SL_PDP_LEVEL and the entry is leaf, it is PDPE 1G leaf and the corresponding index of this array 7.
static bool vtd_slpte_nonzero_rsvd(uint64_t slpte, uint32_t level)
{
if (slpte & VTD_SL_PT_PAGE_SIZE_MASK) {
/* Maybe large page */
return slpte & vtd_paging_entry_rsvd_field[level + 4];
} else {
return slpte & vtd_paging_entry_rsvd_field[level];
}
}Quoted 3 lines
--
Peter Xu
Quoted 59 lines · Peter Xu
Quoted 45 lines · On Sun, Sep 29, 2019 at 01:11:12AM +0000, Zhang, Qi1 wrote:
Quoted 45 lines
-----Original Message-----
From: Peter Xu <[email protected]>
Sent: Friday, September 27, 2019 5:32 PM
To: Zhang, Qi1 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Qi, Yadong <[email protected]>
Subject: Re: [PATCH V2]intel_iommu: TM field should not be in reserved bitsQuoted 18 lines · On Fri, Sep 27, 2019 at 08:03:21AM +0000, Zhang, Qi1 wrote:
Quoted 18 lines
-----Original Message-----
From: Peter Xu <[email protected]>
Sent: Friday, September 27, 2019 2:10 PM
To: Zhang, Qi1 <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH V2]intel_iommu: TM field should not be in reserved bitsQuoted 6 lines · On Fri, Sep 27, 2019 at 12:58:38PM +0800, [email protected] wrote:
From: "Zhang, Qi" <[email protected]>
When dt is supported, TM field should not be Reserved(0).
Refer to VT-d Spec 9.8
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Signed-off-by Zhang, Qi <[email protected]>Signed-off-by Qi, Yadong <[email protected]>--- hw/i386/intel_iommu.c | 12 ++++++------ hw/i386/intel_iommu_internal.h | 25 +++++++++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-)---
VTD_SPTE_PAGE_L2_RSVD_MASK(s-
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
aw_bits);
- vtd_paging_entry_rsvd_field[3] =aw_bits);
+ vtd_paging_entry_rsvd_field[5] =VTD_SPTE_LPAGE_L1_RSVD_MASK(s->aw_bits, x86_iommu-
Quoted 2 lines
dt_supported);
+ vtd_paging_entry_rsvd_field[6] =VTD_SPTE_LPAGE_L2_RSVD_MASK(s->aw_bits, x86_iommu-
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 6 lines
dt_supported);
+ vtd_paging_entry_rsvd_field[7] =
+VTD_SPTE_LPAGE_L3_RSVD_MASK(s->aw_bits, x86_iommu- dt_supported); vtd_paging_entry_rsvd_field[8] =VTD_SPTE_LPAGE_L4_RSVD_MASK(s->aw_bits);Should this TM bit only affects leaves? Say, entry 1 (4K), 5 (2M), 6 (1G).
[1]
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
While this reminded me that I'm totally confused on why we have had entry 7, 8 after all... Are they really used?
Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
Quoted 1 line
Yes. TM bit only affects. To this array, index 1, 5,6,7 may be leaf. Will update
a new patchset for it.
Could I ask why index 7 may be leaf?
Index 7 is PDPE 1G GB leaf.
I thought 1G was index 6. I've listed my understanding above [1]. Would you please double confirm? Thanks,
Oh wait, You are right... Index 6 should be for 1G because index 5 seems to be unused as well. However then again we should drop 5 instead of 7?
I think we can do this in two patches:
Patch 1 to clean these up by only let vtd_paging_rsvd (we can rename it to shorter one like this if going to touch it) to keep reserved bits for non-huge pages. Then we define a new struct (e.g. vtd_paging_rsvd_huge) to only keep the huge page entries. The thing is that I see no point in keeping huge && non-huge in a single array (and I believe that's why it caused confusion so far...). That new one should be a size of 2 array. Meanwhile we need to fix vtd_slpte_nonzero_rsvd() too using the new arrays.
Then in patch 2 we do the DT bit change.
Does that look ok?
Thanks,
Signature · 1 line
Peter Xu
Quoted 45 lines · On Fri, Sep 27, 2019 at 12:58:38PM +0800, [email protected] wrote:
From: "Zhang, Qi" <[email protected]>
When dt is supported, TM field should not be Reserved(0).
Refer to VT-d Spec 9.8
Signed-off-by Zhang, Qi <[email protected]>Signed-off-by Qi, Yadong <[email protected]>--- hw/i386/intel_iommu.c | 12 ++++++------ hw/i386/intel_iommu_internal.h | 25 +++++++++++++++++++------ 2 files changed, 25 insertions(+), 12 deletions(-)---
Changelog V2:
movedt_supportedflag toVTD_SPTE_PAGE_LX_RSVD_MASKandVTD_SPTE_LPAGE_LX_RSVD_MASKhw/i386/intel_iommu.c +6
-6@@ -3548,13 +3548,13 @@ static void vtd_init(IntelIOMMUState *s)* Rsvd field masks for spte */ vtd_paging_entry_rsvd_field[0 ] = ~0ULL ; - vtd_paging_entry_rsvd_field[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[3 ] =VTD_SPTE_PAGE_L3_RSVD_MASK (s->aw_bits); + vtd_paging_entry_rsvd_field[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[3 ] =VTD_SPTE_PAGE_L3_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); vtd_paging_entry_rsvd_field[4 ] =VTD_SPTE_PAGE_L4_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[5 ] =VTD_SPTE_LPAGE_L1_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[6 ] =VTD_SPTE_LPAGE_L2_RSVD_MASK (s->aw_bits); - vtd_paging_entry_rsvd_field[7 ] =VTD_SPTE_LPAGE_L3_RSVD_MASK (s->aw_bits); + vtd_paging_entry_rsvd_field[5 ] =VTD_SPTE_LPAGE_L1_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[6 ] =VTD_SPTE_LPAGE_L2_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); + vtd_paging_entry_rsvd_field[7 ] =VTD_SPTE_LPAGE_L3_RSVD_MASK (s->aw_bits, x86_iommu->dt_supported); vtd_paging_entry_rsvd_field[8 ] =VTD_SPTE_LPAGE_L4_RSVD_MASK (s->aw_bits);if (x86_iommu_ir_supported (x86_iommu)) {hw/i386/intel_iommu_internal.h +0
-0
hw/i386/intel_iommu_internal.h typedef union VTDInvDesc VTDInvDesc; · line 391
Quoted 6 lines
hw/i386/intel_iommu_internal.h +2
-1@@ -387,19 +387,31 @@ typedef union VTDInvDesc VTDInvDesc;#define VTD_INV_DESC_DEVICE_IOTLB_RSVD_LO 0xffff0000ffe0fff8/* Rsvd field masks for spte */ -#define VTD_SPTE_PAGE_L1_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L1_RSVD_MASK (aw, dt_supported) \ + dt_supported? \
space before ? please.
hw/i386/intel_iommu_internal.h typedef union VTDInvDesc VTDInvDesc; · line 393
Quoted 2 lines
hw/i386/intel_iommu_internal.h +1
-0+ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK (aw) |VTD_SL_IGN_COM ))
cleaner:
0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | (dt_supported ? VTD_SL_TM : 0x0))
Quoted 38 lines
hw/i386/intel_iommu_internal.h +16
-5-#define VTD_SPTE_PAGE_L2_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L2_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_PAGE_L3_RSVD_MASK (aw) \ +#define VTD_SPTE_PAGE_L3_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))#define VTD_SPTE_PAGE_L4_RSVD_MASK (aw) \ (0x880ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_LPAGE_L1_RSVD_MASK (aw) \ +#define VTD_SPTE_LPAGE_L1_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_LPAGE_L2_RSVD_MASK (aw) \ +#define VTD_SPTE_LPAGE_L2_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x1ff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x1ff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM)) -#define VTD_SPTE_LPAGE_L3_RSVD_MASK (aw) \ +#define VTD_SPTE_LPAGE_L3_RSVD_MASK (aw, dt_supported) \ + dt_supported? \ + (0x3ffff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM | VTD_SL_TM)) : \ (0x3ffff800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))#define VTD_SPTE_LPAGE_L4_RSVD_MASK (aw) \ (0x880ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))@@ -506,5 +518,6 @@ typedef struct VTDRootEntry VTDRootEntry;#define VTD_SL_W (1ULL << 1)#define VTD_SL_PT_BASE_ADDR_MASK (aw) (~(VTD_PAGE_SIZE - 1) & VTD_HAW_MASK(aw))#define VTD_SL_IGN_COM 0xbff0000000000000ULL +#define VTD_SL_TM (1ULL << 62)#endif Signature · 1 line
2.20.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Type: series
Message-id: [email protected]
Subject: [PATCH V2] intel_iommu: TM field should not be in reserved bits
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Switched to a new branch 'test'
4cd505b intel_iommu: TM field should not be in reserved bits
=== OUTPUT BEGIN ===
ERROR: line over 90 characters
#26: FILE: hw/i386/intel_iommu.c:3551:
+ vtd_paging_entry_rsvd_field[1] = VTD_SPTE_PAGE_L1_RSVD_MASK(s->aw_bits, x86_iommu->dt_supported);
ERROR: line over 90 characters
#27: FILE: hw/i386/intel_iommu.c:3552:
+ vtd_paging_entry_rsvd_field[2] = VTD_SPTE_PAGE_L2_RSVD_MASK(s->aw_bits, x86_iommu->dt_supported);
ERROR: line over 90 characters
#28: FILE: hw/i386/intel_iommu.c:3553:
+ vtd_paging_entry_rsvd_field[3] = VTD_SPTE_PAGE_L3_RSVD_MASK(s->aw_bits, x86_iommu->dt_supported);
ERROR: line over 90 characters
#33: FILE: hw/i386/intel_iommu.c:3555:
+ vtd_paging_entry_rsvd_field[5] = VTD_SPTE_LPAGE_L1_RSVD_MASK(s->aw_bits, x86_iommu->dt_supported);
ERROR: line over 90 characters
#34: FILE: hw/i386/intel_iommu.c:3556:
+ vtd_paging_entry_rsvd_field[6] = VTD_SPTE_LPAGE_L2_RSVD_MASK(s->aw_bits, x86_iommu->dt_supported);
ERROR: line over 90 characters
#35: FILE: hw/i386/intel_iommu.c:3557:
+ vtd_paging_entry_rsvd_field[7] = VTD_SPTE_LPAGE_L3_RSVD_MASK(s->aw_bits, x86_iommu->dt_supported);
ERROR: spaces required around that '?' (ctx:VxE)
#49: FILE: hw/i386/intel_iommu_internal.h:391:
+ dt_supported? \
^ERROR: spaces required around that '?' (ctx:VxE)
#54: FILE: hw/i386/intel_iommu_internal.h:395:
+ dt_supported? \
^ERROR: spaces required around that '?' (ctx:VxE)
#59: FILE: hw/i386/intel_iommu_internal.h:399:
+ dt_supported? \
^ERROR: spaces required around that '?' (ctx:VxE)
#66: FILE: hw/i386/intel_iommu_internal.h:405:
+ dt_supported? \
^ERROR: spaces required around that '?' (ctx:VxE)
#71: FILE: hw/i386/intel_iommu_internal.h:409:
+ dt_supported? \
^ERROR: spaces required around that '?' (ctx:VxE)
#76: FILE: hw/i386/intel_iommu_internal.h:413:
+ dt_supported? \
^total: 12 errors, 0 warnings, 62 lines checked
Commit 4cd505b83cac (intel_iommu: TM field should not be in reserved bits) has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]