Commit 8283e36a authored by Ben Gardon's avatar Ben Gardon Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Propagate memslot const qualifier 



In preparation for implementing in-place hugepage promotion, various
functions will need to be called from zap_collapsible_spte_range, which
has the const qualifier on its memslot argument. Propagate the const
qualifier to the various functions which will be needed. This just serves
to simplify the following patch.

No functional change intended.

Signed-off-by: default avatarBen Gardon <bgardon@google.com>
Message-Id: <20211115234603.2908381-11-bgardon@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4d78d0b3

arch/x86/include/asm/kvm_page_track.h

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ void kvm_slot_page_track_remove_page(struct kvm *kvm, 
				     struct kvm_memory_slot *slot, gfn_t gfn,

				     enum kvm_page_track_mode mode);

bool kvm_slot_page_track_is_active(struct kvm *kvm,

				   struct kvm_memory_slot *slot, gfn_t gfn,

				   enum kvm_page_track_mode mode);

				   const struct kvm_memory_slot *slot,

				   gfn_t gfn, enum kvm_page_track_mode mode);



void

kvm_page_track_register_notifier(struct kvm *kvm,

arch/x86/kvm/mmu/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -2580,7 +2580,7 @@ static void kvm_unsync_page(struct kvm *kvm, struct kvm_mmu_page *sp) 
 * were marked unsync (or if there is no shadow page), -EPERM if the SPTE must

 * be write-protected.

 */

int mmu_try_to_unsync_pages(struct kvm *kvm, struct kvm_memory_slot *slot,

int mmu_try_to_unsync_pages(struct kvm *kvm, const struct kvm_memory_slot *slot,

			    gfn_t gfn, bool can_unsync, bool prefetch)

{

	struct kvm_mmu_page *sp;

arch/x86/kvm/mmu/mmu_internal.h

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static inline bool kvm_mmu_page_ad_need_write_protect(struct kvm_mmu_page *sp) 
	return kvm_x86_ops.cpu_dirty_log_size && sp->role.guest_mode;

}



int mmu_try_to_unsync_pages(struct kvm *kvm, struct kvm_memory_slot *slot,

int mmu_try_to_unsync_pages(struct kvm *kvm, const struct kvm_memory_slot *slot,

			    gfn_t gfn, bool can_unsync, bool prefetch);



void kvm_mmu_gfn_disallow_lpage(const struct kvm_memory_slot *slot, gfn_t gfn);

arch/x86/kvm/mmu/page_track.c

+2 −2
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ EXPORT_SYMBOL_GPL(kvm_slot_page_track_remove_page); 
 * check if the corresponding access on the specified guest page is tracked.

 */

bool kvm_slot_page_track_is_active(struct kvm *kvm,

				   struct kvm_memory_slot *slot, gfn_t gfn,

				   enum kvm_page_track_mode mode)

				   const struct kvm_memory_slot *slot,

				   gfn_t gfn, enum kvm_page_track_mode mode)

{

	int index;

arch/x86/kvm/mmu/spte.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static bool kvm_is_mmio_pfn(kvm_pfn_t pfn) 
}



bool make_spte(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,

	       struct kvm_memory_slot *slot,

	       const struct kvm_memory_slot *slot,

	       unsigned int pte_access, gfn_t gfn, kvm_pfn_t pfn,

	       u64 old_spte, bool prefetch, bool can_unsync,

	       bool host_writable, u64 *new_spte)