From nobody Wed Nov 5 18:21:36 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 14966673705091014.3639189131202; Mon, 5 Jun 2017 05:56:10 -0700 (PDT) Received: from localhost ([::1]:33210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHrYG-000710-Vb for importer@patchew.org; Mon, 05 Jun 2017 08:56:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43146) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHrN9-0004tr-1o for qemu-devel@nongnu.org; Mon, 05 Jun 2017 08:44:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHrN7-0001Ew-1J for qemu-devel@nongnu.org; Mon, 05 Jun 2017 08:44:39 -0400 Received: from mga07.intel.com ([134.134.136.100]:29413) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dHrN6-00019b-NN for qemu-devel@nongnu.org; Mon, 05 Jun 2017 08:44:36 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP; 05 Jun 2017 05:44:36 -0700 Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by orsmga002.jf.intel.com with ESMTP; 05 Jun 2017 05:44:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,300,1493708400"; d="scan'208";a="95699372" From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Mon, 5 Jun 2017 15:45:10 +0300 Message-Id: <1496666711-14630-8-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496666711-14630-1-git-send-email-amarnath.valluri@intel.com> References: <1496666711-14630-1-git-send-email-amarnath.valluri@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.100 Subject: [Qemu-devel] [PATCH v5 7/8] tpm-passthrough: move reusable code to utils 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: Amarnath Valluri , marcandre.lureau@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Amarnath Valluri Reviewed-by: Stefan Berger --- hw/tpm/tpm_passthrough.c | 64 ++++----------------------------------------= ---- hw/tpm/tpm_util.c | 25 +++++++++++++++++++ hw/tpm/tpm_util.h | 4 +++ 3 files changed, 34 insertions(+), 59 deletions(-) diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 4ac47ed..592fd1f 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -68,27 +68,6 @@ typedef struct TPMPassthruState TPMPassthruState; =20 static void tpm_passthrough_cancel_cmd(TPMBackend *tb); =20 -static int tpm_passthrough_unix_write(int fd, const uint8_t *buf, uint32_t= len) -{ - int ret, remain; - - remain =3D len; - while (remain > 0) { - ret =3D write(fd, buf, remain); - if (ret < 0) { - if (errno !=3D EINTR && errno !=3D EAGAIN) { - return -1; - } - } else if (ret =3D=3D 0) { - break; - } else { - buf +=3D ret; - remain -=3D ret; - } - } - return len - remain; -} - static int tpm_passthrough_unix_read(int fd, uint8_t *buf, uint32_t len) { int ret; @@ -102,45 +81,12 @@ static int tpm_passthrough_unix_read(int fd, uint8_t *= buf, uint32_t len) } return ret; } - -static uint32_t tpm_passthrough_get_size_from_buffer(const uint8_t *buf) -{ - struct tpm_resp_hdr *resp =3D (struct tpm_resp_hdr *)buf; - - return be32_to_cpu(resp->len); -} - -/* - * Write an error message in the given output buffer. - */ -static void tpm_write_fatal_error_response(uint8_t *out, uint32_t out_len) -{ - if (out_len >=3D sizeof(struct tpm_resp_hdr)) { - struct tpm_resp_hdr *resp =3D (struct tpm_resp_hdr *)out; - - resp->tag =3D cpu_to_be16(TPM_TAG_RSP_COMMAND); - resp->len =3D cpu_to_be32(sizeof(struct tpm_resp_hdr)); - resp->errcode =3D cpu_to_be32(TPM_FAIL); - } -} - -static bool tpm_passthrough_is_selftest(const uint8_t *in, uint32_t in_len) -{ - struct tpm_req_hdr *hdr =3D (struct tpm_req_hdr *)in; - - if (in_len >=3D sizeof(*hdr)) { - return (be32_to_cpu(hdr->ordinal) =3D=3D TPM_ORD_ContinueSelfTest); - } - - return false; -} - static int tpm_passthrough_unix_tx_bufs(TPMPassthruState *tpm_pt, const uint8_t *in, uint32_t in_len, uint8_t *out, uint32_t out_len, bool *selftest_done) { - int ret; + ssize_t ret; bool is_selftest; const struct tpm_resp_hdr *hdr; =20 @@ -148,9 +94,9 @@ static int tpm_passthrough_unix_tx_bufs(TPMPassthruState= *tpm_pt, tpm_pt->tpm_executing =3D true; *selftest_done =3D false; =20 - is_selftest =3D tpm_passthrough_is_selftest(in, in_len); + is_selftest =3D tpm_util_is_selftest(in, in_len); =20 - ret =3D tpm_passthrough_unix_write(tpm_pt->tpm_fd, in, in_len); + ret =3D qemu_write_full(tpm_pt->tpm_fd, (const void *)in, (size_t)in_l= en); if (ret !=3D in_len) { if (!tpm_pt->tpm_op_canceled || errno !=3D ECANCELED) { error_report("tpm_passthrough: error while transmitting data " @@ -170,7 +116,7 @@ static int tpm_passthrough_unix_tx_bufs(TPMPassthruStat= e *tpm_pt, strerror(errno), errno); } } else if (ret < sizeof(struct tpm_resp_hdr) || - tpm_passthrough_get_size_from_buffer(out) !=3D ret) { + be32_to_cpu(((struct tpm_resp_hdr *)out)->len) !=3D ret) { ret =3D -1; error_report("tpm_passthrough: received invalid response " "packet from TPM"); @@ -183,7 +129,7 @@ static int tpm_passthrough_unix_tx_bufs(TPMPassthruStat= e *tpm_pt, =20 err_exit: if (ret < 0) { - tpm_write_fatal_error_response(out, out_len); + tpm_util_write_fatal_error_response(out, out_len); } =20 tpm_pt->tpm_executing =3D false; diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c index 7b35429..fb929f6 100644 --- a/hw/tpm/tpm_util.c +++ b/hw/tpm/tpm_util.c @@ -24,6 +24,31 @@ #include "tpm_int.h" =20 /* + * Write an error message in the given output buffer. + */ +void tpm_util_write_fatal_error_response(uint8_t *out, uint32_t out_len) +{ + if (out_len >=3D sizeof(struct tpm_resp_hdr)) { + struct tpm_resp_hdr *resp =3D (struct tpm_resp_hdr *)out; + + resp->tag =3D cpu_to_be16(TPM_TAG_RSP_COMMAND); + resp->len =3D cpu_to_be32(sizeof(struct tpm_resp_hdr)); + resp->errcode =3D cpu_to_be32(TPM_FAIL); + } +} + +bool tpm_util_is_selftest(const uint8_t *in, uint32_t in_len) +{ + struct tpm_req_hdr *hdr =3D (struct tpm_req_hdr *)in; + + if (in_len >=3D sizeof(*hdr)) { + return (be32_to_cpu(hdr->ordinal) =3D=3D TPM_ORD_ContinueSelfTest); + } + + return false; +} + +/* * A basic test of a TPM device. We expect a well formatted response header * (error response is fine) within one second. */ diff --git a/hw/tpm/tpm_util.h b/hw/tpm/tpm_util.h index df76245..2f7c961 100644 --- a/hw/tpm/tpm_util.h +++ b/hw/tpm/tpm_util.h @@ -24,6 +24,10 @@ =20 #include "sysemu/tpm_backend.h" =20 +void tpm_util_write_fatal_error_response(uint8_t *out, uint32_t out_len); + +bool tpm_util_is_selftest(const uint8_t *in, uint32_t in_len); + int tpm_util_test_tpmdev(int tpm_fd, TPMVersion *tpm_version); =20 #endif /* TPM_TPM_UTIL_H */ --=20 2.7.4