Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp106531imw; Wed, 13 Jul 2022 20:20:27 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sk3prLrUwi9fYcwQGIMNWa2Xog8fgoJ7SG00BleeWtH2AlN7p/tUBSffsf+GJ/XFNfLO+Z X-Received: by 2002:a65:6409:0:b0:416:f21:a651 with SMTP id a9-20020a656409000000b004160f21a651mr5792416pgv.300.1657768826935; Wed, 13 Jul 2022 20:20:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657768826; cv=none; d=google.com; s=arc-20160816; b=f/kiDtA3YJCcOTOvliA3UzCrySk27HbiurcRtRmP7SxpNHqB0GhtUKEGO8ooO6ZWji p7mHlXePGJUJ8PqCEFV4bsgccjQpp7AQuljTJ4u649ohl3YyciIKe0eCiyQgDydGfSSW XQxlZCLVfXuQlmkB75hW2mDVXTBx+o6keQnEXr/bkfvKVjg5SVg385uVnvGIKJ6LTtAw 6Sdjt27xrsFLeMz8FqDlkb/t8TBBAVDfpRprG2pB0F6G3U/Z2TBF7sBvLPPDySSeAnuh F2XTNCvnW0C35Saj/kolKh2JYbpX0BMM+p9I1Yz+G7Mooqhm9B6Ha484XpN9ef98dXmp JsGA== 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=Cg6ImjqhfGZIy3oKUcK4k/1RFJMaQgPvYkUbHdeFNAA=; b=opvc5Bnqowzcrdv7SVGXyRGsiUzfiH+DBG0+8hwNf55INlocUaj9NPv53BvJkN1p7Z f7HDrv899XLvZSVfP2Wty2s9A9a0gs5FR6+iYjkvah7zrBJZFMubJIjQAsJLUjBZwycm tybfSU2EdGSep6qsfkypAKdyHn5KG5Fu/BbmZtuMhpEcq4hvWYIXmgyNIdHuUD2fs0lu 71E7A8bToiCoJUa0YoUDxCfGIef04C2jA4uHTg/yQO5SUErj9KiYcggIK3n9S91HYmJ4 3czjr2TSd+E1i64ksyKUatXRrPl7LIcN73mrndMHGPklWgVusmUhrPgkD/s3Lk5mDtB/ nymg== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p2-20020a170902bd0200b0016c39c15fb9si481991pls.201.2022.07.13.20.20.14; Wed, 13 Jul 2022 20:20:26 -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 S232208AbiGNC7U (ORCPT + 99 others); Wed, 13 Jul 2022 22:59:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232042AbiGNC7K (ORCPT ); Wed, 13 Jul 2022 22:59:10 -0400 Received: from out30-56.freemail.mail.aliyun.com (out30-56.freemail.mail.aliyun.com [115.124.30.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9B671A048 for ; Wed, 13 Jul 2022 19:59:08 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R731e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046051;MF=xianting.tian@linux.alibaba.com;NM=1;PH=DS;RN=13;SR=0;TI=SMTPD_---0VJH7R.V_1657767544; Received: from localhost(mailfrom:xianting.tian@linux.alibaba.com fp:SMTPD_---0VJH7R.V_1657767544) by smtp.aliyun-inc.com; Thu, 14 Jul 2022 10:59:04 +0800 From: Xianting Tian To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alexandre.ghiti@canonical.com, guoren@kernel.org, anup@brainfault.org, mick@ics.forth.gr, rppt@kernel.org, heiko@sntech.de Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, huanyi.xj@alibaba-inc.com, Xianting Tian Subject: [PATCH V2 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support Date: Thu, 14 Jul 2022 10:59:00 +0800 Message-Id: <20220714025901.359695-2-xianting.tian@linux.alibaba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220714025901.359695-1-xianting.tian@linux.alibaba.com> References: <20220714025901.359695-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,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,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: X-Mailing-List: linux-kernel@vger.kernel.org Add arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC, VMEMMAP and KERNEL_LINK_ADDR ranges), satp mode and ram base to 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 --- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 arch/riscv/kernel/crash_core.c diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index c71d6591d539..54e4183db080 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -81,6 +81,7 @@ obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_KEXEC) += 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..c096904dd0f3 --- /dev/null +++ b/arch/riscv/kernel/crash_core.c @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include +#include + +void arch_crash_save_vmcoreinfo(void) +{ + VMCOREINFO_NUMBER(VA_BITS); + VMCOREINFO_NUMBER(phys_ram_base); + + /* Please note VMCOREINFO_NUMBER() uses "%d", not "%x" */ + 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); + + if (IS_ENABLED(CONFIG_64BIT)) { + vmcoreinfo_append_str("NUMBER(MODULES_VADDR)=0x%lx\n", MODULES_VADDR); + vmcoreinfo_append_str("NUMBER(MODULES_END)=0x%lx\n", MODULES_END); +#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