From: Andrey Konovalov <andreyknvl@google.com>
To: Andrey Ryabinin <aryabinin@virtuozzo.com>,
Alexander Potapenko <glider@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
Jonathan Corbet <corbet@lwn.net>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>, Theodore Ts'o <tytso@mit.edu>,
Jan Kara <jack@suse.com>, Christopher Li <sparse@chrisli.org>,
Christoph Lameter <cl@linux.com>,
Pekka Enberg <penberg@kernel.org>,
David Rientjes <rientjes@google.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
Andrew Morton <akpm@linux-foundation.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Michal Marek <michal.lkml@markovi.net>,
Mark Rutland <mark.rutland@arm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Yury Norov <ynorov@caviumnetworks.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Marc Zyngier <marc.zyngier@arm.com>,
Bob Picco <bob.picco@oracle.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Kristina Martsenko <kristina.martsenko@arm.com>,
Punit Agrawal <punit.agrawal@arm.com>,
Dave Martin <Dave.Martin@arm.com>,
James Morse <james.morse@arm.com>,
Julien Thierry <julien.thierry@arm.com>,
Michael Weiser <michael.weiser@gmx.de>,
Steve Capper <steve.capper@arm.com>,
Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Sandipan Das <sandipan@linux.vnet.ibm.com>,
Paul Lawrence <paullawrence@google.com>,
David Woodhouse <dwmw@amazon.co.uk>,
Kees Cook <keescook@chromium.org>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Arnd Bergmann <arnd@arndb.de>,
kasan-dev@googlegroups.com, linux-doc@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-ext4@vger.kernel.org,
linux-sparse@vger.kernel.org, linux-mm@kvack.org,
linux-kbuild@vger.kernel.org, Kostya Serebryany <kcc@google.com>,
Evgeniy Stepanov <eugenis@google.com>,
Lee Smith <Lee.Smith@arm.com>,
Ramana Radhakrishnan <Ramana.Radhakrishnan@arm.com>,
Jacob Bramley <Jacob.Bramley@arm.com>,
Ruben Ayrapetyan <Ruben.Ayrapetyan@arm.com>,
Kees Cook <keescook@google.com>, Jann Horn <jannh@google.com>,
Mark Brand <markbrand@google.com>
Cc: Andrey Konovalov <andreyknvl@google.com>
Subject: [RFC PATCH 06/14] khwasan: enable top byte ignore for the kernel
Date: Fri, 2 Mar 2018 20:44:25 +0100 [thread overview]
Message-ID: <739eecf573b6342fc41c4f89d7f64eb8c183e312.1520017438.git.andreyknvl@google.com> (raw)
In-Reply-To: <cover.1520017438.git.andreyknvl@google.com>
In-Reply-To: <cover.1520017438.git.andreyknvl@google.com>
KHWASAN uses the Top Byte Ignore feature of arm64 CPUs to store a pointer
tag in the top byte of each pointer. This commit enables the TCR_TBI1 bit,
which enables Top Byte Ignore for the kernel, when KHWASAN is used.
---
arch/arm64/include/asm/pgtable-hwdef.h | 1 +
arch/arm64/mm/proc.S | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
index cdfe3e657a9e..ae6b6405eacc 100644
--- a/arch/arm64/include/asm/pgtable-hwdef.h
+++ b/arch/arm64/include/asm/pgtable-hwdef.h
@@ -289,6 +289,7 @@
#define TCR_A1 (UL(1) << 22)
#define TCR_ASID16 (UL(1) << 36)
#define TCR_TBI0 (UL(1) << 37)
+#define TCR_TBI1 (UL(1) << 38)
#define TCR_HA (UL(1) << 39)
#define TCR_HD (UL(1) << 40)
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index c0af47617299..b2035cfe7a3a 100644
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -41,6 +41,12 @@
/* PTWs cacheable, inner/outer WBWA */
#define TCR_CACHE_FLAGS TCR_IRGN_WBWA | TCR_ORGN_WBWA
+#ifdef CONFIG_KASAN_TAGS
+#define TCR_TBI_FLAGS (TCR_TBI0 | TCR_TBI1)
+#else
+#define TCR_TBI_FLAGS TCR_TBI0
+#endif
+
#define MAIR(attr, mt) ((attr) << ((mt) * 8))
/*
@@ -432,7 +438,7 @@ ENTRY(__cpu_setup)
* both user and kernel.
*/
ldr x10, =TCR_TxSZ(VA_BITS) | TCR_CACHE_FLAGS | TCR_SMP_FLAGS | \
- TCR_TG_FLAGS | TCR_ASID16 | TCR_TBI0 | TCR_A1
+ TCR_TG_FLAGS | TCR_ASID16 | TCR_TBI_FLAGS | TCR_A1
tcr_set_idmap_t0sz x10, x9
/*
--
2.16.2.395.g2e18187dfd-goog
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2018-03-02 19:45 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-02 19:44 [RFC PATCH 00/14] khwasan: kernel hardware assisted address sanitizer Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 01/14] khwasan: change kasan hooks signatures Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 02/14] khwasan: move common kasan and khwasan code to common.c Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 03/14] khwasan: add CONFIG_KASAN_CLASSIC and CONFIG_KASAN_TAGS Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 04/14] khwasan: adjust shadow size for CONFIG_KASAN_TAGS Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 05/14] khwasan: initialize shadow to 0xff Andrey Konovalov
2018-03-02 21:55 ` Evgenii Stepanov
2018-03-02 19:44 ` Andrey Konovalov [this message]
2018-03-05 14:29 ` [RFC PATCH 06/14] khwasan: enable top byte ignore for the kernel Mark Rutland
2018-03-09 18:15 ` Andrey Konovalov
2018-03-05 14:36 ` Mark Rutland
2018-03-06 14:24 ` Marc Zyngier
2018-03-09 18:21 ` Andrey Konovalov
2018-03-09 18:32 ` Marc Zyngier
2018-03-09 18:42 ` Andrey Konovalov
2018-03-09 19:06 ` Marc Zyngier
2018-03-09 19:16 ` Mark Rutland
2018-03-09 19:14 ` Mark Rutland
2018-03-09 18:17 ` Andrey Konovalov
2018-03-09 18:59 ` Mark Rutland
2018-03-02 19:44 ` [RFC PATCH 07/14] khwasan: add tag related helper functions Andrey Konovalov
2018-03-05 14:32 ` Mark Rutland
2018-03-06 18:31 ` Andrey Konovalov
2018-03-07 18:16 ` Christopher Lameter
2018-03-08 9:09 ` Dmitry Vyukov
2018-03-08 11:20 ` Mark Rutland
2018-03-02 19:44 ` [RFC PATCH 08/14] khwasan: perform untagged pointers comparison in krealloc Andrey Konovalov
2018-03-05 14:39 ` Mark Rutland
2018-03-06 18:33 ` Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 09/14] khwasan: add hooks implementation Andrey Konovalov
2018-03-05 14:44 ` Mark Rutland
2018-03-06 18:38 ` Andrey Konovalov
2018-03-08 11:25 ` Mark Rutland
2018-03-09 18:10 ` Andrey Konovalov
2018-03-13 15:05 ` Alexander Potapenko
2018-03-13 17:00 ` Andrey Konovalov
2018-03-15 16:52 ` Andrey Ryabinin
2018-03-16 18:09 ` Andrey Konovalov
2018-03-16 18:16 ` Evgenii Stepanov
2018-03-16 18:24 ` Andrey Konovalov
2018-03-16 18:45 ` Evgenii Stepanov
2018-03-16 19:06 ` Andrey Konovalov
2018-03-16 20:21 ` Evgenii Stepanov
2018-03-20 0:44 ` Anthony Yznaga
2018-03-20 13:43 ` Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 10/14] khwasan: add bug reporting routines Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 11/14] khwasan: add brk handler for inline instrumentation Andrey Konovalov
2018-03-05 14:51 ` Mark Rutland
2018-03-23 15:59 ` Andrey Konovalov
2018-03-24 3:42 ` Ard Biesheuvel
2018-03-26 9:36 ` Mark Rutland
2018-03-27 13:03 ` Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 12/14] khwasan, jbd2: add khwasan annotations Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 13/14] khwasan: update kasan documentation Andrey Konovalov
2018-03-02 19:44 ` [RFC PATCH 14/14] khwasan: default the instrumentation mode to inline Andrey Konovalov
2018-03-05 14:54 ` Mark Rutland
2018-03-09 18:06 ` Andrey Konovalov
2018-03-09 19:18 ` Mark Rutland
2018-03-12 13:10 ` Andrey Konovalov
2018-03-13 14:44 ` Alexander Potapenko
2018-03-13 16:49 ` Andrey Konovalov
2018-03-04 9:16 ` [RFC PATCH 00/14] khwasan: kernel hardware assisted address sanitizer Geert Uytterhoeven
2018-03-04 11:44 ` Ingo Molnar
2018-03-04 15:49 ` Geert Uytterhoeven
2018-03-06 18:21 ` 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=739eecf573b6342fc41c4f89d7f64eb8c183e312.1520017438.git.andreyknvl@google.com \
--to=andreyknvl@google.com \
--cc=Dave.Martin@arm.com \
--cc=Jacob.Bramley@arm.com \
--cc=Lee.Smith@arm.com \
--cc=Ramana.Radhakrishnan@arm.com \
--cc=Ruben.Ayrapetyan@arm.com \
--cc=akpm@linux-foundation.org \
--cc=ard.biesheuvel@linaro.org \
--cc=arnd@arndb.de \
--cc=aryabinin@virtuozzo.com \
--cc=bob.picco@oracle.com \
--cc=catalin.marinas@arm.com \
--cc=cl@linux.com \
--cc=corbet@lwn.net \
--cc=dvyukov@google.com \
--cc=dwmw@amazon.co.uk \
--cc=eugenis@google.com \
--cc=geert@linux-m68k.org \
--cc=glider@google.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=jack@suse.com \
--cc=james.morse@arm.com \
--cc=jannh@google.com \
--cc=jpoimboe@redhat.com \
--cc=julien.thierry@arm.com \
--cc=kasan-dev@googlegroups.com \
--cc=kcc@google.com \
--cc=keescook@chromium.org \
--cc=keescook@google.com \
--cc=kristina.martsenko@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-sparse@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=mark.rutland@arm.com \
--cc=markbrand@google.com \
--cc=michael.weiser@gmx.de \
--cc=michal.lkml@markovi.net \
--cc=mingo@kernel.org \
--cc=ndesaulniers@google.com \
--cc=paullawrence@google.com \
--cc=penberg@kernel.org \
--cc=punit.agrawal@arm.com \
--cc=rientjes@google.com \
--cc=sandipan@linux.vnet.ibm.com \
--cc=sparse@chrisli.org \
--cc=steve.capper@arm.com \
--cc=suzuki.poulose@arm.com \
--cc=tglx@linutronix.de \
--cc=tytso@mit.edu \
--cc=will.deacon@arm.com \
--cc=yamada.masahiro@socionext.com \
--cc=ynorov@caviumnetworks.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