From patchwork Fri Mar 10 20:54:49 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: 67693 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1100734wrd; Fri, 10 Mar 2023 13:09:48 -0800 (PST) X-Google-Smtp-Source: AK7set8F0IqgWk6PT9Ee3IhXlflU9Yqn6dD04YVQlCZpV9u/dfbvW16iCd6Q8KoD6H830YVDYMAz X-Received: by 2002:a62:7945:0:b0:5a9:b4b4:6911 with SMTP id u66-20020a627945000000b005a9b4b46911mr25604535pfc.25.1678482587977; Fri, 10 Mar 2023 13:09:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678482587; cv=none; d=google.com; s=arc-20160816; b=oBRhMCV+HPZuGnQKpC98AzYDKSJQ+UNruC5QTIl6cG1DQTOJNd2RVCTxB39OnrTRcR UITiEoB3A8f0cTLJLVeuPXQB76EPJCVft9rOgGRBfO1kMSdBYwKpxIazfqE8H0bWZqnD tIMs3ipwxeeLiDE+pcW363bMr/pHr0FFTBQ3lT4/Q+z6Od9sPkrDqCeTrzATOURx3wMf aYIqcvCylzFhPBWeZ+4Jj6ofsbhC9nPnLAdTp4Poa0IznB2mJQEWyXrHOphlFILbY6Tt atym5E6Gx/5XWHDWlk+ZLPgp9CRDxcOHVqzrEFQca6qPs+gZR5VLFfXqxJeKNYEvqmaq sVHQ== 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=rL0J423GBVGHeksGJTZLQfQAxnBLSQAQfYgEcTOUz0g=; b=JjoAav8KdW+xudLIcps5fpfZWIZteJQXtCMvcxIZD3sKkPZOVsOaWaobznzPSNTrG6 qExdcXU0Pe3AFFnguKa+h67zgjwLodEUE7yN/8/Kh61l7r3ZWvuO6mhwMRRNNwE2lpMf Ye7Sj4MW5ziEBx3H1Fi8IyJuB3eEeH8O3zCn9mjARJ2Fmq+9sPo3SF3c5BG1ulJz9Tk8 mWMQ6Ey2Et83Rotnyha7ipnIOik5ZCcbYTEpY/Pac64gB6dZjnXLZt2R/6D/abe4xizx K7aWS2Wn+HvWpOhKGHEC9lu2Ryq1yQyjcGb78dp+pT5WPnP6eIqgoEt0w1GyEN985etp QVOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=u2j2VYON; dkim=neutral (no key) header.i=@linutronix.de; 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 k22-20020aa79736000000b005aa310ce65asi558309pfg.107.2023.03.10.13.08.47; Fri, 10 Mar 2023 13:09:47 -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=u2j2VYON; dkim=neutral (no key) header.i=@linutronix.de; 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 S231387AbjCJUz3 (ORCPT + 99 others); Fri, 10 Mar 2023 15:55:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231400AbjCJUyx (ORCPT ); Fri, 10 Mar 2023 15:54:53 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80E951219D0; Fri, 10 Mar 2023 12:54:52 -0800 (PST) Date: Fri, 10 Mar 2023 20:54:49 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1678481689; 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=rL0J423GBVGHeksGJTZLQfQAxnBLSQAQfYgEcTOUz0g=; b=u2j2VYONSGsBhZQHPnLHcKf9LJH1ArkVbeNrEABaNFPEAKLij1qCrmJyPrJVqyJrIZ7JZj TSpjg4oJylNR7M7LAqyVxt1gB7Gh2WdJ/OK53knakQYhbAQXQ9NbBq6YzMm0MxHgzk0n9G 9FhuIIFaxDvAqbQUeINt713tZAuCI7YXeZ4ct6P4j3eyV1P+ruK3G8q6Ug7Gtf5NChF9fC nFQzsmAug9g1/IDNMANRV9WoulLEihQMRn30k7riaI7tnMev0vu45Vw1Yj3oRiz3ZIQl4D kwmAHNsDEfbZZhkq/f+P9GGC48L/ix37OlRf1lbr3vfDTsHhnYIB5TDnAA/IjA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1678481689; 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=rL0J423GBVGHeksGJTZLQfQAxnBLSQAQfYgEcTOUz0g=; b=nZ/vYw6kP5E4/3rw9RujPjFEWn1qtgyDikATEJ77s87nixuVOPSM+8UvxiH+x/4v6mxPjI JwLPohcQyWKmBsCQ== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/core] x86/cpu: Make sure play_dead() doesn't return Cc: Josh Poimboeuf , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <11e6ac1cf10f92967882926e3ac16287b50642f2.1676358308.git.jpoimboe@kernel.org> References: <11e6ac1cf10f92967882926e3ac16287b50642f2.1676358308.git.jpoimboe@kernel.org> MIME-Version: 1.0 Message-ID: <167848168944.5837.18023341418882320171.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,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?1757789427273575886?= X-GMAIL-MSGID: =?utf-8?q?1760016558060873028?= The following commit has been merged into the objtool/core branch of tip: Commit-ID: a02f50b573b3c90a3633a5ab67435fe4c0de144d Gitweb: https://git.kernel.org/tip/a02f50b573b3c90a3633a5ab67435fe4c0de144d Author: Josh Poimboeuf AuthorDate: Mon, 13 Feb 2023 23:05:51 -08:00 Committer: Josh Poimboeuf CommitterDate: Wed, 08 Mar 2023 08:44:26 -08:00 x86/cpu: Make sure play_dead() doesn't return After commit 076cbf5d2163 ("x86/xen: don't let xen_pv_play_dead() return"), play_dead() never returns. Make that more explicit with a BUG(). BUG() is preferable to unreachable() because BUG() is a more explicit failure mode and avoids undefined behavior like falling off the edge of the function into whatever code happens to be next. Link: https://lore.kernel.org/r/11e6ac1cf10f92967882926e3ac16287b50642f2.1676358308.git.jpoimboe@kernel.org Signed-off-by: Josh Poimboeuf --- arch/x86/include/asm/smp.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index b4dbb20..8f628e0 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h @@ -96,6 +96,7 @@ static inline void __cpu_die(unsigned int cpu) static inline void play_dead(void) { smp_ops.play_dead(); + BUG(); } static inline void smp_send_reschedule(int cpu)