From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A510AC2D0E4 for ; Thu, 19 Nov 2020 13:13:06 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1403422242 for ; Thu, 19 Nov 2020 13:13:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="skbT0O3h"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="JJVH/sy7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1403422242 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=I9L05Wyu5kwus8G1NgY58IDjb2yhZwshVlqAlQlcu8U=; b=skbT0O3h1zMciQBW5cogD23zB zxij28+3uvOK1YxSlu1D1uVre2bBpdhybEZJt6+0F722KHFE00kBGS4Jw8O+buOJVgXerlo7zPtXS 5t8MMb8LwuWBaZNi0mQgm8+yDjVJiVgIN8JZiQTlRjx95DVQ+YTgm2LMVNTG+0cBTqoDjrT6+30U0 9KtZwCYP1FX65+V6BT7yjXeS3uayB6kDi35z0e/+zpOFzOX5A05uWngPQA9f69p2FvTB8vYDgzd+s zVG9sGzhNuR+fYz4wWbhYw1FEmQGo3d6DCYoNO2r0OvCOe8Wza1GnJ8GW4RS6mvtN1v/42HQoH6H5 hSVQ5Kg4g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kfjiw-0004Ub-0l; Thu, 19 Nov 2020 13:11:42 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kfjie-0004Pn-QG for linux-arm-kernel@lists.infradead.org; Thu, 19 Nov 2020 13:11:26 +0000 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CF46B2222A; Thu, 19 Nov 2020 13:11:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605791483; bh=/KbjlQN64UwwsBKLJGp7YbJpfr+lizBmUjbVusfK52Q=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=JJVH/sy7423W9dqkPvTZEVsy/PRgJ17r7frby8ETqqQShHZuv9lHM9mOoLa6nn/sd xusHAca+4bI/APIeQI/D/U8zBZSMeEFLo4HQO2yhd+z5Ogu04pvUuA6fZVjQXQg5Bz arOa0T7fMjHGcSlNKqCOgElT8e7lHqu0iz/zRD8o= Date: Thu, 19 Nov 2020 13:11:18 +0000 From: Will Deacon To: Sami Tolvanen Subject: Re: [PATCH 2/2] arm64: scs: use vmapped IRQ and SDEI shadow stacks Message-ID: <20201119131118.GB4331@willie-the-truck> References: <20201022202355.3529836-1-samitolvanen@google.com> <20201022202355.3529836-3-samitolvanen@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201022202355.3529836-3-samitolvanen@google.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201119_081125_104497_373DE590 X-CRM114-Status: GOOD ( 25.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Kees Cook , Ard Biesheuvel , Catalin Marinas , linux-kernel@vger.kernel.org, James Morse , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Oct 22, 2020 at 01:23:55PM -0700, 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 > --- > arch/arm64/include/asm/scs.h | 21 ++++++++++- > arch/arm64/kernel/entry.S | 6 ++-- > arch/arm64/kernel/irq.c | 2 ++ > arch/arm64/kernel/scs.c | 67 +++++++++++++++++++++++++++++++++--- > arch/arm64/kernel/sdei.c | 7 ++++ > include/linux/scs.h | 8 ++--- > kernel/scs.c | 4 +-- > 7 files changed, 101 insertions(+), 14 deletions(-) > > diff --git a/arch/arm64/include/asm/scs.h b/arch/arm64/include/asm/scs.h > index eaa2cd92e4c1..e9d2c3e67ff9 100644 > --- a/arch/arm64/include/asm/scs.h > +++ b/arch/arm64/include/asm/scs.h > @@ -24,6 +24,25 @@ > .endm > #endif /* CONFIG_SHADOW_CALL_STACK */ > > -#endif /* __ASSEMBLY __ */ > +#else /* __ASSEMBLY__ */ > + > +#include > + > +#ifdef CONFIG_SHADOW_CALL_STACK > + > +extern void scs_init_irq(void); > + > +extern void scs_free_sdei(void); This is only called on the scs_init_sdei() failure path, so it can be static. But see below, because I think we should move all of these functions out of scs.c anyway. > diff --git a/arch/arm64/kernel/irq.c b/arch/arm64/kernel/irq.c > index 9cf2fb87584a..54ba3725bc0e 100644 > --- a/arch/arm64/kernel/irq.c > +++ b/arch/arm64/kernel/irq.c > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > #include > > /* Only access this in an NMI enter/exit */ > @@ -54,6 +55,7 @@ static void init_irq_stacks(void) > void __init init_IRQ(void) > { > init_irq_stacks(); > + scs_init_irq(); If we internalise this in init_irq_stacks()... > diff --git a/arch/arm64/kernel/sdei.c b/arch/arm64/kernel/sdei.c > index 7689f2031c0c..04519a7cb51d 100644 > --- a/arch/arm64/kernel/sdei.c > +++ b/arch/arm64/kernel/sdei.c > @@ -13,6 +13,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -138,6 +139,12 @@ unsigned long sdei_arch_get_entry_point(int conduit) > return 0; > } > > + if (scs_init_sdei()) { ... and this in init_sdei_stacks(), then I think we remove all of the code from arch/arm64/kernel/scs.c. > diff --git a/include/linux/scs.h b/include/linux/scs.h > index 86e3c4b7b714..6b35a83576d4 100644 > --- a/include/linux/scs.h > +++ b/include/linux/scs.h > @@ -21,13 +21,11 @@ > /* An illegal pointer value to mark the end of the shadow stack. */ > #define SCS_END_MAGIC (0x5f6UL + POISON_POINTER_DELTA) > > -/* Allocate a static per-CPU shadow stack */ > -#define DEFINE_SCS(name) \ > - DEFINE_PER_CPU(unsigned long [SCS_SIZE/sizeof(long)], name) \ > - > #define task_scs(tsk) (task_thread_info(tsk)->scs_base) > #define task_scs_sp(tsk) (task_thread_info(tsk)->scs_sp) > > +void *scs_alloc(int node); > +void scs_free(void *s); > void scs_init(void); > int scs_prepare(struct task_struct *tsk, int node); > void scs_release(struct task_struct *tsk); > @@ -56,6 +54,8 @@ static inline bool task_scs_end_corrupted(struct task_struct *tsk) > > #else /* CONFIG_SHADOW_CALL_STACK */ > > +static inline void *scs_alloc(int node) { return NULL; } > +static inline void scs_free(void *s) {} > static inline void scs_init(void) {} > static inline void scs_task_reset(struct task_struct *tsk) {} > static inline int scs_prepare(struct task_struct *tsk, int node) { return 0; } > diff --git a/kernel/scs.c b/kernel/scs.c > index 2136edba548d..8df4a92cd939 100644 > --- a/kernel/scs.c > +++ b/kernel/scs.c > @@ -24,7 +24,7 @@ static void __scs_account(void *s, int account) > #define NR_CACHED_SCS 2 > static DEFINE_PER_CPU(void *, scs_cache[NR_CACHED_SCS]); > > -static void *scs_alloc(int node) > +void *scs_alloc(int node) > { > int i; > void *s; > @@ -63,7 +63,7 @@ static void *scs_alloc(int node) > return s; > } > > -static void scs_free(void *s) > +void scs_free(void *s) Should be part of the first patch? Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel