From nobody Thu Sep 11 16:10:51 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 88A20C10F00 for ; Tue, 15 Aug 2023 20:38:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239445AbjHOUii (ORCPT ); Tue, 15 Aug 2023 16:38:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239030AbjHOUiB (ORCPT ); Tue, 15 Aug 2023 16:38:01 -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 B8B352110 for ; Tue, 15 Aug 2023 13:37:39 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-58c8cbf0a0dso834007b3.1 for ; Tue, 15 Aug 2023 13:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692131838; x=1692736638; 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=quIPS1pAkj8snq1ZBSsiom42DynaYCyzTMFv1WUiS2M=; b=RvRWqcWMpEvAk1DUNu/JSGL6I3nolm8Pj4MN/HkYUT+sPFvsYA3TSAh5vBr7kmMt/H J40DMugrpKOgkOr4zldFpm0Ft197XG7kKdrlSaAMlXuXwcE+1qJVh6lVQbcHk1gvCtxF IPdKxacSEA9rUJy+wn4nJqerjEyHVLI1o1SwKD36GQhcVKF2C51gd42peJyWsvi5J+Pk i1i32qqaCfDJm7juIktsbPASIFqkyH6DH3CZiFskIb0vX0BWbGaIubYLHqFxw95URUMp WBptsQKNO4eS6W9Z/tqU22fGyr1wAVg6glABsnRaMcp/YO1Hdt1p7sN3VTGZt6gFQczz faPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692131838; x=1692736638; 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=quIPS1pAkj8snq1ZBSsiom42DynaYCyzTMFv1WUiS2M=; b=EtJrAPj7shSc32cBSaop5U64F3FCRezGIKGZJbfQkyR3l+tQrU3iuazeA0fx1pqVxA MndEwXAGYU2BGXv70PLivzZQ/KtPoM39xSGswKQk15DsIsS5yApGY2iYFaACGqYI0Fz/ 4uZEEK3UoIGcdT4luZmtOFO94GXjPfubuMT8Yu5Nph4kxRh2CLiY99imWOAPXLOZvwbV ktPALVsfM2+DX2bzTjVm9lO1KwbUEDavXNt4W5le8eIEKUTbc84jcEHtu4LegkHeRslf kFIGYatr8sm+dEImLZZkzmaCmlkdD3hNzWckfMSynn22cvB6hcQf/wvljFpW/RndsIeB UwdA== X-Gm-Message-State: AOJu0Yy40fEthMDNzqh/Q01LLZ9xv/UeJjx1DSwtNcWV8nnfsaIyGX/l rpQywmgjnz8VHMWSHC88nM6gSsDDj+w= X-Google-Smtp-Source: AGHT+IGvFX/F2YB5U602ZWBWYYnMgRv9dvTBT04aawRwHtFIqhCUHsWEJDTV7yn9hv1vy8J/KeqCknhg/6k= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:dc87:0:b0:ca3:3341:6315 with SMTP id y129-20020a25dc87000000b00ca333416315mr1741ybe.0.1692131838149; Tue, 15 Aug 2023 13:37:18 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 15 Aug 2023 13:36:50 -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-13-seanjc@google.com> Subject: [PATCH v3 12/15] 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, 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 "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 Reviewed-by: Yuan Yao --- 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 de40745bc8a6..9bfff65e8b7a 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4300,11 +4300,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 45cbbdeac3a3..d57a096e070a 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.694.ge786442a9b-goog