From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F1A7C4320A for ; Tue, 3 Aug 2021 09:00:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1901960EB9 for ; Tue, 3 Aug 2021 09:00:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234909AbhHCJAq (ORCPT ); Tue, 3 Aug 2021 05:00:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:48553 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234833AbhHCJAp (ORCPT ); Tue, 3 Aug 2021 05:00:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627981234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9UH0gpcsz/cdHoJVPf064lHW6QX70PQL8rmdmVm5V1c=; b=OZ+YEf+Ic4A0+je0njOwaLHYjr8VKuRZtztUAlhAwj7ArU3MiqtCi7f+Pt7xdORzVJQNrK WenNikWR6qW2vMEINZwe4UnX4ng0+eRQi0BHr4kz1kHvW/+je7MJpYAC/aIEGYfmcN/ATb XEP4NHDLhiof8Cbp7Wa/OiLj+xXlAZA= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-418-DaHCUBCzMMWz6W0hjrpnkQ-1; Tue, 03 Aug 2021 05:00:33 -0400 X-MC-Unique: DaHCUBCzMMWz6W0hjrpnkQ-1 Received: by mail-wm1-f71.google.com with SMTP id j204-20020a1c23d50000b029024e75a15714so596066wmj.0 for ; Tue, 03 Aug 2021 02:00:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=9UH0gpcsz/cdHoJVPf064lHW6QX70PQL8rmdmVm5V1c=; b=R9eTN2PTMArenvjfhgYp0AUMTbhZaPrSD1X1qKx6bLOXM2acOP8fsMM9qwyeuR01A0 LWsiXyOpEa2Oud5CuVwNvvzg23auNV5Ew/mwKdcsm0TPFPoB8xgUnk2iRlk5jjjqWhvR +syewcj7JjsiYHmF07Cus4VLRC+kaQePitUGs5y8n3kmnLuqs2z7oL9J4neu8W+iSRlO XYFIcNlwpeAxi0fqEgjRyTE7G0Qs8N0dVICVzZvxUvdA2w8cM4aPYYSwRH4FaohQ7fyr Om+Wym6at/9KcKXjhbZnZ47f31lQr86QX+PFCDsxGRqVkn4NjCRYaaxhS4r3XiVaziEt EJlg== X-Gm-Message-State: AOAM532wzS/92FfI8RmFas8Atfu4YULoSZiVhSIf2qNNPKKxAhyth3r7 msjxpHlO3AEaHgsZj447n/7q3K40fGVsqPmBENb0mvPHL78FYGaoVQUfbuZCL5C3+44aoFLE9c9 cro4/X5r+Q2gStxwRqD/QHa3F X-Received: by 2002:a1c:188:: with SMTP id 130mr3208932wmb.122.1627981231921; Tue, 03 Aug 2021 02:00:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlx9U65dG5iOGg+nn1zcieWJgrvlrWZan5a+mAwh+5cAXSF//R8+mFLP2xQqFq1bv7rXUQIw== X-Received: by 2002:a1c:188:: with SMTP id 130mr3208916wmb.122.1627981231688; Tue, 03 Aug 2021 02:00:31 -0700 (PDT) Received: from [192.168.10.118] ([93.56.169.140]) by smtp.gmail.com with ESMTPSA id s1sm1873569wmj.8.2021.08.03.02.00.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 03 Aug 2021 02:00:31 -0700 (PDT) Subject: Re: [PATCH v3 03/12] KVM: x86/mmu: rename try_async_pf to kvm_faultin_pfn To: Maxim Levitsky , kvm@vger.kernel.org Cc: Wanpeng Li , Thomas Gleixner , Joerg Roedel , Borislav Petkov , Sean Christopherson , Jim Mattson , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , Suravee Suthikulpanit , Vitaly Kuznetsov , Ingo Molnar , "H. Peter Anvin" References: <20210802183329.2309921-1-mlevitsk@redhat.com> <20210802183329.2309921-4-mlevitsk@redhat.com> From: Paolo Bonzini Message-ID: <7dbd1416-5cf7-4950-e391-d45190f8313d@redhat.com> Date: Tue, 3 Aug 2021 11:00:29 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210802183329.2309921-4-mlevitsk@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/08/21 20:33, Maxim Levitsky wrote: > try_async_pf is a wrong name for this function, since this code > is used when asynchronous page fault is not enabled as well. > > This code is based on a patch from Sean Christopherson: > https://lkml.org/lkml/2021/7/19/2970 > > Suggested-by: Sean Christopherson > Signed-off-by: Maxim Levitsky > --- > arch/x86/kvm/mmu/mmu.c | 4 ++-- > arch/x86/kvm/mmu/paging_tmpl.h | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index 9da635e383c2..c5e0ecf5f758 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -3842,7 +3842,7 @@ static bool kvm_arch_setup_async_pf(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, > kvm_vcpu_gfn_to_hva(vcpu, gfn), &arch); > } > > -static bool try_async_pf(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn, > +static bool kvm_faultin_pfn(struct kvm_vcpu *vcpu, bool prefault, gfn_t gfn, > gpa_t cr2_or_gpa, kvm_pfn_t *pfn, hva_t *hva, > bool write, bool *writable) > { > @@ -3912,7 +3912,7 @@ static int direct_page_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u32 error_code, > mmu_seq = vcpu->kvm->mmu_notifier_seq; > smp_rmb(); > > - if (try_async_pf(vcpu, prefault, gfn, gpa, &pfn, &hva, > + if (kvm_faultin_pfn(vcpu, prefault, gfn, gpa, &pfn, &hva, > write, &map_writable)) > return RET_PF_RETRY; > > diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h > index ee044d357b5f..f349eae69bf3 100644 > --- a/arch/x86/kvm/mmu/paging_tmpl.h > +++ b/arch/x86/kvm/mmu/paging_tmpl.h > @@ -881,7 +881,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gpa_t addr, u32 error_code, > mmu_seq = vcpu->kvm->mmu_notifier_seq; > smp_rmb(); > > - if (try_async_pf(vcpu, prefault, walker.gfn, addr, &pfn, &hva, > + if (kvm_faultin_pfn(vcpu, prefault, walker.gfn, addr, &pfn, &hva, > write_fault, &map_writable)) > return RET_PF_RETRY; > > Reviewed-by: Paolo Bonzini