From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934181AbeAMKzd (ORCPT + 1 other); Sat, 13 Jan 2018 05:55:33 -0500 Received: from terminus.zytor.com ([65.50.211.136]:54041 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933769AbeAMKzb (ORCPT ); Sat, 13 Jan 2018 05:55:31 -0500 Date: Sat, 13 Jan 2018 02:52:03 -0800 From: "tip-bot for Kirill A. Shutemov" Message-ID: Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, bhe@redhat.com, vgoyal@redhat.com, hpa@zytor.com, torvalds@linux-foundation.org, gregkh@linuxfoundation.org, peterz@infradead.org, dyoung@redhat.com, mingo@kernel.org, kirill.shutemov@linux.intel.com, tglx@linutronix.de Reply-To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, vgoyal@redhat.com, bhe@redhat.com, hpa@zytor.com, torvalds@linux-foundation.org, peterz@infradead.org, dyoung@redhat.com, gregkh@linuxfoundation.org, mingo@kernel.org, kirill.shutemov@linux.intel.com, tglx@linutronix.de In-Reply-To: <20180112162532.35896-1-kirill.shutemov@linux.intel.com> References: <20180112162532.35896-1-kirill.shutemov@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] kdump: Write the correct address of mem_section into vmcoreinfo Git-Commit-ID: 9f15b9120f562ae0bf0a836c96f4dafb33ae426a 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 Return-Path: Commit-ID: 9f15b9120f562ae0bf0a836c96f4dafb33ae426a Gitweb: https://git.kernel.org/tip/9f15b9120f562ae0bf0a836c96f4dafb33ae426a Author: Kirill A. Shutemov AuthorDate: Fri, 12 Jan 2018 19:25:32 +0300 Committer: Ingo Molnar CommitDate: Sat, 13 Jan 2018 11:48:06 +0100 kdump: Write the correct address of mem_section into vmcoreinfo Depending on configuration mem_section can now be an array or a pointer to an array allocated dynamically. In most cases, we can continue to refer to it as 'mem_section' regardless of what it is. But there's one exception: '&mem_section' means "address of the array" if mem_section is an array, but if mem_section is a pointer, it would mean "address of the pointer". We've stepped onto this in the kdump code: VMCOREINFO_SYMBOL(mem_section) writes down the address of pointer into vmcoreinfo, not the array as we wanted, breaking kdump. Let's introduce VMCOREINFO_SYMBOL_ARRAY() that would handle the situation correctly for both cases. Mike Galbraith Signed-off-by: Kirill A. Shutemov Acked-by: Baoquan He Acked-by: Dave Young Cc: Andrew Morton Cc: Greg Kroah-Hartman Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Vivek Goyal Cc: kexec@lists.infradead.org Cc: linux-mm@kvack.org Cc: stable@vger.kernel.org Fixes: 83e3c48729d9 ("mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y") Link: http://lkml.kernel.org/r/20180112162532.35896-1-kirill.shutemov@linux.intel.com Signed-off-by: Ingo Molnar --- include/linux/crash_core.h | 2 ++ kernel/crash_core.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h index 06097ef..b511f6d 100644 --- a/include/linux/crash_core.h +++ b/include/linux/crash_core.h @@ -42,6 +42,8 @@ phys_addr_t paddr_vmcoreinfo_note(void); vmcoreinfo_append_str("PAGESIZE=%ld\n", value) #define VMCOREINFO_SYMBOL(name) \ vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name) +#define VMCOREINFO_SYMBOL_ARRAY(name) \ + vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name) #define VMCOREINFO_SIZE(name) \ vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \ (unsigned long)sizeof(name)) diff --git a/kernel/crash_core.c b/kernel/crash_core.c index b366389..4f63597 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -410,7 +410,7 @@ static int __init crash_save_vmcoreinfo_init(void) VMCOREINFO_SYMBOL(contig_page_data); #endif #ifdef CONFIG_SPARSEMEM - VMCOREINFO_SYMBOL(mem_section); + VMCOREINFO_SYMBOL_ARRAY(mem_section); VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS); VMCOREINFO_STRUCT_SIZE(mem_section); VMCOREINFO_OFFSET(mem_section, section_mem_map);