From: Paolo Bonzini Date: Wed, 9 Jun 2021 05:49:13 +0000 (-0400) Subject: kvm: fix previous commit for 32-bit builds X-Git-Tag: v5.13-rc6~33^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4422829e8053068e0225e4d0ef42dc41ea7c9ef5;p=linux-platform-drivers-x86.git kvm: fix previous commit for 32-bit builds array_index_nospec does not work for uint64_t on 32-bit builds. However, the size of a memory slot must be less than 20 bits wide on those system, since the memory slot must fit in the user address space. So just store it in an unsigned long. Signed-off-by: Paolo Bonzini --- diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 74995f0a2a3c..8583ed3ff344 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1191,8 +1191,8 @@ __gfn_to_hva_memslot(const struct kvm_memory_slot *slot, gfn_t gfn) * table walks, do not let the processor speculate loads outside * the guest's registered memslots. */ - unsigned long offset = array_index_nospec(gfn - slot->base_gfn, - slot->npages); + unsigned long offset = gfn - slot->base_gfn; + offset = array_index_nospec(offset, slot->npages); return slot->userspace_addr + offset * PAGE_SIZE; }