vbd/vnif paravirtulization driver hypervisor support]

diff -Nru a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
@@ -1848,21 +1848,32 @@
 
     if ( unlikely(!array_access_ok(ureqs, count, sizeof(req))) )
     {
-        rc = -EFAULT;
-        goto out;
+       if(!VMX_DOMAIN(current)){
+           rc = -EFAULT;
+           goto out;
+       }
     }
 
     for ( i = 0; i < count; i++ )
     {
-        if ( hypercall_preempt_check() )
+        if(VMX_DOMAIN(current))
         {
-            rc = hypercall4_create_continuation(
-                __HYPERVISOR_mmu_update, ureqs, 
-                (count - i) | MMU_UPDATE_PREEMPTED, pdone, foreigndom);
-            break;
+
+             rc = copy_from_guest(&req, ureqs, sizeof(req));
         }
+        else
+        {
+            if ( hypercall_preempt_check() )
+            {
+                rc = hypercall4_create_continuation(
+                        __HYPERVISOR_mmu_update, ureqs, 
+                        (count - i) | MMU_UPDATE_PREEMPTED, pdone, foreigndom);
+                break;
+            }
+            rc = __copy_from_user(&req, ureqs, sizeof(req));
 
-        if ( unlikely(__copy_from_user(&req, ureqs, sizeof(req)) != 0) )
+        }
+        if ( unlikely(rc) != 0) 
         {
             MEM_LOG("Bad __copy_from_user");
             rc = -EFAULT;

@@ -2008,7 +2019,8 @@
                 break;
             }
 
-            if ( unlikely(shadow_mode_translate(FOREIGNDOM) && !IS_PRIV(d)) )
+            if ( unlikely(shadow_mode_translate(FOREIGNDOM) && !IS_PRIV(d) 
+                          && !shadow_mode_external(FOREIGNDOM)) )
             {
                 MEM_LOG("can't mutate the m2p of translated guests");
                 break;

@@ -2115,7 +2127,6 @@
     return rc;
 }
 
-
 int do_update_va_mapping(unsigned long va,
                          l1_pgentry_t  val, 
                          unsigned long flags)

@@ -2138,9 +2149,12 @@
     if ( unlikely(shadow_mode_enabled(d)) )
         check_pagetable(ed, "pre-va"); /* debug */
 
-    if ( unlikely(!mod_l1_entry(&linear_pg_table[l1_linear_offset(va)],
-                                val)) )
-        rc = -EINVAL;
+    if ( !shadow_mode_external(d) )
+    {
+        if ( unlikely(!mod_l1_entry(&linear_pg_table[l1_linear_offset(va)],
+                        val)) )
+            rc = -EINVAL;
+    }
 
     if ( likely(rc == 0) && unlikely(shadow_mode_enabled(d)) )
     {

diff -Nru a/xen/arch/x86/shadow.c b/xen/arch/x86/shadow.c
@@ -2746,6 +2746,7 @@
     struct domain *d = ed->domain;
     l1_pgentry_t spte;
     int rc = 0;
+    unsigned long gpa, mfn;
 
     shadow_lock(d);
 

@@ -2756,9 +2757,31 @@
     // linear_pg_table[l1_linear_offset(va)] to be in sync)...
     //
     __shadow_sync_va(ed, va);
+    
+    if(!VMX_DOMAIN(ed))
+    {
+        l1pte_propagate_from_guest(d, val, &spte);
+    }
+    else
+    {
+        gpa = gva_to_gpa(va);
+        mfn = l1e_get_pfn(val);
+        if(gpa) 
+        {
+            if(l1e_get_value(val))
+            {
+                set_phystomachine(gpa >> PAGE_SHIFT, 
+                        mfn);
+            }
+            else
+                set_phystomachine(gpa >> PAGE_SHIFT, INVALID_MFN);
+        }
 
-    l1pte_propagate_from_guest(d, val, &spte);
-    shadow_set_l1e(va, spte, 0);
+        spte = val;
+
+    }
+
+    shadow_set_l1e(va, spte, VMX_DOMAIN(ed));
 
     /*
      * If we're in log-dirty mode then we need to note that we've updated

117 lines not on this page · raw message

91 lines not on this page · raw message

123 lines not on this page · raw message

diff -Nru a/xen/arch/x86/x86_64/usercopy.c b/xen/arch/x86/x86_64/usercopy.c
@@ -132,6 +132,21 @@
 	return n;
 }
 
+unsigned long
+copy_from_guest(void *to, const void __user *from, unsigned long n)
+{
+  return n;
+}
+EXPORT_SYMBOL(copy_from_guest);
+
+unsigned long
+copy_to_guest(void __user *to, const void *from, unsigned long n)
+{
+    return n;
+}
+EXPORT_SYMBOL(copy_to_guest);
+
+
 /**
  * copy_to_user: - Copy a block of data into user space.
  * @to:   Destination address, in user space.

diff -Nru a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c
@@ -80,15 +80,21 @@
     struct pfn_info *page;
     unsigned long    i, j, mpfn;
 
-    if ( !array_access_ok(extent_list, nr_extents, sizeof(*extent_list)) )
+    if ( !VMX_DOMAIN(current) && 
+         unlikely(!array_access_ok(extent_list, nr_extents, 
+                                   sizeof(*extent_list))) )
         return start_extent;
 
     for ( i = start_extent; i < nr_extents; i++ )
     {
-        PREEMPT_CHECK(MEMOP_decrease_reservation);
-
-        if ( unlikely(__get_user(mpfn, &extent_list[i]) != 0) )
-            return i;
+        if( VMX_DOMAIN(current)) {
+            if(copy_from_guest(&mpfn, &extent_list[i], sizeof(mpfn)) != 0)
+                return i;
+        } else {
+            PREEMPT_CHECK(MEMOP_decrease_reservation);
+           if ( unlikely(__get_user(mpfn, &extent_list[i]) != 0) )
+                return i;
+        }
 
         for ( j = 0; j < (1 << extent_order); j++ )
         {

@@ -100,6 +106,7 @@
             }
             
             page = &frame_table[mpfn + j];
+
             if ( unlikely(!get_page(page, d)) )
             {
                 DPRINTK("Bad page free for domain %u\n", d->domain_id);

diff -Nru a/xen/common/grant_table.c b/xen/common/grant_table.c
@@ -159,7 +159,10 @@
 
         /* rmb(); */ /* not on x86 */
 
-        frame = __gpfn_to_mfn_foreign(granting_d, sha->frame);
+        if(!shadow_mode_translate(granting_d))
+            frame = __gpfn_to_mfn_foreign(granting_d, sha->frame);
+        else
+            frame = sha->frame;
 
         if ( unlikely(!pfn_valid(frame)) ||
              unlikely(!((dev_hst_ro_flags & GNTMAP_readonly) ?

@@ -668,7 +671,8 @@
     {
         DPRINTK("Xen only supports up to %d grant-table frames per domain.\n",
                 NR_GRANT_FRAMES);
-        (void)put_user(GNTST_general_error, &uop->status);
+        op.status = GNTST_general_error;
+        (void)copy_to_user(uop, &op, sizeof(op));
         return 0;
     }
 

@@ -678,25 +682,44 @@
     }
     else if ( unlikely(!IS_PRIV(current->domain)) )
     {
-        (void)put_user(GNTST_permission_denied, &uop->status);
+        op.status = GNTST_permission_denied;
+        (void)copy_to_user(uop, &op, sizeof(op));
         return 0;
     }
 
     if ( unlikely((d = find_domain_by_id(op.dom)) == NULL) )
     {
         DPRINTK("Bad domid %d.\n", op.dom);
-        (void)put_user(GNTST_bad_domain, &uop->status);
+        op.status = GNTST_bad_domain;
+        (void)copy_to_user(uop, &op, sizeof(op));
         return 0;
     }
 
     if ( op.nr_frames <= NR_GRANT_FRAMES )
     {
         ASSERT(d->grant_table != NULL);
-        (void)put_user(GNTST_okay, &uop->status);
-        for ( i = 0; i < op.nr_frames; i++ )
+        if(!VMX_DOMAIN(current))
+        {
+            (void)put_user(GNTST_okay, &uop->status);
+            for ( i = 0; i < op.nr_frames; i++ )
             (void)put_user(
                 (virt_to_phys(d->grant_table->shared) >> PAGE_SHIFT) + i,
                 &uop->frame_list[i]);
+        }
+        else
+        {
+            op.status = GNTST_okay;
+            for ( i = 0; i < op.nr_frames; i++ )
+            {
+               if(map_sharepage_to_guest((unsigned long)op.frame_list + i * PAGE_SIZE, (unsigned long)d->grant_table->shared + i * PAGE_SIZE))
+               {
+     
+                   op.status = GNTST_general_error;
+                   break;
+               }
+            }
+            (void)copy_to_user(uop, &op, sizeof(op));
+        }
     }
 
     put_domain(d);

79 lines not on this page · raw message

diff -Nru a/xen/include/asm-x86/vmx_vmcs.h b/xen/include/asm-x86/vmx_vmcs.h
@@ -185,6 +185,8 @@
 #define DBG_LEVEL_3     (1 << 3)
 #define DBG_LEVEL_IO    (1 << 4)
 #define DBG_LEVEL_VMMU  (1 << 5)
+#define DBG_LEVEL_VBD  (1 << 6)
+#define DBG_LEVEL_VNIF  (1 << 7)
 
 extern unsigned int opt_vmx_debug_level;
 #define VMX_DBG_LOG(level, _f, _a...)           \

diff -Nru a/xen/include/asm-x86/x86_32/uaccess.h b/xen/include/asm-x86/x86_32/uaccess.h
@@ -332,6 +332,11 @@
 unsigned long copy_from_user(void *to,
                              const void __user *from, unsigned long n);
 
+unsigned long copy_to_guest(void __user *to, 
+                            const void *from, unsigned long n);
+unsigned long copy_from_guest(void *to,
+                              const void __user *from, unsigned long n);
+
 unsigned long clear_user(void __user *mem, unsigned long len);
 unsigned long __clear_user(void __user *mem, unsigned long len);
 

diff -Nru a/xen/include/asm-x86/x86_64/uaccess.h b/xen/include/asm-x86/x86_64/uaccess.h
@@ -224,6 +224,11 @@
 unsigned long copy_to_user(void __user *to, const void *from, unsigned len); 
 unsigned long copy_from_user(void *to, const void __user *from, unsigned len); 
 
+unsigned long copy_to_guest(void __user *to, 
+                            const void *from, unsigned long n);
+unsigned long copy_from_guest(void *to,
+                              const void __user *from, unsigned long n);
+
 static always_inline int __copy_from_user(void *dst, const void __user *src, unsigned size) 
 { 
     int ret = 0;

diff -Nru a/xen/include/public/arch-x86_32.h b/xen/include/public/arch-x86_32.h
@@ -57,7 +57,12 @@
 #define FLAT_USER_SS    FLAT_RING3_SS
 
 /* And the trap vector is... */
+#if defined (CONFIG_VMX_GUEST)
+/*for VMX paravirtualized driver*/
+#define TRAP_INSTR	".byte 0x0f,0x01,0xc1\n"
+#else
 #define TRAP_INSTR "int $0x82"
+#endif
 
 
 /*

diff -Nru a/xen/include/public/xen.h b/xen/include/public/xen.h
@@ -58,6 +58,7 @@
 #define __HYPERVISOR_boot_vcpu            24
 #define __HYPERVISOR_set_segment_base     25 /* x86/64 only */
 #define __HYPERVISOR_mmuext_op            26
+#define __HYPERVISOR_virtual_device_op    28	
 
 /*
  * MULTICALLS

@@ -244,6 +245,16 @@
 #define VMASST_TYPE_writable_pagetables  2
 #define MAX_VMASST_TYPE 2
 
+/*
+ * Commands to HYPERVISOR_virtual_device_op().
+ */
+
+#define SET_SHAREINFO_MAP   1
+#define ADDR_MACHTOPHYS     2
+#define ADDR_PHYSTOMACH     3
+#define SET_PHYSTOMACH     4
+#define SET_CALLBACK_IRQ    5
+
 #ifndef __ASSEMBLY__
 
 typedef u16 domid_t;

@@ -332,7 +343,8 @@
      */
     u8 evtchn_upcall_pending;           /* 0 */
     u8 evtchn_upcall_mask;              /* 1 */
-    u8 pad0, pad1;
+    u8 callback_mask;                   /* 2 */ 
+    u8 pad1;
     u32 evtchn_pending_sel;             /* 4 */
     arch_vcpu_info_t arch;              /* 8 */
 } PACKED vcpu_info_t;                   /* 8 + arch */

diff -Nru a/xen/include/xen/config.h b/xen/include/xen/config.h
@@ -36,6 +36,14 @@
 #define DPRINTK(_f, _a...) ((void)0)
 #endif
 
+#ifdef VERBOSE
+#define VNIFPRINTK(_a...) \
+     if(VMX_DOMAIN(current))  \
+        printk(_a);
+#else
+#define VNIFPRINTK(_a...) 
+#endif
+
 #ifndef __ASSEMBLY__
 #include <xen/compiler.h>
 #endif