lkml.org 
[lkml]   [2021]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/23] KVM: x86: Move nVMX's consistency check macro to common code
    Date
    From: Sean Christopherson <seanjc@google.com>

    Move KVM's CC() macro to x86.h so that it can be reused by nSVM.
    Debugging VM-Enter is as painful on SVM as it is on VMX.

    Rename the more visible macro to KVM_NESTED_VMENTER_CONSISTENCY_CHECK
    to avoid any collisions with the uber-concise "CC".

    Signed-off-by: Sean Christopherson <seanjc@google.com>
    Message-Id: <20210204000117.3303214-12-seanjc@google.com>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    ---
    arch/x86/kvm/vmx/nested.c | 8 +-------
    arch/x86/kvm/x86.h | 8 ++++++++
    2 files changed, 9 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
    index bcca0b80e0d0..fdd80dd8e781 100644
    --- a/arch/x86/kvm/vmx/nested.c
    +++ b/arch/x86/kvm/vmx/nested.c
    @@ -21,13 +21,7 @@ module_param_named(enable_shadow_vmcs, enable_shadow_vmcs, bool, S_IRUGO);
    static bool __read_mostly nested_early_check = 0;
    module_param(nested_early_check, bool, S_IRUGO);

    -#define CC(consistency_check) \
    -({ \
    - bool failed = (consistency_check); \
    - if (failed) \
    - trace_kvm_nested_vmenter_failed(#consistency_check, 0); \
    - failed; \
    -})
    +#define CC KVM_NESTED_VMENTER_CONSISTENCY_CHECK

    /*
    * Hyper-V requires all of these, so mark them as supported even though
    diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
    index 39eb04887141..ee6e01067884 100644
    --- a/arch/x86/kvm/x86.h
    +++ b/arch/x86/kvm/x86.h
    @@ -8,6 +8,14 @@
    #include "kvm_cache_regs.h"
    #include "kvm_emulate.h"

    +#define KVM_NESTED_VMENTER_CONSISTENCY_CHECK(consistency_check) \
    +({ \
    + bool failed = (consistency_check); \
    + if (failed) \
    + trace_kvm_nested_vmenter_failed(#consistency_check, 0); \
    + failed; \
    +})
    +
    #define KVM_DEFAULT_PLE_GAP 128
    #define KVM_VMX_DEFAULT_PLE_WINDOW 4096
    #define KVM_DEFAULT_PLE_WINDOW_GROW 2
    --
    2.26.2

    \
     
     \ /
      Last update: 2021-03-03 03:41    [W:3.179 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site