openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'rfc' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perfcounters into perfcounters/core

This commit is contained in:
Ingo Molnar 2009-03-04 11:43:53 +01:00
parent 8163d88c79 2743a5b0fa
commit 2b578459c3
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/linux/perf_counter.h
View File

@ -69,9 +69,10 @@ struct perf_counter_hw_event {
__s64 type;
__u64 irq_period;
__u32 record_type;
__u64 record_type;
__u64 read_format;
__u32 disabled : 1, /* off by default */
__u64 disabled : 1, /* off by default */
nmi : 1, /* NMI sampling */
raw : 1, /* raw event type */
inherit : 1, /* children inherit it */
@ -80,10 +81,15 @@ struct perf_counter_hw_event {
exclude_user : 1, /* don't count user */
exclude_kernel : 1, /* ditto kernel */
exclude_hv : 1, /* ditto hypervisor */
exclude_idle : 1, /* don't count when idle */
__reserved_1 : 23;
__reserved_1 : 55;
__u32 extra_config_len;
__u32 __reserved_4;
__u64 __reserved_2;
__u64 __reserved_3;
};
/*

2
include/linux/syscalls.h
View File

@ -698,5 +698,5 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[]);
asmlinkage long sys_perf_counter_open(
const struct perf_counter_hw_event __user *hw_event_uptr,
pid_t pid, int cpu, int group_fd);
pid_t pid, int cpu, int group_fd, unsigned long flags);
#endif

10
kernel/perf_counter.c
View File

@ -1683,16 +1683,16 @@ perf_counter_alloc(struct perf_counter_hw_event *hw_event,
}
/**
* sys_perf_task_open - open a performance counter, associate it to a task/cpu
* sys_perf_counter_open - open a performance counter, associate it to a task/cpu
*
* @hw_event_uptr: event type attributes for monitoring/sampling
* @pid: target pid
* @cpu: target cpu
* @group_fd: group leader counter fd
*/
SYSCALL_DEFINE4(perf_counter_open,
SYSCALL_DEFINE5(perf_counter_open,
const struct perf_counter_hw_event __user *, hw_event_uptr,
pid_t, pid, int, cpu, int, group_fd)
pid_t, pid, int, cpu, int, group_fd, unsigned long, flags)
{
struct perf_counter *counter, *group_leader;
struct perf_counter_hw_event hw_event;
@ -1703,6 +1703,10 @@ SYSCALL_DEFINE4(perf_counter_open,
int fput_needed2 = 0;
int ret;
/* for future expandability... */
if (flags)
return -EINVAL;
if (copy_from_user(&hw_event, hw_event_uptr, sizeof(hw_event)) != 0)
return -EFAULT;