From: Marc Zyngier <maz@kernel.org> To: Will Deacon <will@kernel.org> Cc: Catalin Marinas <catalin.marinas@arm.com>, kernel-team@android.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v4 19/21] KVM: arm64: Remove unused page-table code Date: Tue, 08 Sep 2020 11:33:35 +0100 [thread overview] Message-ID: <6674b70b99e82fb8084f801bfca84f37@kernel.org> (raw) In-Reply-To: <20200907152344.12978-20-will@kernel.org> Hi Will, On 2020-09-07 16:23, Will Deacon wrote: > Now that KVM is using the generic page-table code to manage the guest > stage-2 page-tables, we can remove a bunch of unused macros, #defines > and static inline functions from the old implementation. > > Cc: Marc Zyngier <maz@kernel.org> > Cc: Quentin Perret <qperret@google.com> > Reviewed-by: Gavin Shan <gshan@redhat.com> > Signed-off-by: Will Deacon <will@kernel.org> > --- > arch/arm64/include/asm/kvm_mmu.h | 171 ------ > arch/arm64/include/asm/pgtable-hwdef.h | 17 - > arch/arm64/include/asm/pgtable-prot.h | 13 - > arch/arm64/include/asm/stage2_pgtable.h | 215 ------- > arch/arm64/kvm/mmu.c | 755 ------------------------ > 5 files changed, 1171 deletions(-) > [...] > diff --git a/arch/arm64/include/asm/pgtable-hwdef.h > b/arch/arm64/include/asm/pgtable-hwdef.h > index 1a989353144e..bb97d464f42b 100644 > --- a/arch/arm64/include/asm/pgtable-hwdef.h > +++ b/arch/arm64/include/asm/pgtable-hwdef.h > @@ -172,23 +172,6 @@ > #define PTE_ATTRINDX(t) (_AT(pteval_t, (t)) << 2) > #define PTE_ATTRINDX_MASK (_AT(pteval_t, 7) << 2) > > -/* > - * 2nd stage PTE definitions > - */ > -#define PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[2:1] */ > -#define PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ > -#define PTE_S2_XN (_AT(pteval_t, 2) << 53) /* XN[1:0] */ > -#define PTE_S2_SW_RESVD (_AT(pteval_t, 15) << 55) /* Reserved for SW > */ > - > -#define PMD_S2_RDONLY (_AT(pmdval_t, 1) << 6) /* HAP[2:1] */ > -#define PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ > -#define PMD_S2_XN (_AT(pmdval_t, 2) << 53) /* XN[1:0] */ > -#define PMD_S2_SW_RESVD (_AT(pmdval_t, 15) << 55) /* Reserved for SW > */ > - > -#define PUD_S2_RDONLY (_AT(pudval_t, 1) << 6) /* HAP[2:1] */ > -#define PUD_S2_RDWR (_AT(pudval_t, 3) << 6) /* HAP[2:1] */ > -#define PUD_S2_XN (_AT(pudval_t, 2) << 53) /* XN[1:0] */ > - > /* > * Memory Attribute override for Stage-2 (MemAttr[3:0]) > */ This breaks the (still out of tree) NV patches, which use some of these definitions as part of the architectural S2 PTW. I can either keep a KVM-private copy, or revert this hunk. What do you think? M. -- Jazz is not dead. It just smells funny... _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
WARNING: multiple messages have this Message-ID (diff)
From: Marc Zyngier <maz@kernel.org> To: Will Deacon <will@kernel.org> Cc: Catalin Marinas <catalin.marinas@arm.com>, kernel-team@android.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v4 19/21] KVM: arm64: Remove unused page-table code Date: Tue, 08 Sep 2020 11:33:35 +0100 [thread overview] Message-ID: <6674b70b99e82fb8084f801bfca84f37@kernel.org> (raw) In-Reply-To: <20200907152344.12978-20-will@kernel.org> Hi Will, On 2020-09-07 16:23, Will Deacon wrote: > Now that KVM is using the generic page-table code to manage the guest > stage-2 page-tables, we can remove a bunch of unused macros, #defines > and static inline functions from the old implementation. > > Cc: Marc Zyngier <maz@kernel.org> > Cc: Quentin Perret <qperret@google.com> > Reviewed-by: Gavin Shan <gshan@redhat.com> > Signed-off-by: Will Deacon <will@kernel.org> > --- > arch/arm64/include/asm/kvm_mmu.h | 171 ------ > arch/arm64/include/asm/pgtable-hwdef.h | 17 - > arch/arm64/include/asm/pgtable-prot.h | 13 - > arch/arm64/include/asm/stage2_pgtable.h | 215 ------- > arch/arm64/kvm/mmu.c | 755 ------------------------ > 5 files changed, 1171 deletions(-) > [...] > diff --git a/arch/arm64/include/asm/pgtable-hwdef.h > b/arch/arm64/include/asm/pgtable-hwdef.h > index 1a989353144e..bb97d464f42b 100644 > --- a/arch/arm64/include/asm/pgtable-hwdef.h > +++ b/arch/arm64/include/asm/pgtable-hwdef.h > @@ -172,23 +172,6 @@ > #define PTE_ATTRINDX(t) (_AT(pteval_t, (t)) << 2) > #define PTE_ATTRINDX_MASK (_AT(pteval_t, 7) << 2) > > -/* > - * 2nd stage PTE definitions > - */ > -#define PTE_S2_RDONLY (_AT(pteval_t, 1) << 6) /* HAP[2:1] */ > -#define PTE_S2_RDWR (_AT(pteval_t, 3) << 6) /* HAP[2:1] */ > -#define PTE_S2_XN (_AT(pteval_t, 2) << 53) /* XN[1:0] */ > -#define PTE_S2_SW_RESVD (_AT(pteval_t, 15) << 55) /* Reserved for SW > */ > - > -#define PMD_S2_RDONLY (_AT(pmdval_t, 1) << 6) /* HAP[2:1] */ > -#define PMD_S2_RDWR (_AT(pmdval_t, 3) << 6) /* HAP[2:1] */ > -#define PMD_S2_XN (_AT(pmdval_t, 2) << 53) /* XN[1:0] */ > -#define PMD_S2_SW_RESVD (_AT(pmdval_t, 15) << 55) /* Reserved for SW > */ > - > -#define PUD_S2_RDONLY (_AT(pudval_t, 1) << 6) /* HAP[2:1] */ > -#define PUD_S2_RDWR (_AT(pudval_t, 3) << 6) /* HAP[2:1] */ > -#define PUD_S2_XN (_AT(pudval_t, 2) << 53) /* XN[1:0] */ > - > /* > * Memory Attribute override for Stage-2 (MemAttr[3:0]) > */ This breaks the (still out of tree) NV patches, which use some of these definitions as part of the architectural S2 PTW. I can either keep a KVM-private copy, or revert this hunk. What do you think? M. -- Jazz is not dead. It just smells funny... _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-09-08 10:33 UTC|newest] Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-07 15:23 [PATCH v4 00/21] KVM: arm64: Rewrite page-table code and fault handling Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 01/21] KVM: arm64: Remove kvm_mmu_free_memory_caches() Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 02/21] KVM: arm64: Add stand-alone page-table walker infrastructure Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-08 0:03 ` Gavin Shan 2020-09-08 0:03 ` Gavin Shan 2020-09-10 10:57 ` Will Deacon 2020-09-10 10:57 ` Will Deacon 2020-09-09 15:29 ` Alexandru Elisei 2020-09-09 15:29 ` Alexandru Elisei 2020-09-10 12:37 ` Will Deacon 2020-09-10 12:37 ` Will Deacon 2020-09-10 14:21 ` Andrew Scull 2020-09-10 14:21 ` Andrew Scull 2020-09-11 10:15 ` Will Deacon 2020-09-11 10:15 ` Will Deacon 2020-09-11 11:22 ` Andrew Scull 2020-09-11 11:22 ` Andrew Scull 2020-09-07 15:23 ` [PATCH v4 03/21] KVM: arm64: Add support for creating kernel-agnostic stage-1 page tables Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-08 1:09 ` Gavin Shan 2020-09-08 1:09 ` Gavin Shan 2020-09-07 15:23 ` [PATCH v4 04/21] KVM: arm64: Use generic allocator for hyp stage-1 page-tables Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-08 1:03 ` Gavin Shan 2020-09-08 1:03 ` Gavin Shan 2020-09-07 15:23 ` [PATCH v4 05/21] KVM: arm64: Add support for creating kernel-agnostic stage-2 page tables Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 06/21] KVM: arm64: Add support for stage-2 map()/unmap() in generic page-table Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-10 11:20 ` Alexandru Elisei 2020-09-10 11:20 ` Alexandru Elisei 2020-09-10 12:34 ` Will Deacon 2020-09-10 12:34 ` Will Deacon 2020-09-10 13:55 ` Alexandru Elisei 2020-09-10 13:55 ` Alexandru Elisei 2020-09-07 15:23 ` [PATCH v4 07/21] KVM: arm64: Convert kvm_phys_addr_ioremap() to generic page-table API Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 08/21] KVM: arm64: Convert kvm_set_spte_hva() " Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 09/21] KVM: arm64: Convert unmap_stage2_range() " Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 10/21] KVM: arm64: Add support for stage-2 page-aging in generic page-table Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-08 15:30 ` Alexandru Elisei 2020-09-08 15:30 ` Alexandru Elisei 2020-09-10 12:42 ` Will Deacon 2020-09-10 12:42 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 11/21] KVM: arm64: Convert page-aging and access faults to generic page-table API Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-08 15:39 ` Alexandru Elisei 2020-09-08 15:39 ` Alexandru Elisei 2020-09-07 15:23 ` [PATCH v4 12/21] KVM: arm64: Add support for stage-2 write-protect in generic page-table Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 13/21] KVM: arm64: Convert write-protect operation to generic page-table API Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 14/21] KVM: arm64: Add support for stage-2 cache flushing in generic page-table Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 15/21] KVM: arm64: Convert memslot cache-flushing code to generic page-table API Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 16/21] KVM: arm64: Add support for relaxing stage-2 perms in generic page-table code Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-08 16:37 ` Alexandru Elisei 2020-09-08 16:37 ` Alexandru Elisei 2020-09-07 15:23 ` [PATCH v4 17/21] KVM: arm64: Convert user_mem_abort() to generic page-table API Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-09 14:20 ` Alexandru Elisei 2020-09-09 14:20 ` Alexandru Elisei 2020-09-09 17:12 ` Marc Zyngier 2020-09-09 17:12 ` Marc Zyngier 2020-09-10 10:51 ` Will Deacon 2020-09-10 10:51 ` Will Deacon 2020-09-10 10:58 ` Marc Zyngier 2020-09-10 10:58 ` Marc Zyngier 2020-09-10 13:10 ` Alexandru Elisei 2020-09-10 13:10 ` Alexandru Elisei 2020-09-10 13:20 ` Alexandru Elisei 2020-09-10 13:20 ` Alexandru Elisei 2020-09-07 15:23 ` [PATCH v4 18/21] KVM: arm64: Check the pgt instead of the pgd when modifying page-table Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 19/21] KVM: arm64: Remove unused page-table code Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-08 10:33 ` Marc Zyngier [this message] 2020-09-08 10:33 ` Marc Zyngier 2020-09-10 10:54 ` Will Deacon 2020-09-10 10:54 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 20/21] KVM: arm64: Remove unused 'pgd' field from 'struct kvm_s2_mmu' Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-07 15:23 ` [PATCH v4 21/21] KVM: arm64: Don't constrain maximum IPA size based on host configuration Will Deacon 2020-09-07 15:23 ` Will Deacon 2020-09-09 14:53 ` Alexandru Elisei 2020-09-09 14:53 ` Alexandru Elisei 2020-09-07 17:16 ` [PATCH v4 00/21] KVM: arm64: Rewrite page-table code and fault handling Marc Zyngier 2020-09-07 17:16 ` Marc Zyngier 2020-09-07 17:31 ` Will Deacon 2020-09-07 17:31 ` Will Deacon 2020-09-10 4:06 ` Gavin Shan 2020-09-10 4:06 ` Gavin Shan 2020-09-10 4:11 ` Gavin Shan 2020-09-10 4:11 ` Gavin Shan 2020-09-10 10:58 ` Will Deacon 2020-09-10 10:58 ` Will Deacon
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=6674b70b99e82fb8084f801bfca84f37@kernel.org \ --to=maz@kernel.org \ --cc=catalin.marinas@arm.com \ --cc=kernel-team@android.com \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=will@kernel.org \ /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.