From patchwork Mon Dec 12 19:12:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 130943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 84C751007D7 for ; Tue, 13 Dec 2011 09:55:36 +1100 (EST) Received: from localhost ([::1]:56293 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaEmT-0006c6-1m for incoming@patchwork.ozlabs.org; Mon, 12 Dec 2011 17:55:33 -0500 Received: from eggs.gnu.org ([140.186.70.92]:48952) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaEmE-0006SM-Va for qemu-devel@nongnu.org; Mon, 12 Dec 2011 17:55:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RaEmD-0000XE-LI for qemu-devel@nongnu.org; Mon, 12 Dec 2011 17:55:18 -0500 Received: from e37.co.us.ibm.com ([32.97.110.158]:37421) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RaEmD-0000X9-Ds for qemu-devel@nongnu.org; Mon, 12 Dec 2011 17:55:17 -0500 Received: from /spool/local by e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 12 Dec 2011 15:55:16 -0700 Received: from d03relay04.boulder.ibm.com (9.17.195.106) by e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 12 Dec 2011 15:55:14 -0700 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pBCMtEm7115054 for ; Mon, 12 Dec 2011 15:55:14 -0700 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pBCMtCrb028427 for ; Mon, 12 Dec 2011 15:55:13 -0700 Received: from d941e-5.watson.ibm.com (d941e-5.watson.ibm.com [9.59.241.149]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pBCMt9ix028254 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 12 Dec 2011 15:55:12 -0700 Received: from d941e-5.watson.ibm.com (localhost [127.0.0.1]) by d941e-5.watson.ibm.com (8.14.5/8.14.5) with ESMTP id pBCJCYGd021737; Mon, 12 Dec 2011 14:12:34 -0500 Received: (from root@localhost) by d941e-5.watson.ibm.com (8.14.5/8.14.5/Submit) id pBCJCXaX021736; Mon, 12 Dec 2011 14:12:33 -0500 From: Stefan Berger To: stefanb@linux.vnet.ibm.com, qemu-devel@nongnu.org, anthony@codemonkey.ws Date: Mon, 12 Dec 2011 14:12:16 -0500 Message-Id: <1323717136-21661-8-git-send-email-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.6.4 In-Reply-To: <1323717136-21661-1-git-send-email-stefanb@linux.vnet.ibm.com> References: <1323717136-21661-1-git-send-email-stefanb@linux.vnet.ibm.com> x-cbid: 11121222-7408-0000-0000-000001386A1E X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.158 Cc: andreas.niederl@iaik.tugraz.at, mst@redhat.com Subject: [Qemu-devel] [PATCH V13 7/7] Add fd parameter for TPM passthrough driver X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Enable the passing of a file descriptor via fd=<..> to access the host's TPM device using the TPM passthrough driver. Signed-off-by: Stefan Berger --- v13: - Only accepting a character device's file descriptor v12: - added documentation part --- hw/tpm_passthrough.c | 73 +++++++++++++++++++++++++++++++++++++------------- qemu-config.c | 5 +++ qemu-options.hx | 6 +++- 3 files changed, 64 insertions(+), 20 deletions(-) diff --git a/hw/tpm_passthrough.c b/hw/tpm_passthrough.c index f9cfe3d..57bb77a 100644 --- a/hw/tpm_passthrough.c +++ b/hw/tpm_passthrough.c @@ -361,33 +361,68 @@ static int tpm_passthrough_handle_device_opts(QemuOpts *opts, TPMBackend *tb) const char *value; char buf[64]; int n; + struct stat statbuf; - value = qemu_opt_get(opts, "path"); - if (!value) { - value = TPM_PASSTHROUGH_DEFAULT_DEVICE; - } + value = qemu_opt_get(opts, "fd"); + if (value) { + if (qemu_opt_get(opts, "path")) { + error_report("fd= is invalid with path="); + return -1; + } + + tb->s.tpm_pt->tpm_fd = qemu_parse_fd(value); + if (tb->s.tpm_pt->tpm_fd < 0) { + error_report("Illegal file descriptor for TPM device.\n"); + return -1; + } - n = snprintf(tb->s.tpm_pt->tpm_dev, sizeof(tb->s.tpm_pt->tpm_dev), - "%s", value); + snprintf(buf, sizeof(buf), "fd=%d", tb->s.tpm_pt->tpm_fd); - if (n >= sizeof(tb->s.tpm_pt->tpm_dev)) { - error_report("TPM device path is too long.\n"); - goto err_exit; - } + tb->parameters = g_strdup(buf); - snprintf(buf, sizeof(buf), "path=%s", tb->s.tpm_pt->tpm_dev); + if (tb->parameters == NULL) { + goto err_close_tpmdev; + } + } else { + value = qemu_opt_get(opts, "path"); + if (!value) { + value = TPM_PASSTHROUGH_DEFAULT_DEVICE; + } + + n = snprintf(tb->s.tpm_pt->tpm_dev, sizeof(tb->s.tpm_pt->tpm_dev), + "%s", value); + + if (n >= sizeof(tb->s.tpm_pt->tpm_dev)) { + error_report("TPM device path is too long.\n"); + goto err_exit; + } - tb->parameters = g_strdup(buf); + snprintf(buf, sizeof(buf), "path=%s", tb->s.tpm_pt->tpm_dev); - if (tb->parameters == NULL) { - return 1; + tb->parameters = g_strdup(buf); + + if (tb->parameters == NULL) { + return 1; + } + + tb->s.tpm_pt->tpm_fd = open(tb->s.tpm_pt->tpm_dev, O_RDWR); + if (tb->s.tpm_pt->tpm_fd < 0) { + error_report("Cannot access TPM device using '%s'.\n", + tb->s.tpm_pt->tpm_dev); + goto err_exit; + } } - tb->s.tpm_pt->tpm_fd = open(tb->s.tpm_pt->tpm_dev, O_RDWR); - if (tb->s.tpm_pt->tpm_fd < 0) { - error_report("Cannot access TPM device using '%s'.\n", - tb->s.tpm_pt->tpm_dev); - goto err_exit; + if (fstat(tb->s.tpm_pt->tpm_fd, &statbuf) != 0) { + error_report("Cannot determine file descriptor type for TPM " + "device: %s", strerror(errno)); + goto err_close_tpmdev; + } + + /* only allow character devices for now */ + if (!S_ISCHR(statbuf.st_mode)) { + error_report("TPM file descriptor is not a character device"); + goto err_close_tpmdev; } if (tpm_passthrough_test_tpmdev(tb->s.tpm_pt->tpm_fd)) { diff --git a/qemu-config.c b/qemu-config.c index cc4c31d..e49f4d8 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -564,6 +564,11 @@ static QemuOptsList qemu_tpmdev_opts = { .type = QEMU_OPT_STRING, .help = "Persistent storage for TPM state", }, + { + .name = "fd", + .type = QEMU_OPT_STRING, + .help = "Filedescriptor for accessing the TPM", + }, { /* end of list */ } }, }; diff --git a/qemu-options.hx b/qemu-options.hx index 4916baf..7eca701 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1932,7 +1932,7 @@ Use ? to print all available TPM backend types. qemu -tpmdev ? @end example -@item -tpmdev passthrough, id=@var{id}, path=@var{path} +@item -tpmdev passthrough, id=@var{id}, path=@var{path}, fd=@var{h} (Linux-host only) Enable access to the host's TPM using the passthrough driver. @@ -1941,6 +1941,10 @@ driver. a Linux host this would be @code{/dev/tpm0}. @option{path} is optional and by default @code{/dev/tpm0} is used. +@option{fd} specifies the file descriptor of the host's TPM device. +@option{fd} and @option{path} are mutually exclusive. +@option{fd} is optional. + Some notes about using the host's TPM with the passthrough driver: The TPM device accessed by the passthrough driver must not be