mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel_iommu: fixing source id during IOTLB hash key calculation

Browse Source 
Using uint8_t for source id will lose bus num and get the
wrong/invalid IOTLB entry. Fixing by using uint16_t instead and
enlarge level shift.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jason Wang 2016-11-03 09:22:23 +08:00 committed by Michael S. Tsirkin
parent 6bbcb76301
commit bacabb0afa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i386/intel_iommu.c
View File

@ -218,7 +218,7 @@ static void vtd_reset_iotlb(IntelIOMMUState *s)
g_hash_table_remove_all(s->iotlb); g_hash_table_remove_all(s->iotlb);
} }
static uint64_t vtd_get_iotlb_key(uint64_t gfn, uint8_t source_id, static uint64_t vtd_get_iotlb_key(uint64_t gfn, uint16_t source_id,
uint32_t level) uint32_t level)
{ {
return gfn | ((uint64_t)(source_id) << VTD_IOTLB_SID_SHIFT) | return gfn | ((uint64_t)(source_id) << VTD_IOTLB_SID_SHIFT) |

2
hw/i386/intel_iommu_internal.h
View File

@ -115,7 +115,7 @@
/* The shift of source_id in the key of IOTLB hash table */ /* The shift of source_id in the key of IOTLB hash table */
#define VTD_IOTLB_SID_SHIFT 36 #define VTD_IOTLB_SID_SHIFT 36
#define VTD_IOTLB_LVL_SHIFT 44 #define VTD_IOTLB_LVL_SHIFT 52
#define VTD_IOTLB_MAX_SIZE 1024 /* Max size of the hash table */ #define VTD_IOTLB_MAX_SIZE 1024 /* Max size of the hash table */
/* IOTLB_REG */ /* IOTLB_REG */