From patchwork Fri Jun 2 16:08:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 101284 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp476630qge; Fri, 2 Jun 2017 09:14:21 -0700 (PDT) X-Received: by 10.237.40.3 with SMTP id r3mr2866781qtd.44.1496420061196; Fri, 02 Jun 2017 09:14:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496420061; cv=none; d=google.com; s=arc-20160816; b=HVzm3geLEwhxO35hTrYRzvmE86pnRHR0uHoRjl43sIF/EkPtemdIXrSESi1QfClsSJ hI4pelXJoWP/XrmBJcAKV66ppB+3lgORJzG+UYpZP71TFzIoiIU0QcGwlcHP/TO5ZtoW 5B6xbOqnWfLu8paDoZHhqjWZzjtWGnRfQwPWc4URC6v19fs3PILVVSt2NNHd8gEPSe+E D61p3NMS4nii1Rif4DHJ6f1ysxfS19w74x0zN1SsZCe6/cm0NAW1mrEtLKDr6FH8impm JXRqrg72fzT7AdZfJwsTwWQu6TgqEH+BqT7PfS42A43xfIVx2sKQsL+2/WPoK8G7nFE4 qBcg== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=zIWDJyHcm7Zx4NDl20LaKIxjzF+Ai3Lttbv5o84g6co=; b=aDJFHEJohI3RiWpkVcE7Mcq7vUnpzQXZ+NzMn3Um5taAQf1tB4l8p/nOhPlg2Jmr9E DI6fuvqeE5RhiQSu6svaUq7QVY3kFE/Q4QSWiQ/+OlKQ50iHUXicwgv+SEMdW98Vlx9k rVaUbg3jiapQCl1qPzxjmyojTIoF6OL0S7xO/COXgW1Is/+mjyRSmtw6/xXj7QflOfEx wFfT987AlciqrjQHqX7iom2QPmhoyr3o2+iUWzhY8cF7RB0eX/ysWICmXUNeot2dkXMc 8J2F+bB/PHHq2ktESxhmGuK8PgLDd09+p4KMN9IbztsfFr3mLoQSzq4cWXh20iMD178s ZMHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id k10si23620128qtk.222.2017.06.02.09.14.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 02 Jun 2017 09:14:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGpDO-0002cx-A9 for patch@linaro.org; Fri, 02 Jun 2017 12:14:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGp7z-00060C-EW for qemu-devel@nongnu.org; Fri, 02 Jun 2017 12:08:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGp7x-00050n-Sb for qemu-devel@nongnu.org; Fri, 02 Jun 2017 12:08:43 -0400 Received: from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:35976) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dGp7x-000507-J7 for qemu-devel@nongnu.org; Fri, 02 Jun 2017 12:08:41 -0400 Received: by mail-wr0-x22b.google.com with SMTP id v111so2774043wrc.3 for ; Fri, 02 Jun 2017 09:08:41 -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=zIWDJyHcm7Zx4NDl20LaKIxjzF+Ai3Lttbv5o84g6co=; b=hT6iJLGJz/xx1pdrCloJoJ/HbRdk2n7/ROvTgdh+wKLWbl/wQIW1uTe6ATE4S8B3Gb AWrihwmm/36DeOVUv3Xbf+lRhbMA6INqqg7nee51xeLZViLBAOw0VDb5+TF2OrRglBkr 8YJFFRN0Ia98mTswr82UCvNszFd7enHdPq11I= 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=zIWDJyHcm7Zx4NDl20LaKIxjzF+Ai3Lttbv5o84g6co=; b=kZ9Mcsy9NuCMWl0vMejIwprjgF9p/5xuBBMLZoFuzz2JrIXHZvbg8BrkWuPcEIL3X3 A7ZU8/X7BwBo6DDQui1+p9o1S08yBPnXO2gt8XdmuPQwgxbLgLsqkl1nZ9Ow65XZgbTW gg/OagY1sM2otD60mjSKMkPVvu/MBTtc4kHDYJErJvS965DQy5ud1EIaVIdcmRcvUadL nZT825OC8mkCi/iSFbuTh5glYVi2seGZeWOntFxaHRdTOjIEHp1u3bbVu2BLAhr2B/XQ 7C+V0WpWp02vlvXAUJhQTwEAKJJpjNMf+wKpT87MIwIRHgSl0IdrzrE8WzwDtHE2UK2N 6yrg== X-Gm-Message-State: AODbwcBof48haCDmAQO2qs2WQG0DTcVtfWzT9AX4aQrF7dLs6sn1t5yy lAi1ySmS1riPk7XqSc9Qkw== X-Received: by 10.223.169.120 with SMTP id u111mr277420wrc.203.1496419720549; Fri, 02 Jun 2017 09:08:40 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m38sm24693378wrm.4.2017.06.02.09.08.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Jun 2017 09:08:37 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 950193E0349; Fri, 2 Jun 2017 17:08:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 2 Jun 2017 17:08:43 +0100 Message-Id: <20170602160848.4913-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170602160848.4913-1-alex.bennee@linaro.org> References: <20170602160848.4913-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22b Subject: [Qemu-devel] [RISU PATCH v4 05/10] risu: paramterise send/receive functions 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is a precursor to record/playback support. Instead of passing the socket fd we now pass helper functions for reading/writing and responding. This will allow us to do the rest of the record/playback cleanly outside of the main worker function. Signed-off-by: Alex Bennée --- v4 - split header code - fix formatting foo-bar's v3 - new for v3 - arm, aarch64, ppc64 --- reginfo.c | 118 +++++++++++++++++++++++++++++++------------------------------- risu.c | 23 ++++++++++-- risu.h | 11 ++++-- 3 files changed, 89 insertions(+), 63 deletions(-) -- 2.13.0 diff --git a/reginfo.c b/reginfo.c index 96c6342..6498459 100644 --- a/reginfo.c +++ b/reginfo.c @@ -21,33 +21,35 @@ uint8_t apprentice_memblock[MEMBLOCKLEN]; static int mem_used = 0; static int packet_mismatch = 0; -int send_register_info(int sock, void *uc) +int send_register_info(write_fn write_fn, void *uc) { - struct reginfo ri; - int op; - reginfo_init(&ri, uc); - op = get_risuop(&ri); - - switch (op) { - case OP_COMPARE: - case OP_TESTEND: - default: - /* Do a simple register compare on (a) explicit request - * (b) end of test (c) a non-risuop UNDEF - */ - return send_data_pkt(sock, &ri, sizeof(ri)); - case OP_SETMEMBLOCK: - memblock = (void *)(uintptr_t)get_reginfo_paramreg(&ri); - break; - case OP_GETMEMBLOCK: - set_ucontext_paramreg(uc, - get_reginfo_paramreg(&ri) + (uintptr_t)memblock); - break; - case OP_COMPAREMEM: - return send_data_pkt(sock, memblock, MEMBLOCKLEN); - break; - } - return 0; + struct reginfo ri; + int op; + reginfo_init(&ri, uc); + op = get_risuop(&ri); + + switch (op) { + case OP_TESTEND: + write_fn(&ri, sizeof(ri)); + return 1; + case OP_SETMEMBLOCK: + memblock = (void *)(uintptr_t)get_reginfo_paramreg(&ri); + break; + case OP_GETMEMBLOCK: + set_ucontext_paramreg(uc, + get_reginfo_paramreg(&ri) + (uintptr_t)memblock); + break; + case OP_COMPAREMEM: + return write_fn(memblock, MEMBLOCKLEN); + break; + case OP_COMPARE: + default: + /* Do a simple register compare on (a) explicit request + * (b) end of test (c) a non-risuop UNDEF + */ + return write_fn(&ri, sizeof(ri)); + } + return 0; } /* Read register info from the socket and compare it with that from the @@ -58,54 +60,52 @@ int send_register_info(int sock, 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(int sock, void *uc) +int recv_and_compare_register_info(read_fn read_fn, respond_fn resp_fn, void *uc) { - int resp = 0, op; - - reginfo_init(&master_ri, uc); - op = get_risuop(&master_ri); - - switch (op) { - case OP_COMPARE: - case OP_TESTEND: - default: - /* Do a simple register compare on (a) explicit request - * (b) end of test (c) a non-risuop UNDEF - */ - if (recv_data_pkt(sock, &apprentice_ri, sizeof(apprentice_ri))) { + int resp = 0, op; + + reginfo_init(&master_ri, uc); + op = get_risuop(&master_ri); + + switch (op) { + case OP_COMPARE: + case OP_TESTEND: + default: + /* Do a simple register compare on (a) explicit request + * (b) end of test (c) a non-risuop UNDEF + */ + if (read_fn(&apprentice_ri, sizeof(apprentice_ri))) { packet_mismatch = 1; resp = 2; - - } else if (!reginfo_is_eq(&master_ri, &apprentice_ri)) { + } else if (!reginfo_is_eq(&master_ri, &apprentice_ri)) { /* register mismatch */ resp = 2; - - } else if (op == OP_TESTEND) { + } else if (op == OP_TESTEND) { resp = 1; - } - send_response_byte(sock, resp); - break; + } + resp_fn(resp); + break; case OP_SETMEMBLOCK: - memblock = (void *)(uintptr_t)get_reginfo_paramreg(&master_ri); - break; + memblock = (void *)(uintptr_t)get_reginfo_paramreg(&master_ri); + break; case OP_GETMEMBLOCK: - set_ucontext_paramreg(uc, get_reginfo_paramreg(&master_ri) + - (uintptr_t)memblock); - break; + set_ucontext_paramreg(uc, get_reginfo_paramreg(&master_ri) + + (uintptr_t)memblock); + break; case OP_COMPAREMEM: mem_used = 1; - if (recv_data_pkt(sock, apprentice_memblock, MEMBLOCKLEN)) { - packet_mismatch = 1; - resp = 2; + if (read_fn(apprentice_memblock, MEMBLOCKLEN)) { + packet_mismatch = 1; + resp = 2; } else if (memcmp(memblock, apprentice_memblock, MEMBLOCKLEN) != 0) { - /* memory mismatch */ - resp = 2; + /* memory mismatch */ + resp = 2; } - send_response_byte(sock, resp); + resp_fn(resp); break; } - return resp; + return resp; } /* Print a useful report on the status of the last comparison diff --git a/risu.c b/risu.c index bcdc219..22571cd 100644 --- a/risu.c +++ b/risu.c @@ -47,9 +47,28 @@ void report_test_status(void *pc) } } +/* Master functions */ + +int read_sock(void *ptr, size_t bytes) +{ + return recv_data_pkt(master_socket, ptr, bytes); +} + +void respond_sock(int r) +{ + send_response_byte(master_socket, r); +} + +/* Apprentice function */ + +int write_sock(void *ptr, size_t bytes) +{ + return send_data_pkt(apprentice_socket, ptr, bytes); +} + void master_sigill(int sig, siginfo_t *si, void *uc) { - switch (recv_and_compare_register_info(master_socket, uc)) + switch (recv_and_compare_register_info(read_sock, respond_sock, uc)) { case 0: /* match OK */ @@ -63,7 +82,7 @@ void master_sigill(int sig, siginfo_t *si, void *uc) void apprentice_sigill(int sig, siginfo_t *si, void *uc) { - switch (send_register_info(apprentice_socket, uc)) + switch (send_register_info(write_sock, uc)) { case 0: /* match OK */ diff --git a/risu.h b/risu.h index 1eeb885..71ea94f 100644 --- a/risu.h +++ b/risu.h @@ -53,17 +53,24 @@ struct reginfo; /* Functions operating on reginfo */ +/* To keep the read/write logic from multiplying across all arches + * we wrap up the function here to keep all the changes in one place + */ +typedef int (*write_fn) (void *ptr, size_t bytes); +typedef int (*read_fn) (void *ptr, size_t bytes); +typedef void (*respond_fn) (int response); + /* Send the register information from the struct ucontext down the socket. * Return the response code from the master. * NB: called from a signal handler. */ -int send_register_info(int sock, void *uc); +int 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. * NB: called from a signal handler. */ -int recv_and_compare_register_info(int sock, void *uc); +int 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