From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933327AbcHJSNL (ORCPT ); Wed, 10 Aug 2016 14:13:11 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56770 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932969AbcHJSNF (ORCPT ); Wed, 10 Aug 2016 14:13:05 -0400 Date: Wed, 10 Aug 2016 11:12:31 -0700 From: tip-bot for Mike Travis Message-ID: Cc: sivanich@sgi.com, travis@sgi.com, abanman@sgi.com, estabrook@sgi.com, torvalds@linux-foundation.org, tglx@linutronix.de, peterz@infradead.org, akpm@linux-foundation.org, framsay@sgi.com, rja@sgi.com, hpa@zytor.com, athorlton@sgi.com, linux-kernel@vger.kernel.org, mingo@kernel.org, nzimmer@sgi.com Reply-To: tglx@linutronix.de, torvalds@linux-foundation.org, peterz@infradead.org, sivanich@sgi.com, travis@sgi.com, abanman@sgi.com, estabrook@sgi.com, nzimmer@sgi.com, linux-kernel@vger.kernel.org, athorlton@sgi.com, mingo@kernel.org, hpa@zytor.com, rja@sgi.com, framsay@sgi.com, akpm@linux-foundation.org In-Reply-To: <20160801184050.577755634@asylum.americas.sgi.com> References: <20160801184050.577755634@asylum.americas.sgi.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/platform/UV: Fix kernel panic running RHEL kdump kernel on UV systems Git-Commit-ID: 5a52e8f822374bebc702bb2688ed8b5515bbb55b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5a52e8f822374bebc702bb2688ed8b5515bbb55b Gitweb: http://git.kernel.org/tip/5a52e8f822374bebc702bb2688ed8b5515bbb55b Author: Mike Travis AuthorDate: Mon, 1 Aug 2016 13:40:53 -0500 Committer: Ingo Molnar CommitDate: Wed, 10 Aug 2016 15:55:39 +0200 x86/platform/UV: Fix kernel panic running RHEL kdump kernel on UV systems The latest UV kernel support panics when RHEL7 kexec's the kdump kernel to make a dumpfile. This patch fixes the problem by turning off all UV support if NUMA is off. Tested-by: Frank Ramsay Tested-by: John Estabrook Signed-off-by: Mike Travis Reviewed-by: Dimitri Sivanich Reviewed-by: Nathan Zimmer Cc: Alex Thorlton Cc: Andrew Banman Cc: Andrew Morton Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Russ Anderson Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20160801184050.577755634@asylum.americas.sgi.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/apic/x2apic_uv_x.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index 6aa0545..cb0673c 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -223,6 +223,11 @@ static int __init uv_acpi_madt_oem_check(char *oem_id, char *oem_table_id) if (strncmp(oem_id, "SGI", 3) != 0) return 0; + if (numa_off) { + pr_err("UV: NUMA is off, disabling UV support\n"); + return 0; + } + /* Setup early hub type field in uv_hub_info for Node 0 */ uv_cpu_info->p_uv_hub_info = &uv_hub_info_node0;