From: Andrey Konovalov <andreyknvl@google.com> To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com>, kasan-dev@googlegroups.com, Dmitry Vyukov <dvyukov@google.com>, Andrey Ryabinin <aryabinin@virtuozzo.com>, Alexander Potapenko <glider@google.com>, Marco Elver <elver@google.com>, Evgenii Stepanov <eugenis@google.com>, Elena Petrova <lenaptr@google.com>, Branislav Rankov <Branislav.Rankov@arm.com>, Kevin Brodsky <kevin.brodsky@arm.com>, Andrew Morton <akpm@linux-foundation.org>, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov <andreyknvl@google.com> Subject: [PATCH v6 06/40] arm64: kasan: Enable in-kernel MTE Date: Thu, 29 Oct 2020 20:25:27 +0100 [thread overview] Message-ID: <9b5881af53f0206f423117d400167c96e8584024.1603999489.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1603999489.git.andreyknvl@google.com> From: Vincenzo Frascino <vincenzo.frascino@arm.com> Hardware tag-based KASAN relies on Memory Tagging Extension (MTE) feature and requires it to be enabled. The Tag Checking operation causes a synchronous data abort as a consequence of a tag check fault when MTE is configured in synchronous mode. Enable MTE in Synchronous mode in EL1 to provide a more immediate way of tag check failure detection in the kernel. As part of this change enable match-all tag for EL1 to allow the kernel to access user pages without faulting. This is required because the kernel does not have knowledge of the tags set by the user in a page. Note: For MTE, the TCF bit field in SCTLR_EL1 affects only EL1 in a similar way as TCF0 affects EL0. MTE that is built on top of the Top Byte Ignore (TBI) feature hence we enable it as part of this patch as well. Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Signed-off-by: Andrey Konovalov <andreyknvl@google.com> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> --- Change-Id: I4d67497268bb7f0c2fc5dcacefa1e273df4af71d --- arch/arm64/kernel/cpufeature.c | 7 +++++++ arch/arm64/mm/proc.S | 23 ++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index dcc165b3fc04..c61f201042b2 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1704,6 +1704,13 @@ static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) cleared_zero_page = true; mte_clear_page_tags(lm_alias(empty_zero_page)); } + + /* Enable in-kernel MTE only if KASAN_HW_TAGS is enabled */ + if (IS_ENABLED(CONFIG_KASAN_HW_TAGS)) { + /* Enable MTE Sync Mode for EL1 */ + sysreg_clear_set(sctlr_el1, SCTLR_ELx_TCF_MASK, SCTLR_ELx_TCF_SYNC); + isb(); + } } #endif /* CONFIG_ARM64_MTE */ diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 23c326a06b2d..7c3304fb15d9 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -40,9 +40,15 @@ #define TCR_CACHE_FLAGS TCR_IRGN_WBWA | TCR_ORGN_WBWA #ifdef CONFIG_KASAN_SW_TAGS -#define TCR_KASAN_FLAGS TCR_TBI1 +#define TCR_KASAN_SW_FLAGS TCR_TBI1 #else -#define TCR_KASAN_FLAGS 0 +#define TCR_KASAN_SW_FLAGS 0 +#endif + +#ifdef CONFIG_KASAN_HW_TAGS +#define TCR_KASAN_HW_FLAGS SYS_TCR_EL1_TCMA1 | TCR_TBI1 +#else +#define TCR_KASAN_HW_FLAGS 0 #endif /* @@ -427,6 +433,10 @@ SYM_FUNC_START(__cpu_setup) */ mov_q x5, MAIR_EL1_SET #ifdef CONFIG_ARM64_MTE + mte_tcr .req x20 + + mov mte_tcr, #0 + /* * Update MAIR_EL1, GCR_EL1 and TFSR*_EL1 if MTE is supported * (ID_AA64PFR1_EL1[11:8] > 1). @@ -447,6 +457,9 @@ SYM_FUNC_START(__cpu_setup) /* clear any pending tag check faults in TFSR*_EL1 */ msr_s SYS_TFSR_EL1, xzr msr_s SYS_TFSRE0_EL1, xzr + + /* set the TCR_EL1 bits */ + mov_q mte_tcr, TCR_KASAN_HW_FLAGS 1: #endif msr mair_el1, x5 @@ -456,7 +469,11 @@ SYM_FUNC_START(__cpu_setup) */ mov_q x10, TCR_TxSZ(VA_BITS) | TCR_CACHE_FLAGS | TCR_SMP_FLAGS | \ TCR_TG_FLAGS | TCR_KASLR_FLAGS | TCR_ASID16 | \ - TCR_TBI0 | TCR_A1 | TCR_KASAN_FLAGS + TCR_TBI0 | TCR_A1 | TCR_KASAN_SW_FLAGS +#ifdef CONFIG_ARM64_MTE + orr x10, x10, mte_tcr + .unreq mte_tcr +#endif tcr_clear_errata_bits x10, x9, x5 #ifdef CONFIG_ARM64_VA_BITS_52 -- 2.29.1.341.ge80a0c044ae-goog
WARNING: multiple messages have this Message-ID (diff)
From: Andrey Konovalov <andreyknvl@google.com> To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com> Cc: linux-arm-kernel@lists.infradead.org, Marco Elver <elver@google.com>, Elena Petrova <lenaptr@google.com>, Andrey Konovalov <andreyknvl@google.com>, Kevin Brodsky <kevin.brodsky@arm.com>, Branislav Rankov <Branislav.Rankov@arm.com>, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Potapenko <glider@google.com>, Evgenii Stepanov <eugenis@google.com>, Andrey Ryabinin <aryabinin@virtuozzo.com>, Andrew Morton <akpm@linux-foundation.org>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Dmitry Vyukov <dvyukov@google.com> Subject: [PATCH v6 06/40] arm64: kasan: Enable in-kernel MTE Date: Thu, 29 Oct 2020 20:25:27 +0100 [thread overview] Message-ID: <9b5881af53f0206f423117d400167c96e8584024.1603999489.git.andreyknvl@google.com> (raw) In-Reply-To: <cover.1603999489.git.andreyknvl@google.com> From: Vincenzo Frascino <vincenzo.frascino@arm.com> Hardware tag-based KASAN relies on Memory Tagging Extension (MTE) feature and requires it to be enabled. The Tag Checking operation causes a synchronous data abort as a consequence of a tag check fault when MTE is configured in synchronous mode. Enable MTE in Synchronous mode in EL1 to provide a more immediate way of tag check failure detection in the kernel. As part of this change enable match-all tag for EL1 to allow the kernel to access user pages without faulting. This is required because the kernel does not have knowledge of the tags set by the user in a page. Note: For MTE, the TCF bit field in SCTLR_EL1 affects only EL1 in a similar way as TCF0 affects EL0. MTE that is built on top of the Top Byte Ignore (TBI) feature hence we enable it as part of this patch as well. Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Signed-off-by: Andrey Konovalov <andreyknvl@google.com> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> --- Change-Id: I4d67497268bb7f0c2fc5dcacefa1e273df4af71d --- arch/arm64/kernel/cpufeature.c | 7 +++++++ arch/arm64/mm/proc.S | 23 ++++++++++++++++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index dcc165b3fc04..c61f201042b2 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -1704,6 +1704,13 @@ static void cpu_enable_mte(struct arm64_cpu_capabilities const *cap) cleared_zero_page = true; mte_clear_page_tags(lm_alias(empty_zero_page)); } + + /* Enable in-kernel MTE only if KASAN_HW_TAGS is enabled */ + if (IS_ENABLED(CONFIG_KASAN_HW_TAGS)) { + /* Enable MTE Sync Mode for EL1 */ + sysreg_clear_set(sctlr_el1, SCTLR_ELx_TCF_MASK, SCTLR_ELx_TCF_SYNC); + isb(); + } } #endif /* CONFIG_ARM64_MTE */ diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S index 23c326a06b2d..7c3304fb15d9 100644 --- a/arch/arm64/mm/proc.S +++ b/arch/arm64/mm/proc.S @@ -40,9 +40,15 @@ #define TCR_CACHE_FLAGS TCR_IRGN_WBWA | TCR_ORGN_WBWA #ifdef CONFIG_KASAN_SW_TAGS -#define TCR_KASAN_FLAGS TCR_TBI1 +#define TCR_KASAN_SW_FLAGS TCR_TBI1 #else -#define TCR_KASAN_FLAGS 0 +#define TCR_KASAN_SW_FLAGS 0 +#endif + +#ifdef CONFIG_KASAN_HW_TAGS +#define TCR_KASAN_HW_FLAGS SYS_TCR_EL1_TCMA1 | TCR_TBI1 +#else +#define TCR_KASAN_HW_FLAGS 0 #endif /* @@ -427,6 +433,10 @@ SYM_FUNC_START(__cpu_setup) */ mov_q x5, MAIR_EL1_SET #ifdef CONFIG_ARM64_MTE + mte_tcr .req x20 + + mov mte_tcr, #0 + /* * Update MAIR_EL1, GCR_EL1 and TFSR*_EL1 if MTE is supported * (ID_AA64PFR1_EL1[11:8] > 1). @@ -447,6 +457,9 @@ SYM_FUNC_START(__cpu_setup) /* clear any pending tag check faults in TFSR*_EL1 */ msr_s SYS_TFSR_EL1, xzr msr_s SYS_TFSRE0_EL1, xzr + + /* set the TCR_EL1 bits */ + mov_q mte_tcr, TCR_KASAN_HW_FLAGS 1: #endif msr mair_el1, x5 @@ -456,7 +469,11 @@ SYM_FUNC_START(__cpu_setup) */ mov_q x10, TCR_TxSZ(VA_BITS) | TCR_CACHE_FLAGS | TCR_SMP_FLAGS | \ TCR_TG_FLAGS | TCR_KASLR_FLAGS | TCR_ASID16 | \ - TCR_TBI0 | TCR_A1 | TCR_KASAN_FLAGS + TCR_TBI0 | TCR_A1 | TCR_KASAN_SW_FLAGS +#ifdef CONFIG_ARM64_MTE + orr x10, x10, mte_tcr + .unreq mte_tcr +#endif tcr_clear_errata_bits x10, x9, x5 #ifdef CONFIG_ARM64_VA_BITS_52 -- 2.29.1.341.ge80a0c044ae-goog _______________________________________________ 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-10-29 19:26 UTC|newest] Thread overview: 127+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-29 19:25 [PATCH v6 00/40] kasan: add hardware tag-based mode for arm64 Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 01/40] arm64: Enable armv8.5-a asm-arch option Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 02/40] arm64: mte: Add in-kernel MTE helpers Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 03/40] arm64: mte: Reset the page tag in page->flags Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 04/40] arm64: kasan: Add arch layer for memory tagging helpers Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 05/40] arm64: mte: Add in-kernel tag fault handler Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov [this message] 2020-10-29 19:25 ` [PATCH v6 06/40] arm64: kasan: Enable in-kernel MTE Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 07/40] arm64: mte: Convert gcr_user into an exclude mask Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 08/40] arm64: mte: Switch GCR_EL1 in kernel entry and exit Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 09/40] arm64: kasan: Align allocations for HW_TAGS Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 10/40] kasan: drop unnecessary GPL text from comment headers Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 11/40] kasan: KASAN_VMALLOC depends on KASAN_GENERIC Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 12/40] kasan: group vmalloc code Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 13/40] kasan: shadow declarations only for software modes Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-30 13:08 ` kernel test robot 2020-11-02 3:43 ` kernel test robot 2020-10-29 19:25 ` [PATCH v6 14/40] kasan: rename (un)poison_shadow to (un)poison_memory Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 15/40] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 16/40] kasan: only build init.c for software modes Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 17/40] kasan: split out shadow.c from common.c Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 18/40] kasan: define KASAN_GRANULE_PAGE Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 19/40] kasan: rename report and tags files Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 20/40] kasan: don't duplicate config dependencies Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 21/40] kasan: hide invalid free check implementation Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 22/40] kasan: decode stack frame only with KASAN_STACK_ENABLE Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-11-02 6:16 ` kernel test robot 2020-10-29 19:25 ` [PATCH v6 23/40] kasan, arm64: only init shadow for software modes Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 24/40] kasan, arm64: only use kasan_depth " Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-30 11:50 ` kernel test robot 2020-10-29 19:25 ` [PATCH v6 25/40] kasan: rename addr_has_shadow to addr_has_metadata Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 26/40] kasan: rename print_shadow_for_address to print_memory_metadata Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 27/40] kasan: kasan_non_canonical_hook only for software modes Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 28/40] kasan: rename SHADOW layout macros to META Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 29/40] kasan: separate metadata_fetch_row for each mode Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 30/40] kasan, arm64: don't allow SW_TAGS with ARM64_MTE Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 31/40] kasan: introduce CONFIG_KASAN_HW_TAGS Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 32/40] kasan: define KASAN_GRANULE_SIZE for HW_TAGS Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 33/40] kasan, x86, s390: update undef CONFIG_KASAN Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 34/40] kasan, arm64: expand CONFIG_KASAN checks Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 35/40] kasan, arm64: implement HW_TAGS runtime Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 36/40] kasan, arm64: print report from tag fault handler Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 37/40] kasan, mm: reset tags when accessing metadata Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` [PATCH v6 38/40] kasan, arm64: enable CONFIG_KASAN_HW_TAGS Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:25 ` Andrey Konovalov 2020-10-29 19:26 ` [PATCH v6 39/40] kasan: add documentation for hardware tag-based mode Andrey Konovalov 2020-10-29 19:26 ` Andrey Konovalov 2020-10-29 19:26 ` Andrey Konovalov 2020-10-29 19:26 ` [PATCH v6 40/40] kselftest/arm64: Check GCR_EL1 after context switch Andrey Konovalov 2020-10-29 19:26 ` Andrey Konovalov 2020-10-29 19:26 ` Andrey Konovalov
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=9b5881af53f0206f423117d400167c96e8584024.1603999489.git.andreyknvl@google.com \ --to=andreyknvl@google.com \ --cc=Branislav.Rankov@arm.com \ --cc=akpm@linux-foundation.org \ --cc=aryabinin@virtuozzo.com \ --cc=catalin.marinas@arm.com \ --cc=dvyukov@google.com \ --cc=elver@google.com \ --cc=eugenis@google.com \ --cc=glider@google.com \ --cc=kasan-dev@googlegroups.com \ --cc=kevin.brodsky@arm.com \ --cc=lenaptr@google.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=vincenzo.frascino@arm.com \ --cc=will.deacon@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 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.