linux-kernel - Re: linux-next: manual merge of the ftrace tree with Linus' tree

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: <20240927142009.16fe7e19@gandalf.local.home>
Date: Fri, 27 Sep 2024 14:20:09 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: Andrii Nakryiko <andrii.nakryiko@...il.com>
Cc: Stephen Rothwell <sfr@...b.auug.org.au>, Masami Hiramatsu
 <mhiramat@...nel.org>, Andrii Nakryiko <andrii@...nel.org>, Linux Kernel
 Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the ftrace tree with Linus' tree

On Fri, 27 Sep 2024 11:13:30 -0700
Andrii Nakryiko <andrii.nakryiko@...il.com> wrote:

> Hm... sounds like two versions of my patch were applied to two
> different trees or something? FWIW, 10cdb82aa77f is the right one cto
> pick (I didn't check which one is in Linus' tree), but the differences
> are tiny.
> 
> diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
> index 87b468d93f6a..c3df411a2684 100644
> --- a/kernel/trace/trace_uprobe.c
> +++ b/kernel/trace/trace_uprobe.c
> @@ -834,7 +834,7 @@ static int probes_profile_seq_show(struct seq_file
> *m, void *v)
> 
>         nhits = 0;
>         for_each_possible_cpu(cpu) {
> -               nhits += READ_ONCE(*per_cpu_ptr(tu->nhits, cpu));
> +               nhits += per_cpu(*tu->nhits, cpu);
>         }
> 
>         seq_printf(m, "  %s %-44s %15lu\n", tu->filename,
> 
> >

It looks like Masami rebased his tree and I didn't do the update yet.

I updated the latest for-next in the tracing repo, so everything should be
good again.

-- Steve