Unverified Commit 5a7f8ba9 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15608 perf/core: Order the PMU list to fix warning about unordered pmu_ctx_list 

Merge Pull Request from: @ci-robot 
 
PR sync from: Luo Gengkun <luogengkun2@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/2NYNTTXZ6XYWDWR5TYXOD4SZJ2PFJS3P/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBUX7R 
 
Link:https://gitee.com/openeuler/kernel/pulls/15608

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 6f6f173b 86788aa2

kernel/events/core.c

+9 −2
Original line number Diff line number Diff line
@@ -4842,7 +4842,7 @@ static struct perf_event_pmu_context * 
find_get_pmu_context(struct pmu *pmu, struct perf_event_context *ctx,

		     struct perf_event *event)

{

	struct perf_event_pmu_context *new = NULL, *epc;

	struct perf_event_pmu_context *new = NULL, *pos = NULL, *epc;

	void *task_ctx_data = NULL;



	if (!ctx->task) {
@@ -4899,12 +4899,19 @@ find_get_pmu_context(struct pmu *pmu, struct perf_event_context *ctx, 
			atomic_inc(&epc->refcount);

			goto found_epc;

		}

		/* Make sure the pmu_ctx_list is sorted by PMU type: */

		if (!pos && epc->pmu->type > pmu->type)

			pos = epc;

	}



	epc = new;

	new = NULL;



	list_add(&epc->pmu_ctx_entry, &ctx->pmu_ctx_list);

	if (!pos)

		list_add_tail(&epc->pmu_ctx_entry, &ctx->pmu_ctx_list);

	else

		list_add(&epc->pmu_ctx_entry, pos->pmu_ctx_entry.prev);



	epc->ctx = ctx;



found_epc: