From: Wanpeng Li <wanpen...@tencent.com>

This patch introduces per-VM I/O permission bitmaps, it will be used by 
later patches.

Cc: Paolo Bonzini <pbonz...@redhat.com>
Cc: Radim Krčmář <rkrc...@redhat.com>
Cc: Tim Shearer <tshea...@advaoptical.com>
Cc: Liran Alon <liran.a...@oracle.com>
Signed-off-by: Wanpeng Li <wanpen...@tencent.com>
---
 arch/x86/kvm/vmx.c | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 5b49ad4..ebf1140 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -189,12 +189,19 @@ module_param(ple_window_max, uint, 0444);
 
 extern const ulong vmx_return;
 
+enum {
+       VMX_IO_BITMAP_A,
+       VMX_IO_BITMAP_B,
+       VMX_IO_BITMAP_NR
+};
+
 struct kvm_vmx {
        struct kvm kvm;
 
        unsigned int tss_addr;
        bool ept_identity_pagetable_done;
        gpa_t ept_identity_map_addr;
+       unsigned long *vmx_io_bitmap[VMX_IO_BITMAP_NR];
 };
 
 #define NR_AUTOLOAD_MSRS 8
@@ -3963,7 +3970,7 @@ static __init int setup_vmcs_config(struct vmcs_config 
*vmcs_conf)
 #endif
              CPU_BASED_CR3_LOAD_EXITING |
              CPU_BASED_CR3_STORE_EXITING |
-             CPU_BASED_UNCOND_IO_EXITING |
+             CPU_BASED_USE_IO_BITMAPS |
              CPU_BASED_MOV_DR_EXITING |
              CPU_BASED_USE_TSC_OFFSETING |
              CPU_BASED_MWAIT_EXITING |
@@ -5940,6 +5947,12 @@ static void vmx_vcpu_setup(struct vcpu_vmx *vmx)
 #endif
        int i;
 
+       /* I/O */
+       vmcs_write64(IO_BITMAP_A,
+               
__pa(to_kvm_vmx(vmx->vcpu.kvm)->vmx_io_bitmap[VMX_IO_BITMAP_A]));
+       vmcs_write64(IO_BITMAP_B,
+               
__pa(to_kvm_vmx(vmx->vcpu.kvm)->vmx_io_bitmap[VMX_IO_BITMAP_B]));
+
        if (enable_shadow_vmcs) {
                vmcs_write64(VMREAD_BITMAP, __pa(vmx_vmread_bitmap));
                vmcs_write64(VMWRITE_BITMAP, __pa(vmx_vmwrite_bitmap));
@@ -10093,9 +10106,24 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm 
*kvm, unsigned int id)
 
 static int vmx_vm_init(struct kvm *kvm)
 {
+       int i;
+       struct kvm_vmx *kvm_vmx = to_kvm_vmx(kvm);
+
        if (!ple_gap)
                kvm->arch.pause_in_guest = true;
+
+       for (i = 0; i < VMX_IO_BITMAP_NR; i++) {
+               kvm_vmx->vmx_io_bitmap[i] = (unsigned long 
*)__get_free_page(GFP_KERNEL);
+               if (!kvm_vmx->vmx_io_bitmap[i])
+                       goto out;
+               memset(kvm_vmx->vmx_io_bitmap[i], 0xff, PAGE_SIZE);
+       }
        return 0;
+
+out:
+       for (i = 0; i < VMX_IO_BITMAP_NR; i++)
+               free_page((unsigned long)kvm_vmx->vmx_io_bitmap[i]);
+       return -ENOMEM;
 }
 
 static void __init vmx_check_processor_compat(void *rtn)
@@ -11128,8 +11156,8 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct 
vmcs12 *vmcs12,
        }
 
        /*
-        * A vmexit (to either L1 hypervisor or L0 userspace) is always needed
-        * for I/O port accesses.
+        * Merging of IO bitmap not currently supported.
+        * Rather, exit every time.
         */
        exec_control &= ~CPU_BASED_USE_IO_BITMAPS;
        exec_control |= CPU_BASED_UNCOND_IO_EXITING;
-- 
2.7.4

Reply via email to