From patchwork Thu Dec 1 23:26:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 28596 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp540785wrr; Thu, 1 Dec 2022 15:29:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf4bMsfUQhMY2avVh+1bmvofBY4EJsuB655ySwi70Pj8ESBux4Mk4L3hUzBRxlV4qahhimc1 X-Received: by 2002:a50:fe11:0:b0:46b:2327:7c5d with SMTP id f17-20020a50fe11000000b0046b23277c5dmr19937796edt.386.1669937354441; Thu, 01 Dec 2022 15:29:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669937354; cv=none; d=google.com; s=arc-20160816; b=vRko16fZvXDMHCz8ou4YpkCUM4L5YZoMXy8UDU/AGc5hehp98R29vOyocVzUJ5EfRg icsIjURmiWthDPkbo4mUB54IMCNka4jXci9KXnbPeQtXe/CG8nrKqIHMEEoFxBWtbn2p YWIewCINHoTin+4y52WoOMTdUw+T2ksxR8UBfP7060Z9iDfcdivIsdRxbO4cXDkY7UPs UagzDSZi1OCitWclAghslUE9U31DX+NPv1Xgq5AfMsG28C3jR68+OZrHWsMNi6hnnfqZ zSIhYNWxAR69QOHD+jXawPg2vFCrkOydaWNK0scs1wfq6raOMfDxMkF0GJGBWYAgCMgM m77A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=PueUj9DN6y/B+t9EKbOQHEz5+gc+C1Dj1im/eZPScN4=; b=NuV9m/+6jSioDxghJGIeiqdOsZcH3TtRWt++m3gF4rhQI5a4JXo7hObb/jUEP3pXiq h9dtZ236xpGUBrNtazfCZCyOGN5DsWoQknsxE4o8+eMMSLG4TMysnJwh5gfaB1tGdpGy bVIVn1Wo2Z2dR5KfCAT+HuzFuD0kgPevh0wyv/UpAARnsTwqeWahPPOCSwL3JX2NXWL2 O3aqSPIDQE/uM/MPdrpNxuWtmdWRzXTejOsgKpOtINkfNyqFKvlNaRMv+YvlcQDinR9h jdWegdojwtWPTaC4ArmZNq1sXkJLSTyI9k5Usxz7+w3aMoQFt5gpvQjjQpnRcfdjvprh vu1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=MS4rtQrm; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a14-20020a170906468e00b007bdebcdfb58si3077191ejr.720.2022.12.01.15.28.51; Thu, 01 Dec 2022 15:29:14 -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=@google.com header.s=20210112 header.b=MS4rtQrm; 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=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231933AbiLAX1y (ORCPT + 99 others); Thu, 1 Dec 2022 18:27:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231875AbiLAX10 (ORCPT ); Thu, 1 Dec 2022 18:27:26 -0500 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF709CC64E for ; Thu, 1 Dec 2022 15:27:14 -0800 (PST) Received: by mail-pj1-x1049.google.com with SMTP id l2-20020a17090add8200b00218daa1a812so2952599pjv.3 for ; Thu, 01 Dec 2022 15:27:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=PueUj9DN6y/B+t9EKbOQHEz5+gc+C1Dj1im/eZPScN4=; b=MS4rtQrmXPYim7WgQgTNM4fYna3dJdawLyxdI3gxmMYsAenENi/HoieSKBu4uCq4DY btGKvi4pzD+yD18bJlTr1pY+t7g7c1ZcDRdBWVFw0Ch5PmWQGP5l2BLkQx21HI+ugfze +HgPsEsOcYYQn2TTomEnrZSQL1LG+p1oNm58avOaTcv/nMMpWW8u44c8VlhNcp7hKpnv +1R2r7nqOOjK82AyKFm7xg6vbEeOYD4FEnU7AsGk7L65aC1LdgE+N6a8gBZYv1zrQiZ0 ZT6aQxoincXgbjSvwlt9EuygYRjWnFdbD4gSsVajlwz9bNW2/XvbwVqQ3mb3kXY5jujb BRpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=PueUj9DN6y/B+t9EKbOQHEz5+gc+C1Dj1im/eZPScN4=; b=ooTeUyX5v2uE1KLSVmQaq/ePM+NEI9SsiYJGTcsskFoT1svtzjH7Oafl0cEeoboNb9 xioOPJ7VQnxQjnmr2S4s6eQ1wM9Va3bU0Ln0R2SpfubLiCAMR/joPgHsIJuRd0hHxZRo laqU9L6Px3Gkj3DnIrItdpfwWOTD+SWPlE6CaDkCuTGk1jiPlP7LbqZYM/7vAkqhrsJY 3Pe8/hx1P1f+Hi5qPPjR8laAGHrUNZpnaxubjbr72//OHO3UO8XnUxeUh5jrEV3isncP DvF2SJJ+8hol6ngQYZphdhspMdrpCgPxlA7hOh/BdLugm+siHBL2tfQWhrECUkoifJVb wcVA== X-Gm-Message-State: ANoB5plytlwamOIzWOlNqr8ZBhMGTUVBnKLYlAtr8aNRx5Y+Rx7Cr4d+ 3MuKxVNkrP1M3h7YC/apOcnoiNbM7ng= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a65:60c9:0:b0:470:48c1:aae9 with SMTP id r9-20020a6560c9000000b0047048c1aae9mr43149036pgv.4.1669937234233; Thu, 01 Dec 2022 15:27:14 -0800 (PST) Reply-To: Sean Christopherson Date: Thu, 1 Dec 2022 23:26:46 +0000 In-Reply-To: <20221201232655.290720-1-seanjc@google.com> Mime-Version: 1.0 References: <20221201232655.290720-1-seanjc@google.com> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog Message-ID: <20221201232655.290720-8-seanjc@google.com> Subject: [PATCH 07/16] x86/reboot: Hoist "disable virt" helpers above "emergency reboot" path From: Sean Christopherson To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Sean Christopherson , Paolo Bonzini Cc: "H. Peter Anvin" , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Andrew Cooper X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL 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?1751056231351684233?= X-GMAIL-MSGID: =?utf-8?q?1751056231351684233?= Move the various "disable virtualization" helpers above the emergency reboot path so that emergency_reboot_disable_virtualization() can be stubbed out in a future patch if neither KVM_INTEL nor KVM_AMD is enabled, i.e. if there is no in-tree user of CPU virtualization. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/include/asm/reboot.h | 4 +- arch/x86/kernel/reboot.c | 86 +++++++++++++++++------------------ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h index dc2b77e6704b..2be5b89c9a05 100644 --- a/arch/x86/include/asm/reboot.h +++ b/arch/x86/include/asm/reboot.h @@ -29,8 +29,10 @@ void __noreturn machine_real_restart(unsigned int type); typedef void (cpu_emergency_virt_cb)(void); void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback); void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback); -#endif void cpu_emergency_disable_virtualization(void); +#else +static inline void cpu_emergency_disable_virtualization(void) {} +#endif typedef void (*nmi_shootdown_cb)(int, struct pt_regs*); void nmi_panic_self_stop(struct pt_regs *regs); diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 3eec3cdbc054..a006ddaa1405 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -530,6 +530,48 @@ static inline void kb_wait(void) static inline void nmi_shootdown_cpus_on_restart(void); +#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD) +/* RCU-protected callback to disable virtualization prior to reboot. */ +static cpu_emergency_virt_cb __rcu *cpu_emergency_virt_callback; + +void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback) +{ + if (WARN_ON_ONCE(rcu_access_pointer(cpu_emergency_virt_callback))) + return; + + rcu_assign_pointer(cpu_emergency_virt_callback, callback); +} +EXPORT_SYMBOL_GPL(cpu_emergency_register_virt_callback); + +void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback) +{ + if (WARN_ON_ONCE(rcu_access_pointer(cpu_emergency_virt_callback) != callback)) + return; + + rcu_assign_pointer(cpu_emergency_virt_callback, NULL); + synchronize_rcu(); +} +EXPORT_SYMBOL_GPL(cpu_emergency_unregister_virt_callback); + +/* + * Disable virtualization, i.e. VMX or SVM, to ensure INIT is recognized during + * reboot. VMX blocks INIT if the CPU is post-VMXON, and SVM blocks INIT if + * GIF=0, i.e. if the crash occurred between CLGI and STGI. + */ +void cpu_emergency_disable_virtualization(void) +{ + cpu_emergency_virt_cb *callback; + + lockdep_assert_irqs_disabled(); + + rcu_read_lock(); + callback = rcu_dereference(cpu_emergency_virt_callback); + if (callback) + callback(); + rcu_read_unlock(); +} +#endif /* CONFIG_KVM_INTEL || CONFIG_KVM_AMD */ + static void emergency_reboot_disable_virtualization(void) { /* Just make sure we won't change CPUs while doing this */ @@ -787,53 +829,9 @@ void machine_crash_shutdown(struct pt_regs *regs) } #endif -#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD) -/* RCU-protected callback to disable virtualization prior to reboot. */ -static cpu_emergency_virt_cb __rcu *cpu_emergency_virt_callback; - -void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback) -{ - if (WARN_ON_ONCE(rcu_access_pointer(cpu_emergency_virt_callback))) - return; - - rcu_assign_pointer(cpu_emergency_virt_callback, callback); -} -EXPORT_SYMBOL_GPL(cpu_emergency_register_virt_callback); - -void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback) -{ - if (WARN_ON_ONCE(rcu_access_pointer(cpu_emergency_virt_callback) != callback)) - return; - - rcu_assign_pointer(cpu_emergency_virt_callback, NULL); - synchronize_rcu(); -} -EXPORT_SYMBOL_GPL(cpu_emergency_unregister_virt_callback); -#endif - /* This is the CPU performing the emergency shutdown work. */ int crashing_cpu = -1; -/* - * Disable virtualization, i.e. VMX or SVM, to ensure INIT is recognized during - * reboot. VMX blocks INIT if the CPU is post-VMXON, and SVM blocks INIT if - * GIF=0, i.e. if the crash occurred between CLGI and STGI. - */ -void cpu_emergency_disable_virtualization(void) -{ - lockdep_assert_irqs_disabled(); - -#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD) - cpu_emergency_virt_cb *callback; - - rcu_read_lock(); - callback = rcu_dereference(cpu_emergency_virt_callback); - if (callback) - callback(); - rcu_read_unlock(); -#endif -} - #if defined(CONFIG_SMP) static nmi_shootdown_cb shootdown_callback;