From patchwork Fri May 6 17:32:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 94416 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 4B14AB6F19 for ; Sat, 7 May 2011 03:36:05 +1000 (EST) Received: from localhost ([::1]:60392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QIOwc-0002An-Lh for incoming@patchwork.ozlabs.org; Fri, 06 May 2011 13:36:02 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QIOtz-0006hz-Tq for qemu-devel@nongnu.org; Fri, 06 May 2011 13:33:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QIOtx-0003ry-8A for qemu-devel@nongnu.org; Fri, 06 May 2011 13:33:19 -0400 Received: from e35.co.us.ibm.com ([32.97.110.153]:50356) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QIOtw-0003re-VU for qemu-devel@nongnu.org; Fri, 06 May 2011 13:33:17 -0400 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by e35.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p46HGUE9026288 for ; Fri, 6 May 2011 11:16:30 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p46HWkxj039848 for ; Fri, 6 May 2011 11:32:46 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p46BWI4N004233 for ; Fri, 6 May 2011 05:32:18 -0600 Received: from localhost.localdomain (d941e-10.watson.ibm.com [9.59.241.154]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p46BWH7W004182 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 6 May 2011 05:32:18 -0600 Received: from localhost.localdomain (d941e-10 [127.0.0.1]) by localhost.localdomain (8.14.4/8.14.3) with ESMTP id p46HWiua001221; Fri, 6 May 2011 13:32:44 -0400 Received: (from root@localhost) by localhost.localdomain (8.14.4/8.14.4/Submit) id p46HWiKD001220; Fri, 6 May 2011 13:32:44 -0400 Message-Id: <20110506173244.297608456@linux.vnet.ibm.com> User-Agent: quilt/0.48-1 Date: Fri, 06 May 2011 13:32:25 -0400 From: Stefan Berger To: stefanb@linux.vnet.ibm.com, qemu-devel@nongnu.org References: <20110506173224.278066589@linux.vnet.ibm.com> Content-Disposition: inline; filename=qemu_tpm.diff X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.110.153 Cc: andreas.niederl@iaik.tugraz.at, serge@hallyn.com Subject: [Qemu-devel] [PATCH V4 01/10] Support for TPM command line options 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 This patch adds support for TPM command line options. The command line supported here (considering the libtpms based backend) are ./qemu-... -tpm type=,path=, and ./qemu-... -tpm ? where the latter works similar to -soundhw ? and shows a list of available TPM backends (i.e., libtpms-based, Xen). Only the 'type' is interpreted in arch_init.c. Using this parameter, the backend is chosen, i.e., 'builtin' for the libtpms-based builtin TPM. The interpretation of the other parameters along with determining whether enough parameters were provided is pushed into the backend driver, which needs to implement the interface function 'handle_options' and return true if the VM can be started or 'false' if not enough or bad parameters were provided. v4: - coding style fixes v3: - added hw/tpm_tis.h to this patch so Qemu compiles at this stage Signed-off-by: Stefan Berger Acked-by: Serge Hallyn --- arch_init.c | 80 +++++++++++++++++++++++++++++++ arch_init.h | 2 hw/pc.c | 4 + hw/pc.h | 7 ++ hw/tpm_tis.h | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ qemu-config.c | 20 +++++++ qemu-options.hx | 11 ++++ vl.c | 12 ++++ 8 files changed, 279 insertions(+) Index: qemu-git/hw/pc.h =================================================================== --- qemu-git.orig/hw/pc.h +++ qemu-git/hw/pc.h @@ -6,6 +6,7 @@ #include "isa.h" #include "fdc.h" #include "net.h" +#include "tpm_tis.h" /* PC-style peripherals (also used by other machines). */ @@ -128,6 +129,12 @@ void pc_register_ferr_irq(qemu_irq irq); void pc_cmos_set_s3_resume(void *opaque, int irq, int level); void pc_acpi_smi_interrupt(void *opaque, int irq, int level); +/* tpm_tis.c */ +extern bool has_tpm; +const BackendTPMDriver *tis_set_backend_driver(const char *tpm_type); +void tis_display_backend_drivers(FILE *); + + void pc_cpus_init(const char *cpu_model); void pc_memory_init(ram_addr_t ram_size, const char *kernel_filename, Index: qemu-git/qemu-options.hx =================================================================== --- qemu-git.orig/qemu-options.hx +++ qemu-git/qemu-options.hx @@ -1041,6 +1041,17 @@ Specify SMBIOS type 0 fields Specify SMBIOS type 1 fields ETEXI +#ifndef _WIN32 +# ifdef CONFIG_TPM +DEF("tpm", HAS_ARG, QEMU_OPTION_tpm, \ + "" + "-tpm type=,path=\n" \ + " enable a TPM with state from file in given path\n" + " use -tpm ? to get a list of supported TPM types\n", + QEMU_ARCH_I386) +# endif +#endif + DEFHEADING() STEXI @end table Index: qemu-git/vl.c =================================================================== --- qemu-git.orig/vl.c +++ qemu-git/vl.c @@ -244,6 +244,8 @@ int nb_numa_nodes; uint64_t node_mem[MAX_NODES]; uint64_t node_cpumask[MAX_NODES]; +bool has_tpm = false; + static QEMUTimer *nographic_timer; uint8_t qemu_uuid[16]; @@ -2333,6 +2335,16 @@ int main(int argc, char **argv, char **e ram_size = value; break; } +#ifdef CONFIG_TPM + case QEMU_OPTION_tpm: + if (!(tpm_available())) { + printf("Option %s not supported for this target\n", + popt->name); + exit(1); + } + select_tpm(optarg); + break; +#endif case QEMU_OPTION_mempath: mem_path = optarg; break; Index: qemu-git/qemu-config.c =================================================================== --- qemu-git.orig/qemu-config.c +++ qemu-git/qemu-config.c @@ -450,6 +450,25 @@ QemuOptsList qemu_option_rom_opts = { }, }; +static QemuOptsList qemu_tpm_opts = { + .name = "tpm", + .head = QTAILQ_HEAD_INITIALIZER(qemu_tpm_opts.head), + .desc = { + { + .name = "type", + .type = QEMU_OPT_STRING, + .help = "Type of TPM backend", + }, + { + .name = "path", + .type = QEMU_OPT_STRING, + .help = "Persitent storage for TPM state", + }, + { /* end of list */ } + }, +}; + + static QemuOptsList *vm_config_groups[32] = { &qemu_drive_opts, &qemu_chardev_opts, @@ -464,6 +483,7 @@ static QemuOptsList *vm_config_groups[32 &qemu_trace_opts, #endif &qemu_option_rom_opts, + &qemu_tpm_opts, NULL, }; Index: qemu-git/arch_init.c =================================================================== --- qemu-git.orig/arch_init.c +++ qemu-git/arch_init.c @@ -41,6 +41,8 @@ #include "net.h" #include "gdbstub.h" #include "hw/smbios.h" +#include "blockdev.h" +#include "hw/tpm_tis.h" #ifdef TARGET_SPARC int graphic_width = 1024; @@ -726,3 +728,81 @@ int xen_available(void) return 0; #endif } + +int tpm_available(void) { +#ifdef CONFIG_TPM + return 1; +#else + return 0; +#endif +} + +#ifdef CONFIG_TPM + +#if defined (TARGET_I386) || defined (TARGET_X86_64) + + +static int configure_tpm(QemuOpts *opts) +{ + const char *value; + const BackendTPMDriver *be; + + if (has_tpm) { + fprintf(stderr,"Only one TPM is allowed\n"); + return 1; + } + + value = qemu_opt_get(opts, "type"); + if (!value) { + fprintf(stderr, + "Missing TPM backend type."); + tis_display_backend_drivers(stderr); + return 1; + } + + be = tis_set_backend_driver(value); + if (be == NULL) { + fprintf(stderr, + "A TPM backend driver of type %s is not supported.\n", + value); + tis_display_backend_drivers(stderr); + return 1; + } + + has_tpm = be->handle_options(opts); + if (!has_tpm) { + return 1; + } + + return 0; +} + + +void select_tpm(const char *optarg) +{ + QemuOpts *opts; + + if (strcmp("none", optarg) != 0) { + if (*optarg == '?') { + tis_display_backend_drivers(stdout); + exit(0); + } + opts = qemu_opts_parse(qemu_find_opts("tpm"), optarg, 0); + if (!opts) { + exit(1); + } + if (configure_tpm(opts)) { + exit(1); + } + } +} + +# else /* CONFIG_TPM */ + +void select_tpm(const char *optarg) +{ + (void)optarg; +} + +# endif +#endif /* CONFIG_TPM */ Index: qemu-git/arch_init.h =================================================================== --- qemu-git.orig/arch_init.h +++ qemu-git/arch_init.h @@ -29,5 +29,7 @@ int audio_available(void); void audio_init(qemu_irq *isa_pic, PCIBus *pci_bus); int kvm_available(void); int xen_available(void); +int tpm_available(void); +void select_tpm(const char *optarg); #endif Index: qemu-git/hw/tpm_tis.h =================================================================== --- /dev/null +++ qemu-git/hw/tpm_tis.h @@ -0,0 +1,143 @@ +/* + * tpm_tis.h - include file for tpm_tis.c + * + * Copyright (C) 2006,2010,2011 IBM Corporation + * + * Author: Stefan Berger + * David Safford + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, version 2 of the + * License. + */ +#ifndef _HW_TPM_TIS_H +#define _HW_TPM_TIS_H + +#include "isa.h" +#include "block_int.h" +#include "qemu-thread.h" + +#include + +#define TIS_ADDR_BASE 0xFED40000 + +#define NUM_LOCALITIES 5 /* per spec */ +#define NO_LOCALITY 0xff + +#define IS_VALID_LOCTY(x) ((x) < NUM_LOCALITIES) + + +#define TPM_TIS_IRQ 11 + +#define TIS_TPM_BUFFER_MAX 4096 + + +typedef struct TPMSizedBuffer +{ + uint32_t size; + uint8_t *buffer; +} TPMSizedBuffer; + + +enum tis_state { + STATE_IDLE = 0, + STATE_READY, + STATE_COMPLETION, + STATE_EXECUTION, + STATE_RECEPTION, +}; + + +/* locality data -- all fields are persisted */ +typedef struct TPMLocality { + enum tis_state state; + uint8_t access; + uint8_t sts; + uint32_t inte; + uint32_t ints; + + uint16_t w_offset; + uint16_t r_offset; + TPMSizedBuffer w_buffer; + TPMSizedBuffer r_buffer; +} TPMLocality; + + +/* overall state of the TPM interface; 's' marks a persisted field */ +typedef struct TPMState { + ISADevice busdev; + + uint32_t offset; + uint8_t buf[TIS_TPM_BUFFER_MAX]; + + uint8_t active_locty; + uint8_t aborting_locty; + uint8_t next_locty; + + uint8_t command_locty; + TPMLocality loc[NUM_LOCALITIES]; + + qemu_irq irq; + uint32_t irq_num; + + QemuMutex state_lock; + QemuCond from_tpm_cond; + QemuCond to_tpm_cond; + bool to_tpm_execute; + + bool tpm_initialized; +} TPMState; + + +typedef void (TPMRecvDataCB)(TPMState *s, uint8_t locty); + +typedef struct BackendTPMDriver { + const char *id; + const char *(*desc)(void); + + void (*job_for_main_thread)(void *); + + bool (*handle_options)(QemuOpts *); + + int (*init)(TPMState *s, TPMRecvDataCB *datacb); + int (*early_startup_tpm)(void); + int (*late_startup_tpm)(void); + bool (*had_startup_error)(void); + + size_t (*realloc_buffer)(TPMSizedBuffer *sb); + + void (*reset)(void); + + int (*save_volatile_data)(void); + int (*load_volatile_data)(TPMState *s); + + bool (*get_tpm_established_flag)(void); +} BackendTPMDriver; + + +void tis_reset_for_snapshot_resume(TPMState *s); +const BackendTPMDriver *tis_get_active_backend(void); + +/* utility functions */ + +static inline uint16_t tis_get_size_from_buffer(const TPMSizedBuffer *sb) +{ + return (sb->buffer[4] << 8) + sb->buffer[5]; +} + +static inline void dumpBuffer(FILE *stream, + unsigned char *buffer, unsigned int len) +{ + int i; + + for (i = 0; i < len; i++) { + if (i && !(i % 16)) { + fprintf(stream, "\n"); + } + fprintf(stream, "%.2X ", buffer[i]); + } + fprintf(stream, "\n"); +} + +#endif /* _HW_TPM_TIS_H */ Index: qemu-git/hw/pc.c =================================================================== --- qemu-git.orig/hw/pc.c +++ qemu-git/hw/pc.c @@ -1154,6 +1154,10 @@ void pc_basic_device_init(qemu_irq *isa_ fd[i] = drive_get(IF_FLOPPY, 0, i); } fdctrl_init_isa(fd); + + if (has_tpm) { + isa_create_simple("tpm-tis"); + } } void pc_pci_device_init(PCIBus *pci_bus)