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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D72DC433EF for ; Thu, 30 Sep 2021 13:07:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6F1D9619E8 for ; Thu, 30 Sep 2021 13:07:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350392AbhI3NJN (ORCPT ); Thu, 30 Sep 2021 09:09:13 -0400 Received: from pegase2.c-s.fr ([93.17.235.10]:39699 "EHLO pegase2.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351443AbhI3NIf (ORCPT ); Thu, 30 Sep 2021 09:08:35 -0400 Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4HKtmq1XsCz9sTd; Thu, 30 Sep 2021 15:06:51 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Jbg1_Awq21kG; Thu, 30 Sep 2021 15:06:51 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4HKtmq0L5wz9sTF; Thu, 30 Sep 2021 15:06:51 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id E5E6A8B773; Thu, 30 Sep 2021 15:06:50 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id QX1D9MHFEGv7; Thu, 30 Sep 2021 15:06:50 +0200 (CEST) Received: from PO20335.IDSI0.si.c-s.fr (unknown [192.168.203.149]) by messagerie.si.c-s.fr (Postfix) with ESMTP id D83748B763; Thu, 30 Sep 2021 15:06:49 +0200 (CEST) Subject: Re: [PATCH v2 1/7] arm64: add CPU field to struct thread_info To: Ard Biesheuvel , linux-kernel@vger.kernel.org Cc: Keith Packard , Russell King , Catalin Marinas , Will Deacon , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Mark Rutland References: <20210930125813.197418-1-ardb@kernel.org> <20210930125813.197418-2-ardb@kernel.org> From: Christophe Leroy Message-ID: <6b003f58-48df-7ac4-4dbf-81b2c5bca5d9@csgroup.eu> Date: Thu, 30 Sep 2021 15:06:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210930125813.197418-2-ardb@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: fr-FR Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 30/09/2021 à 14:58, Ard Biesheuvel a écrit : > The CPU field will be moved back into thread_info even when > THREAD_INFO_IN_TASK is enabled, so add it back to arm64's definition of > struct thread_info. > > Note that arm64 always has CONFIG_SMP=y so there is no point in guarding > the CPU field with an #ifdef. > > Signed-off-by: Ard Biesheuvel > Acked-by: Catalin Marinas > Acked-by: Mark Rutland > --- > arch/arm64/include/asm/thread_info.h | 1 + > arch/arm64/kernel/asm-offsets.c | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h > index 6623c99f0984..c02bc8c183c3 100644 > --- a/arch/arm64/include/asm/thread_info.h > +++ b/arch/arm64/include/asm/thread_info.h > @@ -42,6 +42,7 @@ struct thread_info { > void *scs_base; > void *scs_sp; > #endif > + u32 cpu; > }; > > #define thread_saved_pc(tsk) \ > diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c > index 551427ae8cc5..cee9f3e9f906 100644 > --- a/arch/arm64/kernel/asm-offsets.c > +++ b/arch/arm64/kernel/asm-offsets.c > @@ -29,6 +29,7 @@ int main(void) > DEFINE(TSK_ACTIVE_MM, offsetof(struct task_struct, active_mm)); > DEFINE(TSK_CPU, offsetof(struct task_struct, cpu)); > BLANK(); > + DEFINE(TSK_TI_CPU, offsetof(struct task_struct, thread_info.cpu)); Why adding that now ? For powerpc you do the switch in 5. > DEFINE(TSK_TI_FLAGS, offsetof(struct task_struct, thread_info.flags)); > DEFINE(TSK_TI_PREEMPT, offsetof(struct task_struct, thread_info.preempt_count)); > #ifdef CONFIG_ARM64_SW_TTBR0_PAN >