|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen stable-4.6] IOMMU/x86: per-domain control structure is not HVM-specific
commit 114d25f99994baf196a56aed81d6633193b862bb
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri May 27 14:34:41 2016 +0200
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri May 27 14:34:41 2016 +0200
IOMMU/x86: per-domain control structure is not HVM-specific
... and hence should not live in the HVM part of the PV/HVM union. In
fact it's not even architecture specific (there already is a per-arch
extension type to it), so it gets moved out right to common struct
domain.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Acked-by: Julien Grall <julien.grall@xxxxxxx>
Reviewed-by: Wei Liu <wei.liu2@xxxxxxxxxx>
master commit: af07377007d595b5d6422291bb1c932c16d1036f
master date: 2016-05-04 09:44:32 +0200
---
xen/arch/x86/domctl.c | 4 +--
xen/arch/x86/hvm/io.c | 4 +--
xen/arch/x86/tboot.c | 7 +++--
xen/drivers/passthrough/amd/iommu_cmd.c | 1 -
xen/drivers/passthrough/amd/iommu_guest.c | 9 +++---
xen/drivers/passthrough/amd/iommu_intr.c | 1 -
xen/drivers/passthrough/amd/iommu_map.c | 15 +++++-----
xen/drivers/passthrough/amd/pci_amd_iommu.c | 16 +++++------
xen/drivers/passthrough/arm/smmu.c | 12 ++++----
xen/drivers/passthrough/device_tree.c | 10 +++----
xen/drivers/passthrough/io.c | 1 -
xen/drivers/passthrough/iommu.c | 23 ++++++---------
xen/drivers/passthrough/pci.c | 19 ++++++-------
xen/drivers/passthrough/vtd/intremap.c | 1 -
xen/drivers/passthrough/vtd/iommu.c | 32 +++++++++------------
xen/drivers/passthrough/vtd/quirks.c | 1 -
xen/drivers/passthrough/x86/iommu.c | 6 ++--
xen/include/asm-arm/domain.h | 2 --
xen/include/asm-arm/hvm/iommu.h | 10 -------
xen/include/asm-arm/iommu.h | 7 ++++-
xen/include/asm-x86/hvm/domain.h | 4 ---
xen/include/asm-x86/hvm/iommu.h | 2 +-
xen/include/asm-x86/iommu.h | 3 +-
xen/include/xen/hvm/iommu.h | 44 -----------------------------
xen/include/xen/iommu.h | 18 ++++++++++++
xen/include/xen/sched.h | 3 ++
26 files changed, 101 insertions(+), 154 deletions(-)
diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index bf62a88..db5681a 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -464,7 +464,7 @@ long arch_do_domctl(
case XEN_DOMCTL_ioport_mapping:
{
- struct hvm_iommu *hd;
+ struct domain_iommu *hd;
unsigned int fgp = domctl->u.ioport_mapping.first_gport;
unsigned int fmp = domctl->u.ioport_mapping.first_mport;
unsigned int np = domctl->u.ioport_mapping.nr_ports;
@@ -490,7 +490,7 @@ long arch_do_domctl(
if ( ret )
break;
- hd = domain_hvm_iommu(d);
+ hd = dom_iommu(d);
if ( add )
{
printk(XENLOG_G_INFO
diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c
index fee812a..45f8c7c 100644
--- a/xen/arch/x86/hvm/io.c
+++ b/xen/arch/x86/hvm/io.c
@@ -173,12 +173,12 @@ static bool_t dpci_portio_accept(const struct
hvm_io_handler *handler,
const ioreq_t *p)
{
struct vcpu *curr = current;
- struct hvm_iommu *hd = domain_hvm_iommu(curr->domain);
+ const struct domain_iommu *dio = dom_iommu(curr->domain);
struct hvm_vcpu_io *vio = &curr->arch.hvm_vcpu.hvm_io;
struct g2m_ioport *g2m_ioport;
unsigned int start, end;
- list_for_each_entry( g2m_ioport, &hd->arch.g2m_ioport_list, list )
+ list_for_each_entry( g2m_ioport, &dio->arch.g2m_ioport_list, list )
{
start = g2m_ioport->gport;
end = start + g2m_ioport->np;
diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c
index 88142d2..e5d7c42 100644
--- a/xen/arch/x86/tboot.c
+++ b/xen/arch/x86/tboot.c
@@ -229,9 +229,10 @@ static void tboot_gen_domain_integrity(const uint8_t
key[TB_KEY_SIZE],
if ( !is_idle_domain(d) )
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
- update_iommu_mac(&ctx, hd->arch.pgd_maddr,
- agaw_to_level(hd->arch.agaw));
+ const struct domain_iommu *dio = dom_iommu(d);
+
+ update_iommu_mac(&ctx, dio->arch.pgd_maddr,
+ agaw_to_level(dio->arch.agaw));
}
}
diff --git a/xen/drivers/passthrough/amd/iommu_cmd.c
b/xen/drivers/passthrough/amd/iommu_cmd.c
index 44407f5..7c9d9be 100644
--- a/xen/drivers/passthrough/amd/iommu_cmd.c
+++ b/xen/drivers/passthrough/amd/iommu_cmd.c
@@ -18,7 +18,6 @@
*/
#include <xen/sched.h>
-#include <xen/hvm/iommu.h>
#include <asm/amd-iommu.h>
#include <asm/hvm/svm/amd-iommu-proto.h>
#include "../ats.h"
diff --git a/xen/drivers/passthrough/amd/iommu_guest.c
b/xen/drivers/passthrough/amd/iommu_guest.c
index e74f469..46ec7dc 100644
--- a/xen/drivers/passthrough/amd/iommu_guest.c
+++ b/xen/drivers/passthrough/amd/iommu_guest.c
@@ -18,7 +18,6 @@
#include <xen/sched.h>
#include <asm/p2m.h>
-#include <asm/hvm/iommu.h>
#include <asm/amd-iommu.h>
#include <asm/hvm/svm/amd-iommu-proto.h>
@@ -59,12 +58,12 @@ static uint16_t guest_bdf(struct domain *d, uint16_t
machine_bdf)
static inline struct guest_iommu *domain_iommu(struct domain *d)
{
- return domain_hvm_iommu(d)->arch.g_iommu;
+ return dom_iommu(d)->arch.g_iommu;
}
static inline struct guest_iommu *vcpu_iommu(struct vcpu *v)
{
- return domain_hvm_iommu(v->domain)->arch.g_iommu;
+ return dom_iommu(v->domain)->arch.g_iommu;
}
static void guest_iommu_enable(struct guest_iommu *iommu)
@@ -885,7 +884,7 @@ static const struct hvm_mmio_ops iommu_mmio_ops = {
int guest_iommu_init(struct domain* d)
{
struct guest_iommu *iommu;
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
if ( !is_hvm_domain(d) || !iommu_enabled || !iommuv2_enabled )
return 0;
@@ -923,5 +922,5 @@ void guest_iommu_destroy(struct domain *d)
tasklet_kill(&iommu->cmd_buffer_tasklet);
xfree(iommu);
- domain_hvm_iommu(d)->arch.g_iommu = NULL;
+ dom_iommu(d)->arch.g_iommu = NULL;
}
diff --git a/xen/drivers/passthrough/amd/iommu_intr.c
b/xen/drivers/passthrough/amd/iommu_intr.c
index 62e29e9..8708383 100644
--- a/xen/drivers/passthrough/amd/iommu_intr.c
+++ b/xen/drivers/passthrough/amd/iommu_intr.c
@@ -18,7 +18,6 @@
#include <xen/err.h>
#include <xen/sched.h>
-#include <xen/hvm/iommu.h>
#include <asm/amd-iommu.h>
#include <asm/hvm/svm/amd-iommu-proto.h>
#include <asm/io_apic.h>
diff --git a/xen/drivers/passthrough/amd/iommu_map.c
b/xen/drivers/passthrough/amd/iommu_map.c
index 78862c9..a7b734c 100644
--- a/xen/drivers/passthrough/amd/iommu_map.c
+++ b/xen/drivers/passthrough/amd/iommu_map.c
@@ -21,7 +21,6 @@
#include <xen/acpi.h>
#include <xen/sched.h>
#include <asm/p2m.h>
-#include <xen/hvm/iommu.h>
#include <asm/amd-iommu.h>
#include <asm/hvm/svm/amd-iommu-proto.h>
#include "../ats.h"
@@ -340,7 +339,7 @@ static int iommu_update_pde_count(struct domain *d,
unsigned long pt_mfn,
unsigned long first_mfn;
u64 *table, *pde, *ntable;
u64 ntable_maddr, mask;
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
bool_t ok = 0;
ASSERT( spin_is_locked(&hd->arch.mapping_lock) && pt_mfn );
@@ -395,7 +394,7 @@ static int iommu_merge_pages(struct domain *d, unsigned
long pt_mfn,
u64 *table, *pde, *ntable;
u64 ntable_mfn;
unsigned long first_mfn;
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
ASSERT( spin_is_locked(&hd->arch.mapping_lock) && pt_mfn );
@@ -445,7 +444,7 @@ static int iommu_pde_from_gfn(struct domain *d, unsigned
long pfn,
unsigned long next_table_mfn;
unsigned int level;
struct page_info *table;
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
table = hd->arch.root_table;
level = hd->arch.paging_mode;
@@ -554,7 +553,7 @@ static int update_paging_mode(struct domain *d, unsigned
long gfn)
struct page_info *old_root = NULL;
void *new_root_vaddr;
unsigned long old_root_mfn;
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
if ( gfn == INVALID_MFN )
return -EADDRNOTAVAIL;
@@ -637,7 +636,7 @@ int amd_iommu_map_page(struct domain *d, unsigned long gfn,
unsigned long mfn,
unsigned int flags)
{
bool_t need_flush = 0;
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
unsigned long pt_mfn[7];
unsigned int merge_level;
@@ -717,7 +716,7 @@ out:
int amd_iommu_unmap_page(struct domain *d, unsigned long gfn)
{
unsigned long pt_mfn[7];
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
BUG_ON( !hd->arch.root_table );
@@ -787,7 +786,7 @@ int amd_iommu_reserve_domain_unity_map(struct domain
*domain,
/* Share p2m table with iommu. */
void amd_iommu_share_p2m(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
struct page_info *p2m_table;
mfn_t pgd_mfn;
diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c
b/xen/drivers/passthrough/amd/pci_amd_iommu.c
index c1c0b6b..453e979 100644
--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
@@ -23,7 +23,6 @@
#include <xen/pci_regs.h>
#include <xen/paging.h>
#include <xen/softirq.h>
-#include <asm/hvm/iommu.h>
#include <asm/amd-iommu.h>
#include <asm/hvm/svm/amd-iommu-proto.h>
#include "../ats.h"
@@ -117,8 +116,7 @@ static void amd_iommu_setup_domain_device(
int req_id, valid = 1;
int dte_i = 0;
u8 bus = pdev->bus;
-
- struct hvm_iommu *hd = domain_hvm_iommu(domain);
+ const struct domain_iommu *hd = dom_iommu(domain);
BUG_ON( !hd->arch.root_table || !hd->arch.paging_mode ||
!iommu->dev_table.buffer );
@@ -224,7 +222,7 @@ int __init amd_iov_detect(void)
return scan_pci_devices();
}
-static int allocate_domain_resources(struct hvm_iommu *hd)
+static int allocate_domain_resources(struct domain_iommu *hd)
{
/* allocate root table */
spin_lock(&hd->arch.mapping_lock);
@@ -259,7 +257,7 @@ static int get_paging_mode(unsigned long entries)
static int amd_iommu_domain_init(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
/* allocate page directroy */
if ( allocate_domain_resources(hd) != 0 )
@@ -341,7 +339,7 @@ void amd_iommu_disable_domain_device(struct domain *domain,
AMD_IOMMU_DEBUG("Disable: device id = %#x, "
"domain = %d, paging mode = %d\n",
req_id, domain->domain_id,
- domain_hvm_iommu(domain)->arch.paging_mode);
+ dom_iommu(domain)->arch.paging_mode);
}
spin_unlock_irqrestore(&iommu->lock, flags);
@@ -358,7 +356,7 @@ static int reassign_device(struct domain *source, struct
domain *target,
{
struct amd_iommu *iommu;
int bdf;
- struct hvm_iommu *t = domain_hvm_iommu(target);
+ struct domain_iommu *t = dom_iommu(target);
bdf = PCI_BDF2(pdev->bus, pdev->devfn);
iommu = find_iommu_for_device(pdev->seg, bdf);
@@ -459,7 +457,7 @@ static void deallocate_page_table(struct page_info *pg)
static void deallocate_iommu_page_tables(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
if ( iommu_use_hap_pt(d) )
return;
@@ -599,7 +597,7 @@ static void amd_dump_p2m_table_level(struct page_info* pg,
int level,
static void amd_dump_p2m_table(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
if ( !hd->arch.root_table )
return;
diff --git a/xen/drivers/passthrough/arm/smmu.c
b/xen/drivers/passthrough/arm/smmu.c
index bb08827..cbcb06c 100644
--- a/xen/drivers/passthrough/arm/smmu.c
+++ b/xen/drivers/passthrough/arm/smmu.c
@@ -2546,7 +2546,7 @@ static u32 platform_features =
ARM_SMMU_FEAT_COHERENT_WALK;
static void arm_smmu_iotlb_flush_all(struct domain *d)
{
- struct arm_smmu_xen_domain *smmu_domain =
domain_hvm_iommu(d)->arch.priv;
+ struct arm_smmu_xen_domain *smmu_domain = dom_iommu(d)->arch.priv;
struct iommu_domain *cfg;
spin_lock(&smmu_domain->lock);
@@ -2577,7 +2577,7 @@ static struct iommu_domain *arm_smmu_get_domain(struct
domain *d,
struct arm_smmu_xen_domain *xen_domain;
struct arm_smmu_device *smmu;
- xen_domain = domain_hvm_iommu(d)->arch.priv;
+ xen_domain = dom_iommu(d)->arch.priv;
smmu = find_smmu_for_device(dev);
if (!smmu)
@@ -2610,7 +2610,7 @@ static int arm_smmu_assign_dev(struct domain *d, u8 devfn,
struct arm_smmu_xen_domain *xen_domain;
int ret = 0;
- xen_domain = domain_hvm_iommu(d)->arch.priv;
+ xen_domain = dom_iommu(d)->arch.priv;
if (!dev->archdata.iommu) {
dev->archdata.iommu = xzalloc(struct arm_smmu_xen_device);
@@ -2671,7 +2671,7 @@ static int arm_smmu_deassign_dev(struct domain *d, struct
device *dev)
struct iommu_domain *domain = dev_iommu_domain(dev);
struct arm_smmu_xen_domain *xen_domain;
- xen_domain = domain_hvm_iommu(d)->arch.priv;
+ xen_domain = dom_iommu(d)->arch.priv;
if (!domain || domain->priv->cfg.domain != d) {
dev_err(dev, " not attached to domain %d\n", d->domain_id);
@@ -2728,7 +2728,7 @@ static int arm_smmu_iommu_domain_init(struct domain *d)
spin_lock_init(&xen_domain->lock);
INIT_LIST_HEAD(&xen_domain->contexts);
- domain_hvm_iommu(d)->arch.priv = xen_domain;
+ dom_iommu(d)->arch.priv = xen_domain;
/* Coherent walk can be enabled only when all SMMUs support it. */
if (platform_features & ARM_SMMU_FEAT_COHERENT_WALK)
@@ -2743,7 +2743,7 @@ static void __hwdom_init arm_smmu_iommu_hwdom_init(struct
domain *d)
static void arm_smmu_iommu_domain_teardown(struct domain *d)
{
- struct arm_smmu_xen_domain *xen_domain = domain_hvm_iommu(d)->arch.priv;
+ struct arm_smmu_xen_domain *xen_domain = dom_iommu(d)->arch.priv;
ASSERT(list_empty(&xen_domain->contexts));
xfree(xen_domain);
diff --git a/xen/drivers/passthrough/device_tree.c
b/xen/drivers/passthrough/device_tree.c
index 7ff79f8..79bf8bf 100644
--- a/xen/drivers/passthrough/device_tree.c
+++ b/xen/drivers/passthrough/device_tree.c
@@ -27,7 +27,7 @@ static spinlock_t dtdevs_lock = SPIN_LOCK_UNLOCKED;
int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev)
{
int rc = -EBUSY;
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
if ( !iommu_enabled || !hd->platform_ops )
return -EINVAL;
@@ -69,7 +69,7 @@ fail:
int iommu_deassign_dt_device(struct domain *d, struct dt_device_node *dev)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
int rc;
if ( !iommu_enabled || !hd->platform_ops )
@@ -109,16 +109,14 @@ static bool_t iommu_dt_device_is_assigned(const struct
dt_device_node *dev)
int iommu_dt_domain_init(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
-
- INIT_LIST_HEAD(&hd->dt_devices);
+ INIT_LIST_HEAD(&dom_iommu(d)->dt_devices);
return 0;
}
int iommu_release_dt_devices(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
struct dt_device_node *dev, *_dev;
int rc;
diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c
index 4eba515..a269cd9 100644
--- a/xen/drivers/passthrough/io.c
+++ b/xen/drivers/passthrough/io.c
@@ -22,7 +22,6 @@
#include <xen/cpu.h>
#include <xen/irq.h>
#include <asm/hvm/irq.h>
-#include <asm/hvm/iommu.h>
#include <asm/hvm/support.h>
#include <xen/hvm/irq.h>
diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c
index d5137733..5d040b0 100644
--- a/xen/drivers/passthrough/iommu.c
+++ b/xen/drivers/passthrough/iommu.c
@@ -14,7 +14,6 @@
#include <xen/sched.h>
#include <xen/iommu.h>
-#include <asm/hvm/iommu.h>
#include <xen/paging.h>
#include <xen/guest_access.h>
#include <xen/event.h>
@@ -118,7 +117,7 @@ static void __init parse_iommu_param(char *s)
int iommu_domain_init(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
int ret = 0;
ret = arch_iommu_domain_init(d);
@@ -148,7 +147,7 @@ static void __hwdom_init check_hwdom_reqs(struct domain *d)
void __hwdom_init iommu_hwdom_init(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
check_hwdom_reqs(d);
@@ -182,7 +181,7 @@ void __hwdom_init iommu_hwdom_init(struct domain *d)
void iommu_teardown(struct domain *d)
{
- const struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
d->need_iommu = 0;
hd->platform_ops->teardown(d);
@@ -217,9 +216,7 @@ int iommu_construct(struct domain *d)
void iommu_domain_destroy(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
-
- if ( !iommu_enabled || !hd->platform_ops )
+ if ( !iommu_enabled || !dom_iommu(d)->platform_ops )
return;
if ( need_iommu(d) )
@@ -231,7 +228,7 @@ void iommu_domain_destroy(struct domain *d)
int iommu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn,
unsigned int flags)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
if ( !iommu_enabled || !hd->platform_ops )
return 0;
@@ -241,7 +238,7 @@ int iommu_map_page(struct domain *d, unsigned long gfn,
unsigned long mfn,
int iommu_unmap_page(struct domain *d, unsigned long gfn)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
if ( !iommu_enabled || !hd->platform_ops )
return 0;
@@ -268,7 +265,7 @@ static void iommu_free_pagetables(unsigned long unused)
void iommu_iotlb_flush(struct domain *d, unsigned long gfn, unsigned int
page_count)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
if ( !iommu_enabled || !hd->platform_ops || !hd->platform_ops->iotlb_flush
)
return;
@@ -278,7 +275,7 @@ void iommu_iotlb_flush(struct domain *d, unsigned long gfn,
unsigned int page_co
void iommu_iotlb_flush_all(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
if ( !iommu_enabled || !hd->platform_ops ||
!hd->platform_ops->iotlb_flush_all )
return;
@@ -389,12 +386,10 @@ int iommu_get_reserved_device_memory(iommu_grdm_t *func,
void *ctxt)
bool_t iommu_has_feature(struct domain *d, enum iommu_feature feature)
{
- const struct hvm_iommu *hd = domain_hvm_iommu(d);
-
if ( !iommu_enabled )
return 0;
- return test_bit(feature, hd->features);
+ return test_bit(feature, dom_iommu(d)->features);
}
static void iommu_dump_p2m_table(unsigned char key)
diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c
index 27b3ca7..ee8c106 100644
--- a/xen/drivers/passthrough/pci.c
+++ b/xen/drivers/passthrough/pci.c
@@ -21,7 +21,6 @@
#include <xen/prefetch.h>
#include <xen/iommu.h>
#include <xen/irq.h>
-#include <asm/hvm/iommu.h>
#include <asm/hvm/irq.h>
#include <xen/delay.h>
#include <xen/keyhandler.h>
@@ -1241,7 +1240,7 @@ void iommu_read_msi_from_ire(
int iommu_add_device(struct pci_dev *pdev)
{
- struct hvm_iommu *hd;
+ const struct domain_iommu *hd;
int rc;
u8 devfn;
@@ -1250,7 +1249,7 @@ int iommu_add_device(struct pci_dev *pdev)
ASSERT(spin_is_locked(&pcidevs_lock));
- hd = domain_hvm_iommu(pdev->domain);
+ hd = dom_iommu(pdev->domain);
if ( !iommu_enabled || !hd->platform_ops )
return 0;
@@ -1272,14 +1271,14 @@ int iommu_add_device(struct pci_dev *pdev)
int iommu_enable_device(struct pci_dev *pdev)
{
- struct hvm_iommu *hd;
+ const struct domain_iommu *hd;
if ( !pdev->domain )
return -EINVAL;
ASSERT(spin_is_locked(&pcidevs_lock));
- hd = domain_hvm_iommu(pdev->domain);
+ hd = dom_iommu(pdev->domain);
if ( !iommu_enabled || !hd->platform_ops ||
!hd->platform_ops->enable_device )
return 0;
@@ -1289,13 +1288,13 @@ int iommu_enable_device(struct pci_dev *pdev)
int iommu_remove_device(struct pci_dev *pdev)
{
- struct hvm_iommu *hd;
+ const struct domain_iommu *hd;
u8 devfn;
if ( !pdev->domain )
return -EINVAL;
- hd = domain_hvm_iommu(pdev->domain);
+ hd = dom_iommu(pdev->domain);
if ( !iommu_enabled || !hd->platform_ops )
return 0;
@@ -1335,7 +1334,7 @@ static int device_assigned(u16 seg, u8 bus, u8 devfn)
static int assign_device(struct domain *d, u16 seg, u8 bus, u8 devfn, u32 flag)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
struct pci_dev *pdev;
int rc = 0;
@@ -1395,7 +1394,7 @@ static int assign_device(struct domain *d, u16 seg, u8
bus, u8 devfn, u32 flag)
/* caller should hold the pcidevs_lock */
int deassign_device(struct domain *d, u16 seg, u8 bus, u8 devfn)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
struct pci_dev *pdev = NULL;
int ret = 0;
@@ -1445,7 +1444,7 @@ static int iommu_get_device_group(
struct domain *d, u16 seg, u8 bus, u8 devfn,
XEN_GUEST_HANDLE_64(uint32) buf, int max_sdevs)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
struct pci_dev *pdev;
int group_id, sdev_id;
u32 bdf;
diff --git a/xen/drivers/passthrough/vtd/intremap.c
b/xen/drivers/passthrough/vtd/intremap.c
index f9ba0ce..0800353 100644
--- a/xen/drivers/passthrough/vtd/intremap.c
+++ b/xen/drivers/passthrough/vtd/intremap.c
@@ -20,7 +20,6 @@
#include <xen/irq.h>
#include <xen/sched.h>
#include <xen/iommu.h>
-#include <asm/hvm/iommu.h>
#include <xen/time.h>
#include <xen/list.h>
#include <xen/pci.h>
diff --git a/xen/drivers/passthrough/vtd/iommu.c
b/xen/drivers/passthrough/vtd/iommu.c
index 753f55a..275d4f1 100644
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -24,7 +24,6 @@
#include <xen/domain_page.h>
#include <xen/iocap.h>
#include <xen/iommu.h>
-#include <asm/hvm/iommu.h>
#include <xen/numa.h>
#include <xen/softirq.h>
#include <xen/time.h>
@@ -253,7 +252,7 @@ static u64 addr_to_dma_page_maddr(struct domain *domain,
u64 addr, int alloc)
{
struct acpi_drhd_unit *drhd;
struct pci_dev *pdev;
- struct hvm_iommu *hd = domain_hvm_iommu(domain);
+ struct domain_iommu *hd = dom_iommu(domain);
int addr_width = agaw_to_width(hd->arch.agaw);
struct dma_pte *parent, *pte = NULL;
int level = agaw_to_level(hd->arch.agaw);
@@ -561,7 +560,7 @@ static void iommu_flush_all(void)
static void __intel_iommu_iotlb_flush(struct domain *d, unsigned long gfn,
int dma_old_pte_present, unsigned int page_count)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
struct acpi_drhd_unit *drhd;
struct iommu *iommu;
int flush_dev_iotlb;
@@ -612,7 +611,7 @@ static void intel_iommu_iotlb_flush_all(struct domain *d)
/* clear one page's page table */
static void dma_pte_clear_one(struct domain *domain, u64 addr)
{
- struct hvm_iommu *hd = domain_hvm_iommu(domain);
+ struct domain_iommu *hd = dom_iommu(domain);
struct dma_pte *page = NULL, *pte = NULL;
u64 pg_maddr;
@@ -1240,9 +1239,7 @@ void __init iommu_free(struct acpi_drhd_unit *drhd)
static int intel_iommu_domain_init(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
-
- hd->arch.agaw = width_to_agaw(DEFAULT_DOMAIN_ADDRESS_WIDTH);
+ dom_iommu(d)->arch.agaw = width_to_agaw(DEFAULT_DOMAIN_ADDRESS_WIDTH);
return 0;
}
@@ -1276,7 +1273,7 @@ int domain_context_mapping_one(
struct iommu *iommu,
u8 bus, u8 devfn, const struct pci_dev *pdev)
{
- struct hvm_iommu *hd = domain_hvm_iommu(domain);
+ struct domain_iommu *hd = dom_iommu(domain);
struct context_entry *context, *context_entries;
u64 maddr, pgd_maddr;
u16 seg = iommu->intel->drhd->segment;
@@ -1646,10 +1643,9 @@ static int domain_context_unmap(
if ( found == 0 )
{
- struct hvm_iommu *hd = domain_hvm_iommu(domain);
int iommu_domid;
- clear_bit(iommu->index, &hd->arch.iommu_bitmap);
+ clear_bit(iommu->index, &dom_iommu(domain)->arch.iommu_bitmap);
iommu_domid = domain_iommu_domid(domain, iommu);
if ( iommu_domid == -1 )
@@ -1668,7 +1664,7 @@ out:
static void iommu_domain_teardown(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
struct mapped_rmrr *mrmrr, *tmp;
if ( list_empty(&acpi_drhd_units) )
@@ -1693,7 +1689,7 @@ static int intel_iommu_map_page(
struct domain *d, unsigned long gfn, unsigned long mfn,
unsigned int flags)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
struct dma_pte *page = NULL, *pte = NULL, old, new = { 0 };
u64 pg_maddr;
@@ -1759,7 +1755,7 @@ void iommu_pte_flush(struct domain *d, u64 gfn, u64 *pte,
{
struct acpi_drhd_unit *drhd;
struct iommu *iommu = NULL;
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
int flush_dev_iotlb;
int iommu_domid;
@@ -1800,11 +1796,11 @@ static int __init vtd_ept_page_compatible(struct iommu
*iommu)
*/
static void iommu_set_pgd(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
mfn_t pgd_mfn;
pgd_mfn = pagetable_get_mfn(p2m_get_pagetable(p2m_get_hostp2m(d)));
- hd->arch.pgd_maddr = pagetable_get_paddr(pagetable_from_mfn(pgd_mfn));
+ dom_iommu(d)->arch.pgd_maddr =
+ pagetable_get_paddr(pagetable_from_mfn(pgd_mfn));
}
static int rmrr_identity_mapping(struct domain *d, bool_t map,
@@ -1814,7 +1810,7 @@ static int rmrr_identity_mapping(struct domain *d, bool_t
map,
unsigned long base_pfn = rmrr->base_address >> PAGE_SHIFT_4K;
unsigned long end_pfn = PAGE_ALIGN_4K(rmrr->end_address) >> PAGE_SHIFT_4K;
struct mapped_rmrr *mrmrr;
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
ASSERT(spin_is_locked(&pcidevs_lock));
ASSERT(rmrr->base_address < rmrr->end_address);
@@ -2504,12 +2500,12 @@ static void vtd_dump_p2m_table_level(paddr_t pt_maddr,
int level, paddr_t gpa,
static void vtd_dump_p2m_table(struct domain *d)
{
- struct hvm_iommu *hd;
+ const struct domain_iommu *hd;
if ( list_empty(&acpi_drhd_units) )
return;
- hd = domain_hvm_iommu(d);
+ hd = dom_iommu(d);
printk("p2m table has %d levels\n", agaw_to_level(hd->arch.agaw));
vtd_dump_p2m_table_level(hd->arch.pgd_maddr, agaw_to_level(hd->arch.agaw),
0, 0);
}
diff --git a/xen/drivers/passthrough/vtd/quirks.c
b/xen/drivers/passthrough/vtd/quirks.c
index 49df41d..473d1fc 100644
--- a/xen/drivers/passthrough/vtd/quirks.c
+++ b/xen/drivers/passthrough/vtd/quirks.c
@@ -21,7 +21,6 @@
#include <xen/xmalloc.h>
#include <xen/domain_page.h>
#include <xen/iommu.h>
-#include <asm/hvm/iommu.h>
#include <xen/numa.h>
#include <xen/softirq.h>
#include <xen/time.h>
diff --git a/xen/drivers/passthrough/x86/iommu.c
b/xen/drivers/passthrough/x86/iommu.c
index 8cbb655..b64b98f 100644
--- a/xen/drivers/passthrough/x86/iommu.c
+++ b/xen/drivers/passthrough/x86/iommu.c
@@ -41,7 +41,7 @@ int __init iommu_setup_hpet_msi(struct msi_desc *msi)
int arch_iommu_populate_page_table(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
struct page_info *page;
int rc = 0, n = 0;
@@ -119,7 +119,7 @@ void __hwdom_init
arch_iommu_check_autotranslated_hwdom(struct domain *d)
int arch_iommu_domain_init(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ struct domain_iommu *hd = dom_iommu(d);
spin_lock_init(&hd->arch.mapping_lock);
INIT_LIST_HEAD(&hd->arch.g2m_ioport_list);
@@ -130,7 +130,7 @@ int arch_iommu_domain_init(struct domain *d)
void arch_iommu_domain_destroy(struct domain *d)
{
- struct hvm_iommu *hd = domain_hvm_iommu(d);
+ const struct domain_iommu *hd = dom_iommu(d);
struct list_head *ioport_list, *tmp;
struct g2m_ioport *ioport;
diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h
index 56aa208..975d76d 100644
--- a/xen/include/asm-arm/domain.h
+++ b/xen/include/asm-arm/domain.h
@@ -11,12 +11,10 @@
#include <asm/gic.h>
#include <public/hvm/params.h>
#include <xen/serial.h>
-#include <xen/hvm/iommu.h>
struct hvm_domain
{
uint64_t params[HVM_NR_PARAMS];
- struct hvm_iommu iommu;
bool_t introspection_enabled;
} __cacheline_aligned;
diff --git a/xen/include/asm-arm/hvm/iommu.h b/xen/include/asm-arm/hvm/iommu.h
deleted file mode 100644
index 461c8cf..0000000
--- a/xen/include/asm-arm/hvm/iommu.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __ASM_ARM_HVM_IOMMU_H_
-#define __ASM_ARM_HVM_IOMMU_H_
-
-struct arch_hvm_iommu
-{
- /* Private information for the IOMMU drivers */
- void *priv;
-};
-
-#endif /* __ASM_ARM_HVM_IOMMU_H_ */
diff --git a/xen/include/asm-arm/iommu.h b/xen/include/asm-arm/iommu.h
index 9b0e34f..57d9b1e 100644
--- a/xen/include/asm-arm/iommu.h
+++ b/xen/include/asm-arm/iommu.h
@@ -14,9 +14,14 @@
#ifndef __ARCH_ARM_IOMMU_H__
#define __ARCH_ARM_IOMMU_H__
+struct arch_iommu
+{
+ /* Private information for the IOMMU drivers */
+ void *priv;
+};
+
/* Always share P2M Table between the CPU and the IOMMU */
#define iommu_use_hap_pt(d) (1)
-#define domain_hvm_iommu(d) (&d->arch.hvm_domain.iommu)
const struct iommu_ops *iommu_get_ops(void);
void __init iommu_set_ops(const struct iommu_ops *ops);
diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h
index 992d5d1..1f69ea0 100644
--- a/xen/include/asm-x86/hvm/domain.h
+++ b/xen/include/asm-x86/hvm/domain.h
@@ -26,7 +26,6 @@
#include <asm/hvm/vlapic.h>
#include <asm/hvm/vioapic.h>
#include <asm/hvm/io.h>
-#include <xen/hvm/iommu.h>
#include <asm/hvm/viridian.h>
#include <asm/hvm/vmx/vmcs.h>
#include <asm/hvm/svm/vmcb.h>
@@ -123,9 +122,6 @@ struct hvm_domain {
spinlock_t uc_lock;
bool_t is_in_uc_mode;
- /* Pass-through */
- struct hvm_iommu hvm_iommu;
-
/* hypervisor intercepted msix table */
struct list_head msixtbl_list;
spinlock_t msixtbl_list_lock;
diff --git a/xen/include/asm-x86/hvm/iommu.h b/xen/include/asm-x86/hvm/iommu.h
index 3a4c68a..6962cf6 100644
--- a/xen/include/asm-x86/hvm/iommu.h
+++ b/xen/include/asm-x86/hvm/iommu.h
@@ -48,7 +48,7 @@ struct g2m_ioport {
#define DEFAULT_DOMAIN_ADDRESS_WIDTH 48
-struct arch_hvm_iommu
+struct arch_iommu
{
u64 pgd_maddr; /* io page directory machine address */
spinlock_t mapping_lock; /* io page table lock */
diff --git a/xen/include/asm-x86/iommu.h b/xen/include/asm-x86/iommu.h
index 7e24b1a..d01fdec 100644
--- a/xen/include/asm-x86/iommu.h
+++ b/xen/include/asm-x86/iommu.h
@@ -14,11 +14,12 @@
#ifndef __ARCH_X86_IOMMU_H__
#define __ARCH_X86_IOMMU_H__
+#include <asm/hvm/iommu.h> /* For now - should really be merged here. */
+
#define MAX_IOMMUS 32
/* Does this domain have a P2M table we can use as its IOMMU pagetable? */
#define iommu_use_hap_pt(d) (hap_enabled(d) && iommu_hap_pt_share)
-#define domain_hvm_iommu(d) (&d->arch.hvm_domain.hvm_iommu)
void iommu_update_ire_from_apic(unsigned int apic, unsigned int reg, unsigned
int value);
unsigned int iommu_read_apic_from_ire(unsigned int apic, unsigned int reg);
diff --git a/xen/include/xen/hvm/iommu.h b/xen/include/xen/hvm/iommu.h
deleted file mode 100644
index 106e08f..0000000
--- a/xen/include/xen/hvm/iommu.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2006, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright (C) Allen Kay <allen.m.kay@xxxxxxxxx>
- */
-
-#ifndef __XEN_HVM_IOMMU_H__
-#define __XEN_HVM_IOMMU_H__
-
-#include <xen/iommu.h>
-#include <xen/list.h>
-#include <asm/hvm/iommu.h>
-
-struct hvm_iommu {
- struct arch_hvm_iommu arch;
-
- /* iommu_ops */
- const struct iommu_ops *platform_ops;
-
-#ifdef HAS_DEVICE_TREE
- /* List of DT devices assigned to this domain */
- struct list_head dt_devices;
-#endif
-
- /* Features supported by the IOMMU */
- DECLARE_BITMAP(features, IOMMU_FEAT_count);
-};
-
-#define iommu_set_feature(d, f) set_bit((f), domain_hvm_iommu(d)->features)
-#define iommu_clear_feature(d, f) clear_bit((f), domain_hvm_iommu(d)->features)
-
-#endif /* __XEN_HVM_IOMMU_H__ */
diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h
index 8f3a20e..28c9f88 100644
--- a/xen/include/xen/iommu.h
+++ b/xen/include/xen/iommu.h
@@ -86,6 +86,24 @@ enum iommu_feature
bool_t iommu_has_feature(struct domain *d, enum iommu_feature feature);
+struct domain_iommu {
+ struct arch_iommu arch;
+
+ /* iommu_ops */
+ const struct iommu_ops *platform_ops;
+
+#ifdef HAS_DEVICE_TREE
+ /* List of DT devices assigned to this domain */
+ struct list_head dt_devices;
+#endif
+
+ /* Features supported by the IOMMU */
+ DECLARE_BITMAP(features, IOMMU_FEAT_count);
+};
+
+#define dom_iommu(d) (&(d)->iommu)
+#define iommu_set_feature(d, f) set_bit(f, dom_iommu(d)->features)
+#define iommu_clear_feature(d, f) clear_bit(f, dom_iommu(d)->features)
#ifdef HAS_PCI
void pt_pci_init(void);
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 73d3bc8..8209e9e 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -8,6 +8,7 @@
#include <xen/timer.h>
#include <xen/rangeset.h>
#include <xen/domain.h>
+#include <xen/iommu.h>
#include <xen/rcupdate.h>
#include <xen/cpumask.h>
#include <xen/nodemask.h>
@@ -368,6 +369,8 @@ struct domain
int64_t time_offset_seconds;
#ifdef HAS_PASSTHROUGH
+ struct domain_iommu iommu;
+
/* Does this guest need iommu mappings (-1 meaning "being set up")? */
s8 need_iommu;
#endif
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.6
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |