From: David Matlack <dmatlack@google.com> To: Paolo Bonzini <pbonzini@redhat.com> Cc: Marc Zyngier <maz@kernel.org>, Huacai Chen <chenhuacai@kernel.org>, Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>, Anup Patel <anup@brainfault.org>, Paul Walmsley <paul.walmsley@sifive.com>, Palmer Dabbelt <palmer@dabbelt.com>, Albert Ou <aou@eecs.berkeley.edu>, Sean Christopherson <seanjc@google.com>, Andrew Jones <drjones@redhat.com>, Ben Gardon <bgardon@google.com>, Peter Xu <peterx@redhat.com>, maciej.szmigiero@oracle.com, "moderated list:KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)" <kvmarm@lists.cs.columbia.edu>, "open list:KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)" <linux-mips@vger.kernel.org>, "open list:KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)" <kvm@vger.kernel.org>, "open list:KERNEL VIRTUAL MACHINE FOR RISC-V (KVM/riscv)" <kvm-riscv@lists.infradead.org>, Peter Feiner <pfeiner@google.com>, Lai Jiangshan <jiangshanlai@gmail.com>, David Matlack <dmatlack@google.com> Subject: [PATCH v5 19/21] KVM: x86/mmu: Refactor drop_large_spte() Date: Fri, 13 May 2022 20:28:17 +0000 [thread overview] Message-ID: <20220513202819.829591-20-dmatlack@google.com> (raw) In-Reply-To: <20220513202819.829591-1-dmatlack@google.com> drop_large_spte() drops a large SPTE if it exists and then flushes TLBs. Its helper function, __drop_large_spte(), does the drop without the flush. In preparation for eager page splitting, which will need to sometimes flush when dropping large SPTEs (and sometimes not), push the flushing logic down into __drop_large_spte() and add a bool parameter to control it. No functional change intended. Reviewed-by: Peter Xu <peterx@redhat.com> Signed-off-by: David Matlack <dmatlack@google.com> --- arch/x86/kvm/mmu/mmu.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index ef190dd77ccc..4b40fa2e27eb 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -1161,26 +1161,26 @@ static void drop_spte(struct kvm *kvm, u64 *sptep) rmap_remove(kvm, sptep); } - -static bool __drop_large_spte(struct kvm *kvm, u64 *sptep) +static void __drop_large_spte(struct kvm *kvm, u64 *sptep, bool flush) { - if (is_large_pte(*sptep)) { - WARN_ON(sptep_to_sp(sptep)->role.level == PG_LEVEL_4K); - drop_spte(kvm, sptep); - return true; - } + struct kvm_mmu_page *sp; - return false; + if (!is_large_pte(*sptep)) + return; + + sp = sptep_to_sp(sptep); + WARN_ON(sp->role.level == PG_LEVEL_4K); + + drop_spte(kvm, sptep); + + if (flush) + kvm_flush_remote_tlbs_with_address(kvm, sp->gfn, + KVM_PAGES_PER_HPAGE(sp->role.level)); } static void drop_large_spte(struct kvm_vcpu *vcpu, u64 *sptep) { - if (__drop_large_spte(vcpu->kvm, sptep)) { - struct kvm_mmu_page *sp = sptep_to_sp(sptep); - - kvm_flush_remote_tlbs_with_address(vcpu->kvm, sp->gfn, - KVM_PAGES_PER_HPAGE(sp->role.level)); - } + return __drop_large_spte(vcpu->kvm, sptep, true); } /* -- 2.36.0.550.gb090851708-goog
WARNING: multiple messages have this Message-ID (diff)
From: David Matlack <dmatlack@google.com> To: Paolo Bonzini <pbonzini@redhat.com> Cc: Albert Ou <aou@eecs.berkeley.edu>, "open list:KERNEL VIRTUAL MACHINE FOR MIPS \(KVM/mips\)" <kvm@vger.kernel.org>, Marc Zyngier <maz@kernel.org>, Huacai Chen <chenhuacai@kernel.org>, Lai Jiangshan <jiangshanlai@gmail.com>, "open list:KERNEL VIRTUAL MACHINE FOR MIPS \(KVM/mips\)" <linux-mips@vger.kernel.org>, David Matlack <dmatlack@google.com>, Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>, Palmer Dabbelt <palmer@dabbelt.com>, "open list:KERNEL VIRTUAL MACHINE FOR RISC-V \(KVM/riscv\)" <kvm-riscv@lists.infradead.org>, Paul Walmsley <paul.walmsley@sifive.com>, Ben Gardon <bgardon@google.com>, maciej.szmigiero@oracle.com, "moderated list:KERNEL VIRTUAL MACHINE FOR ARM64 \(KVM/arm64\)" <kvmarm@lists.cs.columbia.edu>, Peter Feiner <pfeiner@google.com> Subject: [PATCH v5 19/21] KVM: x86/mmu: Refactor drop_large_spte() Date: Fri, 13 May 2022 20:28:17 +0000 [thread overview] Message-ID: <20220513202819.829591-20-dmatlack@google.com> (raw) In-Reply-To: <20220513202819.829591-1-dmatlack@google.com> drop_large_spte() drops a large SPTE if it exists and then flushes TLBs. Its helper function, __drop_large_spte(), does the drop without the flush. In preparation for eager page splitting, which will need to sometimes flush when dropping large SPTEs (and sometimes not), push the flushing logic down into __drop_large_spte() and add a bool parameter to control it. No functional change intended. Reviewed-by: Peter Xu <peterx@redhat.com> Signed-off-by: David Matlack <dmatlack@google.com> --- arch/x86/kvm/mmu/mmu.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index ef190dd77ccc..4b40fa2e27eb 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -1161,26 +1161,26 @@ static void drop_spte(struct kvm *kvm, u64 *sptep) rmap_remove(kvm, sptep); } - -static bool __drop_large_spte(struct kvm *kvm, u64 *sptep) +static void __drop_large_spte(struct kvm *kvm, u64 *sptep, bool flush) { - if (is_large_pte(*sptep)) { - WARN_ON(sptep_to_sp(sptep)->role.level == PG_LEVEL_4K); - drop_spte(kvm, sptep); - return true; - } + struct kvm_mmu_page *sp; - return false; + if (!is_large_pte(*sptep)) + return; + + sp = sptep_to_sp(sptep); + WARN_ON(sp->role.level == PG_LEVEL_4K); + + drop_spte(kvm, sptep); + + if (flush) + kvm_flush_remote_tlbs_with_address(kvm, sp->gfn, + KVM_PAGES_PER_HPAGE(sp->role.level)); } static void drop_large_spte(struct kvm_vcpu *vcpu, u64 *sptep) { - if (__drop_large_spte(vcpu->kvm, sptep)) { - struct kvm_mmu_page *sp = sptep_to_sp(sptep); - - kvm_flush_remote_tlbs_with_address(vcpu->kvm, sp->gfn, - KVM_PAGES_PER_HPAGE(sp->role.level)); - } + return __drop_large_spte(vcpu->kvm, sptep, true); } /* -- 2.36.0.550.gb090851708-goog _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
next prev parent reply other threads:[~2022-05-13 20:29 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-13 20:27 [PATCH v5 00/21] KVM: Extend Eager Page Splitting to the shadow MMU David Matlack 2022-05-13 20:27 ` David Matlack 2022-05-13 20:27 ` [PATCH v5 01/21] KVM: x86/mmu: Optimize MMU page cache lookup for all direct SPs David Matlack 2022-05-13 20:27 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 02/21] KVM: x86/mmu: Use a bool for direct David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 03/21] KVM: x86/mmu: Derive shadow MMU page role from parent David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-16 6:54 ` Lai Jiangshan 2022-05-16 6:54 ` Lai Jiangshan 2022-05-16 21:38 ` David Matlack 2022-05-16 21:38 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 04/21] KVM: x86/mmu: Always pass 0 for @quadrant when gptes are 8 bytes David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 05/21] KVM: x86/mmu: Decompose kvm_mmu_get_page() into separate functions David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 06/21] KVM: x86/mmu: Consolidate shadow page allocation and initialization David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 07/21] KVM: x86/mmu: Rename shadow MMU functions that deal with shadow pages David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 08/21] KVM: x86/mmu: Move guest PT write-protection to account_shadowed() David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 09/21] KVM: x86/mmu: Pass memory caches to allocate SPs separately David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 10/21] KVM: x86/mmu: Replace vcpu with kvm in kvm_mmu_alloc_shadow_page() David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 11/21] KVM: x86/mmu: Pass kvm pointer separately from vcpu to kvm_mmu_find_shadow_page() David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 12/21] KVM: x86/mmu: Allow NULL @vcpu in kvm_mmu_find_shadow_page() David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 13/21] KVM: x86/mmu: Pass const memslot to rmap_add() David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 14/21] KVM: x86/mmu: Decouple rmap_add() and link_shadow_page() from kvm_vcpu David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 15/21] KVM: x86/mmu: Update page stats in __rmap_add() David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 16/21] KVM: x86/mmu: Cache the access bits of shadowed translations David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 17/21] KVM: x86/mmu: Extend make_huge_page_split_spte() for the shadow MMU David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` [PATCH v5 18/21] KVM: x86/mmu: Zap collapsible SPTEs in shadow MMU at all possible levels David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-13 20:28 ` David Matlack [this message] 2022-05-13 20:28 ` [PATCH v5 19/21] KVM: x86/mmu: Refactor drop_large_spte() David Matlack 2022-05-13 20:28 ` [PATCH v5 20/21] KVM: Allow for different capacities in kvm_mmu_memory_cache structs David Matlack 2022-05-13 20:28 ` David Matlack 2022-05-15 11:42 ` Marc Zyngier 2022-05-15 11:42 ` Marc Zyngier 2022-05-16 3:31 ` Anup Patel 2022-05-16 3:31 ` Anup Patel 2022-05-16 23:23 ` David Matlack 2022-05-16 23:23 ` David Matlack 2022-05-16 14:49 ` Sean Christopherson 2022-05-16 14:49 ` Sean Christopherson 2022-05-16 16:39 ` David Matlack 2022-05-16 16:39 ` David Matlack 2022-05-16 17:53 ` Sean Christopherson 2022-05-16 17:53 ` Sean Christopherson 2022-05-13 20:28 ` [PATCH v5 21/21] KVM: x86/mmu: Extend Eager Page Splitting to nested MMUs David Matlack 2022-05-13 20:28 ` David Matlack
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220513202819.829591-20-dmatlack@google.com \ --to=dmatlack@google.com \ --cc=aleksandar.qemu.devel@gmail.com \ --cc=anup@brainfault.org \ --cc=aou@eecs.berkeley.edu \ --cc=bgardon@google.com \ --cc=chenhuacai@kernel.org \ --cc=drjones@redhat.com \ --cc=jiangshanlai@gmail.com \ --cc=kvm-riscv@lists.infradead.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-mips@vger.kernel.org \ --cc=maciej.szmigiero@oracle.com \ --cc=maz@kernel.org \ --cc=palmer@dabbelt.com \ --cc=paul.walmsley@sifive.com \ --cc=pbonzini@redhat.com \ --cc=peterx@redhat.com \ --cc=pfeiner@google.com \ --cc=seanjc@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.