diff mbox series

[mm,v10,32/42] arm64: kasan: Align allocations for HW_TAGS

Message ID	3d2ffcbffff7cdfe60d10493081f82205c181ba7.1605305705.git.andreyknvl@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=AU6j=ET=lists.infradead.org=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E3F621D7F Date: Fri, 13 Nov 2020 23:16:00 +0100 In-Reply-To: <cover.1605305705.git.andreyknvl@google.com> Message-Id: <3d2ffcbffff7cdfe60d10493081f82205c181ba7.1605305705.git.andreyknvl@google.com> Mime-Version: 1.0 References: <cover.1605305705.git.andreyknvl@google.com> Subject: [PATCH mm v10 32/42] arm64: kasan: Align allocations for HW_TAGS From: Andrey Konovalov <andreyknvl@google.com> To: Andrew Morton <akpm@linux-foundation.org> Precedence: list Cc: linux-arm-kernel@lists.infradead.org, Marco Elver <elver@google.com>, Catalin Marinas <catalin.marinas@arm.com>, Kevin Brodsky <kevin.brodsky@arm.com>, Will Deacon <will.deacon@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 Konovalov <andreyknvl@google.com>, Andrey Ryabinin <aryabinin@virtuozzo.com>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Dmitry Vyukov <dvyukov@google.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org
Series	kasan: add hardware tag-based mode for arm64 \| expand [mm,v10,00/42] kasan: add hardware tag-based mode for arm64 [mm,v10,01/42] kasan: drop unnecessary GPL text from comment headers [mm,v10,02/42] kasan: KASAN_VMALLOC depends on KASAN_GENERIC [mm,v10,03/42] kasan: group vmalloc code [mm,v10,04/42] kasan: shadow declarations only for software modes [mm,v10,05/42] kasan: rename (un)poison_shadow to (un)poison_range [mm,v10,06/42] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* [mm,v10,07/42] kasan: only build init.c for software modes [mm,v10,08/42] kasan: split out shadow.c from common.c [mm,v10,09/42] kasan: define KASAN_MEMORY_PER_SHADOW_PAGE [mm,v10,10/42] kasan: rename report and tags files [mm,v10,11/42] kasan: don't duplicate config dependencies [mm,v10,12/42] kasan: hide invalid free check implementation [mm,v10,13/42] kasan: decode stack frame only with KASAN_STACK_ENABLE [mm,v10,14/42] kasan, arm64: only init shadow for software modes [mm,v10,15/42] kasan, arm64: only use kasan_depth for software modes [mm,v10,16/42] kasan, arm64: move initialization message [mm,v10,17/42] kasan, arm64: rename kasan_init_tags and mark as __init [mm,v10,18/42] kasan: rename addr_has_shadow to addr_has_metadata [mm,v10,19/42] kasan: rename print_shadow_for_address to print_memory_metadata [mm,v10,20/42] kasan: rename SHADOW layout macros to META [mm,v10,21/42] kasan: separate metadata_fetch_row for each mode [mm,v10,22/42] kasan, arm64: don't allow SW_TAGS with ARM64_MTE [mm,v10,23/42] kasan: introduce CONFIG_KASAN_HW_TAGS [mm,v10,24/42] arm64: Enable armv8.5-a asm-arch option [mm,v10,25/42] arm64: mte: Add in-kernel MTE helpers [mm,v10,26/42] arm64: mte: Reset the page tag in page->flags [mm,v10,27/42] arm64: mte: Add in-kernel tag fault handler [mm,v10,28/42] arm64: kasan: Allow enabling in-kernel MTE [mm,v10,29/42] arm64: mte: Convert gcr_user into an exclude mask [mm,v10,30/42] arm64: mte: Switch GCR_EL1 in kernel entry and exit [mm,v10,31/42] kasan, mm: untag page address in free_reserved_area [mm,v10,32/42] arm64: kasan: Align allocations for HW_TAGS [mm,v10,33/42] arm64: kasan: Add arch layer for memory tagging helpers [mm,v10,34/42] kasan: define KASAN_GRANULE_SIZE for HW_TAGS [mm,v10,35/42] kasan, x86, s390: update undef CONFIG_KASAN [mm,v10,36/42] kasan, arm64: expand CONFIG_KASAN checks [mm,v10,37/42] kasan, arm64: implement HW_TAGS runtime [mm,v10,38/42] kasan, arm64: print report from tag fault handler [mm,v10,39/42] kasan, mm: reset tags when accessing metadata [mm,v10,40/42] kasan, arm64: enable CONFIG_KASAN_HW_TAGS [mm,v10,41/42] kasan: add documentation for hardware tag-based mode [mm,v10,42/42] kselftest/arm64: Check GCR_EL1 after context switch

Commit Message

Andrey Konovalov Nov. 13, 2020, 10:16 p.m. UTC

Hardware tag-based KASAN uses the memory tagging approach, which requires
all allocations to be aligned to the memory granule size. Align the
allocations to MTE_GRANULE_SIZE via ARCH_SLAB_MINALIGN when
CONFIG_KASAN_HW_TAGS is enabled.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: Alexander Potapenko <glider@google.com>
---
Change-Id: I51ebd3f9645e6330e5a92973bf7c86b62d632c2b
---
 arch/arm64/include/asm/cache.h | 3 +++
 1 file changed, 3 insertions(+)

diff mbox series

Patch

diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h
index 63d43b5f82f6..77cbbe3625f2 100644
--- a/arch/arm64/include/asm/cache.h
+++ b/arch/arm64/include/asm/cache.h
@@ -6,6 +6,7 @@ 
 #define __ASM_CACHE_H
 
 #include <asm/cputype.h>
+#include <asm/mte-kasan.h>
 
 #define CTR_L1IP_SHIFT		14
 #define CTR_L1IP_MASK		3
@@ -51,6 +52,8 @@ 
 
 #ifdef CONFIG_KASAN_SW_TAGS
 #define ARCH_SLAB_MINALIGN	(1ULL << KASAN_SHADOW_SCALE_SHIFT)
+#elif defined(CONFIG_KASAN_HW_TAGS)
+#define ARCH_SLAB_MINALIGN	MTE_GRANULE_SIZE
 #endif
 
 #ifndef __ASSEMBLY__