[v5,09/40] arm64: kasan: Align allocations for HW_TAGS

Message ID	67dc921f4720fdc5a33d747c9419a1fefb33e201.1602535397.git.andreyknvl@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=SllI=DT=kvack.org=owner-linux-mm@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B0CC20790 Date: Mon, 12 Oct 2020 22:44:15 +0200 In-Reply-To: <cover.1602535397.git.andreyknvl@google.com> Message-Id: <67dc921f4720fdc5a33d747c9419a1fefb33e201.1602535397.git.andreyknvl@google.com> Mime-Version: 1.0 References: <cover.1602535397.git.andreyknvl@google.com> Subject: [PATCH v5 09/40] arm64: kasan: Align allocations for HW_TAGS 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> Content-Type: text/plain; charset="UTF-8" Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	kasan: add hardware tag-based mode for arm64 \| expand [v5,00/40] kasan: add hardware tag-based mode for arm64 [v5,01/40] arm64: Enable armv8.5-a asm-arch option [v5,02/40] arm64: mte: Add in-kernel MTE helpers [v5,03/40] arm64: mte: Reset the page tag in page->flags [v5,04/40] arm64: kasan: Add arch layer for memory tagging helpers [v5,05/40] arm64: mte: Add in-kernel tag fault handler [v5,06/40] arm64: kasan: Enable in-kernel MTE [v5,07/40] arm64: mte: Convert gcr_user into an exclude mask [v5,08/40] arm64: mte: Switch GCR_EL1 in kernel entry and exit [v5,09/40] arm64: kasan: Align allocations for HW_TAGS [v5,10/40] kasan: drop unnecessary GPL text from comment headers [v5,11/40] kasan: KASAN_VMALLOC depends on KASAN_GENERIC [v5,12/40] kasan: group vmalloc code [v5,13/40] kasan: shadow declarations only for software modes [v5,14/40] kasan: rename (un)poison_shadow to (un)poison_memory [v5,15/40] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* [v5,16/40] kasan: only build init.c for software modes [v5,17/40] kasan: split out shadow.c from common.c [v5,18/40] kasan: define KASAN_GRANULE_PAGE [v5,19/40] kasan: rename report and tags files [v5,20/40] kasan: don't duplicate config dependencies [v5,21/40] kasan: hide invalid free check implementation [v5,22/40] kasan: decode stack frame only with KASAN_STACK_ENABLE [v5,23/40] kasan, arm64: only init shadow for software modes [v5,24/40] kasan, arm64: only use kasan_depth for software modes [v5,25/40] kasan: rename addr_has_shadow to addr_has_metadata [v5,26/40] kasan: rename print_shadow_for_address to print_memory_metadata [v5,27/40] kasan: kasan_non_canonical_hook only for software modes [v5,28/40] kasan: rename SHADOW layout macros to META [v5,29/40] kasan: separate metadata_fetch_row for each mode [v5,30/40] kasan, arm64: don't allow SW_TAGS with ARM64_MTE [v5,31/40] kasan: introduce CONFIG_KASAN_HW_TAGS [v5,32/40] kasan: define KASAN_GRANULE_SIZE for HW_TAGS [v5,33/40] kasan, x86, s390: update undef CONFIG_KASAN [v5,34/40] kasan, arm64: expand CONFIG_KASAN checks [v5,35/40] kasan, arm64: implement HW_TAGS runtime [v5,36/40] kasan, arm64: print report from tag fault handler [v5,37/40] kasan, mm: reset tags when accessing metadata [v5,38/40] kasan, arm64: enable CONFIG_KASAN_HW_TAGS [v5,39/40] kasan: add documentation for hardware tag-based mode [v5,40/40] kselftest/arm64: Check GCR_EL1 after context switch

Message ID

67dc921f4720fdc5a33d747c9419a1fefb33e201.1602535397.git.andreyknvl@google.com (mailing list archive)

State

New, archived

Headers

DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B0CC20790
Date: Mon, 12 Oct 2020 22:44:15 +0200
In-Reply-To: <cover.1602535397.git.andreyknvl@google.com>
Message-Id: 
 <67dc921f4720fdc5a33d747c9419a1fefb33e201.1602535397.git.andreyknvl@google.com>
Mime-Version: 1.0
References: <cover.1602535397.git.andreyknvl@google.com>
Subject: [PATCH v5 09/40] arm64: kasan: Align allocations for HW_TAGS
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>
Content-Type: text/plain; charset="UTF-8"
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

kasan: add hardware tag-based mode for arm64 | expand

Commit Message

Andrey Konovalov Oct. 12, 2020, 8:44 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>
---
Change-Id: I51ebd3f9645e6330e5a92973bf7c86b62d632c2b
---
 arch/arm64/include/asm/cache.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm64/include/asm/cache.h b/arch/arm64/include/asm/cache.h
index a4d1b5f771f6..151808f1f443 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
@@ -50,6 +51,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__

[v5,09/40] arm64: kasan: Align allocations for HW_TAGS

Commit Message

Patch