From nobody Thu Sep 11 16:06:45 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9766EC07E8F for ; Tue, 15 Aug 2023 20:38:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239640AbjHOUik (ORCPT ); Tue, 15 Aug 2023 16:38:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239107AbjHOUiD (ORCPT ); Tue, 15 Aug 2023 16:38:03 -0400 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 B64A8211F for ; Tue, 15 Aug 2023 13:37:42 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-1bdcb3fc6a4so38631225ad.3 for ; Tue, 15 Aug 2023 13:37:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692131840; x=1692736640; 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=T8HV7UgIa1dG2H5Sf/ED5TJcqQr5XJgF9Itu7yEIR4Q=; b=eRl6rED/Pj2iZDULtLilXVj59YR7XMUFqHnszIcxYB5GnQ+iWW9mAG9veo0hrSniC/ 9QNra63TT3K0jSUT+FxdTV6Ddex/szHO6sFqpBLz3S6BwCVN6bqODIWqR8dLiaFClgER J/1jxVz9oU0Wiau77mexr81UK3oI/uAVpyHD71+khbEqeJszPPlDzM1m+ZsgFF+g7U7d IkTJZo+Ug6ezuIT1dkaCx/ACl0e8DmJro07eeJgBXef5tdWaMxcBYf+1wUF3xS+Ji0PW iKu972u8veilFphQuTnxZwg9pHVo1kmQn2pMH1Z4m+eb/Cxopj2WSPsDT8FvW/LlU1hp NRtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692131840; x=1692736640; 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=T8HV7UgIa1dG2H5Sf/ED5TJcqQr5XJgF9Itu7yEIR4Q=; b=beL6U6/cMCHZLkryd4r5noVzrt3EQCEAx8PD0qP/pu5cDjy5bccPOePWgJolpVBGm2 U5sDDQOJEezCPTEqOrhgCArS0XCLO5+ilCc3W5T23VBBEDiWUM6+Yx095xJSZLLJIsJK vdk061wmj/4MH6wpQuIdmkTAP8QV/ux/ciEWAxIrvAItE3fETEco34uevbaKF+3UIWGG aXC9REx+wFIBGe7lBEjT3z24WRkbndlnXEpDjmkFWtpQ8Ng2jtRUgsZJGmVbWdZHDfSI kV1xdnDeer+viA4P60/KYxPMc16twq8nXgyoLrROjLfcJsDF1CwQp93LZpd0g7PokDyf 5j1Q== X-Gm-Message-State: AOJu0YxWHYkslQes8ACriJno9CKvlzrZd+lqCUcPV4hd25M/UzZcybHc Ot2O6vHL8xe+ScFiRXfAlytpImX5s08= X-Google-Smtp-Source: AGHT+IFBBFSCSZHMid9QQ0CZPxzLqvzwEiYVZ9f1w0QfrdjyI6Rw65m/hlyGdz+4GDRzt0C902bFASlnFvY= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:f54e:b0:1b9:d335:1742 with SMTP id h14-20020a170902f54e00b001b9d3351742mr5767760plf.11.1692131840421; Tue, 15 Aug 2023 13:37:20 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 15 Aug 2023 13:36:51 -0700 In-Reply-To: <20230815203653.519297-1-seanjc@google.com> Mime-Version: 1.0 References: <20230815203653.519297-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.694.ge786442a9b-goog Message-ID: <20230815203653.519297-14-seanjc@google.com> Subject: [PATCH v3 13/15] KVM: nSVM: Use KVM-governed feature framework to track "vGIF enabled" From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Zeng Guang , Yuan Yao Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Track "virtual GIF exposed to L1" via a governed feature flag instead of using a dedicated bit/flag in vcpu_svm. Note, checking KVM's capabilities instead of the "vgif" param means that the code isn't strictly equivalent, as vgif_enabled could have been set if nested=3Dfalse where as that the governed feature cannot. But that's a glorified nop as the feature/flag is consumed only by paths that are Signed-off-by: Sean Christopherson --- arch/x86/kvm/governed_features.h | 1 + arch/x86/kvm/svm/nested.c | 3 ++- arch/x86/kvm/svm/svm.c | 3 +-- arch/x86/kvm/svm/svm.h | 5 +++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/governed_features.h b/arch/x86/kvm/governed_featu= res.h index 9afd34f30599..368696c2e96b 100644 --- a/arch/x86/kvm/governed_features.h +++ b/arch/x86/kvm/governed_features.h @@ -14,6 +14,7 @@ KVM_GOVERNED_X86_FEATURE(V_VMSAVE_VMLOAD) KVM_GOVERNED_X86_FEATURE(LBRV) KVM_GOVERNED_X86_FEATURE(PAUSEFILTER) KVM_GOVERNED_X86_FEATURE(PFTHRESHOLD) +KVM_GOVERNED_X86_FEATURE(VGIF) =20 #undef KVM_GOVERNED_X86_FEATURE #undef KVM_GOVERNED_FEATURE diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index ac03b2bc5b2c..dd496c9e5f91 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -660,7 +660,8 @@ static void nested_vmcb02_prepare_control(struct vcpu_s= vm *svm, * exit_int_info, exit_int_info_err, next_rip, insn_len, insn_bytes. */ =20 - if (svm->vgif_enabled && (svm->nested.ctl.int_ctl & V_GIF_ENABLE_MASK)) + if (guest_can_use(vcpu, X86_FEATURE_VGIF) && + (svm->nested.ctl.int_ctl & V_GIF_ENABLE_MASK)) int_ctl_vmcb12_bits |=3D (V_GIF_MASK | V_GIF_ENABLE_MASK); else int_ctl_vmcb01_bits |=3D (V_GIF_MASK | V_GIF_ENABLE_MASK); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 9bfff65e8b7a..9eac0ad3403e 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4302,8 +4302,7 @@ static void svm_vcpu_after_set_cpuid(struct kvm_vcpu = *vcpu) =20 kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_PAUSEFILTER); kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_PFTHRESHOLD); - - svm->vgif_enabled =3D vgif && guest_cpuid_has(vcpu, X86_FEATURE_VGIF); + kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_VGIF); =20 svm->vnmi_enabled =3D vnmi && guest_cpuid_has(vcpu, X86_FEATURE_VNMI); =20 diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index d57a096e070a..eaddaac6bf18 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -22,6 +22,7 @@ #include #include =20 +#include "cpuid.h" #include "kvm_cache_regs.h" =20 #define __sme_page_pa(x) __sme_set(page_to_pfn(x) << PAGE_SHIFT) @@ -259,7 +260,6 @@ struct vcpu_svm { bool soft_int_injected; =20 /* optional nested SVM features that are enabled for this guest */ - bool vgif_enabled : 1; bool vnmi_enabled : 1; =20 u32 ldr_reg; @@ -443,7 +443,8 @@ static inline bool svm_is_intercept(struct vcpu_svm *sv= m, int bit) =20 static inline bool nested_vgif_enabled(struct vcpu_svm *svm) { - return svm->vgif_enabled && (svm->nested.ctl.int_ctl & V_GIF_ENABLE_MASK); + return guest_can_use(&svm->vcpu, X86_FEATURE_VGIF) && + (svm->nested.ctl.int_ctl & V_GIF_ENABLE_MASK); } =20 static inline struct vmcb *get_vgif_vmcb(struct vcpu_svm *svm) --=20 2.41.0.694.ge786442a9b-goog