Received: by 2002:a05:7412:798b:b0:fc:a2b0:25d7 with SMTP id fb11csp188821rdb; Wed, 21 Feb 2024 23:57:58 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXYu8uZBOqRw5AMkBL0zNChQdbENMQvewGV4cFWkA6Hg8nX19ItabvlWzTtK6hl+2mQ+hRgnx2BjtgzVh1FHq8L1+eOmAirks0jFXvcFw== X-Google-Smtp-Source: AGHT+IFp6pNW0vThUaFN0ECZpvDMJOvTm/rzeGOgIzJMN+HLLcRy9T8A9pmb3dLIFLtLE5EIhgFR X-Received: by 2002:a05:6512:3ca5:b0:512:d907:3161 with SMTP id h37-20020a0565123ca500b00512d9073161mr1701998lfv.66.1708588678571; Wed, 21 Feb 2024 23:57:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708588678; cv=pass; d=google.com; s=arc-20160816; b=wycwIsFubJ/qU/69t19ErYZAHH8OYsc4HBgO5emaYs/YAX7tNIhH2Ia6YDc3Vo3HP6 LOKxLoMEJXXlNyv5GgM+M0rVJKjGUzn1uxZavOL1LnfFpcx4PVAqBMA/lwLJvjDXZ3sM bBmk+vJOgSijKiJxLx7o0a9AqQ0wzgVxkUw/EcUnvqsgB6rblbKUXuH8yRIuABYHqXep w3b3yL1z3NLxa35QmrFzQ45tPmNs7kKFlDgDq+yq0B+0QMeWqxaxXr+QbboTlZ8qyIsu CrCNW1/wfi1KX824yl0aOuP0sW/WlrSQnA9INXIRk2Yho+qT/z8l4XffrZs9WPTUNCiC 4nOQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-disposition:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:message-id:subject:cc :to:from:date:dkim-signature; bh=WhcRfSRUiLi/DRU1WlipMOrtmt88GcHZzot8syBPqRo=; fh=J1tRH/ZIx2r6sMIkFCBo6tyguzmR7ipVwzDjict+cu8=; b=DrwO9kUiGoYBXsqYZQHwER2nyJVDWjjTJQY5itCyrS4pAmZ4z63YbVTTA02v/HmPob tljg77osCBInsjBOkRY5CnoQBunYf/Z27Qjg7rsJjFP+ptZwHzl/VpgjI4PFOlN0KdAy gj/wDeYN8fPlgy9Ngdw7C7NbKjd4Ibys8bYot9iJQ3mF7RwwG1REGcPOBAur2zatond1 ATnTiEO6Xl9t1RKsafmELO9fKyImw9ouBVRns76nZmmn+FgJJjaU94cs3X7IYHSp6Ikg ETIGjDNepIapINXWoOBiro9fhy+h9rs20hjRl6n7DF5bZtt71XlFffEOcAhek2lS9Dyf GHSA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="R/9Igtxu"; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-76038-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76038-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id q16-20020a056402519000b00564ed0b56adsi1499109edd.256.2024.02.21.23.57.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 23:57:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76038-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="R/9Igtxu"; arc=pass (i=1 spf=pass spfdomain=redhat.com dkim=pass dkdomain=redhat.com dmarc=pass fromdomain=redhat.com); spf=pass (google.com: domain of linux-kernel+bounces-76038-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76038-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 8E7221F22463 for ; Thu, 22 Feb 2024 07:57:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EBCC617BAA; Thu, 22 Feb 2024 07:57:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="R/9Igtxu" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BF3B17BDC for ; Thu, 22 Feb 2024 07:57:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708588665; cv=none; b=Y+dTe8u1pMX2J+n4s+JDzaqM5e6wdvm730TEerNfBllV7kncPSFCynvwN1+o/RsxoYvoccfpLx4Zl1/rg2BV2aSt3flP8urEEEOw4PCGe1tFEpcG8z8SQASS3IZ9h67hSSUMlKYpVps30lUt/7h8KvHz57nFSylY53NZymj2TF0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708588665; c=relaxed/simple; bh=cmtxFJFOp1E3mlrPE471qZd1pHbvPXk0iOWua/J3yo0=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=fkKR5mnUEfGuFdEhDG5KovqpxaVw89lHnERZM3v3C3IDOsS6kDvRpdPo6U9AKsFhbgZqouAMyLb8uhltTCzIZlPA5KNHpxXHgNEIUryG7AmCqhkET+SdbpOEbscY0aRNNGs16PzDBVecuASZmPP3E6hxAsNLiJboMrCI1ZXAgd8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=R/9Igtxu; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708588661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WhcRfSRUiLi/DRU1WlipMOrtmt88GcHZzot8syBPqRo=; b=R/9IgtxufNpSIDGAtU24U4nRQo0UGPhjnxa9z502Im8NXFJxItP59L/I61jbDPXYI+H4+y 7sbDMhTnoJTWBNg/E2fCQBT76xtheB45/WElG3UAIfkZ4neSJcJC8I+6OnWq8eEtFnAeaa ZBYurv0hZRfwZQf2/OqA99yETtzXS7o= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-359-kTvqDTybMaeDxgKOPN6wDw-1; Thu, 22 Feb 2024 02:57:37 -0500 X-MC-Unique: kTvqDTybMaeDxgKOPN6wDw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 07A6285A58A; Thu, 22 Feb 2024 07:57:37 +0000 (UTC) Received: from localhost (unknown [10.72.116.2]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 55816492BC8; Thu, 22 Feb 2024 07:57:30 +0000 (UTC) Date: Thu, 22 Feb 2024 15:57:30 +0800 From: Baoquan He To: Sourabh Jain Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, piliu@redhat.com, linux-sh@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, linux-mips@vger.kernel.org, ebiederm@xmission.com, loongarch@lists.linux.dev, hbathini@linux.ibm.com, linux-riscv@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, akpm@linux-foundation.org, linux-arm-kernel@lists.infradead.org, viro@zeniv.linux.org.uk Subject: Re: [PATCH v2 02/14] crash: split vmcoreinfo exporting code out from crash_core.c Message-ID: References: <20240119145241.769622-1-bhe@redhat.com> <20240119145241.769622-3-bhe@redhat.com> <75c77583-6253-4d32-8daf-0e86a2cad226@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <75c77583-6253-4d32-8daf-0e86a2cad226@linux.ibm.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 On 02/21/24 at 11:07pm, Sourabh Jain wrote: > Hello Baoquan, > > On 19/01/24 20:22, Baoquan He wrote: > > Now move the relevant codes into separate files: > > kernel/crash_reserve.c, include/linux/crash_reserve.h. > > > > And add config item CRASH_RESERVE to control its enabling. > > Feels like this patch is more about vmcore_info.[c|h] and CONFIG_VMCORE_INFO > then the above mentioned files and config. You are right. Above lines about crash_reserve should be removed. It's from v1, and done in patch 1 of v2 and v3. I forgot removing them. > > > > > And also update the old ifdeffery of CONFIG_CRASH_CORE, including of > > and config item dependency on CRASH_CORE > > accordingly. > > > > And also do renaming as follows: > > - arch/xxx/kernel/{crash_core.c => vmcore_info.c} > > because they are only related to vmcoreinfo exporting on x86, arm64, > > riscv. > > > > And also Remove config item CRASH_CORE, and rely on CONFIG_KEXEC_CORE to > > decide if build in crash_core.c. > > > > Signed-off-by: Baoquan He > > --- > > arch/arm64/kernel/Makefile | 2 +- > > .../kernel/{crash_core.c => vmcore_info.c} | 2 +- > > arch/powerpc/Kconfig | 2 +- > > arch/powerpc/kernel/setup-common.c | 2 +- > > arch/powerpc/platforms/powernv/opal-core.c | 2 +- > > arch/riscv/kernel/Makefile | 2 +- > > .../kernel/{crash_core.c => vmcore_info.c} | 2 +- > > arch/x86/kernel/Makefile | 2 +- > > .../{crash_core_32.c => vmcore_info_32.c} | 2 +- > > .../{crash_core_64.c => vmcore_info_64.c} | 2 +- > > drivers/firmware/qemu_fw_cfg.c | 14 +- > > fs/proc/Kconfig | 2 +- > > fs/proc/kcore.c | 2 +- > > include/linux/buildid.h | 2 +- > > include/linux/crash_core.h | 73 ------ > > include/linux/kexec.h | 1 + > > include/linux/vmcore_info.h | 81 ++++++ > > kernel/Kconfig.kexec | 4 +- > > kernel/Makefile | 4 +- > > kernel/crash_core.c | 208 ---------------- > > kernel/ksysfs.c | 6 +- > > kernel/printk/printk.c | 4 +- > > kernel/vmcore_info.c | 233 ++++++++++++++++++ > > lib/buildid.c | 2 +- > > 24 files changed, 345 insertions(+), 311 deletions(-) > > rename arch/arm64/kernel/{crash_core.c => vmcore_info.c} (97%) > > rename arch/riscv/kernel/{crash_core.c => vmcore_info.c} (96%) > > rename arch/x86/kernel/{crash_core_32.c => vmcore_info_32.c} (90%) > > rename arch/x86/kernel/{crash_core_64.c => vmcore_info_64.c} (94%) > > create mode 100644 include/linux/vmcore_info.h > > create mode 100644 kernel/vmcore_info.c > > > > diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile > > index d95b3d6b471a..bcf89587a549 100644 > > --- a/arch/arm64/kernel/Makefile > > +++ b/arch/arm64/kernel/Makefile > > @@ -66,7 +66,7 @@ obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file.o kexec_image.o > > obj-$(CONFIG_ARM64_RELOC_TEST) += arm64-reloc-test.o > > arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o > > obj-$(CONFIG_CRASH_DUMP) += crash_dump.o > > -obj-$(CONFIG_CRASH_CORE) += crash_core.o > > +obj-$(CONFIG_VMCORE_INFO) += vmcore_info.o > > obj-$(CONFIG_ARM_SDE_INTERFACE) += sdei.o > > obj-$(CONFIG_ARM64_PTR_AUTH) += pointer_auth.o > > obj-$(CONFIG_ARM64_MTE) += mte.o > > diff --git a/arch/arm64/kernel/crash_core.c b/arch/arm64/kernel/vmcore_info.c > > similarity index 97% > > rename from arch/arm64/kernel/crash_core.c > > rename to arch/arm64/kernel/vmcore_info.c > > index 66cde752cd74..a5abf7186922 100644 > > --- a/arch/arm64/kernel/crash_core.c > > +++ b/arch/arm64/kernel/vmcore_info.c > > @@ -4,7 +4,7 @@ > > * Copyright (C) Huawei Futurewei Technologies. > > */ > > -#include > > +#include > > #include > > #include > > #include > > diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig > > index 6aeab95f0edd..1520146d7c2c 100644 > > --- a/arch/powerpc/Kconfig > > +++ b/arch/powerpc/Kconfig > > @@ -690,7 +690,7 @@ config ARCH_SELECTS_CRASH_DUMP > > config FA_DUMP > > bool "Firmware-assisted dump" > > depends on PPC64 && (PPC_RTAS || PPC_POWERNV) > > - select CRASH_CORE > > + select VMCORE_INFO > > select CRASH_RESERVE > > select CRASH_DUMP > > help > > diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c > > index 9b142b9d5187..733f210ffda1 100644 > > --- a/arch/powerpc/kernel/setup-common.c > > +++ b/arch/powerpc/kernel/setup-common.c > > @@ -109,7 +109,7 @@ int ppc_do_canonicalize_irqs; > > EXPORT_SYMBOL(ppc_do_canonicalize_irqs); > > #endif > > -#ifdef CONFIG_CRASH_CORE > > +#ifdef CONFIG_VMCORE_INFO > > /* This keeps a track of which one is the crashing cpu. */ > > int crashing_cpu = -1; > > #endif > > diff --git a/arch/powerpc/platforms/powernv/opal-core.c b/arch/powerpc/platforms/powernv/opal-core.c > > index bb7657115f1d..c9a9b759cc92 100644 > > --- a/arch/powerpc/platforms/powernv/opal-core.c > > +++ b/arch/powerpc/platforms/powernv/opal-core.c > > @@ -16,7 +16,7 @@ > > #include > > #include > > #include > > -#include > > +#include > > #include > > #include > > diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile > > index c92c623b311e..63a36539ea1a 100644 > > --- a/arch/riscv/kernel/Makefile > > +++ b/arch/riscv/kernel/Makefile > > @@ -91,7 +91,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_VMCORE_INFO) += vmcore_info.o > > obj-$(CONFIG_JUMP_LABEL) += jump_label.o > > diff --git a/arch/riscv/kernel/crash_core.c b/arch/riscv/kernel/vmcore_info.c > > similarity index 96% > > rename from arch/riscv/kernel/crash_core.c > > rename to arch/riscv/kernel/vmcore_info.c > > index 8706736fd4e2..e8ad57a60a2f 100644 > > --- a/arch/riscv/kernel/crash_core.c > > +++ b/arch/riscv/kernel/vmcore_info.c > > @@ -1,6 +1,6 @@ > > // SPDX-License-Identifier: GPL-2.0-only > > -#include > > +#include > > #include > > void arch_crash_save_vmcoreinfo(void) > > diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile > > index 0000325ab98f..913d4022131e 100644 > > --- a/arch/x86/kernel/Makefile > > +++ b/arch/x86/kernel/Makefile > > @@ -98,7 +98,7 @@ obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o > > obj-$(CONFIG_X86_TSC) += trace_clock.o > > obj-$(CONFIG_TRACING) += trace.o > > obj-$(CONFIG_RETHOOK) += rethook.o > > -obj-$(CONFIG_CRASH_CORE) += crash_core_$(BITS).o > > +obj-$(CONFIG_VMCORE_INFO) += vmcore_info_$(BITS).o > > obj-$(CONFIG_KEXEC_CORE) += machine_kexec_$(BITS).o > > obj-$(CONFIG_KEXEC_CORE) += relocate_kernel_$(BITS).o crash.o > > obj-$(CONFIG_KEXEC_FILE) += kexec-bzimage64.o > > diff --git a/arch/x86/kernel/crash_core_32.c b/arch/x86/kernel/vmcore_info_32.c > > similarity index 90% > > rename from arch/x86/kernel/crash_core_32.c > > rename to arch/x86/kernel/vmcore_info_32.c > > index 8a89c109e20a..5995a749288a 100644 > > --- a/arch/x86/kernel/crash_core_32.c > > +++ b/arch/x86/kernel/vmcore_info_32.c > > @@ -1,6 +1,6 @@ > > // SPDX-License-Identifier: GPL-2.0-only > > -#include > > +#include > > #include > > #include > > diff --git a/arch/x86/kernel/crash_core_64.c b/arch/x86/kernel/vmcore_info_64.c > > similarity index 94% > > rename from arch/x86/kernel/crash_core_64.c > > rename to arch/x86/kernel/vmcore_info_64.c > > index 7d255f882afe..0dec7d868754 100644 > > --- a/arch/x86/kernel/crash_core_64.c > > +++ b/arch/x86/kernel/vmcore_info_64.c > > @@ -1,6 +1,6 @@ > > // SPDX-License-Identifier: GPL-2.0-only > > -#include > > +#include > > #include > > #include > > diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c > > index 03da9a4354f8..5f43dfa22f79 100644 > > --- a/drivers/firmware/qemu_fw_cfg.c > > +++ b/drivers/firmware/qemu_fw_cfg.c > > @@ -37,7 +37,7 @@ > > #include > > #include > > #include > > -#include > > +#include > > MODULE_AUTHOR("Gabriel L. Somlo "); > > MODULE_DESCRIPTION("QEMU fw_cfg sysfs support"); > > @@ -67,7 +67,7 @@ static void fw_cfg_sel_endianness(u16 key) > > iowrite16(key, fw_cfg_reg_ctrl); > > } > > -#ifdef CONFIG_CRASH_CORE > > +#ifdef CONFIG_VMCORE_INFO > > static inline bool fw_cfg_dma_enabled(void) > > { > > return (fw_cfg_rev & FW_CFG_VERSION_DMA) && fw_cfg_reg_dma; > > @@ -156,7 +156,7 @@ static ssize_t fw_cfg_read_blob(u16 key, > > return count; > > } > > -#ifdef CONFIG_CRASH_CORE > > +#ifdef CONFIG_VMCORE_INFO > > /* write chunk of given fw_cfg blob (caller responsible for sanity-check) */ > > static ssize_t fw_cfg_write_blob(u16 key, > > void *buf, loff_t pos, size_t count) > > @@ -195,7 +195,7 @@ static ssize_t fw_cfg_write_blob(u16 key, > > return ret; > > } > > -#endif /* CONFIG_CRASH_CORE */ > > +#endif /* CONFIG_VMCORE_INFO */ > > /* clean up fw_cfg device i/o */ > > static void fw_cfg_io_cleanup(void) > > @@ -319,7 +319,7 @@ struct fw_cfg_sysfs_entry { > > struct list_head list; > > }; > > -#ifdef CONFIG_CRASH_CORE > > +#ifdef CONFIG_VMCORE_INFO > > static ssize_t fw_cfg_write_vmcoreinfo(const struct fw_cfg_file *f) > > { > > static struct fw_cfg_vmcoreinfo *data; > > @@ -343,7 +343,7 @@ static ssize_t fw_cfg_write_vmcoreinfo(const struct fw_cfg_file *f) > > kfree(data); > > return ret; > > } > > -#endif /* CONFIG_CRASH_CORE */ > > +#endif /* CONFIG_VMCORE_INFO */ > > /* get fw_cfg_sysfs_entry from kobject member */ > > static inline struct fw_cfg_sysfs_entry *to_entry(struct kobject *kobj) > > @@ -583,7 +583,7 @@ static int fw_cfg_register_file(const struct fw_cfg_file *f) > > int err; > > struct fw_cfg_sysfs_entry *entry; > > -#ifdef CONFIG_CRASH_CORE > > +#ifdef CONFIG_VMCORE_INFO > > if (fw_cfg_dma_enabled() && > > strcmp(f->name, FW_CFG_VMCOREINFO_FILENAME) == 0 && > > !is_kdump_kernel()) { > > diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig > > index 32b1116ae137..d80a1431ef7b 100644 > > --- a/fs/proc/Kconfig > > +++ b/fs/proc/Kconfig > > @@ -32,7 +32,7 @@ config PROC_FS > > config PROC_KCORE > > bool "/proc/kcore support" if !ARM > > depends on PROC_FS && MMU > > - select CRASH_CORE > > + select VMCORE_INFO > > help > > Provides a virtual ELF core file of the live kernel. This can > > be read with gdb and other ELF tools. No modifications can be > > diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c > > index 6422e569b080..8e08a9a1b7ed 100644 > > --- a/fs/proc/kcore.c > > +++ b/fs/proc/kcore.c > > @@ -10,7 +10,7 @@ > > * Safe accesses to vmalloc/direct-mapped discontiguous areas, Kanoj Sarcar > > */ > > -#include > > +#include > > #include > > #include > > #include > > diff --git a/include/linux/buildid.h b/include/linux/buildid.h > > index 8a582d242f06..20aa3c2d89f7 100644 > > --- a/include/linux/buildid.h > > +++ b/include/linux/buildid.h > > @@ -11,7 +11,7 @@ int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id, > > __u32 *size); > > int build_id_parse_buf(const void *buf, unsigned char *build_id, u32 buf_size); > > -#if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) || IS_ENABLED(CONFIG_CRASH_CORE) > > +#if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) || IS_ENABLED(CONFIG_VMCORE_INFO) > > extern unsigned char vmlinux_build_id[BUILD_ID_SIZE_MAX]; > > void init_vmlinux_build_id(void); > > #else > > diff --git a/include/linux/crash_core.h b/include/linux/crash_core.h > > index 1fde49246fa6..7f19f62018ef 100644 > > --- a/include/linux/crash_core.h > > +++ b/include/linux/crash_core.h > > @@ -6,79 +6,6 @@ > > #include > > #include > > -#define CRASH_CORE_NOTE_NAME "CORE" > > -#define CRASH_CORE_NOTE_HEAD_BYTES ALIGN(sizeof(struct elf_note), 4) > > -#define CRASH_CORE_NOTE_NAME_BYTES ALIGN(sizeof(CRASH_CORE_NOTE_NAME), 4) > > -#define CRASH_CORE_NOTE_DESC_BYTES ALIGN(sizeof(struct elf_prstatus), 4) > > - > > -/* > > - * The per-cpu notes area is a list of notes terminated by a "NULL" > > - * note header. For kdump, the code in vmcore.c runs in the context > > - * of the second kernel to combine them into one note. > > - */ > > -#define CRASH_CORE_NOTE_BYTES ((CRASH_CORE_NOTE_HEAD_BYTES * 2) + \ > > - CRASH_CORE_NOTE_NAME_BYTES + \ > > - CRASH_CORE_NOTE_DESC_BYTES) > > - > > -#define VMCOREINFO_BYTES PAGE_SIZE > > -#define VMCOREINFO_NOTE_NAME "VMCOREINFO" > > -#define VMCOREINFO_NOTE_NAME_BYTES ALIGN(sizeof(VMCOREINFO_NOTE_NAME), 4) > > -#define VMCOREINFO_NOTE_SIZE ((CRASH_CORE_NOTE_HEAD_BYTES * 2) + \ > > - VMCOREINFO_NOTE_NAME_BYTES + \ > > - VMCOREINFO_BYTES) > > - > > -typedef u32 note_buf_t[CRASH_CORE_NOTE_BYTES/4]; > > -/* Per cpu memory for storing cpu states in case of system crash. */ > > -extern note_buf_t __percpu *crash_notes; > > - > > -void crash_update_vmcoreinfo_safecopy(void *ptr); > > -void crash_save_vmcoreinfo(void); > > -void arch_crash_save_vmcoreinfo(void); > > -__printf(1, 2) > > -void vmcoreinfo_append_str(const char *fmt, ...); > > -phys_addr_t paddr_vmcoreinfo_note(void); > > - > > -#define VMCOREINFO_OSRELEASE(value) \ > > - vmcoreinfo_append_str("OSRELEASE=%s\n", value) > > -#define VMCOREINFO_BUILD_ID() \ > > - ({ \ > > - static_assert(sizeof(vmlinux_build_id) == 20); \ > > - vmcoreinfo_append_str("BUILD-ID=%20phN\n", vmlinux_build_id); \ > > - }) > > - > > -#define VMCOREINFO_PAGESIZE(value) \ > > - 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)) > > -#define VMCOREINFO_STRUCT_SIZE(name) \ > > - vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \ > > - (unsigned long)sizeof(struct name)) > > -#define VMCOREINFO_OFFSET(name, field) \ > > - vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \ > > - (unsigned long)offsetof(struct name, field)) > > -#define VMCOREINFO_TYPE_OFFSET(name, field) \ > > - vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \ > > - (unsigned long)offsetof(name, field)) > > -#define VMCOREINFO_LENGTH(name, value) \ > > - vmcoreinfo_append_str("LENGTH(%s)=%lu\n", #name, (unsigned long)value) > > -#define VMCOREINFO_NUMBER(name) \ > > - vmcoreinfo_append_str("NUMBER(%s)=%ld\n", #name, (long)name) > > -#define VMCOREINFO_CONFIG(name) \ > > - vmcoreinfo_append_str("CONFIG_%s=y\n", #name) > > - > > -extern unsigned char *vmcoreinfo_data; > > -extern size_t vmcoreinfo_size; > > -extern u32 *vmcoreinfo_note; > > - > > -Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type, > > - void *data, size_t data_len); > > -void final_note(Elf_Word *buf); > > - > > /* Alignment required for elf header segment */ > > #define ELF_CORE_HEADER_ALIGN 4096 > > diff --git a/include/linux/kexec.h b/include/linux/kexec.h > > index 6d79bfb52e5b..9c7bb8b56ed6 100644 > > --- a/include/linux/kexec.h > > +++ b/include/linux/kexec.h > > @@ -16,6 +16,7 @@ > > #if !defined(__ASSEMBLY__) > > #include > > +#include > > #include > > #include > > #include > > diff --git a/include/linux/vmcore_info.h b/include/linux/vmcore_info.h > > new file mode 100644 > > index 000000000000..e1dec1a6a749 > > --- /dev/null > > +++ b/include/linux/vmcore_info.h > > @@ -0,0 +1,81 @@ > > +/* SPDX-License-Identifier: GPL-2.0 */ > > +#ifndef LINUX_VMCORE_INFO_H > > +#define LINUX_VMCORE_INFO_H > > + > > +#include > > +#include > > +#include > > + > > +#define CRASH_CORE_NOTE_NAME "CORE" > > +#define CRASH_CORE_NOTE_HEAD_BYTES ALIGN(sizeof(struct elf_note), 4) > > +#define CRASH_CORE_NOTE_NAME_BYTES ALIGN(sizeof(CRASH_CORE_NOTE_NAME), 4) > > +#define CRASH_CORE_NOTE_DESC_BYTES ALIGN(sizeof(struct elf_prstatus), 4) > > + > > +/* > > + * The per-cpu notes area is a list of notes terminated by a "NULL" > > + * note header. For kdump, the code in vmcore.c runs in the context > > + * of the second kernel to combine them into one note. > > + */ > > +#define CRASH_CORE_NOTE_BYTES ((CRASH_CORE_NOTE_HEAD_BYTES * 2) + \ > > + CRASH_CORE_NOTE_NAME_BYTES + \ > > + CRASH_CORE_NOTE_DESC_BYTES) > > + > > +#define VMCOREINFO_BYTES PAGE_SIZE > > +#define VMCOREINFO_NOTE_NAME "VMCOREINFO" > > +#define VMCOREINFO_NOTE_NAME_BYTES ALIGN(sizeof(VMCOREINFO_NOTE_NAME), 4) > > +#define VMCOREINFO_NOTE_SIZE ((CRASH_CORE_NOTE_HEAD_BYTES * 2) + \ > > + VMCOREINFO_NOTE_NAME_BYTES + \ > > + VMCOREINFO_BYTES) > > + > > +typedef u32 note_buf_t[CRASH_CORE_NOTE_BYTES/4]; > > +/* Per cpu memory for storing cpu states in case of system crash. */ > > +extern note_buf_t __percpu *crash_notes; > > + > > +void crash_update_vmcoreinfo_safecopy(void *ptr); > > +void crash_save_vmcoreinfo(void); > > +void arch_crash_save_vmcoreinfo(void); > > +__printf(1, 2) > > +void vmcoreinfo_append_str(const char *fmt, ...); > > +phys_addr_t paddr_vmcoreinfo_note(void); > > + > > +#define VMCOREINFO_OSRELEASE(value) \ > > + vmcoreinfo_append_str("OSRELEASE=%s\n", value) > > +#define VMCOREINFO_BUILD_ID() \ > > + ({ \ > > + static_assert(sizeof(vmlinux_build_id) == 20); \ > > + vmcoreinfo_append_str("BUILD-ID=%20phN\n", vmlinux_build_id); \ > > + }) > > + > > +#define VMCOREINFO_PAGESIZE(value) \ > > + 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)) > > +#define VMCOREINFO_STRUCT_SIZE(name) \ > > + vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \ > > + (unsigned long)sizeof(struct name)) > > +#define VMCOREINFO_OFFSET(name, field) \ > > + vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \ > > + (unsigned long)offsetof(struct name, field)) > > +#define VMCOREINFO_TYPE_OFFSET(name, field) \ > > + vmcoreinfo_append_str("OFFSET(%s.%s)=%lu\n", #name, #field, \ > > + (unsigned long)offsetof(name, field)) > > +#define VMCOREINFO_LENGTH(name, value) \ > > + vmcoreinfo_append_str("LENGTH(%s)=%lu\n", #name, (unsigned long)value) > > +#define VMCOREINFO_NUMBER(name) \ > > + vmcoreinfo_append_str("NUMBER(%s)=%ld\n", #name, (long)name) > > +#define VMCOREINFO_CONFIG(name) \ > > + vmcoreinfo_append_str("CONFIG_%s=y\n", #name) > > + > > +extern unsigned char *vmcoreinfo_data; > > +extern size_t vmcoreinfo_size; > > +extern u32 *vmcoreinfo_note; > > + > > +Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type, > > + void *data, size_t data_len); > > +void final_note(Elf_Word *buf); > > +#endif /* LINUX_VMCORE_INFO_H */ > > diff --git a/kernel/Kconfig.kexec b/kernel/Kconfig.kexec > > index 8b7be71edd85..8faf27043432 100644 > > --- a/kernel/Kconfig.kexec > > +++ b/kernel/Kconfig.kexec > > @@ -5,11 +5,11 @@ menu "Kexec and crash features" > > config CRASH_RESERVE > > bool > > -config CRASH_CORE > > +config VMCORE_INFO > > bool > > config KEXEC_CORE > > - select CRASH_CORE > > + select VMCORE_INFO > > select CRASH_RESERVE > > bool > > diff --git a/kernel/Makefile b/kernel/Makefile > > index 05fa88b3ab74..649272a1d6b9 100644 > > --- a/kernel/Makefile > > +++ b/kernel/Makefile > > @@ -68,9 +68,9 @@ obj-$(CONFIG_MODULE_SIG_FORMAT) += module_signature.o > > obj-$(CONFIG_KALLSYMS) += kallsyms.o > > obj-$(CONFIG_KALLSYMS_SELFTEST) += kallsyms_selftest.o > > obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o > > -obj-$(CONFIG_CRASH_CORE) += crash_core.o > > +obj-$(CONFIG_VMCORE_INFO) += vmcore_info.o > > obj-$(CONFIG_CRASH_RESERVE) += crash_reserve.o > > -obj-$(CONFIG_KEXEC_CORE) += kexec_core.o > > +obj-$(CONFIG_KEXEC_CORE) += kexec_core.o crash_core.o > > obj-$(CONFIG_KEXEC) += kexec.o > > obj-$(CONFIG_KEXEC_FILE) += kexec_file.o > > obj-$(CONFIG_KEXEC_ELF) += kexec_elf.o > > diff --git a/kernel/crash_core.c b/kernel/crash_core.c > > index 055859c62f19..2f4df1fe6f7a 100644 > > --- a/kernel/crash_core.c > > +++ b/kernel/crash_core.c > > @@ -26,14 +26,6 @@ > > /* Per cpu memory for storing cpu states in case of system crash. */ > > note_buf_t __percpu *crash_notes; > > -/* vmcoreinfo stuff */ > > -unsigned char *vmcoreinfo_data; > > -size_t vmcoreinfo_size; > > -u32 *vmcoreinfo_note; > > - > > -/* trusted vmcoreinfo, e.g. we can make a copy in the crash memory */ > > -static unsigned char *vmcoreinfo_data_safecopy; > > - > > int crash_prepare_elf64_headers(struct crash_mem *mem, int need_kernel_map, > > void **addr, unsigned long *sz) > > { > > @@ -195,206 +187,6 @@ int crash_exclude_mem_range(struct crash_mem *mem, > > return 0; > > } > > -Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type, > > - void *data, size_t data_len) > > -{ > > - struct elf_note *note = (struct elf_note *)buf; > > - > > - note->n_namesz = strlen(name) + 1; > > - note->n_descsz = data_len; > > - note->n_type = type; > > - buf += DIV_ROUND_UP(sizeof(*note), sizeof(Elf_Word)); > > - memcpy(buf, name, note->n_namesz); > > - buf += DIV_ROUND_UP(note->n_namesz, sizeof(Elf_Word)); > > - memcpy(buf, data, data_len); > > - buf += DIV_ROUND_UP(data_len, sizeof(Elf_Word)); > > - > > - return buf; > > -} > > - > > -void final_note(Elf_Word *buf) > > -{ > > - memset(buf, 0, sizeof(struct elf_note)); > > -} > > - > > -static void update_vmcoreinfo_note(void) > > -{ > > - u32 *buf = vmcoreinfo_note; > > - > > - if (!vmcoreinfo_size) > > - return; > > - buf = append_elf_note(buf, VMCOREINFO_NOTE_NAME, 0, vmcoreinfo_data, > > - vmcoreinfo_size); > > - final_note(buf); > > -} > > - > > -void crash_update_vmcoreinfo_safecopy(void *ptr) > > -{ > > - if (ptr) > > - memcpy(ptr, vmcoreinfo_data, vmcoreinfo_size); > > - > > - vmcoreinfo_data_safecopy = ptr; > > -} > > - > > -void crash_save_vmcoreinfo(void) > > -{ > > - if (!vmcoreinfo_note) > > - return; > > - > > - /* Use the safe copy to generate vmcoreinfo note if have */ > > - if (vmcoreinfo_data_safecopy) > > - vmcoreinfo_data = vmcoreinfo_data_safecopy; > > - > > - vmcoreinfo_append_str("CRASHTIME=%lld\n", ktime_get_real_seconds()); > > - update_vmcoreinfo_note(); > > -} > > - > > -void vmcoreinfo_append_str(const char *fmt, ...) > > -{ > > - va_list args; > > - char buf[0x50]; > > - size_t r; > > - > > - va_start(args, fmt); > > - r = vscnprintf(buf, sizeof(buf), fmt, args); > > - va_end(args); > > - > > - r = min(r, (size_t)VMCOREINFO_BYTES - vmcoreinfo_size); > > - > > - memcpy(&vmcoreinfo_data[vmcoreinfo_size], buf, r); > > - > > - vmcoreinfo_size += r; > > - > > - WARN_ONCE(vmcoreinfo_size == VMCOREINFO_BYTES, > > - "vmcoreinfo data exceeds allocated size, truncating"); > > -} > > - > > -/* > > - * provide an empty default implementation here -- architecture > > - * code may override this > > - */ > > -void __weak arch_crash_save_vmcoreinfo(void) > > -{} > > - > > -phys_addr_t __weak paddr_vmcoreinfo_note(void) > > -{ > > - return __pa(vmcoreinfo_note); > > -} > > -EXPORT_SYMBOL(paddr_vmcoreinfo_note); > > - > > -static int __init crash_save_vmcoreinfo_init(void) > > -{ > > - vmcoreinfo_data = (unsigned char *)get_zeroed_page(GFP_KERNEL); > > - if (!vmcoreinfo_data) { > > - pr_warn("Memory allocation for vmcoreinfo_data failed\n"); > > - return -ENOMEM; > > - } > > - > > - vmcoreinfo_note = alloc_pages_exact(VMCOREINFO_NOTE_SIZE, > > - GFP_KERNEL | __GFP_ZERO); > > - if (!vmcoreinfo_note) { > > - free_page((unsigned long)vmcoreinfo_data); > > - vmcoreinfo_data = NULL; > > - pr_warn("Memory allocation for vmcoreinfo_note failed\n"); > > - return -ENOMEM; > > - } > > - > > - VMCOREINFO_OSRELEASE(init_uts_ns.name.release); > > - VMCOREINFO_BUILD_ID(); > > - VMCOREINFO_PAGESIZE(PAGE_SIZE); > > - > > - VMCOREINFO_SYMBOL(init_uts_ns); > > - VMCOREINFO_OFFSET(uts_namespace, name); > > - VMCOREINFO_SYMBOL(node_online_map); > > -#ifdef CONFIG_MMU > > - VMCOREINFO_SYMBOL_ARRAY(swapper_pg_dir); > > -#endif > > - VMCOREINFO_SYMBOL(_stext); > > - VMCOREINFO_SYMBOL(vmap_area_list); > > - > > -#ifndef CONFIG_NUMA > > - VMCOREINFO_SYMBOL(mem_map); > > - VMCOREINFO_SYMBOL(contig_page_data); > > -#endif > > -#ifdef CONFIG_SPARSEMEM > > - VMCOREINFO_SYMBOL_ARRAY(mem_section); > > - VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS); > > - VMCOREINFO_STRUCT_SIZE(mem_section); > > - VMCOREINFO_OFFSET(mem_section, section_mem_map); > > - VMCOREINFO_NUMBER(SECTION_SIZE_BITS); > > - VMCOREINFO_NUMBER(MAX_PHYSMEM_BITS); > > -#endif > > - VMCOREINFO_STRUCT_SIZE(page); > > - VMCOREINFO_STRUCT_SIZE(pglist_data); > > - VMCOREINFO_STRUCT_SIZE(zone); > > - VMCOREINFO_STRUCT_SIZE(free_area); > > - VMCOREINFO_STRUCT_SIZE(list_head); > > - VMCOREINFO_SIZE(nodemask_t); > > - VMCOREINFO_OFFSET(page, flags); > > - VMCOREINFO_OFFSET(page, _refcount); > > - VMCOREINFO_OFFSET(page, mapping); > > - VMCOREINFO_OFFSET(page, lru); > > - VMCOREINFO_OFFSET(page, _mapcount); > > - VMCOREINFO_OFFSET(page, private); > > - VMCOREINFO_OFFSET(page, compound_head); > > - VMCOREINFO_OFFSET(pglist_data, node_zones); > > - VMCOREINFO_OFFSET(pglist_data, nr_zones); > > -#ifdef CONFIG_FLATMEM > > - VMCOREINFO_OFFSET(pglist_data, node_mem_map); > > -#endif > > - VMCOREINFO_OFFSET(pglist_data, node_start_pfn); > > - VMCOREINFO_OFFSET(pglist_data, node_spanned_pages); > > - VMCOREINFO_OFFSET(pglist_data, node_id); > > - VMCOREINFO_OFFSET(zone, free_area); > > - VMCOREINFO_OFFSET(zone, vm_stat); > > - VMCOREINFO_OFFSET(zone, spanned_pages); > > - VMCOREINFO_OFFSET(free_area, free_list); > > - VMCOREINFO_OFFSET(list_head, next); > > - VMCOREINFO_OFFSET(list_head, prev); > > - VMCOREINFO_OFFSET(vmap_area, va_start); > > - VMCOREINFO_OFFSET(vmap_area, list); > > - VMCOREINFO_LENGTH(zone.free_area, NR_PAGE_ORDERS); > > - log_buf_vmcoreinfo_setup(); > > - VMCOREINFO_LENGTH(free_area.free_list, MIGRATE_TYPES); > > - VMCOREINFO_NUMBER(NR_FREE_PAGES); > > - VMCOREINFO_NUMBER(PG_lru); > > - VMCOREINFO_NUMBER(PG_private); > > - VMCOREINFO_NUMBER(PG_swapcache); > > - VMCOREINFO_NUMBER(PG_swapbacked); > > - VMCOREINFO_NUMBER(PG_slab); > > -#ifdef CONFIG_MEMORY_FAILURE > > - VMCOREINFO_NUMBER(PG_hwpoison); > > -#endif > > - VMCOREINFO_NUMBER(PG_head_mask); > > -#define PAGE_BUDDY_MAPCOUNT_VALUE (~PG_buddy) > > - VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE); > > -#ifdef CONFIG_HUGETLB_PAGE > > - VMCOREINFO_NUMBER(PG_hugetlb); > > -#define PAGE_OFFLINE_MAPCOUNT_VALUE (~PG_offline) > > - VMCOREINFO_NUMBER(PAGE_OFFLINE_MAPCOUNT_VALUE); > > -#endif > > - > > -#ifdef CONFIG_KALLSYMS > > - VMCOREINFO_SYMBOL(kallsyms_names); > > - VMCOREINFO_SYMBOL(kallsyms_num_syms); > > - VMCOREINFO_SYMBOL(kallsyms_token_table); > > - VMCOREINFO_SYMBOL(kallsyms_token_index); > > -#ifdef CONFIG_KALLSYMS_BASE_RELATIVE > > - VMCOREINFO_SYMBOL(kallsyms_offsets); > > - VMCOREINFO_SYMBOL(kallsyms_relative_base); > > -#else > > - VMCOREINFO_SYMBOL(kallsyms_addresses); > > -#endif /* CONFIG_KALLSYMS_BASE_RELATIVE */ > > -#endif /* CONFIG_KALLSYMS */ > > - > > - arch_crash_save_vmcoreinfo(); > > - update_vmcoreinfo_note(); > > - > > - return 0; > > -} > > - > > -subsys_initcall(crash_save_vmcoreinfo_init); > > - > > static int __init crash_notes_memory_init(void) > > { > > /* Allocate memory for saving cpu registers. */ > > diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c > > index 1d4bc493b2f4..11526fc42bc2 100644 > > --- a/kernel/ksysfs.c > > +++ b/kernel/ksysfs.c > > @@ -154,7 +154,7 @@ KERNEL_ATTR_RW(kexec_crash_size); > > #endif /* CONFIG_KEXEC_CORE */ > > -#ifdef CONFIG_CRASH_CORE > > +#ifdef CONFIG_VMCORE_INFO > > static ssize_t vmcoreinfo_show(struct kobject *kobj, > > struct kobj_attribute *attr, char *buf) > > @@ -177,7 +177,7 @@ KERNEL_ATTR_RO(crash_elfcorehdr_size); > > #endif > > -#endif /* CONFIG_CRASH_CORE */ > > +#endif /* CONFIG_VMCORE_INFO */ > > /* whether file capabilities are enabled */ > > static ssize_t fscaps_show(struct kobject *kobj, > > @@ -265,7 +265,7 @@ static struct attribute * kernel_attrs[] = { > > &kexec_crash_loaded_attr.attr, > > &kexec_crash_size_attr.attr, > > #endif > > -#ifdef CONFIG_CRASH_CORE > > +#ifdef CONFIG_VMCORE_INFO > > &vmcoreinfo_attr.attr, > > #ifdef CONFIG_CRASH_HOTPLUG > > &crash_elfcorehdr_size_attr.attr, > > diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c > > index f2444b581e16..7d74b000b43a 100644 > > --- a/kernel/printk/printk.c > > +++ b/kernel/printk/printk.c > > @@ -34,7 +34,7 @@ > > #include > > #include > > #include > > -#include > > +#include > > #include > > #include > > #include > > @@ -951,7 +951,7 @@ const struct file_operations kmsg_fops = { > > .release = devkmsg_release, > > }; > > -#ifdef CONFIG_CRASH_CORE > > +#ifdef CONFIG_VMCORE_INFO > > /* > > * This appends the listed symbols to /proc/vmcore > > * > > diff --git a/kernel/vmcore_info.c b/kernel/vmcore_info.c > > new file mode 100644 > > index 000000000000..84f3663530c8 > > --- /dev/null > > +++ b/kernel/vmcore_info.c > > @@ -0,0 +1,233 @@ > > +// SPDX-License-Identifier: GPL-2.0-only > > +/* > > + * crash.c - kernel crash support code. > > + * Copyright (C) 2002-2004 Eric Biederman > > + */ > > + > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > +#include > > + > > +#include > > +#include > > + > > +#include > > + > > +#include "kallsyms_internal.h" > > +#include "kexec_internal.h" > > + > > +/* vmcoreinfo stuff */ > > +unsigned char *vmcoreinfo_data; > > +size_t vmcoreinfo_size; > > +u32 *vmcoreinfo_note; > > + > > +/* trusted vmcoreinfo, e.g. we can make a copy in the crash memory */ > > +static unsigned char *vmcoreinfo_data_safecopy; > > + > > +Elf_Word *append_elf_note(Elf_Word *buf, char *name, unsigned int type, > > + void *data, size_t data_len) > > +{ > > + struct elf_note *note = (struct elf_note *)buf; > > + > > + note->n_namesz = strlen(name) + 1; > > + note->n_descsz = data_len; > > + note->n_type = type; > > + buf += DIV_ROUND_UP(sizeof(*note), sizeof(Elf_Word)); > > + memcpy(buf, name, note->n_namesz); > > + buf += DIV_ROUND_UP(note->n_namesz, sizeof(Elf_Word)); > > + memcpy(buf, data, data_len); > > + buf += DIV_ROUND_UP(data_len, sizeof(Elf_Word)); > > + > > + return buf; > > +} > > + > > +void final_note(Elf_Word *buf) > > +{ > > + memset(buf, 0, sizeof(struct elf_note)); > > +} > > + > > +static void update_vmcoreinfo_note(void) > > +{ > > + u32 *buf = vmcoreinfo_note; > > + > > + if (!vmcoreinfo_size) > > + return; > > + buf = append_elf_note(buf, VMCOREINFO_NOTE_NAME, 0, vmcoreinfo_data, > > + vmcoreinfo_size); > > + final_note(buf); > > +} > > + > > +void crash_update_vmcoreinfo_safecopy(void *ptr) > > +{ > > + if (ptr) > > + memcpy(ptr, vmcoreinfo_data, vmcoreinfo_size); > > + > > + vmcoreinfo_data_safecopy = ptr; > > +} > > + > > +void crash_save_vmcoreinfo(void) > > +{ > > + if (!vmcoreinfo_note) > > + return; > > + > > + /* Use the safe copy to generate vmcoreinfo note if have */ > > + if (vmcoreinfo_data_safecopy) > > + vmcoreinfo_data = vmcoreinfo_data_safecopy; > > + > > + vmcoreinfo_append_str("CRASHTIME=%lld\n", ktime_get_real_seconds()); > > + update_vmcoreinfo_note(); > > +} > > + > > +void vmcoreinfo_append_str(const char *fmt, ...) > > +{ > > + va_list args; > > + char buf[0x50]; > > + size_t r; > > + > > + va_start(args, fmt); > > + r = vscnprintf(buf, sizeof(buf), fmt, args); > > + va_end(args); > > + > > + r = min(r, (size_t)VMCOREINFO_BYTES - vmcoreinfo_size); > > + > > + memcpy(&vmcoreinfo_data[vmcoreinfo_size], buf, r); > > + > > + vmcoreinfo_size += r; > > + > > + WARN_ONCE(vmcoreinfo_size == VMCOREINFO_BYTES, > > + "vmcoreinfo data exceeds allocated size, truncating"); > > +} > > + > > +/* > > + * provide an empty default implementation here -- architecture > > + * code may override this > > + */ > > +void __weak arch_crash_save_vmcoreinfo(void) > > +{} > > + > > +phys_addr_t __weak paddr_vmcoreinfo_note(void) > > +{ > > + return __pa(vmcoreinfo_note); > > +} > > +EXPORT_SYMBOL(paddr_vmcoreinfo_note); > > + > > +static int __init crash_save_vmcoreinfo_init(void) > > +{ > > + vmcoreinfo_data = (unsigned char *)get_zeroed_page(GFP_KERNEL); > > + if (!vmcoreinfo_data) { > > + pr_warn("Memory allocation for vmcoreinfo_data failed\n"); > > + return -ENOMEM; > > + } > > + > > + vmcoreinfo_note = alloc_pages_exact(VMCOREINFO_NOTE_SIZE, > > + GFP_KERNEL | __GFP_ZERO); > > + if (!vmcoreinfo_note) { > > + free_page((unsigned long)vmcoreinfo_data); > > + vmcoreinfo_data = NULL; > > + pr_warn("Memory allocation for vmcoreinfo_note failed\n"); > > + return -ENOMEM; > > + } > > + > > + VMCOREINFO_OSRELEASE(init_uts_ns.name.release); > > + VMCOREINFO_BUILD_ID(); > > + VMCOREINFO_PAGESIZE(PAGE_SIZE); > > + > > + VMCOREINFO_SYMBOL(init_uts_ns); > > + VMCOREINFO_OFFSET(uts_namespace, name); > > + VMCOREINFO_SYMBOL(node_online_map); > > +#ifdef CONFIG_MMU > > + VMCOREINFO_SYMBOL_ARRAY(swapper_pg_dir); > > +#endif > > + VMCOREINFO_SYMBOL(_stext); > > + VMCOREINFO_SYMBOL(vmap_area_list); > > + > > +#ifndef CONFIG_NUMA > > + VMCOREINFO_SYMBOL(mem_map); > > + VMCOREINFO_SYMBOL(contig_page_data); > > +#endif > > +#ifdef CONFIG_SPARSEMEM > > + VMCOREINFO_SYMBOL_ARRAY(mem_section); > > + VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS); > > + VMCOREINFO_STRUCT_SIZE(mem_section); > > + VMCOREINFO_OFFSET(mem_section, section_mem_map); > > + VMCOREINFO_NUMBER(SECTION_SIZE_BITS); > > + VMCOREINFO_NUMBER(MAX_PHYSMEM_BITS); > > +#endif > > + VMCOREINFO_STRUCT_SIZE(page); > > + VMCOREINFO_STRUCT_SIZE(pglist_data); > > + VMCOREINFO_STRUCT_SIZE(zone); > > + VMCOREINFO_STRUCT_SIZE(free_area); > > + VMCOREINFO_STRUCT_SIZE(list_head); > > + VMCOREINFO_SIZE(nodemask_t); > > + VMCOREINFO_OFFSET(page, flags); > > + VMCOREINFO_OFFSET(page, _refcount); > > + VMCOREINFO_OFFSET(page, mapping); > > + VMCOREINFO_OFFSET(page, lru); > > + VMCOREINFO_OFFSET(page, _mapcount); > > + VMCOREINFO_OFFSET(page, private); > > + VMCOREINFO_OFFSET(page, compound_head); > > + VMCOREINFO_OFFSET(pglist_data, node_zones); > > + VMCOREINFO_OFFSET(pglist_data, nr_zones); > > +#ifdef CONFIG_FLATMEM > > + VMCOREINFO_OFFSET(pglist_data, node_mem_map); > > +#endif > > + VMCOREINFO_OFFSET(pglist_data, node_start_pfn); > > + VMCOREINFO_OFFSET(pglist_data, node_spanned_pages); > > + VMCOREINFO_OFFSET(pglist_data, node_id); > > + VMCOREINFO_OFFSET(zone, free_area); > > + VMCOREINFO_OFFSET(zone, vm_stat); > > + VMCOREINFO_OFFSET(zone, spanned_pages); > > + VMCOREINFO_OFFSET(free_area, free_list); > > + VMCOREINFO_OFFSET(list_head, next); > > + VMCOREINFO_OFFSET(list_head, prev); > > + VMCOREINFO_OFFSET(vmap_area, va_start); > > + VMCOREINFO_OFFSET(vmap_area, list); > > + VMCOREINFO_LENGTH(zone.free_area, NR_PAGE_ORDERS); > > + log_buf_vmcoreinfo_setup(); > > + VMCOREINFO_LENGTH(free_area.free_list, MIGRATE_TYPES); > > + VMCOREINFO_NUMBER(NR_FREE_PAGES); > > + VMCOREINFO_NUMBER(PG_lru); > > + VMCOREINFO_NUMBER(PG_private); > > + VMCOREINFO_NUMBER(PG_swapcache); > > + VMCOREINFO_NUMBER(PG_swapbacked); > > + VMCOREINFO_NUMBER(PG_slab); > > +#ifdef CONFIG_MEMORY_FAILURE > > + VMCOREINFO_NUMBER(PG_hwpoison); > > +#endif > > + VMCOREINFO_NUMBER(PG_head_mask); > > +#define PAGE_BUDDY_MAPCOUNT_VALUE (~PG_buddy) > > + VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE); > > +#ifdef CONFIG_HUGETLB_PAGE > > + VMCOREINFO_NUMBER(PG_hugetlb); > > +#define PAGE_OFFLINE_MAPCOUNT_VALUE (~PG_offline) > > + VMCOREINFO_NUMBER(PAGE_OFFLINE_MAPCOUNT_VALUE); > > +#endif > > + > > +#ifdef CONFIG_KALLSYMS > > + VMCOREINFO_SYMBOL(kallsyms_names); > > + VMCOREINFO_SYMBOL(kallsyms_num_syms); > > + VMCOREINFO_SYMBOL(kallsyms_token_table); > > + VMCOREINFO_SYMBOL(kallsyms_token_index); > > +#ifdef CONFIG_KALLSYMS_BASE_RELATIVE > > + VMCOREINFO_SYMBOL(kallsyms_offsets); > > + VMCOREINFO_SYMBOL(kallsyms_relative_base); > > +#else > > + VMCOREINFO_SYMBOL(kallsyms_addresses); > > +#endif /* CONFIG_KALLSYMS_BASE_RELATIVE */ > > +#endif /* CONFIG_KALLSYMS */ > > + > > + arch_crash_save_vmcoreinfo(); > > + update_vmcoreinfo_note(); > > + > > + return 0; > > +} > > + > > +subsys_initcall(crash_save_vmcoreinfo_init); > > diff --git a/lib/buildid.c b/lib/buildid.c > > index e3a7acdeef0e..3e6868c86b45 100644 > > --- a/lib/buildid.c > > +++ b/lib/buildid.c > > @@ -174,7 +174,7 @@ int build_id_parse_buf(const void *buf, unsigned char *build_id, u32 buf_size) > > return parse_build_id_buf(build_id, NULL, buf, buf_size); > > } > > -#if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) || IS_ENABLED(CONFIG_CRASH_CORE) > > +#if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) || IS_ENABLED(CONFIG_VMCORE_INFO) > > unsigned char vmlinux_build_id[BUILD_ID_SIZE_MAX] __ro_after_init; > > /** >