From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A0C03FC1 for ; Wed, 1 Sep 2021 22:41:45 +0000 (UTC) Received: by mail-pg1-f174.google.com with SMTP id n18so979240pgm.12 for ; Wed, 01 Sep 2021 15:41:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=3NRYGbQG6UX30AqNmUtI7t7dPAOy9Ipa6jbNHk92/oY=; b=kl7crTyanbSy2UXfXA3Wou6TvpU8o2k7DIs/hsyl4HUy2mMMnRlxAItMfrzVYFyhs6 ypHxuUVf8YzjKIc8uCQj2mkC6lWfeKjPTjKL9YKItWyuKSL8sERYS1LzL95jkcNPJJhv 5OV8TyO8m4uzWDC7lC3WGY607fIYH9LuHgi4CRJR+wqZLqnG7VQPn+0aH3TtXJl0Aymh /srhoPyJvch+nksJBUWGtUVWcPNSwKKwQeXD1e0SNE2wDxP0K73Gupa1wxjFzX92t1a9 zTfjbsn9rFgbSLw9Vk4iRiAwYXd705col894ZTXBBWFFVjUiQ1XzVYcSuJ1X7esBJBYa WlRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=3NRYGbQG6UX30AqNmUtI7t7dPAOy9Ipa6jbNHk92/oY=; b=otGlCjDxK/zuhkL5UyoumHXQIi2MTDXTu4XV8Eq9H6x7e4pF5mPRJXU4TWoHWwY5rf xQsFW8QWgAmTYLsg9dswEeaupslgqC01WIuurLZ/Z5vsm6t1aUvDr5YLuFOUzkfQ5nea Wc+0w6hZQYPk3NmsYJJPzbNf8F6Um875QunSsy+YC7P76FsIWKsPmKTXCzMI1gOzdg/X d8X6zYoNASIAYqCO4p683xyrW40MSkHi7s7efeA+2QWfCzex3h5FvHKFi/v1ExVn4TAc ZfeuAR4TaDR6wGIB/4mPD4Puhb005WuR1Yh3mXGdL6msTZRPCnItZPmvUz3ifpICyacd RQ+Q== X-Gm-Message-State: AOAM530lPJFXj7cmIPTLH5TnOwYBlxiW5FYTx8+uDCNEjx5p69vs3keK 3CJ9hKHVCm/oSnkikJ7F+nCvng== X-Google-Smtp-Source: ABdhPJxBfJJQdPBhA8L8/oHzvypAYhFXCZBTr7W2qH2Su2I2/jYavct8zDw+qdTg98pZl5YPPP2AeA== X-Received: by 2002:a63:6e02:: with SMTP id j2mr3697pgc.157.1630536104537; Wed, 01 Sep 2021 15:41:44 -0700 (PDT) Received: from google.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id r22sm15239pjp.7.2021.09.01.15.41.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Sep 2021 15:41:44 -0700 (PDT) Date: Wed, 1 Sep 2021 22:41:40 +0000 From: Sean Christopherson To: Joerg Roedel Cc: Paolo Bonzini , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Brijesh Singh , Tom Lendacky , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, Joerg Roedel Subject: Re: [PATCH v2.1 3/4] KVM: SVM: Add support for Hypervisor Feature support MSR protocol Message-ID: References: <20210722115245.16084-1-joro@8bytes.org> <20210722115245.16084-4-joro@8bytes.org> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Thu, Jul 22, 2021, Joerg Roedel wrote: > From: Brijesh Singh > > Version 2 of the GHCB specification introduced advertisement of > supported Hypervisor SEV features. This request is required to support > a the GHCB version 2 protocol. > > Signed-off-by: Brijesh Singh > Signed-off-by: Joerg Roedel > --- > arch/x86/include/uapi/asm/svm.h | 1 + > arch/x86/kvm/svm/sev.c | 21 +++++++++++++++++++++ > arch/x86/kvm/svm/svm.h | 1 + > 3 files changed, 23 insertions(+) > > diff --git a/arch/x86/include/uapi/asm/svm.h b/arch/x86/include/uapi/asm/svm.h > index efa969325ede..fbb6f8d27a80 100644 > --- a/arch/x86/include/uapi/asm/svm.h > +++ b/arch/x86/include/uapi/asm/svm.h > @@ -108,6 +108,7 @@ > #define SVM_VMGEXIT_AP_JUMP_TABLE 0x80000005 > #define SVM_VMGEXIT_SET_AP_JUMP_TABLE 0 > #define SVM_VMGEXIT_GET_AP_JUMP_TABLE 1 > +#define SVM_VMGEXIT_HV_FT 0x8000fffd For this KVM-only (for all intents and purposes) name, please use the verbose SVM_VMGEXIT_HYPERVISOR_FEATURES. https://lkml.kernel.org/r/b73ad44e-7719-cde7-d543-df34e5acf9a5@amd.com > #define SVM_VMGEXIT_UNSUPPORTED_EVENT 0x8000ffff > > /* Exit code reserved for hypervisor/software use */ > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > index a32ef011025f..4565c360d87d 100644 > --- a/arch/x86/kvm/svm/sev.c > +++ b/arch/x86/kvm/svm/sev.c > @@ -2180,6 +2180,7 @@ static int sev_es_validate_vmgexit(struct vcpu_svm *svm) > case SVM_VMGEXIT_AP_HLT_LOOP: > case SVM_VMGEXIT_AP_JUMP_TABLE: > case SVM_VMGEXIT_UNSUPPORTED_EVENT: > + case SVM_VMGEXIT_HV_FT: > break; > default: > goto vmgexit_err; > @@ -2361,6 +2362,16 @@ static void set_ghcb_msr_ap_rst_resp(struct vcpu_svm *svm, u64 value) > svm->vmcb->control.ghcb_gpa = GHCB_MSR_AP_RESET_HOLD_RESP | (value << GHCB_DATA_LOW); > } > > +static void set_ghcb_msr_hv_feat_resp(struct vcpu_svm *svm, u64 value) > +{ > + u64 msr; > + > + msr = GHCB_MSR_HV_FT_RESP; > + msr |= (value << GHCB_DATA_LOW); > + > + svm->vmcb->control.ghcb_gpa = msr; > +} > + > static void set_ghcb_msr(struct vcpu_svm *svm, u64 value) > { > svm->vmcb->control.ghcb_gpa = value; > @@ -2425,6 +2436,10 @@ static int sev_handle_vmgexit_msr_protocol(struct vcpu_svm *svm) > > break; > } > + case GHCB_MSR_HV_FT_REQ: { > + set_ghcb_msr_hv_feat_resp(svm, GHCB_HV_FT_SUPPORTED); I definitely think there are too many small wrappers that bury the write to svm->vmcb->control.ghcb_gpa. E.g. with a rename, this control->ghcb_msr = GHCB_MSR_HV_FT_RESP | (GHCB_HV_FT_SUPPORTED << GHCB_DATA_LOW); or maybe add a generic helper for simple data responses? E.g. GHCB_MSR_AP_RESET_HOLD_REQ can share a macro. control->ghcb_msr = GHCB_MSR_RESP_WITH_DATA(GHCB_MSR_HV_FT_RESP, GHCB_HV_FT_SUPPORTED); > + break; > + } Unnecessary braces. > case GHCB_MSR_TERM_REQ: { > u64 reason_set, reason_code; > > @@ -2537,6 +2552,12 @@ int sev_handle_vmgexit(struct kvm_vcpu *vcpu) > ret = 1; > break; > } > + case SVM_VMGEXIT_HV_FT: { > + ghcb_set_sw_exit_info_2(ghcb, GHCB_HV_FT_SUPPORTED); > + > + ret = 1; > + break; > + } Unnecessary braces. > case SVM_VMGEXIT_UNSUPPORTED_EVENT: > vcpu_unimpl(vcpu, > "vmgexit: unsupported event - exit_info_1=%#llx, exit_info_2=%#llx\n", > diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h > index 7e2090752d8f..9cafeba3340e 100644 > --- a/arch/x86/kvm/svm/svm.h > +++ b/arch/x86/kvm/svm/svm.h > @@ -550,6 +550,7 @@ void svm_vcpu_unblocking(struct kvm_vcpu *vcpu); > #define GHCB_VERSION_MAX 1ULL > #define GHCB_VERSION_MIN 1ULL > > +#define GHCB_HV_FT_SUPPORTED 0 > > extern unsigned int max_sev_asid; > > -- > 2.31.1 >