Fixed bugs in lcd_vmx_create and dependencies. Clean build.

Conditional compilation on number of autoload msr's.

Untested.

arch/x86/include/asm/lcd-vmx.h

@@ -26,10 +26,10 @@ struct lcd_vmx_capability {
 	u32 vpid;
 };
 
-int lcd_vmx_autoload_msrs {
+int lcd_vmx_autoload_msrs[] = {
 	/* NONE */
-}
-#define LCD_VMX_NUM_AUTOLOAD_MSRS 
+};
+#define LCD_VMX_NUM_AUTOLOAD_MSRS 0
 
 enum lcd_vmx_reg {
 	LCD_VMX_REGS_RAX = 0,
@@ -66,7 +66,8 @@ struct lcd_vmx_ept {
 struct lcd_vmx {
 	int cpu;
 	int launched;
-	struct vmcs *vmcs;
+	int vpid;
+	struct lcd_vmx_vmcs *vmcs;
 	struct lcd_vmx_ept ept;
 	struct desc_struct *gdt;
 
@@ -84,12 +85,18 @@ struct lcd_vmx {
 	int ret_code;
 
 	struct msr_autoload {
+#if LCD_VMX_NUM_AUTOLOAD_MSRS > 0
 		struct vmx_msr_entry guest[LCD_VMX_NUM_AUTOLOAD_MSRS];
 		struct vmx_msr_entry host[LCD_VMX_NUM_AUTOLOAD_MSRS];
+#else
+		struct vmx_msr_entry *guest;
+		struct vmx_msr_entry *host;
+#endif
 	} msr_autoload;
 };
 
 int lcd_vmx_init(void);
 void lcd_vmx_exit(void);
+struct lcd_vmx *lcd_vmx_create(void);
 
 #endif  /* LCD_VMX_H */

arch/x86/lcd/lcd-vmx.c

@@ -20,6 +20,7 @@
 #include <linux/gfp.h>
 #include <linux/mm.h>
 #include <linux/tboot.h>
+#include <linux/slab.h>
 
 static struct lcd_vmx_vmcs_config vmcs_config;
 static struct lcd_vmx_capability vmx_capability;
@@ -88,7 +89,7 @@ static inline void invept_single_context(u64 eptp)
 	if (cpu_has_vmx_invept_context())
 		__invept(VMX_EPT_EXTENT_CONTEXT, eptp, 0);
 	else
-		invept_global();
+		invept_global_context();
 }
 
 static inline void __invvpid(int ext, u16 vpid, u64 gva)
@@ -122,12 +123,12 @@ static inline void invvpid_single_context(u16 vpid)
 	if (cpu_has_vmx_invvpid_single())
 		__invvpid(VMX_VPID_EXTENT_SINGLE_CONTEXT, vpid, 0);
 	else
-		invvpid_global();		
+		invvpid_global_context();		
 }
 
 /* VMCS READ / WRITE --------------------------------------------------*/
 
-static void vmcs_clear(struct vmcs *vmcs)
+static void vmcs_clear(struct lcd_vmx_vmcs *vmcs)
 {
 	u64 phys_addr = __pa(vmcs);
 	u8 error;
@@ -140,7 +141,7 @@ static void vmcs_clear(struct vmcs *vmcs)
 			vmcs, phys_addr);
 }
 
-static void vmcs_load(struct vmcs *vmcs)
+static void vmcs_load(struct lcd_vmx_vmcs *vmcs)
 {
 	u64 phys_addr = __pa(vmcs);
 	u8 error;
@@ -769,7 +770,7 @@ int vmx_init_ept(struct lcd_vmx *vcpu)
 		vcpu->ept.access_dirty_enabled = true;
 		eptp |= VMX_EPT_AD_ENABLE_BIT;
 	}
-	eptp |= (ept.root_hpa & PAGE_MASK);
+	eptp |= (vcpu->ept.root_hpa & PAGE_MASK);
 	vcpu->ept.vmcs_ptr = eptp;
 
 	/*
@@ -803,10 +804,7 @@ static struct desc_struct * vmx_per_cpu_tss_desc(void)
  */
 static void vmx_setup_vmcs_host(struct lcd_vmx *vcpu)
 {
-	u32 low32;
-	u32 high32;
 	unsigned long tmpl;
-	struct desc_ptr dt;
 
 	/*
 	 * Host %cr0, %cr4, %cr3
@@ -852,7 +850,7 @@ static void vmx_setup_vmcs_host(struct lcd_vmx *vcpu)
 	 * (will be loaded on vm exit)
 	 */
 	rdmsrl(MSR_EFER, tmpl);
-	vmcs_writel(HOST_IA32_EFER, tmp);
+	vmcs_writel(HOST_IA32_EFER, tmpl);
 
 	/* asm("mov $.Llcd_vmx_return, %0" : "=r"(tmpl)); */
 	/* vmcs_writel(HOST_RIP, tmpl); /\* 22.2.5 *\/ */
@@ -913,6 +911,7 @@ static void vmx_setup_vmcs_guest_regs(struct lcd_vmx *vcpu)
 {
 	unsigned long cr0;
 	unsigned long cr4;
+	unsigned long tmpl;
 
 	/*
 	 * %cr0 (and its shadow)
@@ -1171,7 +1170,7 @@ static void __vmx_setup_cpu(struct lcd_vmx *vcpu, int cur_cpu)
 	gdt = vmx_per_cpu_gdt();
 	tss_desc = vmx_per_cpu_tss_desc();
 	vmcs_writel(HOST_TR_BASE, get_desc_base(tss_desc));
-	vmcs_writel(HOST_GDTR_BASE, gdt);
+	vmcs_writel(HOST_GDTR_BASE, (unsigned long)gdt);
 
 	/*
 	 * %fs and %gs are also per-cpu
@@ -1269,7 +1268,7 @@ static void vmx_get_cpu(struct lcd_vmx *vcpu)
 			/*
 			 * Update cpu-specific data in vmcs
 			 */
-			__vmx_setup_cpu();
+			__vmx_setup_cpu(vcpu, cur_cpu);
 
 			/*
 			 * Remember which cpu we are active on