KVM: x86/mmu: Minor cleanup in try_async_pf()
cover KVM: x86/mmu: Minor cleanup in try_async_pf()
Two cleanups with no functional changes.
I'm not 100% on whether or not open coding the private memslot check in patch 2 is a good idea. Avoiding the extra memslot lookup is nice, but that could be done by providing e.g. kvm_is_memslot_visible(). On one hand, I like deferring the nonexistent and invalid checks to common code, but on the other hand it creates the possibility of missing some future case where kvm_is_gfn_visible() adds a check that's not also incoporated into __gfn_to_hva_many(), though that seems like a rather unlikely scenario.
Sean Christopherson (2):
KVM: x86/mmu: Set @writable to false for non-visible accesses by L2
KVM: x86/mmu: Avoid an extra memslot lookup in try_async_pf() for L2
arch/x86/kvm/mmu/mmu.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
Signature · 1 line
2.26.0
PATCH 1/2 KVM: x86/mmu: Set @writable to false for non-visible accesses by L2
Explicitly set @writable to false in try_async_pf() if the GFN->PFN translation is short-circuited due to the requested GFN not being visible to L2.
Leaving @writable ('map_writable' in the callers) uninitialized is ok in that it's never actually consumed, but one has to track it all the way through set_spte() being short-circuited by set_mmio_spte() to understand that the uninitialized variable is benign, and relying on @writable being ignored is an unnecessary risk. Explicitly setting @writable also aligns try_async_pf() with __gfn_to_pfn_memslot().
Jim Mattson <[email protected]>
--- arch/x86/kvm/mmu/mmu.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kvm/mmu/mmu.c +1 -0
@@ -4090,6 +4090,7 @@ static bool try_async_pf(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn,*/ if (is_guest_mode (vcpu) && !kvm_is_visible_gfn (vcpu->kvm, gfn)) { *pfn =KVM_PFN_NOSLOT ; + *writable = false;return false; }
Signature · 1 line
2.26.0
Re: [PATCH 1/2] KVM: x86/mmu: Set @writable to false for non-visible accesses by L2
Quoted 5 lines · Sean Christopherson
Explicitly set @writable to false in
try_async_pf()if theGFN->PFNtranslation is short-circuited due to the requested GFN not being visible to L2.
Quoted 8 lines
Leaving @writable ('
map_writable' in the callers) uninitialized is ok in that it's never actually consumed, but one has to track it all the way throughset_spte()being short-circuited byset_mmio_spte()to understand that the uninitialized variable is benign, and relying on @writable being ignored is an unnecessary risk. Explicitly setting @writable also alignstry_async_pf()with__gfn_to_pfn_memslot().Jim Mattson <[email protected]>
Go ahead and preface the above with Reviewed-by:
Quoted 20 lines
Signed-off-by Sean Christopherson <[email protected]>--- arch/x86/kvm/mmu/mmu.c | 1 + 1 file changed, 1 insertion(+)arch/x86/kvm/mmu/mmu.c +1
-1@@ -4090,6 +4090,7 @@ static bool try_async_pf(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn,*/ if (is_guest_mode (vcpu) && !kvm_is_visible_gfn (vcpu->kvm, gfn)) { *pfn =KVM_PFN_NOSLOT ; + *writable = false;return false; } --2.26.0
PATCH 2/2 KVM: x86/mmu: Avoid an extra memslot lookup in try_async_pf() for L2
In reply to Sean ChristophersonTweak the L2 vs. private memslot handling in try_async_pf() to avoid an added memslot lookup and more precisely single out private memslots, i.e. defer to the common code to handle nonexistent or invalid memslots to make it clear L2 doesn't require special handling for those cases.
Opportunstically squish a multi-line comment into a single-line comment.
Note, the end result, KVM_PFN_NOSLOT, is unchanged.
--- arch/x86/kvm/mmu/mmu.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
arch/x86/kvm/mmu/mmu.c +3 -6
@@ -4082,19 +4082,16 @@ static bool try_async_pf(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn, gpa_t cr2_or_gpa, kvm_pfn_t *pfn, bool write, bool *writable) { - struct kvm_memory_slot *slot; + struct kvm_memory_slot *slot = kvm_vcpu_gfn_to_memslot(vcpu, gfn);bool async; -/* -* Don't expose private memslots to L2. -*/ -if (is_guest_mode (vcpu) && !kvm_is_visible_gfn (vcpu->kvm, gfn)) { +/* Don't expose private memslots to L2. */ +if (is_guest_mode (vcpu) && slot && slot->id >=KVM_USER_MEM_SLOTS ) { *pfn =KVM_PFN_NOSLOT ; *writable = false;return false; } - slot =kvm_vcpu_gfn_to_memslot (vcpu, gfn); async = false; *pfn =__gfn_to_pfn_memslot (slot, gfn, false, &async, write, writable);if (!async)
Signature · 1 line
2.26.0
Paolo Bonzini
maintainerQuoted 4 lines · Sean Christopherson
I'm not 100% on whether or not open coding the private memslot check in patch 2 is a good idea. Avoiding the extra memslot lookup is nice, but that could be done by providing e.g.
kvm_is_memslot_visible().
Yeah, that's better. The patch is so small that it's even pointless to split it in two:
From: Paolo Bonzini <[email protected]>
Subject: [PATCH] KVM: x86/mmu: Avoid an extra memslot lookup in try_async_pf() for L2
Create a new function kvm_is_visible_memslot() and use it from kvm_is_visible_gfn(); use the new function in try_async_pf() too, to avoid an extra memslot lookup.
arch/x86/kvm/mmu/mmu.c +2 -3
@@ -4082,19 +4082,18 @@ static bool try_async_pf(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn, gpa_t cr2_or_gpa, kvm_pfn_t *pfn, bool write, bool *writable) { - struct kvm_memory_slot *slot; + struct kvm_memory_slot *slot = kvm_vcpu_gfn_to_memslot(vcpu, gfn);bool async;/* * Don't expose private memslots to L2. */ -if (is_guest_mode (vcpu) && !kvm_is_visible_gfn (vcpu->kvm, gfn)) { +if (is_guest_mode (vcpu) && !kvm_is_visible_memslot (slot)) { *pfn =KVM_PFN_NOSLOT ; *writable = false;return false; } - slot =kvm_vcpu_gfn_to_memslot (vcpu, gfn); async = false; *pfn =__gfn_to_pfn_memslot (slot, gfn, false, &async, write, writable);if (!async)
include/linux/kvm_host.h +6 -0
@@ -1357,6 +1357,12 @@ static inline void kvm_vcpu_set_dy_eligible(struct kvm_vcpu *vcpu, bool val) }#endif /* CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT */ +static inline bool kvm_is_visible_memslot (struct kvm_memory_slot *memslot) +{ +return (memslot && memslot->id <KVM_USER_MEM_SLOTS && + !(memslot->flags &KVM_MEMSLOT_INVALID )); +} +struct kvm_vcpu *kvm_get_running_vcpu (void );struct kvm_vcpu *__percpu *kvm_get_running_vcpus (void );
virt/kvm/kvm_main.c +1 -5
@@ -1607,11 +1607,7 @@ bool kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn) {struct kvm_memory_slot *memslot =gfn_to_memslot (kvm, gfn); -if (!memslot || memslot->id >=KVM_USER_MEM_SLOTS || - memslot->flags &KVM_MEMSLOT_INVALID ) -return false; - -return true; +return kvm_is_visible_memslot (memslot); }EXPORT_SYMBOL_GPL (kvm_is_visible_gfn);