lkml.org 
[lkml]   [2021]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 10/29] KVM: x86: Use "new" memslot instead of userspace memory region
    Date
    From: Sean Christopherson <seanjc@google.com>

    Get the number of pages directly from the new memslot instead of
    computing the same from the userspace memory region when allocating
    memslot metadata. This will allow a future patch to drop @mem.

    No functional change intended.

    Signed-off-by: Sean Christopherson <seanjc@google.com>
    Reviewed-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
    Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
    ---
    arch/x86/kvm/x86.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index d6362406a82e..e657c238b642 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -11642,9 +11642,9 @@ int memslot_rmap_alloc(struct kvm_memory_slot *slot, unsigned long npages)
    }

    static int kvm_alloc_memslot_metadata(struct kvm *kvm,
    - struct kvm_memory_slot *slot,
    - unsigned long npages)
    + struct kvm_memory_slot *slot)
    {
    + unsigned long npages = slot->npages;
    int i, r;

    /*
    @@ -11729,8 +11729,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm,
    enum kvm_mr_change change)
    {
    if (change == KVM_MR_CREATE || change == KVM_MR_MOVE)
    - return kvm_alloc_memslot_metadata(kvm, new,
    - mem->memory_size >> PAGE_SHIFT);
    + return kvm_alloc_memslot_metadata(kvm, new);

    if (change == KVM_MR_FLAGS_ONLY)
    memcpy(&new->arch, &old->arch, sizeof(old->arch));
    \
     
     \ /
      Last update: 2021-11-30 22:44    [W:4.116 / U:0.472 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site