From patchwork Fri May 12 23:50:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 93428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp5463878vqo; Fri, 12 May 2023 16:57:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ42/8ZDySXlF2/MOiBs8Uk89EQTfYqssthDguZfLz/GFmmXujiupfyJCY5MKOt6bKkONs3P X-Received: by 2002:a17:902:e751:b0:1ab:b120:8efe with SMTP id p17-20020a170902e75100b001abb1208efemr30656441plf.22.1683935824283; Fri, 12 May 2023 16:57:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683935824; cv=none; d=google.com; s=arc-20160816; b=GMg8yPFM0lfal/vkhcn0CORsnEivw0RDa6w8Zgij6BQyXaJvrTsRqigTFsJtJVpw0s GqcrsEyZbOvRIfCWSGraDpwtL4NegneA/V7dUvoouGBoRLI32DAHTri2aDVsRSNW6RUT KazMJJbKoFeU7Tc0cmBhWs+wfBGw2asU2/K8EehBaKtXeEMU2ECL3RSuhXYaqbSwP8SK UVjmM/HIlotuzNRIxak3/LKyhmZNkNSxRVJsavuKWJ/fxvKvSpg/2d7K2GoHXCw/dT3N OMcnhLMr06KxvLau5ggL8sw0OXb8ljbNvJm/Js+Tb0eNdwzhZnd9XJESF9smYEi4dPj4 BZhw== 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=KGKAnySlWtkvOAmbXxK2nlX19G10s26Qrw8fOC1mwIY=; b=Z5XXr6UCHh7QYB7oz1oGZQ1Kl357lBd6OzHXrBTknhyZ1F/xmCunfXmVctrY5uV205 652vHIcmALAJzct7ES65wpAfhmq094+gLIqWYJkMlXyQly6nxmNlMcqq7G7J0avtIPZK w6KdYwiaSBjjnNtr3q8dN5Ss9Uqne6/Bl6fWdVTmmSnrZVCdt9A+vOyl7k6wjmr2Qm35 8NqyRirz0SR+rP8x8ibPgcGodvY1d3+Ij9Tu6GpdKPmZeJ8C8CIt7UGosVP+mLWiZKQj JjsKHkiqihEf7HSQpH3hzUm42jhT6Jd3pTqnqQahCZvedIdYSikfDqS5g4yVj5V9UUiT jZxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=xSptbPlA; 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 u15-20020a170902e5cf00b0019adf805babsi11149397plf.500.2023.05.12.16.56.51; Fri, 12 May 2023 16:57:04 -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=xSptbPlA; 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 S241570AbjELXwl (ORCPT + 99 others); Fri, 12 May 2023 19:52:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241301AbjELXv6 (ORCPT ); Fri, 12 May 2023 19:51:58 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20057E719 for ; Fri, 12 May 2023 16:51:16 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-ba69d93a6b5so6415306276.1 for ; Fri, 12 May 2023 16:51:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683935459; x=1686527459; 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=KGKAnySlWtkvOAmbXxK2nlX19G10s26Qrw8fOC1mwIY=; b=xSptbPlAmdBo3OoV/lCpZzZM3pkZJe4U21Afu0d5tN2bwXkPEValyNtS1oEWn+XSbv sddtILRUbr35bNgtJCqHWHVCTZuJK4YUQGqsvtkMdbHnBPRtVcEgEVQP5WUj5aq/p/Fe EMHqkeMn2A+c73IsL9bazRv44DPi4+wbcSkO27qRDKC4+1DNxjVhdD2whZ7Etl30iCzq V7if3TNYXP7wmXBA4s5axBA9bvm1slAgM5s6SLgLjOkzr0KujZ7P+tQWaRx/8ZyHx4Jn 8CM32tr9uvqMHKRQhRvPjgImjU4WjHw7ctslGis+z1TBI89xg4LUA4HStSs4TXGNDFmV RFMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683935459; x=1686527459; 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=KGKAnySlWtkvOAmbXxK2nlX19G10s26Qrw8fOC1mwIY=; b=Di7oatcCaNV5CwlJgVxYnS1JTCs+lKZF5cQcIFXMOyGNpStFSdcbaMS4mtWZ7g8ngr O9QgsjuK2+B1ImK92Hp4BxVYbCgOpH0gTskmtmHqBg+DeV1iDgBmBqWYfDFV8ilgp0SS sf+uqnd3A+Oz8fUFOmWuPVjhutfgcrmzA5YR5F3dhH3yNr6Xh4IZDutYYmSBVnXmdv/t GR9p7IcP77//yawkoYwCvJrR3q2CQ9oCdYTg2f/n8d1lPlATcIUvoIcEGfZomgq+Lpf9 Z8jz55xv5A3+MmOirdHtXXhc4ORfr7pzxWVAi7aZlfYL+j+eCug9pkByOD6jdIgr+c/F lb5g== X-Gm-Message-State: AC+VfDyMkR9lnVeO9u/yjC1HQ318br38qN+WKPVKyCzJNTztztPgwH+P 0juaqNPfGwWUynifq/iEqx+r7pAhzLo= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6902:180b:b0:b1d:5061:98e3 with SMTP id cf11-20020a056902180b00b00b1d506198e3mr15831702ybb.6.1683935459101; Fri, 12 May 2023 16:50:59 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 12 May 2023 16:50:24 -0700 In-Reply-To: <20230512235026.808058-1-seanjc@google.com> Mime-Version: 1.0 References: <20230512235026.808058-1-seanjc@google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Message-ID: <20230512235026.808058-17-seanjc@google.com> Subject: [PATCH v3 16/18] x86/virt: KVM: Move "disable SVM" helper into KVM SVM From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@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,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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1765734690574065398?= X-GMAIL-MSGID: =?utf-8?q?1765734690574065398?= 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 Reviewed-by: Kai Huang --- 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 cf5f3880751b..2cc195d95d32 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" @@ -587,9 +586,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) @@ -598,7 +620,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(); }