qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH v4 0/8] Provide support for the software TPM emulator
@ 2017-05-16  7:58 Amarnath Valluri
  2017-05-16  7:58 ` [Qemu-devel] [PATCH v4 1/8] tpm-backend: Remove unneeded member variable from backend class Amarnath Valluri
                   ` (8 more replies)
  0 siblings, 9 replies; 25+ messages in thread
From: Amarnath Valluri @ 2017-05-16  7:58 UTC (permalink / raw)
  To: qemu-devel; +Cc: Amarnath Valluri

Briefly, Theses set of patches introduces:
  - new TPM backend driver to support software TPM emulators(swtpm(1)).
  - and few supported fixes/enhancements/cleanup to existing tpm backend code.

  The similar idea was initiated earliar(2) by Stefan Berger(CCed) with slightly
  different approach, using CUSE. As swtpm has excellent support for unix domain
  sockets, hence this implementation uses unix domain sockets to communicate
  with
  swtpm.

  When Qemu is configured with 'emulator' tpm backend, it spawns 'swtpm' and
  communicates its via Unix domain sockets.

  1) https://github.com/stefanberger/swtpm
  2) https://lists.nongnu.org/archive/html/qemu-devel/2016-01/msg00089.html

** Changes in V2:
- Made spawnning swtpm optional
- used QIOChannel instead of plain unix sockets
- incorporated other fixes pointed in v1 review

** Changes in v3:
- Addressed review comments made by Stefan Berger and Deniel P Berrange

** Changes in v4:
- Moved realloc_buffer() to TIS model
- Made TpmInfo related change backwards compatible.

Amarnath Valluri (8):
  tpm-backend: Remove unneeded member variable from backend class
  tpm-backend: Move thread handling inside TPMBackend
  tpm-backend: Initialize and free data members in it's own methods
  tpm-backend: Made few interface methods optional
  tmp backend: Add new api to read backend TpmInfo
  tpm-backend: Move realloc_buffer() implementation to tpm-tis model
  tpm-passthrough: move reusable code to utils
  tpm: Added support for TPM emulator

 backends/tpm.c                   | 117 +++--
 configure                        |  15 +-
 hmp.c                            |  27 +-
 hw/tpm/Makefile.objs             |   1 +
 hw/tpm/tpm_emulator.c            | 950 +++++++++++++++++++++++++++++++++++++++
 hw/tpm/tpm_ioctl.h               | 243 ++++++++++
 hw/tpm/tpm_passthrough.c         | 238 +++-------
 hw/tpm/tpm_tis.c                 |  14 +-
 hw/tpm/tpm_util.c                |  25 ++
 hw/tpm/tpm_util.h                |   4 +
 include/sysemu/tpm_backend.h     |  96 ++--
 include/sysemu/tpm_backend_int.h |  41 --
 qapi-schema.json                 |  41 +-
 qemu-options.hx                  |  53 ++-
 tpm.c                            |  38 +-
 15 files changed, 1545 insertions(+), 358 deletions(-)
 create mode 100644 hw/tpm/tpm_emulator.c
 create mode 100644 hw/tpm/tpm_ioctl.h
 delete mode 100644 include/sysemu/tpm_backend_int.h

-- 
2.7.4

^ permalink raw reply	[flat|nested] 25+ messages in thread
* Re: [Qemu-devel] [PATCH v3 4/8] tpm-backend: Made few interface methods optional
@ 2017-05-02 12:29 Marc-André Lureau
  2017-05-04 11:06 ` [Qemu-devel] [PATCH v4 " Amarnath Valluri
  0 siblings, 1 reply; 25+ messages in thread
From: Marc-André Lureau @ 2017-05-02 12:29 UTC (permalink / raw)
  To: Amarnath Valluri, qemu-devel; +Cc: stefanb, patrick.ohly, berrange

On Tue, May 2, 2017 at 3:52 PM Amarnath Valluri <amarnath.valluri@intel.com>
wrote:

> This allows backend implementations left optional interface methods.
> For mandatory methods assertion checks added.
>
> Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>

---
>  backends/tpm.c           | 24 ++++++++++++++++++------
>  hw/tpm/tpm_passthrough.c | 16 ----------------
>  2 files changed, 18 insertions(+), 22 deletions(-)
>
> diff --git a/backends/tpm.c b/backends/tpm.c
> index cf5abf1..8245426 100644
> --- a/backends/tpm.c
> +++ b/backends/tpm.c
> @@ -48,7 +48,7 @@ const char *tpm_backend_get_desc(TPMBackend *s)
>  {
>      TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
>
> -    return k->ops->desc();
> +    return k->ops->desc ? k->ops->desc() : "";
>  }
>

If it only need to returns const, we may consider using a class field,
defaulting to null.

Who is using it? tpm_backend_get_desc() not being called anywhere. Let's
remove it?


>  int tpm_backend_init(TPMBackend *s, TPMState *state,
> @@ -59,7 +59,7 @@ int tpm_backend_init(TPMBackend *s, TPMState *state,
>      s->tpm_state = state;
>      s->recv_data_callback = datacb;
>
> -    return k->ops->init(s);
> +    return k->ops->init ? k->ops->init(s) : 0;
>  }
>
>  int tpm_backend_startup_tpm(TPMBackend *s)
> @@ -73,13 +73,15 @@ int tpm_backend_startup_tpm(TPMBackend *s)
>                                         NULL);
>      g_thread_pool_push(s->thread_pool, (gpointer)TPM_BACKEND_CMD_INIT,
> NULL);
>
> -    return k->ops->startup_tpm(s);
> +    return k->ops->startup_tpm ? k->ops->startup_tpm(s) : 0;
>  }
>
>  bool tpm_backend_had_startup_error(TPMBackend *s)
>  {
>      TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
>
> +    assert(k->ops->had_startup_error);
> +
>      return k->ops->had_startup_error(s);
>  }
>
> @@ -87,6 +89,8 @@ size_t tpm_backend_realloc_buffer(TPMBackend *s,
> TPMSizedBuffer *sb)
>  {
>      TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
>
> +    assert(k->ops->realloc_buffer);
> +
>      return k->ops->realloc_buffer(sb);
>  }
>
> @@ -100,7 +104,9 @@ void tpm_backend_reset(TPMBackend *s)
>  {
>      TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
>
> -    k->ops->reset(s);
> +    if (k->ops->reset) {
> +        k->ops->reset(s);
> +    }
>
>      tpm_backend_thread_end(s);
>  }
> @@ -109,6 +115,8 @@ void tpm_backend_cancel_cmd(TPMBackend *s)
>  {
>      TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
>
> +    g_assert(k->ops->cancel_cmd);
>

Let's use assert() for consistency in the file


> +
>      k->ops->cancel_cmd(s);
>  }
>
> @@ -116,20 +124,24 @@ bool tpm_backend_get_tpm_established_flag(TPMBackend
> *s)
>  {
>      TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
>
> -    return k->ops->get_tpm_established_flag(s);
> +    return k->ops->get_tpm_established_flag ?
> +           k->ops->get_tpm_established_flag(s) : false;
>  }
>
>  int tpm_backend_reset_tpm_established_flag(TPMBackend *s, uint8_t locty)
>  {
>      TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
>
> -    return k->ops->reset_tpm_established_flag(s, locty);
> +    return k->ops->reset_tpm_established_flag ?
> +           k->ops->reset_tpm_established_flag(s, locty) : 0;
>  }
>
>  TPMVersion tpm_backend_get_tpm_version(TPMBackend *s)
>  {
>      TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);
>
> +    assert(k->ops->get_tpm_version);
> +
>      return k->ops->get_tpm_version(s);
>  }
>
> diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
> index 815a72e..bbe9e5a 100644
> --- a/hw/tpm/tpm_passthrough.c
> +++ b/hw/tpm/tpm_passthrough.c
> @@ -227,15 +227,6 @@ static void tpm_passthrough_handle_request(TPMBackend
> *tb, TPMBackendCmd cmd)
>      }
>  }
>
> -/*
> - * Start the TPM (thread). If it had been started before, then terminate
> - * and start it again.
> - */
> -static int tpm_passthrough_startup_tpm(TPMBackend *tb)
> -{
> -    return 0;
> -}
> -
>  static void tpm_passthrough_reset(TPMBackend *tb)
>  {
>      TPMPassthruState *tpm_pt = TPM_PASSTHROUGH(tb);
> @@ -247,11 +238,6 @@ static void tpm_passthrough_reset(TPMBackend *tb)
>      tpm_pt->had_startup_error = false;
>  }
>
> -static int tpm_passthrough_init(TPMBackend *tb)
> -{
> -    return 0;
> -}
> -
>  static bool tpm_passthrough_get_tpm_established_flag(TPMBackend *tb)
>  {
>      return false;
> @@ -455,8 +441,6 @@ static const TPMDriverOps tpm_passthrough_driver = {
>      .opts                     = tpm_passthrough_cmdline_opts,
>      .desc                     = tpm_passthrough_create_desc,
>      .create                   = tpm_passthrough_create,
> -    .init                     = tpm_passthrough_init,
> -    .startup_tpm              = tpm_passthrough_startup_tpm,
>      .realloc_buffer           = tpm_passthrough_realloc_buffer,
>      .reset                    = tpm_passthrough_reset,
>      .had_startup_error        = tpm_passthrough_get_startup_error,
> --
> 2.7.4
>
>
othewise,
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-- 
Marc-André Lureau

^ permalink raw reply	[flat|nested] 25+ messages in thread
end of thread, other threads:[~2017-06-13  9:12 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-16  7:58 [Qemu-devel] [PATCH v4 0/8] Provide support for the software TPM emulator Amarnath Valluri
2017-05-16  7:58 ` [Qemu-devel] [PATCH v4 1/8] tpm-backend: Remove unneeded member variable from backend class Amarnath Valluri
2017-05-24 14:15   ` Stefan Berger
2017-05-24 14:34   ` Marc-André Lureau
2017-06-05  7:22     ` Valluri, Amarnath
2017-06-05  9:57       ` Marc-André Lureau
2017-05-16  7:58 ` [Qemu-devel] [PATCH v4 2/8] tpm-backend: Move thread handling inside TPMBackend Amarnath Valluri
2017-05-24 14:19   ` Stefan Berger
2017-05-16  7:58 ` [Qemu-devel] [PATCH v4 3/8] tpm-backend: Initialize and free data members in it's own methods Amarnath Valluri
2017-05-24 14:24   ` Stefan Berger
2017-05-16  7:58 ` [Qemu-devel] [PATCH v4 4/8] tpm-backend: Made few interface methods optional Amarnath Valluri
2017-05-24 14:28   ` Stefan Berger
2017-05-16  7:58 ` [Qemu-devel] [PATCH v4 5/8] tmp backend: Add new api to read backend TpmInfo Amarnath Valluri
2017-05-24 14:34   ` Stefan Berger
2017-05-16  7:58 ` [Qemu-devel] [PATCH v4 6/8] tpm-backend: Move realloc_buffer() implementation to tpm-tis model Amarnath Valluri
2017-05-24 14:37   ` Stefan Berger
2017-05-16  7:58 ` [Qemu-devel] [PATCH v4 7/8] tpm-passthrough: move reusable code to utils Amarnath Valluri
2017-05-24 14:39   ` Stefan Berger
2017-05-16  7:58 ` [Qemu-devel] [PATCH v4 8/8] tpm: Added support for TPM emulator Amarnath Valluri
2017-05-24 15:15   ` Stefan Berger
2017-06-05  7:25     ` Valluri, Amarnath
2017-06-12 19:26       ` Stefan Berger
2017-06-13  9:12         ` Valluri, Amarnath
2017-05-22 12:40 ` [Qemu-devel] [PATCH v4 0/8] Provide support for the software " Valluri, Amarnath
  -- strict thread matches above, loose matches on Subject: below --
2017-05-02 12:29 [Qemu-devel] [PATCH v3 4/8] tpm-backend: Made few interface methods optional Marc-André Lureau
2017-05-04 11:06 ` [Qemu-devel] [PATCH v4 " Amarnath Valluri

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).