Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65fbe37c authored by Takuya Yoshikawa's avatar Takuya Yoshikawa Committed by Avi Kivity
Browse files

KVM: MMU: Use gfn_to_rmap() instead of directly reading rmap array 



This helps to make rmap architecture specific in a later patch.

Signed-off-by: default avatarTakuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent aab2eb7a

arch/x86/kvm/mmu.c

+2 −1
Original line number Diff line number Diff line
@@ -1181,7 +1181,8 @@ void kvm_mmu_write_protect_pt_masked(struct kvm *kvm, 
	unsigned long *rmapp;



	while (mask) {

		rmapp = &slot->rmap[gfn_offset + __ffs(mask)];

		rmapp = __gfn_to_rmap(slot->base_gfn + gfn_offset + __ffs(mask),

				      PT_PAGE_TABLE_LEVEL, slot);

		__rmap_write_protect(kvm, rmapp, PT_PAGE_TABLE_LEVEL, false);



		/* clear the first set bit */

arch/x86/kvm/mmu_audit.c

+1 −3
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ static void check_mappings_rmap(struct kvm *kvm, struct kvm_mmu_page *sp) 


static void audit_write_protection(struct kvm *kvm, struct kvm_mmu_page *sp)

{

	struct kvm_memory_slot *slot;

	unsigned long *rmapp;

	u64 *sptep;

	struct rmap_iterator iter;
@@ -198,8 +197,7 @@ static void audit_write_protection(struct kvm *kvm, struct kvm_mmu_page *sp) 
	if (sp->role.direct || sp->unsync || sp->role.invalid)

		return;



	slot = gfn_to_memslot(kvm, sp->gfn);

	rmapp = &slot->rmap[sp->gfn - slot->base_gfn];

	rmapp = gfn_to_rmap(kvm, sp->gfn, PT_PAGE_TABLE_LEVEL);



	for (sptep = rmap_get_first(*rmapp, &iter); sptep;

	     sptep = rmap_get_next(&iter)) {