perf/x86: Disable non generic regs for software/probe events
Subsystems (2)
PATCH 1/2 perf/x86: Disable non generic regs for software/probe events
From: Kan Liang <[email protected]>
The perf fuzzer caused skylake machine to crash.
[ 9680.085831] Call Trace: [ 9680.088301] <IRQ> [ 9680.090363] perf_output_sample_regs+0x43/0xa0 [ 9680.094928] perf_output_sample+0x3aa/0x7a0 [ 9680.099181] perf_event_output_forward+0x53/0x80 [ 9680.103917] __perf_event_overflow+0x52/0xf0 [ 9680.108266] ? perf_trace_run_bpf_submit+0xc0/0xc0 [ 9680.113108] perf_swevent_hrtimer+0xe2/0x150 [ 9680.117475] ? check_preempt_wakeup+0x181/0x230 [ 9680.122091] ? check_preempt_curr+0x62/0x90 [ 9680.126361] ? ttwu_do_wakeup+0x19/0x140 [ 9680.130355] ? try_to_wake_up+0x54/0x460 [ 9680.134366] ? reweight_entity+0x15b/0x1a0 [ 9680.138559] ? __queue_work+0x103/0x3f0 [ 9680.142472] ? update_dl_rq_load_avg+0x1cd/0x270 [ 9680.147194] ? timerqueue_del+0x1e/0x40 [ 9680.151092] ? __remove_hrtimer+0x35/0x70 [ 9680.155191] __hrtimer_run_queues+0x100/0x280 [ 9680.159658] hrtimer_interrupt+0x100/0x220 [ 9680.163835] smp_apic_timer_interrupt+0x6a/0x140 [ 9680.168555] apic_timer_interrupt+0xf/0x20 [ 9680.172756] </IRQ>
The XMM registers can only be collected by hardware events, not software/probe events.
Add has_non_generic_regs() to check if non-generic regs, e.g. XMM on X86, are applied for software/probe events. If yes, return -EOPNOTSUPP.
Add __weak function non_generic_regs_mask() to return the mask of non-generic regs. For X86, the mask of non-generic regs equals to the mask of XMM registers.
--- arch/x86/kernel/perf_regs.c | 5 +++++ include/linux/perf_regs.h | 2 ++ kernel/events/core.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 44 insertions(+)
arch/x86/kernel/perf_regs.c +5 -0
@@ -57,6 +57,11 @@ static unsigned int pt_regs_offset[PERF_REG_X86_MAX] = {#endif }; +u64 non_generic_regs_mask (void ) +{ +return (~((1ULL <<PERF_REG_X86_XMM0 ) -1 )); +} +u64 perf_reg_value (struct pt_regs *regs,int idx) {struct x86_perf_regs *perf_regs;
include/linux/perf_regs.h +2 -0
@@ -9,6 +9,8 @@ struct perf_regs {struct pt_regs *regs; }; +u64 non_generic_regs_mask (void ); +#ifdef CONFIG_HAVE_PERF_REGS #include <asm/perf_regs.h> u64 perf_reg_value (struct pt_regs *regs,int idx);
kernel/events/core.c +37 -0
@@ -8457,6 +8457,19 @@ static void sw_perf_event_destroy(struct perf_event *event)swevent_hlist_put (); } +u64 __weak non_generic_regs_mask (void ) +{ +return 0 ; +} + +static inline bool has_non_generic_regs (struct perf_event *event) +{ +u64 mask =non_generic_regs_mask (); + +return ((event->attr.sample_regs_user & mask) || + (event->attr.sample_regs_intr & mask)); +} +static int perf_swevent_init (struct perf_event *event) {u64 event_id = event->attr.config;
@@ -8470,6 +8483,10 @@ static int perf_swevent_init(struct perf_event *event)if (has_branch_stack (event))return -EOPNOTSUPP ; +/* only support generic regs */ +if (has_non_generic_regs (event)) +return -EOPNOTSUPP ; +switch (event_id) {case PERF_COUNT_SW_CPU_CLOCK :case PERF_COUNT_SW_TASK_CLOCK :
@@ -8633,6 +8650,10 @@ static int perf_tp_event_init(struct perf_event *event)if (has_branch_stack (event))return -EOPNOTSUPP ; +/* only support generic regs */ +if (has_non_generic_regs (event)) +return -EOPNOTSUPP ; + err =perf_trace_init (event);if (err)return err;
@@ -8722,6 +8743,10 @@ static int perf_kprobe_event_init(struct perf_event *event)if (has_branch_stack (event))return -EOPNOTSUPP ; +/* only support generic regs */ +if (has_non_generic_regs (event)) +return -EOPNOTSUPP ; + is_retprobe = event->attr.config &PERF_PROBE_CONFIG_IS_RETPROBE ; err =perf_kprobe_init (event, is_retprobe);if (err)
@@ -8782,6 +8807,10 @@ static int perf_uprobe_event_init(struct perf_event *event)if (has_branch_stack (event))return -EOPNOTSUPP ; +/* only support generic regs */ +if (has_non_generic_regs (event)) +return -EOPNOTSUPP ; + is_retprobe = event->attr.config &PERF_PROBE_CONFIG_IS_RETPROBE ; ref_ctr_offset = event->attr.config >>PERF_UPROBE_REF_CTR_OFFSET_SHIFT ; err =perf_uprobe_init (event, ref_ctr_offset, is_retprobe);
@@ -9562,6 +9591,10 @@ static int cpu_clock_event_init(struct perf_event *event)if (has_branch_stack (event))return -EOPNOTSUPP ; +/* only support generic regs */ +if (has_non_generic_regs (event)) +return -EOPNOTSUPP ; +perf_swevent_init_hrtimer (event);return 0 ;
@@ -9643,6 +9676,10 @@ static int task_clock_event_init(struct perf_event *event)if (has_branch_stack (event))return -EOPNOTSUPP ; +/* only support generic regs */ +if (has_non_generic_regs (event)) +return -EOPNOTSUPP ; +perf_swevent_init_hrtimer (event);return 0 ;
Signature · 1 line
2.7.4
PATCH 2/2 perf/x86/regs: Check reserved bits
From: Kan Liang <[email protected]>
The perf fuzzer triggers a warning which map to:
if (WARN_ON_ONCE(idx >= ARRAY_SIZE(pt_regs_offset))) return 0;
The bits between XMM registers and generic registers are reserved. But perf_reg_validate() doesn't check these bits.
Add REG_RESERVED for reserved bits.
Check the reserved bits in perf_reg_validate().
--- arch/x86/kernel/perf_regs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kernel/perf_regs.c +5 -2
@@ -79,6 +79,9 @@ u64 perf_reg_value(struct pt_regs *regs, int idx)return regs_get_register (regs, pt_regs_offset[idx]); } +#define REG_RESERVED (((1ULL << PERF_REG_X86_XMM0) - 1) & \ + ~((1ULL << PERF_REG_X86_MAX) - 1)) +#ifdef CONFIG_X86_32 #define REG_NOSUPPORT ((1ULL << PERF_REG_X86_R8) | \ (1ULL << PERF_REG_X86_R9) | \
@@ -91,7 +94,7 @@ u64 perf_reg_value(struct pt_regs *regs, int idx)int perf_reg_validate (u64 mask) { -if (!mask || (mask ®_NOSUPPORT )) +if (!mask || (mask & (REG_NOSUPPORT |REG_RESERVED )))return -EINVAL ;return 0 ;
@@ -117,7 +120,7 @@ void perf_get_regs_user(struct perf_regs *regs_user,int perf_reg_validate (u64 mask) { -if (!mask || (mask ®_NOSUPPORT )) +if (!mask || (mask & (REG_NOSUPPORT |REG_RESERVED )))return -EINVAL ;return 0 ;
Signature · 1 line
2.7.4
Re: [PATCH 2/2] perf/x86/regs: Check reserved bits
Quoted 25 lines · * [email protected] <[email protected]> wrote:
From: Kan Liang <[email protected]>
The perf fuzzer triggers a warning which map to:
if (WARN_ON_ONCE(idx >= ARRAY_SIZE(pt_regs_offset))) return 0;The bits between XMM registers and generic registers are reserved. But
perf_reg_validate()doesn't check these bits.Add
REG_RESERVEDfor reserved bits.
Check the reserved bits inperf_reg_validate().Fixes 878068ea270e ("perf/x86: Support outputting XMM registers")Reported-by Vince Weaver <[email protected]>Signed-off-by Kan Liang <[email protected]>--- arch/x86/kernel/perf_regs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)arch/x86/kernel/perf_regs.c +0
-0
arch/x86/kernel/perf_regs.c u64 perf_reg_value(struct pt_regs *regs, int idx) · line 83
Quoted 5 lines
arch/x86/kernel/perf_regs.c +2
-0@@ -79,6 +79,9 @@ u64 perf_reg_value(struct pt_regs *regs, int idx)return regs_get_register (regs, pt_regs_offset[idx]); } +#define REG_RESERVED (((1ULL << PERF_REG_X86_XMM0) - 1) & \ + ~((1ULL << PERF_REG_X86_MAX) - 1))
This is just randomly polluting the macro namespace with a new variant. We have PERF_REG_X86_ pattern - why not name the new one within that pattern?
Thanks,
Ingo
I've run the fuzzer overnight with both patches applied and have not seen any issues.
Vince
Quoted 4 lines · Vince Weaver
I've run the fuzzer overnight with both patches applied and have not seen any issues.
Thanks a lot for the test.
Kan
Quoted 17 lines · * [email protected] <[email protected]> wrote:
arch/x86/kernel/perf_regs.c +5
-0@@ -57,6 +57,11 @@ static unsigned int pt_regs_offset[PERF_REG_X86_MAX] = {#endif }; +u64 non_generic_regs_mask (void ) +{ +return (~((1ULL <<PERF_REG_X86_XMM0 ) -1 )); +} +u64 perf_reg_value (struct pt_regs *regs,int idx) {struct x86_perf_regs *perf_regs;include/linux/perf_regs.h +0
-0
include/linux/perf_regs.h struct perf_regs { · line 12
Quoted 4 lines
include/linux/perf_regs.h +1
-0@@ -9,6 +9,8 @@ struct perf_regs {struct pt_regs *regs; }; +u64 non_generic_regs_mask (void );
This is a *constant* value, why is it in a separate function, not an inline?
Or rather, since it's obviously a constant, name it in such a way. (PERF_REG_X86_NON_GENERIC_MASK or so.)
To the generic code define it as 0 if arch headers haven't overriden it.
include/linux/perf_regs.h struct perf_regs {
Quoted 11 lines
include/linux/perf_regs.h +11
-0+u64 __weak non_generic_regs_mask (void ) +{ +return 0 ; +} + +static inline bool has_non_generic_regs (struct perf_event *event) +{ +u64 mask =non_generic_regs_mask (); + +return ((event->attr.sample_regs_user & mask) || + (event->attr.sample_regs_intr & mask));
'return' is not a function ...
include/linux/perf_regs.h
Quoted 3 lines
include/linux/perf_regs.h +3
-0+/* only support generic regs */ +if (has_non_generic_regs (event)) +return -EOPNOTSUPP ;
In human readable comments please use complete sentences with no unnecessary abbreviations, i.e. "Only support generic registers".
Thanks,
Ingo
Quoted 23 lines · Ingo Molnar
Quoted 20 lines · * [email protected] <[email protected]> wrote:
arch/x86/kernel/perf_regs.c +5
-0@@ -57,6 +57,11 @@ static unsigned int pt_regs_offset[PERF_REG_X86_MAX] = {#endif }; +u64 non_generic_regs_mask (void ) +{ +return (~((1ULL <<PERF_REG_X86_XMM0 ) -1 )); +} +u64 perf_reg_value (struct pt_regs *regs,int idx) {struct x86_perf_regs *perf_regs;include/linux/perf_regs.h +0
-0@@ -9,6 +9,8 @@ struct perf_regs {struct pt_regs *regs; };
Quoted 9 lines
include/linux/perf_regs.h struct perf_regs { · line 12
Quoted 1 line
include/linux/perf_regs.h +1
-0+u64 non_generic_regs_mask (void );This is a *constant* value, why is it in a separate function, not an inline?
Or rather, since it's obviously a constant, name it in such a way. (
PERF_REG_X86_NON_GENERIC_MASKor so. >
To the generic code define it as 0 if arch headers haven't overriden it.
I will name it PERF_REG_NON_GENERIC_MASK in generic code.
Perf tool also defined a similar macro. I think I will define PERF_REG_NON_GENERIC_MASK in X86 uapi header. So both kernel and user space can use it.
I will send out V2 to address all comments.
Thanks,
Kan
Quoted 25 lines
include/linux/perf_regs.h struct perf_regs {
Quoted 11 lines
include/linux/perf_regs.h +11
-0+u64 __weak non_generic_regs_mask (void ) +{ +return 0 ; +} + +static inline bool has_non_generic_regs (struct perf_event *event) +{ +u64 mask =non_generic_regs_mask (); + +return ((event->attr.sample_regs_user & mask) || + (event->attr.sample_regs_intr & mask));'return' is not a function ...
include/linux/perf_regs.h
Quoted 3 lines
include/linux/perf_regs.h +3
-0+/* only support generic regs */ +if (has_non_generic_regs (event)) +return -EOPNOTSUPP ;In human readable comments please use complete sentences with no unnecessary abbreviations, i.e. "Only support generic registers".
Thanks,
Ingo