From patchwork Tue Dec 11 16:28:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wainer dos Santos Moschetta X-Patchwork-Id: 10724157 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 99E2E13BF for ; Tue, 11 Dec 2018 16:33:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88BA02B314 for ; Tue, 11 Dec 2018 16:33:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 78D0E2B39C; Tue, 11 Dec 2018 16:33:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EEBCC2B314 for ; Tue, 11 Dec 2018 16:33:32 +0000 (UTC) Received: from localhost ([::1]:39936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWkyS-0000cK-2l for patchwork-qemu-devel@patchwork.kernel.org; Tue, 11 Dec 2018 11:33:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWkuU-0006rn-01 for qemu-devel@nongnu.org; Tue, 11 Dec 2018 11:29:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWkuP-0003lL-RD for qemu-devel@nongnu.org; Tue, 11 Dec 2018 11:29:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57560) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gWkuP-0003jL-DK for qemu-devel@nongnu.org; Tue, 11 Dec 2018 11:29:21 -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 mx1.redhat.com (Postfix) with ESMTPS id 5B05F30832D0; Tue, 11 Dec 2018 16:29:17 +0000 (UTC) Received: from virtlab501.virt.lab.eng.bos.redhat.com (virtlab501.virt.lab.eng.bos.redhat.com [10.19.152.162]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB40E26363; Tue, 11 Dec 2018 16:29:15 +0000 (UTC) From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Date: Tue, 11 Dec 2018 11:28:46 -0500 Message-Id: <20181211162846.31149-1-wainersm@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 11 Dec 2018 16:29:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2] target/i386: Fixes to the check missing features routine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, crosa@redhat.com, Wainer dos Santos Moschetta , ccarrara@redhat.com, pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The x86_cpu_class_check_missing_features() returns a list of unavailable features compared to the host CPU. Currently it may return empty strings for unnamed features as well as duplicated names. For example, the qmp "query-cpu-definitions" below shows one empty string and repeated "mpx" entries: (...) {"execute": "query-cpu-definitions"} (...) { "name": "Cascadelake-Server", "typename": "Cascadelake-Server-x86_64-cpu", "unavailable-features": [ "hle", "rtm", "mpx", "avx512f", "avx512dq", "rdseed", "adx", "smap", "clflushopt", "clwb", "intel-pt", "avx512cd", "avx512bw", "avx512vl", "pku", "", "avx512vnni", "spec-ctrl", "ssbd", "3dnowprefetch", "xsavec", "xgetbv1", "mpx", "mpx", "avx512f", "avx512f", "avx512f", "pku" ], (...) Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Eduardo Habkost Reviewed-by: Eric Blake Reviewed-by: Caio Carrara --- v2: * Fixed typos. [eblake] * Removed unwanted manual test case. [ccarrara, ehabkost] * Not passing 'accel=kvm' on test's VM. [ehabkost] * Removed unneeded g_strdup() call. [ehabkost] * Formatted comment according to QEMU's coding style. [ehabkost] v1: https://www.mail-archive.com/qemu-devel@nongnu.org/msg579404.html --- target/i386/cpu.c | 11 ++++++++- tests/acceptance/cpu_definitions.py | 35 +++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 tests/acceptance/cpu_definitions.py diff --git a/target/i386/cpu.c b/target/i386/cpu.c index f81d35e1f9..014b91e608 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3615,19 +3615,28 @@ static void x86_cpu_class_check_missing_features(X86CPUClass *xcc, x86_cpu_filter_features(xc); + /* Auxiliary dictionary to avoid duplicate entries in the list. */ + QDict *unique_feats_dict = qdict_new(); + for (w = 0; w < FEATURE_WORDS; w++) { uint32_t filtered = xc->filtered_features[w]; int i; for (i = 0; i < 32; i++) { if (filtered & (1UL << i)) { + const char *fname = x86_cpu_feature_name(w, i); + if (!fname || qdict_haskey(unique_feats_dict, fname)) { + continue; + } strList *new = g_new0(strList, 1); - new->value = g_strdup(x86_cpu_feature_name(w, i)); + new->value = g_strdup(fname); *next = new; next = &new->next; + qdict_put_null(unique_feats_dict, new->value); } } } + g_free(unique_feats_dict); object_unref(OBJECT(xc)); } diff --git a/tests/acceptance/cpu_definitions.py b/tests/acceptance/cpu_definitions.py new file mode 100644 index 0000000000..4edad86799 --- /dev/null +++ b/tests/acceptance/cpu_definitions.py @@ -0,0 +1,35 @@ +# CPU definitions tests. +# +# Copyright (c) 2018 Red Hat, Inc. +# +# Author: +# Wainer dos Santos Moschetta +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +from avocado import skip +from avocado_qemu import Test + + +class CPUDefinitions(Test): + """ + Tests for the CPU definitions. + + :avocado: enable + :avocado: tags=x86_64 + """ + def test_unavailable_features(self): + self.vm.add_args("-machine", "q35") + self.vm.launch() + cpu_definitions = self.vm.command('query-cpu-definitions') + self.assertTrue(len(cpu_definitions) > 0) + for cpu_model in cpu_definitions: + name = cpu_model.get('name') + unavailable_features = cpu_model.get('unavailable-features') + + self.assertNotIn("", unavailable_features, + name + " has unamed feature") + self.assertEqual(len(unavailable_features), + len(set(unavailable_features)), + name + " has duplicate feature")