Re: [RFC PATCH] drivers core: cpu: add hotplug callback to update cpu_dev state to resumed

[Rafael J. Wysocki]

On Friday, January 25, 2019 4:09:06 PM CET Sudeep Holla wrote:
> The sysfs for the cpu caches are managed by adding devices with cpu
> as the parent in cpu_device_create() when secondary cpu is brought
> onlin. Generally when the secondary CPUs are hotplugged back is as part
> of resume from suspend-to-ram, we call cpu_device_create() from the cpu
> hotplug state machine while the cpu device associated with that CPU is
> not yet ready to be resumed as the device_resume() call happens bit later.
> It's not really needed to set the flag is_prepared for cpu devices are
> they are mostly pseudo device and hotplug framework deals with state
> machine and not managed through the cpu device.
> 
> This often results in annoying warning when resuming:
> Enabling non-boot CPUs ...
> CPU1: Booted secondary processor
>  cache: parent cpu1 should not be sleeping
> CPU1 is up
> CPU2: Booted secondary processor
>  cache: parent cpu2 should not be sleeping
> CPU2 is up
> .... and so on.
> 
> Just fix the warning by updating the device state quite early.
> 
> Cc: "Rafael J. Wysocki" <rjw@xxxxxxxxxxxxx>
> Reported-by: Jisheng Zhang <jszhang@xxxxxxxxxxx>
> Reported-by: Steve Longerbeam <slongerbeam@xxxxxxxxx>
> Reported-by: Eugeniu Rosca <erosca@xxxxxxxxxxxxxx>
> Signed-off-by: Sudeep Holla <sudeep.holla@xxxxxxx>
> ---
>  drivers/base/cpu.c         | 20 +++++++++++++++++++-
>  include/linux/cpuhotplug.h |  1 +
>  2 files changed, 20 insertions(+), 1 deletion(-)
> 
> Hi Rafael,
> 
> This is getting reported for quite some time. Let me know if you have
> better solution to fix this harmless yet annoying warnings during system
> resume.

I'd rather have a flag in struct dev_pm_info that will cause the message to
be suppressed if set.

It could be used for other purposes too then in princple (like skipping the
creation of empty "power" attr groups in sysfs for devices that don't
need them etc.).


> diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
> index eb9443d5bae1..ae0403528bff 100644
> --- a/drivers/base/cpu.c
> +++ b/drivers/base/cpu.c
> @@ -80,6 +80,8 @@ void unregister_cpu(struct cpu *cpu)
> 
>  	device_unregister(&cpu->dev);
>  	per_cpu(cpu_sys_devices, logical_cpu) = NULL;
> +
> +	cpuhp_remove_state_nocalls(CPUHP_CPUDEV_PM_PREPARE);
>  	return;
>  }
> 
> @@ -355,6 +357,20 @@ static int cpu_uevent(struct device *dev, struct kobj_uevent_env *env)
>  }
>  #endif
> 
> +static int cpu_dev_pm_unset_is_prepared(unsigned int cpu)
> +{
> +	struct device *cpu_dev = get_cpu_device(cpu);
> +
> +	/*
> +	 * device_resume sets this for cpu_dev bit later but the child
> +	 * devices are resumes in the cpu hotplug state machine much
> +	 * before device_resume is called.
> +	 */
> +	if (cpu_dev)
> +		cpu_dev->power.is_prepared = false;
> +
> +	return 0;
> +}
>  /*
>   * register_cpu - Setup a sysfs device for a CPU.
>   * @cpu - cpu->hotpluggable field set to 1 will generate a control file in
> @@ -392,7 +408,9 @@ int register_cpu(struct cpu *cpu, int num)
>  	dev_pm_qos_expose_latency_limit(&cpu->dev,
>  					PM_QOS_RESUME_LATENCY_NO_CONSTRAINT);
> 
> -	return 0;
> +	return cpuhp_setup_state_nocalls(CPUHP_CPUDEV_PM_PREPARE,
> +					 "base/cpu/dev_pm:prepare",
> +					 cpu_dev_pm_unset_is_prepared, NULL);
>  }
> 
>  struct device *get_cpu_device(unsigned cpu)
> diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
> index fd586d0301e7..2ecb4c9370ce 100644
> --- a/include/linux/cpuhotplug.h
> +++ b/include/linux/cpuhotplug.h
> @@ -69,6 +69,7 @@ enum cpuhp_state {
>  	CPUHP_SLAB_PREPARE,
>  	CPUHP_MD_RAID5_PREPARE,
>  	CPUHP_RCUTREE_PREP,
> +	CPUHP_CPUDEV_PM_PREPARE,
>  	CPUHP_CPUIDLE_COUPLED_PREPARE,
>  	CPUHP_POWERPC_PMAC_PREPARE,
>  	CPUHP_POWERPC_MMU_CTX_PREPARE,
> --
> 2.17.1
> 
>