From patchwork Wed Oct 19 10:36:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xianting Tian X-Patchwork-Id: 5210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp264704wrs; Wed, 19 Oct 2022 04:20:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5p6j9L0Zhbkn3nq2QNZZjh+Ew1Ea72XVNFLNSpLS8pFOckRnSmH834XRZUu7TW4AR0STJ5 X-Received: by 2002:a05:6402:1e88:b0:45d:88f:4b99 with SMTP id f8-20020a0564021e8800b0045d088f4b99mr7068463edf.236.1666178444894; Wed, 19 Oct 2022 04:20:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666178444; cv=none; d=google.com; s=arc-20160816; b=zwH0Ts36jD3TRjVqapLGl43XrOsdcI8BxzzSDKiDKjY8MgZH/X+UIbnA0o4XqzfenP kIA8kPIGvG0jB+F0EXfLnd6Wf/uWldAOM65/7yky/wuy164RQfDaRimn0+mrNHM4ClXT veB2dZWZn1kjIGVmYx2qZFx8EfRm6iabGIk7WsrSmZVejRmOsl/0yaDVcP/kM1PpgqSA UC0fsnkPWfGqa31KJbaeE+mEcB1zuw+KcIGzbwp457GbJUGQ+CYbo+RyFpFb7dgz/iZI UXY8zsvXPNy6eg5oQ6seCLM/CPEbfjBQfjvCY3seaCj9KOUMFZI8/AfZF5MfzOSYus25 oQsw== 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=30sTVKmYOFohNo2T1PrQnUa6q1YZPw2rQ6+WvsWXDjI=; b=iji7yheR4U+wjVl3znSacYzrAZUQoxAwfSxVi46FKHlGATFc+HBKmnAipaC57iKaiU qUdOxpITR+pmUcvgj+mELiLzaLar6oCov0nyltgXsM1lhf+PmiVXgOKbscAfEeb6QaGb pCWrs0Aw86re1+DMakbNCf/NBzMTB3B46vPfFP0y/dx5KvI+YT2Lawp0Ve0m+rg13KIE H6Ux+OqsrNsbc5FeuDVU0cW+Fw9l05125mgD/+FY8rtzF+RMs7pg7pLH2OsPHBXqUwBT Dwx1LWxxBmicgORuF/Y4nknORXSyTH/E0UeXl3uDKN9GNCRK5CU8td8iMZFcaPwQtuUV lkyw== 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 hq8-20020a1709073f0800b0078c37681f89si17274908ejc.650.2022.10.19.04.20.16; Wed, 19 Oct 2022 04:20:44 -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 S233491AbiJSLKT (ORCPT + 99 others); Wed, 19 Oct 2022 07:10:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234758AbiJSLJK (ORCPT ); Wed, 19 Oct 2022 07:09: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 97B4817FD5D; Wed, 19 Oct 2022 03:37:59 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046059;MF=xianting.tian@linux.alibaba.com;NM=1;PH=DS;RN=25;SR=0;TI=SMTPD_---0VSaNssl_1666175795; Received: from localhost.localdomain(mailfrom:xianting.tian@linux.alibaba.com fp:SMTPD_---0VSaNssl_1666175795) by smtp.aliyun-inc.com; Wed, 19 Oct 2022 18:36:36 +0800 From: Xianting Tian 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, k-hagio-ab@nec.com, lijiang@redhat.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, hschauhan@nulltrace.org, yixun.lan@gmail.com, Xianting Tian Subject: [PATCH V4 1/2] RISC-V: Add arch_crash_save_vmcoreinfo support Date: Wed, 19 Oct 2022 18:36:22 +0800 Message-Id: <20221019103623.7008-2-xianting.tian@linux.alibaba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221019103623.7008-1-xianting.tian@linux.alibaba.com> References: <20221019103623.7008-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,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747114729026677294?= X-GMAIL-MSGID: =?utf-8?q?1747114729026677294?= Add arch_crash_save_vmcoreinfo(), which exports VM layout(MODULES, VMALLOC, VMEMMAP ranges and KERNEL_LINK_ADDR), va bits and ram base for vmcore. Default pagetable levels and PAGE_OFFSET aren't same for different kernel version as below. For pagetable levels, 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 and, for example, is 0x200000 on the 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 Tested-by: Guo Ren --- arch/riscv/kernel/Makefile | 1 + arch/riscv/kernel/crash_core.c | 23 +++++++++++++++++++++++ 2 files changed, 24 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..3e889d0ed7bd --- /dev/null +++ b/arch/riscv/kernel/crash_core.c @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include +#include + +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)) + vmcoreinfo_append_str("NUMBER(KERNEL_LINK_ADDR)=0x%lx\n", KERNEL_LINK_ADDR); +} From patchwork Wed Oct 19 10:36:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xianting Tian X-Patchwork-Id: 5207 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp264608wrs; Wed, 19 Oct 2022 04:20:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Swbah5h6SRTf/RWPB7eySyrTGyBKRjEvg7K6oi2a/C0Ggy3rgwtyaOuvPg6TqElAEVp3v X-Received: by 2002:a17:907:7b8b:b0:78d:cee5:3145 with SMTP id ne11-20020a1709077b8b00b0078dcee53145mr6031902ejc.537.1666178430955; Wed, 19 Oct 2022 04:20:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666178430; cv=none; d=google.com; s=arc-20160816; b=gQFZEDWfyY4ktwUq8M8BqWtECQL+DrAY6CGIA4TPGK9mwV6NYGi591A2sgQIUqsIKN ic/p9bGmgKi4drwS4vX2WwS3NH8Z2DN3aokeXmkB3YxXwA7mLELhB0TaTwXl6tWQ6npS NC3sYbtrWS3u3FBhfJnDqkxC3bLel+AvhAREdsfUfKvBNykZ/zvp+SGcBqlx9oG+1FKb V9Z/jVK1zh7DOGs6SKSuT2UkZKCE/uohUUQdz0znsb+khM8bRp+CWAap5eV/mM54yPvV Wqre2jqVdmaqWRoEmNWfj5YrQ/FFEJkeK9VwiXBeJ93BSvYaFDzdIrd5CyywDCbSB+V1 JuJg== 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=KfM6RfG7OkZJR3LDNCD8Kdld1hgwE8AWtXLQfATHXm8=; b=b8xmxJokCu3bkTAOFWbrChP5URrer0ffpZjyEpCwek7Xx8HfI3m8jMYnfrljfKAmAo Y/bryAJ7HHdTgcbEhjxigHktk89t3ty7MFt1RbI35WRJlp0ehTKcQSPNKlWAauc7jiZm D1EpHoYKIZX9/6pKa77PYvK3RrgUccK8YL8z1XRxSVLMsF7EDrh9mbsUOyaDM+jLLCgA C8LcU39Z7ghe3p0ztWDVO+DDjUylO//mTwoeQmr4nBzzB0ztvv1trZdGoycoNTCTk/be 0P8lVKxos7XbqJwGXnsdRO9cXdoeEnW8FiWI+ZoJPGIXMbOSBou0W71C0cDi5BT6Ckud aHgw== 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 n16-20020aa7c450000000b0043be542b956si12171933edr.262.2022.10.19.04.20.05; Wed, 19 Oct 2022 04:20:30 -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 S232818AbiJSLKI (ORCPT + 99 others); Wed, 19 Oct 2022 07:10:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234038AbiJSLJB (ORCPT ); Wed, 19 Oct 2022 07:09:01 -0400 Received: from out30-43.freemail.mail.aliyun.com (out30-43.freemail.mail.aliyun.com [115.124.30.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E1DC17D858; Wed, 19 Oct 2022 03:37:59 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R161e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=xianting.tian@linux.alibaba.com;NM=1;PH=DS;RN=25;SR=0;TI=SMTPD_---0VSaNstn_1666175796; Received: from localhost.localdomain(mailfrom:xianting.tian@linux.alibaba.com fp:SMTPD_---0VSaNstn_1666175796) by smtp.aliyun-inc.com; Wed, 19 Oct 2022 18:36:37 +0800 From: Xianting Tian 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, k-hagio-ab@nec.com, lijiang@redhat.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, hschauhan@nulltrace.org, yixun.lan@gmail.com, Xianting Tian Subject: [PATCH V4 2/2] Documentation: kdump: describe VMCOREINFO export for RISCV64 Date: Wed, 19 Oct 2022 18:36:23 +0800 Message-Id: <20221019103623.7008-3-xianting.tian@linux.alibaba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221019103623.7008-1-xianting.tian@linux.alibaba.com> References: <20221019103623.7008-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,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747114714324784260?= X-GMAIL-MSGID: =?utf-8?q?1747114714324784260?= The following interrelated definitions and ranges are needed by the kdump crash tool, which are exported by "arch/riscv/kernel/crash_core.c": VA_BITS, PAGE_OFFSET, phys_ram_base, KERNEL_LINK_ADDR, MODULES_VADDR ~ MODULES_END, VMALLOC_START ~ VMALLOC_END, VMEMMAP_START ~ VMEMMAP_END, Document these RISCV64 exports above. Signed-off-by: Xianting Tian Reviewed-by: Bagas Sanjaya --- .../admin-guide/kdump/vmcoreinfo.rst | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Documentation/admin-guide/kdump/vmcoreinfo.rst b/Documentation/admin-guide/kdump/vmcoreinfo.rst index 6726f439958c..86fd88492870 100644 --- a/Documentation/admin-guide/kdump/vmcoreinfo.rst +++ b/Documentation/admin-guide/kdump/vmcoreinfo.rst @@ -595,3 +595,32 @@ X2TLB ----- Indicates whether the crashed kernel enabled SH extended mode. + +RISCV64 +======= + +VA_BITS +------- + +The maximum number of bits for virtual addresses. Used to compute the +virtual memory ranges. + +PAGE_OFFSET +----------- + +Indicates the virtual kernel start address of the direct-mapped RAM region. + +phys_ram_base +------------- + +Indicates the start physical RAM address. + +MODULES_VADDR|MODULES_END|VMALLOC_START|VMALLOC_END|VMEMMAP_START|VMEMMAP_END|KERNEL_LINK_ADDR +---------------------------------------------------------------------------------------------- + +Used to get the correct ranges: + + * MODULES_VADDR ~ MODULES_END : Kernel module space. + * VMALLOC_START ~ VMALLOC_END : vmalloc() / ioremap() space. + * VMEMMAP_START ~ VMEMMAP_END : vmemmap space, used for struct page array. + * KERNEL_LINK_ADDR : start address of Kernel link and BPF