From patchwork Fri Mar 10 21:42:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 67732 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1114426wrd; Fri, 10 Mar 2023 13:47:11 -0800 (PST) X-Google-Smtp-Source: AK7set+88qJiIcQH4seIsN/Vytv8TZ5h2xDFI2oHu6E6viH/uFzfwYhF9kbEsalSSf3BQxM4wNKP X-Received: by 2002:a17:90b:3b85:b0:234:8c58:c325 with SMTP id pc5-20020a17090b3b8500b002348c58c325mr26533021pjb.31.1678484831052; Fri, 10 Mar 2023 13:47:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678484831; cv=none; d=google.com; s=arc-20160816; b=XAJXTBpgESSykYDKC+EnoeuFODU2031eVNeauaBMTH0LFhaByDjTu55JwH+UQTzH5Z 9H8JGYl4bKvGrOgoGQf85LdPCi/kxj/B0gWkJy8T1QkYpArWphJv5hDimVOv0+o2lhti oxV1h95HksI6eHjAX17sMLtK2RTm4P+p1J5yiZ02WL0JA401I4gPPioIuZxCxzZpWI0H GFnmj+KZykjx3ewAp0UgFkvFt6BNhqkXlmKKFPoxdIT3xcdw4xj1sHrwT4giQsJ7Zfhr Lsu8djgoc9AQKS7+RSTZ3ZefTzSuK8OS7hYjukuo7AUHjLVFYn4y4MVY/BEuB14n76wH ZG8w== 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=ksXX7w7DOgMSUfWcc6++N7pFfPEmS+/uh5KW2SxRWLg=; b=wHnLKeqPih223TsEPgH6OTB8cPiVnLipKg+Rav2f1FRoe8v5G0aHnomJgoZ5NiSKMz vesbg6AhpnfZvhoTOpzABAeKBVxKS6RNatmNqMlKJFbCBByeYhnFk+6tSRH0s5633DnV Oo8ZWSHjeNTJ+6MEn+KeV3GjRgguI1pyL/9dVb2dpxZmMqs4o05sYIb4d8svOn2daav4 Zk2OkXZHm5BNx4nRdvuLPvpqJreUYVwnIzkqfLtJsXSv+NVwL/SoC6lFdgUQs199kj3w P8KTMQ1VPUnbybAYpp6vx/TucitBgJuVe3nErXuTy/zXQ1mh+RddbjTzG4/+JkTxuTCc LWKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=CdkmpywE; 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 i10-20020a17090a974a00b002341bdd031fsi730512pjw.69.2023.03.10.13.46.50; Fri, 10 Mar 2023 13:47:11 -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=CdkmpywE; 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 S231251AbjCJVpJ (ORCPT + 99 others); Fri, 10 Mar 2023 16:45:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231877AbjCJVoP (ORCPT ); Fri, 10 Mar 2023 16:44:15 -0500 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E96A6A2DA for ; Fri, 10 Mar 2023 13:43:24 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id q1-20020a170902dac100b0019f1e3ea83dso416565plx.4 for ; Fri, 10 Mar 2023 13:43:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1678484588; 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=ksXX7w7DOgMSUfWcc6++N7pFfPEmS+/uh5KW2SxRWLg=; b=CdkmpywEjUR3b6EjxKkPa4YvZWHbCoXcmVBs3Hrb87A0RA1IF7R1chC4RjF2JU1UOO T/cPDMvG5as5m9qH6MplauVwoTRVSihJS3LAgYhtKzJX8Z1kYl4K5wiFEuEgOVRLSnGw moRsmkKH4UmV0BGwbRQbwpF+m76vXrmtiVO2m644ebUcqa/l6EUx13O5BGJaHJ+3NFZR T3Zkce7rO2JaWHF2Bk617TTUV2pO00zgP6GgppW8x5bVerYKtHy32JCdD7FgQieizCTs eiPnzyTcqjOSubxVy0dYUkClK8MpTWRqAu9J4BBo4EwRRL8Aw7W1OqcsW5dgcZu+QSuI 2Z+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678484588; 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=ksXX7w7DOgMSUfWcc6++N7pFfPEmS+/uh5KW2SxRWLg=; b=G13p/S8la+PKYUdfLCcS5S0Wve4S3KNuIcZU2BUcL7ZJH/JQQoESOKTHUJtklNykeC nQATn8lBpdlqy6edua8QprTZYpmB7dSoCeK9wnmxrW6hKvxTqnyyX6piOMaNomcWGvg6 UBso0i7w9u+kvrPH8/BHcW7Lz/qGMDgxjP1G/X0uN+UY/F+5BF6Z2lXbj3Kh4pQ2EEZZ bnyVGc5zR+KNy+Ffm+sLUvejXP1SHHVCOGUy+RCswdwPaa8naEnEwH/EdrWdpiXLv/WX LEw1LhSP/S2oaKfEv3DNTFomVq6nyUlVj2JNgABb63rAnxo6fg2Ld0DI01bVO+VcryBc LA7A== X-Gm-Message-State: AO0yUKXIJeS7oBu5gigdPT4aSuaDTPPJ3Lr5+5t80Xu9HXTzVnZu5B/m 5f+exqu1Y2HmQvrYcaLNiASYuWMzoqA= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:f90b:b0:19f:1ee9:a14 with SMTP id kw11-20020a170902f90b00b0019f1ee90a14mr331047plb.4.1678484588314; Fri, 10 Mar 2023 13:43:08 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 10 Mar 2023 13:42:30 -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-17-seanjc@google.com> Subject: [PATCH v2 16/18] x86/virt: KVM: Move "disable SVM" helper into KVM SVM 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?1760018909913327802?= X-GMAIL-MSGID: =?utf-8?q?1760018909913327802?= Move cpu_svm_disable() into KVM proper now that all hardware virtualization management is routed through KVM. Remove the now-empty virtext.h. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/include/asm/virtext.h | 50 ---------------------------------- arch/x86/kvm/svm/svm.c | 28 +++++++++++++++++-- 2 files changed, 25 insertions(+), 53 deletions(-) delete mode 100644 arch/x86/include/asm/virtext.h diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h deleted file mode 100644 index 632575e257d8..000000000000 --- a/arch/x86/include/asm/virtext.h +++ /dev/null @@ -1,50 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* CPU virtualization extensions handling - * - * This should carry the code for handling CPU virtualization extensions - * that needs to live in the kernel core. - * - * Author: Eduardo Habkost - * - * Copyright (C) 2008, Red Hat Inc. - * - * Contains code from KVM, Copyright (C) 2006 Qumranet, Inc. - */ -#ifndef _ASM_X86_VIRTEX_H -#define _ASM_X86_VIRTEX_H - -#include - -#include -#include -#include - -/* - * SVM functions: - */ -/** Disable SVM on the current CPU - */ -static inline void cpu_svm_disable(void) -{ - uint64_t efer; - - wrmsrl(MSR_VM_HSAVE_PA, 0); - rdmsrl(MSR_EFER, efer); - if (efer & EFER_SVME) { - /* - * Force GIF=1 prior to disabling SVM to ensure INIT and NMI - * aren't blocked, e.g. if a fatal error occurred between CLGI - * and STGI. Note, STGI may #UD if SVM is disabled from NMI - * context between reading EFER and executing STGI. In that - * case, GIF must already be set, otherwise the NMI would have - * been blocked, so just eat the fault. - */ - asm_volatile_goto("1: stgi\n\t" - _ASM_EXTABLE(1b, %l[fault]) - ::: "memory" : fault); -fault: - wrmsrl(MSR_EFER, efer & ~EFER_SVME); - } -} - -#endif /* _ASM_X86_VIRTEX_H */ diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index f04b61c3d9d8..2db03991dcdf 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -41,7 +41,6 @@ #include #include -#include #include "trace.h" #include "svm.h" @@ -584,9 +583,32 @@ void __svm_write_tsc_multiplier(u64 multiplier) preempt_enable(); } +static inline void kvm_cpu_svm_disable(void) +{ + uint64_t efer; + + wrmsrl(MSR_VM_HSAVE_PA, 0); + rdmsrl(MSR_EFER, efer); + if (efer & EFER_SVME) { + /* + * Force GIF=1 prior to disabling SVM to ensure INIT and NMI + * aren't blocked, e.g. if a fatal error occurred between CLGI + * and STGI. Note, STGI may #UD if SVM is disabled from NMI + * context between reading EFER and executing STGI. In that + * case, GIF must already be set, otherwise the NMI would have + * been blocked, so just eat the fault. + */ + asm_volatile_goto("1: stgi\n\t" + _ASM_EXTABLE(1b, %l[fault]) + ::: "memory" : fault); +fault: + wrmsrl(MSR_EFER, efer & ~EFER_SVME); + } +} + static void svm_emergency_disable(void) { - cpu_svm_disable(); + kvm_cpu_svm_disable(); } static void svm_hardware_disable(void) @@ -595,7 +617,7 @@ static void svm_hardware_disable(void) if (tsc_scaling) __svm_write_tsc_multiplier(SVM_TSC_RATIO_DEFAULT); - cpu_svm_disable(); + kvm_cpu_svm_disable(); amd_pmu_disable_virt(); }