On Wed, 10 Apr 2024 16:19:50 +0200
"Rafael J. Wysocki" <rafael@xxxxxxxxxx> wrote:
> On Wed, Apr 10, 2024 at 3:50 PM Jonathan Cameron
> <Jonathan.Cameron@xxxxxxxxxx> wrote:
> >
> > On Wed, 10 Apr 2024 15:28:18 +0200
> > "Rafael J. Wysocki" <rafael@xxxxxxxxxx> wrote:
> >
> > > On Wed, Apr 10, 2024 at 2:43 PM Jonathan Cameron
> > > <Jonathan.Cameron@xxxxxxxxxx> wrote:
> > > >
> > > > > >
> > > > > > > diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
> > > > > > > index 47de0f140ba6..13d052bf13f4 100644
> > > > > > > --- a/drivers/base/cpu.c
> > > > > > > +++ b/drivers/base/cpu.c
> > > > > > > @@ -553,7 +553,11 @@ static void __init cpu_dev_register_generic(void)
> > > > > > > {
> > > > > > > int i, ret;
> > > > > > >
> > > > > > > - if (!IS_ENABLED(CONFIG_GENERIC_CPU_DEVICES))
> > > > > > > + /*
> > > > > > > + * When ACPI is enabled, CPUs are registered via
> > > > > > > + * acpi_processor_get_info().
> > > > > > > + */
> > > > > > > + if (!IS_ENABLED(CONFIG_GENERIC_CPU_DEVICES) || !acpi_disabled)
> > > > > > > return;
> > > > > >
> > > > > > Honestly, this looks like a quick hack to me and it absolutely
> > > > > > requires an ACK from the x86 maintainers to go anywhere.
> > > > > Will address this separately.
> > > > >
> > > >
> > > > So do people prefer this hack, or something along lines of the following?
> > > >
> > > > static int __init cpu_dev_register_generic(void)
> > > > {
> > > > int i, ret = 0;
> > > >
> > > > for_each_online_cpu(i) {
> > > > if (!get_cpu_device(i)) {
> > > > ret = arch_register_cpu(i);
> > > > if (ret)
> > > > pr_warn("register_cpu %d failed (%d)\n", i, ret);
> > > > }
> > > > }
> > > > //Probably just eat the error.
> > > > return 0;
> > > > }
> > > > subsys_initcall_sync(cpu_dev_register_generic);
> > >
> > > I would prefer something like the above.
> > >
> > > I actually thought that arch_register_cpu() might return something
> > > like -EPROBE_DEFER when it cannot determine whether or not the CPU is
> > > really available.
> >
> > Ok. That would end up looking much more like the original code I think.
> > So we wouldn't have this late registration at all, or keep it for DT
> > on arm64? I'm not sure that's a clean solution though leaves
> > the x86 path alone.
>
> I'm not sure why DT on arm64 would need to do late registration.
This was me falsely thinking better to do it close together for
DT and ACPI. It definitely doesn't need to (or it wouldn't work today!)
>
> There is this chain of calls in the mainline today:
>
> driver_init()
> cpu_dev_init()
> cpu_dev_register_generic()
>
> the last of which registers CPUs on arm64/DT systems IIUC. I don't see
> a need to change this behavior.
>
> On arm64/ACPI, though, arch_register_cpu() cannot make progress until
> it can look into the ACPI Namespace, so I would just make it return
> -EPROBE_DEFER or equivalent then and the ACPI enumeration will find
> the CPU and basically treat it as one that has just appeared.
Ok so giving this a go...
Arm 64 version of arch_register_cpu() ended up as the following
(obviously needs cleaning up, bikeshedding of naming etc)
int arch_register_cpu(int cpu)
{
struct cpu *c = &per_cpu(cpu_devices, cpu);
acpi_handle acpi_handle = ACPI_HANDLE(&c->dev);
int ret;
printk("!!!!! INTO arch_register_cpu() %px\n", ACPI_HANDLE(&c->dev));
if (!acpi_disabled && !acpi_handle)
return -EPROBE_DEFER;
if (acpi_handle) {
ret = acpi_sta_enabled(acpi_handle);
if (ret) {
printk("Have handle, not enabled\n");
/* Not enabled */
return ret;
}
}
printk("!!!!! onwards arch_register_cpu()\n");
c->hotpluggable = arch_cpu_is_hotpluggable(cpu);
return register_cpu(c, cpu);
}
with new utility function in drivers/acpi/utils.c
int acpi_sta_enabled(acpi_handle handle)
{
unsigned long long sta;
bool present, enabled;
acpi_status status;
if (acpi_has_method(handle, "_STA")) {
status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
if (ACPI_FAILURE(status))
return -ENODEV;
present = sta & ACPI_STA_DEVICE_PRESENT;
enabled = sta & ACPI_STA_DEVICE_ENABLED;
if (!present || !enabled) {
return -EPROBE_DEFER;
}
return 0;
}
return 0; /* No _STA means always on! */
}
struct cpu *c = &per_cpu(cpu_devices, pr->id);
ACPI_COMPANION_SET(&c->dev, device);
in acpi_processor_get_info() and that calls
static int acpi_processor_make_enabled(struct acpi_processor *pr)
{
int ret;
if (invalid_phys_cpuid(pr->phys_id))
return -ENODEV;
cpus_write_lock();
ret = arch_register_cpu(pr->id);
cpus_write_unlock();
return ret;
}
I think setting the ACPI handle should be harmless on other architectures.
It seems like the obvious one to set it to for cpu->dev.
Brief tests on same set of DT and ACPI on x86 and arm64 seem fine.
>
> > If we get rid of this catch all, solution would be to move the
> > !acpi_disabled check into the arm64 version of arch_cpu_register()
> > because we would only want the delayed registration path to be
> > used on ACPI cases where the question of CPU availability can't
> > yet be resolved.
>
> Exactly.
>
> This is similar (if not equivalent even) to a CPU becoming available
> between the cpu_dev_register_generic() call and the ACPI enumeration.
>
> > >
> > > Then, the ACPI processor enumeration path may take care of registering
> > > CPU that have not been registered so far and in the more-or-less the
> > > same way regardless of the architecture (modulo some arch-specific
> > > stuff).
> >
> > If I understand correctly, in acpi_processor_get_info() we'd end up
> > with a similar check on whether it was already registered (the x86 path)
> > or had be deferred (arm64 / acpi).
> >
> > >
> > > In the end, it should be possible to avoid changing the behavior of
> > > x86 and loongarch in this series.
> >
> > Possible, yes, but result if I understand correctly is we end up with
> > very different flows and replication of functionality between the
> > early registration and the late one. I'm fine with that if you prefer it!
>
> But that's what is there today, isn't it?
Agreed - but I was previously thinking we could move everything late.
I'm fine with just keeping the two flows separate.
>
> I think this can be changed to reduce the duplication, but I'd prefer
> to do that later, when the requisite functionality is in place and we
> just do the consolidation. In that case, if anything goes wrong, we
> can take a step back and reconsider without deferring the arm64 CPU
> hotplug support.
Great. That plan certainly works for me :)
Thanks for quick replies and help getting this headed in right direction.
+CC Miguel who is also looking at some of this series. Sorry Miguel,
was assuming you were on the thread and never checked :(
Jonathan
|