Commit 3e1efe2b authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: Wrap kvm_{gfn,hva}_range.pte in a per-action union 

Wrap kvm_{gfn,hva}_range.pte in a union so that future notifier events can
pass event specific information up and down the stack without needing to
constantly expand and churn the APIs.  Lockless aging of SPTEs will pass
around a bitmap, and support for memory attributes will pass around the
new attributes for the range.

Add a "KVM_NO_ARG" placeholder to simplify handling events without an
argument (creating a dummy union variable is midly annoying).

Opportunstically drop explicit zero-initialization of the "pte" field, as
omitting the field (now a union) has the same effect.

Cc: Yu Zhao <yuzhao@google.com>
Link: https://lore.kernel.org/all/CAOUHufagkd2Jk3_HrVoFFptRXM=hX2CV8f+M-dka-hJU4bP8kw@mail.gmail.com


Reviewed-by: default avatarOliver Upton <oliver.upton@linux.dev>
Acked-by: default avatarYu Zhao <yuzhao@google.com>
Link: https://lore.kernel.org/r/20230729004144.1054885-1-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent fdf0eaf1

arch/arm64/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1721,7 +1721,7 @@ bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range) 


bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range)

{

	kvm_pfn_t pfn = pte_pfn(range->pte);

	kvm_pfn_t pfn = pte_pfn(range->arg.pte);



	if (!kvm->arch.mmu.pgt)

		return false;

arch/mips/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range) 
bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range)

{

	gpa_t gpa = range->start << PAGE_SHIFT;

	pte_t hva_pte = range->pte;

	pte_t hva_pte = range->arg.pte;

	pte_t *gpa_pte = kvm_mips_pte_for_gpa(kvm, NULL, gpa);

	pte_t old_pte;

arch/riscv/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ bool kvm_unmap_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range) 
bool kvm_set_spte_gfn(struct kvm *kvm, struct kvm_gfn_range *range)

{

	int ret;

	kvm_pfn_t pfn = pte_pfn(range->pte);

	kvm_pfn_t pfn = pte_pfn(range->arg.pte);



	if (!kvm->arch.pgd)

		return false;

arch/x86/kvm/mmu/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1588,7 +1588,7 @@ static __always_inline bool kvm_handle_gfn_range(struct kvm *kvm, 
	for_each_slot_rmap_range(range->slot, PG_LEVEL_4K, KVM_MAX_HUGEPAGE_LEVEL,

				 range->start, range->end - 1, &iterator)

		ret |= handler(kvm, iterator.rmap, range->slot, iterator.gfn,

			       iterator.level, range->pte);

			       iterator.level, range->arg.pte);



	return ret;

}

arch/x86/kvm/mmu/tdp_mmu.c

+3 −3
Original line number Diff line number Diff line
@@ -1241,7 +1241,7 @@ static bool set_spte_gfn(struct kvm *kvm, struct tdp_iter *iter, 
	u64 new_spte;



	/* Huge pages aren't expected to be modified without first being zapped. */

	WARN_ON(pte_huge(range->pte) || range->start + 1 != range->end);

	WARN_ON(pte_huge(range->arg.pte) || range->start + 1 != range->end);



	if (iter->level != PG_LEVEL_4K ||

	    !is_shadow_present_pte(iter->old_spte))
@@ -1255,9 +1255,9 @@ static bool set_spte_gfn(struct kvm *kvm, struct tdp_iter *iter, 
	 */

	tdp_mmu_iter_set_spte(kvm, iter, 0);



	if (!pte_write(range->pte)) {

	if (!pte_write(range->arg.pte)) {

		new_spte = kvm_mmu_changed_pte_notifier_make_spte(iter->old_spte,

								  pte_pfn(range->pte));

								  pte_pfn(range->arg.pte));



		tdp_mmu_iter_set_spte(kvm, iter, new_spte);

	}