gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mcexec: introduction of --profile

Browse Source
This commit is contained in:
Balazs Gerofi
2017-02-27 11:02:34 +09:00
parent dd6f721e03
commit e3e0f6a174
9 changed files with 60 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/include/syscall_list.h
View File

@ -150,8 +150,8 @@ SYSCALL_HANDLED(602, pmc_start)
SYSCALL_HANDLED(603, pmc_stop) SYSCALL_HANDLED(603, pmc_stop)
SYSCALL_HANDLED(604, pmc_reset) SYSCALL_HANDLED(604, pmc_reset)
SYSCALL_HANDLED(700, get_cpu_id) SYSCALL_HANDLED(700, get_cpu_id)
#ifdef TRACK_SYSCALLS #ifdef PROFILE_ENABLE
SYSCALL_HANDLED(__NR_track_syscalls, track_syscalls) SYSCALL_HANDLED(__NR_profile, profile)
#endif // TRACK_SYSCALLS #endif // PROFILE_ENABLE
/**** End of File ****/ /**** End of File ****/

1
executer/include/uprotocol.h
View File

@ -132,6 +132,7 @@ struct program_load_desc {
int nr_processes; int nr_processes;
char shell_path[SHELL_PATH_MAX_LEN]; char shell_path[SHELL_PATH_MAX_LEN];
__cpu_set_unit cpu_set[PLD_CPU_SET_SIZE]; __cpu_set_unit cpu_set[PLD_CPU_SET_SIZE];
int profile;
struct program_image_section sections[0]; struct program_image_section sections[0];
}; };

8
executer/user/mcexec.c
View File

@ -159,6 +159,7 @@ static int mpol_no_stack = 0;
static int mpol_no_bss = 0; static int mpol_no_bss = 0;
static int no_bind_ikc_map = 0; static int no_bind_ikc_map = 0;
static unsigned long mpol_threshold = 0; static unsigned long mpol_threshold = 0;
static int profile = 0;
/* Partitioned execution (e.g., for MPI) */ /* Partitioned execution (e.g., for MPI) */
static int nr_processes = 0; static int nr_processes = 0;
@ -1284,6 +1285,12 @@ static struct option mcexec_options[] = {
.flag = &enable_vdso, .flag = &enable_vdso,
.val = 1, .val = 1,
}, },
{
.name = "profile",
.has_arg = no_argument,
.flag = &profile,
.val = 1,
},
{ {
.name = "mpol-no-heap", .name = "mpol-no-heap",
.has_arg = no_argument, .has_arg = no_argument,
@ -1738,6 +1745,7 @@ int main(int argc, char **argv)
} }
} }
desc->profile = profile;
desc->nr_processes = nr_processes; desc->nr_processes = nr_processes;
desc->mpol_flags = 0; desc->mpol_flags = 0;
if (mpol_no_heap) { if (mpol_no_heap) {

4
kernel/host.c
View File

@ -431,6 +431,10 @@ static int process_msg_prepare_process(unsigned long rphys)
proc->mpol_flags = pn->mpol_flags; proc->mpol_flags = pn->mpol_flags;
proc->mpol_threshold = pn->mpol_threshold; proc->mpol_threshold = pn->mpol_threshold;
proc->nr_processes = pn->nr_processes; proc->nr_processes = pn->nr_processes;
#ifdef PROFILE_ENABLE
proc->profile = pn->profile;
thread->profile = pn->profile;
#endif
vm->region.user_start = pn->user_start; vm->region.user_start = pn->user_start;
vm->region.user_end = pn->user_end; vm->region.user_end = pn->user_end;

1
kernel/include/process.h
View File

@ -546,6 +546,7 @@ struct process {
#define PP_STOP 3 #define PP_STOP 3
struct mc_perf_event *monitoring_event; struct mc_perf_event *monitoring_event;
#ifdef PROFILE_ENABLE #ifdef PROFILE_ENABLE
int profile;
mcs_lock_node_t profile_lock; mcs_lock_node_t profile_lock;
struct profile_event *profile_events; struct profile_event *profile_events;
#endif // PROFILE_ENABLE #endif // PROFILE_ENABLE

1
kernel/include/syscall.h
View File

@ -197,6 +197,7 @@ struct program_load_desc {
int nr_processes; int nr_processes;
char shell_path[SHELL_PATH_MAX_LEN]; char shell_path[SHELL_PATH_MAX_LEN];
__cpu_set_unit cpu_set[PLD_CPU_SET_SIZE]; __cpu_set_unit cpu_set[PLD_CPU_SET_SIZE];
int profile;
struct program_image_section sections[0]; struct program_image_section sections[0];
}; };

7
kernel/process.c
View File

@ -414,6 +414,9 @@ clone_thread(struct thread *org, unsigned long pc, unsigned long sp,
goto err_free_proc; goto err_free_proc;
memset(proc, '\0', sizeof(struct process)); memset(proc, '\0', sizeof(struct process));
init_process(proc, org->proc); init_process(proc, org->proc);
#ifdef PROFILE_ENABLE
proc->profile = org->proc->profile;
#endif
proc->termsig = termsig; proc->termsig = termsig;
asp = create_address_space(cpu_local_var(resource_set), 1); asp = create_address_space(cpu_local_var(resource_set), 1);
@ -522,7 +525,7 @@ clone_thread(struct thread *org, unsigned long pc, unsigned long sp,
#endif #endif
#ifdef PROFILE_ENABLE #ifdef PROFILE_ENABLE
thread->profile = org->profile; thread->profile = org->profile | proc->profile;
#endif #endif
return thread; return thread;
@ -2218,12 +2221,14 @@ release_process(struct process *proc)
if (proc->tids) kfree(proc->tids); if (proc->tids) kfree(proc->tids);
#ifdef PROFILE_ENABLE #ifdef PROFILE_ENABLE
if (proc->profile) {
if (proc->nr_processes) { if (proc->nr_processes) {
profile_accumulate_and_print_job_events(proc); profile_accumulate_and_print_job_events(proc);
} }
else { else {
profile_print_proc_stats(proc); profile_print_proc_stats(proc);
} }
}
profile_dealloc_proc_events(proc); profile_dealloc_proc_events(proc);
#endif // PROFILE_ENABLE #endif // PROFILE_ENABLE
kfree(proc); kfree(proc);

40
kernel/profile.c
View File

@ -44,6 +44,17 @@ extern char *syscall_name[];
#ifdef PROFILE_ENABLE #ifdef PROFILE_ENABLE
//#define DEBUG_PRINT_PROFILE
#ifdef DEBUG_PRINT_PROFILE
#define dkprintf(...) kprintf(__VA_ARGS__)
#define ekprintf(...) kprintf(__VA_ARGS__)
#else
#define dkprintf(...) do { if (0) kprintf(__VA_ARGS__); } while (0)
#define ekprintf(...) kprintf(__VA_ARGS__)
#endif
char *profile_event_names[] = char *profile_event_names[] =
{ {
"page_fault", "page_fault",
@ -101,7 +112,7 @@ void profile_print_thread_stats(struct thread *thread)
!thread->profile_events[i + PROFILE_SYSCALL_MAX].cnt) !thread->profile_events[i + PROFILE_SYSCALL_MAX].cnt)
continue; continue;
__kprintf("TID: %4d (%3d,%20s): %6u %6lukC offl: %6u %6lukC\n", __kprintf("TID: %4d (%3d,%20s): %6u %6luk offl: %6u %6luk\n",
thread->tid, thread->tid,
i, i,
syscall_name[i], syscall_name[i],
@ -123,9 +134,8 @@ void profile_print_thread_stats(struct thread *thread)
if (!thread->profile_events[i].cnt) if (!thread->profile_events[i].cnt)
continue; continue;
__kprintf("TID: %4d (%3d,%20s): %6u %6lukC \n", __kprintf("TID: %4d (%24s): %6u %6luk \n",
thread->tid, thread->tid,
i,
profile_event_names[i - PROFILE_EVENT_MIN], profile_event_names[i - PROFILE_EVENT_MIN],
thread->profile_events[i].cnt, thread->profile_events[i].cnt,
(thread->profile_events[i].tsc / (thread->profile_events[i].tsc /
@ -152,7 +162,7 @@ void profile_print_proc_stats(struct process *proc)
!proc->profile_events[i + PROFILE_SYSCALL_MAX].cnt) !proc->profile_events[i + PROFILE_SYSCALL_MAX].cnt)
continue; continue;
__kprintf("PID: %4d (%3d,%20s): %6u %6lukC offl: %6u %6lukC\n", __kprintf("PID: %4d (%3d,%20s): %6u %6luk offl: %6u %6luk\n",
proc->pid, proc->pid,
i, i,
syscall_name[i], syscall_name[i],
@ -174,9 +184,8 @@ void profile_print_proc_stats(struct process *proc)
if (!proc->profile_events[i].cnt) if (!proc->profile_events[i].cnt)
continue; continue;
__kprintf("PID: %4d (%3d,%20s): %6u %6lukC \n", __kprintf("PID: %4d (%24s): %6u %6luk \n",
proc->pid, proc->pid,
i,
profile_event_names[i - PROFILE_EVENT_MIN], profile_event_names[i - PROFILE_EVENT_MIN],
proc->profile_events[i].cnt, proc->profile_events[i].cnt,
(proc->profile_events[i].tsc / (proc->profile_events[i].tsc /
@ -240,7 +249,7 @@ int profile_accumulate_and_print_job_events(struct process *proc)
!job_profile_events[i + PROFILE_SYSCALL_MAX].cnt) !job_profile_events[i + PROFILE_SYSCALL_MAX].cnt)
continue; continue;
__kprintf("JOB: (%2d) (%3d,%20s): %6u %6lukC offl: %6u %6lukC\n", __kprintf("JOB: (%2d) (%3d,%20s): %6u %6luk offl: %6u %6luk\n",
job_nr_processes, job_nr_processes,
i, i,
syscall_name[i], syscall_name[i],
@ -265,9 +274,8 @@ int profile_accumulate_and_print_job_events(struct process *proc)
if (!job_profile_events[i].cnt) if (!job_profile_events[i].cnt)
continue; continue;
__kprintf("JOB: (%2d) (%3d,%20s): %6u %6lukC \n", __kprintf("JOB: (%2d) (%24s): %6u %6luk \n",
job_nr_processes, job_nr_processes,
i,
profile_event_names[i - PROFILE_EVENT_MIN], profile_event_names[i - PROFILE_EVENT_MIN],
job_profile_events[i].cnt, job_profile_events[i].cnt,
(job_profile_events[i].tsc / (job_profile_events[i].tsc /
@ -376,6 +384,8 @@ int do_profile(int flag)
/* Job level? */ /* Job level? */
if (flag & PROF_JOB) { if (flag & PROF_JOB) {
dkprintf("%s: JOB %d, flag: 0x%lx\n",
__FUNCTION__, proc->nr_processes, flag);
if (flag & PROF_PRINT) { if (flag & PROF_PRINT) {
struct mcs_rwlock_node lock; struct mcs_rwlock_node lock;
struct thread *_thread; struct thread *_thread;
@ -397,6 +407,8 @@ int do_profile(int flag)
struct mcs_rwlock_node lock; struct mcs_rwlock_node lock;
struct thread *_thread; struct thread *_thread;
dkprintf("%s: PID %d, flag: 0x%lx\n",
__FUNCTION__, proc->pid, flag);
/* Accumulate events from all threads */ /* Accumulate events from all threads */
mcs_rwlock_reader_lock_noirq(&proc->threads_lock, &lock); mcs_rwlock_reader_lock_noirq(&proc->threads_lock, &lock);
@ -420,12 +432,22 @@ int do_profile(int flag)
mcs_rwlock_reader_unlock_noirq(&proc->threads_lock, &lock); mcs_rwlock_reader_unlock_noirq(&proc->threads_lock, &lock);
/* Make sure future threads profile as well */
if (flag & PROF_ON) {
proc->profile = 1;
}
else if (flag & PROF_OFF) {
proc->profile = 0;
}
if (flag & PROF_PRINT) { if (flag & PROF_PRINT) {
profile_print_proc_stats(proc); profile_print_proc_stats(proc);
} }
} }
/* Thread level */ /* Thread level */
else { else {
dkprintf("%s: TID %d, flag: 0x%lx\n",
__FUNCTION__, thread->tid, flag);
if (flag & PROF_PRINT) { if (flag & PROF_PRINT) {
profile_print_thread_stats(thread); profile_print_thread_stats(thread);
} }

1
kernel/syscall.c
View File

@ -8510,7 +8510,6 @@ long syscall(int num, ihk_mc_user_context_t *ctx)
dkprintf("\n"); dkprintf("\n");
#ifdef PROFILE_ENABLE #ifdef PROFILE_ENABLE
if (num == __NR_clone) cpu_local_var(current)->profile = 1;
t_s = rdtsc(); t_s = rdtsc();
#endif // PROFILE_ENABLE #endif // PROFILE_ENABLE