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 branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fix from Ingo Molnar:
"A perf kernel side fix for a fuzzer triggered lockup"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Fix irq_work 'tail' recursion

Linus Torvalds ee9b63dd 0fa7271a

+10
+10
kernel/events/core.c
··· 4574 4574 { 4575 4575 struct perf_event *event = container_of(entry, 4576 4576 struct perf_event, pending); 4577 + int rctx; 4578 + 4579 + rctx = perf_swevent_get_recursion_context(); 4580 + /* 4581 + * If we 'fail' here, that's OK, it means recursion is already disabled 4582 + * and we won't recurse 'further'. 4583 + */ 4577 4584 4578 4585 if (event->pending_disable) { 4579 4586 event->pending_disable = 0; ··· 4591 4584 event->pending_wakeup = 0; 4592 4585 perf_event_wakeup(event); 4593 4586 } 4587 + 4588 + if (rctx >= 0) 4589 + perf_swevent_put_recursion_context(rctx); 4594 4590 } 4595 4591 4596 4592 /*