From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1EF80C433DB for ; Wed, 10 Feb 2021 18:06:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E656F64DB1 for ; Wed, 10 Feb 2021 18:06:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233718AbhBJSFT (ORCPT ); Wed, 10 Feb 2021 13:05:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:54518 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233790AbhBJSC7 (ORCPT ); Wed, 10 Feb 2021 13:02:59 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4D03E64DD6; Wed, 10 Feb 2021 18:02:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612980137; bh=bpdU7SzB+UU1APn0byqAKfJjordQigirM2QSD7DDDK0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=IruwRr6Regxi3btAXsedZ4NszJ3zi6NV+nAJnRO3QV5znXCxEDkbNtImFER74BUQd DVFiWMOi3gf7g/9FlSTD8Oie0a90lhUZaa9XByKfZhpgBP3/QkhdayyBEbcrBsI8rI KnTHE0+SP2GNPxIeavlUKbRmhiDk0d6anZMh5/rWQFcdPy4P7ji9CuTmPSvroEd4vV ZpXbLO9T42GVXwAwg06/aUezAsrC+rZFd/3AcP2m+shndGjXobhMMVeTaPRdx0ngE2 9onvJQH7DAyHsjjbPAe8If6T4o3tSNixyfUl/fTgry68gqFRnY9hf4IAPy4DCUd475 +IYL03jU50Mzw== Date: Wed, 10 Feb 2021 11:02:15 -0700 From: Nathan Chancellor To: Andrii Nakryiko Cc: Jiri Olsa , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Song Liu , Networking , bpf , Martin KaFai Lau , Yonghong Song , John Fastabend , KP Singh , Masahiro Yamada , Michal Marek , Linux Kbuild mailing list Subject: Re: [PATCH bpf-next 4/4] kbuild: Add resolve_btfids clean to root clean target Message-ID: <20210210180215.GA2374611@ubuntu-m3-large-x86> References: <20210205124020.683286-1-jolsa@kernel.org> <20210205124020.683286-5-jolsa@kernel.org> <20210210174451.GA1943051@ubuntu-m3-large-x86> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Wed, Feb 10, 2021 at 09:52:42AM -0800, Andrii Nakryiko wrote: > On Wed, Feb 10, 2021 at 9:47 AM Nathan Chancellor wrote: > > > > On Fri, Feb 05, 2021 at 01:40:20PM +0100, Jiri Olsa wrote: > > > The resolve_btfids tool is used during the kernel build, > > > so we should clean it on kernel's make clean. > > > > > > Invoking the the resolve_btfids clean as part of root > > > 'make clean'. > > > > > > Acked-by: Song Liu > > > Signed-off-by: Jiri Olsa > > > --- > > > Makefile | 7 ++++++- > > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > > > diff --git a/Makefile b/Makefile > > > index b0e4767735dc..159d9592b587 100644 > > > --- a/Makefile > > > +++ b/Makefile > > > @@ -1086,6 +1086,11 @@ ifdef CONFIG_STACK_VALIDATION > > > endif > > > endif > > > > > > +PHONY += resolve_btfids_clean > > > + > > > +resolve_btfids_clean: > > > + $(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(abspath $(objtree))/tools/bpf/resolve_btfids clean > > > + > > > ifdef CONFIG_BPF > > > ifdef CONFIG_DEBUG_INFO_BTF > > > ifeq ($(has_libelf),1) > > > @@ -1495,7 +1500,7 @@ vmlinuxclean: > > > $(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean > > > $(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean) > > > > > > -clean: archclean vmlinuxclean > > > +clean: archclean vmlinuxclean resolve_btfids_clean > > > > > > # mrproper - Delete all generated files, including .config > > > # > > > -- > > > 2.26.2 > > > > > > > This breaks running distclean on a clean tree (my script just > > unconditionally runs distclean regardless of the tree state): > > > > $ make -s O=build distclean > > ../../scripts/Makefile.include:4: *** O=/home/nathan/cbl/src/linux-next/build/tools/bpf/resolve_btfids does not exist. Stop. > > > > Can't reproduce it. It works in all kinds of variants (relative and > absolute O=, clean and not clean trees, etc). Jiri, please check as > well. > Odd, this reproduces for me on a completely clean checkout of bpf-next: $ git clone --depth=1 https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/ $ cd bpf-next $ make -s O=build distclean ../../scripts/Makefile.include:4: *** O=/tmp/bpf-next/build/tools/bpf/resolve_btfids does not exist. Stop. I do not really see how this could be environment related. It seems like this comes from tools/scripts/Makefile.include, where there is no guarantee that $(O) is created before being used like in the main Makefile? Cheers, Nathan