[PATCH 16/21] perf/x86: Remove task_ctx_size

kan.liang
2020-06-19T14:08:43Z

A new kmem_cache method has replaced the kzalloc() to allocate the PMU
specific data. The task_ctx_size is not required anymore.

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
---
arch/x86/events/core.c | 1 -
arch/x86/events/intel/lbr.c | 1 -
include/linux/perf_event.h | 4 ----
kernel/events/core.c | 4 +---
4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index a619763..aeb6e6d 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -2364,7 +2364,6 @@ static struct pmu pmu = {

.event_idx = x86_pmu_event_idx,
.sched_task = x86_pmu_sched_task,
- .task_ctx_size = sizeof(struct x86_perf_task_context),
.swap_task_ctx = x86_pmu_swap_task_ctx,
.check_period = x86_pmu_check_period,

diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index 28f0d41..4060d3a 100644
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -1662,7 +1662,6 @@ void __init intel_pmu_arch_lbr_init(void)

size = sizeof(struct x86_perf_task_context_arch_lbr) +
lbr_nr * sizeof(struct x86_perf_arch_lbr_entry);
- x86_get_pmu()->task_ctx_size = size;
x86_get_pmu()->task_ctx_cache = create_lbr_kmem_cache(size, 0);

x86_pmu.lbr_from = MSR_ARCH_LBR_FROM_0;
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index ef6440f..dd6f3a8 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -419,10 +419,6 @@ struct pmu {
*/
void (*sched_task) (struct perf_event_context *ctx,
bool sched_in);
- /*
- * PMU specific data size
- */
- size_t task_ctx_size;

/*
* Kmem cache of PMU specific data
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 165b79b..9800e99 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -1239,15 +1239,13 @@ static void *alloc_task_ctx_data(struct pmu *pmu)
if (pmu->task_ctx_cache)
return kmem_cache_zalloc(pmu->task_ctx_cache, GFP_KERNEL);

- return kzalloc(pmu->task_ctx_size, GFP_KERNEL);
+ return NULL;
}

static void free_task_ctx_data(struct pmu *pmu, void *task_ctx_data)
{
if (pmu->task_ctx_cache && task_ctx_data)
kmem_cache_free(pmu->task_ctx_cache, task_ctx_data);
- else
- kfree(task_ctx_data);
}

static void free_ctx(struct rcu_head *head)
--
2.7.4