lkml.org 
[lkml]   [2010]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH 01/12] KVM: SVM: Add clean-bits infrastructure code
    On Fri, Dec 03, 2010 at 05:45:48AM -0500, Joerg Roedel wrote:
    > +enum {
    > + VMCB_CLEAN_MAX,
    > +};

    This is a left-over from an earlier version. I forgot to remove it. Here
    is an updated patch. Sorry.


    From 7e3f4f175561429d0054daac94763e67d12424ba Mon Sep 17 00:00:00 2001
    From: Joerg Roedel <joerg.roedel@amd.com>
    Date: Wed, 1 Dec 2010 12:01:08 +0100
    Subject: [PATCH 01/12] KVM: SVM: Add clean-bits infrastructure code

    This patch adds the infrastructure for the implementation of
    the individual clean-bits.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/include/asm/svm.h | 3 ++-
    arch/x86/kvm/svm.c | 31 +++++++++++++++++++++++++++++++
    2 files changed, 33 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h
    index 11dbca7..235dd73 100644
    --- a/arch/x86/include/asm/svm.h
    +++ b/arch/x86/include/asm/svm.h
    @@ -79,7 +79,8 @@ struct __attribute__ ((__packed__)) vmcb_control_area {
    u32 event_inj_err;
    u64 nested_cr3;
    u64 lbr_ctl;
    - u64 reserved_5;
    + u32 clean;
    + u32 reserved_5;
    u64 next_rip;
    u8 reserved_6[816];
    };
    diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
    index c00ea90..3ee59b0 100644
    --- a/arch/x86/kvm/svm.c
    +++ b/arch/x86/kvm/svm.c
    @@ -185,6 +185,28 @@ static int nested_svm_vmexit(struct vcpu_svm *svm);
    static int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr,
    bool has_error_code, u32 error_code);

    +enum {
    + VMCB_DIRTY_MAX,
    +};
    +
    +#define VMCB_ALWAYS_DIRTY_MASK 0U
    +
    +static inline void mark_all_dirty(struct vmcb *vmcb)
    +{
    + vmcb->control.clean = 0;
    +}
    +
    +static inline void mark_all_clean(struct vmcb *vmcb)
    +{
    + vmcb->control.clean = ((1 << VMCB_DIRTY_MAX) - 1)
    + & ~VMCB_ALWAYS_DIRTY_MASK;
    +}
    +
    +static inline void mark_dirty(struct vmcb *vmcb, int bit)
    +{
    + vmcb->control.clean &= ~(1 << bit);
    +}
    +
    static inline struct vcpu_svm *to_svm(struct kvm_vcpu *vcpu)
    {
    return container_of(vcpu, struct vcpu_svm, vcpu);
    @@ -973,6 +995,8 @@ static void init_vmcb(struct vcpu_svm *svm)
    set_intercept(svm, INTERCEPT_PAUSE);
    }

    + mark_all_dirty(svm->vmcb);
    +
    enable_gif(svm);
    }

    @@ -1089,6 +1113,7 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu)

    if (unlikely(cpu != vcpu->cpu)) {
    svm->asid_generation = 0;
    + mark_all_dirty(svm->vmcb);
    }

    #ifdef CONFIG_X86_64
    @@ -2139,6 +2164,8 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)
    svm->vmcb->save.cpl = 0;
    svm->vmcb->control.exit_int_info = 0;

    + mark_all_dirty(svm->vmcb);
    +
    nested_svm_unmap(page);

    nested_svm_uninit_mmu_context(&svm->vcpu);
    @@ -2350,6 +2377,8 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)

    enable_gif(svm);

    + mark_all_dirty(svm->vmcb);
    +
    return true;
    }

    @@ -3487,6 +3516,8 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
    if (unlikely(svm->vmcb->control.exit_code ==
    SVM_EXIT_EXCP_BASE + MC_VECTOR))
    svm_handle_mce(svm);
    +
    + mark_all_clean(svm->vmcb);
    }

    #undef R
    --
    1.7.1
    --
    AMD Operating System Research Center

    Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
    General Managers: Alberto Bozzo, Andrew Bowd
    Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632



    \
     
     \ /
      Last update: 2010-12-03 13:17    [W:0.031 / U:59.800 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site