From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:37872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmJHb-0007h6-Cr for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:13:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmJHa-0006ix-8x for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:13:35 -0500 Received: from mga12.intel.com ([192.55.52.136]:53088) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmJHZ-0006aZ-V2 for qemu-devel@nongnu.org; Wed, 23 Jan 2019 09:13:34 -0500 From: Yang Weijiang Date: Wed, 23 Jan 2019 05:06:47 +0800 Message-Id: <20190122210648.26320-4-weijiang.yang@intel.com> In-Reply-To: <20190122210648.26320-1-weijiang.yang@intel.com> References: <20190122210648.26320-1-weijiang.yang@intel.com> Subject: [Qemu-devel] [PATCH v2 3/4] Add hepler functions for CPUID xsave area size calculation. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: pbonzini@redhat.com, cdupontd@redhat.com, rkrcmar@redhat.com, qemu-devel@nongnu.org, mst@redhat.com, yu-cheng.yu@intel.com, yi.z.zhang@intel.com, hjl.tools@gmail.com Cc: weijiang.yang@intel.com, Zhang Yi These functions are called when return CPUID xsave area size information. Signed-off-by: Zhang Yi Signed-off-by: Yang Weijiang --- target/i386/cpu.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index f6c7bdf6fe..d8c36e0f2f 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1284,12 +1284,34 @@ static inline bool accel_uses_host_cpuid(void) return kvm_enabled() || hvf_enabled(); } +static uint32_t xsave_area_size_compacted(uint64_t mask) +{ + int i; + uint64_t ret = 0; + uint32_t offset; + + for (i = 0; i < ARRAY_SIZE(x86_ext_save_areas); i++) { + const ExtSaveArea *esa = &x86_ext_save_areas[i]; + offset = i >= 2 ? ret : esa->offset; + if ((mask >> i) & 1) { + ret = MAX(ret, offset + esa->size); + } + } + return ret; +} + static inline uint64_t x86_cpu_xsave_components(X86CPU *cpu) { return ((uint64_t)cpu->env.features[FEAT_XSAVE_COMP_HI]) << 32 | cpu->env.features[FEAT_XSAVE_COMP_LO]; } +static inline uint64_t x86_cpu_xsave_sv_components(X86CPU *cpu) +{ + return ((uint64_t)cpu->env.features[FEAT_XSAVE_SV_HI]) << 32 | + cpu->env.features[FEAT_XSAVE_SV_LO]; +} + const char *get_register_name_32(unsigned int reg) { if (reg >= CPU_NB_REGS32) { @@ -4919,8 +4941,10 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu) } } - env->features[FEAT_XSAVE_COMP_LO] = mask; + env->features[FEAT_XSAVE_COMP_LO] = mask & CPUID_XSTATE_USER_MASK; env->features[FEAT_XSAVE_COMP_HI] = mask >> 32; + env->features[FEAT_XSAVE_SV_LO] = mask & CPUID_XSTATE_KERNEL_MASK; + env->features[FEAT_XSAVE_SV_HI] = mask >> 32; } /***** Steps involved on loading and filtering CPUID data -- 2.17.1