From patchwork Thu May 12 03:06:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingfan Liu X-Patchwork-Id: 12846898 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 9F601C433F5 for ; Thu, 12 May 2022 03:08:03 +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=Hi8c4kR5xkd3VVAhlyj5hAi1xzJLYADmJC2kNEIRX30=; b=AeMKoNsRkEvwpM 8ghBF79cVIypdiZ9buH8m9LNygheADNukmAu1mkHsO8iZdqsrl329b2Mz+cMNHgMeZANAZSUlmB6T SRnaLWW65LciFXIcPLipJuURYLF01sqSmjSrrviJSm11R3VhvSbdhroBTE7oxPE6jIF67nNygxJ/d dklRfUUIaf39Yg3opG/bgQ+ZRWtzIdc4Ff8e1fqquzp46P2g7NV71Kyqi497TBYYoOWlA1xmGxdBF 5ZYlAI6chm8ikOheWCLVAh0VJ5+M9yXXe79w4AleZjJxoFAA7/3cf4dpvLnMGTWYYYq3fy57PMISB o5I3tP7TCLuF5+vzna8g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nozAD-009cww-WA; Thu, 12 May 2022 03:06:54 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nozAA-009cvS-Q8 for linux-arm-kernel@lists.infradead.org; Thu, 12 May 2022 03:06:52 +0000 Received: by mail-pj1-x1034.google.com with SMTP id l7-20020a17090aaa8700b001dd1a5b9965so3705703pjq.2 for ; Wed, 11 May 2022 20:06:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pWq/+Bte7VjbrLdN2lGHRy6uQDSlfBm3NDeykg391Ho=; b=nwEtTjFAW+x+QRTih+1S+0XAkG0pzoOBF2HYPZwaOOc3NvTHQBxVW9lNY0SWO4QAWt lVO8D7d8sj+GBLO+SJ0XuCUK3Yc5a1dG15PNl51PuQMVJjpmk3gcNXKQCCvS+Wctqw7Z xqwFSaTbEDq62TMY5sEOxYt/+j4UhmjfJcZUAivfC1zzdwpFD+xcQTttiGjDfDv0+hIO tHacXhvSJgKE0ZT/uTsxGFoHh1W3mdRCQZ82qw3g3TqhaGyqWKOBApmpMatJXZe51Rke /RlwqTzaW8mNFIHXJx+fVRv/MOK5rWGcbW7Q/A1aTU0Kzd7hg+3vS7IBsxBjA3alWGY/ 6vWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pWq/+Bte7VjbrLdN2lGHRy6uQDSlfBm3NDeykg391Ho=; b=taZx+7xN65STyYE8KETe1X3Ac59uJxubvIr3lM+zOgK9FgsHMzANeFJUCy0zC0VTm9 AYfjfDjd4YHZstQaFrq25EAkp9g6dvvN1IXO67nNT8hbMFCW1jyvzlrh5tIkoDb9RX+6 eYVnmrj/3sT63MvSxb5mON4BDofUSps21N7Dyt6GcJQLMs97vEJjmUgwy8MTZTHMRCjj 2aZshVXIh/34EP0/ahhk+UoBbOYEhDPoMDUk17CZK0lyxdaRkm71tvVDubB0KjCuWwjN iZzTf7PGQxC67bOnUy9SMj4l0PHr8LOE/cmDinogviRqRk21PIxXBEBB+6RKYow2Ovzm RxHw== X-Gm-Message-State: AOAM533DUEKhqkyyxXvsWF1aQDDW+KWQyiIa3TOi9Ozeh6Z1COoNSXL2 yqN3XYXtVrvqrTWd4Uyrrw== X-Google-Smtp-Source: ABdhPJySV9BUOK77UbovcdzqXyp9x8QSqqEfbjObNWOs5wEeq7X821SAQEeSH0VJB9DBni9EAR7MaA== X-Received: by 2002:a17:90a:4417:b0:1ca:a861:3fbf with SMTP id s23-20020a17090a441700b001caa8613fbfmr8594395pjg.80.1652324809107; Wed, 11 May 2022 20:06:49 -0700 (PDT) Received: from piliu.users.ipa.redhat.com ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id e13-20020aa7980d000000b0050dc762815bsm2488162pfl.53.2022.05.11.20.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 May 2022 20:06:48 -0700 (PDT) From: Pingfan Liu To: linux-ia64@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Pingfan Liu , Thomas Gleixner , Geert Uytterhoeven , Peter Zijlstra , Kees Cook , Jens Axboe , Russell King , Guenter Roeck , Arnd Bergmann , Wolfram Sang , Lee Jones , Catalin Marinas , Will Deacon , Mark Rutland , Peter Collingbourne , Marc Zyngier , linux-kernel@vger.kernel.org Subject: [PATCHv4 2/2] cpu/hotplug: Remove the input parameter primary_cpu of smp_shutdown_nonboot_cpus() Date: Thu, 12 May 2022 11:06:19 +0800 Message-Id: <20220512030619.13426-3-kernelfans@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220512030619.13426-1-kernelfans@gmail.com> References: <20220512030619.13426-1-kernelfans@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220511_200650_874198_796C454C X-CRM114-Status: GOOD ( 21.17 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org For all call sites of smp_shutdown_nonboot_cpus(), $git grep smp_shutdown_nonboot_cpus -- arch | grep -v \* arch/arm/kernel/reboot.c:94: smp_shutdown_nonboot_cpus(reboot_cpu); arch/arm64/kernel/process.c:89: smp_shutdown_nonboot_cpus(reboot_cpu); arch/ia64/kernel/process.c:578: smp_shutdown_nonboot_cpus(reboot_cpu); arch/riscv/kernel/machine_kexec.c:135: smp_shutdown_nonboot_cpus(smp_processor_id()); As it shows, the input parameter seems a little arbitrary. Since kernel_kexec()->migrate_to_reboot_cpu() has already pinned the rebooting thread on the selected CPU and the CPU hotplug keeps disabled before smp_shutdown_nonboot_cpus(). Let smp_shutdown_nonboot_cpus() deduce the rebooting CPU by smp_processor_id(), instead of passing the parameter primary_cpu to it. As a result, all call sites look consistent. Signed-off-by: Pingfan Liu Cc: Thomas Gleixner Cc: Geert Uytterhoeven Cc: Peter Zijlstra Cc: Kees Cook Cc: Jens Axboe To: linux-ia64@vger.kernel.org Cc: Russell King Cc: Guenter Roeck Cc: Arnd Bergmann Cc: Wolfram Sang Cc: Lee Jones Cc: Catalin Marinas Cc: Will Deacon Cc: Mark Rutland Cc: Peter Collingbourne Cc: Marc Zyngier To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Acked-by: Catalin Marinas --- arch/arm/kernel/reboot.c | 2 +- arch/arm64/kernel/process.c | 2 +- arch/ia64/kernel/process.c | 2 +- arch/riscv/kernel/machine_kexec.c | 2 +- include/linux/cpu.h | 4 ++-- kernel/cpu.c | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c index 3044fcb8d073..98c961f0b377 100644 --- a/arch/arm/kernel/reboot.c +++ b/arch/arm/kernel/reboot.c @@ -91,7 +91,7 @@ void soft_restart(unsigned long addr) */ void machine_shutdown(void) { - smp_shutdown_nonboot_cpus(reboot_cpu); + smp_shutdown_nonboot_cpus(); } /* diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 7fa97df55e3a..1f6498d44740 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -86,7 +86,7 @@ void arch_cpu_idle_dead(void) */ void machine_shutdown(void) { - smp_shutdown_nonboot_cpus(reboot_cpu); + smp_shutdown_nonboot_cpus(); } /* diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index d7a256bd9d6b..9af53ff43983 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c @@ -575,7 +575,7 @@ cpu_halt (void) void machine_shutdown(void) { - smp_shutdown_nonboot_cpus(reboot_cpu); + smp_shutdown_nonboot_cpus(); #ifdef CONFIG_KEXEC kexec_disable_iosapic(); diff --git a/arch/riscv/kernel/machine_kexec.c b/arch/riscv/kernel/machine_kexec.c index cbef0fc73afa..a30c545714cc 100644 --- a/arch/riscv/kernel/machine_kexec.c +++ b/arch/riscv/kernel/machine_kexec.c @@ -132,7 +132,7 @@ void machine_shutdown(void) local_irq_disable(); #if defined(CONFIG_HOTPLUG_CPU) - smp_shutdown_nonboot_cpus(smp_processor_id()); + smp_shutdown_nonboot_cpus(); #endif } diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 54dc2f9a2d56..0506ba3ac85e 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -127,7 +127,7 @@ extern void cpu_hotplug_enable(void); void clear_tasks_mm_cpumask(int cpu); int remove_cpu(unsigned int cpu); int cpu_device_down(struct device *dev); -extern void smp_shutdown_nonboot_cpus(unsigned int primary_cpu); +extern void smp_shutdown_nonboot_cpus(void); #else /* CONFIG_HOTPLUG_CPU */ @@ -140,7 +140,7 @@ static inline void lockdep_assert_cpus_held(void) { } static inline void cpu_hotplug_disable(void) { } static inline void cpu_hotplug_enable(void) { } static inline int remove_cpu(unsigned int cpu) { return -EPERM; } -static inline void smp_shutdown_nonboot_cpus(unsigned int primary_cpu) { } +static inline void smp_shutdown_nonboot_cpus(void) { } #endif /* !CONFIG_HOTPLUG_CPU */ #ifdef CONFIG_PM_SLEEP_SMP diff --git a/kernel/cpu.c b/kernel/cpu.c index 4415370f0e91..66b8af6b8a3e 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1228,7 +1228,7 @@ int remove_cpu(unsigned int cpu) } EXPORT_SYMBOL_GPL(remove_cpu); -void smp_shutdown_nonboot_cpus(unsigned int primary_cpu) +void smp_shutdown_nonboot_cpus(void) { unsigned int cpu; int error; @@ -1244,7 +1244,7 @@ void smp_shutdown_nonboot_cpus(unsigned int primary_cpu) __cpu_hotplug_enable(); for_each_online_cpu(cpu) { - if (cpu == primary_cpu) + if (cpu == smp_processor_id()) continue; error = cpu_down_maps_locked(cpu, CPUHP_OFFLINE);