From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etYYK-0003YY-6H for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etYYG-0008M2-6w for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:16 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:59332 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etYYG-0008LF-1L for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:12 -0500 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w27CpsxC107510 for ; Wed, 7 Mar 2018 07:52:11 -0500 Received: from e32.co.us.ibm.com (e32.co.us.ibm.com [32.97.110.150]) by mx0b-001b2d01.pphosted.com with ESMTP id 2gjdw8ppft-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Wed, 07 Mar 2018 07:52:11 -0500 Received: from localhost by e32.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Mar 2018 05:52:10 -0700 From: Stefan Berger Date: Wed, 7 Mar 2018 07:51:58 -0500 In-Reply-To: <1520427119-6236-1-git-send-email-stefanb@linux.vnet.ibm.com> References: <1520427119-6236-1-git-send-email-stefanb@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Message-Id: <1520427119-6236-5-git-send-email-stefanb@linux.vnet.ibm.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v1 4/5] tpm: convert tpm_emulator.c to use trace-events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Stefan Berger Signed-off-by: Stefan Berger Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefan Hajnoczi --- hw/tpm/tpm_emulator.c | 45 +++++++++++++++++++++++---------------------- hw/tpm/trace-events | 14 ++++++++++++++ 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c index b787aee..d0da10a 100644 --- a/hw/tpm/tpm_emulator.c +++ b/hw/tpm/tpm_emulator.c @@ -39,14 +39,7 @@ #include "qapi/error.h" #include "qapi/clone-visitor.h" #include "chardev/char-fe.h" - -#define DEBUG_TPM 0 - -#define DPRINTF(fmt, ...) do { \ - if (DEBUG_TPM) { \ - fprintf(stderr, "tpm-emulator:"fmt"\n", ## __VA_ARGS__); \ - } \ -} while (0) +#include "trace.h" =20 #define TYPE_TPM_EMULATOR "tpm-emulator" #define TPM_EMULATOR(obj) \ @@ -151,13 +144,12 @@ static int tpm_emulator_set_locality(TPMEmulator *t= pm_emu, uint8_t locty_number, { ptm_loc loc; =20 - DPRINTF("%s : locality: 0x%x", __func__, locty_number); - if (tpm_emu->cur_locty_number =3D=3D locty_number) { return 0; } =20 - DPRINTF("setting locality : 0x%x", locty_number); + trace_tpm_emulator_set_locality(locty_number); + loc.u.req.loc =3D locty_number; if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SET_LOCALITY, &loc, sizeof(loc), sizeof(loc)) < 0) { @@ -183,7 +175,7 @@ static void tpm_emulator_handle_request(TPMBackend *t= b, TPMBackendCmd *cmd, { TPMEmulator *tpm_emu =3D TPM_EMULATOR(tb); =20 - DPRINTF("processing TPM command"); + trace_tpm_emulator_handle_request(); =20 if (tpm_emulator_set_locality(tpm_emu, cmd->locty, errp) < 0 || tpm_emulator_unix_tx_bufs(tpm_emu, cmd->in, cmd->in_len, @@ -195,7 +187,6 @@ static void tpm_emulator_handle_request(TPMBackend *t= b, TPMBackendCmd *cmd, =20 static int tpm_emulator_probe_caps(TPMEmulator *tpm_emu) { - DPRINTF("%s", __func__); if (tpm_emulator_ctrlcmd(tpm_emu, CMD_GET_CAPABILITY, &tpm_emu->caps, 0, sizeof(tpm_emu->caps)) <= 0) { error_report("tpm-emulator: probing failed : %s", strerror(errno= )); @@ -204,7 +195,7 @@ static int tpm_emulator_probe_caps(TPMEmulator *tpm_e= mu) =20 tpm_emu->caps =3D be64_to_cpu(tpm_emu->caps); =20 - DPRINTF("capabilities : 0x%"PRIx64, tpm_emu->caps); + trace_tpm_emulator_probe_caps(tpm_emu->caps); =20 return 0; } @@ -293,7 +284,7 @@ static int tpm_emulator_set_buffer_size(TPMBackend *t= b, *actual_size =3D be32_to_cpu(psbs.u.resp.buffersize); } =20 - DPRINTF("buffer size: %u, min: %u, max: %u\n", + trace_tpm_emulator_set_buffer_size( be32_to_cpu(psbs.u.resp.buffersize), be32_to_cpu(psbs.u.resp.minsize), be32_to_cpu(psbs.u.resp.maxsize)); @@ -314,7 +305,7 @@ static int tpm_emulator_startup_tpm(TPMBackend *tb, s= ize_t buffersize) goto err_exit; } =20 - DPRINTF("%s", __func__); + trace_tpm_emulator_startup_tpm(); if (tpm_emulator_ctrlcmd(tpm_emu, CMD_INIT, &init, sizeof(init), sizeof(init)) < 0) { error_report("tpm-emulator: could not send INIT: %s", @@ -348,7 +339,7 @@ static bool tpm_emulator_get_tpm_established_flag(TPM= Backend *tb) strerror(errno)); return false; } - DPRINTF("got established flag: %0x", est.u.resp.bit); + trace_tpm_emulator_get_tpm_established_flag(est.u.resp.bit); =20 tpm_emu->established_flag_cached =3D 1; tpm_emu->established_flag =3D (est.u.resp.bit !=3D 0); @@ -395,7 +386,7 @@ static void tpm_emulator_cancel_cmd(TPMBackend *tb) ptm_res res; =20 if (!TPM_EMULATOR_IMPLEMENTS_ALL_CAPS(tpm_emu, PTM_CAP_CANCEL_TPM_CM= D)) { - DPRINTF("Backend does not support CANCEL_TPM_CMD"); + trace_tpm_emulator_cancel_cmd_not_supt(); return; } =20 @@ -521,8 +512,16 @@ static int tpm_emulator_handle_device_opts(TPMEmulat= or *tpm_emu, QemuOpts *opts) goto err; } =20 - DPRINTF("TPM Version %s", tpm_emu->tpm_version =3D=3D TPM_VERSION_1_= 2 ? "1.2" : - (tpm_emu->tpm_version =3D=3D TPM_VERSION_2_0 ? "2.0" : "Uns= pecified")); + switch (tpm_emu->tpm_version) { + case TPM_VERSION_1_2: + trace_tpm_emulator_handle_device_opts_tpm12(); + break; + case TPM_VERSION_2_0: + trace_tpm_emulator_handle_device_opts_tpm2(); + break; + default: + trace_tpm_emulator_handle_device_opts_unspec(); + } =20 if (tpm_emulator_probe_caps(tpm_emu) || tpm_emulator_check_caps(tpm_emu)) { @@ -532,7 +531,8 @@ static int tpm_emulator_handle_device_opts(TPMEmulato= r *tpm_emu, QemuOpts *opts) return tpm_emulator_block_migration(tpm_emu); =20 err: - DPRINTF("Startup error"); + trace_tpm_emulator_handle_device_opts_startup_error(); + return -1; } =20 @@ -573,7 +573,8 @@ static void tpm_emulator_inst_init(Object *obj) { TPMEmulator *tpm_emu =3D TPM_EMULATOR(obj); =20 - DPRINTF("%s", __func__); + trace_tpm_emulator_inst_init(); + tpm_emu->options =3D g_new0(TPMEmulatorOptions, 1); tpm_emu->cur_locty_number =3D ~0; qemu_mutex_init(&tpm_emu->mutex); diff --git a/hw/tpm/trace-events b/hw/tpm/trace-events index 66b2b91..fe88fa6 100644 --- a/hw/tpm/trace-events +++ b/hw/tpm/trace-events @@ -14,3 +14,17 @@ tpm_util_get_buffer_size_len(uint32_t len, size_t expe= cted) "tpm_resp->len =3D %u, tpm_util_get_buffer_size_hdr_len2(uint32_t len, size_t expected) "tpm2_r= esp->hdr.len =3D %u, expected =3D %zu" tpm_util_get_buffer_size_len2(uint32_t len, size_t expected) "tpm2_resp-= >len =3D %u, expected =3D %zu" tpm_util_get_buffer_size(size_t len) "buffersize of device: %zu" + +# hw/tpm/tpm_emulator.c +tpm_emulator_set_locality(uint8_t locty) "setting locality to %d" +tpm_emulator_handle_request(void) "processing TPM command" +tpm_emulator_probe_caps(uint64_t caps) "capabilities: 0x%"PRIx64 +tpm_emulator_set_buffer_size(uint32_t buffersize, uint32_t minsize, uint= 32_t maxsize) "buffer size: %u, min: %u, max: %u" +tpm_emulator_startup_tpm(void) "startup" +tpm_emulator_get_tpm_established_flag(uint8_t flag) "got established fla= g: %d" +tpm_emulator_cancel_cmd_not_supt(void) "Backend does not support CANCEL_= TPM_CMD" +tpm_emulator_handle_device_opts_tpm12(void) "TPM Version 1.2" +tpm_emulator_handle_device_opts_tpm2(void) "TPM Version 2" +tpm_emulator_handle_device_opts_unspec(void) "TPM Version Unspecified" +tpm_emulator_handle_device_opts_startup_error(void) "Startup error" +tpm_emulator_inst_init(void) "" --=20 2.5.5