4:39 a.m.
The linux kernel supports the large folio for page cache by default.
But the current CRASH does not support the large folio.
So we may meet the errors when we detected the large folio sometimes,
such as in the email:
https://www.spinics.net/linux/fedora/redhat-crash-utility/msg11238.html
------------------------------
files: page_to_nid: invalid page: 0
files: page_to_nid: invalid page: 0
files: page_to_nid: invalid page: 0
files: page_to_nid: invalid page: 10
files: page_to_nid: invalid page: 10
files: page_to_nid: invalid page: 10
files: page_to_nid: invalid page: 20
files: page_to_nid: invalid page: 20
files: page_to_nid: invalid page: 20
files: page_to_nid: invalid page: 30
files: page_to_nid: invalid page: 30
files: page_to_nid: invalid page: 30
files: page_to_nid: invalid page: 40
files: page_to_nid: invalid page: 40
files: page_to_nid: invalid page: 40
files: page_to_nid: invalid page: 50
files: page_to_nid: invalid page: 50
files: page_to_nid: invalid page: 50
files: page_to_nid: invalid page: 60
files: page_to_nid: invalid page: 60
------------------------------
The first 3 patches are used to add large folio support for CRASH.
The last patch is newly version of an old patch:
it add "files -n" command.
v3->>v4:
Fixes the BPF bug by:
1.) patch 1: Add a new type for do_xarray_info
2.) patch 3: Check XARRAY_TYPE_PAGE_CACHE for
do_xarray_count()/do_xarray_dump()/do_xarray_dump_cb()
v2-->v3:
Rewrited the folio_order() in patch 2 to work with different
kernel versions.
v1-->v2:
1.) Rebase the kernel to later 7.0-rc1(merge window)
2.) Fixed a bug in the patch 3, the latest kernel supports folios
whose page order is bigger then 5:
"xarray: add large folio support"
Huang Shijie (4):
xarray: add a new parameter for do_xarray
add folio_order function
xarray: add large folio support
add "files -n" command for an inode
bpf.c | 8 ++---
defs.h | 14 +++++++-
dev.c | 4 +--
diskdump.c | 10 ++++--
filesys.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++-------
help.c | 24 +++++++++++++-
ipcs.c | 4 +--
kernel.c | 4 +--
memory.c | 74 ++++++++++++++++++++++++++++++++++++++++--
symbols.c | 6 ++++
task.c | 4 +--
tools.c | 16 ++++++++--
12 files changed, 230 insertions(+), 32 deletions(-)
--
2.43.0
4:39 a.m.
New subject: [PATCH v4 1/4] xarray: add a new parameter for do_xarray
The xarray can be used in many kernel subsystems.
For the page cache, it can support the large folio
which needs special operations.
So this patch adds a new parameter for do_xarray, and
adds a new type field in xarray_ops/do_xarray_info to
distinguish them.
Also adds macro XARRAY_TYPE_PAGE_CACHE for page cache case.
Signed-off-by: Huang Shijie <huangsj(a)hygon.cn>
---
bpf.c | 8 ++++----
defs.h | 5 ++++-
dev.c | 4 ++--
diskdump.c | 10 ++++++++--
filesys.c | 9 +++++++--
ipcs.c | 4 ++--
kernel.c | 4 ++--
task.c | 4 ++--
8 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/bpf.c b/bpf.c
index 2840c7d..8702596 100644
--- a/bpf.c
+++ b/bpf.c
@@ -344,7 +344,7 @@ bpf_init(struct bpf_info *bpf)
break;
case IDR_XARRAY:
bpf->progs = do_xarray(symbol_value("prog_idr") + OFFSET(idr_idr_rt),
- XARRAY_COUNT, NULL);
+ XARRAY_COUNT, NULL, 0);
break;
}
@@ -364,7 +364,7 @@ bpf_init(struct bpf_info *bpf)
break;
case IDR_XARRAY:
bpf->progs = do_xarray(symbol_value("prog_idr") + OFFSET(idr_idr_rt),
- XARRAY_GATHER, bpf->proglist);
+ XARRAY_GATHER, bpf->proglist, 0);
break;
}
}
@@ -380,7 +380,7 @@ bpf_init(struct bpf_info *bpf)
break;
case IDR_XARRAY:
bpf->maps = do_xarray(symbol_value("map_idr") + OFFSET(idr_idr_rt),
- XARRAY_COUNT, NULL);
+ XARRAY_COUNT, NULL, 0);
break;
}
@@ -400,7 +400,7 @@ bpf_init(struct bpf_info *bpf)
break;
case IDR_XARRAY:
bpf->maps = do_xarray(symbol_value("map_idr") + OFFSET(idr_idr_rt),
- XARRAY_GATHER, bpf->maplist);
+ XARRAY_GATHER, bpf->maplist, 0);
break;
}
}
diff --git a/defs.h b/defs.h
index a6f4372..8f6784e 100644
--- a/defs.h
+++ b/defs.h
@@ -5691,6 +5691,7 @@ struct xarray_ops {
void (*entry)(ulong node, ulong slot, const char *path,
ulong index, void *private);
uint radix;
+ uint type;
void *private;
};
int do_xarray_traverse(ulong ptr, int is_root, struct xarray_ops *ops);
@@ -5996,7 +5997,9 @@ ulong do_radix_tree(ulong, int, struct list_pair *);
#define RADIX_TREE_ENTRY_MASK 3UL
#define RADIX_TREE_EXCEPTIONAL_ENTRY 2
-ulong do_xarray(ulong, int, struct list_pair *);
+ulong do_xarray(ulong, int, struct list_pair *, int);
+#define XARRAY_TYPE_PAGE_CACHE 1
+
#define XARRAY_COUNT (1)
#define XARRAY_SEARCH (2)
#define XARRAY_DUMP (3)
diff --git a/dev.c b/dev.c
index 1332b0e..23f3219 100644
--- a/dev.c
+++ b/dev.c
@@ -4487,12 +4487,12 @@ static void get_mq_diskio_from_hw_queues(ulong q, struct diskio
*dio)
if (VALID_MEMBER(request_queue_hctx_table)) {
addr = q + OFFSET(request_queue_hctx_table);
- cnt = do_xarray(addr, XARRAY_COUNT, NULL);
+ cnt = do_xarray(addr, XARRAY_COUNT, NULL, 0);
lp = (struct list_pair *)GETBUF(sizeof(struct list_pair) * (cnt + 1));
if (!lp)
error(FATAL, "fail to get memory for list_pair.\n");
lp[0].index = cnt;
- cnt = do_xarray(addr, XARRAY_GATHER, lp);
+ cnt = do_xarray(addr, XARRAY_GATHER, lp, 0);
} else {
addr = q + OFFSET(request_queue_nr_hw_queues);
readmem(addr, KVADDR, &cnt, sizeof(uint),
diff --git a/diskdump.c b/diskdump.c
index 20f8b19..456e5cf 100644
--- a/diskdump.c
+++ b/diskdump.c
@@ -2947,6 +2947,7 @@ lookup_swap_cache(ulonglong pte_val, unsigned char *zram_buf)
struct list_pair lp;
physaddr_t paddr;
static int is_xarray = -1;
+ ulong ret;
if (is_xarray < 0) {
is_xarray = STREQ(MEMBER_TYPE_NAME("address_space", "i_pages"),
"xarray");
@@ -2969,8 +2970,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+OFFSET(address_space_page_tree), RADIX_TREE_SEARCH, &lp)) {
+
+ if (is_xarray)
+ ret = do_xarray(swp_space+OFFSET(address_space_page_tree), RADIX_TREE_SEARCH, &lp,
0);
+ else
+ ret = do_radix_tree(swp_space+OFFSET(address_space_page_tree), RADIX_TREE_SEARCH,
&lp);
+
+ if (ret) {
if ((is_xarray ? xa_is_value : radix_tree_exceptional_entry)((ulong)lp.value)) {
/* ignore shadow values */
return NULL;
diff --git a/filesys.c b/filesys.c
index 34944e2..2d3b272 100644
--- a/filesys.c
+++ b/filesys.c
@@ -2289,7 +2289,7 @@ dump_inode_page_cache_info(ulong inode)
if (root_rnode)
count = do_radix_tree(root_rnode, RADIX_TREE_DUMP_CB, &lp);
else if (xarray)
- count = do_xarray(xarray, XARRAY_DUMP_CB, &lp);
+ count = do_xarray(xarray, XARRAY_DUMP_CB, &lp, XARRAY_TYPE_PAGE_CACHE);
if (count != nrpages)
error(INFO, "%s page count: %ld nrpages: %ld\n",
@@ -4216,6 +4216,7 @@ do_radix_tree(ulong root, int flag, struct list_pair *rtp)
struct do_xarray_info {
ulong maxcount;
ulong count;
+ uint type;
void *data;
};
static void do_xarray_count(ulong node, ulong slot, const char *path,
@@ -4305,16 +4306,20 @@ static void do_xarray_dump_cb(ulong node, ulong slot, const char
*path,
* any chance of an overrun.
* For XARRAY_DUMP_CB, the rtp->value must be initialized as a
* callback function. The callback prototype must be: int (*)(ulong);
+ *
+ * type: different xarray use types.
*/
ulong
-do_xarray(ulong root, int flag, struct list_pair *xp)
+do_xarray(ulong root, int flag, struct list_pair *xp, int type)
{
struct do_xarray_info info = {
.count = 0,
+ .type = type,
.data = xp,
};
struct xarray_ops ops = {
.radix = 16,
+ .type = type,
.private = &info,
};
diff --git a/ipcs.c b/ipcs.c
index 59dc9b6..9cf2418 100644
--- a/ipcs.c
+++ b/ipcs.c
@@ -1150,13 +1150,13 @@ gather_xarray_entries(ulong ipcs_idr_p)
{
long len;
- ipcs_table.cnt = do_xarray(ipcs_idr_p, XARRAY_COUNT, NULL);
+ ipcs_table.cnt = do_xarray(ipcs_idr_p, XARRAY_COUNT, NULL, 0);
if (ipcs_table.cnt) {
len = sizeof(struct list_pair) * (ipcs_table.cnt+1);
ipcs_table.lp = (struct list_pair *)GETBUF(len);
ipcs_table.lp[0].index = ipcs_table.cnt;
- ipcs_table.cnt = do_xarray(ipcs_idr_p, XARRAY_GATHER, ipcs_table.lp);
+ ipcs_table.cnt = do_xarray(ipcs_idr_p, XARRAY_GATHER, ipcs_table.lp, 0);
} else
ipcs_table.lp = NULL;
}
diff --git a/kernel.c b/kernel.c
index 8781d6a..870fb3b 100644
--- a/kernel.c
+++ b/kernel.c
@@ -6883,7 +6883,7 @@ get_irq_desc_addr(int irq)
break;
case IRQ_DESC_TREE_XARRAY:
cnt = do_xarray(symbol_value("irq_desc_tree"),
- XARRAY_COUNT, NULL);
+ XARRAY_COUNT, NULL, 0);
break;
}
len = sizeof(struct list_pair) * (cnt+1);
@@ -6898,7 +6898,7 @@ get_irq_desc_addr(int irq)
break;
case IRQ_DESC_TREE_XARRAY:
cnt = do_xarray(symbol_value("irq_desc_tree"),
- XARRAY_GATHER, lp);
+ XARRAY_GATHER, lp, 0);
break;
}
diff --git a/task.c b/task.c
index ec04b55..2d9c4e4 100644
--- a/task.c
+++ b/task.c
@@ -2610,7 +2610,7 @@ refresh_xarray_task_table(void)
curpid = CURRENT_PID();
}
- count = do_xarray(tt->pid_xarray, XARRAY_COUNT, NULL);
+ count = do_xarray(tt->pid_xarray, XARRAY_COUNT, NULL, 0);
if (CRASHDEBUG(1))
console("xarray: count: %ld\n", count);
@@ -2641,7 +2641,7 @@ retry_xarray:
tt->callbacks = 0;
xp.index = 0;
xp.value = (void *)&xarray_task_callback;
- count = do_xarray(tt->pid_xarray, XARRAY_DUMP_CB, &xp);
+ count = do_xarray(tt->pid_xarray, XARRAY_DUMP_CB, &xp, 0);
if (CRASHDEBUG(1))
console("do_xarray: count: %ld tt->callbacks: %d\n", count,
tt->callbacks);
--
2.43.0
4:39 a.m.
New subject: [PATCH v4 2/4] add folio_order function
The folio_order() was introduced to kernel at v5.16, but the first
large folio support patch is in v5.17:
6795801366da "xfs: Support large folios"
The folio_order() keeps the same logic as kernel code
in different versions:
1.) In kernel v5.17, folio_order() uses page[1].compound_order to
get the folio order.
2.) In kernel v6.1, the following patch introduces _folio_order:
c3a15bff46cb5149 "mm: reimplement folio_order() and folio_nr_pages()"
folio_order() uses _folio_order to get the folio order.
3.) In kernel v6.6, the following patch replaces the _folio_order with _flags_1:
ebc1baf5c9b46c22 "mm: free up a word in the first tail page"
folio_order() uses _flags_1 to get the folio order.
This patch will be used in later patches.
Signed-off-by: Huang Shijie <huangsj(a)hygon.cn>
---
defs.h | 8 +++++++
memory.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
symbols.c | 6 +++++
3 files changed, 84 insertions(+)
diff --git a/defs.h b/defs.h
index 8f6784e..e832ea6 100644
--- a/defs.h
+++ b/defs.h
@@ -2290,6 +2290,9 @@ struct offset_table { /* stash of commonly-used
offsets */
long bpf_ringbuf_nr_pages;
long hrtimer_clock_base_index;
long klp_patch_list;
+ long page_compound_order;
+ long folio__folio_order;
+ long folio__flags_1;
};
struct size_table { /* stash of commonly-used sizes */
@@ -2469,6 +2472,9 @@ struct size_table { /* stash of commonly-used sizes */
long cpumask_t;
long task_struct_exit_state;
long bpf_ringbuf_map;
+ long page_compound_order;
+ long folio__folio_order;
+ long folio__flags_1;
};
struct array_table {
@@ -6008,6 +6014,8 @@ ulong do_xarray(ulong, int, struct list_pair *, int);
#define XARRAY_TAG_MASK (3UL)
#define XARRAY_TAG_INTERNAL (2UL)
+int folio_order(ulong folio);
+
int file_dump(ulong, ulong, ulong, int, int);
#define DUMP_FULL_NAME 0x1
#define DUMP_INODE_ONLY 0x2
diff --git a/memory.c b/memory.c
index 17423a5..3b272ad 100644
--- a/memory.c
+++ b/memory.c
@@ -547,6 +547,13 @@ vm_init(void)
MEMBER_OFFSET_INIT(page_freelist, "page", "freelist");
MEMBER_OFFSET_INIT(page_page_type, "page", "page_type");
+ MEMBER_OFFSET_INIT(page_compound_order, "page", "compound_order");
+ MEMBER_SIZE_INIT(page_compound_order, "page", "compound_order");
+ MEMBER_OFFSET_INIT(folio__folio_order, "folio", "_folio_order");
+ MEMBER_SIZE_INIT(folio__folio_order, "folio", "_folio_order");
+ MEMBER_OFFSET_INIT(folio__flags_1, "folio", "_flags_1");
+ MEMBER_SIZE_INIT(folio__flags_1, "folio", "_flags_1");
+
MEMBER_OFFSET_INIT(mm_struct_pgd, "mm_struct", "pgd");
MEMBER_OFFSET_INIT(swap_info_struct_swap_file,
@@ -20426,6 +20433,69 @@ static unsigned int oo_objects(ulong oo)
return (oo & ((1 << 16) - 1));
}
+/*
+ * The folio_order() was introduced to kernel at v5.16, but the first
+ * large folio support patch is in v5.17:
+ * 6795801366da "xfs: Support large folios"
+ *
+ * 1.) In kernel v5.17, folio_order() uses page[1].compound_order to
+ * get the folio order.
+ *
+ * 2.) In kernel v6.1, the following patch introduces _folio_order:
+ * c3a15bff46cb5149 "mm: reimplement folio_order() and folio_nr_pages()"
+ *
+ * folio_order() uses _folio_order to get the folio order.
+ *
+ * 3.) In kernel v6.6, the following patch replaces the _folio_order with _flags_1:
+ * ebc1baf5c9b46c22 "mm: free up a word in the first tail page"
+ *
+ * folio_order() uses _flags_1 to get the folio order.
+ */
+int
+folio_order(ulong folio)
+{
+ ulong v = 0;
+ int PG_head = 16;
+
+ if (THIS_KERNEL_VERSION < LINUX(5,17,0))
+ return 0;
+
+ if (THIS_KERNEL_VERSION < LINUX(6,1,0)) {
+ readmem(folio + OFFSET(page_flags), KVADDR, &v, sizeof(ulong),
+ "folio.page.flags", FAULT_ON_ERROR);
+ if (!(v & (1 << PG_head)))
+ return 0;
+
+ readmem(folio + SIZE(page) + OFFSET(page_compound_order), KVADDR, &v,
+ SIZE(page_compound_order), "page[1].compound_order", FAULT_ON_ERROR);
+
+ return v;
+ } else if (THIS_KERNEL_VERSION < LINUX(6,6,0)) {
+ readmem(folio + OFFSET(page_flags), KVADDR, &v, sizeof(ulong),
+ "folio.page.flags", FAULT_ON_ERROR);
+ if (!(v & (1 << PG_head)))
+ return 0;
+
+ readmem(folio + OFFSET(folio__folio_order), KVADDR, &v,
+ SIZE(folio__folio_order), "folio->_folio_order", FAULT_ON_ERROR);
+
+ return v;
+ } else {
+ /* The PG_head changes to bit 6 at kernel v6.6 */
+ PG_head = 6;
+
+ readmem(folio + OFFSET(page_flags), KVADDR, &v, sizeof(ulong),
+ "folio.page.flags", FAULT_ON_ERROR);
+ if (!(v & (1 << PG_head)))
+ return 0;
+
+ readmem(folio + OFFSET(folio__flags_1), KVADDR, &v,
+ SIZE(folio__flags_1), "folio->_flags_1", FAULT_ON_ERROR);
+
+ return v & 0xff;
+ }
+}
+
#ifdef NOT_USED
ulong
slab_to_kmem_cache_node(struct meminfo *si, ulong slab_page)
diff --git a/symbols.c b/symbols.c
index e6865ca..08c07e9 100644
--- a/symbols.c
+++ b/symbols.c
@@ -10451,6 +10451,9 @@ dump_offset_table(char *spec, ulong makestruct)
fprintf(fp, " page_private: %ld\n",
OFFSET(page_private));
fprintf(fp, " page_page_type: %ld\n",
OFFSET(page_page_type));
+ fprintf(fp, " page_compound_order: %ld\n",
OFFSET(page_compound_order));
+ fprintf(fp, " folio__folio_order: %ld\n",
OFFSET(folio__folio_order));
+ fprintf(fp, " folio__flags_1: %ld\n", OFFSET(folio__flags_1));
fprintf(fp, " trace_print_flags_mask: %ld\n",
OFFSET(trace_print_flags_mask));
@@ -11961,6 +11964,9 @@ dump_offset_table(char *spec, ulong makestruct)
fprintf(fp, "\n size_table:\n");
fprintf(fp, " page: %ld\n", SIZE(page));
fprintf(fp, " page_flags: %ld\n", SIZE(page_flags));
+ fprintf(fp, " page_compound_order: %ld\n",
SIZE(page_compound_order));
+ fprintf(fp, " folio__folio_order: %ld\n",
SIZE(folio__folio_order));
+ fprintf(fp, " folio__flags_1: %ld\n", SIZE(folio__flags_1));
fprintf(fp, " trace_print_flags: %ld\n",
SIZE(trace_print_flags));
fprintf(fp, " free_area_struct: %ld\n",
SIZE(free_area_struct));
--
2.43.0
4:40 a.m.
New subject: [PATCH v4 3/4] xarray: add large folio support
We may meet a large folio at two cases:
1.) when height is 1, the real data layout may looks like this:
--------------------------------------------
crash> p *(struct xa_node*)0xffff889883a6a910
$5 = {
shift = 0 '\000',
offset = 0 '\000',
count = 64 '@',
nr_values = 0 '\000',
.................
slots = { 0xffffea0061d21000, 0x2, 0x2, 0x2,
0xffffea0121d85c00, 0x12, 0x12, 0x12,
0xffffea0121d9f400, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22,
0xffffea0121583800, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42,
0xffffea0121833e00, 0x62, 0x62, 0x62, 0x62, 0x62, 0x62, 0x62,
0xffffea0121eb3800, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82,
0x82, 0x82, 0x82
},
.................
}
--------------------------------------------
The page orders for above folios:
0xffffea0061d21000 --> order 2
0xffffea0121d85c00 --> order 2
0xffffea0121d9f400 --> order 3
0xffffea0121583800 --> order 3
0xffffea0121833e00 --> order 3
0xffffea0121eb3800 --> order 5
2.) when height is not 1, the real data layout may looks like this:
--------------------------------------------
slot: { 0xffff8a2c866b745a, 0xffff8a2c866b16d2, 0xfffff9fcc4ea4000,
0xfffff9fcc4eb9000, ..}
--------------------------------------------
The 0xffff8a2c866b745a and 0xffff8a2c866b16d2 is a internal node, not a folio.
The page orders for above folios:
0xfffff9fcc4ea4000 --> order 6
Current code does not work correctly with large folio page cache.
This patch adds the large folio support with following:
1.) changed the do_xarray_iter() to detect the order of a folio,
and skip the proper dummy slots for a large folio.
2.) updated do_xarray_count/do_xarray_dump/do_xarray_dump_cb
with correct page number if we meet a large folio.
Signed-off-by: Huang Shijie <huangsj(a)hygon.cn>
---
filesys.c | 25 +++++++++++++++++++++----
tools.c | 16 +++++++++++++---
2 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/filesys.c b/filesys.c
index 2d3b272..f0ac1bb 100644
--- a/filesys.c
+++ b/filesys.c
@@ -4223,7 +4223,11 @@ static void do_xarray_count(ulong node, ulong slot, const char
*path,
ulong index, void *private)
{
struct do_xarray_info *info = private;
- info->count++;
+
+ if (info->type == XARRAY_TYPE_PAGE_CACHE)
+ info->count += 1 << folio_order(slot);
+ else
+ info->count++;
}
static void do_xarray_search(ulong node, ulong slot, const char *path,
ulong index, void *private)
@@ -4240,8 +4244,16 @@ static void do_xarray_dump(ulong node, ulong slot, const char
*path,
ulong index, void *private)
{
struct do_xarray_info *info = private;
- fprintf(fp, "[%ld] %lx\n", index, slot);
- info->count++;
+
+ if (info->type == XARRAY_TYPE_PAGE_CACHE) {
+ int order = folio_order(slot);
+
+ fprintf(fp, "[%ld] %lx, order:%d\n", index, slot, order);
+ info->count += 1 << order;
+ } else {
+ fprintf(fp, "[%ld] %lx\n", index, slot);
+ info->count++;
+ }
}
static void do_xarray_gather(ulong node, ulong slot, const char *path,
ulong index, void *private)
@@ -4275,7 +4287,12 @@ static void do_xarray_dump_cb(ulong node, ulong slot, const char
*path,
"operation failed: entry: %ld item: %lx\n",
info->count, slot);
}
- info->count++;
+
+ if (info->type == XARRAY_TYPE_PAGE_CACHE) {
+ info->count += 1 << folio_order(slot);
+ } else {
+ info->count++;
+ }
}
/*
diff --git a/tools.c b/tools.c
index 69250c4..6b51423 100644
--- a/tools.c
+++ b/tools.c
@@ -4737,15 +4737,19 @@ do_xarray_iter(ulong node, uint height, char *path,
ulong index, struct xarray_ops *ops)
{
uint off;
+ uint order, is_folio;
if (!hq_enter(node))
error(FATAL,
"\nduplicate tree node: %lx\n", node);
- for (off = 0; off < XA_CHUNK_SIZE; off++) {
+ for (off = 0; off < XA_CHUNK_SIZE; off += 1 << order) {
ulong slot;
ulong shift = (height - 1) * XA_CHUNK_SHIFT;
+ order = 0;
+ is_folio = 0;
+
readmem(node + OFFSET(xa_node_slots) +
sizeof(void *) * off, KVADDR, &slot, sizeof(void *),
"xa_node.slots[off]", FAULT_ON_ERROR);
@@ -4754,10 +4758,16 @@ do_xarray_iter(ulong node, uint height, char *path,
if ((slot & XARRAY_TAG_MASK) == XARRAY_TAG_INTERNAL)
slot &= ~XARRAY_TAG_INTERNAL;
+ else if ((slot & XARRAY_TAG_MASK) == 0) {
+ if (ops->type == XARRAY_TYPE_PAGE_CACHE)
+ is_folio = 1;
+ }
- if (height == 1)
+ if (height == 1 || is_folio) {
ops->entry(node, slot, path, index | off, ops->private);
- else {
+ if (ops->type == XARRAY_TYPE_PAGE_CACHE)
+ order = folio_order(slot) % XA_CHUNK_SHIFT;
+ } else {
ulong child_index = index | (off << shift);
char child_path[BUFSIZE];
sprintf(child_path, "%s/%d", path, off);
--
2.43.0
4:40 a.m.
New subject: [PATCH v4 4/4] add "files -n" command for an inode
In the NUMA machine, it is useful to know the memory distribution of
an inode page cache:
How many pages in the node 0?
How many pages in the node 1?
Add "files -n" command to get the memory distribution information:
1.) Add new argument for dump_inode_page_cache_info()
2.) make page_to_nid() a global function.
3.) Add summary_inode_page() to check each page's node
information.
4.) Use print_inode_summary_info() to print the
memory distribution information of an inode.
Signed-off-by: Huang Shijie <huangsj(a)hygon.cn>
---
defs.h | 1 +
filesys.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
help.c | 24 +++++++++++++++++++++-
memory.c | 4 ++--
4 files changed, 81 insertions(+), 8 deletions(-)
diff --git a/defs.h b/defs.h
index e832ea6..6abc359 100644
--- a/defs.h
+++ b/defs.h
@@ -5953,6 +5953,7 @@ int dump_inode_page(ulong);
ulong valid_section_nr(ulong);
void display_memory_from_file_offset(ulonglong, long, void *);
void swap_info_init(void);
+int page_to_nid(ulong);
/*
* filesys.c
diff --git a/filesys.c b/filesys.c
index f0ac1bb..430482d 100644
--- a/filesys.c
+++ b/filesys.c
@@ -49,7 +49,7 @@ static int match_file_string(char *, char *, char *);
static ulong get_root_vfsmount(char *);
static void check_live_arch_mismatch(void);
static long get_inode_nrpages(ulong);
-static void dump_inode_page_cache_info(ulong);
+static void dump_inode_page_cache_info(ulong, void *callback);
#define DENTRY_CACHE (20)
#define INODE_CACHE (20)
@@ -2240,8 +2240,38 @@ get_inode_nrpages(ulong i_mapping)
return nrpages;
}
+/* Used to collect the numa information for an inode */
+static ulong *numa_node;
+
static void
-dump_inode_page_cache_info(ulong inode)
+print_inode_summary_info(void)
+{
+ int i;
+
+ fprintf(fp, " NODE PAGES\n");
+ for (i = 0; i < vt->numnodes; i++)
+ fprintf(fp, " %2d %8ld\n", i, numa_node[i]);
+}
+
+static int
+summary_inode_page(ulong page)
+{
+ int node;
+
+ if (!is_page_ptr(page, NULL))
+ error(FATAL, "Invalid inode page(0x%lx)\n", page);
+
+ node = page_to_nid(page);
+ if (node < 0 || node >= vt->numnodes)
+ error(FATAL, "Invalid node(%d) for page(0x%lx)\n", node, page);
+
+ numa_node[node] += 1 << folio_order(page);
+
+ return 1;
+}
+
+static void
+dump_inode_page_cache_info(ulong inode, void *callback)
{
char *inode_buf;
ulong i_mapping, nrpages, root_rnode, xarray, count;
@@ -2284,7 +2314,7 @@ dump_inode_page_cache_info(ulong inode)
root_rnode = i_mapping + OFFSET(address_space_page_tree);
lp.index = 0;
- lp.value = (void *)&dump_inode_page;
+ lp.value = callback;
if (root_rnode)
count = do_radix_tree(root_rnode, RADIX_TREE_DUMP_CB, &lp);
@@ -2324,7 +2354,7 @@ cmd_files(void)
ref = NULL;
refarg = NULL;
- while ((c = getopt(argcnt, args, "d:R:p:c")) != EOF) {
+ while ((c = getopt(argcnt, args, "d:n:R:p:c")) != EOF) {
switch(c)
{
case 'R':
@@ -2343,11 +2373,31 @@ cmd_files(void)
display_dentry_info(value);
return;
+ case 'n':
+ if (VALID_MEMBER(address_space_page_tree) &&
+ VALID_MEMBER(inode_i_mapping)) {
+ value = htol(optarg, FAULT_ON_ERROR, NULL);
+
+ /* Allocate the array for this inode */
+ numa_node = malloc(sizeof(ulong) * vt->numnodes);
+ BZERO(numa_node, sizeof(ulong) * vt->numnodes);
+
+ dump_inode_page_cache_info(value, (void
*)&summary_inode_page);
+
+ /* Print out the NUMA node information for this inode */
+ print_inode_summary_info();
+
+ free(numa_node);
+ numa_node = NULL;
+ } else
+ option_not_supported('n');
+ return;
+
case 'p':
if (VALID_MEMBER(address_space_page_tree) &&
VALID_MEMBER(inode_i_mapping)) {
value = htol(optarg, FAULT_ON_ERROR, NULL);
- dump_inode_page_cache_info(value);
+ dump_inode_page_cache_info(value, (void *)&dump_inode_page);
} else
option_not_supported('p');
return;
diff --git a/help.c b/help.c
index 91d1550..6f97289 100644
--- a/help.c
+++ b/help.c
@@ -7900,7 +7900,7 @@ NULL
char *help_files[] = {
"files",
"open files",
-"[-d dentry] | [-p inode] | [-c] [-R reference] [pid | taskp] ... ",
+"[-d dentry] | [-p inode] | [-n inode]|[-c] [-R reference] [pid | taskp] ...
",
" This command displays information about open files of a context.",
" It prints the context's current root directory and current working",
" directory, and then for each open file descriptor it prints a pointer",
@@ -7915,6 +7915,8 @@ char *help_files[] = {
" super block, file type, and full pathname.",
" -p inode given a hexadecimal inode address, dump all of its pages",
" that are in the page cache.",
+" -n inode given a hexadecimal inode address, check all the pages",
+" in the page cache, and display a NUMA node distribution.",
" -c for each open file descriptor, prints a pointer to its",
" inode, a pointer to the inode's i_mapping address_space",
" structure, the number of pages of the inode that are in",
@@ -8024,6 +8026,26 @@ char *help_files[] = {
" ca1ddde0 2eeef000 f59b91ac 3 2 82c
referenced,uptodate,lru,private",
" ca36b300 3b598000 f59b91ac 4 2 82c
referenced,uptodate,lru,private",
" ca202680 30134000 f59b91ac 5 2 82c
referenced,uptodate,lru,private",
+" ",
+" For the inode at address ffff8898857c55a8, display the NUMA node",
+" distribution of its pages that are in the page cache:",
+" %s> files -n ffff8898857c55a8",
+" INODE NRPAGES",
+" ffff8898857c55a8 51748",
+" ",
+" NODE PAGES",
+" 0 51536",
+" 1 0",
+" 2 0",
+" 3 0",
+" 4 0",
+" 5 212",
+" 6 0",
+" 7 0",
+" 8 0",
+" 9 0",
+" 10 0",
+" 11 0",
" ",
NULL
};
diff --git a/memory.c b/memory.c
index 3b272ad..a8da5b1 100644
--- a/memory.c
+++ b/memory.c
@@ -301,7 +301,7 @@ static int dump_vm_event_state(void);
static int dump_page_states(void);
static int generic_read_dumpfile(ulonglong, void *, long, char *, ulong);
static int generic_write_dumpfile(ulonglong, void *, long, char *, ulong);
-static int page_to_nid(ulong);
+int page_to_nid(ulong);
static int get_kmem_cache_list(ulong **);
static int get_kmem_cache_root_list(ulong **);
static int get_kmem_cache_child_list(ulong **, ulong);
@@ -20065,7 +20065,7 @@ is_kmem_cache_addr_common(ulong vaddr, char *kbuf)
/*
* Kernel-config-neutral page-to-node evaluator.
*/
-static int
+int
page_to_nid(ulong page)
{
int i;
--
2.43.0
10:19 p.m.
New subject: [PATCH v4 0/4] xarray: add large folio support
Hi, Shijie
Thank you for the update.
I can not apply your patch and get an error:
# git apply v4-1.patch
error: patch failed: ipcs.c:1150
error: ipcs.c: patch does not apply
And it seems to have some patch conflicts, would you mind double checking?
That is very helpful for our review and testing.
Thanks
Lianbo
On Fri, Mar 6, 2026 at 6:41 PM Huang Shijie <huangsj(a)hygon.cn> wrote:
The linux kernel supports the large folio for page cache by default.
But the current CRASH does not support the large folio.
So we may meet the errors when we detected the large folio sometimes,
such as in the email:
https://www.spinics.net/linux/fedora/redhat-crash-utility/msg11238.html
------------------------------
files: page_to_nid: invalid page: 0
files: page_to_nid: invalid page: 0
files: page_to_nid: invalid page: 0
files: page_to_nid: invalid page: 10
files: page_to_nid: invalid page: 10
files: page_to_nid: invalid page: 10
files: page_to_nid: invalid page: 20
files: page_to_nid: invalid page: 20
files: page_to_nid: invalid page: 20
files: page_to_nid: invalid page: 30
files: page_to_nid: invalid page: 30
files: page_to_nid: invalid page: 30
files: page_to_nid: invalid page: 40
files: page_to_nid: invalid page: 40
files: page_to_nid: invalid page: 40
files: page_to_nid: invalid page: 50
files: page_to_nid: invalid page: 50
files: page_to_nid: invalid page: 50
files: page_to_nid: invalid page: 60
files: page_to_nid: invalid page: 60
------------------------------
The first 3 patches are used to add large folio support for CRASH.
The last patch is newly version of an old patch:
it add "files -n" command.
v3->>v4:
Fixes the BPF bug by:
1.) patch 1: Add a new type for do_xarray_info
2.) patch 3: Check XARRAY_TYPE_PAGE_CACHE for
do_xarray_count()/do_xarray_dump()/do_xarray_dump_cb()
v2-->v3:
Rewrited the folio_order() in patch 2 to work with different
kernel versions.
v1-->v2:
1.) Rebase the kernel to later 7.0-rc1(merge window)
2.) Fixed a bug in the patch 3, the latest kernel supports folios
whose page order is bigger then 5:
"xarray: add large folio support"
Huang Shijie (4):
xarray: add a new parameter for do_xarray
add folio_order function
xarray: add large folio support
add "files -n" command for an inode
bpf.c | 8 ++---
defs.h | 14 +++++++-
dev.c | 4 +--
diskdump.c | 10 ++++--
filesys.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++-------
help.c | 24 +++++++++++++-
ipcs.c | 4 +--
kernel.c | 4 +--
memory.c | 74 ++++++++++++++++++++++++++++++++++++++++--
symbols.c | 6 ++++
task.c | 4 +--
tools.c | 16 ++++++++--
12 files changed, 230 insertions(+), 32 deletions(-)
--
2.43.0
10:28 p.m.
New subject: [PATCH v4 0/4] xarray: add large folio support
On Wed, Mar 18, 2026 at 11:19:09AM +0800, lijiang wrote:
Hi, Shijie
Thank you for the update.
I can not apply your patch and get an error:
# git apply v4-1.patch
error: patch failed: ipcs.c:1150
error: ipcs.c: patch does not apply
And it seems to have some patch conflicts, would you mind double checking?
That is very helpful for our review and testing.
I also met the same issue when I
apply the patch with the latest crash code.
It seems it caused by the file format by ipcs.c
Could you please try like this:
#git apply --reject xx.patch
#git add -u
#git am --continue
Thanks
Huang Shijie
Thanks
Lianbo
On Fri, Mar 6, 2026 at 6:41 PM Huang Shijie <huangsj(a)hygon.cn> wrote:
> The linux kernel supports the large folio for page cache by default.
> But the current CRASH does not support the large folio.
> So we may meet the errors when we detected the large folio sometimes,
> such as in the email:
> https://www.spinics.net/linux/fedora/redhat-crash-utility/msg11238.html
> ------------------------------
> files: page_to_nid: invalid page: 0
> files: page_to_nid: invalid page: 0
> files: page_to_nid: invalid page: 0
> files: page_to_nid: invalid page: 10
> files: page_to_nid: invalid page: 10
> files: page_to_nid: invalid page: 10
> files: page_to_nid: invalid page: 20
> files: page_to_nid: invalid page: 20
> files: page_to_nid: invalid page: 20
> files: page_to_nid: invalid page: 30
> files: page_to_nid: invalid page: 30
> files: page_to_nid: invalid page: 30
> files: page_to_nid: invalid page: 40
> files: page_to_nid: invalid page: 40
> files: page_to_nid: invalid page: 40
> files: page_to_nid: invalid page: 50
> files: page_to_nid: invalid page: 50
> files: page_to_nid: invalid page: 50
> files: page_to_nid: invalid page: 60
> files: page_to_nid: invalid page: 60
> ------------------------------
>
> The first 3 patches are used to add large folio support for CRASH.
> The last patch is newly version of an old patch:
> it add "files -n" command.
>
> v3->>v4:
> Fixes the BPF bug by:
> 1.) patch 1: Add a new type for do_xarray_info
> 2.) patch 3: Check XARRAY_TYPE_PAGE_CACHE for
> do_xarray_count()/do_xarray_dump()/do_xarray_dump_cb()
>
> v2-->v3:
> Rewrited the folio_order() in patch 2 to work with different
> kernel versions.
>
> v1-->v2:
> 1.) Rebase the kernel to later 7.0-rc1(merge window)
> 2.) Fixed a bug in the patch 3, the latest kernel supports folios
> whose page order is bigger then 5:
> "xarray: add large folio support"
>
>
> Huang Shijie (4):
> xarray: add a new parameter for do_xarray
> add folio_order function
> xarray: add large folio support
> add "files -n" command for an inode
>
> bpf.c | 8 ++---
> defs.h | 14 +++++++-
> dev.c | 4 +--
> diskdump.c | 10 ++++--
> filesys.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++-------
> help.c | 24 +++++++++++++-
> ipcs.c | 4 +--
> kernel.c | 4 +--
> memory.c | 74 ++++++++++++++++++++++++++++++++++++++++--
> symbols.c | 6 ++++
> task.c | 4 +--
> tools.c | 16 ++++++++--
> 12 files changed, 230 insertions(+), 32 deletions(-)
>
> --
> 2.43.0
>
>
>
10:34 p.m.
New subject: [PATCH v4 0/4] xarray: add large folio support
On Wed, Mar 18, 2026 at 11:28:49AM +0800, Huang Shijie wrote:
On Wed, Mar 18, 2026 at 11:19:09AM +0800, lijiang wrote:
> Hi, Shijie
> Thank you for the update.
>
> I can not apply your patch and get an error:
> # git apply v4-1.patch
> error: patch failed: ipcs.c:1150
> error: ipcs.c: patch does not apply
>
> And it seems to have some patch conflicts, would you mind double checking?
> That is very helpful for our review and testing.
I also met the same issue when I apply the patch with the latest crash code.
It seems it caused by the file format by ipcs.c
Could you please try like this:
I missed one command here:
#git am xx.patch
#git apply --reject xx.patch
#git add -u
#git am --continue
Thanks
Huang Shijie
2:34 a.m.
New subject: [PATCH v4 0/4] xarray: add large folio support
On Wed, Mar 18, 2026 at 11:35 AM Huang Shijie <huangsj(a)hygon.cn> wrote:
On Wed, Mar 18, 2026 at 11:28:49AM +0800, Huang Shijie wrote:
> On Wed, Mar 18, 2026 at 11:19:09AM +0800, lijiang wrote:
> > Hi, Shijie
> > Thank you for the update.
> >
> > I can not apply your patch and get an error:
> > # git apply v4-1.patch
> > error: patch failed: ipcs.c:1150
> > error: ipcs.c: patch does not apply
> >
> > And it seems to have some patch conflicts, would you mind double
checking?
> > That is very helpful for our review and testing.
> I also met the same issue when I apply the patch with the latest crash
code.
> It seems it caused by the file format by ipcs.c
>
> Could you please try like this:
I missed one command here:
#git am xx.patch
> #git apply --reject xx.patch
> #git add -u
> #git am --continue
>
It still doesn't work for me. And I got a .rej patch, still need to modify
them manually.
Lianbo.
Thanks
Huang Shijie
2:57 a.m.
New subject: [PATCH v4 0/4] xarray: add large folio support
On Wed, Mar 18, 2026 at 03:34:00PM +0800, lijiang wrote:
On Wed, Mar 18, 2026 at 11:35 AM Huang Shijie
<huangsj(a)hygon.cn> wrote:
> On Wed, Mar 18, 2026 at 11:28:49AM +0800, Huang Shijie wrote:
> > On Wed, Mar 18, 2026 at 11:19:09AM +0800, lijiang wrote:
> > > Hi, Shijie
> > > Thank you for the update.
> > >
> > > I can not apply your patch and get an error:
> > > # git apply v4-1.patch
> > > error: patch failed: ipcs.c:1150
> > > error: ipcs.c: patch does not apply
> > >
> > > And it seems to have some patch conflicts, would you mind double
> checking?
> > > That is very helpful for our review and testing.
> > I also met the same issue when I apply the patch with the latest crash
> code.
> > It seems it caused by the file format by ipcs.c
> >
> > Could you please try like this:
> I missed one command here:
> #git am xx.patch
> > #git apply --reject xx.patch
> > #git add -u
> > #git am --continue
> >
>
>
It still doesn't work for me. And I got a .rej patch, still need to modify
them manually.
I guess the .rej patch is left by previous operations.
So you`d better to use "git clean -xdf" before you do the "git-am".
The following is my working log :
------------------------------------------------------
huangsj@SH-HV00110:~/crash-2$ git log --oneline -1
95c1b0a (HEAD -> master, origin/master, origin/HEAD) Fix for "help -r/-D" to
display register values and notes[]
huangsj@SH-HV00110:~/crash-2$ git am 0001-xarray-add-a-new-parameter-for-do_xarray.patch
Applying: xarray: add a new parameter for do_xarray
error: patch failed: ipcs.c:1150
error: ipcs.c: patch does not apply
Patch failed at 0001 xarray: add a new parameter for do_xarray
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
huangsj@SH-HV00110:~/crash-2$ git apply --reject
0001-xarray-add-a-new-parameter-for-do_xarray.patch
Checking patch bpf.c...
Checking patch defs.h...
Checking patch dev.c...
Checking patch diskdump.c...
Checking patch filesys.c...
Checking patch ipcs.c...
Checking patch kernel.c...
Checking patch task.c...
Applied patch bpf.c cleanly.
Applied patch defs.h cleanly.
Applied patch dev.c cleanly.
Applied patch diskdump.c cleanly.
Applied patch filesys.c cleanly.
Applied patch ipcs.c cleanly.
Applied patch kernel.c cleanly.
Applied patch task.c cleanly.
huangsj@SH-HV00110:~/crash-2$ git add -u
huangsj@SH-HV00110:~/crash-2$ git am --continue
Applying: xarray: add a new parameter for do_xarray
------------------------------------------------------
I do not see any .rej patch.
Thanks
Huang Shijie
3:17 a.m.
New subject: [PATCH v4 0/4] xarray: add large folio support
Hi Lianbo,
On Wed, Mar 18, 2026 at 03:57:18PM +0800, Huang Shijie wrote:
On Wed, Mar 18, 2026 at 03:34:00PM +0800, lijiang wrote:
> On Wed, Mar 18, 2026 at 11:35 AM Huang Shijie <huangsj(a)hygon.cn> wrote:
>
> > On Wed, Mar 18, 2026 at 11:28:49AM +0800, Huang Shijie wrote:
> > > On Wed, Mar 18, 2026 at 11:19:09AM +0800, lijiang wrote:
> > > > Hi, Shijie
> > > > Thank you for the update.
> > > >
> > > > I can not apply your patch and get an error:
> > > > # git apply v4-1.patch
> > > > error: patch failed: ipcs.c:1150
> > > > error: ipcs.c: patch does not apply
> > > >
> > > > And it seems to have some patch conflicts, would you mind double
> > checking?
> > > > That is very helpful for our review and testing.
> > > I also met the same issue when I apply the patch with the latest crash
> > code.
> > > It seems it caused by the file format by ipcs.c
> > >
> > > Could you please try like this:
> > I missed one command here:
> > #git am xx.patch
> > > #git apply --reject xx.patch
> > > #git add -u
> > > #git am --continue
> > >
> >
> >
> It still doesn't work for me. And I got a .rej patch, still need to modify
> them manually.
I guess the .rej patch is left by previous operations.
So you`d better to use "git clean -xdf" before you do the "git-am".
The following is my working log :
------------------------------------------------------
huangsj@SH-HV00110:~/crash-2$ git log --oneline -1
95c1b0a (HEAD -> master, origin/master, origin/HEAD) Fix for "help -r/-D"
to display register values and notes[]
huangsj@SH-HV00110:~/crash-2$ git am 0001-xarray-add-a-new-parameter-for-do_xarray.patch
Applying: xarray: add a new parameter for do_xarray
error: patch failed: ipcs.c:1150
error: ipcs.c: patch does not apply
Patch failed at 0001 xarray: add a new parameter for do_xarray
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
huangsj@SH-HV00110:~/crash-2$ git apply --reject
0001-xarray-add-a-new-parameter-for-do_xarray.patch
Checking patch bpf.c...
Checking patch defs.h...
Checking patch dev.c...
Checking patch diskdump.c...
Checking patch filesys.c...
Checking patch ipcs.c...
Checking patch kernel.c...
Checking patch task.c...
Applied patch bpf.c cleanly.
Applied patch defs.h cleanly.
Applied patch dev.c cleanly.
Applied patch diskdump.c cleanly.
Applied patch filesys.c cleanly.
Applied patch ipcs.c cleanly.
Applied patch kernel.c cleanly.
Applied patch task.c cleanly.
huangsj@SH-HV00110:~/crash-2$ git add -u
huangsj@SH-HV00110:~/crash-2$ git am --continue
Applying: xarray: add a new parameter for do_xarray
------------------------------------------------------
I do not see any .rej patch.
If you still cannot fix this issue, please let me
know.
I can create a patch to convert the ipcs.c to unix format by "dos2unit"
and rebase the whole patch set again.
Thanks
Huang Shijie
3:41 a.m.
New subject: [PATCH v4 0/4] xarray: add large folio support
On 3/18/26 4:17 PM, Huang Shijie wrote:
> I guess the .rej patch is left by previous operations.
> So you`d better to use "git clean -xdf" before you do the
"git-am".
>
> The following is my working log :
> ------------------------------------------------------
>
> huangsj@SH-HV00110:~/crash-2$ git log --oneline -1
> 95c1b0a (HEAD -> master, origin/master, origin/HEAD) Fix for "help
-r/-D" to display register values and notes[]
>
> huangsj@SH-HV00110:~/crash-2$ git am
0001-xarray-add-a-new-parameter-for-do_xarray.patch
> Applying: xarray: add a new parameter for do_xarray
> error: patch failed: ipcs.c:1150
> error: ipcs.c: patch does not apply
> Patch failed at 0001 xarray: add a new parameter for do_xarray
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> huangsj@SH-HV00110:~/crash-2$ git apply --reject
0001-xarray-add-a-new-parameter-for-do_xarray.patch
> Checking patch bpf.c...
> Checking patch defs.h...
> Checking patch dev.c...
> Checking patch diskdump.c...
> Checking patch filesys.c...
> Checking patch ipcs.c...
> Checking patch kernel.c...
> Checking patch task.c...
> Applied patch bpf.c cleanly.
> Applied patch defs.h cleanly.
> Applied patch dev.c cleanly.
> Applied patch diskdump.c cleanly.
> Applied patch filesys.c cleanly.
> Applied patch ipcs.c cleanly.
> Applied patch kernel.c cleanly.
> Applied patch task.c cleanly.
>
> huangsj@SH-HV00110:~/crash-2$ git add -u
>
> huangsj@SH-HV00110:~/crash-2$ git am --continue
> Applying: xarray: add a new parameter for do_xarray
> ------------------------------------------------------
>
> I do not see any .rej patch.
If you still cannot fix this issue, please let me know.
I can create a patch to convert the ipcs.c to unix format by "dos2unit"
and rebase the whole patch set again.
Yes, please.
Here is my log:
[root@xx crash]# git status
On branch master
Your branch is up to date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
1.patch
v4-0.patch
v4-1.patch
v4-2.patch
v4-3.patch
v4-4.patch
nothing added to commit but untracked files present (use "git add" to track)
[root@xx crash]# git am v4-1.patch
Applying: xarray: add a new parameter for do_xarray
error: patch failed: ipcs.c:1150
error: ipcs.c: patch does not apply
Patch failed at 0001 xarray: add a new parameter for do_xarray
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am
--abort".
hint: Disable this message with "git config set advice.mergeConflict false"
[root@xx crash]# git apply --reject v4-1.patch
Checking patch bpf.c...
Checking patch defs.h...
Checking patch dev.c...
Checking patch diskdump.c...
Checking patch filesys.c...
Checking patch ipcs.c...
error: while searching for:
{
long len;
ipcs_table.cnt = do_xarray(ipcs_idr_p, XARRAY_COUNT, NULL);
if (ipcs_table.cnt) {
len = sizeof(struct list_pair) * (ipcs_table.cnt+1);
ipcs_table.lp = (struct list_pair *)GETBUF(len);
ipcs_table.lp[0].index = ipcs_table.cnt;
ipcs_table.cnt = do_xarray(ipcs_idr_p, XARRAY_GATHER,
ipcs_table.lp);
} else
ipcs_table.lp = NULL;
}
error: patch failed: ipcs.c:1150
Checking patch kernel.c...
Checking patch task.c...
Applied patch bpf.c cleanly.
Applied patch defs.h cleanly.
Applied patch dev.c cleanly.
Applied patch diskdump.c cleanly.
Applied patch filesys.c cleanly.
Applying patch ipcs.c with 1 reject...
Rejected hunk #1.
Applied patch kernel.c cleanly.
Applied patch task.c cleanly.
[root@xx crash]#
[root@xx crash]# git add -u
[root@xx crash]# git am --continue
Applying: xarray: add a new parameter for do_xarray
[root@xx crash]# git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
Untracked files:
(use "git add <file>..." to include in what will be committed)
1.patch
ipcs.c.rej
v4-0.patch
v4-1.patch
v4-2.patch
v4-3.patch
v4-4.patch
Lianbo
3:59 a.m.
New subject: [PATCH v4 0/4] xarray: add large folio support
On Wed, Mar 18, 2026 at 04:41:59PM +0800, Lianbo Jiang wrote:
On 3/18/26 4:17 PM, Huang Shijie wrote:
> > I guess the .rej patch is left by previous operations.
> > So you`d better to use "git clean -xdf" before you do the
"git-am".
> >
> > The following is my working log :
> > ------------------------------------------------------
> >
> > huangsj@SH-HV00110:~/crash-2$ git log --oneline -1
> > 95c1b0a (HEAD -> master, origin/master, origin/HEAD) Fix for "help
-r/-D" to display register values and notes[]
> >
> > huangsj@SH-HV00110:~/crash-2$ git am
0001-xarray-add-a-new-parameter-for-do_xarray.patch
> > Applying: xarray: add a new parameter for do_xarray
> > error: patch failed: ipcs.c:1150
> > error: ipcs.c: patch does not apply
> > Patch failed at 0001 xarray: add a new parameter for do_xarray
> > hint: Use 'git am --show-current-patch=diff' to see the failed patch
> > When you have resolved this problem, run "git am --continue".
> > If you prefer to skip this patch, run "git am --skip" instead.
> > To restore the original branch and stop patching, run "git am
--abort".
> >
> > huangsj@SH-HV00110:~/crash-2$ git apply --reject
0001-xarray-add-a-new-parameter-for-do_xarray.patch
> > Checking patch bpf.c...
> > Checking patch defs.h...
> > Checking patch dev.c...
> > Checking patch diskdump.c...
> > Checking patch filesys.c...
> > Checking patch ipcs.c...
> > Checking patch kernel.c...
> > Checking patch task.c...
> > Applied patch bpf.c cleanly.
> > Applied patch defs.h cleanly.
> > Applied patch dev.c cleanly.
> > Applied patch diskdump.c cleanly.
> > Applied patch filesys.c cleanly.
> > Applied patch ipcs.c cleanly.
> > Applied patch kernel.c cleanly.
> > Applied patch task.c cleanly.
> >
> > huangsj@SH-HV00110:~/crash-2$ git add -u
> >
> > huangsj@SH-HV00110:~/crash-2$ git am --continue
> > Applying: xarray: add a new parameter for do_xarray
> > ------------------------------------------------------
> >
> > I do not see any .rej patch.
> If you still cannot fix this issue, please let me know.
>
> I can create a patch to convert the ipcs.c to unix format by "dos2unit"
> and rebase the whole patch set again.
Yes, please.
Here is my log:
[root@xx crash]# git status
On branch master
Your branch is up to date with 'origin/master'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
1.patch
v4-0.patch
v4-1.patch
v4-2.patch
v4-3.patch
v4-4.patch
nothing added to commit but untracked files present (use "git add" to track)
[root@xx crash]# git am v4-1.patch
Applying: xarray: add a new parameter for do_xarray
error: patch failed: ipcs.c:1150
error: ipcs.c: patch does not apply
Patch failed at 0001 xarray: add a new parameter for do_xarray
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am
--abort".
hint: Disable this message with "git config set advice.mergeConflict false"
[root@xx crash]# git apply --reject v4-1.patch
Checking patch bpf.c...
Checking patch defs.h...
Checking patch dev.c...
Checking patch diskdump.c...
Checking patch filesys.c...
Checking patch ipcs.c...
error: while searching for:
{
long len;
ipcs_table.cnt = do_xarray(ipcs_idr_p, XARRAY_COUNT, NULL);
if (ipcs_table.cnt) {
len = sizeof(struct list_pair) * (ipcs_table.cnt+1);
ipcs_table.lp = (struct list_pair *)GETBUF(len);
ipcs_table.lp[0].index = ipcs_table.cnt;
ipcs_table.cnt = do_xarray(ipcs_idr_p, XARRAY_GATHER,
ipcs_table.lp);
} else
ipcs_table.lp = NULL;
}
error: patch failed: ipcs.c:1150
Checking patch kernel.c...
Checking patch task.c...
Applied patch bpf.c cleanly.
Applied patch defs.h cleanly.
Applied patch dev.c cleanly.
Applied patch diskdump.c cleanly.
Applied patch filesys.c cleanly.
Applying patch ipcs.c with 1 reject...
Rejected hunk #1.
Applied patch kernel.c cleanly.
Applied patch task.c cleanly.
[root@xx crash]#
[root@xx crash]# git add -u
[root@xx crash]# git am --continue
Applying: xarray: add a new parameter for do_xarray
[root@xx crash]# git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
You have already succeeded to git-am the first patch.
Please git-am the v4-2.patch, v4-3.patch, v4-4.patch one by one.
It seems there is no need to create an extra patch by me :)
Thanks
Huang Shijie
Untracked files:
(use "git add <file>..." to include in what will be committed)
1.patch
ipcs.c.rej
v4-0.patch
v4-1.patch
v4-2.patch
v4-3.patch
v4-4.patch
Lianbo
7:11 a.m.
New subject: [PATCH v4 0/4] xarray: add large folio support
On Wed, Mar 18, 2026 at 4:59 PM Huang Shijie <huangsj(a)hygon.cn> wrote:
On Wed, Mar 18, 2026 at 04:41:59PM +0800, Lianbo Jiang wrote:
> On 3/18/26 4:17 PM, Huang Shijie wrote:
>
> > > I guess the .rej patch is left by previous operations.
> > > So you`d better to use "git clean -xdf" before you do the
"git-am".
> > >
> > > The following is my working log :
> > > ------------------------------------------------------
> > >
> > > huangsj@SH-HV00110:~/crash-2$ git log --oneline -1
> > > 95c1b0a (HEAD -> master, origin/master, origin/HEAD) Fix for
"help
-r/-D" to display register values and notes[]
> > >
> > > huangsj@SH-HV00110:~/crash-2$ git am
0001-xarray-add-a-new-parameter-for-do_xarray.patch
> > > Applying: xarray: add a new parameter for do_xarray
> > > error: patch failed: ipcs.c:1150
> > > error: ipcs.c: patch does not apply
> > > Patch failed at 0001 xarray: add a new parameter for do_xarray
> > > hint: Use 'git am --show-current-patch=diff' to see the failed
patch
> > > When you have resolved this problem, run "git am --continue".
> > > If you prefer to skip this patch, run "git am --skip"
instead.
> > > To restore the original branch and stop patching, run "git am
--abort".
> > >
> > > huangsj@SH-HV00110:~/crash-2$ git apply --reject
0001-xarray-add-a-new-parameter-for-do_xarray.patch
> > > Checking patch bpf.c...
> > > Checking patch defs.h...
> > > Checking patch dev.c...
> > > Checking patch diskdump.c...
> > > Checking patch filesys.c...
> > > Checking patch ipcs.c...
> > > Checking patch kernel.c...
> > > Checking patch task.c...
> > > Applied patch bpf.c cleanly.
> > > Applied patch defs.h cleanly.
> > > Applied patch dev.c cleanly.
> > > Applied patch diskdump.c cleanly.
> > > Applied patch filesys.c cleanly.
> > > Applied patch ipcs.c cleanly.
> > > Applied patch kernel.c cleanly.
> > > Applied patch task.c cleanly.
> > >
> > > huangsj@SH-HV00110:~/crash-2$ git add -u
> > >
> > > huangsj@SH-HV00110:~/crash-2$ git am --continue
> > > Applying: xarray: add a new parameter for do_xarray
> > > ------------------------------------------------------
> > >
> > > I do not see any .rej patch.
> > If you still cannot fix this issue, please let me know.
> >
> > I can create a patch to convert the ipcs.c to unix format by
"dos2unit"
> > and rebase the whole patch set again.
>
> Yes, please.
>
> Here is my log:
>
> [root@xx crash]# git status
> On branch master
> Your branch is up to date with 'origin/master'.
>
> Untracked files:
> (use "git add <file>..." to include in what will be committed)
> 1.patch
> v4-0.patch
> v4-1.patch
> v4-2.patch
> v4-3.patch
> v4-4.patch
>
> nothing added to commit but untracked files present (use "git add" to
track)
> [root@xx crash]# git am v4-1.patch
> Applying: xarray: add a new parameter for do_xarray
> error: patch failed: ipcs.c:1150
> error: ipcs.c: patch does not apply
> Patch failed at 0001 xarray: add a new parameter for do_xarray
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> hint: When you have resolved this problem, run "git am --continue".
> hint: If you prefer to skip this patch, run "git am --skip" instead.
> hint: To restore the original branch and stop patching, run "git am
> --abort".
> hint: Disable this message with "git config set advice.mergeConflict
false"
> [root@xx crash]# git apply --reject v4-1.patch
> Checking patch bpf.c...
> Checking patch defs.h...
> Checking patch dev.c...
> Checking patch diskdump.c...
> Checking patch filesys.c...
> Checking patch ipcs.c...
> error: while searching for:
> {
> long len;
>
> ipcs_table.cnt = do_xarray(ipcs_idr_p, XARRAY_COUNT, NULL);
>
> if (ipcs_table.cnt) {
> len = sizeof(struct list_pair) * (ipcs_table.cnt+1);
> ipcs_table.lp = (struct list_pair *)GETBUF(len);
> ipcs_table.lp[0].index = ipcs_table.cnt;
> ipcs_table.cnt = do_xarray(ipcs_idr_p, XARRAY_GATHER,
> ipcs_table.lp);
> } else
> ipcs_table.lp = NULL;
> }
>
> error: patch failed: ipcs.c:1150
> Checking patch kernel.c...
> Checking patch task.c...
> Applied patch bpf.c cleanly.
> Applied patch defs.h cleanly.
> Applied patch dev.c cleanly.
> Applied patch diskdump.c cleanly.
> Applied patch filesys.c cleanly.
> Applying patch ipcs.c with 1 reject...
> Rejected hunk #1.
> Applied patch kernel.c cleanly.
> Applied patch task.c cleanly.
> [root@xx crash]#
> [root@xx crash]# git add -u
> [root@xx crash]# git am --continue
> Applying: xarray: add a new parameter for do_xarray
> [root@xx crash]# git status
> On branch master
> Your branch is ahead of 'origin/master' by 1 commit.
> (use "git push" to publish your local commits)
You have already succeeded to git-am the first patch.
Please git-am the v4-2.patch, v4-3.patch, v4-4.patch one by one.
It seems there is no need to create an extra patch by me :)
No.
Thanks
Huang Shijie
>
> Untracked files:
> (use "git add <file>..." to include in what will be committed)
> 1.patch
> ipcs.c.rej
Here is the ipcs.c.rej, and this is not in the merged commit.
Lianbo
> v4-0.patch
> v4-1.patch
> v4-2.patch
> v4-3.patch
> v4-4.patch
>
> Lianbo
>
>
21
days inactive
33
days old
devel@lists.crash-utility.osci.io
14 comments
3 participants
participants (3)
-
Huang Shijie -
Lianbo Jiang -
lijiang