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=-17.0 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=ham 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 416E6C64E8A for ; Mon, 30 Nov 2020 11:50:58 +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 C455B2074A for ; Mon, 30 Nov 2020 11:50:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="SgeDIetF"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ds2NevWQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C455B2074A 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=tGVYcJa1ml6+6RtMQMNO5mo+DDemFe74nPdIUmB4HG8=; b=SgeDIetF8iuKqF+kMgx8mDTnC abu6HDC/YVfjAnVi/T790JeHl8pbhDoW4ygnT5xQ61yXq/D1+gCwNYwyJ8zggnHhjINLrsJdPiho5 UNuW3c+KGKx7OG4Qbf3qk4vVnIm65b1y+uHdbpEOtdhta0g0fcgxycQ7Vs1PZItYELAwdCQZawvPN ctS7l4aEXts7qg/FW0k1GRyshH9v1unRsaEZE+VOIjp993qRuIP41wrFhFB2XkC7oS6LaVaQDI98F Ar51PM6TNzEugiO+Y3G/IF3YV1FsWIgLzr1yvOT6GZ5ICFSc4s5YAsGssaGlzrzPbAu9IYhTMYe43 J6bq4mkoA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kjhgi-00077E-L5; Mon, 30 Nov 2020 11:49:48 +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 1kjhgg-00076h-FN for linux-arm-kernel@lists.infradead.org; Mon, 30 Nov 2020 11:49:47 +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 C420B2074A; Mon, 30 Nov 2020 11:49:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1606736985; bh=pgFsJz6+xwO0ONaJrG4G+55biFAhUPSSqR+91oyiBUU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ds2NevWQVVnXnC6pud42fd56+wiR1fPDhErH0fO2BGozOuvJigl6vU8G3GXWHVedf Mz/rMlUoUhiH6VkVyfU7fUjwwt1hSQ0FhNaoFPXAE9hQWsY1YjK6niGZjPOjeoGhnF y4sMJJNqmxmiS6tUVvS8NNTsueW+v3+C5GhZ66uA= Date: Mon, 30 Nov 2020 11:49:40 +0000 From: Will Deacon To: Sami Tolvanen Subject: Re: [PATCH v2 2/2] arm64: scs: use vmapped IRQ and SDEI shadow stacks Message-ID: <20201130114940.GB24563@willie-the-truck> References: <20201124195940.27061-1-samitolvanen@google.com> <20201124195940.27061-3-samitolvanen@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201124195940.27061-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-20201130_064946_611541_C32BFFE2 X-CRM114-Status: GOOD ( 22.37 ) 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 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 > --- > 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel