Merge branch 'c8' into a8

.crash.metadata

@@ -0,0 +1,2 @@
+f230368e17058e61a0be4c22f0969bed76cd6c29 SOURCES/crash-7.3.1.tar.gz
+026f4c9e1c8152a2773354551c523acd32d7f00e SOURCES/gdb-7.6.tar.gz

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/crash-8.0.4.tar.gz
-SOURCES/gdb-10.2.tar.gz
+SOURCES/crash-7.3.1.tar.gz
+SOURCES/gdb-7.6.tar.gz

SOURCES/0001-Fix-pvops-Xen-detection-for-arm-machine.patch

@@ -0,0 +1,70 @@
+From 5c4f786450ea61b87d4db0092288df83dd5cb454 Mon Sep 17 00:00:00 2001
+From: Qi Zheng <zhengqi.arch@bytedance.com>
+Date: Tue, 21 Dec 2021 15:40:31 +0800
+Subject: [PATCH 01/11] Fix pvops Xen detection for arm machine
+
+Since the xen_start_info on the arm/arm64 platform points to a static
+variable '_xen_start_info'(see its definition as below), which makes
+that the address of xen_start_info will never be null.
+
+arch/arm/xen/enlighten.c:40:static struct start_info _xen_start_info;
+arch/arm/xen/enlighten.c:41:struct start_info *xen_start_info = &_xen_start_info;
+arch/arm/xen/enlighten.c:42:EXPORT_SYMBOL(xen_start_info);
+
+As a result, the is_pvops_xen() in commit 4badc6229c69 ("Fix pvops
+Xen detection for kernels >= v4.20") always returns TRUE because it
+can always read out the non-null address of xen_start_info, finally
+the following error will be reported on arm/arm64 platform(non-Xen
+environment) because p2m_mid_missing and xen_p2m_addr are not defined:
+
+        crash: cannot resolve "p2m_top"
+
+For the arm/arm64 platform, fix it by using xen_vcpu_info instead of
+xen_start_info to detect Xen dumps.
+
+In addition, also explicitly narrow the scope of the xen_start_info
+check to x86 with the machine_type(), there is no need to check it on
+other architectures.
+
+Fixes: 4badc6229c69 ("Fix pvops Xen detection for kernels >= v4.20")
+Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com>
+Acked-by: Kazuhito Hagio <k-hagio-ab@nec.com>
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ kernel.c | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/kernel.c b/kernel.c
+index 8ae9e0c169ff..a637dd0eb8f8 100644
+--- a/kernel.c
++++ b/kernel.c
+@@ -10754,11 +10754,21 @@ is_pvops_xen(void)
+ 	     STREQ(sym, "paravirt_patch_default")))
+ 		return TRUE;
+ 
+-	if (symbol_exists("xen_start_info") &&
+-	    readmem(symbol_value("xen_start_info"), KVADDR, &addr,
+-	    sizeof(void *), "xen_start_info", RETURN_ON_ERROR) &&
+-	    addr != 0)
+-		return TRUE;
++	if (machine_type("X86") || machine_type("X86_64")) {
++		if (symbol_exists("xen_start_info") &&
++		    readmem(symbol_value("xen_start_info"), KVADDR, &addr,
++		    sizeof(void *), "xen_start_info", RETURN_ON_ERROR) &&
++		    addr != 0)
++			return TRUE;
++	}
++
++	if (machine_type("ARM") || machine_type("ARM64")) {
++		if (symbol_exists("xen_vcpu_info") &&
++		    readmem(symbol_value("xen_vcpu_info"), KVADDR, &addr,
++		    sizeof(void *), "xen_vcpu_info", RETURN_ON_ERROR) &&
++		    addr != 0)
++			return TRUE;
++	}
+ 
+ 	return FALSE;
+ }
+-- 
+2.20.1
+

SOURCES/0001-Fix-rd-command-for-zram-data-display-in-Linux-6.2-an.patch

@@ -1,142 +0,0 @@
-From 38acd02c7fc09843ffb10fc2d695cccdd10cc7f6 Mon Sep 17 00:00:00 2001
-From: Chengen Du <chengen.du@canonical.com>
-Date: Fri, 17 Nov 2023 11:45:33 +0800
-Subject: [PATCH 01/14] Fix "rd" command for zram data display in Linux 6.2 and
- later
-
-Kernel commit 7ac07a26dea7 ("zram: preparation for multi-zcomp support")
-replaced "compressor" member with "comp_algs" in the zram struct.
-Without the patch, the "rd" command can triggers the following error:
-
-  rd: WARNING: Some pages are swapped out to zram. Please run mod -s zram.
-  rd: invalid user virtual address: ffff7d23f010  type: "64-bit UVADDR"
-
-Related kernel commit:
-  84b33bf78889 ("zram: introduce recompress sysfs knob")
-
-Signed-off-by: Chengen Du <chengen.du@canonical.com>
-Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- defs.h     |  1 +
- diskdump.c | 47 ++++++++++++++++++++++++++++++-----------------
- 2 files changed, 31 insertions(+), 17 deletions(-)
-
-diff --git a/defs.h b/defs.h
-index 788f63ada739..2cae5b61e589 100644
---- a/defs.h
-+++ b/defs.h
-@@ -2227,6 +2227,7 @@ struct offset_table {                    /* stash of commonly-used offsets */
- 	long module_memory_size;
- 	long irq_data_irq;
- 	long zspage_huge;
-+	long zram_comp_algs;
- };
- 
- struct size_table {         /* stash of commonly-used sizes */
-diff --git a/diskdump.c b/diskdump.c
-index 0fe46f4644d0..25054d96313e 100644
---- a/diskdump.c
-+++ b/diskdump.c
-@@ -2757,6 +2757,8 @@ diskdump_device_dump_info(FILE *ofp)
- 
- static ulong ZRAM_FLAG_SHIFT;
- static ulong ZRAM_FLAG_SAME_BIT;
-+static ulong ZRAM_COMP_PRIORITY_BIT1;
-+static ulong ZRAM_COMP_PRIORITY_MASK;
- 
- static void
- zram_init(void)
-@@ -2765,6 +2767,8 @@ zram_init(void)
- 
- 	MEMBER_OFFSET_INIT(zram_mempoll, "zram", "mem_pool");
- 	MEMBER_OFFSET_INIT(zram_compressor, "zram", "compressor");
-+	if (INVALID_MEMBER(zram_compressor))
-+		MEMBER_OFFSET_INIT(zram_comp_algs, "zram", "comp_algs");
- 	MEMBER_OFFSET_INIT(zram_table_flag, "zram_table_entry", "flags");
- 	if (INVALID_MEMBER(zram_table_flag))
- 		MEMBER_OFFSET_INIT(zram_table_flag, "zram_table_entry", "value");
-@@ -2782,6 +2786,8 @@ zram_init(void)
- 
- 	ZRAM_FLAG_SHIFT = 1 << zram_flag_shift;
- 	ZRAM_FLAG_SAME_BIT = 1 << (zram_flag_shift+1);
-+	ZRAM_COMP_PRIORITY_BIT1 = ZRAM_FLAG_SHIFT + 7;
-+	ZRAM_COMP_PRIORITY_MASK = 0x3;
- 
- 	if (CRASHDEBUG(1))
- 		fprintf(fp, "zram_flag_shift: %ld\n", zram_flag_shift);
-@@ -2981,9 +2987,9 @@ try_zram_decompress(ulonglong pte_val, unsigned char *buf, ulong len, ulonglong
- 	ulong zram, zram_table_entry, sector, index, entry, flags, size,
- 		outsize, off;
- 
--	if (INVALID_MEMBER(zram_compressor)) {
-+	if (INVALID_MEMBER(zram_mempoll)) {
- 		zram_init();
--		if (INVALID_MEMBER(zram_compressor)) {
-+		if (INVALID_MEMBER(zram_mempoll)) {
- 			error(WARNING,
- 			      "Some pages are swapped out to zram. "
- 			      "Please run mod -s zram.\n");
-@@ -2997,8 +3003,28 @@ try_zram_decompress(ulonglong pte_val, unsigned char *buf, ulong len, ulonglong
- 	if (!get_disk_name_private_data(pte_val, vaddr, NULL, &zram))
- 		return 0;
- 
--	readmem(zram + OFFSET(zram_compressor), KVADDR, name,
--		sizeof(name), "zram compressor", FAULT_ON_ERROR);
-+	if (THIS_KERNEL_VERSION >= LINUX(2, 6, 0))
-+		swp_offset = (ulonglong)__swp_offset(pte_val);
-+	else
-+		swp_offset = (ulonglong)SWP_OFFSET(pte_val);
-+
-+	sector = swp_offset << (PAGESHIFT() - 9);
-+	index = sector >> SECTORS_PER_PAGE_SHIFT;
-+	readmem(zram, KVADDR, &zram_table_entry,
-+		sizeof(void *), "zram_table_entry", FAULT_ON_ERROR);
-+	zram_table_entry += (index * SIZE(zram_table_entry));
-+	readmem(zram_table_entry + OFFSET(zram_table_flag), KVADDR, &flags,
-+		sizeof(void *), "zram_table_flag", FAULT_ON_ERROR);
-+	if (VALID_MEMBER(zram_compressor))
-+		readmem(zram + OFFSET(zram_compressor), KVADDR, name, sizeof(name),
-+			"zram compressor", FAULT_ON_ERROR);
-+	else {
-+		ulong comp_alg_addr;
-+		uint32_t prio = (flags >> ZRAM_COMP_PRIORITY_BIT1) & ZRAM_COMP_PRIORITY_MASK;
-+		readmem(zram + OFFSET(zram_comp_algs) + sizeof(const char *) * prio, KVADDR,
-+			&comp_alg_addr, sizeof(comp_alg_addr), "zram comp_algs", FAULT_ON_ERROR);
-+		read_string(comp_alg_addr, name, sizeof(name));
-+	}
- 	if (STREQ(name, "lzo")) {
- #ifdef LZO
- 		if (!(dd->flags & LZO_SUPPORTED)) {
-@@ -3019,12 +3045,6 @@ try_zram_decompress(ulonglong pte_val, unsigned char *buf, ulong len, ulonglong
- 		return 0;
- 	}
- 
--	if (THIS_KERNEL_VERSION >= LINUX(2, 6, 0)) {
--		swp_offset = (ulonglong)__swp_offset(pte_val);
--	} else {
--		swp_offset = (ulonglong)SWP_OFFSET(pte_val);
--	}
--
- 	zram_buf = (unsigned char *)GETBUF(PAGESIZE());
- 	/* lookup page from swap cache */
- 	off = PAGEOFFSET(vaddr);
-@@ -3034,15 +3054,8 @@ try_zram_decompress(ulonglong pte_val, unsigned char *buf, ulong len, ulonglong
- 		goto out;
- 	}
- 
--	sector = swp_offset << (PAGESHIFT() - 9);
--	index = sector >> SECTORS_PER_PAGE_SHIFT;
--	readmem(zram, KVADDR, &zram_table_entry,
--		sizeof(void *), "zram_table_entry", FAULT_ON_ERROR);
--	zram_table_entry += (index * SIZE(zram_table_entry));
- 	readmem(zram_table_entry, KVADDR, &entry,
- 		sizeof(void *), "entry of table", FAULT_ON_ERROR);
--	readmem(zram_table_entry + OFFSET(zram_table_flag), KVADDR, &flags,
--		sizeof(void *), "zram_table_flag", FAULT_ON_ERROR);
- 	if (!entry || (flags & ZRAM_FLAG_SAME_BIT)) {
- 		int count;
- 		ulong *same_buf = (ulong *)GETBUF(PAGESIZE());
--- 
-2.41.0
-

SOURCES/0001-arm64-Support-overflow-stack-panic.patch

@@ -0,0 +1,379 @@
+From c05db8d7d83389a342664073547bd29eda900158 Mon Sep 17 00:00:00 2001
+From: Hong YANG <hong.yang3@nio.com>
+Date: Mon, 15 Nov 2021 15:41:01 +0800
+Subject: [PATCH 1/2] arm64: Support overflow stack panic
+
+Kernel commit <872d8327ce89> ("arm64: add VMAP_STACK overflow detection")
+has supported the overflow stack exception handling. Without the patch, the
+"bt" command will make crash generate a core dump because of segmentation
+fault. With the patch, the "bt" command can display the overflow stack.
+
+Before:
+crash> bt
+PID: 3607   TASK: ffffffcbf9a4da00  CPU: 2   COMMAND: "sh"
+Segmentation fault (core dumped)
+
+After:
+crash> bt
+PID: 3607   TASK: ffffffcbf9a4da00  CPU: 2   COMMAND: "sh"
+ #0 [ffffffccbfd85f50] __delay at ffffff8008ceded8
+...
+ #5 [ffffffccbfd85fd0] emergency_restart at ffffff80080d49fc
+ #6 [ffffffccbfd86140] panic at ffffff80080af4c0
+ #7 [ffffffccbfd86150] nmi_panic at ffffff80080af150
+ #8 [ffffffccbfd86190] handle_bad_stack at ffffff800808b0b8
+ #9 [ffffffccbfd862d0] __bad_stack at ffffff800808285c
+     PC: ffffff8008082e80  [el1_sync]
+     LR: ffffff8000d6c214  [stack_overflow_demo+84]
+     SP: ffffff1a79930070  PSTATE: 204003c5
+    X29: ffffff8011b03d00  X28: ffffffcbf9a4da00  X27: ffffff8008e02000
+    X26: 0000000000000040  X25: 0000000000000124  X24: ffffffcbf9a4da00
+    X23: 0000007daec2e288  X22: ffffffcbfe03b800  X21: 0000007daec2e288
+    X20: 0000000000000002  X19: 0000000000000002  X18: 0000000000000002
+    X17: 00000000000003e7  X16: 0000000000000000  X15: 0000000000000000
+    X14: ffffffcc17facb00  X13: ffffffccb4c25c00  X12: 0000000000000000
+    X11: ffffffcc17fad660  X10: 0000000000000af0   X9: 0000000000000000
+     X8: ffffff1a799334f0   X7: 0000000000000000   X6: 000000000000003f
+     X5: 0000000000000040   X4: 0000000000000010   X3: 00000065981d07f0
+     X2: 00000065981d07f0   X1: 0000000000000000   X0: ffffff1a799334f0
+
+Signed-off-by: Hong YANG <hong.yang3@nio.com>
+---
+ arm64.c | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++------
+ defs.h  |   6 ++
+ 2 files changed, 159 insertions(+), 16 deletions(-)
+
+diff --git a/arm64.c b/arm64.c
+index 94681d1a37db..23c3d75d85aa 100644
+--- a/arm64.c
++++ b/arm64.c
+@@ -45,6 +45,7 @@ static int arm64_vtop_3level_4k(ulong, ulong, physaddr_t *, int);
+ static int arm64_vtop_4level_4k(ulong, ulong, physaddr_t *, int);
+ static ulong arm64_get_task_pgd(ulong);
+ static void arm64_irq_stack_init(void);
++static void arm64_overflow_stack_init(void);
+ static void arm64_stackframe_init(void);
+ static int arm64_eframe_search(struct bt_info *);
+ static int arm64_is_kernel_exception_frame(struct bt_info *, ulong);
+@@ -63,6 +64,7 @@ static int arm64_get_dumpfile_stackframe(struct bt_info *, struct arm64_stackfra
+ static int arm64_in_kdump_text(struct bt_info *, struct arm64_stackframe *);
+ static int arm64_in_kdump_text_on_irq_stack(struct bt_info *);
+ static int arm64_switch_stack(struct bt_info *, struct arm64_stackframe *, FILE *);
++static int arm64_switch_stack_from_overflow(struct bt_info *, struct arm64_stackframe *, FILE *);
+ static int arm64_get_stackframe(struct bt_info *, struct arm64_stackframe *);
+ static void arm64_get_stack_frame(struct bt_info *, ulong *, ulong *);
+ static void arm64_gen_hidden_frame(struct bt_info *bt, ulong, struct arm64_stackframe *);
+@@ -78,8 +80,11 @@ static int arm64_get_smp_cpus(void);
+ static void arm64_clear_machdep_cache(void);
+ static int arm64_on_process_stack(struct bt_info *, ulong);
+ static int arm64_in_alternate_stack(int, ulong);
++static int arm64_in_alternate_stackv(int cpu, ulong stkptr, ulong *stacks, ulong stack_size);
+ static int arm64_on_irq_stack(int, ulong);
++static int arm64_on_overflow_stack(int, ulong);
+ static void arm64_set_irq_stack(struct bt_info *);
++static void arm64_set_overflow_stack(struct bt_info *);
+ static void arm64_set_process_stack(struct bt_info *);
+ static int arm64_get_kvaddr_ranges(struct vaddr_range *);
+ static void arm64_get_crash_notes(void);
+@@ -463,6 +468,7 @@ arm64_init(int when)
+ 			machdep->hz = 100;
+ 
+ 		arm64_irq_stack_init();
++		arm64_overflow_stack_init();
+ 		arm64_stackframe_init();
+ 		break;
+ 
+@@ -1715,6 +1721,49 @@ arm64_irq_stack_init(void)
+ 	} 
+ }
+ 
++/*
++ *  Gather Overflow stack values.
++ *
++ *  Overflow stack supported since 4.14, in commit 872d8327c
++ */
++static void
++arm64_overflow_stack_init(void)
++{
++	int i;
++	struct syment *sp;
++	struct gnu_request request, *req;
++	struct machine_specific *ms = machdep->machspec;
++	req = &request;
++
++	if (symbol_exists("overflow_stack") &&
++	    (sp = per_cpu_symbol_search("overflow_stack")) &&
++	    get_symbol_type("overflow_stack", NULL, req)) {
++		if (CRASHDEBUG(1)) {
++			fprintf(fp, "overflow_stack: \n");
++			fprintf(fp, "  type: %x, %s\n",
++				(int)req->typecode,
++				(req->typecode == TYPE_CODE_ARRAY) ?
++						"TYPE_CODE_ARRAY" : "other");
++			fprintf(fp, "  target_typecode: %x, %s\n",
++				(int)req->target_typecode,
++				req->target_typecode == TYPE_CODE_INT ?
++						"TYPE_CODE_INT" : "other");
++			fprintf(fp, "  target_length: %ld\n",
++						req->target_length);
++			fprintf(fp, "  length: %ld\n", req->length);
++		}
++
++		if (!(ms->overflow_stacks = (ulong *)malloc((size_t)(kt->cpus * sizeof(ulong)))))
++			error(FATAL, "cannot malloc overflow_stack addresses\n");
++
++		ms->overflow_stack_size = ARM64_OVERFLOW_STACK_SIZE;
++		machdep->flags |= OVERFLOW_STACKS;
++
++		for (i = 0; i < kt->cpus; i++)
++			ms->overflow_stacks[i] = kt->__per_cpu_offset[i] + sp->value;
++	}
++}
++
+ /*
+  *  Gather and verify all of the backtrace requirements.
+  */
+@@ -1960,6 +2009,7 @@ static char *arm64_exception_functions[] = {
+         "do_mem_abort",
+         "do_el0_irq_bp_hardening",
+         "do_sp_pc_abort",
++        "handle_bad_stack",
+         NULL
+ };
+ 
+@@ -1978,7 +2028,10 @@ arm64_in_exception_text(ulong ptr)
+ 		if ((ptr >= ms->__exception_text_start) &&
+ 		    (ptr < ms->__exception_text_end))
+ 			return TRUE;
+-	} else if ((name = closest_symbol(ptr))) {  /* Linux 5.5 and later */
++	}
++
++	name = closest_symbol(ptr);
++	if (name != NULL) { /* Linux 5.5 and later */
+ 		for (func = &arm64_exception_functions[0]; *func; func++) {
+ 			if (STREQ(name, *func))
+ 				return TRUE;
+@@ -2252,15 +2305,14 @@ arm64_unwind_frame(struct bt_info *bt, struct arm64_stackframe *frame)
+ 	if ((frame->fp == 0) && (frame->pc == 0))
+ 		return FALSE;
+ 
+-	if (!(machdep->flags & IRQ_STACKS))
+-		return TRUE;
+-
+-	if (!(machdep->flags & IRQ_STACKS))
++	if (!(machdep->flags & (IRQ_STACKS | OVERFLOW_STACKS)))
+ 		return TRUE;
+ 
+ 	if (machdep->flags & UNW_4_14) {
+-		if ((bt->flags & BT_IRQSTACK) &&
+-		    !arm64_on_irq_stack(bt->tc->processor, frame->fp)) {
++		if (((bt->flags & BT_IRQSTACK) &&
++		     !arm64_on_irq_stack(bt->tc->processor, frame->fp)) ||
++		    ((bt->flags & BT_OVERFLOW_STACK) &&
++		     !arm64_on_overflow_stack(bt->tc->processor, frame->fp))) {
+ 			if (arm64_on_process_stack(bt, frame->fp)) {
+ 				arm64_set_process_stack(bt);
+ 
+@@ -2677,6 +2729,9 @@ arm64_back_trace_cmd(struct bt_info *bt)
+ 		if (arm64_on_irq_stack(bt->tc->processor, bt->frameptr)) {
+ 			arm64_set_irq_stack(bt);
+ 			bt->flags |= BT_IRQSTACK;
++		} else if (arm64_on_overflow_stack(bt->tc->processor, bt->frameptr)) {
++			arm64_set_overflow_stack(bt);
++			bt->flags |= BT_OVERFLOW_STACK;
+ 		}
+ 		stackframe.sp = bt->stkptr;
+ 		stackframe.pc = bt->instptr;
+@@ -2731,7 +2786,9 @@ arm64_back_trace_cmd(struct bt_info *bt)
+ 			break;
+ 
+ 		if (arm64_in_exception_text(bt->instptr) && INSTACK(stackframe.fp, bt)) {
+-			if (!(bt->flags & BT_IRQSTACK) ||
++			if (bt->flags & BT_OVERFLOW_STACK) {
++				exception_frame = stackframe.fp - KERN_EFRAME_OFFSET;
++			} else if (!(bt->flags & BT_IRQSTACK) ||
+ 			    ((stackframe.sp + SIZE(pt_regs)) < bt->stacktop)) {
+ 				if (arm64_is_kernel_exception_frame(bt, stackframe.fp - KERN_EFRAME_OFFSET))
+ 					exception_frame = stackframe.fp - KERN_EFRAME_OFFSET;
+@@ -2745,6 +2802,12 @@ arm64_back_trace_cmd(struct bt_info *bt)
+ 				break;
+ 		}
+ 
++		if ((bt->flags & BT_OVERFLOW_STACK) &&
++		    !arm64_on_overflow_stack(bt->tc->processor, stackframe.fp)) {
++			bt->flags &= ~BT_OVERFLOW_STACK;
++			if (arm64_switch_stack_from_overflow(bt, &stackframe, ofp) == USER_MODE)
++				break;
++		}
+ 
+ 		level++;
+ 	}
+@@ -3131,6 +3194,43 @@ arm64_switch_stack(struct bt_info *bt, struct arm64_stackframe *frame, FILE *ofp
+ 	return KERNEL_MODE;
+ }
+ 
++static int
++arm64_switch_stack_from_overflow(struct bt_info *bt, struct arm64_stackframe *frame, FILE *ofp)
++{
++	int i;
++	ulong stacktop, words, addr;
++	ulong *stackbuf;
++	char buf[BUFSIZE];
++	struct machine_specific *ms = machdep->machspec;
++
++	if (bt->flags & BT_FULL) {
++		stacktop = ms->overflow_stacks[bt->tc->processor] + ms->overflow_stack_size;
++		words = (stacktop - bt->bptr) / sizeof(ulong);
++		stackbuf = (ulong *)GETBUF(words * sizeof(ulong));
++		readmem(bt->bptr, KVADDR, stackbuf, words * sizeof(long),
++			"top of overflow stack", FAULT_ON_ERROR);
++
++		addr = bt->bptr;
++		for (i = 0; i < words; i++) {
++			if (!(i & 1))
++				fprintf(ofp, "%s    %lx: ", i ? "\n" : "", addr);
++			fprintf(ofp, "%s ", format_stack_entry(bt, buf, stackbuf[i], 0));
++			addr += sizeof(ulong);
++		}
++		fprintf(ofp, "\n");
++		FREEBUF(stackbuf);
++	}
++	fprintf(ofp, "--- <Overflow stack> ---\n");
++
++	if (frame->fp == 0)
++		return USER_MODE;
++
++	if (!(machdep->flags & UNW_4_14))
++		arm64_print_exception_frame(bt, frame->sp, KERNEL_MODE, ofp);
++
++	return KERNEL_MODE;
++}
++
+ static int
+ arm64_get_dumpfile_stackframe(struct bt_info *bt, struct arm64_stackframe *frame)
+ {
+@@ -3682,6 +3782,16 @@ arm64_display_machine_stats(void)
+ 				machdep->machspec->irq_stacks[i]);
+ 		}
+ 	}
++	if (machdep->machspec->overflow_stack_size) {
++		fprintf(fp, "OVERFLOW STACK SIZE: %ld\n",
++			machdep->machspec->overflow_stack_size);
++		fprintf(fp, "    OVERFLOW STACKS:\n");
++		for (i = 0; i < kt->cpus; i++) {
++			pad = (i < 10) ? 3 : (i < 100) ? 2 : (i < 1000) ? 1 : 0;
++			fprintf(fp, "%s           CPU %d: %lx\n", space(pad), i,
++				machdep->machspec->overflow_stacks[i]);
++		}
++	}
+ }
+ 
+ static int
+@@ -3875,24 +3985,41 @@ arm64_on_process_stack(struct bt_info *bt, ulong stkptr)
+ }
+ 
+ static int
+-arm64_on_irq_stack(int cpu, ulong stkptr)
++arm64_in_alternate_stackv(int cpu, ulong stkptr, ulong *stacks, ulong stack_size)
+ {
+-	return arm64_in_alternate_stack(cpu, stkptr);
++	if ((cpu >= kt->cpus) || (stacks == NULL) || !stack_size)
++		return FALSE;
++
++	if ((stkptr >= stacks[cpu]) &&
++	    (stkptr < (stacks[cpu] + stack_size)))
++		return TRUE;
++
++	return FALSE;
+ }
+ 
+ static int
+ arm64_in_alternate_stack(int cpu, ulong stkptr)
++{
++	return (arm64_on_irq_stack(cpu, stkptr) ||
++		arm64_on_overflow_stack(cpu, stkptr));
++}
++
++static int
++arm64_on_irq_stack(int cpu, ulong stkptr)
+ {
+ 	struct machine_specific *ms = machdep->machspec;
+ 
+-	if (!ms->irq_stack_size || (cpu >= kt->cpus))
+-		return FALSE;
++	return arm64_in_alternate_stackv(cpu, stkptr,
++			ms->irq_stacks, ms->irq_stack_size);
++}
+ 
+-	if ((stkptr >= ms->irq_stacks[cpu]) &&
+-	    (stkptr < (ms->irq_stacks[cpu] + ms->irq_stack_size)))
+-		return TRUE;
++static int
++arm64_on_overflow_stack(int cpu, ulong stkptr)
++{
++	struct machine_specific *ms = machdep->machspec;
+ 
+-	return FALSE;
++	return arm64_in_alternate_stackv(cpu, stkptr,
++			ms->overflow_stacks, ms->overflow_stack_size);
+ }
+ 
+ static void
+@@ -3905,6 +4032,16 @@ arm64_set_irq_stack(struct bt_info *bt)
+ 	alter_stackbuf(bt);
+ }
+ 
++static void
++arm64_set_overflow_stack(struct bt_info *bt)
++{
++	struct machine_specific *ms = machdep->machspec;
++
++	bt->stackbase = ms->overflow_stacks[bt->tc->processor];
++	bt->stacktop = bt->stackbase + ms->overflow_stack_size;
++	alter_stackbuf(bt);
++}
++
+ static void
+ arm64_set_process_stack(struct bt_info *bt)
+ {
+diff --git a/defs.h b/defs.h
+index 43eff46b105d..caaa11e50c87 100644
+--- a/defs.h
++++ b/defs.h
+@@ -3218,6 +3218,7 @@ typedef signed int s32;
+ #define UNW_4_14      (0x200)
+ #define FLIPPED_VM    (0x400)
+ #define HAS_PHYSVIRT_OFFSET (0x800)
++#define OVERFLOW_STACKS     (0x1000)
+ 
+ /*
+  * Get kimage_voffset from /dev/crash
+@@ -3260,6 +3261,7 @@ typedef signed int s32;
+ 
+ #define ARM64_STACK_SIZE   (16384)
+ #define ARM64_IRQ_STACK_SIZE   ARM64_STACK_SIZE
++#define ARM64_OVERFLOW_STACK_SIZE   (4096)
+ 
+ #define _SECTION_SIZE_BITS           30
+ #define _SECTION_SIZE_BITS_5_12      27
+@@ -3332,6 +3334,9 @@ struct machine_specific {
+ 	char  *irq_stackbuf;
+ 	ulong __irqentry_text_start;
+ 	ulong __irqentry_text_end;
++	ulong overflow_stack_size;
++	ulong *overflow_stacks;
++	char  *overflow_stackbuf;
+ 	/* for exception vector code */
+ 	ulong exp_entry1_start;
+ 	ulong exp_entry1_end;
+@@ -5778,6 +5783,7 @@ ulong cpu_map_addr(const char *type);
+ #define BT_CPUMASK        (0x1000000000000ULL)
+ #define BT_SHOW_ALL_REGS  (0x2000000000000ULL)
+ #define BT_REGS_NOT_FOUND (0x4000000000000ULL)
++#define BT_OVERFLOW_STACK (0x8000000000000ULL)
+ #define BT_SYMBOL_OFFSET   (BT_SYMBOLIC_ARGS)
+ 
+ #define BT_REF_HEXVAL         (0x1)
+-- 
+2.30.2
+

SOURCES/0002-Fix-typos-in-offset_table-and-missing-help-o-items.patch

@@ -1,168 +0,0 @@
-From d65e5d3eae0dd06a5308a5cb00c05fee60594093 Mon Sep 17 00:00:00 2001
-From: Kazuhito Hagio <k-hagio-ab@nec.com>
-Date: Mon, 20 Nov 2023 13:22:56 +0900
-Subject: [PATCH 02/14] Fix typos in offset_table and missing "help -o" items
-
-A few of zram related members in the offset_table have typos and
-irregular naming rule, also they are not present in the "help -o"
-output.  Let's fix these.
-
-Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- defs.h     |  8 ++++----
- diskdump.c | 24 ++++++++++++------------
- memory.c   |  2 +-
- symbols.c  | 12 ++++++++++++
- 4 files changed, 29 insertions(+), 17 deletions(-)
-
-diff --git a/defs.h b/defs.h
-index 2cae5b61e589..5218a94fe4a4 100644
---- a/defs.h
-+++ b/defs.h
-@@ -2112,13 +2112,13 @@ struct offset_table {                    /* stash of commonly-used offsets */
- 	long bpf_prog_aux_name;
- 	long page_private;
- 	long swap_info_struct_bdev;
--	long zram_mempoll;
-+	long zram_mem_pool;
- 	long zram_compressor;
--	long zram_table_flag;
--	long zspoll_size_class;
-+	long zram_table_entry_flags;
-+	long zs_pool_size_class;
- 	long size_class_size;
- 	long gendisk_private_data;
--	long zram_table_entry;
-+	long zram_table_entry;	/* unused; but cannot remove */
- 	long module_core_size_rw;
- 	long module_core_size_rx;
- 	long module_init_size_rw;
-diff --git a/diskdump.c b/diskdump.c
-index 25054d96313e..f20f3ac519a1 100644
---- a/diskdump.c
-+++ b/diskdump.c
-@@ -2765,15 +2765,15 @@ zram_init(void)
- {
- 	long zram_flag_shift;
- 
--	MEMBER_OFFSET_INIT(zram_mempoll, "zram", "mem_pool");
-+	MEMBER_OFFSET_INIT(zram_mem_pool, "zram", "mem_pool");
- 	MEMBER_OFFSET_INIT(zram_compressor, "zram", "compressor");
- 	if (INVALID_MEMBER(zram_compressor))
- 		MEMBER_OFFSET_INIT(zram_comp_algs, "zram", "comp_algs");
--	MEMBER_OFFSET_INIT(zram_table_flag, "zram_table_entry", "flags");
--	if (INVALID_MEMBER(zram_table_flag))
--		MEMBER_OFFSET_INIT(zram_table_flag, "zram_table_entry", "value");
-+	MEMBER_OFFSET_INIT(zram_table_entry_flags, "zram_table_entry", "flags");
-+	if (INVALID_MEMBER(zram_table_entry_flags))
-+		MEMBER_OFFSET_INIT(zram_table_entry_flags, "zram_table_entry", "value");
- 	STRUCT_SIZE_INIT(zram_table_entry, "zram_table_entry");
--	MEMBER_OFFSET_INIT(zspoll_size_class, "zs_pool", "size_class");
-+	MEMBER_OFFSET_INIT(zs_pool_size_class, "zs_pool", "size_class");
- 	MEMBER_OFFSET_INIT(size_class_size, "size_class", "size");
- 	MEMBER_OFFSET_INIT(zspage_huge, "zspage", "huge");
- 
-@@ -2826,7 +2826,7 @@ zram_object_addr(ulong pool, ulong handle, unsigned char *zram_buf)
- 	if (zs_magic != ZSPAGE_MAGIC)
- 		error(FATAL, "zspage magic incorrect: %x\n", zs_magic);
- 
--	class = pool + OFFSET(zspoll_size_class);
-+	class = pool + OFFSET(zs_pool_size_class);
- 	class += (class_idx * sizeof(void *));
- 	readmem(class, KVADDR, &class, sizeof(void *), "size_class", FAULT_ON_ERROR);
- 	readmem(class + OFFSET(size_class_size), KVADDR,
-@@ -2987,9 +2987,9 @@ try_zram_decompress(ulonglong pte_val, unsigned char *buf, ulong len, ulonglong
- 	ulong zram, zram_table_entry, sector, index, entry, flags, size,
- 		outsize, off;
- 
--	if (INVALID_MEMBER(zram_mempoll)) {
-+	if (INVALID_MEMBER(zram_mem_pool)) {
- 		zram_init();
--		if (INVALID_MEMBER(zram_mempoll)) {
-+		if (INVALID_MEMBER(zram_mem_pool)) {
- 			error(WARNING,
- 			      "Some pages are swapped out to zram. "
- 			      "Please run mod -s zram.\n");
-@@ -3013,8 +3013,8 @@ try_zram_decompress(ulonglong pte_val, unsigned char *buf, ulong len, ulonglong
- 	readmem(zram, KVADDR, &zram_table_entry,
- 		sizeof(void *), "zram_table_entry", FAULT_ON_ERROR);
- 	zram_table_entry += (index * SIZE(zram_table_entry));
--	readmem(zram_table_entry + OFFSET(zram_table_flag), KVADDR, &flags,
--		sizeof(void *), "zram_table_flag", FAULT_ON_ERROR);
-+	readmem(zram_table_entry + OFFSET(zram_table_entry_flags), KVADDR, &flags,
-+		sizeof(void *), "zram_table_entry.flags", FAULT_ON_ERROR);
- 	if (VALID_MEMBER(zram_compressor))
- 		readmem(zram + OFFSET(zram_compressor), KVADDR, name, sizeof(name),
- 			"zram compressor", FAULT_ON_ERROR);
-@@ -3072,8 +3072,8 @@ try_zram_decompress(ulonglong pte_val, unsigned char *buf, ulong len, ulonglong
- 		goto out;
- 	}
- 
--	readmem(zram + OFFSET(zram_mempoll), KVADDR, &zram,
--		sizeof(void *), "zram_mempoll", FAULT_ON_ERROR);
-+	readmem(zram + OFFSET(zram_mem_pool), KVADDR, &zram,
-+		sizeof(void *), "zram.mem_pool", FAULT_ON_ERROR);
- 
- 	obj_addr = zram_object_addr(zram, entry, zram_buf);
- 	if (obj_addr == NULL) {
-diff --git a/memory.c b/memory.c
-index 86ccec5e2bac..791194a405d4 100644
---- a/memory.c
-+++ b/memory.c
-@@ -519,7 +519,7 @@ vm_init(void)
-         	"swap_info_struct", "old_block_size");
- 	MEMBER_OFFSET_INIT(swap_info_struct_bdev, "swap_info_struct", "bdev");
- 
--	MEMBER_OFFSET_INIT(zspoll_size_class, "zs_pool", "size_class");
-+	MEMBER_OFFSET_INIT(zs_pool_size_class, "zs_pool", "size_class");
- 	MEMBER_OFFSET_INIT(size_class_size, "size_class", "size");
- 
- 	MEMBER_OFFSET_INIT(block_device_bd_inode, "block_device", "bd_inode");
-diff --git a/symbols.c b/symbols.c
-index 8e8b4c31d915..176c95026f03 100644
---- a/symbols.c
-+++ b/symbols.c
-@@ -10304,6 +10304,7 @@ dump_offset_table(char *spec, ulong makestruct)
-                 OFFSET(page_active));
-         fprintf(fp, "            page_compound_head: %ld\n",
-                 OFFSET(page_compound_head));
-+        fprintf(fp, "                  page_private: %ld\n", OFFSET(page_private));
- 
- 	fprintf(fp, "        trace_print_flags_mask: %ld\n",
- 		OFFSET(trace_print_flags_mask));
-@@ -10330,6 +10331,7 @@ dump_offset_table(char *spec, ulong makestruct)
- 		OFFSET(swap_info_struct_inuse_pages));
-         fprintf(fp, "swap_info_struct_old_block_size: %ld\n",
- 		OFFSET(swap_info_struct_old_block_size));
-+        fprintf(fp, "         swap_info_struct_bdev: %ld\n", OFFSET(swap_info_struct_bdev));
- 	fprintf(fp, "         block_device_bd_inode: %ld\n",
- 		OFFSET(block_device_bd_inode));
- 	fprintf(fp, "          block_device_bd_list: %ld\n",
-@@ -11359,6 +11361,8 @@ dump_offset_table(char *spec, ulong makestruct)
- 		OFFSET(gendisk_part0));
- 	fprintf(fp, "                 gendisk_queue: %ld\n",
- 		OFFSET(gendisk_queue));
-+	fprintf(fp, "          gendisk_private_data: %ld\n", OFFSET(gendisk_private_data));
-+
- 	fprintf(fp, "                 hd_struct_dev: %ld\n",
- 		OFFSET(hd_struct_dev));
- 	fprintf(fp, "             hd_struct_dkstats: %ld\n",
-@@ -11765,6 +11769,14 @@ dump_offset_table(char *spec, ulong makestruct)
- 	fprintf(fp, "            maple_metadata_end: %ld\n", OFFSET(maple_metadata_end));
- 	fprintf(fp, "            maple_metadata_gap: %ld\n", OFFSET(maple_metadata_gap));
- 
-+	fprintf(fp, "                 zram_mem_pool: %ld\n", OFFSET(zram_mem_pool));
-+	fprintf(fp, "               zram_compressor: %ld\n", OFFSET(zram_compressor));
-+	fprintf(fp, "                zram_comp_algs: %ld\n", OFFSET(zram_comp_algs));
-+	fprintf(fp, "        zram_table_entry_flags: %ld\n", OFFSET(zram_table_entry_flags));
-+	fprintf(fp, "            zs_pool_size_class: %ld\n", OFFSET(zs_pool_size_class));
-+	fprintf(fp, "               size_class_size: %ld\n", OFFSET(size_class_size));
-+	fprintf(fp, "                   zspage_huge: %ld\n", OFFSET(zspage_huge));
-+
- 	fprintf(fp, "\n                    size_table:\n");
- 	fprintf(fp, "                          page: %ld\n", SIZE(page));
- 	fprintf(fp, "                    page_flags: %ld\n", SIZE(page_flags));
--- 
-2.41.0
-

SOURCES/0002-Handle-blk_mq_ctx-member-changes-for-kernels-5.16-rc.patch

@@ -0,0 +1,101 @@
+From 78255e3b33f8d51eb893e662dd1b05a008246b9d Mon Sep 17 00:00:00 2001
+From: Lianbo Jiang <lijiang@redhat.com>
+Date: Fri, 24 Dec 2021 18:56:35 +0800
+Subject: [PATCH 02/11] Handle blk_mq_ctx member changes for kernels 5.16-rc1
+ and later
+
+Kernel commit 9a14d6ce4135 ("block: remove debugfs blk_mq_ctx
+dispatched/merged/completed attributes") removed the member
+rq_dispatched and rq_completed from struct blk_mq_ctx.  Without
+the patch, "dev -d|-D" options will fail with the following error:
+
+crash> dev -d
+MAJOR GENDISK            NAME       REQUEST_QUEUE      TOTAL ASYNC  SYNC
+
+dev: invalid structure member offset: blk_mq_ctx_rq_dispatched
+     FILE: dev.c  LINE: 4229  FUNCTION: get_one_mctx_diskio()
+
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
+---
+ dev.c | 57 +++++++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 39 insertions(+), 18 deletions(-)
+
+diff --git a/dev.c b/dev.c
+index effe789f38d8..a493e51ac95c 100644
+--- a/dev.c
++++ b/dev.c
+@@ -4246,6 +4246,10 @@ get_mq_diskio(unsigned long q, unsigned long *mq_count)
+ 	unsigned long mctx_addr;
+ 	struct diskio tmp;
+ 
++	if (INVALID_MEMBER(blk_mq_ctx_rq_dispatched) ||
++	    INVALID_MEMBER(blk_mq_ctx_rq_completed))
++		return;
++
+ 	memset(&tmp, 0x00, sizeof(struct diskio));
+ 
+ 	readmem(q + OFFSET(request_queue_queue_ctx), KVADDR, &queue_ctx,
+@@ -4475,24 +4479,41 @@ display_one_diskio(struct iter *i, unsigned long gendisk, ulong flags)
+ 		&& (io.read + io.write == 0))
+ 		return;
+ 
+-	fprintf(fp, "%s%s%s  %s%s%s%s  %s%5d%s%s%s%s%s",
+-		mkstring(buf0, 5, RJUST|INT_DEC, (char *)(unsigned long)major),
+-		space(MINSPACE),
+-		mkstring(buf1, VADDR_PRLEN, LJUST|LONG_HEX, (char *)gendisk),
+-		space(MINSPACE),
+-		mkstring(buf2, 10, LJUST, disk_name),
+-		space(MINSPACE),
+-		mkstring(buf3, VADDR_PRLEN <= 11 ? 11 : VADDR_PRLEN,
+-			 LJUST|LONG_HEX, (char *)queue_addr),
+-		space(MINSPACE),
+-		io.read + io.write,
+-		space(MINSPACE),
+-		mkstring(buf4, 5, RJUST|INT_DEC,
+-			(char *)(unsigned long)io.read),
+-		space(MINSPACE),
+-		mkstring(buf5, 5, RJUST|INT_DEC,
+-			(char *)(unsigned long)io.write),
+-		space(MINSPACE));
++	if (use_mq_interface(queue_addr) &&
++	    (INVALID_MEMBER(blk_mq_ctx_rq_dispatched) ||
++	     INVALID_MEMBER(blk_mq_ctx_rq_completed)))
++		fprintf(fp, "%s%s%s  %s%s%s%s  %s%s%s",
++			mkstring(buf0, 5, RJUST|INT_DEC, (char *)(unsigned long)major),
++			space(MINSPACE),
++			mkstring(buf1, VADDR_PRLEN, LJUST|LONG_HEX, (char *)gendisk),
++			space(MINSPACE),
++			mkstring(buf2, 10, LJUST, disk_name),
++			space(MINSPACE),
++			mkstring(buf3, VADDR_PRLEN <= 11 ? 11 : VADDR_PRLEN,
++				 LJUST|LONG_HEX, (char *)queue_addr),
++			space(MINSPACE),
++			mkstring(buf4, 17, RJUST, "(not supported)"),
++			space(MINSPACE));
++
++	else
++		fprintf(fp, "%s%s%s  %s%s%s%s  %s%5d%s%s%s%s%s",
++			mkstring(buf0, 5, RJUST|INT_DEC, (char *)(unsigned long)major),
++			space(MINSPACE),
++			mkstring(buf1, VADDR_PRLEN, LJUST|LONG_HEX, (char *)gendisk),
++			space(MINSPACE),
++			mkstring(buf2, 10, LJUST, disk_name),
++			space(MINSPACE),
++			mkstring(buf3, VADDR_PRLEN <= 11 ? 11 : VADDR_PRLEN,
++				 LJUST|LONG_HEX, (char *)queue_addr),
++			space(MINSPACE),
++			io.read + io.write,
++			space(MINSPACE),
++			mkstring(buf4, 5, RJUST|INT_DEC,
++				(char *)(unsigned long)io.read),
++			space(MINSPACE),
++			mkstring(buf5, 5, RJUST|INT_DEC,
++				(char *)(unsigned long)io.write),
++			space(MINSPACE));
+ 
+ 	if (VALID_MEMBER(request_queue_in_flight)) {
+ 		if (!use_mq_interface(queue_addr)) {
+-- 
+2.20.1
+

SOURCES/0002-defs.h-fix-breakage-of-compatibility-of-struct-symbo.patch

@@ -0,0 +1,41 @@
+From a0eec39c14ee1db95a6c1a649a8f69b97e260dc6 Mon Sep 17 00:00:00 2001
+From: HATAYAMA Daisuke <d.hatayama@fujitsu.com>
+Date: Wed, 8 Dec 2021 12:07:34 +0000
+Subject: [PATCH 2/2] defs.h: fix breakage of compatibility of struct
+ symbol_table_data for extension modules
+
+Commit <3ab39203ddd9> ("symbols: Implement install and remove operations
+for mod_symname_hash") added new member variable mod_symname_hash in the
+middle of struct symbol_table_date, which breaks compatibility of struct
+symbol_table_data for extension modules. As the result, crash trace command
+results in segmentation fault.
+
+Fixes: 3ab39203ddd9 ("symbols: Implement install and remove operations for mod_symname_hash")
+Signed-off-by: HATAYAMA Daisuke <d.hatayama@fujitsu.com>
+---
+ defs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/defs.h b/defs.h
+index caaa11e50c87..41b6cbc6cc85 100644
+--- a/defs.h
++++ b/defs.h
+@@ -2753,7 +2753,6 @@ struct symbol_table_data {
+         double val_hash_searches;
+         double val_hash_iterations;
+         struct syment *symname_hash[SYMNAME_HASH];
+-	struct syment *mod_symname_hash[SYMNAME_HASH];
+ 	struct symbol_namespace kernel_namespace;
+ 	struct syment *ext_module_symtable;
+ 	struct syment *ext_module_symend;
+@@ -2780,6 +2779,7 @@ struct symbol_table_data {
+ 	ulong kaiser_init_vmlinux;
+ 	int kernel_symbol_type;
+ 	ulong linux_banner_vmlinux;
++	struct syment *mod_symname_hash[SYMNAME_HASH];
+ };
+ 
+ /* flags for st */
+-- 
+2.30.2
+

SOURCES/0003-Fix-for-timer-r-option-to-display-all-the-per-CPU-cl.patch

@@ -0,0 +1,59 @@
+From c48177972f351d7853abb2a57709628c75ee38bc Mon Sep 17 00:00:00 2001
+From: Lianbo Jiang <lijiang@redhat.com>
+Date: Thu, 6 Jan 2022 22:34:26 +0800
+Subject: [PATCH 03/11] Fix for "timer -r" option to display all the per-CPU
+ clocks
+
+Currently, the hrtimer_max_clock_bases is hard-coded to 3, which
+makes that crash only prints three clocks, and the rest of clocks
+are not displayed.
+
+Without the patch:
+crash> timer -r -C 11
+CPU: 11  HRTIMER_CPU_BASE: ffff9a775f95ee00
+  CLOCK: 0  HRTIMER_CLOCK_BASE: ffff9a775f95ee80  [ktime_get]
+  (empty)
+
+  CLOCK: 1  HRTIMER_CLOCK_BASE: ffff9a775f95ef00  [ktime_get_real]
+  (empty)
+
+  CLOCK: 2  HRTIMER_CLOCK_BASE: ffff9a775f95ef80  [ktime_get_boottime]
+  (empty)
+
+With the patch:
+crash> timer -r -C 11
+CPU: 11  HRTIMER_CPU_BASE: ffff9a775f95ee00
+  CLOCK: 0  HRTIMER_CLOCK_BASE: ffff9a775f95ee80  [ktime_get]
+  (empty)
+
+  CLOCK: 1  HRTIMER_CLOCK_BASE: ffff9a775f95ef00  [ktime_get_real]
+  (empty)
+
+  CLOCK: 2  HRTIMER_CLOCK_BASE: ffff9a775f95ef80  [ktime_get_boottime]
+  (empty)
+...
+  CLOCK: 7  HRTIMER_CLOCK_BASE: ffff9a775f95f200  [ktime_get_clocktai]
+  (empty)
+
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ kernel.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kernel.c b/kernel.c
+index a637dd0eb8f8..a44a9c52ace0 100644
+--- a/kernel.c
++++ b/kernel.c
+@@ -7672,7 +7672,8 @@ dump_hrtimer_data(const ulong *cpus)
+ 	if (VALID_STRUCT(hrtimer_clock_base)) {
+ 		hrtimer_max_clock_bases = 2;
+ 		if (symbol_exists("ktime_get_boottime"))
+-			hrtimer_max_clock_bases = 3;
++			hrtimer_max_clock_bases = MEMBER_SIZE("hrtimer_cpu_base", "clock_base") /
++							SIZE(hrtimer_clock_base);
+ 	} else if (VALID_STRUCT(hrtimer_base)) {
+ 		max_hrtimer_bases = 2;
+ 	} else
+-- 
+2.20.1
+

SOURCES/0003-zram-Fixes-for-lookup_swap_cache.patch

@@ -1,78 +0,0 @@
-From 582febffa8b3567339148c2bb916fc70f2fc546e Mon Sep 17 00:00:00 2001
-From: Johan Erlandsson <johan.erlandsson@sony.com>
-Date: Fri, 20 Oct 2023 19:10:52 +0200
-Subject: [PATCH 03/14] zram: Fixes for lookup_swap_cache()
-
-Fix the following three issues:
-(1) swap cache missing page tree offset
-    The radix or xarray start at an offset inside struct address_space.
-(2) swap cache entries are pointer to struct page
-    The entries in radix, xarray (swap cache) are address to struct page.
-(3) exclude shadow entries from swap cache lookup
-    radix or xarray can contain shadow entries from previous page
-    entries. These should be ignored when looking for a page pointer.
-
-Without the patch,
-- lookup_swap_cache() returns NULL since do_xarray() call returns FALSE,
-- in try_zram_decompress(), since 'entry' is NULL, page is filled with 0,
-    if (!entry || (flags & ZRAM_FLAG_SAME_BIT)) {
-and pages in swap cache will be seen to be a 'zero' page.
-
-Signed-off-by: Johan Erlandsson <johan.erlandsson@sony.com>
-Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- diskdump.c | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/diskdump.c b/diskdump.c
-index f20f3ac519a1..660c25729dad 100644
---- a/diskdump.c
-+++ b/diskdump.c
-@@ -27,6 +27,7 @@
- #include "diskdump.h"
- #include "xen_dom0.h"
- #include "vmcore.h"
-+#include "maple_tree.h"
- 
- #define BITMAP_SECT_LEN	4096
- 
-@@ -2877,11 +2878,16 @@ out:
- 	return zram_buf;
- }
- 
-+static inline bool radix_tree_exceptional_entry(ulong entry)
-+{
-+	return entry & RADIX_TREE_EXCEPTIONAL_ENTRY;
-+}
-+
- static unsigned char *
- lookup_swap_cache(ulonglong pte_val, unsigned char *zram_buf)
- {
- 	ulonglong swp_offset;
--	ulong swp_type, swp_space, page;
-+	ulong swp_type, swp_space;
- 	struct list_pair lp;
- 	physaddr_t paddr;
- 	static int is_xarray = -1;
-@@ -2907,10 +2913,13 @@ lookup_swap_cache(ulonglong pte_val, unsigned char *zram_buf)
- 	swp_space += (swp_offset >> SWAP_ADDRESS_SPACE_SHIFT) * SIZE(address_space);
- 
- 	lp.index = swp_offset;
--	if ((is_xarray ? do_xarray : do_radix_tree)(swp_space, RADIX_TREE_SEARCH, &lp)) {
--		readmem((ulong)lp.value, KVADDR, &page, sizeof(void *),
--				"swap_cache page", FAULT_ON_ERROR);
--		if (!is_page_ptr(page, &paddr)) {
-+	if ((is_xarray ? do_xarray : do_radix_tree)
-+		(swp_space+OFFSET(address_space_page_tree), RADIX_TREE_SEARCH, &lp)) {
-+		if ((is_xarray ? xa_is_value : radix_tree_exceptional_entry)((ulong)lp.value)) {
-+			/* ignore shadow values */
-+			return NULL;
-+		}
-+		if (!is_page_ptr((ulong)lp.value, &paddr)) {
- 			error(WARNING, "radix page: %lx: not a page pointer\n", lp.value);
- 			return NULL;
- 		}
--- 
-2.41.0
-

SOURCES/0004-Fix-for-bt-v-option-to-display-the-stack-end-address.patch

@@ -0,0 +1,69 @@
+From 1706f8b6ab50cd25e8fdabe8d50a37ce89bd60e0 Mon Sep 17 00:00:00 2001
+From: Lianbo Jiang <lijiang@redhat.com>
+Date: Thu, 6 Jan 2022 12:01:17 +0800
+Subject: [PATCH 04/11] Fix for "bt -v" option to display the stack-end address
+ correctly
+
+The "bt -v" command prints incorrect stack-end address when the
+"CONFIG_THREAD_INFO_IN_TASK=y" is enabled in kernel, the "bt -v"
+command output shows that the value stored at 0xffff8dee0312c198
+is 0xffffffffc076400a, however, the value stored actually at
+0xffff8dee0312c198 is NULL(0x0000000000000000), the stack-end
+address is incorrect.
+
+Without the patch:
+crash> bt -v
+PID: 28642  TASK: ffff8dee0312c180  CPU: 0   COMMAND: "insmod"
+  possible stack overflow: ffff8dee0312c198: ffffffffc076400a != STACK_END_MAGIC
+                                             ^^^^^^^^^^^^^^^^
+
+crash> rd 0xffff8dee0312c198
+ffff8dee0312c198:  0000000000000000                    ........
+                   ^^^^^^^^^^^^^^^^
+
+With the patch:
+crash> bt -v
+PID: 28642  TASK: ffff8dee0312c180  CPU: 0   COMMAND: "insmod"
+  possible stack overflow: ffff991340bc0000: ffffffffc076400a != STACK_END_MAGIC
+
+crash> rd 0xffff991340bc0000
+ffff991340bc0000:  ffffffffc076400a                    .@v.....
+
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ task.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/task.c b/task.c
+index bb6a5da8ad33..b5ddc88e0acb 100644
+--- a/task.c
++++ b/task.c
+@@ -11202,7 +11202,7 @@ check_stack_overflow(void)
+ {
+ 	int i, overflow, cpu_size, cpu, total;
+ 	char buf[BUFSIZE];
+-	ulong magic, task, stackbase;
++	ulong magic, task, stackbase, location;
+ 	struct task_context *tc;
+ 
+ 	if (!tt->stack_end_magic && 
+@@ -11286,9 +11286,15 @@ check_stack_end_magic:
+ 		if (magic != STACK_END_MAGIC) {
+ 			if (!overflow)
+ 				print_task_header(fp, tc, 0);
++
++			if (tt->flags & THREAD_INFO_IN_TASK)
++				location = task_to_stackbase(tc->task);
++			else
++				location = tc->thread_info + SIZE(thread_info);
++
+ 			fprintf(fp, 
+ 			    "  possible stack overflow: %lx: %lx != STACK_END_MAGIC\n",
+-				tc->thread_info + SIZE(thread_info), magic);
++				location, magic);
+ 			overflow++, total++;
+ 		}
+ 
+-- 
+2.20.1
+

SOURCES/0004-symbols-expand-all-kernel-module-symtable-if-not-all.patch

@@ -1,171 +0,0 @@
-From f2ee6fa6c841ddc37ba665909dafbc7294c34d64 Mon Sep 17 00:00:00 2001
-From: Tao Liu <ltao@redhat.com>
-Date: Fri, 17 Nov 2023 15:52:19 +0800
-Subject: [PATCH 04/14] symbols: expand all kernel module symtable if not all
- expanded previously
-
-There is an issue that, for kernel modules, "dis -rl" fails to display
-modules code line number data after execute "bt" command in crash.
-
-Without the patch:
-  crsah> mod -S
-  crash> bt
-  PID: 1500     TASK: ff2bd8b093524000  CPU: 16   COMMAND: "lpfc_worker_0"
-   #0 [ff2c9f725c39f9e0] machine_kexec at ffffffff8e0686d3
-   ...snip...
-   #8 [ff2c9f725c39fcc0] __lpfc_sli_release_iocbq_s4 at ffffffffc0f2f425 [lpfc]
-   ...snip...
-  crash> dis -rl ffffffffc0f60f82
-  0xffffffffc0f60eb0 <lpfc_nlp_get>:      nopl   0x0(%rax,%rax,1) [FTRACE NOP]
-  0xffffffffc0f60eb5 <lpfc_nlp_get+5>:    push   %rbp
-  0xffffffffc0f60eb6 <lpfc_nlp_get+6>:    push   %rbx
-  0xffffffffc0f60eb7 <lpfc_nlp_get+7>:    test   %rdi,%rdi
-
-With the patch:
-  crash> mod -S
-  crash> bt
-  PID: 1500     TASK: ff2bd8b093524000  CPU: 16   COMMAND: "lpfc_worker_0"
-   #0 [ff2c9f725c39f9e0] machine_kexec at ffffffff8e0686d3
-   ...snip...
-   #8 [ff2c9f725c39fcc0] __lpfc_sli_release_iocbq_s4 at ffffffffc0f2f425 [lpfc]
-   ...snip...
-  crash> dis -rl ffffffffc0f60f82
-  /usr/src/debug/kernel-4.18.0-425.13.1.el8_7/linux-4.18.0-425.13.1.el8_7.x86_64/drivers/scsi/lpfc/lpfc_hbadisc.c: 6756
-  0xffffffffc0f60eb0 <lpfc_nlp_get>:      nopl   0x0(%rax,%rax,1) [FTRACE NOP]
-  /usr/src/debug/kernel-4.18.0-425.13.1.el8_7/linux-4.18.0-425.13.1.el8_7.x86_64/drivers/scsi/lpfc/lpfc_hbadisc.c: 6759
-  0xffffffffc0f60eb5 <lpfc_nlp_get+5>:    push   %rbp
-
-The root cause is, after kernel module been loaded by mod command, the symtable
-is not expanded in gdb side. crash bt or dis command will trigger such an
-expansion. However the symtable expansion is different for the 2 commands:
-
-The stack trace of "dis -rl" for symtable expanding:
-
-  #0  0x00000000008d8d9f in add_compunit_symtab_to_objfile ...
-  #1  0x00000000006d3293 in buildsym_compunit::end_symtab_with_blockvector ...
-  #2  0x00000000006d336a in buildsym_compunit::end_symtab_from_static_block ...
-  #3  0x000000000077e8e9 in process_full_comp_unit ...
-  #4  process_queue ...
-  #5  dw2_do_instantiate_symtab ...
-  #6  0x000000000077ed67 in dw2_instantiate_symtab ...
-  #7  0x000000000077f75e in dw2_expand_all_symtabs ...
-  #8  0x00000000008f254d in gdb_get_line_number ...
-  #9  0x00000000008f22af in gdb_command_funnel_1 ...
-  #10 0x00000000008f2003 in gdb_command_funnel ...
-  #11 0x00000000005b7f02 in gdb_interface ...
-  #12 0x00000000005f5bd8 in get_line_number ...
-  #13 0x000000000059e574 in cmd_dis ...
-
-The stack trace of "bt" for symtable expanding:
-
-  #0  0x00000000008d8d9f in add_compunit_symtab_to_objfile ...
-  #1  0x00000000006d3293 in buildsym_compunit::end_symtab_with_blockvector ...
-  #2  0x00000000006d336a in buildsym_compunit::end_symtab_from_static_block ...
-  #3  0x000000000077e8e9 in process_full_comp_unit ...
-  #4  process_queue ...
-  #5  dw2_do_instantiate_symtab ...
-  #6  0x000000000077ed67 in dw2_instantiate_symtab ...
-  #7  0x000000000077f8ed in dw2_lookup_symbol ...
-  #8  0x00000000008e6d03 in lookup_symbol_via_quick_fns ...
-  #9  0x00000000008e7153 in lookup_symbol_in_objfile ...
-  #10 0x00000000008e73c6 in lookup_symbol_global_or_static_iterator_cb ...
-  #11 0x00000000008b99c4 in svr4_iterate_over_objfiles_in_search_order ...
-  #12 0x00000000008e754e in lookup_global_or_static_symbol ...
-  #13 0x00000000008e75da in lookup_static_symbol ...
-  #14 0x00000000008e632c in lookup_symbol_aux ...
-  #15 0x00000000008e5a7a in lookup_symbol_in_language ...
-  #16 0x00000000008e5b30 in lookup_symbol ...
-  #17 0x00000000008f2a4a in gdb_get_datatype ...
-  #18 0x00000000008f22c0 in gdb_command_funnel_1 ...
-  #19 0x00000000008f2003 in gdb_command_funnel ...
-  #20 0x00000000005b7f02 in gdb_interface ...
-  #21 0x00000000005f8a9f in datatype_info ...
-  #22 0x0000000000599947 in cpu_map_size ...
-  #23 0x00000000005a975d in get_cpus_online ...
-  #24 0x0000000000637a8b in diskdump_get_prstatus_percpu ...
-  #25 0x000000000062f0e4 in get_netdump_regs_x86_64 ...
-  #26 0x000000000059fe68 in back_trace ...
-  #27 0x00000000005ab1cb in cmd_bt ...
-
-For the stacktrace of "dis -rl", it calls dw2_expand_all_symtabs() to expand
-all symtable of the objfile, or "*.ko.debug" in our case. However for
-the stacktrace of "bt", it doesn't expand all, but only a subset of symtable
-which is enough to find a symbol by dw2_lookup_symbol(). As a result, the
-objfile->compunit_symtabs, which is the head of a single linked list of
-struct compunit_symtab, is not NULL but didn't contain all symtables. It
-will not be reinitialized in gdb_get_line_number() by "dis -rl" because
-!objfile_has_full_symbols(objfile) check will fail, so it cannot display
-the proper code line number data.
-
-Since objfile_has_full_symbols(objfile) check cannot ensure all symbols
-been expanded, this patch add a new member as a flag for struct objfile
-to record if all symbols have been expanded. The flag will be set only ofter
-expand_all_symtabs been called.
-
-Signed-off-by: Tao Liu <ltao@redhat.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- gdb-10.2.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 50 insertions(+)
-
-diff --git a/gdb-10.2.patch b/gdb-10.2.patch
-index d81030d946e8..2f7d585105aa 100644
---- a/gdb-10.2.patch
-+++ b/gdb-10.2.patch
-@@ -3187,3 +3187,53 @@ exit 0
-        result = stringtab + symbol_entry->_n._n_n._n_offset;
-      }
-    else
-+--- gdb-10.2/gdb/objfiles.h.orig
-++++ gdb-10.2/gdb/objfiles.h
-+@@ -712,6 +712,8 @@ struct objfile
-+      next time.  If an objfile does not have the symbols, it will
-+      never have them.  */
-+   bool skip_jit_symbol_lookup = false;
-++
-++  bool all_symtabs_expanded = false;
-+ };
-+ 
-+ /* A deleter for objfile.  */
-+--- gdb-10.2/gdb/symfile.c.orig
-++++ gdb-10.2/gdb/symfile.c
-+@@ -1133,8 +1133,10 @@ symbol_file_add_with_addrs (bfd *abfd, const char *name,
-+ 	printf_filtered (_("Expanding full symbols from %ps...\n"),
-+ 			 styled_string (file_name_style.style (), name));
-+ 
-+-      if (objfile->sf)
-++      if (objfile->sf) {
-+ 	objfile->sf->qf->expand_all_symtabs (objfile);
-++	objfile->all_symtabs_expanded = true;
-++      }
-+     }
-+ 
-+   /* Note that we only print a message if we have no symbols and have
-+--- gdb-10.2/gdb/symtab.c.orig
-++++ gdb-10.2/gdb/symtab.c
-+@@ -7097,8 +7097,9 @@ gdb_get_line_number(struct gnu_request *req)
-+                  */
-+                 if (req->lm) {
-+                         objfile = req->lm->loaded_objfile;
-+-                        if (!objfile_has_full_symbols(objfile) && objfile->sf) {
-++                        if (!objfile->all_symtabs_expanded && objfile->sf) {
-+                                 objfile->sf->qf->expand_all_symtabs(objfile);
-++                                objfile->all_symtabs_expanded = true;
-+                                 sal = find_pc_line(pc, 0);
-+                         }
-+                 }
-+@@ -7761,8 +7765,10 @@ iterate_datatypes (struct gnu_request *req)
-+ {
-+   for (objfile *objfile : current_program_space->objfiles ())
-+     {
-+-      if (objfile->sf)
-++      if (objfile->sf) {
-+         objfile->sf->qf->expand_all_symtabs(objfile);
-++        objfile->all_symtabs_expanded = true;
-++      }
-+ 
-+       for (compunit_symtab *cust : objfile->compunits ())
-+         {
--- 
-2.41.0
-

SOURCES/0005-Fix-for-HZ-calculation-on-Linux-5.14-and-later.patch

@@ -0,0 +1,35 @@
+From f5637f341533ef2b28e2d6a6b12fcfb00d0fff2d Mon Sep 17 00:00:00 2001
+From: Lianbo Jiang <lijiang@redhat.com>
+Date: Mon, 10 Jan 2022 17:25:06 +0800
+Subject: [PATCH 05/11] Fix for HZ calculation on Linux 5.14 and later
+
+Kernel commit 3e9a99eba058 ("block/mq-deadline: Rename dd_init_queue()
+and dd_exit_queue()") renamed dd_init_queue to dd_init_sched. Without
+the patch, the 'help -m' may print incorrect hz value as follows:
+
+crash> help -m | grep hz
+       hz: 1000    <---The correct hz value on ppc64le machine is 100.
+	   ^^^^
+
+Fixes: b93027ce5c75 ("Add alternate HZ calculation using write_expire")
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ task.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/task.c b/task.c
+index b5ddc88e0acb..76e184ae70b1 100644
+--- a/task.c
++++ b/task.c
+@@ -440,6 +440,8 @@ task_init(void)
+ 		}
+ 	} else if ((symbol_exists("dd_init_queue") &&
+ 	    gdb_set_crash_scope(symbol_value("dd_init_queue"), "dd_init_queue")) ||
++	    (symbol_exists("dd_init_sched") &&
++	    gdb_set_crash_scope(symbol_value("dd_init_sched"), "dd_init_sched")) ||
+ 	    (symbol_exists("deadline_init_queue") &&
+ 	    gdb_set_crash_scope(symbol_value("deadline_init_queue"), "deadline_init_queue"))) {
+ 		char buf[BUFSIZE];
+-- 
+2.20.1
+

SOURCES/0005-symbols-skip-load-.init.-sections-if-module-was-succ.patch

@@ -1,67 +0,0 @@
-From 0c5ef6a4a3a2759915ffe72b1366dce2f32f65c5 Mon Sep 17 00:00:00 2001
-From: Tao Liu <ltao@redhat.com>
-Date: Tue, 14 Nov 2023 16:32:07 +0800
-Subject: [PATCH 05/14] symbols: skip load .init.* sections if module was
- successfully initialized
-
-There might be address overlap of one modules .init.text symbols and
-another modules .text symbols. As a result, gdb fails to translate the
-address to symbol name correctly:
-
-  crash> sym -m virtio_blk | grep MODULE
-  ffffffffc00a4000 MODULE START: virtio_blk
-  ffffffffc00a86ec MODULE END: virtio_blk
-  crash> gdb info address floppy_module_init
-  Symbol "floppy_module_init" is a function at address 0xffffffffc00a4131.
-
-Since the .init.* sections of a module had been freed by kernel if the
-module was initialized successfully, there is no need to load the .init.*
-sections data from "*.ko.debug" in gdb to create such an overlap.
-lm->mod_init_module_ptr is used as a flag of whether module is freed.
-
-Without the patch:
-  crash> mod -S
-  crash> struct blk_mq_ops 0xffffffffc00a7160
-  struct blk_mq_ops {
-    queue_rq = 0xffffffffc00a45b0 <floppy_module_init+1151>, <-- translated from module floppy
-    map_queue = 0xffffffff813015c0 <blk_mq_map_queue>,
-    ...snip...
-    complete = 0xffffffffc00a4370 <floppy_module_init+575>,
-    init_request = 0xffffffffc00a4260 <floppy_module_init+303>,
-    ...snip...
-  }
-
-With the patch:
-  crash> mod -S
-  crash> struct blk_mq_ops 0xffffffffc00a7160
-  struct blk_mq_ops {
-    queue_rq = 0xffffffffc00a45b0 <virtio_queue_rq>, <-- translated from module virtio_blk
-    map_queue = 0xffffffff813015c0 <blk_mq_map_queue>,
-    ...snip...
-    complete = 0xffffffffc00a4370 <virtblk_request_done>,
-    init_request = 0xffffffffc00a4260 <virtblk_init_request>,
-    ...snip...
-  }
-
-Signed-off-by: Tao Liu <ltao@redhat.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- symbols.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/symbols.c b/symbols.c
-index 176c95026f03..5d919910164e 100644
---- a/symbols.c
-+++ b/symbols.c
-@@ -13295,7 +13295,7 @@ add_symbol_file_kallsyms(struct load_module *lm, struct gnu_request *req)
- 			shift_string_right(req->buf, strlen(buf));
- 			BCOPY(buf, req->buf, strlen(buf));
- 			retval = TRUE;
--		} else {
-+		} else if (lm->mod_init_module_ptr || !STRNEQ(section_name, ".init.")) {
- 			sprintf(buf, " -s %s 0x%lx", section_name, section_vaddr);
- 			while ((len + strlen(buf)) >= buflen) {
- 				RESIZEBUF(req->buf, buflen, buflen * 2);
--- 
-2.41.0
-

SOURCES/0006-memory-Handle-struct-slab-changes-on-Linux-5.17-rc1-.patch

@@ -0,0 +1,40 @@
+From a392b27653e4e75460753522af0f006006b4dc4e Mon Sep 17 00:00:00 2001
+From: Alexander Egorenkov <egorenar@linux.ibm.com>
+Date: Mon, 6 Dec 2021 16:04:19 +0100
+Subject: [PATCH 06/11] memory: Handle struct slab changes on Linux 5.17-rc1
+ and later
+
+Since kernel commit d122019bf061 ("mm: Split slab into its own type"),
+the struct slab is used for both SLAB and SLUB. Therefore, don't depend
+on the non-presence of the struct slab to decide whether SLAB implementation
+should be chosen and use the member variable "cpu_slab" of the struct
+kmem_cache instead, it should be present only in SLUB.
+
+Without the patch, crash fails to start with the error message:
+
+  crash: invalid structure member offset: kmem_cache_s_num
+             FILE: memory.c  LINE: 9619  FUNCTION: kmem_cache_init()
+
+Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ memory.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/memory.c b/memory.c
+index 86c02c132890..5af45fd7d834 100644
+--- a/memory.c
++++ b/memory.c
+@@ -576,7 +576,8 @@ vm_init(void)
+ 		STRUCT_SIZE_INIT(cpucache_s, "cpucache_s");
+ 
+         } else if (!VALID_STRUCT(kmem_slab_s) && 
+-		   !VALID_STRUCT(slab_s) && 
++		   !VALID_STRUCT(slab_s) &&
++		   !MEMBER_EXISTS("kmem_cache", "cpu_slab") &&
+ 		   (VALID_STRUCT(slab) || (vt->flags & SLAB_OVERLOAD_PAGE))) {
+                 vt->flags |= PERCPU_KMALLOC_V2;
+ 
+-- 
+2.20.1
+

SOURCES/0006-use-NR_SWAPCACHE-when-nr_swapper_spaces-isn-t-availa.patch

@@ -1,47 +0,0 @@
-From c15da07526291a5c357010cb4aaf4bde6151e642 Mon Sep 17 00:00:00 2001
-From: Johan Erlandsson <johan.erlandsson@sony.com>
-Date: Wed, 19 Apr 2023 11:26:04 +0200
-Subject: [PATCH 06/14] use NR_SWAPCACHE when nr_swapper_spaces isn't available
-
-In 5.12 the following change was introduced:
-b6038942480e ("mm: memcg: add swapcache stat for memcg v2")
-
-Then the variable 'nr_swapper_spaces' is not read (unless
-CONFIG_DEBUG_VM=y).  In GKI builds this variable is then optimized
-out. But the same change provided a new way to obtain the same
-information, using NR_SWAPCACHE.
-
-Reported-by: xueguolun <xueguolun@xiaomi.com>
-Signed-off-by: Johan Erlandsson <johan.erlandsson@sony.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- memory.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/memory.c b/memory.c
-index 791194a405d4..b84e974a3325 100644
---- a/memory.c
-+++ b/memory.c
-@@ -8486,7 +8486,7 @@ dump_kmeminfo(void)
- 	ulong hugetlb_total_pages, hugetlb_total_free_pages = 0;
- 	int done_hugetlb_calc = 0; 
- 	long nr_file_pages, nr_slab;
--	ulong swapper_space_nrpages;
-+	long swapper_space_nrpages;
- 	ulong pct;
- 	uint tmp;
- 	struct meminfo meminfo;
-@@ -8609,7 +8609,9 @@ dump_kmeminfo(void)
- 		char *swapper_space = GETBUF(SIZE(address_space));
- 
- 		swapper_space_nrpages = 0;
--		if (symbol_exists("nr_swapper_spaces") &&
-+		if (dump_vm_stat("NR_SWAPCACHE", &swapper_space_nrpages, 0)) {
-+			;
-+		} else if (symbol_exists("nr_swapper_spaces") &&
- 			(len = get_array_length("nr_swapper_spaces",
- 				NULL, 0))) {
- 			char *nr_swapper_space =
--- 
-2.41.0
-

SOURCES/0007-Fix-identity_map_base-value-dump-on-S390.patch

@@ -1,43 +0,0 @@
-From 2e513114e7d77fadc88011f186ef943ccf397d35 Mon Sep 17 00:00:00 2001
-From: Alexander Gordeev <agordeev@linux.ibm.com>
-Date: Wed, 29 Nov 2023 13:47:34 +0100
-Subject: [PATCH 07/14] Fix identity_map_base value dump on S390
-
-Kernel virtual base instead of identity base is printed
-
-Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- s390.c  | 2 +-
- s390x.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/s390.c b/s390.c
-index 42f5cc63ae52..a8b2bcca86c7 100644
---- a/s390.c
-+++ b/s390.c
-@@ -183,7 +183,7 @@ s390_dump_machdep_table(ulong arg)
- 	fprintf(fp, ")\n");
- 
- 	fprintf(fp, "             kvbase: %lx\n", machdep->kvbase);
--	fprintf(fp, "  identity_map_base: %lx\n", machdep->kvbase);
-+	fprintf(fp, "  identity_map_base: %lx\n", machdep->identity_map_base);
- 	fprintf(fp, "           pagesize: %d\n", machdep->pagesize);
- 	fprintf(fp, "          pageshift: %d\n", machdep->pageshift);
- 	fprintf(fp, "           pagemask: %llx\n", machdep->pagemask);
-diff --git a/s390x.c b/s390x.c
-index d7ee3755fc0b..096c072186f5 100644
---- a/s390x.c
-+++ b/s390x.c
-@@ -650,7 +650,7 @@ s390x_dump_machdep_table(ulong arg)
- 	fprintf(fp, ")\n");
- 
- 	fprintf(fp, "             kvbase: %lx\n", machdep->kvbase);
--	fprintf(fp, "  identity_map_base: %lx\n", machdep->kvbase);
-+	fprintf(fp, "  identity_map_base: %lx\n", machdep->identity_map_base);
- 	fprintf(fp, "           pagesize: %d\n", machdep->pagesize);
- 	fprintf(fp, "          pageshift: %d\n", machdep->pageshift);
- 	fprintf(fp, "           pagemask: %llx\n", machdep->pagemask);
--- 
-2.41.0
-

SOURCES/0007-Move-the-initialization-of-boot_date-to-task_init.patch

@@ -0,0 +1,75 @@
+From fa0b6453a05c5600849e4e531c94594ed9c90270 Mon Sep 17 00:00:00 2001
+From: Lianbo Jiang <lijiang@redhat.com>
+Date: Mon, 17 Jan 2022 15:14:00 +0800
+Subject: [PATCH 07/11] Move the initialization of "boot_date" to task_init()
+
+The "boot_date" is initialized conditionally in the cmd_log(), which may
+display incorrect "boot_date" value with the following command before
+running the "log -T" command:
+
+crash> help -k | grep date
+          date: Wed Dec 22 13:39:29 IST 2021
+     boot_date: Thu Jan  1 05:30:00 IST 1970
+                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The calculation of "boot_date" depends on the HZ value, and the HZ will
+be calculated in task_init() at the latest, so let's move it here.
+
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ kernel.c | 18 +++---------------
+ task.c   | 10 ++++++++++
+ 2 files changed, 13 insertions(+), 15 deletions(-)
+
+diff --git a/kernel.c b/kernel.c
+index a44a9c52ace0..9afddc0c918c 100644
+--- a/kernel.c
++++ b/kernel.c
+@@ -5026,21 +5026,9 @@ cmd_log(void)
+         if (argerrs)
+                 cmd_usage(pc->curcmd, SYNOPSIS);
+ 
+-	if (msg_flags & SHOW_LOG_CTIME) {
+-		if (pc->flags & MINIMAL_MODE) {
+-			error(WARNING, "the option '-T' is not available in minimal mode\n");
+-			return;
+-		}
+-
+-		if (kt->boot_date.tv_sec == 0) {
+-			ulonglong uptime_jiffies;
+-			ulong  uptime_sec;
+-
+-			get_uptime(NULL, &uptime_jiffies);
+-			uptime_sec = (uptime_jiffies)/(ulonglong)machdep->hz;
+-			kt->boot_date.tv_sec = kt->date.tv_sec - uptime_sec;
+-			kt->boot_date.tv_nsec = 0;
+-		}
++	if (msg_flags & SHOW_LOG_CTIME && pc->flags & MINIMAL_MODE) {
++		error(WARNING, "the option '-T' is not available in minimal mode\n");
++		return;
+ 	}
+ 
+ 	if (msg_flags & SHOW_LOG_AUDIT) {
+diff --git a/task.c b/task.c
+index 76e184ae70b1..263a8344dd94 100644
+--- a/task.c
++++ b/task.c
+@@ -692,6 +692,16 @@ task_init(void)
+ 
+ 	stack_overflow_check_init();
+ 
++	if (machdep->hz) {
++		ulonglong uptime_jiffies;
++		ulong  uptime_sec;
++
++		get_uptime(NULL, &uptime_jiffies);
++		uptime_sec = (uptime_jiffies)/(ulonglong)machdep->hz;
++		kt->boot_date.tv_sec = kt->date.tv_sec - uptime_sec;
++		kt->boot_date.tv_nsec = 0;
++	}
++
+ 	tt->flags |= TASK_INIT_DONE;
+ }
+ 
+-- 
+2.20.1
+

SOURCES/0008-Remove-ptype-command-from-ps-t-option-to-reduce-memo.patch

@@ -0,0 +1,79 @@
+From bbd5a5c1f5db3bde04628e75396155260333e53e Mon Sep 17 00:00:00 2001
+From: Kazuhito Hagio <k-hagio-ab@nec.com>
+Date: Wed, 19 Jan 2022 16:24:49 +0900
+Subject: [PATCH 08/11] Remove ptype command from "ps -t" option to reduce
+ memory and time
+
+With some vmlinux e.g. RHEL9 ones, the first execution of the gdb ptype
+command heavily consumes memory and time.  The "ps -t" option uses it in
+start_time_timespec(), and it can be replaced with the crash macros.
+
+This can reduce about 1.4 GB memory and 6 seconds time comsumption in
+the following test:
+
+  $ echo "ps -t" | time crash vmlinux vmcore
+
+  Without the patch:
+  11.60user 0.43system 0:11.94elapsed 100%CPU (0avgtext+0avgdata 1837964maxresident)k
+  0inputs+400outputs (0major+413636minor)pagefaults 0swaps
+
+  With the patch:
+  5.40user 0.16system 0:05.46elapsed 101%CPU (0avgtext+0avgdata 417896maxresident)k
+  0inputs+384outputs (0major+41528minor)pagefaults 0swaps
+
+Although the ptype command and similar ones cannot be fully removed,
+but removing some of them will make the use of crash safer, especially
+for an automatic crash reporter.
+
+Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ task.c | 25 +++++--------------------
+ 1 file changed, 5 insertions(+), 20 deletions(-)
+
+diff --git a/task.c b/task.c
+index 263a8344dd94..a79ed0d96fb5 100644
+--- a/task.c
++++ b/task.c
+@@ -4662,8 +4662,6 @@ show_task_times(struct task_context *tcp, ulong flags)
+ static int
+ start_time_timespec(void)
+ {
+-        char buf[BUFSIZE];
+-
+ 	switch(tt->flags & (TIMESPEC | NO_TIMESPEC | START_TIME_NSECS))
+ 	{
+ 	case TIMESPEC:
+@@ -4677,24 +4675,11 @@ start_time_timespec(void)
+ 
+ 	tt->flags |= NO_TIMESPEC;
+ 
+-        open_tmpfile();
+-        sprintf(buf, "ptype struct task_struct");
+-        if (!gdb_pass_through(buf, NULL, GNU_RETURN_ON_ERROR)) {
+-                close_tmpfile();
+-                return FALSE;
+-        }
+-
+-        rewind(pc->tmpfile);
+-        while (fgets(buf, BUFSIZE, pc->tmpfile)) {
+-                if (strstr(buf, "start_time;")) {
+-			if (strstr(buf, "struct timespec")) {
+-				tt->flags &= ~NO_TIMESPEC;
+-				tt->flags |= TIMESPEC;
+-			}
+-		}
+-        }
+-
+-        close_tmpfile();
++	if (VALID_MEMBER(task_struct_start_time) &&
++	    STREQ(MEMBER_TYPE_NAME("task_struct", "start_time"), "timespec")) {
++			tt->flags &= ~NO_TIMESPEC;
++			tt->flags |= TIMESPEC;
++	}
+ 
+ 	if ((tt->flags & NO_TIMESPEC) && (SIZE(task_struct_start_time) == 8)) {
+ 		tt->flags &= ~NO_TIMESPEC;
+-- 
+2.20.1
+

SOURCES/0008-s390x-fix-virtual-vs-physical-address-confusion.patch

@@ -1,70 +0,0 @@
-From 4c78eb4a9199631fe94845cb3fbd6376aae1251d Mon Sep 17 00:00:00 2001
-From: Alexander Gordeev <agordeev@linux.ibm.com>
-Date: Wed, 29 Nov 2023 13:47:35 +0100
-Subject: [PATCH 08/14] s390x: fix virtual vs physical address confusion
-
-Physical and virtual addresses are the same on S390X.
-That led to missing to use PTOV and VTOP macros where
-they actually expected.
-
-Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- s390x.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/s390x.c b/s390x.c
-index 096c072186f5..957b839a5fa9 100644
---- a/s390x.c
-+++ b/s390x.c
-@@ -311,7 +311,7 @@ static struct s390x_cpu *s390x_cpu_get(struct bt_info *bt)
- 	readmem(lowcore_ptr + cpu * sizeof(long), KVADDR,
- 		&prefix, sizeof(long), "lowcore_ptr", FAULT_ON_ERROR);
- 	for (i = 0; i < s390x_cpu_cnt; i++) {
--		if (s390x_cpu_vec[i].prefix == prefix)
-+		if (s390x_cpu_vec[i].prefix == VTOP(prefix))
- 			return &s390x_cpu_vec[i];
- 	}
- 	error(FATAL, "cannot determine CPU for task: %lx\n", bt->task);
-@@ -985,12 +985,12 @@ int s390x_vtop(ulong table, ulong vaddr, physaddr_t *phys_addr, int verbose)
- 						  verbose);
- 		if (!entry)
- 			return FALSE;
--		table = entry & ~0xfffULL;
-+		table = PTOV(entry & ~0xfffULL);
- 		/* Check if this a 2GB page */
- 		if ((entry & 0x400ULL) && (level == 1)) {
- 			/* Add the 2GB frame offset & return the final value. */
- 			table &= ~0x7fffffffULL;
--			*phys_addr = table + (vaddr & 0x7fffffffULL);
-+			*phys_addr = VTOP(table + (vaddr & 0x7fffffffULL));
- 			return TRUE;
- 		}
- 		len = entry & 0x3ULL;
-@@ -1001,12 +1001,12 @@ int s390x_vtop(ulong table, ulong vaddr, physaddr_t *phys_addr, int verbose)
- 	if (entry & 0x400ULL) {
- 		/* Add the 1MB page offset and return the final value. */
- 		table &= ~0xfffffULL;
--		*phys_addr = table + (vaddr & 0xfffffULL);
-+		*phys_addr = VTOP(table + (vaddr & 0xfffffULL));
- 		return TRUE;
- 	}
- 
- 	/* Get the page table entry */
--	entry = _kl_pg_table_deref_s390x(vaddr, entry & ~0x7ffULL, verbose);
-+	entry = _kl_pg_table_deref_s390x(vaddr, PTOV(entry & ~0x7ffULL), verbose);
- 	if (!entry)
- 		return FALSE;
- 
-@@ -1033,7 +1033,7 @@ s390x_vmalloc_start(void)
- {
- 	unsigned long highmem_addr,high_memory;
- 	highmem_addr=symbol_value("high_memory");
--       	readmem(highmem_addr, PHYSADDR, &high_memory,sizeof(long),
-+	readmem(highmem_addr, KVADDR, &high_memory,sizeof(long),
- 		"highmem",FAULT_ON_ERROR);
- 	return high_memory;
- }
--- 
-2.41.0
-

SOURCES/0009-Improve-the-ps-performance-for-vmcores-with-large-nu.patch

@@ -0,0 +1,150 @@
+From d52cccfaa96ed6f61ff9d53da88715296e31db80 Mon Sep 17 00:00:00 2001
+From: Tao Liu <ltao@redhat.com>
+Date: Fri, 21 Jan 2022 13:43:09 +0800
+Subject: [PATCH 09/11] Improve the ps performance for vmcores with large
+ number of threads
+
+Previously, the ps command will iterate over all threads which
+have the same tgid, to accumulate their rss value, in order to
+get a thread/process's final rss value as part of the final output.
+
+For non-live systems, the rss accumulation values are identical for
+threads which have the same tgid, so there is no need to do the
+iteration and accumulation repeatly, thus a lot of readmem calls are
+skipped. Otherwise it will be the performance bottleneck if the
+vmcores have a large number of threads.
+
+In this patch, the rss accumulation value will be stored in a cache,
+next time a thread with the same tgid will take it directly without
+the iteration.
+
+For example, we can monitor the performance issue when a vmcore has
+~65k processes, most of which are threads for several specific
+processes. Without the patch, it will take ~7h for ps command
+to finish. With the patch, ps command will finish in 1min.
+
+Signed-off-by: Tao Liu <ltao@redhat.com>
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ defs.h   |  1 +
+ memory.c | 70 +++++++++++++++++++++++++++++++-------------------------
+ task.c   |  1 +
+ 3 files changed, 41 insertions(+), 31 deletions(-)
+
+diff --git a/defs.h b/defs.h
+index 41b6cbc6cc85..77e76f27cddb 100644
+--- a/defs.h
++++ b/defs.h
+@@ -830,6 +830,7 @@ struct task_context {                     /* context stored for each task */
+ struct tgid_context {               /* tgid and task stored for each task */
+ 	ulong tgid;
+ 	ulong task;
++	long rss_cache;
+ };
+ 
+ struct task_table {                      /* kernel/local task table data */
+diff --git a/memory.c b/memory.c
+index 5af45fd7d834..e80c59ea4534 100644
+--- a/memory.c
++++ b/memory.c
+@@ -4665,7 +4665,7 @@ void
+ get_task_mem_usage(ulong task, struct task_mem_usage *tm)
+ {
+ 	struct task_context *tc;
+-	long rss = 0;
++	long rss = 0, rss_cache = 0;
+ 
+ 	BZERO(tm, sizeof(struct task_mem_usage));
+ 
+@@ -4730,38 +4730,46 @@ get_task_mem_usage(ulong task, struct task_mem_usage *tm)
+ 					(last->tgid == (last + 1)->tgid))
+ 					last++;
+ 
+-				while (first <= last)
+-				{
+-					/* count 0 -> filepages */
+-					if (!readmem(first->task +
+-						OFFSET(task_struct_rss_stat) +
+-						OFFSET(task_rss_stat_count), KVADDR,
+-						&sync_rss,
+-						sizeof(int),
+-						"task_struct rss_stat MM_FILEPAGES",
+-						RETURN_ON_ERROR))
+-							continue;
+-
+-					rss += sync_rss;
+-
+-					/* count 1 -> anonpages */
+-					if (!readmem(first->task +
+-						OFFSET(task_struct_rss_stat) +
+-						OFFSET(task_rss_stat_count) +
+-						sizeof(int),
+-						KVADDR, &sync_rss,
+-						sizeof(int),
+-						"task_struct rss_stat MM_ANONPAGES",
+-						RETURN_ON_ERROR))
+-							continue;
+-
+-					rss += sync_rss;
+-
+-					if (first == last)
+-						break;
+-					first++;
++				/*
++				 * Using rss cache for dumpfile is more beneficial than live debug
++				 * because its value never changes in dumpfile.
++				 */
++				if (ACTIVE() || last->rss_cache == UNINITIALIZED) {
++					while (first <= last)
++					{
++						/* count 0 -> filepages */
++						if (!readmem(first->task +
++							OFFSET(task_struct_rss_stat) +
++							OFFSET(task_rss_stat_count), KVADDR,
++							&sync_rss,
++							sizeof(int),
++							"task_struct rss_stat MM_FILEPAGES",
++							RETURN_ON_ERROR))
++								continue;
++
++						rss_cache += sync_rss;
++
++						/* count 1 -> anonpages */
++						if (!readmem(first->task +
++							OFFSET(task_struct_rss_stat) +
++							OFFSET(task_rss_stat_count) +
++							sizeof(int),
++							KVADDR, &sync_rss,
++							sizeof(int),
++							"task_struct rss_stat MM_ANONPAGES",
++							RETURN_ON_ERROR))
++								continue;
++
++						rss_cache += sync_rss;
++
++						if (first == last)
++							break;
++						first++;
++					}
++					last->rss_cache = rss_cache;
+ 				}
+ 
++				rss += last->rss_cache;
+ 				tt->last_tgid = last;
+ 			}
+ 		}
+diff --git a/task.c b/task.c
+index a79ed0d96fb5..864c838637ee 100644
+--- a/task.c
++++ b/task.c
+@@ -2947,6 +2947,7 @@ add_context(ulong task, char *tp)
+ 	tg = tt->tgid_array + tt->running_tasks;
+ 	tg->tgid = *tgid_addr;
+ 	tg->task = task;
++	tg->rss_cache = UNINITIALIZED;
+ 
+         if (do_verify && !verify_task(tc, do_verify)) {
+ 		error(INFO, "invalid task address: %lx\n", tc->task);
+-- 
+2.20.1
+

SOURCES/0009-s390x-uncouple-physical-and-virtual-memory-spaces.patch

@@ -1,323 +0,0 @@
-From d0164e7e480ad2ffd3fe73fe53c46087e5e137a6 Mon Sep 17 00:00:00 2001
-From: Alexander Gordeev <agordeev@linux.ibm.com>
-Date: Thu, 7 Dec 2023 16:54:06 +0100
-Subject: [PATCH 09/14] s390x: uncouple physical and virtual memory spaces
-
-Rework VTOP and PTOV macros to reflect the future
-uncoupling of physical and virtual address spaces
-in kernel. Existing versions are not affected.
-
-Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- defs.h  |  20 +++++-
- s390x.c | 212 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 228 insertions(+), 4 deletions(-)
-
-diff --git a/defs.h b/defs.h
-index 5218a94fe4a4..20237b72a10b 100644
---- a/defs.h
-+++ b/defs.h
-@@ -4564,9 +4564,9 @@ struct efi_memory_desc_t {
- #define _64BIT_
- #define MACHINE_TYPE       "S390X"
- 
--#define PTOV(X)            ((unsigned long)(X)+(machdep->kvbase))
--#define VTOP(X)            ((unsigned long)(X)-(machdep->kvbase))
--#define IS_VMALLOC_ADDR(X) (vt->vmalloc_start && (ulong)(X) >= vt->vmalloc_start)
-+#define PTOV(X)            s390x_PTOV((ulong)(X))
-+#define VTOP(X)            s390x_VTOP((ulong)(X))
-+#define IS_VMALLOC_ADDR(X) s390x_IS_VMALLOC_ADDR(X)
- #define PTRS_PER_PTE    512
- #define PTRS_PER_PMD    1024
- #define PTRS_PER_PGD    2048
-@@ -6827,7 +6827,21 @@ void get_s390_panicmsg(char *);
-  *  s390x.c
-  */
- #ifdef S390X
-+
-+struct machine_specific
-+{
-+	ulong (*virt_to_phys)(ulong vaddr);
-+	ulong (*phys_to_virt)(ulong paddr);
-+	int (*is_vmalloc_addr)(ulong vaddr);
-+	ulong __kaslr_offset_phys;
-+	ulong amode31_start;
-+	ulong amode31_end;
-+};
-+
- void s390x_init(int);
-+ulong s390x_PTOV(ulong);
-+ulong s390x_VTOP(ulong);
-+int s390x_IS_VMALLOC_ADDR(ulong);
- void s390x_dump_machdep_table(ulong);
- #define display_idt_table() \
-         error(FATAL, "-d option is not applicable to S390X architecture\n")
-diff --git a/s390x.c b/s390x.c
-index 957b839a5fa9..794ae825906d 100644
---- a/s390x.c
-+++ b/s390x.c
-@@ -47,6 +47,7 @@
- #define S390X_PSW_MASK_PSTATE	0x0001000000000000UL
- 
- #define S390X_LC_VMCORE_INFO	0xe0c
-+#define S390X_LC_OS_INFO	0xe18
- 
- /*
-  * Flags for Region and Segment table entries.
-@@ -168,6 +169,19 @@ static struct line_number_hook s390x_line_number_hooks[];
- static int s390x_is_uvaddr(ulong, struct task_context *);
- static int s390x_get_kvaddr_ranges(struct vaddr_range *);
- static int set_s390x_max_physmem_bits(void);
-+static ulong s390x_generic_VTOP(ulong vaddr);
-+static ulong s390x_generic_PTOV(ulong paddr);
-+static int s390x_generic_IS_VMALLOC_ADDR(ulong vaddr);
-+static ulong s390x_vr_VTOP(ulong vaddr);
-+static ulong s390x_vr_PTOV(ulong paddr);
-+static int s390x_vr_IS_VMALLOC_ADDR(ulong vaddr);
-+static int s390x_vr_is_kvaddr(ulong);
-+
-+struct machine_specific s390x_machine_specific = {
-+	.virt_to_phys = s390x_generic_VTOP,
-+	.phys_to_virt = s390x_generic_PTOV,
-+	.is_vmalloc_addr = s390x_generic_IS_VMALLOC_ADDR,
-+};
- 
- /*
-  * struct lowcore name (old: "_lowcore", new: "lowcore")
-@@ -546,6 +560,191 @@ static void s390x_check_kaslr(void)
- 	free(vmcoreinfo);
- }
- 
-+#define OS_INFO_VERSION_MAJOR		1
-+#define OS_INFO_VERSION_MINOR		1
-+
-+#define OS_INFO_VMCOREINFO		0
-+#define OS_INFO_REIPL_BLOCK		1
-+#define OS_INFO_FLAGS_ENTRY		2
-+#define OS_INFO_RESERVED		3
-+#define OS_INFO_IDENTITY_BASE		4
-+#define OS_INFO_KASLR_OFFSET		5
-+#define OS_INFO_KASLR_OFF_PHYS		6
-+#define OS_INFO_VMEMMAP			7
-+#define OS_INFO_AMODE31_START		8
-+#define OS_INFO_AMODE31_END		9
-+
-+struct os_info_entry {
-+	union {
-+		__u64	addr;
-+		__u64	val;
-+	};
-+	__u64	size;
-+	__u32	csum;
-+} __attribute__((packed));
-+
-+struct os_info {
-+	__u64	magic;
-+	__u32	csum;
-+	__u16	version_major;
-+	__u16	version_minor;
-+	__u64	crashkernel_addr;
-+	__u64	crashkernel_size;
-+	struct	os_info_entry entry[10];
-+	__u8	reserved[3864];
-+} __attribute__((packed));
-+
-+struct vm_info {
-+	__u64 __identity_base;
-+	__u64 __kaslr_offset;
-+	__u64 __kaslr_offset_phys;
-+	__u64 amode31_start;
-+	__u64 amode31_end;
-+};
-+
-+static bool
-+vmcoreinfo_read_u64(const char *key, __u64 *val)
-+{
-+	char *string;
-+
-+	string = pc->read_vmcoreinfo(key);
-+	if (string) {
-+		*val = strtoul(string, NULL, 16);
-+		free(string);
-+		return true;
-+	}
-+
-+	return false;
-+}
-+
-+static bool vmcoreinfo_read_vm_info(struct vm_info *_vm_info)
-+{
-+	struct vm_info vm_info;
-+
-+	if (!vmcoreinfo_read_u64("IDENTITYBASE",  &vm_info.__identity_base) ||
-+	    !vmcoreinfo_read_u64("KERNELOFFSET",  &vm_info.__kaslr_offset) ||
-+	    !vmcoreinfo_read_u64("KERNELOFFPHYS", &vm_info.__kaslr_offset_phys) ||
-+	    !vmcoreinfo_read_u64("SAMODE31",      &vm_info.amode31_start) ||
-+	    !vmcoreinfo_read_u64("EAMODE31",      &vm_info.amode31_end))
-+		return false;
-+
-+	*_vm_info = vm_info;
-+
-+	return true;
-+}
-+
-+static bool os_info_read_vm_info(struct vm_info *vm_info)
-+{
-+	struct os_info os_info;
-+	ulong addr;
-+
-+	if (!readmem(S390X_LC_OS_INFO, PHYSADDR, &addr,
-+		    sizeof(addr), "s390x os_info ptr",
-+		    QUIET|RETURN_ON_ERROR))
-+		return false;
-+
-+	if (addr == 0)
-+		return true;
-+
-+	if (!readmem(addr, PHYSADDR, &os_info,
-+		    offsetof(struct os_info, reserved), "s390x os_info header",
-+		    QUIET|RETURN_ON_ERROR))
-+		return false;
-+
-+	vm_info->__identity_base      = os_info.entry[OS_INFO_IDENTITY_BASE].val;
-+	vm_info->__kaslr_offset       = os_info.entry[OS_INFO_KASLR_OFFSET].val;
-+	vm_info->__kaslr_offset_phys  = os_info.entry[OS_INFO_KASLR_OFF_PHYS].val;
-+	vm_info->amode31_start        = os_info.entry[OS_INFO_AMODE31_START].val;
-+	vm_info->amode31_end          = os_info.entry[OS_INFO_AMODE31_END].val;
-+
-+	return true;
-+}
-+
-+static bool vm_info_empty(struct vm_info *vm_info)
-+{
-+	return !vm_info->__kaslr_offset;
-+}
-+
-+static bool s390x_init_vm(void)
-+{
-+	struct vm_info vm_info;
-+
-+	if (pc->flags & PROC_KCORE) {
-+		if (!vmcoreinfo_read_vm_info(&vm_info))
-+			return true;
-+	} else {
-+		if (!os_info_read_vm_info(&vm_info))
-+			return false;
-+	}
-+	if (vm_info_empty(&vm_info))
-+		return true;
-+
-+	machdep->identity_map_base		= vm_info.__identity_base;
-+	machdep->kvbase				= vm_info.__kaslr_offset;
-+	machdep->machspec->__kaslr_offset_phys	= vm_info.__kaslr_offset_phys;
-+	machdep->machspec->amode31_start	= vm_info.amode31_start;
-+	machdep->machspec->amode31_end		= vm_info.amode31_end;
-+
-+	machdep->is_kvaddr			= s390x_vr_is_kvaddr;
-+	machdep->machspec->virt_to_phys		= s390x_vr_VTOP;
-+	machdep->machspec->phys_to_virt		= s390x_vr_PTOV;
-+	machdep->machspec->is_vmalloc_addr	= s390x_vr_IS_VMALLOC_ADDR;
-+
-+	return true;
-+}
-+
-+static ulong s390x_generic_VTOP(ulong vaddr)
-+{
-+	return vaddr - machdep->kvbase;
-+}
-+
-+static ulong s390x_generic_PTOV(ulong paddr)
-+{
-+	return paddr + machdep->kvbase;
-+}
-+
-+static int s390x_generic_IS_VMALLOC_ADDR(ulong vaddr)
-+{
-+	return vt->vmalloc_start && vaddr >= vt->vmalloc_start;
-+}
-+
-+static ulong s390x_vr_VTOP(ulong vaddr)
-+{
-+	if (vaddr < LOWCORE_SIZE)
-+		return vaddr;
-+	if ((vaddr < machdep->machspec->amode31_end) &&
-+	    (vaddr >= machdep->machspec->amode31_start))
-+		return vaddr;
-+	if (vaddr < machdep->kvbase)
-+		return vaddr - machdep->identity_map_base;
-+	return vaddr - machdep->kvbase + machdep->machspec->__kaslr_offset_phys;
-+}
-+
-+static ulong s390x_vr_PTOV(ulong paddr)
-+{
-+	return paddr + machdep->identity_map_base;
-+}
-+
-+static int s390x_vr_IS_VMALLOC_ADDR(ulong vaddr)
-+{
-+	return (vaddr >= vt->vmalloc_start && vaddr < machdep->kvbase);
-+}
-+
-+ulong s390x_VTOP(ulong vaddr)
-+{
-+	return machdep->machspec->virt_to_phys(vaddr);
-+}
-+
-+ulong s390x_PTOV(ulong paddr)
-+{
-+	return machdep->machspec->phys_to_virt(paddr);
-+}
-+
-+int s390x_IS_VMALLOC_ADDR(ulong vaddr)
-+{
-+	return machdep->machspec->is_vmalloc_addr(vaddr);
-+}
-+
- /*
-  *  Do all necessary machine-specific setup here.  This is called several
-  *  times during initialization.
-@@ -560,6 +759,7 @@ s390x_init(int when)
- 		machdep->process_elf_notes = s390x_process_elf_notes;
- 		break;
- 	case PRE_SYMTAB:
-+		machdep->machspec = &s390x_machine_specific;
- 		machdep->verify_symbol = s390x_verify_symbol;
- 		if (pc->flags & KERNEL_DEBUG_QUERY)
- 			return;
-@@ -587,6 +787,8 @@ s390x_init(int when)
- 		machdep->kvbase = 0;
- 		machdep->identity_map_base = 0;
- 		machdep->is_kvaddr =  generic_is_kvaddr;
-+		if (!s390x_init_vm())
-+			error(FATAL, "cannot initialize VM parameters.");
- 		machdep->is_uvaddr =  s390x_is_uvaddr;
- 		machdep->eframe_search = s390x_eframe_search;
- 		machdep->back_trace = s390x_back_trace_cmd;
-@@ -681,7 +883,9 @@ s390x_dump_machdep_table(ulong arg)
- 	fprintf(fp, "         dis_filter: s390x_dis_filter()\n");
- 	fprintf(fp, "           cmd_mach: s390x_cmd_mach()\n");
- 	fprintf(fp, "       get_smp_cpus: s390x_get_smp_cpus()\n");
--	fprintf(fp, "          is_kvaddr: generic_is_kvaddr()\n");
-+	fprintf(fp, "          is_kvaddr: %s()\n", machdep->is_kvaddr == s390x_vr_is_kvaddr ?
-+					  "s390x_vr_is_kvaddr" :
-+					  "generic_is_kvaddr");
- 	fprintf(fp, "          is_uvaddr: s390x_is_uvaddr()\n");
- 	fprintf(fp, "       verify_paddr: generic_verify_paddr()\n");
- 	fprintf(fp, "  get_kvaddr_ranges: s390x_get_kvaddr_ranges()\n");
-@@ -702,6 +906,12 @@ s390x_dump_machdep_table(ulong arg)
- 	fprintf(fp, "           machspec: %lx\n", (ulong)machdep->machspec);
- }
- 
-+static int
-+s390x_vr_is_kvaddr(ulong vaddr)
-+{
-+	return (vaddr < LOWCORE_SIZE) || (vaddr >= machdep->identity_map_base);
-+}
-+
- /*
-  * Check if address is in context's address space
-  */
--- 
-2.41.0
-

SOURCES/0010-RISCV64-Dump-NT_PRSTATUS-in-help-n.patch

@@ -1,160 +0,0 @@
-From 5187a0320cc54a9cb8b326cf012e69795950a716 Mon Sep 17 00:00:00 2001
-From: Song Shuai <songshuaishuai@tinylab.org>
-Date: Tue, 12 Dec 2023 18:20:50 +0800
-Subject: [PATCH 10/14] RISCV64: Dump NT_PRSTATUS in 'help -n'
-
-With the patch we can get full dump of "struct elf_prstatus" in 'help -n':
-```
-crash> help -n
-<snip>
-Elf64_Nhdr:
-               n_namesz: 5 ("CORE")
-               n_descsz: 376
-                 n_type: 1 (NT_PRSTATUS)
-                         si.signo: 0  si.code: 0  si.errno: 0
-                         cursig: 0  sigpend: 0  sighold: 0
-                         pid: 1  ppid: 0  pgrp: 0  sid:0
-                         utime: 0.000000  stime: 0.000000
-                         cutime: 0.000000  cstime: 0.000000
-                         epc: ffffffff8000a1dc   ra: ffffffff800af958   sp: ff6000001fc501c0
-                          gp: ffffffff81515d38   tp: ff600000000d8000   t0: 6666666666663c5b
-                          t1: ff600000000d88c8   t2: 666666666666663c   s0: ff6000001fc50320
-                          s1: ffffffff815170d8   a0: ff6000001fc501c8   a1: c0000000ffffefff
-                          a2: 0000000000000000   a3: 0000000000000001   a4: 0000000000000000
-                          a5: ff60000001782c00   a6: 000000000130e0f0   a7: 0000000000000000
-                          s2: ffffffff81517820   s3: ff6000001fc501c8   s4: 000000000000000f
-                          s5: 0000000000000000   s6: ff20000000013e60   s7: 0000000000000000
-                          s8: ff60000000861000   s9: 00007fffc3641694  s10: 00007fffc3641690
-                         s11: 00005555796ed240   t3: 0000000000010297   t4: ffffffff80c17810
-                          t5: ffffffff8195e7b8   t6: ff6000001fc50048
-                         0000000000000000 0000000000000000
-                         0000000000000000 0000000000000000
-                         0000000000000001 0000000000000000
-                         0000000000000000 0000000000000000
-                         0000000000000000 0000000000000000
-                         0000000000000000 0000000000000000
-                         0000000000000000 0000000000000000
-                         ffffffff8000a1dc ffffffff800af958
-                         ff6000001fc501c0 ffffffff81515d38
-                         ff600000000d8000 6666666666663c5b
-<snip>
-```
-
-Signed-off-by: Song Shuai <songshuaishuai@tinylab.org>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- netdump.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 84 insertions(+)
-
-diff --git a/netdump.c b/netdump.c
-index 390786364959..32586b6809d3 100644
---- a/netdump.c
-+++ b/netdump.c
-@@ -2578,6 +2578,8 @@ dump_Elf64_Nhdr(Elf64_Off offset, int store)
- 				display_ELF_note(EM_PPC64, PRSTATUS_NOTE, note, nd->ofp);
- 			if (machine_type("ARM64") && (note->n_type == NT_PRSTATUS))
- 				display_ELF_note(EM_AARCH64, PRSTATUS_NOTE, note, nd->ofp);
-+			if (machine_type("RISCV64") && (note->n_type == NT_PRSTATUS))
-+				display_ELF_note(EM_RISCV, PRSTATUS_NOTE, note, nd->ofp);
- 		}
- 		for (i = lf = 0; i < note->n_descsz/sizeof(ulonglong); i++) {
- 			if (((i%2)==0)) {
-@@ -3399,6 +3401,80 @@ display_prstatus_arm64(void *note_ptr, FILE *ofp)
- 		space(sp), pr->pr_reg[33], pr->pr_fpvalid);
- }
- 
-+struct riscv64_elf_siginfo {
-+    int si_signo;
-+    int si_code;
-+    int si_errno;
-+};
-+
-+struct riscv64_elf_prstatus {
-+    struct riscv64_elf_siginfo pr_info;
-+    short pr_cursig;
-+    unsigned long pr_sigpend;
-+    unsigned long pr_sighold;
-+    pid_t pr_pid;
-+    pid_t pr_ppid;
-+    pid_t pr_pgrp;
-+    pid_t pr_sid;
-+    struct timeval pr_utime;
-+    struct timeval pr_stime;
-+    struct timeval pr_cutime;
-+    struct timeval pr_cstime;
-+/*  elf_gregset_t pr_reg; => typedef struct user_regs_struct elf_gregset_t; */
-+    unsigned long pr_reg[32];
-+    int pr_fpvalid;
-+};
-+
-+static void
-+display_prstatus_riscv64(void *note_ptr, FILE *ofp)
-+{
-+	struct riscv64_elf_prstatus *pr;
-+	Elf64_Nhdr *note;
-+	int sp;
-+
-+	note = (Elf64_Nhdr *)note_ptr;
-+	pr = (struct riscv64_elf_prstatus *)(
-+		(char *)note + sizeof(Elf64_Nhdr) + note->n_namesz);
-+	pr = (struct riscv64_elf_prstatus *)roundup((ulong)pr, 4);
-+	sp = nd->num_prstatus_notes ? 25 : 22;
-+
-+	fprintf(ofp,
-+		"%ssi.signo: %d  si.code: %d  si.errno: %d\n"
-+		"%scursig: %d  sigpend: %lx  sighold: %lx\n"
-+		"%spid: %d  ppid: %d  pgrp: %d  sid:%d\n"
-+		"%sutime: %01lld.%06d  stime: %01lld.%06d\n"
-+		"%scutime: %01lld.%06d  cstime: %01lld.%06d\n",
-+		space(sp), pr->pr_info.si_signo, pr->pr_info.si_code, pr->pr_info.si_errno,
-+		space(sp), pr->pr_cursig, pr->pr_sigpend, pr->pr_sighold,
-+		space(sp), pr->pr_pid, pr->pr_ppid, pr->pr_pgrp, pr->pr_sid,
-+		space(sp), (long long)pr->pr_utime.tv_sec, (int)pr->pr_utime.tv_usec,
-+		(long long)pr->pr_stime.tv_sec, (int)pr->pr_stime.tv_usec,
-+		space(sp), (long long)pr->pr_cutime.tv_sec, (int)pr->pr_cutime.tv_usec,
-+		(long long)pr->pr_cstime.tv_sec, (int)pr->pr_cstime.tv_usec);
-+	fprintf(ofp,
-+		"%sepc: %016lx   ra: %016lx   sp: %016lx\n"
-+		"%s gp: %016lx   tp: %016lx   t0: %016lx\n"
-+		"%s t1: %016lx   t2: %016lx   s0: %016lx\n"
-+		"%s s1: %016lx   a0: %016lx   a1: %016lx\n"
-+		"%s a2: %016lx   a3: %016lx   a4: %016lx\n"
-+		"%s a5: %016lx   a6: %016lx   a7: %016lx\n"
-+		"%s s2: %016lx   s3: %016lx   s4: %016lx\n"
-+		"%s s5: %016lx   s6: %016lx   s7: %016lx\n"
-+		"%s s8: %016lx   s9: %016lx  s10: %016lx\n"
-+		"%ss11: %016lx   t3: %016lx   t4: %016lx\n"
-+		"%s t5: %016lx   t6: %016lx\n",
-+		space(sp), pr->pr_reg[0], pr->pr_reg[1], pr->pr_reg[2],
-+		space(sp), pr->pr_reg[3], pr->pr_reg[4], pr->pr_reg[5],
-+		space(sp), pr->pr_reg[6], pr->pr_reg[7], pr->pr_reg[8],
-+		space(sp), pr->pr_reg[9], pr->pr_reg[10], pr->pr_reg[11],
-+		space(sp), pr->pr_reg[12], pr->pr_reg[13], pr->pr_reg[14],
-+		space(sp), pr->pr_reg[15], pr->pr_reg[16], pr->pr_reg[17],
-+		space(sp), pr->pr_reg[18], pr->pr_reg[19], pr->pr_reg[20],
-+		space(sp), pr->pr_reg[21], pr->pr_reg[22], pr->pr_reg[23],
-+		space(sp), pr->pr_reg[24], pr->pr_reg[25], pr->pr_reg[26],
-+		space(sp), pr->pr_reg[27], pr->pr_reg[28], pr->pr_reg[29],
-+		space(sp), pr->pr_reg[30], pr->pr_reg[31]);
-+}
- 
- void
- display_ELF_note(int machine, int type, void *note, FILE *ofp)
-@@ -3449,6 +3525,14 @@ display_ELF_note(int machine, int type, void *note, FILE *ofp)
- 			break;
- 		}
- 		break;
-+	case EM_RISCV:
-+		switch (type)
-+		{
-+		case PRSTATUS_NOTE:
-+			display_prstatus_riscv64(note, ofp);
-+			break;
-+		}
-+		break;
- 
- 	default:
- 		return;
--- 
-2.41.0
-

SOURCES/0010-arm64-Fix-segfault-by-bt-command-with-offline-cpus.patch

@@ -0,0 +1,59 @@
+From 1a1fd21c625cb2ca335e626eb50426f13c4160f7 Mon Sep 17 00:00:00 2001
+From: Kazuhito Hagio <k-hagio-ab@nec.com>
+Date: Wed, 26 Jan 2022 06:07:00 +0000
+Subject: [PATCH 10/11] arm64: Fix segfault by "bt" command with offline cpus
+
+Currently on arm64, NT_PRSTATUS notes in dumpfile are not mapped to
+online cpus and machine_specific->panic_task_regs correctly.  As a
+result, the "bt" command can cause a segmentation fault.
+
+  crash> bt -c 0
+  PID: 0      TASK: ffff8000117fa240  CPU: 0   COMMAND: "swapper/0"
+  Segmentation fault (core dumped)
+
+To fix this,
+1) make map_cpus_to_prstatus_kdump_cmprs() map the notes to
+   dd->nt_prstatus_percpu also on arm64, and
+2) move arm64_get_crash_notes() to machdep_init(POST_INIT) in order
+   to apply the mapping to machine_specific->panic_task_regs.
+
+Resolves: https://github.com/crash-utility/crash/issues/105
+Reported-by: xuchunmei000 <xuchunmei@linux.alibaba.com>
+Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
+Tested-by: David Wysochanski <dwysocha@redhat.com>
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ arm64.c    | 2 +-
+ diskdump.c | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/arm64.c b/arm64.c
+index 23c3d75d85aa..4f2c2b5104a1 100644
+--- a/arm64.c
++++ b/arm64.c
+@@ -472,7 +472,7 @@ arm64_init(int when)
+ 		arm64_stackframe_init();
+ 		break;
+ 
+-	case POST_VM:
++	case POST_INIT:
+ 		/*
+ 		 * crash_notes contains machine specific information about the
+ 		 * crash. In particular, it contains CPU registers at the time
+diff --git a/diskdump.c b/diskdump.c
+index 112f769f8949..690b42443ed2 100644
+--- a/diskdump.c
++++ b/diskdump.c
+@@ -111,8 +111,7 @@ map_cpus_to_prstatus_kdump_cmprs(void)
+ 	if (pc->flags2 & QEMU_MEM_DUMP_COMPRESSED)  /* notes exist for all cpus */
+ 		goto resize_note_pointers;
+ 
+-	if (!(online = get_cpus_online()) || (online == kt->cpus) || 
+-	    machine_type("ARM64"))
++	if (!(online = get_cpus_online()) || (online == kt->cpus))
+ 		goto resize_note_pointers;
+ 
+ 	if (CRASHDEBUG(1))
+-- 
+2.20.1
+

SOURCES/0011-Fix-for-kmem-s-S-and-bt-F-F-on-Linux-5.17-rc1.patch

@@ -0,0 +1,89 @@
+From 86446eaba408807e00cf2310d5748aa6b7511284 Mon Sep 17 00:00:00 2001
+From: Kazuhito Hagio <k-hagio-ab@nec.com>
+Date: Wed, 2 Feb 2022 02:14:56 +0000
+Subject: [PATCH 11/11] Fix for "kmem -s|-S" and "bt -F[F]" on Linux 5.17-rc1
+
+Since the following kernel commits split slab info from struct page
+into struct slab, crash cannot get several slab related offsets from
+struct page.
+
+  d122019bf061 ("mm: Split slab into its own type")
+  07f910f9b729 ("mm: Remove slab from struct page")
+
+Without the patch, "kmem -s|-S" and "bt -F[F]" options cannot work
+correctly with the following errors:
+
+  crash> kmem -s kmem_cache
+  CACHE             OBJSIZE  ALLOCATED     TOTAL  SLABS  SSIZE  NAME
+  kmem: page_to_nid: invalid page: ffff9454afc35020
+  kmem: kmem_cache: cannot gather relevant slab data
+  ffff945140042000      216          ?         ?      ?     8k  kmem_cache
+
+  crash> bt -F
+  ...
+  bt: invalid structure member offset: page_slab
+      FILE: memory.c  LINE: 9477  FUNCTION: vaddr_to_kmem_cache()
+
+Signed-by: Kazuhito Hagio <k-hagio-ab@nec.com>
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ memory.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/memory.c b/memory.c
+index e80c59ea4534..8448ddc3a16c 100644
+--- a/memory.c
++++ b/memory.c
+@@ -421,6 +421,8 @@ vm_init(void)
+ 		MEMBER_OFFSET_INIT(page_prev, "page", "prev");
+ 	if (INVALID_MEMBER(page_next))
+ 		ANON_MEMBER_OFFSET_INIT(page_next, "page", "next");
++	if (INVALID_MEMBER(page_next))
++		MEMBER_OFFSET_INIT(page_next, "slab", "next");
+ 
+ 	MEMBER_OFFSET_INIT(page_list, "page", "list");
+ 	if (VALID_MEMBER(page_list)) {
+@@ -747,11 +749,15 @@ vm_init(void)
+ 		MEMBER_OFFSET_INIT(kmem_cache_random, "kmem_cache", "random");
+ 		MEMBER_OFFSET_INIT(kmem_cache_cpu_freelist, "kmem_cache_cpu", "freelist");
+ 		MEMBER_OFFSET_INIT(kmem_cache_cpu_page, "kmem_cache_cpu", "page");
++		if (INVALID_MEMBER(kmem_cache_cpu_page))
++			MEMBER_OFFSET_INIT(kmem_cache_cpu_page, "kmem_cache_cpu", "slab");
+ 		MEMBER_OFFSET_INIT(kmem_cache_cpu_node, "kmem_cache_cpu", "node");
+ 		MEMBER_OFFSET_INIT(kmem_cache_cpu_partial, "kmem_cache_cpu", "partial");
+ 		MEMBER_OFFSET_INIT(page_inuse, "page", "inuse");
+ 		if (INVALID_MEMBER(page_inuse))
+ 			ANON_MEMBER_OFFSET_INIT(page_inuse, "page", "inuse");
++		if (INVALID_MEMBER(page_inuse))
++			MEMBER_OFFSET_INIT(page_inuse, "slab", "inuse");
+ 		MEMBER_OFFSET_INIT(page_offset, "page", "offset");
+ 		if (INVALID_MEMBER(page_offset))
+ 			ANON_MEMBER_OFFSET_INIT(page_offset, "page", "offset");
+@@ -763,6 +769,9 @@ vm_init(void)
+ 			if (INVALID_MEMBER(page_slab))
+ 				ANON_MEMBER_OFFSET_INIT(page_slab, "page", "slab_cache");
+ 		}
++		if (INVALID_MEMBER(page_slab))
++			MEMBER_OFFSET_INIT(page_slab, "slab", "slab_cache");
++
+ 		MEMBER_OFFSET_INIT(page_slab_page, "page", "slab_page");
+ 		if (INVALID_MEMBER(page_slab_page))
+ 			ANON_MEMBER_OFFSET_INIT(page_slab_page, "page", "slab_page");
+@@ -772,10 +781,14 @@ vm_init(void)
+ 		MEMBER_OFFSET_INIT(page_freelist, "page", "freelist");
+ 		if (INVALID_MEMBER(page_freelist))
+ 			ANON_MEMBER_OFFSET_INIT(page_freelist, "page", "freelist");
++		if (INVALID_MEMBER(page_freelist))
++			MEMBER_OFFSET_INIT(page_freelist, "slab", "freelist");
+ 		if (INVALID_MEMBER(kmem_cache_objects)) {
+ 			MEMBER_OFFSET_INIT(kmem_cache_oo, "kmem_cache", "oo");
+ 			/* NOTE: returns offset of containing bitfield */
+ 			ANON_MEMBER_OFFSET_INIT(page_objects, "page", "objects");
++			if (INVALID_MEMBER(page_objects))
++				ANON_MEMBER_OFFSET_INIT(page_objects, "slab", "objects");
+ 		}
+ 		if (VALID_MEMBER(kmem_cache_node)) {
+                 	ARRAY_LENGTH_INIT(len, NULL, "kmem_cache.node", NULL, 0);
+-- 
+2.20.1
+

SOURCES/0011-RISCV64-Fix-bt-output-when-no-ra-on-the-stack-top.patch

@@ -1,87 +0,0 @@
-From 9b69093e623f1d54c373b1e091900d40576c059b Mon Sep 17 00:00:00 2001
-From: Song Shuai <songshuaishuai@tinylab.org>
-Date: Tue, 12 Dec 2023 18:20:51 +0800
-Subject: [PATCH 11/14] RISCV64: Fix 'bt' output when no ra on the stack top
-
-Same as the Linux commit f766f77a74f5 ("riscv/stacktrace: Fix
-stack output without ra on the stack top").
-
-When a function doesn't have a callee, then it will not
-push ra into the stack, such as lkdtm functions, so
-correct the FP of the second frame and use pt_regs to get
-the right PC of the second frame.
-
-Before this patch, the `bt -f` outputs only the first frame with
-the wrong PC and FP of next frame:
-```
-crash> bt -f
-PID: 1        TASK: ff600000000e0000  CPU: 1    COMMAND: "sh"
- #0 [ff20000000013cf0] lkdtm_EXCEPTION at ffffffff805303c0
-    [PC: ffffffff805303c0 RA: ff20000000013d10 SP: ff20000000013cf0 SIZE: 16] <- wrong next PC
-    ff20000000013cf0: 0000000000000001 ff20000000013d10 <- next FP
-    ff20000000013d00: ff20000000013d40
-crash>
-```
-After this patch, the `bt` outputs the full frames:
-```
-crash> bt
-PID: 1        TASK: ff600000000e0000  CPU: 1    COMMAND: "sh"
- #0 [ff20000000013cf0] lkdtm_EXCEPTION at ffffffff805303c0
- #1 [ff20000000013d00] lkdtm_do_action at ffffffff8052fe36
- #2 [ff20000000013d10] direct_entry at ffffffff80530018
- #3 [ff20000000013d40] full_proxy_write at ffffffff80305044
- #4 [ff20000000013d80] vfs_write at ffffffff801b68b4
- #5 [ff20000000013e30] ksys_write at ffffffff801b6c4a
- #6 [ff20000000013e80] __riscv_sys_write at ffffffff801b6cc4
- #7 [ff20000000013e90] do_trap_ecall_u at ffffffff80836798
-crash>
-```
-
-Acked-by: Kazuhito Hagio <k-hagio-ab@nec.com>
-Signed-off-by: Song Shuai <songshuaishuai@tinylab.org>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- riscv64.c | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/riscv64.c b/riscv64.c
-index 0aaa14b2671e..872be594d72b 100644
---- a/riscv64.c
-+++ b/riscv64.c
-@@ -747,11 +747,14 @@ riscv64_back_trace_cmd(struct bt_info *bt)
- {
- 	struct riscv64_unwind_frame current, previous;
- 	struct stackframe curr_frame;
-+	struct riscv64_register * regs;
- 	int level = 0;
- 
- 	if (bt->flags & BT_REGS_NOT_FOUND)
- 		return;
- 
-+	regs = (struct riscv64_register *) bt->machdep;
-+
- 	current.pc = bt->instptr;
- 	current.sp = bt->stkptr;
- 	current.fp = bt->frameptr;
-@@ -788,8 +791,16 @@ riscv64_back_trace_cmd(struct bt_info *bt)
- 		    sizeof(curr_frame), "get stack frame", RETURN_ON_ERROR))
- 			return;
- 
--		previous.pc = curr_frame.ra;
--		previous.fp = curr_frame.fp;
-+		/* correct PC and FP of the second frame when the first frame has no callee */
-+
-+		if (regs && (regs->regs[RISCV64_REGS_EPC] == current.pc) && curr_frame.fp & 0x7){
-+			previous.pc = regs->regs[RISCV64_REGS_RA];
-+			previous.fp = curr_frame.ra;
-+		} else {
-+			previous.pc = curr_frame.ra;
-+			previous.fp = curr_frame.fp;
-+		}
-+
- 		previous.sp = current.fp;
- 
- 		riscv64_dump_backtrace_entry(bt, symbol, &current, &previous, level++);
--- 
-2.41.0
-

SOURCES/0012-arm64-rewrite-the-arm64_get_vmcoreinfo_ul-to-arm64_g.patch

@@ -1,265 +0,0 @@
-From 19d3c56c9fca9dea49dced0414becc6d1b12e9fc Mon Sep 17 00:00:00 2001
-From: Huang Shijie <shijie@os.amperecomputing.com>
-Date: Thu, 14 Dec 2023 15:15:20 +0800
-Subject: [PATCH 12/14] arm64: rewrite the arm64_get_vmcoreinfo_ul to
- arm64_get_vmcoreinfo
-
-Rewrite the arm64_get_vmcoreinfo_ul to arm64_get_vmcoreinfo,
-add a new parameter "base" for it.
-
-Also use it to simplify the arm64 code.
-
-Signed-off-by: Huang Shijie <shijie@os.amperecomputing.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- arm64.c | 99 +++++++++++++++++++++++----------------------------------
- 1 file changed, 39 insertions(+), 60 deletions(-)
-
-diff --git a/arm64.c b/arm64.c
-index 2b6b0e588d4e..57965c6cb3c8 100644
---- a/arm64.c
-+++ b/arm64.c
-@@ -92,6 +92,7 @@ static void arm64_get_crash_notes(void);
- static void arm64_calc_VA_BITS(void);
- static int arm64_is_uvaddr(ulong, struct task_context *);
- static void arm64_calc_KERNELPACMASK(void);
-+static int arm64_get_vmcoreinfo(unsigned long *vaddr, const char *label, int base);
- 
- struct kernel_range {
- 	unsigned long modules_vaddr, modules_end;
-@@ -124,7 +125,6 @@ void
- arm64_init(int when)
- {
- 	ulong value;
--	char *string;
- 	struct machine_specific *ms;
- 
- #if defined(__x86_64__)
-@@ -160,11 +160,8 @@ arm64_init(int when)
- 		if (!ms->kimage_voffset && STREQ(pc->live_memsrc, "/dev/crash"))
- 			ioctl(pc->mfd, DEV_CRASH_ARCH_DATA, &ms->kimage_voffset);
- 
--		if (!ms->kimage_voffset &&
--		    (string = pc->read_vmcoreinfo("NUMBER(kimage_voffset)"))) {
--			ms->kimage_voffset = htol(string, QUIET, NULL);
--			free(string);
--		}
-+		if (!ms->kimage_voffset)
-+			arm64_get_vmcoreinfo(&ms->kimage_voffset, "NUMBER(kimage_voffset)", NUM_HEX);
- 
- 		if (ms->kimage_voffset ||
- 		    (ACTIVE() && (symbol_value_from_proc_kallsyms("kimage_voffset") != BADVAL))) {
-@@ -185,11 +182,8 @@ arm64_init(int when)
- 		if (kernel_symbol_exists("kimage_voffset"))
- 			machdep->flags |= NEW_VMEMMAP;
- 
--		if (!machdep->pagesize && 
--		    (string = pc->read_vmcoreinfo("PAGESIZE"))) {
--			machdep->pagesize = atoi(string);
--			free(string);
--		}
-+		if (!machdep->pagesize && arm64_get_vmcoreinfo(&value, "PAGESIZE", NUM_DEC))
-+			machdep->pagesize = (unsigned int)value;
- 
- 		if (!machdep->pagesize) {
- 			/*
-@@ -443,9 +437,8 @@ arm64_init(int when)
- 		arm64_get_section_size_bits();
- 
- 		if (!machdep->max_physmem_bits) {
--			if ((string = pc->read_vmcoreinfo("NUMBER(MAX_PHYSMEM_BITS)"))) {
--				machdep->max_physmem_bits = atol(string);
--				free(string);
-+			if (arm64_get_vmcoreinfo(&machdep->max_physmem_bits, "NUMBER(MAX_PHYSMEM_BITS)", NUM_DEC)) {
-+				/* nothing */
- 			} else if (machdep->machspec->VA_BITS == 52)  /* guess */
- 				machdep->max_physmem_bits = _MAX_PHYSMEM_BITS_52;
- 			else if (THIS_KERNEL_VERSION >= LINUX(3,17,0)) 
-@@ -573,16 +566,28 @@ static int arm64_get_struct_page_max_shift(struct machine_specific *ms)
- }
- 
- /* Return TRUE if we succeed, return FALSE on failure. */
--static int arm64_get_vmcoreinfo_ul(unsigned long *vaddr, const char* label)
-+static int
-+arm64_get_vmcoreinfo(unsigned long *vaddr, const char *label, int base)
- {
-+	int err = 0;
- 	char *string = pc->read_vmcoreinfo(label);
- 
- 	if (!string)
- 		return FALSE;
- 
--	*vaddr  = strtoul(string, NULL, 0);
-+	switch (base) {
-+	case NUM_HEX:
-+		*vaddr  = strtoul(string, NULL, 16);
-+		break;
-+	case NUM_DEC:
-+		*vaddr  = strtoul(string, NULL, 10);
-+		break;
-+	default:
-+		err++;
-+		error(INFO, "Unknown type:%#x, (NUM_HEX|NUM_DEC)\n", base);
-+	}
- 	free(string);
--	return TRUE;
-+	return err ? FALSE: TRUE;
- }
- 
- /*
-@@ -594,21 +599,21 @@ static struct kernel_range *arm64_get_range_v5_18(struct machine_specific *ms)
- 	struct kernel_range *r = &tmp_range;
- 
- 	/* Get the MODULES_VADDR ~ MODULES_END */
--	if (!arm64_get_vmcoreinfo_ul(&r->modules_vaddr, "NUMBER(MODULES_VADDR)"))
-+	if (!arm64_get_vmcoreinfo(&r->modules_vaddr, "NUMBER(MODULES_VADDR)", NUM_HEX))
- 		return NULL;
--	if (!arm64_get_vmcoreinfo_ul(&r->modules_end, "NUMBER(MODULES_END)"))
-+	if (!arm64_get_vmcoreinfo(&r->modules_end, "NUMBER(MODULES_END)", NUM_HEX))
- 		return NULL;
- 
- 	/* Get the VMEMMAP_START ~ VMEMMAP_END */
--	if (!arm64_get_vmcoreinfo_ul(&r->vmemmap_vaddr, "NUMBER(VMEMMAP_START)"))
-+	if (!arm64_get_vmcoreinfo(&r->vmemmap_vaddr, "NUMBER(VMEMMAP_START)", NUM_HEX))
- 		return NULL;
--	if (!arm64_get_vmcoreinfo_ul(&r->vmemmap_end, "NUMBER(VMEMMAP_END)"))
-+	if (!arm64_get_vmcoreinfo(&r->vmemmap_end, "NUMBER(VMEMMAP_END)", NUM_HEX))
- 		return NULL;
- 
- 	/* Get the VMALLOC_START ~ VMALLOC_END */
--	if (!arm64_get_vmcoreinfo_ul(&r->vmalloc_start_addr, "NUMBER(VMALLOC_START)"))
-+	if (!arm64_get_vmcoreinfo(&r->vmalloc_start_addr, "NUMBER(VMALLOC_START)", NUM_HEX))
- 		return NULL;
--	if (!arm64_get_vmcoreinfo_ul(&r->vmalloc_end, "NUMBER(VMALLOC_END)"))
-+	if (!arm64_get_vmcoreinfo(&r->vmalloc_end, "NUMBER(VMALLOC_END)", NUM_HEX))
- 		return NULL;
- 
- 	return r;
-@@ -888,12 +893,7 @@ range_failed:
- /* Get the size of struct page {} */
- static void arm64_get_struct_page_size(struct machine_specific *ms)
- {
--	char *string;
--
--	string = pc->read_vmcoreinfo("SIZE(page)");
--	if (string)
--		ms->struct_page_size = atol(string);
--	free(string);
-+	arm64_get_vmcoreinfo(&ms->struct_page_size, "SIZE(page)", NUM_DEC);
- }
- 
- /*
-@@ -1469,16 +1469,12 @@ arm64_calc_phys_offset(void)
- 		physaddr_t paddr;
- 		ulong vaddr;
- 		struct syment *sp;
--		char *string;
- 
- 		if ((machdep->flags & NEW_VMEMMAP) &&
- 		    ms->kimage_voffset && (sp = kernel_symbol_search("memstart_addr"))) {
- 			if (pc->flags & PROC_KCORE) {
--				if ((string = pc->read_vmcoreinfo("NUMBER(PHYS_OFFSET)"))) {
--					ms->phys_offset = htol(string, QUIET, NULL);
--					free(string);
-+				if (arm64_get_vmcoreinfo(&ms->phys_offset, "NUMBER(PHYS_OFFSET)", NUM_HEX))
- 					return;
--				}
- 				vaddr = symbol_value_from_proc_kallsyms("memstart_addr");
- 				if (vaddr == BADVAL)
- 					vaddr = sp->value;
-@@ -1560,9 +1556,8 @@ arm64_get_section_size_bits(void)
- 	} else
- 		machdep->section_size_bits = _SECTION_SIZE_BITS;
- 
--	if ((string = pc->read_vmcoreinfo("NUMBER(SECTION_SIZE_BITS)"))) {
--		machdep->section_size_bits = atol(string);
--		free(string);
-+	if (arm64_get_vmcoreinfo(&machdep->section_size_bits, "NUMBER(SECTION_SIZE_BITS)", NUM_DEC)) {
-+		/* nothing */
- 	} else if (kt->ikconfig_flags & IKCONFIG_AVAIL) {
- 		if ((ret = get_kernel_config("CONFIG_MEMORY_HOTPLUG", NULL)) == IKCONFIG_Y) {
- 			if ((ret = get_kernel_config("CONFIG_HOTPLUG_SIZE_BITS", &string)) == IKCONFIG_STR)
-@@ -1581,15 +1576,11 @@ arm64_get_section_size_bits(void)
- static int
- arm64_kdump_phys_base(ulong *phys_offset)
- {
--	char *string;
- 	struct syment *sp;
- 	physaddr_t paddr;
- 
--	if ((string = pc->read_vmcoreinfo("NUMBER(PHYS_OFFSET)"))) {
--		*phys_offset = htol(string, QUIET, NULL);
--		free(string);
-+	if (arm64_get_vmcoreinfo(phys_offset, "NUMBER(PHYS_OFFSET)", NUM_HEX))
- 		return TRUE;
--	}
- 
- 	if ((machdep->flags & NEW_VMEMMAP) &&
- 	    machdep->machspec->kimage_voffset &&
-@@ -4592,10 +4583,9 @@ static int
- arm64_set_va_bits_by_tcr(void)
- {
- 	ulong value;
--	char *string;
- 
--	if ((string = pc->read_vmcoreinfo("NUMBER(TCR_EL1_T1SZ)")) ||
--	    (string = pc->read_vmcoreinfo("NUMBER(tcr_el1_t1sz)"))) {
-+	if (arm64_get_vmcoreinfo(&value, "NUMBER(TCR_EL1_T1SZ)", NUM_HEX) ||
-+		arm64_get_vmcoreinfo(&value, "NUMBER(tcr_el1_t1sz)", NUM_HEX)) {
- 		/* See ARMv8 ARM for the description of
- 		 * TCR_EL1.T1SZ and how it can be used
- 		 * to calculate the vabits_actual
-@@ -4604,10 +4594,9 @@ arm64_set_va_bits_by_tcr(void)
- 		 * Basically:
- 		 * vabits_actual = 64 - T1SZ;
- 		 */
--		value = 64 - strtoll(string, NULL, 0);
-+		value = 64 - value;
- 		if (CRASHDEBUG(1))
- 			fprintf(fp,  "vmcoreinfo : vabits_actual: %ld\n", value);
--		free(string);
- 		machdep->machspec->VA_BITS_ACTUAL = value;
- 		machdep->machspec->VA_BITS = value;
- 		machdep->machspec->VA_START = _VA_START(machdep->machspec->VA_BITS_ACTUAL);
-@@ -4623,13 +4612,8 @@ arm64_calc_VA_BITS(void)
- 	int bitval;
- 	struct syment *sp;
- 	ulong vabits_actual, value;
--	char *string;
- 
--	if ((string = pc->read_vmcoreinfo("NUMBER(VA_BITS)"))) {
--		value = atol(string);
--		free(string);
--		machdep->machspec->CONFIG_ARM64_VA_BITS = value;
--	}
-+	arm64_get_vmcoreinfo(&machdep->machspec->CONFIG_ARM64_VA_BITS, "NUMBER(VA_BITS)", NUM_DEC);
- 
- 	if (kernel_symbol_exists("vabits_actual")) {
- 		if (pc->flags & PROC_KCORE) {
-@@ -4754,9 +4738,7 @@ arm64_calc_virtual_memory_ranges(void)
- 	ulong PUD_SIZE = UNINITIALIZED;
- 
- 	if (!machdep->machspec->CONFIG_ARM64_VA_BITS) {
--		if ((string = pc->read_vmcoreinfo("NUMBER(VA_BITS)"))) {
--			value = atol(string);
--			free(string);
-+		if (arm64_get_vmcoreinfo(&value, "NUMBER(VA_BITS)", NUM_DEC)) {
- 			machdep->machspec->CONFIG_ARM64_VA_BITS = value;
- 		} else if (kt->ikconfig_flags & IKCONFIG_AVAIL) {
- 			if ((ret = get_kernel_config("CONFIG_ARM64_VA_BITS",
-@@ -4852,11 +4834,8 @@ arm64_swp_offset(ulong pte)
- static void arm64_calc_KERNELPACMASK(void)
- {
- 	ulong value;
--	char *string;
- 
--	if ((string = pc->read_vmcoreinfo("NUMBER(KERNELPACMASK)"))) {
--		value = htol(string, QUIET, NULL);
--		free(string);
-+	if (arm64_get_vmcoreinfo(&value, "NUMBER(KERNELPACMASK)", NUM_HEX)) {
- 		machdep->machspec->CONFIG_ARM64_KERNELPACMASK = value;
- 		if (CRASHDEBUG(1))
- 			fprintf(fp, "CONFIG_ARM64_KERNELPACMASK: %lx\n", value);
--- 
-2.41.0
-

SOURCES/0013-help.c-Remove-kmem-l-help-messages.patch

@@ -1,36 +0,0 @@
-From 38435c3acec075b076353ca28f557a0dfe1341c3 Mon Sep 17 00:00:00 2001
-From: Li Zhijian <lizhijian@fujitsu.com>
-Date: Fri, 15 Dec 2023 10:44:21 +0800
-Subject: [PATCH 13/14] help.c: Remove "kmem -l" help messages
-
-"kmem -l" option has existed when crash git project initialization, but
-its help message was not accurate (extra arguments a|i|ic|id was missing).
-
-In addition, those symbols required by the -l option were for very old
-kernels, at least 2.6 kernels don't contain them.  Also, this option has
-not been fixed for a long time.
-
-Instead of document this option, hide it from help messages.
-
-Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- help.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/help.c b/help.c
-index cc7ab20e343e..d80e843703c1 100644
---- a/help.c
-+++ b/help.c
-@@ -6888,8 +6888,6 @@ char *help_kmem[] = {
- "            members of the associated page struct are displayed.",
- "   address  when used with -c, the address must be a page pointer address;",
- "            the page_hash_table entry containing the page is displayed.",
--"   address  when used with -l, the address must be a page pointer address;",
--"            the page address is displayed if it is contained with the list.",
- "   address  when used with -v, the address can be a mapped kernel virtual",
- "            address or physical address; the mapped region containing the",
- "            address is displayed.\n",
--- 
-2.41.0
-

SOURCES/0014-x86_64-check-bt-bptr-before-calculate-framesize.patch

@@ -1,65 +0,0 @@
-From 53d2577cef98b76b122aade94349637a11e06138 Mon Sep 17 00:00:00 2001
-From: Tao Liu <ltao@redhat.com>
-Date: Tue, 26 Dec 2023 09:19:28 +0800
-Subject: [PATCH 14/14] x86_64: check bt->bptr before calculate framesize
-
-Previously the value of bt->bptr is not checked, which may led to a
-wrong prev_sp and framesize. As a result, bt->stackbuf[] will be
-accessed out of range, and segfault.
-
-Before:
-  crash> set debug 1
-  crash> bt
-  ...snip...
-  --- <NMI exception stack> ---
-   #8 [ffffffff9a603e10] __switch_to_asm at ffffffff99800214
-  rsp: ffffffff9a603e10 textaddr: ffffffff99800214 -> spo: 0 bpo: 0 spr: 0 bpr: 0 type: 0 end: 0
-   #9 [ffffffff9a603e40] __schedule at ffffffff9960dfb1
-  rsp: ffffffff9a603e40 textaddr: ffffffff9960dfb1 -> spo: 16 bpo: -16 spr: 4 bpr: 1 type: 0 end: 0
-  rsp: ffffffff9a603e40 rbp: ffffb9ca076e7ca8 prev_sp: ffffb9ca076e7cb8 framesize: 1829650024
-  Segmentation fault (core dumped)
-
-  (gdb) p/x bt->stackbase
-  $1 = 0xffffffff9a600000
-  (gdb) p/x bt->stacktop
-  $2 = 0xffffffff9a604000
-
-After:
-  crash> set debug 1
-  crash> bt
-  ...snip...
-  --- <NMI exception stack> ---
-   #8 [ffffffff9a603e10] __switch_to_asm at ffffffff99800214
-  rsp: ffffffff9a603e10 textaddr: ffffffff99800214 -> spo: 0 bpo: 0 spr: 0 bpr: 0 type: 0 end: 0
-   #9 [ffffffff9a603e40] __schedule at ffffffff9960dfb1
-  rsp: ffffffff9a603e40 textaddr: ffffffff9960dfb1 -> spo: 16 bpo: -16 spr: 4 bpr: 1 type: 0 end: 0
-   #10 [ffffffff9a603e98] schedule_idle at ffffffff9960e87c
-  rsp: ffffffff9a603e98 textaddr: ffffffff9960e87c -> spo: 8 bpo: 0 spr: 5 bpr: 0 type: 0 end: 0
-  rsp: ffffffff9a603e98 prev_sp: ffffffff9a603ea8 framesize: 0
-  ...snip...
-
-Check bt->bptr value before calculate framesize. Only bt->bptr within
-the range of bt->stackbase and bt->stacktop will be regarded as valid.
-
-Signed-off-by: Tao Liu <ltao@redhat.com>
-Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
----
- x86_64.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/x86_64.c b/x86_64.c
-index 42ade4817ad9..f59991f8c4c5 100644
---- a/x86_64.c
-+++ b/x86_64.c
-@@ -8649,7 +8649,7 @@ x86_64_get_framesize(struct bt_info *bt, ulong textaddr, ulong rsp, char *stack_
- 				if (CRASHDEBUG(1))
- 					fprintf(fp, "rsp: %lx prev_sp: %lx framesize: %d\n",
- 							rsp, prev_sp, framesize);
--			} else if ((korc->sp_reg == ORC_REG_BP) && bt->bptr) {
-+			} else if ((korc->sp_reg == ORC_REG_BP) && bt->bptr && INSTACK(bt->bptr, bt)) {
- 				prev_sp = bt->bptr + korc->sp_offset;
- 				framesize = (prev_sp - (rsp + 8) - 8);
- 				if (CRASHDEBUG(1))
--- 
-2.41.0
-

SOURCES/lzo_snappy_zstd.patch

@@ -1,16 +1,16 @@
---- crash-8.0.4/Makefile.orig
-+++ crash-8.0.4/Makefile
-@@ -256,7 +256,7 @@ all: make_configure
+--- crash-7.3.1/Makefile.orig
++++ crash-7.3.1/Makefile
+@@ -230,7 +230,7 @@ all: make_configure
  gdb_merge: force
  	@if [ ! -f ${GDB}/README ]; then \
- 	  $(MAKE) gdb_unzip; fi
+ 	  make --no-print-directory gdb_unzip; fi
 -	@echo "${LDFLAGS} -lz -ldl -rdynamic" > ${GDB}/gdb/mergelibs
 +	@echo "${LDFLAGS} -lz -llzo2 -lsnappy -lzstd -ldl -rdynamic" > ${GDB}/gdb/mergelibs
  	@echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj
  	@rm -f ${PROGRAM}
  	@if [ ! -f ${GDB}/config.status ]; then \
---- crash-8.0.4/diskdump.c.orig
-+++ crash-8.0.4/diskdump.c
+--- crash-7.3.1/diskdump.c.orig
++++ crash-7.3.1/diskdump.c
 @@ -23,6 +23,9 @@
   * GNU General Public License for more details.
   */

SOURCES/rhel8_build.patch

@@ -1,6 +1,6 @@
---- crash-8.0.4/Makefile.orig
-+++ crash-8.0.4/Makefile
-@@ -204,7 +204,7 @@ GDB_FLAGS=
+--- crash-7.3.1/Makefile.orig
++++ crash-7.3.1/Makefile
+@@ -200,7 +200,7 @@ GDB_FLAGS=
  # TARGET_CFLAGS will be configured automatically by configure
  TARGET_CFLAGS=
  
@@ -9,18 +9,18 @@
  
  GPL_FILES=
  TAR_FILES=${SOURCE_FILES} Makefile ${GPL_FILES} README .rh_rpm_package crash.8 \
-@@ -256,7 +256,7 @@ all: make_configure
+@@ -230,7 +230,7 @@ all: make_configure
  gdb_merge: force
  	@if [ ! -f ${GDB}/README ]; then \
- 	  $(MAKE) gdb_unzip; fi
+ 	  make --no-print-directory gdb_unzip; fi
 -	@echo "${LDFLAGS} -lz -llzo2 -lsnappy -lzstd -ldl -rdynamic" > ${GDB}/gdb/mergelibs
-+	@echo "${LDFLAGS} -lz -llzo2 -lsnappy -lzstd -ldl -rdynamic -Wl,-z,now -fPIE" > ${GDB}/gdb/mergelibs
++	@echo "${LDFLAGS} -lz -llzo2 -lsnappy -lzstd -ldl -rdynamic -Wl,-z,now -fpie" > ${GDB}/gdb/mergelibs
  	@echo "../../${PROGRAM} ../../${PROGRAM}lib.a" > ${GDB}/gdb/mergeobj
  	@rm -f ${PROGRAM}
  	@if [ ! -f ${GDB}/config.status ]; then \
---- crash-8.0.4/configure.c.orig
-+++ crash-8.0.4/configure.c
-@@ -810,7 +810,8 @@ build_configure(struct supported_gdb_version *sp)
+--- crash-7.3.1/configure.c.orig
++++ crash-7.3.1/configure.c
+@@ -800,7 +800,8 @@ build_configure(struct supported_gdb_version *sp)
                          fprintf(fp2, "%s\n", sp->GDB);
                          sprintf(target_data.gdb_version, "%s", &sp->GDB[4]);
  		} else if (strncmp(buf, "LDFLAGS=", strlen("LDFLAGS=")) == 0) {
@@ -30,4 +30,3 @@
  		} else
  			fprintf(fp2, "%s", buf);
  
-

SOURCES/rhel8_freepointer.patch

@@ -0,0 +1,29 @@
+From e09e3c038c853f9a332cf05a17e5fdee1c7837e0 Mon Sep 17 00:00:00 2001
+From: Lianbo Jiang <lijiang@redhat.com>
+Date: Thu, 18 Nov 2021 09:55:45 +0800
+Subject: [PATCH] fix freepointer issue
+
+Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
+---
+ memory.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/memory.c b/memory.c
+index a3cf8a86728d..81db9c7bee9f 100644
+--- a/memory.c
++++ b/memory.c
+@@ -19340,9 +19340,8 @@ freelist_ptr(struct meminfo *si, ulong ptr, ulong ptr_addr)
+ 	if (VALID_MEMBER(kmem_cache_random)) {
+ 		/* CONFIG_SLAB_FREELIST_HARDENED */
+ 
+-		if (THIS_KERNEL_VERSION >= LINUX(5,7,0))
+-			ptr_addr = (sizeof(long) == 8) ? bswap_64(ptr_addr)
+-						       : bswap_32(ptr_addr);
++		ptr_addr = (sizeof(long) == 8) ? bswap_64(ptr_addr)
++					       : bswap_32(ptr_addr);
+ 		return (ptr ^ si->random ^ ptr_addr);
+ 	} else
+ 		return ptr;
+-- 
+2.30.2
+

SPECS/crash.spec

@@ -1,38 +1,37 @@
 #
 # crash core analysis suite
-#
+
 Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles
 Name: crash
-Version: 8.0.4
-Release: 2%{?dist}.alma
+Version: 7.3.1
+Release: 5%{?dist}.alma
 License: GPLv3
 Group: Development/Debuggers
 Source0: https://github.com/crash-utility/crash/archive/crash-%{version}.tar.gz
-Source1: http://ftp.gnu.org/gnu/gdb/gdb-10.2.tar.gz
+Source1: http://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.gz
 URL: https://crash-utility.github.io
 ExclusiveOS: Linux
 ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le
-BuildRequires: ncurses-devel zlib-devel lzo-devel bison snappy-devel wget patch texinfo libzstd-devel
-BuildRequires: gcc gcc-c++ make
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+BuildRequires: ncurses-devel zlib-devel lzo-devel bison snappy-devel libzstd-devel
 Requires: binutils
-Provides: bundled(libiberty)
-Provides: bundled(gdb) = 10.2
+Provides: bundled(gdb) = 7.6
 Patch0: lzo_snappy_zstd.patch
-Patch1: crash-8.0.4_build.patch
-Patch2: 0001-Fix-rd-command-for-zram-data-display-in-Linux-6.2-an.patch
-Patch3: 0002-Fix-typos-in-offset_table-and-missing-help-o-items.patch
-Patch4: 0003-zram-Fixes-for-lookup_swap_cache.patch
-Patch5: 0004-symbols-expand-all-kernel-module-symtable-if-not-all.patch
-Patch6: 0005-symbols-skip-load-.init.-sections-if-module-was-succ.patch
-Patch7: 0006-use-NR_SWAPCACHE-when-nr_swapper_spaces-isn-t-availa.patch
-Patch8: 0007-Fix-identity_map_base-value-dump-on-S390.patch
-Patch9: 0008-s390x-fix-virtual-vs-physical-address-confusion.patch
-Patch10: 0009-s390x-uncouple-physical-and-virtual-memory-spaces.patch
-Patch11: 0010-RISCV64-Dump-NT_PRSTATUS-in-help-n.patch
-Patch12: 0011-RISCV64-Fix-bt-output-when-no-ra-on-the-stack-top.patch
-Patch13: 0012-arm64-rewrite-the-arm64_get_vmcoreinfo_ul-to-arm64_g.patch
-Patch14: 0013-help.c-Remove-kmem-l-help-messages.patch
-Patch15: 0014-x86_64-check-bt-bptr-before-calculate-framesize.patch
+Patch1: rhel8_build.patch
+Patch2: rhel8_freepointer.patch
+Patch3: 0001-arm64-Support-overflow-stack-panic.patch
+Patch4: 0002-defs.h-fix-breakage-of-compatibility-of-struct-symbo.patch
+Patch5: 0001-Fix-pvops-Xen-detection-for-arm-machine.patch
+Patch6: 0002-Handle-blk_mq_ctx-member-changes-for-kernels-5.16-rc.patch
+Patch7: 0003-Fix-for-timer-r-option-to-display-all-the-per-CPU-cl.patch
+Patch8: 0004-Fix-for-bt-v-option-to-display-the-stack-end-address.patch
+Patch9: 0005-Fix-for-HZ-calculation-on-Linux-5.14-and-later.patch
+Patch10: 0006-memory-Handle-struct-slab-changes-on-Linux-5.17-rc1-.patch
+Patch11: 0007-Move-the-initialization-of-boot_date-to-task_init.patch
+Patch12: 0008-Remove-ptype-command-from-ps-t-option-to-reduce-memo.patch
+Patch13: 0009-Improve-the-ps-performance-for-vmcores-with-large-nu.patch
+Patch14: 0010-arm64-Fix-segfault-by-bt-command-with-offline-cpus.patch
+Patch15: 0011-Fix-for-kmem-s-S-and-bt-F-F-on-Linux-5.17-rc1.patch
 
 %description
 The core analysis suite is a self-contained tool that can be used to
@@ -53,31 +52,32 @@ offered by Mission Critical Linux, or the LKCD kernel patch.
 
 %prep
 %setup -n %{name}-%{version} -q
-%patch -P 0 -p1 -b lzo_snappy_zstd.patch
-%patch -P 1 -p1 -b crash-8.0.4_build.patch
-%patch -P 2 -p1
-%patch -P 3 -p1
-%patch -P 4 -p1
-%patch -P 5 -p1
-%patch -P 6 -p1
-%patch -P 7 -p1
-%patch -P 8 -p1
-%patch -P 9 -p1
-%patch -P 10 -p1
-%patch -P 11 -p1
-%patch -P 12 -p1
-%patch -P 13 -p1
-%patch -P 14 -p1
-%patch -P 15 -p1
+%patch0 -p1 -b lzo_snappy_zstd.patch
+%patch1 -p1 -b rhel8_build.patch
+%patch2 -p1 -b rhel8_freepointer.patch
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 %build
 cp %{SOURCE1} .
-make -j`nproc` RPMPKG="%{version}-%{release}" CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
+#make RPMPKG="%{version}-%{release}" CFLAGS="%{optflags}"
+make RPMPKG="%{version}-%{release}" CFLAGS="%{optflags}" LDFLAGS="%{build_ldflags}"
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_bindir}
-%make_install
+make DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}%{_mandir}/man8
 cp -p crash.8 %{buildroot}%{_mandir}/man8/crash.8
 mkdir -p %{buildroot}%{_includedir}/crash
@@ -88,50 +88,18 @@ cp -p defs.h %{buildroot}%{_includedir}/crash
 rm -rf %{buildroot}
 
 %files
+%defattr(-,root,root,-)
 %{_bindir}/crash
 %{_mandir}/man8/crash.8*
 %doc README COPYING3
 
 %files devel
+%defattr(-,root,root,-)
 %{_includedir}/*
 
 %changelog
-* Wed Mar 27 2024 Eduard Abdullin <eabdullin@almalinux.org> - 8.0.4-2.alma
-- AlmaLinux changes
-
-* Tue Jan 02 2024 Lianbo Jiang <lijiang@redhat.com> - 8.0.4-2
-- Fix the "dis -lr" not displaying the source file names
-  and line numbers
-- Fix incorrect symbol translation by the 'struct blk_mq_ops'
-* Fri Nov 17 2023 Lianbo Jiang <lijiang@redhat.com> - 8.0.4-1
-- Rebase to upstream crash 8.0.4
-
-* Thu Sep 07 2023 Lianbo Jiang <lijiang@redhat.com> - 8.0.3-1
-- Rebase to upstream crash-utility 8.0.3
-- Backport the latest patches from upstream crash-utility
-
-* Thu Jun 15 2023 Lianbo Jiang <lijiang@redhat.com> - 7.3.2-8
-- arm64: Fix again segfault in arm64_is_kernel_exception_frame()
-- Fix invalid structure size error during crash startup on ppc64
-* Wed Jun 07 2023 Lianbo Jiang <lijiang@redhat.com> - 7.3.2-7
-- Fix segfault caused by failure of stopping CPUs
-
-* Mon May 08 2023 Lianbo Jiang <lijiang@redhat.com> - 7.3.2-6
-- Fix for freelist pointer on PPC64le, ARM64 and S390x
-
-* Mon May 08 2023 Lianbo Jiang <lijiang@redhat.com> - 7.3.2-5
-- Update to the latest upstream commit 47216437e79a
-- ("Fix "net" command on kernel configured with CONFIG_IPV6=m")
-
-* Mon Nov 21 2022 Lianbo Jiang <lijiang@redhat.com> - 7.3.2-4
-- Fix for commit 2145b2bb79c5, there are different behaviors between gdb-7.6 and gdb-10.2
-* Thu Nov 17 2022 Lianbo Jiang <lijiang@redhat.com> - 7.3.2-3
-- Update to the latest commit a158590f475c from master branch
-
-* Thu Jun 16 2022 Lianbo Jiang <lijiang@redhat.com> - 7.3.2-2
-- Enhance "dev -d|-D" options to support blk-mq sbitmap
-* Mon May 16 2022 Lianbo Jiang <lijiang@redhat.com> - 7.3.2-1
-- Rebase to upstream crash 7.3.2
+* Tue May 10 2022 Andrew Lukoshko <alukoshko@almalinux.org> - 7.3.1-5.alma
+- Debrand for AlmaLinux
 
 * Tue Feb 08 2022 Lianbo Jiang <lijiang@redhat.com> - 7.3.1-5
 - Rebuild for osci badfuncs issue
@@ -222,6 +190,9 @@ rm -rf %{buildroot}
 - Support for KASLR on s390x
   Resolves: rhbz# 1753172
 
+* Mon Nov 11 2019 Sergey Fokin <sfokin@cloudlinux.com> - 7.2.6-2.cloudlinux
+- rebranding for CloudLinux
+
 * Mon Jun 10 2019 Dave Anderson <anderson@redhat.com> - 7.2.6-2
 - Fix "p" command regression
   Resolves: rhbz#1718417