Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1643086 > unrolled thread

[PATCH] kernel: trace: pass export pointer as argument to ->write()

Started byFelipe Balbi <felipe.balbi@linux.intel.com>
First post2017-05-17 10:10 +0200
Last post2017-05-18 05:00 +0200
Articles 4 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] kernel: trace: pass export pointer as argument to ->write() Felipe Balbi <felipe.balbi@linux.intel.com> - 2017-05-17 10:10 +0200
    Re: [PATCH] kernel: trace: pass export pointer as argument to  ->write() Steven Rostedt <rostedt@goodmis.org> - 2017-05-17 15:50 +0200
    Re: [PATCH] kernel: trace: pass export pointer as argument to ->write() Chunyan Zhang <zhang.chunyan@linaro.org> - 2017-05-18 04:30 +0200
      Re: [PATCH] kernel: trace: pass export pointer as argument to  ->write() Steven Rostedt <rostedt@goodmis.org> - 2017-05-18 05:00 +0200

#1643086 — [PATCH] kernel: trace: pass export pointer as argument to ->write()

FromFelipe Balbi <felipe.balbi@linux.intel.com>
Date2017-05-17 10:10 +0200
Subject[PATCH] kernel: trace: pass export pointer as argument to ->write()
Message-ID<tI2bU-xt-3@gated-at.bofh.it>
That way, users don't need to keep a global static pointer and can
rely on container_of() to fetch their own structure.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
---

I'm working on exposing this data over a USB peripheral controller and
I really can't have a global pointer there.

 drivers/hwtracing/stm/ftrace.c | 6 ++++--
 include/linux/trace.h          | 2 +-
 kernel/trace/trace.c           | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/hwtracing/stm/ftrace.c b/drivers/hwtracing/stm/ftrace.c
index bd126a7c6da2..371b8333d9ae 100644
--- a/drivers/hwtracing/stm/ftrace.c
+++ b/drivers/hwtracing/stm/ftrace.c
@@ -42,9 +42,11 @@ static struct stm_ftrace {
  * @len:	length of the data packet
  */
 static void notrace
-stm_ftrace_write(const void *buf, unsigned int len)
+stm_ftrace_write(struct trace_export *export, const void *buf, unsigned int len)
 {
-	stm_source_write(&stm_ftrace.data, STM_FTRACE_CHAN, buf, len);
+	struct stm_ftrace *stm = container_of(export, struct stm_ftrace, ftrace);
+
+	stm_source_write(stm->data, STM_FTRACE_CHAN, buf, len);
 }
 
 static int stm_ftrace_link(struct stm_source_data *data)
diff --git a/include/linux/trace.h b/include/linux/trace.h
index 9330a58e2651..477aed6f0caa 100644
--- a/include/linux/trace.h
+++ b/include/linux/trace.h
@@ -17,7 +17,7 @@
  */
 struct trace_export {
 	struct trace_export __rcu	*next;
-	void (*write)(const void *, unsigned int);
+	void (*write)(struct trace_export *, const void *, unsigned int);
 };
 
 int register_ftrace_export(struct trace_export *export);
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c4536c449021..6a96652a3b0f 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2317,7 +2317,7 @@ trace_process_export(struct trace_export *export,
 
 	entry = ring_buffer_event_data(event);
 	size = ring_buffer_event_length(event);
-	export->write(entry, size);
+	export->write(export, entry, size);
 }
 
 static DEFINE_MUTEX(ftrace_export_lock);
-- 
2.11.0.295.gd7dffce1ce

[toc] | [next] | [standalone]


#1643371 — Re: [PATCH] kernel: trace: pass export pointer as argument to ->write()

FromSteven Rostedt <rostedt@goodmis.org>
Date2017-05-17 15:50 +0200
SubjectRe: [PATCH] kernel: trace: pass export pointer as argument to ->write()
Message-ID<tI7uW-3HE-17@gated-at.bofh.it>
In reply to#1643086
On Wed, 17 May 2017 11:05:54 +0300
Felipe Balbi <felipe.balbi@linux.intel.com> wrote:

> That way, users don't need to keep a global static pointer and can
> rely on container_of() to fetch their own structure.
> 
> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

-- Steve

> ---
> 
> I'm working on exposing this data over a USB peripheral controller and
> I really can't have a global pointer there.
> 
>  drivers/hwtracing/stm/ftrace.c | 6 ++++--
>  include/linux/trace.h          | 2 +-
>  kernel/trace/trace.c           | 2 +-
>  3 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/hwtracing/stm/ftrace.c b/drivers/hwtracing/stm/ftrace.c
> index bd126a7c6da2..371b8333d9ae 100644
> --- a/drivers/hwtracing/stm/ftrace.c
> +++ b/drivers/hwtracing/stm/ftrace.c
> @@ -42,9 +42,11 @@ static struct stm_ftrace {
>   * @len:	length of the data packet
>   */
>  static void notrace
> -stm_ftrace_write(const void *buf, unsigned int len)
> +stm_ftrace_write(struct trace_export *export, const void *buf, unsigned int len)
>  {
> -	stm_source_write(&stm_ftrace.data, STM_FTRACE_CHAN, buf, len);
> +	struct stm_ftrace *stm = container_of(export, struct stm_ftrace, ftrace);
> +
> +	stm_source_write(stm->data, STM_FTRACE_CHAN, buf, len);
>  }
>  
>  static int stm_ftrace_link(struct stm_source_data *data)
> diff --git a/include/linux/trace.h b/include/linux/trace.h
> index 9330a58e2651..477aed6f0caa 100644
> --- a/include/linux/trace.h
> +++ b/include/linux/trace.h
> @@ -17,7 +17,7 @@
>   */
>  struct trace_export {
>  	struct trace_export __rcu	*next;
> -	void (*write)(const void *, unsigned int);
> +	void (*write)(struct trace_export *, const void *, unsigned int);
>  };
>  
>  int register_ftrace_export(struct trace_export *export);
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index c4536c449021..6a96652a3b0f 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -2317,7 +2317,7 @@ trace_process_export(struct trace_export *export,
>  
>  	entry = ring_buffer_event_data(event);
>  	size = ring_buffer_event_length(event);
> -	export->write(entry, size);
> +	export->write(export, entry, size);
>  }
>  
>  static DEFINE_MUTEX(ftrace_export_lock);

[toc] | [prev] | [next] | [standalone]


#1643748

FromChunyan Zhang <zhang.chunyan@linaro.org>
Date2017-05-18 04:30 +0200
Message-ID<tIjmp-3i3-3@gated-at.bofh.it>
In reply to#1643086
On 17 May 2017 at 16:05, Felipe Balbi <felipe.balbi@linux.intel.com> wrote:
> That way, users don't need to keep a global static pointer and can
> rely on container_of() to fetch their own structure.
>
> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

Reviewed-by: Chunyan Zhang <zhang.chunyan@linaro.org>

Thanks,
Chunyan

> ---
>
> I'm working on exposing this data over a USB peripheral controller and
> I really can't have a global pointer there.
>
>  drivers/hwtracing/stm/ftrace.c | 6 ++++--
>  include/linux/trace.h          | 2 +-
>  kernel/trace/trace.c           | 2 +-
>  3 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/hwtracing/stm/ftrace.c b/drivers/hwtracing/stm/ftrace.c
> index bd126a7c6da2..371b8333d9ae 100644
> --- a/drivers/hwtracing/stm/ftrace.c
> +++ b/drivers/hwtracing/stm/ftrace.c
> @@ -42,9 +42,11 @@ static struct stm_ftrace {
>   * @len:       length of the data packet
>   */
>  static void notrace
> -stm_ftrace_write(const void *buf, unsigned int len)
> +stm_ftrace_write(struct trace_export *export, const void *buf, unsigned int len)
>  {
> -       stm_source_write(&stm_ftrace.data, STM_FTRACE_CHAN, buf, len);
> +       struct stm_ftrace *stm = container_of(export, struct stm_ftrace, ftrace);
> +
> +       stm_source_write(stm->data, STM_FTRACE_CHAN, buf, len);
>  }
>
>  static int stm_ftrace_link(struct stm_source_data *data)
> diff --git a/include/linux/trace.h b/include/linux/trace.h
> index 9330a58e2651..477aed6f0caa 100644
> --- a/include/linux/trace.h
> +++ b/include/linux/trace.h
> @@ -17,7 +17,7 @@
>   */
>  struct trace_export {
>         struct trace_export __rcu       *next;
> -       void (*write)(const void *, unsigned int);
> +       void (*write)(struct trace_export *, const void *, unsigned int);
>  };
>
>  int register_ftrace_export(struct trace_export *export);
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index c4536c449021..6a96652a3b0f 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -2317,7 +2317,7 @@ trace_process_export(struct trace_export *export,
>
>         entry = ring_buffer_event_data(event);
>         size = ring_buffer_event_length(event);
> -       export->write(entry, size);
> +       export->write(export, entry, size);
>  }
>
>  static DEFINE_MUTEX(ftrace_export_lock);
> --
> 2.11.0.295.gd7dffce1ce
>

[toc] | [prev] | [next] | [standalone]


#1643752 — Re: [PATCH] kernel: trace: pass export pointer as argument to ->write()

FromSteven Rostedt <rostedt@goodmis.org>
Date2017-05-18 05:00 +0200
SubjectRe: [PATCH] kernel: trace: pass export pointer as argument to ->write()
Message-ID<tIjPs-3vN-3@gated-at.bofh.it>
In reply to#1643748
On Thu, 18 May 2017 10:26:59 +0800
Chunyan Zhang <zhang.chunyan@linaro.org> wrote:

> On 17 May 2017 at 16:05, Felipe Balbi <felipe.balbi@linux.intel.com> wrote:
> > That way, users don't need to keep a global static pointer and can
> > rely on container_of() to fetch their own structure.
> >
> > Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>  
> 
> Reviewed-by: Chunyan Zhang <zhang.chunyan@linaro.org>


If someone wants to pull this through their tree, feel free to do
so. I've already acked it.

-- Steve

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web