From patchwork Sun Feb 12 10:03:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 55892 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1843394wrn; Sun, 12 Feb 2023 02:09:34 -0800 (PST) X-Google-Smtp-Source: AK7set8RzTKbiLHFuiDnV4cc5SVwZXqH3+nL2QxV51GAye9pYYY93OUUVVMS87DFE7CtJlkIs7Sm X-Received: by 2002:a17:90b:38cf:b0:233:d54d:3bb0 with SMTP id nn15-20020a17090b38cf00b00233d54d3bb0mr3171446pjb.24.1676196574129; Sun, 12 Feb 2023 02:09:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676196574; cv=none; d=google.com; s=arc-20160816; b=ajPIONQlcw1a2uOGtK/52JJWaGcACWVlvAZ7mF2kU2U0mdqp7kQA85A6NFh1822Kyt iYG90MXxtt1mhTgQk0NyfitLRwsjoJHiFcZHOAH8C1HR4QHC/ZBwwJzzUX3l1YQkBeiO SMLbNiJAFr8vB3JjJSREIoq1SqAU7Al3+bOA1sEPXhnihRBCHVWbNJNsLpxV2iwyatlr 7Ho8HyndyscyDU3RGYs3Zs0uXVEuC8X2imiLA387wLTXYx/iAJRZXD5THBAn1UdhzeYl wtMV66BIeSAiwCTv9tqUWOSY56Ohb0IbjCPK1sF8QiOEemQ8EyXqqWmOUZb5KwMQbadt 4D9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=ysHXBb1DcM5V0ddOscfbWUty0Zk2SK1CJCjvUWrO308=; b=tzn7C6N++tTaZMFAtBoZUIS7YSC4ew8PUMqzQ0PzBUSp9bHwH6PfGtZZQUFX6uLF5I 6WIEQw1NMQqdOf+UfJQHPOPf+wIjAWMEsEXeT1udmkApJfAuOmsrMmiVVP+DQ4kP1jyM hNKDb3CIhoSZd1hc29xphT9cH11Pa9clMPmQMwMNz/jH/7H/TksXi/gPwN7nHcLIiiT9 LhP+qcxga+E/G0lXTmwUQ2J2jcuR73xmyUmVEM4+Kt9gqYdibS8JL+MusKTBdgalteOX iasZFsykuDsYCkb0GKF/+6aBDZMtUQR3T2EW9PETq3sNAaI2H3g3l7J/g9ZR0VoVAdxd ijPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=zBkwI6Po; dkim=neutral (no key) header.i=@linutronix.de header.b=n8KaWnFy; 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 v19-20020a17090ad59300b002312371ee87si10395745pju.146.2023.02.12.02.09.21; Sun, 12 Feb 2023 02:09:34 -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=@linutronix.de header.s=2020 header.b=zBkwI6Po; dkim=neutral (no key) header.i=@linutronix.de header.b=n8KaWnFy; 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 S229558AbjBLKDu (ORCPT + 99 others); Sun, 12 Feb 2023 05:03:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229481AbjBLKDt (ORCPT ); Sun, 12 Feb 2023 05:03:49 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F419813DCD; Sun, 12 Feb 2023 02:03:47 -0800 (PST) Date: Sun, 12 Feb 2023 10:03:43 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1676196224; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ysHXBb1DcM5V0ddOscfbWUty0Zk2SK1CJCjvUWrO308=; b=zBkwI6PoKuPRl+fh83uc5ZF7qs+7xaOYWQcIAQ/MemIr5vrPcZyoTlkFWtgx8Udg78Urfg srnW7OFlUMXZkyJdqNFTLkz4OXUU1sQ2WBWX/BpsmFkOfmsTKFdSXt5vb+WwYriLxdrqFt uIG+5X6gN9wXdd/j0sY8GSHDaYm6rvIgi2ieZlP/rTaWNCaenRSS2xgZ11BqjxXS/CU8rL EyZdFEwZ+tFku1EilTcAl6kDUt+HpkDxZbmSO8RKT1ZY3qjMeKz6qKtgBFLt+VTUpy0lQZ 1izALFCnUKvxAzBVyBhYFt7FiDTDptcsTwbFDP8c4Y3NHMlk0XeaZbQo5EP5ag== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1676196224; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ysHXBb1DcM5V0ddOscfbWUty0Zk2SK1CJCjvUWrO308=; b=n8KaWnFyinIKpSIxGG0/xAP4WVBHZBRtHQ0LbUr61tj0pENaO/lrxmQlFteMgrAvkJOn/w EeP8p96FA4VOtnCw== From: "tip-bot2 for Juergen Gross" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/core] x86/xen: mark xen_pv_play_dead() as __noreturn Cc: Juergen Gross , Boris Ostrovsky , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221125063248.30256-3-jgross@suse.com> References: <20221125063248.30256-3-jgross@suse.com> MIME-Version: 1.0 Message-ID: <167619622384.4906.15498256119270145523.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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 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?1750449216152130967?= X-GMAIL-MSGID: =?utf-8?q?1757619498520504175?= The following commit has been merged into the objtool/core branch of tip: Commit-ID: 1aff0d2658e5a5217d3168e06a90fbb99fa63e80 Gitweb: https://git.kernel.org/tip/1aff0d2658e5a5217d3168e06a90fbb99fa63e80 Author: Juergen Gross AuthorDate: Fri, 25 Nov 2022 07:32:48 +01:00 Committer: Juergen Gross CommitterDate: Tue, 17 Jan 2023 09:05:32 +01:00 x86/xen: mark xen_pv_play_dead() as __noreturn Mark xen_pv_play_dead() and related to that xen_cpu_bringup_again() as "__noreturn". Signed-off-by: Juergen Gross Reviewed-by: Boris Ostrovsky Acked-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20221125063248.30256-3-jgross@suse.com Signed-off-by: Juergen Gross --- arch/x86/xen/smp.h | 2 +- arch/x86/xen/smp_pv.c | 4 ++-- tools/objtool/check.c | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/x86/xen/smp.h b/arch/x86/xen/smp.h index 6e90a31..22fb982 100644 --- a/arch/x86/xen/smp.h +++ b/arch/x86/xen/smp.h @@ -21,7 +21,7 @@ void xen_smp_send_reschedule(int cpu); void xen_smp_send_call_function_ipi(const struct cpumask *mask); void xen_smp_send_call_function_single_ipi(int cpu); -void xen_cpu_bringup_again(unsigned long stack); +void __noreturn xen_cpu_bringup_again(unsigned long stack); struct xen_common_irq { int irq; diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c index a97b050..a9cf8c8 100644 --- a/arch/x86/xen/smp_pv.c +++ b/arch/x86/xen/smp_pv.c @@ -381,7 +381,7 @@ static void xen_pv_cpu_die(unsigned int cpu) } } -static void xen_pv_play_dead(void) /* used only with HOTPLUG_CPU */ +static void __noreturn xen_pv_play_dead(void) /* used only with HOTPLUG_CPU */ { play_dead_common(); HYPERVISOR_vcpu_op(VCPUOP_down, xen_vcpu_nr(smp_processor_id()), NULL); @@ -400,7 +400,7 @@ static void xen_pv_cpu_die(unsigned int cpu) BUG(); } -static void xen_pv_play_dead(void) +static void __noreturn xen_pv_play_dead(void) { BUG(); } diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 4b7c8b3..68e87b4 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -186,6 +186,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func, "snp_abort", "stop_this_cpu", "usercopy_abort", + "xen_cpu_bringup_again", "xen_start_kernel", };