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

Commit 0dc1a185 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm_pmu: add armpmu_alloc_atomic() 



In ACPI systems, we don't know the makeup of CPUs until we hotplug them
on, and thus have to allocate the PMU datastructures at hotplug time.
Thus, we must use GFP_ATOMIC allocations.

Let's add an armpmu_alloc_atomic() that we can use in this case.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent d3d5aac2

drivers/perf/arm_pmu.c

+14 −3
Original line number Diff line number Diff line
@@ -760,18 +760,18 @@ static void cpu_pmu_destroy(struct arm_pmu *cpu_pmu) 
					    &cpu_pmu->node);

}



struct arm_pmu *armpmu_alloc(void)

static struct arm_pmu *__armpmu_alloc(gfp_t flags)

{

	struct arm_pmu *pmu;

	int cpu;



	pmu = kzalloc(sizeof(*pmu), GFP_KERNEL);

	pmu = kzalloc(sizeof(*pmu), flags);

	if (!pmu) {

		pr_info("failed to allocate PMU device!\n");

		goto out;

	}



	pmu->hw_events = alloc_percpu(struct pmu_hw_events);

	pmu->hw_events = alloc_percpu_gfp(struct pmu_hw_events, flags);

	if (!pmu->hw_events) {

		pr_info("failed to allocate per-cpu PMU data.\n");

		goto out_free_pmu;
@@ -817,6 +817,17 @@ struct arm_pmu *armpmu_alloc(void) 
	return NULL;

}



struct arm_pmu *armpmu_alloc(void)

{

	return __armpmu_alloc(GFP_KERNEL);

}



struct arm_pmu *armpmu_alloc_atomic(void)

{

	return __armpmu_alloc(GFP_ATOMIC);

}





void armpmu_free(struct arm_pmu *pmu)

{

	free_percpu(pmu->hw_events);

drivers/perf/arm_pmu_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static struct arm_pmu *arm_pmu_acpi_find_alloc_pmu(void) 
		return pmu;

	}



	pmu = armpmu_alloc();

	pmu = armpmu_alloc_atomic();

	if (!pmu) {

		pr_warn("Unable to allocate PMU for CPU%d\n",

			smp_processor_id());

include/linux/perf/arm_pmu.h

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ static inline int arm_pmu_acpi_probe(armpmu_init_fn init_fn) { return 0; } 


/* Internal functions only for core arm_pmu code */

struct arm_pmu *armpmu_alloc(void);

struct arm_pmu *armpmu_alloc_atomic(void);

void armpmu_free(struct arm_pmu *pmu);

int armpmu_register(struct arm_pmu *pmu);

int armpmu_request_irq(struct arm_pmu *armpmu, int cpu);