From: Catalin Marinas <catalin.marinas@arm.com>
To: Andrey Konovalov <andreyknvl@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
kasan-dev@googlegroups.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>,
Will Deacon <will.deacon@arm.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4 27/39] arm64: kasan: Enable in-kernel MTE
Date: Fri, 2 Oct 2020 15:00:18 +0100 [thread overview]
Message-ID: <20201002140017.GF7034@gaia> (raw)
In-Reply-To: <e8d5ed9bc12086670cbde30d390de32730d0371f.1601593784.git.andreyknvl@google.com>
On Fri, Oct 02, 2020 at 01:10:28AM +0200, Andrey Konovalov wrote:
> diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
> index 23c326a06b2d..6c1a6621d769 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
> +#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
Don't we miss the TBI1 bit here? I think the v3 version of this patch
was better.
--
Catalin
next prev parent reply other threads:[~2020-10-02 14:00 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-01 23:10 [PATCH v4 00/39] kasan: add hardware tag-based mode for arm64 Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 01/39] kasan: drop unnecessary GPL text from comment headers Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 02/39] kasan: KASAN_VMALLOC depends on KASAN_GENERIC Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 03/39] kasan: group vmalloc code Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 04/39] kasan: shadow declarations only for software modes Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 05/39] kasan: rename (un)poison_shadow to (un)poison_memory Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 06/39] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 07/39] kasan: only build init.c for software modes Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 08/39] kasan: split out shadow.c from common.c Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 09/39] kasan: define KASAN_GRANULE_PAGE Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 10/39] kasan: rename report and tags files Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 11/39] kasan: don't duplicate config dependencies Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 12/39] kasan: hide invalid free check implementation Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 13/39] kasan: decode stack frame only with KASAN_STACK_ENABLE Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 14/39] kasan, arm64: only init shadow for software modes Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 15/39] kasan, arm64: only use kasan_depth " Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 16/39] kasan: rename addr_has_shadow to addr_has_metadata Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 17/39] kasan: rename print_shadow_for_address to print_memory_metadata Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 18/39] kasan: kasan_non_canonical_hook only for software modes Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 19/39] kasan: rename SHADOW layout macros to META Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 20/39] kasan: separate metadata_fetch_row for each mode Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 21/39] kasan, arm64: don't allow SW_TAGS with ARM64_MTE Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 22/39] kasan: introduce CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 23/39] arm64: Enable armv8.5-a asm-arch option Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 24/39] arm64: mte: Add in-kernel MTE helpers Andrey Konovalov
2020-10-02 13:51 ` Catalin Marinas
2020-10-01 23:10 ` [PATCH v4 25/39] arm64: kasan: Add arch layer for memory tagging helpers Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 26/39] arm64: mte: Add in-kernel tag fault handler Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 27/39] arm64: kasan: Enable in-kernel MTE Andrey Konovalov
2020-10-02 14:00 ` Catalin Marinas [this message]
2020-10-01 23:10 ` [PATCH v4 28/39] arm64: mte: Convert gcr_user into an exclude mask Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 29/39] arm64: mte: Switch GCR_EL1 in kernel entry and exit Andrey Konovalov
2020-10-02 14:06 ` Catalin Marinas
2020-10-08 18:24 ` Vincenzo Frascino
2020-10-09 8:11 ` Catalin Marinas
2020-10-09 9:56 ` Vincenzo Frascino
2020-10-09 10:16 ` Catalin Marinas
2020-10-09 10:21 ` Vincenzo Frascino
2020-10-01 23:10 ` [PATCH v4 30/39] arm64: kasan: Enable TBI EL1 Andrey Konovalov
2020-10-02 14:10 ` Catalin Marinas
2020-10-01 23:10 ` [PATCH v4 31/39] arm64: kasan: Align allocations for HW_TAGS Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 32/39] kasan: define KASAN_GRANULE_SIZE " Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 33/39] kasan, x86, s390: update undef CONFIG_KASAN Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 34/39] kasan, arm64: expand CONFIG_KASAN checks Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 35/39] kasan, arm64: implement HW_TAGS runtime Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 36/39] kasan, arm64: print report from tag fault handler Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 37/39] kasan, mm: reset tags when accessing metadata Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 38/39] kasan, arm64: enable CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-10-01 23:10 ` [PATCH v4 39/39] kasan: add documentation for hardware tag-based mode 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=20201002140017.GF7034@gaia \
--to=catalin.marinas@arm.com \
--cc=Branislav.Rankov@arm.com \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@google.com \
--cc=aryabinin@virtuozzo.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: link
Be 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).