On 26/03/20 14:41, Vitaly Kuznetsov wrote:
> Paolo Bonzini <pbonzini@xxxxxxxxxx> writes:
>
>> To reconstruct the kvm_mmu to be used for page fault injection, we
>> can simply use fault->nested_page_fault. This matches how
>> fault->nested_page_fault is assigned in the first place by
>> FNAME(walk_addr_generic).
>>
>> Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
>> ---
>> arch/x86/kvm/mmu/mmu.c | 6 ------
>> arch/x86/kvm/mmu/paging_tmpl.h | 2 +-
>> arch/x86/kvm/x86.c | 7 +++----
>> 3 files changed, 4 insertions(+), 11 deletions(-)
>>
>> diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
>> index e26c9a583e75..6250e31ac617 100644
>> --- a/arch/x86/kvm/mmu/mmu.c
>> +++ b/arch/x86/kvm/mmu/mmu.c
>> @@ -4353,12 +4353,6 @@ static unsigned long get_cr3(struct kvm_vcpu *vcpu)
>> return kvm_read_cr3(vcpu);
>> }
>>
>> -static void inject_page_fault(struct kvm_vcpu *vcpu,
>> - struct x86_exception *fault)
>> -{
>> - vcpu->arch.mmu->inject_page_fault(vcpu, fault);
>> -}
>> -
>
> This is already gone with Sean's "KVM: x86: Consolidate logic for
> injecting page faults to L1".
>
> It would probably make sense to have a combined series (or a branch on
> kvm.git) to simplify testing efforts.
Yes, these three patches replace part of Sean's (the patch you mention
and the next one, "KVM: x86: Sync SPTEs when injecting page/EPT fault
into L1").
I pushed the result to a branch named kvm-tlb-cleanup on kvm.git.
Paolo
