From patchwork Tue Oct 10 16:20:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 9998035 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 6BB85603B5 for ; Tue, 10 Oct 2017 22:02:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E6FA287D4 for ; Tue, 10 Oct 2017 22:02:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 52FEA287E0; Tue, 10 Oct 2017 22:02:41 +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=-2.6 required=2.0 tests=BAYES_00, DATE_IN_PAST_03_06, 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 D3B38287D4 for ; Tue, 10 Oct 2017 22:02:40 +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 1e22ZL-000376-38; Tue, 10 Oct 2017 22:00:07 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e22ZK-000364-1i for xen-devel@lists.xenproject.org; Tue, 10 Oct 2017 22:00:06 +0000 Received: from [193.109.254.147] by server-11.bemta-6.messagelabs.com id FD/D6-20813-5E24DD95; Tue, 10 Oct 2017 22:00:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHRDpO5Dp7u RBs1tNhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8aGz+fZCm7wV1zb/p6lgfEPTxcjJ4eEgL/E k7P/WEBsNgE9iXnHvwLZHBwiAioSt/cadDFycTAL7GeU6P36gw2kRlggXuJXzwOwehYBVYmt8 zYxg9i8AjYSOxb+ZIWYKS/xfsF9RhCbU8BWYve5XnYQWwioZlv7ZCYIW1Vi8YOj7BC9ghInZz 4Bm8ksICFx8MUL5gmMvLOQpGYhSS1gZFrFqFGcWlSWWqRrZKSXVJSZnlGSm5iZo2toYKaXm1p cnJiempOYVKyXnJ+7iREYPAxAsINxzfzAQ4ySHExKoryv1e9GCvEl5adUZiQWZ8QXleakFh9i lOHgUJLgneQIlBMsSk1PrUjLzAGGMUxagoNHSYRXCxjKQrzFBYm5xZnpEKlTjLocHTfv/mESY snLz0uVEuddDTJDAKQoozQPbgQspi4xykoJ8zICHSXEU5BalJtZgir/ilGcg1FJmHcXyBSezL wSuE2vgI5gAjpCNO0OyBEliQgpqQbG5A/6HztKJJ4JZbCv3bbp04/NAtOalF6uyN20dPe38LV 5vB0OjmWJOf8tWWsyBCw2XbOpCf47b6P3/12f9pTtOq7YHNGjwhQXHd10SHNnwfbF9mpXb/yd YvDS4eSRnpuTb7efOSsqkulWfl0x0XfvgdjwJVXrpDe+W7DKymBWgc2hPQdmHnipqcRSnJFoq MVcVJwIAL49J7akAgAA X-Env-Sender: prvs=4495d6a26=George.Dunlap@citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1507672798!109594437!2 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.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26322 invoked from network); 10 Oct 2017 22:00:01 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-12.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 10 Oct 2017 22:00:01 -0000 X-IronPort-AV: E=Sophos;i="5.43,359,1503360000"; d="scan'208";a="444876826" From: George Dunlap To: Date: Tue, 10 Oct 2017 17:20:01 +0100 Message-ID: <20171010162011.9629-2-george.dunlap@citrix.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171010162011.9629-1-george.dunlap@citrix.com> References: <20171010162011.9629-1-george.dunlap@citrix.com> MIME-Version: 1.0 Cc: Ian Jackson , Wei Liu , George Dunlap , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH v3 02/12] fuzz/x86_emulate: Improve failure descriptions in x86_emulate harness 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 - Print the symbolic name rather than the number - Explicitly state when data_read() fails due to EOI Signed-off-by: George Dunlap Reviewed-by: Wei Liu Reviewed-by: Jan Beulich --- Changes in v4: - Make array 'static const char* const' Changes in v2: - Add spaces around '=' CC: Ian Jackson CC: Wei Liu CC: Andrew Cooper CC: Jan Beulich --- tools/fuzz/x86_instruction_emulator/fuzz-emul.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/fuzz/x86_instruction_emulator/fuzz-emul.c b/tools/fuzz/x86_instruction_emulator/fuzz-emul.c index 48a879cc88..999f417716 100644 --- a/tools/fuzz/x86_instruction_emulator/fuzz-emul.c +++ b/tools/fuzz/x86_instruction_emulator/fuzz-emul.c @@ -52,6 +52,14 @@ struct fuzz_state struct x86_emulate_ops ops; }; +static const char* const x86emul_return_string[] = { + [X86EMUL_OKAY] = "X86EMUL_OKAY", + [X86EMUL_UNHANDLEABLE] = "X86EMUL_UNHANDLEABLE", + [X86EMUL_EXCEPTION] = "X86EMUL_EXCEPTION", + [X86EMUL_RETRY] = "X86EMUL_RETRY", + [X86EMUL_DONE] = "X86EMUL_DONE", +}; + /* * Randomly return success or failure when processing data. If * `exception` is false, this function turns _EXCEPTION to _OKAY. @@ -84,7 +92,7 @@ static int maybe_fail(struct x86_emulate_ctxt *ctxt, if ( rc == X86EMUL_EXCEPTION && !exception ) rc = X86EMUL_OKAY; - printf("maybe_fail %s: %d\n", why, rc); + printf("maybe_fail %s: %s\n", why, x86emul_return_string[rc]); if ( rc == X86EMUL_EXCEPTION ) /* Fake up a pagefault. */ @@ -113,6 +121,7 @@ static int data_read(struct x86_emulate_ctxt *ctxt, x86_emul_hw_exception(13, 0, ctxt); rc = X86EMUL_EXCEPTION; + printf("data_read %s: X86EMUL_EXCEPTION (end of input)\n", why); } else rc = maybe_fail(ctxt, why, true);