[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/10] intel_iommu: use access_flags for iotlb
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 05/10] intel_iommu: use access_flags for iotlb |
Date: |
Wed, 2 Aug 2017 00:37:44 +0300 |
From: Peter Xu <address@hidden>
It was cached by read/write separately. Let's merge them.
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/i386/intel_iommu.h | 3 +--
hw/i386/intel_iommu.c | 15 +++++++--------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
index 08d8a26..ac15e6b 100644
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@@ -103,8 +103,7 @@ struct VTDIOTLBEntry {
uint16_t domain_id;
uint64_t slpte;
uint64_t mask;
- bool read_flags;
- bool write_flags;
+ uint8_t access_flags;
};
/* VT-d Source-ID Qualifier types */
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index e0b0498..a7bf87a 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -237,8 +237,7 @@ out:
static void vtd_update_iotlb(IntelIOMMUState *s, uint16_t source_id,
uint16_t domain_id, hwaddr addr, uint64_t slpte,
- bool read_flags, bool write_flags,
- uint32_t level)
+ uint8_t access_flags, uint32_t level)
{
VTDIOTLBEntry *entry = g_malloc(sizeof(*entry));
uint64_t *key = g_malloc(sizeof(*key));
@@ -253,8 +252,7 @@ static void vtd_update_iotlb(IntelIOMMUState *s, uint16_t
source_id,
entry->gfn = gfn;
entry->domain_id = domain_id;
entry->slpte = slpte;
- entry->read_flags = read_flags;
- entry->write_flags = write_flags;
+ entry->access_flags = access_flags;
entry->mask = vtd_slpt_level_page_mask(level);
*key = vtd_get_iotlb_key(gfn, source_id, level);
g_hash_table_replace(s->iotlb, key, entry);
@@ -1087,6 +1085,7 @@ static bool vtd_do_iommu_translate(VTDAddressSpace
*vtd_as, PCIBus *bus,
bool is_fpd_set = false;
bool reads = true;
bool writes = true;
+ uint8_t access_flags;
VTDIOTLBEntry *iotlb_entry;
/*
@@ -1101,8 +1100,7 @@ static bool vtd_do_iommu_translate(VTDAddressSpace
*vtd_as, PCIBus *bus,
trace_vtd_iotlb_page_hit(source_id, addr, iotlb_entry->slpte,
iotlb_entry->domain_id);
slpte = iotlb_entry->slpte;
- reads = iotlb_entry->read_flags;
- writes = iotlb_entry->write_flags;
+ access_flags = iotlb_entry->access_flags;
page_mask = iotlb_entry->mask;
goto out;
}
@@ -1172,13 +1170,14 @@ static bool vtd_do_iommu_translate(VTDAddressSpace
*vtd_as, PCIBus *bus,
}
page_mask = vtd_slpt_level_page_mask(level);
+ access_flags = IOMMU_ACCESS_FLAG(reads, writes);
vtd_update_iotlb(s, source_id, VTD_CONTEXT_ENTRY_DID(ce.hi), addr, slpte,
- reads, writes, level);
+ access_flags, level);
out:
entry->iova = addr & page_mask;
entry->translated_addr = vtd_get_slpte_addr(slpte) & page_mask;
entry->addr_mask = ~page_mask;
- entry->perm = IOMMU_ACCESS_FLAG(reads, writes);
+ entry->perm = access_flags;
return true;
error:
--
MST
- [Qemu-devel] [PULL 00/10] pc, acpi, virtio: fixes, test speedup for rc1, Michael S. Tsirkin, 2017/08/01
- [Qemu-devel] [PULL 01/10] tests: switch pxe and vm gen id tests to use kvm, Michael S. Tsirkin, 2017/08/01
- [Qemu-devel] [PULL 02/10] vhost: fix a memory leak, Michael S. Tsirkin, 2017/08/01
- [Qemu-devel] [PULL 03/10] vhost-user: fix legacy cross-endian configurations, Michael S. Tsirkin, 2017/08/01
- [Qemu-devel] [PULL 05/10] intel_iommu: use access_flags for iotlb,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 04/10] intel_iommu: fix iova for pt, Michael S. Tsirkin, 2017/08/01
- [Qemu-devel] [PULL 06/10] accel: cleanup error output, Michael S. Tsirkin, 2017/08/01
- [Qemu-devel] [PULL 07/10] tests/bios-tables-test: Compiler warning fix, Michael S. Tsirkin, 2017/08/01
- [Qemu-devel] [PULL 08/10] vhost-user: fix watcher need be removed when vhost-user hotplug, Michael S. Tsirkin, 2017/08/01
- [Qemu-devel] [PULL 09/10] pc: make 'pc.rom' readonly when machine has PCI enabled, Michael S. Tsirkin, 2017/08/01
- [Qemu-devel] [PULL 10/10] pc: acpi: force FADT rev1 for 440fx based machine types, Michael S. Tsirkin, 2017/08/01
- Re: [Qemu-devel] [PULL 00/10] pc, acpi, virtio: fixes, test speedup for rc1, Peter Maydell, 2017/08/02