HACK: initial (very hacky) XENMAPSPACE_gmfn_foreign

diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 986bec32508c24fa28a8f39e24e94484f7a98300..7d76962a63b7cab853cecbf54ca445cc0fd37989 100644 (file)
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -3,8 +3,14 @@
 #include <xen/interface/memory.h>
 #include <asm/xen/hypervisor.h>
 #include <asm/xen/hypercall.h>
+
 #include <linux/module.h>
 
+#include <linux/mm.h>
+#include <linux/ioport.h>
+
+#include <asm/pgtable.h>
+
 struct start_info _xen_start_info = { .flags = (SIF_INITDOMAIN|SIF_PRIVILEGED) };
 struct start_info *xen_start_info = &_xen_start_info;
 EXPORT_SYMBOL_GPL(xen_start_info);
@@ -25,13 +31,99 @@ EXPORT_SYMBOL_GPL(xen_have_vector_callback);
 int xen_platform_pci_unplug;
 EXPORT_SYMBOL_GPL(xen_platform_pci_unplug);
 
+#define FOREIGN_MAP_BUFFER 0x90000000UL
+#define FOREIGN_MAP_BUFFER_SIZE 0x10000000UL
+struct resource foreign_map_resource = {
+       .start = FOREIGN_MAP_BUFFER,
+       .end = FOREIGN_MAP_BUFFER + FOREIGN_MAP_BUFFER_SIZE,
+       .name = "Xen foreign map buffer",
+       .flags = 0,
+};
+
+static unsigned long foreign_map_buffer_pfn = FOREIGN_MAP_BUFFER >> PAGE_SHIFT;
+
 /* TODO */
+
+struct remap_data {
+       struct mm_struct *mm;
+       unsigned long mfn;
+       pgprot_t prot;
+};
+
+static int remap_area_mfn_pte_fn(pte_t *ptep, pgtable_t token,
+                                unsigned long addr, void *data)
+{
+       struct remap_data *rmd = data;
+/*     pte_mkspecial(); */
+       pte_t pte = pfn_pte(rmd->mfn, rmd->prot);
+
+       if ( rmd->mfn < 0x90010 )
+               printk(KERN_CRIT "%s: ptep %p addr %#lx => %#x / %#lx\n",
+                      __func__, ptep, addr, pte_val(pte), rmd->mfn);
+
+       set_pte_at(rmd->mm, addr, ptep, pte);
+
+       rmd->mfn++;
+       return 0;
+}
+
+
 int xen_remap_domain_mfn_range(struct vm_area_struct *vma,
                               unsigned long addr,
                               unsigned long mfn, int nr,
                               pgprot_t prot, unsigned domid)
 {
-       return -ENOSYS;
+       int i, rc = 0;
+       struct remap_data rmd = {
+               .mm = vma->vm_mm,
+               .prot = prot,
+       };
+       struct xen_add_to_physmap xatp = {
+               .domid = DOMID_SELF,
+               .space = XENMAPSPACE_gmfn_foreign,
+
+               .foreign_domid = domid,
+       };
+
+       if ( foreign_map_buffer_pfn + nr > ((FOREIGN_MAP_BUFFER + FOREIGN_MAP_BUFFER_SIZE)>>PAGE_SHIFT) ) {
+               printk(KERN_CRIT "RAM out of foreign map buffers...\n");
+               return -EBUSY;
+       }
+
+       //printk(KERN_CRIT "%s: vma=%p addr=%#lx mfn=%#lx nr=%#x prot=%#x domid=%d\n",
+       //       __func__, vma, addr, mfn, nr, prot, domid);
+       //printk(KERN_CRIT "%s: Buffer PFN %#lx\n", __func__, foreign_map_buffer_pfn);
+
+       for (i=0; i<nr; i++) {
+               xatp.idx = mfn + i;
+               xatp.gpfn = foreign_map_buffer_pfn + i;
+               //printk(KERN_CRIT "mapping dom%d gpfn %#lx -> pfn %#"PRI_xen_pfn"\n",
+               //       domid, xatp.idx, xatp.gpfn);
+               rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp);
+               if (rc != 0) {
+                       printk(KERN_CRIT
+                              "foreign map add_to_physmap failed, err=%d\n", rc);
+                       goto out;
+               }
+       }
+
+       //printk(KERN_CRIT "%s: apply_to_page_range %#lx %#lx %#lx\n",
+       //      __func__, addr, foreign_map_buffer_pfn << PAGE_SHIFT, (unsigned long)nr << PAGE_SHIFT);
+
+       rmd.mfn = foreign_map_buffer_pfn;
+       rc = apply_to_page_range(vma->vm_mm,
+                                addr, //vma->vm_start,  //foreign_map_buffer_pfn << PAGE_SHIFT,
+                                (unsigned long)nr << PAGE_SHIFT,
+                                remap_area_mfn_pte_fn, &rmd);
+       if (rc != 0) {
+               printk(KERN_CRIT "apply_to_page_range failed rc=%d\n", rc);
+               goto out;
+       }
+
+       //printk(KERN_CRIT "%s: success\n", __func__);
+       foreign_map_buffer_pfn += nr;
+out:
+       return rc;
 }
 EXPORT_SYMBOL_GPL(xen_remap_domain_mfn_range);
 

diff --git a/drivers/xen/xenfs/privcmd.c b/drivers/xen/xenfs/privcmd.c
index dbd3b16fd1317adc9f1fa8afedfd0e6d3fc53400..c200b49ff6faa9fe1b700e24aa4b4cc5fa6b4915 100644 (file)
--- a/drivers/xen/xenfs/privcmd.c
+++ b/drivers/xen/xenfs/privcmd.c
@@ -18,6 +18,8 @@
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
 #include <linux/seq_file.h>
+#include <linux/resource.h>
+#include <linux/ioport.h>
 
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
@@ -190,8 +192,8 @@ static long privcmd_ioctl_mmap(void __user *udata)
        LIST_HEAD(pagelist);
        struct mmap_mfn_state state;
 
-       if (!xen_initial_domain())
-               return -EPERM;
+       //if (!xen_initial_domain())
+       //      return -EPERM;
 
        if (copy_from_user(&mmapcmd, udata, sizeof(mmapcmd)))
                return -EFAULT;
@@ -280,8 +282,8 @@ static long privcmd_ioctl_mmap_batch(void __user *udata)
        LIST_HEAD(pagelist);
        struct mmap_batch_state state;
 
-       if (!xen_initial_domain())
-               return -EPERM;
+       //if (!xen_initial_domain())
+       //      return -EPERM;
 
        if (copy_from_user(&m, udata, sizeof(m)))
                return -EFAULT;
@@ -360,24 +362,37 @@ static long privcmd_ioctl(struct file *file,
 }
 
 #ifndef HAVE_ARCH_PRIVCMD_MMAP
+static void privcmd_close(struct vm_area_struct *vma)
+{
+       //printk(KERN_CRIT "should unmap vma %p\n", vma);
+}
+
 static int privcmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-       printk(KERN_DEBUG "privcmd_fault: vma=%p %lx-%lx, pgoff=%lx, uv=%p\n",
+       printk(KERN_DEBUG "privcmd_fault: vma=%p %lx-%lx, pgoff=%lx, virt=%p\n",
               vma, vma->vm_start, vma->vm_end,
               vmf->pgoff, vmf->virtual_address);
+       show_pte(vma->vm_mm, vmf->virtual_address);
+       show_pte(vma->vm_mm, vmf->virtual_address-PAGE_SIZE);
 
        return VM_FAULT_SIGBUS;
 }
 
 static struct vm_operations_struct privcmd_vm_ops = {
-       .fault = privcmd_fault
+       .fault = privcmd_fault,
+       .close = privcmd_close,
 };
 
 static int privcmd_mmap(struct file *file, struct vm_area_struct *vma)
 {
+       //printk(KERN_CRIT "privcmd_mmap\n");
+
        /* Unsupported for auto-translate guests. */
        if (xen_feature(XENFEAT_auto_translated_physmap))
+       {
+               printk(KERN_CRIT "privcmd_mmap -- no auto translated..\n");
                return -ENOSYS;
+       }
 
        /* DONTCOPY is essential for Xen because copy_page_range doesn't know
         * how to recreate these mappings */

diff --git a/drivers/xen/xenfs/super.c b/drivers/xen/xenfs/super.c
index 1aa3897198462112a3bc1db479986653cf0a716f..ea994a3b67bcdead8ef2564f0501708c2e4f6abc 100644 (file)
--- a/drivers/xen/xenfs/super.c
+++ b/drivers/xen/xenfs/super.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/magic.h>
+#include <linux/ioport.h>
 
 #include <xen/xen.h>
 
@@ -78,6 +79,8 @@ static const struct file_operations capabilities_file_ops = {
        .llseek = default_llseek,
 };
 
+extern struct resource foreign_map_resource;
+
 static int xenfs_fill_super(struct super_block *sb, void *data, int silent)
 {
        static struct tree_descr xenfs_files[] = {
@@ -98,6 +101,10 @@ static int xenfs_fill_super(struct super_block *sb, void *data, int silent)
                                  &xsd_kva_file_ops, NULL, S_IRUSR|S_IWUSR);
                xenfs_create_file(sb, sb->s_root, "xsd_port",
                                  &xsd_port_file_ops, NULL, S_IRUSR|S_IWUSR);
+               rc = request_resource(&iomem_resource, &foreign_map_resource);
+               if (rc < 0)
+                       printk(KERN_ERR "failed to register foreign map resource\n");
+               rc = 0; /* ignore */
        }
 
        return rc;

diff --git a/include/xen/interface/memory.h b/include/xen/interface/memory.h
index abbbff0e3937114a62f4b2bd47cc1ea5714fae54..bc12867835204e187f3336a22639241ec8b04040 100644 (file)
--- a/include/xen/interface/memory.h
+++ b/include/xen/interface/memory.h
@@ -164,9 +164,13 @@ struct xen_add_to_physmap {
     domid_t domid;
 
     /* Source mapping space. */
-#define XENMAPSPACE_shared_info 0 /* shared info page */
-#define XENMAPSPACE_grant_table 1 /* grant table page */
-    unsigned int space;
+#define XENMAPSPACE_shared_info  0 /* shared info page */
+#define XENMAPSPACE_grant_table  1 /* grant table page */
+#define XENMAPSPACE_gmfn         2 /* GMFN */
+#define XENMAPSPACE_gmfn_range   3 /* GMFN range */
+#define XENMAPSPACE_gmfn_foreign 4 /* GMFN from another guest */
+    uint16_t space;
+    domid_t foreign_domid; /* IFF gmfn_foreign */
 
     /* Index into source mapping space. */
     unsigned long idx;