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

!4647 hisi_ptt: Move type check to the beginning of hisi_ptt_pmu_event_init() 

Merge Pull Request from: @lujunhuaHW 
 
When perf_init_event() calls perf_try_init_event() to init pmu driver,
searches for the next pmu driver only when the return value is -ENOENT.
Therefore, hisi_ptt_pmu_event_init() needs to check the type at the
beginning of the function.
Otherwise, in the case of perf-task mode, perf_try_init_event() returns
-EOPNOTSUPP and skips subsequent pmu drivers, causes perf_init_event() to
fail.

bugzilla: https://gitee.com/openeuler/kernel/issues/I92NZO 
 
Link:https://gitee.com/openeuler/kernel/pulls/4647

 

Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 8ec41fca e16e4c70

drivers/hwtracing/ptt/hisi_ptt.c

+3 −3
Original line number Diff line number Diff line
@@ -998,6 +998,9 @@ static int hisi_ptt_pmu_event_init(struct perf_event *event) 
	int ret;

	u32 val;



	if (event->attr.type != hisi_ptt->hisi_ptt_pmu.type)

		return -ENOENT;



	if (event->cpu < 0) {

		dev_dbg(event->pmu->dev, "Per-task mode not supported\n");

		return -EOPNOTSUPP;
@@ -1006,9 +1009,6 @@ static int hisi_ptt_pmu_event_init(struct perf_event *event) 
	if (event->attach_state & PERF_ATTACH_TASK)

		return -EOPNOTSUPP;



	if (event->attr.type != hisi_ptt->hisi_ptt_pmu.type)

		return -ENOENT;



	ret = hisi_ptt_trace_valid_filter(hisi_ptt, event->attr.config);

	if (ret < 0)

		return ret;