Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: jgdJPqAAGT7tTGD4zNujWLHgLxcMQePUoqscyz13Zt/BSL0N3LRPM/9SemA6EoT0MLkf601u9E
 PDzEuZLg2TBg==
IronPort-SDR: YYjB9/fWl1Spvw0vurNKuTxblIOskCClI/mVkhs+e0697wKwLmDdCBq6GZNIe16MnyziV1CUvy
 5Zy7YuwGA8Dw==
Date:   Wed, 3 Feb 2021 20:59:57 +0800
From:   Yang Weijiang <weijiang.yang@intel.com>
To:     Paolo Bonzini <pbonzini@redhat.com>
Cc:     Yang Weijiang <weijiang.yang@intel.com>, seanjc@google.com,
        jmattson@google.com, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org, yu.c.zhang@linux.intel.com
Subject: Re: [PATCH v15 14/14] KVM: x86: Save/Restore GUEST_SSP to/from SMRAM
Message-ID: <20210203125957.GB6080@local-michael-cet-test>
References: <20210203113421.5759-1-weijiang.yang@intel.com>
 <20210203113421.5759-15-weijiang.yang@intel.com>
 <55e43685-f4a7-b068-8d4c-931b8789f031@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <55e43685-f4a7-b068-8d4c-931b8789f031@redhat.com>
User-Agent: Mutt/1.11.3 (2019-02-01)
Precedence: bulk

On Wed, Feb 03, 2021 at 01:07:53PM +0100, Paolo Bonzini wrote:
> On 03/02/21 12:34, Yang Weijiang wrote:
> > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> > index 22eb6b8626a8..f63b713cd71f 100644
> > --- a/arch/x86/kvm/x86.c
> > +++ b/arch/x86/kvm/x86.c
> > @@ -8592,6 +8592,16 @@ static void enter_smm_save_state_64(struct kvm_vcpu *vcpu, char *buf)
> >   	for (i = 0; i < 6; i++)
> >   		enter_smm_save_seg_64(vcpu, buf, i);
> > +
> > +	if (kvm_cet_supported()) {
> > +		struct msr_data msr;
> > +
> > +		msr.index = MSR_KVM_GUEST_SSP;
> > +		msr.host_initiated = true;
> > +		/* GUEST_SSP is stored in VMCS at vm-exit. */
> > +		kvm_x86_ops.get_msr(vcpu, &msr);
> > +		put_smstate(u64, buf, 0x7ec8, msr.data);
> > +	}
> >   }
> >   #endif
> > 
> 
> 0x7ec8 is used for I/O instruction restart and auto-halt restart. 0x7f08 is
> a free spot.  We should really document the KVM state save area format.
Thanks for catching the documentation error! 
> 
> Paolo