VT-d minor fixes
v7 cover VT-d minor fixes
From: Clément Mathieu--Drif <[email protected]>
Various fixes for VT-d
This series contains fixes that will be necessary when adding in-guest (fully emulated) SVM support.
v7
intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo:
- Edit commit message
v6
intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo:
- Add 'Fixes' tag
v5
intel_iommu: fix FRCD construction macro:
- Remove empty line after 'Fixes'
intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo:
- Edit commit message after comment from Yi
intel_iommu: make types match:
- Edit commit message (s/"make types match"/"make type match"/)
v4
- Move declarations of VTD_FRCD_PV and VTD_FRCD_PP
- intel_iommu: make types match:
- edit commit message to explain that we are not fixing a bug
- intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo
- edit commit message
v3
FRCD construction macro :
- Longer sha1 for the 'Fixes' tag
- Add '.' at the end of the sentence
Make types match :
- Split into 2 patches (one for the fix and one for type matching)
Remove patch for wait descriptor handling (will be in the PRI series)
v2
Make commit author consistent
Clément Mathieu--Drif (4):
intel_iommu: fix FRCD construction macro
intel_iommu: move VTD_FRCD_PV and VTD_FRCD_PP declarations
intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo
intel_iommu: make type match
hw/i386/intel_iommu.c | 2 +- hw/i386/intel_iommu_internal.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
2.45.2
PATCH v7 1/4 intel_iommu: fix FRCD construction macro
From: Clément Mathieu--Drif <[email protected]>
The constant must be unsigned, otherwise the two's complement overrides the other fields when a PASID is present.
--- hw/i386/intel_iommu_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/i386/intel_iommu_internal.h +1 -1
@@ -267,7 +267,7 @@/* For the low 64-bit of 128-bit */ #define VTD_FRCD_FI (val) ((val) & ~0xfffULL)#define VTD_FRCD_PV (val) (((val) & 0xffffULL) << 40) -#define VTD_FRCD_PP (val) (((val) & 0x1) << 31) +#define VTD_FRCD_PP (val) (((val) & 0x1ULL) << 31)#define VTD_FRCD_IR_IDX (val) (((val) & 0xffffULL) << 48)/* DMA Remapping Fault Conditions */
Signature · 1 line
2.45.2
PATCH v7 2/4 intel_iommu: move VTD_FRCD_PV and VTD_FRCD_PP declarations
In reply to CLEMENT MATHIEU--DRIFFrom: Clément Mathieu--Drif <[email protected]>
These 2 macros are for high 64-bit of the FRCD registers. Declarations have to be moved accordingly.
--- hw/i386/intel_iommu_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/i386/intel_iommu_internal.h +2 -2
@@ -264,10 +264,10 @@#define VTD_FRCD_FR (val) (((val) & 0xffULL) << 32)#define VTD_FRCD_SID_MASK 0xffffULL#define VTD_FRCD_SID (val) ((val) & VTD_FRCD_SID_MASK) -/* For the low 64-bit of 128-bit */ -#define VTD_FRCD_FI (val) ((val) & ~0xfffULL)#define VTD_FRCD_PV (val) (((val) & 0xffffULL) << 40)#define VTD_FRCD_PP (val) (((val) & 0x1ULL) << 31) +/* For the low 64-bit of 128-bit */ +#define VTD_FRCD_FI (val) ((val) & ~0xfffULL)#define VTD_FRCD_IR_IDX (val) (((val) & 0xffffULL) << 48)/* DMA Remapping Fault Conditions */
Signature · 1 line
2.45.2
PATCH v7 3/4 intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo
In reply to CLEMENT MATHIEU--DRIFFrom: Clément Mathieu--Drif <[email protected]>
Per the below code, it can overflow as am can be larger than 8 according to the CH 6.5.2.3 IOTLB Invalidate. Use uint64_t to avoid overflows.
--- hw/i386/intel_iommu_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/i386/intel_iommu_internal.h +1 -1
@@ -436,7 +436,7 @@ struct VTDIOTLBPageInvInfo {uint16_t domain_id;uint32_t pasid;uint64_t addr; -uint8_t mask; +uint64_t mask; };typedef struct VTDIOTLBPageInvInfo VTDIOTLBPageInvInfo ;
Signature · 1 line
2.45.2
PATCH v7 4/4 intel_iommu: make type match
In reply to CLEMENT MATHIEU--DRIFFrom: Clément Mathieu--Drif <[email protected]>
The 'level' field in vtd_iotlb_key is an unsigned integer. We don't need to store level as an int in vtd_lookup_iotlb.
This is not an issue by itself, but using unsigned here seems cleaner.
--- hw/i386/intel_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/i386/intel_iommu.c +1 -1
@@ -358,7 +358,7 @@ static VTDIOTLBEntry *vtd_lookup_iotlb(IntelIOMMUState *s, uint16_t source_id, {struct vtd_iotlb_key key;VTDIOTLBEntry *entry; -int level; +unsigned level;for (level =VTD_SL_PT_LEVEL ; level <VTD_SL_PML4_LEVEL ; level++) { key.gfn =vtd_get_iotlb_gfn (addr, level);
Signature · 1 line
2.45.2
Hi Michael, Yi and Jason
Thanks for your feedback on the previous versions.
If you agree with the series, do you think we can move forward?
Thanks!
Quoted 1 line
cmd
Quoted 57 lines · CLEMENT MATHIEU--DRIF
From: Clément Mathieu--Drif <[email protected]>
Various fixes for VT-d
This series contains fixes that will be necessary when adding in-guest (fully emulated) SVM support.
v7
intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo:
- Edit commit messagev6
intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo:
- Add 'Fixes' tagv5
intel_iommu: fix FRCD construction macro:
- Remove empty line after 'Fixes'
intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo:
- Edit commit message after comment from Yi
intel_iommu: make types match:
- Edit commit message (s/"make types match"/"make type match"/)v4
- Move declarations ofVTD_FRCD_PVandVTD_FRCD_PP
-intel_iommu: make types match:
- edit commit message to explain that we are not fixing a bug
-intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo
- edit commit messagev3
FRCD construction macro :
- Longer sha1 for the 'Fixes' tag
- Add '.' at the end of the sentenceMake types match :
- Split into 2 patches (one for the fix and one for type matching)Remove patch for wait descriptor handling (will be in the PRI series)
v2
Make commit author consistentClément Mathieu--Drif (4):
intel_iommu: fix FRCD construction macro
intel_iommu: moveVTD_FRCD_PVandVTD_FRCD_PPdeclarations
intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo
intel_iommu: make type matchhw/i386/intel_iommu.c | 2 +- hw/i386/intel_iommu_internal.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
Quoted 4 lines · CLEMENT MATHIEU--DRIF
Hi Michael, Yi and Jason
Thanks for your feedback on the previous versions.
If you agree with the series, do you think we can move forward?
Yes, tagged, thanks!
Quoted 61 lines
Thanks!
Quoted 1 line
cmd
Quoted 57 lines · CLEMENT MATHIEU--DRIF
From: Clément Mathieu--Drif <[email protected]>
Various fixes for VT-d
This series contains fixes that will be necessary when adding in-guest (fully emulated) SVM support.
v7
intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo:
- Edit commit messagev6
intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo:
- Add 'Fixes' tagv5
intel_iommu: fix FRCD construction macro:
- Remove empty line after 'Fixes'
intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo:
- Edit commit message after comment from Yi
intel_iommu: make types match:
- Edit commit message (s/"make types match"/"make type match"/)v4
- Move declarations ofVTD_FRCD_PVandVTD_FRCD_PP
-intel_iommu: make types match:
- edit commit message to explain that we are not fixing a bug
-intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo
- edit commit messagev3
FRCD construction macro :
- Longer sha1 for the 'Fixes' tag
- Add '.' at the end of the sentenceMake types match :
- Split into 2 patches (one for the fix and one for type matching)Remove patch for wait descriptor handling (will be in the PRI series)
v2
Make commit author consistentClément Mathieu--Drif (4):
intel_iommu: fix FRCD construction macro
intel_iommu: moveVTD_FRCD_PVandVTD_FRCD_PPdeclarations
intel_iommu: fix type of the mask field in VTDIOTLBPageInvInfo
intel_iommu: make type matchhw/i386/intel_iommu.c | 2 +- hw/i386/intel_iommu_internal.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)