From patchwork Mon Mar 27 09:56:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 9646133 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EE07F602BF for ; Mon, 27 Mar 2017 09:59:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C57692833B for ; Mon, 27 Mar 2017 09:59:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA5632835B; Mon, 27 Mar 2017 09:59:06 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 685F42833B for ; Mon, 27 Mar 2017 09:59:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csROQ-0003hZ-8n; Mon, 27 Mar 2017 09:56:54 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1csROO-0003fr-Os for xen-devel@lists.xen.org; Mon, 27 Mar 2017 09:56:52 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id 15/ED-27751-4E1E8D85; Mon, 27 Mar 2017 09:56:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHRDpO7jhzc iDBb8VbRY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDPm/3jMUtDCX/HuyxrWBsbbXF2MnBwSAv4S F7dOYAex2QT0JXa/+MQEYosIqEuc7rjI2sXIxcEscJRRYu73uawgCWGBCImjT2eCNbAIqEqcX 7+GBcTmFfCSmHbtLxPEUDmJ88d/MoPYnEDxtadvgdUICXhKbG68zwZhq0lc67/EDtErKHFy5h OwGmYBCYmDL14wT2DknYUkNQtJagEj0ypG9eLUorLUIl1zvaSizPSMktzEzBxdQwMzvdzU4uL E9NScxKRiveT83E2MwOBhAIIdjDMv+x9ilORgUhLl/XD6RoQQX1J+SmVGYnFGfFFpTmrxIUYZ Dg4lCd5TD4BygkWp6akVaZk5wDCGSUtw8CiJ8DICQ1mIt7ggMbc4Mx0idYpRl2PO7N1vmIRY8 vLzUqXEeU+CzBAAKcoozYMbAYupS4yyUsK8jEBHCfEUpBblZpagyr9iFOdgVBLmPQYyhSczrw Ru0yugI5iAjjg8H+yIkkSElFQDY9PD5Qs+9ZTOmt22sCIhnWsNRwHnidu6ayawS7mbr3RUP2V vHsGyUFY3LuvFra0vFZuvKRys3VqlwBZ2jLnW8xmbrCPTNS+uPfs3LSh+/mStvP3L70u7Qvx/ SWzwEjLzVJ5vV66xq5ZDWMz/S0fyaSupUvXnT/gXaUnMPb712MVz6d5tm1gNlViKMxINtZiLi hMBDJbLTqQCAAA= X-Env-Sender: prvs=252526eb1=Andrew.Cooper3@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1490608604!93578819!5 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49966 invoked from network); 27 Mar 2017 09:56:51 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 27 Mar 2017 09:56:51 -0000 X-IronPort-AV: E=Sophos;i="5.36,231,1486425600"; d="scan'208";a="416035582" From: Andrew Cooper To: Xen-devel Date: Mon, 27 Mar 2017 10:56:37 +0100 Message-ID: <1490608598-11197-10-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1490608598-11197-1-git-send-email-andrew.cooper3@citrix.com> References: <1490608598-11197-1-git-send-email-andrew.cooper3@citrix.com> MIME-Version: 1.0 Cc: George Dunlap , Andrew Cooper , Ian Jackson , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH 09/10] tools/x86emul: Advertise more CPUID features for testing purposes X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Andrew Cooper Acked-by: George Dunlap --- CC: Jan Beulich CC: George Dunlap CC: Ian Jackson CC: Wei Liu --- tools/tests/x86_emulator/x86_emulate.c | 41 ++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/tools/tests/x86_emulator/x86_emulate.c b/tools/tests/x86_emulator/x86_emulate.c index cea0595..2c49954 100644 --- a/tools/tests/x86_emulator/x86_emulate.c +++ b/tools/tests/x86_emulator/x86_emulate.c @@ -73,20 +73,37 @@ int emul_test_cpuid( : "a" (leaf), "c" (subleaf)); /* - * The emulator doesn't itself use MOVBE, so we can always run the - * respective tests. + * Some instructions and features can be emulated without specific + * hardware support. These features are unconditionally reported here, + * for testing and fuzzing-coverage purposes. */ - if ( leaf == 1 ) - res->c |= 1U << 22; - - /* - * The emulator doesn't itself use ADCX/ADOX/RDPID, so we can always run - * the respective tests. - */ - if ( leaf == 7 && subleaf == 0 ) + switch ( leaf ) { - res->b |= 1U << 19; - res->c |= 1U << 22; + case 1: + res->c |= 1U << 22; /* MOVBE */ + break; + + case 7: + switch ( subleaf ) + { + case 0: + res->b |= 1U << 11; /* rtm */ + res->b |= 1U << 19; /* ADCX/ADOX */ + res->b |= 1U << 20; /* STAC/CLAC */ + res->b |= 1U << 24; /* CLWB */ + + res->c |= 1U << 22; /* RDPID */ + break; + } + break; + + case 0x80000001: + res->c |= 1U << 4; /* cr8_legacy */ + + if ( ctxt->vendor == X86_VENDOR_AMD ) + res->c |= 1U << 7; /* misalignsse */ + + break; } return X86EMUL_OKAY;