From nobody Mon May 20 23:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612220168; cv=none; d=zohomail.com; s=zohoarc; b=ZEUoFV6CB+YOjZCgeeQIGYJ11HBtM5f0/rntx7qSt7dkL7H/q9mmWuBZcnolLQG852PIqphweQ/I7ARMuPC7SMx+1MuUOjXjIRI5DRc7q/ENcdl/GpLtjfc4UGqlt6Mz3L7MycSz2aboL4nUfNqhtlW1QfXi+WhpKL2PwFFeqIY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612220168; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=az4sdLdgyiV9UN1GjEJmlcUXtom4ZZy7Mb5kEaY5AdI=; b=fjP+IO8wtiGQYvCQgANufFVBPykPtl06bReMtw2yTYBS5sqdmVEeN6ws/oN5nNvdgg7ThDPx0xFNBj08V6lZ9wY256CK83GDflGU1c0dw9zkxduXnYt7ec2o8urBP3pAAV6vyVhmcgd9fJtPOt4efcI5sspH31WDmo7nyl8WNc0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161222016871727.345759557006886; Mon, 1 Feb 2021 14:56:08 -0800 (PST) Received: from localhost ([::1]:33654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6i75-0007Ns-ET for importer@patchew.org; Mon, 01 Feb 2021 17:56:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6i5G-00064G-Qd for qemu-devel@nongnu.org; Mon, 01 Feb 2021 17:54:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:52534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6i5D-000245-DU for qemu-devel@nongnu.org; Mon, 01 Feb 2021 17:54:14 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-200--QQCP0EYMge3drSu5aY99g-1; Mon, 01 Feb 2021 17:54:08 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 92B8D59; Mon, 1 Feb 2021 22:54:07 +0000 (UTC) Received: from localhost (ovpn-3-197.rdu2.redhat.com [10.22.3.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52A0D5C1A1; Mon, 1 Feb 2021 22:54:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612220050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=az4sdLdgyiV9UN1GjEJmlcUXtom4ZZy7Mb5kEaY5AdI=; b=A1jQkTnD5xBfgh8EmQ3WcZkN6XqYru6Wz4E1jX6gEnuMJ/oYggGKyx4pek8vbwdplTZ1lj Nd1cm7HdxLaABvbkvhWA04xitTDdJFVZ/Y8P8sNsU1ad3Zn9XYDgzxITnyz11Pd4+woujH fi0Qni9EN3CTnBKY7MFwWQpaT4mkCCI= X-MC-Unique: -QQCP0EYMge3drSu5aY99g-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 1/3] i386: Add missing "vmx-ept-wb" feature name Date: Mon, 1 Feb 2021 17:54:02 -0500 Message-Id: <20210201225404.3941395-2-ehabkost@redhat.com> In-Reply-To: <20210201225404.3941395-1-ehabkost@redhat.com> References: <20210201225404.3941395-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Igor Mammedov , Richard Henderson , Eduardo Habkost , Babu Moger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Not having a feature name in feature_word_info breaks error reporting and query-cpu-model-expansion. Add the missing feature name to feature_word_info[FEAT_VMX_EPT_VPID_CAPS].feat_names[14]. Fixes: 0723cc8a5558 ("target/i386: add VMX features to named CPU models") Signed-off-by: Eduardo Habkost --- target/i386/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index ae89024d366..2bf3ab78056 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1262,7 +1262,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORD= S] =3D { "vmx-ept-execonly", NULL, NULL, NULL, NULL, NULL, "vmx-page-walk-4", "vmx-page-walk-5", NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + NULL, NULL, "vmx-ept-wb", NULL, "vmx-ept-2mb", "vmx-ept-1gb", NULL, NULL, "vmx-invept", "vmx-eptad", "vmx-ept-advanced-exitinfo", NULL, NULL, "vmx-invept-single-context", "vmx-invept-all-context", N= ULL, --=20 2.28.0 From nobody Mon May 20 23:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612220168; cv=none; d=zohomail.com; s=zohoarc; b=AydyYk5oS0bISmSPp7o8U8jtDDXeYbKRMgRujUycwN82jw9Rwlddlem9HcadWea4m5fbDgOGpb/qzB3jN7Mmdq7O+JKd6G1N2q/ymLtEJuIuFGpmbhhUImbIZts4T8pa2CaUBPJC9rL7ir4j3RiDFiWZhiXkknm11SyxNu0XNts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612220168; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HJBXSoWEw+48AA0c3Z3hHaBYGhwzEtH/EGkiv/yCyiE=; b=WEeJ2YYV/1LF0uQb2bbBf3F9vBeY3P4M/egwzzxV9fPVLb3kTuiUEEN8Tpbb2aX65L3kJf+zfa7Ruzi0bvVZHuz9HCnK8k16mUWGK1zlmFvPk0K615tT+Q2unZivMxLjt6XSaR9I5sK+Grtwgm18tGN0N+X0CgF0+frEIHsJmAM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612220168692655.8672101138477; Mon, 1 Feb 2021 14:56:08 -0800 (PST) Received: from localhost ([::1]:33638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6i75-0007NU-MA for importer@patchew.org; Mon, 01 Feb 2021 17:56:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6i5H-00064z-5H for qemu-devel@nongnu.org; Mon, 01 Feb 2021 17:54:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29231) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6i5D-00025a-R9 for qemu-devel@nongnu.org; Mon, 01 Feb 2021 17:54:14 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-582-kJaNM8q-PeS4Jaj1-JALdA-1; Mon, 01 Feb 2021 17:54:09 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 86AA710054FF; Mon, 1 Feb 2021 22:54:08 +0000 (UTC) Received: from localhost (ovpn-3-197.rdu2.redhat.com [10.22.3.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DE04E2E0; Mon, 1 Feb 2021 22:54:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612220051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HJBXSoWEw+48AA0c3Z3hHaBYGhwzEtH/EGkiv/yCyiE=; b=Ml4I92mcFEOVhGKxrcDDpx+kGY0K0ctKoEDcwBFkKK0Eq3s6OVImACTzMmAOnCAEQ15Hz4 IoEgzQWTcSuJQkBU2c5GUq5aiYgGCfbRO7hXLyn3MF2Fhlz1AkvlYbw5tECDcc7B/KKbDi pJxzDupZOaXMt5Hc8p6e5IAo9f9uZ3c= X-MC-Unique: kJaNM8q-PeS4Jaj1-JALdA-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 2/3] i386: Move asserts to separate x86_cpudef_validate() function Date: Mon, 1 Feb 2021 17:54:03 -0500 Message-Id: <20210201225404.3941395-3-ehabkost@redhat.com> In-Reply-To: <20210201225404.3941395-1-ehabkost@redhat.com> References: <20210201225404.3941395-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Igor Mammedov , Richard Henderson , Eduardo Habkost , Babu Moger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Additional sanity checks will be added to the code, so move the existing asserts to a separate function. Wrap the whole function in `#ifndef NDEBUG` because the checks will become more complex than trivial assert() calls. Signed-off-by: Eduardo Habkost --- target/i386/cpu.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 2bf3ab78056..6285fb00eb8 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5431,17 +5431,25 @@ static void x86_register_cpu_model_type(const char = *name, X86CPUModel *model) type_register(&ti); } =20 -static void x86_register_cpudef_types(X86CPUDefinition *def) +/* Sanity check CPU model definition before registering it */ +static void x86_cpudef_validate(X86CPUDefinition *def) { - X86CPUModel *m; - const X86CPUVersionDefinition *vdef; - +#ifndef NDEBUG /* AMD aliases are handled at runtime based on CPUID vendor, so * they shouldn't be set on the CPU model table. */ assert(!(def->features[FEAT_8000_0001_EDX] & CPUID_EXT2_AMD_ALIASES)); /* catch mistakes instead of silently truncating model_id when too lon= g */ assert(def->model_id && strlen(def->model_id) <=3D 48); +#endif +} + +static void x86_register_cpudef_types(X86CPUDefinition *def) +{ + X86CPUModel *m; + const X86CPUVersionDefinition *vdef; + + x86_cpudef_validate(def); =20 /* Unversioned model: */ m =3D g_new0(X86CPUModel, 1); --=20 2.28.0 From nobody Mon May 20 23:13:01 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612220253; cv=none; d=zohomail.com; s=zohoarc; b=aTMzUjBH+HVFBtsfrJV5+WiThi9OPulu2Sly1XEBPmrQl9+yC/dAw1VgQGdYcokFWAi3Hiygq7674zC4GMvm+ZNqIKWKeO7+DMLDAB7XTYq0H3BHmaUbWRkee90jbsMCgZ4FlQFBxb/7F0Ofgu575yzl4op5Qp1eSpr3B27bwU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612220253; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3zY9N5aoCdgHS0R4abLCwJpvLZ4sXzF262CtMaH3APo=; b=OhJ6EOIbvhDtgPQ/VUir8LHqygDt2qY8fCMAXzBQbTkes0NeqVjXw4jKxzijaBOXR4NWrY8HE6oUqVLUdP+zacfPtlm7OhLYwrpD5X+A3J0enih67jZ5r/ZRttSvVjSAw0O2fhVafFthhgpZc1eCIlEEvyWd0U8qz+LAz1lnMvE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612220253514427.17388641777313; Mon, 1 Feb 2021 14:57:33 -0800 (PST) Received: from localhost ([::1]:37860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6i8S-0000m4-H5 for importer@patchew.org; Mon, 01 Feb 2021 17:57:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6i5I-000663-1K for qemu-devel@nongnu.org; Mon, 01 Feb 2021 17:54:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:25433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6i5E-00025e-Hx for qemu-devel@nongnu.org; Mon, 01 Feb 2021 17:54:15 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-588-Hnr9jnHsN56t9pBMHyCbqw-1; Mon, 01 Feb 2021 17:54:10 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7379415729; Mon, 1 Feb 2021 22:54:09 +0000 (UTC) Received: from localhost (ovpn-3-197.rdu2.redhat.com [10.22.3.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 310F76F7E9; Mon, 1 Feb 2021 22:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612220051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3zY9N5aoCdgHS0R4abLCwJpvLZ4sXzF262CtMaH3APo=; b=ZO+t+cV7DTsEW6Jcc94XFZSzR1Y69An7Q4SQQ0D/fRdMTJHJ6Xhx3FagRFBAl21qXaw4Vx MCPKx1uSDXYQveoM2q7Ern+t/5G9yKPDIP2UJgeBLed3f5pMwZAG/Rh7npOshCiptMePl9 VKcncPQqbZmIe4nqVULePF9UzoMEgL0= X-MC-Unique: Hnr9jnHsN56t9pBMHyCbqw-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH 3/3] i386: Sanity check CPU model feature sets Date: Mon, 1 Feb 2021 17:54:04 -0500 Message-Id: <20210201225404.3941395-4-ehabkost@redhat.com> In-Reply-To: <20210201225404.3941395-1-ehabkost@redhat.com> References: <20210201225404.3941395-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Igor Mammedov , Richard Henderson , Eduardo Habkost , Babu Moger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" All CPU models must refer only to features that have their names defined in feature_word_info[].feat_names, otherwise error reporting and query-cpu-model-expansion will break. Validate CPU feature flags in x86_cpudef_validate(), we can catch mistakes more easily. Signed-off-by: Eduardo Habkost --- target/i386/cpu.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6285fb00eb8..3c066738e82 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5435,12 +5435,27 @@ static void x86_register_cpu_model_type(const char = *name, X86CPUModel *model) static void x86_cpudef_validate(X86CPUDefinition *def) { #ifndef NDEBUG + FeatureWord w; + int bitnr; + /* AMD aliases are handled at runtime based on CPUID vendor, so * they shouldn't be set on the CPU model table. */ assert(!(def->features[FEAT_8000_0001_EDX] & CPUID_EXT2_AMD_ALIASES)); /* catch mistakes instead of silently truncating model_id when too lon= g */ assert(def->model_id && strlen(def->model_id) <=3D 48); + + /* + * CPU models must enable only features with valid names, otherwise + * error reporting and query-cpu-model-expansion can't work correctly. + */ + for (w =3D 0; w < FEATURE_WORDS; w++) { + for (bitnr =3D 0; bitnr < 64; bitnr++) { + uint64_t mask =3D (1ULL << bitnr); + assert(!(def->features[w] & mask) || + feature_word_info[w].feat_names[bitnr]); + } + } #endif } =20 --=20 2.28.0