From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rap7p-0007fZ-0l for qemu-devel@nongnu.org; Wed, 14 Dec 2011 08:44:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rap7n-0001Go-PL for qemu-devel@nongnu.org; Wed, 14 Dec 2011 08:44:00 -0500 Received: from e34.co.us.ibm.com ([32.97.110.152]:34640) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rap7n-0001Gc-Ej for qemu-devel@nongnu.org; Wed, 14 Dec 2011 08:43:59 -0500 Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 14 Dec 2011 06:43:58 -0700 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pBEDhgVd115326 for ; Wed, 14 Dec 2011 06:43:42 -0700 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pBEDhf5o030309 for ; Wed, 14 Dec 2011 06:43:42 -0700 From: Stefan Berger Date: Wed, 14 Dec 2011 08:43:22 -0500 Message-Id: <1323870202-25742-8-git-send-email-stefanb@linux.vnet.ibm.com> In-Reply-To: <1323870202-25742-1-git-send-email-stefanb@linux.vnet.ibm.com> References: <1323870202-25742-1-git-send-email-stefanb@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V14 7/7] Add fd parameter for TPM passthrough driver List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: stefanb@linux.vnet.ibm.com, qemu-devel@nongnu.org, anthony@codemonkey.ws Cc: andreas.niederl@iaik.tugraz.at, mst@redhat.com 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 --- 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 76e4e35..ab8831a 100644 --- a/hw/tpm_passthrough.c +++ b/hw/tpm_passthrough.c @@ -377,33 +377,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 10ae499..8b3fba8 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1928,7 +1928,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. @@ -1937,6 +1937,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 -- 1.7.6.4