2024-03-21 21:41:49

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the perf tree

Hi all,

After merging the perf tree, today's linux-next build (native perf)
failed like this:

make[3]: *** No rule to make target '/home/sfr/next/next/tools/include/uapi/linux/stat.h', needed by '/home/sfr/next/perf/libbpf/staticobjs/libbpf.o'. Stop.

Caused by commit

f122b3d6d179 ("perf beauty: Introduce scrape script for the 'statx' syscall 'mask' argument")

Are all these new commits today really destined for the current merge
window?

I have used the perf tree from next-20240321 for today.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2024-03-21 23:18:13

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the perf tree

On Fri, Mar 22, 2024 at 08:41:31AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the perf tree, today's linux-next build (native perf)
> failed like this:
>
> make[3]: *** No rule to make target '/home/sfr/next/next/tools/include/uapi/linux/stat.h', needed by '/home/sfr/next/perf/libbpf/staticobjs/libbpf.o'. Stop.
>
> Caused by commit
>
> f122b3d6d179 ("perf beauty: Introduce scrape script for the 'statx' syscall 'mask' argument")
>
> Are all these new commits today really destined for the current merge
> window?
>
> I have used the perf tree from next-20240321 for today.

Ok, maybe I opened perf-tools-next for the next merge window too early?

For this merge window I think Namhyung is switching to perf-tools,
right?

From your reaction I think I made a mistake and should have opened
perf-tools-next for v6.10 stuff only when the v6.9-rc1 gets released...

- Arnaldo

2024-03-21 23:19:11

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the perf tree

On Thu, Mar 21, 2024 at 08:18:03PM -0300, Arnaldo Carvalho de Melo wrote:
> On Fri, Mar 22, 2024 at 08:41:31AM +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the perf tree, today's linux-next build (native perf)
> > failed like this:
> >
> > make[3]: *** No rule to make target '/home/sfr/next/next/tools/include/uapi/linux/stat.h', needed by '/home/sfr/next/perf/libbpf/staticobjs/libbpf.o'. Stop.

About this specific problem, was this done on over a previous build? Can
you try after a 'make -C tools/perf clean' ?

> > Caused by commit
> >
> > f122b3d6d179 ("perf beauty: Introduce scrape script for the 'statx' syscall 'mask' argument")

> > Are all these new commits today really destined for the current merge
> > window?
> >
> > I have used the perf tree from next-20240321 for today.
>
> Ok, maybe I opened perf-tools-next for the next merge window too early?
>
> For this merge window I think Namhyung is switching to perf-tools,
> right?
>
> From your reaction I think I made a mistake and should have opened
> perf-tools-next for v6.10 stuff only when the v6.9-rc1 gets released...
>
> - Arnaldo

2024-03-21 23:33:01

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the perf tree

Hi Arnaldo,

On Thu, 21 Mar 2024 20:19:00 -0300 Arnaldo Carvalho de Melo <[email protected]> wrote:
>
>
> About this specific problem, was this done on over a previous build? Can
> you try after a 'make -C tools/perf clean' ?

It was done over a previous build. I can try a clean build later
today. We have had this problem before with different include files
and I think it came down to a missing dependency.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2024-03-21 23:36:51

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the perf tree

Hi Arnaldo,

On Thu, 21 Mar 2024 20:18:00 -0300 Arnaldo Carvalho de Melo <[email protected]> wrote:
>
> Ok, maybe I opened perf-tools-next for the next merge window too early?

Yeah.

> For this merge window I think Namhyung is switching to perf-tools,
> right?

Hopefully. That branch is for bugs fixes, I think.

> From your reaction I think I made a mistake and should have opened
> perf-tools-next for v6.10 stuff only when the v6.9-rc1 gets released...

The top of my daily linux-next release report says

"Please do not add any v6.10 material to your linux-next included branches
until after v6.9-rc1 has been released."

(I did forget this message for few days this merge window, sorry).

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2024-03-21 23:47:58

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the perf tree

On Fri, Mar 22, 2024 at 10:36:36AM +1100, Stephen Rothwell wrote:
> Hi Arnaldo,
>
> On Thu, 21 Mar 2024 20:18:00 -0300 Arnaldo Carvalho de Melo <[email protected]> wrote:
> >
> > Ok, maybe I opened perf-tools-next for the next merge window too early?
>
> Yeah.

Ok, I'm rewinding perf-tools-next to the point where Linus merged
Namhyung's first, and only so far, pull request, sorry for the noise.

> > For this merge window I think Namhyung is switching to perf-tools,
> > right?

> Hopefully. That branch is for bugs fixes, I think.

Right, that will start at rc1, ok.

> > From your reaction I think I made a mistake and should have opened
> > perf-tools-next for v6.10 stuff only when the v6.9-rc1 gets released...
>
> The top of my daily linux-next release report says
>
> "Please do not add any v6.10 material to your linux-next included branches
> until after v6.9-rc1 has been released."
>
> (I did forget this message for few days this merge window, sorry).

Ok,

- Arnaldo

2024-03-21 23:49:12

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the perf tree

On Fri, Mar 22, 2024 at 10:36:36AM +1100, Stephen Rothwell wrote:
> Hi Arnaldo,
>
> On Thu, 21 Mar 2024 20:18:00 -0300 Arnaldo Carvalho de Melo <[email protected]> wrote:
> >
> > Ok, maybe I opened perf-tools-next for the next merge window too early?
>
> Yeah.

Ok, I got it back to:

acme@x1:~/git/perf-tools-next$ git log --oneline -3 perf-tools-next/perf-tools-next
1bbeaf83dd7b5e36 (perf-tools-next/perf-tools-next) Merge tag 'perf-tools-for-v6.9-2024-03-13' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools
63bd30f249dcf0a7 Merge tag 'trace-ring-buffer-v6.8-rc7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
01732755ee30f086 Merge tag 'probes-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
acme@x1:~/git/perf-tools-next$

Sorry for the noise, I'll move to perf-tools-next when -rc1 gets
released, I'm acumulating new stuff on a different branch.

- Arnaldo

2024-03-22 02:13:55

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the perf tree

Hi Arnaldo,

On Fri, 22 Mar 2024 10:32:29 +1100 Stephen Rothwell <[email protected]> wrote:
>
> On Thu, 21 Mar 2024 20:19:00 -0300 Arnaldo Carvalho de Melo <[email protected]> wrote:
>
> > About this specific problem, was this done on over a previous build? Can
> > you try after a 'make -C tools/perf clean' ?
>
> It was done over a previous build. I can try a clean build later
> today. We have had this problem before with different include files
> and I think it came down to a missing dependency.

It builds OK if I do the clean first.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2024-03-22 14:33:23

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the perf tree

On Fri, Mar 22, 2024 at 01:13:38PM +1100, Stephen Rothwell wrote:
> Hi Arnaldo,
>
> On Fri, 22 Mar 2024 10:32:29 +1100 Stephen Rothwell <[email protected]> wrote:
> >
> > On Thu, 21 Mar 2024 20:19:00 -0300 Arnaldo Carvalho de Melo <[email protected]> wrote:
> >
> > > About this specific problem, was this done on over a previous build? Can
> > > you try after a 'make -C tools/perf clean' ?
> >
> > It was done over a previous build. I can try a clean build later
> > today. We have had this problem before with different include files
> > and I think it came down to a missing dependency.
>
> It builds OK if I do the clean first.

Thanks for checking, I'll try and have this noticed by make so that it
works even when doing it on a previous build.

- Arnaldo