Messages in this thread Patch in this message | | | Date | Wed, 05 Oct 2022 11:26:42 -0000 | From | "tip-bot2 for Peter Zijlstra" <> | Subject | [tip: perf/core] perf: Fix lockdep_assert_event_ctx() |
| |
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 0ce38047e82a02017839b6cae837f13a1383a3a0 Gitweb: https://git.kernel.org/tip/0ce38047e82a02017839b6cae837f13a1383a3a0 Author: Peter Zijlstra <peterz@infradead.org> AuthorDate: Tue, 04 Oct 2022 10:46:58 +02:00 Committer: Peter Zijlstra <peterz@infradead.org> CommitterDate: Tue, 04 Oct 2022 13:32:08 +02:00
perf: Fix lockdep_assert_event_ctx()
I'm a flamin' moron; because even after Mark told me it should be '&&' I still got it wrong in the final commit.
Fixes: f3c0eba28704 ("perf: Add a few assertions") Reported-by: Borislav Petkov <bp@alien8.de> Reported-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Borislav Petkov <bp@alien8.de> Link: https://lkml.kernel.org/r/YvvIWmDBWdIUCMZj@FVFF77S0Q05N --- include/linux/perf_event.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index e9b151c..853f64b 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -644,7 +644,7 @@ struct pmu_event_list { #ifdef CONFIG_PROVE_LOCKING #define lockdep_assert_event_ctx(event) \ WARN_ON_ONCE(__lockdep_enabled && \ - (this_cpu_read(hardirqs_enabled) || \ + (this_cpu_read(hardirqs_enabled) && \ lockdep_is_held(&(event)->ctx->mutex) != LOCK_STATE_HELD)) #else #define lockdep_assert_event_ctx(event)
| |