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.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, 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 3BF98C433DB for ; Wed, 10 Feb 2021 18:35:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 041B864DD4 for ; Wed, 10 Feb 2021 18:35:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231939AbhBJSe7 (ORCPT ); Wed, 10 Feb 2021 13:34:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52861 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234275AbhBJSbO (ORCPT ); Wed, 10 Feb 2021 13:31:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612981783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=r7Y1DVfWb4o7Hpsmpvc7aELdC5QDqIQH5+nQpBg6HlI=; b=Hc0Jgxpxo4WxfqEg8GFEqvzY6XpmGIdlOscgfZypJJLfZt/Uy8dY6kUkbTVESH1eqG+CkY iCYfok6x9E3ph6TgWSN3ney6yneWOl+r53364r+yV0yZ3QCeXMqx2aVC+7hFSXixbDsj8P iO1iBwFv4sBmNkM2/xRYs6E41hL8bgQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-371-tvMyJIsaNdSIIiCZTSfkow-1; Wed, 10 Feb 2021 13:29:38 -0500 X-MC-Unique: tvMyJIsaNdSIIiCZTSfkow-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BD672192CC40; Wed, 10 Feb 2021 18:29:35 +0000 (UTC) Received: from krava (unknown [10.40.195.206]) by smtp.corp.redhat.com (Postfix) with SMTP id 5301261F47; Wed, 10 Feb 2021 18:29:32 +0000 (UTC) Date: Wed, 10 Feb 2021 19:29:31 +0100 From: Jiri Olsa To: Nathan Chancellor Cc: Andrii Nakryiko , 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: References: <20210205124020.683286-1-jolsa@kernel.org> <20210205124020.683286-5-jolsa@kernel.org> <20210210174451.GA1943051@ubuntu-m3-large-x86> <20210210180215.GA2374611@ubuntu-m3-large-x86> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210210180215.GA2374611@ubuntu-m3-large-x86> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Wed, Feb 10, 2021 at 11:02:15AM -0700, Nathan Chancellor wrote: > 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? right, we need to handle the case where tools/bpf/resolve_btfids does not exist, patch below fixes it for me jirka --- diff --git a/Makefile b/Makefile index 159d9592b587..ce9685961abe 100644 --- a/Makefile +++ b/Makefile @@ -1088,8 +1088,14 @@ endif PHONY += resolve_btfids_clean +resolve_btfids_O = $(abspath $(objtree))/tools/bpf/resolve_btfids + +# tools/bpf/resolve_btfids directory might not exist +# in output directory, skip its clean in that case resolve_btfids_clean: - $(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(abspath $(objtree))/tools/bpf/resolve_btfids clean +ifneq (,$(wildcard $(resolve_btfids_O))) + $(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean +endif ifdef CONFIG_BPF ifdef CONFIG_DEBUG_INFO_BTF