Subject: [PATCH] bus: mhi: host: Change the trace string for the userspace tools mapping

User space tools can't map strings if we use directly, as the string
address is internal to kernel.

So add trace point strings for the user space tools to map strings
properly.

Signed-off-by: Krishna chaitanya chundru <[email protected]>
---
drivers/bus/mhi/host/main.c | 4 ++--
drivers/bus/mhi/host/trace.h | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/bus/mhi/host/main.c b/drivers/bus/mhi/host/main.c
index 2d38f6005da6..15d657af9b5b 100644
--- a/drivers/bus/mhi/host/main.c
+++ b/drivers/bus/mhi/host/main.c
@@ -1340,7 +1340,7 @@ static int mhi_update_channel_state(struct mhi_controller *mhi_cntrl,
enum mhi_cmd_type cmd = MHI_CMD_NOP;
int ret;

- trace_mhi_channel_command_start(mhi_cntrl, mhi_chan, to_state, "Updating");
+ trace_mhi_channel_command_start(mhi_cntrl, mhi_chan, to_state, TPS("Updating"));
switch (to_state) {
case MHI_CH_STATE_TYPE_RESET:
write_lock_irq(&mhi_chan->lock);
@@ -1407,7 +1407,7 @@ static int mhi_update_channel_state(struct mhi_controller *mhi_cntrl,
write_unlock_irq(&mhi_chan->lock);
}

- trace_mhi_channel_command_end(mhi_cntrl, mhi_chan, to_state, "Updated");
+ trace_mhi_channel_command_end(mhi_cntrl, mhi_chan, to_state, TPS("Updated"));
exit_channel_update:
mhi_cntrl->runtime_put(mhi_cntrl);
mhi_device_put(mhi_cntrl->mhi_dev);
diff --git a/drivers/bus/mhi/host/trace.h b/drivers/bus/mhi/host/trace.h
index d12a98d44272..368515dcb22d 100644
--- a/drivers/bus/mhi/host/trace.h
+++ b/drivers/bus/mhi/host/trace.h
@@ -84,6 +84,8 @@ DEV_ST_TRANSITION_LIST
#define dev_st_trans(a, b) { DEV_ST_TRANSITION_##a, b },
#define dev_st_trans_end(a, b) { DEV_ST_TRANSITION_##a, b }

+#define TPS(x) tracepoint_string(x)
+
TRACE_EVENT(mhi_gen_tre,

TP_PROTO(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,

---
base-commit: ceeb64f41fe6a1eb9fc56d583983a81f8f3dd058
change-id: 20240218-ftrace_string-7677762aa63c

Best regards,
--
Krishna chaitanya chundru <[email protected]>



2024-02-21 06:12:12

by Manivannan Sadhasivam

[permalink] [raw]
Subject: Re: [PATCH] bus: mhi: host: Change the trace string for the userspace tools mapping

On Sun, Feb 18, 2024 at 02:13:39PM +0530, Krishna chaitanya chundru wrote:
> User space tools can't map strings if we use directly, as the string
> address is internal to kernel.
>
> So add trace point strings for the user space tools to map strings
> properly.
>
> Signed-off-by: Krishna chaitanya chundru <[email protected]>

Reported-by: Steven Rostedt <[email protected]>
Reviewed-by: Manivannan Sadhasivam <[email protected]>

- Mani

> ---
> drivers/bus/mhi/host/main.c | 4 ++--
> drivers/bus/mhi/host/trace.h | 2 ++
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/bus/mhi/host/main.c b/drivers/bus/mhi/host/main.c
> index 2d38f6005da6..15d657af9b5b 100644
> --- a/drivers/bus/mhi/host/main.c
> +++ b/drivers/bus/mhi/host/main.c
> @@ -1340,7 +1340,7 @@ static int mhi_update_channel_state(struct mhi_controller *mhi_cntrl,
> enum mhi_cmd_type cmd = MHI_CMD_NOP;
> int ret;
>
> - trace_mhi_channel_command_start(mhi_cntrl, mhi_chan, to_state, "Updating");
> + trace_mhi_channel_command_start(mhi_cntrl, mhi_chan, to_state, TPS("Updating"));
> switch (to_state) {
> case MHI_CH_STATE_TYPE_RESET:
> write_lock_irq(&mhi_chan->lock);
> @@ -1407,7 +1407,7 @@ static int mhi_update_channel_state(struct mhi_controller *mhi_cntrl,
> write_unlock_irq(&mhi_chan->lock);
> }
>
> - trace_mhi_channel_command_end(mhi_cntrl, mhi_chan, to_state, "Updated");
> + trace_mhi_channel_command_end(mhi_cntrl, mhi_chan, to_state, TPS("Updated"));
> exit_channel_update:
> mhi_cntrl->runtime_put(mhi_cntrl);
> mhi_device_put(mhi_cntrl->mhi_dev);
> diff --git a/drivers/bus/mhi/host/trace.h b/drivers/bus/mhi/host/trace.h
> index d12a98d44272..368515dcb22d 100644
> --- a/drivers/bus/mhi/host/trace.h
> +++ b/drivers/bus/mhi/host/trace.h
> @@ -84,6 +84,8 @@ DEV_ST_TRANSITION_LIST
> #define dev_st_trans(a, b) { DEV_ST_TRANSITION_##a, b },
> #define dev_st_trans_end(a, b) { DEV_ST_TRANSITION_##a, b }
>
> +#define TPS(x) tracepoint_string(x)
> +
> TRACE_EVENT(mhi_gen_tre,
>
> TP_PROTO(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,
>
> ---
> base-commit: ceeb64f41fe6a1eb9fc56d583983a81f8f3dd058
> change-id: 20240218-ftrace_string-7677762aa63c
>
> Best regards,
> --
> Krishna chaitanya chundru <[email protected]>
>

--
மணிவண்ணன் சதாசிவம்

2024-02-21 14:13:24

by Steven Rostedt

[permalink] [raw]
Subject: Re: [PATCH] bus: mhi: host: Change the trace string for the userspace tools mapping

On Wed, 21 Feb 2024 11:41:46 +0530
Manivannan Sadhasivam <[email protected]> wrote:

> On Sun, Feb 18, 2024 at 02:13:39PM +0530, Krishna chaitanya chundru wrote:
> > User space tools can't map strings if we use directly, as the string
> > address is internal to kernel.
> >
> > So add trace point strings for the user space tools to map strings
> > properly.
> >
> > Signed-off-by: Krishna chaitanya chundru <[email protected]>
>
> Reported-by: Steven Rostedt <[email protected]>

Suggested-by: may be more accurate?

-- Steve

> Reviewed-by: Manivannan Sadhasivam <[email protected]>


2024-02-22 05:15:17

by Manivannan Sadhasivam

[permalink] [raw]
Subject: Re: [PATCH] bus: mhi: host: Change the trace string for the userspace tools mapping

On Wed, Feb 21, 2024 at 09:11:03AM -0500, Steven Rostedt wrote:
> On Wed, 21 Feb 2024 11:41:46 +0530
> Manivannan Sadhasivam <[email protected]> wrote:
>
> > On Sun, Feb 18, 2024 at 02:13:39PM +0530, Krishna chaitanya chundru wrote:
> > > User space tools can't map strings if we use directly, as the string
> > > address is internal to kernel.
> > >
> > > So add trace point strings for the user space tools to map strings
> > > properly.
> > >
> > > Signed-off-by: Krishna chaitanya chundru <[email protected]>
> >
> > Reported-by: Steven Rostedt <[email protected]>
>
> Suggested-by: may be more accurate?
>

Sure. Will change it while applying.

- Mani

> -- Steve
>
> > Reviewed-by: Manivannan Sadhasivam <[email protected]>
>

--
மணிவண்ணன் சதாசிவம்

2024-02-22 05:16:54

by Manivannan Sadhasivam

[permalink] [raw]
Subject: Re: [PATCH] bus: mhi: host: Change the trace string for the userspace tools mapping

On Sun, Feb 18, 2024 at 02:13:39PM +0530, Krishna chaitanya chundru wrote:
> User space tools can't map strings if we use directly, as the string
> address is internal to kernel.
>
> So add trace point strings for the user space tools to map strings
> properly.
>
> Signed-off-by: Krishna chaitanya chundru <[email protected]>

Applied to mhi-next!

- Mani

> ---
> drivers/bus/mhi/host/main.c | 4 ++--
> drivers/bus/mhi/host/trace.h | 2 ++
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/bus/mhi/host/main.c b/drivers/bus/mhi/host/main.c
> index 2d38f6005da6..15d657af9b5b 100644
> --- a/drivers/bus/mhi/host/main.c
> +++ b/drivers/bus/mhi/host/main.c
> @@ -1340,7 +1340,7 @@ static int mhi_update_channel_state(struct mhi_controller *mhi_cntrl,
> enum mhi_cmd_type cmd = MHI_CMD_NOP;
> int ret;
>
> - trace_mhi_channel_command_start(mhi_cntrl, mhi_chan, to_state, "Updating");
> + trace_mhi_channel_command_start(mhi_cntrl, mhi_chan, to_state, TPS("Updating"));
> switch (to_state) {
> case MHI_CH_STATE_TYPE_RESET:
> write_lock_irq(&mhi_chan->lock);
> @@ -1407,7 +1407,7 @@ static int mhi_update_channel_state(struct mhi_controller *mhi_cntrl,
> write_unlock_irq(&mhi_chan->lock);
> }
>
> - trace_mhi_channel_command_end(mhi_cntrl, mhi_chan, to_state, "Updated");
> + trace_mhi_channel_command_end(mhi_cntrl, mhi_chan, to_state, TPS("Updated"));
> exit_channel_update:
> mhi_cntrl->runtime_put(mhi_cntrl);
> mhi_device_put(mhi_cntrl->mhi_dev);
> diff --git a/drivers/bus/mhi/host/trace.h b/drivers/bus/mhi/host/trace.h
> index d12a98d44272..368515dcb22d 100644
> --- a/drivers/bus/mhi/host/trace.h
> +++ b/drivers/bus/mhi/host/trace.h
> @@ -84,6 +84,8 @@ DEV_ST_TRANSITION_LIST
> #define dev_st_trans(a, b) { DEV_ST_TRANSITION_##a, b },
> #define dev_st_trans_end(a, b) { DEV_ST_TRANSITION_##a, b }
>
> +#define TPS(x) tracepoint_string(x)
> +
> TRACE_EVENT(mhi_gen_tre,
>
> TP_PROTO(struct mhi_controller *mhi_cntrl, struct mhi_chan *mhi_chan,
>
> ---
> base-commit: ceeb64f41fe6a1eb9fc56d583983a81f8f3dd058
> change-id: 20240218-ftrace_string-7677762aa63c
>
> Best regards,
> --
> Krishna chaitanya chundru <[email protected]>
>

--
மணிவண்ணன் சதாசிவம்