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

intel_iommu_accel: Switch to VTDAccelPASIDCacheEntry for PASID bind/unbind and PIOTLB invalidation

Browse Source 
This patch switches from VTDAddressSpace to VTDAccelPASIDCacheEntry for
handling PASID bind/unbind operations and PIOTLB invalidations in
passthrough scenarios. VTDAccelPASIDCacheEntry was introduced to cache
PASID entries for passthrough devices and is now ready to propagate
PASID bind/unbind operations and PIOTLB invalidations to the host.

Unlike the previous approach, VTDAccelPASIDCacheEntry supports both
IOMMU_NO_PASID (rid_pasid) and other valid PASIDs, so this switch drops
IOMMU_NO_PASID limitations that existed in the prior PASID bind/unbind
and PIOTLB invalidation path. For IOMMU_NO_PASID of passthrough devices,
VTDAddressSpace continues to handle shadow page modifications to the
host, but no longer manages PASID bind/unbind operations or PIOTLB
invalidations for passthrough scenarios.

Co-developed-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Xudong Hao <xudong.hao@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20260527054658.1021096-16-zhenzhong.duan@intel.com>
This commit is contained in:
Zhenzhong Duan
2026-05-27 01:46:53 -04:00
committed by Michael S. Tsirkin
parent b583cdbb0e
commit 4101df1201
4 changed files with 68 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hw/i386/intel_iommu.c
View File

@@ -86,8 +86,6 @@ static void vtd_pasid_cache_reset_locked(IntelIOMMUState *s)
VTDPASIDCacheEntry *pc_entry = &vtd_as->pasid_cache_entry;
if (pc_entry->valid) {
pc_entry->valid = false;
/* It's fatal to get failure during reset */
vtd_propagate_guest_pasid(vtd_as, &error_fatal);
}
}
}
@@ -3104,8 +3102,6 @@ static void vtd_pasid_cache_sync_locked(gpointer key, gpointer value,
VTDPASIDEntry pe;
IOMMUNotifier *n;
uint16_t did;
const char *err_prefix = "Attaching to HWPT failed: ";
Error *local_err = NULL;
if (vtd_dev_get_pe_from_pasid(vtd_as->iommu_state, vtd_as->bus,
vtd_as->devfn, vtd_as->pasid, &pe)) {
@@ -3127,9 +3123,6 @@ static void vtd_pasid_cache_sync_locked(gpointer key, gpointer value,
vtd_address_space_unmap(vtd_as, n);
}
vtd_switch_address_space(vtd_as);
err_prefix = "Detaching from HWPT failed: ";
goto do_bind_unbind;
}
/*
@@ -3157,20 +3150,12 @@ static void vtd_pasid_cache_sync_locked(gpointer key, gpointer value,
if (!pc_entry->valid) {
pc_entry->pasid_entry = pe;
pc_entry->valid = true;
} else if (vtd_pasid_entry_compare(&pe, &pc_entry->pasid_entry)) {
err_prefix = "Replacing HWPT attachment failed: ";
} else {
} else if (!vtd_pasid_entry_compare(&pe, &pc_entry->pasid_entry)) {
return;
}
vtd_switch_address_space(vtd_as);
vtd_address_space_sync(vtd_as);
do_bind_unbind:
/* TODO: Fault event injection into guest, report error to QEMU for now */
if (!vtd_propagate_guest_pasid(vtd_as, &local_err)) {
error_reportf_err(local_err, "%s", err_prefix);
}
}
static void vtd_pasid_cache_sync(IntelIOMMUState *s, VTDPASIDCacheInfo *pc_info)

131
hw/i386/intel_iommu_accel.c
View File

@@ -89,24 +89,25 @@ static bool vtd_create_fs_hwpt(VTDHostIOMMUDevice *vtd_hiod,
fs_hwpt_id, errp);
}
static void vtd_destroy_old_fs_hwpt(VTDHostIOMMUDevice *vtd_hiod,
VTDAddressSpace *vtd_as)
static void vtd_destroy_old_fs_hwpt(VTDAccelPASIDCacheEntry *vtd_pce)
{
HostIOMMUDeviceIOMMUFD *hiodi = HOST_IOMMU_DEVICE_IOMMUFD(vtd_hiod->hiod);
HostIOMMUDeviceIOMMUFD *hiodi =
HOST_IOMMU_DEVICE_IOMMUFD(vtd_pce->vtd_hiod->hiod);
if (!vtd_as->fs_hwpt_id) {
if (!vtd_pce->fs_hwpt_id) {
return;
}
iommufd_backend_free_id(hiodi->iommufd, vtd_as->fs_hwpt_id);
vtd_as->fs_hwpt_id = 0;
iommufd_backend_free_id(hiodi->iommufd, vtd_pce->fs_hwpt_id);
vtd_pce->fs_hwpt_id = 0;
}
static bool vtd_device_attach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
VTDAddressSpace *vtd_as, Error **errp)
static bool vtd_device_attach_iommufd(VTDAccelPASIDCacheEntry *vtd_pce,
Error **errp)
{
VTDHostIOMMUDevice *vtd_hiod = vtd_pce->vtd_hiod;
HostIOMMUDeviceIOMMUFD *hiodi = HOST_IOMMU_DEVICE_IOMMUFD(vtd_hiod->hiod);
VTDPASIDEntry *pe = &vtd_as->pasid_cache_entry.pasid_entry;
uint32_t hwpt_id = hiodi->hwpt_id;
VTDPASIDEntry *pe = &vtd_pce->pasid_entry;
uint32_t hwpt_id = hiodi->hwpt_id, pasid = vtd_pce->pasid;
bool ret;
/*
@@ -126,14 +127,13 @@ static bool vtd_device_attach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
}
}
ret = host_iommu_device_iommufd_attach_hwpt(hiodi, IOMMU_NO_PASID, hwpt_id,
errp);
trace_vtd_device_attach_hwpt(hiodi->devid, IOMMU_NO_PASID, hwpt_id, ret);
ret = host_iommu_device_iommufd_attach_hwpt(hiodi, pasid, hwpt_id, errp);
trace_vtd_device_attach_hwpt(hiodi->devid, pasid, hwpt_id, ret);
if (ret) {
/* Destroy old fs_hwpt if it's a replacement */
vtd_destroy_old_fs_hwpt(vtd_hiod, vtd_as);
vtd_destroy_old_fs_hwpt(vtd_pce);
if (vtd_pe_pgtt_is_fst(pe)) {
vtd_as->fs_hwpt_id = hwpt_id;
vtd_pce->fs_hwpt_id = hwpt_id;
}
} else if (vtd_pe_pgtt_is_fst(pe)) {
iommufd_backend_free_id(hiodi->iommufd, hwpt_id);
@@ -142,17 +142,19 @@ static bool vtd_device_attach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
return ret;
}
static bool vtd_device_detach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
VTDAddressSpace *vtd_as, Error **errp)
static bool vtd_device_detach_iommufd(VTDAccelPASIDCacheEntry *vtd_pce,
Error **errp)
{
VTDHostIOMMUDevice *vtd_hiod = vtd_pce->vtd_hiod;
HostIOMMUDeviceIOMMUFD *hiodi = HOST_IOMMU_DEVICE_IOMMUFD(vtd_hiod->hiod);
IntelIOMMUState *s = vtd_as->iommu_state;
IntelIOMMUState *s = vtd_hiod->iommu_state;
uint32_t pasid = vtd_pce->pasid;
bool ret;
if (s->dmar_enabled && s->root_scalable) {
ret = host_iommu_device_iommufd_detach_hwpt(hiodi, IOMMU_NO_PASID,
errp);
trace_vtd_device_detach_hwpt(hiodi->devid, IOMMU_NO_PASID, ret);
if (pasid != IOMMU_NO_PASID || (s->dmar_enabled && s->root_scalable)) {
ret = host_iommu_device_iommufd_detach_hwpt(hiodi, pasid, errp);
trace_vtd_device_detach_hwpt(hiodi->devid, pasid, ret);
} else {
/*
* If DMAR remapping is disabled or guest switches to legacy mode,
@@ -166,58 +168,32 @@ static bool vtd_device_detach_iommufd(VTDHostIOMMUDevice *vtd_hiod,
}
if (ret) {
vtd_destroy_old_fs_hwpt(vtd_hiod, vtd_as);
vtd_destroy_old_fs_hwpt(vtd_pce);
}
return ret;
}
bool vtd_propagate_guest_pasid(VTDAddressSpace *vtd_as, Error **errp)
{
VTDPASIDCacheEntry *pc_entry = &vtd_as->pasid_cache_entry;
VTDHostIOMMUDevice *vtd_hiod = vtd_find_hiod_iommufd(vtd_as);
/* Ignore emulated device or legacy VFIO backed device */
if (!vtd_as->iommu_state->fsts || !vtd_hiod) {
return true;
}
if (pc_entry->valid) {
return vtd_device_attach_iommufd(vtd_hiod, vtd_as, errp);
}
return vtd_device_detach_iommufd(vtd_hiod, vtd_as, errp);
}
/*
* This function is a loop function for the s->vtd_address_spaces
* list with VTDPIOTLBInvInfo as execution filter. It propagates
* the piotlb invalidation to host.
* This function is a loop function for the s->vtd_host_iommu_dev
* and vtd_hiod->pasid_cache_list lists with VTDPIOTLBInvInfo as
* execution filter. It propagates the piotlb invalidation to host.
*/
static void vtd_flush_host_piotlb_locked(gpointer key, gpointer value,
gpointer user_data)
static void vtd_flush_host_piotlb_locked(VTDAccelPASIDCacheEntry *vtd_pce,
VTDPIOTLBInvInfo *piotlb_info)
{
VTDPIOTLBInvInfo *piotlb_info = user_data;
VTDAddressSpace *vtd_as = value;
VTDHostIOMMUDevice *vtd_hiod = vtd_find_hiod_iommufd(vtd_as);
VTDPASIDCacheEntry *pc_entry = &vtd_as->pasid_cache_entry;
VTDHostIOMMUDevice *vtd_hiod = vtd_pce->vtd_hiod;
VTDPASIDEntry *pe = &vtd_pce->pasid_entry;
uint16_t did;
if (!vtd_hiod) {
return;
}
assert(vtd_as->pasid == IOMMU_NO_PASID);
/* Nothing to do if there is no first stage HWPT attached */
if (!pc_entry->valid ||
!vtd_pe_pgtt_is_fst(&pc_entry->pasid_entry)) {
if (!vtd_pe_pgtt_is_fst(pe)) {
return;
}
did = VTD_SM_PASID_ENTRY_DID(&pc_entry->pasid_entry);
did = VTD_SM_PASID_ENTRY_DID(pe);
if (piotlb_info->domain_id == did && piotlb_info->pasid == IOMMU_NO_PASID) {
if (piotlb_info->domain_id == did && piotlb_info->pasid == vtd_pce->pasid) {
HostIOMMUDeviceIOMMUFD *hiodi =
HOST_IOMMU_DEVICE_IOMMUFD(vtd_hiod->hiod);
uint32_t entry_num = 1; /* Only implement one request for simplicity */
@@ -225,7 +201,7 @@ static void vtd_flush_host_piotlb_locked(gpointer key, gpointer value,
struct iommu_hwpt_vtd_s1_invalidate *cache = piotlb_info->inv_data;
if (!iommufd_backend_invalidate_cache(hiodi->iommufd,
vtd_as->fs_hwpt_id,
vtd_pce->fs_hwpt_id,
IOMMU_HWPT_INVALIDATE_DATA_VTD_S1,
sizeof(*cache), &entry_num, cache,
&local_err)) {
@@ -241,6 +217,8 @@ void vtd_flush_host_piotlb_all_locked(IntelIOMMUState *s, uint16_t domain_id,
{
struct iommu_hwpt_vtd_s1_invalidate cache_info = { 0 };
VTDPIOTLBInvInfo piotlb_info;
VTDHostIOMMUDevice *vtd_hiod;
GHashTableIter hiod_it;
cache_info.addr = addr;
cache_info.npages = npages;
@@ -251,23 +229,36 @@ void vtd_flush_host_piotlb_all_locked(IntelIOMMUState *s, uint16_t domain_id,
piotlb_info.inv_data = &cache_info;
/*
* Go through each vtd_as instance in s->vtd_address_spaces, find out
* affected host devices which need host piotlb invalidation. Piotlb
* invalidation should check pasid cache per architecture point of view.
* Go through each vtd_pce in vtd_hiod->pasid_cache_list for each host
* device, find out affected host device pasid which need host piotlb
* invalidation. Piotlb invalidation should check pasid cache per
* architecture point of view.
*/
g_hash_table_foreach(s->vtd_address_spaces,
vtd_flush_host_piotlb_locked, &piotlb_info);
g_hash_table_iter_init(&hiod_it, s->vtd_host_iommu_dev);
while (g_hash_table_iter_next(&hiod_it, NULL, (void **)&vtd_hiod)) {
VTDAccelPASIDCacheEntry *vtd_pce;
QLIST_FOREACH(vtd_pce, &vtd_hiod->pasid_cache_list, next) {
vtd_flush_host_piotlb_locked(vtd_pce, &piotlb_info);
}
}
}
static void vtd_accel_fill_pc(VTDHostIOMMUDevice *vtd_hiod, uint32_t pasid,
VTDPASIDEntry *pe)
{
VTDAccelPASIDCacheEntry *vtd_pce;
Error *local_err = NULL;
QLIST_FOREACH(vtd_pce, &vtd_hiod->pasid_cache_list, next) {
if (vtd_pce->pasid == pasid) {
if (vtd_pasid_entry_compare(pe, &vtd_pce->pasid_entry)) {
vtd_pce->pasid_entry = *pe;
if (!vtd_device_attach_iommufd(vtd_pce, &local_err)) {
error_reportf_err(local_err, "%s",
"Replacing HWPT attachment failed: ");
}
}
return;
}
@@ -278,11 +269,21 @@ static void vtd_accel_fill_pc(VTDHostIOMMUDevice *vtd_hiod, uint32_t pasid,
vtd_pce->pasid = pasid;
vtd_pce->pasid_entry = *pe;
QLIST_INSERT_HEAD(&vtd_hiod->pasid_cache_list, vtd_pce, next);
if (!vtd_device_attach_iommufd(vtd_pce, &local_err)) {
error_reportf_err(local_err, "%s", "Attaching to HWPT failed: ");
}
}
static void vtd_accel_delete_pc(VTDAccelPASIDCacheEntry *vtd_pce,
VTDPASIDCacheInfo *pc_info)
{
Error *local_err = NULL;
if (!vtd_device_detach_iommufd(vtd_pce, &local_err)) {
error_reportf_err(local_err, "%s", "Detaching from HWPT failed: ");
}
QLIST_REMOVE(vtd_pce, next);
g_free(vtd_pce);

2
hw/i386/intel_iommu_accel.h
View File

@@ -16,6 +16,7 @@ typedef struct VTDAccelPASIDCacheEntry {
VTDHostIOMMUDevice *vtd_hiod;
VTDPASIDEntry pasid_entry;
uint32_t pasid;
uint32_t fs_hwpt_id;
QLIST_ENTRY(VTDAccelPASIDCacheEntry) next;
} VTDAccelPASIDCacheEntry;
@@ -23,7 +24,6 @@ typedef struct VTDAccelPASIDCacheEntry {
bool vtd_check_hiod_accel(IntelIOMMUState *s, VTDHostIOMMUDevice *vtd_hiod,
Error **errp);
VTDHostIOMMUDevice *vtd_find_hiod_iommufd(VTDAddressSpace *as);
bool vtd_propagate_guest_pasid(VTDAddressSpace *vtd_as, Error **errp);
void vtd_flush_host_piotlb_all_locked(IntelIOMMUState *s, uint16_t domain_id,
uint32_t pasid, hwaddr addr,
uint64_t npages, bool ih);

2
include/hw/i386/intel_iommu.h
View File

@@ -154,8 +154,6 @@ struct VTDAddressSpace {
* with the guest IOMMU pgtables for a device.
*/
IOVATree *iova_tree;
uint32_t fs_hwpt_id;
};
struct VTDIOTLBEntry {