From nobody Mon Nov 25 12:23:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1716227357; cv=none; d=zohomail.com; s=zohoarc; b=F3Qr7ISD5wkmUjzKVfrUqcoiSZ5Uew885qrRblwm11bpVbw7lg3Br8h3PGmqGlRM9RZzUxyq51qJ4LgomlkXJ8pG5wltmp64DhX/SqFuBung4WUjGZscUGH7bj3GmxqjystwxJ3FfhvPFlC4hA5x3GSzfDji92C9zMLqH+VyV4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716227357; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2AnUR49A/ChZZVKD8tEGLC2s1by6hKERUHvsKWY8EKw=; b=XY6t7WJaXUNJ+BaO05/C6he6lQYeQsUCjpitATln3CrY4+kmIFDUQOKzrufPdSbJMceoXTpLoPrfMC1ZUyALTJOEKWWzJo4c2qtczgQG+4pXOAOiVaa3lMPu49YkgDrUbdaFRusuwNdyNmhavDJO+R5uIQKgjAntlJSrTe6fbSs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1716227357775959.2941999759282; Mon, 20 May 2024 10:49:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s977W-0002Cx-04; Mon, 20 May 2024 13:48:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s977O-0002Ax-AO for qemu-devel@nongnu.org; Mon, 20 May 2024 13:48:15 -0400 Received: from mgamail.intel.com ([192.198.163.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s977L-0003k1-JF for qemu-devel@nongnu.org; Mon, 20 May 2024 13:48:14 -0400 Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 10:47:57 -0700 Received: from 9cc2c43eec6b.jf.intel.com ([10.54.77.100]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2024 10:47:57 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716227292; x=1747763292; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9arJsPQyD5NpWwBsxe3zjoYW9m+vFMY49U8AYvXT+dc=; b=CTHAKAAfwKUJy2ZxtBUWi7ajeSrhqw30mrTBXDZwNzpOW2+7zdXdwTVu hzv5giPZKmnQ3M1qHFuCwQhY7E72g7zer0fghtF/TnzlIGE/YPcnDLipT P9vM80S5v2/fk4Pd0i83QLQpArKA4qK8YikKQ8T/fs0unIPIcp/+oWxQj 8J3LAu48T11bB6JhMtfkmsZvC926titsG/X58GhDngZoCcRC5+di1xPin oGLdvMg6jQL8D0j2hZvQSntJ9ZQXeMP6vFbuouAdBN3y+wgNFXrqhSdJh fxO+uxWGfbT2K1Mfmn2JsAs+lu6VP6sSCnNs7OtOb0oUh5PYHMphGTOMY w==; X-CSE-ConnectionGUID: 1JyTe7b8QaC5z99Aj9Oe1g== X-CSE-MsgGUID: QLAk5d8YQdeesDsLZQ9x+g== X-IronPort-AV: E=McAfee;i="6600,9927,11078"; a="12222093" X-IronPort-AV: E=Sophos;i="6.08,175,1712646000"; d="scan'208";a="12222093" X-CSE-ConnectionGUID: +6aKCblvSJ+XatYyxNsoNg== X-CSE-MsgGUID: 0iP9h6z9TWywfSzECeLmBA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,175,1712646000"; d="scan'208";a="32746634" From: Zide Chen To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mst@redhat.com, thuth@redhat.com, cfontana@suse.de, xiaoyao.li@intel.com, Zide Chen Subject: [PATCH 2/3] target/i386: call cpu_exec_realizefn before x86_cpu_filter_features Date: Mon, 20 May 2024 10:47:32 -0700 Message-Id: <20240520174733.32979-3-zide.chen@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240520174733.32979-1-zide.chen@intel.com> References: <20240520174733.32979-1-zide.chen@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.198.163.19; envelope-from=zide.chen@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1716227358444100001 Content-Type: text/plain; charset="utf-8" cpu_exec_realizefn which calls the accel-specific realizefn may expand features. e.g., some accel-specific options may require extra features to be enabled, and it's appropriate to expand these features in accel- specific realizefn. One such example is the cpu-pm option, which may add CPUID_EXT_MONITOR. Thus, call cpu_exec_realizefn before x86_cpu_filter_features to ensure that it won't expose features not supported by the host. Fixes: 662175b91ff2 ("i386: reorder call to cpu_exec_realizefn") Suggested-by: Xiaoyao Li Signed-off-by: Zide Chen --- target/i386/cpu.c | 24 ++++++++++++------------ target/i386/kvm/kvm-cpu.c | 1 - 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index cfe7c92d6bc6..da1ab7892d26 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7438,6 +7438,18 @@ static void x86_cpu_realizefn(DeviceState *dev, Erro= r **errp) } } =20 + /* + * note: the call to the framework needs to happen after feature expan= sion, + * but before the checks/modifications to ucode_rev, mwait, phys_bits. + * These may be set by the accel-specific code, + * and the results are subsequently checked / assumed in this function. + */ + cpu_exec_realizefn(cs, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + return; + } + x86_cpu_filter_features(cpu, cpu->check_cpuid || cpu->enforce_cpuid); =20 if (cpu->enforce_cpuid && x86_cpu_have_filtered_features(cpu)) { @@ -7459,18 +7471,6 @@ static void x86_cpu_realizefn(DeviceState *dev, Erro= r **errp) =20 x86_cpu_set_sgxlepubkeyhash(env); =20 - /* - * note: the call to the framework needs to happen after feature expan= sion, - * but before the checks/modifications to ucode_rev, mwait, phys_bits. - * These may be set by the accel-specific code, - * and the results are subsequently checked / assumed in this function. - */ - cpu_exec_realizefn(cs, &local_err); - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - return; - } - if (xcc->host_cpuid_required && !accel_uses_host_cpuid()) { g_autofree char *name =3D x86_cpu_class_get_model_name(xcc); error_setg(&local_err, "CPU model '%s' requires KVM or HVF", name); diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c index f76972e47e61..3adcedf0dbc3 100644 --- a/target/i386/kvm/kvm-cpu.c +++ b/target/i386/kvm/kvm-cpu.c @@ -50,7 +50,6 @@ static bool kvm_cpu_realizefn(CPUState *cs, Error **errp) * nothing else has been set by the user (or by accelerators) in * cpu->ucode_rev and cpu->phys_bits, and updates the CPUID results in * mwait.ecx. - * This accel realization code also assumes cpu features are already e= xpanded. * * realize order: * --=20 2.34.1