]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
perf/core: Fix low freq setting via IOC_PERIOD
authorKan Liang <kan.liang@linux.intel.com>
Fri, 17 Jan 2025 15:19:12 +0000 (07:19 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Mar 2025 17:25:38 +0000 (18:25 +0100)
commit 0d39844150546fa1415127c5fbae26db64070dd3 upstream.

A low attr::freq value cannot be set via IOC_PERIOD on some platforms.

The perf_event_check_period() introduced in:

  81ec3f3c4c4d ("perf/x86: Add check_period PMU callback")

was intended to check the period, rather than the frequency.
A low frequency may be mistakenly rejected by limit_period().

Fix it.

Fixes: 81ec3f3c4c4d ("perf/x86: Add check_period PMU callback")
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20250117151913.3043942-2-kan.liang@linux.intel.com
Closes: https://lore.kernel.org/lkml/20250115154949.3147-1-ravi.bangoria@amd.com/
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/events/core.c

index a3db8f859c7a2efbcd07561ea01ad8cfbd246664..a0e1d2124727e115f73c3bec560d95f017daa19d 100644 (file)
@@ -5976,14 +5976,15 @@ static int _perf_event_period(struct perf_event *event, u64 value)
        if (!value)
                return -EINVAL;
 
-       if (event->attr.freq && value > sysctl_perf_event_sample_rate)
-               return -EINVAL;
-
-       if (perf_event_check_period(event, value))
-               return -EINVAL;
-
-       if (!event->attr.freq && (value & (1ULL << 63)))
-               return -EINVAL;
+       if (event->attr.freq) {
+               if (value > sysctl_perf_event_sample_rate)
+                       return -EINVAL;
+       } else {
+               if (perf_event_check_period(event, value))
+                       return -EINVAL;
+               if (value & (1ULL << 63))
+                       return -EINVAL;
+       }
 
        event_function_call(event, __perf_event_period, &value);