From nobody Mon Nov 25 08:05:28 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=1716580966; cv=none; d=zohomail.com; s=zohoarc; b=L7wODI4v0OeQy4R1oAzQioeVLmIDLfSVl1XTsPWL5DaKUmijM4PGjEhPhyB4yf8NeeVcdbdc+jErSvnVDnKrHgUb9OPct7g+5pmhUpD/90k/Xcc8DIxau+GfoDKwQZOg2KfvqjZc1n3BUKbhujQBCx8N6mwtyPJLOidrjZ888E0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716580966; 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=uTCHMDUdeCRcyWCyrSXYIjqyr1/ThcP1TvvRyAEC8z8=; b=PpXdCS0N/LMkQBASi3F9f44VnQfKG68kkOSu9lQ8N2qAjheP6FVB3aeJbRyWYtjQQ1IGny5VNHibzAqane9d6aFeMrZYmcGoJkQFeVVeAJ4cdmPqtDAAUgua4bQ96mFPnUEz0J4hLvJC7ywR/OkHjtMVKBULK9rwo73zMwCzS+0= 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 171658096693037.91647081202552; Fri, 24 May 2024 13:02:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAb6J-0002Ir-EF; Fri, 24 May 2024 16:01:15 -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 1sAb63-00025z-2V; Fri, 24 May 2024 16:01:05 -0400 Received: from mgamail.intel.com ([192.198.163.13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sAb5v-00051T-BG; Fri, 24 May 2024 16:00:57 -0400 Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2024 13:00:46 -0700 Received: from 9cc2c43eec6b.jf.intel.com ([10.54.77.100]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2024 13:00:46 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716580851; x=1748116851; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TxxJnHMBaLnho+/05QzctY86Y8OJz5CyPdX6d6Cev54=; b=mpc7+m/xQcJ6WPiCT51isNdMEuCxTL4UxaC0YY3gkwZIx7dvZBul7Yy/ mTgKbMliNpxJONpwDb3fTlgRAmldT4Mo2f/rghn5FS37TyGq87wKjBdOt kc1p9BwCPrWSBeR0BqremjPS+XLPBK3pYjYFeemX5ZeQj2gAfAHTUONxc AvdO5O7j5sBMgQQKhA3Qg/h1TdKIZIZELYofw4ZwR+Zutx9lSfjvRpOox BM1eSVP35KqBdq7szE5VT5zj1OIAzf/6GX2R9h1PuZidye/P/YWvrUJmn WXO1Nobucpd7w9oZmxtoydcKLrlrpWILUx508SrwZSxHtrsyLEMM7l6zC w==; X-CSE-ConnectionGUID: fDUc9Ub2T8GW/KyPXa54dA== X-CSE-MsgGUID: TUBMBPzISOm312cGEK8guQ== X-IronPort-AV: E=McAfee;i="6600,9927,11082"; a="15918263" X-IronPort-AV: E=Sophos;i="6.08,186,1712646000"; d="scan'208";a="15918263" X-CSE-ConnectionGUID: PG9RzVkzT4We7qa5u0gq5A== X-CSE-MsgGUID: i5LmdFabSFm3uuxpa4R3OA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,186,1712646000"; d="scan'208";a="39108906" 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, qemu-trivial@nongnu.org, Zide Chen Subject: [PATCH V2 1/3] vl: Allow multiple -overcommit commands Date: Fri, 24 May 2024 13:00:15 -0700 Message-Id: <20240524200017.150339-2-zide.chen@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524200017.150339-1-zide.chen@intel.com> References: <20240524200017.150339-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.13; 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, 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: 1716580968316100001 Content-Type: text/plain; charset="utf-8" Both cpu-pm and mem-lock are related to system resource overcommit, but they are separate from each other, in terms of how they are realized, and of course, they are applied to different system resources. It's tempting to use separate command lines to specify their behavior. e.g., in the following example, the cpu-pm command is quietly overwritten, and it's not easy to notice it without careful inspection. --overcommit mem-lock=3Don --overcommit cpu-pm=3Don Fixes: c8c9dc42b7ca ("Remove the deprecated -realtime option") Suggested-by: Thomas Huth Signed-off-by: Zide Chen Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- v2: Thanks to Thomas' suggestion, changed to this better approach, which is more generic and can handle situations like: "enabled the option in the config file, and now you'd like to disable it on the command line again". system/vl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/vl.c b/system/vl.c index a3eede5fa5b8..dfa6cdd9283b 100644 --- a/system/vl.c +++ b/system/vl.c @@ -3545,8 +3545,8 @@ void qemu_init(int argc, char **argv) if (!opts) { exit(1); } - enable_mlock =3D qemu_opt_get_bool(opts, "mem-lock", false= ); - enable_cpu_pm =3D qemu_opt_get_bool(opts, "cpu-pm", false); + enable_mlock =3D qemu_opt_get_bool(opts, "mem-lock", enabl= e_mlock); + enable_cpu_pm =3D qemu_opt_get_bool(opts, "cpu-pm", enable= _cpu_pm); break; case QEMU_OPTION_compat: { --=20 2.34.1 From nobody Mon Nov 25 08:05:28 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=1716580936; cv=none; d=zohomail.com; s=zohoarc; b=Q/jSESHcjV3si5OMw9vptvkuNsuUipuhgUPP9DjOygUBSMqO0GfbdWyBIyBzMJhHeG6ClWWTSXvj8cGhNWkn+lD7GeZey7Xl/oifIRYNY1q9SIZ18mUPYcCRiOsAGouZxRHocYrOz2Rx843YzBz99sutc0khkH8aGJyG8mBmq+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716580936; 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=KWYrQdUexdKPVH9VMk16DstBHy/RPVvvvHkKqpnkAgs=; b=ZkRxDFqLQeW8y9lbqSIhSvSB6/VdXAOJB1ZAsqSaiNmHOaZ0QYfw8Sr0zM1spin+hl7CG9YD0hhq/ZhSBqqtVEgkg6ZkzPKFfopntBk57lgJJVy6ZPGP3OcFlOoYZ4CWU3hU3rwmqnxr5YX71xje6aBpTw+Y7R7Ya8q5oKSzbJk= 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 1716580936061190.74784368530504; Fri, 24 May 2024 13:02:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAb6H-0002Gb-7g; Fri, 24 May 2024 16:01:13 -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 1sAb67-0002AO-VX; Fri, 24 May 2024 16:01:05 -0400 Received: from mgamail.intel.com ([192.198.163.13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sAb64-00051T-9q; Fri, 24 May 2024 16:01:03 -0400 Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2024 13:00:46 -0700 Received: from 9cc2c43eec6b.jf.intel.com ([10.54.77.100]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2024 13:00:46 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716580860; x=1748116860; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pa1xGnNT8/923n1FNJFTnDx3aYnMbMwudAm7e6bIlhU=; b=QWgMKETEyPlt6hlTSHV5FmQb28ZO/xc1oZ1UdKpiijUBOc4PyyD4sH3n LzKp8FT5IIZ67Ehs3TS++FGUTGMuRlFSwBXnz17GPh6rOXU2igcujPjLz Wlvw6fiMbBtTKrjbOri3RUgJzOy8jiPCb8y1I8NKOVU0UJFGlyaMSeKEC lH7inDwM4niaFQHiy6rn7HQiJKra5EKkIgn+uK1ljJUJROEQRKi7B7iWp bod8Kve4G8MCuyQPeGKFysNn5vF3yVaXl+Oyqs5JJYAEn9aYK8A8SU0ex 68Vl3kxMLoF5yr25gYQfNAV/1aZIX91a4TIJQ1th8gypMYuHW4ietq9wJ A==; X-CSE-ConnectionGUID: frdOGVmgTeC88/hHEVFimw== X-CSE-MsgGUID: xpMK7CPUTSieTd+DgWTEug== X-IronPort-AV: E=McAfee;i="6600,9927,11082"; a="15918266" X-IronPort-AV: E=Sophos;i="6.08,186,1712646000"; d="scan'208";a="15918266" X-CSE-ConnectionGUID: R987icKQR22Acv/yRV1Dkg== X-CSE-MsgGUID: 8ohV8JULSo+ZYahDIuu+ag== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,186,1712646000"; d="scan'208";a="39108910" 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, qemu-trivial@nongnu.org, Zide Chen Subject: [PATCH V2 2/3] target/i386: call cpu_exec_realizefn before x86_cpu_filter_features Date: Fri, 24 May 2024 13:00:16 -0700 Message-Id: <20240524200017.150339-3-zide.chen@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524200017.150339-1-zide.chen@intel.com> References: <20240524200017.150339-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.13; 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, 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: 1716580938431100010 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 bc2dceb647fa..a1c1c785bd2f 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7604,6 +7604,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)) { @@ -7625,18 +7637,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 From nobody Mon Nov 25 08:05:28 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=1716580936; cv=none; d=zohomail.com; s=zohoarc; b=hZ+O2fKIyS7YGCAdPiKI3b7PhuQ3ZQEGFyLl4Dy9WxMAwLNjb4cWy87iU5EgaO+8IdXfbNbXM4vAM+PTsmqqZntIoxe1ZtOItaDgc6jFDJlYJ3y+GeyNuXlzkcZRozra7Y1JZ3JHkA6JtU6ujjzhGtu0o+RgwwD7EQi5Kp3MkU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716580936; 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=sOEQVfxCMK6r4Owkt8ovuP8Jylv9C9cK9BgJaESn5z0=; b=R7lgDVxN5RfPwO7gxmTSfaPhYpsJL16bht14g0RsbiXWP61BBAxf9eEwZNYS5pbrEfam8fbHfqBqSbH4AUg1sWd7PCaRMuN0uSJME51/dMXlYIyz1Ke8psWl0DDzMO1sWxF91SP/QDV0+JUcIrGZnC+HJO0YeJ4aOqVfQ18i/ck= 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 1716580936386721.5844075869587; Fri, 24 May 2024 13:02:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAb6K-0002JB-02; Fri, 24 May 2024 16:01:16 -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 1sAb67-0002AN-VX; Fri, 24 May 2024 16:01:05 -0400 Received: from mgamail.intel.com ([192.198.163.13]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sAb65-00050y-8Q; Fri, 24 May 2024 16:01:03 -0400 Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2024 13:00:47 -0700 Received: from 9cc2c43eec6b.jf.intel.com ([10.54.77.100]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 May 2024 13:00:47 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1716580861; x=1748116861; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CfBulfqouTJD2KFyY/RsB2TzLeKk14JepRumF3y0b/o=; b=W9Qd0V68JuFXL+/effeT7LWe/8z5ESNY53WrWP8v6x//wlWKkvjyCl1C LDVMD3CF2qfRUbUPs83sNtj5e8gs2w/vW2fL/x35DHXJ7dbFjyJ4ANtPo 3gwizdpfNuuXQfmKq+7fRBNPOQy6HLj6VhV17ru+opYKrT3NhFFCVYJNS 0TouAkppXZcoPxXebo7f1gNfn5UC6p1IlMN/lZRfTNpx/CLgFFhX+U+6a oZYP9f3E72T1LpSk9LECCKpodSUKNhxUW63UkmhKXJH3MJF7ECzSbLolB NSD4kyFRzVWvXlszJE3zBmUjaKOy8A8nplYM2zS0mAbHBlR2uhjOiM1Ly g==; X-CSE-ConnectionGUID: XVCOb9HDTO6U9wxfKnNKow== X-CSE-MsgGUID: 7nlj2i+mS6C2Guhi/Qfgkw== X-IronPort-AV: E=McAfee;i="6600,9927,11082"; a="15918269" X-IronPort-AV: E=Sophos;i="6.08,186,1712646000"; d="scan'208";a="15918269" X-CSE-ConnectionGUID: 8eAWJbomQI6p/IR+TlvkVA== X-CSE-MsgGUID: pS5GDOZTTWK8qgYDfYh2nA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,186,1712646000"; d="scan'208";a="39108914" 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, qemu-trivial@nongnu.org, Zide Chen Subject: [PATCH V2 3/3] target/i386: Move host_cpu_enable_cpu_pm into kvm_cpu_realizefn() Date: Fri, 24 May 2024 13:00:17 -0700 Message-Id: <20240524200017.150339-4-zide.chen@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240524200017.150339-1-zide.chen@intel.com> References: <20240524200017.150339-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.13; 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, 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: 1716580938293100007 Content-Type: text/plain; charset="utf-8" It seems not a good idea to expand features in host_cpu_realizefn, which is for host CPU only. Additionally, cpu-pm option is KVM specific, and it's cleaner to put it in kvm_cpu_realizefn(), together with the WAITPKG code. Fixes: f5cc5a5c1686 ("i386: split cpu accelerators from cpu.c, using AccelC= PUClass") Signed-off-by: Zide Chen --- target/i386/host-cpu.c | 12 ------------ target/i386/kvm/kvm-cpu.c | 11 +++++++++-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/target/i386/host-cpu.c b/target/i386/host-cpu.c index 280e427c017c..8b8bf5afeccf 100644 --- a/target/i386/host-cpu.c +++ b/target/i386/host-cpu.c @@ -42,15 +42,6 @@ static uint32_t host_cpu_phys_bits(void) return host_phys_bits; } =20 -static void host_cpu_enable_cpu_pm(X86CPU *cpu) -{ - CPUX86State *env =3D &cpu->env; - - host_cpuid(5, 0, &cpu->mwait.eax, &cpu->mwait.ebx, - &cpu->mwait.ecx, &cpu->mwait.edx); - env->features[FEAT_1_ECX] |=3D CPUID_EXT_MONITOR; -} - static uint32_t host_cpu_adjust_phys_bits(X86CPU *cpu) { uint32_t host_phys_bits =3D host_cpu_phys_bits(); @@ -83,9 +74,6 @@ bool host_cpu_realizefn(CPUState *cs, Error **errp) X86CPU *cpu =3D X86_CPU(cs); CPUX86State *env =3D &cpu->env; =20 - if (cpu->max_features && enable_cpu_pm) { - host_cpu_enable_cpu_pm(cpu); - } if (env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM) { uint32_t phys_bits =3D host_cpu_adjust_phys_bits(cpu); =20 diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c index 3adcedf0dbc3..197c892da89a 100644 --- a/target/i386/kvm/kvm-cpu.c +++ b/target/i386/kvm/kvm-cpu.c @@ -64,9 +64,16 @@ static bool kvm_cpu_realizefn(CPUState *cs, Error **errp) * cpu_common_realizefn() (via xcc->parent_realize) */ if (cpu->max_features) { - if (enable_cpu_pm && kvm_has_waitpkg()) { - env->features[FEAT_7_0_ECX] |=3D CPUID_7_0_ECX_WAITPKG; + if (enable_cpu_pm) { + if (kvm_has_waitpkg()) { + env->features[FEAT_7_0_ECX] |=3D CPUID_7_0_ECX_WAITPKG; + } + + host_cpuid(5, 0, &cpu->mwait.eax, &cpu->mwait.ebx, + &cpu->mwait.ecx, &cpu->mwait.edx); + env->features[FEAT_1_ECX] |=3D CPUID_EXT_MONITOR; } + if (cpu->ucode_rev =3D=3D 0) { cpu->ucode_rev =3D kvm_arch_get_supported_msr_feature(kvm_state, --=20 2.34.1