Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753900AbcCMBwo (ORCPT <rfc822;w@1wt.eu>);
	Sat, 12 Mar 2016 20:52:44 -0500
Received: from e19.ny.us.ibm.com ([129.33.205.209]:38018 "EHLO
	e19.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753663AbcCMBwd (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sat, 12 Mar 2016 20:52:33 -0500
X-IBM-Helo: d01dlp01.pok.ibm.com
X-IBM-MailFrom: stefanb@linux.vnet.ibm.com
X-IBM-RcptTo: linux-api@vger.kernel.org;linux-doc@vger.kernel.org;linux-kernel@vger.kernel.org;linux-security-module@vger.kernel.org
Subject: Re: [PATCH v7 08/10] tpm: Proxy driver for supporting multiple
 emulated TPMs
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
References: <1457751065-11507-1-git-send-email-stefanb@linux.vnet.ibm.com>
 <1457751065-11507-9-git-send-email-stefanb@linux.vnet.ibm.com>
 <20160312185154.GA12412@intel.com>
Cc: jgunthorpe@obsidianresearch.com, linux-security-module@vger.kernel.org,
        linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
        linux-api@vger.kernel.org
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
Message-ID: <56E4C7DC.6010608@linux.vnet.ibm.com>
Date: Sat, 12 Mar 2016 20:52:28 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.3.0
MIME-Version: 1.0
In-Reply-To: <20160312185154.GA12412@intel.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
X-TM-AS-MML: disable
X-Content-Scanned: Fidelis XPS MAILER
x-cbid: 16031301-0057-0000-0000-000003B28AE7
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2755
Lines: 73

On 03/12/2016 01:51 PM, Jarkko Sakkinen wrote:
> On Fri, Mar 11, 2016 at 09:51:03PM -0500, Stefan Berger wrote:
>> This patch implements a proxy driver for supporting multiple emulated TPMs
>> in a system.
>>
>> The driver implements a device /dev/vtpmx that is used to created
>> a client device pair /dev/tpmX (e.g., /dev/tpm10) and a server side that
>> is accessed using a file descriptor returned by an ioctl.
>> The device /dev/tpmX is the usual TPM device created by the core TPM
>> driver. Applications or kernel subsystems can send TPM commands to it
>> and the corresponding server-side file descriptor receives these
>> commands and delivers them to an emulated TPM.
> With my test script [1] running on QEMU and TPM 2.0 simulator running on the
> host side I get this:
>
> $ python tpm2-simulator-vtpm --host=10.0.2.2
> cmd
> 80 01 00 00 00 0c 00 00 01 44 00 00
> rsp
> 80 01 00 00 00 0a 00 00 00 00
> Traceback (most recent call last):
>    File "tpm2-simulator-vtpm", line 85, in <module>
>      main()
>    File "tpm2-simulator-vtpm", line 80, in main
>      resp = client.send_cmd(stream)
>    File "/home/tpmdd/tpm2-scripts/tpm2.py", line 454, in send_cmd
>      rsp = self.simulator.send_cmd(cmd)
>    File "/home/tpmdd/tpm2-scripts/tpm2.py", line 436, in send_cmd
>      raise SimulatorError("Empty response")
> tpm2.SimulatorError: Empty response
>
> However, the process does not exit before the read call expires:
>
> $ python tpm2-list-handles
> Traceback (most recent call last):
>    File "tpm2-list-handles", line 61, in <module>
>      main()
>    File "tpm2-list-handles", line 51, in main
>      handles += client.get_cap(tpm2.TPM2_CAP_HANDLES, tpm2.HR_LOADED_SESSION)
>    File "/home/tpmdd/tpm2-scripts/tpm2.py", line 782, in get_cap
>      next_handles, more_data = self.__get_cap_cnt(cap, pt, 1)
>    File "/home/tpmdd/tpm2-scripts/tpm2.py", line 766, in __get_cap_cnt
>      rsp = self.send_cmd(cmd)[10:]
>    File "/home/tpmdd/tpm2-scripts/tpm2.py", line 458, in send_cmd
>      rsp = f.read()
> IOError: [Errno 62] Timer expired
>
> The server side stays stuck unti this happens.

This fix should solve the problem:

diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c 
b/drivers/char/tpm/tpm_vtpm_proxy.c
index d73944e..01e5070 100644
--- a/drivers/char/tpm/tpm_vtpm_proxy.c
+++ b/drivers/char/tpm/tpm_vtpm_proxy.c
@@ -456,10 +456,10 @@ err_delete_proxy_dev:
   */
  static void vtpm_proxy_delete_device(struct proxy_dev *proxy_dev)
  {
-       tpm_chip_unregister(proxy_dev->chip);
-
         vtpm_proxy_fops_undo_open(proxy_dev);

+      tpm_chip_unregister(proxy_dev->chip);
+
         vtpm_proxy_delete_proxy_dev(proxy_dev);
  }


Can you let me know whether this gets it working for you? I'd prepare a v9.

    Stefan