intel-iommu: update root_scalable before switching as during post_load
PATCH 1/2 intel-iommu: update root_scalable before switching as during post_load
We need check whether passthrough is enabled during vtd_switch_address_space() by checking the context entries. This requires the root_scalable to be set correctly otherwise we may try to check legacy rsvd bits instead of scalable ones.
Fixing this by updating root_scalable before switching the address spaces during post_load.
--- hw/i386/intel_iommu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
hw/i386/intel_iommu.c +7 -7
@@ -3052,13 +3052,6 @@ static int vtd_post_load(void *opaque, int version_id) {IntelIOMMUState *iommu = opaque; -/* -* Memory regions are dynamically turned on/off depending on -* context entry configurations from the guest. After migration, -* we need to make sure the memory regions are still correct. -*/ -vtd_switch_address_space_all (iommu); -/* * We don't need to migrate the root_scalable because we can * simply do the calculation after the loading is complete. We
@@ -3068,6 +3061,13 @@ static int vtd_post_load(void *opaque, int version_id)*/ vtd_update_scalable_state (iommu); +/* +* Memory regions are dynamically turned on/off depending on +* context entry configurations from the guest. After migration, +* we need to make sure the memory regions are still correct. +*/ +vtd_switch_address_space_all (iommu); +return 0 ; }
Signature · 1 line
2.25.1
PATCH 2/2 intel-iommu: update iq_dw during post load
We need to update iq_dw according to the DMA_IRQ_REG during post load. Otherwise we may get wrong IOTLB invalidation descriptor after migration.
--- hw/i386/intel_iommu.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
hw/i386/intel_iommu.c +15 -6
@@ -181,6 +181,18 @@ static void vtd_update_scalable_state(IntelIOMMUState *s) } } +static void vtd_update_iq_dw (IntelIOMMUState *s) +{ +uint64_t val =vtd_get_quad_raw (s,DMAR_IQA_REG ); + +if (s->ecap &VTD_ECAP_SMTS && + val &VTD_IQA_DW_MASK ) { + s->iq_dw = true; + }else { + s->iq_dw = false; + } +} +/* Whether the address space needs to notify new mappings */ static inline gboolean vtd_as_has_map_notifier (VTDAddressSpace *as) {
@@ -2883,12 +2895,7 @@ static void vtd_mem_write(void *opaque, hwaddr addr, }else {vtd_set_quad (s, addr, val); } -if (s->ecap &VTD_ECAP_SMTS && - val &VTD_IQA_DW_MASK ) { - s->iq_dw = true; - }else { - s->iq_dw = false; - } +vtd_update_iq_dw (s);break ;case DMAR_IQA_REG_HI :
@@ -3061,6 +3068,8 @@ static int vtd_post_load(void *opaque, int version_id)*/ vtd_update_scalable_state (iommu); +vtd_update_iq_dw (iommu); +/* * Memory regions are dynamically turned on/off depending on * context entry configurations from the guest. After migration,
Signature · 1 line
2.25.1
Re: [PATCH 2/2] intel-iommu: update iq_dw during post load
Quoted 6 lines · Jason Wang
We need to update
iq_dwaccording to theDMA_IRQ_REGduring post load. Otherwise we may get wrong IOTLB invalidation descriptor after migration.Fixes fb43cf739e ("intel_iommu: scalable mode emulation")Signed-off-by Jason Wang <[email protected]>
Signature · 1 line
Peter Xu
Quoted 10 lines · Jason Wang
We need check whether passthrough is enabled during
vtd_switch_address_space()by checking the context entries. This requires theroot_scalableto be set correctly otherwise we may try to check legacy rsvd bits instead of scalable ones.Fixing this by updating
root_scalablebefore switching the address spaces duringpost_load.Fixes fb43cf739e ("intel_iommu: scalable mode emulation")Signed-off-by Jason Wang <[email protected]>
Signature · 1 line
Peter Xu