]> git.ipfire.org Git - people/arne_f/kernel.git/commit
perf/x86/intel: Allow PEBS multi-entry in watermark mode
authorStephane Eranian <eranian@google.com>
Tue, 14 May 2019 00:34:00 +0000 (17:34 -0700)
committerIngo Molnar <mingo@kernel.org>
Tue, 14 May 2019 07:07:58 +0000 (09:07 +0200)
commitc7a286577d7592720c2f179aadfb325a1ff48c95
tree95f4c716accffb5b8bccc81a2bf08e79375bc9c7
parent6b89d4c1ae8596a8c9240f169ef108704de373f2
perf/x86/intel: Allow PEBS multi-entry in watermark mode

This patch fixes a restriction/bug introduced by:

   583feb08e7f7 ("perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS")

The original patch prevented using multi-entry PEBS when wakeup_events != 0.
However given that wakeup_events is part of a union with wakeup_watermark, it
means that in watermark mode, PEBS multi-entry is also disabled which is not the
intent. This patch fixes this by checking is watermark mode is enabled.

Signed-off-by: Stephane Eranian <eranian@google.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: jolsa@redhat.com
Cc: kan.liang@intel.com
Cc: vincent.weaver@maine.edu
Fixes: 583feb08e7f7 ("perf/x86/intel: Fix handling of wakeup_events for multi-entry PEBS")
Link: http://lkml.kernel.org/r/20190514003400.224340-1-eranian@google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/intel/core.c