Message ID | 20221014134139.5151-2-xianting.tian@linux.alibaba.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp193592wrs; Fri, 14 Oct 2022 06:52:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM64GdwmSkOW93UQBLJdSo3hx/qK2uhjDcxswsrr7Uffn+9BAEICAO9mM4aHVNn+1rm0uNag X-Received: by 2002:a63:8643:0:b0:46b:2bef:338b with SMTP id x64-20020a638643000000b0046b2bef338bmr2252089pgd.357.1665755542124; Fri, 14 Oct 2022 06:52:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665755542; cv=none; d=google.com; s=arc-20160816; b=Vm7omOFxDsmmKqo8JA6698gTcKFml26VD0e+dSEbk9j4J6Bs0e+pyST7TjfEgIoflS AU8XKkiPYxHWM/uX16kMj/cd3cH5N6v3+3+mL/WC5XTfhyVGLJdPCzR9rMY95i83sUbo qXTQbsal1aebC/BohO7TLcfKb07EuVhFmgnySlQ0pa9oez2WoPc2xDlbpbNKF5LPRvS1 7kDOeBPjkxBt/UPPST7O53z1DQrl1Hcw0pqrmEJM/kPEk4VZyvPLobC/GSkJUq8gmnPl E0j8bZWyCBY/ORqW2Gn018vilOYKpGS2nZ9tavB9EIOmUDym3xPUSWC9eUiqrzZQ1mfs oDrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=DKme98+WhK8iJYoTrOeTZeG4L2VuT7Q7J4JJffodrwA=; b=p2xxqXMF/I4/LFRmFOu1OXXJYzBPK3lgKnTFjmOensSriC61ZIPHT0pvWRkvvKJwKU R5jNkVT9TQJnHklWsiG8sA3xk1nq2gsBKf9WQwiiWq8EPiQZzEsY1xzkHhqskx+voFyR FekcauQjRjwATJL6Jgs74oUmMvtxJu2GzwaBcIh823kTfDp7QOimuDAmJTMB86KOOEie Wy3Z7xkFuezgefCqQj44H+BGhI0yE4hwoohwUspbQAWIYeGjoR6zch4P67+6/NV9p/0N sE2Fii2g7E9Nw/DNAef8JhNNUNJJ7HXZHH931llBLzsI2vaAVVMP0x4M3+bEsol6R7if gUxQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e129-20020a636987000000b004597ddac1fasi2648552pgc.533.2022.10.14.06.52.09; Fri, 14 Oct 2022 06:52:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229761AbiJNNmR (ORCPT <rfc822;ouuuleilei@gmail.com> + 99 others); Fri, 14 Oct 2022 09:42:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229751AbiJNNmH (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 14 Oct 2022 09:42:07 -0400 Received: from out30-44.freemail.mail.aliyun.com (out30-44.freemail.mail.aliyun.com [115.124.30.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D366F1CEC22; Fri, 14 Oct 2022 06:42:03 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=xianting.tian@linux.alibaba.com;NM=1;PH=DS;RN=24;SR=0;TI=SMTPD_---0VS82Wbl_1665754917; Received: from localhost.localdomain(mailfrom:xianting.tian@linux.alibaba.com fp:SMTPD_---0VS82Wbl_1665754917) by smtp.aliyun-inc.com; Fri, 14 Oct 2022 21:41:58 +0800 From: Xianting Tian <xianting.tian@linux.alibaba.com> To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, anup@brainfault.org, heiko@sntech.de, guoren@kernel.org, mick@ics.forth.gr, alexandre.ghiti@canonical.com, bhe@redhat.com, vgoyal@redhat.com, dyoung@redhat.com, corbet@lwn.net, Conor.Dooley@microchip.com, bagasdotme@gmail.com Cc: kexec@lists.infradead.org, linux-doc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, crash-utility@redhat.com, heinrich.schuchardt@canonical.com, k-hagio-ab@nec.com, hschauhan@nulltrace.org, yixun.lan@gmail.com, Xianting Tian <xianting.tian@linux.alibaba.com> Subject: [PATCH V2 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support Date: Fri, 14 Oct 2022 21:41:38 +0800 Message-Id: <20221014134139.5151-2-xianting.tian@linux.alibaba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221014134139.5151-1-xianting.tian@linux.alibaba.com> References: <20221014134139.5151-1-xianting.tian@linux.alibaba.com> X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746671283721296177?= X-GMAIL-MSGID: =?utf-8?q?1746671283721296177?= |
Series |
Support VMCOREINFO export for RISCV64
|
|
Commit Message
Xianting Tian
Oct. 14, 2022, 1:41 p.m. UTC
Add arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC,
VMEMMAP and KERNEL_LINK_ADDR ranges), va bits and ram base for vmcore.
Default pagetable levels and PAGE_OFFSET aren't same for different kernel
version as below. For default pagetable levels, it sets sv57 on defaultly
in latest kernel and do fallback to try to set sv48 on boot time if sv57
is not supported in current hardware.
For ram base, the default value is 0x80200000 for qemu riscv64 env, 0x200000
for riscv64 SoC platform(eg, SoC platform of RISC-V XuanTie 910 CPU).
* Linux Kernel 5.18 ~
* PGTABLE_LEVELS = 5
* PAGE_OFFSET = 0xff60000000000000
* Linux Kernel 5.17 ~
* PGTABLE_LEVELS = 4
* PAGE_OFFSET = 0xffffaf8000000000
* Linux Kernel 4.19 ~
* PGTABLE_LEVELS = 3
* PAGE_OFFSET = 0xffffffe000000000
Since these configurations change from time to time and version to version,
it is preferable to export them via vmcoreinfo than to change the crash's
code frequently, it can simplify the development of crash tool.
Signed-off-by: Xianting Tian <xianting.tian@linux.alibaba.com>
---
arch/riscv/kernel/Makefile | 1 +
arch/riscv/kernel/crash_core.c | 29 +++++++++++++++++++++++++++++
2 files changed, 30 insertions(+)
create mode 100644 arch/riscv/kernel/crash_core.c
Comments
On Fri, Oct 14, 2022 at 09:41:38PM +0800, Xianting Tian wrote: > Add arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC, > VMEMMAP and KERNEL_LINK_ADDR ranges), va bits and ram base for vmcore. > > Default pagetable levels and PAGE_OFFSET aren't same for different kernel > version as below. For default pagetable levels, it sets sv57 on defaultly > in latest kernel and do fallback to try to set sv48 on boot time if sv57 > is not supported in current hardware. nit: This would read better as "it sets sv57 by default and falls back to setting sv48 at boot time if sv57 is not supported by the hardware". > > For ram base, the default value is 0x80200000 for qemu riscv64 env, 0x200000 > for riscv64 SoC platform(eg, SoC platform of RISC-V XuanTie 910 CPU). The second part of this sentence I'm not really sure that that is true, I think you should reword it to something like "...for qemu riscv64 and, for example, is 0x200000 on the XuanTie 910 CPU." and avoid applying that number blanketly for other SoCs. > > * Linux Kernel 5.18 ~ > * PGTABLE_LEVELS = 5 > * PAGE_OFFSET = 0xff60000000000000 > * Linux Kernel 5.17 ~ > * PGTABLE_LEVELS = 4 > * PAGE_OFFSET = 0xffffaf8000000000 > * Linux Kernel 4.19 ~ > * PGTABLE_LEVELS = 3 > * PAGE_OFFSET = 0xffffffe000000000 > > Since these configurations change from time to time and version to version, > it is preferable to export them via vmcoreinfo than to change the crash's > code frequently, it can simplify the development of crash tool. > > Signed-off-by: Xianting Tian <xianting.tian@linux.alibaba.com> > --- > arch/riscv/kernel/Makefile | 1 + > arch/riscv/kernel/crash_core.c | 29 +++++++++++++++++++++++++++++ > 2 files changed, 30 insertions(+) > create mode 100644 arch/riscv/kernel/crash_core.c > > diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile > index db6e4b1294ba..4cf303a779ab 100644 > --- a/arch/riscv/kernel/Makefile > +++ b/arch/riscv/kernel/Makefile > @@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o > obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.o crash_save_regs.o machine_kexec.o > obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o > obj-$(CONFIG_CRASH_DUMP) += crash_dump.o > +obj-$(CONFIG_CRASH_CORE) += crash_core.o > > obj-$(CONFIG_JUMP_LABEL) += jump_label.o > > diff --git a/arch/riscv/kernel/crash_core.c b/arch/riscv/kernel/crash_core.c > new file mode 100644 > index 000000000000..8d7f5ff108da > --- /dev/null > +++ b/arch/riscv/kernel/crash_core.c > @@ -0,0 +1,29 @@ > +// SPDX-License-Identifier: GPL-2.0-only > + > +#include <linux/crash_core.h> > +#include <linux/pagemap.h> > + > +void arch_crash_save_vmcoreinfo(void) > +{ > + VMCOREINFO_NUMBER(VA_BITS); > + VMCOREINFO_NUMBER(phys_ram_base); > + > + vmcoreinfo_append_str("NUMBER(PAGE_OFFSET)=0x%lx\n", PAGE_OFFSET); > + vmcoreinfo_append_str("NUMBER(VMALLOC_START)=0x%lx\n", VMALLOC_START); > + vmcoreinfo_append_str("NUMBER(VMALLOC_END)=0x%lx\n", VMALLOC_END); > + vmcoreinfo_append_str("NUMBER(VMEMMAP_START)=0x%lx\n", VMEMMAP_START); > + vmcoreinfo_append_str("NUMBER(VMEMMAP_END)=0x%lx\n", VMEMMAP_END); > +#ifdef CONFIG_64BIT > + vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR); > + vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END); > +#endif > + > + if (IS_ENABLED(CONFIG_64BIT)) { You've already got a #ifdef CONFIG_64BIT above, is there a reason why you'd use the IS_ENABLED here rather than merge this with the above section? I'm a big fan of IS_ENABLED but I'm not sure what it adds here, maybe you can show me the light :) Thanks, Conor. > +#ifdef CONFIG_KASAN > + vmcoreinfo_append_str("NUMBER(KASAN_SHADOW_START)=0x%lx\n", KASAN_SHADOW_START); > + vmcoreinfo_append_str("NUMBER(KASAN_SHADOW_END)=0x%lx\n", KASAN_SHADOW_END); > +#endif > + vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR); > + vmcoreinfo_append_str("NUMBER(ADDRESS_SPACE_END)=0x%lx\n", ADDRESS_SPACE_END); > + } > +} > -- > 2.17.1 > >
On 18/10/2022 03:28, Xianting Tian wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > 在 2022/10/18 上午3:54, Conor Dooley 写道: > >> On Fri, Oct 14, 2022 at 09:41:38PM +0800, Xianting Tian wrote: >>> * Linux Kernel 5.18 ~ >>> * PGTABLE_LEVELS = 5 >>> * PAGE_OFFSET = 0xff60000000000000 >>> * Linux Kernel 5.17 ~ >>> * PGTABLE_LEVELS = 4 >>> * PAGE_OFFSET = 0xffffaf8000000000 >>> * Linux Kernel 4.19 ~ >>> * PGTABLE_LEVELS = 3 >>> * PAGE_OFFSET = 0xffffffe000000000 >>> >>> Since these configurations change from time to time and version to version, >>> it is preferable to export them via vmcoreinfo than to change the crash's >>> code frequently, it can simplify the development of crash tool. >>> >>> Signed-off-by: Xianting Tian<xianting.tian@linux.alibaba.com> >>> --- >>> arch/riscv/kernel/Makefile | 1 + >>> arch/riscv/kernel/crash_core.c | 29 +++++++++++++++++++++++++++++ >>> 2 files changed, 30 insertions(+) >>> create mode 100644 arch/riscv/kernel/crash_core.c >>> >>> diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile >>> index db6e4b1294ba..4cf303a779ab 100644 >>> --- a/arch/riscv/kernel/Makefile >>> +++ b/arch/riscv/kernel/Makefile >>> @@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o >>> obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.o crash_save_regs.o machine_kexec.o >>> obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o >>> obj-$(CONFIG_CRASH_DUMP) += crash_dump.o >>> +obj-$(CONFIG_CRASH_CORE) += crash_core.o >>> >>> obj-$(CONFIG_JUMP_LABEL) += jump_label.o >>> >>> diff --git a/arch/riscv/kernel/crash_core.c b/arch/riscv/kernel/crash_core.c >>> new file mode 100644 >>> index 000000000000..8d7f5ff108da >>> --- /dev/null >>> +++ b/arch/riscv/kernel/crash_core.c >>> @@ -0,0 +1,29 @@ >>> +// SPDX-License-Identifier: GPL-2.0-only >>> + >>> +#include <linux/crash_core.h> >>> +#include <linux/pagemap.h> >>> + >>> +void arch_crash_save_vmcoreinfo(void) >>> +{ >>> + VMCOREINFO_NUMBER(VA_BITS); >>> + VMCOREINFO_NUMBER(phys_ram_base); >>> + >>> + vmcoreinfo_append_str("NUMBER(PAGE_OFFSET)=0x%lx\n", PAGE_OFFSET); >>> + vmcoreinfo_append_str("NUMBER(VMALLOC_START)=0x%lx\n", VMALLOC_START); >>> + vmcoreinfo_append_str("NUMBER(VMALLOC_END)=0x%lx\n", VMALLOC_END); >>> + vmcoreinfo_append_str("NUMBER(VMEMMAP_START)=0x%lx\n", VMEMMAP_START); >>> + vmcoreinfo_append_str("NUMBER(VMEMMAP_END)=0x%lx\n", VMEMMAP_END); >>> +#ifdef CONFIG_64BIT >>> + vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR); >>> + vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END); >>> +#endif >>> + >>> + if (IS_ENABLED(CONFIG_64BIT)) { >> You've already got a #ifdef CONFIG_64BIT above, is there a reason why >> you'd use the IS_ENABLED here rather than merge this with the above >> section? I'm a big fan of IS_ENABLED but I'm not sure what it adds here, >> maybe you can show me the light :) > The IS_ENABLED() check prevents the line from getting executed, but > unlike an #ifdef it relies on it to be parsable. Hey Xianting, Firstly, neither this nor the other version of this message made it to the mailing list - and since I usually use lei to get my mails that is a bit of a problem :( Yeah, I know that that is what IS_ENABLED() does, it's just in this situation it does not look very intentional & more like disjoint bits of copy-paste. It's fine though, leave it as it is. Thanks, Conor. > > I wrote this arch_crash_save_vmcoreinfo() func with reference to this: static void __init print_vm_layout(void) // arch/riscv/mm/init.c > { > pr_notice("Virtual kernel memory layout:\n"); > print_ml("fixmap", (unsigned long)FIXADDR_START, > (unsigned long)FIXADDR_TOP); > print_ml("pci io", (unsigned long)PCI_IO_START, > (unsigned long)PCI_IO_END); > print_ml("vmemmap", (unsigned long)VMEMMAP_START, > (unsigned long)VMEMMAP_END); > print_ml("vmalloc", (unsigned long)VMALLOC_START, > (unsigned long)VMALLOC_END); > #ifdef CONFIG_64BIT > print_ml("modules", (unsigned long)MODULES_VADDR, > (unsigned long)MODULES_END); > #endif > print_ml("lowmem", (unsigned long)PAGE_OFFSET, > (unsigned long)high_memory); > if (IS_ENABLED(CONFIG_64BIT)) { > #ifdef CONFIG_KASAN > print_ml("kasan", KASAN_SHADOW_START, KASAN_SHADOW_END); > #endif > > print_ml("kernel", (unsigned long)KERNEL_LINK_ADDR, > (unsigned long)ADDRESS_SPACE_END); > } > } > >> Thanks, >> Conor. >> >> >>> +#ifdef CONFIG_KASAN >>> + vmcoreinfo_append_str("NUMBER(KASAN_SHADOW_START)=0x%lx\n", KASAN_SHADOW_START); >>> + vmcoreinfo_append_str("NUMBER(KASAN_SHADOW_END)=0x%lx\n", KASAN_SHADOW_END); >>> +#endif >>> + vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR); >>> + vmcoreinfo_append_str("NUMBER(ADDRESS_SPACE_END)=0x%lx\n", ADDRESS_SPACE_END); >>> + } >>> +} >>> -- >>> 2.17.1 >>> >>>
在 2022/10/18 下午3:19, Conor.Dooley@microchip.com 写道: > On 18/10/2022 03:28, Xianting Tian wrote: >> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe >> >> 在 2022/10/18 上午3:54, Conor Dooley 写道: >> >>> On Fri, Oct 14, 2022 at 09:41:38PM +0800, Xianting Tian wrote: >>>> * Linux Kernel 5.18 ~ >>>> * PGTABLE_LEVELS = 5 >>>> * PAGE_OFFSET = 0xff60000000000000 >>>> * Linux Kernel 5.17 ~ >>>> * PGTABLE_LEVELS = 4 >>>> * PAGE_OFFSET = 0xffffaf8000000000 >>>> * Linux Kernel 4.19 ~ >>>> * PGTABLE_LEVELS = 3 >>>> * PAGE_OFFSET = 0xffffffe000000000 >>>> >>>> Since these configurations change from time to time and version to version, >>>> it is preferable to export them via vmcoreinfo than to change the crash's >>>> code frequently, it can simplify the development of crash tool. >>>> >>>> Signed-off-by: Xianting Tian<xianting.tian@linux.alibaba.com> >>>> --- >>>> arch/riscv/kernel/Makefile | 1 + >>>> arch/riscv/kernel/crash_core.c | 29 +++++++++++++++++++++++++++++ >>>> 2 files changed, 30 insertions(+) >>>> create mode 100644 arch/riscv/kernel/crash_core.c >>>> >>>> diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile >>>> index db6e4b1294ba..4cf303a779ab 100644 >>>> --- a/arch/riscv/kernel/Makefile >>>> +++ b/arch/riscv/kernel/Makefile >>>> @@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o >>>> obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.o crash_save_regs.o machine_kexec.o >>>> obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o >>>> obj-$(CONFIG_CRASH_DUMP) += crash_dump.o >>>> +obj-$(CONFIG_CRASH_CORE) += crash_core.o >>>> >>>> obj-$(CONFIG_JUMP_LABEL) += jump_label.o >>>> >>>> diff --git a/arch/riscv/kernel/crash_core.c b/arch/riscv/kernel/crash_core.c >>>> new file mode 100644 >>>> index 000000000000..8d7f5ff108da >>>> --- /dev/null >>>> +++ b/arch/riscv/kernel/crash_core.c >>>> @@ -0,0 +1,29 @@ >>>> +// SPDX-License-Identifier: GPL-2.0-only >>>> + >>>> +#include <linux/crash_core.h> >>>> +#include <linux/pagemap.h> >>>> + >>>> +void arch_crash_save_vmcoreinfo(void) >>>> +{ >>>> + VMCOREINFO_NUMBER(VA_BITS); >>>> + VMCOREINFO_NUMBER(phys_ram_base); >>>> + >>>> + vmcoreinfo_append_str("NUMBER(PAGE_OFFSET)=0x%lx\n", PAGE_OFFSET); >>>> + vmcoreinfo_append_str("NUMBER(VMALLOC_START)=0x%lx\n", VMALLOC_START); >>>> + vmcoreinfo_append_str("NUMBER(VMALLOC_END)=0x%lx\n", VMALLOC_END); >>>> + vmcoreinfo_append_str("NUMBER(VMEMMAP_START)=0x%lx\n", VMEMMAP_START); >>>> + vmcoreinfo_append_str("NUMBER(VMEMMAP_END)=0x%lx\n", VMEMMAP_END); >>>> +#ifdef CONFIG_64BIT >>>> + vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR); >>>> + vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END); >>>> +#endif >>>> + >>>> + if (IS_ENABLED(CONFIG_64BIT)) { >>> You've already got a #ifdef CONFIG_64BIT above, is there a reason why >>> you'd use the IS_ENABLED here rather than merge this with the above >>> section? I'm a big fan of IS_ENABLED but I'm not sure what it adds here, >>> maybe you can show me the light :) >> The IS_ENABLED() check prevents the line from getting executed, but >> unlike an #ifdef it relies on it to be parsable. > Hey Xianting, > Firstly, neither this nor the other version of this message made it to > the mailing list - and since I usually use lei to get my mails that is > a bit of a problem :( Sorry, I don't know why, I just reply via Thunderbird. But git send-mail is right, I will send V3 soon. > > Yeah, I know that that is what IS_ENABLED() does, it's just in this > situation it does not look very intentional & more like disjoint bits > of copy-paste. It's fine though, leave it as it is. OK, thanks > > Thanks, > Conor. > >> I wrote this arch_crash_save_vmcoreinfo() func with reference to this: static void __init print_vm_layout(void) // arch/riscv/mm/init.c >> { >> pr_notice("Virtual kernel memory layout:\n"); >> print_ml("fixmap", (unsigned long)FIXADDR_START, >> (unsigned long)FIXADDR_TOP); >> print_ml("pci io", (unsigned long)PCI_IO_START, >> (unsigned long)PCI_IO_END); >> print_ml("vmemmap", (unsigned long)VMEMMAP_START, >> (unsigned long)VMEMMAP_END); >> print_ml("vmalloc", (unsigned long)VMALLOC_START, >> (unsigned long)VMALLOC_END); >> #ifdef CONFIG_64BIT >> print_ml("modules", (unsigned long)MODULES_VADDR, >> (unsigned long)MODULES_END); >> #endif >> print_ml("lowmem", (unsigned long)PAGE_OFFSET, >> (unsigned long)high_memory); >> if (IS_ENABLED(CONFIG_64BIT)) { >> #ifdef CONFIG_KASAN >> print_ml("kasan", KASAN_SHADOW_START, KASAN_SHADOW_END); >> #endif >> >> print_ml("kernel", (unsigned long)KERNEL_LINK_ADDR, >> (unsigned long)ADDRESS_SPACE_END); >> } >> } >> >>> Thanks, >>> Conor. >>> >>> >>>> +#ifdef CONFIG_KASAN >>>> + vmcoreinfo_append_str("NUMBER(KASAN_SHADOW_START)=0x%lx\n", KASAN_SHADOW_START); >>>> + vmcoreinfo_append_str("NUMBER(KASAN_SHADOW_END)=0x%lx\n", KASAN_SHADOW_END); >>>> +#endif >>>> + vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR); >>>> + vmcoreinfo_append_str("NUMBER(ADDRESS_SPACE_END)=0x%lx\n", ADDRESS_SPACE_END); >>>> + } >>>> +} >>>> -- >>>> 2.17.1 >>>> >>>>
diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index db6e4b1294ba..4cf303a779ab 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_KEXEC_CORE) += kexec_relocate.o crash_save_regs.o machine_kexec.o obj-$(CONFIG_KEXEC_FILE) += elf_kexec.o machine_kexec_file.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o +obj-$(CONFIG_CRASH_CORE) += crash_core.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o diff --git a/arch/riscv/kernel/crash_core.c b/arch/riscv/kernel/crash_core.c new file mode 100644 index 000000000000..8d7f5ff108da --- /dev/null +++ b/arch/riscv/kernel/crash_core.c @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include <linux/crash_core.h> +#include <linux/pagemap.h> + +void arch_crash_save_vmcoreinfo(void) +{ + VMCOREINFO_NUMBER(VA_BITS); + VMCOREINFO_NUMBER(phys_ram_base); + + vmcoreinfo_append_str("NUMBER(PAGE_OFFSET)=0x%lx\n", PAGE_OFFSET); + vmcoreinfo_append_str("NUMBER(VMALLOC_START)=0x%lx\n", VMALLOC_START); + vmcoreinfo_append_str("NUMBER(VMALLOC_END)=0x%lx\n", VMALLOC_END); + vmcoreinfo_append_str("NUMBER(VMEMMAP_START)=0x%lx\n", VMEMMAP_START); + vmcoreinfo_append_str("NUMBER(VMEMMAP_END)=0x%lx\n", VMEMMAP_END); +#ifdef CONFIG_64BIT + vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR); + vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END); +#endif + + if (IS_ENABLED(CONFIG_64BIT)) { +#ifdef CONFIG_KASAN + vmcoreinfo_append_str("NUMBER(KASAN_SHADOW_START)=0x%lx\n", KASAN_SHADOW_START); + vmcoreinfo_append_str("NUMBER(KASAN_SHADOW_END)=0x%lx\n", KASAN_SHADOW_END); +#endif + vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR); + vmcoreinfo_append_str("NUMBER(ADDRESS_SPACE_END)=0x%lx\n", ADDRESS_SPACE_END); + } +}