TM field check failed
cover TM field check failed
From: "Zhang, Qi" <[email protected]>
*** BLURB HERE ***
Zhang, Qi (2):
intel_iommu: split the resevred fields arrays into two ones
intel_iommu: TM field should not be in reserved bits
hw/i386/intel_iommu.c | 35 ++++++++++++++++++++-------------- hw/i386/intel_iommu_internal.h | 17 +++++++++++++---- 2 files changed, 34 insertions(+), 18 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 intel_iommu: split the resevred fields arrays into two ones
From: "Zhang, Qi" <[email protected]>
--- hw/i386/intel_iommu.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
hw/i386/intel_iommu.c +17 -14
@@ -910,18 +910,19 @@ static dma_addr_t vtd_get_iova_pgtbl_base(IntelIOMMUState *s,/* * Rsvd field masks for spte: -* Index [1] to [4] 4k pages -* Index [5] to [8] large pages +* vtd_spte_rsvd 4k pages +* vtd_spte_rsvd_large large pages */ -static uint64_t vtd_paging_entry_rsvd_field[9 ]; +static uint64_t vtd_spte_rsvd[5 ]; +static uint64_t vtd_spte_rsvd_large[5 ];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 ]; +return slpte & vtd_spte_rsvd_large[level]; }else { -return slpte & vtd_paging_entry_rsvd_field[level]; +return slpte & vtd_spte_rsvd[level]; } }
@@ -3547,15 +3548,17 @@ 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[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[8 ] =VTD_SPTE_LPAGE_L4_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd[0 ] = ~0ULL ; + vtd_spte_rsvd[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd[3 ] =VTD_SPTE_PAGE_L3_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd[4 ] =VTD_SPTE_PAGE_L4_RSVD_MASK (s->aw_bits); + + vtd_spte_rsvd_large[0 ] = ~0ULL ; + vtd_spte_rsvd_large[1 ] =VTD_SPTE_LPAGE_L1_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd_large[2 ] =VTD_SPTE_LPAGE_L2_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd_large[3 ] =VTD_SPTE_LPAGE_L3_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd_large[4 ] =VTD_SPTE_LPAGE_L4_RSVD_MASK (s->aw_bits);if (x86_iommu_ir_supported (x86_iommu)) { s->ecap |=VTD_ECAP_IR |VTD_ECAP_MHMV ;
Signature · 1 line
2.20.1
PATCH 2/2 intel_iommu: TM field should not be in reserved bits
In reply to [email protected]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 | 17 +++++++++++++---- 2 files changed, 21 insertions(+), 8 deletions(-)
hw/i386/intel_iommu.c +8 -4
@@ -3549,15 +3549,19 @@ static void vtd_init(IntelIOMMUState *s)* Rsvd field masks for spte */ vtd_spte_rsvd[0 ] = ~0ULL ; - vtd_spte_rsvd[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd[1 ] =VTD_SPTE_PAGE_L1_RSVD_MASK (s->aw_bits, + x86_iommu->dt_supported); vtd_spte_rsvd[2 ] =VTD_SPTE_PAGE_L2_RSVD_MASK (s->aw_bits); vtd_spte_rsvd[3 ] =VTD_SPTE_PAGE_L3_RSVD_MASK (s->aw_bits); vtd_spte_rsvd[4 ] =VTD_SPTE_PAGE_L4_RSVD_MASK (s->aw_bits); vtd_spte_rsvd_large[0 ] = ~0ULL ; - vtd_spte_rsvd_large[1 ] =VTD_SPTE_LPAGE_L1_RSVD_MASK (s->aw_bits); - vtd_spte_rsvd_large[2 ] =VTD_SPTE_LPAGE_L2_RSVD_MASK (s->aw_bits); - vtd_spte_rsvd_large[3 ] =VTD_SPTE_LPAGE_L3_RSVD_MASK (s->aw_bits); + vtd_spte_rsvd_large[1 ] =VTD_SPTE_LPAGE_L1_RSVD_MASK (s->aw_bits, + x86_iommu->dt_supported); + vtd_spte_rsvd_large[2 ] =VTD_SPTE_LPAGE_L2_RSVD_MASK (s->aw_bits, + x86_iommu->dt_supported); + vtd_spte_rsvd_large[3 ] =VTD_SPTE_LPAGE_L3_RSVD_MASK (s->aw_bits, + x86_iommu->dt_supported); vtd_spte_rsvd_large[4 ] =VTD_SPTE_LPAGE_L4_RSVD_MASK (s->aw_bits);if (x86_iommu_ir_supported (x86_iommu)) {
hw/i386/intel_iommu_internal.h +13 -4
@@ -387,7 +387,9 @@ 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) \ (0x800ULL | ~(VTD_HAW_MASK(aw) | VTD_SL_IGN_COM))
@@ -395,11 +397,17 @@ typedef union VTDInvDesc VTDInvDesc; (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 +514,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
Hello, everyone
May I know you have comments on this patch set? Thank you!
BRs
Qi Zhang
Quoted 26 lines
-----Original Message-----
From: Zhang, Qi1 <[email protected]>
Sent: Tuesday, October 8, 2019 10:35 AM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Zhang, Qi1 <[email protected]>; Qi, Yadong <[email protected]>
Subject: [PATCH v1 0/2] TM field check failedFrom: "Zhang, Qi" <[email protected]>
spilt the reserved fields arrays and remove TM field from reserved bits
Changelog V1:
add descriptonsZhang, Qi (2):
intel_iommu: split the resevred fields arrays into two ones
intel_iommu: TM field should not be in reserved bitshw/i386/intel_iommu.c | 35 ++++++++++++++++++++-------------- hw/i386/intel_iommu_internal.h | 17 +++++++++++++---- 2 files changed, 34 insertions(+), 18 deletions(-)--
2.20.1