From nobody Fri Apr 26 23:06:14 2024 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 1493726199206487.7409836238885; Tue, 2 May 2017 04:56:39 -0700 (PDT) Received: from localhost ([::1]:58225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WQ1-0003V8-Rx for importer@patchew.org; Tue, 02 May 2017 07:56:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46558) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WMQ-0000dj-QD for qemu-devel@nongnu.org; Tue, 02 May 2017 07:52:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5WMO-0005w3-Kg for qemu-devel@nongnu.org; Tue, 02 May 2017 07:52:54 -0400 Received: from mga03.intel.com ([134.134.136.65]:28100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5WMO-0005ug-BI for qemu-devel@nongnu.org; Tue, 02 May 2017 07:52:52 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2017 04:52:51 -0700 Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by orsmga003.jf.intel.com with ESMTP; 02 May 2017 04:52:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,405,1488873600"; d="scan'208";a="963424683" From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Tue, 2 May 2017 14:52:42 +0300 Message-Id: <1493725969-19518-2-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493725969-19518-1-git-send-email-amarnath.valluri@intel.com> References: <1493725969-19518-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.65 Subject: [Qemu-devel] [PATCH v3 1/8] tpm-backend: Remove unneeded member variable from backend class 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 , patrick.ohly@intel.com, marcandre.lureau@gmail.com, stefanb@linux.vnet.ibm.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" TPMDriverOps inside TPMBackend is not required, as it is supposed to be a c= lass member. The only possible reason for keeping in TPMBackend was, to get the backend type in tpm.c where dedicated backend api, tpm_backend_get_type() is present. Signed-off-by: Amarnath Valluri Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/tpm/tpm_passthrough.c | 4 ---- include/sysemu/tpm_backend.h | 1 - tpm.c | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 9234eb3..a0baf5f 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -46,8 +46,6 @@ #define TPM_PASSTHROUGH(obj) \ OBJECT_CHECK(TPMPassthruState, (obj), TYPE_TPM_PASSTHROUGH) =20 -static const TPMDriverOps tpm_passthrough_driver; - /* data structures */ typedef struct TPMPassthruThreadParams { TPMState *tpm_state; @@ -462,8 +460,6 @@ static TPMBackend *tpm_passthrough_create(QemuOpts *opt= s, const char *id) /* let frontend set the fe_model to proper value */ tb->fe_model =3D -1; =20 - tb->ops =3D &tpm_passthrough_driver; - if (tpm_passthrough_handle_device_opts(opts, tb)) { goto err_exit; } diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h index b58f52d..e7f590d 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -50,7 +50,6 @@ struct TPMBackend { enum TpmModel fe_model; char *path; char *cancel_path; - const TPMDriverOps *ops; =20 QLIST_ENTRY(TPMBackend) list; }; diff --git a/tpm.c b/tpm.c index 9a7c711..0ee021a 100644 --- a/tpm.c +++ b/tpm.c @@ -258,7 +258,7 @@ static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv) res->model =3D drv->fe_model; res->options =3D g_new0(TpmTypeOptions, 1); =20 - switch (drv->ops->type) { + switch (tpm_backend_get_type(drv)) { case TPM_TYPE_PASSTHROUGH: res->options->type =3D TPM_TYPE_OPTIONS_KIND_PASSTHROUGH; tpo =3D g_new0(TPMPassthroughOptions, 1); --=20 2.7.4 From nobody Fri Apr 26 23:06:14 2024 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 1493726080307518.4475321354487; Tue, 2 May 2017 04:54:40 -0700 (PDT) Received: from localhost ([::1]:58210 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WO6-0001jf-Ur for importer@patchew.org; Tue, 02 May 2017 07:54:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WMS-0000du-Pn for qemu-devel@nongnu.org; Tue, 02 May 2017 07:52:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5WMQ-0005wz-SS for qemu-devel@nongnu.org; Tue, 02 May 2017 07:52:56 -0400 Received: from mga03.intel.com ([134.134.136.65]:28100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5WMQ-0005ug-Ee for qemu-devel@nongnu.org; Tue, 02 May 2017 07:52:54 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2017 04:52:54 -0700 Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by orsmga003.jf.intel.com with ESMTP; 02 May 2017 04:52:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,405,1488873600"; d="scan'208";a="963424689" From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Tue, 2 May 2017 14:52:43 +0300 Message-Id: <1493725969-19518-3-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493725969-19518-1-git-send-email-amarnath.valluri@intel.com> References: <1493725969-19518-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.65 Subject: [Qemu-devel] [PATCH v3 2/8] tpm-backend: Move thread handling inside TPMBackend 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 , patrick.ohly@intel.com, marcandre.lureau@gmail.com, stefanb@linux.vnet.ibm.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" Move thread handling inside TPMBackend, this way backend implementations ne= ed not to maintain their own thread life cycle, instead they needs to implement 'handle_request()' class method that always been called from a thread. This change made tpm_backend_int.h kind of useless, hence removed it. Signed-off-by: Amarnath Valluri --- backends/tpm.c | 62 +++++++++++++++++++++++++-----------= ---- hw/tpm/tpm_passthrough.c | 58 ++++++------------------------------- include/sysemu/tpm_backend.h | 32 +++++++++++++-------- include/sysemu/tpm_backend_int.h | 41 -------------------------- 4 files changed, 67 insertions(+), 126 deletions(-) delete mode 100644 include/sysemu/tpm_backend_int.h diff --git a/backends/tpm.c b/backends/tpm.c index 536f262..ce56c3b 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -18,7 +18,24 @@ #include "qapi/qmp/qerror.h" #include "sysemu/tpm.h" #include "qemu/thread.h" -#include "sysemu/tpm_backend_int.h" + +static void tpm_backend_worker_thread(gpointer data, gpointer user_data) +{ + TPMBackend *s =3D TPM_BACKEND(user_data); + TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); + + assert(k->handle_request !=3D NULL); + k->handle_request(s, (TPMBackendCmd)data); +} + +static void tpm_backend_thread_end(TPMBackend *s) +{ + if (s->thread_pool) { + g_thread_pool_push(s->thread_pool, (gpointer)TPM_BACKEND_CMD_END, = NULL); + g_thread_pool_free(s->thread_pool, FALSE, TRUE); + s->thread_pool =3D NULL; + } +} =20 enum TpmType tpm_backend_get_type(TPMBackend *s) { @@ -39,6 +56,8 @@ void tpm_backend_destroy(TPMBackend *s) TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 k->ops->destroy(s); + + tpm_backend_thread_end(s); } =20 int tpm_backend_init(TPMBackend *s, TPMState *state, @@ -46,13 +65,23 @@ int tpm_backend_init(TPMBackend *s, TPMState *state, { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 - return k->ops->init(s, state, datacb); + s->tpm_state =3D state; + s->recv_data_callback =3D datacb; + + return k->ops->init(s); } =20 int tpm_backend_startup_tpm(TPMBackend *s) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 + /* terminate a running TPM */ + tpm_backend_thread_end(s); + + s->thread_pool =3D g_thread_pool_new(tpm_backend_worker_thread, s, 1, = TRUE, + NULL); + g_thread_pool_push(s->thread_pool, (gpointer)TPM_BACKEND_CMD_INIT, NUL= L); + return k->ops->startup_tpm(s); } =20 @@ -72,9 +101,8 @@ size_t tpm_backend_realloc_buffer(TPMBackend *s, TPMSize= dBuffer *sb) =20 void tpm_backend_deliver_request(TPMBackend *s) { - TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); - - k->ops->deliver_request(s); + g_thread_pool_push(s->thread_pool, (gpointer)TPM_BACKEND_CMD_PROCESS_C= MD, + NULL); } =20 void tpm_backend_reset(TPMBackend *s) @@ -82,6 +110,8 @@ void tpm_backend_reset(TPMBackend *s) TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 k->ops->reset(s); + + tpm_backend_thread_end(s); } =20 void tpm_backend_cancel_cmd(TPMBackend *s) @@ -156,29 +186,14 @@ static void tpm_backend_instance_init(Object *obj) tpm_backend_prop_get_opened, tpm_backend_prop_set_opened, NULL); -} =20 -void tpm_backend_thread_deliver_request(TPMBackendThread *tbt) -{ - g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_PROCESS_CMD, NU= LL); } =20 -void tpm_backend_thread_create(TPMBackendThread *tbt, - GFunc func, gpointer user_data) +static void tpm_backend_instance_finalize(Object *obj) { - if (!tbt->pool) { - tbt->pool =3D g_thread_pool_new(func, user_data, 1, TRUE, NULL); - g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_INIT, NULL= ); - } -} + TPMBackend *s =3D TPM_BACKEND(obj); =20 -void tpm_backend_thread_end(TPMBackendThread *tbt) -{ - if (tbt->pool) { - g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_END, NULL); - g_thread_pool_free(tbt->pool, FALSE, TRUE); - tbt->pool =3D NULL; - } + tpm_backend_thread_end(s); } =20 static const TypeInfo tpm_backend_info =3D { @@ -186,6 +201,7 @@ static const TypeInfo tpm_backend_info =3D { .parent =3D TYPE_OBJECT, .instance_size =3D sizeof(TPMBackend), .instance_init =3D tpm_backend_instance_init, + .instance_finalize =3D tpm_backend_instance_finalize, .class_size =3D sizeof(TPMBackendClass), .abstract =3D true, }; diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index a0baf5f..f50d9cf 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -30,7 +30,6 @@ #include "tpm_int.h" #include "hw/hw.h" #include "hw/i386/pc.h" -#include "sysemu/tpm_backend_int.h" #include "tpm_tis.h" #include "tpm_util.h" =20 @@ -47,20 +46,9 @@ OBJECT_CHECK(TPMPassthruState, (obj), TYPE_TPM_PASSTHROUGH) =20 /* data structures */ -typedef struct TPMPassthruThreadParams { - TPMState *tpm_state; - - TPMRecvDataCB *recv_data_callback; - TPMBackend *tb; -} TPMPassthruThreadParams; - struct TPMPassthruState { TPMBackend parent; =20 - TPMBackendThread tbt; - - TPMPassthruThreadParams tpm_thread_params; - char *tpm_dev; int tpm_fd; bool tpm_executing; @@ -214,12 +202,9 @@ static int tpm_passthrough_unix_transfer(TPMPassthruSt= ate *tpm_pt, selftest_done); } =20 -static void tpm_passthrough_worker_thread(gpointer data, - gpointer user_data) +static void tpm_passthrough_handle_request(TPMBackend *tb, TPMBackendCmd c= md) { - TPMPassthruThreadParams *thr_parms =3D user_data; - TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(thr_parms->tb); - TPMBackendCmd cmd =3D (TPMBackendCmd)data; + TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); bool selftest_done =3D false; =20 DPRINTF("tpm_passthrough: processing command type %d\n", cmd); @@ -227,12 +212,12 @@ static void tpm_passthrough_worker_thread(gpointer da= ta, switch (cmd) { case TPM_BACKEND_CMD_PROCESS_CMD: tpm_passthrough_unix_transfer(tpm_pt, - thr_parms->tpm_state->locty_data, + tb->tpm_state->locty_data, &selftest_done); =20 - thr_parms->recv_data_callback(thr_parms->tpm_state, - thr_parms->tpm_state->locty_number, - selftest_done); + tb->recv_data_callback(tb->tpm_state, + tb->tpm_state->locty_number, + selftest_done); break; case TPM_BACKEND_CMD_INIT: case TPM_BACKEND_CMD_END: @@ -248,15 +233,6 @@ static void tpm_passthrough_worker_thread(gpointer dat= a, */ static int tpm_passthrough_startup_tpm(TPMBackend *tb) { - TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); - - /* terminate a running TPM */ - tpm_backend_thread_end(&tpm_pt->tbt); - - tpm_backend_thread_create(&tpm_pt->tbt, - tpm_passthrough_worker_thread, - &tpm_pt->tpm_thread_params); - return 0; } =20 @@ -268,20 +244,11 @@ static void tpm_passthrough_reset(TPMBackend *tb) =20 tpm_passthrough_cancel_cmd(tb); =20 - tpm_backend_thread_end(&tpm_pt->tbt); - tpm_pt->had_startup_error =3D false; } =20 -static int tpm_passthrough_init(TPMBackend *tb, TPMState *s, - TPMRecvDataCB *recv_data_cb) +static int tpm_passthrough_init(TPMBackend *tb) { - TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); - - tpm_pt->tpm_thread_params.tpm_state =3D s; - tpm_pt->tpm_thread_params.recv_data_callback =3D recv_data_cb; - tpm_pt->tpm_thread_params.tb =3D tb; - return 0; } =20 @@ -315,13 +282,6 @@ static size_t tpm_passthrough_realloc_buffer(TPMSizedB= uffer *sb) return sb->size; } =20 -static void tpm_passthrough_deliver_request(TPMBackend *tb) -{ - TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); - - tpm_backend_thread_deliver_request(&tpm_pt->tbt); -} - static void tpm_passthrough_cancel_cmd(TPMBackend *tb) { TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); @@ -483,8 +443,6 @@ static void tpm_passthrough_destroy(TPMBackend *tb) =20 tpm_passthrough_cancel_cmd(tb); =20 - tpm_backend_thread_end(&tpm_pt->tbt); - qemu_close(tpm_pt->tpm_fd); qemu_close(tpm_pt->cancel_fd); =20 @@ -520,7 +478,6 @@ static const TPMDriverOps tpm_passthrough_driver =3D { .realloc_buffer =3D tpm_passthrough_realloc_buffer, .reset =3D tpm_passthrough_reset, .had_startup_error =3D tpm_passthrough_get_startup_error, - .deliver_request =3D tpm_passthrough_deliver_request, .cancel_cmd =3D tpm_passthrough_cancel_cmd, .get_tpm_established_flag =3D tpm_passthrough_get_tpm_established_flag, .reset_tpm_established_flag =3D tpm_passthrough_reset_tpm_established_= flag, @@ -540,6 +497,7 @@ static void tpm_passthrough_class_init(ObjectClass *kla= ss, void *data) TPMBackendClass *tbc =3D TPM_BACKEND_CLASS(klass); =20 tbc->ops =3D &tpm_passthrough_driver; + tbc->handle_request =3D tpm_passthrough_handle_request; } =20 static const TypeInfo tpm_passthrough_info =3D { diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h index e7f590d..a538a7f 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -29,22 +29,24 @@ =20 typedef struct TPMBackendClass TPMBackendClass; typedef struct TPMBackend TPMBackend; - typedef struct TPMDriverOps TPMDriverOps; +typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty, bool selftest_done= ); =20 -struct TPMBackendClass { - ObjectClass parent_class; - - const TPMDriverOps *ops; - - void (*opened)(TPMBackend *s, Error **errp); -}; +typedef enum TPMBackendCmd { + TPM_BACKEND_CMD_INIT =3D 1, + TPM_BACKEND_CMD_PROCESS_CMD, + TPM_BACKEND_CMD_END, + TPM_BACKEND_CMD_TPM_RESET, +} TPMBackendCmd; =20 struct TPMBackend { Object parent; =20 /*< protected >*/ bool opened; + TPMState *tpm_state; + GThreadPool *thread_pool; + TPMRecvDataCB *recv_data_callback; =20 char *id; enum TpmModel fe_model; @@ -54,7 +56,15 @@ struct TPMBackend { QLIST_ENTRY(TPMBackend) list; }; =20 -typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty, bool selftest_done= ); +struct TPMBackendClass { + ObjectClass parent_class; + + const TPMDriverOps *ops; + + void (*opened)(TPMBackend *s, Error **errp); + + void (*handle_request)(TPMBackend *s, TPMBackendCmd cmd); +}; =20 typedef struct TPMSizedBuffer { uint32_t size; @@ -71,7 +81,7 @@ struct TPMDriverOps { void (*destroy)(TPMBackend *t); =20 /* initialize the backend */ - int (*init)(TPMBackend *t, TPMState *s, TPMRecvDataCB *datacb); + int (*init)(TPMBackend *t); /* start up the TPM on the backend */ int (*startup_tpm)(TPMBackend *t); /* returns true if nothing will ever answer TPM requests */ @@ -79,8 +89,6 @@ struct TPMDriverOps { =20 size_t (*realloc_buffer)(TPMSizedBuffer *sb); =20 - void (*deliver_request)(TPMBackend *t); - void (*reset)(TPMBackend *t); =20 void (*cancel_cmd)(TPMBackend *t); diff --git a/include/sysemu/tpm_backend_int.h b/include/sysemu/tpm_backend_= int.h deleted file mode 100644 index 00639dd..0000000 --- a/include/sysemu/tpm_backend_int.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * common TPM backend driver functions - * - * Copyright (c) 2012-2013 IBM Corporation - * Authors: - * Stefan Berger - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see - */ - -#ifndef TPM_BACKEND_INT_H -#define TPM_BACKEND_INT_H - -typedef struct TPMBackendThread { - GThreadPool *pool; -} TPMBackendThread; - -void tpm_backend_thread_deliver_request(TPMBackendThread *tbt); -void tpm_backend_thread_create(TPMBackendThread *tbt, - GFunc func, gpointer user_data); -void tpm_backend_thread_end(TPMBackendThread *tbt); - -typedef enum TPMBackendCmd { - TPM_BACKEND_CMD_INIT =3D 1, - TPM_BACKEND_CMD_PROCESS_CMD, - TPM_BACKEND_CMD_END, - TPM_BACKEND_CMD_TPM_RESET, -} TPMBackendCmd; - -#endif /* TPM_BACKEND_INT_H */ --=20 2.7.4 From nobody Fri Apr 26 23:06:14 2024 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 1493726080217587.8148605118596; Tue, 2 May 2017 04:54:40 -0700 (PDT) Received: from localhost ([::1]:58211 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WO6-0001kV-OH for importer@patchew.org; Tue, 02 May 2017 07:54:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WMU-0000eo-0l for qemu-devel@nongnu.org; Tue, 02 May 2017 07:52:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5WMS-0005yy-Ql for qemu-devel@nongnu.org; Tue, 02 May 2017 07:52:58 -0400 Received: from mga03.intel.com ([134.134.136.65]:28100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5WMS-0005ug-Fv for qemu-devel@nongnu.org; Tue, 02 May 2017 07:52:56 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2017 04:52:56 -0700 Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by orsmga003.jf.intel.com with ESMTP; 02 May 2017 04:52:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,405,1488873600"; d="scan'208";a="963424706" From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Tue, 2 May 2017 14:52:44 +0300 Message-Id: <1493725969-19518-4-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493725969-19518-1-git-send-email-amarnath.valluri@intel.com> References: <1493725969-19518-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.65 Subject: [Qemu-devel] [PATCH v3 3/8] tpm-backend: Initialize and free data members in it's own methods 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 , patrick.ohly@intel.com, marcandre.lureau@gmail.com, stefanb@linux.vnet.ibm.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" Initialize and free TPMBackend data members in it's own instance_init() and instance_finalize methods. Took the opportunity to remove unneeded destroy() method from TpmDriverOps interface as TPMBackend is a Qemu Object, we can use object_unref() inplace= of tpm_backend_destroy() to free the backend object, hence removed destroy() f= rom TPMDriverOps interface. Signed-off-by: Amarnath Valluri Reviewed-by: Marc-Andr=C3=A9 Lureau --- backends/tpm.c | 16 ++++++---------- hw/tpm/tpm_passthrough.c | 31 ++++++++++++------------------- include/sysemu/tpm_backend.h | 7 ------- tpm.c | 2 +- 4 files changed, 19 insertions(+), 37 deletions(-) diff --git a/backends/tpm.c b/backends/tpm.c index ce56c3b..cf5abf1 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -51,15 +51,6 @@ const char *tpm_backend_get_desc(TPMBackend *s) return k->ops->desc(); } =20 -void tpm_backend_destroy(TPMBackend *s) -{ - TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); - - k->ops->destroy(s); - - tpm_backend_thread_end(s); -} - int tpm_backend_init(TPMBackend *s, TPMState *state, TPMRecvDataCB *datacb) { @@ -182,17 +173,22 @@ static void tpm_backend_prop_set_opened(Object *obj, = bool value, Error **errp) =20 static void tpm_backend_instance_init(Object *obj) { + TPMBackend *s =3D TPM_BACKEND(obj); + object_property_add_bool(obj, "opened", tpm_backend_prop_get_opened, tpm_backend_prop_set_opened, NULL); - + s->fe_model =3D -1; } =20 static void tpm_backend_instance_finalize(Object *obj) { TPMBackend *s =3D TPM_BACKEND(obj); =20 + g_free(s->id); + g_free(s->path); + g_free(s->cancel_path); tpm_backend_thread_end(s); } =20 diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index f50d9cf..815a72e 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -417,8 +417,6 @@ static TPMBackend *tpm_passthrough_create(QemuOpts *opt= s, const char *id) TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); =20 tb->id =3D g_strdup(id); - /* let frontend set the fe_model to proper value */ - tb->fe_model =3D -1; =20 if (tpm_passthrough_handle_device_opts(opts, tb)) { goto err_exit; @@ -432,26 +430,11 @@ static TPMBackend *tpm_passthrough_create(QemuOpts *o= pts, const char *id) return tb; =20 err_exit: - g_free(tb->id); + object_unref(obj); =20 return NULL; } =20 -static void tpm_passthrough_destroy(TPMBackend *tb) -{ - TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); - - tpm_passthrough_cancel_cmd(tb); - - qemu_close(tpm_pt->tpm_fd); - qemu_close(tpm_pt->cancel_fd); - - g_free(tb->id); - g_free(tb->path); - g_free(tb->cancel_path); - g_free(tpm_pt->tpm_dev); -} - static const QemuOptDesc tpm_passthrough_cmdline_opts[] =3D { TPM_STANDARD_CMDLINE_OPTS, { @@ -472,7 +455,6 @@ static const TPMDriverOps tpm_passthrough_driver =3D { .opts =3D tpm_passthrough_cmdline_opts, .desc =3D tpm_passthrough_create_desc, .create =3D tpm_passthrough_create, - .destroy =3D tpm_passthrough_destroy, .init =3D tpm_passthrough_init, .startup_tpm =3D tpm_passthrough_startup_tpm, .realloc_buffer =3D tpm_passthrough_realloc_buffer, @@ -486,10 +468,21 @@ static const TPMDriverOps tpm_passthrough_driver =3D { =20 static void tpm_passthrough_inst_init(Object *obj) { + TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(obj); + + tpm_pt->tpm_fd =3D -1; + tpm_pt->cancel_fd =3D -1; } =20 static void tpm_passthrough_inst_finalize(Object *obj) { + TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(obj); + + tpm_passthrough_cancel_cmd(TPM_BACKEND(obj)); + + qemu_close(tpm_pt->tpm_fd); + qemu_close(tpm_pt->cancel_fd); + g_free(tpm_pt->tpm_dev); } =20 static void tpm_passthrough_class_init(ObjectClass *klass, void *data) diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h index a538a7f..f61bcfe 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -78,7 +78,6 @@ struct TPMDriverOps { const char *(*desc)(void); =20 TPMBackend *(*create)(QemuOpts *opts, const char *id); - void (*destroy)(TPMBackend *t); =20 /* initialize the backend */ int (*init)(TPMBackend *t); @@ -118,12 +117,6 @@ enum TpmType tpm_backend_get_type(TPMBackend *s); const char *tpm_backend_get_desc(TPMBackend *s); =20 /** - * tpm_backend_destroy: - * @s: the backend to destroy - */ -void tpm_backend_destroy(TPMBackend *s); - -/** * tpm_backend_init: * @s: the backend to initialized * @state: TPMState diff --git a/tpm.c b/tpm.c index 0ee021a..70f74fa 100644 --- a/tpm.c +++ b/tpm.c @@ -197,7 +197,7 @@ void tpm_cleanup(void) =20 QLIST_FOREACH_SAFE(drv, &tpm_backends, list, next) { QLIST_REMOVE(drv, list); - tpm_backend_destroy(drv); + object_unref(OBJECT(drv)); } } =20 --=20 2.7.4 From nobody Fri Apr 26 23:06:14 2024 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 149372620830556.25499232058189; Tue, 2 May 2017 04:56:48 -0700 (PDT) Received: from localhost ([::1]:58226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WQB-0003cg-4r for importer@patchew.org; Tue, 02 May 2017 07:56:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WMW-0000gs-Ox for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5WMU-00061G-Va for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:00 -0400 Received: from mga03.intel.com ([134.134.136.65]:28100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5WMU-0005ug-J7 for qemu-devel@nongnu.org; Tue, 02 May 2017 07:52:58 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2017 04:52:58 -0700 Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by orsmga003.jf.intel.com with ESMTP; 02 May 2017 04:52:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,405,1488873600"; d="scan'208";a="963424710" From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Tue, 2 May 2017 14:52:45 +0300 Message-Id: <1493725969-19518-5-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493725969-19518-1-git-send-email-amarnath.valluri@intel.com> References: <1493725969-19518-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.65 Subject: [Qemu-devel] [PATCH v3 4/8] tpm-backend: Made few interface methods optional 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 , patrick.ohly@intel.com, marcandre.lureau@gmail.com, stefanb@linux.vnet.ibm.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" This allows backend implementations left optional interface methods. For mandatory methods assertion checks added. Signed-off-by: Amarnath Valluri Reviewed-by: Marc-Andr=C3=A9 Lureau --- backends/tpm.c | 24 ++++++++++++++++++------ hw/tpm/tpm_passthrough.c | 16 ---------------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/backends/tpm.c b/backends/tpm.c index cf5abf1..8245426 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -48,7 +48,7 @@ const char *tpm_backend_get_desc(TPMBackend *s) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 - return k->ops->desc(); + return k->ops->desc ? k->ops->desc() : ""; } =20 int tpm_backend_init(TPMBackend *s, TPMState *state, @@ -59,7 +59,7 @@ int tpm_backend_init(TPMBackend *s, TPMState *state, s->tpm_state =3D state; s->recv_data_callback =3D datacb; =20 - return k->ops->init(s); + return k->ops->init ? k->ops->init(s) : 0; } =20 int tpm_backend_startup_tpm(TPMBackend *s) @@ -73,13 +73,15 @@ int tpm_backend_startup_tpm(TPMBackend *s) NULL); g_thread_pool_push(s->thread_pool, (gpointer)TPM_BACKEND_CMD_INIT, NUL= L); =20 - return k->ops->startup_tpm(s); + return k->ops->startup_tpm ? k->ops->startup_tpm(s) : 0; } =20 bool tpm_backend_had_startup_error(TPMBackend *s) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 + assert(k->ops->had_startup_error); + return k->ops->had_startup_error(s); } =20 @@ -87,6 +89,8 @@ size_t tpm_backend_realloc_buffer(TPMBackend *s, TPMSized= Buffer *sb) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 + assert(k->ops->realloc_buffer); + return k->ops->realloc_buffer(sb); } =20 @@ -100,7 +104,9 @@ void tpm_backend_reset(TPMBackend *s) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 - k->ops->reset(s); + if (k->ops->reset) { + k->ops->reset(s); + } =20 tpm_backend_thread_end(s); } @@ -109,6 +115,8 @@ void tpm_backend_cancel_cmd(TPMBackend *s) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 + g_assert(k->ops->cancel_cmd); + k->ops->cancel_cmd(s); } =20 @@ -116,20 +124,24 @@ bool tpm_backend_get_tpm_established_flag(TPMBackend = *s) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 - return k->ops->get_tpm_established_flag(s); + return k->ops->get_tpm_established_flag ? + k->ops->get_tpm_established_flag(s) : false; } =20 int tpm_backend_reset_tpm_established_flag(TPMBackend *s, uint8_t locty) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 - return k->ops->reset_tpm_established_flag(s, locty); + return k->ops->reset_tpm_established_flag ? + k->ops->reset_tpm_established_flag(s, locty) : 0; } =20 TPMVersion tpm_backend_get_tpm_version(TPMBackend *s) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); =20 + assert(k->ops->get_tpm_version); + return k->ops->get_tpm_version(s); } =20 diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 815a72e..bbe9e5a 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -227,15 +227,6 @@ static void tpm_passthrough_handle_request(TPMBackend = *tb, TPMBackendCmd cmd) } } =20 -/* - * Start the TPM (thread). If it had been started before, then terminate - * and start it again. - */ -static int tpm_passthrough_startup_tpm(TPMBackend *tb) -{ - return 0; -} - static void tpm_passthrough_reset(TPMBackend *tb) { TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); @@ -247,11 +238,6 @@ static void tpm_passthrough_reset(TPMBackend *tb) tpm_pt->had_startup_error =3D false; } =20 -static int tpm_passthrough_init(TPMBackend *tb) -{ - return 0; -} - static bool tpm_passthrough_get_tpm_established_flag(TPMBackend *tb) { return false; @@ -455,8 +441,6 @@ static const TPMDriverOps tpm_passthrough_driver =3D { .opts =3D tpm_passthrough_cmdline_opts, .desc =3D tpm_passthrough_create_desc, .create =3D tpm_passthrough_create, - .init =3D tpm_passthrough_init, - .startup_tpm =3D tpm_passthrough_startup_tpm, .realloc_buffer =3D tpm_passthrough_realloc_buffer, .reset =3D tpm_passthrough_reset, .had_startup_error =3D tpm_passthrough_get_startup_error, --=20 2.7.4 From nobody Fri Apr 26 23:06:14 2024 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 1493726209881834.5953094051548; Tue, 2 May 2017 04:56:49 -0700 (PDT) Received: from localhost ([::1]:58227 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WQC-0003dE-Jw for importer@patchew.org; Tue, 02 May 2017 07:56:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WMa-0000jo-7T for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5WMX-00063Z-3H for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:04 -0400 Received: from mga03.intel.com ([134.134.136.65]:28100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5WMW-0005ug-MY for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:01 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2017 04:53:00 -0700 Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by orsmga003.jf.intel.com with ESMTP; 02 May 2017 04:52:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,405,1488873600"; d="scan'208";a="963424716" From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Tue, 2 May 2017 14:52:46 +0300 Message-Id: <1493725969-19518-6-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493725969-19518-1-git-send-email-amarnath.valluri@intel.com> References: <1493725969-19518-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.65 Subject: [Qemu-devel] [PATCH v3 5/8] tmp backend: Add new api to read backend TpmInfo 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 , patrick.ohly@intel.com, marcandre.lureau@gmail.com, stefanb@linux.vnet.ibm.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" TPM configuration options are backend implementation details and shall not = be part of base TPMBackend object, and these shall not be accessed directly ou= tside of the class, hence added a new interface method, get_tpm_options() to TPMDriverOps., which shall be implemented by the derived classes to return configured tpm options. A new tpm backend api - tpm_backend_query_tpm() which uses _get_tpm_options= () to prepare TpmInfo. Made TPMPassthroughOptions type inherited from newly defined TPMOptions bas= e type. The TPMOptions base type is intentionally left empty and supposed to be inherited by all backend implementations to define their tpm configuration options. Signed-off-by: Amarnath Valluri --- backends/tpm.c | 24 ++++++++++++++++++-- hmp.c | 10 ++++---- hw/tpm/tpm_passthrough.c | 54 +++++++++++++++++++++++++++++++++++-----= ---- include/sysemu/tpm_backend.h | 25 ++++++++++++++++++-- qapi-schema.json | 41 +++++++++++++++++---------------- tpm.c | 32 +------------------------- 6 files changed, 115 insertions(+), 71 deletions(-) diff --git a/backends/tpm.c b/backends/tpm.c index 8245426..4a6358e 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -145,6 +145,28 @@ TPMVersion tpm_backend_get_tpm_version(TPMBackend *s) return k->ops->get_tpm_version(s); } =20 +TPMOptions *tpm_backend_get_tpm_options(TPMBackend *s) +{ + TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); + + assert(k->ops->get_tpm_options); + + return k->ops->get_tpm_options(s); +} + +TPMInfo *tpm_backend_query_tpm(TPMBackend *s) +{ + TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); + TPMInfo *info =3D g_new0(TPMInfo, 1); + + info->type =3D k->ops->type; + info->id =3D g_strdup(s->id); + info->model =3D s->fe_model; + info->options =3D tpm_backend_get_tpm_options(s); + + return info; +} + static bool tpm_backend_prop_get_opened(Object *obj, Error **errp) { TPMBackend *s =3D TPM_BACKEND(obj); @@ -199,8 +221,6 @@ static void tpm_backend_instance_finalize(Object *obj) TPMBackend *s =3D TPM_BACKEND(obj); =20 g_free(s->id); - g_free(s->path); - g_free(s->cancel_path); tpm_backend_thread_end(s); } =20 diff --git a/hmp.c b/hmp.c index edb8970..9caf7c8 100644 --- a/hmp.c +++ b/hmp.c @@ -955,18 +955,18 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) c, TpmModel_lookup[ti->model]); =20 monitor_printf(mon, " \\ %s: type=3D%s", - ti->id, TpmTypeOptionsKind_lookup[ti->options->type= ]); + ti->id, TpmType_lookup[ti->type]); =20 - switch (ti->options->type) { - case TPM_TYPE_OPTIONS_KIND_PASSTHROUGH: - tpo =3D ti->options->u.passthrough.data; + switch (ti->type) { + case TPM_TYPE_PASSTHROUGH: + tpo =3D (TPMPassthroughOptions *)ti->options; monitor_printf(mon, "%s%s%s%s", tpo->has_path ? ",path=3D" : "", tpo->has_path ? tpo->path : "", tpo->has_cancel_path ? ",cancel-path=3D" : "", tpo->has_cancel_path ? tpo->cancel_path : ""); break; - case TPM_TYPE_OPTIONS_KIND__MAX: + default: break; } monitor_printf(mon, "\n"); diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index bbe9e5a..2efced1 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -49,6 +49,7 @@ struct TPMPassthruState { TPMBackend parent; =20 + TPMPassthroughOptions *ops; char *tpm_dev; int tpm_fd; bool tpm_executing; @@ -313,15 +314,14 @@ static TPMVersion tpm_passthrough_get_tpm_version(TPM= Backend *tb) * in Documentation/ABI/stable/sysfs-class-tpm. * From /dev/tpm0 create /sys/class/misc/tpm0/device/cancel */ -static int tpm_passthrough_open_sysfs_cancel(TPMBackend *tb) +static int tpm_passthrough_open_sysfs_cancel(TPMPassthruState *tpm_pt) { - TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); int fd =3D -1; char *dev; char path[PATH_MAX]; =20 - if (tb->cancel_path) { - fd =3D qemu_open(tb->cancel_path, O_WRONLY); + if (tpm_pt->ops->cancel_path) { + fd =3D qemu_open(tpm_pt->ops->cancel_path, O_WRONLY); if (fd < 0) { error_report("Could not open TPM cancel path : %s", strerror(errno)); @@ -336,7 +336,7 @@ static int tpm_passthrough_open_sysfs_cancel(TPMBackend= *tb) dev) < sizeof(path)) { fd =3D qemu_open(path, O_WRONLY); if (fd >=3D 0) { - tb->cancel_path =3D g_strdup(path); + tpm_pt->ops->cancel_path =3D g_strdup(path); } else { error_report("tpm_passthrough: Could not open TPM cancel " "path %s : %s", path, strerror(errno)); @@ -356,17 +356,24 @@ static int tpm_passthrough_handle_device_opts(QemuOpt= s *opts, TPMBackend *tb) const char *value; =20 value =3D qemu_opt_get(opts, "cancel-path"); - tb->cancel_path =3D g_strdup(value); + if (value) { + tpm_pt->ops->cancel_path =3D g_strdup(value); + tpm_pt->ops->has_cancel_path =3D true; + } else { + tpm_pt->ops->has_cancel_path =3D false; + } =20 value =3D qemu_opt_get(opts, "path"); if (!value) { value =3D TPM_PASSTHROUGH_DEFAULT_DEVICE; + tpm_pt->ops->has_path =3D false; + } else { + tpm_pt->ops->has_path =3D true; } =20 + tpm_pt->ops->path =3D g_strdup(value); tpm_pt->tpm_dev =3D g_strdup(value); =20 - tb->path =3D g_strdup(tpm_pt->tpm_dev); - tpm_pt->tpm_fd =3D qemu_open(tpm_pt->tpm_dev, O_RDWR); if (tpm_pt->tpm_fd < 0) { error_report("Cannot access TPM device using '%s': %s", @@ -387,8 +394,8 @@ static int tpm_passthrough_handle_device_opts(QemuOpts = *opts, TPMBackend *tb) tpm_pt->tpm_fd =3D -1; =20 err_free_parameters: - g_free(tb->path); - tb->path =3D NULL; + g_free(tpm_pt->ops->path); + tpm_pt->ops->path =3D NULL; =20 g_free(tpm_pt->tpm_dev); tpm_pt->tpm_dev =3D NULL; @@ -408,7 +415,7 @@ static TPMBackend *tpm_passthrough_create(QemuOpts *opt= s, const char *id) goto err_exit; } =20 - tpm_pt->cancel_fd =3D tpm_passthrough_open_sysfs_cancel(tb); + tpm_pt->cancel_fd =3D tpm_passthrough_open_sysfs_cancel(tpm_pt); if (tpm_pt->cancel_fd < 0) { goto err_exit; } @@ -421,6 +428,28 @@ err_exit: return NULL; } =20 +static TPMOptions *tpm_passthrough_get_tpm_options(TPMBackend *tb) +{ + TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); + TPMPassthroughOptions *ops =3D g_new0(TPMPassthroughOptions, 1); + + if (!ops) { + return NULL; + } + + if (tpm_pt->ops->has_path) { + ops->has_path =3D true; + ops->path =3D g_strdup(tpm_pt->ops->path); + } + + if (tpm_pt->ops->has_cancel_path) { + ops->has_cancel_path =3D true; + ops->cancel_path =3D g_strdup(tpm_pt->ops->cancel_path); + } + + return (TPMOptions *)ops; +} + static const QemuOptDesc tpm_passthrough_cmdline_opts[] =3D { TPM_STANDARD_CMDLINE_OPTS, { @@ -448,12 +477,14 @@ static const TPMDriverOps tpm_passthrough_driver =3D { .get_tpm_established_flag =3D tpm_passthrough_get_tpm_established_flag, .reset_tpm_established_flag =3D tpm_passthrough_reset_tpm_established_= flag, .get_tpm_version =3D tpm_passthrough_get_tpm_version, + .get_tpm_options =3D tpm_passthrough_get_tpm_options, }; =20 static void tpm_passthrough_inst_init(Object *obj) { TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(obj); =20 + tpm_pt->ops =3D g_new0(TPMPassthroughOptions, 1); tpm_pt->tpm_fd =3D -1; tpm_pt->cancel_fd =3D -1; } @@ -467,6 +498,7 @@ static void tpm_passthrough_inst_finalize(Object *obj) qemu_close(tpm_pt->tpm_fd); qemu_close(tpm_pt->cancel_fd); g_free(tpm_pt->tpm_dev); + qapi_free_TPMPassthroughOptions(tpm_pt->ops); } =20 static void tpm_passthrough_class_init(ObjectClass *klass, void *data) diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h index f61bcfe..8f8f133 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -48,10 +48,9 @@ struct TPMBackend { GThreadPool *thread_pool; TPMRecvDataCB *recv_data_callback; =20 + /* */ char *id; enum TpmModel fe_model; - char *path; - char *cancel_path; =20 QLIST_ENTRY(TPMBackend) list; }; @@ -97,6 +96,8 @@ struct TPMDriverOps { int (*reset_tpm_established_flag)(TPMBackend *t, uint8_t locty); =20 TPMVersion (*get_tpm_version)(TPMBackend *t); + + TPMOptions *(*get_tpm_options)(TPMBackend *t); }; =20 =20 @@ -223,6 +224,26 @@ void tpm_backend_open(TPMBackend *s, Error **errp); */ TPMVersion tpm_backend_get_tpm_version(TPMBackend *s); =20 +/** + * tpm_backend_get_tpm_options: + * @s: the backend + * + * Get the backend configuration options + * + * Returns newly allocated TPMOptions + */ +TPMOptions *tpm_backend_get_tpm_options(TPMBackend *s); + +/** + * tpm_backend_query_tpm: + * @s: the backend + * + * Query backend tpm info + * + * Returns newly allocated TPMInfo + */ +TPMInfo *tpm_backend_query_tpm(TPMBackend *s); + TPMBackend *qemu_find_tpm(const char *id); =20 const TPMDriverOps *tpm_get_backend_driver(const char *type); diff --git a/qapi-schema.json b/qapi-schema.json index 250e4dc..764f731 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -5137,6 +5137,16 @@ { 'command': 'query-tpm-types', 'returns': ['TpmType'] } =20 ## +# @TPMOptions: +# +# Base type for TPM options +# +# Since: 2.10 +## +{ 'struct': 'TPMOptions', + 'data': { } } + +## # @TPMPassthroughOptions: # # Information about the TPM passthrough type @@ -5148,20 +5158,9 @@ # # Since: 1.5 ## -{ 'struct': 'TPMPassthroughOptions', 'data': { '*path' : 'str', - '*cancel-path' : 'str'} } +{ 'struct': 'TPMPassthroughOptions', 'base': 'TPMOptions', + 'data': { '*path' : 'str', '*cancel-path' : 'str'} } =20 -## -# @TpmTypeOptions: -# -# A union referencing different TPM backend types' configuration options -# -# @type: 'passthrough' The configuration options for the TPM passthrough t= ype -# -# Since: 1.5 -## -{ 'union': 'TpmTypeOptions', - 'data': { 'passthrough' : 'TPMPassthroughOptions' } } =20 ## # @TPMInfo: @@ -5170,6 +5169,8 @@ # # @id: The Id of the TPM # +# @type: The TPM backend type +# # @model: The TPM frontend model # # @options: The TPM (backend) type configuration options @@ -5178,8 +5179,9 @@ ## { 'struct': 'TPMInfo', 'data': {'id': 'str', + 'type': 'TpmType', 'model': 'TpmModel', - 'options': 'TpmTypeOptions' } } + 'options': 'TPMOptions' } } =20 ## # @query-tpm: @@ -5196,13 +5198,12 @@ # <- { "return": # [ # { "model": "tpm-tis", +# "type": "passthrough", # "options": -# { "type": "passthrough", -# "data": -# { "cancel-path": "/sys/class/misc/tpm0/device/cancel", -# "path": "/dev/tpm0" -# } -# }, +# { +# "cancel-path": "/sys/class/misc/tpm0/device/cancel", +# "path": "/dev/tpm0" +# }, # "id": "tpm0" # } # ] diff --git a/tpm.c b/tpm.c index 70f74fa..43d980e 100644 --- a/tpm.c +++ b/tpm.c @@ -249,36 +249,6 @@ static const TPMDriverOps *tpm_driver_find_by_type(enu= m TpmType type) return NULL; } =20 -static TPMInfo *qmp_query_tpm_inst(TPMBackend *drv) -{ - TPMInfo *res =3D g_new0(TPMInfo, 1); - TPMPassthroughOptions *tpo; - - res->id =3D g_strdup(drv->id); - res->model =3D drv->fe_model; - res->options =3D g_new0(TpmTypeOptions, 1); - - switch (tpm_backend_get_type(drv)) { - case TPM_TYPE_PASSTHROUGH: - res->options->type =3D TPM_TYPE_OPTIONS_KIND_PASSTHROUGH; - tpo =3D g_new0(TPMPassthroughOptions, 1); - res->options->u.passthrough.data =3D tpo; - if (drv->path) { - tpo->path =3D g_strdup(drv->path); - tpo->has_path =3D true; - } - if (drv->cancel_path) { - tpo->cancel_path =3D g_strdup(drv->cancel_path); - tpo->has_cancel_path =3D true; - } - break; - case TPM_TYPE__MAX: - break; - } - - return res; -} - /* * Walk the list of active TPM backends and collect information about them * following the schema description in qapi-schema.json. @@ -293,7 +263,7 @@ TPMInfoList *qmp_query_tpm(Error **errp) continue; } info =3D g_new0(TPMInfoList, 1); - info->value =3D qmp_query_tpm_inst(drv); + info->value =3D tpm_backend_query_tpm(drv); =20 if (!cur_item) { head =3D cur_item =3D info; --=20 2.7.4 From nobody Fri Apr 26 23:06:14 2024 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 1493726091123245.3994637263312; Tue, 2 May 2017 04:54:51 -0700 (PDT) Received: from localhost ([::1]:58212 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WOH-0001tq-CF for importer@patchew.org; Tue, 02 May 2017 07:54:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WMd-0000mw-Dw for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5WMZ-00066B-1v for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:07 -0400 Received: from mga03.intel.com ([134.134.136.65]:28100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5WMY-0005ug-PV for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:02 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2017 04:53:02 -0700 Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by orsmga003.jf.intel.com with ESMTP; 02 May 2017 04:53:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,405,1488873600"; d="scan'208";a="963424724" From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Tue, 2 May 2017 14:52:47 +0300 Message-Id: <1493725969-19518-7-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493725969-19518-1-git-send-email-amarnath.valluri@intel.com> References: <1493725969-19518-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.65 Subject: [Qemu-devel] [PATCH v3 6/8] tpm-backend: Move realloc_buffer() implementation to base class 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 , patrick.ohly@intel.com, marcandre.lureau@gmail.com, stefanb@linux.vnet.ibm.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" Provide base implementation of realloc_buffer(), so that backend implementa= tions can resue. Signed-off-by: Amarnath Valluri --- backends/tpm.c | 9 ++++++++- hw/tpm/tpm_passthrough.c | 12 ------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/backends/tpm.c b/backends/tpm.c index 4a6358e..f048c1d 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -88,8 +88,15 @@ bool tpm_backend_had_startup_error(TPMBackend *s) size_t tpm_backend_realloc_buffer(TPMBackend *s, TPMSizedBuffer *sb) { TPMBackendClass *k =3D TPM_BACKEND_GET_CLASS(s); + if (!k->ops->realloc_buffer) { + size_t wanted_size =3D 4096; /* Linux tpm.c buffer size */ =20 - assert(k->ops->realloc_buffer); + if (sb->size !=3D wanted_size) { + sb->buffer =3D g_realloc(sb->buffer, wanted_size); + sb->size =3D wanted_size; + } + return sb->size; + } =20 return k->ops->realloc_buffer(sb); } diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 2efced1..a7da0f8 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -258,17 +258,6 @@ static bool tpm_passthrough_get_startup_error(TPMBacke= nd *tb) return tpm_pt->had_startup_error; } =20 -static size_t tpm_passthrough_realloc_buffer(TPMSizedBuffer *sb) -{ - size_t wanted_size =3D 4096; /* Linux tpm.c buffer size */ - - if (sb->size !=3D wanted_size) { - sb->buffer =3D g_realloc(sb->buffer, wanted_size); - sb->size =3D wanted_size; - } - return sb->size; -} - static void tpm_passthrough_cancel_cmd(TPMBackend *tb) { TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); @@ -470,7 +459,6 @@ static const TPMDriverOps tpm_passthrough_driver =3D { .opts =3D tpm_passthrough_cmdline_opts, .desc =3D tpm_passthrough_create_desc, .create =3D tpm_passthrough_create, - .realloc_buffer =3D tpm_passthrough_realloc_buffer, .reset =3D tpm_passthrough_reset, .had_startup_error =3D tpm_passthrough_get_startup_error, .cancel_cmd =3D tpm_passthrough_cancel_cmd, --=20 2.7.4 From nobody Fri Apr 26 23:06:14 2024 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 1493726310114746.4717482429414; Tue, 2 May 2017 04:58:30 -0700 (PDT) Received: from localhost ([::1]:58233 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WRn-00050w-Pf for importer@patchew.org; Tue, 02 May 2017 07:58:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WMf-0000od-Bq for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5WMe-0006As-0y for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:09 -0400 Received: from mga03.intel.com ([134.134.136.65]:28100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5WMd-0005ug-Ly for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:07 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2017 04:53:07 -0700 Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by orsmga003.jf.intel.com with ESMTP; 02 May 2017 04:53:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,405,1488873600"; d="scan'208";a="963424737" From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Tue, 2 May 2017 14:52:48 +0300 Message-Id: <1493725969-19518-8-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493725969-19518-1-git-send-email-amarnath.valluri@intel.com> References: <1493725969-19518-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.65 Subject: [Qemu-devel] [PATCH v3 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 , patrick.ohly@intel.com, marcandre.lureau@gmail.com, stefanb@linux.vnet.ibm.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 --- 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 a7da0f8..b00efd5 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 From nobody Fri Apr 26 23:06:14 2024 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 1493726309993565.2996844140623; Tue, 2 May 2017 04:58:29 -0700 (PDT) Received: from localhost ([::1]:58232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WRo-00050g-G7 for importer@patchew.org; Tue, 02 May 2017 07:58:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5WMm-0000v5-ET for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5WMh-0006Ec-WC for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:16 -0400 Received: from mga03.intel.com ([134.134.136.65]:28100) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d5WMh-0005ug-Do for qemu-devel@nongnu.org; Tue, 02 May 2017 07:53:11 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2017 04:53:07 -0700 Received: from avallurigigabyte.fi.intel.com ([10.237.72.170]) by orsmga003.jf.intel.com with ESMTP; 02 May 2017 04:53:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.37,405,1488873600"; d="scan'208";a="963424742" From: Amarnath Valluri To: qemu-devel@nongnu.org Date: Tue, 2 May 2017 14:52:49 +0300 Message-Id: <1493725969-19518-9-git-send-email-amarnath.valluri@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493725969-19518-1-git-send-email-amarnath.valluri@intel.com> References: <1493725969-19518-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.65 Subject: [Qemu-devel] [PATCH v3 8/8] tpm: Added support for TPM emulator 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 , patrick.ohly@intel.com, marcandre.lureau@gmail.com, stefanb@linux.vnet.ibm.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" This change introduces a new TPM backend driver that can communicate with swtpm(software TPM emulator) using unix domain socket interface. Swtpm uses two unix sockets, one for plain TPM commands and responses, and = one for out-of-band control messages. The swtpm and associated tools can be found here: https://github.com/stefanberger/swtpm Usage: # setup TPM state directory mkdir /tmp/mytpm chown -R tss:root /tmp/mytpm /usr/bin/swtpm_setup --tpm-state /tmp/mytpm --createek # Ask qemu to use TPM emulator with given tpm state directory qemu-system-x86_64 \ [...] \ -tpmdev emulator,id=3Dtpm0,tpmstatedir=3D/tmp/mytpm,logfile=3D/tmp/= swtpm.log \ -device tpm-tis,tpmdev=3Dtpm0 \ [...] Signed-off-by: Amarnath Valluri --- configure | 15 +- hmp.c | 21 ++ hw/tpm/Makefile.objs | 1 + hw/tpm/tpm_emulator.c | 943 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ hw/tpm/tpm_ioctl.h | 243 +++++++++++++ qapi-schema.json | 36 +- qemu-options.hx | 53 ++- tpm.c | 2 +- 8 files changed, 1305 insertions(+), 9 deletions(-) create mode 100644 hw/tpm/tpm_emulator.c create mode 100644 hw/tpm/tpm_ioctl.h diff --git a/configure b/configure index be4d326..a933ec7 100755 --- a/configure +++ b/configure @@ -3359,10 +3359,15 @@ fi ########################################## # TPM passthrough is only on x86 Linux =20 -if test "$targetos" =3D Linux && test "$cpu" =3D i386 -o "$cpu" =3D x86_64= ; then - tpm_passthrough=3D$tpm +if test "$targetos" =3D Linux; then + tpm_emulator=3D$tpm + if test "$cpu" =3D i386 -o "$cpu" =3D x86_64; then + tpm_passthrough=3D$tpm + else + tpm_passthrough=3Dno + fi else - tpm_passthrough=3Dno + tpm_emulator=3Dno fi =20 ########################################## @@ -5137,6 +5142,7 @@ echo "gcov enabled $gcov" echo "TPM support $tpm" echo "libssh2 support $libssh2" echo "TPM passthrough $tpm_passthrough" +echo "TPM emulator $tpm_emulator" echo "QOM debugging $qom_cast_debug" echo "lzo support $lzo" echo "snappy support $snappy" @@ -5716,6 +5722,9 @@ if test "$tpm" =3D "yes"; then if test "$tpm_passthrough" =3D "yes"; then echo "CONFIG_TPM_PASSTHROUGH=3Dy" >> $config_host_mak fi + if test "$tpm_emulator" =3D "yes"; then + echo "CONFIG_TPM_EMULATOR=3Dy" >> $config_host_mak + fi fi =20 echo "TRACE_BACKENDS=3D$trace_backends" >> $config_host_mak diff --git a/hmp.c b/hmp.c index 9caf7c8..e7fd426 100644 --- a/hmp.c +++ b/hmp.c @@ -937,6 +937,7 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) Error *err =3D NULL; unsigned int c =3D 0; TPMPassthroughOptions *tpo; + TPMEmulatorOptions *teo; =20 info_list =3D qmp_query_tpm(&err); if (err) { @@ -966,6 +967,26 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) tpo->has_cancel_path ? ",cancel-path=3D" : "", tpo->has_cancel_path ? tpo->cancel_path : ""); break; + case TPM_TYPE_EMULATOR: + teo =3D (TPMEmulatorOptions *)(ti->options); + monitor_printf(mon, ",tmpstatedir=3D%s", teo->tpmstatedir); + monitor_printf(mon, ",spawn=3D%s", teo->spawn ? "on" : "off"); + if (teo->has_path) { + monitor_printf(mon, ",path=3D%s", teo->path); + } + if (teo->has_data_path) { + monitor_printf(mon, ",data-path=3D%s", teo->data_path); + } + if (teo->has_ctrl_path) { + monitor_printf(mon, ",ctrl-path=3D%s", teo->ctrl_path); + } + if (teo->has_logfile) { + monitor_printf(mon, ",logfile=3D%s", teo->logfile); + } + if (teo->has_loglevel) { + monitor_printf(mon, ",loglevel=3D%ld", teo->loglevel); + } + break; default: break; } diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs index 64cecc3..41f0b7a 100644 --- a/hw/tpm/Makefile.objs +++ b/hw/tpm/Makefile.objs @@ -1,2 +1,3 @@ common-obj-$(CONFIG_TPM_TIS) +=3D tpm_tis.o common-obj-$(CONFIG_TPM_PASSTHROUGH) +=3D tpm_passthrough.o tpm_util.o +common-obj-$(CONFIG_TPM_EMULATOR) +=3D tpm_emulator.o tpm_util.o diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c new file mode 100644 index 0000000..b480a53 --- /dev/null +++ b/hw/tpm/tpm_emulator.c @@ -0,0 +1,943 @@ +/* + * emulator TPM driver + * + * Copyright (c) 2017 Intel Corporation + * Author: Amarnath Valluri + * + * Copyright (c) 2010 - 2013 IBM Corporation + * Authors: + * Stefan Berger + * + * Copyright (C) 2011 IAIK, Graz University of Technology + * Author: Andreas Niederl + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + * + */ + +#include "qemu/osdep.h" +#include "qemu/error-report.h" +#include "qemu/sockets.h" +#include "io/channel-socket.h" +#include "sysemu/tpm_backend.h" +#include "tpm_int.h" +#include "hw/hw.h" +#include "hw/i386/pc.h" +#include "tpm_util.h" +#include "tpm_ioctl.h" +#include "qapi/error.h" + +#include +#include +#include +#include + +#define DEBUG_TPM 0 + +#define DPRINT(fmt, ...) do { \ + if (DEBUG_TPM) { \ + fprintf(stderr, fmt, ## __VA_ARGS__); \ + } \ +} while (0); + +#define DPRINTF(fmt, ...) DPRINT("tpm-emulator: "fmt"\n", __VA_ARGS__) + +#define TYPE_TPM_EMULATOR "tpm-emulator" +#define TPM_EMULATOR(obj) \ + OBJECT_CHECK(TPMEmulator, (obj), TYPE_TPM_EMULATOR) + +static const TPMDriverOps tpm_emulator_driver; + +/* data structures */ +typedef struct TPMEmulator { + TPMBackend parent; + + TPMEmulatorOptions *ops; + QIOChannel *data_ioc; + QIOChannel *ctrl_ioc; + bool op_executing; + bool op_canceled; + bool child_running; + TPMVersion tpm_version; + ptm_cap caps; /* capabilities of the TPM */ + uint8_t cur_locty_number; /* last set locality */ + QemuMutex state_lock; +} TPMEmulator; + +#define TPM_DEFAULT_EMULATOR "swtpm" +#define TPM_DEFAULT_LOGLEVEL 5 +#define TPM_EMULATOR_PIDFILE "/tmp/qemu-tpm.pid" +#define TPM_EMULATOR_IMPLEMENTS_ALL_CAPS(S, cap) (((S)->caps & (cap)) =3D= =3D (cap)) + +static int tpm_emulator_ctrlcmd(QIOChannel *ioc, unsigned long cmd, void *= msg, + size_t msg_len_in, size_t msg_len_out) +{ + ssize_t n; + + uint32_t cmd_no =3D cpu_to_be32(cmd); + struct iovec iov[2] =3D { + { .iov_base =3D &cmd_no, .iov_len =3D sizeof(cmd_no), }, + { .iov_base =3D msg, .iov_len =3D msg_len_in, }, + }; + + n =3D qio_channel_writev(ioc, iov, 2, NULL); + if (n > 0) { + if (msg_len_out > 0) { + n =3D qio_channel_read(ioc, (char *)msg, msg_len_out, NULL); + /* simulate ioctl return value */ + if (n > 0) { + n =3D 0; + } + } else { + n =3D 0; + } + } + return n; +} + +static int tpm_emulator_unix_tx_bufs(TPMEmulator *tpm_pt, + const uint8_t *in, uint32_t in_len, + uint8_t *out, uint32_t out_len, + bool *selftest_done) +{ + ssize_t ret; + bool is_selftest; + const struct tpm_resp_hdr *hdr; + + if (!tpm_pt->child_running) { + return -1; + } + + tpm_pt->op_canceled =3D false; + tpm_pt->op_executing =3D true; + *selftest_done =3D false; + + is_selftest =3D tpm_util_is_selftest(in, in_len); + + ret =3D qio_channel_write(tpm_pt->data_ioc, (const char *)in, (size_t)= in_len, + NULL); + if (ret !=3D in_len) { + if (!tpm_pt->op_canceled || errno !=3D ECANCELED) { + error_report("tpm-emulator: error while transmitting data " + "to TPM: %s (%i)", strerror(errno), errno); + } + goto err_exit; + } + + tpm_pt->op_executing =3D false; + + ret =3D qio_channel_read(tpm_pt->data_ioc, (char *)out, (size_t)out_le= n, + NULL); + if (ret < 0) { + if (!tpm_pt->op_canceled || errno !=3D ECANCELED) { + error_report("tpm-emulator: error while reading data from " + "TPM: %s (%i)", strerror(errno), errno); + } + } else if (ret < sizeof(struct tpm_resp_hdr) || + be32_to_cpu(((struct tpm_resp_hdr *)out)->len) !=3D ret) { + ret =3D -1; + error_report("tpm-emulator: received invalid response " + "packet from TPM"); + } + + if (is_selftest && (ret >=3D sizeof(struct tpm_resp_hdr))) { + hdr =3D (struct tpm_resp_hdr *)out; + *selftest_done =3D (be32_to_cpu(hdr->errcode) =3D=3D 0); + } + +err_exit: + if (ret < 0) { + tpm_util_write_fatal_error_response(out, out_len); + } + + tpm_pt->op_executing =3D false; + + return ret; +} + +static int tpm_emulator_set_locality(TPMEmulator *tpm_pt, + uint8_t locty_number) +{ + ptm_loc loc; + + if (!tpm_pt->child_running) { + return -1; + } + + DPRINTF("%s : locality: 0x%x", __func__, locty_number); + + if (tpm_pt->cur_locty_number !=3D locty_number) { + DPRINTF("setting locality : 0x%x", locty_number); + loc.u.req.loc =3D locty_number; + if (tpm_emulator_ctrlcmd(tpm_pt->ctrl_ioc, CMD_SET_LOCALITY, &loc, + sizeof(loc), sizeof(loc)) < 0) { + error_report("tpm-emulator: could not set locality : %s", + strerror(errno)); + return -1; + } + loc.u.resp.tpm_result =3D be32_to_cpu(loc.u.resp.tpm_result); + if (loc.u.resp.tpm_result !=3D 0) { + error_report("tpm-emulator: TPM result for set locality : 0x%x= ", + loc.u.resp.tpm_result); + return -1; + } + tpm_pt->cur_locty_number =3D locty_number; + } + return 0; +} + +static void tpm_emulator_handle_request(TPMBackend *tb, TPMBackendCmd cmd) +{ + TPMEmulator *tpm_pt =3D TPM_EMULATOR(tb); + TPMLocality *locty =3D NULL; + bool selftest_done =3D false; + + DPRINTF("processing command type %d", cmd); + + switch (cmd) { + case TPM_BACKEND_CMD_PROCESS_CMD: + qemu_mutex_lock(&tpm_pt->state_lock); + locty =3D tb->tpm_state->locty_data; + if (tpm_emulator_set_locality(tpm_pt, + tb->tpm_state->locty_number) < 0) { + tpm_util_write_fatal_error_response(locty->r_buffer.buffer, + locty->r_buffer.size); + } else { + tpm_emulator_unix_tx_bufs(tpm_pt, locty->w_buffer.buffer, + locty->w_offset, locty->r_buffer.buffer, + locty->r_buffer.size, &selftest_done); + } + tb->recv_data_callback(tb->tpm_state, tb->tpm_state->locty_number, + selftest_done); + qemu_mutex_unlock(&tpm_pt->state_lock); + break; + case TPM_BACKEND_CMD_INIT: + case TPM_BACKEND_CMD_END: + case TPM_BACKEND_CMD_TPM_RESET: + /* nothing to do */ + break; + } +} + +/* + * Gracefully shut down the external unixio TPM + */ +static void tpm_emulator_shutdown(TPMEmulator *tpm_pt) +{ + ptm_res res; + + if (!tpm_pt->child_running) { + return; + } + + if (tpm_emulator_ctrlcmd(tpm_pt->ctrl_ioc, CMD_SHUTDOWN, &res, 0, + sizeof(res)) < 0) { + error_report("tpm-emulator: Could not cleanly shutdown the TPM: %s= ", + strerror(errno)); + } else if (res !=3D 0) { + error_report("tpm-emulator: TPM result for sutdown: 0x%x", + be32_to_cpu(res)); + } +} + +static int tpm_emulator_probe_caps(TPMEmulator *tpm_pt) +{ + if (!tpm_pt->child_running) { + return -1; + } + + DPRINTF("%s", __func__); + if (tpm_emulator_ctrlcmd(tpm_pt->ctrl_ioc, CMD_GET_CAPABILITY, + &tpm_pt->caps, 0, sizeof(tpm_pt->caps)) < 0) { + error_report("tpm-emulator: probing failed : %s", strerror(errno)); + return -1; + } + + tpm_pt->caps =3D be64_to_cpu(tpm_pt->caps); + + DPRINTF("capbilities : 0x%lx", tpm_pt->caps); + + return 0; +} + +static int tpm_emulator_check_caps(TPMEmulator *tpm_pt) +{ + ptm_cap caps =3D 0; + const char *tpm =3D NULL; + + /* check for min. required capabilities */ + switch (tpm_pt->tpm_version) { + case TPM_VERSION_1_2: + caps =3D PTM_CAP_INIT | PTM_CAP_SHUTDOWN | PTM_CAP_GET_TPMESTABLIS= HED | + PTM_CAP_SET_LOCALITY; + tpm =3D "1.2"; + break; + case TPM_VERSION_2_0: + caps =3D PTM_CAP_INIT | PTM_CAP_SHUTDOWN | PTM_CAP_GET_TPMESTABLIS= HED | + PTM_CAP_SET_LOCALITY | PTM_CAP_RESET_TPMESTABLISHED; + tpm =3D "2"; + break; + case TPM_VERSION_UNSPEC: + error_report("tpm-emulator: TPM version has not been set"); + return -1; + } + + if (!TPM_EMULATOR_IMPLEMENTS_ALL_CAPS(tpm_pt, caps)) { + error_report("tpm-emulator: TPM does not implement minimum set of " + "required capabilities for TPM %s (0x%x)", tpm, (int)= caps); + return -1; + } + + return 0; +} + +static int tpm_emulator_init_tpm(TPMEmulator *tpm_pt) +{ + ptm_init init; + ptm_res res; + + if (!tpm_pt->child_running) { + return -1; + } + + DPRINTF("%s", __func__); + if (tpm_emulator_ctrlcmd(tpm_pt->ctrl_ioc, CMD_INIT, &init, sizeof(ini= t), + sizeof(init)) < 0) { + error_report("tpm-emulator: could not send INIT: %s", + strerror(errno)); + return -1; + } + + res =3D be32_to_cpu(init.u.resp.tpm_result); + if (res) { + error_report("tpm-emulator: TPM result for CMD_INIT: 0x%x", res); + return -1; + } + + return 0; +} + +static int tpm_emulator_startup_tpm(TPMBackend *tb) +{ + TPMEmulator *tpm_pt =3D TPM_EMULATOR(tb); + + DPRINTF("%s", __func__); + + tpm_emulator_init_tpm(tpm_pt) ; + + return 0; +} + +static bool tpm_emulator_get_tpm_established_flag(TPMBackend *tb) +{ + TPMEmulator *tpm_pt =3D TPM_EMULATOR(tb); + ptm_est est; + + DPRINTF("%s", __func__); + if (tpm_emulator_ctrlcmd(tpm_pt->ctrl_ioc, CMD_GET_TPMESTABLISHED, &es= t, 0, + sizeof(est)) < 0) { + error_report("tpm-emulator: Could not get the TPM established flag= : %s", + strerror(errno)); + return false; + } + DPRINTF("established flag: %0x", est.u.resp.bit); + + return (est.u.resp.bit !=3D 0); +} + +static int tpm_emulator_reset_tpm_established_flag(TPMBackend *tb, + uint8_t locty) +{ + TPMEmulator *tpm_pt =3D TPM_EMULATOR(tb); + ptm_reset_est reset_est; + ptm_res res; + + /* only a TPM 2.0 will support this */ + if (tpm_pt->tpm_version =3D=3D TPM_VERSION_2_0) { + reset_est.u.req.loc =3D tpm_pt->cur_locty_number; + + if (tpm_emulator_ctrlcmd(tpm_pt->ctrl_ioc, CMD_RESET_TPMESTABLISHE= D, + &reset_est, sizeof(reset_est), + sizeof(reset_est)) < 0) { + error_report("tpm-emulator: Could not reset the establishment = bit: " + "%s", strerror(errno)); + return -1; + } + + res =3D be32_to_cpu(reset_est.u.resp.tpm_result); + if (res) { + error_report("tpm-emulator: TPM result for rest establixhed fl= ag: " + "0x%x", res); + return -1; + } + } + + return 0; +} + +static bool tpm_emulator_had_startup_error(TPMBackend *tb) +{ + TPMEmulator *tpm_pt =3D TPM_EMULATOR(tb); + + return !tpm_pt->child_running; +} + +static void tpm_emulator_cancel_cmd(TPMBackend *tb) +{ + TPMEmulator *tpm_pt =3D TPM_EMULATOR(tb); + ptm_res res; + + /* + * As of Linux 3.7 the tpm_tis driver does not properly cancel + * commands on all TPM manufacturers' TPMs. + * Only cancel if we're busy so we don't cancel someone else's + * command, e.g., a command executed on the host. + */ + if (tpm_pt->op_executing) { + if (TPM_EMULATOR_IMPLEMENTS_ALL_CAPS(tpm_pt, PTM_CAP_CANCEL_TPM_CM= D)) { + if (tpm_emulator_ctrlcmd(tpm_pt->ctrl_ioc, CMD_CANCEL_TPM_CMD,= &res, + 0, sizeof(res)) < 0) { + error_report("tpm-emulator: Could not cancel command: %s", + strerror(errno)); + } else if (res !=3D 0) { + error_report("tpm-emulator: Failed to cancel TPM: 0x%x", + be32_to_cpu(res)); + } else { + tpm_pt->op_canceled =3D true; + } + } + } +} + +static void tpm_emulator_reset(TPMBackend *tb) +{ + DPRINTF("%s", __func__); + + tpm_emulator_cancel_cmd(tb); +} + +static const char *tpm_emulator_desc(void) +{ + return "TPM emulator backend driver"; +} + +static TPMVersion tpm_emulator_get_tpm_version(TPMBackend *tb) +{ + TPMEmulator *tpm_pt =3D TPM_EMULATOR(tb); + + return tpm_pt->tpm_version; +} + +static gboolean tpm_emulator_fd_handler(QIOChannel *ioc, GIOCondition cnd, + void *opaque) +{ + TPMEmulator *tpm_pt =3D opaque; + + if (cnd & G_IO_ERR || cnd & G_IO_HUP) { + error_report("TPM backend disappeared"); + tpm_pt->child_running =3D false; + return false; + } + + return true; +} + +static QIOChannel *_iochannel_new(const char *path, int fd, Error **err) +{ + int socket =3D path ? unix_connect(path, err) : fd; + if (socket < 0) { + return NULL; + } + + return QIO_CHANNEL(qio_channel_socket_new_fd(socket, err)); +} + +static int tpm_emulator_spawn_emulator(TPMEmulator *tpm_pt) +{ + int fds[2] =3D { -1, -1 }; + int ctrl_fds[2] =3D { -1, -1 }; + pid_t cpid; + + if (!tpm_pt->ops->has_data_path) { + if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds) < 0) { + return -1; + } + } + + if (!tpm_pt->ops->has_ctrl_path) { + if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, ctrl_fds) < 0) { + if (!tpm_pt->ops->has_data_path) { + closesocket(fds[0]); + closesocket(fds[1]); + } + return -1; + } + } + + cpid =3D qemu_fork(NULL); + if (cpid < 0) { + error_report("tpm-emulator: Fork failure: %s", strerror(errno)); + if (!tpm_pt->ops->has_data_path) { + closesocket(fds[0]); + closesocket(fds[1]); + } + if (!tpm_pt->ops->has_ctrl_path) { + closesocket(ctrl_fds[0]); + closesocket(ctrl_fds[1]); + } + return -1; + } + + unlink(TPM_EMULATOR_PIDFILE); + + if (cpid =3D=3D 0) { /* CHILD */ + enum { + PARAM_PATH, + PARAM_IFACE, + PARAM_SERVER, PARAM_SERVER_ARGS, + PARAM_CTRL, PARAM_CTRL_ARGS, + PARAM_STATE, PARAM_STATE_ARGS, + PARAM_PIDFILE, PARAM_PIDFILE_ARGS, + PARAM_LOG, PARAM_LOG_ARGS, + PARAM_MAX + }; + + int i; + int data_fd =3D -1, ctrl_fd =3D -1; + char *argv[PARAM_MAX + 1]; + + /* close all unused inherited sockets */ + if (fds[0] >=3D 0) { + closesocket(fds[0]); + } + if (ctrl_fds[0] >=3D 0) { + closesocket(ctrl_fds[0]); + } + + i =3D STDERR_FILENO + 1; + if (fds[1] >=3D 0) { + data_fd =3D dup2(fds[1], i++); + if (data_fd < 0) { + error_report("tpm-emulator: dup2() failure - %s", + strerror(errno)); + goto exit_child; + } + } + if (ctrl_fds[1] >=3D 0) { + ctrl_fd =3D dup2(ctrl_fds[1], i++); + if (ctrl_fd < 0) { + error_report("tpm-emulator: dup2() failure - %s", + strerror(errno)); + goto exit_child; + } + } + for ( ; i < sysconf(_SC_OPEN_MAX); i++) { + close(i); + } + + argv[PARAM_MAX] =3D NULL; + argv[PARAM_PATH] =3D g_strdup(tpm_pt->ops->path); + argv[PARAM_IFACE] =3D g_strdup("socket"); + if (tpm_pt->ops->has_data_path) { + argv[PARAM_SERVER] =3D g_strdup("--server"); + argv[PARAM_SERVER_ARGS] =3D g_strdup_printf("type=3Dunixio,pat= h=3D%s", + tpm_pt->ops->data_path); + } else { + argv[PARAM_SERVER] =3D g_strdup("--fd"); + argv[PARAM_SERVER_ARGS] =3D g_strdup_printf("%d", data_fd); + } + + argv[PARAM_CTRL] =3D g_strdup("--ctrl"); + if (tpm_pt->ops->has_ctrl_path) { + argv[PARAM_CTRL_ARGS] =3D g_strdup_printf("type=3Dunixio,path= =3D%s", + tpm_pt->ops->ctrl_path= ); + } else { + argv[PARAM_CTRL_ARGS] =3D g_strdup_printf("type=3Dunixio,clien= tfd=3D%d", + ctrl_fd); + } + + argv[PARAM_STATE] =3D g_strdup("--tpmstate"); + argv[PARAM_STATE_ARGS] =3D g_strdup_printf("dir=3D%s", + tpm_pt->ops->tpmstatedir); + argv[PARAM_PIDFILE] =3D g_strdup("--pid"); + argv[PARAM_PIDFILE_ARGS] =3D g_strdup_printf("file=3D%s", + TPM_EMULATOR_PIDFILE); + if (tpm_pt->ops->has_logfile) { + argv[PARAM_LOG] =3D g_strdup("--log"); + argv[PARAM_LOG_ARGS] =3D g_strdup_printf("file=3D%s,level=3D%d= ", + tpm_pt->ops->logfile, (int)tpm_pt->ops->loglevel); + } else { + /* truncate logs */ + argv[PARAM_LOG] =3D NULL; + } + DPRINTF("%s", "Running cmd: ") + for (i =3D 0; argv[i]; i++) { + DPRINT(" %s", argv[i]) + } + DPRINT("\n") + if (execv(tpm_pt->ops->path, (char * const *)argv) < 0) { + error_report("execv() failure : %s", strerror(errno)); + } + +exit_child: + g_strfreev(argv); + if (data_fd >=3D 0) { + closesocket(data_fd); + } + if (ctrl_fd >=3D 0) { + closesocket(ctrl_fd); + } + + _exit(1); + } else { /* self */ + struct stat st; + DPRINTF("child pid: %d", cpid); + int rc; + useconds_t usec =3D 100 * 1000L; /* wait for 100 milliseconds */ + useconds_t timeout =3D 10; /* max 1 second */ + + /* close unused sockets */ + if (fds[1] >=3D 0) { + closesocket(fds[1]); + } + if (ctrl_fds[1] >=3D 0) { + closesocket(ctrl_fds[1]); + } + + tpm_pt->data_ioc =3D _iochannel_new(tpm_pt->ops->data_path, fds[0]= , NULL); + if (!tpm_pt->data_ioc) { + error_report("tpm-emulator: Unable to connect socket : %s", + tpm_pt->ops->data_path); + goto err_kill_child; + } + + tpm_pt->ctrl_ioc =3D _iochannel_new(tpm_pt->ops->ctrl_path, ctrl_f= ds[0], + NULL); + if (!tpm_pt->ctrl_ioc) { + error_report("tpm-emulator: Unable to connect socket : %s", + tpm_pt->ops->ctrl_path); + goto err_kill_child; + } + + qemu_add_child_watch(cpid); + + qio_channel_add_watch(tpm_pt->data_ioc, G_IO_HUP | G_IO_ERR, + tpm_emulator_fd_handler, tpm_pt, NULL); + + while ((rc =3D stat(TPM_EMULATOR_PIDFILE, &st)) < 0 && timeout--) { + usleep(usec); + } + + if (timeout =3D=3D -1) { + error_report("tpm-emulator: pid file not ready: %s", + strerror(errno)); + goto err_kill_child; + } + + /* check if child really running */ + if (kill(cpid, 0) < 0 && errno =3D=3D ESRCH) { + goto err_no_child; + } + + tpm_pt->child_running =3D true; + } + + return 0; + +err_kill_child: + kill(cpid, SIGTERM); + /* wait for 10 mill-seconds */ + usleep(10 * 1000); + /* force kill if still reachable */ + if (kill(cpid, 0) =3D=3D 0) { + kill(cpid, SIGKILL); + } + +err_no_child: + tpm_pt->child_running =3D false; + + return -1; +} + +static int tpm_emulator_handle_device_opts(TPMEmulator *tpm_pt, QemuOpts *= opts) +{ + const char *value; + + value =3D qemu_opt_get(opts, "tpmstatedir"); + if (!value) { + error_report("tpm-emulator: Missing tpm state directory"); + return -1; + } + tpm_pt->ops->tpmstatedir =3D g_strdup(value); + + tpm_pt->ops->spawn =3D qemu_opt_get_bool(opts, "spawn", false); + + value =3D qemu_opt_get(opts, "path"); + if (!value) { + value =3D TPM_DEFAULT_EMULATOR; + tpm_pt->ops->has_path =3D false; + } else { + tpm_pt->ops->has_path =3D true; + if (value[0] =3D=3D '/') { + struct stat st; + if (stat(value, &st) < 0 || !(S_ISREG(st.st_mode) + || S_ISLNK(st.st_mode))) { + error_report("tpm-emulator: Invalid emulator path: %s", va= lue); + return -1; + } + } + } + tpm_pt->ops->path =3D g_strdup(value); + + value =3D qemu_opt_get(opts, "data-path"); + if (value) { + tpm_pt->ops->has_data_path =3D true; + tpm_pt->ops->data_path =3D g_strdup(value); + } else { + tpm_pt->ops->has_data_path =3D false; + if (!tpm_pt->ops->spawn) { + error_report("tpm-emulator: missing mandatory data-path"); + return -1; + } + } + + value =3D qemu_opt_get(opts, "ctrl-path"); + if (value) { + tpm_pt->ops->has_ctrl_path =3D true; + tpm_pt->ops->ctrl_path =3D g_strdup(value); + } else { + tpm_pt->ops->has_ctrl_path =3D false; + if (!tpm_pt->ops->spawn) { + error_report("tpm-emulator: missing mandatory ctrl-path"); + return -1; + } + } + + value =3D qemu_opt_get(opts, "logfile"); + if (value) { + tpm_pt->ops->has_logfile =3D true; + tpm_pt->ops->logfile =3D g_strdup(value); + tpm_pt->ops->loglevel =3D qemu_opt_get_number(opts, "loglevel", + TPM_DEFAULT_LOGLEVEL); + tpm_pt->ops->has_loglevel =3D tpm_pt->ops->loglevel !=3D + TPM_DEFAULT_LOGLEVEL; + } + + if (tpm_pt->ops->spawn) { + if (tpm_emulator_spawn_emulator(tpm_pt) < 0) { + goto err_close_dev; + } + } else { + tpm_pt->data_ioc =3D _iochannel_new(tpm_pt->ops->data_path, -1, NU= LL); + if (tpm_pt->data_ioc =3D=3D NULL) { + error_report("tpm-emulator: Failed to connect data socket: %s", + tpm_pt->ops->data_path); + goto err_close_dev; + } + tpm_pt->ctrl_ioc =3D _iochannel_new(tpm_pt->ops->ctrl_path, -1, NU= LL); + if (tpm_pt->ctrl_ioc =3D=3D NULL) { + DPRINTF("Failed to connect control socket: %s", + strerror(errno)); + goto err_close_dev; + } + tpm_pt->child_running =3D true; + } + + /* FIXME: tpm_util_test_tpmdev() accepts only on socket fd, as it also= used + * by passthrough driver, which not yet using GIOChannel. + */ + if (tpm_util_test_tpmdev(QIO_CHANNEL_SOCKET(tpm_pt->data_ioc)->fd, + &tpm_pt->tpm_version)) { + error_report("'%s' is not emulating TPM device.", tpm_pt->ops->pat= h); + goto err_close_dev; + } + + DPRINTF("TPM Version %s", tpm_pt->tpm_version =3D=3D TPM_VERSION_1_2 ?= "1.2" : + (tpm_pt->tpm_version =3D=3D TPM_VERSION_2_0 ? "2.0" : "Unspe= cified")); + + if (tpm_emulator_probe_caps(tpm_pt) || + tpm_emulator_check_caps(tpm_pt)) { + goto err_close_dev; + } + + return 0; + +err_close_dev: + DPRINT("Startup error\n"); + return -1; +} + +static TPMBackend *tpm_emulator_create(QemuOpts *opts, const char *id) +{ + TPMBackend *tb =3D TPM_BACKEND(object_new(TYPE_TPM_EMULATOR)); + + tb->id =3D g_strdup(id); + + if (tpm_emulator_handle_device_opts(TPM_EMULATOR(tb), opts)) { + goto err_exit; + } + + return tb; + +err_exit: + object_unref(OBJECT(tb)); + + return NULL; +} + +static TPMOptions *tpm_emulator_get_tpm_options(TPMBackend *tb) +{ + TPMEmulator *tpm_pt =3D TPM_EMULATOR(tb); + TPMEmulatorOptions *ops =3D g_new0(TPMEmulatorOptions, 1); + + if (!ops) { + return NULL; + } + DPRINTF("%s", __func__); + + ops->tpmstatedir =3D g_strdup(tpm_pt->ops->tpmstatedir); + ops->spawn =3D tpm_pt->ops->spawn; + if (tpm_pt->ops->has_path) { + ops->has_path =3D true; + ops->path =3D g_strdup(tpm_pt->ops->path); + } + if (tpm_pt->ops->has_data_path) { + ops->has_data_path =3D true; + ops->data_path =3D g_strdup(tpm_pt->ops->data_path); + } + if (tpm_pt->ops->has_ctrl_path) { + ops->has_ctrl_path =3D true; + ops->ctrl_path =3D g_strdup(tpm_pt->ops->ctrl_path); + } + if (tpm_pt->ops->has_logfile) { + ops->has_logfile =3D true; + ops->logfile =3D g_strdup(tpm_pt->ops->logfile); + } + if (tpm_pt->ops->has_loglevel) { + ops->has_loglevel =3D true; + ops->loglevel =3D tpm_pt->ops->loglevel; + } + + return (TPMOptions *)ops; +} + +static const QemuOptDesc tpm_emulator_cmdline_opts[] =3D { + TPM_STANDARD_CMDLINE_OPTS, + { + .name =3D "tpmstatedir", + .type =3D QEMU_OPT_STRING, + .help =3D "TPM state directroy", + }, + { + .name =3D "spawn", + .type =3D QEMU_OPT_BOOL, + .help =3D "Wether to spwan given emlatory binary", + }, + { + .name =3D "path", + .type =3D QEMU_OPT_STRING, + .help =3D "Path to TPM emulator binary", + }, + { + .name =3D "data-path", + .type =3D QEMU_OPT_STRING, + .help =3D "Socket path to use for data exhange", + }, + { + .name =3D "ctrl-path", + .type =3D QEMU_OPT_STRING, + .help =3D "Socket path to use for out-of-band control messages", + }, + { + .name =3D "logfile", + .type =3D QEMU_OPT_STRING, + .help =3D "Path to log file", + }, + { + .name =3D "level", + .type =3D QEMU_OPT_STRING, + .help =3D "Log level number", + }, + { /* end of list */ }, +}; + +static const TPMDriverOps tpm_emulator_driver =3D { + .type =3D TPM_TYPE_EMULATOR, + .opts =3D tpm_emulator_cmdline_opts, + .desc =3D tpm_emulator_desc, + .create =3D tpm_emulator_create, + .startup_tpm =3D tpm_emulator_startup_tpm, + .reset =3D tpm_emulator_reset, + .had_startup_error =3D tpm_emulator_had_startup_error, + .cancel_cmd =3D tpm_emulator_cancel_cmd, + .get_tpm_established_flag =3D tpm_emulator_get_tpm_established_flag, + .reset_tpm_established_flag =3D tpm_emulator_reset_tpm_established_fla= g, + .get_tpm_version =3D tpm_emulator_get_tpm_version, + .get_tpm_options =3D tpm_emulator_get_tpm_options, +}; + +static void tpm_emulator_inst_init(Object *obj) +{ + TPMEmulator *tpm_pt =3D TPM_EMULATOR(obj); + + DPRINTF("%s", __func__); + tpm_pt->ops =3D g_new0(TPMEmulatorOptions, 1); + tpm_pt->data_ioc =3D tpm_pt->ctrl_ioc =3D NULL; + tpm_pt->op_executing =3D tpm_pt->op_canceled =3D false; + tpm_pt->child_running =3D false; + tpm_pt->cur_locty_number =3D ~0; + qemu_mutex_init(&tpm_pt->state_lock); +} + +static void tpm_emulator_inst_finalize(Object *obj) +{ + TPMEmulator *tpm_pt =3D TPM_EMULATOR(obj); + + tpm_emulator_cancel_cmd(TPM_BACKEND(obj)); + tpm_emulator_shutdown(tpm_pt); + + if (tpm_pt->data_ioc) { + qio_channel_close(tpm_pt->data_ioc, NULL); + } + if (tpm_pt->ctrl_ioc) { + qio_channel_close(tpm_pt->ctrl_ioc, NULL); + } + if (tpm_pt->ops) { + qapi_free_TPMEmulatorOptions(tpm_pt->ops); + } +} + +static void tpm_emulator_class_init(ObjectClass *klass, void *data) +{ + TPMBackendClass *tbc =3D TPM_BACKEND_CLASS(klass); + tbc->ops =3D &tpm_emulator_driver; + tbc->handle_request =3D tpm_emulator_handle_request; +} + +static const TypeInfo tpm_emulator_info =3D { + .name =3D TYPE_TPM_EMULATOR, + .parent =3D TYPE_TPM_BACKEND, + .instance_size =3D sizeof(TPMEmulator), + .class_init =3D tpm_emulator_class_init, + .instance_init =3D tpm_emulator_inst_init, + .instance_finalize =3D tpm_emulator_inst_finalize, +}; + +static void tpm_emulator_register(void) +{ + type_register_static(&tpm_emulator_info); + tpm_register_driver(&tpm_emulator_driver); +} + +type_init(tpm_emulator_register) diff --git a/hw/tpm/tpm_ioctl.h b/hw/tpm/tpm_ioctl.h new file mode 100644 index 0000000..af49708 --- /dev/null +++ b/hw/tpm/tpm_ioctl.h @@ -0,0 +1,243 @@ +/* + * tpm_ioctl.h + * + * (c) Copyright IBM Corporation 2014, 2015. + * + * This file is licensed under the terms of the 3-clause BSD license + */ +#ifndef _TPM_IOCTL_H_ +#define _TPM_IOCTL_H_ + +#include +#include +#include +#include + +/* + * Every response from a command involving a TPM command execution must ho= ld + * the ptm_res as the first element. + * ptm_res corresponds to the error code of a command executed by the TPM. + */ + +typedef uint32_t ptm_res; + +/* PTM_GET_TPMESTABLISHED: get the establishment bit */ +struct ptm_est { + union { + struct { + ptm_res tpm_result; + unsigned char bit; /* TPM established bit */ + } resp; /* response */ + } u; +}; + +/* PTM_RESET_TPMESTABLISHED: reset establishment bit */ +struct ptm_reset_est { + union { + struct { + uint8_t loc; /* locality to use */ + } req; /* request */ + struct { + ptm_res tpm_result; + } resp; /* response */ + } u; +}; + +/* PTM_INIT */ +struct ptm_init { + union { + struct { + uint32_t init_flags; /* see definitions below */ + } req; /* request */ + struct { + ptm_res tpm_result; + } resp; /* response */ + } u; +}; + +/* above init_flags */ +#define PTM_INIT_FLAG_DELETE_VOLATILE (1 << 0) + /* delete volatile state file after reading it */ + +/* PTM_SET_LOCALITY */ +struct ptm_loc { + union { + struct { + uint8_t loc; /* locality to set */ + } req; /* request */ + struct { + ptm_res tpm_result; + } resp; /* response */ + } u; +}; + +/* PTM_HASH_DATA: hash given data */ +struct ptm_hdata { + union { + struct { + uint32_t length; + uint8_t data[4096]; + } req; /* request */ + struct { + ptm_res tpm_result; + } resp; /* response */ + } u; +}; + +/* + * size of the TPM state blob to transfer; x86_64 can handle 8k, + * ppc64le only ~7k; keep the response below a 4k page size + */ +#define PTM_STATE_BLOB_SIZE (3 * 1024) + +/* + * The following is the data structure to get state blobs from the TPM. + * If the size of the state blob exceeds the PTM_STATE_BLOB_SIZE, multiple= reads + * with this ioctl and with adjusted offset are necessary. All bytes + * must be transferred and the transfer is done once the last byte has been + * returned. + * It is possible to use the read() interface for reading the data; howeve= r, the + * first bytes of the state blob will be part of the response to the ioctl= (); a + * subsequent read() is only necessary if the total length (totlength) exc= eeds + * the number of received bytes. seek() is not supported. + */ +struct ptm_getstate { + union { + struct { + uint32_t state_flags; /* may be: PTM_STATE_FLAG_DECRYPTED */ + uint32_t type; /* which blob to pull */ + uint32_t offset; /* offset from where to read */ + } req; /* request */ + struct { + ptm_res tpm_result; + uint32_t state_flags; /* may be: PTM_STATE_FLAG_ENCRYPTED */ + uint32_t totlength; /* total length that will be transferred= */ + uint32_t length; /* number of bytes in following buffer */ + uint8_t data[PTM_STATE_BLOB_SIZE]; + } resp; /* response */ + } u; +}; + +/* TPM state blob types */ +#define PTM_BLOB_TYPE_PERMANENT 1 +#define PTM_BLOB_TYPE_VOLATILE 2 +#define PTM_BLOB_TYPE_SAVESTATE 3 + +/* state_flags above : */ +#define PTM_STATE_FLAG_DECRYPTED 1 /* on input: get decrypted state */ +#define PTM_STATE_FLAG_ENCRYPTED 2 /* on output: state is encrypted */ + +/* + * The following is the data structure to set state blobs in the TPM. + * If the size of the state blob exceeds the PTM_STATE_BLOB_SIZE, multiple + * 'writes' using this ioctl are necessary. The last packet is indicated + * by the length being smaller than the PTM_STATE_BLOB_SIZE. + * The very first packet may have a length indicator of '0' enabling + * a write() with all the bytes from a buffer. If the write() interface + * is used, a final ioctl with a non-full buffer must be made to indicate + * that all data were transferred (a write with 0 bytes would not work). + */ +struct ptm_setstate { + union { + struct { + uint32_t state_flags; /* may be PTM_STATE_FLAG_ENCRYPTED */ + uint32_t type; /* which blob to set */ + uint32_t length; /* length of the data; + use 0 on the first packet to + transfer using write() */ + uint8_t data[PTM_STATE_BLOB_SIZE]; + } req; /* request */ + struct { + ptm_res tpm_result; + } resp; /* response */ + } u; +}; + +/* + * PTM_GET_CONFIG: Data structure to get runtime configuration information + * such as which keys are applied. + */ +struct ptm_getconfig { + union { + struct { + ptm_res tpm_result; + uint32_t flags; + } resp; /* response */ + } u; +}; + +#define PTM_CONFIG_FLAG_FILE_KEY 0x1 +#define PTM_CONFIG_FLAG_MIGRATION_KEY 0x2 + + +typedef uint64_t ptm_cap; +typedef struct ptm_est ptm_est; +typedef struct ptm_reset_est ptm_reset_est; +typedef struct ptm_loc ptm_loc; +typedef struct ptm_hdata ptm_hdata; +typedef struct ptm_init ptm_init; +typedef struct ptm_getstate ptm_getstate; +typedef struct ptm_setstate ptm_setstate; +typedef struct ptm_getconfig ptm_getconfig; + +/* capability flags returned by PTM_GET_CAPABILITY */ +#define PTM_CAP_INIT (1) +#define PTM_CAP_SHUTDOWN (1 << 1) +#define PTM_CAP_GET_TPMESTABLISHED (1 << 2) +#define PTM_CAP_SET_LOCALITY (1 << 3) +#define PTM_CAP_HASHING (1 << 4) +#define PTM_CAP_CANCEL_TPM_CMD (1 << 5) +#define PTM_CAP_STORE_VOLATILE (1 << 6) +#define PTM_CAP_RESET_TPMESTABLISHED (1 << 7) +#define PTM_CAP_GET_STATEBLOB (1 << 8) +#define PTM_CAP_SET_STATEBLOB (1 << 9) +#define PTM_CAP_STOP (1 << 10) +#define PTM_CAP_GET_CONFIG (1 << 11) + +enum { + PTM_GET_CAPABILITY =3D _IOR('P', 0, ptm_cap), + PTM_INIT =3D _IOWR('P', 1, ptm_init), + PTM_SHUTDOWN =3D _IOR('P', 2, ptm_res), + PTM_GET_TPMESTABLISHED =3D _IOR('P', 3, ptm_est), + PTM_SET_LOCALITY =3D _IOWR('P', 4, ptm_loc), + PTM_HASH_START =3D _IOR('P', 5, ptm_res), + PTM_HASH_DATA =3D _IOWR('P', 6, ptm_hdata), + PTM_HASH_END =3D _IOR('P', 7, ptm_res), + PTM_CANCEL_TPM_CMD =3D _IOR('P', 8, ptm_res), + PTM_STORE_VOLATILE =3D _IOR('P', 9, ptm_res), + PTM_RESET_TPMESTABLISHED =3D _IOWR('P', 10, ptm_reset_est), + PTM_GET_STATEBLOB =3D _IOWR('P', 11, ptm_getstate), + PTM_SET_STATEBLOB =3D _IOWR('P', 12, ptm_setstate), + PTM_STOP =3D _IOR('P', 13, ptm_res), + PTM_GET_CONFIG =3D _IOR('P', 14, ptm_getconfig), +}; + +/* + * Commands used by the non-CUSE TPMs + * + * All messages container big-endian data. + * + * The return messages only contain the 'resp' part of the unions + * in the data structures above. Besides that the limits in the + * buffers above (ptm_hdata:u.req.data and ptm_get_state:u.resp.data + * and ptm_set_state:u.req.data) are 0xffffffff. + */ +enum { + CMD_GET_CAPABILITY =3D 1, + CMD_INIT, + CMD_SHUTDOWN, + CMD_GET_TPMESTABLISHED, + CMD_SET_LOCALITY, + CMD_HASH_START, + CMD_HASH_DATA, + CMD_HASH_END, + CMD_CANCEL_TPM_CMD, + CMD_STORE_VOLATILE, + CMD_RESET_TPMESTABLISHED, + CMD_GET_STATEBLOB, + CMD_SET_STATEBLOB, + CMD_STOP, + CMD_GET_CONFIG, +}; + +#endif /* _TPM_IOCTL_H */ diff --git a/qapi-schema.json b/qapi-schema.json index 764f731..17c2ae9 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -5114,10 +5114,12 @@ # An enumeration of TPM types # # @passthrough: TPM passthrough type +# @emulator: Software Emulator TPM type +# Since: 2.10 # # Since: 1.5 ## -{ 'enum': 'TpmType', 'data': [ 'passthrough' ] } +{ 'enum': 'TpmType', 'data': [ 'passthrough', 'emulator' ] } =20 ## # @query-tpm-types: @@ -5131,7 +5133,7 @@ # Example: # # -> { "execute": "query-tpm-types" } -# <- { "return": [ "passthrough" ] } +# <- { "return": [ "passthrough", "emulator" ] } # ## { 'command': 'query-tpm-types', 'returns': ['TpmType'] } @@ -5161,6 +5163,36 @@ { 'struct': 'TPMPassthroughOptions', 'base': 'TPMOptions', 'data': { '*path' : 'str', '*cancel-path' : 'str'} } =20 +## +# @TPMEmulatorOptions: +# +# Information about the TPM emulator +# +# @tpmstatedir: TPM emulator state directory +# @spawn: true if, qemu has to spawn a new emulator process with given @pa= th, +# otherwise it connects to already rinning emulator with given @da= ta-path +# and @ctrl-path sockets. (default: 'false') +# @path: TPM emulator binary path to spawn.(default: 'swtpm') +# @data-path: path of the unix socket to use for exchanging data messages,= if +# not provided socket pairs are used when @sapwn is true. +# @ctrl-path: path of the unix socket file to use for exchagning out-of-ba= nd +# control messages, if not provided socket pairs are used when +# @spawn is true. +# @logfile: file to use to place TPM emulator logs, if not provided loggin= g is +# disabled. +# @loglevel: optional log level number, loglevel is ignored if no logfile +# provided. (default: 5) +# +# Since: 2.10 +## +{ 'struct': 'TPMEmulatorOptions', 'base': 'TPMOptions', + 'data': { 'tpmstatedir' : 'str', + 'spawn': 'bool', + '*path': 'str', + '*data-path': 'str', + '*ctrl-path': 'str', + '*logfile': 'str', + '*loglevel': 'int' } } =20 ## # @TPMInfo: diff --git a/qemu-options.hx b/qemu-options.hx index 99af8ed..aae0de0 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2846,7 +2846,15 @@ DEF("tpmdev", HAS_ARG, QEMU_OPTION_tpmdev, \ "-tpmdev passthrough,id=3Did[,path=3Dpath][,cancel-path=3Dpath]\n" " use path to provide path to a character device; defau= lt is /dev/tpm0\n" " use cancel-path to provide path to TPM's cancel sysfs= entry; if\n" - " not provided it will be searched for in /sys/class/mi= sc/tpm?/device\n", + " not provided it will be searched for in /sys/class/mi= sc/tpm?/device\n" + "-tpmdev emulator,id=3Did,spawn=3Don|off,tpmstatedir=3Ddir[,path=3Demu= lator-path,data-path=3Dpath,ctrl-path=3Dpath,logfile=3Dpath,loglevel=3Dleve= l]\n" + " spawn=3Don|off controls spawning support\n" + " use tpmstatedir to provide path to the tpm state dirc= tory\n" + " use path to provide the emulator binary to launch; de= fault is 'swtpm'\n" + " use data-path to provide the socket path for exchangi= ng data messages\n" + " use ctrl-path to provide the socket path for sending = control messages to software emulator\n" + " use logfile to provide where to place the swtpm logs\= n" + " use loglevel to controls the swtpm log level\n", QEMU_ARCH_ALL) STEXI =20 @@ -2855,8 +2863,8 @@ The general form of a TPM device option is: =20 @item -tpmdev @var{backend} ,id=3D@var{id} [,@var{options}] @findex -tpmdev -Backend type must be: -@option{passthrough}. +Backend type must be either one of the following: +@option{passthrough}, @option{emulator}. =20 The specific backend type will determine the applicable options. The @code{-tpmdev} option creates the TPM backend and requires a @@ -2906,6 +2914,45 @@ To create a passthrough TPM use the following two op= tions: Note that the @code{-tpmdev} id is @code{tpm0} and is referenced by @code{tpmdev=3Dtpm0} in the device option. =20 +@item -tpmdev emulator, id=3D@var{id}, tpmstatedir=3D@var{path}, spawn=3D@= var{on|off}, path=3D@var{emulator-binary-path}, data-path=3D@var{path}, ctr= l-path=3D@var{path}, logfile=3D@var{path}, loglevel=3D@var{level} + +(Linux-host only) Enable access to a TPM emulator using unix domain socket= s. + +@option{tpmstatedir} specifies the tpm state directory + +@option{spawn} specifies if qemu should spawn new emulator process with gi= ven @option{path} + +@option{path} specifies the emulator binary path to use for spawning + +@option{data-path} optional socket path to use for exchanging TPM data wit= h emulator + +@option{ctrl-path} optional socket path to use for sending control data to= emulator + +@option{logfile} optional log file to use to place log messages + +@option{loglevel} specifies the log level to use + +To create TPM emulator backend device that spawns new swtpm binary and com= municate with socket pairs: +@example + +-tpmdev emulator,id=3Dtpm0,tpmstatedir=3D/tmp/my-tpm,spawn=3Don,path=3D/us= r/local/bin/swtpm,logfile=3D/tmp/qemu-tpm.log,loglevel=3D5 -device tpm-tis,= tpmdev=3Dtpm0 + +@end example + +To create TPM emulator backend device that spawns new swtpm binary and com= municate using unix file system sockets: +@example + +-tpmdev emulator,id=3Dtpm0,tpmstatedir=3D/tmp/my-tpm,spawn=3Don,path=3D/us= r/local/bin/swtpm,data-path=3D/tmp/swtpm-data.socket,ctrl-path=3D/tmp/swtpm= -ctrl.socket,logfile=3D/tmp/qemu-tpm.log,loglevel=3D5 -device tpm-tis,tpmde= v=3Dtpm0 + +@end example + +To create a TOM emulator backend device that connects to already running s= wtpm binary using file system sockets: +@example + +-tpmdev emulator,id=3Dtpm0,tpmstatedir=3D/tmp/my-tpm,spawn=3Doff,data-path= =3D/tmp/swtpm-data.socket,ctrl-path=3D/tmp/swtpm-ctrl.socket,logfile=3D/tmp= /qemu-tpm.log,loglevel=3D5 -device tpm-tis,tpmdev=3Dtpm0 + +@end example + @end table =20 ETEXI diff --git a/tpm.c b/tpm.c index 43d980e..ce07c40 100644 --- a/tpm.c +++ b/tpm.c @@ -25,7 +25,7 @@ static QLIST_HEAD(, TPMBackend) tpm_backends =3D =20 =20 #define TPM_MAX_MODELS 1 -#define TPM_MAX_DRIVERS 1 +#define TPM_MAX_DRIVERS 2 =20 static TPMDriverOps const *be_drivers[TPM_MAX_DRIVERS] =3D { NULL, --=20 2.7.4