From nobody Sat Feb 7 08:53:41 2026 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.zohomail.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 1520427251295609.9727266533906; Wed, 7 Mar 2018 04:54:11 -0800 (PST) Received: from localhost ([::1]:33035 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etYaA-0004zt-GE for importer@patchew.org; Wed, 07 Mar 2018 07:54:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etYYH-0003Xr-DD for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etYYD-0008HV-FS for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:13 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:59004 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 1etYYD-0008GW-8s for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:09 -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 w27Cq7qo107946 for ; Wed, 7 Mar 2018 07:52:08 -0500 Received: from e31.co.us.ibm.com (e31.co.us.ibm.com [32.97.110.149]) by mx0b-001b2d01.pphosted.com with ESMTP id 2gjdw8ppdb-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Wed, 07 Mar 2018 07:52:08 -0500 Received: from localhost by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Mar 2018 05:52:07 -0700 Received: from b03cxnp07028.gho.boulder.ibm.com (9.17.130.15) by e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Mar 2018 05:52:04 -0700 Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp07028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w27Cq4B814483730; Wed, 7 Mar 2018 05:52:04 -0700 Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0A5AC6A042; Wed, 7 Mar 2018 05:52:04 -0700 (MST) Received: from sbct-3.watson.ibm.com (unknown [9.47.158.153]) by b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP id B277F6A03C; Wed, 7 Mar 2018 05:52:03 -0700 (MST) From: Stefan Berger To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 07:51:55 -0500 X-Mailer: git-send-email 2.5.5 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 X-TM-AS-GCONF: 00 x-cbid: 18030712-8235-0000-0000-00000D1FE3A7 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008628; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000254; SDB=6.00999623; UDB=6.00508472; IPR=6.00778982; MB=3.00019890; MTD=3.00000008; XFM=3.00000015; UTC=2018-03-07 12:52:05 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18030712-8236-0000-0000-00003FF657D7 Message-Id: <1520427119-6236-2-git-send-email-stefanb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-07_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803070149 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx0b-001b2d01.pphosted.com id w27Cq7qo107946 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PULL v1 1/5] tpm: convert tpm_crb.c to use trace-events 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: peter.maydell@linaro.org, Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Stefan Berger Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefan Hajnoczi --- Makefile.objs | 1 + hw/tpm/tpm_crb.c | 17 +++++------------ hw/tpm/trace-events | 5 +++++ 3 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 hw/tpm/trace-events diff --git a/Makefile.objs b/Makefile.objs index 5dc1348..72c3d8c 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -162,6 +162,7 @@ trace-events-subdirs +=3D hw/alpha trace-events-subdirs +=3D hw/hppa trace-events-subdirs +=3D hw/xen trace-events-subdirs +=3D hw/ide +trace-events-subdirs +=3D hw/tpm trace-events-subdirs +=3D ui trace-events-subdirs +=3D audio trace-events-subdirs +=3D net diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index b5b8256..d8917cb 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -29,6 +29,7 @@ #include "sysemu/reset.h" #include "tpm_int.h" #include "tpm_util.h" +#include "trace.h" =20 typedef struct CRBState { DeviceState parent_obj; @@ -44,14 +45,6 @@ typedef struct CRBState { =20 #define CRB(obj) OBJECT_CHECK(CRBState, (obj), TYPE_TPM_CRB) =20 -#define DEBUG_CRB 0 - -#define DPRINTF(fmt, ...) do { \ - if (DEBUG_CRB) { \ - printf(fmt, ## __VA_ARGS__); \ - } \ - } while (0) - #define CRB_INTF_TYPE_CRB_ACTIVE 0b1 #define CRB_INTF_VERSION_CRB 0b1 #define CRB_INTF_CAP_LOCALITY_0_ONLY 0b0 @@ -91,8 +84,8 @@ static uint64_t tpm_crb_mmio_read(void *opaque, hwaddr ad= dr, unsigned offset =3D addr & 3; uint32_t val =3D *(uint32_t *)regs >> (8 * offset); =20 - DPRINTF("CRB read 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx32 "\n", - addr, size, val); + trace_tpm_crb_mmio_read(addr, size, val); + return val; } =20 @@ -100,8 +93,8 @@ static void tpm_crb_mmio_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { CRBState *s =3D CRB(opaque); - DPRINTF("CRB write 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx64 "\n", - addr, size, val); + + trace_tpm_crb_mmio_write(addr, size, val); =20 switch (addr) { case A_CRB_CTRL_REQ: diff --git a/hw/tpm/trace-events b/hw/tpm/trace-events new file mode 100644 index 0000000..336b06d --- /dev/null +++ b/hw/tpm/trace-events @@ -0,0 +1,5 @@ +# See docs/devel/tracing.txt for syntax documentation. + +# hw/tpm/tpm_crb.c +tpm_crb_mmio_read(uint64_t addr, unsigned size, uint32_t val) "CRB read 0x= " TARGET_FMT_plx " len:%u val: 0x%" PRIx32 +tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t val) "CRB write = 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx32 --=20 2.5.5 From nobody Sat Feb 7 08:53:41 2026 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.zohomail.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 1520427247058563.1689738384567; Wed, 7 Mar 2018 04:54:07 -0800 (PST) Received: from localhost ([::1]:33033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etYa0-0004cc-1X for importer@patchew.org; Wed, 07 Mar 2018 07:54:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54443) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etYYH-0003Xt-J5 for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etYYD-0008Hj-HF for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:13 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:53476 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 1etYYD-0008Gh-B3 for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:09 -0500 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w27Co1dw119297 for ; Wed, 7 Mar 2018 07:52:08 -0500 Received: from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153]) by mx0b-001b2d01.pphosted.com with ESMTP id 2gjdpq718r-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Wed, 07 Mar 2018 07:52:08 -0500 Received: from localhost by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Mar 2018 05:52:07 -0700 Received: from b03cxnp08026.gho.boulder.ibm.com (9.17.130.18) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Mar 2018 05:52:05 -0700 Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w27Cq5CF11469214; Wed, 7 Mar 2018 05:52:05 -0700 Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6CE366A043; Wed, 7 Mar 2018 05:52:05 -0700 (MST) Received: from sbct-3.watson.ibm.com (unknown [9.47.158.153]) by b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP id 20A406A03F; Wed, 7 Mar 2018 05:52:05 -0700 (MST) From: Stefan Berger To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 07:51:56 -0500 X-Mailer: git-send-email 2.5.5 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 X-TM-AS-GCONF: 00 x-cbid: 18030712-0012-0000-0000-000015DC426F X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008628; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000254; SDB=6.00999623; UDB=6.00508472; IPR=6.00778982; MB=3.00019891; MTD=3.00000008; XFM=3.00000015; UTC=2018-03-07 12:52:07 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18030712-0013-0000-0000-000051C6C21B Message-Id: <1520427119-6236-3-git-send-email-stefanb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-07_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803070149 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx0b-001b2d01.pphosted.com id w27Co1dw119297 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PULL v1 2/5] tpm: convert tpm_passthrough.c to use trace-events 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: peter.maydell@linaro.org, Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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_passthrough.c | 13 +++---------- hw/tpm/trace-events | 4 ++++ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index a495fe0..2589c4d 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -31,14 +31,7 @@ #include "hw/hw.h" #include "qapi/clone-visitor.h" #include "tpm_util.h" - -#define DEBUG_TPM 0 - -#define DPRINTF(fmt, ...) do { \ - if (DEBUG_TPM) { \ - fprintf(stderr, fmt, ## __VA_ARGS__); \ - } \ -} while (0) +#include "trace.h" =20 #define TYPE_TPM_PASSTHROUGH "tpm-passthrough" #define TPM_PASSTHROUGH(obj) \ @@ -137,7 +130,7 @@ static void tpm_passthrough_handle_request(TPMBackend *= tb, TPMBackendCmd *cmd, { TPMPassthruState *tpm_pt =3D TPM_PASSTHROUGH(tb); =20 - DPRINTF("tpm_passthrough: processing command %p\n", cmd); + trace_tpm_passthrough_handle_request(cmd); =20 tpm_passthrough_unix_tx_bufs(tpm_pt, cmd->in, cmd->in_len, cmd->out, cmd->out_len, &cmd->selftest_do= ne, @@ -146,7 +139,7 @@ static void tpm_passthrough_handle_request(TPMBackend *= tb, TPMBackendCmd *cmd, =20 static void tpm_passthrough_reset(TPMBackend *tb) { - DPRINTF("tpm_passthrough: CALL TO TPM_RESET!\n"); + trace_tpm_passthrough_reset(); =20 tpm_passthrough_cancel_cmd(tb); } diff --git a/hw/tpm/trace-events b/hw/tpm/trace-events index 336b06d..8557dd9 100644 --- a/hw/tpm/trace-events +++ b/hw/tpm/trace-events @@ -3,3 +3,7 @@ # hw/tpm/tpm_crb.c tpm_crb_mmio_read(uint64_t addr, unsigned size, uint32_t val) "CRB read 0x= " TARGET_FMT_plx " len:%u val: 0x%" PRIx32 tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t val) "CRB write = 0x" TARGET_FMT_plx " len:%u val: 0x%" PRIx32 + +# hw/tpm/tpm_passthrough.c +tpm_passthrough_handle_request(void *cmd) "processing command %p" +tpm_passthrough_reset(void) "reset" --=20 2.5.5 From nobody Sat Feb 7 08:53:41 2026 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.zohomail.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 1520427405927403.9853797875759; Wed, 7 Mar 2018 04:56:45 -0800 (PST) Received: from localhost ([::1]:33052 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etYcf-0007Sc-3l for importer@patchew.org; Wed, 07 Mar 2018 07:56:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etYYK-0003Z0-PR for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etYYG-0008NZ-SS for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:16 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:57558) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1etYYG-0008La-JL for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:12 -0500 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w27CpRa1134621 for ; Wed, 7 Mar 2018 07:52:11 -0500 Received: from e37.co.us.ibm.com (e37.co.us.ibm.com [32.97.110.158]) by mx0a-001b2d01.pphosted.com with ESMTP id 2gjf2tugnv-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Wed, 07 Mar 2018 07:52:10 -0500 Received: from localhost by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Mar 2018 05:52:09 -0700 Received: from b03cxnp07029.gho.boulder.ibm.com (9.17.130.16) by e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Mar 2018 05:52:07 -0700 Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w27Cq6Zr7143926; Wed, 7 Mar 2018 05:52:06 -0700 Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D03196A043; Wed, 7 Mar 2018 05:52:06 -0700 (MST) Received: from sbct-3.watson.ibm.com (unknown [9.47.158.153]) by b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP id 8394D6A03C; Wed, 7 Mar 2018 05:52:06 -0700 (MST) From: Stefan Berger To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 07:51:57 -0500 X-Mailer: git-send-email 2.5.5 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 X-TM-AS-GCONF: 00 x-cbid: 18030712-0024-0000-0000-0000180B8C78 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008628; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000254; SDB=6.00999623; UDB=6.00508472; IPR=6.00778982; MB=3.00019890; MTD=3.00000008; XFM=3.00000015; UTC=2018-03-07 12:52:08 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18030712-0025-0000-0000-00004F01F716 Message-Id: <1520427119-6236-4-git-send-email-stefanb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-07_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803070149 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-001b2d01.pphosted.com id w27CpRa1134621 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PULL v1 3/5] tpm: convert tpm_util.c to use trace-events 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: peter.maydell@linaro.org, Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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_util.c | 29 ++++++++++++----------------- hw/tpm/trace-events | 7 +++++++ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c index 2de52a0..ee41757 100644 --- a/hw/tpm/tpm_util.c +++ b/hw/tpm/tpm_util.c @@ -28,14 +28,7 @@ #include "exec/memory.h" #include "sysemu/tpm_backend.h" #include "hw/qdev.h" - -#define DEBUG_TPM 0 - -#define DPRINTF(fmt, ...) do { \ - if (DEBUG_TPM) { \ - fprintf(stderr, "tpm-util:"fmt"\n", ## __VA_ARGS__); \ - } \ -} while (0) +#include "trace.h" =20 /* tpm backend property */ =20 @@ -279,10 +272,11 @@ int tpm_util_get_buffer_size(int tpm_fd, TPMVersion t= pm_version, =20 if (be32_to_cpu(tpm_resp.hdr.len) !=3D sizeof(tpm_resp) || be32_to_cpu(tpm_resp.len) !=3D sizeof(uint32_t)) { - DPRINTF("tpm_resp->hdr.len =3D %u, expected =3D %zu\n", - be32_to_cpu(tpm_resp.hdr.len), sizeof(tpm_resp)); - DPRINTF("tpm_resp->len =3D %u, expected =3D %zu\n", - be32_to_cpu(tpm_resp.len), sizeof(uint32_t)); + trace_tpm_util_get_buffer_size_hdr_len( + be32_to_cpu(tpm_resp.hdr.len), + sizeof(tpm_resp)); + trace_tpm_util_get_buffer_size_len(be32_to_cpu(tpm_resp.len), + sizeof(uint32_t)); error_report("tpm_util: Got unexpected response to " "TPM_GetCapability; errcode: 0x%x", be32_to_cpu(tpm_resp.hdr.errcode)); @@ -327,10 +321,11 @@ int tpm_util_get_buffer_size(int tpm_fd, TPMVersion t= pm_version, =20 if (be32_to_cpu(tpm2_resp.hdr.len) !=3D sizeof(tpm2_resp) || be32_to_cpu(tpm2_resp.count) !=3D 2) { - DPRINTF("tpm2_resp->hdr.len =3D %u, expected =3D %zu\n", - be32_to_cpu(tpm2_resp.hdr.len), sizeof(tpm2_resp)); - DPRINTF("tpm2_resp->len =3D %u, expected =3D %u\n", - be32_to_cpu(tpm2_resp.count), 2); + trace_tpm_util_get_buffer_size_hdr_len2( + be32_to_cpu(tpm2_resp.hdr.len), + sizeof(tpm2_resp)); + trace_tpm_util_get_buffer_size_len2( + be32_to_cpu(tpm2_resp.count), 2); error_report("tpm_util: Got unexpected response to " "TPM2_GetCapability; errcode: 0x%x", be32_to_cpu(tpm2_resp.hdr.errcode)); @@ -344,7 +339,7 @@ int tpm_util_get_buffer_size(int tpm_fd, TPMVersion tpm= _version, return -EFAULT; } =20 - DPRINTF("buffersize of device: %zu\n", *buffersize); + trace_tpm_util_get_buffer_size(*buffersize); =20 return 0; } diff --git a/hw/tpm/trace-events b/hw/tpm/trace-events index 8557dd9..66b2b91 100644 --- a/hw/tpm/trace-events +++ b/hw/tpm/trace-events @@ -7,3 +7,10 @@ tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t = val) "CRB write 0x" TA # hw/tpm/tpm_passthrough.c tpm_passthrough_handle_request(void *cmd) "processing command %p" tpm_passthrough_reset(void) "reset" + +# hw/tpm/tpm_util.c +tpm_util_get_buffer_size_hdr_len(uint32_t len, size_t expected) "tpm_resp-= >hdr.len =3D %u, expected =3D %zu" +tpm_util_get_buffer_size_len(uint32_t len, size_t expected) "tpm_resp->len= =3D %u, expected =3D %zu" +tpm_util_get_buffer_size_hdr_len2(uint32_t len, size_t expected) "tpm2_res= p->hdr.len =3D %u, expected =3D %zu" +tpm_util_get_buffer_size_len2(uint32_t len, size_t expected) "tpm2_resp->l= en =3D %u, expected =3D %zu" +tpm_util_get_buffer_size(size_t len) "buffersize of device: %zu" --=20 2.5.5 From nobody Sat Feb 7 08:53:41 2026 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520427405093277.131862394642; Wed, 7 Mar 2018 04:56:45 -0800 (PST) Received: from localhost ([::1]:33049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etYcZ-0007Nz-8r for importer@patchew.org; Wed, 07 Mar 2018 07:56:39 -0500 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 Received: from b03cxnp08027.gho.boulder.ibm.com (9.17.130.19) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Mar 2018 05:52:08 -0700 Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w27Cq8mK10944972; Wed, 7 Mar 2018 05:52:08 -0700 Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 407DB6A03D; Wed, 7 Mar 2018 05:52:08 -0700 (MST) Received: from sbct-3.watson.ibm.com (unknown [9.47.158.153]) by b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP id E6A196A042; Wed, 7 Mar 2018 05:52:07 -0700 (MST) From: Stefan Berger To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 07:51:58 -0500 X-Mailer: git-send-email 2.5.5 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 X-TM-AS-GCONF: 00 x-cbid: 18030712-0004-0000-0000-000013C44258 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008628; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000254; SDB=6.00999623; UDB=6.00508472; IPR=6.00778982; MB=3.00019891; MTD=3.00000008; XFM=3.00000015; UTC=2018-03-07 12:52:09 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18030712-0005-0000-0000-0000865E3D07 Message-Id: <1520427119-6236-5-git-send-email-stefanb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-07_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803070149 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx0b-001b2d01.pphosted.com id w27CpsxC107510 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PULL v1 4/5] tpm: convert tpm_emulator.c to use trace-events 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: peter.maydell@linaro.org, Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 *tpm= _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 *tb,= 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 *tb,= 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_emu) =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 *tb, *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, siz= e_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(TPMBa= ckend *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_CMD)= ) { - 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(TPMEmulator= *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" : "Unspe= cified")); + 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(TPMEmulator = *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 expect= ed) "tpm_resp->len =3D %u, tpm_util_get_buffer_size_hdr_len2(uint32_t len, size_t expected) "tpm2_res= p->hdr.len =3D %u, expected =3D %zu" tpm_util_get_buffer_size_len2(uint32_t len, size_t expected) "tpm2_resp->l= en =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, uint32= _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 flag:= %d" +tpm_emulator_cancel_cmd_not_supt(void) "Backend does not support CANCEL_TP= M_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 From nobody Sat Feb 7 08:53:41 2026 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.zohomail.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 1520427415140664.9023613638432; Wed, 7 Mar 2018 04:56:55 -0800 (PST) Received: from localhost ([::1]:33054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etYco-0007Zv-0o for importer@patchew.org; Wed, 07 Mar 2018 07:56:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etYYK-0003Yz-PL for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etYYI-0008RS-Q4 for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:16 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:34604 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 1etYYI-0008QT-Kf for qemu-devel@nongnu.org; Wed, 07 Mar 2018 07:52:14 -0500 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w27CpJJP083821 for ; Wed, 7 Mar 2018 07:52:14 -0500 Received: from e32.co.us.ibm.com (e32.co.us.ibm.com [32.97.110.150]) by mx0a-001b2d01.pphosted.com with ESMTP id 2gjejgvu8t-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Wed, 07 Mar 2018 07:52:13 -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:12 -0700 Received: from b03cxnp07029.gho.boulder.ibm.com (9.17.130.16) by e32.co.us.ibm.com (192.168.1.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Mar 2018 05:52:10 -0700 Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp07029.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w27Cq9RG9109976; Wed, 7 Mar 2018 05:52:09 -0700 Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AF4BD6A03C; Wed, 7 Mar 2018 05:52:09 -0700 (MST) Received: from sbct-3.watson.ibm.com (unknown [9.47.158.153]) by b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP id 5714B6A03D; Wed, 7 Mar 2018 05:52:09 -0700 (MST) From: Stefan Berger To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 07:51:59 -0500 X-Mailer: git-send-email 2.5.5 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 X-TM-AS-GCONF: 00 x-cbid: 18030712-0004-0000-0000-000013C4425B X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008628; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000254; SDB=6.00999623; UDB=6.00508472; IPR=6.00778982; MB=3.00019891; MTD=3.00000008; XFM=3.00000015; UTC=2018-03-07 12:52:10 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18030712-0005-0000-0000-0000865E3D0C Message-Id: <1520427119-6236-6-git-send-email-stefanb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-07_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803070149 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-001b2d01.pphosted.com id w27CpJJP083821 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PULL v1 5/5] tpm: convert tpm_tis.c to use trace-events 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: peter.maydell@linaro.org, Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Leave the DEBUG_TIS for more debugging and convert to use if (DEBUG_TIS) rather than #if DEBUG_TIS where it is being used. 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_tis.c | 98 ++++++++++++++++++++++++-------------------------= ---- hw/tpm/trace-events | 16 +++++++++ 2 files changed, 61 insertions(+), 53 deletions(-) diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 834eef7..2ac7e74 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -31,6 +31,7 @@ #include "sysemu/tpm_backend.h" #include "tpm_int.h" #include "tpm_util.h" +#include "trace.h" =20 #define TPM_TIS_NUM_LOCALITIES 5 /* per spec */ #define TPM_TIS_LOCALITY_SHIFT 12 @@ -86,12 +87,6 @@ typedef struct TPMState { =20 #define DEBUG_TIS 0 =20 -#define DPRINTF(fmt, ...) do { \ - if (DEBUG_TIS) { \ - printf(fmt, ## __VA_ARGS__); \ - } \ -} while (0) - /* local prototypes */ =20 static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr addr, @@ -107,19 +102,17 @@ static uint8_t tpm_tis_locality_from_addr(hwaddr addr) static void tpm_tis_show_buffer(const unsigned char *buffer, size_t buffer_size, const char *string) { -#ifdef DEBUG_TIS uint32_t len, i; =20 len =3D MIN(tpm_cmd_get_size(buffer), buffer_size); - DPRINTF("tpm_tis: %s length =3D %d\n", string, len); + printf("tpm_tis: %s length =3D %d\n", string, len); for (i =3D 0; i < len; i++) { if (i && !(i % 16)) { - DPRINTF("\n"); + printf("\n"); } - DPRINTF("%.2X ", buffer[i]); + printf("%.2X ", buffer[i]); } - DPRINTF("\n"); -#endif + printf("\n"); } =20 /* @@ -146,8 +139,10 @@ static void tpm_tis_sts_set(TPMLocality *l, uint32_t f= lags) */ static void tpm_tis_tpm_send(TPMState *s, uint8_t locty) { - tpm_tis_show_buffer(s->buffer, s->be_buffer_size, - "tpm_tis: To TPM"); + if (DEBUG_TIS) { + tpm_tis_show_buffer(s->buffer, s->be_buffer_size, + "tpm_tis: To TPM"); + } =20 /* * rw_offset serves as length indicator for length of data; @@ -175,7 +170,7 @@ static void tpm_tis_raise_irq(TPMState *s, uint8_t loct= y, uint32_t irqmask) =20 if ((s->loc[locty].inte & TPM_TIS_INT_ENABLED) && (s->loc[locty].inte & irqmask)) { - DPRINTF("tpm_tis: Raising IRQ for flag %08x\n", irqmask); + trace_tpm_tis_raise_irq(irqmask); qemu_irq_raise(s->irq); s->loc[locty].ints |=3D irqmask; } @@ -223,7 +218,7 @@ static void tpm_tis_new_active_locality(TPMState *s, ui= nt8_t new_active_locty) =20 s->active_locty =3D new_active_locty; =20 - DPRINTF("tpm_tis: Active locality is now %d\n", s->active_locty); + trace_tpm_tis_new_active_locality(s->active_locty); =20 if (TPM_TIS_IS_VALID_LOCTY(new_active_locty)) { /* set flags on the new active locality */ @@ -242,7 +237,7 @@ static void tpm_tis_abort(TPMState *s, uint8_t locty) { s->rw_offset =3D 0; =20 - DPRINTF("tpm_tis: tis_abort: new active locality is %d\n", s->next_loc= ty); + trace_tpm_tis_abort(s->next_locty); =20 /* * Need to react differently depending on who's aborting now and @@ -310,8 +305,10 @@ static void tpm_tis_request_completed(TPMIf *ti, int r= et) s->loc[locty].state =3D TPM_TIS_STATE_COMPLETION; s->rw_offset =3D 0; =20 - tpm_tis_show_buffer(s->buffer, s->be_buffer_size, - "tpm_tis: From TPM"); + if (DEBUG_TIS) { + tpm_tis_show_buffer(s->buffer, s->be_buffer_size, + "tpm_tis: From TPM"); + } =20 if (TPM_TIS_IS_VALID_LOCTY(s->next_locty)) { tpm_tis_abort(s, locty); @@ -339,8 +336,7 @@ static uint32_t tpm_tis_data_read(TPMState *s, uint8_t = locty) tpm_tis_sts_set(&s->loc[locty], TPM_TIS_STS_VALID); tpm_tis_raise_irq(s, locty, TPM_TIS_INT_STS_VALID); } - DPRINTF("tpm_tis: tpm_tis_data_read byte 0x%02x [%d]\n", - ret, s->rw_offset - 1); + trace_tpm_tis_data_read(ret, s->rw_offset - 1); } =20 return ret; @@ -364,29 +360,29 @@ static void tpm_tis_dump_state(void *opaque, hwaddr a= ddr) hwaddr base =3D addr & ~0xfff; TPMState *s =3D opaque; =20 - DPRINTF("tpm_tis: active locality : %d\n" - "tpm_tis: state of locality %d : %d\n" - "tpm_tis: register dump:\n", - s->active_locty, - locty, s->loc[locty].state); + printf("tpm_tis: active locality : %d\n" + "tpm_tis: state of locality %d : %d\n" + "tpm_tis: register dump:\n", + s->active_locty, + locty, s->loc[locty].state); =20 for (idx =3D 0; regs[idx] !=3D 0xfff; idx++) { - DPRINTF("tpm_tis: 0x%04x : 0x%08x\n", regs[idx], - (int)tpm_tis_mmio_read(opaque, base + regs[idx], 4)); + printf("tpm_tis: 0x%04x : 0x%08x\n", regs[idx], + (int)tpm_tis_mmio_read(opaque, base + regs[idx], 4)); } =20 - DPRINTF("tpm_tis: r/w offset : %d\n" - "tpm_tis: result buffer : ", - s->rw_offset); + printf("tpm_tis: r/w offset : %d\n" + "tpm_tis: result buffer : ", + s->rw_offset); for (idx =3D 0; idx < MIN(tpm_cmd_get_size(&s->buffer), s->be_buffer_size); idx++) { - DPRINTF("%c%02x%s", - s->rw_offset =3D=3D idx ? '>' : ' ', - s->buffer[idx], - ((idx & 0xf) =3D=3D 0xf) ? "\ntpm_tis: " := ""); + printf("%c%02x%s", + s->rw_offset =3D=3D idx ? '>' : ' ', + s->buffer[idx], + ((idx & 0xf) =3D=3D 0xf) ? "\ntpm_tis: " : = ""); } - DPRINTF("\n"); + printf("\n"); } #endif =20 @@ -506,7 +502,7 @@ static uint64_t tpm_tis_mmio_read(void *opaque, hwaddr = addr, val >>=3D shift; } =20 - DPRINTF("tpm_tis: read.%u(%08x) =3D %08x\n", size, (int)addr, (int)va= l); + trace_tpm_tis_mmio_read(size, addr, val); =20 return val; } @@ -527,10 +523,10 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr a= ddr, uint16_t len; uint32_t mask =3D (size =3D=3D 1) ? 0xff : ((size =3D=3D 2) ? 0xffff := ~0); =20 - DPRINTF("tpm_tis: write.%u(%08x) =3D %08x\n", size, (int)addr, (int)va= l); + trace_tpm_tis_mmio_write(size, addr, val); =20 if (locty =3D=3D 4) { - DPRINTF("tpm_tis: Access to locality 4 only allowed from hardware\= n"); + trace_tpm_tis_mmio_write_locty4(); return; } =20 @@ -560,20 +556,18 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr a= ddr, if ((val & TPM_TIS_ACCESS_ACTIVE_LOCALITY)) { /* give up locality if currently owned */ if (s->active_locty =3D=3D locty) { - DPRINTF("tpm_tis: Releasing locality %d\n", locty); + trace_tpm_tis_mmio_write_release_locty(locty); =20 uint8_t newlocty =3D TPM_TIS_NO_LOCALITY; /* anybody wants the locality ? */ for (c =3D TPM_TIS_NUM_LOCALITIES - 1; c >=3D 0; c--) { if ((s->loc[c].access & TPM_TIS_ACCESS_REQUEST_USE)) { - DPRINTF("tpm_tis: Locality %d requests use.\n", c); + trace_tpm_tis_mmio_write_locty_req_use(c); newlocty =3D c; break; } } - DPRINTF("tpm_tis: TPM_TIS_ACCESS_ACTIVE_LOCALITY: " - "Next active locality: %d\n", - newlocty); + trace_tpm_tis_mmio_write_next_locty(newlocty); =20 if (TPM_TIS_IS_VALID_LOCTY(newlocty)) { set_new_locty =3D 0; @@ -627,10 +621,10 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr a= ddr, } =20 s->loc[locty].access |=3D TPM_TIS_ACCESS_SEIZE; - DPRINTF("tpm_tis: TPM_TIS_ACCESS_SEIZE: " - "Locality %d seized from locality %d\n", - locty, s->active_locty); - DPRINTF("tpm_tis: TPM_TIS_ACCESS_SEIZE: Initiating abort.\= n"); + + trace_tpm_tis_mmio_write_locty_seized(locty, s->active_loc= ty); + trace_tpm_tis_mmio_write_init_abort(); + set_new_locty =3D 0; tpm_tis_prep_abort(s, s->active_locty, locty); break; @@ -677,7 +671,7 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr add= r, s->loc[locty].ints &=3D ~val; if (s->loc[locty].ints =3D=3D 0) { qemu_irq_lower(s->irq); - DPRINTF("tpm_tis: Lowering IRQ\n"); + trace_tpm_tis_mmio_write_lowering_irq(); } } s->loc[locty].ints &=3D ~(val & TPM_TIS_INTERRUPTS_SUPPORTED); @@ -725,8 +719,7 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr add= r, case TPM_TIS_STATE_EXECUTION: case TPM_TIS_STATE_RECEPTION: /* abort currently running command */ - DPRINTF("tpm_tis: %s: Initiating abort.\n", - __func__); + trace_tpm_tis_mmio_write_init_abort(); tpm_tis_prep_abort(s, locty, locty); break; =20 @@ -780,8 +773,7 @@ static void tpm_tis_mmio_write(void *opaque, hwaddr add= r, s->loc[locty].state =3D=3D TPM_TIS_STATE_COMPLETION) { /* drop the byte */ } else { - DPRINTF("tpm_tis: Data to send to TPM: %08x (size=3D%d)\n", - (int)val, size); + trace_tpm_tis_mmio_write_data2send(val, size); if (s->loc[locty].state =3D=3D TPM_TIS_STATE_READY) { s->loc[locty].state =3D TPM_TIS_STATE_RECEPTION; tpm_tis_sts_set(&s->loc[locty], diff --git a/hw/tpm/trace-events b/hw/tpm/trace-events index fe88fa6..9a65384 100644 --- a/hw/tpm/trace-events +++ b/hw/tpm/trace-events @@ -28,3 +28,19 @@ 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) "" + +# hw/tpm/tpm_tis.c +tpm_tis_raise_irq(uint32_t irqmask) "Raising IRQ for flag 0x%08x" +tpm_tis_new_active_locality(uint8_t locty) "Active locality is now %d" +tpm_tis_abort(uint8_t locty) "New active locality is %d" +tpm_tis_data_read(uint32_t value, uint32_t off) "byte 0x%02x [%d]" +tpm_tis_mmio_read(unsigned size, uint32_t addr, uint32_t val) " read.%u(0= x%08x) =3D 0x%08x" +tpm_tis_mmio_write(unsigned size, uint32_t addr, uint32_t val) "write.%u(0= x%08x) =3D 0x%08x" +tpm_tis_mmio_write_locty4(void) "Access to locality 4 only allowed from ha= rdware" +tpm_tis_mmio_write_release_locty(uint8_t locty) "Releasing locality %d" +tpm_tis_mmio_write_locty_req_use(uint8_t locty) "Locality %d requests use" +tpm_tis_mmio_write_next_locty(uint8_t locty) "Next active locality is %d" +tpm_tis_mmio_write_locty_seized(uint8_t locty, uint8_t active) "Locality %= d seized from locality %d" +tpm_tis_mmio_write_init_abort(void) "Initiating abort" +tpm_tis_mmio_write_lowering_irq(void) "Lowering IRQ" +tpm_tis_mmio_write_data2send(uint32_t value, unsigned size) "Data to send = to TPM: 0x%08x (size=3D%d)" --=20 2.5.5