motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 15:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

intel_iommu: Introduce a property x-flts for stage-1 translation

Browse source 
Intel VT-d 3.0 introduces scalable mode, and it has a bunch of capabilities
related to scalable mode translation, thus there are multiple combinations.

This vIOMMU implementation wants to simplify it with a new property "x-flts".
When turned on in scalable mode, stage-1 translation is supported. When turned
on in legacy mode, throw out error.

With stage-1 translation support exposed to user, also accurate the pasid entry
check in vtd_pe_type_check().

Suggested-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Yi Sun <yi.y.sun@linux.intel.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Clément Mathieu--Drif<clement.mathieu--drif@eviden.com>
Message-Id: <20241212083757.605022-19-zhenzhong.duan@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Zhenzhong Duan 2024-12-12 16:37:55 +08:00 • committed by Michael S. Tsirkin
parent 81ab964f21
commit aa68a9fbdb
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
hw/i386/intel_iommu.c
View file

@ -803,16 +803,18 @@ static inline bool vtd_is_fl_level_supported(IntelIOMMUState *s, uint32_t level)
} }
/* Return true if check passed, otherwise false */ /* Return true if check passed, otherwise false */
static inline bool vtd_pe_type_check(X86IOMMUState *x86_iommu, static inline bool vtd_pe_type_check(IntelIOMMUState *s, VTDPASIDEntry *pe)
VTDPASIDEntry *pe)
{ {
switch (VTD_PE_GET_TYPE(pe)) { switch (VTD_PE_GET_TYPE(pe)) {
case VTD_SM_PASID_ENTRY_SLT:
return true;
case VTD_SM_PASID_ENTRY_PT:
return x86_iommu->pt_supported;
case VTD_SM_PASID_ENTRY_FLT: case VTD_SM_PASID_ENTRY_FLT:
return !!(s->ecap & VTD_ECAP_FLTS);
case VTD_SM_PASID_ENTRY_SLT:
return !!(s->ecap & VTD_ECAP_SLTS);
case VTD_SM_PASID_ENTRY_NESTED: case VTD_SM_PASID_ENTRY_NESTED:
/* Not support NESTED page table type yet */
return false;
case VTD_SM_PASID_ENTRY_PT:
return !!(s->ecap & VTD_ECAP_PT);
default: default:
/* Unknown type */ /* Unknown type */
return false; return false;
@ -861,7 +863,6 @@ static int vtd_get_pe_in_pasid_leaf_table(IntelIOMMUState *s,
uint8_t pgtt; uint8_t pgtt;
uint32_t index; uint32_t index;
dma_addr_t entry_size; dma_addr_t entry_size;
X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s);
index = VTD_PASID_TABLE_INDEX(pasid); index = VTD_PASID_TABLE_INDEX(pasid);
entry_size = VTD_PASID_ENTRY_SIZE; entry_size = VTD_PASID_ENTRY_SIZE;
@ -875,7 +876,7 @@ static int vtd_get_pe_in_pasid_leaf_table(IntelIOMMUState *s,
} }
/* Do translation type check */ /* Do translation type check */
if (!vtd_pe_type_check(x86_iommu, pe)) { if (!vtd_pe_type_check(s, pe)) {
return -VTD_FR_PASID_TABLE_ENTRY_INV; return -VTD_FR_PASID_TABLE_ENTRY_INV;
} }
@ -3827,6 +3828,7 @@ static const Property vtd_properties[] = {
VTD_HOST_ADDRESS_WIDTH), VTD_HOST_ADDRESS_WIDTH),
DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE), DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE),
DEFINE_PROP_BOOL("x-scalable-mode", IntelIOMMUState, scalable_mode, FALSE), DEFINE_PROP_BOOL("x-scalable-mode", IntelIOMMUState, scalable_mode, FALSE),
DEFINE_PROP_BOOL("x-flts", IntelIOMMUState, flts, FALSE),
DEFINE_PROP_BOOL("snoop-control", IntelIOMMUState, snoop_control, false), DEFINE_PROP_BOOL("snoop-control", IntelIOMMUState, snoop_control, false),
DEFINE_PROP_BOOL("x-pasid-mode", IntelIOMMUState, pasid, false), DEFINE_PROP_BOOL("x-pasid-mode", IntelIOMMUState, pasid, false),
DEFINE_PROP_BOOL("dma-drain", IntelIOMMUState, dma_drain, true), DEFINE_PROP_BOOL("dma-drain", IntelIOMMUState, dma_drain, true),
@ -4557,7 +4559,10 @@ static void vtd_cap_init(IntelIOMMUState *s)
} }
/* TODO: read cap/ecap from host to decide which cap to be exposed. */ /* TODO: read cap/ecap from host to decide which cap to be exposed. */
if (s->scalable_mode) { if (s->flts) {
s->ecap |= VTD_ECAP_SMTS | VTD_ECAP_FLTS;
s->cap |= VTD_CAP_FS1GP;
} else if (s->scalable_mode) {
s->ecap |= VTD_ECAP_SMTS | VTD_ECAP_SRS | VTD_ECAP_SLTS; s->ecap |= VTD_ECAP_SMTS | VTD_ECAP_SRS | VTD_ECAP_SLTS;
} }
@ -4736,6 +4741,11 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp)
} }
} }
if (!s->scalable_mode && s->flts) {
error_setg(errp, "x-flts is only available in scalable mode");
return false;
}
if (!s->flts && s->aw_bits != VTD_HOST_AW_39BIT && if (!s->flts && s->aw_bits != VTD_HOST_AW_39BIT &&
s->aw_bits != VTD_HOST_AW_48BIT) { s->aw_bits != VTD_HOST_AW_48BIT) {
error_setg(errp, "%s: supported values for aw-bits are: %d, %d", error_setg(errp, "%s: supported values for aw-bits are: %d, %d",

2
hw/i386/intel_iommu_internal.h
View file

@ -195,6 +195,7 @@
#define VTD_ECAP_PASID (1ULL << 40) #define VTD_ECAP_PASID (1ULL << 40)
#define VTD_ECAP_SMTS (1ULL << 43) #define VTD_ECAP_SMTS (1ULL << 43)
#define VTD_ECAP_SLTS (1ULL << 46) #define VTD_ECAP_SLTS (1ULL << 46)
#define VTD_ECAP_FLTS (1ULL << 47)
/* CAP_REG */ /* CAP_REG */
/* (offset >> 4) << 24 */ /* (offset >> 4) << 24 */
@ -211,6 +212,7 @@
#define VTD_CAP_SLLPS ((1ULL << 34) | (1ULL << 35)) #define VTD_CAP_SLLPS ((1ULL << 34) | (1ULL << 35))
#define VTD_CAP_DRAIN_WRITE (1ULL << 54) #define VTD_CAP_DRAIN_WRITE (1ULL << 54)
#define VTD_CAP_DRAIN_READ (1ULL << 55) #define VTD_CAP_DRAIN_READ (1ULL << 55)
#define VTD_CAP_FS1GP (1ULL << 56)
#define VTD_CAP_DRAIN (VTD_CAP_DRAIN_READ | VTD_CAP_DRAIN_WRITE) #define VTD_CAP_DRAIN (VTD_CAP_DRAIN_READ | VTD_CAP_DRAIN_WRITE)
#define VTD_CAP_CM (1ULL << 7) #define VTD_CAP_CM (1ULL << 7)
#define VTD_PASID_ID_SHIFT 20 #define VTD_PASID_ID_SHIFT 20