From: Will Deacon <will@kernel.org>
To: Sami Tolvanen <samitolvanen@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>,
Kees Cook <keescook@chromium.org>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Catalin Marinas <catalin.marinas@arm.com>,
linux-kernel@vger.kernel.org, James Morse <james.morse@arm.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2 2/2] arm64: scs: use vmapped IRQ and SDEI shadow stacks
Date: Mon, 30 Nov 2020 11:49:40 +0000 [thread overview]
Message-ID: <20201130114940.GB24563@willie-the-truck> (raw)
In-Reply-To: <20201124195940.27061-3-samitolvanen@google.com>
On Tue, Nov 24, 2020 at 11:59:40AM -0800, Sami Tolvanen wrote:
> Use scs_alloc() to allocate also IRQ and SDEI shadow stacks instead of
> using statically allocated stacks.
>
> Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
> ---
> arch/arm64/kernel/Makefile | 1 -
> arch/arm64/kernel/entry.S | 6 ++--
> arch/arm64/kernel/irq.c | 19 ++++++++++
> arch/arm64/kernel/scs.c | 16 ---------
> arch/arm64/kernel/sdei.c | 71 +++++++++++++++++++++++++++++++-------
> include/linux/scs.h | 4 ---
> 6 files changed, 81 insertions(+), 36 deletions(-)
> delete mode 100644 arch/arm64/kernel/scs.c
[...]
> @@ -70,18 +97,40 @@ static int _init_sdei_stack(unsigned long * __percpu *ptr, int cpu)
> return 0;
> }
>
> +static int _init_sdei_scs(unsigned long * __percpu *ptr, int cpu)
> +{
> + void *s;
> +
> + s = scs_alloc(cpu_to_node(cpu));
> + if (!s)
> + return -ENOMEM;
> + per_cpu(*ptr, cpu) = s;
> +
> + return 0;
> +}
> +
> static int init_sdei_stacks(void)
> {
> int cpu;
> int err = 0;
>
> for_each_possible_cpu(cpu) {
> - err = _init_sdei_stack(&sdei_stack_normal_ptr, cpu);
> - if (err)
> - break;
> - err = _init_sdei_stack(&sdei_stack_critical_ptr, cpu);
> - if (err)
> - break;
> + if (IS_ENABLED(CONFIG_VMAP_STACK)) {
> + err = _init_sdei_stack(&sdei_stack_normal_ptr, cpu);
> + if (err)
> + break;
> + err = _init_sdei_stack(&sdei_stack_critical_ptr, cpu);
> + if (err)
> + break;
> + }
> + if (IS_ENABLED(CONFIG_SHADOW_CALL_STACK)) {
> + err = _init_sdei_scs(&sdei_shadow_call_stack_normal_ptr, cpu);
> + if (err)
> + break;
> + err = _init_sdei_scs(&sdei_shadow_call_stack_critical_ptr, cpu);
> + if (err)
> + break;
This looks ok to me, but I think it would be better to follow the same
approach as you have for the IRQ stacks and instead have a separate
init_sdei_scs() function (similarly for the free() path), which means
you can simply the IS_ENABLED() checks too.
Either way:
Acked-by: Will Deacon <will@kernel.org>
Will
_______________________________________________
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-11-30 11:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 19:59 [PATCH v2 0/2] scs: switch to vmapped shadow stacks Sami Tolvanen
2020-11-24 19:59 ` [PATCH v2 1/2] " Sami Tolvanen
2020-11-24 22:04 ` Kees Cook
2020-11-30 11:44 ` Will Deacon
2020-11-30 20:03 ` Sami Tolvanen
2020-11-24 19:59 ` [PATCH v2 2/2] arm64: scs: use vmapped IRQ and SDEI " Sami Tolvanen
2020-11-30 11:49 ` Will Deacon [this message]
2020-11-30 21:13 ` Sami Tolvanen
2020-12-01 10:18 ` Will Deacon
2020-12-01 10:26 ` Will Deacon
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=20201130114940.GB24563@willie-the-truck \
--to=will@kernel.org \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=samitolvanen@google.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