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

Commit 0beb8d66 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: MMU: check rmap for every spte 



The read-only spte also has reverse mapping, so fix the code to check them,
also modify the function name to fit its doing

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 9ad17b10

arch/x86/kvm/mmu.c

+26 −31
Original line number Diff line number Diff line
@@ -3644,7 +3644,7 @@ void inspect_spte_has_rmap(struct kvm *kvm, u64 *sptep) 
	struct kvm_mmu_page *rev_sp;

	gfn_t gfn;



	if (is_writable_pte(*sptep)) {



	rev_sp = page_header(__pa(sptep));

	gfn = kvm_mmu_page_get_gfn(rev_sp, sptep - rev_sp->spt);
@@ -3670,14 +3670,12 @@ void inspect_spte_has_rmap(struct kvm *kvm, u64 *sptep) 
	}

}



}



void audit_writable_sptes_have_rmaps(struct kvm_vcpu *vcpu)

void audit_sptes_have_rmaps(struct kvm_vcpu *vcpu)

{

	mmu_spte_walk(vcpu, inspect_spte_has_rmap);

}



static void check_writable_mappings_rmap(struct kvm_vcpu *vcpu)

static void check_mappings_rmap(struct kvm_vcpu *vcpu)

{

	struct kvm_mmu_page *sp;

	int i;
@@ -3689,12 +3687,9 @@ static void check_writable_mappings_rmap(struct kvm_vcpu *vcpu) 
			continue;



		for (i = 0; i < PT64_ENT_PER_PAGE; ++i) {

			u64 ent = pt[i];



			if (!(ent & PT_PRESENT_MASK))

				continue;

			if (!is_writable_pte(ent))

			if (!is_rmap_spte(pt[i]))

				continue;



			inspect_spte_has_rmap(vcpu->kvm, &pt[i]);

		}

	}
@@ -3703,7 +3698,7 @@ static void check_writable_mappings_rmap(struct kvm_vcpu *vcpu) 


static void audit_rmap(struct kvm_vcpu *vcpu)

{

	check_writable_mappings_rmap(vcpu);

	check_mappings_rmap(vcpu);

	count_rmaps(vcpu);

}
@@ -3746,7 +3741,7 @@ static void kvm_mmu_audit(struct kvm_vcpu *vcpu, const char *msg) 
	audit_write_protection(vcpu);

	if (strcmp("pre pte write", audit_msg) != 0)

		audit_mappings(vcpu);

	audit_writable_sptes_have_rmaps(vcpu);

	audit_sptes_have_rmaps(vcpu);

	dbg = olddbg;

}