lkml.org 
[lkml]   [2009]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 58/88] KVM: VMX: Move private memory slot position

    2.6.28-stable review patch. If anyone has any objections, please let us know.

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

    From: Sheng Yang <sheng@linux.intel.com>

    (cherry picked from 6fe639792c7b8e462baeaac39ecc33541fd5da6e)

    PCI device assignment would map guest MMIO spaces as separate slot, so it is
    possible that the device has more than 2 MMIO spaces and overwrite current
    private memslot.

    The patch move private memory slot to the top of userspace visible memory slots.

    Signed-off-by: Sheng Yang <sheng@linux.intel.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    arch/x86/kvm/vmx.c | 2 +-
    arch/x86/kvm/vmx.h | 5 +++--
    2 files changed, 4 insertions(+), 3 deletions(-)

    --- a/arch/x86/kvm/vmx.c
    +++ b/arch/x86/kvm/vmx.c
    @@ -2407,7 +2407,7 @@ static int vmx_set_tss_addr(struct kvm *
    {
    int ret;
    struct kvm_userspace_memory_region tss_mem = {
    - .slot = 8,
    + .slot = TSS_PRIVATE_MEMSLOT,
    .guest_phys_addr = addr,
    .memory_size = PAGE_SIZE * 3,
    .flags = 0,
    --- a/arch/x86/kvm/vmx.h
    +++ b/arch/x86/kvm/vmx.h
    @@ -331,8 +331,9 @@ enum vmcs_field {

    #define AR_RESERVD_MASK 0xfffe0f00

    -#define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT 9
    -#define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT 10
    +#define TSS_PRIVATE_MEMSLOT (KVM_MEMORY_SLOTS + 0)
    +#define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT (KVM_MEMORY_SLOTS + 1)
    +#define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT (KVM_MEMORY_SLOTS + 2)

    #define VMX_NR_VPIDS (1 << 16)
    #define VMX_VPID_EXTENT_SINGLE_CONTEXT 1



    \
     
     \ /
      Last update: 2009-04-30 19:37    [W:0.020 / U:17.172 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site