]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
s390/cpum_sf: Do not re-enable event after deletion
authorThomas Richter <tmricht@linux.ibm.com>
Tue, 8 Oct 2024 12:51:10 +0000 (14:51 +0200)
committerHeiko Carstens <hca@linux.ibm.com>
Tue, 29 Oct 2024 10:17:18 +0000 (11:17 +0100)
commitdb417646fecd10b330c9dd611a39999520553bf2
treeea0e1dcd7c9327b079987079442ee6efd3e60739
parente7277a8981660adf06f6e32f84c9052fc713d299
s390/cpum_sf: Do not re-enable event after deletion

Event delete removes an event from the event list, but common
code invokes the PMU's enable function later on. This happens
in event_sched_out() and leads to the following call sequence:

  event_sched_out()
  +--> cpumsf_pmu_del()
  +--> cpumsf_pmu_enable()

In cpumsf_pmu_enable() return immediately when the event is not
active. Also remove an unneeded if clause. That if() statement
is only reached when flag PMU_F_IN_USE has been set in
cpumsf_pmu_add(). And this function also sets cpuhw->event
to a valid value.

Remove WARN_ON_ONCE() statement which never triggered.

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Acked-by: Sumanth Korikkar <sumanthk@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
arch/s390/kernel/perf_cpum_sf.c