|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [XEN RFC PATCH v6 05/11] iommu: Simplify quarantine logic
Current quarantine code is very hard to change and is very
complicated, remove most bits of it and replace it with direct
reassignement to dom_io domain instead.
Signed-off-by: Teddy Astie <teddy.astie@xxxxxxxxxx>
---
A idea would be to rework this feature using the new reworked
IOMMU subsystem.
---
xen/arch/x86/include/asm/pci.h | 17 --
xen/drivers/passthrough/amd/iommu_map.c | 129 +---------
xen/drivers/passthrough/amd/pci_amd_iommu.c | 51 +---
xen/drivers/passthrough/pci.c | 7 +-
xen/drivers/passthrough/vtd/iommu.c | 253 ++------------------
xen/drivers/passthrough/x86/iommu.c | 1 -
6 files changed, 29 insertions(+), 429 deletions(-)
diff --git a/xen/arch/x86/include/asm/pci.h b/xen/arch/x86/include/asm/pci.h
index fd5480d67d..214c1a0948 100644
--- a/xen/arch/x86/include/asm/pci.h
+++ b/xen/arch/x86/include/asm/pci.h
@@ -15,23 +15,6 @@
struct arch_pci_dev {
vmask_t used_vectors;
- /*
- * These fields are (de)initialized under pcidevs-lock. Other uses of
- * them don't race (de)initialization and hence don't strictly need any
- * locking.
- */
- union {
- /* Subset of struct arch_iommu's fields, to be used in dom_io. */
- struct {
- uint64_t pgd_maddr;
- } vtd;
- struct {
- struct page_info *root_table;
- } amd;
- };
- domid_t pseudo_domid;
- mfn_t leaf_mfn;
- struct page_list_head pgtables_list;
};
int pci_conf_write_intercept(unsigned int seg, unsigned int bdf,
diff --git a/xen/drivers/passthrough/amd/iommu_map.c
b/xen/drivers/passthrough/amd/iommu_map.c
index 7514384789..91d8c21048 100644
--- a/xen/drivers/passthrough/amd/iommu_map.c
+++ b/xen/drivers/passthrough/amd/iommu_map.c
@@ -656,9 +656,6 @@ int amd_iommu_reserve_domain_unity_map(struct domain *d,
struct iommu_context *c
{
int rc;
- if ( d == dom_io )
- return 0;
-
for ( rc = 0; !rc && map; map = map->next )
{
p2m_access_t p2ma = p2m_access_n;
@@ -680,9 +677,6 @@ int amd_iommu_reserve_domain_unity_unmap(struct domain *d,
struct iommu_context
{
int rc;
- if ( d == dom_io )
- return 0;
-
for ( rc = 0; map; map = map->next )
{
int ret = iommu_identity_mapping(d, ctx, p2m_access_x, map->addr,
@@ -771,134 +765,15 @@ int cf_check amd_iommu_get_reserved_device_memory(
return 0;
}
-static int fill_qpt(union amd_iommu_pte *this, unsigned int level,
- struct page_info *pgs[IOMMU_MAX_PT_LEVELS])
-{
- struct domain_iommu *hd = dom_iommu(dom_io);
- struct iommu_context *ctx = iommu_default_context(dom_io);
- unsigned int i;
- int rc = 0;
-
- for ( i = 0; !rc && i < PTE_PER_TABLE_SIZE; ++i )
- {
- union amd_iommu_pte *pte = &this[i], *next;
-
- if ( !pte->pr )
- {
- if ( !pgs[level] )
- {
- /*
- * The pgtable allocator is fine for the leaf page, as well as
- * page table pages, and the resulting allocations are always
- * zeroed.
- */
- pgs[level] = iommu_alloc_pgtable(hd, ctx, 0);
- if ( !pgs[level] )
- {
- rc = -ENOMEM;
- break;
- }
-
- if ( level )
- {
- next = __map_domain_page(pgs[level]);
- rc = fill_qpt(next, level - 1, pgs);
- unmap_domain_page(next);
- }
- }
-
- /*
- * PDEs are essentially a subset of PTEs, so this function
- * is fine to use even at the leaf.
- */
- set_iommu_pde_present(pte, mfn_x(page_to_mfn(pgs[level])), level,
- true, true);
- }
- else if ( level && pte->next_level )
- {
- next = map_domain_page(_mfn(pte->mfn));
- rc = fill_qpt(next, level - 1, pgs);
- unmap_domain_page(next);
- }
- }
-
- return rc;
-}
-
int cf_check amd_iommu_quarantine_init(struct pci_dev *pdev, bool scratch_page)
{
- struct domain_iommu *hd = dom_iommu(dom_io);
- struct iommu_context *ctx = iommu_default_context(dom_io);
- unsigned int level = ctx->arch.amd.paging_mode;
- unsigned int req_id = get_dma_requestor_id(pdev->seg, pdev->sbdf.bdf);
- const struct ivrs_mappings *ivrs_mappings = get_ivrs_mappings(pdev->seg);
- int rc;
+ amd_iommu_quarantine_teardown(pdev);
- ASSERT(pcidevs_locked());
- ASSERT(!ctx->arch.amd.root_table);
- ASSERT(page_list_empty(&ctx->arch.pgtables));
-
- if ( !scratch_page && !ivrs_mappings[req_id].unity_map )
- return 0;
-
- ASSERT(pdev->arch.pseudo_domid != DOMID_INVALID);
-
- if ( pdev->arch.amd.root_table )
- {
- clear_domain_page(pdev->arch.leaf_mfn);
- return 0;
- }
-
- pdev->arch.amd.root_table = iommu_alloc_pgtable(hd, ctx, 0);
- if ( !pdev->arch.amd.root_table )
- return -ENOMEM;
-
- /* Transiently install the root into DomIO, for iommu_identity_mapping().
*/
- ctx->arch.amd.root_table = pdev->arch.amd.root_table;
-
- rc = amd_iommu_reserve_domain_unity_map(dom_io, ctx,
- ivrs_mappings[req_id].unity_map,
- 0);
-
- iommu_identity_map_teardown(dom_io, ctx);
- ctx->arch.amd.root_table = NULL;
-
- if ( rc )
- AMD_IOMMU_WARN("%pp: quarantine unity mapping failed\n", &pdev->sbdf);
- else if ( scratch_page )
- {
- union amd_iommu_pte *root;
- struct page_info *pgs[IOMMU_MAX_PT_LEVELS] = {};
-
- root = __map_domain_page(pdev->arch.amd.root_table);
- rc = fill_qpt(root, level - 1, pgs);
- unmap_domain_page(root);
-
- pdev->arch.leaf_mfn = page_to_mfn(pgs[0]);
- }
-
- page_list_move(&pdev->arch.pgtables_list, &ctx->arch.pgtables);
-
- if ( rc )
- amd_iommu_quarantine_teardown(pdev);
-
- return rc;
+ return 0;
}
void amd_iommu_quarantine_teardown(struct pci_dev *pdev)
{
- struct iommu_context *ctx = iommu_default_context(dom_io);
-
- ASSERT(pcidevs_locked());
-
- if ( !pdev->arch.amd.root_table )
- return;
-
- ASSERT(page_list_empty(&ctx->arch.pgtables));
- page_list_move(&ctx->arch.pgtables, &pdev->arch.pgtables_list);
- while ( iommu_free_pgtables(dom_io, ctx) == -ERESTART )
- /* nothing */;
- pdev->arch.amd.root_table = NULL;
}
/*
diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c
b/xen/drivers/passthrough/amd/pci_amd_iommu.c
index a3815d71be..0008b35162 100644
--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
@@ -138,9 +138,6 @@ static int __must_check amd_iommu_setup_domain_device(
const struct page_info *root_pg;
domid_t domid;
- if ( QUARANTINE_SKIP(domain, pdev) )
- return 0;
-
BUG_ON(!ctx->arch.amd.paging_mode || !iommu->dev_table.buffer);
rc = allocate_domain_resources(domain);
@@ -159,16 +156,8 @@ static int __must_check amd_iommu_setup_domain_device(
dte = &table[req_id];
ivrs_dev = &get_ivrs_mappings(iommu->seg)[req_id];
- if ( domain != dom_io )
- {
- root_pg = ctx->arch.amd.root_table;
- domid = domain->domain_id;
- }
- else
- {
- root_pg = pdev->arch.amd.root_table;
- domid = pdev->arch.pseudo_domid;
- }
+ root_pg = ctx->arch.amd.root_table;
+ domid = domain->domain_id;
spin_lock_irqsave(&iommu->lock, flags);
@@ -414,9 +403,6 @@ static void amd_iommu_disable_domain_device(const struct
domain *domain,
int req_id;
u8 bus = pdev->bus;
- if ( QUARANTINE_SKIP(domain, pdev) )
- return;
-
ASSERT(pcidevs_locked());
if ( pci_ats_device(iommu->seg, bus, pdev->devfn) &&
@@ -479,14 +465,9 @@ static int cf_check reassign_device(
return -ENODEV;
}
- if ( !QUARANTINE_SKIP(target, pdev) )
- {
- rc = amd_iommu_setup_domain_device(target, target_ctx, iommu, devfn,
pdev);
- if ( rc )
- return rc;
- }
- else
- amd_iommu_disable_domain_device(source, iommu, devfn, pdev);
+ rc = amd_iommu_setup_domain_device(target, target_ctx, iommu, devfn, pdev);
+ if ( rc )
+ return rc;
if ( devfn == pdev->devfn && pdev->domain != target )
{
@@ -579,8 +560,6 @@ static int cf_check amd_iommu_add_device(u8 devfn, struct
pci_dev *pdev)
struct iommu_context *ctx;
u16 bdf;
struct ivrs_mappings *ivrs_mappings;
- bool fresh_domid = false;
- int ret;
if ( !pdev->domain )
return -EINVAL;
@@ -649,22 +628,7 @@ static int cf_check amd_iommu_add_device(u8 devfn, struct
pci_dev *pdev)
AMD_IOMMU_WARN("%pd: unity mapping failed for %pp\n",
pdev->domain, &PCI_SBDF(pdev->seg, bdf));
- if ( iommu_quarantine && pdev->arch.pseudo_domid == DOMID_INVALID )
- {
- pdev->arch.pseudo_domid = iommu_alloc_domid(iommu->domid_map);
- if ( pdev->arch.pseudo_domid == DOMID_INVALID )
- return -ENOSPC;
- fresh_domid = true;
- }
-
- ret = amd_iommu_setup_domain_device(pdev->domain, ctx, iommu, devfn, pdev);
- if ( ret && fresh_domid )
- {
- iommu_free_domid(pdev->arch.pseudo_domid, iommu->domid_map);
- pdev->arch.pseudo_domid = DOMID_INVALID;
- }
-
- return ret;
+ return amd_iommu_setup_domain_device(pdev->domain, ctx, iommu, devfn,
pdev);
}
static int cf_check amd_iommu_remove_device(u8 devfn, struct pci_dev *pdev)
@@ -700,9 +664,6 @@ static int cf_check amd_iommu_remove_device(u8 devfn,
struct pci_dev *pdev)
amd_iommu_quarantine_teardown(pdev);
- iommu_free_domid(pdev->arch.pseudo_domid, iommu->domid_map);
- pdev->arch.pseudo_domid = DOMID_INVALID;
-
if ( amd_iommu_perdev_intremap &&
ivrs_mappings[bdf].dte_requestor_id == bdf &&
ivrs_mappings[bdf].intremap_table )
diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
index 777c6b1a7f..e1ca74b477 100644
--- a/xen/drivers/passthrough/pci.c
+++ b/xen/drivers/passthrough/pci.c
@@ -1370,12 +1370,7 @@ static int cf_check _dump_pci_devices(struct pci_seg
*pseg, void *arg)
list_for_each_entry ( pdev, &pseg->alldevs_list, alldevs_list )
{
printk("%pp - ", &pdev->sbdf);
-#ifdef CONFIG_X86
- if ( pdev->domain == dom_io )
- printk("DomIO:%x", pdev->arch.pseudo_domid);
- else
-#endif
- printk("%pd", pdev->domain);
+ printk("%pd", pdev->domain);
printk(" - node %-3d", (pdev->node != NUMA_NO_NODE) ? pdev->node : -1);
pdev_dump_msi(pdev);
printk("\n");
diff --git a/xen/drivers/passthrough/vtd/iommu.c
b/xen/drivers/passthrough/vtd/iommu.c
index f60f39ee1d..55562084fc 100644
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -49,14 +49,6 @@
#define CONTIG_MASK DMA_PTE_CONTIG_MASK
#include <asm/pt-contig-markers.h>
-/* dom_io is used as a sentinel for quarantined devices */
-#define QUARANTINE_SKIP(d, pgd_maddr) ((d) == dom_io && !(pgd_maddr))
-#define DEVICE_DOMID(d, pdev) ((d) != dom_io ? (d)->domain_id \
- : (pdev)->arch.pseudo_domid)
-#define DEVICE_PGTABLE(d, pdev) ((d) != dom_io \
- ?
iommu_default_context(d)->arch.vtd.pgd_maddr \
- : (pdev)->arch.vtd.pgd_maddr)
-
bool __read_mostly iommu_igfx = true;
bool __read_mostly iommu_qinval = true;
#ifndef iommu_snoop
@@ -1494,8 +1486,6 @@ int domain_context_mapping_one(
int rc, ret;
bool flush_dev_iotlb;
- if ( QUARANTINE_SKIP(domain, pgd_maddr) )
- return 0;
ASSERT(pcidevs_locked());
spin_lock(&iommu->lock);
@@ -1512,8 +1502,6 @@ int domain_context_mapping_one(
domid = did_to_domain_id(iommu, prev_did);
if ( domid < DOMID_FIRST_RESERVED )
prev_dom = rcu_lock_domain_by_id(domid);
- else if ( pdev ? domid == pdev->arch.pseudo_domid : domid > DOMID_MASK
)
- prev_dom = rcu_lock_domain(dom_io);
if ( !prev_dom )
{
spin_unlock(&iommu->lock);
@@ -1645,8 +1633,8 @@ int domain_context_mapping_one(
ret = domain_context_unmap_one(domain, iommu, bus, devfn);
else
ret = domain_context_mapping_one(prev_dom, ctx, iommu, bus, devfn,
pdev,
- DEVICE_DOMID(prev_dom, pdev),
- DEVICE_PGTABLE(prev_dom, pdev),
+ prev_dom->domain_id,
+
iommu_default_context(prev_dom)->arch.vtd.pgd_maddr,
(mode & MAP_WITH_RMRR) |
MAP_ERROR_RECOVERY) < 0;
@@ -1668,8 +1656,8 @@ static int domain_context_mapping(struct domain *domain,
struct iommu_context *c
{
const struct acpi_drhd_unit *drhd = acpi_find_matched_drhd_unit(pdev);
const struct acpi_rmrr_unit *rmrr;
- paddr_t pgd_maddr = DEVICE_PGTABLE(domain, pdev);
- domid_t orig_domid = pdev->arch.pseudo_domid;
+ paddr_t pgd_maddr = ctx->arch.vtd.pgd_maddr;
+ domid_t did = domain->domain_id;
int ret = 0;
unsigned int i, mode = 0;
uint16_t seg = pdev->seg, bdf;
@@ -1722,20 +1710,11 @@ static int domain_context_mapping(struct domain
*domain, struct iommu_context *c
if ( !drhd )
return -ENODEV;
- if ( iommu_quarantine && orig_domid == DOMID_INVALID )
- {
- pdev->arch.pseudo_domid =
- iommu_alloc_domid(drhd->iommu->pseudo_domid_map);
- if ( pdev->arch.pseudo_domid == DOMID_INVALID )
- return -ENOSPC;
- }
-
if ( iommu_debug )
printk(VTDPREFIX "%pd:PCIe: map %pp\n",
domain, &PCI_SBDF(seg, bus, devfn));
ret = domain_context_mapping_one(domain, ctx, drhd->iommu, bus, devfn,
pdev,
- DEVICE_DOMID(domain, pdev), pgd_maddr,
- mode);
+ did, pgd_maddr, mode);
if ( ret > 0 )
ret = 0;
if ( !ret && devfn == pdev->devfn && ats_device(pdev, drhd) > 0 )
@@ -1747,21 +1726,12 @@ static int domain_context_mapping(struct domain
*domain, struct iommu_context *c
if ( !drhd )
return -ENODEV;
- if ( iommu_quarantine && orig_domid == DOMID_INVALID )
- {
- pdev->arch.pseudo_domid =
- iommu_alloc_domid(drhd->iommu->pseudo_domid_map);
- if ( pdev->arch.pseudo_domid == DOMID_INVALID )
- return -ENOSPC;
- }
-
if ( iommu_debug )
printk(VTDPREFIX "%pd:PCI: map %pp\n",
domain, &PCI_SBDF(seg, bus, devfn));
ret = domain_context_mapping_one(domain, ctx, drhd->iommu, bus, devfn,
- pdev, DEVICE_DOMID(domain, pdev),
- pgd_maddr, mode);
+ pdev, did, pgd_maddr, mode);
if ( ret < 0 )
break;
prev_present = ret;
@@ -1791,8 +1761,7 @@ static int domain_context_mapping(struct domain *domain,
struct iommu_context *c
*/
if ( ret >= 0 )
ret = domain_context_mapping_one(domain, ctx, drhd->iommu, bus,
devfn,
- NULL, DEVICE_DOMID(domain, pdev),
- pgd_maddr, mode);
+ NULL, did, pgd_maddr, mode);
/*
* Devices behind PCIe-to-PCI/PCIx bridge may generate different
@@ -1807,8 +1776,7 @@ static int domain_context_mapping(struct domain *domain,
struct iommu_context *c
if ( !ret && pdev_type(seg, bus, devfn) == DEV_TYPE_PCIe2PCI_BRIDGE &&
(secbus != pdev->bus || pdev->devfn != 0) )
ret = domain_context_mapping_one(domain, ctx, drhd->iommu, secbus,
0,
- NULL, DEVICE_DOMID(domain, pdev),
- pgd_maddr, mode);
+ NULL, did, pgd_maddr, mode);
if ( ret )
{
@@ -1830,13 +1798,6 @@ static int domain_context_mapping(struct domain *domain,
struct iommu_context *c
if ( !ret && devfn == pdev->devfn )
pci_vtd_quirk(pdev);
- if ( ret && drhd && orig_domid == DOMID_INVALID )
- {
- iommu_free_domid(pdev->arch.pseudo_domid,
- drhd->iommu->pseudo_domid_map);
- pdev->arch.pseudo_domid = DOMID_INVALID;
- }
-
return ret;
}
@@ -1994,10 +1955,6 @@ static const struct acpi_drhd_unit *domain_context_unmap(
return ERR_PTR(-EINVAL);
}
- if ( !ret && pdev->devfn == devfn &&
- !QUARANTINE_SKIP(domain, pdev->arch.vtd.pgd_maddr) )
- check_cleanup_domid_map(domain, pdev, iommu);
-
return drhd;
}
@@ -2031,21 +1988,6 @@ static void cf_check iommu_domain_teardown(struct domain
*d)
static void quarantine_teardown(struct pci_dev *pdev,
const struct acpi_drhd_unit *drhd)
{
- struct iommu_context *ctx = iommu_default_context(dom_io);
-
- ASSERT(pcidevs_locked());
-
- if ( !pdev->arch.vtd.pgd_maddr )
- return;
-
- ASSERT(page_list_empty(&ctx->arch.pgtables));
- page_list_move(&ctx->arch.pgtables, &pdev->arch.pgtables_list);
- while ( iommu_free_pgtables(dom_io, ctx) == -ERESTART )
- /* nothing */;
- pdev->arch.vtd.pgd_maddr = 0;
-
- if ( drhd )
- cleanup_domid_map(pdev->arch.pseudo_domid, drhd->iommu);
}
static int __must_check cf_check intel_iommu_map_page(
@@ -2386,13 +2328,6 @@ static int cf_check intel_iommu_remove_device(u8 devfn,
struct pci_dev *pdev)
quarantine_teardown(pdev, drhd);
- if ( drhd )
- {
- iommu_free_domid(pdev->arch.pseudo_domid,
- drhd->iommu->pseudo_domid_map);
- pdev->arch.pseudo_domid = DOMID_INVALID;
- }
-
return 0;
}
@@ -2750,42 +2685,22 @@ static int cf_check reassign_device_ownership(
{
int ret;
- if ( !QUARANTINE_SKIP(target, pdev->arch.vtd.pgd_maddr) )
- {
- struct iommu_context *target_ctx = iommu_default_context(target);
-
- if ( !has_arch_pdevs(target) )
- vmx_pi_hooks_assign(target);
+ if ( !has_arch_pdevs(target) )
+ vmx_pi_hooks_assign(target);
#ifdef CONFIG_PV
- /*
- * Devices assigned to untrusted domains (here assumed to be any domU)
- * can attempt to send arbitrary LAPIC/MSI messages. We are unprotected
- * by the root complex unless interrupt remapping is enabled.
- */
- if ( !iommu_intremap && !is_hardware_domain(target) &&
- !is_system_domain(target) )
- untrusted_msi = true;
+ /*
+ * Devices assigned to untrusted domains (here assumed to be any domU)
+ * can attempt to send arbitrary LAPIC/MSI messages. We are unprotected
+ * by the root complex unless interrupt remapping is enabled.
+ */
+ if ( !iommu_intremap && !is_hardware_domain(target) &&
+ !is_system_domain(target) )
+ untrusted_msi = true;
#endif
- ret = domain_context_mapping(target, target_ctx, devfn, pdev);
-
- if ( !ret && pdev->devfn == devfn &&
- !QUARANTINE_SKIP(source, pdev->arch.vtd.pgd_maddr) )
- {
- const struct acpi_drhd_unit *drhd =
acpi_find_matched_drhd_unit(pdev);
+ ret = domain_context_mapping(target, iommu_default_context(target), devfn,
pdev);
- if ( drhd )
- check_cleanup_domid_map(source, pdev, drhd->iommu);
- }
- }
- else
- {
- const struct acpi_drhd_unit *drhd;
-
- drhd = domain_context_unmap(source, devfn, pdev);
- ret = IS_ERR(drhd) ? PTR_ERR(drhd) : 0;
- }
if ( ret )
{
if ( !has_arch_pdevs(target) )
@@ -2884,9 +2799,6 @@ static int cf_check intel_iommu_assign_device(
}
}
- if ( d == dom_io )
- return reassign_device_ownership(s, d, devfn, pdev);
-
/* Setup rmrr identity mapping */
for_each_rmrr_device( rmrr, bdf, i )
{
@@ -3096,135 +3008,10 @@ static void cf_check vtd_dump_page_tables(struct
domain *d)
agaw_to_level(hd->arch.vtd.agaw), 0, 0);
}
-static int fill_qpt(struct dma_pte *this, unsigned int level,
- struct page_info *pgs[6])
-{
- struct domain_iommu *hd = dom_iommu(dom_io);
- struct iommu_context *ctx = iommu_default_context(dom_io);
- unsigned int i;
- int rc = 0;
-
- for ( i = 0; !rc && i < PTE_NUM; ++i )
- {
- struct dma_pte *pte = &this[i], *next;
-
- if ( !dma_pte_present(*pte) )
- {
- if ( !pgs[level] )
- {
- /*
- * The pgtable allocator is fine for the leaf page, as well as
- * page table pages, and the resulting allocations are always
- * zeroed.
- */
- pgs[level] = iommu_alloc_pgtable(hd, ctx, 0);
- if ( !pgs[level] )
- {
- rc = -ENOMEM;
- break;
- }
-
- if ( level )
- {
- next = map_vtd_domain_page(page_to_maddr(pgs[level]));
- rc = fill_qpt(next, level - 1, pgs);
- unmap_vtd_domain_page(next);
- }
- }
-
- dma_set_pte_addr(*pte, page_to_maddr(pgs[level]));
- dma_set_pte_readable(*pte);
- dma_set_pte_writable(*pte);
- }
- else if ( level && !dma_pte_superpage(*pte) )
- {
- next = map_vtd_domain_page(dma_pte_addr(*pte));
- rc = fill_qpt(next, level - 1, pgs);
- unmap_vtd_domain_page(next);
- }
- }
-
- return rc;
-}
-
static int cf_check intel_iommu_quarantine_init(struct pci_dev *pdev,
bool scratch_page)
{
- struct domain_iommu *hd = dom_iommu(dom_io);
- struct iommu_context *ctx = iommu_default_context(dom_io);
- struct page_info *pg;
- unsigned int agaw = hd->arch.vtd.agaw;
- unsigned int level = agaw_to_level(agaw);
- const struct acpi_drhd_unit *drhd;
- const struct acpi_rmrr_unit *rmrr;
- unsigned int i, bdf;
- bool rmrr_found = false;
- int rc;
-
- ASSERT(pcidevs_locked());
- ASSERT(!ctx->arch.vtd.pgd_maddr);
- ASSERT(page_list_empty(&ctx->arch.pgtables));
-
- if ( pdev->arch.vtd.pgd_maddr )
- {
- clear_domain_page(pdev->arch.leaf_mfn);
- return 0;
- }
-
- drhd = acpi_find_matched_drhd_unit(pdev);
- if ( !drhd )
- return -ENODEV;
-
- pg = iommu_alloc_pgtable(hd, ctx, 0);
- if ( !pg )
- return -ENOMEM;
-
- rc = context_set_domain_id(NULL, pdev->arch.pseudo_domid, drhd->iommu);
-
- /* Transiently install the root into DomIO, for iommu_identity_mapping().
*/
- ctx->arch.vtd.pgd_maddr = page_to_maddr(pg);
-
- for_each_rmrr_device ( rmrr, bdf, i )
- {
- if ( rc )
- break;
-
- if ( rmrr->segment == pdev->seg && bdf == pdev->sbdf.bdf )
- {
- rmrr_found = true;
-
- rc = iommu_identity_mapping(dom_io, ctx, p2m_access_rw,
- rmrr->base_address, rmrr->end_address,
- 0);
- if ( rc )
- printk(XENLOG_ERR VTDPREFIX
- "%pp: RMRR quarantine mapping failed\n",
- &pdev->sbdf);
- }
- }
-
- iommu_identity_map_teardown(dom_io, ctx);
- ctx->arch.vtd.pgd_maddr = 0;
- pdev->arch.vtd.pgd_maddr = page_to_maddr(pg);
-
- if ( !rc && scratch_page )
- {
- struct dma_pte *root;
- struct page_info *pgs[6] = {};
-
- root = map_vtd_domain_page(pdev->arch.vtd.pgd_maddr);
- rc = fill_qpt(root, level - 1, pgs);
- unmap_vtd_domain_page(root);
-
- pdev->arch.leaf_mfn = page_to_mfn(pgs[0]);
- }
-
- page_list_move(&pdev->arch.pgtables_list, &ctx->arch.pgtables);
-
- if ( rc || (!scratch_page && !rmrr_found) )
- quarantine_teardown(pdev, drhd);
-
- return rc;
+ return 0;
}
static const struct iommu_ops __initconst_cf_clobber vtd_ops = {
diff --git a/xen/drivers/passthrough/x86/iommu.c
b/xen/drivers/passthrough/x86/iommu.c
index 4a3fe059cb..a444e5813e 100644
--- a/xen/drivers/passthrough/x86/iommu.c
+++ b/xen/drivers/passthrough/x86/iommu.c
@@ -549,7 +549,6 @@ void __hwdom_init arch_iommu_hwdom_init(struct domain *d)
void arch_pci_init_pdev(struct pci_dev *pdev)
{
- pdev->arch.pseudo_domid = DOMID_INVALID;
}
unsigned long *__init iommu_init_domid(domid_t reserve)
--
2.47.2
Teddy Astie | Vates XCP-ng Developer
XCP-ng & Xen Orchestra - Vates solutions
web: https://vates.tech
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |