From patchwork Fri Feb 17 23:10:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 58807 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp116404wrn; Fri, 17 Feb 2023 15:17:58 -0800 (PST) X-Google-Smtp-Source: AK7set9xAcroHE0lL2o2JFz2b+F5hdxJ83hOwOG8PYP6GXtUc6YzOUWn+cAs5vYEM+tYD4q/3dzJ X-Received: by 2002:a05:6a20:840e:b0:c7:20e9:de29 with SMTP id c14-20020a056a20840e00b000c720e9de29mr9656600pzd.5.1676675877755; Fri, 17 Feb 2023 15:17:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676675877; cv=none; d=google.com; s=arc-20160816; b=h3WNvj+JcboD6SzUOdlQvX760OXCNdmuohzWVfHU7wjuW0sVFtfYfdngfWxTXAYDiU 0OGT3RUg/nF/fw6Ge9yrPAV1kY7JIHp8rTKyJDJRLKd8dYCWrqlt5z49w1Z3Klu0rKOJ 85eP9E0F1dkVz7TE8cdGny6u+ZDlhYuRujR9eBSYPhA6AUU5UhmkVz/ZfTPTsiFyt0+u JGv/GnBKobNoE6x8Tgbal4x/m9K/kOycIYqUXD4ga7/WKtsCn8UC68+2g0Ul6tGCqS66 04sfuQ8dxggG3c/ZXR4VmJDcuYZjot8etNQ810960tQFSJXDBVH5UH8FnvYcYkwwjkNR HHjA== 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=TQzYXroMSTeC6jBkk8L8kpJ+IXUUCZH+35l1d+2iFCk=; b=DkwMdvUWW+SGY0hC+gzwgHnNNWsXsGoQe+H6o685b+y0+LwzGzV02b1S2/eZlj1Q9r HaJfo4+ga2Q7ZctyaIWkR2cEWQ3MZp1nCvYZ4iW2PsG/TwT17ROvz/xRjkEG9p3bzYJn I2EgWgh+5l94phqVE2XEsAZBA9+Ec+N65yZEIIb4LtM2RkkygQylHc5RCnf1dxQvYVpo GAnCiMB44NHf4e/eCZuFSoie5kjKM17I73NG/fQzMv+hbXCLbYcxJQ/XhdVzo8nluAaa hSY5ihxht0RSX1QeZyYr9p9E8CKRZT9aXY+SUpDKEiBM7Qouqd7OuxsrlIwqMqqTkFm8 VtMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=nDWIVzLI; 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 k63-20020a638442000000b004fc274006ddsi4963993pgd.670.2023.02.17.15.17.45; Fri, 17 Feb 2023 15:17:57 -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=nDWIVzLI; 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 S229930AbjBQXLt (ORCPT + 99 others); Fri, 17 Feb 2023 18:11:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230003AbjBQXL0 (ORCPT ); Fri, 17 Feb 2023 18:11:26 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3FF669292 for ; Fri, 17 Feb 2023 15:10:51 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id d23-20020aa78697000000b005a9b2e7702dso784301pfo.8 for ; Fri, 17 Feb 2023 15:10:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; 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=TQzYXroMSTeC6jBkk8L8kpJ+IXUUCZH+35l1d+2iFCk=; b=nDWIVzLIP0yst3AFQlqDNtPsqJCThrW68j/ZDgsIoK51pQLuviijWNO1GiQNNGfcD4 GYM/nmpNu2qua902e+XJlPwfEnqeyWoe4s3Vb9i0Y1jVuzJWJ0wCTnDT4WrRry0KOOdA 1EvSk1Ml1D4JrModuEI7cV+JTr2ved0KqLeoFWDFdZZeMDm6Uui++DSXcDEHfDmoGKEn Amq0zZule0c9Xfswa3PJzg+CfbLGjw6SxBGdcFuUGioZRdQjUYH1XO7H/YAz36FXKc6W 1N6fmIjiwtceyLVKbWIRc4iUOqgSuX5UaryxPThGgeLffTTL/uoZX6eCLzvFdhzYcE6M jPHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=TQzYXroMSTeC6jBkk8L8kpJ+IXUUCZH+35l1d+2iFCk=; b=rj6BU+0nd4pgxYX2YWlgtxQiVZRTe9EvXcLh4hfoVq7ml5DiBEU0ssOte6KhE0Gm1x xud7DpWx/01UynPVCPOR5dE/4k8H2v8baTAHmftgJTX7ArJxKx4y0avjMERh+CREFBzS r1Lmgyx8pJb31zOOfkhG9mbEIVjA37bP9aoHmIDOElMSb+Z93S+YN7dJMfVb+NQiG/YJ AK+2/eFT9hSw/tW4VE+986uSq9IuFIMnZEt8nDxJiPow8p2PHxXxNnlGdwYAGyZ38LiF lomGxipYVQJwBbIng3NAg4KbLhrnOzSmkD8WB0BjieEnpZ3TfwrDk/ilQAwqMYc4gf5j mW0w== X-Gm-Message-State: AO0yUKXS0p5ceFhnlE+DSjvJ2smL161E8VCgbzUdwhXuxzJc47fYHEck QHkXRbJa9iZKUAU7GBvnCTXi2XYigUI= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a63:6d4a:0:b0:500:16e8:a008 with SMTP id i71-20020a636d4a000000b0050016e8a008mr130045pgc.8.1676675446370; Fri, 17 Feb 2023 15:10:46 -0800 (PST) Reply-To: Sean Christopherson Date: Fri, 17 Feb 2023 15:10:21 -0800 In-Reply-To: <20230217231022.816138-1-seanjc@google.com> Mime-Version: 1.0 References: <20230217231022.816138-1-seanjc@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Message-ID: <20230217231022.816138-12-seanjc@google.com> Subject: [PATCH 11/12] 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 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?1758122085286198899?= X-GMAIL-MSGID: =?utf-8?q?1758122085286198899?= Track "virtual GIF exposed to L1" via a governed feature flag instead of using a dedicated bit/flag in vcpu_svm. No functional change intended. 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 | 7 +++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/governed_features.h b/arch/x86/kvm/governed_features.h index 93c7d840e546..b49fdabb88c4 100644 --- a/arch/x86/kvm/governed_features.h +++ b/arch/x86/kvm/governed_features.h @@ -13,6 +13,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) #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 c38f17ba818e..c73c2acaf4c0 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -648,7 +648,8 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm, * exit_int_info, exit_int_info_err, next_rip, insn_len, insn_bytes. */ - 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 |= (V_GIF_MASK | V_GIF_ENABLE_MASK); else int_ctl_vmcb01_bits |= (V_GIF_MASK | V_GIF_ENABLE_MASK); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index b18bd0b33942..11068e8eb969 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4163,7 +4163,8 @@ static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) if (kvm_cpu_cap_has(X86_FEATURE_PFTHRESHOLD)) kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_PFTHRESHOLD); - svm->vgif_enabled = vgif && guest_cpuid_has(vcpu, X86_FEATURE_VGIF); + if (vgif) + kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_VGIF); svm_recalc_instruction_intercepts(vcpu, svm); diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index c05eea319d28..be5419975694 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -22,6 +22,7 @@ #include #include +#include "cpuid.h" #include "kvm_cache_regs.h" #define __sme_page_pa(x) __sme_set(page_to_pfn(x) << PAGE_SHIFT) @@ -257,9 +258,6 @@ struct vcpu_svm { unsigned long soft_int_next_rip; bool soft_int_injected; - /* optional nested SVM features that are enabled for this guest */ - bool vgif_enabled : 1; - u32 ldr_reg; u32 dfr_reg; struct page *avic_backing_page; @@ -484,7 +482,8 @@ static inline bool svm_is_intercept(struct vcpu_svm *svm, int bit) 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); } static inline struct vmcb *get_vgif_vmcb(struct vcpu_svm *svm)