From patchwork Fri Jul 21 20:18:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 124083 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp453414vqg; Fri, 21 Jul 2023 13:41:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlFK4vbPMb/cxZS351rgxx/rD2ENvbKoeRP3xocMi/4kAP8OjTZZSO+SttosHgQS2yPIAJYV X-Received: by 2002:a17:906:3107:b0:997:e836:6bb with SMTP id 7-20020a170906310700b00997e83606bbmr3205661ejx.14.1689972072710; Fri, 21 Jul 2023 13:41:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689972072; cv=none; d=google.com; s=arc-20160816; b=IH7Dt1XFXG3ZVC/LeZlQ1AAjqYoXvOthbL1AqNL9VTN4F6rm6loVprKOgopUAUUr2T NpnIZoUmFL+mscTd66o3kCU7iVUluo3dWduXtmqEHToHtSCFrFpAYAQy8VYtIwvVOKKa E0ta+asxioQfa44yIsLO0UcX1r0NbeJ9D8NoA1jndH5+xnZVWU014iNlC6r1NWsarbNY Q2+EzhY6lAQ7YPy+5i01lKchRSL+7UDAsVXSuMhbEcRdNBWxOO1DySJ+cweTdj6kp49b wohlEyZNQv+J/L0DV3mTUG0dPRBbXsblvBg1qBpPgCQwNfsKbTDJkvGY4fc72AxBYmdk 1QDQ== 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=kp8wKDt0eMxNmmgxbfIQ59HsgNC9pjZ5TgTeqdMxU/I=; fh=GitwJflddDxrBBVhnTGEzIZYOBTU7RKSqL+OyCDv/0M=; b=Nu1Diy99os7S5RvFo3PKGuP2U2QGYiwjwV+HEzL3fONpYpCx+Ou+rWGsP4r7HvVQNG Yo/c51QnZjbwFx0Czv7xuRjIgKErwrgZpAEA1SI/mS7JSoVW5i4Yi5tXO4crm2jpCWBb eCsZv+cgxd0rqP4gK5IwbH8IqIlZhrI3INhIOCGTqaDB32GBtpS592r2m8nhAS7jKj3N BOZnz4TtF4gyY3DmK7AVSRu/wm+GBb5avIIZ40wlc10gobyQdMvtR4B1yHWdkfyzi3ty HYH0XYX3W5U2TsHqFSIkyKzFqoDBUC5dldx8SRrdOBggfnxnvsydF7b3g8oktlorOVTn SYWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=AAcenZvw; 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 p21-20020a1709060dd500b0098d2f716c75si2473036eji.597.2023.07.21.13.40.49; Fri, 21 Jul 2023 13:41:12 -0700 (PDT) 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=20221208 header.b=AAcenZvw; 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 S231339AbjGUUTw (ORCPT + 99 others); Fri, 21 Jul 2023 16:19:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231179AbjGUUT1 (ORCPT ); Fri, 21 Jul 2023 16:19:27 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D95083A8C for ; Fri, 21 Jul 2023 13:19:21 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-583994e0bc5so12901007b3.0 for ; Fri, 21 Jul 2023 13:19:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689970760; x=1690575560; 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=kp8wKDt0eMxNmmgxbfIQ59HsgNC9pjZ5TgTeqdMxU/I=; b=AAcenZvw756VBG7/uWjvcLB2GB6SaD9rHsGVP1ovtfQ7g3P1/K5Es/5cP7bQX4Cett TXIqUcFS8rwOAQTdffRrYdTVUeGqUN4Pk1zQVEpgyHZgM5CU4q7BAddWItw5Q7B/HUFX dm9BEq62JHh36Dyv0YCxgBb//gvHCL44aM4hNFvAWv9IYaRXhunR1CtejhbcQSL/3BKu jhhLx9apEs7AWteNUlsHKFY1npg1EGGfPoIogyCbJDG+NVcTCP8a4KpbcRzwBW7l7aEc fnDXtssi6A7cJBIy/mxf0JRinHLH1Q1C9G7n2rTaBE2AVxXbRmy7Sib5y3L9HVmp9h0H 1bJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689970760; x=1690575560; 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=kp8wKDt0eMxNmmgxbfIQ59HsgNC9pjZ5TgTeqdMxU/I=; b=jrwqRpOghM2r0mFoDborV9a9yuYvhTDdkiW68QJ6YHB04/z8nJ02oeBhqiAWznPmYE Uccj+Q4mVSzRf2A/5riwDi/8TnZqDL9p4Wjb5dEvPQNdvrp3GgvaCTe2+VNu89Xfuzlu b5nQYsN8Jm4nclM4vTz5eJvmxqt85eInm4/hPv4UQsvMifYB3AeqfBE+Q0SKR8hV3W2x 0n5rHXDkMvjC/NiQmrwBbUeq2HooFhJgzT4NUt5NGDrnuyk2VnhOeyzMev2OOmbYJQN/ Pza+NfgEaWV6BWuwcIx6welwiTmdzZDGlJ+OBptThOCvoz6A3js+HGiP8FGGmQr4I0wj 9aQQ== X-Gm-Message-State: ABy/qLbg8EfWdYR7UShtk6j/bNzGVq9IJCwFFmuvmg2di8iJ5jcDViCp DmDHkhgkW/qrm0GyXwNFPFHWzMKI0xk= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:ac14:0:b0:581:3899:91bc with SMTP id k20-20020a81ac14000000b00581389991bcmr9159ywh.6.1689970760558; Fri, 21 Jul 2023 13:19:20 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 21 Jul 2023 13:18:48 -0700 In-Reply-To: <20230721201859.2307736-1-seanjc@google.com> Mime-Version: 1.0 References: <20230721201859.2307736-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230721201859.2307736-9-seanjc@google.com> Subject: [PATCH v4 08/19] x86/reboot: Expose VMCS crash hooks if and only if KVM_{INTEL,AMD} 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_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, USER_IN_DEF_DKIM_WL autolearn=unavailable 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: INBOX X-GMAIL-THRID: 1772064156001166221 X-GMAIL-MSGID: 1772064156001166221 Expose the crash/reboot hooks used by KVM to disable virtualization in hardware and unblock INIT only if there's a potential in-tree user, i.e. either KVM_INTEL or KVM_AMD is enabled. Reviewed-by: Kai Huang Signed-off-by: Sean Christopherson --- arch/x86/include/asm/reboot.h | 4 ++++ arch/x86/kernel/reboot.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h index 74c6a624d166..6536873f8fc0 100644 --- a/arch/x86/include/asm/reboot.h +++ b/arch/x86/include/asm/reboot.h @@ -25,10 +25,14 @@ void __noreturn machine_real_restart(unsigned int type); #define MRR_BIOS 0 #define MRR_APM 1 +#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD) 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); void cpu_emergency_disable_virtualization(void); +#else +static inline void cpu_emergency_disable_virtualization(void) {} +#endif /* CONFIG_KVM_INTEL || CONFIG_KVM_AMD */ typedef void (*nmi_shootdown_cb)(int, struct pt_regs*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 98e5db3fd7f4..830425e6d38e 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -529,6 +529,7 @@ 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; @@ -596,7 +597,9 @@ static void emergency_reboot_disable_virtualization(void) nmi_shootdown_cpus_on_restart(); } } - +#else +static void emergency_reboot_disable_virtualization(void) { } +#endif /* CONFIG_KVM_INTEL || CONFIG_KVM_AMD */ void __attribute__((weak)) mach_reboot_fixups(void) {