On Wed, 6 Nov 2024 14:45:42 +0000 Salil Mehta <salil.me...@huawei.com> wrote:
> Hi Igor, > > > From: qemu-arm-bounces+salil.mehta=huawei....@nongnu.org <qemu- > > arm-bounces+salil.mehta=huawei....@nongnu.org> On Behalf Of Igor > > Mammedov > > Sent: Wednesday, November 6, 2024 1:57 PM > > To: Salil Mehta <salil.me...@huawei.com> > > > > On Wed, 6 Nov 2024 13:03:30 +0000 > > Salil Mehta <salil.me...@huawei.com> wrote: > > > > > Checking `is_present` first can break x86 migration from new Qemu > > > version to old Qemu. This is because CPRS Bit is not defined in the > > > older Qemu register block and will always be 0 resulting in check > > > always failing. Reversing the logic to first check `is_enabled` can > > > alleviate below problem: > > > > > > - If ((\_SB.PCI0.PRES.CPEN == One)) > > > - { > > > - Local0 = 0x0F > > > + If ((\_SB.PCI0.PRES.CPRS == One)) > > > + { > > > + If ((\_SB.PCI0.PRES.CPEN == One)) > > > + { > > > + Local0 = 0x0F > > > + } > > > + Else > > > + { > > > + Local0 = 0x0D > > > + } > > > } > > > > > > Suggested-by: Igor Mammedov <imamm...@redhat.com> > > 'Reported-by' maybe, but certainly not suggested. > > > No issues. I can change. > > > > > > After more thinking and given presence is system wide that doesn't change > > at runtime, I don't see any reason for introducing presence bit as ABI (and > > undocumented on top of that). > > > This is a wrong assumption. Presence bit can change in future. We have taken > into account this aspect by design in the kernel code as well. Both virtual Above does imply that support for really hotpluggable CPUs might be implemented in the future. Can you point to relevant kernel code/patches? > and physical CPU hot plug can co-exists or entirely as sole features. This is > a requirement. I don't see any _must_ requirements here whatsoever. If/when ARM reaches point where standby and hotplug cpus are mixed within VM instance, we might have to expose presence bit to guest dynamically but it is totally not needed within observable future and premature. Your cpu class presence check also works target-wise just with more boiler code + not needed presence bit ABI for guest side, The same as my suggestion only from other side. But regardless of that as long as machine has doesn't mix always present CPUs with hotpluggable ones within the same instance, changing AML side as I've just suggested works. If ARM ever gets real cpu hotplug as your comment above hints, my suggestion also works fine. With only difference that board code would turn off always_present_cpus if hotpluggable CPUs are used instead of standby. > > > > > Instead changing AML code to account for it would be better, something like > > this: > > > > diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h index > > 32654dc274..4a3e591120 100644 > > --- a/include/hw/acpi/cpu.h > > +++ b/include/hw/acpi/cpu.h > > @@ -55,6 +55,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object > > *owner, typedef struct CPUHotplugFeatures { > > bool acpi_1_compatible; > > bool has_legacy_cphp; > > + bool always_present_cpus; > > > This has to be fetched from architecture code. Please see other changes in > the V3 > patch-set. I've seen, that and it doesn't have to be fetched dynamically. In my opinion the series was not ready to be merged (Michael probably picked it by mistake). We don't really need this in 9.2 as it is only ARM cpu 'hotplug' related, and the later is not ready for 9.2. I'd prefer the series being reverted and we continue improving series, instead of rushing it and fixing broken thing up. > > > > bool fw_unplugs_cpu; > > const char *smi_path; > > } CPUHotplugFeatures; > > diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index 5cb60ca8bc..2bcce2b31c > > 100644 > > --- a/hw/acpi/cpu.c > > +++ b/hw/acpi/cpu.c > > @@ -452,15 +452,16 @@ void build_cpus_aml(Aml *table, MachineState > > *machine, CPUHotplugFeatures opts, > > > > method = aml_method(CPU_STS_METHOD, 1, AML_SERIALIZED); > > { > > + uint8_t default_sta = opts.always_present_cpus?0xd:0; > > Aml *idx = aml_arg(0); > > - Aml *sta = aml_local(0); > > + Aml *sta = aml_local(default_sta); > > > > aml_append(method, aml_acquire(ctrl_lock, 0xFFFF)); > > aml_append(method, aml_store(idx, cpu_selector)); > > aml_append(method, aml_store(zero, sta)); > > ifctx = aml_if(aml_equal(is_enabled, one)); > > { > > - aml_append(ifctx, aml_store(aml_int(0xF), sta)); > > + aml_append(ifctx, aml_or(aml_int(0xF), sta, sta)); > > } > > aml_append(method, ifctx); > > aml_append(method, aml_release(ctrl_lock)) > > > > then for ARM set > > CPUHotplugFeatures::always_present_cpus = true to get present flag > > always enabled > > > We MUST fetch this from architecture code as this can dynamically change in > future and hence, we need to keep that flexibility CPUHotplugFeatures::always_present_cpus can be set dynamically per VM instance or per Machine type. > > > > After that revert _all_ other presence bit related changes that were just > > merged. > > (I did ask to get rid of that in previous reviews but it came back again > > for no > > good reason). > > > The CPUs AML in the V2 patch-set would have broken the x86 functionality. Frankly speaking, I don't see much progress. All that happens on respins is flipping between what I asked to remove before to some earlier concept. And all of that for the purpose to workaround/accommodate fake cpu hotplug hacks. > Thanks > Salil. >