From nobody Tue Sep 16 10:47:17 2025 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 95A9AC53210 for ; Thu, 5 Jan 2023 09:58:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231983AbjAEJ6E (ORCPT ); Thu, 5 Jan 2023 04:58:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231836AbjAEJ5p (ORCPT ); Thu, 5 Jan 2023 04:57:45 -0500 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A2994FD5B; Thu, 5 Jan 2023 01:57:44 -0800 (PST) Received: by mail-pf1-x42f.google.com with SMTP id z7so19256172pfq.13; Thu, 05 Jan 2023 01:57:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5qbcS2kAh7qKqu1Tcd+kRAYagIvCht+cBr4HMCNf5SE=; b=dxbrMS6ocOOad8B62fNsSZS9ih/clJTefmEBMIJ7VgmiirhlnHxz0NsoB+pMRrMjj/ 44P8V6Knx4dXLAF5qyytPrhqM0yMWEekP23utHYQDrhFgqoOCBgocIkda0sYV+KInfxE MODKKso97BdYrspU+q4YJ+/SsyK2vvxteqmQWTayuf/msOByn0VMp7wbQfzLEG06Jl6b RO4Z6G+fLarlApjENWWkCsRowsiq1nrnoN8XRrMNXaFtZM6cNpfjlp9UnC1T8KRmVR8G V8dWLkIjwMajfgY/nhQalmYYHgda+dkHihT1nTEOXnjFpsSRyyWluTzgoSIL9fFAei17 lKYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5qbcS2kAh7qKqu1Tcd+kRAYagIvCht+cBr4HMCNf5SE=; b=NRNttAOQ5iW87M1w4RL2/GugRhUpYjzKSy32RvEWXGb3Ct7xqaGlCbiceuuCBw/AyS QbVimiJwy/gaRiBYePLHFnEYdBGE4v9JwiJCx6otyOJS8CtgL3PsOvKBQ4i+otKdS08w 3ul8UYRCcX10MQUIM2Ev+q0Eobt2Z8j1TnmsfylYgSLhCywUOwV8gI3GslYPceh0D9tR ejqr0aH+ikewwlaQzzvZf4NuUzB+0rFDoQFCgNbzdCjZ79ENXozF0nNnam9H6CbjxI5f Nj3ALAk+RbSGsnqXkXZSfxliiJIjidLBAkAg+QTMgciOMmwjU6a8MkEaBiU1YMGA+bxa soDw== X-Gm-Message-State: AFqh2krspgOG3tSIDzXvbPQ6NdOwbopqbxGzPHmMkR7W4WvZcrGZHVXh IISEKyweR0zyrHhG8gqAggwXOGRo9Kk= X-Google-Smtp-Source: AMrXdXv4uug4JkZySUhwZOKjIjQFeasqLgfgauccigVds449xxlHEN+xYGPtwVj8Ogx4a71DoTHLVA== X-Received: by 2002:a62:7bcd:0:b0:581:1c64:92bc with SMTP id w196-20020a627bcd000000b005811c6492bcmr38273815pfc.3.1672912663320; Thu, 05 Jan 2023 01:57:43 -0800 (PST) Received: from localhost ([198.11.176.14]) by smtp.gmail.com with ESMTPSA id i2-20020aa796e2000000b00581172f7456sm19549248pfq.56.2023.01.05.01.57.42 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jan 2023 01:57:42 -0800 (PST) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Paolo Bonzini , Sean Christopherson , Lai Jiangshan , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , kvm@vger.kernel.org Subject: [PATCH 2/7] kvm: x86/mmu: Use kvm_mmu_invalidate_gva() in kvm_mmu_invpcid_gva() Date: Thu, 5 Jan 2023 17:58:43 +0800 Message-Id: <20230105095848.6061-3-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20230105095848.6061-1-jiangshanlai@gmail.com> References: <20230105095848.6061-1-jiangshanlai@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Lai Jiangshan Use kvm_mmu_invalidate_gva() instead open calls to mmu->invlpg(). No functional change intended. Signed-off-by: Lai Jiangshan --- arch/x86/kvm/mmu/mmu.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 90339b71bd56..b0e7ac6d4e88 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -5742,27 +5742,20 @@ EXPORT_SYMBOL_GPL(kvm_mmu_invlpg); void kvm_mmu_invpcid_gva(struct kvm_vcpu *vcpu, gva_t gva, unsigned long p= cid) { struct kvm_mmu *mmu =3D vcpu->arch.mmu; - bool tlb_flush =3D false; + ulong roots_to_invalidate =3D 0; uint i; =20 - if (pcid =3D=3D kvm_get_active_pcid(vcpu)) { - if (mmu->invlpg) - mmu->invlpg(vcpu, gva, mmu->root.hpa); - tlb_flush =3D true; - } + if (pcid =3D=3D kvm_get_active_pcid(vcpu)) + roots_to_invalidate |=3D KVM_MMU_ROOT_CURRENT; =20 for (i =3D 0; i < KVM_MMU_NUM_PREV_ROOTS; i++) { if (VALID_PAGE(mmu->prev_roots[i].hpa) && - pcid =3D=3D kvm_get_pcid(vcpu, mmu->prev_roots[i].pgd)) { - if (mmu->invlpg) - mmu->invlpg(vcpu, gva, mmu->prev_roots[i].hpa); - tlb_flush =3D true; - } + pcid =3D=3D kvm_get_pcid(vcpu, mmu->prev_roots[i].pgd)) + roots_to_invalidate |=3D KVM_MMU_ROOT_PREVIOUS(i); } =20 - if (tlb_flush) - static_call(kvm_x86_flush_tlb_gva)(vcpu, gva); - + if (roots_to_invalidate) + kvm_mmu_invalidate_gva(vcpu, mmu, gva, roots_to_invalidate); ++vcpu->stat.invlpg; =20 /* --=20 2.19.1.6.gb485710b