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 20/29] KVM: Move WARN on invalid memslot index to update_memslots()
    Date
    From: "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>

    Since kvm_memslot_move_forward() can theoretically return a negative
    memslot index even when kvm_memslot_move_backward() returned a positive one
    (and so did not WARN) let's just move the warning to the common code.

    Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
    Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
    Reviewed-by: Sean Christopherson <seanjc@google.com>
    ---
    virt/kvm/kvm_main.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
    index aca39b587cdb..bbc0110224f3 100644
    --- a/virt/kvm/kvm_main.c
    +++ b/virt/kvm/kvm_main.c
    @@ -1324,8 +1324,7 @@ static inline int kvm_memslot_move_backward(struct kvm_memslots *slots,
    struct kvm_memory_slot *mslots = slots->memslots;
    int i;

    - if (WARN_ON_ONCE(slots->id_to_index[memslot->id] == -1) ||
    - WARN_ON_ONCE(!slots->used_slots))
    + if (slots->id_to_index[memslot->id] == -1 || !slots->used_slots)
    return -1;

    /*
    @@ -1429,6 +1428,9 @@ static void update_memslots(struct kvm_memslots *slots,
    i = kvm_memslot_move_backward(slots, memslot);
    i = kvm_memslot_move_forward(slots, memslot, i);

    + if (WARN_ON_ONCE(i < 0))
    + return;
    +
    /*
    * Copy the memslot to its new position in memslots and update
    * its index accordingly.
    \
     
     \ /
      Last update: 2021-12-06 20:57    [W:3.772 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site