lkml.org 
[lkml]   [2015]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 128/180] KVM: x86: Fix MSR_IA32_BNDCFGS in msrs_to_save
    Date
    3.16.7-ckt11 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Nadav Amit <namit@cs.technion.ac.il>

    commit 9e9c3fe40bcd28e3f98f0ad8408435f4503f2781 upstream.

    kvm_init_msr_list is currently called before hardware_setup. As a result,
    vmx_mpx_supported always returns false when kvm_init_msr_list checks whether to
    save MSR_IA32_BNDCFGS.

    Move kvm_init_msr_list after vmx_hardware_setup is called to fix this issue.

    Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>

    Message-Id: <1428864435-4732-1-git-send-email-namit@cs.technion.ac.il>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/x86/kvm/x86.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index a711a0d1ebc3..6018e319d7fb 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -5634,7 +5634,6 @@ int kvm_arch_init(void *opaque)
    kvm_set_mmio_spte_mask();

    kvm_x86_ops = ops;
    - kvm_init_msr_list();

    kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK,
    PT_DIRTY_MASK, PT64_NX_MASK, 0);
    @@ -7015,7 +7014,14 @@ void kvm_arch_hardware_disable(void *garbage)

    int kvm_arch_hardware_setup(void)
    {
    - return kvm_x86_ops->hardware_setup();
    + int r;
    +
    + r = kvm_x86_ops->hardware_setup();
    + if (r != 0)
    + return r;
    +
    + kvm_init_msr_list();
    + return 0;
    }

    void kvm_arch_hardware_unsetup(void)

    \
     
     \ /
      Last update: 2015-05-07 12:21    [W:3.233 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site