From nobody Sun Nov 2 11:47:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.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 1509145668467822.4619025896102; Fri, 27 Oct 2017 16:07:48 -0700 (PDT) Received: from localhost ([::1]:59201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e8Dj2-0005qb-I6 for importer@patchew.org; Fri, 27 Oct 2017 19:07:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e8Deg-0002gJ-1w for qemu-devel@nongnu.org; Fri, 27 Oct 2017 19:03:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e8Deb-0003z2-Ix for qemu-devel@nongnu.org; Fri, 27 Oct 2017 19:03:10 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:34370) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e8Deb-0003xx-9r for qemu-devel@nongnu.org; Fri, 27 Oct 2017 19:03:05 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v9RMwnAY140279 for ; Fri, 27 Oct 2017 19:03:01 -0400 Received: from e15.ny.us.ibm.com (e15.ny.us.ibm.com [129.33.205.205]) by mx0a-001b2d01.pphosted.com with ESMTP id 2dv79j1c7f-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 27 Oct 2017 19:03:01 -0400 Received: from localhost by e15.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 27 Oct 2017 19:03:00 -0400 Received: from b01cxnp22035.gho.pok.ibm.com (9.57.198.25) by e15.ny.us.ibm.com (146.89.104.202) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 27 Oct 2017 19:02:56 -0400 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp22035.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v9RN2ujf47579206; Fri, 27 Oct 2017 23:02:56 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 76F26AC041; Fri, 27 Oct 2017 19:03:41 -0400 (EDT) Received: from sbct-3.watson.ibm.com (unknown [9.47.158.153]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP id 5FC68AC040; Fri, 27 Oct 2017 19:03:41 -0400 (EDT) From: Stefan Berger To: qemu-devel@nongnu.org Date: Fri, 27 Oct 2017 19:02:40 -0400 X-Mailer: git-send-email 2.5.5 In-Reply-To: <1509145361-11218-1-git-send-email-stefanb@linux.vnet.ibm.com> References: <1509145361-11218-1-git-send-email-stefanb@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17102723-0036-0000-0000-00000282CB2B X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007964; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000239; SDB=6.00937412; UDB=6.00472471; IPR=6.00717674; BA=6.00005660; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00017751; XFM=3.00000015; UTC=2017-10-27 23:02:58 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17102723-0037-0000-0000-00004235CFEF Message-Id: <1509145361-11218-7-git-send-email-stefanb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-10-27_10:, , 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-1707230000 definitions=main-1710270296 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH v2 6/7] tpm: extend TPM TIS with state migration support 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@intel.com, marcandre.lureau@gmail.com, Stefan Berger 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" Extend the TPM TIS interface with state migration support. We need to synchronize with the backend thread to make sure that a command being processed by the external TPM emulator has completed and its response been received. In case the bottom half did not run, we run the function it is supposed to run. Since only 1 locality can be active ay any time we only need to store the command buffer of that active locality. Signed-off-by: Stefan Berger --- hw/tpm/tpm_tis.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++= +--- 1 file changed, 128 insertions(+), 6 deletions(-) diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index 60887c3..1c52ea7 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -404,12 +404,8 @@ static void tpm_tis_prep_abort(TPMState *s, uint8_t lo= cty, uint8_t newlocty) tpm_tis_abort(s, locty); } =20 -/* - * Callback from the TPM to indicate that the response was received. - */ -static void tpm_tis_request_completed(TPMIf *ti) +static void _tpm_tis_request_completed(TPMState *s) { - TPMState *s =3D TPM(ti); uint8_t locty =3D s->cmd.locty; uint8_t l; =20 @@ -442,6 +438,14 @@ static void tpm_tis_request_completed(TPMIf *ti) } =20 /* + * Callback from the TPM to indicate that the response was received. + */ +static void tpm_tis_request_completed(TPMIf *ti) +{ + _tpm_tis_request_completed(TPM(ti)); +} + +/* * Read a byte of response data */ static uint32_t tpm_tis_data_read(TPMState *s, uint8_t locty) @@ -1047,9 +1051,127 @@ static void tpm_tis_reset(DeviceState *dev) tpm_tis_do_startup_tpm(s); } =20 +/* persistent state handling */ + +static int tpm_tis_pre_save(void *opaque) +{ + TPMState *s =3D opaque; + uint8_t locty =3D s->active_locty; + + DPRINTF("tpm_tis: suspend: locty =3D %d : r_offset =3D %d, w_offset = =3D %d\n", + locty, s->loc[0].r_offset, s->loc[0].w_offset); +#ifdef DEBUG_TIS + tpm_tis_dump_state(opaque, 0); +#endif + + /* + * Synchronize with backend completion. + */ + tpm_backend_wait_cmd_completed(s->be_driver); + + if (TPM_TIS_IS_VALID_LOCTY(locty) && + s->loc[locty].state =3D=3D TPM_TIS_STATE_EXECUTION) { + /* bottom half did not run - run its function */ + _tpm_tis_request_completed(s); + } + + /* copy current active read or write buffer into the buffer + written to disk */ + if (TPM_TIS_IS_VALID_LOCTY(locty)) { + switch (s->loc[locty].state) { + case TPM_TIS_STATE_RECEPTION: + memcpy(s->buf, + s->loc[locty].w_buffer.buffer, + MIN(sizeof(s->buf), + s->loc[locty].w_buffer.size)); + s->offset =3D s->loc[locty].w_offset; + break; + case TPM_TIS_STATE_COMPLETION: + memcpy(s->buf, + s->loc[locty].r_buffer.buffer, + MIN(sizeof(s->buf), + s->loc[locty].r_buffer.size)); + s->offset =3D s->loc[locty].r_offset; + break; + default: + /* leak nothing */ + memset(s->buf, 0x0, sizeof(s->buf)); + break; + } + } + + return 0; +} + +static int tpm_tis_post_load(void *opaque, + int version_id __attribute__((unused))) +{ + TPMState *s =3D opaque; + + uint8_t locty =3D s->active_locty; + + if (TPM_TIS_IS_VALID_LOCTY(locty)) { + switch (s->loc[locty].state) { + case TPM_TIS_STATE_RECEPTION: + memcpy(s->loc[locty].w_buffer.buffer, + s->buf, + MIN(sizeof(s->buf), + s->loc[locty].w_buffer.size)); + s->loc[locty].w_offset =3D s->offset; + break; + case TPM_TIS_STATE_COMPLETION: + memcpy(s->loc[locty].r_buffer.buffer, + s->buf, + MIN(sizeof(s->buf), + s->loc[locty].r_buffer.size)); + s->loc[locty].r_offset =3D s->offset; + break; + default: + break; + } + } + + DPRINTF("tpm_tis: resume : locty =3D %d : r_offset =3D %d, w_offset = =3D %d\n", + locty, s->loc[0].r_offset, s->loc[0].w_offset); + + return 0; +} + +static const VMStateDescription vmstate_locty =3D { + .name =3D "loc", + .version_id =3D 1, + .minimum_version_id =3D 0, + .minimum_version_id_old =3D 0, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(state, TPMLocality), + VMSTATE_UINT32(inte, TPMLocality), + VMSTATE_UINT32(ints, TPMLocality), + VMSTATE_UINT8(access, TPMLocality), + VMSTATE_UINT32(sts, TPMLocality), + VMSTATE_UINT32(iface_id, TPMLocality), + VMSTATE_END_OF_LIST(), + } +}; + static const VMStateDescription vmstate_tpm_tis =3D { .name =3D "tpm", - .unmigratable =3D 1, + .version_id =3D 1, + .minimum_version_id =3D 0, + .minimum_version_id_old =3D 0, + .pre_save =3D tpm_tis_pre_save, + .post_load =3D tpm_tis_post_load, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32(offset, TPMState), + VMSTATE_BUFFER(buf, TPMState), + VMSTATE_UINT8(active_locty, TPMState), + VMSTATE_UINT8(aborting_locty, TPMState), + VMSTATE_UINT8(next_locty, TPMState), + + VMSTATE_STRUCT_ARRAY(loc, TPMState, TPM_TIS_NUM_LOCALITIES, 1, + vmstate_locty, TPMLocality), + + VMSTATE_END_OF_LIST() + } }; =20 static Property tpm_tis_properties[] =3D { --=20 2.5.5