Date: Thu, 10 Aug 2023 07:23:55 GMT From: Corvin =?utf-8?Q?K=C3=B6hne?= <corvink@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 28dc1aa73392 - main - bhyve: add emulation for CRB register of TPM devices Message-ID: <202308100723.37A7NtWp025540@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=28dc1aa733923fbccc81281b8f2d9a6a2d96d4f9 commit 28dc1aa733923fbccc81281b8f2d9a6a2d96d4f9 Author: Corvin Köhne <corvink@FreeBSD.org> AuthorDate: 2022-08-29 10:10:44 +0000 Commit: Corvin Köhne <corvink@FreeBSD.org> CommitDate: 2023-08-10 07:23:33 +0000 bhyve: add emulation for CRB register of TPM devices Trap accesses to the CRB MMIO range and emulate them properly. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40459 --- usr.sbin/bhyve/tpm_device.c | 3 +- usr.sbin/bhyve/tpm_intf.h | 4 +- usr.sbin/bhyve/tpm_intf_crb.c | 185 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 189 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/tpm_device.c b/usr.sbin/bhyve/tpm_device.c index 3ff480d5e6bb..421d10dafb75 100644 --- a/usr.sbin/bhyve/tpm_device.c +++ b/usr.sbin/bhyve/tpm_device.c @@ -141,7 +141,8 @@ tpm_device_create(struct tpm_device **const new_dev, struct vmctx *const vm_ctx, } if (dev->intf->init) { - error = dev->intf->init(&dev->intf_sc, dev->emul, dev->emul_sc); + error = dev->intf->init(&dev->intf_sc, dev->emul, dev->emul_sc, + dev->acpi_dev); if (error) goto err_out; } diff --git a/usr.sbin/bhyve/tpm_intf.h b/usr.sbin/bhyve/tpm_intf.h index b1523270d7e7..8f50297138d9 100644 --- a/usr.sbin/bhyve/tpm_intf.h +++ b/usr.sbin/bhyve/tpm_intf.h @@ -9,6 +9,7 @@ #include <vmmapi.h> +#include "acpi_device.h" #include "config.h" #include "tpm_device.h" #include "tpm_emul.h" @@ -31,7 +32,8 @@ struct tpm_intf { const char *name; - int (*init)(void **sc, struct tpm_emul *emul, void *emul_sc); + int (*init)(void **sc, struct tpm_emul *emul, void *emul_sc, + struct acpi_device *acpi_dev); void (*deinit)(void *sc); int (*build_acpi_table)(void *sc, struct vmctx *vm_ctx); }; diff --git a/usr.sbin/bhyve/tpm_intf_crb.c b/usr.sbin/bhyve/tpm_intf_crb.c index c4bfaa19958d..6aeafe7f0ec1 100644 --- a/usr.sbin/bhyve/tpm_intf_crb.c +++ b/usr.sbin/bhyve/tpm_intf_crb.c @@ -253,7 +253,173 @@ tpm_crb_thread(void *const arg) } static int -tpm_crb_init(void **sc, struct tpm_emul *emul, void *emul_sc) +tpm_crb_mmiocpy(void *const dst, void *const src, const int size) +{ + if (!(size == 1 || size == 2 || size == 4 || size == 8)) + return (EINVAL); + memcpy(dst, src, size); + + return (0); +} + +static int +tpm_crb_mem_handler(struct vcpu *vcpu __unused, const int dir, + const uint64_t addr, const int size, uint64_t *const val, void *const arg1, + const long arg2 __unused) +{ + struct tpm_crb *crb; + uint8_t *ptr; + uint64_t off, shift; + int error = 0; + + if ((addr & (size - 1)) != 0) { + warnx("%s: unaligned %s access @ %16lx [size = %x]", __func__, + (dir == MEM_F_READ) ? "read" : "write", addr, size); + return (EINVAL); + } + + crb = arg1; + + off = addr - TPM_CRB_ADDRESS; + if (off > TPM_CRB_REGS_SIZE || off + size >= TPM_CRB_REGS_SIZE) { + return (EINVAL); + } + + shift = 8 * (off & 3); + ptr = (uint8_t *)&crb->regs + off; + + if (dir == MEM_F_READ) { + error = tpm_crb_mmiocpy(val, ptr, size); + if (error) + goto err_out; + } else { + switch (off & ~0x3) { + case offsetof(struct tpm_crb_regs, loc_ctrl): { + union tpm_crb_reg_loc_ctrl loc_ctrl; + + if ((size_t)size > sizeof(loc_ctrl)) + goto err_out; + + *val = *val << shift; + tpm_crb_mmiocpy(&loc_ctrl, val, size); + + if (loc_ctrl.relinquish) { + crb->regs.loc_sts.granted = false; + crb->regs.loc_state.loc_assigned = false; + } else if (loc_ctrl.request_access) { + crb->regs.loc_sts.granted = true; + crb->regs.loc_state.loc_assigned = true; + } + + break; + } + case offsetof(struct tpm_crb_regs, ctrl_req): { + union tpm_crb_reg_ctrl_req req; + + if ((size_t)size > sizeof(req)) + goto err_out; + + *val = *val << shift; + tpm_crb_mmiocpy(&req, val, size); + + if (req.cmd_ready && !req.go_idle) { + crb->regs.ctrl_sts.tpm_idle = false; + } else if (!req.cmd_ready && req.go_idle) { + crb->regs.ctrl_sts.tpm_idle = true; + } + + break; + } + case offsetof(struct tpm_crb_regs, ctrl_cancel): { + /* TODO: cancel the tpm command */ + warnx( + "%s: cancelling a TPM command is not implemented yet", + __func__); + + break; + } + case offsetof(struct tpm_crb_regs, ctrl_start): { + union tpm_crb_reg_ctrl_start start; + + if ((size_t)size > sizeof(start)) + goto err_out; + + *val = *val << shift; + + pthread_mutex_lock(&crb->mutex); + tpm_crb_mmiocpy(&start, val, size); + + if (!start.start || crb->regs.ctrl_start.start) + break; + + crb->regs.ctrl_start.start = true; + + pthread_cond_signal(&crb->cond); + pthread_mutex_unlock(&crb->mutex); + + break; + } + case offsetof(struct tpm_crb_regs, cmd_size): + case offsetof(struct tpm_crb_regs, cmd_addr_lo): + case offsetof(struct tpm_crb_regs, cmd_addr_hi): + case offsetof(struct tpm_crb_regs, rsp_size): + case offsetof(struct tpm_crb_regs, + rsp_addr) ... offsetof(struct tpm_crb_regs, rsp_addr) + + 4: + case offsetof(struct tpm_crb_regs, + data_buffer) ... offsetof(struct tpm_crb_regs, data_buffer) + + TPM_CRB_DATA_BUFFER_SIZE / 4: + /* + * Those fields are used to execute a TPM command. The + * crb_thread will access them. For that reason, we have + * to acquire the crb mutex in order to write them. + */ + pthread_mutex_lock(&crb->mutex); + error = tpm_crb_mmiocpy(ptr, val, size); + pthread_mutex_unlock(&crb->mutex); + if (error) + goto err_out; + break; + default: + /* + * The other fields are either readonly or we do not + * support writing them. + */ + error = EINVAL; + goto err_out; + } + } + + return (0); + +err_out: + warnx("%s: invalid %s @ %16lx [size = %d]", __func__, + dir == MEM_F_READ ? "read" : "write", addr, size); + + return (error); +} + +static int +tpm_crb_modify_mmio_registration(const bool registration, void *const arg1) +{ + struct mem_range crb_mmio = { + .name = "crb-mmio", + .base = TPM_CRB_ADDRESS, + .size = TPM_CRB_LOCALITIES_MAX * TPM_CRB_CONTROL_AREA_SIZE, + .flags = MEM_F_RW, + .arg1 = arg1, + .handler = tpm_crb_mem_handler, + }; + + if (registration) + return (register_mem(&crb_mmio)); + else + return (unregister_mem(&crb_mmio)); +} + +static int +tpm_crb_init(void **sc, struct tpm_emul *emul, void *emul_sc, + struct acpi_device *acpi_dev) { struct tpm_crb *crb = NULL; int error; @@ -304,6 +470,19 @@ tpm_crb_init(void **sc, struct tpm_emul *emul, void *emul_sc) goto err_out; } + error = acpi_device_add_res_fixed_memory32(acpi_dev, false, + TPM_CRB_ADDRESS, TPM_CRB_CONTROL_AREA_SIZE); + if (error) { + warnx("%s: failed to add acpi resources\n", __func__); + goto err_out; + } + + error = tpm_crb_modify_mmio_registration(true, crb); + if (error) { + warnx("%s: failed to register crb mmio", __func__); + goto err_out; + } + error = pthread_mutex_init(&crb->mutex, NULL); if (error) { warnc(error, "%s: failed to init mutex", __func__); @@ -338,6 +517,7 @@ static void tpm_crb_deinit(void *sc) { struct tpm_crb *crb; + int error; if (sc == NULL) { return; @@ -352,6 +532,9 @@ tpm_crb_deinit(void *sc) pthread_cond_destroy(&crb->cond); pthread_mutex_destroy(&crb->mutex); + error = tpm_crb_modify_mmio_registration(false, NULL); + assert(error == 0); + free(crb); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308100723.37A7NtWp025540>