|
 |
f27a4c |
From d6b4f36d6b22b70fb14e692f36d20910ef5563c1 Mon Sep 17 00:00:00 2001
|
|
|
f27a4c |
From: Alexander Egorenkov <egorenar@linux.ibm.com>
|
|
|
f27a4c |
Date: Tue, 29 Jun 2021 08:39:00 +0200
|
|
|
f27a4c |
Subject: [PATCH] Handle task_struct state member changes for kernels >=
|
|
|
f27a4c |
5.14-rc1
|
|
|
f27a4c |
|
|
|
f27a4c |
Kernel commit 2f064a59a11ff9bc22e52e9678bc601404c7cb34 ("sched: Change
|
|
|
f27a4c |
task_struct::state") renamed the member state of task_struct to __state
|
|
|
f27a4c |
and its type changed from long to unsigned int. Without the patch,
|
|
|
f27a4c |
crash fails to start up with the following error:
|
|
|
f27a4c |
|
|
|
f27a4c |
crash: invalid structure member offset: task_struct_state
|
|
|
f27a4c |
FILE: task.c LINE: 5929 FUNCTION: task_state()
|
|
|
f27a4c |
|
|
|
f27a4c |
Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
|
|
|
f27a4c |
---
|
|
|
f27a4c |
defs.h | 1 +
|
|
|
f27a4c |
symbols.c | 1 +
|
|
|
f27a4c |
task.c | 10 +++++++++-
|
|
|
f27a4c |
3 files changed, 11 insertions(+), 1 deletion(-)
|
|
|
f27a4c |
|
|
|
f27a4c |
diff --git a/defs.h b/defs.h
|
|
|
f27a4c |
index 6bb00e29d811..5d32954905c2 100644
|
|
|
f27a4c |
--- a/defs.h
|
|
|
f27a4c |
+++ b/defs.h
|
|
|
f27a4c |
@@ -2304,6 +2304,7 @@ struct size_table { /* stash of commonly-used sizes */
|
|
|
f27a4c |
long printk_ringbuffer;
|
|
|
f27a4c |
long prb_desc;
|
|
|
f27a4c |
long wait_queue_entry;
|
|
|
f27a4c |
+ long task_struct_state;
|
|
|
f27a4c |
};
|
|
|
f27a4c |
|
|
|
f27a4c |
struct array_table {
|
|
|
f27a4c |
diff --git a/symbols.c b/symbols.c
|
|
|
f27a4c |
index 67c135f12984..bf6d94db84af 100644
|
|
|
f27a4c |
--- a/symbols.c
|
|
|
f27a4c |
+++ b/symbols.c
|
|
|
f27a4c |
@@ -10678,6 +10678,7 @@ dump_offset_table(char *spec, ulong makestruct)
|
|
|
f27a4c |
SIZE(page_cache_bucket));
|
|
|
f27a4c |
fprintf(fp, " pt_regs: %ld\n", SIZE(pt_regs));
|
|
|
f27a4c |
fprintf(fp, " task_struct: %ld\n", SIZE(task_struct));
|
|
|
f27a4c |
+ fprintf(fp, " task_struct_state: %ld\n", SIZE(task_struct_state));
|
|
|
f27a4c |
fprintf(fp, " task_struct_flags: %ld\n", SIZE(task_struct_flags));
|
|
|
f27a4c |
fprintf(fp, " task_struct_policy: %ld\n", SIZE(task_struct_policy));
|
|
|
f27a4c |
fprintf(fp, " thread_info: %ld\n", SIZE(thread_info));
|
|
|
f27a4c |
diff --git a/task.c b/task.c
|
|
|
f27a4c |
index 36cf259e5d7b..672b41697e75 100644
|
|
|
f27a4c |
--- a/task.c
|
|
|
f27a4c |
+++ b/task.c
|
|
|
f27a4c |
@@ -297,6 +297,11 @@ task_init(void)
|
|
|
f27a4c |
}
|
|
|
f27a4c |
|
|
|
f27a4c |
MEMBER_OFFSET_INIT(task_struct_state, "task_struct", "state");
|
|
|
f27a4c |
+ MEMBER_SIZE_INIT(task_struct_state, "task_struct", "state");
|
|
|
f27a4c |
+ if (INVALID_MEMBER(task_struct_state)) {
|
|
|
f27a4c |
+ MEMBER_OFFSET_INIT(task_struct_state, "task_struct", "__state");
|
|
|
f27a4c |
+ MEMBER_SIZE_INIT(task_struct_state, "task_struct", "__state");
|
|
|
f27a4c |
+ }
|
|
|
f27a4c |
MEMBER_OFFSET_INIT(task_struct_exit_state, "task_struct", "exit_state");
|
|
|
f27a4c |
MEMBER_OFFSET_INIT(task_struct_pid, "task_struct", "pid");
|
|
|
f27a4c |
MEMBER_OFFSET_INIT(task_struct_comm, "task_struct", "comm");
|
|
|
f27a4c |
@@ -5926,7 +5931,10 @@ task_state(ulong task)
|
|
|
f27a4c |
if (!tt->last_task_read)
|
|
|
f27a4c |
return 0;
|
|
|
f27a4c |
|
|
|
f27a4c |
- state = ULONG(tt->task_struct + OFFSET(task_struct_state));
|
|
|
f27a4c |
+ if (SIZE(task_struct_state) == sizeof(ulong))
|
|
|
f27a4c |
+ state = ULONG(tt->task_struct + OFFSET(task_struct_state));
|
|
|
f27a4c |
+ else
|
|
|
f27a4c |
+ state = UINT(tt->task_struct + OFFSET(task_struct_state));
|
|
|
f27a4c |
exit_state = VALID_MEMBER(task_struct_exit_state) ?
|
|
|
f27a4c |
ULONG(tt->task_struct + OFFSET(task_struct_exit_state)) : 0;
|
|
|
f27a4c |
|
|
|
f27a4c |
--
|
|
|
f27a4c |
2.30.2
|
|
|
f27a4c |
|