Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0933840a authored by Jiri Olsa's avatar Jiri Olsa Committed by Ingo Molnar
Browse files

perf/core: Protect PMU device removal with a 'pmu_bus_running' check, to fix... 

perf/core: Protect PMU device removal with a 'pmu_bus_running' check, to fix CONFIG_DEBUG_TEST_DRIVER_REMOVE=y kernel panic

CAI Qian reported a crash in the PMU uncore device removal code,
enabled by the CONFIG_DEBUG_TEST_DRIVER_REMOVE=y option:

  https://marc.info/?l=linux-kernel&m=147688837328451



The reason for the crash is that perf_pmu_unregister() tries to remove
a PMU device which is not added at this point. We add PMU devices
only after pmu_bus is registered, which happens in the
perf_event_sysfs_init() call and sets the 'pmu_bus_running' flag.

The fix is to get the 'pmu_bus_running' flag state at the point
the PMU is taken out of the PMU list and remove the device
later only if it's set.

Reported-by: default avatarCAI Qian <caiqian@redhat.com>
Tested-by: default avatarCAI Qian <caiqian@redhat.com>
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20161020111011.GA13361@krava


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 889882bc

kernel/events/core.c

+9 −4
Original line number Diff line number Diff line
@@ -8855,7 +8855,10 @@ EXPORT_SYMBOL_GPL(perf_pmu_register); 


void perf_pmu_unregister(struct pmu *pmu)

{

	int remove_device;



	mutex_lock(&pmus_lock);

	remove_device = pmu_bus_running;

	list_del_rcu(&pmu->entry);

	mutex_unlock(&pmus_lock);
@@ -8869,10 +8872,12 @@ void perf_pmu_unregister(struct pmu *pmu) 
	free_percpu(pmu->pmu_disable_count);

	if (pmu->type >= PERF_TYPE_MAX)

		idr_remove(&pmu_idr, pmu->type);

	if (remove_device) {

		if (pmu->nr_addr_filters)

			device_remove_file(pmu->dev, &dev_attr_nr_addr_filters);

		device_del(pmu->dev);

		put_device(pmu->dev);

	}

	free_pmu_context(pmu);

}

EXPORT_SYMBOL_GPL(perf_pmu_unregister);