Commit-ID: fd74da217df7d4bd25e95411da64e0b92762842e Gitweb: http://git.kernel.org/tip/fd74da217df7d4bd25e95411da64e0b92762842e Author: Dou Liyang <douly.f...@cn.fujitsu.com> AuthorDate: Thu, 25 Aug 2016 16:35:20 +0800 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Wed, 21 Sep 2016 21:18:40 +0200
acpi: Validate processor id when mapping the processor When we want to identify whether the proc_id is unreasonable or not, we can call the "acpi_processor_validate_proc_id" function. It will search in the duplicate IDs. If we find the proc_id in the IDs, we return true to the call function. Conversely, the false represents available. When we establish all possible cpuid <-> nodeid mapping to handle the cpu hotplugs, we will use the proc_id from ACPI table. We do validation when we get the proc_id. If the result is true, we will stop the mapping. [ tglx: Mark the new function __init ] Signed-off-by: Dou Liyang <douly.f...@cn.fujitsu.com> Acked-by: Ingo Molnar <mi...@kernel.org> Cc: mika.j.pentt...@gmail.com Cc: len.br...@intel.com Cc: raf...@kernel.org Cc: r...@rjwysocki.net Cc: yasu.isim...@gmail.com Cc: linux...@kvack.org Cc: linux-a...@vger.kernel.org Cc: isimatu.yasu...@jp.fujitsu.com Cc: gongzhaog...@inspur.com Cc: t...@kernel.org Cc: izumi.t...@jp.fujitsu.com Cc: c...@linux.com Cc: chen.t...@easystack.cn Cc: a...@linux-foundation.org Cc: kamezawa.hir...@jp.fujitsu.com Cc: l...@kernel.org Link: http://lkml.kernel.org/r/1472114120-3281-8-git-send-email-douly.f...@cn.fujitsu.com Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- drivers/acpi/acpi_processor.c | 15 +++++++++++++++ drivers/acpi/processor_core.c | 4 ++++ include/linux/acpi.h | 3 +++ 3 files changed, 22 insertions(+) diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index f27c709..3de3b6b 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -659,6 +659,21 @@ static void __init acpi_processor_check_duplicates(void) NULL, NULL, NULL); } +bool __init acpi_processor_validate_proc_id(int proc_id) +{ + int i; + + /* + * compare the proc_id with duplicate IDs, if the proc_id is already + * in the duplicate IDs, return true, otherwise, return false. + */ + for (i = 0; i < nr_duplicate_ids; i++) { + if (duplicate_processor_ids[i] == proc_id) + return true; + } + return false; +} + void __init acpi_processor_init(void) { acpi_processor_check_duplicates(); diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 8801976..9ac265f 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -302,6 +302,10 @@ map_processor(acpi_handle handle, phys_cpuid_t *phys_id, int *cpuid) 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); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 5b4f9ac..7f307f3 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -267,6 +267,9 @@ static inline bool invalid_phys_cpuid(phys_cpuid_t phys_id) return phys_id == PHYS_CPUID_INVALID; } +/* Validate the processor object's proc_id */ +bool acpi_processor_validate_proc_id(int proc_id); + #ifdef CONFIG_ACPI_HOTPLUG_CPU /* Arch dependent functions for cpu hotplug support */ int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, int *pcpu);
