From patchwork Fri May 22 02:34:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187125 Delivered-To: patch@linaro.org Received: by 2002:a92:5b0a:0:0:0:0:0 with SMTP id p10csp2104478ilb; Thu, 21 May 2020 19:39:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwX4Hc7trLV/p7DXvMfekU8vGdZgN+oFVSwSVQfpk67bDulaJwgA/n7b32L7qwvFl849Obz X-Received: by 2002:a25:ba8f:: with SMTP id s15mr20122217ybg.34.1590115197156; Thu, 21 May 2020 19:39:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590115197; cv=none; d=google.com; s=arc-20160816; b=siFneVIyVI6yzP+faM1XII5wQnN5l6jPUxccop+0N2mPayV4JTlSMa+FtS+XbNCfDB nZWnS6QtYtiI7rBoCP5aZ7D69GboybxitudG5DLgtXZxKfu8S4bgl+ITQFtievvBVMNv 2AtY9+0iWTd8xIC9pxTD67R+5CybGAtqL2uxtwH1TIu5sxk2OP0+UeF6z/6QdreLDj3H F1UgoJR4bkJTkX9KVZTjANZaVBhLbUZ3VpXmksJ/fGnUyfARF1IH375950AGqhgIXk2N bAUGc4Lq+EYGFwSpj8pU1hQaBFVQcxqk3NO62PQirn1ZPuEkC6f8Eli1QVYq/txtDajD V41A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=3G4PJj+ygy8yy6dNKzxkyDjb06D6oXBdXQgauyjKNKc=; b=aB/PO1wHpyNEX7vQP7C++hb6p83MUD6buLipcML8qRW6ZnXAej3/RgbTmA7a98rgca uMWo0VQgVtpvicZBGQk86L57s9EUSPdGfmy1CmZw6PA4k1GAd5umm8uDsU87IbWaDxhX eEhYvyz+++J46nHN8kTQ9BRghctr1cDK68aPOH9rGx6TGxZn2333xfv7idSSfz9O0xyK V5o67+79iEQbZ5PzkyWT/ZQrlq0BvdrXSdDtit/gtTXipSDK2PEZ+5mJbpcNdxFWupQt hpKsxPpR2DCoV661uxktIWrJj+0z/3fh0NVAGmjCcUMfR9hPatJdLOt1Mm3jRbPogy5H 3uPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VYzFDTzE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g18si6670460ybd.194.2020.05.21.19.39.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 May 2020 19:39:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VYzFDTzE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbxbI-00056G-L5 for patch@linaro.org; Thu, 21 May 2020 22:39:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbxWQ-0002ML-Vz for qemu-devel@nongnu.org; Thu, 21 May 2020 22:34:55 -0400 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:45078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jbxWP-00056d-U2 for qemu-devel@nongnu.org; Thu, 21 May 2020 22:34:54 -0400 Received: by mail-pl1-x643.google.com with SMTP id u22so3800107plq.12 for ; Thu, 21 May 2020 19:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3G4PJj+ygy8yy6dNKzxkyDjb06D6oXBdXQgauyjKNKc=; b=VYzFDTzEPy0A2kxWMWYkLaRVXsZ//5tFKncxAGUD2ZuPjx+xpuwaOLVyCAtQXz4x6R GU5gN9YV3x7Ps2RlJHECsvuN6s0hzf6vVXOwRm0XV3Vy6tmfCD3TJ4sYc6b0auV3SXmB ltNs1MVKO6EasxaMRKzr+V6LTB0WX2hjEbgj+ceE81l2QHJ5gaqogLB72a6mIzXKZLg5 rb+KG98p+9mZaU9mYK2iyQpyl3wIEZEi1O6Ef4CU6CS6df2Ht59HT2WWzrwsY4zhIq/T NLQ3+0z67jT76lybRHgvsYegfVVyIjeLzLYTpeoF1Hg/p9qdPjKuSMVSqEVufgVuAS2R +bWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3G4PJj+ygy8yy6dNKzxkyDjb06D6oXBdXQgauyjKNKc=; b=O8ZM50MJvry9y/uG6xWrUBL0uIBM4y9Og6/lC29SI6OgTAI8duhCjhnAmyjlEh7orw J+OCgWisl6hLET2KbdoleF0KiBOvjVxnUDYu+ISE7osof75zg8NwvxheZR0xefDlgM5G xtRxiPU5n6Zuq1Suit2Iq9ZIS3Wxns04IHWyoN2cAQkLh/u8liuz7LILI+8ONZbxlJpb VvfqfrFeWakC7seCI5dyuffzCnRbwXK3/Q7lvbnMublxB2EO0DXrRgAlYVqFnUvILhtE H7N8wB2d4fnL+UrtEeF+bEWS5cDMFHhE26FROhoRxr0DiFdsILEWomJZCecAXzRKnJRo hK3Q== X-Gm-Message-State: AOAM530lY357J8keqYCkTxkzCJKbJJUxWeiBuHRgEoCOyMWMzfBAkFz0 Y6heWq2z43Jzp9MhgjewXvpGt6talPU= X-Received: by 2002:a17:90a:7087:: with SMTP id g7mr1902831pjk.70.1590114892095; Thu, 21 May 2020 19:34:52 -0700 (PDT) Received: from localhost.localdomain (174-21-143-238.tukw.qwest.net. [174.21.143.238]) by smtp.gmail.com with ESMTPSA id gt10sm5443755pjb.30.2020.05.21.19.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2020 19:34:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 08/25] Add enum RisuResult Date: Thu, 21 May 2020 19:34:23 -0700 Message-Id: <20200522023440.26261-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522023440.26261-1-richard.henderson@linaro.org> References: <20200522023440.26261-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::643; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x643.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Formalize the random set of numbers into an enum. Doing this makes it easy to see that one of the responses in recv_and_compare_register_info was inconsistent. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- risu.h | 25 +++++++++++++++++-------- reginfo.c | 32 ++++++++++++++++---------------- risu.c | 18 +++++++++--------- 3 files changed, 42 insertions(+), 33 deletions(-) -- 2.20.1 diff --git a/risu.h b/risu.h index a7aa929..e6d07eb 100644 --- a/risu.h +++ b/risu.h @@ -57,6 +57,14 @@ typedef enum { OP_COMPAREMEM = 4, } RisuOp; +/* Result of operation */ +typedef enum { + RES_OK = 0, + RES_END, + RES_MISMATCH, + RES_BAD_IO, +} RisuResult; + /* The memory block should be this long */ #define MEMBLOCKLEN 8192 @@ -82,20 +90,21 @@ typedef struct { */ typedef int (*write_fn) (void *ptr, size_t bytes); typedef int (*read_fn) (void *ptr, size_t bytes); -typedef void (*respond_fn) (int response); +typedef void (*respond_fn) (RisuResult response); -/* Send the register information from the struct ucontext down the socket. - * Return the response code from the master. +/* + * Send the register information from the struct ucontext down the socket. * NB: called from a signal handler. */ -int send_register_info(write_fn write_fn, void *uc); +RisuResult send_register_info(write_fn write_fn, void *uc); -/* Read register info from the socket and compare it with that from the - * ucontext. Return 0 for match, 1 for end-of-test, 2 for mismatch. +/* + * Read register info from the socket and compare it with that from the + * ucontext. * NB: called from a signal handler. */ -int recv_and_compare_register_info(read_fn read_fn, - respond_fn respond, void *uc); +RisuResult recv_and_compare_register_info(read_fn read_fn, + respond_fn respond, void *uc); /* Print a useful report on the status of the last comparison * done in recv_and_compare_register_info(). This is called on diff --git a/reginfo.c b/reginfo.c index 2d67c93..b909a1f 100644 --- a/reginfo.c +++ b/reginfo.c @@ -21,7 +21,7 @@ uint8_t apprentice_memblock[MEMBLOCKLEN]; static int mem_used; static int packet_mismatch; -int send_register_info(write_fn write_fn, void *uc) +RisuResult send_register_info(write_fn write_fn, void *uc) { struct reginfo ri; trace_header_t header; @@ -34,7 +34,7 @@ int send_register_info(write_fn write_fn, void *uc) header.pc = get_pc(&ri); header.risu_op = op; if (write_fn(&header, sizeof(header)) != 0) { - return -1; + return RES_BAD_IO; } switch (op) { @@ -46,10 +46,10 @@ int send_register_info(write_fn write_fn, void *uc) * (b) end of test (c) a non-risuop UNDEF */ if (write_fn(&ri, reginfo_size()) != 0) { - return -1; + return RES_BAD_IO; } /* For OP_TEST_END, force return 1 to exit. */ - return op == OP_TESTEND; + return op == OP_TESTEND ? RES_END : RES_OK; case OP_SETMEMBLOCK: memblock = (void *)(uintptr_t)get_reginfo_paramreg(&ri); break; @@ -63,7 +63,7 @@ int send_register_info(write_fn write_fn, void *uc) default: abort(); } - return 0; + return RES_OK; } /* Read register info from the socket and compare it with that from the @@ -74,10 +74,10 @@ int send_register_info(write_fn write_fn, void *uc) * that says whether it is register or memory data, so if the two * sides get out of sync then we will fail obscurely. */ -int recv_and_compare_register_info(read_fn read_fn, - respond_fn resp_fn, void *uc) +RisuResult recv_and_compare_register_info(read_fn read_fn, + respond_fn resp_fn, void *uc) { - int resp = 0; + RisuResult resp = RES_OK; trace_header_t header; RisuOp op; @@ -85,18 +85,18 @@ int recv_and_compare_register_info(read_fn read_fn, op = get_risuop(&master_ri); if (read_fn(&header, sizeof(header)) != 0) { - return -1; + return RES_BAD_IO; } if (header.risu_op != op) { /* We are out of sync */ - resp = 2; + resp = RES_BAD_IO; resp_fn(resp); return resp; } /* send OK for the header */ - resp_fn(0); + resp_fn(RES_OK); switch (op) { case OP_COMPARE: @@ -107,12 +107,12 @@ int recv_and_compare_register_info(read_fn read_fn, */ if (read_fn(&apprentice_ri, reginfo_size())) { packet_mismatch = 1; - resp = 2; + resp = RES_BAD_IO; } else if (!reginfo_is_eq(&master_ri, &apprentice_ri)) { /* register mismatch */ - resp = 2; + resp = RES_MISMATCH; } else if (op == OP_TESTEND) { - resp = 1; + resp = RES_END; } resp_fn(resp); break; @@ -127,10 +127,10 @@ int recv_and_compare_register_info(read_fn read_fn, mem_used = 1; if (read_fn(apprentice_memblock, MEMBLOCKLEN)) { packet_mismatch = 1; - resp = 2; + resp = RES_BAD_IO; } else if (memcmp(memblock, apprentice_memblock, MEMBLOCKLEN) != 0) { /* memory mismatch */ - resp = 2; + resp = RES_MISMATCH; } resp_fn(resp); break; diff --git a/risu.c b/risu.c index ab17c71..7b14f72 100644 --- a/risu.c +++ b/risu.c @@ -69,7 +69,7 @@ int write_trace(void *ptr, size_t bytes) return (res == bytes) ? 0 : 1; } -void respond_sock(int r) +void respond_sock(RisuResult r) { send_response_byte(comm_fd, r); } @@ -98,11 +98,11 @@ int read_trace(void *ptr, size_t bytes) return (res == bytes) ? 0 : 1; } -void respond_trace(int r) +void respond_trace(RisuResult r) { switch (r) { - case 0: /* test ok */ - case 1: /* end of test */ + case RES_OK: + case RES_END: break; default: /* mismatch - if tracing we need to report, otherwise barf */ @@ -115,7 +115,7 @@ void respond_trace(int r) static void master_sigill(int sig, siginfo_t *si, void *uc) { - int r; + RisuResult r; signal_count++; if (trace) { @@ -125,7 +125,7 @@ static void master_sigill(int sig, siginfo_t *si, void *uc) } switch (r) { - case 0: + case RES_OK: /* match OK */ advance_pc(uc); return; @@ -137,7 +137,7 @@ static void master_sigill(int sig, siginfo_t *si, void *uc) static void apprentice_sigill(int sig, siginfo_t *si, void *uc) { - int r; + RisuResult r; signal_count++; if (trace) { @@ -147,11 +147,11 @@ static void apprentice_sigill(int sig, siginfo_t *si, void *uc) } switch (r) { - case 0: + case RES_OK: /* match OK */ advance_pc(uc); return; - case 1: + case RES_END: /* end of test */ exit(EXIT_SUCCESS); default: