[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.9 1/2] intel_iommu: check validity for GAW bit
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH for-2.9 1/2] intel_iommu: check validity for GAW bits in CE |
Date: |
Wed, 7 Dec 2016 13:52:44 +0800 |
Currently vt-d Context Entry (CE) only allows 39/48 bits address width.
If guest software configured more than that, we complain and force
shrink to the maximum supported, which is 48bits.
Signed-off-by: Peter Xu <address@hidden>
---
hw/i386/intel_iommu.c | 12 +++++++++++-
hw/i386/intel_iommu_internal.h | 2 ++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 5f3e351..98d45ef 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -601,7 +601,17 @@ static inline uint32_t
vtd_get_level_from_context_entry(VTDContextEntry *ce)
static inline uint32_t vtd_get_agaw_from_context_entry(VTDContextEntry *ce)
{
- return 30 + (ce->hi & VTD_CONTEXT_ENTRY_AW) * 9;
+ uint8_t aw = (ce->hi & VTD_CONTEXT_ENTRY_AW);
+ /*
+ * According to vt-d spec 10.4.2 bits 12:8, SAGAW only allows
+ * 39/48 bits.
+ */
+ if (aw > VTD_CE_AW_48BIT) {
+ error_report("Context entry address width not supported (aw=%d), "
+ "Shrinking to maximum.", aw);
+ aw = VTD_CE_AW_48BIT;
+ }
+ return 30 + aw * 9;
}
static const uint64_t vtd_paging_entry_rsvd_field[] = {
diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h
index 11abfa2..e808c67 100644
--- a/hw/i386/intel_iommu_internal.h
+++ b/hw/i386/intel_iommu_internal.h
@@ -406,6 +406,8 @@ typedef struct VTDRootEntry VTDRootEntry;
#define VTD_CONTEXT_ENTRY_RSVD_LO (0xff0ULL | ~VTD_HAW_MASK)
/* hi */
#define VTD_CONTEXT_ENTRY_AW 7ULL /* Adjusted guest-address-width */
+#define VTD_CE_AW_39BIT 1
+#define VTD_CE_AW_48BIT 2
#define VTD_CONTEXT_ENTRY_DID(val) (((val) >> 8) & VTD_DOMAIN_ID_MASK)
#define VTD_CONTEXT_ENTRY_RSVD_HI 0xffffffffff000080ULL
--
2.7.4
[Qemu-devel] [PATCH for-2.9 2/2] intel_iommu: extend supported guest aw to 48 bits, Peter Xu, 2016/12/07