From: David Matlack <dmatlack@google.com> To: Sean Christopherson <seanjc@google.com> Cc: Paolo Bonzini <pbonzini@redhat.com>, 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>, Andrew Jones <drjones@redhat.com>, Ben Gardon <bgardon@google.com>, Peter Xu <peterx@redhat.com>, "Maciej S. Szmigiero" <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> Subject: Re: [PATCH v6 19/22] KVM: x86/mmu: Zap collapsible SPTEs in shadow MMU at all possible levels Date: Tue, 21 Jun 2022 10:24:46 -0700 [thread overview] Message-ID: <CALzav=dG9f2X8GBLjQgR-Lj4yPKX2Adg3C+9_9aC83A7mzmbtw@mail.gmail.com> (raw) In-Reply-To: <Yqyzavjp9eS9p4+m@google.com> On Fri, Jun 17, 2022 at 10:01 AM Sean Christopherson <seanjc@google.com> wrote: > > On Mon, May 16, 2022, David Matlack wrote: > > Currently KVM only zaps collapsible 4KiB SPTEs in the shadow MMU. This > > is fine for now since KVM never creates intermediate huge pages during > > dirty logging. In other words, KVM always replaces 1GiB pages directly > > with 4KiB pages, so there is no reason to look for collapsible 2MiB > > pages. > > > > However, this will stop being true once the shadow MMU participates in > > eager page splitting. During eager page splitting, each 1GiB is first > > split into 2MiB pages and then those are split into 4KiB pages. The > > intermediate 2MiB pages may be left behind if an error condition causes > > eager page splitting to bail early. > > > > 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 | 21 ++++++++++++++------- > > 1 file changed, 14 insertions(+), 7 deletions(-) > > > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > > index f83de72feeac..a5d96d452f42 100644 > > --- a/arch/x86/kvm/mmu/mmu.c > > +++ b/arch/x86/kvm/mmu/mmu.c > > @@ -6177,18 +6177,25 @@ static bool kvm_mmu_zap_collapsible_spte(struct kvm *kvm, > > return need_tlb_flush; > > } > > > > +static void kvm_rmap_zap_collapsible_sptes(struct kvm *kvm, > > + const struct kvm_memory_slot *slot) > > +{ > > + /* > > + * Note, use KVM_MAX_HUGEPAGE_LEVEL - 1 since there's no need to zap > > + * pages that are already mapped at the maximum possible level. > > + */ > > + if (slot_handle_level(kvm, slot, kvm_mmu_zap_collapsible_spte, > > + PG_LEVEL_4K, KVM_MAX_HUGEPAGE_LEVEL - 1, > > + true)) > > No need to wrap, "true" fits easily on the previous line. That said, I don't see > any point in adding a helper. It's highly unlike there will be another caller, > and IMO it's not any more readable since I have to go look at another function > when reading kvm_mmu_zap_collapsible_sptes(). I could see an argument for readability either way. Putting it in a helper function abstracts away the details, which would aid readability if the reader does not care about the implementation details of the rmap case. I also have been thinking about splitting the rmap stuff out of mmu.c (e.g. into rmap.c or shadow_mmu.c) to mirror the TDP MMU. That way we can have a more clear split between the TDP MMU and shadow MMU, each with their own file, and with higher level MMU operations that need to operate on either or both MMUs living in mmu.c. > > With some gentle massaging, the comment can squeeze onto two lines even with the > extra level of indentation. > > /* > * Note, use KVM_MAX_HUGEPAGE_LEVEL - 1, there's no need to zap > * pages that are already mapped at the maximum hugepage level. > */ > if (slot_handle_level(kvm, slot, kvm_mmu_zap_collapsible_spte, > PG_LEVEL_4K, KVM_MAX_HUGEPAGE_LEVEL - 1, true) > kvm_arch_flush_remote_tlbs_memslot(kvm, slot); > > > + kvm_arch_flush_remote_tlbs_memslot(kvm, slot); > > +} > > + > > void kvm_mmu_zap_collapsible_sptes(struct kvm *kvm, > > const struct kvm_memory_slot *slot) > > { > > if (kvm_memslots_have_rmaps(kvm)) { > > write_lock(&kvm->mmu_lock); > > - /* > > - * Zap only 4k SPTEs since the legacy MMU only supports dirty > > - * logging at a 4k granularity and never creates collapsible > > - * 2m SPTEs during dirty logging. > > - */ > > - if (slot_handle_level_4k(kvm, slot, kvm_mmu_zap_collapsible_spte, true)) > > - kvm_arch_flush_remote_tlbs_memslot(kvm, slot); > > + kvm_rmap_zap_collapsible_sptes(kvm, slot); > > write_unlock(&kvm->mmu_lock); > > } > > > > -- > > 2.36.0.550.gb090851708-goog > >
WARNING: multiple messages have this Message-ID (diff)
From: David Matlack <dmatlack@google.com> To: Sean Christopherson <seanjc@google.com> Cc: Marc Zyngier <maz@kernel.org>, Albert Ou <aou@eecs.berkeley.edu>, "open list:KERNEL VIRTUAL MACHINE FOR MIPS \(KVM/mips\)" <kvm@vger.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>, 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>, Paolo Bonzini <pbonzini@redhat.com>, "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>, "moderated list:KERNEL VIRTUAL MACHINE FOR ARM64 \(KVM/arm64\)" <kvmarm@lists.cs.columbia.edu>, Peter Feiner <pfeiner@google.com> Subject: Re: [PATCH v6 19/22] KVM: x86/mmu: Zap collapsible SPTEs in shadow MMU at all possible levels Date: Tue, 21 Jun 2022 10:24:46 -0700 [thread overview] Message-ID: <CALzav=dG9f2X8GBLjQgR-Lj4yPKX2Adg3C+9_9aC83A7mzmbtw@mail.gmail.com> (raw) In-Reply-To: <Yqyzavjp9eS9p4+m@google.com> On Fri, Jun 17, 2022 at 10:01 AM Sean Christopherson <seanjc@google.com> wrote: > > On Mon, May 16, 2022, David Matlack wrote: > > Currently KVM only zaps collapsible 4KiB SPTEs in the shadow MMU. This > > is fine for now since KVM never creates intermediate huge pages during > > dirty logging. In other words, KVM always replaces 1GiB pages directly > > with 4KiB pages, so there is no reason to look for collapsible 2MiB > > pages. > > > > However, this will stop being true once the shadow MMU participates in > > eager page splitting. During eager page splitting, each 1GiB is first > > split into 2MiB pages and then those are split into 4KiB pages. The > > intermediate 2MiB pages may be left behind if an error condition causes > > eager page splitting to bail early. > > > > 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 | 21 ++++++++++++++------- > > 1 file changed, 14 insertions(+), 7 deletions(-) > > > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > > index f83de72feeac..a5d96d452f42 100644 > > --- a/arch/x86/kvm/mmu/mmu.c > > +++ b/arch/x86/kvm/mmu/mmu.c > > @@ -6177,18 +6177,25 @@ static bool kvm_mmu_zap_collapsible_spte(struct kvm *kvm, > > return need_tlb_flush; > > } > > > > +static void kvm_rmap_zap_collapsible_sptes(struct kvm *kvm, > > + const struct kvm_memory_slot *slot) > > +{ > > + /* > > + * Note, use KVM_MAX_HUGEPAGE_LEVEL - 1 since there's no need to zap > > + * pages that are already mapped at the maximum possible level. > > + */ > > + if (slot_handle_level(kvm, slot, kvm_mmu_zap_collapsible_spte, > > + PG_LEVEL_4K, KVM_MAX_HUGEPAGE_LEVEL - 1, > > + true)) > > No need to wrap, "true" fits easily on the previous line. That said, I don't see > any point in adding a helper. It's highly unlike there will be another caller, > and IMO it's not any more readable since I have to go look at another function > when reading kvm_mmu_zap_collapsible_sptes(). I could see an argument for readability either way. Putting it in a helper function abstracts away the details, which would aid readability if the reader does not care about the implementation details of the rmap case. I also have been thinking about splitting the rmap stuff out of mmu.c (e.g. into rmap.c or shadow_mmu.c) to mirror the TDP MMU. That way we can have a more clear split between the TDP MMU and shadow MMU, each with their own file, and with higher level MMU operations that need to operate on either or both MMUs living in mmu.c. > > With some gentle massaging, the comment can squeeze onto two lines even with the > extra level of indentation. > > /* > * Note, use KVM_MAX_HUGEPAGE_LEVEL - 1, there's no need to zap > * pages that are already mapped at the maximum hugepage level. > */ > if (slot_handle_level(kvm, slot, kvm_mmu_zap_collapsible_spte, > PG_LEVEL_4K, KVM_MAX_HUGEPAGE_LEVEL - 1, true) > kvm_arch_flush_remote_tlbs_memslot(kvm, slot); > > > + kvm_arch_flush_remote_tlbs_memslot(kvm, slot); > > +} > > + > > void kvm_mmu_zap_collapsible_sptes(struct kvm *kvm, > > const struct kvm_memory_slot *slot) > > { > > if (kvm_memslots_have_rmaps(kvm)) { > > write_lock(&kvm->mmu_lock); > > - /* > > - * Zap only 4k SPTEs since the legacy MMU only supports dirty > > - * logging at a 4k granularity and never creates collapsible > > - * 2m SPTEs during dirty logging. > > - */ > > - if (slot_handle_level_4k(kvm, slot, kvm_mmu_zap_collapsible_spte, true)) > > - kvm_arch_flush_remote_tlbs_memslot(kvm, slot); > > + kvm_rmap_zap_collapsible_sptes(kvm, slot); > > write_unlock(&kvm->mmu_lock); > > } > > > > -- > > 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-06-21 17:25 UTC|newest] Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-16 23:21 [PATCH v6 00/22] KVM: Extend Eager Page Splitting to the shadow MMU David Matlack 2022-05-16 23:21 ` David Matlack 2022-05-16 23:21 ` [PATCH v6 01/22] KVM: x86/mmu: Optimize MMU page cache lookup for all direct SPs David Matlack 2022-05-16 23:21 ` David Matlack 2022-05-16 23:21 ` [PATCH v6 02/22] KVM: x86/mmu: Use a bool for direct David Matlack 2022-05-16 23:21 ` David Matlack 2022-05-16 23:21 ` [PATCH v6 03/22] KVM: x86/mmu: Stop passing @direct to mmu_alloc_root() David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-16 18:47 ` Sean Christopherson 2022-06-16 18:47 ` Sean Christopherson 2022-06-22 14:06 ` Paolo Bonzini 2022-06-22 14:06 ` Paolo Bonzini 2022-06-22 14:19 ` Sean Christopherson 2022-06-22 14:19 ` Sean Christopherson 2022-05-16 23:21 ` [PATCH v6 04/22] KVM: x86/mmu: Derive shadow MMU page role from parent David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-17 1:19 ` Sean Christopherson 2022-06-17 1:19 ` Sean Christopherson 2022-06-17 15:12 ` Sean Christopherson 2022-06-17 15:12 ` Sean Christopherson 2022-05-16 23:21 ` [PATCH v6 05/22] KVM: x86/mmu: Always pass 0 for @quadrant when gptes are 8 bytes David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-17 15:20 ` Sean Christopherson 2022-06-17 15:20 ` Sean Christopherson 2022-05-16 23:21 ` [PATCH v6 06/22] KVM: x86/mmu: Decompose kvm_mmu_get_page() into separate functions David Matlack 2022-05-16 23:21 ` David Matlack 2022-05-16 23:21 ` [PATCH v6 07/22] KVM: x86/mmu: Consolidate shadow page allocation and initialization David Matlack 2022-05-16 23:21 ` David Matlack 2022-05-16 23:21 ` [PATCH v6 08/22] KVM: x86/mmu: Rename shadow MMU functions that deal with shadow pages David Matlack 2022-05-16 23:21 ` David Matlack 2022-05-16 23:21 ` [PATCH v6 09/22] KVM: x86/mmu: Move guest PT write-protection to account_shadowed() David Matlack 2022-05-16 23:21 ` David Matlack 2022-05-16 23:21 ` [PATCH v6 10/22] KVM: x86/mmu: Pass memory caches to allocate SPs separately David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-17 15:01 ` Sean Christopherson 2022-06-17 15:01 ` Sean Christopherson 2022-06-21 17:06 ` David Matlack 2022-06-21 17:06 ` David Matlack 2022-06-21 17:27 ` Sean Christopherson 2022-06-21 17:27 ` Sean Christopherson 2022-05-16 23:21 ` [PATCH v6 11/22] KVM: x86/mmu: Replace vcpu with kvm in kvm_mmu_alloc_shadow_page() David Matlack 2022-05-16 23:21 ` David Matlack 2022-05-16 23:21 ` [PATCH v6 12/22] KVM: x86/mmu: Pass kvm pointer separately from vcpu to kvm_mmu_find_shadow_page() David Matlack 2022-05-16 23:21 ` David Matlack 2022-05-16 23:21 ` [PATCH v6 13/22] KVM: x86/mmu: Allow NULL @vcpu in kvm_mmu_find_shadow_page() David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-17 15:28 ` Sean Christopherson 2022-06-17 15:28 ` Sean Christopherson 2022-06-22 14:26 ` Paolo Bonzini 2022-06-22 14:26 ` Paolo Bonzini 2022-05-16 23:21 ` [PATCH v6 14/22] KVM: x86/mmu: Pass const memslot to rmap_add() David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-17 15:30 ` Sean Christopherson 2022-06-17 15:30 ` Sean Christopherson 2022-05-16 23:21 ` [PATCH v6 15/22] KVM: x86/mmu: Decouple rmap_add() and link_shadow_page() from kvm_vcpu David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-17 16:39 ` Sean Christopherson 2022-06-17 16:39 ` Sean Christopherson 2022-05-16 23:21 ` [PATCH v6 16/22] KVM: x86/mmu: Update page stats in __rmap_add() David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-17 16:40 ` Sean Christopherson 2022-06-17 16:40 ` Sean Christopherson 2022-05-16 23:21 ` [PATCH v6 17/22] KVM: x86/mmu: Cache the access bits of shadowed translations David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-17 16:53 ` Sean Christopherson 2022-06-17 16:53 ` Sean Christopherson 2022-05-16 23:21 ` [PATCH v6 18/22] KVM: x86/mmu: Extend make_huge_page_split_spte() for the shadow MMU David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-17 16:56 ` Sean Christopherson 2022-06-17 16:56 ` Sean Christopherson 2022-05-16 23:21 ` [PATCH v6 19/22] KVM: x86/mmu: Zap collapsible SPTEs in shadow MMU at all possible levels David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-17 17:01 ` Sean Christopherson 2022-06-17 17:01 ` Sean Christopherson 2022-06-21 17:24 ` David Matlack [this message] 2022-06-21 17:24 ` David Matlack 2022-06-21 17:59 ` Sean Christopherson 2022-06-21 17:59 ` Sean Christopherson 2022-05-16 23:21 ` [PATCH v6 20/22] KVM: x86/mmu: Refactor drop_large_spte() David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-17 17:11 ` Sean Christopherson 2022-06-17 17:11 ` Sean Christopherson 2022-06-22 16:13 ` Paolo Bonzini 2022-06-22 16:13 ` Paolo Bonzini 2022-06-22 16:50 ` Paolo Bonzini 2022-06-22 16:50 ` Paolo Bonzini 2022-05-16 23:21 ` [PATCH v6 21/22] KVM: Allow for different capacities in kvm_mmu_memory_cache structs David Matlack 2022-05-16 23:21 ` David Matlack 2022-05-19 15:33 ` Anup Patel 2022-05-19 15:33 ` Anup Patel 2022-05-20 23:21 ` Mingwei Zhang 2022-05-23 17:37 ` Sean Christopherson 2022-05-23 17:37 ` Sean Christopherson 2022-05-23 17:44 ` David Matlack 2022-05-23 17:44 ` David Matlack 2022-05-23 18:13 ` Mingwei Zhang 2022-05-23 18:13 ` Mingwei Zhang 2022-05-23 18:22 ` David Matlack 2022-05-23 18:22 ` David Matlack 2022-05-23 23:53 ` David Matlack 2022-05-23 23:53 ` David Matlack 2022-06-17 17:41 ` Sean Christopherson 2022-06-17 17:41 ` Sean Christopherson 2022-06-17 18:34 ` Sean Christopherson 2022-06-17 18:34 ` Sean Christopherson 2022-05-16 23:21 ` [PATCH v6 22/22] KVM: x86/mmu: Extend Eager Page Splitting to nested MMUs David Matlack 2022-05-16 23:21 ` David Matlack 2022-06-01 21:50 ` Ricardo Koller 2022-06-01 21:50 ` Ricardo Koller 2022-06-17 19:08 ` Sean Christopherson 2022-06-17 19:08 ` Sean Christopherson
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='CALzav=dG9f2X8GBLjQgR-Lj4yPKX2Adg3C+9_9aC83A7mzmbtw@mail.gmail.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.