Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757086AbeAIDpY (ORCPT + 1 other); Mon, 8 Jan 2018 22:45:24 -0500 Received: from mout.gmx.net ([212.227.15.18]:53776 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751173AbeAIDpV (ORCPT ); Mon, 8 Jan 2018 22:45:21 -0500 Message-ID: <1515469448.6766.12.camel@gmx.de> Subject: Re: [PATCH 4.14 023/159] mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y From: Mike Galbraith To: "Kirill A. Shutemov" , Ingo Molnar , Andrew Morton Cc: "Kirill A. Shutemov" , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Andy Lutomirski , Borislav Petkov , Cyrill Gorcunov , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , linux-mm@kvack.org, Dave Young , Baoquan He , Vivek Goyal , kexec@lists.infradead.org Date: Tue, 09 Jan 2018 04:44:08 +0100 In-Reply-To: <20180109001303.dy73bpixsaegn4ol@node.shutemov.name> References: <20171222084623.668990192@linuxfoundation.org> <20171222084625.007160464@linuxfoundation.org> <1515302062.6507.18.camel@gmx.de> <20180108160444.2ol4fvgqbxnjmlpg@gmail.com> <20180108174653.7muglyihpngxp5tl@black.fi.intel.com> <20180109001303.dy73bpixsaegn4ol@node.shutemov.name> Content-Type: text/plain; charset="ISO-8859-15" X-Mailer: Evolution 3.20.5 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:pCeMYai6MMCGmJIpNk124fsZ4APEU/ZudyrKnBLkWc93T+2r8IW S/7U9uy0T3J4lzHd0Mvk64iuevyj1diAlE1JC2yTNKIYVjOhxAZ8XJhfN3AK4vXSG+Kt2pP raQA08xZgSnPP3a5Rcc2QtK8TNtWulFV6yqWMzuVy7M+hBEBTHGpvgmD6dRlKkuaGrLXJaL JX9zZg87RJQO7tJdvihKw== X-UI-Out-Filterresults: notjunk:1;V01:K0:Ze5D00KUeOE=:ERxXDoCr5Xp1IsT1DMk7ib jgiTklebE4wc1PiB72HXZ32EXS9ftX2NcPP53XDXgiAoEUs2P7+4ZsdZJMljAQMvMQFh3uCtZ M2PG4IQplbQ3/9tppOR2RUh4hMUkS3BP4yhj0TmScXt1V/Nwyh6n2z3EhQZ0fBmrquTD4DFXJ gYRyzgyUnk3Aq9b+4cjCTYxFSQrXxsoCj5mC8yfG8Wjuj0Ql3tZgayTKSwfuCw5+Ir2/qLdME sRvaVsfd2xk1qjeKQ2kNMzkdNo0Gr0T7aZS6Sk12c0e3QsW/tB36NKwAkcpUtoOpKVdYIh51c KRmfYWpNvZ9bM0TiGipKPKrslmMmw5rXS97/005OZT3i8wZwQNTrXxT7hb5fZt5b7E/bNi9XO eaRiT4/98tlLI/RlQrldSJdaGCC0E1ykbBVwZxRFAGdE1TImlwGyMJ4EnFNzy3WSUvRxKNpSF s7RvEF943zc9GZTEV/M6c+yOl2VPpAmUITxqH0AVhUu9CvNRo+JYLQOAFHN8MoUjcOi0VXHjn jQdD5B5/sT5veglNxM2UvSTL+HzKNdyqKJukmxZcGX0+qQT0wD6DU1DtQWZvXiFcirnByojxb EyeTHxTT/zOOoecJhS7wskobKeBnQaO1HCcxdCHUD06NZx5k4gD5RIbo0TwrVDQZShwxc7+J1 4be8amgicqNTfAe/WSsDq2TBLmQBiksQOEMSffJG4+AcW9d9i6k9GbNIJ40XGPvjxRE4MCafd s3VBcinwoGwmfT7bHzwLsasTGdvfFqQREDMlh5rnER1KwNd2V/RpklXpUcwwdhxWuju8hQtLB cyyZPknyEBJC7qHcvHCEewwV/wO7GrMyha2sBD/e3SEX/nG95I= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On Tue, 2018-01-09 at 03:13 +0300, Kirill A. Shutemov wrote: > > Mike, could you test this? (On top of the rest of the fixes.) homer:..crash/2018-01-09-04:25 # ll total 1863604 -rw------- 1 root root 66255 Jan 9 04:25 dmesg.txt -rw-r--r-- 1 root root 182 Jan 9 04:25 README.txt -rw-r--r-- 1 root root 2818240 Jan 9 04:25 System.map-4.15.0.gb2cd1df-master -rw------- 1 root root 1832914928 Jan 9 04:25 vmcore -rw-r--r-- 1 root root 72514993 Jan 9 04:25 vmlinux-4.15.0.gb2cd1df-master.gz Yup, all better. > Sorry for the mess. (why, developers not installing shiny new bugs is a whole lot worse:) > From 100fd567754f1457be94732046aefca204c842d2 Mon Sep 17 00:00:00 2001 > From: "Kirill A. Shutemov" > Date: Tue, 9 Jan 2018 02:55:47 +0300 > Subject: [PATCH] kdump: Write a 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 kdump code. VMCOREINFO_SYMBOL(mem_section) > writes down address of pointer into vmcoreinfo, not array as we wanted. > > Let's introduce VMCOREINFO_ARRAY() that would handle the situation > correctly for both cases. > > Signed-off-by: Kirill A. Shutemov > Fixes: 83e3c48729d9 ("mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y") > --- > 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 06097ef30449..83ae04950269 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_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 b3663896278e..d4122a837477 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_ARRAY(mem_section); > VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS); > VMCOREINFO_STRUCT_SIZE(mem_section); > VMCOREINFO_OFFSET(mem_section, section_mem_map);