Commit c962cff1 authored by Dou Liyang's avatar Dou Liyang Committed by Thomas Gleixner
Browse files

Revert "x86/acpi: Set persistent cpuid <-> nodeid mapping when booting" 



Revert: dc6db24d ("x86/acpi: Set persistent cpuid <-> nodeid mapping when booting")

The mapping of "cpuid <-> nodeid" is established at boot time via ACPI
tables to keep associations of workqueues and other node related items
consistent across cpu hotplug.

But, ACPI tables are unreliable and failures with that boot time mapping
have been reported on machines where the ACPI table and the physical
information which is retrieved at actual hotplug is inconsistent.

Revert the mapping implementation so it can be replaced with a less error
prone approach.

Signed-off-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
Tested-by: default avatarXiaolong Ye <xiaolong.ye@intel.com>
Cc: rjw@rjwysocki.net
Cc: linux-acpi@vger.kernel.org
Cc: guzheng1@huawei.com
Cc: izumi.taku@jp.fujitsu.com
Cc: lenb@kernel.org
Link: http://lkml.kernel.org/r/1488528147-2279-2-git-send-email-douly.fnst@cn.fujitsu.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 434fd635

arch/x86/kernel/acpi/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ static void __init acpi_set_irq_model_ioapic(void) 
#ifdef CONFIG_ACPI_HOTPLUG_CPU

#include <acpi/processor.h>



int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

static int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

{

#ifdef CONFIG_ACPI_NUMA

	int nid;

drivers/acpi/acpi_processor.c

+0 −5
Original line number Diff line number Diff line
@@ -182,11 +182,6 @@ int __weak arch_register_cpu(int cpu) 


void __weak arch_unregister_cpu(int cpu) {}



int __weak acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)

{

	return -ENODEV;

}



static int acpi_processor_hotadd_init(struct acpi_processor *pr)

{

	unsigned long long sta;

drivers/acpi/bus.c

+0 −1
Original line number Diff line number Diff line
@@ -1249,7 +1249,6 @@ static int __init acpi_init(void) 
	acpi_wakeup_device_init();

	acpi_debugger_init();

	acpi_setup_sb_notify_handler();

	acpi_set_processor_mapping();

	return 0;

}

drivers/acpi/processor_core.c

+0 −73
Original line number Diff line number Diff line
@@ -278,79 +278,6 @@ int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id) 
}

EXPORT_SYMBOL_GPL(acpi_get_cpuid);



#ifdef CONFIG_ACPI_HOTPLUG_CPU

static bool __init

map_processor(acpi_handle handle, phys_cpuid_t *phys_id, int *cpuid)

{

	int type, id;

	u32 acpi_id;

	acpi_status status;

	acpi_object_type acpi_type;

	unsigned long long tmp;

	union acpi_object object = { 0 };

	struct acpi_buffer buffer = { sizeof(union acpi_object), &object };



	status = acpi_get_type(handle, &acpi_type);

	if (ACPI_FAILURE(status))

		return false;



	switch (acpi_type) {

	case ACPI_TYPE_PROCESSOR:

		status = acpi_evaluate_object(handle, NULL, NULL, &buffer);

		if (ACPI_FAILURE(status))

			return false;

		acpi_id = object.processor.proc_id;



		/* validate the acpi_id */

		if(acpi_processor_validate_proc_id(acpi_id))

			return false;

		break;

	case ACPI_TYPE_DEVICE:

		status = acpi_evaluate_integer(handle, "_UID", NULL, &tmp);

		if (ACPI_FAILURE(status))

			return false;

		acpi_id = tmp;

		break;

	default:

		return false;

	}



	type = (acpi_type == ACPI_TYPE_DEVICE) ? 1 : 0;



	*phys_id = __acpi_get_phys_id(handle, type, acpi_id, false);

	id = acpi_map_cpuid(*phys_id, acpi_id);



	if (id < 0)

		return false;

	*cpuid = id;

	return true;

}



static acpi_status __init

set_processor_node_mapping(acpi_handle handle, u32 lvl, void *context,

			   void **rv)

{

	phys_cpuid_t phys_id;

	int cpu_id;



	if (!map_processor(handle, &phys_id, &cpu_id))

		return AE_ERROR;



	acpi_map_cpu2node(handle, cpu_id, phys_id);

	return AE_OK;

}



void __init acpi_set_processor_mapping(void)

{

	/* Set persistent cpu <-> node mapping for all processors. */

	acpi_walk_namespace(ACPI_TYPE_PROCESSOR, ACPI_ROOT_OBJECT,

			    ACPI_UINT32_MAX, set_processor_node_mapping,

			    NULL, NULL, NULL);

}

#else

void __init acpi_set_processor_mapping(void) {}

#endif /* CONFIG_ACPI_HOTPLUG_CPU */



#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC

static int get_ioapic_id(struct acpi_subtable_header *entry, u32 gsi_base,

			 u64 *phys_addr, int *ioapic_id)

include/linux/acpi.h

+0 −3
Original line number Diff line number Diff line
@@ -294,11 +294,8 @@ bool acpi_processor_validate_proc_id(int proc_id); 
int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, u32 acpi_id,

		 int *pcpu);

int acpi_unmap_cpu(int cpu);

int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid);

#endif /* CONFIG_ACPI_HOTPLUG_CPU */



void acpi_set_processor_mapping(void);



#ifdef CONFIG_ACPI_HOTPLUG_IOAPIC

int acpi_get_ioapic_id(acpi_handle handle, u32 gsi_base, u64 *phys_addr);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE