On Fri, Oct 7, 2016 at 6:28 AM, tip-bot for Thomas Gleixner <tip...@zytor.com> wrote: > Commit-ID: 8237bded3959c6d038798b905485d3ba94b8ea10 > Gitweb: http://git.kernel.org/tip/8237bded3959c6d038798b905485d3ba94b8ea10 > Author: Thomas Gleixner <t...@linutronix.de> > AuthorDate: Fri, 7 Oct 2016 14:02:12 +0200 > Committer: Thomas Gleixner <t...@linutronix.de> > CommitDate: Fri, 7 Oct 2016 15:22:15 +0200 > > x86/acpi: Prevent LAPIC id 0xff from being accounted > > Yinghai reported that the recent changes to make the cpuid - nodeid > relationship permanent causes a cpuid ordering regression on a system which > has 2apic enabled.. > > The reason is that the ACPI local APIC parser has no sanity check for > apicid 0xff, which is an invalid id. So a CPU id for this invalid local > APIC id is allocated and therefor breaks the cpuid ordering. > > Add a sanity check to acpi_parse_lapic() which ignores the invalid id. > > Fixes: 8f54969dc8d6 ("x86/acpi: Introduce persistent storage for cpuid <-> > apicid mapping") > Reported-by: Yinghai Lu <ying...@kernel.org> > Signed-off-by: Thomas Gleixner <t...@linutronix.de> > Cc: Gu Zheng <guz.f...@cn.fujitsu.com>, > Cc: Tang Chen <tangc...@cn.fujitsu.com> > Cc: douly.f...@cn.fujitsu.com, > Cc: zhugh.f...@cn.fujitsu.com > Cc: Tony Luck <tony.l...@intel.com> > Cc: Rafael J. Wysocki <r...@rjwysocki.net> > Cc: Len Brown <l...@kernel.org> > Cc: Lv Zheng <lv.zh...@intel.com>, > Cc: robert.mo...@intel.com > Cc: linux-a...@vger.kernel.org > Link: > https://lkml.kernel.org/r/cae9fiqvqx6frxt-rdr7crz4dg5leuwhcusy1kacjr+jgu_v...@mail.gmail.com > --- > arch/x86/kernel/acpi/boot.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c > index 32a7d70..6d35baf 100644 > --- a/arch/x86/kernel/acpi/boot.c > +++ b/arch/x86/kernel/acpi/boot.c > @@ -233,6 +233,9 @@ acpi_parse_lapic(struct acpi_subtable_header * header, > const unsigned long end) > > acpi_table_print_madt_entry(header); > > + if (processor->id >= 0xff) > + return -EINVAL; > + > /* > * We need to register disabled CPU as well to permit > * counting disabled CPUs. This allows us to size
some thing is wrong: [ 71.787437] ACPI: LAPIC (acpi_id[0xff] lapic_id[0xff] disabled) [ 71.799681] ACPI: Error parsing LAPIC/X2APIC entries [ 71.809934] ACPI: Invalid BIOS MADT, disabling ACPI looks like should change return -EINVAL ; ==> return 0;
