lkml.org 
[lkml]   [2021]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v7 23/29] KVM: s390: Introduce kvm_s390_get_gfn_end()
    Date
    From: "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>

    And use it where s390 code would just access the memslot with the highest
    gfn directly.

    No functional change intended.

    Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
    Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
    ---
    arch/s390/kvm/kvm-s390.c | 2 +-
    arch/s390/kvm/kvm-s390.h | 12 ++++++++++++
    arch/s390/kvm/pv.c | 4 +---
    3 files changed, 14 insertions(+), 4 deletions(-)

    diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
    index b0fa2592b4ef..5054fab23226 100644
    --- a/arch/s390/kvm/kvm-s390.c
    +++ b/arch/s390/kvm/kvm-s390.c
    @@ -2014,7 +2014,7 @@ static int kvm_s390_get_cmma(struct kvm *kvm, struct kvm_s390_cmma_log *args,
    if (!ms)
    return 0;
    next_gfn = kvm_s390_next_dirty_cmma(slots, cur_gfn + 1);
    - mem_end = slots->memslots[0].base_gfn + slots->memslots[0].npages;
    + mem_end = kvm_s390_get_gfn_end(slots);

    while (args->count < bufsize) {
    hva = gfn_to_hva(kvm, cur_gfn);
    diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h
    index b887fe7a7064..cc309cc37e96 100644
    --- a/arch/s390/kvm/kvm-s390.h
    +++ b/arch/s390/kvm/kvm-s390.h
    @@ -217,6 +217,18 @@ static inline void kvm_s390_set_user_cpu_state_ctrl(struct kvm *kvm)
    kvm->arch.user_cpu_state_ctrl = 1;
    }

    +/* get the end gfn of the last (highest gfn) memslot */
    +static inline unsigned long kvm_s390_get_gfn_end(struct kvm_memslots *slots)
    +{
    + struct kvm_memory_slot *ms;
    +
    + if (WARN_ON(!slots->used_slots))
    + return 0;
    +
    + ms = slots->memslots;
    + return ms->base_gfn + ms->npages;
    +}
    +
    /* implemented in pv.c */
    int kvm_s390_pv_destroy_cpu(struct kvm_vcpu *vcpu, u16 *rc, u16 *rrc);
    int kvm_s390_pv_create_cpu(struct kvm_vcpu *vcpu, u16 *rc, u16 *rrc);
    diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/pv.c
    index 00d272d134c2..7f7c0d6af2ce 100644
    --- a/arch/s390/kvm/pv.c
    +++ b/arch/s390/kvm/pv.c
    @@ -116,7 +116,6 @@ static int kvm_s390_pv_alloc_vm(struct kvm *kvm)
    unsigned long base = uv_info.guest_base_stor_len;
    unsigned long virt = uv_info.guest_virt_var_stor_len;
    unsigned long npages = 0, vlen = 0;
    - struct kvm_memory_slot *memslot;

    kvm->arch.pv.stor_var = NULL;
    kvm->arch.pv.stor_base = __get_free_pages(GFP_KERNEL_ACCOUNT, get_order(base));
    @@ -130,8 +129,7 @@ static int kvm_s390_pv_alloc_vm(struct kvm *kvm)
    * Slots are sorted by GFN
    */
    mutex_lock(&kvm->slots_lock);
    - memslot = kvm_memslots(kvm)->memslots;
    - npages = memslot->base_gfn + memslot->npages;
    + npages = kvm_s390_get_gfn_end(kvm_memslots(kvm));
    mutex_unlock(&kvm->slots_lock);

    kvm->arch.pv.guest_len = npages * PAGE_SIZE;
    \
     
     \ /
      Last update: 2021-12-06 20:57    [W:4.043 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site