Skip to contentSkip to conversation

perf/core: fix perf_event_mux_interval_ms when set zero

PATCH In review Yajun Deng 2 participants 3 messages Jun 14, 2022 – Jun 15, 2022 perf events

lore
Share & tools
lore

Yajun Deng

author
#0 lore raw

PATCH 1/1 perf/core: fix perf_event_mux_interval_ms when set zero

The perf_event_mux_interval_ms is set to zero or one by default. It can't change back when someone changes it from zero to another value.

Make perf_event_mux_interval_ms to PERF_CPU_HRTIMER when set zero.

Fixes 62b856397927 ("perf: Add sysfs entry to adjust multiplexing interval per PMU")
---
 kernel/events/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/events/core.c +4 -1
index 61ad10862c21..73c8c7462bbf 100644
@@ -10954,9 +10954,12 @@ perf_event_mux_interval_ms_store(struct device *dev,
 	if (ret)
 		return ret;
 
-	if (timer < 1)
+	if (timer < 0)
 		return -EINVAL;
 
+	if (timer < 1)
+		timer = PERF_CPU_HRTIMER;
+
 	/* same value, noting to do */
 	if (timer == pmu->hrtimer_interval_ms)
 		return count;
Signature · 1 line
2.25.1
maintainer
#1 lore raw

Hello,

Quoted 2 lines · Yajun Deng

The perf_event_mux_interval_ms is set to zero or one by default.

I see that __perf_mux_hrtimer_init() sets it to PERF_CPU_HRTIMER if it's less than 1.

Thanks,
Namhyung

Quoted 32 lines

It can't change back when someone changes it from zero to another value.

Make perf_event_mux_interval_ms to PERF_CPU_HRTIMER when set zero.

Fixes 62b856397927 ("perf: Add sysfs entry to adjust multiplexing interval per PMU")
---
 kernel/events/core.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/events/core.c +4 -2
index 61ad10862c21..73c8c7462bbf 100644
@@ -10954,9 +10954,12 @@ perf_event_mux_interval_ms_store(struct device *dev,
        if (ret)
                return ret;
 
-       if (timer < 1)
+       if (timer < 0)
                return -EINVAL;
 
+       if (timer < 1)
+               timer = PERF_CPU_HRTIMER;
+
        /* same value, noting to do */
        if (timer == pmu->hrtimer_interval_ms)
                return count;
--

2.25.1

author
#2 lore raw
Quoted 9 lines · Namhyung Kim

Hello,

Quoted 1 line · Yajun Deng

The perf_event_mux_interval_ms is set to zero or one by default.

I see that __perf_mux_hrtimer_init() sets it to PERF_CPU_HRTIMER if it's less than 1.

Yes, pmu->hrtimer_interval_ms was set to PERF_CPU_HRTIMER, but perf_event_mux_interval_ms didn't. We can execute 'cat /sys/devices/intel_pt/perf_event_mux_interval_ms' see that.

Quoted 34 lines

Thanks,
Namhyung

Quoted 31 lines

It can't change back when someone changes it from zero to another value.

Make perf_event_mux_interval_ms to PERF_CPU_HRTIMER when set zero.

Fixes 62b856397927 ("perf: Add sysfs entry to adjust multiplexing interval per PMU")

---
kernel/events/core.c | 5 ++++-

1 file changed, 4 insertions(+), 1 deletion(-)
kernel/events/core.c +4 -2
index 61ad10862c21..73c8c7462bbf 100644
@@ -10954,9 +10954,12 @@ perf_event_mux_interval_ms_store(struct device *dev,
 if (ret)
 return ret;
 
- if (timer < 1)
+ if (timer < 0)
 return -EINVAL;
 
+ if (timer < 1)
+ timer = PERF_CPU_HRTIMER;
+
 /* same value, noting to do */
 if (timer == pmu->hrtimer_interval_ms)
 return count;
--

2.25.1