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

uti: Hook system calls by binary-patching glibc

Browse Source 
(1) Add --enable-uti option. The binary-patch library is
    preloaded with this option.
(2) Binary-patching is done by syscall_intercept developed by Intel

This commit includes the following fixes:

(1) Fix do_exit() and terminate() handling
(2) Fix timing of killing mcexec threads when McKernel thread calls terminate()

Change-Id: Iad885e1e5540ed79f0808debd372463e3b8fecea
This commit is contained in:
Masamichi Takagi
2018-09-04 09:29:54 +09:00
parent e613483bee
commit e42c414454
15 changed files with 608 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
kernel/syscall.c
View File

@ -60,6 +60,7 @@
#include <ihk/monitor.h>
#include <profile.h>
#include <debug.h>
#include "../executer/include/uti.h"
/* Headers taken from kitten LWK */
#include <lwk/stddef.h>
@ -74,7 +75,7 @@
#define DDEBUG_DEFAULT DDEBUG_PRINT
#endif
#define DEBUG_UTI
//#define DEBUG_UTI
#ifdef DEBUG_UTI
#define uti_dkprintf(...) do { ((uti_clv && linux_printk) ? (*linux_printk) : kprintf)(__VA_ARGS__); } while (0)
#else
@ -112,6 +113,7 @@ char *syscall_name[] MCKERNEL_UNUSED = {
};
static ihk_spinlock_t tod_data_lock = SPIN_LOCK_UNLOCKED;
static unsigned long uti_desc; /* Address of struct uti_desc object in syscall_intercept.c */
static void calculate_time_from_tsc(struct timespec *ts);
void check_signal(unsigned long, void *, int);
@ -3131,6 +3133,8 @@ SYSCALL_DECLARE(setpgid)
return rc;
}
/* Ignore the registration by start_thread() (in pthread_create.c)
because McKernel doesn't unlock mutex-es held by the thread which has been killed. */
SYSCALL_DECLARE(set_robust_list)
{
// Palliative fix. wait for impl.
@ -9085,6 +9089,29 @@ SYSCALL_DECLARE(pmc_reset)
extern void save_uctx(void *, void *);
/* TODO: use copy_from_user() */
int util_show_syscall_profile()
{
int i;
struct uti_desc *desc = (struct uti_desc *)uti_desc;
kprintf("Syscall stats for offloaded thread:\n");
for (i = 0; i < 512; i++) {
if (desc->syscalls[i]) {
kprintf("nr=%d #called=%ld\n", i, desc->syscalls[i]);
}
}
kprintf("Syscall stats for other threads:\n");
for (i = 0; i < 512; i++) {
if (desc->syscalls2[i]) {
kprintf("nr=%d #called=%ld\n", i, desc->syscalls2[i]);
}
}
return 0;
}
int
util_thread(struct uti_attr *arg)
{
@ -9127,8 +9154,13 @@ util_thread(struct uti_attr *arg)
request.args[2] = virt_to_phys(&kattr);
}
request.args[3] = (unsigned long)uti_clv;
request.args[4] = uti_desc;
thread->thread_offloaded = 1;
rc = do_syscall(&request, ihk_mc_get_processor_id(), 0);
dkprintf("%s: returned from do_syscall,tid=%d,rc=%lx\n", __FUNCTION__, thread->tid, rc);
util_show_syscall_profile();
thread->thread_offloaded = 0;
free_address = context[0];
free_size = context[1];
@ -9141,8 +9173,8 @@ util_thread(struct uti_attr *arg)
thread->proc->nohost = 1;
terminate((rc >> 8) & 255, rc & 255);
} else {
/* tracer has detected exit or killed by signal */
dkprintf("%s: exit, pid=%d,tid=%d,rc=%lx\n", __FUNCTION__, thread->proc->pid, thread->tid, rc);
/* exit or killed-by-signal detected */
dkprintf("%s: exit or killed by signal, pid=%d,tid=%d,rc=%lx\n", __FUNCTION__, thread->proc->pid, thread->tid, rc);
request.number = __NR_sched_setaffinity;
request.args[0] = 1;
request.args[1] = free_address;
@ -9316,6 +9348,14 @@ SYSCALL_DECLARE(resume_threads)
return 0;
}
SYSCALL_DECLARE(util_register_desc)
{
struct thread *thread = cpu_local_var(current);
uti_desc = ihk_mc_syscall_arg0(ctx);
dkprintf("%s: tid=%d,uti_desc=%lx\n", __FUNCTION__, thread->tid, uti_desc);
return 0;
}
void
reset_cputime()
{
@ -9518,7 +9558,7 @@ long syscall(int num, ihk_mc_user_context_t *ctx)
&& (syscall_table[num] != NULL)) {
l = syscall_table[num](num, ctx);
dkprintf("SC(%d)[%3d] ret: %d\n",
dkprintf("SC(%d)[%3d] ret: %lx\n",
ihk_mc_get_processor_id(), num, l);
} else {
dkprintf("USC[%3d](%lx, %lx, %lx, %lx, %lx) @ %lx | %lx\n", num,