From patchwork Fri Jul 21 20:18:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 124076 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp445476vqg; Fri, 21 Jul 2023 13:22:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlGeNumv2Xfo9OUzg9csC9brgp3eNcmFABHcZFGYv6s+DhnwL6g1zi82sTqfaoBObVMU6QYT X-Received: by 2002:a17:907:781a:b0:993:d589:8b70 with SMTP id la26-20020a170907781a00b00993d5898b70mr2530310ejc.10.1689970958637; Fri, 21 Jul 2023 13:22:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689970958; cv=none; d=google.com; s=arc-20160816; b=y9NtlhK3XMKNmMzNhtweyEZA5iT68zGLDLo1EnpRgwEQte/4O+MkzLYkMY1oC54j3S g+W2ejR5EJvL8CNbn6Np+ojuULq8rdo7+62Jxy/Qm54LyIgBqxHH/Ef9dnCUojhuQQUO H3ymoOd7ueptL071RSXVw/LvKc1mIRccBHcep8UOxLZGQaj1v8sGZWJ7CZLhzAkaZjnX SpOqfGXrrQYZcurAaDJoDbfG15DG7UcjECvEf7d1nz2JI6qhWCpxmGLlc70zSc3QnU7b JuBm0GRaMIvv40Ib9GV0Y4SVWV3WR75p7EnCwA6uTghK15NDxqLsRdGuiPTtAotZXKrr NXZA== 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=KapJsJDXZSaTZ0KCMkqJA+w32osB4ivWYrQOtexabwQ=; fh=GitwJflddDxrBBVhnTGEzIZYOBTU7RKSqL+OyCDv/0M=; b=oKlKF02mONaLyDdxuUQxcdqgx4wVGAipahRe1XuTJgW5P1v2NkN9tF7R967K2Ykhj6 QGivFq5UyTRJqN7cmKPp3/EGRVvW/nZMv4+qX9fSU9GE6FeGKPMF/HHa5D8hWzRSiaFJ 6MIrQKeERn50hMkFQofmcc3Mz0f+CKEmQJdQc+zqvAMHvUwCUISKoVRz8zt5NP2tMKMv FCJFMHK46Dh1ihVI4uNe46W/wnI9+kXCI2bNGPKLiNGa3KfX8N+SlW2CSGsbsnDdryC+ O2qn7blBXxHe4pO+NBvFn3c2Wjm4Pm5O6OtjqDxd2tTAFnVmNtgcfKsuDB7WTTSh1jEr QE1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=TrXZbzXJ; 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 m12-20020a1709060d8c00b0098935e138basi2474123eji.286.2023.07.21.13.22.12; Fri, 21 Jul 2023 13:22:38 -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=TrXZbzXJ; 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 S231286AbjGUUTk (ORCPT + 99 others); Fri, 21 Jul 2023 16:19:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230356AbjGUUTT (ORCPT ); Fri, 21 Jul 2023 16:19:19 -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 DDBFDC6 for ; Fri, 21 Jul 2023 13:19:12 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-57059e6f9c7so39817167b3.0 for ; Fri, 21 Jul 2023 13:19:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1689970752; x=1690575552; 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=KapJsJDXZSaTZ0KCMkqJA+w32osB4ivWYrQOtexabwQ=; b=TrXZbzXJvXjAFMtmdjbY6g43FEEUJ51e56dkvtg+kfgYdfON7FtAc+d4i+2limdYih Fjpb36idC7mIVH+9ApO7W85B+EBgNR1y6VZFqbg9bjcKv172M5172Tu0I1dzmE0TZhX3 D9a4xyqNrw76UX3aD/sp0MisPY3yUWWKy6fXVSHGN4RpngnPjxMpr1WT6B57I5nDMM9h IGtYIrkL6QnQtXLq3ifiyUfnkXFyNu8goNHHb5EOEskvSfgSpgVq/fQOHdiQZkOKHfsp pRjXnhp8+gJFBM/PT+CJZnzWIouDqwd+pTmAWoAH8rgQR31KG+5TVJ87+VibBetAjN4U 9KGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689970752; x=1690575552; 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=KapJsJDXZSaTZ0KCMkqJA+w32osB4ivWYrQOtexabwQ=; b=RUOv8jvbXetdtINDT/14WhPjhxxpX31Z1U95Omh5sR15DO+xxKTRbLLbrHtiG/X2C2 zltzAERAY6vY3jshWLtB0kjanCm3xNFfQB2b7A+GlxJWd5CNEZoVwqjyGWweiB82cVa3 5hSB2ox0jNwADFrrui1gU7V+/mXQwJ/zz8B66chTZEy2acwHDYNZ09ZnJfUnn9uAKCmj RX2izTEuwrpMviwDK/Vaw8JnsVysOkFlthz1SF562aCK/DVqSGElV08Ev4S7/jC5lDTs v0HPa/cUzD53U0wBDUcaDaSQI3yHaBtRZc6XKoeWIEkCvr5qF7hBKbxz8+6QNOvpfMKM 9IxQ== X-Gm-Message-State: ABy/qLZMD2lVe1yhT5uqmYVFeFRyFuZD0cA6mpE8lczuSCAXkErMh2pU J8XA7c7DYu0/2K9vom9UPNVa4pcT40c= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:ad24:0:b0:56c:e53d:ae90 with SMTP id l36-20020a81ad24000000b0056ce53dae90mr13963ywh.4.1689970752188; Fri, 21 Jul 2023 13:19:12 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 21 Jul 2023 13:18:44 -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-5-seanjc@google.com> Subject: [PATCH v4 04/19] x86/reboot: KVM: Disable SVM during reboot via virt/KVM reboot callback 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: 1772062987866088919 X-GMAIL-MSGID: 1772062987866088919 Use the virt callback to disable SVM (and set GIF=1) during an emergency instead of blindly attempting to disable SVM. Like the VMX case, if a hypervisor, i.e. KVM, isn't loaded/active, SVM can't be in use. Acked-by: Kai Huang Signed-off-by: Sean Christopherson --- arch/x86/include/asm/virtext.h | 8 -------- arch/x86/kernel/reboot.c | 3 --- arch/x86/kvm/svm/svm.c | 19 +++++++++++++++++-- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h index 5bc29fab15da..aaed66249ccf 100644 --- a/arch/x86/include/asm/virtext.h +++ b/arch/x86/include/asm/virtext.h @@ -133,12 +133,4 @@ static inline void cpu_svm_disable(void) } } -/** Makes sure SVM is disabled, if it is supported on the CPU - */ -static inline void cpu_emergency_svm_disable(void) -{ - if (cpu_has_svm(NULL)) - cpu_svm_disable(); -} - #endif /* _ASM_X86_VIRTEX_H */ diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index d2d0f2672a64..48ad2d1ff83d 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -826,9 +826,6 @@ void cpu_emergency_disable_virtualization(void) if (callback) callback(); rcu_read_unlock(); - - /* KVM_AMD doesn't yet utilize the common callback. */ - cpu_emergency_svm_disable(); } #if defined(CONFIG_SMP) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index d381ad424554..1ae9c2c7eacb 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -563,6 +564,11 @@ void __svm_write_tsc_multiplier(u64 multiplier) preempt_enable(); } +static void svm_emergency_disable(void) +{ + cpu_svm_disable(); +} + static void svm_hardware_disable(void) { /* Make sure we clean up behind us */ @@ -5209,6 +5215,13 @@ static struct kvm_x86_init_ops svm_init_ops __initdata = { .pmu_ops = &amd_pmu_ops, }; +static void __svm_exit(void) +{ + kvm_x86_vendor_exit(); + + cpu_emergency_unregister_virt_callback(svm_emergency_disable); +} + static int __init svm_init(void) { int r; @@ -5222,6 +5235,8 @@ static int __init svm_init(void) if (r) return r; + cpu_emergency_register_virt_callback(svm_emergency_disable); + /* * Common KVM initialization _must_ come last, after this, /dev/kvm is * exposed to userspace! @@ -5234,14 +5249,14 @@ static int __init svm_init(void) return 0; err_kvm_init: - kvm_x86_vendor_exit(); + __svm_exit(); return r; } static void __exit svm_exit(void) { kvm_exit(); - kvm_x86_vendor_exit(); + __svm_exit(); } module_init(svm_init)