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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DA49C433EF for ; Thu, 4 Nov 2021 17:38:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 46FC360E90 for ; Thu, 4 Nov 2021 17:38:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233996AbhKDRkk (ORCPT ); Thu, 4 Nov 2021 13:40:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:49768 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233993AbhKDRki (ORCPT ); Thu, 4 Nov 2021 13:40:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 087DD60E90; Thu, 4 Nov 2021 17:38:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636047480; bh=3dj54GcToDRArCavCYNJX6yC7TQbVCKsCf0X142AsN4=; h=Date:From:To:Cc:Subject:From; b=ZRm47lGanUSQF+rZXsdd7tJtrfbOawKWrtazrpkrNThnER0OcS/zUQW9P79HLNUkB IXvx9CnbdBMILZdTZuZzo1/wxm+w0bUURrCINFsseom5Hl+Db0YqDMOdb6R/Im2uHY RcPhst0dFOqQPQqBzw1p2Uyf4DolhOZyYI2uwTYBEOoUaFps5iL5BMkwYCKMoeC3Mh iolF1k8teUGtZ3oPNYep8lJiSoOHpofA/kuDrpyYps7ym/l92vRYDVQF2LojEi4yeZ WO5dEt21xNCMP5QOQTeFoTwwezMYzXpHOD8wVp6/uawVWAKPHLgFothOsVbL+/v64g Q4OLc4wSabIqg== Received: by quaco.ghostprotocols.net (Postfix, from userid 1000) id AB116410A1; Thu, 4 Nov 2021 14:37:57 -0300 (-03) Date: Thu, 4 Nov 2021 14:37:57 -0300 From: Arnaldo Carvalho de Melo To: Song Liu Cc: Andrii Nakryiko , Jiri Olsa , Namhyung Kim , bpf@vger.kernel.org, Linux Kernel Mailing List Subject: perf build broken looking for bpf/{libbpf,bpf}.h after merge with upstream Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Url: http://acmel.wordpress.com Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Song, I just did a merge with upstream and I'm getting this: LINK /tmp/build/perf/plugins/plugin_scsi.so INSTALL trace_plugins Auto-detecting system features: ... libbfd: [ on ] ... disassembler-four-args: [ on ] ... zlib: [ on ] ... libcap: [ on ] ... clang-bpf-co-re: [ on ] MKDIR /tmp/build/perf/util/bpf_skel/.tmp//libbpf//include/bpf MKDIR /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/ MKDIR /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/ INSTALL /tmp/build/perf/util/bpf_skel/.tmp//libbpf//include/bpf/hashmap.h INSTALL /tmp/build/perf/util/bpf_skel/.tmp//libbpf//include/bpf/nlattr.h GEN /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/bpf_helper_defs.h MKDIR /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/ MKDIR /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/ MKDIR /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/ MKDIR /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/ MKDIR /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/ MKDIR /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/ MKDIR /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/ MKDIR /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/ CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/libbpf.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/libbpf_probes.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/xsk.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/bpf.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/nlattr.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/btf.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/libbpf_errno.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/hashmap.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/str_error.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/netlink.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/btf_dump.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/bpf_prog_linfo.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/ringbuf.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/strset.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/linker.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/gen_loader.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/relo_core.o LD /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/staticobjs/libbpf-in.o LINK /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/libbpf/libbpf.a CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/main.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/common.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/gen.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/json_writer.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/btf.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/xlated_dumper.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/btf_dumper.o CC /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/disasm.o gen.c:15:10: fatal error: bpf/bpf.h: No such file or directory 15 | #include | ^~~~~~~~~~~ compilation terminated. make[3]: *** [Makefile:213: /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/gen.o] Error 1 make[3]: *** Waiting for unfinished jobs.... xlated_dumper.c:10:10: fatal error: bpf/libbpf.h: No such file or directory 10 | #include | ^~~~~~~~~~~~~~ compilation terminated. btf.c:15:10: fatal error: bpf/bpf.h: No such file or directory 15 | #include | ^~~~~~~~~~~ compilation terminated. make[3]: *** [Makefile:213: /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/xlated_dumper.o] Error 1 make[3]: *** [Makefile:213: /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/btf.o] Error 1 main.c:12:10: fatal error: bpf/bpf.h: No such file or directory 12 | #include | ^~~~~~~~~~~ compilation terminated. make[3]: *** [Makefile:213: /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/main.o] Error 1 btf_dumper.c:12:10: fatal error: bpf/btf.h: No such file or directory 12 | #include | ^~~~~~~~~~~ compilation terminated. make[3]: *** [Makefile:213: /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/btf_dumper.o] Error 1 common.c:24:10: fatal error: bpf/bpf.h: No such file or directory 24 | #include | ^~~~~~~~~~~ compilation terminated. make[3]: *** [Makefile:213: /tmp/build/perf/util/bpf_skel/.tmp//bootstrap/common.o] Error 1 make[2]: *** [Makefile.perf:1048: /tmp/build/perf/util/bpf_skel/.tmp/bootstrap/bpftool] Error 2 make[1]: *** [Makefile.perf:240: sub-make] Error 2 make: *** [Makefile:113: install-bin] Error 2 make: Leaving directory '/var/home/acme/git/perf/tools/perf' Performance counter stats for 'make -k BUILD_BPF_SKEL=1 CORESIGHT=1 PYTHON=python3 O=/tmp/build/perf -C tools/perf install-bin': 6,965.78 msec task-clock:u # 1.492 CPUs utilized 6,937.93 msec cpu-clock:u # 1.486 CPUs utilized 4.669198336 seconds time elapsed 4.015978000 seconds user 3.202660000 seconds sys 70: Event expansion for cgroups : Ok 88: perf all metricgroups test : FAILED! ⬢[acme@toolbox perf]$ find tools/ -name bpf.h tools/include/uapi/linux/bpf.h tools/lib/bpf/bpf.h tools/perf/include/bpf/bpf.h ⬢[acme@toolbox perf]$ find tools/ -name libbpf.h tools/lib/bpf/libbpf.h ⬢[acme@toolbox perf]$ find tools/perf/ -name gen.c ⬢[acme@toolbox perf]$ Before the merge, with pristine sources I wasn't getting this, investigating now. ⬢[acme@toolbox perf]$ git show HEAD commit e1498f18537a1639963370a4635c6fb99e7d672b (HEAD -> perf/core) Merge: 32f7aa2731b24ad8 abfecb39092029c4 Author: Arnaldo Carvalho de Melo Date: Thu Nov 4 14:32:11 2021 -0300 Merge remote-tracking branch 'torvalds/master' into perf/core To pick up some tools/perf/ patches that went via tip/perf/core, such as: tools/perf: Add mem_hops field in perf_mem_data_src structure Signed-off-by: Arnaldo Carvalho de Melo ⬢[acme@toolbox perf]$ ⬢[acme@toolbox perf]$ git log --oneline -10 torvalds/master abfecb39092029c4 (torvalds/master) Merge tag 'tty-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 95faf6ba654dd334 Merge tag 'driver-core-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 5c904c66ed4e86c3 Merge tag 'char-misc-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 5cd4dc44b8a0f656 Merge tag 'staging-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 048ff8629e117d84 Merge tag 'usb-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 7ddb58cb0ecae8e8 Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux ce840177930f591a Merge tag 'defconfig-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc d461e96cd22b5aeb Merge tag 'drivers-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc ae45d84fc36d01dc Merge tag 'dt-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 2219b0ceefe835b9 Merge tag 'soc-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc ⬢[acme@toolbox perf]$ - Arnaldo