From patchwork Thu Feb 16 18:41:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Josh Poimboeuf X-Patchwork-Id: 58207 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp466753wrn; Thu, 16 Feb 2023 10:44:03 -0800 (PST) X-Google-Smtp-Source: AK7set+A/1R4KHHThGWhxEgj88P9MLu45+7HF3hEt96TPah+Kiu3TS7ILSYKqyn8E34pRHClByqu X-Received: by 2002:a17:906:b310:b0:8b0:23a6:c491 with SMTP id n16-20020a170906b31000b008b023a6c491mr8315705ejz.31.1676573043106; Thu, 16 Feb 2023 10:44:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676573043; cv=none; d=google.com; s=arc-20160816; b=C8Jn7MSmuNnQXfM0vG1zpBdShiBk8f1epPCeKJHzOeG6KaOl8ilo4VkGyA5bOIdhRu 2I9vn0XhlULt/loP2gpPcr7BE3vuZwdhg4e9gnS3x1LyCDaxsKGo4AF8NS3Eujwyd/wL 7aywbl/L0MhpOyr1/gGiMt3kZ1KfGGZPo9ShD2Wf8SldL1M9ZgZogSzgUAsb4Md0vS3I qhlUmfjwzGBgmxAEvaaBBswWNB3NeA2de89fD9pi0dIwDJvqaEgqRCmh5X1XD+0I09mr LuswNiXwkhVkDdIFooUkNlJJpCqIuCr8seyk8lcAKcxFg+LKoyDqBLReHSr38GJJxNO+ Mm4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=ahBm54VTHNIG6IeSY6Sv5ogmGkg2J7rhF1m5kce9R3A=; b=J7eiukavqUDGU/b13qOEOPIe2BAzPyIoWHL7pLsfY22wzqudV9383R1+NGzcF8efNP 3/nrAoCdQwlPr0V1bLu+YGmt8Jn1tM4QKkxl8okmHAhUKDpbtBj/UM5wFp/0wFm27ANM gpO4vYmGNi+Ega3dtusqDxCJmqa3uTuJotUuDR4Hhp55UtIWyi2uP0Ykln5kPemat+Nt LSTLiBFxIqw/P162pC0P2OIvLsign6Tj0JawLaRgXG3R5U+CEofJ62Y8cTWNdA6/MQ9z LDf29Fl8U6ejKxh7sfnLfI59paXQIVcKMsPWemG/lBguD/epbfaL4bgiijulWE+BDIOv PlDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=VModKb3f; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ez22-20020a1709070bd600b008b14c6ece42si2162912ejc.30.2023.02.16.10.43.40; Thu, 16 Feb 2023 10:44:03 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=VModKb3f; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229739AbjBPSmI (ORCPT + 99 others); Thu, 16 Feb 2023 13:42:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229534AbjBPSmG (ORCPT ); Thu, 16 Feb 2023 13:42:06 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E330646174; Thu, 16 Feb 2023 10:42:03 -0800 (PST) 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 92AD7B8293F; Thu, 16 Feb 2023 18:42:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8645EC433D2; Thu, 16 Feb 2023 18:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676572921; bh=+sMmN2IJBomErQJnP8GjKXcy2h70Xrt73RBGKymR0H4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=VModKb3fOKbOeGAfrMtcxWG8Hr22AYe+0gtAQb49CSGfCviRThwkBpO8fFnnwUTSV E4hgXNUKfEN+clH4h03E1aufyNQSj1mSnq9Vo29Kl5bJ5GqVEXWFIw1p5asDpvsioC JBvLRlQLFKtSrt0jAdGj0RnHQLW07q9G/u/tUU6dMjMJGte6KKw3VKLH5O2qq3YmXT 1H/Hq7Um9b66v+XQUlM04J510C4wS4Nlvj1PntzoSiTqVG8CV1ErpLQg67WmsfQ9G5 ZAEVlFxb2/JEE+olKEpmHAVug71xwO3+q2dEqxmcS6shyfVGKxKtuT5r0pyLprf9Xh vuADtQm3K08UA== Date: Thu, 16 Feb 2023 10:41:57 -0800 From: Josh Poimboeuf To: Mark Rutland Cc: Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= , juri.lelli@redhat.com, dalias@libc.org, linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, peterz@infradead.org, catalin.marinas@arm.com, dave.hansen@linux.intel.com, x86@kernel.org, jiaxun.yang@flygoat.com, linux-mips@vger.kernel.org, bsegall@google.com, jcmvbkbc@gmail.com, guoren@kernel.org, hpa@zytor.com, sparclinux@vger.kernel.org, kernel@xen0n.name, will@kernel.org, vschneid@redhat.com, f.fainelli@gmail.com, vincent.guittot@linaro.org, ysato@users.sourceforge.jp, chenhuacai@kernel.org, linux@armlinux.org.uk, linux-csky@vger.kernel.org, dietmar.eggemann@arm.com, mingo@redhat.com, bcm-kernel-feedback-list@broadcom.com, mgorman@suse.de, mattst88@gmail.com, linux-xtensa@linux-xtensa.org, paulmck@kernel.org, richard.henderson@linaro.org, npiggin@gmail.com, ink@jurassic.park.msu.ru, rostedt@goodmis.org, loongarch@lists.linux.dev, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org, jgross@suse.com, chris@zankel.net, tsbogend@alpha.franken.de, bristot@redhat.com, linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, bp@alien8.de, linuxppc-dev@lists.ozlabs.org, davem@davemloft.net Subject: [PATCH v2.1 04/24] arm64/cpu: Mark cpu_die() __noreturn Message-ID: <20230216184157.4hup6y6mmspr2kll@treble> References: <14274f04-2991-95bd-c29b-07e86e8755c1@linaro.org> <20230215194538.aiiris3uabnuvkkg@treble> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20230215194538.aiiris3uabnuvkkg@treble> X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS 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?1757789359682997448?= X-GMAIL-MSGID: =?utf-8?q?1758014254917671836?= cpu_die() doesn't return. Annotate it as such. By extension this also makes arch_cpu_idle_dead() noreturn. Acked-by: Mark Rutland Signed-off-by: Josh Poimboeuf Reviewed-by: Philippe Mathieu-Daudé --- arch/arm64/include/asm/smp.h | 2 +- arch/arm64/kernel/smp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/smp.h b/arch/arm64/include/asm/smp.h index fc55f5a57a06..5733a31bab08 100644 --- a/arch/arm64/include/asm/smp.h +++ b/arch/arm64/include/asm/smp.h @@ -100,7 +100,7 @@ static inline void arch_send_wakeup_ipi_mask(const struct cpumask *mask) extern int __cpu_disable(void); extern void __cpu_die(unsigned int cpu); -extern void cpu_die(void); +extern void __noreturn cpu_die(void); extern void cpu_die_early(void); static inline void cpu_park_loop(void) diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index 4e8327264255..d5d09a18b4f8 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -361,7 +361,7 @@ void __cpu_die(unsigned int cpu) * Called from the idle thread for the CPU which has been shutdown. * */ -void cpu_die(void) +void __noreturn cpu_die(void) { unsigned int cpu = smp_processor_id(); const struct cpu_operations *ops = get_cpu_ops(cpu);