pc: cpu: Consolidate apic-id validity checks in pc_cpu_pre_plug()
Machine code knows about all possible APIC IDs so use that instead of hack which does O(n^2) complexity duplicate checks, interating over global CPUs list. As result duplicate check is done only once with O(log n) complexity. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
7baef5cfea
commit
4ec60c76d5
43
hw/i386/pc.c
43
hw/i386/pc.c
|
@ -1122,18 +1122,6 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cpu_exists(apic_id)) {
|
|
||||||
error_setg(errp, "Unable to add CPU: %" PRIi64
|
|
||||||
", it already exists", id);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (id >= max_cpus) {
|
|
||||||
error_setg(errp, "Unable to add CPU: %" PRIi64
|
|
||||||
", max allowed: %d", id, max_cpus - 1);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (apic_id >= ACPI_CPU_HOTPLUG_ID_LIMIT) {
|
if (apic_id >= ACPI_CPU_HOTPLUG_ID_LIMIT) {
|
||||||
error_setg(errp, "Unable to add CPU: %" PRIi64
|
error_setg(errp, "Unable to add CPU: %" PRIi64
|
||||||
", resulting APIC ID (%" PRIi64 ") is too large",
|
", resulting APIC ID (%" PRIi64 ") is too large",
|
||||||
|
@ -1852,6 +1840,36 @@ static void pc_cpu_unplug_cb(HotplugHandler *hotplug_dev,
|
||||||
error_propagate(errp, local_err);
|
error_propagate(errp, local_err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
|
||||||
|
DeviceState *dev, Error **errp)
|
||||||
|
{
|
||||||
|
int idx;
|
||||||
|
X86CPU *cpu = X86_CPU(dev);
|
||||||
|
PCMachineState *pcms = PC_MACHINE(hotplug_dev);
|
||||||
|
CPUArchId *cpu_slot = pc_find_cpu_slot(pcms, CPU(dev), &idx);
|
||||||
|
|
||||||
|
if (!cpu_slot) {
|
||||||
|
error_setg(errp, "Invalid CPU index with APIC ID (%" PRIu32
|
||||||
|
"), valid range 0:%d", cpu->apic_id,
|
||||||
|
pcms->possible_cpus->len - 1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cpu_slot->cpu) {
|
||||||
|
error_setg(errp, "CPU[%d] with APIC ID %" PRIu32 " exists",
|
||||||
|
idx, cpu->apic_id);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void pc_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev,
|
||||||
|
DeviceState *dev, Error **errp)
|
||||||
|
{
|
||||||
|
if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
|
||||||
|
pc_cpu_pre_plug(hotplug_dev, dev, errp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
|
static void pc_machine_device_plug_cb(HotplugHandler *hotplug_dev,
|
||||||
DeviceState *dev, Error **errp)
|
DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
|
@ -2149,6 +2167,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
|
||||||
mc->hot_add_cpu = pc_hot_add_cpu;
|
mc->hot_add_cpu = pc_hot_add_cpu;
|
||||||
mc->max_cpus = 255;
|
mc->max_cpus = 255;
|
||||||
mc->reset = pc_machine_reset;
|
mc->reset = pc_machine_reset;
|
||||||
|
hc->pre_plug = pc_machine_device_pre_plug_cb;
|
||||||
hc->plug = pc_machine_device_plug_cb;
|
hc->plug = pc_machine_device_plug_cb;
|
||||||
hc->unplug_request = pc_machine_device_unplug_request_cb;
|
hc->unplug_request = pc_machine_device_unplug_request_cb;
|
||||||
hc->unplug = pc_machine_device_unplug_cb;
|
hc->unplug = pc_machine_device_unplug_cb;
|
||||||
|
|
|
@ -1907,8 +1907,6 @@ static void x86_cpuid_set_apic_id(Object *obj, Visitor *v, const char *name,
|
||||||
{
|
{
|
||||||
X86CPU *cpu = X86_CPU(obj);
|
X86CPU *cpu = X86_CPU(obj);
|
||||||
DeviceState *dev = DEVICE(obj);
|
DeviceState *dev = DEVICE(obj);
|
||||||
const int64_t min = 0;
|
|
||||||
const int64_t max = UINT32_MAX;
|
|
||||||
Error *error = NULL;
|
Error *error = NULL;
|
||||||
int64_t value;
|
int64_t value;
|
||||||
|
|
||||||
|
@ -1923,17 +1921,6 @@ static void x86_cpuid_set_apic_id(Object *obj, Visitor *v, const char *name,
|
||||||
error_propagate(errp, error);
|
error_propagate(errp, error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (value < min || value > max) {
|
|
||||||
error_setg(errp, "Property %s.%s doesn't take value %" PRId64
|
|
||||||
" (minimum: %" PRId64 ", maximum: %" PRId64 ")" ,
|
|
||||||
object_get_typename(obj), name, value, min, max);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((value != cpu->apic_id) && cpu_exists(value)) {
|
|
||||||
error_setg(errp, "CPU with APIC ID %" PRIi64 " exists", value);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
cpu->apic_id = value;
|
cpu->apic_id = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue