linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
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: 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,
	 Andrey Konovalov <andreyknvl@google.com>
Subject: [PATCH v3 24/39] arm64: mte: Add in-kernel MTE helpers
Date: Fri, 25 Sep 2020 00:50:31 +0200	[thread overview]
Message-ID: <ae603463aed82bdff74942f23338a681b8ed8820.1600987622.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1600987622.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-kasan.h | 60 ++++++++++++++++++++++++++++++
 arch/arm64/include/asm/mte.h       | 17 ++++++---
 arch/arm64/kernel/mte.c            | 44 ++++++++++++++++++++++
 arch/arm64/lib/mte.S               | 19 ++++++++++
 5 files changed, 135 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm64/include/asm/mte-kasan.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-kasan.h b/arch/arm64/include/asm/mte-kasan.h
new file mode 100644
index 000000000000..b0f27de8de33
--- /dev/null
+++ b/arch/arm64/include/asm/mte-kasan.h
@@ -0,0 +1,60 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (C) 2020 ARM Ltd.
+ */
+#ifndef __ASM_MTE_ASM_H
+#define __ASM_MTE_ASM_H
+
+#include <asm/compiler.h>
+
+#define __MTE_PREAMBLE		ARM64_ASM_PREAMBLE ".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
+
+static inline u8 mte_get_ptr_tag(void *ptr)
+{
+	u8 tag = (u8)(((u64)(ptr)) >> MTE_TAG_SHIFT);
+
+	return tag;
+}
+
+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 */
+
+static inline u8 mte_get_ptr_tag(void *ptr)
+{
+	return 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..3a2bf3ccb26c 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-kasan.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..833b63fdd5e2 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,48 @@ int memcmp_pages(struct page *page1, struct page *page2)
 	return ret;
 }
 
+u8 mte_get_mem_tag(void *addr)
+{
+	if (!system_supports_mte())
+		return 0xFF;
+
+	asm volatile(__MTE_PREAMBLE "ldg %0, [%0]"
+		    : "+r" (addr));
+
+	return 0xF0 | mte_get_ptr_tag(addr);
+}
+
+u8 mte_get_random_tag(void)
+{
+	void *addr;
+
+	if (!system_supports_mte())
+		return 0xFF;
+
+	asm volatile(__MTE_PREAMBLE "irg %0, %0"
+		    : "+r" (addr));
+
+	return 0xF0 | mte_get_ptr_tag(addr);
+}
+
+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;
+	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..aa0ab01252fe 100644
--- a/arch/arm64/lib/mte.S
+++ b/arch/arm64/lib/mte.S
@@ -149,3 +149,22 @@ 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
+	/* if (size == 0) return; */
+	cbz	x1, 2f
+1:	stg	x0, [x0]
+	add	x0, x0, #MTE_GRANULE_SIZE
+	subs	x1, x1, #MTE_GRANULE_SIZE
+	b.gt	1b
+2:	ret
+SYM_FUNC_END(mte_assign_mem_tag_range)
-- 
2.28.0.681.g6f77f65b4e-goog



  parent reply	other threads:[~2020-09-24 22:51 UTC|newest]

Thread overview: 88+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-24 22:50 [PATCH v3 00/39] kasan: add hardware tag-based mode for arm64 Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 01/39] kasan: drop unnecessary GPL text from comment headers Andrey Konovalov
2020-10-01 17:18   ` elver
2020-09-24 22:50 ` [PATCH v3 02/39] kasan: KASAN_VMALLOC depends on KASAN_GENERIC Andrey Konovalov
2020-10-01 17:19   ` elver
2020-09-24 22:50 ` [PATCH v3 03/39] kasan: group vmalloc code Andrey Konovalov
2020-10-01 17:27   ` elver
2020-09-24 22:50 ` [PATCH v3 04/39] kasan: shadow declarations only for software modes Andrey Konovalov
2020-10-01 17:29   ` elver
2020-09-24 22:50 ` [PATCH v3 05/39] kasan: rename (un)poison_shadow to (un)poison_memory Andrey Konovalov
2020-10-01 17:29   ` elver
2020-09-24 22:50 ` [PATCH v3 06/39] kasan: rename KASAN_SHADOW_* to KASAN_GRANULE_* Andrey Konovalov
2020-10-01 17:30   ` elver
2020-09-24 22:50 ` [PATCH v3 07/39] kasan: only build init.c for software modes Andrey Konovalov
2020-10-01 17:31   ` elver
2020-09-24 22:50 ` [PATCH v3 08/39] kasan: split out shadow.c from common.c Andrey Konovalov
2020-10-01 17:32   ` elver
2020-09-24 22:50 ` [PATCH v3 09/39] kasan: define KASAN_GRANULE_PAGE Andrey Konovalov
2020-10-01 17:33   ` elver
2020-09-24 22:50 ` [PATCH v3 10/39] kasan: rename report and tags files Andrey Konovalov
2020-10-01 17:36   ` elver
2020-09-24 22:50 ` [PATCH v3 11/39] kasan: don't duplicate config dependencies Andrey Konovalov
2020-10-01 17:39   ` elver
2020-10-01 21:54     ` Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 12/39] kasan: hide invalid free check implementation Andrey Konovalov
2020-10-01 17:41   ` elver
2020-09-24 22:50 ` [PATCH v3 13/39] kasan: decode stack frame only with KASAN_STACK_ENABLE Andrey Konovalov
2020-10-01 17:43   ` elver
2020-09-24 22:50 ` [PATCH v3 14/39] kasan, arm64: only init shadow for software modes Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 15/39] kasan, arm64: only use kasan_depth " Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 16/39] kasan: rename addr_has_shadow to addr_has_metadata Andrey Konovalov
2020-10-01 17:45   ` elver
2020-09-24 22:50 ` [PATCH v3 17/39] kasan: rename print_shadow_for_address to print_memory_metadata Andrey Konovalov
2020-10-01 17:45   ` elver
2020-09-24 22:50 ` [PATCH v3 18/39] kasan: kasan_non_canonical_hook only for software modes Andrey Konovalov
2020-10-01 17:47   ` elver
2020-09-24 22:50 ` [PATCH v3 19/39] kasan: rename SHADOW layout macros to META Andrey Konovalov
2020-10-01 17:48   ` elver
2020-09-24 22:50 ` [PATCH v3 20/39] kasan: separate metadata_fetch_row for each mode Andrey Konovalov
2020-10-01 17:54   ` elver
2020-10-01 21:56     ` Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 21/39] kasan: don't allow SW_TAGS with ARM64_MTE Andrey Konovalov
2020-10-01 17:55   ` elver
2020-10-01 21:57     ` Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 22/39] kasan: introduce CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-10-01 17:57   ` elver
2020-09-24 22:50 ` [PATCH v3 23/39] arm64: Enable armv8.5-a asm-arch option Andrey Konovalov
2020-09-25 10:16   ` Catalin Marinas
2020-09-24 22:50 ` Andrey Konovalov [this message]
2020-09-25 10:15   ` [PATCH v3 24/39] arm64: mte: Add in-kernel MTE helpers Catalin Marinas
2020-09-25 11:28     ` Vincenzo Frascino
2020-09-25 12:50       ` Catalin Marinas
2020-09-25 13:36         ` Vincenzo Frascino
2020-09-24 22:50 ` [PATCH v3 25/39] arm64: kasan: Add arch layer for memory tagging helpers Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 26/39] arm64: mte: Add in-kernel tag fault handler Andrey Konovalov
2020-09-25 10:49   ` Catalin Marinas
2020-09-25 11:26     ` Andrey Konovalov
2020-09-25 11:47       ` Catalin Marinas
2020-09-25 11:52         ` Andrey Konovalov
2020-09-25 12:35           ` Catalin Marinas
2020-09-25 12:35   ` Catalin Marinas
2020-09-24 22:50 ` [PATCH v3 27/39] arm64: kasan: Enable in-kernel MTE Andrey Konovalov
2020-09-25 11:14   ` Catalin Marinas
2020-09-24 22:50 ` [PATCH v3 28/39] arm64: mte: Convert gcr_user into an exclude mask Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 29/39] arm64: mte: Switch GCR_EL1 in kernel entry and exit Andrey Konovalov
2020-09-25 11:34   ` Catalin Marinas
2020-09-25 11:50     ` Vincenzo Frascino
2020-09-25 12:38       ` Catalin Marinas
2020-09-24 22:50 ` [PATCH v3 30/39] arm64: kasan: Enable TBI EL1 Andrey Konovalov
2020-09-25 11:37   ` Catalin Marinas
2020-09-25 11:47     ` Vincenzo Frascino
2020-09-24 22:50 ` [PATCH v3 31/39] arm64: kasan: Align allocations for HW_TAGS Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 32/39] kasan: define KASAN_GRANULE_SIZE " Andrey Konovalov
2020-10-01 17:58   ` elver
2020-10-01 21:59     ` Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 33/39] kasan, x86, s390: update undef CONFIG_KASAN Andrey Konovalov
2020-10-01 17:59   ` elver
2020-09-24 22:50 ` [PATCH v3 34/39] kasan, arm64: expand CONFIG_KASAN checks Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 35/39] kasan, arm64: implement HW_TAGS runtime Andrey Konovalov
2020-10-01 18:00   ` elver
2020-09-24 22:50 ` [PATCH v3 36/39] kasan, arm64: print report from tag fault handler Andrey Konovalov
2020-09-25 11:39   ` Catalin Marinas
2020-09-24 22:50 ` [PATCH v3 37/39] kasan, slub: reset tags when accessing metadata Andrey Konovalov
2020-10-01 18:03   ` elver
2020-10-01 22:00     ` Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 38/39] kasan, arm64: enable CONFIG_KASAN_HW_TAGS Andrey Konovalov
2020-09-24 22:50 ` [PATCH v3 39/39] kasan: add documentation for hardware tag-based mode Andrey Konovalov
2020-10-01 18:03   ` elver

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=ae603463aed82bdff74942f23338a681b8ed8820.1600987622.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).