From patchwork Fri Mar 10 21:42:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67756 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1121315wrd; Fri, 10 Mar 2023 14:06:12 -0800 (PST) X-Google-Smtp-Source: AK7set/ozbehb51Khu6qz3TO2WUlYSFsIbKCJwEh/tXw/hHGLK49ZAwDUkJaURrBiTuKSmBI3x9Z X-Received: by 2002:a17:902:e848:b0:19e:7f7f:c8b1 with SMTP id t8-20020a170902e84800b0019e7f7fc8b1mr30422636plg.51.1678485972315; Fri, 10 Mar 2023 14:06:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678485972; cv=none; d=google.com; s=arc-20160816; b=FyKsSYkeQ2ziIOm2zDawtXqWY0/8ujKcIOLc92HfT+j/eDyI+FhlkCmVEbBQlypZjB Cb6WJYkQx96Wep7esQqzpflgrDWV/YQLnBHd81sewKPxMuKybgZbDH19wOCpWlnZycad 3ewOcW0MAE+N0uPPHeI7N8jyF87jk4+BpeQp7ENaZ1CEy49CrPqbwFCFqz6HX5vvjW+B kthOAEE+Lij0PkNMFOydVNeOvAbFU//LI9+8LoU+gQVXuOdgk2rAztem6aq/9HGXtXX7 peLwT2Mj6TLGKmzURbjLFK8MRdWmUxuk43S1to8fWn7i7YlPSnEwaeIBO6RTQ6lguFPX Pi4w== 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=enCDXi9YsDemt2TTHxfwszJvRc2dXqyk89onukiwfQc=; b=r8pqEKCcxfVcfVyik99AXE+C1tbNF1D7PtUF304PAi2hQD2SAFnTzgK4DK8xW5Clag hvZtxqa8LP+MTFXNlBZdniVO1gPwEzaXAfboMOlXcAJjJyEMNJ0qRABBpMSlJiHcPAwo M2LBwBJcpWudcMHmiekc6yAo0hx9C/FxhiFFvcbCypZvMRORs7g8EAh9DjYxmjOMQ7hr ONWB4Cd7YDydLqCXtehUDczPyq44smr4b72xxhssWTd8MOmlAViE3KlyyVW6PiQ8d0SP dn4ZZaJQIsy6AE3gsNVe8T2Kh7Ismju9Wq0HGq0d4NCDkyenQ/5Sxvu0x+jDMqtTH8/w AQGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=SPuqihFs; 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 li11-20020a170903294b00b0019cb8eede49si820288plb.506.2023.03.10.14.05.58; Fri, 10 Mar 2023 14:06:12 -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=SPuqihFs; 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 S231905AbjCJVmr (ORCPT + 99 others); Fri, 10 Mar 2023 16:42:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231868AbjCJVmn (ORCPT ); Fri, 10 Mar 2023 16:42:43 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AD90130C0B for ; Fri, 10 Mar 2023 13:42:42 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id g5-20020a25a485000000b009419f64f6afso7059841ybi.2 for ; Fri, 10 Mar 2023 13:42:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678484561; 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=enCDXi9YsDemt2TTHxfwszJvRc2dXqyk89onukiwfQc=; b=SPuqihFsYK9loRsqerF2bubjM61LStKypskZQztDWFydbqKu4vX/erViPPJeSHsWvS rppVs6WV756orTYsyXgV+CjCRh365Fc5NpZI5KUA0XyW3pnmbiYruP15pQapOP52kQla EtuUG+8Jw357D32wLqbTIVCqAPfinsvXQpYfzJMc5sq/caBnqgXO88T8aLxhVIgvOnEb 5owsW7BZvOZY2T8ls1H4Zw3mzTqVb7cXLPtdphlxezMpqOcdGM6cPlgwAnWSJomydpam 5u/+pfPjb1ViCYG8h9uMxcGnfrMh6DUEDezA60Pe82tUdlOloVcnXkBTDLhCHaqAd20r tfIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678484561; 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=enCDXi9YsDemt2TTHxfwszJvRc2dXqyk89onukiwfQc=; b=MWlunD7o4pjVIE2lZmcq8SUfZHm+c03UiDbabJHd8XRbxnxHjgALmPd9n5R1prfDD6 yzfGTi3RoA+p4YREg7ionBQqswx59z55fvOYhPDAsmntIkAdU6HH3k0CtH08jzwSjoHC MR+UFhJJtSqiDGlWnbz0P/P4Xd1GZ10fRYkJB55uzMer8bY9o4vFeZvlwy8/1kD1DeyM BBkQEd7Xp5eH0cjjlwunbuFDQL5UXX/lP5eZHWG2gm+O5/KUPPERmyY45F0QEIN3qDxg 1rttoFZZ+CcjSqDBV9jfSbcGi+/e/xNCjeRKLA36f3FbyzO1rIEd+RXlVj5VZSGPLWPA XSSw== X-Gm-Message-State: AO0yUKXpkPQt9GvuRDXyEO89XtLKz7Dt50MDGo7LD2au++ipIREjL1vI sdANEb+N3RRXNlwsN/MTkWUBDGV0mIU= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:a989:0:b0:534:1d7:fcf0 with SMTP id g131-20020a81a989000000b0053401d7fcf0mr17579810ywh.1.1678484561398; Fri, 10 Mar 2023 13:42:41 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 13:42:16 -0800 In-Reply-To: <20230310214232.806108-1-seanjc@google.com> Mime-Version: 1.0 References: <20230310214232.806108-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.rc1.284.g88254d51c5-goog Message-ID: <20230310214232.806108-3-seanjc@google.com> Subject: [PATCH v2 02/18] x86/reboot: Expose VMCS crash hooks if and only if KVM_INTEL is enabled From: Sean Christopherson To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Sean Christopherson , Paolo Bonzini Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Andrew Cooper , Kai Huang , Chao Gao 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?1760020106690308013?= X-GMAIL-MSGID: =?utf-8?q?1760020106690308013?= Expose the crash/reboot hooks used by KVM to do VMCLEAR+VMXOFF if and only if there's a potential in-tree user, KVM_INTEL. Signed-off-by: Sean Christopherson --- arch/x86/include/asm/reboot.h | 2 ++ arch/x86/kernel/reboot.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h index 2551baec927d..33c8e911e0de 100644 --- a/arch/x86/include/asm/reboot.h +++ b/arch/x86/include/asm/reboot.h @@ -25,8 +25,10 @@ void __noreturn machine_real_restart(unsigned int type); #define MRR_BIOS 0 #define MRR_APM 1 +#if IS_ENABLED(CONFIG_KVM_INTEL) typedef void crash_vmclear_fn(void); extern crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss; +#endif void cpu_emergency_disable_virtualization(void); typedef void (*nmi_shootdown_cb)(int, struct pt_regs*); diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 299b970e5f82..6c0b1634b884 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -787,6 +787,7 @@ void machine_crash_shutdown(struct pt_regs *regs) } #endif +#if IS_ENABLED(CONFIG_KVM_INTEL) /* * This is used to VMCLEAR all VMCSs loaded on the * processor. And when loading kvm_intel module, the @@ -807,6 +808,7 @@ static inline void cpu_crash_vmclear_loaded_vmcss(void) do_vmclear_operation(); rcu_read_unlock(); } +#endif /* This is the CPU performing the emergency shutdown work. */ int crashing_cpu = -1; @@ -818,7 +820,9 @@ int crashing_cpu = -1; */ void cpu_emergency_disable_virtualization(void) { +#if IS_ENABLED(CONFIG_KVM_INTEL) cpu_crash_vmclear_loaded_vmcss(); +#endif cpu_emergency_vmxoff(); cpu_emergency_svm_disable();