From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: ard.biesheuvel@linaro.org, catalin.marinas@arm.com,
james.morse@arm.com, labbott@redhat.com,
linux-kernel@vger.kernel.org, luto@amacapital.net,
mark.rutland@arm.com, matt@codeblueprint.co.uk,
will.deacon@arm.com, kernel-hardening@lists.openwall.com,
keescook@chromium.org
Subject: [PATCHv2 10/14] arm64: assembler: allow adr_this_cpu to use the stack pointer
Date: Tue, 15 Aug 2017 13:50:45 +0100 [thread overview]
Message-ID: <1502801449-29246-11-git-send-email-mark.rutland@arm.com> (raw)
In-Reply-To: <1502801449-29246-1-git-send-email-mark.rutland@arm.com>
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Given that adr_this_cpu already requires a temp register in addition
to the destination register, tweak the instruction sequence so that sp
may be used as well.
This will simplify switching to per-cpu stacks in subsequent patches. While
this limits the range of adr_this_cpu, to +/-4GiB, we don't currently use
adr_this_cpu in modules, and this is not problematic for the main kernel image.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
[Mark: add more commit text]
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Will Deacon <will.deacon@arm.com>
---
arch/arm64/include/asm/assembler.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index 610a420..2f2bd51 100644
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -230,12 +230,18 @@
.endm
/*
- * @dst: Result of per_cpu(sym, smp_processor_id())
+ * @dst: Result of per_cpu(sym, smp_processor_id()), can be SP for
+ * non-module code
* @sym: The name of the per-cpu variable
* @tmp: scratch register
*/
.macro adr_this_cpu, dst, sym, tmp
+#ifndef MODULE
+ adrp \tmp, \sym
+ add \dst, \tmp, #:lo12:\sym
+#else
adr_l \dst, \sym
+#endif
mrs \tmp, tpidr_el1
add \dst, \dst, \tmp
.endm
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: mark.rutland@arm.com (Mark Rutland)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv2 10/14] arm64: assembler: allow adr_this_cpu to use the stack pointer
Date: Tue, 15 Aug 2017 13:50:45 +0100 [thread overview]
Message-ID: <1502801449-29246-11-git-send-email-mark.rutland@arm.com> (raw)
In-Reply-To: <1502801449-29246-1-git-send-email-mark.rutland@arm.com>
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Given that adr_this_cpu already requires a temp register in addition
to the destination register, tweak the instruction sequence so that sp
may be used as well.
This will simplify switching to per-cpu stacks in subsequent patches. While
this limits the range of adr_this_cpu, to +/-4GiB, we don't currently use
adr_this_cpu in modules, and this is not problematic for the main kernel image.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
[Mark: add more commit text]
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Will Deacon <will.deacon@arm.com>
---
arch/arm64/include/asm/assembler.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index 610a420..2f2bd51 100644
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -230,12 +230,18 @@
.endm
/*
- * @dst: Result of per_cpu(sym, smp_processor_id())
+ * @dst: Result of per_cpu(sym, smp_processor_id()), can be SP for
+ * non-module code
* @sym: The name of the per-cpu variable
* @tmp: scratch register
*/
.macro adr_this_cpu, dst, sym, tmp
+#ifndef MODULE
+ adrp \tmp, \sym
+ add \dst, \tmp, #:lo12:\sym
+#else
adr_l \dst, \sym
+#endif
mrs \tmp, tpidr_el1
add \dst, \dst, \tmp
.endm
--
1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: ard.biesheuvel@linaro.org, catalin.marinas@arm.com,
james.morse@arm.com, labbott@redhat.com,
linux-kernel@vger.kernel.org, luto@amacapital.net,
mark.rutland@arm.com, matt@codeblueprint.co.uk,
will.deacon@arm.com, kernel-hardening@lists.openwall.com,
keescook@chromium.org
Subject: [kernel-hardening] [PATCHv2 10/14] arm64: assembler: allow adr_this_cpu to use the stack pointer
Date: Tue, 15 Aug 2017 13:50:45 +0100 [thread overview]
Message-ID: <1502801449-29246-11-git-send-email-mark.rutland@arm.com> (raw)
In-Reply-To: <1502801449-29246-1-git-send-email-mark.rutland@arm.com>
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Given that adr_this_cpu already requires a temp register in addition
to the destination register, tweak the instruction sequence so that sp
may be used as well.
This will simplify switching to per-cpu stacks in subsequent patches. While
this limits the range of adr_this_cpu, to +/-4GiB, we don't currently use
adr_this_cpu in modules, and this is not problematic for the main kernel image.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
[Mark: add more commit text]
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Laura Abbott <labbott@redhat.com>
Cc: Will Deacon <will.deacon@arm.com>
---
arch/arm64/include/asm/assembler.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index 610a420..2f2bd51 100644
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -230,12 +230,18 @@
.endm
/*
- * @dst: Result of per_cpu(sym, smp_processor_id())
+ * @dst: Result of per_cpu(sym, smp_processor_id()), can be SP for
+ * non-module code
* @sym: The name of the per-cpu variable
* @tmp: scratch register
*/
.macro adr_this_cpu, dst, sym, tmp
+#ifndef MODULE
+ adrp \tmp, \sym
+ add \dst, \tmp, #:lo12:\sym
+#else
adr_l \dst, \sym
+#endif
mrs \tmp, tpidr_el1
add \dst, \dst, \tmp
.endm
--
1.9.1
next prev parent reply other threads:[~2017-08-15 12:53 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-15 12:50 [PATCHv2 00/14] arm64: VMAP_STACK support Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` [PATCHv2 01/14] arm64: remove __die()'s stack dump Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` [PATCHv2 02/14] fork: allow arch-override of VMAP stack alignment Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 16:09 ` Andy Lutomirski
2017-08-15 16:09 ` [kernel-hardening] " Andy Lutomirski
2017-08-15 16:09 ` Andy Lutomirski
2017-08-15 16:30 ` Mark Rutland
2017-08-15 16:30 ` [kernel-hardening] " Mark Rutland
2017-08-15 16:30 ` Mark Rutland
2017-08-15 16:33 ` Andy Lutomirski
2017-08-15 16:33 ` [kernel-hardening] " Andy Lutomirski
2017-08-15 16:33 ` Andy Lutomirski
2017-08-15 16:39 ` Mark Rutland
2017-08-15 16:39 ` [kernel-hardening] " Mark Rutland
2017-08-15 16:39 ` Mark Rutland
2017-08-15 17:02 ` Catalin Marinas
2017-08-15 17:02 ` [kernel-hardening] " Catalin Marinas
2017-08-15 17:02 ` Catalin Marinas
2017-08-15 12:50 ` [PATCHv2 03/14] arm64: kernel: remove {THREAD,IRQ_STACK}_START_SP Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` [PATCHv2 04/14] arm64: factor out PAGE_* and CONT_* definitions Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` [PATCHv2 05/14] arm64: clean up THREAD_* definitions Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` [PATCHv2 06/14] arm64: clean up irq stack definitions Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` [PATCHv2 07/14] arm64: move SEGMENT_ALIGN to <asm/memory.h> Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` [PATCHv2 08/14] efi/arm64: add EFI_KIMG_ALIGN Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` [PATCHv2 09/14] arm64: factor out entry stack manipulation Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` Mark Rutland [this message]
2017-08-15 12:50 ` [kernel-hardening] [PATCHv2 10/14] arm64: assembler: allow adr_this_cpu to use the stack pointer Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` [PATCHv2 11/14] arm64: use an irq " Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` [PATCHv2 12/14] arm64: add basic VMAP_STACK support Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` [PATCHv2 13/14] arm64: add on_accessible_stack() Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 12:50 ` [PATCHv2 14/14] arm64: add VMAP_STACK overflow detection Mark Rutland
2017-08-15 12:50 ` [kernel-hardening] " Mark Rutland
2017-08-15 12:50 ` Mark Rutland
2017-08-15 14:00 ` [PATCHv2 00/14] arm64: VMAP_STACK support Will Deacon
2017-08-15 14:00 ` [kernel-hardening] " Will Deacon
2017-08-15 14:00 ` Will Deacon
2017-08-15 17:18 ` Laura Abbott
2017-08-15 17:18 ` [kernel-hardening] " Laura Abbott
2017-08-15 17:18 ` Laura Abbott
2017-08-15 17:39 ` Mark Rutland
2017-08-15 17:39 ` [kernel-hardening] " Mark Rutland
2017-08-15 17:39 ` Mark Rutland
2017-08-15 17:44 ` Catalin Marinas
2017-08-15 17:44 ` [kernel-hardening] " Catalin Marinas
2017-08-15 17:44 ` Catalin Marinas
2017-08-15 18:15 ` Kees Cook
2017-08-15 18:15 ` [kernel-hardening] " Kees Cook
2017-08-15 18:15 ` Kees Cook
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=1502801449-29246-11-git-send-email-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=keescook@chromium.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=labbott@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=matt@codeblueprint.co.uk \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.