Re: [PATCH] ACPI, cpu hotplug: move try_offline_node() after acpi_unmap_lsapic()

[Gu Zheng <guz.fnst@cn.fujitsu.com>]

Hi Ishimatsu-san,
On 08/06/2013 06:11 PM, Yasuaki Ishimatsu wrote:

> try_offline_node() checks that all cpus related with removed node have been
> removed by using cpu_present_bits. If all cpus related with removed node have
> been removed, try_offline_node() clears the node information.
> 
> But try_offline_node() called from acpi_processor_remove() never clears
> the node information. For disabling cpu_present_bits, acpi_unmap_lsapic()
> need be called. But acpi_unmap_lsapic() is called after try_offline_node()
> runs. So when try_offline_node() runs, the cpu's cpu_present_bits is always
> set.
> 
> This patch moves try_offline_node() after acpi_unmap_lsapic().

It works well.

> 
> Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>


Tested-by: Gu Zheng <guz.fnst@cn.fujitsu.com>

Thanks,
Gu

> ---
>  drivers/acpi/acpi_processor.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
> index fd6c51c..5a74a9c 100644
> --- a/drivers/acpi/acpi_processor.c
> +++ b/drivers/acpi/acpi_processor.c
> @@ -451,7 +451,6 @@ static void acpi_processor_remove(struct acpi_device *device)
>  	/* Clean up. */
>  	per_cpu(processor_device_array, pr->id) = NULL;
>  	per_cpu(processors, pr->id) = NULL;
> -	try_offline_node(cpu_to_node(pr->id));
> 
>  	/* Remove the CPU. */
>  	get_online_cpus();
> @@ -459,6 +458,8 @@ static void acpi_processor_remove(struct acpi_device *device)
>  	acpi_unmap_lsapic(pr->id);
>  	put_online_cpus();
> 
> +	try_offline_node(cpu_to_node(pr->id));
> +
>   out:
>  	free_cpumask_var(pr->throttling.shared_cpu_map);
>  	kfree(pr);
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>