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 97EFFC433EF for ; Tue, 30 Nov 2021 13:02:51 +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=HKPdSWPZMR6mfyoGnx3xd/t0fSAp4z5kAJZFd1/6IVk=; b=Z4APssYC7jBgKb 4UiXk8t9VGlyf8MH5dbfE4M7dl3En/ns0Z/88OhZ+RdfrruuBkHAkPGat6RLKZ+lZ3GNMnUP1ZAfA mOw4Rz+28HDNzmq927OpPg8mlaMz1pWBfn1k+/fMu+mJgYLSlOvpaufmiJRGQT8NKrwOZntqP6kdm oVkZdLhHc2xW2oQoxxL6DLHodMeT+ylVdb4/ZvDnpKQu/wQZkTQjE30Nnf3zfGsngY8CGusiuY4dA emRFiEg25DwkCSv2yEMFJtLuuhbtldr/M/XKjJaBWDjcwFf8CxZd5VEK8xqbbaBso5y/BcZHJQPXZ wkQmsN2DMK10vrkw65Bg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms2kt-005D0y-Em; Tue, 30 Nov 2021 13:01:08 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ms2jJ-005COi-0W for linux-arm-kernel@lists.infradead.org; Tue, 30 Nov 2021 12:59:30 +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 sin.source.kernel.org (Postfix) with ESMTPS id 4D364CE19D7; Tue, 30 Nov 2021 12:59:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6683DC53FCF; Tue, 30 Nov 2021 12:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638277165; bh=syNfb7FHAZSk8r9wnEYWTGGjW2wOLgM2toAzSUyHVcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nfP3caOYxUjcezYR7oTkwCeeYKCV/nCHYqNU9lW+9FxNLrJ19hQbIeQbMmgz80H3F 4KMSPwED/xwNGYVolplXw7FmX7f+dvFY+l7xSpqtXHftHpV8YRjtreuiUeD++BbblY ZkV1baai5K8P6hVhE6YzRZOU5Q7FYO2tlbMwwh1FYfRla0aKMkYNquMwrXYEHm3elT GPZ3ot6G09W5mTrpIdIKj/a0nvL9vojTthfiVhNx2P4E1gFsgjHu+l6bhp9KTiXxkv a1JvYCnp6QI+MWfw4QxcyYqaWZQJs0CCE+PlSOxQgGilGKTL4R+0hbl0h2xxRngwxP FBA8RvJceW/WQ== 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 Subject: [PATCH v2 06/12] ARM: entry: preserve thread_info pointer in switch_to Date: Tue, 30 Nov 2021 13:58:55 +0100 Message-Id: <20211130125901.3054-7-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211130125901.3054-1-ardb@kernel.org> References: <20211130125901.3054-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2129; h=from:subject; bh=syNfb7FHAZSk8r9wnEYWTGGjW2wOLgM2toAzSUyHVcE=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBhpiANENrYFKqnLoUOkZdSPn+LhdfgTtN2m3R28GPz wkP0xcGJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYaYgDQAKCRDDTyI5ktmPJC06DA CtnQY55+Qm6xAClx8D/NjCkWMYiR1cy/9GcDnkFlZehnfxeK7HlxIa/YWjfEb5toBJ0GNADUErJJzA 6vCUg3AfFR6sTLCd+vFRbKglcpPQwsc6YPj3pJNVCgLaa0Hz+hVTbsdXvzwVf3C8oed8qn0yr6Y/k/ a8Ill2OFGB4eBXbsENCkN4hXVt1kXQJKDJeIi44YCMAov2p9sQ775r29Y4E8T68jj0Ga5NG2Y1m8Ia KthfgN8IkvN8mtU3B62wxJYj3FBZrkxjIEEROR/joi+hZZfZiBWp44lg6w4z5Fqe746il86M66WdWu obXqL648e7Tj14/RcFfb7v63bRXQmUQ5Pnwi3qLTY56yJV6iRXGEVi64WpWn6TdhSEa8+XTPIFVFTl yOcYIaXsOAW3fZBT+0FwFKqTjAAmV6iHXqTH2vb6hPkc21mXCpsbU91iLT5hQRfSh8N4u67EPGSID0 2SiNBcJJeFLdqAV+Z1d52OuwGWjW8s7TOk9i+TOBcmwoQ= 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-20211130_045929_458505_62F9513C X-CRM114-Status: GOOD ( 14.83 ) 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 --- 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