tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'perf_urgent_for_v6.17_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fix from Borislav Petkov:

- Fix a case where the events throttling logic operates on inactive
events

* tag 'perf_urgent_for_v6.17_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Avoid undefined behavior from stopping/starting inactive events

Linus Torvalds 69fd6b99 0f74d9cf

+6
+6
kernel/events/core.c
··· 2665 2665 2666 2666 static void perf_event_unthrottle(struct perf_event *event, bool start) 2667 2667 { 2668 + if (event->state != PERF_EVENT_STATE_ACTIVE) 2669 + return; 2670 + 2668 2671 event->hw.interrupts = 0; 2669 2672 if (start) 2670 2673 event->pmu->start(event, 0); ··· 2677 2674 2678 2675 static void perf_event_throttle(struct perf_event *event) 2679 2676 { 2677 + if (event->state != PERF_EVENT_STATE_ACTIVE) 2678 + return; 2679 + 2680 2680 event->hw.interrupts = MAX_INTERRUPTS; 2681 2681 event->pmu->stop(event, 0); 2682 2682 if (event == event->group_leader)