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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EE0F0C433F5 for ; Mon, 6 Dec 2021 16:54:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GP6tTqn9gOveZWQ+5ZcCIBnimmk5k07qCMRJnAz/zSk=; b=AAifztpNshpoHG 9pdEAWS856Mc7DYibLeJlj5r/o+0zTbjWVDQjJlgz7va1Zqdye3+kZEYgzI4bAozcYC1AyCJfHYGk hcGOSUgqm1D+F6m5wqUHizNeIFtf//i/hTvj5oV4eyFnVwwWNI8SNQafIe4RbFpiQACxGg6omVoqy t514f3qTnfXo5X1kCgajpeJIPXndpeG0uNAy2B41oVrqvzv89eVGcqRiRDAERUQmShGbsFJ5pNh1P PwE7/+ZwTNDzicDIWy742AdboIeX8MwqO4JwqTT/f2DqSBF0QLX40oT2f5O/p8Ko/hKAUUwR6L3oy yF8nwIQXvg0w4cHxICMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1muHEM-004t0u-Bw; Mon, 06 Dec 2021 16:52:47 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1muH9V-004qiy-Op for linux-arm-kernel@lists.infradead.org; Mon, 06 Dec 2021 16:47:47 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 79C6EB81171; Mon, 6 Dec 2021 16:47:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D801C341C8; Mon, 6 Dec 2021 16:47:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638809263; bh=NPq64AFT6aTgAzj2N4miGTj2EySKEdu7b2YeRa5bcXs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lAfsb+lb3FgIbfhCOUexqJS6XpXuMPIU5elJjqLtaqWJKtI/jlgJ9ypiWm++G1jqd rizcltTj8ixe2BwQ6cvKwremO0InBJ0oXsAz+41r2Er9rfej6pCXWEenSg/tn6tTyc aQq+zrwtBdG6wg8BD0sjhdvSx6DCOk1CxjPfDxZBOU+W3sjM851QwxopNTmmD9NtS4 yiGwGWpM/gWGC+OsDIHT59tCKNI3MfVX81LBj5rLWt7dRa+h/GHqAqkq3Q9F4M7G4+ KUb6FbZJCxo0B5eq5AjsIgzkwUA1X+zdAskqI1g7VWrShm30FjWw8CNDKjaj3olz93 McQm1yUFEGbGw== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk Cc: Ard Biesheuvel , Nicolas Pitre , Arnd Bergmann , Kees Cook , Keith Packard , Linus Walleij , Nick Desaulniers , Tony Lindgren , Marc Zyngier , Vladimir Murzin , Jesse Taube Subject: [PATCH v4 08/15] ARM: entry: preserve thread_info pointer in switch_to Date: Mon, 6 Dec 2021 17:46:52 +0100 Message-Id: <20211206164659.1495084-9-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211206164659.1495084-1-ardb@kernel.org> References: <20211206164659.1495084-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2234; h=from:subject; bh=NPq64AFT6aTgAzj2N4miGTj2EySKEdu7b2YeRa5bcXs=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBhrj50ysXHidfxjQftsMDv+ncKH8m7SmfTiIqTF+VV cxUPTgiJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYa4+dAAKCRDDTyI5ktmPJAGBC/ 9Yluyfmzj6EXtP7yr2RGanV8sqAVZfFlOv6D5pTxmS4u3YvefSKUkbQrzpPWTD9D41Thc32cBWMlsy O+vG2WMk5u7Z8D4NAfSEOA8tAnajKqKT+CZZzshkJSBk4vheteAsCz0cLvOOucNeNvP1fiPQyCHQV/ qPzATvI0tCMALG37Yj6JupRewcvE4gmpWBacyhZbZZ7phxvbnvAgtOrRpmEGTxCI9LcNffgVGj3KWf JXB47UUhPvNuTue2VZgTYt7tQXE9hT1eCC0PHxtWueNDxDdf13T6E4FkeP9e80188OBSxdtR/mnHSF UbOd3fWHIuvVVeR+EzO9xn/zgFJ1tgvw2G66um6n/GDtiP7kA+cjW0GnOJ85EfGnGOEQGzFjRo2h20 arVQtrcs8J6shNtbzooHxaVx7dd+2HzxakGrHc5v23c7RqpvAM1THKtnQoevVONIqtRfBfbFUXrTT7 AuENkrR5gvBs7TykW45Gtwi1o4F9Bmu7MF9vSrgcA0Okw= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211206_084746_111447_44AB3AC7 X-CRM114-Status: GOOD ( 13.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Tweak the UP stack protector handling code so that the thread info pointer is preserved in R7 until set_current is called. This is needed for a subsequent patch that implements THREAD_INFO_IN_TASK and set_current for UP as well. This also means we will prefer the per-task protector on UP systems that implement the thread ID registers, so tweak the preprocessor conditionals to reflect this. Acked-by: Linus Walleij Acked-by: Nicolas Pitre Signed-off-by: Ard Biesheuvel Tested-by: Marc Zyngier Tested-by: Vladimir Murzin # ARMv7M --- arch/arm/kernel/entry-armv.S | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 9744d087ee9f..1a6cf711a3b4 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -806,16 +806,16 @@ ENTRY(__switch_to) ldr r6, [r2, #TI_CPU_DOMAIN] #endif switch_tls r1, r4, r5, r3, r7 -#if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_SMP) - ldr r7, [r2, #TI_TASK] +#if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_SMP) && \ + !defined(CONFIG_STACKPROTECTOR_PER_TASK) + ldr r9, [r2, #TI_TASK] ldr r8, =__stack_chk_guard .if (TSK_STACK_CANARY > IMM12_MASK) - add r7, r7, #TSK_STACK_CANARY & ~IMM12_MASK + add r9, r9, #TSK_STACK_CANARY & ~IMM12_MASK .endif - ldr r7, [r7, #TSK_STACK_CANARY & IMM12_MASK] -#elif defined(CONFIG_CURRENT_POINTER_IN_TPIDRURO) - mov r7, r2 @ Preserve 'next' + ldr r9, [r9, #TSK_STACK_CANARY & IMM12_MASK] #endif + mov r7, r2 @ Preserve 'next' #ifdef CONFIG_CPU_USE_DOMAINS mcr p15, 0, r6, c3, c0, 0 @ Set domain register #endif @@ -824,8 +824,9 @@ ENTRY(__switch_to) ldr r0, =thread_notify_head mov r1, #THREAD_NOTIFY_SWITCH bl atomic_notifier_call_chain -#if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_SMP) - str r7, [r8] +#if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_SMP) && \ + !defined(CONFIG_STACKPROTECTOR_PER_TASK) + str r9, [r8] #endif mov r0, r5 #if !defined(CONFIG_THUMB2_KERNEL) && !defined(CONFIG_VMAP_STACK) -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel