* [Qemu-devel] [V9 0/4] AMD IOMMU
@ 2016-04-24 22:12 David Kiarie
2016-04-24 22:12 ` [Qemu-devel] [V9 1/4] hw/i386: Introduce " David Kiarie
` (5 more replies)
0 siblings, 6 replies; 27+ messages in thread
From: David Kiarie @ 2016-04-24 22:12 UTC (permalink / raw)
To: qemu-devel
Cc: valentine.sinitsyn, marcel, mst, jan.kizska, imammedo,
David Kiarie
Hi all,
The current AMD IOMMU patches that fixes Igor's comments. I got rid of structs and instead
added individual integer fields into the table data directly, as suggested.
I have also got rid of some un-used macros and fixed a few other miscellaneous things.
David Kiarie (4):
hw/i386: Introduce AMD IOMMU
hw/i386: ACPI table for AMD IOMMU
hw/core: Add AMD IOMMU to machine properties
hw/pci-host: Emulate AMD IOMMU
hw/acpi/aml-build.c | 2 +-
hw/acpi/core.c | 13 -
hw/core/machine.c | 32 +-
hw/i386/Makefile.objs | 1 +
hw/i386/acpi-build.c | 101 ++-
hw/i386/amd_iommu.c | 1426 +++++++++++++++++++++++++++++++++++++++++
hw/i386/amd_iommu.h | 398 ++++++++++++
hw/pci-host/q35.c | 21 +-
include/hw/acpi/acpi-defs.h | 14 +
include/hw/acpi/acpi.h | 16 +
include/hw/acpi/aml-build.h | 1 +
include/hw/boards.h | 1 +
include/hw/i386/intel_iommu.h | 1 +
include/hw/pci/pci.h | 2 +
qemu-options.hx | 7 +-
util/qemu-config.c | 8 +-
16 files changed, 2010 insertions(+), 34 deletions(-)
create mode 100644 hw/i386/amd_iommu.c
create mode 100644 hw/i386/amd_iommu.h
--
2.1.4
^ permalink raw reply [flat|nested] 27+ messages in thread* [Qemu-devel] [V9 1/4] hw/i386: Introduce AMD IOMMU 2016-04-24 22:12 [Qemu-devel] [V9 0/4] AMD IOMMU David Kiarie @ 2016-04-24 22:12 ` David Kiarie 2016-04-24 22:12 ` [Qemu-devel] [V9 2/4] hw/i386: ACPI table for " David Kiarie ` (4 subsequent siblings) 5 siblings, 0 replies; 27+ messages in thread From: David Kiarie @ 2016-04-24 22:12 UTC (permalink / raw) To: qemu-devel Cc: valentine.sinitsyn, marcel, mst, jan.kizska, imammedo, David Kiarie Add AMD IOMMU emulaton to Qemu in addition to Intel IOMMU The IOMMU does basic translation, error checking and has a minimal IOTLB implementation Signed-off-by: David Kiarie <davidkiarie4@gmail.com> --- hw/i386/Makefile.objs | 1 + hw/i386/amd_iommu.c | 1426 +++++++++++++++++++++++++++++++++++++++++++++++++ hw/i386/amd_iommu.h | 398 ++++++++++++++ include/hw/pci/pci.h | 2 + 4 files changed, 1827 insertions(+) create mode 100644 hw/i386/amd_iommu.c create mode 100644 hw/i386/amd_iommu.h diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index b52d5b8..2f1a265 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -3,6 +3,7 @@ obj-y += multiboot.o obj-y += pc.o pc_piix.o pc_q35.o obj-y += pc_sysfw.o obj-y += intel_iommu.o +obj-y += amd_iommu.o obj-$(CONFIG_XEN) += ../xenpv/ xen/ obj-y += kvmvapic.o diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c new file mode 100644 index 0000000..96ed8c3 --- /dev/null +++ b/hw/i386/amd_iommu.c @@ -0,0 +1,1426 @@ +/* + * QEMU emulation of AMD IOMMU (AMD-Vi) + * + * Copyright (C) 2011 Eduard - Gabriel Munteanu + * Copyright (C) 2015 David Kiarie, <davidkiarie4@gmail.com> + * + * 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; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + * + * Cache implementation inspired by hw/i386/intel_iommu.c + * + */ +#include "qemu/osdep.h" +#include "hw/i386/amd_iommu.h" + +/*#define DEBUG_AMD_IOMMU*/ +#ifdef DEBUG_AMD_IOMMU +enum { + DEBUG_GENERAL, DEBUG_CAPAB, DEBUG_MMIO, DEBUG_ELOG, + DEBUG_CACHE, DEBUG_COMMAND, DEBUG_MMU, DEBUG_CUSTOM +}; + +#define IOMMU_DBGBIT(x) (1 << DEBUG_##x) +static int iommu_dbgflags = IOMMU_DBGBIT(CUSTOM); + +#define IOMMU_DPRINTF(what, fmt, ...) do { \ + if (iommu_dbgflags & IOMMU_DBGBIT(what)) { \ + fprintf(stderr, "(amd-iommu)%s: " fmt "\n", __func__, \ + ## __VA_ARGS__); } \ + } while (0) +#else +#define IOMMU_DPRINTF(what, fmt, ...) do {} while (0) +#endif + +#define ENCODE_EVENT(devid, info, addr, rshift) do { \ + *(uint16_t *)&evt[0] = devid; \ + *(uint8_t *)&evt[3] = info; \ + *(uint64_t *)&evt[4] = rshift ? cpu_to_le64(addr) :\ + cpu_to_le64(addr) >> rshift; \ + } while (0) + +typedef struct AMDIOMMUAddressSpace { + uint8_t bus_num; /* bus number */ + uint8_t devfn; /* device function */ + AMDIOMMUState *iommu_state; /* IOMMU - one per machine */ + MemoryRegion iommu; /* Device's iommu region */ + AddressSpace as; /* device's corresponding address space */ +} AMDIOMMUAddressSpace; + +/* IOMMU cache entry */ +typedef struct IOMMUIOTLBEntry { + uint64_t gfn; + uint16_t domid; + uint64_t devid; + uint64_t perms; + uint64_t translated_addr; +} IOMMUIOTLBEntry; + +/* configure MMIO registers at startup/reset */ +static void amd_iommu_set_quad(AMDIOMMUState *s, hwaddr addr, uint64_t val, + uint64_t romask, uint64_t w1cmask) +{ + stq_le_p(&s->mmior[addr], val); + stq_le_p(&s->romask[addr], romask); + stq_le_p(&s->w1cmask[addr], w1cmask); +} + +static uint16_t amd_iommu_readw(AMDIOMMUState *s, hwaddr addr) +{ + return lduw_le_p(&s->mmior[addr]); +} + +static uint32_t amd_iommu_readl(AMDIOMMUState *s, hwaddr addr) +{ + return ldl_le_p(&s->mmior[addr]); +} + +static uint64_t amd_iommu_readq(AMDIOMMUState *s, hwaddr addr) +{ + return ldq_le_p(&s->mmior[addr]); +} + +/* internal write */ +static void amd_iommu_writeq_raw(AMDIOMMUState *s, uint64_t val, hwaddr addr) +{ + stq_le_p(&s->mmior[addr], val); +} + +/* external write */ +static void amd_iommu_writew(AMDIOMMUState *s, hwaddr addr, uint16_t val) +{ + uint16_t romask = lduw_le_p(&s->romask[addr]); + uint16_t w1cmask = lduw_le_p(&s->w1cmask[addr]); + uint16_t oldval = lduw_le_p(&s->mmior[addr]); + stw_le_p(&s->mmior[addr], (val & ~(val & w1cmask)) | (romask & oldval)); +} + +static void amd_iommu_writel(AMDIOMMUState *s, hwaddr addr, uint32_t val) +{ + uint32_t romask = ldl_le_p(&s->romask[addr]); + uint32_t w1cmask = ldl_le_p(&s->w1cmask[addr]); + uint32_t oldval = ldl_le_p(&s->mmior[addr]); + stl_le_p(&s->mmior[addr], (val & ~(val & w1cmask)) | (romask & oldval)); +} + +static void amd_iommu_writeq(AMDIOMMUState *s, hwaddr addr, uint64_t val) +{ + uint64_t romask = ldq_le_p(&s->romask[addr]); + uint64_t w1cmask = ldq_le_p(&s->w1cmask[addr]); + uint32_t oldval = ldq_le_p(&s->mmior[addr]); + stq_le_p(&s->mmior[addr], (val & ~(val & w1cmask)) | (romask & oldval)); +} + +static void amd_iommu_log_event(AMDIOMMUState *s, uint16_t *evt) +{ + /* event logging not enabled */ + if (!s->evtlog_enabled || *(uint64_t *)&s->mmior[IOMMU_MMIO_STATUS] | + IOMMU_MMIO_STATUS_EVT_OVF) { + return; + } + + /* event log buffer full */ + if (s->evtlog_tail >= s->evtlog_len) { + *(uint64_t *)&s->mmior[IOMMU_MMIO_STATUS] |= IOMMU_MMIO_STATUS_EVT_OVF; + /* generate interrupt */ + msi_notify(&s->dev, 0); + } + + if (dma_memory_write(&address_space_memory, s->evtlog_len + s->evtlog_tail, + &evt, IOMMU_EVENT_LEN)) { + IOMMU_DPRINTF(ELOG, "error: fail to write at address 0x%"PRIx64 + " + offset 0x%"PRIx32, s->evtlog, s->evtlog_tail); + } + + s->evtlog_tail += IOMMU_EVENT_LEN; + *(uint64_t *)&s->mmior[IOMMU_MMIO_STATUS] |= IOMMU_MMIO_STATUS_COMP_INT; +} + +/* log an error encountered page-walking + * + * @addr: virtual address in translation request + */ +static void amd_iommu_page_fault(AMDIOMMUState *s, uint16_t devid, + dma_addr_t addr, uint16_t info) +{ + IOMMU_DPRINTF(ELOG, ""); + + uint16_t evt[8]; + + info |= IOMMU_EVENT_IOPF_I | IOMMU_EVENT_IOPF; + + /* encode information */ + ENCODE_EVENT(devid, info, addr, 0); + + /* log a page fault */ + amd_iommu_log_event(s, evt); + + /* Abort the translation */ + pci_word_test_and_set_mask(s->dev.config + PCI_STATUS, + PCI_STATUS_SIG_TARGET_ABORT); +} +/* + * log a master abort accessing device table + * @devtab : address of device table entry + * @info : error flags + */ +static void amd_iommu_log_devtab_error(AMDIOMMUState *s, uint16_t devid, + dma_addr_t devtab, uint16_t info) +{ + + IOMMU_DPRINTF(ELOG, ""); + + uint16_t evt[8]; + + info |= IOMMU_EVENT_DEV_TAB_HW_ERROR; + + /* encode information */ + ENCODE_EVENT(devid, info, devtab, 0); + + amd_iommu_log_event(s, evt); + + /* Abort the translation */ + pci_word_test_and_set_mask(s->dev.config + PCI_STATUS, + PCI_STATUS_SIG_TARGET_ABORT); + +} + +/* log a master abort encountered during a page-walk + * @addr : address that couldn't be accessed + */ +static void amd_iommu_log_pagetab_error(AMDIOMMUState *s, uint16_t devid, + dma_addr_t addr, uint16_t info) +{ + IOMMU_DPRINTF(ELOG, ""); + + uint16_t evt[8]; + + info |= IOMMU_EVENT_PAGE_TAB_HW_ERROR; + + /* encode information */ + ENCODE_EVENT(devid, info, addr, 3); + + amd_iommu_log_event(s, evt); + + /* Abort the translation */ + pci_word_test_and_set_mask(s->dev.config + PCI_STATUS, + PCI_STATUS_SIG_TARGET_ABORT); + +} + +/* log an event trying to access command buffer + * @addr : address that couldn't be accessed + */ +static void amd_iommu_log_command_error(AMDIOMMUState *s, dma_addr_t addr) +{ + IOMMU_DPRINTF(ELOG, ""); + + uint16_t evt[8], info = IOMMU_EVENT_COMMAND_HW_ERROR; + + /* encode information */ + ENCODE_EVENT(0, info, addr, 3); + + amd_iommu_log_event(s, evt); + + /* Abort the translation */ + pci_word_test_and_set_mask(s->dev.config + PCI_STATUS, + PCI_STATUS_SIG_TARGET_ABORT); +} + +/* log an illegal comand event + * @addr : address of illegal command + */ +static void amd_iommu_log_illegalcom_error(AMDIOMMUState *s, uint16_t info, + dma_addr_t addr) +{ + IOMMU_DPRINTF(ELOG, ""); + + uint16_t evt[8]; + info |= IOMMU_EVENT_ILLEGAL_COMMAND_ERROR; + + /* encode information */ + ENCODE_EVENT(0, info, addr, 3); + + amd_iommu_log_event(s, evt); +} + +/* log an error accessing device table + * + * @devid : device owning the table entry + * @devtab : address of device table entry + * @info : error flags + */ +static void amd_iommu_log_illegaldevtab_error(AMDIOMMUState *s, uint16_t devid, + dma_addr_t addr, uint16_t info) +{ + IOMMU_DPRINTF(ELOG, ""); + + uint16_t evt[8]; + + info |= IOMMU_EVENT_ILLEGAL_DEVTAB_ENTRY; + + ENCODE_EVENT(devid, info, addr, 3); + + amd_iommu_log_event(s, evt); +} + +static gboolean amd_iommu_uint64_equal(gconstpointer v1, gconstpointer v2) +{ + return *((const uint64_t *)v1) == *((const uint64_t *)v2); +} + +static guint amd_iommu_uint64_hash(gconstpointer v) +{ + return (guint)*(const uint64_t *)v; +} + +static IOMMUIOTLBEntry *amd_iommu_iotlb_lookup(AMDIOMMUState *s, hwaddr addr, + uint64_t devid) +{ + uint64_t key = (addr >> IOMMU_PAGE_SHIFT_4K) | + ((uint64_t)(devid) << IOMMU_DEVID_SHIFT); + return g_hash_table_lookup(s->iotlb, &key); +} + +static void amd_iommu_iotlb_reset(AMDIOMMUState *s) +{ + assert(s->iotlb); + g_hash_table_remove_all(s->iotlb); +} + +static gboolean amd_iommu_iotlb_remove_by_devid(gpointer key, gpointer value, + gpointer user_data) +{ + IOMMUIOTLBEntry *entry = (IOMMUIOTLBEntry *)value; + uint16_t devid = *(uint16_t *)user_data; + return entry->devid == devid; +} + +static void amd_iommu_iotlb_remove_page(AMDIOMMUState *s, hwaddr addr, + uint64_t devid) +{ + uint64_t key = (addr >> IOMMU_PAGE_SHIFT_4K) | + ((uint64_t)(devid) << IOMMU_DEVID_SHIFT); + g_hash_table_remove(s->iotlb, &key); +} + +/* extract device id */ +static inline uint16_t devid_extract(uint8_t *cmd) +{ + return (uint16_t)cmd[2] & IOMMU_INVAL_DEV_ID_MASK; +} + +static void amd_iommu_invalidate_iotlb(AMDIOMMUState *s, uint64_t *cmd) +{ + uint16_t devid = devid_extract((uint8_t *)cmd); + /* if invalidation of more than one page requested */ + if (IOMMU_INVAL_ALL(cmd[0])) { + g_hash_table_foreach_remove(s->iotlb, amd_iommu_iotlb_remove_by_devid, + &devid); + } else { + hwaddr addr = (hwaddr)(cmd[1] & IOMMU_INVAL_ADDR_MASK); + amd_iommu_iotlb_remove_page(s, addr, devid); + } +} + +static void amd_iommu_update_iotlb(AMDIOMMUState *s, uint16_t devid, + uint64_t gpa, uint64_t spa, uint64_t perms, + uint16_t domid) +{ + IOMMUIOTLBEntry *entry = g_malloc(sizeof(*entry)); + uint64_t *key = g_malloc(sizeof(key)); + uint64_t gfn = gpa >> IOMMU_PAGE_SHIFT_4K; + + IOMMU_DPRINTF(CACHE, " update iotlb domid "PRIx16" devid: %02x:%02x.%x" + "gpa 0x%"PRIx64 " hpa 0x%"PRIx64, domid, PCI_BUS_NUM(devid), + PCI_SLOT(devid), PCI_FUNC(devid), gpa, spa); + + if (g_hash_table_size(s->iotlb) >= IOMMU_IOTLB_MAX_SIZE) { + IOMMU_DPRINTF(CACHE, "iotlb exceeds size limit - reset"); + amd_iommu_iotlb_reset(s); + } + + entry->gfn = gfn; + entry->domid = domid; + entry->perms = perms; + entry->translated_addr = spa; + *key = gfn | ((uint64_t)(devid) << IOMMU_DEVID_SHIFT); + g_hash_table_replace(s->iotlb, key, entry); +} + +/* execute a completion wait command */ +static void amd_iommu_completion_wait(AMDIOMMUState *s, uint8_t *cmd) +{ + IOMMU_DPRINTF(COMMAND, ""); + unsigned int addr; + + /* completion store */ + if (cmd[0] & IOMMU_COM_COMPLETION_STORE_MASK) { + addr = le64_to_cpu(*(uint64_t *)cmd) & IOMMU_COM_STORE_ADDRESS_MASK; + if (dma_memory_write(&address_space_memory, addr, cmd + 8, 8)) { + IOMMU_DPRINTF(ELOG, "error: fail to write at address 0%x"PRIx64, + addr); + } + } + + /* set completion interrupt */ + if (cmd[0] & IOMMU_COM_COMPLETION_INTR) { + s->mmior[IOMMU_MMIO_STATUS] |= IOMMU_MMIO_STATUS_COMP_INT; + } +} + +/* get command type */ +static uint8_t opcode(uint8_t *cmd) +{ + return cmd[IOMMU_CMDBUF_ID_BYTE] >> IOMMU_CMDBUF_ID_RSHIFT; +} + +/* log error without aborting since linux seems to be using reserved bits */ +static void iommu_inval_devtab_entry(AMDIOMMUState *s, uint8_t *cmd, + uint8_t type) +{ + IOMMU_DPRINTF(COMMAND, ""); + + /* This command should invalidate internal caches of which there isn't */ + if (*(uint64_t *)&cmd[0] & IOMMU_CMD_INVAL_DEV_RSVD || + *(uint64_t *)&cmd[1]) { + amd_iommu_log_illegalcom_error(s, type, s->cmdbuf + s->cmdbuf_head); + } +#ifdef DEBUG_AMD_IOMMU + uint16_t devid = devid_extract(cmd); +#endif + IOMMU_DPRINTF(COMMAND, "device table entry for devid: %02x:%02x.%x" + "invalidated", PCI_BUS_NUM(devid), PCI_SLOT(devid), + PCI_FUNC(devid)); +} + +static void iommu_completion_wait(AMDIOMMUState *s, uint8_t *cmd, uint8_t type) +{ + IOMMU_DPRINTF(COMMAND, ""); + + if (*(uint32_t *)&cmd[1] & IOMMU_COMPLETION_WAIT_RSVD) { + amd_iommu_log_illegalcom_error(s, type, s->cmdbuf + s->cmdbuf_head); + } + /* pretend to wait for command execution to complete */ + IOMMU_DPRINTF(COMMAND, "completion wait requested with store address 0x%" + PRIx64 " and store data 0x%"PRIx64, (cmd[0] & + IOMMU_COM_STORE_ADDRESS_MASK), *(uint64_t *)(cmd + 8)); + amd_iommu_completion_wait(s, cmd); +} + +static void iommu_complete_ppr(AMDIOMMUState *s, uint8_t *cmd, uint8_t type) +{ + IOMMU_DPRINTF(COMMAND, ""); + + if ((*(uint64_t *)&cmd[0] & IOMMU_COMPLETE_PPR_RQ_RSVD) || + *(uint64_t *)&cmd[1] & IOMMU_COMPLETE_PPR_HIGH_RSVD) { + amd_iommu_log_illegalcom_error(s, type, s->cmdbuf + s->cmdbuf_head); + } + + IOMMU_DPRINTF(COMMAND, "Execution of PPR queue requested"); +} + +static void iommu_inval_all(AMDIOMMUState *s, uint8_t *cmd, uint8_t type) +{ + IOMMU_DPRINTF(COMMAND, ""); + + if ((*(uint64_t *)&cmd[0] & IOMMU_INVAL_IOMMU_ALL_RSVD) || + *(uint64_t *)&cmd[1]) { + amd_iommu_log_illegalcom_error(s, type, s->cmdbuf + s->cmdbuf_head); + } + + amd_iommu_iotlb_reset(s); + IOMMU_DPRINTF(COMMAND, "Invalidation of all IOMMU cache requested"); +} + +static inline uint16_t domid_extract(uint64_t *cmd) +{ + return (uint16_t)(cmd[0] >> 32) & IOMMU_INVAL_PAGES_DOMID; +} + +static gboolean amd_iommu_iotlb_remove_by_domid(gpointer key, gpointer value, + gpointer user_data) +{ + IOMMUIOTLBEntry *entry = (IOMMUIOTLBEntry *)value; + uint16_t domid = *(uint16_t *)user_data; + return entry->domid == domid; +} + +/* we don't have devid - we can't remove pages by address */ +static void iommu_inval_pages(AMDIOMMUState *s, uint8_t *cmd, uint8_t type) +{ + IOMMU_DPRINTF(CUSTOM, ""); + uint16_t domid = domid_extract((uint64_t *)cmd); + + if (*(uint64_t *)&cmd[0] & IOMMU_INVAL_IOMMU_PAGES_RSVD || + *(uint32_t *)&cmd[1] & IOMMU_INVAL_PAGES_HIGH_RSVD) { + amd_iommu_log_illegalcom_error(s, type, s->cmdbuf + s->cmdbuf_head); + } + + g_hash_table_foreach_remove(s->iotlb, amd_iommu_iotlb_remove_by_domid, + &domid); + + IOMMU_DPRINTF(CUSTOM, "IOMMU pages for domain 0x%"PRIx16 "invalidated", + domid); +} + +static void iommu_prefetch_pages(AMDIOMMUState *s, uint8_t *cmd, uint8_t type) +{ + IOMMU_DPRINTF(COMMAND, ""); + + if ((*(uint64_t *)&cmd[0] & IOMMU_PRF_IOMMU_PAGES_RSVD) || + (*(uint32_t *)&cmd[1] & IOMMU_PREF_HIGH_RSVD)) { + amd_iommu_log_illegalcom_error(s, type, s->cmdbuf + s->cmdbuf_head); + } + + IOMMU_DPRINTF(COMMAND, "Pre-fetch of IOMMU pages requested"); +} + +static void iommu_inval_inttable(AMDIOMMUState *s, uint8_t *cmd, uint8_t type) +{ + IOMMU_DPRINTF(COMMAND, ""); + + if ((*(uint64_t *)&cmd[0] & IOMMU_INVAL_INTR_TABLE_RSVD) || + *(uint64_t *)&cmd[1]) { + amd_iommu_log_illegalcom_error(s, type, s->cmdbuf + s->cmdbuf_head); + return; + } + + IOMMU_DPRINTF(COMMAND, "interrupt table invalidated"); +} + +static void iommu_inval_iotlb(AMDIOMMUState *s, uint8_t *cmd, uint8_t type) +{ + IOMMU_DPRINTF(COMMAND, ""); + + if (*(uint32_t *)&cmd[2] & IOMMU_INVAL_IOTLB_PAGES_RSVD) { + amd_iommu_log_illegalcom_error(s, type, s->cmdbuf + s->cmdbuf_head); + return; + } + + amd_iommu_invalidate_iotlb(s, (uint64_t *)cmd); + IOMMU_DPRINTF(COMMAND, "IOTLB pages invalidated"); +} + +/* not honouring reserved bits is regarded as an illegal command */ +static void amd_iommu_cmdbuf_exec(AMDIOMMUState *s) +{ + IOMMU_DPRINTF(COMMAND, ""); + + uint8_t type; + uint8_t cmd[IOMMU_COMMAND_SIZE]; + + memset(cmd, 0, IOMMU_COMMAND_SIZE); + + if (dma_memory_read(&address_space_memory, s->cmdbuf + s->cmdbuf_head, cmd, + IOMMU_COMMAND_SIZE)) { + IOMMU_DPRINTF(COMMAND, "error: fail to access memory at 0x%"PRIx64 + " + 0x%"PRIu8, s->cmdbuf, s->cmdbuf_head); + amd_iommu_log_command_error(s, s->cmdbuf + s->cmdbuf_head); + return; + } + + type = opcode(cmd); + + switch (type) { + case IOMMU_CMD_COMPLETION_WAIT: + iommu_completion_wait(s, cmd, type); + break; + + case IOMMU_CMD_INVAL_DEVTAB_ENTRY: + iommu_inval_devtab_entry(s, cmd, type); + break; + + case IOMMU_CMD_INVAL_IOMMU_PAGES: + iommu_inval_pages(s, cmd, type); + break; + + case IOMMU_CMD_INVAL_IOTLB_PAGES: + iommu_inval_iotlb(s, cmd, type); + break; + + case IOMMU_CMD_INVAL_INTR_TABLE: + iommu_inval_inttable(s, cmd, type); + break; + + case IOMMU_CMD_PREFETCH_IOMMU_PAGES: + iommu_prefetch_pages(s, cmd, type); + break; + + case IOMMU_CMD_COMPLETE_PPR_REQUEST: + iommu_complete_ppr(s, cmd, type); + break; + + case IOMMU_CMD_INVAL_IOMMU_ALL: + iommu_inval_all(s, cmd, type); + break; + + default: + IOMMU_DPRINTF(COMMAND, "unhandled command %d", type); + /* log illegal command */ + amd_iommu_log_illegalcom_error(s, type, + s->cmdbuf + s->cmdbuf_head); + break; + } + +} + +static void amd_iommu_cmdbuf_run(AMDIOMMUState *s) +{ + IOMMU_DPRINTF(COMMAND, ""); + + uint64_t *mmio_cmdbuf_head = (uint64_t *)(s->mmior + + IOMMU_MMIO_COMMAND_HEAD); + + if (!s->cmdbuf_enabled) { + IOMMU_DPRINTF(COMMAND, "error: IOMMU trying to execute commands with " + "command buffer disabled. IOMMU control value 0x%"PRIx64, + amd_iommu_readq(s, IOMMU_MMIO_CONTROL)); + return; + } + + while (s->cmdbuf_head != s->cmdbuf_tail) { + /* check if there is work to do. */ + IOMMU_DPRINTF(COMMAND, "command buffer head at 0x%"PRIx32 " command " + "buffer tail at 0x%"PRIx32" command buffer base at 0x%" + PRIx64, s->cmdbuf_head, s->cmdbuf_tail, s->cmdbuf); + amd_iommu_cmdbuf_exec(s); + s->cmdbuf_head += IOMMU_COMMAND_SIZE; + amd_iommu_writeq_raw(s, s->cmdbuf_head, IOMMU_MMIO_COMMAND_HEAD); + + /* wrap head pointer */ + if (s->cmdbuf_head >= s->cmdbuf_len * IOMMU_COMMAND_SIZE) { + s->cmdbuf_head = 0; + } + } + + *mmio_cmdbuf_head = cpu_to_le64(s->cmdbuf_head); +} + +/* System Software might never read from some of this fields but anyways */ +static uint64_t amd_iommu_mmio_read(void *opaque, hwaddr addr, unsigned size) +{ + AMDIOMMUState *s = opaque; + + uint64_t val = -1; + if (addr + size > IOMMU_MMIO_SIZE) { + IOMMU_DPRINTF(MMIO, "error: addr outside region: max 0x%"PRIX64 + ", got 0x%"PRIx64 " %d", (uint64_t)IOMMU_MMIO_SIZE, addr, + size); + return (uint64_t)-1; + } + + if (size == 2) { + val = amd_iommu_readw(s, addr); + } else if (size == 4) { + val = amd_iommu_readl(s, addr); + } else if (size == 8) { + val = amd_iommu_readq(s, addr); + } + + switch (addr & ~0x07) { + case IOMMU_MMIO_DEVICE_TABLE: + IOMMU_DPRINTF(MMIO, "MMIO_DEVICE_TABLE read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64, addr, size, + addr & ~0x07); + break; + + case IOMMU_MMIO_COMMAND_BASE: + IOMMU_DPRINTF(MMIO, "MMIO_COMMAND_BASE read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64, addr, size, + addr & ~0x07); + break; + + case IOMMU_MMIO_EVENT_BASE: + IOMMU_DPRINTF(MMIO, "MMIO_EVENT_BASE read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64, addr, size, + addr & ~0x07); + break; + + case IOMMU_MMIO_CONTROL: + IOMMU_DPRINTF(MMIO, "MMIO_CONTROL read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64, addr, size, + addr & ~0x07); + break; + + case IOMMU_MMIO_EXCL_BASE: + IOMMU_DPRINTF(MMIO, "MMIO_EXCL_BASE read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64, addr, size, + addr & ~0x07); + break; + + case IOMMU_MMIO_EXCL_LIMIT: + IOMMU_DPRINTF(MMIO, "MMIO_EXCL_LIMIT read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64, addr, size, + addr & ~0x07); + break; + + case IOMMU_MMIO_COMMAND_HEAD: + IOMMU_DPRINTF(MMIO, "MMIO_COMMAND_HEAD read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64, addr, size, + addr & ~0x07); + break; + + case IOMMU_MMIO_COMMAND_TAIL: + IOMMU_DPRINTF(MMIO, "MMIO_COMMAND_TAIL read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64, addr, size, + addr & ~0x07); + break; + + case IOMMU_MMIO_EVENT_HEAD: + IOMMU_DPRINTF(MMIO, "MMIO_EVENT_HEAD read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64, addr, size, + addr & ~0x07); + break; + + case IOMMU_MMIO_EVENT_TAIL: + IOMMU_DPRINTF(MMIO, "MMIO_EVENT_TAIL read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64, addr, size, + addr & ~0x07); + break; + + case IOMMU_MMIO_STATUS: + IOMMU_DPRINTF(MMIO, "MMIO_STATUS read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64, addr, size, + addr & ~0x07); + break; + + case IOMMU_MMIO_EXT_FEATURES: + IOMMU_DPRINTF(MMU, "MMIO_EXT_FEATURES read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64 "value 0x%"PRIx64, + addr, size, addr & ~0x07, val); + break; + + default: + IOMMU_DPRINTF(MMIO, "UNHANDLED MMIO read addr 0x%"PRIx64 + ", size %d offset 0x%"PRIx64, addr, size, + addr & ~0x07); + } + return val; +} + +static void iommu_handle_control_write(AMDIOMMUState *s) +{ + IOMMU_DPRINTF(COMMAND, ""); + /* + * read whatever is already written in case + * software is writing in chucks less than 8 bytes + */ + unsigned long control = amd_iommu_readq(s, IOMMU_MMIO_CONTROL); + s->enabled = !!(control & IOMMU_MMIO_CONTROL_IOMMUEN); + + s->ats_enabled = !!(control & IOMMU_MMIO_CONTROL_HTTUNEN); + s->evtlog_enabled = s->enabled && !!(control & + IOMMU_MMIO_CONTROL_EVENTLOGEN); + + s->evtlog_intr = !!(control & IOMMU_MMIO_CONTROL_EVENTINTEN); + s->completion_wait_intr = !!(control & IOMMU_MMIO_CONTROL_COMWAITINTEN); + s->cmdbuf_enabled = s->enabled && !!(control & + IOMMU_MMIO_CONTROL_CMDBUFLEN); + + /* update the flags depending on the control register */ + if (s->cmdbuf_enabled) { + (*(uint64_t *)&s->mmior[IOMMU_MMIO_STATUS]) |= + IOMMU_MMIO_STATUS_CMDBUF_RUN; + } else { + (*(uint64_t *)&s->mmior[IOMMU_MMIO_STATUS]) &= + ~IOMMU_MMIO_STATUS_CMDBUF_RUN; + } + if (s->evtlog_enabled) { + (*(uint64_t *)&s->mmior[IOMMU_MMIO_STATUS]) |= + IOMMU_MMIO_STATUS_EVT_RUN; + } else { + (*(uint64_t *)&s->mmior[IOMMU_MMIO_STATUS]) &= + ~IOMMU_MMIO_STATUS_EVT_RUN; + } + + IOMMU_DPRINTF(COMMAND, "MMIO_STATUS state 0x%"PRIx64, control); + + amd_iommu_cmdbuf_run(s); +} + +static inline void iommu_handle_devtab_write(AMDIOMMUState *s) + +{ + IOMMU_DPRINTF(MMIO, ""); + + uint64_t val = amd_iommu_readq(s, IOMMU_MMIO_DEVICE_TABLE); + s->devtab = (dma_addr_t)(val & IOMMU_MMIO_DEVTAB_BASE_MASK); + + /* set device table length */ + s->devtab_len = ((val & IOMMU_MMIO_DEVTAB_SIZE_MASK) + 1 * + (IOMMU_MMIO_DEVTAB_SIZE_UNIT / + IOMMU_MMIO_DEVTAB_ENTRY_SIZE)); +} + +static inline void iommu_handle_cmdhead_write(AMDIOMMUState *s) +{ + IOMMU_DPRINTF(MMIO, ""); + + s->cmdbuf_head = (dma_addr_t)amd_iommu_readq(s, IOMMU_MMIO_COMMAND_HEAD) + & IOMMU_MMIO_CMDBUF_HEAD_MASK; + amd_iommu_cmdbuf_run(s); +} + +static inline void iommu_handle_cmdbase_write(AMDIOMMUState *s) +{ + IOMMU_DPRINTF(MMIO, ""); + + s->cmdbuf = (dma_addr_t)amd_iommu_readq(s, IOMMU_MMIO_COMMAND_BASE) + & IOMMU_MMIO_CMDBUF_BASE_MASK; + s->cmdbuf_len = 1UL << (s->mmior[IOMMU_MMIO_CMDBUF_SIZE_BYTE] + & IOMMU_MMIO_CMDBUF_SIZE_MASK); + s->cmdbuf_head = s->cmdbuf_tail = 0; + +} + +static inline void iommu_handle_cmdtail_write(AMDIOMMUState *s) +{ + s->cmdbuf_tail = amd_iommu_readq(s, IOMMU_MMIO_COMMAND_TAIL) + & IOMMU_MMIO_CMDBUF_TAIL_MASK; + amd_iommu_cmdbuf_run(s); +} + +static inline void iommu_handle_excllim_write(AMDIOMMUState *s) +{ + IOMMU_DPRINTF(MMIO, ""); + + uint64_t val = amd_iommu_readq(s, IOMMU_MMIO_EXCL_LIMIT); + s->excl_limit = (val & IOMMU_MMIO_EXCL_LIMIT_MASK) | + IOMMU_MMIO_EXCL_LIMIT_LOW; +} + +static inline void iommu_handle_evtbase_write(AMDIOMMUState *s) +{ + IOMMU_DPRINTF(MMIO, ""); + + uint64_t val = amd_iommu_readq(s, IOMMU_MMIO_EVENT_BASE); + s->evtlog = val & IOMMU_MMIO_EVTLOG_BASE_MASK; + s->evtlog_len = 1UL << (*(uint64_t *)&s->mmior[IOMMU_MMIO_EVTLOG_SIZE_BYTE] + & IOMMU_MMIO_EVTLOG_SIZE_MASK); +} + +static inline void iommu_handle_evttail_write(AMDIOMMUState *s) +{ + IOMMU_DPRINTF(MMIO, ""); + + uint64_t val = amd_iommu_readq(s, IOMMU_MMIO_EVENT_TAIL); + s->evtlog_tail = val & IOMMU_MMIO_EVTLOG_TAIL_MASK; +} + +static inline void iommu_handle_evthead_write(AMDIOMMUState *s) +{ + IOMMU_DPRINTF(MMIO, ""); + + uint64_t val = amd_iommu_readq(s, IOMMU_MMIO_EVENT_HEAD); + s->evtlog_head = val & IOMMU_MMIO_EVTLOG_HEAD_MASK; +} + +static inline void iommu_handle_pprbase_write(AMDIOMMUState *s) +{ + IOMMU_DPRINTF(MMIO, ""); + + uint64_t val = amd_iommu_readq(s, IOMMU_MMIO_PPR_BASE); + s->ppr_log = val & IOMMU_MMIO_PPRLOG_BASE_MASK; + s->pprlog_len = 1UL << (*(uint64_t *)&s->mmior[IOMMU_MMIO_PPRLOG_SIZE_BYTE] + & IOMMU_MMIO_PPRLOG_SIZE_MASK); +} + +static inline void iommu_handle_pprhead_write(AMDIOMMUState *s) +{ + IOMMU_DPRINTF(MMIO, ""); + + uint64_t val = amd_iommu_readq(s, IOMMU_MMIO_PPR_HEAD); + s->pprlog_head = val & IOMMU_MMIO_PPRLOG_HEAD_MASK; +} + +static inline void iommu_handle_pprtail_write(AMDIOMMUState *s) +{ + IOMMU_DPRINTF(MMIO, ""); + + uint64_t val = amd_iommu_readq(s, IOMMU_MMIO_PPR_TAIL); + s->pprlog_tail = val & IOMMU_MMIO_PPRLOG_TAIL_MASK; +} + +/* FIXME: something might go wrong if System Software writes in chunks + * of one byte but linux writes in chunks of 4 bytes so currently it + * works correctly with linux but will definitely be busted if software + * reads/writes 8 bytes + */ +static void amd_iommu_mmio_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ + IOMMU_DPRINTF(MMIO, ""); + + AMDIOMMUState *s = opaque; + unsigned long offset = addr & 0x07; + + if (addr + size > IOMMU_MMIO_SIZE) { + IOMMU_DPRINTF(MMIO, "error: addr outside region: max 0x%"PRIx64 + ", got 0x%"PRIx64 " %d", (uint64_t)IOMMU_MMIO_SIZE, + addr, size); + return; + } + + switch (addr & ~0x07) { + case IOMMU_MMIO_CONTROL: + if (size == 2) { + amd_iommu_writew(s, addr, val); + } else if (size == 4) { + amd_iommu_writel(s, addr, val); + } else if (size == 8) { + amd_iommu_writeq(s, addr, val); + } + + IOMMU_DPRINTF(MMIO, "MMIO_CONTROL write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + iommu_handle_control_write(s); + break; + + case IOMMU_MMIO_DEVICE_TABLE: + IOMMU_DPRINTF(MMIO, "MMIO_DEVICE_TABLE write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + if (size == 2) { + amd_iommu_writew(s, addr, val); + } else if (size == 4) { + amd_iommu_writel(s, addr, val); + } else if (size == 8) { + amd_iommu_writeq(s, addr, val); + } + + /* set device table address + * This also suffers from inability to tell whether software + * is done writing + */ + + if (offset || (size == 8)) { + iommu_handle_devtab_write(s); + } + break; + + case IOMMU_MMIO_COMMAND_HEAD: + IOMMU_DPRINTF(MMIO, "MMIO_COMMAND_HEAD write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + if (size == 2) { + amd_iommu_writew(s, addr, val); + } else if (size == 4) { + amd_iommu_writel(s, addr, val); + } else if (size == 8) { + amd_iommu_writeq(s, addr, val); + } + + iommu_handle_cmdhead_write(s); + break; + + case IOMMU_MMIO_COMMAND_BASE: + IOMMU_DPRINTF(MMIO, "MMIO_COMMAND_BASE write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + if (size == 2) { + amd_iommu_writew(s, addr, val); + } else if (size == 4) { + amd_iommu_writel(s, addr, val); + } else if (size == 8) { + amd_iommu_writeq(s, addr, val); + } + + /* FIXME - make sure System Software has finished writing incase + * it writes in chucks less than 8 bytes in a robust way.As for + * now, this hacks works for the linux driver + */ + if (offset || (size == 8)) { + iommu_handle_cmdbase_write(s); + } + break; + + case IOMMU_MMIO_COMMAND_TAIL: + IOMMU_DPRINTF(MMIO, "MMIO_COMMAND_TAIL write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + if (size == 2) { + amd_iommu_writew(s, addr, val); + } else if (size == 4) { + amd_iommu_writel(s, addr, val); + } else if (size == 8) { + amd_iommu_writeq(s, addr, val); + } + iommu_handle_cmdtail_write(s); + break; + + case IOMMU_MMIO_EVENT_BASE: + IOMMU_DPRINTF(MMIO, "MMIO_EVENT_BASE write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + if (size == 2) { + amd_iommu_writew(s, addr, val); + } else if (size == 4) { + amd_iommu_writel(s, addr, val); + } else if (size == 8) { + amd_iommu_writeq(s, addr, val); + } + iommu_handle_evtbase_write(s); + break; + + case IOMMU_MMIO_EVENT_HEAD: + IOMMU_DPRINTF(MMIO, "MMIO_EVENT_HEAD write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + if (size == 2) { + amd_iommu_writew(s, addr, val); + } else if (size == 4) { + amd_iommu_writel(s, addr, val); + } else if (size == 8) { + amd_iommu_writeq(s, addr, val); + } + iommu_handle_evthead_write(s); + break; + + case IOMMU_MMIO_EVENT_TAIL: + IOMMU_DPRINTF(MMIO, "MMIO_EVENT_TAIL write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + if (size == 2) { + amd_iommu_writew(s, addr, val); + } else if (size == 4) { + amd_iommu_writel(s, addr, val); + } else if (size == 8) { + amd_iommu_writeq(s, addr, val); + } + iommu_handle_evttail_write(s); + break; + + case IOMMU_MMIO_EXCL_LIMIT: + IOMMU_DPRINTF(MMIO, "MMIO_EXCL_LIMIT write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + if (size == 2) { + amd_iommu_writew(s, addr, val); + } else if (size == 4) { + amd_iommu_writel(s, addr, val); + } else if (size == 8) { + amd_iommu_writeq(s, addr, val); + } + iommu_handle_excllim_write(s); + break; + + /* PPR log base - unused for now */ + case IOMMU_MMIO_PPR_BASE: + IOMMU_DPRINTF(MMIO, "MMIO_PPR_BASE write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + if (size == 2) { + amd_iommu_writew(s, addr, val); + } else if (size == 4) { + amd_iommu_writel(s, addr, val); + } else if (size == 8) { + amd_iommu_writeq(s, addr, val); + } + iommu_handle_pprbase_write(s); + break; + /* PPR log head - also unused for now */ + case IOMMU_MMIO_PPR_HEAD: + IOMMU_DPRINTF(MMIO, "MMIO_PPR_HEAD write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + if (size == 2) { + amd_iommu_writew(s, addr, val); + } else if (size == 4) { + amd_iommu_writel(s, addr, val); + } else if (size == 8) { + amd_iommu_writeq(s, addr, val); + } + iommu_handle_pprhead_write(s); + break; + /* PPR log tail - unused for now */ + case IOMMU_MMIO_PPR_TAIL: + IOMMU_DPRINTF(MMIO, "MMIO_PPR_TAIL write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + if (size == 2) { + amd_iommu_writew(s, addr, val); + } else if (size == 4) { + amd_iommu_writel(s, addr, val); + } else if (size == 8) { + amd_iommu_writeq(s, addr, val); + } + iommu_handle_pprtail_write(s); + break; + + /* ignore write to ext_features */ + default: + IOMMU_DPRINTF(MMIO, "UNHANDLED MMIO write addr 0x%"PRIx64 + ", size %d, val 0x%"PRIx64 ", offset 0x%"PRIx64, + addr, size, val, offset); + } + +} + +static inline uint64_t amd_iommu_get_perms(uint64_t entry) +{ + return (entry & (IOMMU_DEV_PERM_READ | IOMMU_DEV_PERM_WRITE)) >> + IOMMU_DEV_PERM_SHIFT; +} + +AddressSpace *bridge_host_amd_iommu(PCIBus *bus, void *opaque, int devfn) +{ + AMDIOMMUState *s = opaque; + AMDIOMMUAddressSpace **iommu_as; + int bus_num = pci_bus_num(bus); + + iommu_as = s->address_spaces[bus_num]; + + /* allocate memory during the first run */ + if (!iommu_as) { + iommu_as = g_malloc0(sizeof(AMDIOMMUAddressSpace *) * PCI_DEVFN_MAX); + s->address_spaces[bus_num] = iommu_as; + } + + /* set up IOMMU region */ + if (!iommu_as[devfn]) { + iommu_as[devfn] = g_malloc0(sizeof(AMDIOMMUAddressSpace)); + iommu_as[devfn]->bus_num = (uint8_t)bus_num; + iommu_as[devfn]->devfn = (uint8_t)devfn; + iommu_as[devfn]->iommu_state = s; + + memory_region_init_iommu(&iommu_as[devfn]->iommu, OBJECT(s), + &s->iommu_ops, "amd-iommu", UINT64_MAX); + address_space_init(&iommu_as[devfn]->as, &iommu_as[devfn]->iommu, + "amd-iommu"); + } + return &iommu_as[devfn]->as; +} + +/* validate a page table entry */ +static bool amd_iommu_validate_dte(AMDIOMMUState *s, uint16_t devid, + uint64_t *dte) +{ + if ((dte[0] & IOMMU_DTE_LOWER_QUAD_RESERVED) + || (dte[1] & IOMMU_DTE_MIDDLE_QUAD_RESERVED) + || (dte[2] & IOMMU_DTE_UPPER_QUAD_RESERVED) || dte[3]) { + amd_iommu_log_illegaldevtab_error(s, devid, + s->devtab + devid * IOMMU_DEVTAB_ENTRY_SIZE, 0); + return false; + } + + return dte[0] & IOMMU_DEV_VALID && (dte[0] & IOMMU_DEV_TRANSLATION_VALID) + && (dte[0] & IOMMU_DEV_PT_ROOT_MASK); +} + +/* get a device table entry given the devid */ +static bool amd_iommu_get_dte(AMDIOMMUState *s, int devid, uint64_t *entry) +{ + uint32_t offset = devid * IOMMU_DEVTAB_ENTRY_SIZE; + + IOMMU_DPRINTF(MMU, "Device Table at 0x%"PRIx64, s->devtab); + + if (dma_memory_read(&address_space_memory, s->devtab + offset, entry, + IOMMU_DEVTAB_ENTRY_SIZE)) { + IOMMU_DPRINTF(MMU, "error: fail to access Device Entry devtab 0x%"PRIx64 + "offset 0x%"PRIx32, s->devtab, offset); + /* log ever accessing dte */ + amd_iommu_log_devtab_error(s, devid, s->devtab + offset, 0); + return false; + } + + if (!amd_iommu_validate_dte(s, devid, entry)) { + IOMMU_DPRINTF(MMU, + "Pte entry at 0x%"PRIx64" is invalid", entry[0]); + return false; + } + + return true; +} + +/* get pte translation mode */ +static inline uint8_t get_pte_translation_mode(uint64_t pte) +{ + return (pte >> IOMMU_DEV_MODE_RSHIFT) & IOMMU_DEV_MODE_MASK; +} + +static int amd_iommu_page_walk(AMDIOMMUAddressSpace *as, uint64_t *dte, + IOMMUTLBEntry *ret, unsigned perms, + hwaddr addr) +{ + uint8_t level, oldlevel; + unsigned present; + uint64_t pte, pte_addr; + uint64_t pte_perms; + pte = dte[0]; + + level = get_pte_translation_mode(pte); + + if (level >= 7 || level == 0) { + IOMMU_DPRINTF(MMU, "error: translation level 0x%"PRIu8 " detected" + "while translating 0x%"PRIx64, level, addr); + return -1; + } + + while (level > 0) { + pte_perms = amd_iommu_get_perms(pte); + present = pte & 1; + if (!present || perms != (perms & pte_perms)) { + amd_iommu_page_fault(as->iommu_state, as->devfn, addr, perms); + IOMMU_DPRINTF(MMU, "error: page fault accessing virtual addr 0x%" + PRIx64, addr); + return -1; + } + + /* go to the next lower level */ + pte_addr = pte & IOMMU_DEV_PT_ROOT_MASK; + /* add offset and load pte */ + pte_addr += ((addr >> (3 + 9 * level)) & 0x1FF) << 3; + pte = ldq_phys(&address_space_memory, pte_addr); + oldlevel = level; + level = get_pte_translation_mode(pte); + + /* PT is corrupted or not there */ + if (level != oldlevel - 1) { + return -1; + } + } + + ret->iova = addr & IOMMU_PAGE_MASK_4K; + ret->translated_addr = (pte & IOMMU_DEV_PT_ROOT_MASK) & IOMMU_PAGE_MASK_4K; + ret->addr_mask = ~IOMMU_PAGE_MASK_4K; + ret->perm = IOMMU_RW; + return 0; +} + +/* TODO : Mark addresses as Accessed and Dirty */ +static void amd_iommu_do_translate(AMDIOMMUAddressSpace *as, hwaddr addr, + bool is_write, IOMMUTLBEntry *ret) +{ + AMDIOMMUState *s = as->iommu_state; + uint16_t devid = PCI_DEVID(as->bus_num, as->devfn); + IOMMUIOTLBEntry *iotlb_entry; + uint8_t err; + uint64_t entry[4]; + + /* try getting a cache entry first */ + iotlb_entry = amd_iommu_iotlb_lookup(s, addr, as->devfn); + + if (iotlb_entry) { + IOMMU_DPRINTF(CACHE, "hit iotlb devid: %02x:%02x.%x gpa 0x%"PRIx64 + " hpa 0x%"PRIx64, PCI_BUS_NUM(devid), PCI_SLOT(devid), + PCI_FUNC(devid), addr, iotlb_entry->translated_addr); + ret->iova = addr & IOMMU_PAGE_MASK_4K; + ret->translated_addr = iotlb_entry->translated_addr; + ret->addr_mask = ~IOMMU_PAGE_MASK_4K; + ret->perm = iotlb_entry->perms; + return; + } + + if (!amd_iommu_get_dte(s, devid, entry)) { + goto out; + } + + err = amd_iommu_page_walk(as, entry, ret, + is_write ? IOMMU_PERM_WRITE : IOMMU_PERM_READ, + addr); + if (err) { + IOMMU_DPRINTF(MMU, "error: hardware error accessing page tables" + " while translating addr 0x%"PRIx64, addr); + amd_iommu_log_pagetab_error(s, as->devfn, addr, 0); + goto out; + } + + amd_iommu_update_iotlb(s, as->devfn, addr, ret->translated_addr, + ret->perm, entry[1] & IOMMU_DEV_DOMID_ID_MASK); + return; + +out: + ret->iova = addr; + ret->translated_addr = addr & IOMMU_PAGE_MASK_4K; + ret->addr_mask = ~IOMMU_PAGE_MASK_4K; + ret->perm = IOMMU_RW; +} + +static IOMMUTLBEntry amd_iommu_translate(MemoryRegion *iommu, hwaddr addr, + bool is_write) +{ + IOMMU_DPRINTF(GENERAL, ""); + + AMDIOMMUAddressSpace *as = container_of(iommu, AMDIOMMUAddressSpace, iommu); + AMDIOMMUState *s = as->iommu_state; + + IOMMUTLBEntry ret = { + .target_as = &address_space_memory, + .iova = addr, + .translated_addr = 0, + .addr_mask = ~(hwaddr)0, + .perm = IOMMU_NONE, + }; + + if (!s->enabled) { + /* IOMMU disabled - corresponds to iommu=off not + * failure to provide any parameter + */ + ret.iova = addr & IOMMU_PAGE_MASK_4K; + ret.translated_addr = addr & IOMMU_PAGE_MASK_4K; + ret.addr_mask = ~IOMMU_PAGE_MASK_4K; + ret.perm = IOMMU_RW; + return ret; + } + + amd_iommu_do_translate(as, addr, is_write, &ret); + IOMMU_DPRINTF(MMU, "devid: %02x:%02x.%x gpa 0x%"PRIx64 " hpa 0x%"PRIx64, + as->bus_num, PCI_SLOT(as->devfn), PCI_FUNC(as->devfn), addr, + ret.translated_addr); + + return ret; +} + +static const MemoryRegionOps mmio_mem_ops = { + .read = amd_iommu_mmio_read, + .write = amd_iommu_mmio_write, + .endianness = DEVICE_LITTLE_ENDIAN, + .impl = { + .min_access_size = 1, + .max_access_size = 8, + .unaligned = false, + }, + .valid = { + .min_access_size = 1, + .max_access_size = 8, + } +}; + +static void amd_iommu_init(AMDIOMMUState *s) +{ + + IOMMU_DPRINTF(GENERAL, ""); + + amd_iommu_iotlb_reset(s); + + s->iommu_ops.translate = amd_iommu_translate; + + s->devtab_len = 0; + s->cmdbuf_len = 0; + s->cmdbuf_head = 0; + s->cmdbuf_tail = 0; + s->evtlog_head = 0; + s->evtlog_tail = 0; + s->excl_enabled = false; + s->excl_allow = false; + s->mmio_enabled = false; + s->enabled = false; + s->ats_enabled = false; + s->cmdbuf_enabled = false; + + /* reset MMIO */ + memset(s->mmior, 0, IOMMU_MMIO_SIZE); + amd_iommu_set_quad(s, IOMMU_MMIO_EXT_FEATURES, IOMMU_EXT_FEATURES, + 0xffffffffffffffef, 0); + amd_iommu_set_quad(s, IOMMU_MMIO_STATUS, 0, 0x98, 0x67); + /* reset device ident */ + pci_config_set_vendor_id(s->dev.config, PCI_VENDOR_ID_AMD); + pci_config_set_device_id(s->dev.config, PCI_DEVICE_ID_RD890_IOMMU); + pci_config_set_prog_interface(s->dev.config, 00); + pci_config_set_class(s->dev.config, 0x0806); + + /* reset IOMMU specific capabilities, all r/o */ + pci_set_long(s->dev.config + s->capab_offset, IOMMU_CAPAB_FEATURES); + pci_set_long(s->dev.config + s->capab_offset + IOMMU_CAPAB_BAR_LOW, + s->mmio.addr & ~(0xffff0000)); + pci_set_long(s->dev.config + s->capab_offset + IOMMU_CAPAB_BAR_HIGH, + (s->mmio.addr & ~(0xffff)) >> 16); + pci_set_long(s->dev.config + s->capab_offset + IOMMU_CAPAB_RANGE, + 0xff000000); + pci_set_long(s->dev.config + s->capab_offset + IOMMU_CAPAB_MISC, 0); + pci_set_long(s->dev.config + s->capab_offset + IOMMU_CAPAB_MISC, + IOMMU_MAX_PH_ADDR | IOMMU_MAX_GVA_ADDR | IOMMU_MAX_VA_ADDR); +} + +static void amd_iommu_reset(DeviceState *dev) +{ + AMDIOMMUState *s = AMD_IOMMU_DEVICE(dev); + + amd_iommu_init(s); +} + +static void amd_iommu_realize(PCIDevice *dev, Error **error) +{ + AMDIOMMUState *s = container_of(dev, AMDIOMMUState, dev); + + s->iotlb = g_hash_table_new_full(amd_iommu_uint64_hash, + amd_iommu_uint64_equal, g_free, g_free); + + s->capab_offset = pci_add_capability(dev, IOMMU_CAPAB_ID_SEC, 0, + IOMMU_CAPAB_SIZE); + + /* add msi and hypertransport capabilities */ + pci_add_capability(&s->dev, PCI_CAP_ID_MSI, 0, IOMMU_CAPAB_REG_SIZE); + pci_add_capability(&s->dev, PCI_CAP_ID_HT, 0, IOMMU_CAPAB_REG_SIZE); + + amd_iommu_init(s); + + /* set up MMIO */ + memory_region_init_io(&s->mmio, OBJECT(s), &mmio_mem_ops, s, "mmio", + IOMMU_MMIO_SIZE); + + if (s->mmio.addr == IOMMU_BASE_ADDR) { + return; + } + + s->mmio.addr = IOMMU_BASE_ADDR; + memory_region_add_subregion(get_system_memory(), IOMMU_BASE_ADDR, &s->mmio); +} + +static const VMStateDescription vmstate_amd_iommu = { + .name = "amd-iommu", + .fields = (VMStateField[]) { + VMSTATE_PCI_DEVICE(dev, AMDIOMMUState), + VMSTATE_END_OF_LIST() + } +}; + +static Property amd_iommu_properties[] = { + DEFINE_PROP_UINT32("version", AMDIOMMUState, version, 2), + DEFINE_PROP_END_OF_LIST(), +}; + +static void amd_iommu_uninit(PCIDevice *dev) +{ + AMDIOMMUState *s = container_of(dev, AMDIOMMUState, dev); + amd_iommu_iotlb_reset(s); +} + +static void amd_iommu_class_init(ObjectClass *klass, void* data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->realize = amd_iommu_realize; + k->exit = amd_iommu_uninit; + + dc->reset = amd_iommu_reset; + dc->vmsd = &vmstate_amd_iommu; + dc->props = amd_iommu_properties; +} + +static const TypeInfo amd_iommu = { + .name = TYPE_AMD_IOMMU_DEVICE, + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(AMDIOMMUState), + .class_init = amd_iommu_class_init +}; + +static void amd_iommu_register_types(void) +{ + type_register_static(&amd_iommu); +} + +type_init(amd_iommu_register_types); diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h new file mode 100644 index 0000000..2f35e15 --- /dev/null +++ b/hw/i386/amd_iommu.h @@ -0,0 +1,398 @@ +/* + * QEMU emulation of an AMD IOMMU (AMD-Vi) + * + * Copyright (C) 2011 Eduard - Gabriel Munteanu + * Copyright (C) 2015 David Kiarie, <davidkiarie4@gmail.com> + * + * 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; either version 2 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef AMD_IOMMU_H_ +#define AMD_IOMMU_H_ + +#include "hw/hw.h" +#include "hw/pci/pci.h" +#include "hw/pci/msi.h" +#include "hw/sysbus.h" +#include "sysemu/dma.h" + +/* Capability registers */ +#define IOMMU_CAPAB_HEADER 0x00 +#define IOMMU_CAPAB_REV_TYPE 0x02 +#define IOMMU_CAPAB_FLAGS 0x03 +#define IOMMU_CAPAB_BAR_LOW 0x04 +#define IOMMU_CAPAB_BAR_HIGH 0x08 +#define IOMMU_CAPAB_RANGE 0x0C +#define IOMMU_CAPAB_MISC 0x10 +#define IOMMU_CAPAB_MISC1 0x14 + +#define IOMMU_CAPAB_SIZE 0x18 +#define IOMMU_CAPAB_REG_SIZE 0x04 + +/* Capability header data */ +#define IOMMU_CAPAB_ID_SEC 0xf +#define IOMMU_CAPAB_FLAT_EXT (1 << 28) +#define IOMMU_CAPAB_EFR_SUP (1 << 27) +#define IOMMU_CAPAB_FLAG_NPCACHE (1 << 26) +#define IOMMU_CAPAB_FLAG_HTTUNNEL (1 << 25) +#define IOMMU_CAPAB_FLAG_IOTLBSUP (1 << 24) +#define IOMMU_CAPAB_INIT_REV (1 << 19) +#define IOMMU_CAPAB_INIT_TYPE (3 << 16) +#define IOMMU_CAPAB_INIT_REV_TYPE (IOMMU_CAPAB_REV | IOMMU_CAPAB_TYPE) +#define IOMMU_CAPAB_INIT_FLAGS (IOMMU_CAPAB_FLAG_NPCACHE | \ + IOMMU_CAPAB_FLAG_HTTUNNEL) +#define IOMMU_CAPAB_INIT_MISC ((64 << 15) | (48 << 8)) +#define IOMMU_CAPAB_BAR_MASK (~((1UL << 14) - 1)) + +/* MMIO registers */ +#define IOMMU_MMIO_DEVICE_TABLE 0x0000 +#define IOMMU_MMIO_COMMAND_BASE 0x0008 +#define IOMMU_MMIO_EVENT_BASE 0x0010 +#define IOMMU_MMIO_CONTROL 0x0018 +#define IOMMU_MMIO_EXCL_BASE 0x0020 +#define IOMMU_MMIO_EXCL_LIMIT 0x0028 +#define IOMMU_MMIO_EXT_FEATURES 0x0030 +#define IOMMU_MMIO_COMMAND_HEAD 0x2000 +#define IOMMU_MMIO_COMMAND_TAIL 0x2008 +#define IOMMU_MMIO_EVENT_HEAD 0x2010 +#define IOMMU_MMIO_EVENT_TAIL 0x2018 +#define IOMMU_MMIO_STATUS 0x2020 +#define IOMMU_MMIO_PPR_BASE 0x0038 +#define IOMMU_MMIO_PPR_HEAD 0x2030 +#define IOMMU_MMIO_PPR_TAIL 0x2038 + +#define IOMMU_MMIO_SIZE 0x4000 + +#define IOMMU_MMIO_DEVTAB_SIZE_MASK ((1ULL << 12) - 1) +#define IOMMU_MMIO_DEVTAB_BASE_MASK (((1ULL << 52) - 1) & ~ \ + IOMMU_MMIO_DEVTAB_SIZE_MASK) +#define IOMMU_MMIO_DEVTAB_ENTRY_SIZE 32 +#define IOMMU_MMIO_DEVTAB_SIZE_UNIT 4096 + +/* some of this are similar but just for readability */ +#define IOMMU_MMIO_CMDBUF_SIZE_BYTE (IOMMU_MMIO_COMMAND_BASE + 7) +#define IOMMU_MMIO_CMDBUF_SIZE_MASK 0x0F +#define IOMMU_MMIO_CMDBUF_BASE_MASK IOMMU_MMIO_DEVTAB_BASE_MASK +#define IOMMU_MMIO_CMDBUF_DEFAULT_SIZE 8 +#define IOMMU_MMIO_CMDBUF_HEAD_MASK (((1ULL << 19) - 1) & ~0x0F) +#define IOMMU_MMIO_CMDBUF_TAIL_MASK IOMMU_MMIO_EVTLOG_HEAD_MASK + +#define IOMMU_MMIO_EVTLOG_SIZE_BYTE (IOMMU_MMIO_EVENT_BASE + 7) +#define IOMMU_MMIO_EVTLOG_SIZE_MASK IOMMU_MMIO_CMDBUF_SIZE_MASK +#define IOMMU_MMIO_EVTLOG_BASE_MASK IOMMU_MMIO_CMDBUF_BASE_MASK +#define IOMMU_MMIO_EVTLOG_DEFAULT_SIZE IOMMU_MMIO_CMDBUF_DEFAULT_SIZE +#define IOMMU_MMIO_EVTLOG_HEAD_MASK (((1ULL << 19) - 1) & ~0x0F) +#define IOMMU_MMIO_EVTLOG_TAIL_MASK IOMMU_MMIO_EVTLOG_HEAD_MASK + +#define IOMMU_MMIO_PPRLOG_SIZE_BYTE (IOMMU_MMIO_EVENT_BASE + 7) +#define IOMMU_MMIO_PPRLOG_HEAD_MASK IOMMU_MMIO_EVTLOG_HEAD_MASK +#define IOMMU_MMIO_PPRLOG_TAIL_MASK IOMMU_MMIO_EVTLOG_HEAD_MASK +#define IOMMU_MMIO_PPRLOG_BASE_MASK IOMMU_MMIO_EVTLOG_BASE_MASK +#define IOMMU_MMIO_PPRLOG_SIZE_MASK IOMMU_MMIO_EVTLOG_SIZE_MASK + +#define IOMMU_MMIO_EXCL_BASE_MASK IOMMU_MMIO_DEVTAB_BASE_MASK +#define IOMMU_MMIO_EXCL_ENABLED_MASK (1ULL << 0) +#define IOMMU_MMIO_EXCL_ALLOW_MASK (1ULL << 1) +#define IOMMU_MMIO_EXCL_LIMIT_MASK IOMMU_MMIO_DEVTAB_BASE_MASK +#define IOMMU_MMIO_EXCL_LIMIT_LOW 0xFFF + +/* mmio control register flags */ +#define IOMMU_MMIO_CONTROL_IOMMUEN (1ULL << 0) +#define IOMMU_MMIO_CONTROL_HTTUNEN (1ULL << 1) +#define IOMMU_MMIO_CONTROL_EVENTLOGEN (1ULL << 2) +#define IOMMU_MMIO_CONTROL_EVENTINTEN (1ULL << 3) +#define IOMMU_MMIO_CONTROL_COMWAITINTEN (1ULL << 4) +#define IOMMU_MMIO_CONTROL_PASSPW (1ULL << 7) +#define IOMMU_MMIO_CONTROL_REPASSPW (1ULL << 9) +#define IOMMU_MMIO_CONTROL_COHERENT (1ULL << 10) +#define IOMMU_MMIO_CONTROL_ISOC (1ULL << 11) +#define IOMMU_MMIO_CONTROL_CMDBUFLEN (1ULL << 12) +#define IOMMU_MMIO_CONTROL_PPRLOGEN (1ULL << 13) +#define IOMMU_MMIO_CONTROL_PPRINTEN (1ULL << 14) +#define IOMMU_MMIO_CONTROL_PPREN (1ULL << 15) +#define IOMMU_MMIO_CONTROL_GAEN (1ULL << 16) +#define IOMMU_MMIO_CONTROL_GTEN (1ULL << 17) + +/* MMIO status register bits */ +#define IOMMU_MMIO_STATUS_PPR_OVFE (1 << 18) +#define IOMMU_MMIO_STATUS_PPR_OVFEB (1 << 17) +#define IOMMU_MMIO_STATUS_EVT_ACTIVE (1 << 16) +#define IOMMU_MMIO_STATUS_EVT_OVFB (1 << 15) +#define IOMMU_MMIO_STATUS_PPR_ACTIVE (1 << 12) +#define IOMMU_MMIO_STATUS_PPR_OVFB (1 << 11) +#define IOMMU_MMIO_STATUS_GA_INT (1 << 10) +#define IOMMU_MMIO_STATUS_GA_RUN (1 << 9) +#define IOMMU_MMIO_STATUS_GA_OVF (1 << 8) +#define IOMMU_MMIO_STATUS_PPR_RUN (1 << 7) +#define IOMMU_MMIO_STATUS_PPR_INT (1 << 6) +#define IOMMU_MMIO_STATUS_PPR_OVF (1 << 5) +#define IOMMU_MMIO_STATUS_CMDBUF_RUN (1 << 4) +#define IOMMU_MMIO_STATUS_EVT_RUN (1 << 3) +#define IOMMU_MMIO_STATUS_COMP_INT (1 << 2) +#define IOMMU_MMIO_STATUS_EVT_INT (1 << 1) +#define IOMMU_MMIO_STATUS_EVT_OVF (1 << 0) + +#define IOMMU_CMDBUF_ID_BYTE 0x07 +#define IOMMU_CMDBUF_ID_RSHIFT 4 + +#define IOMMU_CMD_COMPLETION_WAIT 0x01 +#define IOMMU_CMD_INVAL_DEVTAB_ENTRY 0x02 +#define IOMMU_CMD_INVAL_IOMMU_PAGES 0x03 +#define IOMMU_CMD_INVAL_IOTLB_PAGES 0x04 +#define IOMMU_CMD_INVAL_INTR_TABLE 0x05 +#define IOMMU_CMD_PREFETCH_IOMMU_PAGES 0x06 +#define IOMMU_CMD_COMPLETE_PPR_REQUEST 0x07 +#define IOMMU_CMD_INVAL_IOMMU_ALL 0x08 + +#define IOMMU_DEVTAB_ENTRY_SIZE 32 + +/* Device table entry bits 0:63 */ +#define IOMMU_DEV_VALID (1ULL << 0) +#define IOMMU_DEV_TRANSLATION_VALID (1ULL << 1) +#define IOMMU_DEV_MODE_MASK 0x7 +#define IOMMU_DEV_MODE_RSHIFT 9 +#define IOMMU_DEV_PT_ROOT_MASK 0xFFFFFFFFFF000 +#define IOMMU_DEV_PT_ROOT_RSHIFT 12 +#define IOMMU_DEV_PERM_SHIFT 61 +#define IOMMU_DEV_PERM_READ (1ULL << 61) +#define IOMMU_DEV_PERM_WRITE (1ULL << 62) + +/* Device table entry bits 64:127 */ +#define IOMMU_DEV_DOMID_ID_MASK ((1ULL << 16) - 1) +#define IOMMU_DEV_IOTLB_SUPPORT (1ULL << 17) +#define IOMMU_DEV_SUPPRESS_PF (1ULL << 18) +#define IOMMU_DEV_SUPPRESS_ALL_PF (1ULL << 19) +#define IOMMU_DEV_IOCTL_MASK (~3) +#define IOMMU_DEV_IOCTL_RSHIFT 20 +#define IOMMU_DEV_IOCTL_DENY 0 +#define IOMMU_DEV_IOCTL_PASSTHROUGH 1 +#define IOMMU_DEV_IOCTL_TRANSLATE 2 +#define IOMMU_DEV_CACHE (1ULL << 37) +#define IOMMU_DEV_SNOOP_DISABLE (1ULL << 38) +#define IOMMU_DEV_EXCL (1ULL << 39) + +/* Event codes and flags, as stored in the info field */ +#define IOMMU_EVENT_ILLEGAL_DEVTAB_ENTRY (0x1U << 12) +#define IOMMU_EVENT_IOPF (0x2U << 12) +#define IOMMU_EVENT_IOPF_I (1U << 3) +#define IOMMU_EVENT_IOPF_PR (1U << 4) +#define IOMMU_EVENT_IOPF_RW (1U << 5) +#define IOMMU_EVENT_IOPF_PE (1U << 6) +#define IOMMU_EVENT_IOPF_RZ (1U << 7) +#define IOMMU_EVENT_IOPF_TR (1U << 8) +#define IOMMU_EVENT_DEV_TAB_HW_ERROR (0x3U << 12) +#define IOMMU_EVENT_PAGE_TAB_HW_ERROR (0x4U << 12) +#define IOMMU_EVENT_ILLEGAL_COMMAND_ERROR (0x5U << 12) +#define IOMMU_EVENT_COMMAND_HW_ERROR (0x6U << 12) +#define IOMMU_EVENT_IOTLB_INV_TIMEOUT (0x7U << 12) +#define IOMMU_EVENT_INVALID_DEV_REQUEST (0x8U << 12) + +#define IOMMU_EVENT_LEN 16 +#define IOMMU_PERM_READ (1 << 0) +#define IOMMU_PERM_WRITE (1 << 1) +#define IOMMU_PERM_RW (IOMMU_PERM_READ | IOMMU_PERM_WRITE) + +/* AMD RD890 Chipset */ +#define PCI_DEVICE_ID_RD890_IOMMU 0x20 + +#define IOMMU_FEATURE_PREFETCH (1ULL << 0) +#define IOMMU_FEATURE_PPR (1ULL << 1) +#define IOMMU_FEATURE_NX (1ULL << 3) +#define IOMMU_FEATURE_GT (1ULL << 4) +#define IOMMU_FEATURE_IA (1ULL << 6) +#define IOMMU_FEATURE_GA (1ULL << 7) +#define IOMMU_FEATURE_HE (1ULL << 8) +#define IOMMU_FEATURE_PC (1ULL << 9) + +/* reserved DTE bits */ +#define IOMMU_DTE_LOWER_QUAD_RESERVED 0x80300000000000fc +#define IOMMU_DTE_MIDDLE_QUAD_RESERVED 0x0000000000000100 +#define IOMMU_DTE_UPPER_QUAD_RESERVED 0x08f0000000000000 + +/* IOMMU paging mode */ +#define IOMMU_GATS_MODE (6ULL << 12) +#define IOMMU_HATS_MODE (6ULL << 10) + +/* PCI SIG constants */ +#define PCI_BUS_MAX 256 +#define PCI_SLOT_MAX 32 +#define PCI_FUNC_MAX 8 +#define PCI_DEVFN_MAX 256 + +/* IOTLB */ +#define IOMMU_IOTLB_MAX_SIZE 1024 +#define IOMMU_DEVID_SHIFT 36 + +/* extended feature support */ +#define IOMMU_EXT_FEATURES (IOMMU_FEATURE_PREFETCH | IOMMU_FEATURE_PPR | \ + IOMMU_FEATURE_NX | IOMMU_FEATURE_IA | IOMMU_FEATURE_GT | \ + IOMMU_FEATURE_GA | IOMMU_FEATURE_HE | IOMMU_GATS_MODE | \ + IOMMU_HATS_MODE) + +/* capabilities header */ +#define IOMMU_CAPAB_FEATURES (IOMMU_CAPAB_FLAT_EXT | \ + IOMMU_CAPAB_FLAG_NPCACHE | IOMMU_CAPAB_FLAG_IOTLBSUP \ + | IOMMU_CAPAB_ID_SEC | IOMMU_CAPAB_INIT_TYPE | \ + IOMMU_CAPAB_FLAG_HTTUNNEL | IOMMU_CAPAB_EFR_SUP) + +/* command constants */ +#define IOMMU_COM_STORE_ADDRESS_MASK 0xffffffffffff8 +#define IOMMU_COM_COMPLETION_STORE_MASK 0x1 +#define IOMMU_COM_COMPLETION_INTR 0x2 +#define IOMMU_COM_COMPLETION_DATA_OFF 0x8 +#define IOMMU_COMMAND_SIZE 0x10 + +/* IOMMU default address */ +#define IOMMU_BASE_ADDR 0xfed80000 + +/* page management constants */ +#define IOMMU_PAGE_SHIFT 12 +#define IOMMU_PAGE_SIZE (1ULL << IOMMU_PAGE_SHIFT) + +#define IOMMU_PAGE_SHIFT_4K 12 +#define IOMMU_PAGE_MASK_4K (~((1ULL << IOMMU_PAGE_SHIFT_4K) - 1)) +#define IOMMU_PAGE_SHIFT_2M 21 +#define IOMMU_PAGE_MASK_2M (~((1ULL << IOMMU_PAGE_SHIFT_2M) - 1)) +#define IOMMU_PAGE_SHIFT_1G 30 +#define IOMMU_PAGE_MASK_1G (~((1ULL << IOMMU_PAGE_SHIFT_1G) - 1)) + +#define IOMMU_MAX_VA_ADDR (48UL << 5) +#define IOMMU_MAX_PH_ADDR (40UL << 8) +#define IOMMU_MAX_GVA_ADDR (48UL << 15) + +/* invalidation command device id */ +#define IOMMU_INVAL_DEV_ID_SHIFT 32 +#define IOMMU_INVAL_DEV_ID_MASK (~((1UL << IOMMU_INVAL_DEV_ID_SHIFT) - 1)) + +/* invalidation address */ +#define IOMMU_INVAL_ADDR_MASK_SHIFT 12 +#define IOMMU_INVAL_ADDR_MASK (~((1UL << IOMMU_INVAL_ADDR_MASK_SHIFT) - 1)) + +/* invalidation S bit mask */ +#define IOMMU_INVAL_ALL(val) ((val) & (0x1)) + +/* reserved bits */ +#define IOMMU_COMPLETION_WAIT_RSVD 0x0ff000000 +#define IOMMU_CMD_INVAL_DEV_RSVD 0xffff00000fffffff +#define IOMMU_INVAL_IOMMU_PAGES_RSVD 0xfff000000fff0000 +#define IOMMU_INVAL_IOTLB_PAGES_RSVD 0x00000ff4 +#define IOMMU_INVAL_INTR_TABLE_RSVD 0xffff00000fffffff +#define IOMMU_PRF_IOMMU_PAGES_RSVD 0x00ff00000ff00000 +#define IOMMU_COMPLETE_PPR_RQ_RSVD 0xffff00000ff00000 +#define IOMMU_INVAL_IOMMU_ALL_RSVD 0x0fffffff00000000 +#define IOMMU_COMPLETE_PPR_HIGH_RSVD 0xffff000000000000 +#define IOMMU_INVAL_PAGES_HIGH_RSVD 0xff0 +#define IOMMU_PREF_HIGH_RSVD 0xfd4 + +/* command masks - inval iommu pages */ +#define IOMMU_INVAL_PAGES_PASID (~((1UL << 20) - 1)) +#define IOMMU_INVAL_PAGES_DOMID ((1UL << 16) - 1) +#define IOMMU_INVAL_PAGES_ADDRESS (~((1UL << 12) - 1)) +#define IOMMU_INVAL_PAGES_SBIT (1UL << 0) +#define IOMMU_INVAL_PAGES_PDE (1UL << 1) +#define IOMMU_INVAL_PAGES_GN (1UL << 2) + +/* masks - inval iotlb pages */ +#define IOMMU_INVAL_IOTLB_DEVID (~((1UL << 16) - 1)) +#define IOMMU_INVAL_IOTLB_PASID_LOW (0xff << 15) +#define IOMMU_INVAL_IOTLB_MAXPEND (0xff << 23) +#define IOMMU_INVAL_IOTLB_QUEUEID (~((1UL << 16) - 1)) +#define IOMMU_INVAL_IOTLB_PASID_HIGH (0xff << 46) +#define IOMMU_INVAL_IOTLB_GN IOMMU_INVAL_PAGES_GN +#define IOMMU_INVAL_IOTLB_S IOMMU_INVAL_PAGES_S +#define IOMMU_INVAL_IOTLB_ADDRESS IOMMU_INVAL_PAGES_ADDRESS +#define IOMMU_INVAL_IOTLB_MAKEPASID(low, high) + +/* masks - prefetch pages */ +#define IOMMU_PREFETCH_PAGES_DEVID IOMMU_INVAL_IOTLB_DEVID +#define IOMMU_PREFETCH_PAGES_PFCOUNT IOMMU_INVAL_IOTLB_MAXPEND + +#define TYPE_AMD_IOMMU_DEVICE "amd-iommu" +#define AMD_IOMMU_DEVICE(obj)\ + OBJECT_CHECK(AMDIOMMUState, (obj), TYPE_AMD_IOMMU_DEVICE) + +#define AMD_IOMMU_STR "amd" + +typedef struct AMDIOMMUAddressSpace AMDIOMMUAddressSpace; + +typedef struct AMDIOMMUState { + PCIDevice dev; /* The PCI device itself */ + + uint32_t version; + + uint32_t capab_offset; /* capability offset pointer */ + uint64_t mmio_addr; + uint8_t *capab; /* capabilities registers */ + + bool enabled; /* IOMMU enabled */ + bool ats_enabled; /* address translation enabled */ + bool cmdbuf_enabled; /* command buffer enabled */ + bool evtlog_enabled; /* event log enabled */ + bool excl_enabled; + + dma_addr_t devtab; /* base address device table */ + size_t devtab_len; /* device table length */ + + dma_addr_t cmdbuf; /* command buffer base address */ + uint64_t cmdbuf_len; /* command buffer length */ + uint32_t cmdbuf_head; /* current IOMMU read position */ + uint32_t cmdbuf_tail; /* next Software write position */ + bool completion_wait_intr; + + dma_addr_t evtlog; /* base address event log */ + bool evtlog_intr; + uint32_t evtlog_len; /* event log length */ + uint32_t evtlog_head; /* current IOMMU write position */ + uint32_t evtlog_tail; /* current Software read position */ + + /* unused for now */ + dma_addr_t excl_base; /* base DVA - IOMMU exclusion range */ + dma_addr_t excl_limit; /* limit of IOMMU exclusion range */ + bool excl_allow; /* translate accesses to the exclusion range */ + bool excl_enable; /* exclusion range enabled */ + + dma_addr_t ppr_log; /* base address ppr log */ + uint32_t pprlog_len; /* ppr log len */ + uint32_t pprlog_head; /* ppr log head */ + uint32_t pprlog_tail; /* ppr log tail */ + + MemoryRegion mmio; /* MMIO region */ + uint8_t mmior[IOMMU_MMIO_SIZE]; /* read/write MMIO */ + uint8_t w1cmask[IOMMU_MMIO_SIZE]; /* read/write 1 clear mask */ + uint8_t romask[IOMMU_MMIO_SIZE]; /* MMIO read/only mask */ + bool mmio_enabled; + + /* IOMMU function */ + MemoryRegionIOMMUOps iommu_ops; + + /* for each served device */ + AMDIOMMUAddressSpace **address_spaces[PCI_BUS_MAX]; + + /* IOTLB */ + GHashTable *iotlb; +} AMDIOMMUState; + +/* + * bridge_host_amd_iommu: setup an IOMMU function on a bus + * + * called for all PCI devices + * + * @bus: PCI bus to host the IOMMU + * @opaque: opaque pointer to AMDIOMMUState struct + * @defvn: PCI function of device for which to setup IOMMU region for + * + */ +AddressSpace *bridge_host_amd_iommu(PCIBus *bus, void *opaque, int devfn); + +#endif diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index ef6ba51..266cd7e 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -12,6 +12,8 @@ /* PCI bus */ +#define PCI_BUS_NUM(x) (((x) >> 8) & 0xff) +#define PCI_DEVID(bus, devfn) ((((uint16_t)(bus)) << 8) | (devfn)) #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) #define PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f) #define PCI_FUNC(devfn) ((devfn) & 0x07) -- 2.1.4 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* [Qemu-devel] [V9 2/4] hw/i386: ACPI table for AMD IOMMU 2016-04-24 22:12 [Qemu-devel] [V9 0/4] AMD IOMMU David Kiarie 2016-04-24 22:12 ` [Qemu-devel] [V9 1/4] hw/i386: Introduce " David Kiarie @ 2016-04-24 22:12 ` David Kiarie 2016-04-29 6:09 ` Jan Kiszka 2016-04-24 22:12 ` [Qemu-devel] [V9 3/4] hw/core: Add AMD IOMMU to machine properties David Kiarie ` (3 subsequent siblings) 5 siblings, 1 reply; 27+ messages in thread From: David Kiarie @ 2016-04-24 22:12 UTC (permalink / raw) To: qemu-devel Cc: valentine.sinitsyn, marcel, mst, jan.kizska, imammedo, David Kiarie Add IVRS table for AMD IOMMU. Generate IVRS or DMAR depending on emulated IOMMU Signed-off-by: David Kiarie <davidkiarie4@gmail.com> --- hw/acpi/aml-build.c | 2 +- hw/acpi/core.c | 13 ------ hw/i386/acpi-build.c | 101 +++++++++++++++++++++++++++++++++++++++----- include/hw/acpi/acpi-defs.h | 14 ++++++ include/hw/acpi/acpi.h | 16 +++++++ include/hw/acpi/aml-build.h | 1 + 6 files changed, 122 insertions(+), 25 deletions(-) diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index ab89ca6..da11bf8 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -227,7 +227,7 @@ static void build_extop_package(GArray *package, uint8_t op) build_prepend_byte(package, 0x5B); /* ExtOpPrefix */ } -static void build_append_int_noprefix(GArray *table, uint64_t value, int size) +void build_append_int_noprefix(GArray *table, uint64_t value, int size) { int i; diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 7925a1a..ee0e687 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -29,19 +29,6 @@ #include "qapi-visit.h" #include "qapi-event.h" -struct acpi_table_header { - uint16_t _length; /* our length, not actual part of the hdr */ - /* allows easier parsing for fw_cfg clients */ - char sig[4]; /* ACPI signature (4 ASCII characters) */ - uint32_t length; /* Length of table, in bytes, including header */ - uint8_t revision; /* ACPI Specification minor version # */ - uint8_t checksum; /* To make sum of entire table == 0 */ - char oem_id[6]; /* OEM identification */ - char oem_table_id[8]; /* OEM table identification */ - uint32_t oem_revision; /* OEM revision number */ - char asl_compiler_id[4]; /* ASL compiler vendor ID */ - uint32_t asl_compiler_revision; /* ASL compiler revision number */ -} QEMU_PACKED; #define ACPI_TABLE_HDR_SIZE sizeof(struct acpi_table_header) #define ACPI_TABLE_PFX_SIZE sizeof(uint16_t) /* size of the extra prefix */ diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 6477003..19efc68 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -52,6 +52,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci-host/q35.h" #include "hw/i386/intel_iommu.h" +#include "hw/i386/amd_iommu.h" #include "hw/timer/hpet.h" #include "hw/acpi/aml-build.h" @@ -118,6 +119,12 @@ typedef struct AcpiBuildPciBusHotplugState { bool pcihp_bridge_en; } AcpiBuildPciBusHotplugState; +typedef enum IommuType { + TYPE_AMD, + TYPE_INTEL, + TYPE_NONE +} IommuType; + static void acpi_get_pm_info(AcpiPmInfo *pm) { Object *piix = piix4_pm_find(); @@ -2598,6 +2605,81 @@ build_dmar_q35(GArray *table_data, GArray *linker) "DMAR", table_data->len - dmar_start, 1, NULL, NULL); } +#define IOMMU_IVRS_LENGTH 0x30 +/* increase ivdb length if more devices are added */ +#define IOMMU_IVDB_LENGTH 0x20 + +static void +build_amd_iommu(GArray *table_data, GArray *linker) +{ + int iommu_start = table_data->len; + bool iommu_ambig; + + /* IVRS definition - table header has an extra 2-byte field */ + acpi_data_push(table_data, (sizeof(acpi_table_header) - 2)); + /* common virtualization information */ + build_append_int_noprefix(table_data, AMD_IOMMU_HOST_ADDRESS_WIDTH << 8, 4); + /* reserved */ + build_append_int_noprefix(table_data, 0, 8); + + AMDIOMMUState *s = (AMDIOMMUState *)object_resolve_path_type("", + TYPE_AMD_IOMMU_DEVICE, &iommu_ambig); + + /* IVDB definition - type 10h */ + if (!iommu_ambig) { + /* IVHD definition - type 10h */ + build_append_int_noprefix(table_data, 0x10, 1); + /* virtualization flags */ + build_append_int_noprefix(table_data, (IVHD_HT_TUNEN | + IVHD_PPRSUP | IVHD_IOTLBSUP | IVHD_PREFSUP), 1); + /* ivhd length */ + build_append_int_noprefix(table_data, IOMMU_IVDB_LENGTH, 2); + /* iommu device id */ + build_append_int_noprefix(table_data, PCI_DEVICE_ID_RD890_IOMMU, 2); + /* offset of capability registers */ + build_append_int_noprefix(table_data, s->capab_offset, 2); + /* mmio base register */ + build_append_int_noprefix(table_data, s->mmio.addr, 8); + /* pci segment */ + build_append_int_noprefix(table_data, 0, 2); + /* interrupt numbers */ + build_append_int_noprefix(table_data, 0, 2); + /* feature reporting */ + build_append_int_noprefix(table_data, (IVHD_EFR_GTSUP | + IVHD_EFR_HATS | IVHD_EFR_GATS), 4); + /* Add device flags here + * This is are 4-byte device entries currently reporting the range of + * devices 00h - ffffh; all devices + * Device setting affecting all devices should be made here + * + * Refer to + * (http://developer.amd.com/wordpress/media/2012/10/488821.pdf) + * Table 95 + */ + /* start of device range, 4-byte entries */ + build_append_int_noprefix(table_data, 0x03000000, 4); + /* end of device range */ + build_append_int_noprefix(table_data, 0x04ffff00, 4); + } + + build_header(linker, table_data, (void *)(table_data->data + iommu_start), + "IVRS", table_data->len - iommu_start, 1, NULL, NULL); +} + +static IommuType has_iommu(void) +{ + bool ambiguous; + + if (object_resolve_path_type("", TYPE_AMD_IOMMU_DEVICE, &ambiguous) + && !ambiguous) + return TYPE_AMD; + else if (object_resolve_path_type("", TYPE_INTEL_IOMMU_DEVICE, &ambiguous) + && !ambiguous) + return TYPE_INTEL; + else + return TYPE_NONE; +} + static GArray * build_rsdp(GArray *rsdp_table, GArray *linker, unsigned rsdt) { @@ -2656,16 +2738,6 @@ static bool acpi_get_mcfg(AcpiMcfgInfo *mcfg) return true; } -static bool acpi_has_iommu(void) -{ - bool ambiguous; - Object *intel_iommu; - - intel_iommu = object_resolve_path_type("", TYPE_INTEL_IOMMU_DEVICE, - &ambiguous); - return intel_iommu && !ambiguous; -} - static void acpi_build(AcpiBuildTables *tables, MachineState *machine) { @@ -2678,6 +2750,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) AcpiMcfgInfo mcfg; PcPciInfo pci; uint8_t *u; + IommuType IOMMUType = has_iommu(); size_t aml_len = 0; GArray *tables_blob = tables->table_data; AcpiSlicOem slic_oem = { .id = NULL, .table_id = NULL }; @@ -2743,7 +2816,13 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) acpi_add_table(table_offsets, tables_blob); build_mcfg_q35(tables_blob, tables->linker, &mcfg); } - if (acpi_has_iommu()) { + + if (IOMMUType == TYPE_AMD) { + acpi_add_table(table_offsets, tables_blob); + build_amd_iommu(tables_blob, tables->linker); + } + + if (IOMMUType == TYPE_INTEL) { acpi_add_table(table_offsets, tables_blob); build_dmar_q35(tables_blob, tables->linker); } diff --git a/include/hw/acpi/acpi-defs.h b/include/hw/acpi/acpi-defs.h index c7a03d4..114227a 100644 --- a/include/hw/acpi/acpi-defs.h +++ b/include/hw/acpi/acpi-defs.h @@ -570,4 +570,18 @@ typedef struct AcpiDmarHardwareUnit AcpiDmarHardwareUnit; /* Masks for Flags field above */ #define ACPI_DMAR_INCLUDE_PCI_ALL 1 +/* IVRS constants */ +#define AMD_IOMMU_HOST_ADDRESS_WIDTH 39UL + +/* flags in the IVHD headers */ +#define IVHD_HT_TUNEN (1UL << 0) +#define IVHD_IOTLBSUP (1UL << 4) +#define IVHD_PREFSUP (1UL << 6) +#define IVHD_PPRSUP (1UL << 7) + +/* features in the IVHD headers */ +#define IVHD_EFR_HATS 48 +#define IVHD_EFR_GATS 48 +#define IVHD_EFR_GTSUP (1UL << 2) + #endif diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index e0978c8..a708b84 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -201,4 +201,20 @@ struct AcpiSlicOem { }; int acpi_get_slic_oem(AcpiSlicOem *oem); +struct acpi_table_header { + uint16_t _length; /* our length, not actual part of the hdr */ + /* allows easier parsing for fw_cfg clients */ + char sig[4]; /* ACPI signature (4 ASCII characters) */ + uint32_t length; /* Length of table, in bytes, including header */ + uint8_t revision; /* ACPI Specification minor version # */ + uint8_t checksum; /* To make sum of entire table == 0 */ + char oem_id[6]; /* OEM identification */ + char oem_table_id[8]; /* OEM table identification */ + uint32_t oem_revision; /* OEM revision number */ + char asl_compiler_id[4]; /* ASL compiler vendor ID */ + uint32_t asl_compiler_revision; /* ASL compiler revision number */ +} QEMU_PACKED; + +typedef struct acpi_table_header acpi_table_header; + #endif /* !QEMU_HW_ACPI_H */ diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 2c994b3..d25e9a5 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -355,6 +355,7 @@ Aml *aml_derefof(Aml *arg); Aml *aml_sizeof(Aml *arg); Aml *aml_concatenate(Aml *source1, Aml *source2, Aml *target); +void build_append_int_noprefix(GArray *table, uint64_t value, int size); void build_header(GArray *linker, GArray *table_data, AcpiTableHeader *h, const char *sig, int len, uint8_t rev, -- 2.1.4 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 2/4] hw/i386: ACPI table for AMD IOMMU 2016-04-24 22:12 ` [Qemu-devel] [V9 2/4] hw/i386: ACPI table for " David Kiarie @ 2016-04-29 6:09 ` Jan Kiszka 2016-04-29 8:28 ` David Kiarie 2016-05-04 7:45 ` Valentine Sinitsyn 0 siblings, 2 replies; 27+ messages in thread From: Jan Kiszka @ 2016-04-29 6:09 UTC (permalink / raw) To: David Kiarie, qemu-devel; +Cc: mst, valentine.sinitsyn, marcel, imammedo On 2016-04-25 00:12, David Kiarie wrote: > Add IVRS table for AMD IOMMU. Generate IVRS or DMAR > depending on emulated IOMMU It seems you lack scope descriptions for the PCI devices in the system. At least, this is what our jailhouse config generator complains about right now (didn't look into details yet). If so, the guest OS will likely not configure the IOMMU appropriately as it thinks that the devices are passed through anyway. On Intel, there is an easy way to state "catch them all" in the ACPI table. Maybe AMD has this as well so that you don't need to add individual devices. Jan ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 2/4] hw/i386: ACPI table for AMD IOMMU 2016-04-29 6:09 ` Jan Kiszka @ 2016-04-29 8:28 ` David Kiarie 2016-05-04 7:50 ` Valentine Sinitsyn 2016-05-04 7:45 ` Valentine Sinitsyn 1 sibling, 1 reply; 27+ messages in thread From: David Kiarie @ 2016-04-29 8:28 UTC (permalink / raw) To: Jan Kiszka Cc: QEMU Developers, Michael S. Tsirkin, Valentine Sinitsyn, Marcel Apfelbaum, imammedo On Fri, Apr 29, 2016 at 9:09 AM, Jan Kiszka <jan.kiszka@web.de> wrote: > On 2016-04-25 00:12, David Kiarie wrote: >> Add IVRS table for AMD IOMMU. Generate IVRS or DMAR >> depending on emulated IOMMU > > It seems you lack scope descriptions for the PCI devices in the system. > At least, this is what our jailhouse config generator complains about > right now (didn't look into details yet). If so, the guest OS will > likely not configure the IOMMU appropriately as it thinks that the > devices are passed through anyway. > > On Intel, there is an easy way to state "catch them all" in the ACPI > table. Maybe AMD has this as well so that you don't need to add > individual devices. This is what am currently doing. From what I can see, linux correctly detects the range but I will have a look at it again before sending the next version. There was another issue raised by Michael about denying VFIO in case a user requests for IOMMU support. I did look at this but since VFIO is started with '-device' I didn't find a way to deny it in case of IOMMU support except by parsing command line arguments which turned out to be a bit ugly. We could exclude VFIO from translation by IOMMU by excluding it from the scope descriptions but am not quite sure this will remedy all the problems relating to VFIO and IOMMU. This will also require the device scope to explicitly list all the devices. > > Jan ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 2/4] hw/i386: ACPI table for AMD IOMMU 2016-04-29 8:28 ` David Kiarie @ 2016-05-04 7:50 ` Valentine Sinitsyn 0 siblings, 0 replies; 27+ messages in thread From: Valentine Sinitsyn @ 2016-05-04 7:50 UTC (permalink / raw) To: David Kiarie, Jan Kiszka Cc: QEMU Developers, Michael S. Tsirkin, Marcel Apfelbaum, imammedo On 29.04.2016 13:28, David Kiarie wrote: > On Fri, Apr 29, 2016 at 9:09 AM, Jan Kiszka <jan.kiszka@web.de> wrote: >> On 2016-04-25 00:12, David Kiarie wrote: >>> Add IVRS table for AMD IOMMU. Generate IVRS or DMAR >>> depending on emulated IOMMU >> >> It seems you lack scope descriptions for the PCI devices in the system. >> At least, this is what our jailhouse config generator complains about >> right now (didn't look into details yet). If so, the guest OS will >> likely not configure the IOMMU appropriately as it thinks that the >> devices are passed through anyway. >> >> On Intel, there is an easy way to state "catch them all" in the ACPI >> table. Maybe AMD has this as well so that you don't need to add >> individual devices. > > This is what am currently doing. From what I can see, linux correctly > detects the range but I will have a look at it again before sending > the next version. > > There was another issue raised by Michael about denying VFIO in case a > user requests for IOMMU support. I did look at this but since VFIO is > started with '-device' I didn't find a way to deny it in case of IOMMU > support except by parsing command line arguments which turned out to > be a bit ugly. > > We could exclude VFIO from translation by IOMMU by excluding it from > the scope descriptions but am not quite sure this will remedy all the > problems relating to VFIO and IOMMU. This will also require the device > scope to explicitly list all the devices. You may also try listing everything "up to" VFIO, then everything "after" the VFIO, I guess. Valentine ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 2/4] hw/i386: ACPI table for AMD IOMMU 2016-04-29 6:09 ` Jan Kiszka 2016-04-29 8:28 ` David Kiarie @ 2016-05-04 7:45 ` Valentine Sinitsyn 1 sibling, 0 replies; 27+ messages in thread From: Valentine Sinitsyn @ 2016-05-04 7:45 UTC (permalink / raw) To: Jan Kiszka, David Kiarie, qemu-devel; +Cc: mst, marcel, imammedo On 29.04.2016 11:09, Jan Kiszka wrote: > On 2016-04-25 00:12, David Kiarie wrote: >> Add IVRS table for AMD IOMMU. Generate IVRS or DMAR >> depending on emulated IOMMU > > It seems you lack scope descriptions for the PCI devices in the system. > At least, this is what our jailhouse config generator complains about > right now (didn't look into details yet). If so, the guest OS will > likely not configure the IOMMU appropriately as it thinks that the > devices are passed through anyway. > > On Intel, there is an easy way to state "catch them all" in the ACPI > table. Maybe AMD has this as well so that you don't need to add > individual devices. There is. IVHD Device Entry Type 1 does just that. Valentine ^ permalink raw reply [flat|nested] 27+ messages in thread
* [Qemu-devel] [V9 3/4] hw/core: Add AMD IOMMU to machine properties 2016-04-24 22:12 [Qemu-devel] [V9 0/4] AMD IOMMU David Kiarie 2016-04-24 22:12 ` [Qemu-devel] [V9 1/4] hw/i386: Introduce " David Kiarie 2016-04-24 22:12 ` [Qemu-devel] [V9 2/4] hw/i386: ACPI table for " David Kiarie @ 2016-04-24 22:12 ` David Kiarie 2016-04-25 3:00 ` Peter Xu 2016-04-24 22:12 ` [Qemu-devel] [V9 4/4] hw/pci-host: Emulate AMD IOMMU David Kiarie ` (2 subsequent siblings) 5 siblings, 1 reply; 27+ messages in thread From: David Kiarie @ 2016-04-24 22:12 UTC (permalink / raw) To: qemu-devel Cc: valentine.sinitsyn, marcel, mst, jan.kizska, imammedo, David Kiarie Added a bool, subject to review to machine properties which it used to override iommu emulated from Intel to AMD. Signed-off-by: David Kiarie <davidkiarie4@gmail.com> --- hw/core/machine.c | 32 +++++++++++++++++++++++++++++--- include/hw/boards.h | 1 + include/hw/i386/intel_iommu.h | 1 + qemu-options.hx | 7 +++++-- util/qemu-config.c | 8 ++++++-- 5 files changed, 42 insertions(+), 7 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 6dbbc85..792641b 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -15,6 +15,8 @@ #include "qapi/error.h" #include "qapi-visit.h" #include "qapi/visitor.h" +#include "hw/i386/amd_iommu.h" +#include "hw/i386/intel_iommu.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "qemu/error-report.h" @@ -300,6 +302,26 @@ static void machine_set_iommu(Object *obj, bool value, Error **errp) ms->iommu = value; } +static void machine_set_iommu_override(Object *obj, const char *value, + Error **errp) +{ + MachineState *ms = MACHINE(obj); + Error *err = NULL; + + ms->x_iommu_type = false; + /* ensure a valid iommu type */ + if (g_strcmp0(value, AMD_IOMMU_STR) && + g_strcmp0(value, INTEL_IOMMU_STR)) { + error_setg(errp, "Invalid IOMMU type %s", value); + error_propagate(errp, err); + return; + } + + if ((g_strcmp0(value, AMD_IOMMU_STR) == 0)) { + ms->x_iommu_type = true; + } +} + static void machine_set_suppress_vmdesc(Object *obj, bool value, Error **errp) { MachineState *ms = MACHINE(obj); @@ -473,10 +495,14 @@ static void machine_initfn(Object *obj) "Firmware image", NULL); object_property_add_bool(obj, "iommu", - machine_get_iommu, - machine_set_iommu, NULL); + machine_get_iommu, machine_set_iommu, NULL); object_property_set_description(obj, "iommu", - "Set on/off to enable/disable Intel IOMMU (VT-d)", + "Set on to enable IOMMU emulation", + NULL); + object_property_add_str(obj, "x-iommu-type", + NULL, machine_set_iommu_override, NULL); + object_property_set_description(obj, "x-iommu-type", + "Set on to override emulated IOMMU to AMD IOMMU", NULL); object_property_add_bool(obj, "suppress-vmdesc", machine_get_suppress_vmdesc, diff --git a/include/hw/boards.h b/include/hw/boards.h index 8d4fe56..5a12a1c 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -152,6 +152,7 @@ struct MachineState { bool igd_gfx_passthru; char *firmware; bool iommu; + bool x_iommu_type; bool suppress_vmdesc; bool enforce_config_section; diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index b024ffa..7e511e1 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -24,6 +24,7 @@ #include "hw/qdev.h" #include "sysemu/dma.h" +#define INTEL_IOMMU_STR "intel" #define TYPE_INTEL_IOMMU_DEVICE "intel-iommu" #define INTEL_IOMMU_DEVICE(obj) \ OBJECT_CHECK(IntelIOMMUState, (obj), TYPE_INTEL_IOMMU_DEVICE) diff --git a/qemu-options.hx b/qemu-options.hx index 6106520..81217d3 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -38,7 +38,8 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " kvm_shadow_mem=size of KVM shadow MMU\n" " dump-guest-core=on|off include guest memory in a core dump (default=on)\n" " mem-merge=on|off controls memory merge support (default: on)\n" - " iommu=on|off controls emulated Intel IOMMU (VT-d) support (default=off)\n" + " iommu=on|off controls emulated IOMMU support(default: off)\n" + " x-iommu-type=amd|intel overrides emulated IOMMU to AMD IOMMU (default: intel)\n" " igd-passthru=on|off controls IGD GFX passthrough support (default=off)\n" " aes-key-wrap=on|off controls support for AES key wrapping (default=on)\n" " dea-key-wrap=on|off controls support for DEA key wrapping (default=on)\n" @@ -74,7 +75,9 @@ Enables or disables memory merge support. This feature, when supported by the host, de-duplicates identical memory pages among VMs instances (enabled by default). @item iommu=on|off -Enables or disables emulated Intel IOMMU (VT-d) support. The default is off. +Enables and disables IOMMU emulation. The default is off. +@item x-iommu-type=on|off +Overrides emulated IOMMU from AMD IOMMU. By default Intel IOMMU is emulated. @item aes-key-wrap=on|off Enables or disables AES key wrapping support on s390-ccw hosts. This feature controls whether AES wrapping keys will be created to allow diff --git a/util/qemu-config.c b/util/qemu-config.c index fb97307..8886abf 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -213,8 +213,12 @@ static QemuOptsList machine_opts = { .help = "firmware image", },{ .name = "iommu", - .type = QEMU_OPT_BOOL, - .help = "Set on/off to enable/disable Intel IOMMU (VT-d)", + .type = QEMU_OPT_BOOL, + .help = "Set on/off to enable iommu", + },{ + .name = "x-iommu-type", + .type = QEMU_OPT_STRING, + .help = "Overrides emulated IOMMU from Intel to AMD", },{ .name = "suppress-vmdesc", .type = QEMU_OPT_BOOL, -- 2.1.4 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 3/4] hw/core: Add AMD IOMMU to machine properties 2016-04-24 22:12 ` [Qemu-devel] [V9 3/4] hw/core: Add AMD IOMMU to machine properties David Kiarie @ 2016-04-25 3:00 ` Peter Xu 0 siblings, 0 replies; 27+ messages in thread From: Peter Xu @ 2016-04-25 3:00 UTC (permalink / raw) To: David Kiarie Cc: qemu-devel, jan.kizska, mst, valentine.sinitsyn, marcel, imammedo On Mon, Apr 25, 2016 at 01:12:56AM +0300, David Kiarie wrote: > Added a bool, subject to review to machine properties which > it used to override iommu emulated from Intel to AMD. > > Signed-off-by: David Kiarie <davidkiarie4@gmail.com> > --- > hw/core/machine.c | 32 +++++++++++++++++++++++++++++--- > include/hw/boards.h | 1 + > include/hw/i386/intel_iommu.h | 1 + > qemu-options.hx | 7 +++++-- > util/qemu-config.c | 8 ++++++-- > 5 files changed, 42 insertions(+), 7 deletions(-) > > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 6dbbc85..792641b 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -15,6 +15,8 @@ > #include "qapi/error.h" > #include "qapi-visit.h" > #include "qapi/visitor.h" > +#include "hw/i386/amd_iommu.h" > +#include "hw/i386/intel_iommu.h" > #include "hw/sysbus.h" > #include "sysemu/sysemu.h" > #include "qemu/error-report.h" > @@ -300,6 +302,26 @@ static void machine_set_iommu(Object *obj, bool value, Error **errp) > ms->iommu = value; > } > > +static void machine_set_iommu_override(Object *obj, const char *value, > + Error **errp) > +{ > + MachineState *ms = MACHINE(obj); > + Error *err = NULL; > + > + ms->x_iommu_type = false; > + /* ensure a valid iommu type */ > + if (g_strcmp0(value, AMD_IOMMU_STR) && > + g_strcmp0(value, INTEL_IOMMU_STR)) { > + error_setg(errp, "Invalid IOMMU type %s", value); > + error_propagate(errp, err); > + return; > + } > + > + if ((g_strcmp0(value, AMD_IOMMU_STR) == 0)) { > + ms->x_iommu_type = true; > + } Would it be clearer to use: if (g_strcmp0(value, AMD_IOMMU_STR) == 0) { ... } else if (g_strcmp0(value, INTEL_IOMMU_STR) == 0) { ... } else { error... } ? Thanks. -- peterx ^ permalink raw reply [flat|nested] 27+ messages in thread
* [Qemu-devel] [V9 4/4] hw/pci-host: Emulate AMD IOMMU 2016-04-24 22:12 [Qemu-devel] [V9 0/4] AMD IOMMU David Kiarie ` (2 preceding siblings ...) 2016-04-24 22:12 ` [Qemu-devel] [V9 3/4] hw/core: Add AMD IOMMU to machine properties David Kiarie @ 2016-04-24 22:12 ` David Kiarie 2016-04-25 3:06 ` Peter Xu 2016-04-24 22:16 ` [Qemu-devel] [V9 0/4] " David Kiarie 2016-04-25 12:53 ` Marcel Apfelbaum 5 siblings, 1 reply; 27+ messages in thread From: David Kiarie @ 2016-04-24 22:12 UTC (permalink / raw) To: qemu-devel Cc: valentine.sinitsyn, marcel, mst, jan.kizska, imammedo, David Kiarie Add AMD IOMMU emulation support to q35 chipset Signed-off-by: David Kiarie <davidkiarie4@gmail.com> --- hw/pci-host/q35.c | 21 +++++++++++++++++++-- include/hw/i386/intel_iommu.h | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 70f897e..37f8a84 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -32,6 +32,7 @@ #include "hw/pci-host/q35.h" #include "qapi/error.h" #include "qapi/visitor.h" +#include "hw/i386/amd_iommu.h" /**************************************************************************** * Q35 host @@ -448,6 +449,19 @@ static void mch_init_dmar(MCHPCIState *mch) pci_setup_iommu(pci_bus, q35_host_dma_iommu, mch->iommu); } +static void mch_init_amdvi(MCHPCIState *mch) +{ + AMDIOMMUState *iommu_state; + PCIBus *bus = PCI_BUS(qdev_get_parent_bus(DEVICE(mch))); + PCIDevice *iommu; + + iommu = pci_create_simple(bus, 0x20, TYPE_AMD_IOMMU_DEVICE); + + iommu_state = AMD_IOMMU_DEVICE(iommu); + + pci_setup_iommu(bus, bridge_host_amd_iommu, iommu_state); +} + static void mch_realize(PCIDevice *d, Error **errp) { int i; @@ -506,8 +520,11 @@ static void mch_realize(PCIDevice *d, Error **errp) mch->pci_address_space, &mch->pam_regions[i+1], PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE); } - /* Intel IOMMU (VT-d) */ - if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { + + if (object_property_get_bool(qdev_get_machine(), "iommu", NULL) && + MACHINE(qdev_get_machine())->x_iommu_type) { + mch_init_amdvi(mch); + } else if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { mch_init_dmar(mch); } } diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h index 7e511e1..539530c 100644 --- a/include/hw/i386/intel_iommu.h +++ b/include/hw/i386/intel_iommu.h @@ -24,10 +24,10 @@ #include "hw/qdev.h" #include "sysemu/dma.h" -#define INTEL_IOMMU_STR "intel" #define TYPE_INTEL_IOMMU_DEVICE "intel-iommu" #define INTEL_IOMMU_DEVICE(obj) \ OBJECT_CHECK(IntelIOMMUState, (obj), TYPE_INTEL_IOMMU_DEVICE) +#define INTEL_IOMMU_STR "intel" /* DMAR Hardware Unit Definition address (IOMMU unit) */ #define Q35_HOST_BRIDGE_IOMMU_ADDR 0xfed90000ULL -- 2.1.4 ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 4/4] hw/pci-host: Emulate AMD IOMMU 2016-04-24 22:12 ` [Qemu-devel] [V9 4/4] hw/pci-host: Emulate AMD IOMMU David Kiarie @ 2016-04-25 3:06 ` Peter Xu 0 siblings, 0 replies; 27+ messages in thread From: Peter Xu @ 2016-04-25 3:06 UTC (permalink / raw) To: David Kiarie Cc: qemu-devel, jan.kizska, mst, valentine.sinitsyn, marcel, imammedo On Mon, Apr 25, 2016 at 01:12:57AM +0300, David Kiarie wrote: > Add AMD IOMMU emulation support to q35 chipset > > Signed-off-by: David Kiarie <davidkiarie4@gmail.com> > --- > hw/pci-host/q35.c | 21 +++++++++++++++++++-- > include/hw/i386/intel_iommu.h | 2 +- > 2 files changed, 20 insertions(+), 3 deletions(-) > > diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c > index 70f897e..37f8a84 100644 > --- a/hw/pci-host/q35.c > +++ b/hw/pci-host/q35.c > @@ -32,6 +32,7 @@ > #include "hw/pci-host/q35.h" > #include "qapi/error.h" > #include "qapi/visitor.h" > +#include "hw/i386/amd_iommu.h" > > /**************************************************************************** > * Q35 host > @@ -448,6 +449,19 @@ static void mch_init_dmar(MCHPCIState *mch) > pci_setup_iommu(pci_bus, q35_host_dma_iommu, mch->iommu); > } > > +static void mch_init_amdvi(MCHPCIState *mch) > +{ > + AMDIOMMUState *iommu_state; > + PCIBus *bus = PCI_BUS(qdev_get_parent_bus(DEVICE(mch))); > + PCIDevice *iommu; > + > + iommu = pci_create_simple(bus, 0x20, TYPE_AMD_IOMMU_DEVICE); > + > + iommu_state = AMD_IOMMU_DEVICE(iommu); > + > + pci_setup_iommu(bus, bridge_host_amd_iommu, iommu_state); > +} > + > static void mch_realize(PCIDevice *d, Error **errp) > { > int i; > @@ -506,8 +520,11 @@ static void mch_realize(PCIDevice *d, Error **errp) > mch->pci_address_space, &mch->pam_regions[i+1], > PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE); > } > - /* Intel IOMMU (VT-d) */ > - if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { > + > + if (object_property_get_bool(qdev_get_machine(), "iommu", NULL) && > + MACHINE(qdev_get_machine())->x_iommu_type) { > + mch_init_amdvi(mch); > + } else if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { > mch_init_dmar(mch); > } Like patch 3's comment, I would prefer this: if (object_property_get_bool(qdev_get_machine(), "iommu", NULL)) { if (MACHINE(qdev_get_machine())->x_iommu_type) { mch_init_amdvi(mch); } else { mch_init_dmar(mch); } } Thanks. -- peterx ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-04-24 22:12 [Qemu-devel] [V9 0/4] AMD IOMMU David Kiarie ` (3 preceding siblings ...) 2016-04-24 22:12 ` [Qemu-devel] [V9 4/4] hw/pci-host: Emulate AMD IOMMU David Kiarie @ 2016-04-24 22:16 ` David Kiarie 2016-04-25 7:13 ` Jan Kiszka 2016-04-25 12:53 ` Marcel Apfelbaum 5 siblings, 1 reply; 27+ messages in thread From: David Kiarie @ 2016-04-24 22:16 UTC (permalink / raw) To: QEMU Developers Cc: Valentine Sinitsyn, Marcel Apfelbaum, Michael S. Tsirkin, imammedo, David Kiarie, J. Kiszka Sorry, I keep missing Jan's email... On Mon, Apr 25, 2016 at 1:12 AM, David Kiarie <davidkiarie4@gmail.com> wrote: > Hi all, > > The current AMD IOMMU patches that fixes Igor's comments. I got rid of structs and instead > added individual integer fields into the table data directly, as suggested. > > I have also got rid of some un-used macros and fixed a few other miscellaneous things. > > David Kiarie (4): > hw/i386: Introduce AMD IOMMU > hw/i386: ACPI table for AMD IOMMU > hw/core: Add AMD IOMMU to machine properties > hw/pci-host: Emulate AMD IOMMU > > hw/acpi/aml-build.c | 2 +- > hw/acpi/core.c | 13 - > hw/core/machine.c | 32 +- > hw/i386/Makefile.objs | 1 + > hw/i386/acpi-build.c | 101 ++- > hw/i386/amd_iommu.c | 1426 +++++++++++++++++++++++++++++++++++++++++ > hw/i386/amd_iommu.h | 398 ++++++++++++ > hw/pci-host/q35.c | 21 +- > include/hw/acpi/acpi-defs.h | 14 + > include/hw/acpi/acpi.h | 16 + > include/hw/acpi/aml-build.h | 1 + > include/hw/boards.h | 1 + > include/hw/i386/intel_iommu.h | 1 + > include/hw/pci/pci.h | 2 + > qemu-options.hx | 7 +- > util/qemu-config.c | 8 +- > 16 files changed, 2010 insertions(+), 34 deletions(-) > create mode 100644 hw/i386/amd_iommu.c > create mode 100644 hw/i386/amd_iommu.h > > -- > 2.1.4 > ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-04-24 22:16 ` [Qemu-devel] [V9 0/4] " David Kiarie @ 2016-04-25 7:13 ` Jan Kiszka 0 siblings, 0 replies; 27+ messages in thread From: Jan Kiszka @ 2016-04-25 7:13 UTC (permalink / raw) To: David Kiarie, QEMU Developers Cc: Valentine Sinitsyn, Marcel Apfelbaum, Michael S. Tsirkin, imammedo On 2016-04-25 00:16, David Kiarie wrote: > Sorry, I keep missing Jan's email... No problem. I'm planning to give this version a try soon and will also look into some details for a review. Jan > > On Mon, Apr 25, 2016 at 1:12 AM, David Kiarie <davidkiarie4@gmail.com> wrote: >> Hi all, >> >> The current AMD IOMMU patches that fixes Igor's comments. I got rid of structs and instead >> added individual integer fields into the table data directly, as suggested. >> >> I have also got rid of some un-used macros and fixed a few other miscellaneous things. >> >> David Kiarie (4): >> hw/i386: Introduce AMD IOMMU >> hw/i386: ACPI table for AMD IOMMU >> hw/core: Add AMD IOMMU to machine properties >> hw/pci-host: Emulate AMD IOMMU >> >> hw/acpi/aml-build.c | 2 +- >> hw/acpi/core.c | 13 - >> hw/core/machine.c | 32 +- >> hw/i386/Makefile.objs | 1 + >> hw/i386/acpi-build.c | 101 ++- >> hw/i386/amd_iommu.c | 1426 +++++++++++++++++++++++++++++++++++++++++ >> hw/i386/amd_iommu.h | 398 ++++++++++++ >> hw/pci-host/q35.c | 21 +- >> include/hw/acpi/acpi-defs.h | 14 + >> include/hw/acpi/acpi.h | 16 + >> include/hw/acpi/aml-build.h | 1 + >> include/hw/boards.h | 1 + >> include/hw/i386/intel_iommu.h | 1 + >> include/hw/pci/pci.h | 2 + >> qemu-options.hx | 7 +- >> util/qemu-config.c | 8 +- >> 16 files changed, 2010 insertions(+), 34 deletions(-) >> create mode 100644 hw/i386/amd_iommu.c >> create mode 100644 hw/i386/amd_iommu.h >> >> -- >> 2.1.4 >> -- Siemens AG, Corporate Technology, CT RDA ITP SES-DE Corporate Competence Center Embedded Linux ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-04-24 22:12 [Qemu-devel] [V9 0/4] AMD IOMMU David Kiarie ` (4 preceding siblings ...) 2016-04-24 22:16 ` [Qemu-devel] [V9 0/4] " David Kiarie @ 2016-04-25 12:53 ` Marcel Apfelbaum 5 siblings, 0 replies; 27+ messages in thread From: Marcel Apfelbaum @ 2016-04-25 12:53 UTC (permalink / raw) To: David Kiarie, qemu-devel; +Cc: valentine.sinitsyn, mst, jan.kizska, imammedo On 04/25/2016 01:12 AM, David Kiarie wrote: > Hi all, > > The current AMD IOMMU patches that fixes Igor's comments. I got rid of structs and instead > added individual integer fields into the table data directly, as suggested. > > I have also got rid of some un-used macros and fixed a few other miscellaneous things. My comments for V8 still stand. I don't see them addressed in this version. Thanks, Marcel > > David Kiarie (4): > hw/i386: Introduce AMD IOMMU > hw/i386: ACPI table for AMD IOMMU > hw/core: Add AMD IOMMU to machine properties > hw/pci-host: Emulate AMD IOMMU > > hw/acpi/aml-build.c | 2 +- > hw/acpi/core.c | 13 - > hw/core/machine.c | 32 +- > hw/i386/Makefile.objs | 1 + > hw/i386/acpi-build.c | 101 ++- > hw/i386/amd_iommu.c | 1426 +++++++++++++++++++++++++++++++++++++++++ > hw/i386/amd_iommu.h | 398 ++++++++++++ > hw/pci-host/q35.c | 21 +- > include/hw/acpi/acpi-defs.h | 14 + > include/hw/acpi/acpi.h | 16 + > include/hw/acpi/aml-build.h | 1 + > include/hw/boards.h | 1 + > include/hw/i386/intel_iommu.h | 1 + > include/hw/pci/pci.h | 2 + > qemu-options.hx | 7 +- > util/qemu-config.c | 8 +- > 16 files changed, 2010 insertions(+), 34 deletions(-) > create mode 100644 hw/i386/amd_iommu.c > create mode 100644 hw/i386/amd_iommu.h > ^ permalink raw reply [flat|nested] 27+ messages in thread
* [Qemu-devel] [V9 0/4] AMD IOMMU @ 2016-04-29 22:42 David Kiarie 2016-05-01 13:47 ` Michael S. Tsirkin 2016-05-04 6:12 ` Jan Kiszka 0 siblings, 2 replies; 27+ messages in thread From: David Kiarie @ 2016-04-29 22:42 UTC (permalink / raw) To: qemu-devel Cc: jan.kiszka, valentine.sinitsyn, imammedo, mst, marcel, peterx, David Kiarie These series adds AMD IOMMU support to Qemu. It's currently in the 9th version. In this series I have (hopefully) addressed all the comments made in the previous version. I have also tested and successfully passed-through PCI device 'ac97' with more devices to be tested. David Kiarie (4): hw/i386: Introduce AMD IOMMU hw/i386: ACPI table for AMD IOMMU hw/core: Add AMD IOMMU to machine properties hw/pci-host: Emulate AMD IOMMU hw/acpi/aml-build.c | 2 +- hw/acpi/core.c | 13 - hw/core/machine.c | 33 +- hw/i386/Makefile.objs | 1 + hw/i386/acpi-build.c | 93 ++- hw/i386/amd_iommu.c | 1426 +++++++++++++++++++++++++++++++++++++++++ hw/i386/amd_iommu.h | 398 ++++++++++++ hw/pci-host/q35.c | 25 +- include/hw/acpi/acpi-defs.h | 14 + include/hw/acpi/acpi.h | 16 + include/hw/acpi/aml-build.h | 1 + include/hw/boards.h | 7 + include/hw/i386/intel_iommu.h | 1 + include/hw/pci/pci.h | 2 + qemu-options.hx | 7 +- util/qemu-config.c | 8 +- 16 files changed, 2012 insertions(+), 35 deletions(-) create mode 100644 hw/i386/amd_iommu.c create mode 100644 hw/i386/amd_iommu.h -- 2.1.4 ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-04-29 22:42 David Kiarie @ 2016-05-01 13:47 ` Michael S. Tsirkin 2016-05-01 14:00 ` Michael S. Tsirkin 2016-05-04 6:12 ` Jan Kiszka 1 sibling, 1 reply; 27+ messages in thread From: Michael S. Tsirkin @ 2016-05-01 13:47 UTC (permalink / raw) To: David Kiarie Cc: qemu-devel, jan.kiszka, valentine.sinitsyn, imammedo, marcel, peterx On Sat, Apr 30, 2016 at 01:42:39AM +0300, David Kiarie wrote: > These series adds AMD IOMMU support to Qemu. It's currently in the 9th version. > > In this series I have (hopefully) addressed all the comments made in the previous version. changelog? > I have also tested and successfully passed-through PCI device 'ac97' with more devices to be tested. A fundamental problem with AMD IOMMUs is that the VMM must write-protect guest I/O page tables from the guest in order to intercept all guest updates and propagate the updates to the shadow I/O page tables. AMD manual says as much. Until this is implemented, I think device assignment must be disabled when AMD IOMMU is in use. > > David Kiarie (4): > hw/i386: Introduce AMD IOMMU > hw/i386: ACPI table for AMD IOMMU > hw/core: Add AMD IOMMU to machine properties > hw/pci-host: Emulate AMD IOMMU > > hw/acpi/aml-build.c | 2 +- > hw/acpi/core.c | 13 - > hw/core/machine.c | 33 +- > hw/i386/Makefile.objs | 1 + > hw/i386/acpi-build.c | 93 ++- > hw/i386/amd_iommu.c | 1426 +++++++++++++++++++++++++++++++++++++++++ > hw/i386/amd_iommu.h | 398 ++++++++++++ > hw/pci-host/q35.c | 25 +- > include/hw/acpi/acpi-defs.h | 14 + > include/hw/acpi/acpi.h | 16 + > include/hw/acpi/aml-build.h | 1 + > include/hw/boards.h | 7 + > include/hw/i386/intel_iommu.h | 1 + > include/hw/pci/pci.h | 2 + > qemu-options.hx | 7 +- > util/qemu-config.c | 8 +- > 16 files changed, 2012 insertions(+), 35 deletions(-) > create mode 100644 hw/i386/amd_iommu.c > create mode 100644 hw/i386/amd_iommu.h > > -- > 2.1.4 ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-05-01 13:47 ` Michael S. Tsirkin @ 2016-05-01 14:00 ` Michael S. Tsirkin 2016-05-02 8:33 ` David Kiarie 0 siblings, 1 reply; 27+ messages in thread From: Michael S. Tsirkin @ 2016-05-01 14:00 UTC (permalink / raw) To: David Kiarie Cc: qemu-devel, jan.kiszka, valentine.sinitsyn, imammedo, marcel, peterx On Sun, May 01, 2016 at 04:47:44PM +0300, Michael S. Tsirkin wrote: > On Sat, Apr 30, 2016 at 01:42:39AM +0300, David Kiarie wrote: > > These series adds AMD IOMMU support to Qemu. It's currently in the 9th version. > > > > In this series I have (hopefully) addressed all the comments made in the previous version. > > changelog? > > > I have also tested and successfully passed-through PCI device 'ac97' with more devices to be tested. > > > A fundamental problem with AMD IOMMUs is that the VMM must write-protect > guest I/O page tables from the guest in order to intercept all guest > updates and propagate the updates to the shadow I/O page tables. > > AMD manual says as much. Actually while it says so, it's wrong. There's an NPcache flag which makes guest to invalidations for invalid to valid transitions. > Until this is implemented, I think device assignment must be disabled > when AMD IOMMU is in use. So I take this back. I would, however, like to see how this interacts with Aviv's patches enabling VFIO support for IOMMU. > > > > > David Kiarie (4): > > hw/i386: Introduce AMD IOMMU > > hw/i386: ACPI table for AMD IOMMU > > hw/core: Add AMD IOMMU to machine properties > > hw/pci-host: Emulate AMD IOMMU > > > > hw/acpi/aml-build.c | 2 +- > > hw/acpi/core.c | 13 - > > hw/core/machine.c | 33 +- > > hw/i386/Makefile.objs | 1 + > > hw/i386/acpi-build.c | 93 ++- > > hw/i386/amd_iommu.c | 1426 +++++++++++++++++++++++++++++++++++++++++ > > hw/i386/amd_iommu.h | 398 ++++++++++++ > > hw/pci-host/q35.c | 25 +- > > include/hw/acpi/acpi-defs.h | 14 + > > include/hw/acpi/acpi.h | 16 + > > include/hw/acpi/aml-build.h | 1 + > > include/hw/boards.h | 7 + > > include/hw/i386/intel_iommu.h | 1 + > > include/hw/pci/pci.h | 2 + > > qemu-options.hx | 7 +- > > util/qemu-config.c | 8 +- > > 16 files changed, 2012 insertions(+), 35 deletions(-) > > create mode 100644 hw/i386/amd_iommu.c > > create mode 100644 hw/i386/amd_iommu.h > > > > -- > > 2.1.4 ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-05-01 14:00 ` Michael S. Tsirkin @ 2016-05-02 8:33 ` David Kiarie 0 siblings, 0 replies; 27+ messages in thread From: David Kiarie @ 2016-05-02 8:33 UTC (permalink / raw) To: Michael S. Tsirkin Cc: QEMU Developers, Jan Kiszka, Valentine Sinitsyn, imammedo, Marcel Apfelbaum, Peter Xu On Sun, May 1, 2016 at 5:00 PM, Michael S. Tsirkin <mst@redhat.com> wrote: > On Sun, May 01, 2016 at 04:47:44PM +0300, Michael S. Tsirkin wrote: >> On Sat, Apr 30, 2016 at 01:42:39AM +0300, David Kiarie wrote: >> > These series adds AMD IOMMU support to Qemu. It's currently in the 9th version. >> > >> > In this series I have (hopefully) addressed all the comments made in the previous version. >> >> changelog? >> >> > I have also tested and successfully passed-through PCI device 'ac97' with more devices to be tested. >> >> >> A fundamental problem with AMD IOMMUs is that the VMM must write-protect >> guest I/O page tables from the guest in order to intercept all guest >> updates and propagate the updates to the shadow I/O page tables. >> >> AMD manual says as much. > > Actually while it says so, it's wrong. > There's an NPcache flag which makes guest to invalidations > for invalid to valid transitions. > >> Until this is implemented, I think device assignment must be disabled >> when AMD IOMMU is in use. > > So I take this back. I would, however, like to see how this > interacts with Aviv's patches enabling VFIO support for IOMMU. > The initial consensus was to deny VFIO when user requests for IOMMU and I did actually look at that but I can't get an obvious way to disable, or even tell that a user requested for a device when they do so via '-device'. The only way to disable VFIO was parsing the command line argument which seemed very ugly. Other than that, I would prefer not to add more features to this patchset but I will still be working on IOMMU for the next few months so I'll probably look at that. >> >> > >> > David Kiarie (4): >> > hw/i386: Introduce AMD IOMMU >> > hw/i386: ACPI table for AMD IOMMU >> > hw/core: Add AMD IOMMU to machine properties >> > hw/pci-host: Emulate AMD IOMMU >> > >> > hw/acpi/aml-build.c | 2 +- >> > hw/acpi/core.c | 13 - >> > hw/core/machine.c | 33 +- >> > hw/i386/Makefile.objs | 1 + >> > hw/i386/acpi-build.c | 93 ++- >> > hw/i386/amd_iommu.c | 1426 +++++++++++++++++++++++++++++++++++++++++ >> > hw/i386/amd_iommu.h | 398 ++++++++++++ >> > hw/pci-host/q35.c | 25 +- >> > include/hw/acpi/acpi-defs.h | 14 + >> > include/hw/acpi/acpi.h | 16 + >> > include/hw/acpi/aml-build.h | 1 + >> > include/hw/boards.h | 7 + >> > include/hw/i386/intel_iommu.h | 1 + >> > include/hw/pci/pci.h | 2 + >> > qemu-options.hx | 7 +- >> > util/qemu-config.c | 8 +- >> > 16 files changed, 2012 insertions(+), 35 deletions(-) >> > create mode 100644 hw/i386/amd_iommu.c >> > create mode 100644 hw/i386/amd_iommu.h >> > >> > -- >> > 2.1.4 ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-04-29 22:42 David Kiarie 2016-05-01 13:47 ` Michael S. Tsirkin @ 2016-05-04 6:12 ` Jan Kiszka 2016-05-04 7:05 ` David Kiarie 1 sibling, 1 reply; 27+ messages in thread From: Jan Kiszka @ 2016-05-04 6:12 UTC (permalink / raw) To: David Kiarie, qemu-devel Cc: mst, peterx, valentine.sinitsyn, jan.kiszka, marcel, imammedo On 2016-04-30 00:42, David Kiarie wrote: > These series adds AMD IOMMU support to Qemu. It's currently in the 9th version. > > In this series I have (hopefully) addressed all the comments made in the previous version. > I have also tested and successfully passed-through PCI device 'ac97' with more devices to be tested. > I've done some basic testing with a Jailhouse setup and found it working. The ACPI table is now properly parsed and the DMA remapping was not disturbing the system after Jailhouse was activated. However, it was also still not intervening after I started to corrupt the configuration, removed DMA target properties from most of the RAM or dropped PCI devices. You are not dropping invalid remapping requests, are you? According to the logs, you are detecting them at least: (amd-iommu)amd_iommu_get_dte: Device Table at 0x3b0d4000 (amd-iommu)amd_iommu_get_dte: Pte entry at 0x0 is invalid (amd-iommu)amd_iommu_translate: devid: 00:02.0 gpa 0x32f39480 hpa 0x32f39000 It's a bit hard to test right now if remapping is actually properly working in all important cases if you do not reject invalid ones. Jan ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-05-04 6:12 ` Jan Kiszka @ 2016-05-04 7:05 ` David Kiarie 2016-05-04 7:26 ` Jan Kiszka 2016-05-04 7:39 ` Valentine Sinitsyn 0 siblings, 2 replies; 27+ messages in thread From: David Kiarie @ 2016-05-04 7:05 UTC (permalink / raw) To: Jan Kiszka Cc: QEMU Developers, Michael S. Tsirkin, Peter Xu, Valentine Sinitsyn, Marcel Apfelbaum, imammedo On Wed, May 4, 2016 at 9:12 AM, Jan Kiszka <jan.kiszka@web.de> wrote: > On 2016-04-30 00:42, David Kiarie wrote: >> These series adds AMD IOMMU support to Qemu. It's currently in the 9th version. >> >> In this series I have (hopefully) addressed all the comments made in the previous version. >> I have also tested and successfully passed-through PCI device 'ac97' with more devices to be tested. >> > > I've done some basic testing with a Jailhouse setup and found it > working. The ACPI table is now properly parsed and the DMA remapping was > not disturbing the system after Jailhouse was activated. > > However, it was also still not intervening after I started to corrupt > the configuration, removed DMA target properties from most of the RAM or > dropped PCI devices. This means you're invalidating DTEs ? > > You are not dropping invalid remapping requests, are you? According to > the logs, you are detecting them at least: > > (amd-iommu)amd_iommu_get_dte: Device Table at 0x3b0d4000 > (amd-iommu)amd_iommu_get_dte: Pte entry at 0x0 is invalid > (amd-iommu)amd_iommu_translate: devid: 00:02.0 gpa 0x32f39480 hpa 0x32f39000 > > It's a bit hard to test right now if remapping is actually properly > working in all important cases if you do not reject invalid ones. > > Jan > ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-05-04 7:05 ` David Kiarie @ 2016-05-04 7:26 ` Jan Kiszka 2016-05-04 7:39 ` Valentine Sinitsyn 1 sibling, 0 replies; 27+ messages in thread From: Jan Kiszka @ 2016-05-04 7:26 UTC (permalink / raw) To: David Kiarie Cc: QEMU Developers, Michael S. Tsirkin, Peter Xu, Valentine Sinitsyn, Marcel Apfelbaum, imammedo On 2016-05-04 09:05, David Kiarie wrote: > On Wed, May 4, 2016 at 9:12 AM, Jan Kiszka <jan.kiszka@web.de> wrote: >> On 2016-04-30 00:42, David Kiarie wrote: >>> These series adds AMD IOMMU support to Qemu. It's currently in the 9th version. >>> >>> In this series I have (hopefully) addressed all the comments made in the previous version. >>> I have also tested and successfully passed-through PCI device 'ac97' with more devices to be tested. >>> >> >> I've done some basic testing with a Jailhouse setup and found it >> working. The ACPI table is now properly parsed and the DMA remapping was >> not disturbing the system after Jailhouse was activated. >> >> However, it was also still not intervening after I started to corrupt >> the configuration, removed DMA target properties from most of the RAM or >> dropped PCI devices. > > This means you're invalidating DTEs ? No, it's either enabling the IOMMU with only a partially filled or completely empty page table or not listing a specific device that continues to do DMA (pattern: Linux boots with IOMMU off, Jailhouse configures 1:1 mappings afterwards and enables IOMMU). Jan > >> >> You are not dropping invalid remapping requests, are you? According to >> the logs, you are detecting them at least: >> >> (amd-iommu)amd_iommu_get_dte: Device Table at 0x3b0d4000 >> (amd-iommu)amd_iommu_get_dte: Pte entry at 0x0 is invalid >> (amd-iommu)amd_iommu_translate: devid: 00:02.0 gpa 0x32f39480 hpa 0x32f39000 >> >> It's a bit hard to test right now if remapping is actually properly >> working in all important cases if you do not reject invalid ones. >> >> Jan >> ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-05-04 7:05 ` David Kiarie 2016-05-04 7:26 ` Jan Kiszka @ 2016-05-04 7:39 ` Valentine Sinitsyn 2016-05-04 10:51 ` David Kiarie 1 sibling, 1 reply; 27+ messages in thread From: Valentine Sinitsyn @ 2016-05-04 7:39 UTC (permalink / raw) To: David Kiarie, Jan Kiszka Cc: QEMU Developers, Michael S. Tsirkin, Peter Xu, Marcel Apfelbaum, imammedo Hi everyone, On 04.05.2016 12:05, David Kiarie wrote: > On Wed, May 4, 2016 at 9:12 AM, Jan Kiszka <jan.kiszka@web.de> wrote: >> On 2016-04-30 00:42, David Kiarie wrote: >>> These series adds AMD IOMMU support to Qemu. It's currently in the 9th version. >>> >>> In this series I have (hopefully) addressed all the comments made in the previous version. >>> I have also tested and successfully passed-through PCI device 'ac97' with more devices to be tested. >>> >> >> I've done some basic testing with a Jailhouse setup and found it >> working. The ACPI table is now properly parsed and the DMA remapping was >> not disturbing the system after Jailhouse was activated. >> >> However, it was also still not intervening after I started to corrupt >> the configuration, removed DMA target properties from most of the RAM or >> dropped PCI devices. Please also remember that unlisted devices go without translation. To "mute" the device, set V, TV, the DomainId, and zero everything else in the DTE. > > This means you're invalidating DTEs ? > >> >> You are not dropping invalid remapping requests, are you? According to >> the logs, you are detecting them at least: >> >> (amd-iommu)amd_iommu_get_dte: Device Table at 0x3b0d4000 >> (amd-iommu)amd_iommu_get_dte: Pte entry at 0x0 is invalid >> (amd-iommu)amd_iommu_translate: devid: 00:02.0 gpa 0x32f39480 hpa 0x32f39000 >> >> It's a bit hard to test right now if remapping is actually properly >> working in all important cases if you do not reject invalid ones. My understanding is that you should generate an IO_PAGE_FAULT event and drop the request. This doesn't apply to ATS, which is a bit trickier, but we don't address ATS in this patch series anyway, do we? Valentine ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-05-04 7:39 ` Valentine Sinitsyn @ 2016-05-04 10:51 ` David Kiarie 2016-05-04 10:58 ` Valentine Sinitsyn 0 siblings, 1 reply; 27+ messages in thread From: David Kiarie @ 2016-05-04 10:51 UTC (permalink / raw) To: Valentine Sinitsyn Cc: Jan Kiszka, QEMU Developers, Michael S. Tsirkin, Peter Xu, Marcel Apfelbaum, imammedo On Wed, May 4, 2016 at 10:39 AM, Valentine Sinitsyn <valentine.sinitsyn@gmail.com> wrote: > Hi everyone, > > On 04.05.2016 12:05, David Kiarie wrote: >> >> On Wed, May 4, 2016 at 9:12 AM, Jan Kiszka <jan.kiszka@web.de> wrote: >>> >>> On 2016-04-30 00:42, David Kiarie wrote: >>>> >>>> These series adds AMD IOMMU support to Qemu. It's currently in the 9th >>>> version. >>>> >>>> In this series I have (hopefully) addressed all the comments made in the >>>> previous version. >>>> I have also tested and successfully passed-through PCI device 'ac97' >>>> with more devices to be tested. >>>> >>> >>> I've done some basic testing with a Jailhouse setup and found it >>> working. The ACPI table is now properly parsed and the DMA remapping was >>> not disturbing the system after Jailhouse was activated. >>> >>> However, it was also still not intervening after I started to corrupt >>> the configuration, removed DMA target properties from most of the RAM or >>> dropped PCI devices. > > Please also remember that unlisted devices go without translation. To "mute" > the device, set V, TV, the DomainId, and zero everything else in the DTE. > >> >> This means you're invalidating DTEs ? >> >>> >>> You are not dropping invalid remapping requests, are you? According to >>> the logs, you are detecting them at least: >>> >>> (amd-iommu)amd_iommu_get_dte: Device Table at 0x3b0d4000 >>> (amd-iommu)amd_iommu_get_dte: Pte entry at 0x0 is invalid >>> (amd-iommu)amd_iommu_translate: devid: 00:02.0 gpa 0x32f39480 hpa >>> 0x32f39000 >>> >>> It's a bit hard to test right now if remapping is actually properly >>> working in all important cases if you do not reject invalid ones. > > My understanding is that you should generate an IO_PAGE_FAULT event and drop > the request. This doesn't apply to ATS, which is a bit trickier, but we > don't address ATS in this patch series anyway, do we? My next question is what you mean by 'reject' and 'drop'. In I encounter an invalid PTE/DTE I don't translate the gpa, it just become the hpa which is what is happening above. > > Valentine ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-05-04 10:51 ` David Kiarie @ 2016-05-04 10:58 ` Valentine Sinitsyn 2016-05-04 11:02 ` David Kiarie 0 siblings, 1 reply; 27+ messages in thread From: Valentine Sinitsyn @ 2016-05-04 10:58 UTC (permalink / raw) To: David Kiarie Cc: Jan Kiszka, QEMU Developers, Michael S. Tsirkin, Peter Xu, Marcel Apfelbaum, imammedo On 04.05.2016 15:51, David Kiarie wrote: > On Wed, May 4, 2016 at 10:39 AM, Valentine Sinitsyn > <valentine.sinitsyn@gmail.com> wrote: >> Hi everyone, >> >> On 04.05.2016 12:05, David Kiarie wrote: >>> >>> On Wed, May 4, 2016 at 9:12 AM, Jan Kiszka <jan.kiszka@web.de> wrote: >>>> >>>> On 2016-04-30 00:42, David Kiarie wrote: >>>>> >>>>> These series adds AMD IOMMU support to Qemu. It's currently in the 9th >>>>> version. >>>>> >>>>> In this series I have (hopefully) addressed all the comments made in the >>>>> previous version. >>>>> I have also tested and successfully passed-through PCI device 'ac97' >>>>> with more devices to be tested. >>>>> >>>> >>>> I've done some basic testing with a Jailhouse setup and found it >>>> working. The ACPI table is now properly parsed and the DMA remapping was >>>> not disturbing the system after Jailhouse was activated. >>>> >>>> However, it was also still not intervening after I started to corrupt >>>> the configuration, removed DMA target properties from most of the RAM or >>>> dropped PCI devices. >> >> Please also remember that unlisted devices go without translation. To "mute" >> the device, set V, TV, the DomainId, and zero everything else in the DTE. >> >>> >>> This means you're invalidating DTEs ? >>> >>>> >>>> You are not dropping invalid remapping requests, are you? According to >>>> the logs, you are detecting them at least: >>>> >>>> (amd-iommu)amd_iommu_get_dte: Device Table at 0x3b0d4000 >>>> (amd-iommu)amd_iommu_get_dte: Pte entry at 0x0 is invalid >>>> (amd-iommu)amd_iommu_translate: devid: 00:02.0 gpa 0x32f39480 hpa >>>> 0x32f39000 >>>> >>>> It's a bit hard to test right now if remapping is actually properly >>>> working in all important cases if you do not reject invalid ones. >> >> My understanding is that you should generate an IO_PAGE_FAULT event and drop >> the request. This doesn't apply to ATS, which is a bit trickier, but we >> don't address ATS in this patch series anyway, do we? > > My next question is what you mean by 'reject' and 'drop'. In I > encounter an invalid PTE/DTE I don't translate the gpa, it just become > the hpa which is what is happening above. What happens if you just ignore the request? I mean, what if you don't forward it to anywhere else in QEMU, just log this event and return? Valentine > >> >> Valentine ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-05-04 10:58 ` Valentine Sinitsyn @ 2016-05-04 11:02 ` David Kiarie 2016-05-04 11:05 ` Valentine Sinitsyn 0 siblings, 1 reply; 27+ messages in thread From: David Kiarie @ 2016-05-04 11:02 UTC (permalink / raw) To: Valentine Sinitsyn Cc: Jan Kiszka, QEMU Developers, Michael S. Tsirkin, Peter Xu, Marcel Apfelbaum, imammedo On 04/05/16 13:58, Valentine Sinitsyn wrote: > On 04.05.2016 15:51, David Kiarie wrote: >> On Wed, May 4, 2016 at 10:39 AM, Valentine Sinitsyn >> <valentine.sinitsyn@gmail.com> wrote: >>> Hi everyone, >>> >>> On 04.05.2016 12:05, David Kiarie wrote: >>>> >>>> On Wed, May 4, 2016 at 9:12 AM, Jan Kiszka <jan.kiszka@web.de> wrote: >>>>> >>>>> On 2016-04-30 00:42, David Kiarie wrote: >>>>>> >>>>>> These series adds AMD IOMMU support to Qemu. It's currently in >>>>>> the 9th >>>>>> version. >>>>>> >>>>>> In this series I have (hopefully) addressed all the comments made >>>>>> in the >>>>>> previous version. >>>>>> I have also tested and successfully passed-through PCI device 'ac97' >>>>>> with more devices to be tested. >>>>>> >>>>> >>>>> I've done some basic testing with a Jailhouse setup and found it >>>>> working. The ACPI table is now properly parsed and the DMA >>>>> remapping was >>>>> not disturbing the system after Jailhouse was activated. >>>>> >>>>> However, it was also still not intervening after I started to corrupt >>>>> the configuration, removed DMA target properties from most of the >>>>> RAM or >>>>> dropped PCI devices. >>> >>> Please also remember that unlisted devices go without translation. >>> To "mute" >>> the device, set V, TV, the DomainId, and zero everything else in the >>> DTE. >>> >>>> >>>> This means you're invalidating DTEs ? >>>> >>>>> >>>>> You are not dropping invalid remapping requests, are you? >>>>> According to >>>>> the logs, you are detecting them at least: >>>>> >>>>> (amd-iommu)amd_iommu_get_dte: Device Table at 0x3b0d4000 >>>>> (amd-iommu)amd_iommu_get_dte: Pte entry at 0x0 is invalid >>>>> (amd-iommu)amd_iommu_translate: devid: 00:02.0 gpa 0x32f39480 hpa >>>>> 0x32f39000 >>>>> >>>>> It's a bit hard to test right now if remapping is actually properly >>>>> working in all important cases if you do not reject invalid ones. >>> >>> My understanding is that you should generate an IO_PAGE_FAULT event >>> and drop >>> the request. This doesn't apply to ATS, which is a bit trickier, but we >>> don't address ATS in this patch series anyway, do we? >> >> My next question is what you mean by 'reject' and 'drop'. In I >> encounter an invalid PTE/DTE I don't translate the gpa, it just become >> the hpa which is what is happening above. > What happens if you just ignore the request? I mean, what if you don't > forward it to anywhere else in QEMU, just log this event and return? Am guessing this should have something to do with pci abort which, last time I tried, wasn't aborting at request. I will look at it again. > > > Valentine > >> >>> >>> Valentine ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-05-04 11:02 ` David Kiarie @ 2016-05-04 11:05 ` Valentine Sinitsyn 2016-05-05 14:20 ` David Kiarie 0 siblings, 1 reply; 27+ messages in thread From: Valentine Sinitsyn @ 2016-05-04 11:05 UTC (permalink / raw) To: David Kiarie Cc: Jan Kiszka, QEMU Developers, Michael S. Tsirkin, Peter Xu, Marcel Apfelbaum, imammedo On 04.05.2016 16:02, David Kiarie wrote: > > > On 04/05/16 13:58, Valentine Sinitsyn wrote: >> On 04.05.2016 15:51, David Kiarie wrote: >>> On Wed, May 4, 2016 at 10:39 AM, Valentine Sinitsyn >>> <valentine.sinitsyn@gmail.com> wrote: >>>> Hi everyone, >>>> >>>> On 04.05.2016 12:05, David Kiarie wrote: >>>>> >>>>> On Wed, May 4, 2016 at 9:12 AM, Jan Kiszka <jan.kiszka@web.de> wrote: >>>>>> >>>>>> On 2016-04-30 00:42, David Kiarie wrote: >>>>>>> >>>>>>> These series adds AMD IOMMU support to Qemu. It's currently in >>>>>>> the 9th >>>>>>> version. >>>>>>> >>>>>>> In this series I have (hopefully) addressed all the comments made >>>>>>> in the >>>>>>> previous version. >>>>>>> I have also tested and successfully passed-through PCI device 'ac97' >>>>>>> with more devices to be tested. >>>>>>> >>>>>> >>>>>> I've done some basic testing with a Jailhouse setup and found it >>>>>> working. The ACPI table is now properly parsed and the DMA >>>>>> remapping was >>>>>> not disturbing the system after Jailhouse was activated. >>>>>> >>>>>> However, it was also still not intervening after I started to corrupt >>>>>> the configuration, removed DMA target properties from most of the >>>>>> RAM or >>>>>> dropped PCI devices. >>>> >>>> Please also remember that unlisted devices go without translation. >>>> To "mute" >>>> the device, set V, TV, the DomainId, and zero everything else in the >>>> DTE. >>>> >>>>> >>>>> This means you're invalidating DTEs ? >>>>> >>>>>> >>>>>> You are not dropping invalid remapping requests, are you? >>>>>> According to >>>>>> the logs, you are detecting them at least: >>>>>> >>>>>> (amd-iommu)amd_iommu_get_dte: Device Table at 0x3b0d4000 >>>>>> (amd-iommu)amd_iommu_get_dte: Pte entry at 0x0 is invalid >>>>>> (amd-iommu)amd_iommu_translate: devid: 00:02.0 gpa 0x32f39480 hpa >>>>>> 0x32f39000 >>>>>> >>>>>> It's a bit hard to test right now if remapping is actually properly >>>>>> working in all important cases if you do not reject invalid ones. >>>> >>>> My understanding is that you should generate an IO_PAGE_FAULT event >>>> and drop >>>> the request. This doesn't apply to ATS, which is a bit trickier, but we >>>> don't address ATS in this patch series anyway, do we? >>> >>> My next question is what you mean by 'reject' and 'drop'. In I >>> encounter an invalid PTE/DTE I don't translate the gpa, it just become >>> the hpa which is what is happening above. >> What happens if you just ignore the request? I mean, what if you don't >> forward it to anywhere else in QEMU, just log this event and return? > > Am guessing this should have something to do with pci abort which, last > time I tried, wasn't aborting at request. I will look at it again. My initial answer was also "do target abort". But then I did a quick look over the spec, and found no such requirement. Please read relevant parts thoroughly yourself, and maybe experiment with "just ignore"/"explicitly abort" options. Valentine ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [Qemu-devel] [V9 0/4] AMD IOMMU 2016-05-04 11:05 ` Valentine Sinitsyn @ 2016-05-05 14:20 ` David Kiarie 0 siblings, 0 replies; 27+ messages in thread From: David Kiarie @ 2016-05-05 14:20 UTC (permalink / raw) To: Valentine Sinitsyn Cc: Jan Kiszka, QEMU Developers, Michael S. Tsirkin, Peter Xu, Marcel Apfelbaum, imammedo On Wed, May 4, 2016 at 2:05 PM, Valentine Sinitsyn <valentine.sinitsyn@gmail.com> wrote: > On 04.05.2016 16:02, David Kiarie wrote: >> >> >> >> On 04/05/16 13:58, Valentine Sinitsyn wrote: >>> >>> On 04.05.2016 15:51, David Kiarie wrote: >>>> >>>> On Wed, May 4, 2016 at 10:39 AM, Valentine Sinitsyn >>>> <valentine.sinitsyn@gmail.com> wrote: >>>>> >>>>> Hi everyone, >>>>> >>>>> On 04.05.2016 12:05, David Kiarie wrote: >>>>>> >>>>>> >>>>>> On Wed, May 4, 2016 at 9:12 AM, Jan Kiszka <jan.kiszka@web.de> wrote: >>>>>>> >>>>>>> >>>>>>> On 2016-04-30 00:42, David Kiarie wrote: >>>>>>>> >>>>>>>> >>>>>>>> These series adds AMD IOMMU support to Qemu. It's currently in >>>>>>>> the 9th >>>>>>>> version. >>>>>>>> >>>>>>>> In this series I have (hopefully) addressed all the comments made >>>>>>>> in the >>>>>>>> previous version. >>>>>>>> I have also tested and successfully passed-through PCI device 'ac97' >>>>>>>> with more devices to be tested. >>>>>>>> >>>>>>> >>>>>>> I've done some basic testing with a Jailhouse setup and found it >>>>>>> working. The ACPI table is now properly parsed and the DMA >>>>>>> remapping was >>>>>>> not disturbing the system after Jailhouse was activated. >>>>>>> >>>>>>> However, it was also still not intervening after I started to corrupt >>>>>>> the configuration, removed DMA target properties from most of the >>>>>>> RAM or >>>>>>> dropped PCI devices. >>>>> >>>>> >>>>> Please also remember that unlisted devices go without translation. >>>>> To "mute" >>>>> the device, set V, TV, the DomainId, and zero everything else in the >>>>> DTE. >>>>> >>>>>> >>>>>> This means you're invalidating DTEs ? >>>>>> >>>>>>> >>>>>>> You are not dropping invalid remapping requests, are you? >>>>>>> According to >>>>>>> the logs, you are detecting them at least: >>>>>>> >>>>>>> (amd-iommu)amd_iommu_get_dte: Device Table at 0x3b0d4000 >>>>>>> (amd-iommu)amd_iommu_get_dte: Pte entry at 0x0 is invalid >>>>>>> (amd-iommu)amd_iommu_translate: devid: 00:02.0 gpa 0x32f39480 hpa >>>>>>> 0x32f39000 >>>>>>> >>>>>>> It's a bit hard to test right now if remapping is actually properly >>>>>>> working in all important cases if you do not reject invalid ones. >>>>> >>>>> >>>>> My understanding is that you should generate an IO_PAGE_FAULT event >>>>> and drop >>>>> the request. This doesn't apply to ATS, which is a bit trickier, but we >>>>> don't address ATS in this patch series anyway, do we? >>>> >>>> >>>> My next question is what you mean by 'reject' and 'drop'. In I >>>> encounter an invalid PTE/DTE I don't translate the gpa, it just become >>>> the hpa which is what is happening above. >>> >>> What happens if you just ignore the request? I mean, what if you don't >>> forward it to anywhere else in QEMU, just log this event and return? >> >> >> Am guessing this should have something to do with pci abort which, last >> time I tried, wasn't aborting at request. I will look at it again. > > My initial answer was also "do target abort". But then I did a quick look > over the spec, and found no such requirement. Please read relevant parts > thoroughly yourself, and maybe experiment with "just ignore"/"explicitly > abort" options. Qemu doesn't seem to be honouring target aborts. The PCI device represented by IOMMU seems like just a link to allow communication with the OS/System Software. In place of target aborts I am going to instead populate the struct (IOMMUTLBEntry) like below IOMMUTLBEntry ret = { .target_as = &address_space_memory, .iova = addr, .translated_addr = 0, .addr_mask = ~(hwaddr)0, .perm = IOMMU_NONE, } Functionally speaking, this doesn't seem very different from a target abort because with a target abort, the bus is expected to complete the translation which should come down to the same thing(with the later being more complicated). On the other hand, I am yet to confirm, from the spec that the particular reported case warrants a target abort but cases such as page faults should be target aborted (which is not currently the case, so they should be fixed). > > Valentine ^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2016-05-05 14:20 UTC | newest] Thread overview: 27+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-04-24 22:12 [Qemu-devel] [V9 0/4] AMD IOMMU David Kiarie 2016-04-24 22:12 ` [Qemu-devel] [V9 1/4] hw/i386: Introduce " David Kiarie 2016-04-24 22:12 ` [Qemu-devel] [V9 2/4] hw/i386: ACPI table for " David Kiarie 2016-04-29 6:09 ` Jan Kiszka 2016-04-29 8:28 ` David Kiarie 2016-05-04 7:50 ` Valentine Sinitsyn 2016-05-04 7:45 ` Valentine Sinitsyn 2016-04-24 22:12 ` [Qemu-devel] [V9 3/4] hw/core: Add AMD IOMMU to machine properties David Kiarie 2016-04-25 3:00 ` Peter Xu 2016-04-24 22:12 ` [Qemu-devel] [V9 4/4] hw/pci-host: Emulate AMD IOMMU David Kiarie 2016-04-25 3:06 ` Peter Xu 2016-04-24 22:16 ` [Qemu-devel] [V9 0/4] " David Kiarie 2016-04-25 7:13 ` Jan Kiszka 2016-04-25 12:53 ` Marcel Apfelbaum -- strict thread matches above, loose matches on Subject: below -- 2016-04-29 22:42 David Kiarie 2016-05-01 13:47 ` Michael S. Tsirkin 2016-05-01 14:00 ` Michael S. Tsirkin 2016-05-02 8:33 ` David Kiarie 2016-05-04 6:12 ` Jan Kiszka 2016-05-04 7:05 ` David Kiarie 2016-05-04 7:26 ` Jan Kiszka 2016-05-04 7:39 ` Valentine Sinitsyn 2016-05-04 10:51 ` David Kiarie 2016-05-04 10:58 ` Valentine Sinitsyn 2016-05-04 11:02 ` David Kiarie 2016-05-04 11:05 ` Valentine Sinitsyn 2016-05-05 14:20 ` David Kiarie
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).