Re: [PATCH v4] gpu/trace: add a gpu total memory usage tracepoint

[Yiwei Zhang]

On Tue, Mar 3, 2020 at 7:56 AM Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
>
> On Tue, Mar 03, 2020 at 09:31:04AM -0500, Steven Rostedt wrote:
> > On Tue, 3 Mar 2020 15:15:05 +0100
> > Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> wrote:
> >
> > > On Tue, Mar 03, 2020 at 09:07:03AM -0500, Steven Rostedt wrote:
> > > >
> > > > Greg,
> > > >
> > > > You acked this patch before, did you want to ack it again, and I'll take it
> > > > in my tree?
> > >
> > > Sure, but where did my ack go?  What changed from previous versions???
> > >
> > > Anyway, the patch seems sane enough to me:
> > >
> > > Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> >
> > Your previous ack was was here:
> >
> >   https://lore.kernel.org/lkml/20200213004029.GA2500609@xxxxxxxxx/
>
> Yeah, I remember that.
>
> > And the patch changed since then (although, only cosmetically), so your ack
> > was removed. The diff between this patch and the patch you acked is this:
> >
> > -- Steve
> >
> > diff --git a/include/trace/events/gpu_mem.h b/include/trace/events/gpu_mem.h
> > index 3b632a2b5100..1897822a9150 100644
> > --- a/include/trace/events/gpu_mem.h
> > +++ b/include/trace/events/gpu_mem.h
> > @@ -28,34 +28,27 @@
> >   *
> >   */
> >  TRACE_EVENT(gpu_mem_total,
> > -     TP_PROTO(
> > -             uint32_t gpu_id,
> > -             uint32_t pid,
> > -             uint64_t size
> > -     ),
> > -     TP_ARGS(
> > -             gpu_id,
> > -             pid,
> > -             size
> > -     ),
> > +
> > +     TP_PROTO(uint32_t gpu_id, uint32_t pid, uint64_t size),
> > +
> > +     TP_ARGS(gpu_id, pid, size),
> > +
> >       TP_STRUCT__entry(
> >               __field(uint32_t, gpu_id)
> >               __field(uint32_t, pid)
> >               __field(uint64_t, size)
> >       ),
> > +
> >       TP_fast_assign(
> >               __entry->gpu_id = gpu_id;
> >               __entry->pid = pid;
> >               __entry->size = size;
> >       ),
> > -     TP_printk(
> > -             "gpu_id=%u "
> > -             "pid=%u "
> > -             "size=%llu",
> > +
> > +     TP_printk("gpu_id=%u pid=%u size=%llu",
> >               __entry->gpu_id,
> >               __entry->pid,
> > -             __entry->size
> > -     )
> > +             __entry->size)
> >  );
> >
> >  #endif /* _TRACE_GPU_MEM_H */
>
> thanks for the diff, my ack still stands.
>
> greg k-h

Hi guys, thanks for all the help throughout this. After struggling a
while, I failed to figure out when the next merge window is. Could you
help point me to the release calendar or something?  Thanks again!

Best,
Yiwei