From nobody Sun Feb 8 16:31:22 2026 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 97974EB64DD for ; Sat, 29 Jul 2023 01:18:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237374AbjG2BSa (ORCPT ); Fri, 28 Jul 2023 21:18:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237475AbjG2BRr (ORCPT ); Fri, 28 Jul 2023 21:17:47 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC1CB5260 for ; Fri, 28 Jul 2023 18:17:16 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-584126c65d1so29404367b3.3 for ; Fri, 28 Jul 2023 18:17:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690593407; x=1691198207; 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=IAQPKbD8tPDmYBWrX7RApaZ6urq2NKcobd6GaE19UZk=; b=ZeRoOCqFI4p+w9IAeXNpwy5tKs7MTBzITIeEzXVkbc0WGkIBaxYXBabBmGzaP1liLi XzrIM1m5WJ5mzyQ+rtejbV0YofqVAwW9vi2WTcum05Q9JdcoEmvQzyNePKLll1Sn2HMO ahBeBbAd+C4oZYuQ4+SLDrttWUUutbvJzB+NPE7xpQnmvhQPgMqjg7siGDxiXFihzVXR CGyom5LhVfRPhLZEQNaMXxCXXDXIhIMlYrl/Im0JiotbqoucEne7MLA8+4hOwpXgTPnp HZqMWWaIu0y0sib7kJ858UYs6W7nHxDs6gM9J0R2oTbVCNf3/l6v/DSd89ZM/J9z6Dt8 UoTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690593407; x=1691198207; 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=IAQPKbD8tPDmYBWrX7RApaZ6urq2NKcobd6GaE19UZk=; b=NCEkWa5nxLo7nT7ycYZNVBeSTtzQ18dZNbd+rx5RWY6GX1LoGNa0BZtXzk4xCCciPu 9bU3tCzmLeE7Ude7DS6ph19qt0yDnQ/pLfv6qnYVT7XOHB90vpzvuIsuRS3ju0bq3RS1 rH0ddYDEAM9cjBXASDDWRsFHf7hHPPYQzQ85FNmbZ/BW4giM/PxeF0wT/kNJathyWi52 5OmEE0H47CFjBO2lmlTXJiylxVPTvR1g1wtbPhQF+KZvFLkDI4WWIy0qNoC/6XsbmTPj kST3m/6Vb+B82PId+X/quKeB88GAaEgvEYg8+oPR2k7OIyyxwt2M+jTg6l5Aa+87xqL1 SyoA== X-Gm-Message-State: ABy/qLZWZfShnCAfhg11QMcaDTTpptAbllhVHmZUSjWFw++vX4uyJ+AP yS36p/ca4noRnOYwyPT/DTbXXrj07hY= X-Google-Smtp-Source: APBJJlGCdrikao/e6/kr7d/aLh6t1yJ8UDloeWc8WvjWjWmX1Ju375VMcZzc7H1kC6TbxCNSrsZbWzRKWOc= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a81:ae25:0:b0:56c:b037:88aa with SMTP id m37-20020a81ae25000000b0056cb03788aamr24021ywh.5.1690593407555; Fri, 28 Jul 2023 18:16:47 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 28 Jul 2023 18:16:05 -0700 In-Reply-To: <20230729011608.1065019-1-seanjc@google.com> Mime-Version: 1.0 References: <20230729011608.1065019-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230729011608.1065019-19-seanjc@google.com> Subject: [PATCH v2 18/21] KVM: nSVM: Use KVM-governed feature framework to track "Pause Filter enabled" From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Maxim Levitsky 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 "Pause Filtering is exposed to L1" via governed feature flags instead of using dedicated bits/flags in vcpu_svm. No functional change intended. Signed-off-by: Sean Christopherson --- arch/x86/kvm/governed_features.h | 2 ++ arch/x86/kvm/svm/nested.c | 10 ++++++++-- arch/x86/kvm/svm/svm.c | 7 ++----- arch/x86/kvm/svm/svm.h | 2 -- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/governed_features.h b/arch/x86/kvm/governed_featu= res.h index 3a4c0e40e1e0..9afd34f30599 100644 --- a/arch/x86/kvm/governed_features.h +++ b/arch/x86/kvm/governed_features.h @@ -12,6 +12,8 @@ KVM_GOVERNED_X86_FEATURE(NRIPS) KVM_GOVERNED_X86_FEATURE(TSCRATEMSR) KVM_GOVERNED_X86_FEATURE(V_VMSAVE_VMLOAD) KVM_GOVERNED_X86_FEATURE(LBRV) +KVM_GOVERNED_X86_FEATURE(PAUSEFILTER) +KVM_GOVERNED_X86_FEATURE(PFTHRESHOLD) =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 f50f74b1a04e..ac03b2bc5b2c 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -743,8 +743,14 @@ static void nested_vmcb02_prepare_control(struct vcpu_= svm *svm, if (!nested_vmcb_needs_vls_intercept(svm)) vmcb02->control.virt_ext |=3D VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK; =20 - pause_count12 =3D svm->pause_filter_enabled ? svm->nested.ctl.pause_filte= r_count : 0; - pause_thresh12 =3D svm->pause_threshold_enabled ? svm->nested.ctl.pause_f= ilter_thresh : 0; + if (guest_can_use(vcpu, X86_FEATURE_PAUSEFILTER)) + pause_count12 =3D svm->nested.ctl.pause_filter_count; + else + pause_count12 =3D 0; + if (guest_can_use(vcpu, X86_FEATURE_PFTHRESHOLD)) + pause_thresh12 =3D svm->nested.ctl.pause_filter_thresh; + else + pause_thresh12 =3D 0; if (kvm_pause_in_guest(svm->vcpu.kvm)) { /* use guest values since host doesn't intercept PAUSE */ vmcb02->control.pause_filter_count =3D pause_count12; diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index a83fa6df7c04..be3a11f00f4e 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4233,11 +4233,8 @@ static void svm_vcpu_after_set_cpuid(struct kvm_vcpu= *vcpu) if (!guest_cpuid_is_intel(vcpu)) kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_V_VMSAVE_VMLOAD); =20 - svm->pause_filter_enabled =3D kvm_cpu_cap_has(X86_FEATURE_PAUSEFILTER) && - guest_cpuid_has(vcpu, X86_FEATURE_PAUSEFILTER); - - svm->pause_threshold_enabled =3D kvm_cpu_cap_has(X86_FEATURE_PFTHRESHOLD)= && - guest_cpuid_has(vcpu, X86_FEATURE_PFTHRESHOLD); + kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_PAUSEFILTER); + kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_PFTHRESHOLD); =20 svm->vgif_enabled =3D vgif && guest_cpuid_has(vcpu, X86_FEATURE_VGIF); =20 diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 0e21823e8a19..fb438439b61e 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -259,8 +259,6 @@ struct vcpu_svm { bool soft_int_injected; =20 /* optional nested SVM features that are enabled for this guest */ - bool pause_filter_enabled : 1; - bool pause_threshold_enabled : 1; bool vgif_enabled : 1; bool vnmi_enabled : 1; =20 --=20 2.41.0.487.g6d72f3e995-goog