From patchwork Fri Oct 27 23:02:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 10030813 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3C36A6034B for ; Fri, 27 Oct 2017 23:04:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4339725D9E for ; Fri, 27 Oct 2017 23:04:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36725269E2; Fri, 27 Oct 2017 23:04:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D4B0225D9E for ; Fri, 27 Oct 2017 23:04:43 +0000 (UTC) Received: from localhost ([::1]:59185 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e8Dg9-0002iF-0n for patchwork-qemu-devel@patchwork.kernel.org; Fri, 27 Oct 2017 19:04:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e8Dee-0002ee-OS for qemu-devel@nongnu.org; Fri, 27 Oct 2017 19:03:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e8DeY-0003wO-Rx for qemu-devel@nongnu.org; Fri, 27 Oct 2017 19:03:08 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:56924 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 1e8DeY-0003vg-JO for qemu-devel@nongnu.org; Fri, 27 Oct 2017 19:03:02 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v9RMwnaY034190 for ; Fri, 27 Oct 2017 19:02:56 -0400 Received: from e15.ny.us.ibm.com (e15.ny.us.ibm.com [129.33.205.205]) by mx0b-001b2d01.pphosted.com with ESMTP id 2dv8bdnvvh-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 27 Oct 2017 19:02:55 -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:02:55 -0400 Received: from b01cxnp22034.gho.pok.ibm.com (9.57.198.24) 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:52 -0400 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp22034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v9RN2pwp52625426; Fri, 27 Oct 2017 23:02:51 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 51D9FAC03F; Fri, 27 Oct 2017 19:03:37 -0400 (EDT) Received: from sbct-3.watson.ibm.com (unknown [9.47.158.153]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP id 3B78AAC03A; Fri, 27 Oct 2017 19:03:37 -0400 (EDT) From: Stefan Berger To: qemu-devel@nongnu.org Date: Fri, 27 Oct 2017 19:02:36 -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-00000282CB2A 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:54 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17102723-0037-0000-0000-00004235CFE5 Message-Id: <1509145361-11218-3-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.158.5 Subject: [Qemu-devel] [PATCH v2 2/7] tpm: Introduce condition in TPM backend for notification 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP TPM backends will suspend independently of the frontends. Also here we need to be able to wait for the TPM command to have been completely processed. Signed-off-by: Stefan Berger --- backends/tpm.c | 19 +++++++++++++++++++ include/sysemu/tpm_backend.h | 14 ++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/backends/tpm.c b/backends/tpm.c index 7777467..2f60166 100644 --- a/backends/tpm.c +++ b/backends/tpm.c @@ -20,6 +20,14 @@ #include "qemu/thread.h" #include "qemu/main-loop.h" +void tpm_backend_cmd_completed(TPMBackend *s) +{ + qemu_mutex_lock(&s->state_lock); + s->tpm_busy = false; + qemu_cond_signal(&s->cmd_complete); + qemu_mutex_unlock(&s->state_lock); +} + static void tpm_backend_request_completed_bh(void *opaque) { TPMBackend *s = TPM_BACKEND(opaque); @@ -36,6 +44,9 @@ static void tpm_backend_worker_thread(gpointer data, gpointer user_data) k->handle_request(s, (TPMBackendCmd *)data); qemu_bh_schedule(s->bh); + + /* result delivered */ + tpm_backend_cmd_completed(s); } static void tpm_backend_thread_end(TPMBackend *s) @@ -64,6 +75,10 @@ int tpm_backend_init(TPMBackend *s, TPMIf *tpmif, Error **errp) object_ref(OBJECT(tpmif)); s->had_startup_error = false; + s->tpm_busy = false; + + qemu_mutex_init(&s->state_lock); + qemu_cond_init(&s->cmd_complete); return 0; } @@ -93,6 +108,10 @@ bool tpm_backend_had_startup_error(TPMBackend *s) void tpm_backend_deliver_request(TPMBackend *s, TPMBackendCmd *cmd) { + qemu_mutex_lock(&s->state_lock); + s->tpm_busy = true; + qemu_mutex_unlock(&s->state_lock); + g_thread_pool_push(s->thread_pool, cmd, NULL); } diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h index d02067e..e08c51d 100644 --- a/include/sysemu/tpm_backend.h +++ b/include/sysemu/tpm_backend.h @@ -19,6 +19,7 @@ #include "qemu/option.h" #include "sysemu/tpm.h" #include "hw/tpm/tpm_int.h" +#include "qemu/thread.h" #define TYPE_TPM_BACKEND "tpm-backend" #define TPM_BACKEND(obj) \ @@ -54,6 +55,10 @@ struct TPMBackend { char *id; QLIST_ENTRY(TPMBackend) list; + + QemuMutex state_lock; + QemuCond cmd_complete; /* signaled once tpm_busy is false */ + bool tpm_busy; }; struct TPMBackendClass { @@ -193,6 +198,15 @@ TPMVersion tpm_backend_get_tpm_version(TPMBackend *s); */ TPMInfo *tpm_backend_query_tpm(TPMBackend *s); +/** + * tpm_backend_cmd_completed: + * @s: the backend + * + * Mark the backend as not busy and notify anyone interested + * in the state changed + */ +void tpm_backend_cmd_completed(TPMBackend *s); + TPMBackend *qemu_find_tpm_be(const char *id); void tpm_register_model(enum TpmModel model);