Received-SPF: pass (google.com: domain of linux-kernel+bounces-201866-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Sender: Ingo Molnar <mingo.kernel.org@gmail.com>
Date: Wed, 5 Jun 2024 09:18:33 +0200
From: Ingo Molnar <mingo@kernel.org>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Ian Rogers <irogers@google.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Adrian Hunter <adrian.hunter@intel.com>,
	Jiri Olsa <jolsa@kernel.org>, Kan Liang <kan.liang@linux.intel.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-perf-users@vger.kernel.org
Subject: Re: Makefile.perf:1149: *** Missing bpftool input for generating
 vmlinux.h. Stop.
Message-ID: <ZmARSXB0Wqp6wMpr@gmail.com>
References: <ZjssGrj+abyC6mYP@gmail.com>
 <CAP-5=fUvLiCDVDFFfJ78ng4T1FZ8j2N9Yt1sGTeGsupkbFEEug@mail.gmail.com>
 <ZkG4LWr7w11wQ/PR@gmail.com>
 <CAP-5=fVHrKcqwczoU1uMD4tP5DTVhfQ1T_hXnm_y5Ji3M6K_ag@mail.gmail.com>
 <ZkJK3x3zQ9a4wp8E@gmail.com>
 <CAP-5=fUh+GoqERAF-qf8zx4kwq2uzwR2Ugop5XOkPexYGAqF3A@mail.gmail.com>
 <CAP-5=fWXDPfNqLz6DHYe9+dev_e6X5TcTe_xzOOz27yDkT7o7A@mail.gmail.com>
 <CAM9d7ch5HTr+k+_GpbMrX0HUo5BZ11byh1xq0Two7B7RQACuNw@mail.gmail.com>
 <ZmAQfJ9C5fFQdjQM@gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ZmAQfJ9C5fFQdjQM@gmail.com>


* Ingo Molnar <mingo@kernel.org> wrote:

> 
> * Namhyung Kim <namhyung@kernel.org> wrote:
> 
> > Hi Ian and Ingo,
> > 
> > The failure happens when you don't have vmlinux.h or vmlinux with BTF.
> > 
> > ifeq ($(VMLINUX_H),)
> >   ifeq ($(VMLINUX_BTF),)
> >     $(error Missing bpftool input for generating vmlinux.h)
> >   endif
> > endif
> > 
> > VMLINUX_BTF can be empty if you didn't build a kernel or
> > it doesn't have a BTF section and the current kernel also
> > has no BTF.  This is totally ok.
> > 
> > But VMLINUX_H should be set to the minimal version in
> > the source tree (unless you overwrite it manually) when you
> > don't pass GEN_VMLINUX_H=1 (which requires VMLINUX_BTF
> > should not be empty).  The problem is that it's defined in
> > Makefile.config which is not included for `make clean`.
> > 
> > Can you please verify if the below patch fixes it?
> > 
> > Thanks,
> > Namhyung
> > 
> > ---8<---
> > 
> > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> > index 5c35c0d89306..e6d56b555369 100644
> > --- a/tools/perf/Makefile.perf
> > +++ b/tools/perf/Makefile.perf
> > @@ -214,6 +214,7 @@ NON_CONFIG_TARGETS := clean python-clean TAGS tags
> > cscope help
> > 
> >  ifdef MAKECMDGOALS
> >  ifeq ($(filter-out $(NON_CONFIG_TARGETS),$(MAKECMDGOALS)),)
> > +  VMLINUX_H=$(src-perf)/util/bpf_skel/vmlinux/vmlinux.h
> >    config := 0
> >  endif
> >  endif
> 
> Yeah, this appears to be doing the trick here - judging by a couple of 
> tries of interrupted builds:
> 
>    Tested-by: Ingo Molnar <mingo@kernel.org>

Specifically I also tested it on a failed tree, by merging in your fix the 
build now progresses as expected. So this is fixed for good.

Thanks,

	Ingo