From: Andrey Konovalov <andreyknvl@google.com>
To: Dmitry Vyukov <dvyukov@google.com>,
Vincenzo Frascino <vincenzo.frascino@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
kasan-dev@googlegroups.com
Cc: Marco Elver <elver@google.com>,
Elena Petrova <lenaptr@google.com>,
Andrey Konovalov <andreyknvl@google.com>,
Kevin Brodsky <kevin.brodsky@arm.com>,
Will Deacon <will.deacon@arm.com>,
Branislav Rankov <Branislav.Rankov@arm.com>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
Alexander Potapenko <glider@google.com>,
linux-arm-kernel@lists.infradead.org,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
Andrew Morton <akpm@linux-foundation.org>,
Evgenii Stepanov <eugenis@google.com>
Subject: [PATCH v2 22/37] arm64: mte: Add in-kernel MTE helpers
Date: Tue, 15 Sep 2020 23:16:04 +0200 [thread overview]
Message-ID: <4ac1ed624dd1b0851d8cf2861b4f4aac4d2dbc83.1600204505.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1600204505.git.andreyknvl@google.com>
From: Vincenzo Frascino <vincenzo.frascino@arm.com>
Provide helper functions to manipulate allocation and pointer tags for
kernel addresses.
Low-level helper functions (mte_assign_*, written in assembly) operate
tag values from the [0x0, 0xF] range. High-level helper functions
(mte_get/set_*) use the [0xF0, 0xFF] range to preserve compatibility
with normal kernel pointers that have 0xFF in their top byte.
MTE_GRANULE_SIZE and related definitions are moved to mte-def.h header
that doesn't have any dependencies and is safe to include into any
low-level header.
Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
Co-developed-by: Andrey Konovalov <andreyknvl@google.com>
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
Change-Id: I1b5230254f90dc21a913447cb17f07fea7944ece
---
arch/arm64/include/asm/esr.h | 1 +
arch/arm64/include/asm/mte-helpers.h | 48 ++++++++++++++++++++++++++++
arch/arm64/include/asm/mte.h | 17 ++++++----
arch/arm64/kernel/mte.c | 48 ++++++++++++++++++++++++++++
arch/arm64/lib/mte.S | 17 ++++++++++
5 files changed, 125 insertions(+), 6 deletions(-)
create mode 100644 arch/arm64/include/asm/mte-helpers.h
diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h
index 035003acfa87..bc0dc66a6a27 100644
--- a/arch/arm64/include/asm/esr.h
+++ b/arch/arm64/include/asm/esr.h
@@ -103,6 +103,7 @@
#define ESR_ELx_FSC (0x3F)
#define ESR_ELx_FSC_TYPE (0x3C)
#define ESR_ELx_FSC_EXTABT (0x10)
+#define ESR_ELx_FSC_MTE (0x11)
#define ESR_ELx_FSC_SERROR (0x11)
#define ESR_ELx_FSC_ACCESS (0x08)
#define ESR_ELx_FSC_FAULT (0x04)
diff --git a/arch/arm64/include/asm/mte-helpers.h b/arch/arm64/include/asm/mte-helpers.h
new file mode 100644
index 000000000000..5dc2d443851b
--- /dev/null
+++ b/arch/arm64/include/asm/mte-helpers.h
@@ -0,0 +1,48 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2020 ARM Ltd.
+ */
+#ifndef __ASM_MTE_ASM_H
+#define __ASM_MTE_ASM_H
+
+#define __MTE_PREAMBLE ".arch armv8.5-a\n.arch_extension memtag\n"
+
+#define MTE_GRANULE_SIZE UL(16)
+#define MTE_GRANULE_MASK (~(MTE_GRANULE_SIZE - 1))
+#define MTE_TAG_SHIFT 56
+#define MTE_TAG_SIZE 4
+#define MTE_TAG_MASK GENMASK((MTE_TAG_SHIFT + (MTE_TAG_SIZE - 1)), MTE_TAG_SHIFT)
+#define MTE_TAG_MAX (MTE_TAG_MASK >> MTE_TAG_SHIFT)
+
+#ifndef __ASSEMBLY__
+
+#include <linux/types.h>
+
+#ifdef CONFIG_ARM64_MTE
+
+#define mte_get_ptr_tag(ptr) ((u8)(((u64)(ptr)) >> MTE_TAG_SHIFT))
+u8 mte_get_mem_tag(void *addr);
+u8 mte_get_random_tag(void);
+void *mte_set_mem_tag_range(void *addr, size_t size, u8 tag);
+
+#else /* CONFIG_ARM64_MTE */
+
+#define mte_get_ptr_tag(ptr) 0xFF
+static inline u8 mte_get_mem_tag(void *addr)
+{
+ return 0xFF;
+}
+static inline u8 mte_get_random_tag(void)
+{
+ return 0xFF;
+}
+static inline void *mte_set_mem_tag_range(void *addr, size_t size, u8 tag)
+{
+ return addr;
+}
+
+#endif /* CONFIG_ARM64_MTE */
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* __ASM_MTE_ASM_H */
diff --git a/arch/arm64/include/asm/mte.h b/arch/arm64/include/asm/mte.h
index 1c99fcadb58c..82cd7c89edec 100644
--- a/arch/arm64/include/asm/mte.h
+++ b/arch/arm64/include/asm/mte.h
@@ -5,14 +5,13 @@
#ifndef __ASM_MTE_H
#define __ASM_MTE_H
-#define MTE_GRANULE_SIZE UL(16)
-#define MTE_GRANULE_MASK (~(MTE_GRANULE_SIZE - 1))
-#define MTE_TAG_SHIFT 56
-#define MTE_TAG_SIZE 4
+#include <asm/mte-helpers.h>
#ifndef __ASSEMBLY__
+#include <linux/bitfield.h>
#include <linux/page-flags.h>
+#include <linux/types.h>
#include <asm/pgtable-types.h>
@@ -45,7 +44,9 @@ long get_mte_ctrl(struct task_struct *task);
int mte_ptrace_copy_tags(struct task_struct *child, long request,
unsigned long addr, unsigned long data);
-#else
+void mte_assign_mem_tag_range(void *addr, size_t size);
+
+#else /* CONFIG_ARM64_MTE */
/* unused if !CONFIG_ARM64_MTE, silence the compiler */
#define PG_mte_tagged 0
@@ -80,7 +81,11 @@ static inline int mte_ptrace_copy_tags(struct task_struct *child,
return -EIO;
}
-#endif
+static inline void mte_assign_mem_tag_range(void *addr, size_t size)
+{
+}
+
+#endif /* CONFIG_ARM64_MTE */
#endif /* __ASSEMBLY__ */
#endif /* __ASM_MTE_H */
diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c
index 52a0638ed967..e238ffde2679 100644
--- a/arch/arm64/kernel/mte.c
+++ b/arch/arm64/kernel/mte.c
@@ -13,8 +13,10 @@
#include <linux/swap.h>
#include <linux/swapops.h>
#include <linux/thread_info.h>
+#include <linux/types.h>
#include <linux/uio.h>
+#include <asm/barrier.h>
#include <asm/cpufeature.h>
#include <asm/mte.h>
#include <asm/ptrace.h>
@@ -72,6 +74,52 @@ int memcmp_pages(struct page *page1, struct page *page2)
return ret;
}
+u8 mte_get_mem_tag(void *addr)
+{
+ if (system_supports_mte())
+ asm volatile(ALTERNATIVE("ldr %0, [%0]",
+ __MTE_PREAMBLE "ldg %0, [%0]",
+ ARM64_MTE)
+ : "+r" (addr));
+
+ return 0xF0 | mte_get_ptr_tag(addr);
+}
+
+u8 mte_get_random_tag(void)
+{
+ u8 tag = 0xF;
+ u64 addr = 0;
+
+ if (system_supports_mte()) {
+ asm volatile(ALTERNATIVE("add %0, %0, %0",
+ __MTE_PREAMBLE "irg %0, %0",
+ ARM64_MTE)
+ : "+r" (addr));
+
+ tag = mte_get_ptr_tag(addr);
+ }
+
+ return 0xF0 | tag;
+}
+
+void *mte_set_mem_tag_range(void *addr, size_t size, u8 tag)
+{
+ void *ptr = addr;
+
+ if ((!system_supports_mte()) || (size == 0))
+ return addr;
+
+ /* Make sure that size is aligned. */
+ WARN_ON(size & (MTE_GRANULE_SIZE - 1));
+
+ tag = 0xF0 | (tag & 0xF);
+ ptr = (void *)__tag_set(ptr, tag);
+
+ mte_assign_mem_tag_range(ptr, size);
+
+ return ptr;
+}
+
static void update_sctlr_el1_tcf0(u64 tcf0)
{
/* ISB required for the kernel uaccess routines */
diff --git a/arch/arm64/lib/mte.S b/arch/arm64/lib/mte.S
index 03ca6d8b8670..cc2c3a378c00 100644
--- a/arch/arm64/lib/mte.S
+++ b/arch/arm64/lib/mte.S
@@ -149,3 +149,20 @@ SYM_FUNC_START(mte_restore_page_tags)
ret
SYM_FUNC_END(mte_restore_page_tags)
+
+/*
+ * Assign allocation tags for a region of memory based on the pointer tag
+ * x0 - source pointer
+ * x1 - size
+ *
+ * Note: size must be non-zero and MTE_GRANULE_SIZE aligned
+ */
+SYM_FUNC_START(mte_assign_mem_tag_range)
+ /* if (src == NULL) return; */
+ cbz x0, 2f
+1: stg x0, [x0]
+ add x0, x0, #MTE_GRANULE_SIZE
+ sub x1, x1, #MTE_GRANULE_SIZE
+ cbnz x1, 1b
+2: ret
+SYM_FUNC_END(mte_assign_mem_tag_range)
--
2.28.0.618.gf4bc123cb7-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-09-15 21:25 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-15 21:15 [PATCH v2 00/37] kasan: add hardware tag-based mode for arm64 Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 01/37] kasan: KASAN_VMALLOC depends on KASAN_GENERIC Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 02/37] kasan: group vmalloc code Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 03/37] kasan: shadow declarations only for software modes Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 04/37] kasan: rename (un)poison_shadow to (un)poison_memory Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 05/37] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* Andrey Konovalov
2020-09-18 8:04 ` Alexander Potapenko
2020-09-18 10:42 ` Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 06/37] kasan: only build init.c for software modes Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 07/37] kasan: split out shadow.c from common.c Andrey Konovalov
2020-09-18 8:17 ` Alexander Potapenko
2020-09-18 10:39 ` Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 08/37] kasan: rename generic/tags_report.c files Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 09/37] kasan: don't duplicate config dependencies Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 10/37] kasan: hide invalid free check implementation Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 11/37] kasan: decode stack frame only with KASAN_STACK_ENABLE Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 12/37] kasan, arm64: only init shadow for software modes Andrey Konovalov
2020-09-17 17:05 ` Catalin Marinas
2020-09-15 21:15 ` [PATCH v2 13/37] kasan, arm64: only use kasan_depth " Andrey Konovalov
2020-09-17 17:05 ` Catalin Marinas
2020-09-15 21:15 ` [PATCH v2 14/37] kasan: rename addr_has_shadow to addr_has_metadata Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 15/37] kasan: rename print_shadow_for_address to print_memory_metadata Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 16/37] kasan: kasan_non_canonical_hook only for software modes Andrey Konovalov
2020-09-15 21:15 ` [PATCH v2 17/37] kasan: rename SHADOW layout macros to META Andrey Konovalov
2020-09-15 21:16 ` [PATCH v2 18/37] kasan: separate metadata_fetch_row for each mode Andrey Konovalov
2020-09-15 21:16 ` [PATCH v2 19/37] kasan: don't allow SW_TAGS with ARM64_MTE Andrey Konovalov
2020-09-17 17:05 ` Catalin Marinas
2020-09-15 21:16 ` [PATCH v2 20/37] kasan: rename tags.c to tags_sw.c Andrey Konovalov
2020-09-18 9:41 ` Alexander Potapenko
2020-09-18 9:44 ` Alexander Potapenko
2020-09-18 9:46 ` Alexander Potapenko
2020-09-18 10:42 ` Andrey Konovalov
2020-09-15 21:16 ` [PATCH v2 21/37] kasan: introduce CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-09-18 12:32 ` Marco Elver
2020-09-18 15:06 ` Andrey Konovalov
2020-09-18 15:36 ` Marco Elver
2020-09-18 15:45 ` Andrey Konovalov
2020-09-15 21:16 ` Andrey Konovalov [this message]
2020-09-17 13:46 ` [PATCH v2 22/37] arm64: mte: Add in-kernel MTE helpers Catalin Marinas
2020-09-17 14:21 ` Vincenzo Frascino
2020-09-18 9:36 ` Catalin Marinas
2020-09-22 10:16 ` Vincenzo Frascino
2020-09-17 16:17 ` Vincenzo Frascino
2020-09-17 17:07 ` Catalin Marinas
2020-09-15 21:16 ` [PATCH v2 23/37] arm64: kasan: Add arch layer for memory tagging helpers Andrey Konovalov
2020-09-17 17:05 ` Catalin Marinas
2020-09-18 13:00 ` Marco Elver
2020-09-18 14:56 ` Andrey Konovalov
2020-09-15 21:16 ` [PATCH v2 24/37] arm64: mte: Add in-kernel tag fault handler Andrey Konovalov
2020-09-17 14:03 ` Catalin Marinas
2020-09-17 14:24 ` Vincenzo Frascino
2020-09-17 14:59 ` Catalin Marinas
2020-09-15 21:16 ` [PATCH v2 25/37] arm64: kasan: Enable in-kernel MTE Andrey Konovalov
2020-09-17 16:35 ` Catalin Marinas
2020-09-15 21:16 ` [PATCH v2 26/37] arm64: mte: Convert gcr_user into an exclude mask Andrey Konovalov
2020-09-17 17:06 ` Catalin Marinas
2020-09-15 21:16 ` [PATCH v2 27/37] arm64: mte: Switch GCR_EL1 in kernel entry and exit Andrey Konovalov
2020-09-17 16:52 ` Catalin Marinas
2020-09-17 16:58 ` Catalin Marinas
2020-09-17 18:47 ` Vincenzo Frascino
2020-09-18 9:39 ` Catalin Marinas
2020-09-15 21:16 ` [PATCH v2 28/37] arm64: kasan: Enable TBI EL1 Andrey Konovalov
2020-09-17 16:54 ` Catalin Marinas
2020-09-15 21:16 ` [PATCH v2 29/37] arm64: kasan: Align allocations for HW_TAGS Andrey Konovalov
2020-09-17 17:06 ` Catalin Marinas
2020-09-15 21:16 ` [PATCH v2 30/37] kasan: define KASAN_GRANULE_SIZE " Andrey Konovalov
2020-09-15 21:16 ` [PATCH v2 31/37] kasan, x86, s390: update undef CONFIG_KASAN Andrey Konovalov
2020-09-18 10:52 ` Marco Elver
2020-09-18 15:07 ` Andrey Konovalov
2020-09-24 21:35 ` Andrey Konovalov
2020-09-15 21:16 ` [PATCH v2 32/37] kasan, arm64: expand CONFIG_KASAN checks Andrey Konovalov
2020-09-17 17:06 ` Catalin Marinas
2020-09-15 21:16 ` [PATCH v2 33/37] kasan, arm64: implement HW_TAGS runtime Andrey Konovalov
2020-09-17 17:06 ` Catalin Marinas
2020-09-18 10:46 ` Marco Elver
2020-09-18 12:28 ` Andrey Konovalov
2020-09-18 12:52 ` Marco Elver
2020-09-18 15:00 ` Andrey Konovalov
2020-09-18 15:19 ` Marco Elver
2020-09-18 15:52 ` Andrey Konovalov
2020-09-15 21:16 ` [PATCH v2 34/37] kasan, arm64: print report from tag fault handler Andrey Konovalov
2020-09-17 17:04 ` Catalin Marinas
2020-09-18 12:26 ` Andrey Konovalov
2020-09-15 21:16 ` [PATCH v2 35/37] kasan, slub: reset tags when accessing metadata Andrey Konovalov
2020-09-18 14:44 ` Marco Elver
2020-09-18 14:55 ` Andrey Konovalov
2020-09-18 15:29 ` Catalin Marinas
2020-09-15 21:16 ` [PATCH v2 36/37] kasan, arm64: enable CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-09-17 17:04 ` Catalin Marinas
2020-09-15 21:16 ` [PATCH v2 37/37] 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=4ac1ed624dd1b0851d8cf2861b4f4aac4d2dbc83.1600204505.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: 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).