>From 6df681dd0fb65615547602f24fa39823053a8376 Mon Sep 17 00:00:00 2001 From: zhangyanfei Date: Thu, 30 Aug 2012 10:01:36 +0800 Subject: [PATCH] Fix rt not support group sched bug Signed-off-by: zhangyanfei --- defs.h | 2 ++ symbols.c | 4 ++++ task.c | 49 +++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 45 insertions(+), 10 deletions(-) diff --git a/defs.h b/defs.h index 4a8e2e3..4af670d 100755 --- a/defs.h +++ b/defs.h @@ -1785,6 +1785,7 @@ struct offset_table { /* stash of commonly-used offsets */ long log_level; long log_flags_level; long timekeeper_xtime_sec; + long sched_rt_entity_my_q; }; struct size_table { /* stash of commonly-used sizes */ @@ -1919,6 +1920,7 @@ struct size_table { /* stash of commonly-used sizes */ long msg_queue; long log; long log_level; + long rt_rq; }; struct array_table { diff --git a/symbols.c b/symbols.c index 2646ff8..bbadd5e 100755 --- a/symbols.c +++ b/symbols.c @@ -8812,6 +8812,8 @@ dump_offset_table(char *spec, ulong makestruct) OFFSET(log_level)); fprintf(fp, " log_flags_level: %ld\n", OFFSET(log_flags_level)); + fprintf(fp, " sched_rt_entity_my_q: %ld\n", + OFFSET(sched_rt_entity_my_q)); fprintf(fp, "\n size_table:\n"); fprintf(fp, " page: %ld\n", SIZE(page)); @@ -9027,6 +9029,8 @@ dump_offset_table(char *spec, ulong makestruct) SIZE(log)); fprintf(fp, " log_level: %ld\n", SIZE(log_level)); + fprintf(fp, " rt_rq: %ld\n", + SIZE(rt_rq)); fprintf(fp, "\n array_table:\n"); /* diff --git a/task.c b/task.c index 6e4cfec..5b04e99 100755 --- a/task.c +++ b/task.c @@ -67,7 +67,7 @@ static void dump_task_runq_entry(struct task_context *); static int dump_tasks_in_cfs_rq(ulong); static void dump_on_rq_tasks(void); static void dump_CFS_runqueues(void); -static void dump_RT_prio_array(ulong, char *); +static void dump_RT_prio_array(int, ulong, char *); static void task_struct_member(struct task_context *,unsigned int, struct reference *); static void signal_reference(struct task_context *, ulong, struct reference *); static void do_sig_thread_group(ulong); @@ -7552,6 +7552,7 @@ dump_CFS_runqueues(void) if (!VALID_STRUCT(cfs_rq)) { STRUCT_SIZE_INIT(cfs_rq, "cfs_rq"); + STRUCT_SIZE_INIT(rt_rq, "rt_rq"); MEMBER_OFFSET_INIT(rq_rt, "rq", "rt"); MEMBER_OFFSET_INIT(rq_nr_running, "rq", "nr_running"); MEMBER_OFFSET_INIT(task_struct_se, "task_struct", "se"); @@ -7562,6 +7563,8 @@ dump_CFS_runqueues(void) "cfs_rq"); MEMBER_OFFSET_INIT(sched_entity_my_q, "sched_entity", "my_q"); + MEMBER_OFFSET_INIT(sched_rt_entity_my_q, "sched_rt_entity", + "my_q"); MEMBER_OFFSET_INIT(sched_entity_on_rq, "sched_entity", "on_rq"); MEMBER_OFFSET_INIT(cfs_rq_rb_leftmost, "cfs_rq", "rb_leftmost"); MEMBER_OFFSET_INIT(cfs_rq_nr_running, "cfs_rq", "nr_running"); @@ -7629,7 +7632,7 @@ dump_CFS_runqueues(void) OFFSET(cfs_rq_tasks_timeline)); } - dump_RT_prio_array(runq + OFFSET(rq_rt) + OFFSET(rt_rq_active), + dump_RT_prio_array(0, runq + OFFSET(rq_rt) + OFFSET(rt_rq_active), &runqbuf[OFFSET(rq_rt) + OFFSET(rt_rq_active)]); fprintf(fp, " CFS RB_ROOT: %lx\n", (ulong)root); @@ -7649,7 +7652,7 @@ dump_CFS_runqueues(void) } static void -dump_RT_prio_array(ulong k_prio_array, char *u_prio_array) +dump_RT_prio_array(int depth, ulong k_prio_array, char *u_prio_array) { int i, c, tot, cnt, qheads; ulong offset, kvaddr, uvaddr; @@ -7657,8 +7660,11 @@ dump_RT_prio_array(ulong k_prio_array, char *u_prio_array) struct list_data list_data, *ld; struct task_context *tc; ulong *tlist; + ulong my_q, task_addr; + char *rt_rq_buf; - fprintf(fp, " RT PRIO_ARRAY: %lx\n", k_prio_array); + if (!depth) + fprintf(fp, " RT PRIO_ARRAY: %lx\n", k_prio_array); qheads = (i = ARRAY_LENGTH(rt_prio_array_queue)) ? i : get_array_length("rt_prio_array.queue", NULL, SIZE(list_head)); @@ -7678,14 +7684,14 @@ dump_RT_prio_array(ulong k_prio_array, char *u_prio_array) if ((list_head[0] == kvaddr) && (list_head[1] == kvaddr)) continue; - fprintf(fp, " [%3d] ", i); + INDENT(5 + 8 * depth); + fprintf(fp, "[%3d] ", i); BZERO(ld, sizeof(struct list_data)); ld->start = list_head[0]; if (VALID_MEMBER(task_struct_rt) && VALID_MEMBER(sched_rt_entity_run_list)) - ld->list_head_offset = OFFSET(task_struct_rt) + - OFFSET(sched_rt_entity_run_list); + ld->list_head_offset = OFFSET(sched_rt_entity_run_list); else ld->list_head_offset = OFFSET(task_struct_run_list); ld->end = kvaddr; @@ -7695,10 +7701,33 @@ dump_RT_prio_array(ulong k_prio_array, char *u_prio_array) tlist = (ulong *)GETBUF((cnt) * sizeof(ulong)); cnt = retrieve_list(tlist, cnt); for (c = 0; c < cnt; c++) { - if (!(tc = task_to_context(tlist[c]))) + task_addr = tlist[c]; + if (VALID_MEMBER(sched_rt_entity_my_q)) { + readmem(tlist[c] + OFFSET(sched_rt_entity_my_q), + KVADDR, &my_q, sizeof(ulong), "my_q", + FAULT_ON_ERROR); + if (my_q) { + rt_rq_buf = GETBUF(SIZE(rt_rq)); + readmem(my_q, KVADDR, rt_rq_buf, + SIZE(rt_rq), "rt_rq", + FAULT_ON_ERROR); + if (c) + INDENT(11 + 8 * depth); + fprintf(fp, "GROUP RT PRIO_ARRAY: %lx\n", + my_q + OFFSET(rt_rq_active)); + tot++; + dump_RT_prio_array(depth + 1, + my_q + OFFSET(rt_rq_active), + &rt_rq_buf[OFFSET(rt_rq_active)]); + continue; + } else { + task_addr -= OFFSET(task_struct_rt); + } + } + if (!(tc = task_to_context(task_addr))) continue; if (c) - INDENT(11); + INDENT(11 + 8 * depth); fprintf(fp, "PID: %-5ld TASK: %lx COMMAND: \"%s\"\n", tc->pid, tc->task, tc->comm); tot++; @@ -7707,7 +7736,7 @@ dump_RT_prio_array(ulong k_prio_array, char *u_prio_array) } if (!tot) { - INDENT(5); + INDENT(5 + 8 * depth); fprintf(fp, "[no tasks queued]\n"); } } -- 1.7.1