# HG changeset patch
# User Wei Wang <wei.wang2@xxxxxxx>
# Node ID 15a9daf8a8aedf21e941a9ed3cb250536ac6972f
# Parent  5846cc03cf0c1a4b02eba76a7b4aa4884de5e957
Add a generic interface for both vtd and amd iommu p2m sharing. Also introduce a new parameter (iommu=sharept) to enable this feature.

Signed-off-by: Wei Wang <wei.wang2@xxxxxxx>

diff -r 5846cc03cf0c -r 15a9daf8a8ae xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c	Mon Apr 18 15:01:52 2011 +0200
+++ b/xen/arch/x86/mm/p2m.c	Mon Apr 18 15:37:28 2011 +0200
@@ -2061,8 +2061,8 @@ int p2m_alloc_table(struct p2m_domain *p
 
     p2m->phys_table = pagetable_from_mfn(page_to_mfn(p2m_top));
 
-    if ( hap_enabled(d) && (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) )
-        iommu_set_pgd(d);
+    if ( hap_enabled(d) )
+        iommu_share_p2m_table(d);
 
     P2M_PRINTK("populating p2m table\n");
 
diff -r 5846cc03cf0c -r 15a9daf8a8ae xen/drivers/passthrough/amd/iommu_map.c
--- a/xen/drivers/passthrough/amd/iommu_map.c	Mon Apr 18 15:01:52 2011 +0200
+++ b/xen/drivers/passthrough/amd/iommu_map.c	Mon Apr 18 15:37:28 2011 +0200
@@ -716,6 +716,9 @@ void amd_iommu_share_p2m(struct domain *
 
     ASSERT( is_hvm_domain(d) && d->arch.hvm_domain.hap_enabled );
 
+    if ( !iommu_hap_pt_share )
+        return;
+
     pgd_mfn = pagetable_get_mfn(p2m_get_pagetable(p2m_get_hostp2m(d)));
     p2m_table = mfn_to_page(mfn_x(pgd_mfn));
 
@@ -726,8 +729,6 @@ void amd_iommu_share_p2m(struct domain *
 
         /* When sharing p2m with iommu, paging mode = 4 */
         hd->paging_mode = IOMMU_PAGING_MODE_LEVEL_4;
-        iommu_hap_pt_share = 1;
-
         AMD_IOMMU_DEBUG("Share p2m table with iommu: p2m table = 0x%lx\n",
                         mfn_x(pgd_mfn));
     }
diff -r 5846cc03cf0c -r 15a9daf8a8ae xen/drivers/passthrough/amd/pci_amd_iommu.c
--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c	Mon Apr 18 15:01:52 2011 +0200
+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c	Mon Apr 18 15:37:28 2011 +0200
@@ -458,4 +458,5 @@ const struct iommu_ops amd_iommu_ops = {
     .read_msi_from_ire = amd_iommu_read_msi_from_ire,
     .suspend = amd_iommu_suspend,
     .resume = amd_iommu_resume,
+    .share_p2m = amd_iommu_share_p2m,
 };
diff -r 5846cc03cf0c -r 15a9daf8a8ae xen/drivers/passthrough/iommu.c
--- a/xen/drivers/passthrough/iommu.c	Mon Apr 18 15:01:52 2011 +0200
+++ b/xen/drivers/passthrough/iommu.c	Mon Apr 18 15:37:28 2011 +0200
@@ -82,6 +82,8 @@ static void __init parse_iommu_param(cha
             iommu_passthrough = 1;
         else if ( !strcmp(s, "dom0-strict") )
             iommu_dom0_strict = 1;
+        else if ( !strcmp(s, "sharept") )
+            iommu_hap_pt_share = 1;
 
         s = ss + 1;
     } while ( ss );
@@ -419,6 +421,14 @@ void iommu_suspend()
         ops->suspend();
 }
 
+void iommu_share_p2m_table(struct domain* d)
+{
+    const struct iommu_ops *ops = iommu_get_ops();
+
+    if ( iommu_enabled && is_hvm_domain(d) )
+        ops->share_p2m(d);
+}
+
 /*
  * Local variables:
  * mode: C
diff -r 5846cc03cf0c -r 15a9daf8a8ae xen/drivers/passthrough/vtd/iommu.c
--- a/xen/drivers/passthrough/vtd/iommu.c	Mon Apr 18 15:01:52 2011 +0200
+++ b/xen/drivers/passthrough/vtd/iommu.c	Mon Apr 18 15:37:28 2011 +0200
@@ -45,9 +45,6 @@
 #define nr_ioapics              iosapic_get_nr_iosapics()
 #endif
 
-static int sharept = 0;
-boolean_param("sharept", sharept);
-
 int nr_iommus;
 
 static void setup_dom0_devices(struct domain *d);
@@ -1747,7 +1744,7 @@ static bool_t vtd_ept_share(void)
     bool_t share = TRUE;
 
     /* sharept defaults to 0 for now, default to 1 when feature matures */
-    if ( !sharept )
+    if ( !iommu_hap_pt_share )
         share = FALSE;
 
     /*
@@ -2299,6 +2296,7 @@ const struct iommu_ops intel_iommu_ops =
     .read_msi_from_ire = msi_msg_read_remap_rte,
     .suspend = vtd_suspend,
     .resume = vtd_resume,
+    .share_p2m = iommu_set_pgd,
 };
 
 /*
diff -r 5846cc03cf0c -r 15a9daf8a8ae xen/include/xen/iommu.h
--- a/xen/include/xen/iommu.h	Mon Apr 18 15:01:52 2011 +0200
+++ b/xen/include/xen/iommu.h	Mon Apr 18 15:37:28 2011 +0200
@@ -132,6 +132,7 @@ struct iommu_ops {
     unsigned int (*read_apic_from_ire)(unsigned int apic, unsigned int reg);
     void (*suspend)(void);
     void (*resume)(void);
+    void (*share_p2m)(struct domain *d);
 };
 
 void iommu_update_ire_from_apic(unsigned int apic, unsigned int reg, unsigned int value);
@@ -143,5 +144,6 @@ void iommu_resume(void);
 void iommu_resume(void);
 
 void iommu_set_dom0_mapping(struct domain *d);
+void iommu_share_p2m_table(struct domain *d);
 
 #endif /* _IOMMU_H_ */