remove icc bus/bridge
v8 cover remove icc bus/bridge
ICC Bus was used for providing a hotpluggable bus for APIC and CPU, but now we use HotplugHandler to make hotplug. So ICC Bus is unnecessary.
This code has passed the new pc-cpu-test.
And I have tested with kvm along with kernel_irqchip=on/off, it works fine.
This patch series is based on Eduardo's x86 tree.
https://github.com/ehabkost/qemu.git
v8:
-add a wrapper to specify reset order
v7:
-update to register reset handler for main_system_bus when created -register reset handler for apic after all devices are initialized
v6:
-reword commit message
-drop NULL check for APIC device
-use C cast instead of QOM cast
v5:
-convert DEVICE() casts to C casts
-use a local variable instead of doing the cast inline twice -drop to set cpu's parent bus
-rename patch 3's subject
-fix a bug about setting cpu's apic base
v4:
-add wrapper to get root memory region from address space -set cpu apic base's default value in x86_cpu_apic_create() -drop NULL check for cpu apic_state
-put drop of the unused files about icc_bus into a seprate patch -put DEVICE() casts into a seprate patch
v3:
-replace init apic by object_new()
-add reset apic at the time of CPU reset
Chen Fan (2):
apic: map APIC's MMIO region at each CPU's address space cpu/apic: drop icc bus/bridge
Zhu Guihua (2):
hw: add a wrapper for registering reset handler
icc_bus: drop the unused files
default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - exec.c | 5 ++ hw/cpu/Makefile.objs | 1 - hw/cpu/icc_bus.c | 118 ------------------------------------- hw/i386/pc.c | 31 +++------- hw/i386/pc_piix.c | 9 +-- hw/i386/pc_q35.c | 9 +-- hw/intc/apic_common.c | 19 +++--- include/exec/memory.h | 5 ++ include/hw/cpu/icc_bus.h | 82 -------------------------- include/hw/hw.h | 4 ++ include/hw/i386/apic_internal.h | 7 ++- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 25 +++++--- target-i386/cpu.h | 4 ++ vl.c | 18 +++++- 17 files changed, 78 insertions(+), 263 deletions(-) delete mode 100644 hw/cpu/icc_bus.c delete mode 100644 include/hw/cpu/icc_bus.h
Signature · 1 line
1.9.3
PATCH v8 1/4 apic: map APIC's MMIO region at each CPU's address space
From: Chen Fan <[email protected]>
Replace mapping APIC at global system address space with mapping it at per-CPU address spaces.
--- exec.c | 5 +++++ hw/i386/pc.c | 7 ------- hw/intc/apic_common.c | 14 ++++++++------ include/exec/memory.h | 5 +++++ target-i386/cpu.c | 2 ++ 5 files changed, 20 insertions(+), 13 deletions(-)
exec.c +5 -0
@@ -2712,6 +2712,11 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len,cpu_notify_map_clients (); } +MemoryRegion *address_space_root_memory_region (AddressSpace *as) +{ +return as->root; +} +void *cpu_physical_memory_map (hwaddr addr,hwaddr *plen,int is_write)
hw/i386/pc.c +0 -7
@@ -1097,13 +1097,6 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge)object_unref (OBJECT (cpu)); } -/* map APIC MMIO area if CPU has APIC */ -if (cpu && cpu->apic_state) { -/* XXX: what if the base changes? */ -sysbus_mmio_map_overlap (SYS_BUS_DEVICE (icc_bridge),0 , -APIC_DEFAULT_ADDRESS ,0x1000 ); - } -/* tell smbios about cpuid version and features */ smbios_set_cpuid (cpu->env.cpuid_version, cpu->env.features[FEAT_1_EDX ]); }
hw/intc/apic_common.c +8 -6
@@ -296,7 +296,8 @@ static void apic_common_realize(DeviceState *dev, Error **errp)APICCommonClass *info;static DeviceState *vapic;static int apic_no; -static bool mmio_registered; +CPUState *cpu =CPU (s->cpu); +MemoryRegion *root;if (apic_no >=MAX_APICS ) { error_setg(errp, "%s initialization failed.",
@@ -307,11 +308,12 @@ static void apic_common_realize(DeviceState *dev, Error **errp) info =APIC_COMMON_GET_CLASS (s); info->realize (dev, errp); -if (!mmio_registered) { -ICCBus *b =ICC_BUS (qdev_get_parent_bus (dev)); -memory_region_add_subregion (b->apic_address_space,0 , &s->io_memory); - mmio_registered = true; - } + + root =address_space_root_memory_region (cpu->as); +memory_region_add_subregion_overlap (root, + s->apicbase &MSR_IA32_APICBASE_BASE , + &s->io_memory, +0x1000 );/* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK &&
include/exec/memory.h +5 -0
@@ -1295,6 +1295,11 @@ void *address_space_map(AddressSpace *as, hwaddr addr,void address_space_unmap (AddressSpace *as,void *buffer,hwaddr len,int is_write,hwaddr access_len); +/* address_space_root_memory_region: get root memory region +* +* @as: #AddressSpace to be accessed +*/ +MemoryRegion *address_space_root_memory_region (AddressSpace *as);#endif
target-i386/cpu.c +2 -0
@@ -2740,6 +2740,8 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp)/* TODO: convert to link<> */ apic =APIC_COMMON (cpu->apic_state); apic->cpu = cpu; +cpu_set_apic_base (cpu->apic_state, +APIC_DEFAULT_ADDRESS |MSR_IA32_APICBASE_ENABLE ); }static void x86_cpu_apic_realize (X86CPU *cpu,Error **errp)
Signature · 1 line
1.9.3
PATCH v8 2/4 hw: add a wrapper for registering reset handler
In reply to Zhu GuihuaAdd a wrapper to specify reset order when registering reset handler, instead of non-obvious initiazation code ordering.
--- include/hw/hw.h | 4 ++++ vl.c | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-)
include/hw/hw.h +4 -0
@@ -37,7 +37,11 @@#endif typedef void QEMUResetHandler (void *opaque); +typedef uint64_t QEMUResetOrder ; +#define default_reset_order 0x0 +void qemu_register_reset_common (QEMUResetHandler *func,void *opaque, +QEMUResetOrder reset_order);void qemu_register_reset (QEMUResetHandler *func,void *opaque);void qemu_unregister_reset (QEMUResetHandler *func,void *opaque);
vl.c +17 -1
@@ -1492,6 +1492,7 @@ typedef struct QEMUResetEntry {QTAILQ_ENTRY (QEMUResetEntry) entry;QEMUResetHandler *func;void *opaque; +QEMUResetOrder reset_order; } QEMUResetEntry; static QTAILQ_HEAD(reset_handlers, QEMUResetEntry) reset_handlers =
@@ -1575,15 +1576,30 @@ static int qemu_debug_requested(void)return r; } -void qemu_register_reset (QEMUResetHandler *func,void *opaque) +void qemu_register_reset_common (QEMUResetHandler *func,void *opaque, +QEMUResetOrder reset_order) { +QEMUResetEntry *item;QEMUResetEntry *re =g_malloc0 (sizeof (QEMUResetEntry)); re->func = func; re->opaque = opaque; + re->reset_order = reset_order; + + QTAILQ_FOREACH(item, &reset_handlers, entry) { +if (re->reset_order >= item->reset_order) +continue ; +QTAILQ_INSERT_BEFORE (item, re, entry); +return ; + }QTAILQ_INSERT_TAIL (&reset_handlers, re, entry); } +void qemu_register_reset (QEMUResetHandler *func,void *opaque) +{ +qemu_register_reset_common (func, opaque, default_reset_order); +} +void qemu_unregister_reset (QEMUResetHandler *func,void *opaque) {QEMUResetEntry *re;
Signature · 1 line
1.9.3
PATCH v8 3/4 cpu/apic: drop icc bus/bridge
In reply to Zhu GuihuaFrom: Chen Fan <[email protected]>
After CPU hotplug has been converted to BUS-less hot-plug infrastructure, the only function ICC bus performs is to propagate reset to LAPICs. However LAPIC could be reset by registering its reset handler after all device are initialized.
Do so and drop ~200LOC of not needed anymore ICCBus related code.
--- hw/i386/pc.c | 24 +++++++++--------------- hw/i386/pc_piix.c | 9 +-------- hw/i386/pc_q35.c | 9 +-------- hw/intc/apic_common.c | 5 ++--- include/hw/i386/apic_internal.h | 7 ++++--- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 23 +++++++++++++++-------- target-i386/cpu.h | 4 ++++ 8 files changed, 37 insertions(+), 46 deletions(-)
hw/i386/pc.c +9 -15
@@ -59,7 +59,6 @@#include "qemu/config-file.h" #include "hw/acpi/acpi.h" #include "hw/acpi/cpu_hotplug.h" -#include "hw/cpu/icc_bus.h" #include "hw/boards.h" #include "hw/pci/pci_host.h" #include "acpi-build.h"
@@ -990,27 +989,25 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) } } +#define x86_cpu_apic_reset_order 0x1 +static X86CPU *pc_new_cpu (const char *cpu_model,int64_t apic_id, -DeviceState *icc_bridge,Error **errp) +Error **errp) {X86CPU *cpu =NULL ;Error *local_err =NULL ; -if (icc_bridge ==NULL ) { -error_setg (&local_err,"Invalid icc-bridge value" ); - goto out; - } - cpu =cpu_x86_create (cpu_model, &local_err);if (local_err !=NULL ) { goto out; } -qdev_set_parent_bus (DEVICE (cpu),qdev_get_child_bus (icc_bridge,"icc" )); -object_property_set_int (OBJECT (cpu), apic_id,"apic-id" , &local_err);object_property_set_bool (OBJECT (cpu), true,"realized" , &local_err); +qemu_register_reset_common (x86_cpu_apic_reset, cpu, + x86_cpu_apic_reset_order); + out:if (local_err) {error_propagate (errp, local_err);
@@ -1024,7 +1021,6 @@ static const char *current_cpu_model;void pc_hot_add_cpu (const int64_t id,Error **errp) { -DeviceState *icc_bridge;X86CPU *cpu;int64_t apic_id =x86_cpu_apic_id_from_index (id);Error *local_err =NULL ;
@@ -1053,9 +1049,7 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)return ; } - icc_bridge =DEVICE (object_resolve_path_type ("icc-bridge" , -TYPE_ICC_BRIDGE ,NULL )); - cpu =pc_new_cpu (current_cpu_model, apic_id, icc_bridge, &local_err); + cpu =pc_new_cpu (current_cpu_model, apic_id, &local_err);if (local_err) {error_propagate (errp, local_err);return ;
@@ -1063,7 +1057,7 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)object_unref (OBJECT (cpu)); } -void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) +void pc_cpus_init (const char *cpu_model) {int i;X86CPU *cpu =NULL ;
@@ -1089,7 +1083,7 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge)for (i =0 ; i < smp_cpus; i++) { cpu =pc_new_cpu (cpu_model,x86_cpu_apic_id_from_index (i), - icc_bridge, &error); + &error);if (error) {error_report_err (error);exit (1 );
hw/i386/pc_piix.c +1 -8
@@ -39,7 +39,6 @@#include "hw/kvm/clock.h" #include "sysemu/sysemu.h" #include "hw/sysbus.h" -#include "hw/cpu/icc_bus.h" #include "sysemu/arch_init.h" #include "sysemu/block-backend.h" #include "hw/i2c/smbus.h"
@@ -97,7 +96,6 @@ static void pc_init1(MachineState *machine)MemoryRegion *ram_memory;MemoryRegion *pci_memory;MemoryRegion *rom_memory; -DeviceState *icc_bridge;PcGuestInfo *guest_info;ram_addr_t lowmem;
@@ -141,11 +139,7 @@ static void pc_init1(MachineState *machine)exit (1 ); } - icc_bridge =qdev_create (NULL ,TYPE_ICC_BRIDGE ); -object_property_add_child (qdev_get_machine (),"icc-bridge" , -OBJECT (icc_bridge),NULL ); - -pc_cpus_init (machine->cpu_model, icc_bridge); +pc_cpus_init (machine->cpu_model);if (kvm_enabled () && kvmclock_enabled) {kvmclock_create ();
@@ -228,7 +222,6 @@ static void pc_init1(MachineState *machine)if (pci_enabled) {ioapic_init_gsi (gsi_state,"i440fx" ); } -qdev_init_nofail (icc_bridge);pc_register_ferr_irq (gsi[13 ]);
hw/i386/pc_q35.c +1 -8
@@ -43,7 +43,6 @@#include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/usb.h" -#include "hw/cpu/icc_bus.h" #include "qemu/error-report.h" /* ICH9 AHCI has 6 ports */
@@ -84,7 +83,6 @@ static void pc_q35_init(MachineState *machine)int i;ICH9LPCState *ich9_lpc;PCIDevice *ahci; -DeviceState *icc_bridge;PcGuestInfo *guest_info;ram_addr_t lowmem;DriveInfo *hd[MAX_SATA_PORTS ];
@@ -132,11 +130,7 @@ static void pc_q35_init(MachineState *machine)exit (1 ); } - icc_bridge =qdev_create (NULL ,TYPE_ICC_BRIDGE ); -object_property_add_child (qdev_get_machine (),"icc-bridge" , -OBJECT (icc_bridge),NULL ); - -pc_cpus_init (machine->cpu_model, icc_bridge); +pc_cpus_init (machine->cpu_model);pc_acpi_init ("q35-acpi-dsdt.aml" );kvmclock_create ();
@@ -238,7 +232,6 @@ static void pc_q35_init(MachineState *machine)if (pci_enabled) {ioapic_init_gsi (gsi_state,"q35" ); } -qdev_init_nofail (icc_bridge);pc_register_ferr_irq (gsi[13 ]);
hw/intc/apic_common.c +2 -3
@@ -429,13 +429,12 @@ static Property apic_properties_common[] = {static void apic_common_class_init (ObjectClass *klass,void *data) { -ICCDeviceClass *idc =ICC_DEVICE_CLASS (klass);DeviceClass *dc =DEVICE_CLASS (klass); dc->vmsd = &vmstate_apic_common; dc->reset = apic_reset_common; dc->props = apic_properties_common; - idc->realize = apic_common_realize; + dc->realize = apic_common_realize;/* * Reason: APIC and CPU need to be wired up by * x86_cpu_apic_create()
@@ -445,7 +444,7 @@ static void apic_common_class_init(ObjectClass *klass, void *data)static const TypeInfo apic_common_type = { .name =TYPE_APIC_COMMON , - .parent =TYPE_ICC_DEVICE , + .parent =TYPE_DEVICE , .instance_size =sizeof (APICCommonState), .class_size =sizeof (APICCommonClass), .class_init = apic_common_class_init,
include/hw/i386/apic_internal.h +4 -3
@@ -21,7 +21,6 @@#define QEMU_APIC_INTERNAL_H #include "exec/memory.h" -#include "hw/cpu/icc_bus.h" #include "qemu/timer.h" /* APIC Local Vector Table */
@@ -78,7 +77,7 @@ typedef struct APICCommonState APICCommonState; typedef struct APICCommonClass { - ICCDeviceClass parent_class; + DeviceClass parent_class; DeviceRealize realize; void (*set_base)(APICCommonState *s, uint64_t val);
@@ -93,7 +92,9 @@ typedef struct APICCommonClass } APICCommonClass;struct APICCommonState { -ICCDevice busdev; +/*< private >*/ +DeviceState parent_obj; +/*< public >*/ MemoryRegion io_memory;X86CPU *cpu;
include/hw/i386/pc.h +1 -1
@@ -161,7 +161,7 @@ extern int fd_bootchk;void pc_register_ferr_irq (qemu_irq irq);void pc_acpi_smi_interrupt (void *opaque,int irq,int level); -void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge); +void pc_cpus_init (const char *cpu_model);void pc_hot_add_cpu (const int64_t id,Error **errp);void pc_acpi_init (const char *default_dsdt);
target-i386/cpu.c +15 -8
@@ -42,7 +42,6 @@#include "sysemu/sysemu.h" #include "hw/qdev-properties.h" -#include "hw/cpu/icc_bus.h" #ifndef CONFIG_USER_ONLY #include "hw/xen/xen.h" #include "hw/i386/apic_internal.h"
@@ -2718,7 +2717,6 @@ static void mce_init(X86CPU *cpu)#ifndef CONFIG_USER_ONLY static void x86_cpu_apic_create (X86CPU *cpu,Error **errp) { -DeviceState *dev =DEVICE (cpu);APICCommonState *apic;const char *apic_type ="apic" ;
@@ -2728,11 +2726,7 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) apic_type ="xen-apic" ; } - cpu->apic_state =qdev_try_create (qdev_get_parent_bus (dev), apic_type); -if (cpu->apic_state ==NULL ) { -error_setg (errp,"APIC device '%s' could not be created" , apic_type); -return ; - } + cpu->apic_state =DEVICE (object_new (apic_type));object_property_add_child (OBJECT (cpu),"apic" ,OBJECT (cpu->apic_state),NULL );
@@ -2752,6 +2746,20 @@ static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp)object_property_set_bool (OBJECT (cpu->apic_state), true,"realized" , errp); } + +void x86_cpu_apic_reset (void *opaque) +{ +X86CPU *cpu = opaque; +DeviceClass *dc; + +if (cpu->apic_state) { + dc =DEVICE_GET_CLASS (cpu->apic_state); + +if (dc->reset !=NULL ) { + (*dc->reset)(cpu->apic_state); + } + } +}#else static void x86_cpu_apic_realize (X86CPU *cpu,Error **errp) {
@@ -3091,7 +3099,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) xcc->parent_realize = dc->realize; dc->realize = x86_cpu_realizefn; - dc->bus_type =TYPE_ICC_BUS ; dc->props = x86_cpu_properties; xcc->parent_reset = cc->reset;
target-i386/cpu.h +4 -0
@@ -1105,6 +1105,10 @@ int x86_cpu_handle_mmu_fault(CPUState *cpu, vaddr addr, int is_write, int mmu_idx);void x86_cpu_set_a20 (X86CPU *cpu,int a20_state); +#ifndef CONFIG_USER_ONLY +void x86_cpu_apic_reset (void *opaque); +#endif +static inline bool hw_local_breakpoint_enabled (unsigned long dr7,int index) {return (dr7 >> (index *2 )) &1 ;
Signature · 1 line
1.9.3
PATCH v8 4/4 icc_bus: drop the unused files
In reply to Zhu GuihuaICC bus impl has been droped, so all icc related files are not useful any more; delete them.
--- default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/cpu/Makefile.objs | 1 - hw/cpu/icc_bus.c | 118 ------------------------------------- include/hw/cpu/icc_bus.h | 82 -------------------------- 5 files changed, 203 deletions(-) delete mode 100644 hw/cpu/icc_bus.c delete mode 100644 include/hw/cpu/icc_bus.h
default-configs/i386-softmmu.mak +0 -1
@@ -42,7 +42,6 @@ CONFIG_LPC_ICH9=y CONFIG_PCI_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y -CONFIG_ICC_BUS=y CONFIG_PVPANIC=y CONFIG_MEM_HOTPLUG=y CONFIG_XIO3130=y
default-configs/x86_64-softmmu.mak +0 -1
@@ -42,7 +42,6 @@ CONFIG_LPC_ICH9=y CONFIG_PCI_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y -CONFIG_ICC_BUS=y CONFIG_PVPANIC=y CONFIG_MEM_HOTPLUG=y CONFIG_XIO3130=y
hw/cpu/Makefile.objs +0 -1
@@ -2,5 +2,4 @@ obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o obj-$(CONFIG_REALVIEW) += realview_mpcore.o obj-$(CONFIG_A9MPCORE) += a9mpcore.o obj-$(CONFIG_A15MPCORE) += a15mpcore.o -obj-$(CONFIG_ICC_BUS) += icc_bus.o
hw/cpu/icc_bus.c deleted +0 -118
118 lines not on this page · raw message
include/hw/cpu/icc_bus.h deleted +0 -82
82 lines not on this page · raw message
Signature · 1 line
1.9.3
ping...
Quoted 70 lines · Zhu Guihua
ICC Bus was used for providing a hotpluggable bus for APIC and CPU, but now we use HotplugHandler to make hotplug. So ICC Bus is unnecessary.
This code has passed the new pc-cpu-test.
And I have tested with kvm along with kernel_irqchip=on/off, it works fine.This patch series is based on Eduardo's x86 tree.
https://github.com/ehabkost/qemu.gitv8:
-add a wrapper to specify reset orderv7:
-update to register reset handler formain_system_buswhen created -register reset handler for apic after all devices are initializedv6:
-reword commit message
-drop NULL check for APIC device
-use C cast instead of QOM castv5:
-convertDEVICE()casts to C casts
-use a local variable instead of doing the cast inline twice -drop to set cpu's parent bus
-rename patch 3's subject
-fix a bug about setting cpu's apic basev4:
-add wrapper to get root memory region from address space -set cpu apic base's default value inx86_cpu_apic_create()-drop NULL check for cpuapic_state
-put drop of the unused files abouticc_businto a seprate patch -putDEVICE()casts into a seprate patchv3:
-replace init apic byobject_new()
-add reset apic at the time of CPU resetChen Fan (2):
apic: map APIC's MMIO region at each CPU's address space cpu/apic: drop icc bus/bridgeZhu Guihua (2):
hw: add a wrapper for registering reset handler
icc_bus: drop the unused filesdefault-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - exec.c | 5 ++ hw/cpu/Makefile.objs | 1 - hw/cpu/icc_bus.c | 118 ------------------------------------- hw/i386/pc.c | 31 +++------- hw/i386/pc_piix.c | 9 +-- hw/i386/pc_q35.c | 9 +-- hw/intc/apic_common.c | 19 +++--- include/exec/memory.h | 5 ++ include/hw/cpu/icc_bus.h | 82 -------------------------- include/hw/hw.h | 4 ++ include/hw/i386/apic_internal.h | 7 ++- include/hw/i386/pc.h | 2 +- target-i386/cpu.c | 25 +++++--- target-i386/cpu.h | 4 ++ vl.c | 18 +++++- 17 files changed, 78 insertions(+), 263 deletions(-)delete mode 100644
hw/cpu/icc_bus.c
delete mode 100644include/hw/cpu/icc_bus.h