mirror of
https://github.com/torvalds/linux.git
synced 2024-12-12 14:12:51 +00:00
25f69c69bc
When creating counters with initial delay configured, the enable_on_exec
field is not set. So we need to enable the counters later. The problem
is, when a workload is specified the target__none() is true. So we also
need to check stat_config.initial_delay.
In this change, we add a new field 'initial_delay' for struct target
which could be shared by other subcommands. And define
target__enable_on_exec() which returns whether enable_on_exec should be
set on normal cases.
Before this fix the event is not counted:
$ ./perf stat -e instructions -D 100 sleep 2
Events disabled
Events enabled
Performance counter stats for 'sleep 2':
<not counted> instructions
1.901661124 seconds time elapsed
0.001602000 seconds user
0.000000000 seconds sys
After fix it works:
$ ./perf stat -e instructions -D 100 sleep 2
Events disabled
Events enabled
Performance counter stats for 'sleep 2':
404,214 instructions
1.901743475 seconds time elapsed
0.001617000 seconds user
0.000000000 seconds sys
Fixes: c587e77e10 ("perf stat: Do not delay the workload with --delay")
Signed-off-by: Changbin Du <changbin.du@huawei.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Hui Wang <hw.huiwang@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230302031146.2801588-2-changbin.du@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
108 lines
2.7 KiB
C
108 lines
2.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _PERF_TARGET_H
|
|
#define _PERF_TARGET_H
|
|
|
|
#include <stdbool.h>
|
|
#include <sys/types.h>
|
|
|
|
struct target {
|
|
const char *pid;
|
|
const char *tid;
|
|
const char *cpu_list;
|
|
const char *uid_str;
|
|
const char *bpf_str;
|
|
uid_t uid;
|
|
bool system_wide;
|
|
bool uses_mmap;
|
|
bool default_per_cpu;
|
|
bool per_thread;
|
|
bool use_bpf;
|
|
bool hybrid;
|
|
int initial_delay;
|
|
const char *attr_map;
|
|
};
|
|
|
|
enum target_errno {
|
|
TARGET_ERRNO__SUCCESS = 0,
|
|
|
|
/*
|
|
* Choose an arbitrary negative big number not to clash with standard
|
|
* errno since SUS requires the errno has distinct positive values.
|
|
* See 'Issue 6' in the link below.
|
|
*
|
|
* http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/errno.h.html
|
|
*/
|
|
__TARGET_ERRNO__START = -10000,
|
|
|
|
/* for target__validate() */
|
|
TARGET_ERRNO__PID_OVERRIDE_CPU = __TARGET_ERRNO__START,
|
|
TARGET_ERRNO__PID_OVERRIDE_UID,
|
|
TARGET_ERRNO__UID_OVERRIDE_CPU,
|
|
TARGET_ERRNO__PID_OVERRIDE_SYSTEM,
|
|
TARGET_ERRNO__UID_OVERRIDE_SYSTEM,
|
|
TARGET_ERRNO__SYSTEM_OVERRIDE_THREAD,
|
|
TARGET_ERRNO__BPF_OVERRIDE_CPU,
|
|
TARGET_ERRNO__BPF_OVERRIDE_PID,
|
|
TARGET_ERRNO__BPF_OVERRIDE_UID,
|
|
TARGET_ERRNO__BPF_OVERRIDE_THREAD,
|
|
|
|
/* for target__parse_uid() */
|
|
TARGET_ERRNO__INVALID_UID,
|
|
TARGET_ERRNO__USER_NOT_FOUND,
|
|
|
|
__TARGET_ERRNO__END,
|
|
};
|
|
|
|
enum target_errno target__validate(struct target *target);
|
|
enum target_errno target__parse_uid(struct target *target);
|
|
|
|
int target__strerror(struct target *target, int errnum, char *buf, size_t buflen);
|
|
|
|
static inline bool target__has_task(struct target *target)
|
|
{
|
|
return target->tid || target->pid || target->uid_str;
|
|
}
|
|
|
|
static inline bool target__has_cpu(struct target *target)
|
|
{
|
|
return target->system_wide || target->cpu_list;
|
|
}
|
|
|
|
static inline bool target__none(struct target *target)
|
|
{
|
|
return !target__has_task(target) && !target__has_cpu(target);
|
|
}
|
|
|
|
static inline bool target__enable_on_exec(struct target *target)
|
|
{
|
|
/*
|
|
* Normally enable_on_exec should be set if:
|
|
* 1) The tracee process is forked (not attaching to existed task or cpu).
|
|
* 2) And initial_delay is not configured.
|
|
* Otherwise, we enable tracee events manually.
|
|
*/
|
|
return target__none(target) && !target->initial_delay;
|
|
}
|
|
|
|
static inline bool target__has_per_thread(struct target *target)
|
|
{
|
|
return target->system_wide && target->per_thread;
|
|
}
|
|
|
|
static inline bool target__uses_dummy_map(struct target *target)
|
|
{
|
|
bool use_dummy = false;
|
|
|
|
if (target->default_per_cpu)
|
|
use_dummy = target->per_thread ? true : false;
|
|
else if (target__has_task(target) ||
|
|
(!target__has_cpu(target) && !target->uses_mmap))
|
|
use_dummy = true;
|
|
else if (target__has_per_thread(target))
|
|
use_dummy = true;
|
|
|
|
return use_dummy;
|
|
}
|
|
|
|
#endif /* _PERF_TARGET_H */
|