linux-kernel - Re: [GIT PULL] tracing: Updates for 5.16

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20211103024145.8e3fafade181fc989f3baca6@kernel.org>
Date:   Wed, 3 Nov 2021 02:41:45 +0900
From:   Masami Hiramatsu <mhiramat@...nel.org>
To:     Steven Rostedt <rostedt@...dmis.org>
Cc:     Linus Torvalds <torvalds@...ux-foundation.org>,
        LKML <linux-kernel@...r.kernel.org>,
        Arnd Bergmann <arnd@...db.de>,
        Carles Pey <carles.pey@...il.com>,
        Changbin Du <changbin.du@...el.com>,
        Daniel Bristot de Oliveira <bristot@...nel.org>,
        Jiri Olsa <jolsa@...hat.com>,
        Josh Poimboeuf <jpoimboe@...hat.com>,
        Kalesh Singh <kaleshsingh@...gle.com>,
        Masami Hiramatsu <mhiramat@...nel.org>,
        Mathieu Desnoyers <mathieu.desnoyers@...icios.com>,
        Punit Agrawal <punitagrawal@...il.com>,
        "Robin H. Johnson" <robbat2@...too.org>,
        Song Liu <songliubraving@...com>,
        Sven Schnelle <svens@...ux.ibm.com>,
        Tiezhu Yang <yangtiezhu@...ngson.cn>,
        Viktor Rosendahl <Viktor.Rosendahl@....de>,
        Wang ShaoBo <bobo.shaobowang@...wei.com>,
        Weizhao Ouyang <o451686892@...il.com>,
        chongjiapeng <jiapeng.chong@...ux.alibaba.com>,
        kernel test robot <lkp@...el.com>,
        王贇 <yun.wang@...ux.alibaba.com>,
        Heiko Carstens <hca@...ux.ibm.com>,
        "Gustavo A. R. Silva" <gustavoars@...nel.org>
Subject: Re: [GIT PULL] tracing: Updates for 5.16

On Tue, 2 Nov 2021 09:17:22 -0400
Steven Rostedt <rostedt@...dmis.org> wrote:

> On Mon, 1 Nov 2021 20:08:30 -0700
> Linus Torvalds <torvalds@...ux-foundation.org> wrote:
> 
> > On Mon, Nov 1, 2021 at 2:55 PM Steven Rostedt <rostedt@...dmis.org> wrote:
> > >
> > > Also, this pull request will conflict with your tree against a fix I had
> > > for trace recursions. I did the conflict resolution and pushed it to my
> > > ftrace/conflicts branch if you want to reference it.  
> > 
> > In the meantime, my tree had grown a few more conflicts elsewhere, but
> > it all looked fairly straightforward.
> > 
> > It might be a good idea if you were to double-check that everything
> > looks good, though.
> >
> 
> I performed the merge and conflict resolution to the same commit you used,
> and came up with pretty much the same (sans whitespace differences).
> 
> The only thing I would like to bring attention to is the wording for the
> comment to kprobe_flush_task() that both Thomas and Masami updated, and I
> want to make sure they are both happy with the final result:
> 
> Thomas, Masami ?
> 
> /*
>  * This function is called from delayed_put_task_struct() when a task is
>  * dead and cleaned up to recycle any kretprobe instances associated with
>  * this task. These left over instances represent probed functions that
>  * have been called but will never return.
>  */
> void kprobe_flush_task(struct task_struct *tk)
> 
> You OK with the above wording?

Yes, this looks good to me :-)
Thank you for merging nicely!

-- 
Masami Hiramatsu <mhiramat@...nel.org>