Support x2APIC mode with TCG accelerator
v3 cover Support x2APIC mode with TCG accelerator
[Reposting due to broken threading in previous post]
Hi everyone,
This series implements x2APIC mode in userspace local APIC and the RDMSR/WRMSR helper to access x2APIC registers in x2APIC mode. Intel iommu and AMD iommu are adjusted to support x2APIC interrupt remapping. With this series, we can now boot Linux kernel into x2APIC mode with TCG accelerator using either Intel or AMD iommu.
Testing the emulated userspace APIC with kvm-unit-tests, disable test device with this patch
lib/x86/fwcfg.c +1 -0
@@ -27,6 +27,7 @@ static void read_cfg_override(void)if ((str =getenv ("TEST_DEVICE" ))) no_test_device = !atol (str); + no_test_device = true;if ((str =getenv ("MEMLIMIT" ))) fw_override[FW_CFG_MAX_RAM ] =atol (str) *1024 *1024 ;
~ env QEMU=/home/minh/Desktop/oss/qemu/build/qemu-system-x86_64 ACCEL=tcg \
./run_tests.sh -v -g apic
TESTNAME=apic-split TIMEOUT=90s ACCEL=tcg ./x86/run x86/apic.flat -smp 2 -cpu qemu64,+x2apic,+tsc-deadline -machine kernel_irqchip=split FAIL apic-split (54 tests, 8 unexpected failures, 1 skipped) TESTNAME=ioapic-split TIMEOUT=90s ACCEL=tcg ./x86/run x86/ioapic.flat -smp 1 -cpu qemu64 -machine kernel_irqchip=split PASS ioapic-split (19 tests) TESTNAME=x2apic TIMEOUT=30 ACCEL=tcg ./x86/run x86/apic.flat -smp 2 -cpu qemu64,+x2apic,+tsc-deadline FAIL x2apic (54 tests, 8 unexpected failures, 1 skipped) TESTNAME=xapic TIMEOUT=60 ACCEL=tcg ./x86/run x86/apic.flat -smp 2 -cpu qemu64,-x2apic,+tsc-deadline -machine pit=off FAIL xapic (43 tests, 6 unexpected failures, 2 skipped)
FAIL: apic_disable: *0xfee00030: 50014
FAIL: apic_disable: *0xfee00080: f0
FAIL: apic_disable: *0xfee00030: 50014
FAIL: apic_disable: *0xfee00080: f0
FAIL: apicbase: relocate apic
These errors are because we don't disable MMIO region when switching to x2APIC and don't support relocate MMIO region yet. This is a problem because, MMIO region is the same for all CPUs, in order to support these we need to figure out how to allocate and manage different MMIO regions for each CPUs. This can be an improvement in the future.
FAIL: nmi-after-sti
FAIL: multiple nmi
These errors are in the way we handle CPU_INTERRUPT_NMI in core TCG.
FAIL: TMCCT should stay at zero
This error is related to APIC timer which should be addressed in separate patch.
Version 3 changes,
- Patch 2:
+ Allow APIC ID > 255 only when x2APIC feature is supported on CPU
+ Make physical destination mode IPI which has destination id 0xffffffff a broadcast to xAPIC CPUs
+ Make cluster address 0xf in cluster model of xAPIC logical destination mode a broadcast to all clusters
+ Create new extended_log_dest to store APIC_LDR information in x2APIC instead of extending log_dest for backward compatibility in vmstate
Version 2 changes,
- Add support for APIC ID larger than 255
- Adjust AMD iommu for x2APIC suuport
- Reorganize and split patch 1,2 into patch 1,2,3 in version 2
Thanks,
Quang Minh.
Bui Quang Minh (5):
i386/tcg: implement x2APIC registers MSR access
apic: add support for x2APIC mode
apic, i386/tcg: add x2apic transitions
intel_iommu: allow Extended Interrupt Mode when using userspace APIC
amd_iommu: report x2APIC support to the operating system
hw/i386/acpi-build.c | 28 +- hw/i386/amd_iommu.c | 21 +- hw/i386/amd_iommu.h | 16 +- hw/i386/intel_iommu.c | 11 - hw/i386/x86.c | 8 +- hw/intc/apic.c | 395 +++++++++++++++++++++------ hw/intc/apic_common.c | 16 +- hw/intc/trace-events | 4 +- include/hw/i386/apic.h | 6 +- include/hw/i386/apic_internal.h | 7 +- target/i386/cpu-sysemu.c | 18 +- target/i386/cpu.c | 5 +- target/i386/cpu.h | 9 + target/i386/tcg/sysemu/misc_helper.c | 31 +++ 14 files changed, 436 insertions(+), 139 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/5 i386/tcg: implement x2APIC registers MSR access
This commit refactors apic_mem_read/write to support both MMIO access in xAPIC and MSR access in x2APIC.
--- hw/intc/apic.c | 79 ++++++++++++++++++---------- hw/intc/trace-events | 4 +- include/hw/i386/apic.h | 3 ++ target/i386/cpu.h | 3 ++ target/i386/tcg/sysemu/misc_helper.c | 27 ++++++++++ 5 files changed, 86 insertions(+), 30 deletions(-)
hw/intc/apic.c +51 -28
@@ -288,6 +288,13 @@ void apic_deliver_irq(uint8_t dest, uint8_t dest_mode, uint8_t delivery_mode,apic_bus_deliver (deliver_bitmask, delivery_mode, vector_num, trigger_mode); } +bool is_x2apic_mode (DeviceState *dev) +{ +APICCommonState *s =APIC (dev); + +return s->apicbase &MSR_IA32_APICBASE_EXTD ; +} +static void apic_set_base (APICCommonState *s,uint64_t val) { s->apicbase = (val & 0xfffff000) |
@@ -636,16 +643,11 @@ static void apic_timer(void *opaque)apic_timer_update (s, s->next_time); } -static uint64_t apic_mem_read (void *opaque,hwaddr addr,unsigned size) +uint64_t apic_register_read (int index) {DeviceState *dev;APICCommonState *s; -uint32_t val; -int index; - -if (size <4 ) { -return 0 ; - } +uint64_t val; dev =cpu_get_current_apic ();if (!dev) {
@@ -653,7 +655,6 @@ static uint64_t apic_mem_read(void *opaque, hwaddr addr, unsigned size) } s =APIC (dev); - index = (addr >>4 ) &0xff ;switch (index) {case 0x02 :/* id */ val = s->id <<24 ;
@@ -720,7 +721,23 @@ static uint64_t apic_mem_read(void *opaque, hwaddr addr, unsigned size) val =0 ;break ; } -trace_apic_mem_readl (addr, val); + +trace_apic_register_read (index, val); +return val; +} + +static uint64_t apic_mem_read (void *opaque,hwaddr addr,unsigned size) +{ +uint32_t val; +int index; + +if (size <4 ) { +return 0 ; + } + + index = (addr >>4 ) &0xff ; + val = (uint32_t )apic_register_read (index); +return val; }
@@ -737,27 +754,10 @@ static void apic_send_msi(MSIMessage *msi)apic_deliver_irq (dest, dest_mode, delivery, vector, trigger_mode); } -static void apic_mem_write (void *opaque,hwaddr addr,uint64_t val, -unsigned size) +void apic_register_write (int index,uint64_t val) {DeviceState *dev;APICCommonState *s; -int index = (addr >>4 ) &0xff ; - -if (size <4 ) { -return ; - } - -if (addr >0xfff || !index) { -/* MSI and MMIO APIC are at the same memory location, -* but actually not on the global bus: MSI is on PCI bus -* APIC is connected directly to the CPU. -* Mapping them on the global bus happens to work because -* MSI registers are reserved in APIC MMIO and vice versa. */ -MSIMessage msi = { .address = addr, .data = val }; -apic_send_msi (&msi); -return ; - } dev =cpu_get_current_apic ();if (!dev) {
@@ -765,7 +765,7 @@ static void apic_mem_write(void *opaque, hwaddr addr, uint64_t val, } s =APIC (dev); -trace_apic_mem_writel (addr, val); +trace_apic_register_write (index, val);switch (index) {case 0x02 :
@@ -843,6 +843,29 @@ static void apic_mem_write(void *opaque, hwaddr addr, uint64_t val, } } +static void apic_mem_write (void *opaque,hwaddr addr,uint64_t val, +unsigned size) +{ +int index = (addr >>4 ) &0xff ; + +if (size <4 ) { +return ; + } + +if (addr >0xfff || !index) { +/* MSI and MMIO APIC are at the same memory location, +* but actually not on the global bus: MSI is on PCI bus +* APIC is connected directly to the CPU. +* Mapping them on the global bus happens to work because +* MSI registers are reserved in APIC MMIO and vice versa. */ +MSIMessage msi = { .address = addr, .data = val }; +apic_send_msi (&msi); +return ; + } + +apic_register_write (index, val); +} +static void apic_pre_save (APICCommonState *s) {apic_sync_vapic (s,SYNC_FROM_VAPIC );
hw/intc/trace-events +2 -2
@@ -14,8 +14,8 @@ cpu_get_apic_base(uint64_t val) "0x%016"PRIx64 # apic.c apic_local_deliver(int vector, uint32_t lvt) "vector %d delivery mode %d" apic_deliver_irq(uint8_t dest, uint8_t dest_mode, uint8_t delivery_mode, uint8_t vector_num, uint8_t trigger_mode) "dest %d dest_mode %d delivery_mode %d vector %d trigger_mode %d" -apic_mem_readl(uint64_t addr, uint32_t val) "0x%"PRIx64" = 0x%08x" -apic_mem_writel(uint64_t addr, uint32_t val) "0x%"PRIx64" = 0x%08x" +apic_register_read(uint8_t reg, uint64_t val) "register 0x%02x = 0x%"PRIx64 +apic_register_write(uint8_t reg, uint64_t val) "register 0x%02x = 0x%"PRIx64 # ioapic.c ioapic_set_remote_irr(int n) "set remote irr for pin %d"
include/hw/i386/apic.h +3 -0
@@ -18,6 +18,9 @@ void apic_sipi(DeviceState *s);void apic_poll_irq (DeviceState *d);void apic_designate_bsp (DeviceState *d,bool bsp);int apic_get_highest_priority_irr (DeviceState *dev); +uint64_t apic_register_read (int index); +void apic_register_write (int index,uint64_t val); +bool is_x2apic_mode (DeviceState *d);/* pc.c */ DeviceState *cpu_get_current_apic (void );
target/i386/cpu.h +3 -0
@@ -545,6 +545,9 @@ typedef enum X86Seg {#define MSR_IA32_VMX_TRUE_ENTRY_CTLS 0x00000490#define MSR_IA32_VMX_VMFUNC 0x00000491 +#define MSR_APIC_START 0x00000800 +#define MSR_APIC_END 0x000008ff +#define XSTATE_FP_BIT 0#define XSTATE_SSE_BIT 1#define XSTATE_YMM_BIT 2
target/i386/tcg/sysemu/misc_helper.c +27 -0
@@ -25,6 +25,7 @@#include "exec/address-spaces.h" #include "exec/exec-all.h" #include "tcg/helper-tcg.h" +#include "hw/i386/apic.h" void helper_outb (CPUX86State *env,uint32_t port,uint32_t data) {
@@ -289,6 +290,19 @@ void helper_wrmsr(CPUX86State *env) env->msr_bndcfgs = val;cpu_sync_bndcs_hflags (env);break ; + case MSR_APIC_START ... MSR_APIC_END: { +int index = (uint32_t )env->regs[R_ECX ] -MSR_APIC_START ; + +if (!is_x2apic_mode (env_archcpu (env)->apic_state)) { + goto error; + } + +qemu_mutex_lock_iothread (); +apic_register_write (index, val); +qemu_mutex_unlock_iothread (); + +break ; + }default :if ((uint32_t )env->regs[R_ECX ] >=MSR_MC0_CTL && (uint32_t)env->regs[R_ECX] < MSR_MC0_CTL +
@@ -455,6 +469,19 @@ void helper_rdmsr(CPUX86State *env) val = (cs->nr_threads * cs->nr_cores) | (cs->nr_cores <<16 );break ; } + case MSR_APIC_START ... MSR_APIC_END: { +int index = (uint32_t )env->regs[R_ECX ] -MSR_APIC_START ; + +if (!is_x2apic_mode (env_archcpu (env)->apic_state)) { +raise_exception_ra (env,EXCP0D_GPF ,GETPC ()); + } + +qemu_mutex_lock_iothread (); + val =apic_register_read (index); +qemu_mutex_unlock_iothread (); + +break ; + }default :if ((uint32_t )env->regs[R_ECX ] >=MSR_MC0_CTL && (uint32_t)env->regs[R_ECX] < MSR_MC0_CTL +
Signature · 1 line
2.25.1
PATCH v3 2/5 apic: add support for x2APIC mode
In reply to Bui Quang MinhThis commit extends the APIC ID to 32-bit long and remove the 255 max APIC ID limit in userspace APIC. The array that manages local APICs is now dynamically allocated based on the max APIC ID of created x86 machine. Also, new x2APIC IPI destination determination scheme, self IPI and x2APIC mode register access are supported.
---
Version 3 changes:
- Allow APIC ID > 255 only when x2APIC feature is supported on CPU
- Make physical destination mode IPI which has destination id 0xffffffff a broadcast to xAPIC CPUs
- Make cluster address 0xf in cluster model of xAPIC logical destination mode a broadcast to all clusters
- Create new extended_log_dest to store APIC_LDR information in x2APIC instead of extending log_dest for backward compatibility in vmstate
hw/i386/x86.c | 8 +- hw/intc/apic.c | 266 ++++++++++++++++++++++++-------- hw/intc/apic_common.c | 9 ++ include/hw/i386/apic.h | 3 +- include/hw/i386/apic_internal.h | 7 +- target/i386/cpu-sysemu.c | 8 +- 6 files changed, 231 insertions(+), 70 deletions(-)
hw/i386/x86.c +6 -2
@@ -132,11 +132,11 @@ void x86_cpus_init(X86MachineState *x86ms, int default_cpu_version)* Can we support APIC ID 255 or higher? * * Under Xen: yes. -* With userspace emulated lapic: no +* With userspace emulated lapic: checked later in apic_common_set_id. * With KVM's in-kernel lapic: only if X2APIC API is enabled. */ if (x86ms->apic_id_limit >255 && !xen_enabled () && - (!kvm_irqchip_in_kernel () || !kvm_enable_x2apic ())) { +kvm_irqchip_in_kernel () && !kvm_enable_x2apic ()) {error_report ("current -smp configuration requires kernel " "irqchip and X2APIC API support." );exit (EXIT_FAILURE );
@@ -146,6 +146,10 @@ void x86_cpus_init(X86MachineState *x86ms, int default_cpu_version)kvm_set_max_apic_id (x86ms->apic_id_limit); } +if (!kvm_irqchip_in_kernel ()) { +apic_set_max_apic_id (x86ms->apic_id_limit); + } + possible_cpus = mc->possible_cpu_arch_ids (ms);for (i =0 ; i < ms->smp.cpus; i++) {x86_cpu_new (x86ms, possible_cpus->cpus[i].arch_id, &error_fatal);
hw/intc/apic.c +203 -63
430 lines not on this page · raw message
hw/intc/apic_common.c +9 -0
@@ -284,6 +284,10 @@ static void apic_common_realize(DeviceState *dev, Error **errp) }vmstate_register_with_alias_id (NULL , instance_id, &vmstate_apic_common, s,-1 ,0 ,NULL ); + +/* APIC LDR in x2APIC mode */ + s->extended_log_dest = ((s->initial_apic_id &0xffff0 ) <<16 ) | + (1 << (s->initial_apic_id &0xf )); }static void apic_common_unrealize (DeviceState *dev)
@@ -424,6 +428,11 @@ static void apic_common_set_id(Object *obj, Visitor *v, const char *name,return ; } +if (value >=255 && !cpu_has_x2apic_feature (&s->cpu->env)) { +error_setg (errp,"APIC ID %d requires x2APIC feature in CPU" , value); +return ; + } + s->initial_apic_id = value; s->id = (uint8_t )value; }
include/hw/i386/apic.h +1 -2
@@ -3,8 +3,7 @@/* apic.c */ -void apic_deliver_irq (uint8_t dest,uint8_t dest_mode,uint8_t delivery_mode, -uint8_t vector_num,uint8_t trigger_mode); +void apic_set_max_apic_id (uint32_t max_apic_id);int apic_accept_pic_intr (DeviceState *s);void apic_deliver_pic_intr (DeviceState *s,int level);void apic_deliver_nmi (DeviceState *d);
include/hw/i386/apic_internal.h +5 -2
@@ -46,8 +46,10 @@#define APIC_DM_EXTINT 7/* APIC destination mode */ -#define APIC_DESTMODE_FLAT 0xf -#define APIC_DESTMODE_CLUSTER 1 +#define APIC_DESTMODE_PHYSICAL 0 +#define APIC_DESTMODE_LOGICAL 1 +#define APIC_DESTMODE_LOGICAL_FLAT 0xf +#define APIC_DESTMODE_LOGICAL_CLUSTER 0#define APIC_TRIGGER_EDGE 0#define APIC_TRIGGER_LEVEL 1
@@ -187,6 +189,7 @@ struct APICCommonState {DeviceState *vapic;hwaddr vapic_paddr;/* note: persistence via kvmvapic */ bool legacy_instance_id; +uint32_t extended_log_dest; }; typedef struct VAPICState {
target/i386/cpu-sysemu.c +7 -1
@@ -281,11 +281,17 @@ void x86_cpu_apic_create(X86CPU *cpu, Error **errp) OBJECT(cpu->apic_state));object_unref (OBJECT (cpu->apic_state)); -qdev_prop_set_uint32 (cpu->apic_state,"id" , cpu->apic_id);/* TODO: convert to link<> */ apic =APIC_COMMON (cpu->apic_state); apic->cpu = cpu; apic->apicbase =APIC_DEFAULT_ADDRESS |MSR_IA32_APICBASE_ENABLE ; + +/* +* apic_common_set_id needs to check if the CPU has x2APIC +* feature in case APIC ID >= 255, so we need to set apic->cpu +* before setting APIC ID +*/ +qdev_prop_set_uint32 (cpu->apic_state,"id" , cpu->apic_id); }void x86_cpu_apic_realize (X86CPU *cpu,Error **errp)
Signature · 1 line
2.25.1
PATCH v3 3/5 apic, i386/tcg: add x2apic transitions
In reply to Bui Quang MinhThis commit adds support for x2APIC transitions when writing to MSR_IA32_APICBASE register and finally adds CPUID_EXT_X2APIC to TCG_EXT_FEATURES.
--- hw/intc/apic.c | 50 ++++++++++++++++++++++++++++ hw/intc/apic_common.c | 7 ++-- target/i386/cpu-sysemu.c | 10 ++++++ target/i386/cpu.c | 5 +-- target/i386/cpu.h | 6 ++++ target/i386/tcg/sysemu/misc_helper.c | 4 +++ 6 files changed, 75 insertions(+), 7 deletions(-)
hw/intc/apic.c +50 -0
@@ -309,8 +309,41 @@ bool is_x2apic_mode(DeviceState *dev)return s->apicbase &MSR_IA32_APICBASE_EXTD ; } +static void apic_set_base_check (APICCommonState *s,uint64_t val) +{ +/* Enable x2apic when x2apic is not supported by CPU */ +if (!cpu_has_x2apic_feature (&s->cpu->env) && + val &MSR_IA32_APICBASE_EXTD ) +raise_exception_ra (&s->cpu->env,EXCP0D_GPF ,GETPC ()); + +/* +* Transition into invalid state +* (s->apicbase & MSR_IA32_APICBASE_ENABLE == 0) && +* (s->apicbase & MSR_IA32_APICBASE_EXTD) == 1 +*/ +if (!(val &MSR_IA32_APICBASE_ENABLE ) && + (val &MSR_IA32_APICBASE_EXTD )) +raise_exception_ra (&s->cpu->env,EXCP0D_GPF ,GETPC ()); + +/* Invalid transition from disabled mode to x2APIC */ +if (!(s->apicbase &MSR_IA32_APICBASE_ENABLE ) && + !(s->apicbase &MSR_IA32_APICBASE_EXTD ) && + (val &MSR_IA32_APICBASE_ENABLE ) && + (val &MSR_IA32_APICBASE_EXTD )) +raise_exception_ra (&s->cpu->env,EXCP0D_GPF ,GETPC ()); + +/* Invalid transition from x2APIC to xAPIC */ +if ((s->apicbase &MSR_IA32_APICBASE_ENABLE ) && + (s->apicbase &MSR_IA32_APICBASE_EXTD ) && + (val &MSR_IA32_APICBASE_ENABLE ) && + !(val &MSR_IA32_APICBASE_EXTD )) +raise_exception_ra (&s->cpu->env,EXCP0D_GPF ,GETPC ()); +} +static void apic_set_base (APICCommonState *s,uint64_t val) { +apic_set_base_check (s, val); + s->apicbase = (val &0xfffff000 ) | (s->apicbase & (MSR_IA32_APICBASE_BSP |MSR_IA32_APICBASE_ENABLE ));/* if disabled, cannot be enabled again */
@@ -319,6 +352,23 @@ static void apic_set_base(APICCommonState *s, uint64_t val)cpu_clear_apic_feature (&s->cpu->env); s->spurious_vec &= ~APIC_SV_ENABLE ; } + +/* Transition from disabled mode to xAPIC */ +if (!(s->apicbase &MSR_IA32_APICBASE_ENABLE ) && + (val &MSR_IA32_APICBASE_ENABLE )) { + s->apicbase |=MSR_IA32_APICBASE_ENABLE ; +cpu_set_apic_feature (&s->cpu->env); + } + +/* Transition from xAPIC to x2APIC */ +if (cpu_has_x2apic_feature (&s->cpu->env) && + !(s->apicbase &MSR_IA32_APICBASE_EXTD ) && + (val &MSR_IA32_APICBASE_EXTD )) { + s->apicbase |=MSR_IA32_APICBASE_EXTD ; + + s->log_dest = ((s->initial_apic_id &0xffff0 ) <<16 ) | + (1 << (s->initial_apic_id &0xf )); + } }static void apic_set_tpr (APICCommonState *s,uint8_t val)
hw/intc/apic_common.c +2 -5
@@ -43,11 +43,8 @@ void cpu_set_apic_base(DeviceState *dev, uint64_t val)if (dev) {APICCommonState *s =APIC_COMMON (dev);APICCommonClass *info =APIC_COMMON_GET_CLASS (s); -/* switching to x2APIC, reset possibly modified xAPIC ID */ -if (!(s->apicbase &MSR_IA32_APICBASE_EXTD ) && - (val &MSR_IA32_APICBASE_EXTD )) { - s->id = s->initial_apic_id; - } +/* Reset possibly modified xAPIC ID */ + s->id = s->initial_apic_id; info->set_base (s, val); } }
target/i386/cpu-sysemu.c +10 -0
@@ -235,6 +235,16 @@ void cpu_clear_apic_feature(CPUX86State *env) env->features[FEAT_1_EDX ] &= ~CPUID_APIC ; } +void cpu_set_apic_feature (CPUX86State *env) +{ + env->features[FEAT_1_EDX ] |=CPUID_APIC ; +} + +bool cpu_has_x2apic_feature (CPUX86State *env) +{ +return env->features[FEAT_1_ECX ] &CPUID_EXT_X2APIC ; +} +bool cpu_is_bsp (X86CPU *cpu) {return cpu_get_apic_base (cpu->apic_state) &MSR_IA32_APICBASE_BSP ;
target/i386/cpu.c +3 -2
@@ -627,12 +627,13 @@ void x86_cpu_vendor_words2str(char *dst, uint32_t vendor1, CPUID_EXT_XSAVE | /* CPUID_EXT_OSXSAVE is dynamic */ \ CPUID_EXT_MOVBE | CPUID_EXT_AES | CPUID_EXT_HYPERVISOR | \ CPUID_EXT_RDRAND | CPUID_EXT_AVX | CPUID_EXT_F16C | \ - CPUID_EXT_FMA) + CPUID_EXT_FMA | CPUID_EXT_X2APIC)/* missing: CPUID_EXT_DTES64, CPUID_EXT_DSCPL, CPUID_EXT_VMX, CPUID_EXT_SMX, CPUID_EXT_EST, CPUID_EXT_TM2, CPUID_EXT_CID, CPUID_EXT_XTPR, CPUID_EXT_PDCM, CPUID_EXT_PCID, CPUID_EXT_DCA, -CPUID_EXT_X2APIC, CPUID_EXT_TSC_DEADLINE_TIMER */ +CPUID_EXT_TSC_DEADLINE_TIMER +*/ #ifdef TARGET_X86_64 #define TCG_EXT2_X86_64_FEATURES (CPUID_EXT2_SYSCALL | CPUID_EXT2_LM)
target/i386/cpu.h +6 -0
@@ -379,6 +379,10 @@ typedef enum X86Seg {#define MSR_IA32_APICBASE_ENABLE (1<<11)#define MSR_IA32_APICBASE_EXTD (1 << 10)#define MSR_IA32_APICBASE_BASE (0xfffffU<<12) +#define MSR_IA32_APICBASE_RESERVED \ + (~(uint64_t)(MSR_IA32_APICBASE_BSP | MSR_IA32_APICBASE_ENABLE \ + | MSR_IA32_APICBASE_EXTD | MSR_IA32_APICBASE_BASE)) +#define MSR_IA32_FEATURE_CONTROL 0x0000003a#define MSR_TSC_ADJUST 0x0000003b#define MSR_IA32_SPEC_CTRL 0x48
@@ -2158,8 +2162,10 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx);void cpu_clear_apic_feature (CPUX86State *env); +void cpu_set_apic_feature (CPUX86State *env);void host_cpuid (uint32_t function,uint32_t count,uint32_t *eax,uint32_t *ebx,uint32_t *ecx,uint32_t *edx); +bool cpu_has_x2apic_feature (CPUX86State *env);/* helper.c */ void x86_cpu_set_a20 (X86CPU *cpu,int a20_state);
target/i386/tcg/sysemu/misc_helper.c +4 -0
@@ -159,6 +159,10 @@ void helper_wrmsr(CPUX86State *env) env->sysenter_eip = val;break ;case MSR_IA32_APICBASE : +if (val &MSR_IA32_APICBASE_RESERVED ) { + goto error; + } +cpu_set_apic_base (env_archcpu (env)->apic_state, val);break ;case MSR_EFER :
Signature · 1 line
2.25.1
PATCH v3 4/5 intel_iommu: allow Extended Interrupt Mode when using userspace APIC
In reply to Bui Quang MinhAs userspace APIC now supports x2APIC, intel interrupt remapping hardware can be set to EIM mode when userspace local APIC is used.
--- hw/i386/intel_iommu.c | 11 ----------- 1 file changed, 11 deletions(-)
hw/i386/intel_iommu.c +0 -11
@@ -4045,17 +4045,6 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) &&x86_iommu_ir_supported (x86_iommu) ?ON_OFF_AUTO_ON :ON_OFF_AUTO_OFF ; } -if (s->intr_eim ==ON_OFF_AUTO_ON && !s->buggy_eim) { -if (!kvm_irqchip_is_split ()) { -error_setg (errp,"eim=on requires accel=kvm,kernel-irqchip=split" ); -return false; - } -if (!kvm_enable_x2apic ()) { -error_setg (errp,"eim=on requires support on the KVM side" -"(X2APIC_API, first shipped in v4.7)" ); -return false; - } - }/* Currently only address widths supported are 39 and 48 bits */ if ((s->aw_bits != VTD_HOST_AW_39BIT) &&
Signature · 1 line
2.25.1
Re: [REPOST PATCH v3 4/5] intel_iommu: allow Extended Interrupt Mode when using userspace APIC
Quoted 20 lines · Bui Quang Minh
As userspace APIC now supports x2APIC, intel interrupt remapping hardware can be set to EIM mode when userspace local APIC is used.
Signed-off-by Bui Quang Minh <[email protected]>--- hw/i386/intel_iommu.c | 11 ----------- 1 file changed, 11 deletions(-)hw/i386/intel_iommu.c +0
-4@@ -4045,17 +4045,6 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) &&x86_iommu_ir_supported (x86_iommu) ?ON_OFF_AUTO_ON :ON_OFF_AUTO_OFF ; } -if (s->intr_eim ==ON_OFF_AUTO_ON && !s->buggy_eim) { -if (!kvm_irqchip_is_split ()) { -error_setg (errp,"eim=on requires accel=kvm,kernel-irqchip=split" ); -return false;
hw/i386/intel_iommu.c static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) · line 4050
Quoted 10 lines
hw/i386/intel_iommu.c +0
-7- } -if (!kvm_enable_x2apic ()) { -error_setg (errp,"eim=on requires support on the KVM side" -"(X2APIC_API, first shipped in v4.7)" ); -return false; - } - }/* Currently only address widths supported are 39 and 48 bits */ if ((s->aw_bits != VTD_HOST_AW_39BIT) &&
Paolo I think if you ack the kvm bits, I can merge.
Quoted 4 lines
Signature · 1 line
2.25.1
PATCH v3 5/5 amd_iommu: report x2APIC support to the operating system
In reply to Bui Quang MinhThis commit adds XTSup configuration to let user choose to whether enable this feature or not. When XTSup is enabled, additional bytes in IRTE with enabled guest virtual VAPIC are used to support 32-bit destination id.
Additionally, this commit changes to use IVHD type 0x11 in ACPI table for feature report to operating system. This is because Linux does not use XTSup in IOMMU Feature Reporting field of IVHD type 0x10 but only use XTSup bit in EFR Register Image of IVHD 0x11 to indicate x2APIC support (see init_iommu_one in linux/drivers/iommu/amd/init.c)
--- hw/i386/acpi-build.c | 28 ++++++++++++++-------------- hw/i386/amd_iommu.c | 21 +++++++++++++++++++-- hw/i386/amd_iommu.h | 16 +++++++++++----- 3 files changed, 44 insertions(+), 21 deletions(-)
hw/i386/acpi-build.c +14 -14
@@ -2339,7 +2339,7 @@ static void build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, const char *oem_table_id) { -int ivhd_table_len =24 ; +int ivhd_table_len =40 ;AMDVIState *s =AMD_IOMMU_DEVICE (x86_iommu_get_default ());GArray *ivhd_blob =g_array_new (false, true,1 );AcpiTable table = { .sig ="IVRS" , .rev =1 , .oem_id = oem_id,
@@ -2349,18 +2349,19 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,/* IVinfo - IO virtualization information common to all * IOMMU units in a system */ -build_append_int_noprefix (table_data,40UL <<8 /* PASize */ ,4 ); +build_append_int_noprefix (table_data, + (1UL <<0 ) |/* EFRSup */ + (40UL <<8 ),/* PASize */ +4 );/* reserved */ build_append_int_noprefix (table_data,0 ,8 ); -/* IVHD definition - type 10h */ -build_append_int_noprefix (table_data,0x10 ,1 ); +/* IVHD definition - type 11h */ +build_append_int_noprefix (table_data,0x11 ,1 );/* virtualization flags */ build_append_int_noprefix (table_data, (1UL <<0 ) |/* HtTunEn */ - (1UL <<4 ) |/* iotblSup */ - (1UL <<6 ) |/* PrefSup */ - (1UL <<7 ),/* PPRSup */ + (1UL <<4 ),/* iotblSup */ 1 );/*
@@ -2404,13 +2405,12 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,build_append_int_noprefix (table_data,0 ,2 );/* IOMMU info */ build_append_int_noprefix (table_data,0 ,2 ); -/* IOMMU Feature Reporting */ -build_append_int_noprefix (table_data, - (48UL <<30 ) |/* HATS */ - (48UL <<28 ) |/* GATS */ - (1UL <<2 ) |/* GTSup */ - (1UL <<6 ),/* GASup */ -4 ); +/* IOMMU Attributes */ +build_append_int_noprefix (table_data,0 ,4 ); +/* EFR Register Image */ +build_append_int_noprefix (table_data, s->efr_reg,8 ); +/* EFR Register Image 2 */ +build_append_int_noprefix (table_data,0 ,8 );/* IVHD entries as found above */ g_array_append_vals (table_data, ivhd_blob->data, ivhd_blob->len);
hw/i386/amd_iommu.c +19 -2
@@ -31,6 +31,7 @@#include "hw/i386/apic_internal.h" #include "trace.h" #include "hw/i386/apic-msidef.h" +#include "hw/qdev-properties.h" /* used AMD-Vi MMIO registers */ const char *amdvi_mmio_low[] = {
@@ -1155,7 +1156,12 @@ static int amdvi_int_remap_ga(AMDVIState *iommu, irq->vector = irte.hi.fields.vector; irq->dest_mode = irte.lo.fields_remap.dm; irq->redir_hint = irte.lo.fields_remap.rq_eoi; - irq->dest = irte.lo.fields_remap.destination; +if (!iommu->xtsup) { + irq->dest = irte.lo.fields_remap.destination &0xff ; + }else { + irq->dest = irte.lo.fields_remap.destination | + (irte.hi.fields.destination_hi <<24 ); + }return 0 ; }
@@ -1503,10 +1509,15 @@ static void amdvi_init(AMDVIState *s) s->enabled = false; s->ats_enabled = false; s->cmdbuf_enabled = false; + s->efr_reg =AMDVI_DEFAULT_EXT_FEATURES ; + +if (s->xtsup) { + s->efr_reg |=AMDVI_FEATURE_XT ; + }/* reset MMIO */ memset (s->mmior,0 ,AMDVI_MMIO_SIZE ); -amdvi_set_quad (s,AMDVI_MMIO_EXT_FEATURES ,AMDVI_EXT_FEATURES , +amdvi_set_quad (s,AMDVI_MMIO_EXT_FEATURES , s->efr_reg,0xffffffffffffffef ,0 );amdvi_set_quad (s,AMDVI_MMIO_STATUS ,0 ,0x98 ,0x67 );
@@ -1586,6 +1597,11 @@ static void amdvi_sysbus_realize(DeviceState *dev, Error **errp)amdvi_init (s); } +static Property amdvi_properties[] = { +DEFINE_PROP_BOOL ("xtsup" , AMDVIState, xtsup, false), +DEFINE_PROP_END_OF_LIST (), +}; +static const VMStateDescription vmstate_amdvi_sysbus = { .name ="amd-iommu" , .unmigratable =1
@@ -1612,6 +1628,7 @@ static void amdvi_sysbus_class_init(ObjectClass *klass, void *data) dc->user_creatable = true;set_bit (DEVICE_CATEGORY_MISC , dc->categories); dc->desc ="AMD IOMMU (AMD-Vi) DMA Remapping device" ; +device_class_set_props (dc, amdvi_properties); }static const TypeInfo amdvi_sysbus = {
hw/i386/amd_iommu.h +11 -5
@@ -154,6 +154,7 @@#define AMDVI_FEATURE_PREFETCH (1ULL << 0)/* page prefetch */ #define AMDVI_FEATURE_PPR (1ULL << 1)/* PPR Support */ +#define AMDVI_FEATURE_XT (1ULL << 2)/* x2APIC Support */ #define AMDVI_FEATURE_GT (1ULL << 4)/* Guest Translation */ #define AMDVI_FEATURE_IA (1ULL << 6)/* inval all support */ #define AMDVI_FEATURE_GA (1ULL << 7)/* guest VAPIC support */
@@ -173,8 +174,9 @@#define AMDVI_IOTLB_MAX_SIZE 1024#define AMDVI_DEVID_SHIFT 36 -/* extended feature support */ -#define AMDVI_EXT_FEATURES (AMDVI_FEATURE_PREFETCH | AMDVI_FEATURE_PPR | \ +/* default extended feature */ +#define AMDVI_DEFAULT_EXT_FEATURES \ + (AMDVI_FEATURE_PREFETCH | AMDVI_FEATURE_PPR | \ AMDVI_FEATURE_IA | AMDVI_FEATURE_GT | AMDVI_FEATURE_HE | \ AMDVI_GATS_MODE | AMDVI_HATS_MODE | AMDVI_FEATURE_GA)
@@ -278,8 +280,8 @@ union irte_ga_lo { dm:1, /* ------ */ guest_mode:1, - destination:8, - rsvd_1:48; + destination:24, + rsvd_1:32; } fields_remap; };
@@ -287,7 +289,8 @@ union irte_ga_hi {uint64_t val;struct {uint64_t vector:8 , - rsvd_2:56 ; + rsvd_2:48 , + destination_hi:8 ; } fields; };
@@ -367,6 +370,9 @@ struct AMDVIState {/* Interrupt remapping */ bool ga_enabled; +bool xtsup; + + uint64_t efr_reg; /* extended feature register */ };#endif
Signature · 1 line
2.25.1
Re: [REPOST PATCH v3 5/5] amd_iommu: report x2APIC support to the operating system
Quoted 11 lines · Bui Quang Minh
This commit adds XTSup configuration to let user choose to whether enable this feature or not. When XTSup is enabled, additional bytes in IRTE with enabled guest virtual VAPIC are used to support 32-bit destination id.
Additionally, this commit changes to use IVHD type
0x11in ACPI table for feature report to operating system. This is because Linux does not use XTSup in IOMMU Feature Reporting field of IVHD type0x10but only use XTSup bit in EFR Register Image of IVHD0x11to indicate x2APIC support (seeinit_iommu_oneinlinux/drivers/iommu/amd/init.c)Signed-off-by Bui Quang Minh <[email protected]>
I'm concerned that switching to type 11 will break some older guests. It would be better if we could export both type 10 and type 11 ivhd. A question however would be how does this interact with older guests. For example:
https://lists.linuxfoundation.org/pipermail/iommu/2016-January/015310.html
it looks like linux before 2016 only expected one ivhd entry?
Some research and testing here would be benefitial. Similarly for windows guests.
Thanks!
Quoted 29 lines
--- hw/i386/acpi-build.c | 28 ++++++++++++++-------------- hw/i386/amd_iommu.c | 21 +++++++++++++++++++-- hw/i386/amd_iommu.h | 16 +++++++++++----- 3 files changed, 44 insertions(+), 21 deletions(-)hw/i386/acpi-build.c +5
-2@@ -2339,7 +2339,7 @@ static void build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, const char *oem_table_id) { -int ivhd_table_len =24 ; +int ivhd_table_len =40 ;AMDVIState *s =AMD_IOMMU_DEVICE (x86_iommu_get_default ());GArray *ivhd_blob =g_array_new (false, true,1 );AcpiTable table = { .sig ="IVRS" , .rev =1 , .oem_id = oem_id,@@ -2349,18 +2349,19 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,/* IVinfo - IO virtualization information common to all * IOMMU units in a system */ -build_append_int_noprefix (table_data,40UL <<8 /* PASize */ ,4 ); +build_append_int_noprefix (table_data, + (1UL <<0 ) |/* EFRSup */ + (40UL <<8 ),/* PASize */ +4 );/* reserved */
hw/i386/acpi-build.c build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, · line 2361
Quoted 10 lines
hw/i386/acpi-build.c +2
-3build_append_int_noprefix (table_data,0 ,8 ); -/* IVHD definition - type 10h */ -build_append_int_noprefix (table_data,0x10 ,1 ); +/* IVHD definition - type 11h */ +build_append_int_noprefix (table_data,0x11 ,1 );/* virtualization flags */ build_append_int_noprefix(table_data, (1UL << 0) | /* HtTunEn */ - (1UL << 4) | /* iotblSup */
btw this should have been iotlbsup?
hw/i386/acpi-build.c build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, · line 2367
Quoted 6 lines
hw/i386/acpi-build.c +1
-2- (1UL <<6 ) |/* PrefSup */ - (1UL <<7 ),/* PPRSup */ + (1UL <<4 ),/* iotblSup */ 1);/*
hmm why are you removing these other flags?
Quoted 7 lines
hw/i386/acpi-build.c +0
-3@@ -2404,13 +2405,12 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,build_append_int_noprefix (table_data,0 ,2 );/* IOMMU info */ build_append_int_noprefix (table_data,0 ,2 ); -/* IOMMU Feature Reporting */ - build_append_int_noprefix(table_data, - (48UL << 30) | /* HATS */
hw/i386/acpi-build.c build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, · line 2413
Quoted 10 lines
hw/i386/acpi-build.c +6
-4- (48UL <<28 ) |/* GATS */ - (1UL <<2 ) |/* GTSup */ - (1UL <<6 ),/* GASup */ - 4); +/* IOMMU Attributes */ +build_append_int_noprefix (table_data,0 ,4 ); +/* EFR Register Image */ +build_append_int_noprefix (table_data, s->efr_reg,8 ); +/* EFR Register Image 2 */ +build_append_int_noprefix (table_data,0 ,8 );
here too. what's going on?
Quoted 16 lines
hw/i386/acpi-build.c +0
-0/* IVHD entries as found above */ g_array_append_vals (table_data, ivhd_blob->data, ivhd_blob->len);hw/i386/amd_iommu.c +1
-0@@ -31,6 +31,7 @@#include "hw/i386/apic_internal.h" #include "trace.h" #include "hw/i386/apic-msidef.h" +#include "hw/qdev-properties.h" /* used AMD-Vi MMIO registers */ const char *amdvi_mmio_low[] = {
hw/i386/amd_iommu.c static int amdvi_int_remap_ga(AMDVIState *iommu, · line 1164
Quoted 10 lines
hw/i386/amd_iommu.c +6
-1@@ -1155,7 +1156,12 @@ static int amdvi_int_remap_ga(AMDVIState *iommu, irq->vector = irte.hi.fields.vector; irq->dest_mode = irte.lo.fields_remap.dm; irq->redir_hint = irte.lo.fields_remap.rq_eoi; - irq->dest = irte.lo.fields_remap.destination; +if (!iommu->xtsup) { + irq->dest = irte.lo.fields_remap.destination &0xff ; + }else { + irq->dest = irte.lo.fields_remap.destination | + (irte.hi.fields.destination_hi <<24 ); + }
Weird way to put it. Why not if (iommu->xtsup) ... ?
Quoted 97 lines
hw/i386/amd_iommu.c +12
-1return 0 ; }@@ -1503,10 +1509,15 @@ static void amdvi_init(AMDVIState *s) s->enabled = false; s->ats_enabled = false; s->cmdbuf_enabled = false; + s->efr_reg =AMDVI_DEFAULT_EXT_FEATURES ; + +if (s->xtsup) { + s->efr_reg |=AMDVI_FEATURE_XT ; + }/* reset MMIO */ memset (s->mmior,0 ,AMDVI_MMIO_SIZE ); -amdvi_set_quad (s,AMDVI_MMIO_EXT_FEATURES ,AMDVI_EXT_FEATURES , +amdvi_set_quad (s,AMDVI_MMIO_EXT_FEATURES , s->efr_reg,0xffffffffffffffef ,0 );amdvi_set_quad (s,AMDVI_MMIO_STATUS ,0 ,0x98 ,0x67 );@@ -1586,6 +1597,11 @@ static void amdvi_sysbus_realize(DeviceState *dev, Error **errp)amdvi_init (s); } +static Property amdvi_properties[] = { +DEFINE_PROP_BOOL ("xtsup" , AMDVIState, xtsup, false), +DEFINE_PROP_END_OF_LIST (), +}; +static const VMStateDescription vmstate_amdvi_sysbus = { .name ="amd-iommu" , .unmigratable =1 @@ -1612,6 +1628,7 @@ static void amdvi_sysbus_class_init(ObjectClass *klass, void *data) dc->user_creatable = true;set_bit (DEVICE_CATEGORY_MISC , dc->categories); dc->desc ="AMD IOMMU (AMD-Vi) DMA Remapping device" ; +device_class_set_props (dc, amdvi_properties); }static const TypeInfo amdvi_sysbus = {hw/i386/amd_iommu.h +11
-5@@ -154,6 +154,7 @@#define AMDVI_FEATURE_PREFETCH (1ULL << 0)/* page prefetch */ #define AMDVI_FEATURE_PPR (1ULL << 1)/* PPR Support */ +#define AMDVI_FEATURE_XT (1ULL << 2)/* x2APIC Support */ #define AMDVI_FEATURE_GT (1ULL << 4)/* Guest Translation */ #define AMDVI_FEATURE_IA (1ULL << 6)/* inval all support */ #define AMDVI_FEATURE_GA (1ULL << 7)/* guest VAPIC support */ @@ -173,8 +174,9 @@#define AMDVI_IOTLB_MAX_SIZE 1024#define AMDVI_DEVID_SHIFT 36 -/* extended feature support */ -#define AMDVI_EXT_FEATURES (AMDVI_FEATURE_PREFETCH | AMDVI_FEATURE_PPR | \ +/* default extended feature */ +#define AMDVI_DEFAULT_EXT_FEATURES \ + (AMDVI_FEATURE_PREFETCH | AMDVI_FEATURE_PPR | \ AMDVI_FEATURE_IA | AMDVI_FEATURE_GT | AMDVI_FEATURE_HE | \ AMDVI_GATS_MODE | AMDVI_HATS_MODE | AMDVI_FEATURE_GA)@@ -278,8 +280,8 @@ union irte_ga_lo { dm:1, /* ------ */ guest_mode:1, - destination:8, - rsvd_1:48; + destination:24, + rsvd_1:32; } fields_remap; };@@ -287,7 +289,8 @@ union irte_ga_hi {uint64_t val;struct {uint64_t vector:8 , - rsvd_2:56 ; + rsvd_2:48 , + destination_hi:8 ; } fields; };@@ -367,6 +370,9 @@ struct AMDVIState {/* Interrupt remapping */ bool ga_enabled; +bool xtsup; + + uint64_t efr_reg; /* extended feature register */ };#endif Signature · 1 line
2.25.1
Re: [REPOST PATCH v3 5/5] amd_iommu: report x2APIC support to the operating system
Quoted 11 lines · Michael S. Tsirkin
Quoted 10 lines · Bui Quang Minh
This commit adds XTSup configuration to let user choose to whether enable this feature or not. When XTSup is enabled, additional bytes in IRTE with enabled guest virtual VAPIC are used to support 32-bit destination id.
Additionally, this commit changes to use IVHD type
0x11in ACPI table for feature report to operating system. This is because Linux does not use XTSup in IOMMU Feature Reporting field of IVHD type0x10but only use XTSup bit in EFR Register Image of IVHD0x11to indicate x2APIC support (seeinit_iommu_oneinlinux/drivers/iommu/amd/init.c)
Quoted 8 lines
Quoted 1 line
Signed-off-by Bui Quang Minh <[email protected]>I'm concerned that switching to type 11 will break some older guests. It would be better if we could export both type 10 and type 11 ivhd. A question however would be how does this interact with older guests. For example:
https://lists.linuxfoundation.org/pipermail/iommu/2016-January/015310.html
it looks like linux before 2016 only expected one ivhd entry?
Export both type 0x10 and 0x11 looks reasonable to me. Before the above commit, I see that Linux still loops through multiple ivhd but only handles one with type 0x10. On newer kernel, it will choose to handle the type that appears last corresponding the first devid, which is weird in my opinion.
+static u8 get_highest_supported_ivhd_type(struct acpi_table_header *ivrs) +{
+ u8 *base = (u8 *)ivrs;
+ struct ivhd_header *ivhd = (struct ivhd_header *)
+ (base + IVRS_HEADER_LENGTH);
+ u8 last_type = ivhd->type;
+ u16 devid = ivhd->devid;
+
+ while (((u8 *)ivhd - base < ivrs->length) &&
+ (ivhd->type <= ACPI_IVHD_TYPE_MAX_SUPPORTED)) {
+ u8 *p = (u8 *) ivhd;
+
+ if (ivhd->devid == devid)
+ last_type = ivhd->type;
+ ivhd = (struct ivhd_header *)(p + ivhd->length);
+ }
+
+ return last_type;
+}
So when exposing type 0x10 following by 0x11, old kernel only parses 0x10 and does not support x2APIC while new kernel parse 0x11 and support x2APIC. I will expose both types in the next version.
Quoted 49 lines
Some research and testing here would be benefitial. Similarly for windows guests.
Thanks!
Quoted 29 lines
--- hw/i386/acpi-build.c | 28 ++++++++++++++-------------- hw/i386/amd_iommu.c | 21 +++++++++++++++++++-- hw/i386/amd_iommu.h | 16 +++++++++++----- 3 files changed, 44 insertions(+), 21 deletions(-)hw/i386/acpi-build.c +5
-2@@ -2339,7 +2339,7 @@ static void build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, const char *oem_table_id) { -int ivhd_table_len =24 ; +int ivhd_table_len =40 ;AMDVIState *s =AMD_IOMMU_DEVICE (x86_iommu_get_default ());GArray *ivhd_blob =g_array_new (false, true,1 );AcpiTable table = { .sig ="IVRS" , .rev =1 , .oem_id = oem_id,@@ -2349,18 +2349,19 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,/* IVinfo - IO virtualization information common to all * IOMMU units in a system */ -build_append_int_noprefix (table_data,40UL <<8 /* PASize */ ,4 ); +build_append_int_noprefix (table_data, + (1UL <<0 ) |/* EFRSup */ + (40UL <<8 ),/* PASize */ +4 );/* reserved */ hw/i386/acpi-build.c build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, · line 2361
Quoted 10 lines
hw/i386/acpi-build.c +2
-3build_append_int_noprefix (table_data,0 ,8 ); -/* IVHD definition - type 10h */ -build_append_int_noprefix (table_data,0x10 ,1 ); +/* IVHD definition - type 11h */ +build_append_int_noprefix (table_data,0x11 ,1 );/* virtualization flags */ build_append_int_noprefix(table_data, (1UL << 0) | /* HtTunEn */ - (1UL << 4) | /* iotblSup */btw this should have been iotlbsup?
Quoted 8 lines
hw/i386/acpi-build.c build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, · line 2367
Quoted 6 lines
hw/i386/acpi-build.c +1
-2- (1UL <<6 ) |/* PrefSup */ - (1UL <<7 ),/* PPRSup */ + (1UL <<4 ),/* iotblSup */ 1);/* hmm why are you removing these other flags?
According to the AMD IOMMU specification, the bit 6, 7 are reserved in type 0x11 which are PerfSup, PPRSup respectively in type 0x10 so I remove those flags when changing to type 0x11. In type 0x11, these feature are reported via the below EFR Register Image I believe.
Quoted 13 lines
Quoted 13 lines
hw/i386/acpi-build.c +1
-7@@ -2404,13 +2405,12 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,build_append_int_noprefix (table_data,0 ,2 );/* IOMMU info */ build_append_int_noprefix (table_data,0 ,2 ); -/* IOMMU Feature Reporting */ -build_append_int_noprefix (table_data, - (48UL <<30 ) |/* HATS */ - (48UL <<28 ) |/* GATS */ - (1UL <<2 ) |/* GTSup */ - (1UL <<6 ),/* GASup */ -4 ); +/* IOMMU Attributes */
Quoted 8 lines
hw/i386/acpi-build.c build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, · line 2413
Quoted 5 lines
hw/i386/acpi-build.c +5
-0+build_append_int_noprefix (table_data,0 ,4 ); +/* EFR Register Image */ +build_append_int_noprefix (table_data, s->efr_reg,8 ); +/* EFR Register Image 2 */ +build_append_int_noprefix (table_data,0 ,8 );here too. what's going on?
Same as the above, the structure of type 0x11 is different from 0x10. At offset 20 it is not IOMMU feature reporting but IOMMU attributes. And there are 2 more fields: EFR Register Image, EFR Register Image 2 before IVHD device entries.
Quoted 13 lines
Quoted 13 lines
hw/i386/acpi-build.c +0
-0/* IVHD entries as found above */ g_array_append_vals (table_data, ivhd_blob->data, ivhd_blob->len);hw/i386/amd_iommu.c +1
-0@@ -31,6 +31,7 @@#include "hw/i386/apic_internal.h" #include "trace.h" #include "hw/i386/apic-msidef.h" +#include "hw/qdev-properties.h"
Quoted 15 lines
hw/i386/amd_iommu.c static int amdvi_int_remap_ga(AMDVIState *iommu, · line 1164
Quoted 13 lines
hw/i386/amd_iommu.c +6
-1/* used AMD-Vi MMIO registers */ const char *amdvi_mmio_low[] = {@@ -1155,7 +1156,12 @@ static int amdvi_int_remap_ga(AMDVIState *iommu, irq->vector = irte.hi.fields.vector; irq->dest_mode = irte.lo.fields_remap.dm; irq->redir_hint = irte.lo.fields_remap.rq_eoi; - irq->dest = irte.lo.fields_remap.destination; +if (!iommu->xtsup) { + irq->dest = irte.lo.fields_remap.destination &0xff ; + }else { + irq->dest = irte.lo.fields_remap.destination | + (irte.hi.fields.destination_hi <<24 ); + }Weird way to put it. Why not if (
iommu->xtsup) ... ?
Okay, I'll fix this in next version.
Quoted 94 lines
Quoted 94 lines
hw/i386/amd_iommu.c +12
-1return 0 ; }@@ -1503,10 +1509,15 @@ static void amdvi_init(AMDVIState *s) s->enabled = false; s->ats_enabled = false; s->cmdbuf_enabled = false; + s->efr_reg =AMDVI_DEFAULT_EXT_FEATURES ; + +if (s->xtsup) { + s->efr_reg |=AMDVI_FEATURE_XT ; + }/* reset MMIO */ memset (s->mmior,0 ,AMDVI_MMIO_SIZE ); -amdvi_set_quad (s,AMDVI_MMIO_EXT_FEATURES ,AMDVI_EXT_FEATURES , +amdvi_set_quad (s,AMDVI_MMIO_EXT_FEATURES , s->efr_reg,0xffffffffffffffef ,0 );amdvi_set_quad (s,AMDVI_MMIO_STATUS ,0 ,0x98 ,0x67 );@@ -1586,6 +1597,11 @@ static void amdvi_sysbus_realize(DeviceState *dev, Error **errp)amdvi_init (s); } +static Property amdvi_properties[] = { +DEFINE_PROP_BOOL ("xtsup" , AMDVIState, xtsup, false), +DEFINE_PROP_END_OF_LIST (), +}; +static const VMStateDescription vmstate_amdvi_sysbus = { .name ="amd-iommu" , .unmigratable =1 @@ -1612,6 +1628,7 @@ static void amdvi_sysbus_class_init(ObjectClass *klass, void *data) dc->user_creatable = true;set_bit (DEVICE_CATEGORY_MISC , dc->categories); dc->desc ="AMD IOMMU (AMD-Vi) DMA Remapping device" ; +device_class_set_props (dc, amdvi_properties); }static const TypeInfo amdvi_sysbus = {hw/i386/amd_iommu.h +11
-5@@ -154,6 +154,7 @@#define AMDVI_FEATURE_PREFETCH (1ULL << 0)/* page prefetch */ #define AMDVI_FEATURE_PPR (1ULL << 1)/* PPR Support */ +#define AMDVI_FEATURE_XT (1ULL << 2)/* x2APIC Support */ #define AMDVI_FEATURE_GT (1ULL << 4)/* Guest Translation */ #define AMDVI_FEATURE_IA (1ULL << 6)/* inval all support */ #define AMDVI_FEATURE_GA (1ULL << 7)/* guest VAPIC support */ @@ -173,8 +174,9 @@#define AMDVI_IOTLB_MAX_SIZE 1024#define AMDVI_DEVID_SHIFT 36 -/* extended feature support */ -#define AMDVI_EXT_FEATURES (AMDVI_FEATURE_PREFETCH | AMDVI_FEATURE_PPR | \ +/* default extended feature */ +#define AMDVI_DEFAULT_EXT_FEATURES \ + (AMDVI_FEATURE_PREFETCH | AMDVI_FEATURE_PPR | \ AMDVI_FEATURE_IA | AMDVI_FEATURE_GT | AMDVI_FEATURE_HE | \ AMDVI_GATS_MODE | AMDVI_HATS_MODE | AMDVI_FEATURE_GA)@@ -278,8 +280,8 @@ union irte_ga_lo { dm:1, /* ------ */ guest_mode:1, - destination:8, - rsvd_1:48; + destination:24, + rsvd_1:32; } fields_remap; };@@ -287,7 +289,8 @@ union irte_ga_hi {uint64_t val;struct {uint64_t vector:8 , - rsvd_2:56 ; + rsvd_2:48 , + destination_hi:8 ; } fields; };@@ -367,6 +370,9 @@ struct AMDVIState {/* Interrupt remapping */ bool ga_enabled; +bool xtsup; + +uint64_t efr_reg;/* extended feature register */ };
Quoted 4 lines
Quoted 3 lines
hw/i386/amd_iommu.h +0
-0#endif Signature · 1 line
2.25.1
Thanks,
Quang Minh.
Re: [REPOST PATCH v3 5/5] amd_iommu: report x2APIC support to the operating system
Quoted 34 lines · Bui Quang Minh
Quoted 11 lines · Michael S. Tsirkin
Quoted 10 lines · Bui Quang Minh
This commit adds XTSup configuration to let user choose to whether enable this feature or not. When XTSup is enabled, additional bytes in IRTE with enabled guest virtual VAPIC are used to support 32-bit destination id.
Additionally, this commit changes to use IVHD type
0x11in ACPI table for feature report to operating system. This is because Linux does not use XTSup in IOMMU Feature Reporting field of IVHD type0x10but only use XTSup bit in EFR Register Image of IVHD0x11to indicate x2APIC support (seeinit_iommu_oneinlinux/drivers/iommu/amd/init.c)Quoted 8 lines
Quoted 1 line
Signed-off-by Bui Quang Minh <[email protected]>I'm concerned that switching to type 11 will break some older guests. It would be better if we could export both type 10 and type 11 ivhd. A question however would be how does this interact with older guests. For example:
https://lists.linuxfoundation.org/pipermail/iommu/2016-January/015310.html
it looks like linux before 2016 only expected one ivhd entry?Export both type
0x10and0x11looks reasonable to me. Before the above commit, I see that Linux still loops through multiple ivhd but only handles one with type0x10. On newer kernel, it will choose to handle the type that appears last corresponding the first devid, which is weird in my opinion.(quoted diff) +9
-0+static u8 get_highest_supported_ivhd_type(struct acpi_table_header *ivrs) +{ + u8 *base = (u8 *)ivrs; + struct ivhd_header *ivhd = (struct ivhd_header *) + (base + IVRS_HEADER_LENGTH); + u8 last_type = ivhd->type; + u16 devid = ivhd->devid; + + while (((u8 *)ivhd - base < ivrs->length) &&
Review
Quoted 10 lines
(quoted diff) +10
-0+ (ivhd->type <= ACPI_IVHD_TYPE_MAX_SUPPORTED)) { + u8 *p = (u8 *) ivhd; + + if (ivhd->devid == devid) + last_type = ivhd->type; + ivhd = (struct ivhd_header *)(p + ivhd->length); + } + + return last_type; +}
Yes I don't get the logic here either.
Talk to kernel devs who wrote this?
commit 8c7142f56fedfc6824b5bca56fee1f443e01746b
Author: Suravee Suthikulpanit <[email protected]> Date: Fri Apr 1 09:05:59 2016 -0400
iommu/amd: Use the most comprehensive IVHD type that the driver can support
The IVRS in more recent AMD system usually contains multiple IVHD block types (e.g. 0x10, 0x11, and 0x40) for each IOMMU. The newer IVHD types provide more information (e.g. new features specified in the IOMMU spec), while maintain compatibility with the older IVHD type.
Having multiple IVHD type allows older IOMMU drivers to still function (e.g. using the older IVHD type 0x10) while the newer IOMMU driver can use the newer IVHD types (e.g. 0x11 and 0x40). Therefore, the IOMMU driver should only make use of the newest IVHD type that it can support.
This patch adds new logic to determine the highest level of IVHD type it can support, and use it throughout the to initialize the driver. This requires adding another pass to the IVRS parsing to determine appropriate IVHD type (see function get_highest_supported_ivhd_type()) before parsing the contents.
[Vincent: fix the build error of IVHD_DEV_ACPI_HID flag not found]
Quoted 211 lines
So when exposing type
0x10following by0x11, old kernel only parses0x10and does not support x2APIC while new kernel parse0x11and support x2APIC. I will expose both types in the next version.Quoted 48 lines
Some research and testing here would be benefitial. Similarly for windows guests.
Thanks!
Quoted 28 lines
--- hw/i386/acpi-build.c | 28 ++++++++++++++-------------- hw/i386/amd_iommu.c | 21 +++++++++++++++++++-- hw/i386/amd_iommu.h | 16 +++++++++++----- 3 files changed, 44 insertions(+), 21 deletions(-)hw/i386/acpi-build.c +5
-2@@ -2339,7 +2339,7 @@ static void build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, const char *oem_table_id) { -int ivhd_table_len =24 ; +int ivhd_table_len =40 ;AMDVIState *s =AMD_IOMMU_DEVICE (x86_iommu_get_default ());GArray *ivhd_blob =g_array_new (false, true,1 );AcpiTable table = { .sig ="IVRS" , .rev =1 , .oem_id = oem_id,@@ -2349,18 +2349,19 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,/* IVinfo - IO virtualization information common to all * IOMMU units in a system */ -build_append_int_noprefix (table_data,40UL <<8 /* PASize */ ,4 ); +build_append_int_noprefix (table_data, + (1UL <<0 ) |/* EFRSup */ + (40UL <<8 ),/* PASize */ +4 );hw/i386/acpi-build.c build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, · line 2360
Quoted 10 lines
hw/i386/acpi-build.c +2
-3/* reserved */ build_append_int_noprefix (table_data,0 ,8 ); -/* IVHD definition - type 10h */ -build_append_int_noprefix (table_data,0x10 ,1 ); +/* IVHD definition - type 11h */ +build_append_int_noprefix (table_data,0x11 ,1 );/* virtualization flags */ build_append_int_noprefix(table_data, (1UL << 0) | /* HtTunEn */ - (1UL << 4) | /* iotblSup */btw this should have been iotlbsup?
Quoted 7 lines
hw/i386/acpi-build.c build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, · line 2367
Quoted 5 lines
hw/i386/acpi-build.c +1
-2- (1UL <<6 ) |/* PrefSup */ - (1UL <<7 ),/* PPRSup */ + (1UL <<4 ),/* iotblSup */ 1);/* hmm why are you removing these other flags?
According to the AMD IOMMU specification, the bit 6, 7 are reserved in type
0x11which are PerfSup, PPRSup respectively in type0x10so I remove those flags when changing to type0x11. In type0x11, these feature are reported via the below EFR Register Image I believe.Quoted 13 lines
Quoted 13 lines
hw/i386/acpi-build.c +1
-7@@ -2404,13 +2405,12 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,build_append_int_noprefix (table_data,0 ,2 );/* IOMMU info */ build_append_int_noprefix (table_data,0 ,2 ); -/* IOMMU Feature Reporting */ -build_append_int_noprefix (table_data, - (48UL <<30 ) |/* HATS */ - (48UL <<28 ) |/* GATS */ - (1UL <<2 ) |/* GTSup */ - (1UL <<6 ),/* GASup */ -4 ); +/* IOMMU Attributes */ Quoted 8 lines
hw/i386/acpi-build.c build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, · line 2413
Quoted 5 lines
hw/i386/acpi-build.c +5
-0+build_append_int_noprefix (table_data,0 ,4 ); +/* EFR Register Image */ +build_append_int_noprefix (table_data, s->efr_reg,8 ); +/* EFR Register Image 2 */ +build_append_int_noprefix (table_data,0 ,8 );here too. what's going on?
Same as the above, the structure of type
0x11is different from0x10. At offset 20 it is not IOMMU feature reporting but IOMMU attributes. And there are 2 more fields: EFR Register Image, EFR Register Image 2 before IVHD device entries.Quoted 18 lines
Quoted 18 lines
hw/i386/acpi-build.c +0
-0/* IVHD entries as found above */ g_array_append_vals (table_data, ivhd_blob->data, ivhd_blob->len);hw/i386/amd_iommu.c +1
-1@@ -31,6 +31,7 @@#include "hw/i386/apic_internal.h" #include "trace.h" #include "hw/i386/apic-msidef.h" +#include "hw/qdev-properties.h" /* used AMD-Vi MMIO registers */ const char *amdvi_mmio_low[] = {@@ -1155,7 +1156,12 @@ static int amdvi_int_remap_ga(AMDVIState *iommu, irq->vector = irte.hi.fields.vector; irq->dest_mode = irte.lo.fields_remap.dm; irq->redir_hint = irte.lo.fields_remap.rq_eoi; - irq->dest = irte.lo.fields_remap.destination;Quoted 8 lines
hw/i386/amd_iommu.c static int amdvi_int_remap_ga(AMDVIState *iommu, · line 1164
Quoted 6 lines
hw/i386/amd_iommu.c +6
-0+if (!iommu->xtsup) { + irq->dest = irte.lo.fields_remap.destination &0xff ; + }else { + irq->dest = irte.lo.fields_remap.destination | + (irte.hi.fields.destination_hi <<24 ); + }Weird way to put it. Why not if (
iommu->xtsup) ... ?Okay, I'll fix this in next version.
Quoted 77 lines
Quoted 77 lines
hw/i386/amd_iommu.c +12
-1return 0 ; }@@ -1503,10 +1509,15 @@ static void amdvi_init(AMDVIState *s) s->enabled = false; s->ats_enabled = false; s->cmdbuf_enabled = false; + s->efr_reg =AMDVI_DEFAULT_EXT_FEATURES ; + +if (s->xtsup) { + s->efr_reg |=AMDVI_FEATURE_XT ; + }/* reset MMIO */ memset (s->mmior,0 ,AMDVI_MMIO_SIZE ); -amdvi_set_quad (s,AMDVI_MMIO_EXT_FEATURES ,AMDVI_EXT_FEATURES , +amdvi_set_quad (s,AMDVI_MMIO_EXT_FEATURES , s->efr_reg,0xffffffffffffffef ,0 );amdvi_set_quad (s,AMDVI_MMIO_STATUS ,0 ,0x98 ,0x67 );@@ -1586,6 +1597,11 @@ static void amdvi_sysbus_realize(DeviceState *dev, Error **errp)amdvi_init (s); } +static Property amdvi_properties[] = { +DEFINE_PROP_BOOL ("xtsup" , AMDVIState, xtsup, false), +DEFINE_PROP_END_OF_LIST (), +}; +static const VMStateDescription vmstate_amdvi_sysbus = { .name ="amd-iommu" , .unmigratable =1 @@ -1612,6 +1628,7 @@ static void amdvi_sysbus_class_init(ObjectClass *klass, void *data) dc->user_creatable = true;set_bit (DEVICE_CATEGORY_MISC , dc->categories); dc->desc ="AMD IOMMU (AMD-Vi) DMA Remapping device" ; +device_class_set_props (dc, amdvi_properties); }static const TypeInfo amdvi_sysbus = {hw/i386/amd_iommu.h +8
-5@@ -154,6 +154,7 @@#define AMDVI_FEATURE_PREFETCH (1ULL << 0)/* page prefetch */ #define AMDVI_FEATURE_PPR (1ULL << 1)/* PPR Support */ +#define AMDVI_FEATURE_XT (1ULL << 2)/* x2APIC Support */ #define AMDVI_FEATURE_GT (1ULL << 4)/* Guest Translation */ #define AMDVI_FEATURE_IA (1ULL << 6)/* inval all support */ #define AMDVI_FEATURE_GA (1ULL << 7)/* guest VAPIC support */ @@ -173,8 +174,9 @@#define AMDVI_IOTLB_MAX_SIZE 1024#define AMDVI_DEVID_SHIFT 36 -/* extended feature support */ -#define AMDVI_EXT_FEATURES (AMDVI_FEATURE_PREFETCH | AMDVI_FEATURE_PPR | \ +/* default extended feature */ +#define AMDVI_DEFAULT_EXT_FEATURES \ + (AMDVI_FEATURE_PREFETCH | AMDVI_FEATURE_PPR | \ AMDVI_FEATURE_IA | AMDVI_FEATURE_GT | AMDVI_FEATURE_HE | \ AMDVI_GATS_MODE | AMDVI_HATS_MODE | AMDVI_FEATURE_GA)@@ -278,8 +280,8 @@ union irte_ga_lo { dm:1, /* ------ */ guest_mode:1, - destination:8, - rsvd_1:48; + destination:24, + rsvd_1:32; } fields_remap; };@@ -287,7 +289,8 @@ union irte_ga_hi {uint64_t val;struct {uint64_t vector:8 , - rsvd_2:56 ; + rsvd_2:48 , + destination_hi:8 ; } fields; };@@ -367,6 +370,9 @@ struct AMDVIState {/* Interrupt remapping */ Quoted 9 lines
Quoted 8 lines
hw/i386/amd_iommu.h +3
-0bool ga_enabled; +bool xtsup; + + uint64_t efr_reg; /* extended feature register */ };#endif Signature · 1 line
2.25.1Thanks,
Quang Minh.
Re: [REPOST PATCH v3 5/5] amd_iommu: report x2APIC support to the operating system
Quoted 72 lines · Michael S. Tsirkin
Quoted 34 lines · Bui Quang Minh
Quoted 11 lines · Michael S. Tsirkin
Quoted 10 lines · Bui Quang Minh
This commit adds XTSup configuration to let user choose to whether enable this feature or not. When XTSup is enabled, additional bytes in IRTE with enabled guest virtual VAPIC are used to support 32-bit destination id.
Additionally, this commit changes to use IVHD type
0x11in ACPI table for feature report to operating system. This is because Linux does not use XTSup in IOMMU Feature Reporting field of IVHD type0x10but only use XTSup bit in EFR Register Image of IVHD0x11to indicate x2APIC support (seeinit_iommu_oneinlinux/drivers/iommu/amd/init.c)Quoted 8 lines
Quoted 1 line
Signed-off-by Bui Quang Minh <[email protected]>I'm concerned that switching to type 11 will break some older guests. It would be better if we could export both type 10 and type 11 ivhd. A question however would be how does this interact with older guests. For example:
https://lists.linuxfoundation.org/pipermail/iommu/2016-January/015310.html
it looks like linux before 2016 only expected one ivhd entry?Export both type
0x10and0x11looks reasonable to me. Before the above commit, I see that Linux still loops through multiple ivhd but only handles one with type0x10. On newer kernel, it will choose to handle the type that appears last corresponding the first devid, which is weird in my opinion.(quoted diff) +9
-0+static u8 get_highest_supported_ivhd_type(struct acpi_table_header *ivrs) +{ + u8 *base = (u8 *)ivrs; + struct ivhd_header *ivhd = (struct ivhd_header *) + (base + IVRS_HEADER_LENGTH); + u8 last_type = ivhd->type; + u16 devid = ivhd->devid; + + while (((u8 *)ivhd - base < ivrs->length) &&Review
Quoted 10 lines
(quoted diff) +10
-0+ (ivhd->type <= ACPI_IVHD_TYPE_MAX_SUPPORTED)) { + u8 *p = (u8 *) ivhd; + + if (ivhd->devid == devid) + last_type = ivhd->type; + ivhd = (struct ivhd_header *)(p + ivhd->length); + } + + return last_type; +}Yes I don't get the logic here either.
Talk to kernel devs who wrote this?commit
8c7142f56fedfc6824b5bca56fee1f443e01746bAuthor: Suravee Suthikulpanit <[email protected]> Date: Fri Apr 1 09:05:59 2016 -0400iommu/amd: Use the most comprehensive IVHD type that the driver can support
The IVRS in more recent AMD system usually contains multiple IVHD block types (e.g.
0x10,0x11, and0x40) for each IOMMU. The newer IVHD types provide more information (e.g. new features specified in the IOMMU spec), while maintain compatibility with the older IVHD type.Having multiple IVHD type allows older IOMMU drivers to still function (e.g. using the older IVHD type
0x10) while the newer IOMMU driver can use the newer IVHD types (e.g.0x11and0x40). Therefore, the IOMMU driver should only make use of the newest IVHD type that it can support.This patch adds new logic to determine the highest level of IVHD type it can support, and use it throughout the to initialize the driver. This requires adding another pass to the IVRS parsing to determine appropriate IVHD type (see function
get_highest_supported_ivhd_type()) before parsing the contents.
Quoted 5 lines
[Vincent: fix the build error of
IVHD_DEV_ACPI_HIDflag not found]Signed-off-by Wan Zongshun <[email protected]>Signed-off-by Suravee Suthikulpanit <[email protected]>Signed-off-by Joerg Roedel <[email protected]>
I've sent a email to talk to kernel developers about this function. Here is the link to the email: https://lore.kernel.org/all/[email protected]/
Re: [REPOST PATCH v3 5/5] amd_iommu: report x2APIC support to the operating system
In reply to Bui Quang MinhQuoted 239 lines · Bui Quang Minh
Quoted 11 lines · Michael S. Tsirkin
Quoted 10 lines · Bui Quang Minh
This commit adds XTSup configuration to let user choose to whether enable this feature or not. When XTSup is enabled, additional bytes in IRTE with enabled guest virtual VAPIC are used to support 32-bit destination id.
Additionally, this commit changes to use IVHD type
0x11in ACPI table for feature report to operating system. This is because Linux does not use XTSup in IOMMU Feature Reporting field of IVHD type0x10but only use XTSup bit in EFR Register Image of IVHD0x11to indicate x2APIC support (seeinit_iommu_oneinlinux/drivers/iommu/amd/init.c)Quoted 8 lines
Quoted 1 line
Signed-off-by Bui Quang Minh <[email protected]>I'm concerned that switching to type 11 will break some older guests. It would be better if we could export both type 10 and type 11 ivhd. A question however would be how does this interact with older guests. For example:
https://lists.linuxfoundation.org/pipermail/iommu/2016-January/015310.html
it looks like linux before 2016 only expected one ivhd entry?Export both type
0x10and0x11looks reasonable to me. Before the above commit, I see that Linux still loops through multiple ivhd but only handles one with type0x10. On newer kernel, it will choose to handle the type that appears last corresponding the first devid, which is weird in my opinion.(quoted diff) +19
-0+static u8 get_highest_supported_ivhd_type(struct acpi_table_header *ivrs) +{ + u8 *base = (u8 *)ivrs; + struct ivhd_header *ivhd = (struct ivhd_header *) + (base + IVRS_HEADER_LENGTH); + u8 last_type = ivhd->type; + u16 devid = ivhd->devid; + + while (((u8 *)ivhd - base < ivrs->length) && + (ivhd->type <= ACPI_IVHD_TYPE_MAX_SUPPORTED)) { + u8 *p = (u8 *) ivhd; + + if (ivhd->devid == devid) + last_type = ivhd->type; + ivhd = (struct ivhd_header *)(p + ivhd->length); + } + + return last_type; +}So when exposing type
0x10following by0x11, old kernel only parses0x10and does not support x2APIC while new kernel parse0x11and support x2APIC. I will expose both types in the next version.Quoted 49 lines
Some research and testing here would be benefitial. Similarly for windows guests.
Thanks!
Quoted 37 lines
---
hw/i386/acpi-build.c| 28 ++++++++++++++-------------- hw/i386/amd_iommu.c | 21 +++++++++++++++++++-- hw/i386/amd_iommu.h | 16 +++++++++++-----3 files changed, 44 insertions(+), 21 deletions(-)hw/i386/acpi-build.c +7
-4@@ -2339,7 +2339,7 @@ static void build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, const char *oem_table_id) { - int ivhd_table_len = 24; + int ivhd_table_len = 40; AMDVIState *s = AMD_IOMMU_DEVICE(x86_iommu_get_default()); GArray *ivhd_blob = g_array_new(false, true, 1); AcpiTable table = { .sig = "IVRS", .rev = 1, .oem_id = oem_id,@@ -2349,18 +2349,19 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, /* IVinfo - IO virtualization information common to all * IOMMU units in a system */ - build_append_int_noprefix(table_data, 40UL << 8/* PASize */, 4); + build_append_int_noprefix(table_data, + (1UL << 0) | /* EFRSup */ + (40UL << 8), /* PASize */ + 4); /* reserved */ build_append_int_noprefix(table_data, 0, 8); - /* IVHD definition - type 10h */ - build_append_int_noprefix(table_data, 0x10, 1); + /* IVHD definition - type 11h */ + build_append_int_noprefix(table_data, 0x11, 1); /* virtualization flags */ build_append_int_noprefix(table_data,Quoted 2 lines
(1UL << 0) | /* HtTunEn */ - (1UL << 4) | /* iotblSup */
btw this should have been iotlbsup?
Quoted 7 lines
Quoted 5 lines
- (1UL << 6) | /* PrefSup */ - (1UL << 7), /* PPRSup */ + (1UL << 4), /* iotblSup */ 1);
/*hmm why are you removing these other flags?
According to the AMD IOMMU specification, the bit 6, 7 are reserved in type
0x11which are PerfSup, PPRSup respectively in type0x10so I remove those flags when changing to type0x11. In type0x11, these feature are reported via the below EFR Register Image I believe.Quoted 14 lines
Quoted 14 lines
hw/i386/acpi-build.c +1
-7@@ -2404,13 +2405,12 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, build_append_int_noprefix(table_data, 0, 2); /* IOMMU info */ build_append_int_noprefix(table_data, 0, 2); - /* IOMMU Feature Reporting */ - build_append_int_noprefix(table_data, - (48UL << 30) | /* HATS */ - (48UL << 28) | /* GATS */ - (1UL << 2) | /* GTSup */ - (1UL << 6), /* GASup */ - 4); + /* IOMMU Attributes */Quoted 8 lines
hw/i386/acpi-build.c build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id, · line 2413
Quoted 5 lines
hw/i386/acpi-build.c +5
-0+ build_append_int_noprefix(table_data, 0, 4); + /* EFR Register Image */ + build_append_int_noprefix(table_data, s->efr_reg, 8); + /* EFR Register Image 2 */ + build_append_int_noprefix(table_data, 0, 8);here too. what's going on?
Same as the above, the structure of type
0x11is different from0x10. At offset 20 it is not IOMMU feature reporting but IOMMU attributes. And there are 2 more fields: EFR Register Image, EFR Register Image 2 before IVHD device entries.Quoted 18 lines
Quoted 18 lines
hw/i386/acpi-build.c +0
-0/* IVHD entries as found above */ g_array_append_vals(table_data, ivhd_blob->data, ivhd_blob->len);hw/i386/amd_iommu.c +1
-1@@ -31,6 +31,7 @@ #include "hw/i386/apic_internal.h" #include "trace.h" #include "hw/i386/apic-msidef.h" +#include "hw/qdev-properties.h" /* used AMD-Vi MMIO registers */ const char *amdvi_mmio_low[] = {@@ -1155,7 +1156,12 @@ static int amdvi_int_remap_ga(AMDVIState *iommu, irq->vector = irte.hi.fields.vector; irq->dest_mode = irte.lo.fields_remap.dm; irq->redir_hint = irte.lo.fields_remap.rq_eoi; - irq->dest = irte.lo.fields_remap.destination;Quoted 8 lines
hw/i386/amd_iommu.c static int amdvi_int_remap_ga(AMDVIState *iommu, · line 1164
Quoted 6 lines
hw/i386/amd_iommu.c +6
-0+ if (!iommu->xtsup) { + irq->dest = irte.lo.fields_remap.destination & 0xff; + } else { + irq->dest = irte.lo.fields_remap.destination | + (irte.hi.fields.destination_hi << 24); + }Weird way to put it. Why not if (
iommu->xtsup) ... ?Okay, I'll fix this in next version.
Quoted 81 lines
Quoted 81 lines
hw/i386/amd_iommu.c +11
-1return 0; }@@ -1503,10 +1509,15 @@ static void amdvi_init(AMDVIState *s) s->enabled = false; s->ats_enabled = false; s->cmdbuf_enabled = false; + s->efr_reg = AMDVI_DEFAULT_EXT_FEATURES; + + if (s->xtsup) { + s->efr_reg |= AMDVI_FEATURE_XT; + } /* reset MMIO */ memset(s->mmior, 0, AMDVI_MMIO_SIZE); - amdvi_set_quad(s, AMDVI_MMIO_EXT_FEATURES, AMDVI_EXT_FEATURES, + amdvi_set_quad(s, AMDVI_MMIO_EXT_FEATURES, s->efr_reg, 0xffffffffffffffef, 0); amdvi_set_quad(s, AMDVI_MMIO_STATUS, 0, 0x98, 0x67);@@ -1586,6 +1597,11 @@ static void amdvi_sysbus_realize(DeviceState *dev, Error **errp) amdvi_init(s); } +static Property amdvi_properties[] = { + DEFINE_PROP_BOOL("xtsup", AMDVIState, xtsup, false), + DEFINE_PROP_END_OF_LIST(), +}; + static const VMStateDescription vmstate_amdvi_sysbus = { .name = "amd-iommu",.unmigratable = 1
hw/i386/amd_iommu.c +1
-0@@ -1612,6 +1628,7 @@ static void amdvi_sysbus_class_init(ObjectClass *klass, void *data) dc->user_creatable = true; set_bit(DEVICE_CATEGORY_MISC, dc->categories); dc->desc = "AMD IOMMU (AMD-Vi) DMA Remapping device"; + device_class_set_props(dc, amdvi_properties); } static const TypeInfo amdvi_sysbus = {hw/i386/amd_iommu.h +1
-0@@ -154,6 +154,7 @@ #define AMDVI_FEATURE_PREFETCH (1ULL << 0) /* page prefetch */ #define AMDVI_FEATURE_PPR (1ULL << 1) /* PPR Support */ +#define AMDVI_FEATURE_XT (1ULL << 2)/* x2APIC Support */
#define AMDVI_FEATURE_GT (1ULL << 4) /* Guest Translation */ #define AMDVI_FEATURE_IA (1ULL << 6) /* inval all support */ #define AMDVI_FEATURE_GA (1ULL << 7) /* guest VAPIC support */hw/i386/amd_iommu.h +7
-5@@ -173,8 +174,9 @@ #define AMDVI_IOTLB_MAX_SIZE 1024 #define AMDVI_DEVID_SHIFT 36 -/* extended feature support */ -#define AMDVI_EXT_FEATURES (AMDVI_FEATURE_PREFETCH | AMDVI_FEATURE_PPR | \ +/* default extended feature */ +#define AMDVI_DEFAULT_EXT_FEATURES \ + (AMDVI_FEATURE_PREFETCH | AMDVI_FEATURE_PPR | \ AMDVI_FEATURE_IA | AMDVI_FEATURE_GT | AMDVI_FEATURE_HE | \ AMDVI_GATS_MODE | AMDVI_HATS_MODE | AMDVI_FEATURE_GA)@@ -278,8 +280,8 @@ union irte_ga_lo { dm:1, /* ------ */ guest_mode:1, - destination:8, - rsvd_1:48; + destination:24, + rsvd_1:32; } fields_remap; };@@ -287,7 +289,8 @@ union irte_ga_hi { uint64_t val; struct { uint64_t vector:8, - rsvd_2:56; + rsvd_2:48, + destination_hi:8; } fields; };@@ -367,6 +370,9 @@ struct AMDVIState { /* Interrupt remapping */
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
hw/i386/amd_iommu.h +3
-0bool ga_enabled; + bool xtsup; + + uint64_t efr_reg; /* extended feature register */ }; #endifSignature · 1 line
2.25.1
I have posted version 4 to export both IVHD types and flip the iommu->xtsup for readability.
I have tested with old Linux before this commit 8c7142f56fedfc6824b5bca56fee1f443e01746b (iommu/amd: Use the most comprehensive IVHD type that the driver can support) (Linux 4.6-rc2) that does not support IVHD type 0x11, it can still detect AMD IOMMU device via IVHD 0x10 but cannot detect x2APIC support. With newer Linux, it successfully detects x2APIC support.
With Windows, I don't have much experience, I have tried to get the driver for reverse engineer but looks like the driver can be installed via the installer only. And I don't have the device so installer aborts the driver installation.
Thanks,
Quang Minh.
Quoted 4 lines · Bui Quang Minh
[Reposting due to broken threading in previous post]
Hi everyone,
Quoted 8 lines
This series implements x2APIC mode in userspace local APIC and the RDMSR/WRMSR helper to access x2APIC registers in x2APIC mode. Intel iommu and AMD iommu are adjusted to support x2APIC interrupt remapping. With this series, we can now boot Linux kernel into x2APIC mode with TCG accelerator using either Intel or AMD iommu.
Testing the emulated userspace APIC with kvm-unit-tests, disable test device with this patch
Series:
any acks from tcg maintainers?
Quoted 92 lines
lib/x86/fwcfg.c +1
-0@@ -27,6 +27,7 @@ static void read_cfg_override(void)if ((str =getenv ("TEST_DEVICE" ))) no_test_device = !atol (str); + no_test_device = true;if ((str =getenv ("MEMLIMIT" ))) fw_override[FW_CFG_MAX_RAM ] =atol (str) *1024 *1024 ;~ env QEMU=/home/minh/Desktop/oss/qemu/build/qemu-system-x86_64 ACCEL=tcg \
./run_tests.sh -v -g apicTESTNAME=apic-split TIMEOUT=90s ACCEL=tcg ./x86/run x86/apic.flat -smp 2 -cpu qemu64,+x2apic,+tsc-deadline -machine kernel_irqchip=split FAIL apic-split (54 tests, 8 unexpected failures, 1 skipped) TESTNAME=ioapic-split TIMEOUT=90s ACCEL=tcg ./x86/run x86/ioapic.flat -smp 1 -cpu qemu64 -machine kernel_irqchip=split PASS ioapic-split (19 tests) TESTNAME=x2apic TIMEOUT=30 ACCEL=tcg ./x86/run x86/apic.flat -smp 2 -cpu qemu64,+x2apic,+tsc-deadline FAIL x2apic (54 tests, 8 unexpected failures, 1 skipped) TESTNAME=xapic TIMEOUT=60 ACCEL=tcg ./x86/run x86/apic.flat -smp 2 -cpu qemu64,-x2apic,+tsc-deadline -machine pit=off FAIL xapic (43 tests, 6 unexpected failures, 2 skipped)
FAIL:
apic_disable: *0xfee00030: 50014
FAIL:apic_disable: *0xfee00080: f0
FAIL:apic_disable: *0xfee00030: 50014
FAIL:apic_disable: *0xfee00080: f0
FAIL: apicbase: relocate apicThese errors are because we don't disable MMIO region when switching to x2APIC and don't support relocate MMIO region yet. This is a problem because, MMIO region is the same for all CPUs, in order to support these we need to figure out how to allocate and manage different MMIO regions for each CPUs. This can be an improvement in the future.
FAIL: nmi-after-sti
FAIL: multiple nmiThese errors are in the way we handle
CPU_INTERRUPT_NMIin core TCG.FAIL: TMCCT should stay at zero
This error is related to APIC timer which should be addressed in separate patch.
Version 3 changes,
- Patch 2:
+ Allow APIC ID > 255 only when x2APIC feature is supported on CPU
+ Make physical destination mode IPI which has destination id0xffffffffa broadcast to xAPIC CPUs
+ Make cluster address0xfin cluster model of xAPIC logical destination mode a broadcast to all clusters
+ Create newextended_log_destto storeAPIC_LDRinformation in x2APIC instead of extendinglog_destfor backward compatibility in vmstateVersion 2 changes,
- Add support for APIC ID larger than 255
- Adjust AMD iommu for x2APIC suuport
- Reorganize and split patch 1,2 into patch 1,2,3 in version 2Thanks,
Quang Minh.Bui Quang Minh (5):
i386/tcg: implement x2APIC registers MSR access
apic: add support for x2APIC mode
apic, i386/tcg: add x2apic transitions
intel_iommu: allow Extended Interrupt Mode when using userspace APIC
amd_iommu: report x2APIC support to the operating systemhw/i386/acpi-build.c | 28 +- hw/i386/amd_iommu.c | 21 +- hw/i386/amd_iommu.h | 16 +- hw/i386/intel_iommu.c | 11 - hw/i386/x86.c | 8 +- hw/intc/apic.c | 395 +++++++++++++++++++++------ hw/intc/apic_common.c | 16 +- hw/intc/trace-events | 4 +- include/hw/i386/apic.h | 6 +- include/hw/i386/apic_internal.h | 7 +- target/i386/cpu-sysemu.c | 18 +- target/i386/cpu.c | 5 +- target/i386/cpu.h | 9 + target/i386/tcg/sysemu/misc_helper.c | 31 +++ 14 files changed, 436 insertions(+), 139 deletions(-)Signature · 1 line
2.25.1
Quoted 15 lines · Michael S. Tsirkin
Quoted 4 lines · Bui Quang Minh
[Reposting due to broken threading in previous post]
Hi everyone,
Quoted 8 lines
This series implements x2APIC mode in userspace local APIC and the RDMSR/WRMSR helper to access x2APIC registers in x2APIC mode. Intel iommu and AMD iommu are adjusted to support x2APIC interrupt remapping. With this series, we can now boot Linux kernel into x2APIC mode with TCG accelerator using either Intel or AMD iommu.
Testing the emulated userspace APIC with kvm-unit-tests, disable test device with this patch
Quoted 5 lines
Series:
Reviewed-by Michael S. Tsirkin <[email protected]>any acks from tcg maintainers?
Thank you for your review. There is no ack from tcg maintainers yet. Quang Minh.
Quoted 87 lines · Bui Quang Minh
[Reposting due to broken threading in previous post]
Hi everyone,
This series implements x2APIC mode in userspace local APIC and the RDMSR/WRMSR helper to access x2APIC registers in x2APIC mode. Intel iommu and AMD iommu are adjusted to support x2APIC interrupt remapping. With this series, we can now boot Linux kernel into x2APIC mode with TCG accelerator using either Intel or AMD iommu.
Testing the emulated userspace APIC with kvm-unit-tests, disable test device with this patch
lib/x86/fwcfg.c +1
-0@@ -27,6 +27,7 @@ static void read_cfg_override(void)if ((str =getenv ("TEST_DEVICE" ))) no_test_device = !atol (str); + no_test_device = true;if ((str =getenv ("MEMLIMIT" ))) fw_override[FW_CFG_MAX_RAM ] =atol (str) *1024 *1024 ;~ env QEMU=/home/minh/Desktop/oss/qemu/build/qemu-system-x86_64 ACCEL=tcg \
./run_tests.sh -v -g apicTESTNAME=apic-split TIMEOUT=90s ACCEL=tcg ./x86/run x86/apic.flat -smp 2 -cpu qemu64,+x2apic,+tsc-deadline -machine kernel_irqchip=split FAIL apic-split (54 tests, 8 unexpected failures, 1 skipped) TESTNAME=ioapic-split TIMEOUT=90s ACCEL=tcg ./x86/run x86/ioapic.flat -smp 1 -cpu qemu64 -machine kernel_irqchip=split PASS ioapic-split (19 tests) TESTNAME=x2apic TIMEOUT=30 ACCEL=tcg ./x86/run x86/apic.flat -smp 2 -cpu qemu64,+x2apic,+tsc-deadline FAIL x2apic (54 tests, 8 unexpected failures, 1 skipped) TESTNAME=xapic TIMEOUT=60 ACCEL=tcg ./x86/run x86/apic.flat -smp 2 -cpu qemu64,-x2apic,+tsc-deadline -machine pit=off FAIL xapic (43 tests, 6 unexpected failures, 2 skipped)
FAIL: apic_disable: *0xfee00030: 50014 FAIL: apic_disable: *0xfee00080: f0 FAIL: apic_disable: *0xfee00030: 50014 FAIL: apic_disable: *0xfee00080: f0 FAIL: apicbase: relocate apicThese errors are because we don't disable MMIO region when switching to x2APIC and don't support relocate MMIO region yet. This is a problem because, MMIO region is the same for all CPUs, in order to support these we need to figure out how to allocate and manage different MMIO regions for each CPUs. This can be an improvement in the future.
FAIL: nmi-after-sti
FAIL: multiple nmiThese errors are in the way we handle
CPU_INTERRUPT_NMIin core TCG.FAIL: TMCCT should stay at zero
This error is related to APIC timer which should be addressed in separate patch.
Version 3 changes,
- Patch 2:
+ Allow APIC ID > 255 only when x2APIC feature is supported on CPU
+ Make physical destination mode IPI which has destination id0xffffffffa broadcast to xAPIC CPUs
+ Make cluster address0xfin cluster model of xAPIC logical destination mode a broadcast to all clusters
+ Create newextended_log_destto storeAPIC_LDRinformation in x2APIC instead of extendinglog_destfor backward compatibility in vmstateVersion 2 changes,
- Add support for APIC ID larger than 255
- Adjust AMD iommu for x2APIC suuport
- Reorganize and split patch 1,2 into patch 1,2,3 in version 2Thanks,
Quang Minh.Bui Quang Minh (5):
i386/tcg: implement x2APIC registers MSR access
apic: add support for x2APIC mode
apic, i386/tcg: add x2apic transitions
intel_iommu: allow Extended Interrupt Mode when using userspace APIC
amd_iommu: report x2APIC support to the operating system
Quoted 15 lines
hw/i386/acpi-build.c | 28 +- hw/i386/amd_iommu.c | 21 +- hw/i386/amd_iommu.h | 16 +- hw/i386/intel_iommu.c | 11 - hw/i386/x86.c | 8 +- hw/intc/apic.c | 395 +++++++++++++++++++++------ hw/intc/apic_common.c | 16 +- hw/intc/trace-events | 4 +- include/hw/i386/apic.h | 6 +- include/hw/i386/apic_internal.h | 7 +- target/i386/cpu-sysemu.c | 18 +- target/i386/cpu.c | 5 +- target/i386/cpu.h | 9 + target/i386/tcg/sysemu/misc_helper.c | 31 +++ 14 files changed, 436 insertions(+), 139 deletions(-)
Hello everyone, I just want to politely ping here. Could you spend some time to review the series?
Thank you very much,
Quang Minh.