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

Protect more code by #ifdef PERF_ENABLE

Browse Source 
Change-Id: I20a67c56c4d7817fdb87cc6a2aa47d68fe3eae8d
This commit is contained in:
Dominique Martinet
2018-07-27 14:34:42 +09:00
committed by Dominique Martinet
parent 240a23a21b
commit a6a9bac5b7
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/kernel/cpu.c
View File

@ -1315,6 +1315,7 @@ struct thread *arch_switch_context(struct thread *prev, struct thread *next)
dkprintf("[%d] arch_switch_context: tlsblock_base: 0x%lX\n", dkprintf("[%d] arch_switch_context: tlsblock_base: 0x%lX\n",
ihk_mc_get_processor_id(), next->tlsblock_base); ihk_mc_get_processor_id(), next->tlsblock_base);
#ifdef ENABLE_PERF
/* Performance monitoring inherit */ /* Performance monitoring inherit */
if(next->proc->monitoring_event) { if(next->proc->monitoring_event) {
if(next->proc->perf_status == PP_RESET) if(next->proc->perf_status == PP_RESET)
@ -1324,6 +1325,7 @@ struct thread *arch_switch_context(struct thread *prev, struct thread *next)
perf_start(next->proc->monitoring_event); perf_start(next->proc->monitoring_event);
} }
} }
#endif /*ENABLE_PERF*/
if (likely(prev)) { if (likely(prev)) {
tls_thread_switch(prev, next); tls_thread_switch(prev, next);

4
arch/arm64/kernel/include/syscall_list.h
View File

@ -114,14 +114,18 @@ SYSCALL_HANDLED(236, get_mempolicy)
SYSCALL_HANDLED(237, set_mempolicy) SYSCALL_HANDLED(237, set_mempolicy)
SYSCALL_HANDLED(238, migrate_pages) SYSCALL_HANDLED(238, migrate_pages)
SYSCALL_HANDLED(239, move_pages) SYSCALL_HANDLED(239, move_pages)
#ifdef PERF_ENABLE
SYSCALL_HANDLED(241, perf_event_open) SYSCALL_HANDLED(241, perf_event_open)
#endif // PERF_ENABLE
SYSCALL_HANDLED(260, wait4) SYSCALL_HANDLED(260, wait4)
SYSCALL_HANDLED(270, process_vm_readv) SYSCALL_HANDLED(270, process_vm_readv)
SYSCALL_HANDLED(271, process_vm_writev) SYSCALL_HANDLED(271, process_vm_writev)
#ifdef PERF_ENABLE
SYSCALL_HANDLED(601, pmc_init) SYSCALL_HANDLED(601, pmc_init)
SYSCALL_HANDLED(602, pmc_start) 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)
#endif // PERF_ENABLE
SYSCALL_HANDLED(700, get_cpu_id) SYSCALL_HANDLED(700, get_cpu_id)
#ifdef PROFILE_ENABLE #ifdef PROFILE_ENABLE
SYSCALL_HANDLED(__NR_profile, profile) SYSCALL_HANDLED(__NR_profile, profile)

7
kernel/syscall.c
View File

@ -3431,6 +3431,7 @@ SYSCALL_DECLARE(signalfd4)
return sfd->fd; return sfd->fd;
} }
#ifdef ENABLE_PERF
int int
perf_counter_alloc(struct thread *thread) perf_counter_alloc(struct thread *thread)
{ {
@ -3766,6 +3767,7 @@ perf_mmap(struct mckfd *sfd, ihk_mc_user_context_t *ctx)
return rc; return rc;
} }
#endif /*ENABLE_PERF*/
struct vm_range_numa_policy *vm_range_policy_search(struct process_vm *vm, uintptr_t addr) struct vm_range_numa_policy *vm_range_policy_search(struct process_vm *vm, uintptr_t addr)
{ {
@ -3817,7 +3819,7 @@ static int vm_policy_insert(struct process_vm *vm, struct vm_range_numa_policy *
return 0; return 0;
} }
#ifdef ENABLE_PERF
struct mc_perf_event* struct mc_perf_event*
mc_perf_event_alloc(struct perf_event_attr *attr) mc_perf_event_alloc(struct perf_event_attr *attr)
{ {
@ -3993,6 +3995,7 @@ SYSCALL_DECLARE(perf_event_open)
ihk_mc_spinlock_unlock(&proc->mckfd_lock, irqstate); ihk_mc_spinlock_unlock(&proc->mckfd_lock, irqstate);
return sfd->fd; return sfd->fd;
} }
#endif /* ENABLE_PERF */
SYSCALL_DECLARE(rt_sigtimedwait) SYSCALL_DECLARE(rt_sigtimedwait)
{ {
@ -8911,6 +8914,7 @@ static void do_mod_exit(int status){
} }
#endif #endif
#ifdef ENABLE_PERF
/* select counter type */ /* select counter type */
SYSCALL_DECLARE(pmc_init) SYSCALL_DECLARE(pmc_init)
{ {
@ -8957,6 +8961,7 @@ SYSCALL_DECLARE(pmc_reset)
int counter = ihk_mc_syscall_arg0(ctx); int counter = ihk_mc_syscall_arg0(ctx);
return ihk_mc_perfctr_reset(counter); return ihk_mc_perfctr_reset(counter);
} }
#endif /*ENABLE_PERF*/
extern void save_uctx(void *, void *); extern void save_uctx(void *, void *);