From nobody Tue Apr 7 07:55:56 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2E77C433FE for ; Wed, 12 Oct 2022 18:18:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229786AbiJLSSI (ORCPT ); Wed, 12 Oct 2022 14:18:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229810AbiJLSRh (ORCPT ); Wed, 12 Oct 2022 14:17:37 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7AA32AC39F for ; Wed, 12 Oct 2022 11:17:16 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-33dc888dc62so166752067b3.4 for ; Wed, 12 Oct 2022 11:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=TyhNic6RvRRWto70e2eCzZmqxgJk22R96aLUbLuIWvs=; b=MVQI3M6pbnDm9koPk/+/XGl6NZkOOF3VKQKaZVSZjFl6JxjgenM2TroRTmInL4qQiT kE7xjKNlTauf9ZjHyleDGQQZ57S7JpqLShfQReaA9Ga2AGPgUdm0M/boo6iV4UWs+BXK vRAP+xfrf+gCf5StNDUN7CqCpKI4if3Clv1czf1UnxpqqMa8fecGAfvZlFu0RQqqRc7t ve0DCfPCji3W1bzhdcfvD/Nm8vJOzVEkVNUDlTTMkoTj+eT2aIRn1ZDE8ksEbe1ofpfW fgKLmBrgmT2wMhxKpn2UR9JcRBdTQRVwyEPNnLx3kljweq1qmlro0s+ABvo0QtsQ+pTu 8m5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=TyhNic6RvRRWto70e2eCzZmqxgJk22R96aLUbLuIWvs=; b=UydI/0fCnbKy2zamNneJ1h4Yq+i7enaFzNplwekKJFFX6N3Xz7NldVtGYFdjs9mTjR lFrjw7yE+I4NatcFAxPXrNGfScE0YnvQaVTFa7b3XF5lb7dvQvycYrB0lOuAyCy3vu58 RlL5omdnk7dbOcO2Hr1GUVezAGfMBCF7aejB0FrU7Wm2r/PT7NLQWQFt0Ce1bXiAR1YE YV5qkyd/YiP56XHR6zd3K+wA3Y/giB5wEs6VFcmbexDFENW5En25Fa8WyXcwrd2RsTnf QrikQ5ODmb6FLNTGjJcQtB87ZkFZM6Vws0qlcvjl1CI4Uh7zCAyEWnzkkLpIoGKQXeQ8 g+xg== X-Gm-Message-State: ACrzQf0LKuyJxTotGIc1+YmAPhqvOr4vweJM1ucfKYVqsbWvESbGSl+f 30skNrpi/4w5de4oAbKydmBFjvmLoj0= X-Google-Smtp-Source: AMsMyM4F55qdnAxdTruYJL4NvuqMwcZDQ9nbKWTitPpl1wVMtTj8QpPhAdtMT8Tdyk+zByiu7mDlMO/Gi74= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:3cc4:0:b0:6af:c67e:909e with SMTP id j187-20020a253cc4000000b006afc67e909emr27796209yba.266.1665598632588; Wed, 12 Oct 2022 11:17:12 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 12 Oct 2022 18:16:54 +0000 In-Reply-To: <20221012181702.3663607-1-seanjc@google.com> Mime-Version: 1.0 References: <20221012181702.3663607-1-seanjc@google.com> X-Mailer: git-send-email 2.38.0.rc1.362.ged0d419d3c-goog Message-ID: <20221012181702.3663607-4-seanjc@google.com> Subject: [PATCH v4 03/11] KVM: x86/mmu: Grab mmu_invalidate_seq in kvm_faultin_pfn() From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, David Matlack , Isaku Yamahata Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: David Matlack Grab mmu_invalidate_seq in kvm_faultin_pfn() and stash it in struct kvm_page_fault. The eliminates duplicate code and reduces the amount of parameters needed for is_page_fault_stale(). Preemptively split out __kvm_faultin_pfn() to a separate function for use in subsequent commits. No functional change intended. Signed-off-by: David Matlack Reviewed-by: Isaku Yamahata Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/mmu.c | 21 ++++++++++++--------- arch/x86/kvm/mmu/mmu_internal.h | 1 + arch/x86/kvm/mmu/paging_tmpl.h | 6 +----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index b2b970e9fa8d..72c3dc1884f6 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4143,7 +4143,7 @@ void kvm_arch_async_page_ready(struct kvm_vcpu *vcpu,= struct kvm_async_pf *work) kvm_mmu_do_page_fault(vcpu, work->cr2_or_gpa, 0, true); } =20 -static int kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *f= ault) +static int __kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault = *fault) { struct kvm_memory_slot *slot =3D fault->slot; bool async; @@ -4199,12 +4199,20 @@ static int kvm_faultin_pfn(struct kvm_vcpu *vcpu, s= truct kvm_page_fault *fault) return RET_PF_CONTINUE; } =20 +static int kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *f= ault) +{ + fault->mmu_seq =3D vcpu->kvm->mmu_invalidate_seq; + smp_rmb(); + + return __kvm_faultin_pfn(vcpu, fault); +} + /* * Returns true if the page fault is stale and needs to be retried, i.e. i= f the * root was invalidated by a memslot update or a relevant mmu_notifier fir= ed. */ static bool is_page_fault_stale(struct kvm_vcpu *vcpu, - struct kvm_page_fault *fault, int mmu_seq) + struct kvm_page_fault *fault) { struct kvm_mmu_page *sp =3D to_shadow_page(vcpu->arch.mmu->root.hpa); =20 @@ -4224,14 +4232,12 @@ static bool is_page_fault_stale(struct kvm_vcpu *vc= pu, return true; =20 return fault->slot && - mmu_invalidate_retry_hva(vcpu->kvm, mmu_seq, fault->hva); + mmu_invalidate_retry_hva(vcpu->kvm, fault->mmu_seq, fault->hva); } =20 static int direct_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault = *fault) { bool is_tdp_mmu_fault =3D is_tdp_mmu(vcpu->arch.mmu); - - unsigned long mmu_seq; int r; =20 fault->gfn =3D fault->addr >> PAGE_SHIFT; @@ -4248,9 +4254,6 @@ static int direct_page_fault(struct kvm_vcpu *vcpu, s= truct kvm_page_fault *fault if (r) return r; =20 - mmu_seq =3D vcpu->kvm->mmu_invalidate_seq; - smp_rmb(); - r =3D kvm_faultin_pfn(vcpu, fault); if (r !=3D RET_PF_CONTINUE) return r; @@ -4266,7 +4269,7 @@ static int direct_page_fault(struct kvm_vcpu *vcpu, s= truct kvm_page_fault *fault else write_lock(&vcpu->kvm->mmu_lock); =20 - if (is_page_fault_stale(vcpu, fault, mmu_seq)) + if (is_page_fault_stale(vcpu, fault)) goto out_unlock; =20 r =3D make_mmu_pages_available(vcpu); diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_interna= l.h index 582def531d4d..1c0a1e7c796d 100644 --- a/arch/x86/kvm/mmu/mmu_internal.h +++ b/arch/x86/kvm/mmu/mmu_internal.h @@ -221,6 +221,7 @@ struct kvm_page_fault { struct kvm_memory_slot *slot; =20 /* Outputs of kvm_faultin_pfn. */ + unsigned long mmu_seq; kvm_pfn_t pfn; hva_t hva; bool map_writable; diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h index 5ab5f94dcb6f..30b9d9b6734f 100644 --- a/arch/x86/kvm/mmu/paging_tmpl.h +++ b/arch/x86/kvm/mmu/paging_tmpl.h @@ -791,7 +791,6 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, str= uct kvm_page_fault *fault { struct guest_walker walker; int r; - unsigned long mmu_seq; bool is_self_change_mapping; =20 pgprintk("%s: addr %lx err %x\n", __func__, fault->addr, fault->error_cod= e); @@ -838,9 +837,6 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, str= uct kvm_page_fault *fault else fault->max_level =3D walker.level; =20 - mmu_seq =3D vcpu->kvm->mmu_invalidate_seq; - smp_rmb(); - r =3D kvm_faultin_pfn(vcpu, fault); if (r !=3D RET_PF_CONTINUE) return r; @@ -871,7 +867,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, str= uct kvm_page_fault *fault r =3D RET_PF_RETRY; write_lock(&vcpu->kvm->mmu_lock); =20 - if (is_page_fault_stale(vcpu, fault, mmu_seq)) + if (is_page_fault_stale(vcpu, fault)) goto out_unlock; =20 r =3D make_mmu_pages_available(vcpu); --=20 2.38.0.rc1.362.ged0d419d3c-goog