diff options
| author |   Maciej S. Szmigiero <maciej.szmigiero@oracle.com> | 2021-12-06 20:54:25 +0100 |
|---|---|---|
| committer |   Paolo Bonzini <pbonzini@redhat.com> | 2021-12-08 04:24:30 -0500 |
| commit | c928bfc2632fa3dd6a3bd4504ac6d8e42302287a (patch) | |
| tree | 79d34395cf30656db4734e314a56e1aeeefcaf42 /virt | |
| parent | KVM: x86: Use nr_memslot_pages to avoid traversing the memslots array (diff) | |
| download | linux-dev-c928bfc2632fa3dd6a3bd4504ac6d8e42302287a.tar.xz linux-dev-c928bfc2632fa3dd6a3bd4504ac6d8e42302287a.zip | |
KVM: Integrate gfn_to_memslot_approx() into search_memslots()
s390 arch has gfn_to_memslot_approx() which is almost identical to
search_memslots(), differing only in that in case the gfn falls in a hole
one of the memslots bordering the hole is returned.
Add this lookup mode as an option to search_memslots() so we don't have two
almost identical functions for looking up a memslot by its gfn.
Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
[sean: tweaked helper names to keep gfn_to_memslot_approx() in s390]
Reviewed-by: Sean Christopherson <seanjc@google.com>
Message-Id: <171cd89b52c718dbe180ecd909b4437a64a7e2ec.1638817640.git.maciej.szmigiero@oracle.com>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 8ccb1ac82d38..6ca076ae64a2 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -2141,7 +2141,7 @@ struct kvm_memory_slot *kvm_vcpu_gfn_to_memslot(struct kvm_vcpu *vcpu, gfn_t gfn * search_memslots() instead of __gfn_to_memslot() to avoid * thrashing the VM-wide last_used_index in kvm_memslots. */ - slot = search_memslots(slots, gfn, &slot_index); + slot = search_memslots(slots, gfn, &slot_index, false); if (slot) { vcpu->last_used_slot = slot_index; return slot; |