diff --git a/defs.h b/defs.h index a1746cc..c5d26ea 100644 --- a/defs.h +++ b/defs.h @@ -952,6 +952,9 @@ struct vaddr_range {
#define MAX_MACHDEP_ARGS 5 /* for --machdep/-m machine-specific args */
struct machdep_table { ulong flags; ulong kvbase; @@ -1719,6 +1722,11 @@ struct offset_table { /* stash of commonly-used offsets */ long vcpu_struct_rq; long task_struct_sched_info; long sched_info_last_arrival; + long task_struct_sched_entity; + long se_exec_start; + long page_objects; long kmem_cache_oo; long char_device_struct_cdev; @@ -4426,9 +4434,18 @@ extern long _ZOMBIE_; #define PS_BY_REGEX (0x8000) #define PS_NO_HEADER (0x10000) #define PS_MSECS (0x20000) +#if 1 +#define PS_EXEC_START (0x40000) +#define PS_SUMMARY (0x80000) +#else #define PS_SUMMARY (0x40000) +#endif
+#if 1 +#define PS_EXCLUSIVE (PS_TGID_LIST|PS_ARGV_ENVP|PS_TIMES|PS_CHILD_LIST|PS_PPID_LIST|PS_LAST_RUN|PS_EXEC_START|PS_RLIMIT|PS_MSECS|PS_SUMMARY) +#else #define PS_EXCLUSIVE (PS_TGID_LIST|PS_ARGV_ENVP|PS_TIMES|PS_CHILD_LIST|PS_PPID_LIST|PS_LAST_RUN|PS_RLIMIT|PS_MSECS|PS_SUMMARY) +#endif
#define MAX_PS_ARGS (100) /* maximum command-line specific requests */
@@ -5102,6 +5119,9 @@ ulong task_state(ulong); ulong task_mm(ulong, int); ulong task_tgid(ulong); ulonglong task_last_run(ulong); +#if 1 +ulonglong task_exec_start(ulong); +#endif ulong vaddr_in_task_struct(ulong); int comm_exists(char *); struct task_context *task_to_context(ulong); diff --git a/filesys.c b/filesys.c index 9b59998..68452f5 100644 --- a/filesys.c +++ b/filesys.c @@ -3671,7 +3671,7 @@ get_live_memory_source(void) sprintf(modname1, "%s.o", pc->memory_module); sprintf(modname2, "%s.ko", pc->memory_module); while (fgets(buf, BUFSIZE, pipe)) { - if (strstr(buf, "invalid option") && + if (strstr(buf, "invalid option: filesys.c 3674") && (uname(&utsname) == 0)) { sprintf(buf, "/lib/modules/%s/kernel/drivers/char/%s", diff --git a/main.c b/main.c index 821bb4e..3985448 100644 --- a/main.c +++ b/main.c @@ -408,7 +408,7 @@ main(int argc, char **argv) break;
default: - error(INFO, "invalid option: %s\n", + error(INFO, "main.c @411, invalid option: %s\n", argv[optind-1]); program_usage(SHORT_FORM); } diff --git a/memory.c b/memory.c index 216038d..0b97477 100644 --- a/memory.c +++ b/memory.c @@ -1756,9 +1756,11 @@ cmd_wr(void) long size; struct syment *sp;
+// Guillermo would like to update memory content. 11/22/2016 +#if 0 if (DUMPFILE()) error(FATAL, "not allowed on dumpfiles\n"); - +#endif memtype = 0; buf = NULL; addr = 0; diff --git a/symbols.c b/symbols.c index a8d3563..6d80834 100644 --- a/symbols.c +++ b/symbols.c @@ -8497,6 +8497,11 @@ dump_offset_table(char *spec, ulong makestruct) OFFSET(sched_rt_entity_run_list)); fprintf(fp, " sched_info_last_arrival: %ld\n", OFFSET(sched_info_last_arrival)); + error(INFO, "dump_offset_table: Initializing task_struct.se.exec_start\n"); + fprintf(fp, " se_exec_start: %ld\n", + OFFSET(se_exec_start)); fprintf(fp, " task_struct_thread_info: %ld\n", OFFSET(task_struct_thread_info)); fprintf(fp, " task_struct_nsproxy: %ld\n", @@ -12518,7 +12523,7 @@ OFFSET_verify(long offset, char *func, char *file, int line, char *item) if (offset < 0) { void *retaddr[NUMBER_STACKFRAMES] = { 0 }; SAVE_RETURN_ADDRESS(retaddr); - sprintf(errmsg, "invalid structure member offset: %s", + sprintf(errmsg, "Guillermo: invalid structure member offset: %s", item); datatype_error(retaddr, errmsg, func, file, line); } diff --git a/task.c b/task.c index b857cf6..ee3ac45 100644 --- a/task.c +++ b/task.c @@ -268,6 +268,23 @@ task_init(void) strcpy(buf, "alias last ps -l"); alias_init(buf); } + + MEMBER_OFFSET_INIT(task_struct_sched_entity, "task_struct", "se"); + error(INFO, "Guillermo: Initializing task_struct.se.exec_start\n"); + if (VALID_MEMBER(task_struct_sched_entity)) { + STRUCT_SIZE_INIT(sched_entity, "sched_entity"); + MEMBER_OFFSET_INIT(se_exec_start, "sched_entity", "exec_start"); + char buf[BUFSIZE]; + strcpy(buf, "alias last ps -e"); + + alias_init(buf); + if (VALID_MEMBER(se_exec_start)) { + error(INFO, "Guillermo:VALID task_struct.se.exec_start\n"); + } + } + MEMBER_OFFSET_INIT(pid_link_pid, "pid_link", "pid"); MEMBER_OFFSET_INIT(pid_hash_chain, "pid", "hash_chain");
@@ -2471,6 +2488,35 @@ sort_by_pid(const void *arg1, const void *arg2) t1->pid == t2->pid ? 0 : 1); }
+static int +sort_by_exec_start(const void *arg1, const void *arg2) +{ + ulong task_last_run_stamp(ulong); + struct task_context *t1, *t2; + ulonglong lr1, lr2; + + t1 = (struct task_context *)arg1; + t2 = (struct task_context *)arg2; + + lr1 = task_exec_start(t1->task); + lr2 = task_exec_start(t2->task); + + return (lr2 < lr1 ? -1 : + lr2 == lr1 ? 0 : 1); +} + +static void +sort_context_array_by_exec_start(void) +{ + ulong curtask; + + curtask = CURRENT_TASK(); + qsort((void *)tt->context_array, (size_t)tt->running_tasks, + sizeof(struct task_context), sort_by_exec_start); + set_context(curtask, NO_PID); +}
static int sort_by_last_run(const void *arg1, const void *arg2) @@ -2897,8 +2943,11 @@ cmd_ps(void) BZERO(&psinfo, sizeof(struct psinfo)); cpuspec = NULL; flag = 0; - +#if 1 + while ((c = getopt(argcnt, args, "SgstcpkuGlemarC:")) != EOF) { +#else while ((c = getopt(argcnt, args, "SgstcpkuGlmarC:")) != EOF) { +#endif switch(c) { case 'k': @@ -2978,7 +3027,18 @@ cmd_ps(void) check_ps_exclusive(flag, PS_LAST_RUN); flag |= PS_LAST_RUN; break; - + case 'e': + if (INVALID_MEMBER(se_exec_start)) { + error(INFO, + "exec_start timestamps do not exist in this kernel\n"); + argerrs++; + break; + } + check_ps_exclusive(flag, PS_EXEC_START); + flag |= PS_EXEC_START; + break; case 's': flag |= PS_KSTACKP; break; @@ -3010,6 +3070,12 @@ cmd_ps(void)
if (flag & (PS_LAST_RUN|PS_MSECS)) sort_context_array_by_last_run(); + else if (flag & PS_EXEC_START) { + error(INFO, "exec_start - task_struct.se.exec_start will be displayed at the time of order\n"); + sort_context_array_by_exec_start(); + } else if (psinfo.cpus) { error(INFO, "-C option is only applicable with -l and -m\n"); goto bailout; @@ -5299,6 +5365,26 @@ task_tgid(ulong task) return (ulong)tgid; }
+ulonglong +task_exec_start(ulong task) +{ + ulong exec_start; + ulonglong timestamp; + + timestamp = 0; + fill_task_struct(task); + + if (VALID_MEMBER(se_exec_start)) { + timestamp = tt->last_task_read ? ULONGLONG(tt->task_struct + + OFFSET(task_struct_sched_entity) + + OFFSET(se_exec_start)) : 0; + } + + return timestamp; +} + ulonglong task_last_run(ulong task) {
| 