From patchwork Fri May 12 21:07:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 93404 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5397261vqo; Fri, 12 May 2023 14:21:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6b/+sfz7vRhV87agj1vJcgDz7zDNnKoYSDEOqzcz+wnSspeesGdwqbujJg9g5KQWGmGvOR X-Received: by 2002:a17:903:2307:b0:1ac:a61c:7a14 with SMTP id d7-20020a170903230700b001aca61c7a14mr15446441plh.62.1683926465049; Fri, 12 May 2023 14:21:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683926465; cv=none; d=google.com; s=arc-20160816; b=muuPKeVlOT0ie776Fw2aCnlX+X156H+mzx+X3BAI/fX+1nkkGUxrXIhqgiTlRhreds LjC75XoQDHnGys7sDfAT5iSXCmRX2wF8pirVaN7AJ0zqenklqMGRDY+y1JHriisY+kWz F2rBEponVE4Vyogmi10TIBxBCxU0HlIaJB/cU5cjOSZUfXAbjkkAoqD457IRT05SX7En HmdwLIu9yWWvRLTkXXdL+OwiZAniH2QtdplEfpbv5sLXfBTtSrsTpTWLgxd35PDSjQlK ExwWQUE7SZcx+DMm0SIkVm+XJJ0YdFxKAmWKDlyuE1A0AxyajDYFmdJHqeUgOQIiHSmI xW1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=rINXxhKXmpYAtWqMmPzc6OdjQErCtPtZZiG/o2u67XA=; b=dshdwr5uYS8x880PYOeFOsKjwSa5FbfYj1VvsLpKukiRh/WvpLG//XxYTvoemIn+W/ eOMFfS2oMzntGfoOlqgqFOnJMLziSwV7CpdbefJQWDXd9UK00JuyaG2tSMUie0IiClqn zwpCHrSx0eyAMiy8a0KC0swyrtyPcQn0P50VTlK0Jw9rSD8elRGzz4MIM7jJk1hRqxy6 2Hbn3U6wyRzI+fW/Qj8u1nR9hBNO5ceAq2Z/L8L7GJWLzJ6rYu/yDu6Tk8/7FCLSwf1x I9eoQgcxBILvmJeE4Ceztgyth69n6KM++ebllZjmdTUJAPcWVNB3Ia6B1SGZFc7zJsif DfuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=zVr4ZNUN; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020a170902f54600b001a96b56099fsi10628045plf.404.2023.05.12.14.20.52; Fri, 12 May 2023 14:21:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=zVr4ZNUN; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239739AbjELVJK (ORCPT + 99 others); Fri, 12 May 2023 17:09:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240009AbjELVIL (ORCPT ); Fri, 12 May 2023 17:08:11 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52144A5C6; Fri, 12 May 2023 14:07:35 -0700 (PDT) Message-ID: <20230512205256.635326070@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1683925652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=rINXxhKXmpYAtWqMmPzc6OdjQErCtPtZZiG/o2u67XA=; b=zVr4ZNUNaCJyD2RgIxyzBhfIe89JftjURTbIdWm+bfCJWlFf4rsjq4OuozvjGhm9ULhHrC U+aEJu664cXclDTxQuAvnz47evxGKtnynt0q7QKC8sqCfjf36XHNHRGVlHpVCtZBasVbXa gv1iPwgpkiOTosy1dsjss8b8knMy3Hz3lj6ov/gir6MWLV2GXOwcnbFuE4PuQ8MSg84x92 hnzVxYv6Z/LoV2my9lHN/jUVhkZbsxpowfX+bp0NKPfT/TaL1EN1Lbe/fjcyoBF18PLYQI MH9mNvHLkLUEnvXztxwCwTD8RTyo3FLLhL56NmTy/yerLcQyMUsA3XboFVowyA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1683925652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=rINXxhKXmpYAtWqMmPzc6OdjQErCtPtZZiG/o2u67XA=; b=Oocpkedn7RFFiZEZ6uMicf8fkqVHkAt6v2WrHB3tn/jDxmbRHsz+Nfcb/Op9ZCsGgDieF+ 01qSbNlzEhoG1jDQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, David Woodhouse , Andrew Cooper , Brian Gerst , Arjan van de Veen , Paolo Bonzini , Paul McKenney , Tom Lendacky , Sean Christopherson , Oleksandr Natalenko , Paul Menzel , "Guilherme G. Piccoli" , Piotr Gorski , Usama Arif , Juergen Gross , Boris Ostrovsky , xen-devel@lists.xenproject.org, Russell King , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Catalin Marinas , Will Deacon , Guo Ren , linux-csky@vger.kernel.org, Thomas Bogendoerfer , linux-mips@vger.kernel.org, "James E.J. Bottomley" , Helge Deller , linux-parisc@vger.kernel.org, Paul Walmsley , Palmer Dabbelt , linux-riscv@lists.infradead.org, Mark Rutland , Sabin Rapan , "Michael Kelley (LINUX)" , Ross Philipson Subject: [patch V4 22/37] ARM: smp: Switch to hotplug core state synchronization References: <20230512203426.452963764@linutronix.de> MIME-Version: 1.0 Date: Fri, 12 May 2023 23:07:32 +0200 (CEST) X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765724877454452981?= X-GMAIL-MSGID: =?utf-8?q?1765724877454452981?= From: Thomas Gleixner Switch to the CPU hotplug core state tracking and synchronization mechanim. No functional change intended. Signed-off-by: Thomas Gleixner Tested-by: Michael Kelley --- arch/arm/Kconfig | 1 + arch/arm/include/asm/smp.h | 2 +- arch/arm/kernel/smp.c | 18 +++++++----------- 3 files changed, 9 insertions(+), 12 deletions(-) --- --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -124,6 +124,7 @@ config ARM select HAVE_SYSCALL_TRACEPOINTS select HAVE_UID16 select HAVE_VIRT_CPU_ACCOUNTING_GEN + select HOTPLUG_CORE_SYNC_DEAD if HOTPLUG_CPU select IRQ_FORCED_THREADING select MODULES_USE_ELF_REL select NEED_DMA_MAP_STATE --- a/arch/arm/include/asm/smp.h +++ b/arch/arm/include/asm/smp.h @@ -64,7 +64,7 @@ extern void secondary_startup_arm(void); extern int __cpu_disable(void); -extern void __cpu_die(unsigned int cpu); +static inline void __cpu_die(unsigned int cpu) { } extern void arch_send_call_function_single_ipi(int cpu); extern void arch_send_call_function_ipi_mask(const struct cpumask *mask); --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -288,15 +288,11 @@ int __cpu_disable(void) } /* - * called on the thread which is asking for a CPU to be shutdown - - * waits until shutdown has completed, or it is timed out. + * called on the thread which is asking for a CPU to be shutdown after the + * shutdown completed. */ -void __cpu_die(unsigned int cpu) +void arch_cpuhp_cleanup_dead_cpu(unsigned int cpu) { - if (!cpu_wait_death(cpu, 5)) { - pr_err("CPU%u: cpu didn't die\n", cpu); - return; - } pr_debug("CPU%u: shutdown\n", cpu); clear_tasks_mm_cpumask(cpu); @@ -336,11 +332,11 @@ void __noreturn arch_cpu_idle_dead(void) flush_cache_louis(); /* - * Tell __cpu_die() that this CPU is now safe to dispose of. Once - * this returns, power and/or clocks can be removed at any point - * from this CPU and its cache by platform_cpu_kill(). + * Tell cpuhp_bp_sync_dead() that this CPU is now safe to dispose + * of. Once this returns, power and/or clocks can be removed at + * any point from this CPU and its cache by platform_cpu_kill(). */ - (void)cpu_report_death(); + cpuhp_ap_report_dead(); /* * Ensure that the cache lines associated with that completion are