From: Ricardo Koller <ricarkol@google.com> To: pbonzini@redhat.com, maz@kernel.org, oupton@google.com, dmatlack@google.com, qperret@google.com, catalin.marinas@arm.com, andrew.jones@linux.dev, seanjc@google.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, eric.auger@redhat.com, gshan@redhat.com, reijiw@google.com, rananta@google.com, bgardon@google.com Cc: kvmarm@lists.linux.dev, ricarkol@gmail.com, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Subject: [RFC PATCH 06/12] KVM: arm64: Split block PTEs without using break-before-make Date: Sat, 12 Nov 2022 08:17:08 +0000 [thread overview] Message-ID: <20221112081714.2169495-7-ricarkol@google.com> (raw) In-Reply-To: <20221112081714.2169495-1-ricarkol@google.com> Breaking a huge-page block PTE into an equivalent table of smaller PTEs does not require using break-before-make (BBM) when FEAT_BBM level 2 is implemented. Add the respective check for eager page splitting and avoid using BBM. Also take care of possible Conflict aborts. According to the rules specified in the Arm ARM (DDI 0487H.a) section "Support levels for changing block size" D5.10.1, this can result in a Conflict abort. So, handle it by clearing all VM TLB entries. Signed-off-by: Ricardo Koller <ricarkol@google.com> --- arch/arm64/include/asm/esr.h | 1 + arch/arm64/include/asm/kvm_arm.h | 1 + arch/arm64/kvm/hyp/pgtable.c | 10 +++++++++- arch/arm64/kvm/mmu.c | 6 ++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index 15b34fbfca66..6f5b976396e7 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -114,6 +114,7 @@ #define ESR_ELx_FSC_ACCESS (0x08) #define ESR_ELx_FSC_FAULT (0x04) #define ESR_ELx_FSC_PERM (0x0C) +#define ESR_ELx_FSC_CONFLICT (0x30) /* ISS field definitions for Data Aborts */ #define ESR_ELx_ISV_SHIFT (24) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 0df3fc3a0173..58e7cbe3c250 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -333,6 +333,7 @@ #define FSC_SECC_TTW1 (0x1d) #define FSC_SECC_TTW2 (0x1e) #define FSC_SECC_TTW3 (0x1f) +#define FSC_CONFLICT ESR_ELx_FSC_CONFLICT /* Hyp Prefetch Fault Address Register (HPFAR/HDFAR) */ #define HPFAR_MASK (~UL(0xf)) diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index 9c42eff6d42e..36b81df5687e 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -1267,6 +1267,11 @@ static int stage2_create_removed(kvm_pte_t *ptep, u64 phys, u32 level, return __kvm_pgtable_visit(&data, mm_ops, ptep, level); } +static bool stage2_has_bbm_level2(void) +{ + return cpus_have_const_cap(ARM64_HAS_STAGE2_BBM2); +} + struct stage2_split_data { struct kvm_s2_mmu *mmu; void *memcache; @@ -1308,7 +1313,10 @@ static int stage2_split_walker(const struct kvm_pgtable_visit_ctx *ctx, */ WARN_ON(stage2_create_removed(&new, phys, level, attr, mc, mm_ops)); - stage2_put_pte(ctx, data->mmu, mm_ops); + if (stage2_has_bbm_level2()) + mm_ops->put_page(ctx->ptep); + else + stage2_put_pte(ctx, data->mmu, mm_ops); /* * Note, the contents of the page table are guaranteed to be made diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 8f26c65693a9..318f7b0aa20b 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1481,6 +1481,12 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) return 1; } + /* Conflict abort? */ + if (fault_status == FSC_CONFLICT) { + kvm_flush_remote_tlbs(vcpu->kvm); + return 1; + } + trace_kvm_guest_fault(*vcpu_pc(vcpu), kvm_vcpu_get_esr(vcpu), kvm_vcpu_get_hfar(vcpu), fault_ipa); -- 2.38.1.431.g37b22c650d-goog _______________________________________________ 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: Ricardo Koller <ricarkol@google.com> To: pbonzini@redhat.com, maz@kernel.org, oupton@google.com, dmatlack@google.com, qperret@google.com, catalin.marinas@arm.com, andrew.jones@linux.dev, seanjc@google.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, eric.auger@redhat.com, gshan@redhat.com, reijiw@google.com, rananta@google.com, bgardon@google.com Cc: kvm@vger.kernel.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, ricarkol@gmail.com, Ricardo Koller <ricarkol@google.com> Subject: [RFC PATCH 06/12] KVM: arm64: Split block PTEs without using break-before-make Date: Sat, 12 Nov 2022 08:17:08 +0000 [thread overview] Message-ID: <20221112081714.2169495-7-ricarkol@google.com> (raw) Message-ID: <20221112081708.M2LMGY4OixrCzViTZhE-DXiE-g_5K0qHVTYGMue3GfA@z> (raw) In-Reply-To: <20221112081714.2169495-1-ricarkol@google.com> Breaking a huge-page block PTE into an equivalent table of smaller PTEs does not require using break-before-make (BBM) when FEAT_BBM level 2 is implemented. Add the respective check for eager page splitting and avoid using BBM. Also take care of possible Conflict aborts. According to the rules specified in the Arm ARM (DDI 0487H.a) section "Support levels for changing block size" D5.10.1, this can result in a Conflict abort. So, handle it by clearing all VM TLB entries. Signed-off-by: Ricardo Koller <ricarkol@google.com> --- arch/arm64/include/asm/esr.h | 1 + arch/arm64/include/asm/kvm_arm.h | 1 + arch/arm64/kvm/hyp/pgtable.c | 10 +++++++++- arch/arm64/kvm/mmu.c | 6 ++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index 15b34fbfca66..6f5b976396e7 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -114,6 +114,7 @@ #define ESR_ELx_FSC_ACCESS (0x08) #define ESR_ELx_FSC_FAULT (0x04) #define ESR_ELx_FSC_PERM (0x0C) +#define ESR_ELx_FSC_CONFLICT (0x30) /* ISS field definitions for Data Aborts */ #define ESR_ELx_ISV_SHIFT (24) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 0df3fc3a0173..58e7cbe3c250 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -333,6 +333,7 @@ #define FSC_SECC_TTW1 (0x1d) #define FSC_SECC_TTW2 (0x1e) #define FSC_SECC_TTW3 (0x1f) +#define FSC_CONFLICT ESR_ELx_FSC_CONFLICT /* Hyp Prefetch Fault Address Register (HPFAR/HDFAR) */ #define HPFAR_MASK (~UL(0xf)) diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c index 9c42eff6d42e..36b81df5687e 100644 --- a/arch/arm64/kvm/hyp/pgtable.c +++ b/arch/arm64/kvm/hyp/pgtable.c @@ -1267,6 +1267,11 @@ static int stage2_create_removed(kvm_pte_t *ptep, u64 phys, u32 level, return __kvm_pgtable_visit(&data, mm_ops, ptep, level); } +static bool stage2_has_bbm_level2(void) +{ + return cpus_have_const_cap(ARM64_HAS_STAGE2_BBM2); +} + struct stage2_split_data { struct kvm_s2_mmu *mmu; void *memcache; @@ -1308,7 +1313,10 @@ static int stage2_split_walker(const struct kvm_pgtable_visit_ctx *ctx, */ WARN_ON(stage2_create_removed(&new, phys, level, attr, mc, mm_ops)); - stage2_put_pte(ctx, data->mmu, mm_ops); + if (stage2_has_bbm_level2()) + mm_ops->put_page(ctx->ptep); + else + stage2_put_pte(ctx, data->mmu, mm_ops); /* * Note, the contents of the page table are guaranteed to be made diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 8f26c65693a9..318f7b0aa20b 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1481,6 +1481,12 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) return 1; } + /* Conflict abort? */ + if (fault_status == FSC_CONFLICT) { + kvm_flush_remote_tlbs(vcpu->kvm); + return 1; + } + trace_kvm_guest_fault(*vcpu_pc(vcpu), kvm_vcpu_get_esr(vcpu), kvm_vcpu_get_hfar(vcpu), fault_ipa); -- 2.38.1.431.g37b22c650d-goog
next prev parent reply other threads:[~2022-11-12 8:17 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-12 8:17 [RFC PATCH 00/12] KVM: arm64: Eager huge-page splitting for dirty-logging Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller 2022-11-12 8:17 ` [RFC PATCH 01/12] KVM: arm64: Relax WARN check in stage2_make_pte() Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller 2022-11-14 20:59 ` Oliver Upton 2022-11-14 20:59 ` Oliver Upton 2022-11-12 8:17 ` [RFC PATCH 02/12] KVM: arm64: Allow visiting block PTEs in post-order Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller 2022-11-14 18:48 ` Oliver Upton 2022-11-14 18:48 ` Oliver Upton 2023-01-13 3:44 ` Ricardo Koller 2022-11-12 8:17 ` [RFC PATCH 03/12] KVM: arm64: Add stage2_create_removed() Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller 2022-11-12 8:17 ` [RFC PATCH 04/12] KVM: arm64: Add kvm_pgtable_stage2_split() Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller 2022-11-14 20:54 ` Oliver Upton 2022-11-14 20:54 ` Oliver Upton 2022-11-15 23:03 ` Ricardo Koller 2022-11-15 23:03 ` Ricardo Koller 2022-11-15 23:27 ` Ricardo Koller 2022-11-15 23:27 ` Ricardo Koller 2022-11-15 23:54 ` Oliver Upton 2022-11-15 23:54 ` Oliver Upton 2022-11-17 21:50 ` Ricardo Koller 2022-11-17 21:50 ` Ricardo Koller 2022-11-12 8:17 ` [RFC PATCH 05/12] arm64: Add a capability for FEAT_BBM level 2 Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller [this message] 2022-11-12 8:17 ` [RFC PATCH 06/12] KVM: arm64: Split block PTEs without using break-before-make Ricardo Koller 2022-11-14 18:56 ` Oliver Upton 2022-11-14 18:56 ` Oliver Upton 2022-11-12 8:17 ` [RFC PATCH 07/12] KVM: arm64: Refactor kvm_arch_commit_memory_region() Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller 2022-11-12 8:17 ` [RFC PATCH 08/12] KVM: arm64: Add kvm_uninit_stage2_mmu() Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller 2022-11-12 8:17 ` [RFC PATCH 09/12] KVM: arm64: Split huge pages when dirty logging is enabled Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller 2022-11-12 8:17 ` [RFC PATCH 10/12] KVM: arm64: Open-code kvm_mmu_write_protect_pt_masked() Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller 2022-11-12 8:17 ` [RFC PATCH 11/12] KVM: arm64: Split huge pages during KVM_CLEAR_DIRTY_LOG Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller 2022-11-12 8:17 ` [RFC PATCH 12/12] KVM: arm64: Use local TLBI on permission relaxation Ricardo Koller 2022-11-12 8:17 ` Ricardo Koller 2022-11-14 18:42 ` [RFC PATCH 00/12] KVM: arm64: Eager huge-page splitting for dirty-logging Oliver Upton 2022-11-14 18:42 ` Oliver Upton 2023-01-13 3:42 ` Ricardo Koller
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=20221112081714.2169495-7-ricarkol@google.com \ --to=ricarkol@google.com \ --cc=alexandru.elisei@arm.com \ --cc=andrew.jones@linux.dev \ --cc=bgardon@google.com \ --cc=catalin.marinas@arm.com \ --cc=dmatlack@google.com \ --cc=eric.auger@redhat.com \ --cc=gshan@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=kvmarm@lists.linux.dev \ --cc=maz@kernel.org \ --cc=oupton@google.com \ --cc=pbonzini@redhat.com \ --cc=qperret@google.com \ --cc=rananta@google.com \ --cc=reijiw@google.com \ --cc=ricarkol@gmail.com \ --cc=seanjc@google.com \ --cc=suzuki.poulose@arm.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 a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).