From patchwork Thu Jul 16 08:20:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoyao Li X-Patchwork-Id: 1330055 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6nJk1ZXZz9sRW for ; Thu, 16 Jul 2020 18:21:10 +1000 (AEST) Received: from localhost ([::1]:39554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvz8d-0002rd-Uy for incoming@patchwork.ozlabs.org; Thu, 16 Jul 2020 04:21:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvz85-0002p3-L0 for qemu-devel@nongnu.org; Thu, 16 Jul 2020 04:20:33 -0400 Received: from mga06.intel.com ([134.134.136.31]:38840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvz83-0000Hh-Nx for qemu-devel@nongnu.org; Thu, 16 Jul 2020 04:20:33 -0400 IronPort-SDR: 1ObO1bXvFmHof383yI7zaM/A7YuqvqP1dPszPftm7YYAArmU0ARQF50zfICIQ4KK6pkjX0S/pP 9afJFoa+gY0w== X-IronPort-AV: E=McAfee;i="6000,8403,9683"; a="210871089" X-IronPort-AV: E=Sophos;i="5.75,358,1589266800"; d="scan'208";a="210871089" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2020 01:20:27 -0700 IronPort-SDR: 1N7LCXM+bfDWOvADM/qwYmGdTkP85zTcUZLCxuo/Ro/+ZplEJPB06VIN/s3O8sYhk1aXnvefUU bwKiIM+/ubVQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,358,1589266800"; d="scan'208";a="286403894" Received: from lxy-dell.sh.intel.com ([10.239.159.21]) by orsmga006.jf.intel.com with ESMTP; 16 Jul 2020 01:20:23 -0700 From: Xiaoyao Li To: Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PATCH 1/2] i386/cpu: Clear FEAT_XSAVE_COMP_{LO, HI} when XSAVE is not available Date: Thu, 16 Jul 2020 16:20:18 +0800 Message-Id: <20200716082019.215316-2-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.18.4 In-Reply-To: <20200716082019.215316-1-xiaoyao.li@intel.com> References: <20200716082019.215316-1-xiaoyao.li@intel.com> Received-SPF: pass client-ip=134.134.136.31; envelope-from=xiaoyao.li@intel.com; helo=mga06.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/16 04:20:23 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xiaoyao Li , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Per Intel SDM vol 1, 13.2, if CPUID.1:ECX.XSAVE[bit 26] is 0, the processor provides no further enumeration through CPUID function 0DH. Signed-off-by: Xiaoyao Li --- target/i386/cpu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1e5123251d74..f5f11603e805 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6261,6 +6261,8 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu) uint64_t mask; if (!(env->features[FEAT_1_ECX] & CPUID_EXT_XSAVE)) { + env->features[FEAT_XSAVE_COMP_LO] = 0; + env->features[FEAT_XSAVE_COMP_HI] = 0; return; } From patchwork Thu Jul 16 08:20:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoyao Li X-Patchwork-Id: 1330054 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6nJj17Hjz9sSt for ; Thu, 16 Jul 2020 18:21:09 +1000 (AEST) Received: from localhost ([::1]:39570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvz8c-0002s0-Sy for incoming@patchwork.ozlabs.org; Thu, 16 Jul 2020 04:21:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51704) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvz86-0002qM-BL for qemu-devel@nongnu.org; Thu, 16 Jul 2020 04:20:34 -0400 Received: from mga06.intel.com ([134.134.136.31]:38844) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvz84-0000Ih-GS for qemu-devel@nongnu.org; Thu, 16 Jul 2020 04:20:34 -0400 IronPort-SDR: ZzWOrB/zrLjXgyJGQ7IXxCIqzgbbaWJzJ6ZBEpmSQWOB8mmYSSx0FTINohtd1Lx0mGo53TTicD qmgyZ4uxb3sg== X-IronPort-AV: E=McAfee;i="6000,8403,9683"; a="210871090" X-IronPort-AV: E=Sophos;i="5.75,358,1589266800"; d="scan'208";a="210871090" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jul 2020 01:20:30 -0700 IronPort-SDR: bkkLh9L8zpygOMsOm1BVjgDaNw0b1DwsKnkbtY8/miA8wcWibt0c4RT1C0gpVr96hgWigyj4mB qwZfs5vWvCEQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,358,1589266800"; d="scan'208";a="286403906" Received: from lxy-dell.sh.intel.com ([10.239.159.21]) by orsmga006.jf.intel.com with ESMTP; 16 Jul 2020 01:20:27 -0700 From: Xiaoyao Li To: Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PATCH 2/2] i386/cpu: Mask off unsupported XSAVE components Date: Thu, 16 Jul 2020 16:20:19 +0800 Message-Id: <20200716082019.215316-3-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.18.4 In-Reply-To: <20200716082019.215316-1-xiaoyao.li@intel.com> References: <20200716082019.215316-1-xiaoyao.li@intel.com> Received-SPF: pass client-ip=134.134.136.31; envelope-from=xiaoyao.li@intel.com; helo=mga06.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/16 04:20:23 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xiaoyao Li , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When setting up XSAVE components, it needs to mask off those unsupported by KVM. Signed-off-by: Xiaoyao Li --- target/i386/cpu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index f5f11603e805..efc92334b7b1 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6274,8 +6274,10 @@ static void x86_cpu_enable_xsave_components(X86CPU *cpu) } } - env->features[FEAT_XSAVE_COMP_LO] = mask; - env->features[FEAT_XSAVE_COMP_HI] = mask >> 32; + env->features[FEAT_XSAVE_COMP_LO] = mask & + x86_cpu_get_supported_feature_word(FEAT_XSAVE_COMP_LO, cpu->migratable); + env->features[FEAT_XSAVE_COMP_HI] = (mask >> 32) & + x86_cpu_get_supported_feature_word(FEAT_XSAVE_COMP_HI, cpu->migratable); } /***** Steps involved on loading and filtering CPUID data