* [PATCH v2] hwtracing: hisi_ptt: Move type check to the beginning of hisi_ptt_pmu_event_init()
@ 2024-01-08 12:19 Yang Jihong
2024-01-08 12:29 ` Yicong Yang
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Yang Jihong @ 2024-01-08 12:19 UTC (permalink / raw)
To: yangyicong, jonathan.cameron, alexander.shishkin,
mathieu.poirier, john.garry, linux-kernel
Cc: suzuki.poulose, yangjihong1, wangkefeng.wang, yangyicong
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.
Fixes: ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSilicon PCIe Tune and Trace device")
Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
---
Changes since v1:
- Add fixes tag.
drivers/hwtracing/ptt/hisi_ptt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/hwtracing/ptt/hisi_ptt.c b/drivers/hwtracing/ptt/hisi_ptt.c
index a991ecb7515a..24a1f7797aeb 100644
--- a/drivers/hwtracing/ptt/hisi_ptt.c
+++ b/drivers/hwtracing/ptt/hisi_ptt.c
@@ -995,6 +995,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;
@@ -1003,9 +1006,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;
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] hwtracing: hisi_ptt: Move type check to the beginning of hisi_ptt_pmu_event_init()
2024-01-08 12:19 [PATCH v2] hwtracing: hisi_ptt: Move type check to the beginning of hisi_ptt_pmu_event_init() Yang Jihong
@ 2024-01-08 12:29 ` Yicong Yang
2024-02-26 1:06 ` Yang Jihong
2024-02-26 14:35 ` Suzuki K Poulose
2 siblings, 0 replies; 4+ messages in thread
From: Yicong Yang @ 2024-01-08 12:29 UTC (permalink / raw)
To: Yang Jihong
Cc: suzuki.poulose, wangkefeng.wang, yangyicong, alexander.shishkin,
jonathan.cameron, john.garry, mathieu.poirier, linux-kernel
Hi Jihong,
On 2024/1/8 20:19, Yang Jihong wrote:
> 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.
>
> Fixes: ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSilicon PCIe Tune and Trace device")
> Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
Thanks for fixing this:
Reviewed-by: Yicong Yang <yangyicong@hisilicon.com>
> ---
>
> Changes since v1:
> - Add fixes tag.
>
> drivers/hwtracing/ptt/hisi_ptt.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hwtracing/ptt/hisi_ptt.c b/drivers/hwtracing/ptt/hisi_ptt.c
> index a991ecb7515a..24a1f7797aeb 100644
> --- a/drivers/hwtracing/ptt/hisi_ptt.c
> +++ b/drivers/hwtracing/ptt/hisi_ptt.c
> @@ -995,6 +995,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;
> @@ -1003,9 +1006,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;
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] hwtracing: hisi_ptt: Move type check to the beginning of hisi_ptt_pmu_event_init()
2024-01-08 12:19 [PATCH v2] hwtracing: hisi_ptt: Move type check to the beginning of hisi_ptt_pmu_event_init() Yang Jihong
2024-01-08 12:29 ` Yicong Yang
@ 2024-02-26 1:06 ` Yang Jihong
2024-02-26 14:35 ` Suzuki K Poulose
2 siblings, 0 replies; 4+ messages in thread
From: Yang Jihong @ 2024-02-26 1:06 UTC (permalink / raw)
To: Suzuki Poulouse
Cc: wangkefeng.wang, yangyicong, yangyicong, jonathan.cameron,
alexander.shishkin, mathieu.poirier, john.garry, linux-kernel
Hello,
PING.
Thanks,
Yang
On 2024/1/8 20:19, Yang Jihong wrote:
> 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.
>
> Fixes: ff0de066b463 ("hwtracing: hisi_ptt: Add trace function support for HiSilicon PCIe Tune and Trace device")
> Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
> ---
>
> Changes since v1:
> - Add fixes tag.
>
> drivers/hwtracing/ptt/hisi_ptt.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hwtracing/ptt/hisi_ptt.c b/drivers/hwtracing/ptt/hisi_ptt.c
> index a991ecb7515a..24a1f7797aeb 100644
> --- a/drivers/hwtracing/ptt/hisi_ptt.c
> +++ b/drivers/hwtracing/ptt/hisi_ptt.c
> @@ -995,6 +995,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;
> @@ -1003,9 +1006,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;
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] hwtracing: hisi_ptt: Move type check to the beginning of hisi_ptt_pmu_event_init()
2024-01-08 12:19 [PATCH v2] hwtracing: hisi_ptt: Move type check to the beginning of hisi_ptt_pmu_event_init() Yang Jihong
2024-01-08 12:29 ` Yicong Yang
2024-02-26 1:06 ` Yang Jihong
@ 2024-02-26 14:35 ` Suzuki K Poulose
2 siblings, 0 replies; 4+ messages in thread
From: Suzuki K Poulose @ 2024-02-26 14:35 UTC (permalink / raw)
To: mathieu.poirier, Yang Jihong, alexander.shishkin, john.garry,
jonathan.cameron, yangyicong, linux-kernel
Cc: Suzuki K Poulose, yangyicong, wangkefeng.wang
On Mon, 8 Jan 2024 12:19:06 +0000, Yang Jihong wrote:
> 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.
>
> [...]
Applied, thanks!
[1/1] hwtracing: hisi_ptt: Move type check to the beginning of hisi_ptt_pmu_event_init()
https://git.kernel.org/coresight/c/06226d120a28
Best regards,
--
Suzuki K Poulose <suzuki.poulose@arm.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-26 14:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-08 12:19 [PATCH v2] hwtracing: hisi_ptt: Move type check to the beginning of hisi_ptt_pmu_event_init() Yang Jihong
2024-01-08 12:29 ` Yicong Yang
2024-02-26 1:06 ` Yang Jihong
2024-02-26 14:35 ` Suzuki K Poulose
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®