releases/4.19.34/libbpf-force-fixdep-compilation-at-the-start-of-the-.patch

   1 From 37fbd537dc63d9ed6c20bcfd35bcb4319e9ba4e9 Mon Sep 17 00:00:00 2001
   2 From: Stanislav Fomichev <sdf@google.com>
   3 Date: Wed, 6 Mar 2019 11:59:27 -0800
   4 Subject: libbpf: force fixdep compilation at the start of the build
   5
   6 [ Upstream commit 8e2688876c7f7073d925e1f150e86b8ed3338f52 ]
   7
   8 libbpf targets don't explicitly depend on fixdep target, so when
   9 we do 'make -j$(nproc)', there is a high probability, that some
  10 objects will be built before fixdep binary is available.
  11
  12 Fix this by running sub-make; this makes sure that fixdep dependency
  13 is properly accounted for.
  14
  15 For the same issue in perf, see commit abb26210a395 ("perf tools: Force
  16 fixdep compilation at the start of the build").
  17
  18 Before:
  19
  20 $ rm -rf /tmp/bld; mkdir /tmp/bld; make -j$(nproc) O=/tmp/bld -C tools/lib/bpf/
  21
  22 Auto-detecting system features:
  23 ...                        libelf: [ on  ]
  24 ...                           bpf: [ on  ]
  25
  26   HOSTCC   /tmp/bld/fixdep.o
  27   CC       /tmp/bld/libbpf.o
  28   CC       /tmp/bld/bpf.o
  29   CC       /tmp/bld/btf.o
  30   CC       /tmp/bld/nlattr.o
  31   CC       /tmp/bld/libbpf_errno.o
  32   CC       /tmp/bld/str_error.o
  33   CC       /tmp/bld/netlink.o
  34   CC       /tmp/bld/bpf_prog_linfo.o
  35   CC       /tmp/bld/libbpf_probes.o
  36   CC       /tmp/bld/xsk.o
  37   HOSTLD   /tmp/bld/fixdep-in.o
  38   LINK     /tmp/bld/fixdep
  39   LD       /tmp/bld/libbpf-in.o
  40   LINK     /tmp/bld/libbpf.a
  41   LINK     /tmp/bld/libbpf.so
  42   LINK     /tmp/bld/test_libbpf
  43
  44 $ head /tmp/bld/.libbpf.o.cmd
  45  # cannot find fixdep (/usr/local/google/home/sdf/src/linux/xxx//fixdep)
  46  # using basic dep data
  47
  48 /tmp/bld/libbpf.o: libbpf.c /usr/include/stdc-predef.h \
  49  /usr/include/stdlib.h /usr/include/features.h \
  50  /usr/include/x86_64-linux-gnu/sys/cdefs.h \
  51  /usr/include/x86_64-linux-gnu/bits/wordsize.h \
  52  /usr/include/x86_64-linux-gnu/gnu/stubs.h \
  53  /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
  54  /usr/lib/gcc/x86_64-linux-gnu/7/include/stddef.h \
  55
  56 After:
  57
  58 $ rm -rf /tmp/bld; mkdir /tmp/bld; make -j$(nproc) O=/tmp/bld -C tools/lib/bpf/
  59
  60 Auto-detecting system features:
  61 ...                        libelf: [ on  ]
  62 ...                           bpf: [ on  ]
  63
  64   HOSTCC   /tmp/bld/fixdep.o
  65   HOSTLD   /tmp/bld/fixdep-in.o
  66   LINK     /tmp/bld/fixdep
  67   CC       /tmp/bld/libbpf.o
  68   CC       /tmp/bld/bpf.o
  69   CC       /tmp/bld/nlattr.o
  70   CC       /tmp/bld/btf.o
  71   CC       /tmp/bld/libbpf_errno.o
  72   CC       /tmp/bld/str_error.o
  73   CC       /tmp/bld/netlink.o
  74   CC       /tmp/bld/bpf_prog_linfo.o
  75   CC       /tmp/bld/libbpf_probes.o
  76   CC       /tmp/bld/xsk.o
  77   LD       /tmp/bld/libbpf-in.o
  78   LINK     /tmp/bld/libbpf.a
  79   LINK     /tmp/bld/libbpf.so
  80   LINK     /tmp/bld/test_libbpf
  81
  82 $ head /tmp/bld/.libbpf.o.cmd
  83 cmd_/tmp/bld/libbpf.o := gcc -Wp,-MD,/tmp/bld/.libbpf.o.d -Wp,-MT,/tmp/bld/libbpf.o -g -Wall -DHAVE_LIBELF_MMAP_SUPPORT -DCOMPAT_NEED_REALLOCARRAY -Wbad-function-cast -Wdeclaration-after-statement -Wformat-security -Wformat-y2k -Winit-self -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wno-system-headers -Wold-style-definition -Wpacked -Wredundant-decls -Wshadow -Wstrict-prototypes -Wswitch-default -Wswitch-enum -Wundef -Wwrite-strings -Wformat -Wstrict-aliasing=3 -Werror -Wall -fPIC -I. -I/usr/local/google/home/sdf/src/linux/tools/include -I/usr/local/google/home/sdf/src/linux/tools/arch/x86/include/uapi -I/usr/local/google/home/sdf/src/linux/tools/include/uapi -fvisibility=hidden -D"BUILD_STR(s)=$(pound)s" -c -o /tmp/bld/libbpf.o libbpf.c
  84
  85 source_/tmp/bld/libbpf.o := libbpf.c
  86
  87 deps_/tmp/bld/libbpf.o := \
  88   /usr/include/stdc-predef.h \
  89   /usr/include/stdlib.h \
  90   /usr/include/features.h \
  91   /usr/include/x86_64-linux-gnu/sys/cdefs.h \
  92   /usr/include/x86_64-linux-gnu/bits/wordsize.h \
  93
  94 Fixes: 7c422f557266 ("tools build: Build fixdep helper from perf and basic libs")
  95 Reported-by: Eric Dumazet <edumazet@google.com>
  96 Signed-off-by: Stanislav Fomichev <sdf@google.com>
  97 Acked-by: Yonghong Song <yhs@fb.com>
  98 Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
  99 Signed-off-by: Sasha Levin <sashal@kernel.org>
 100 ---
 101  tools/lib/bpf/Makefile | 3 ++-
 102  1 file changed, 2 insertions(+), 1 deletion(-)
 103
 104 diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
 105 index d49902e818b5..3624557550a1 100644
 106 --- a/tools/lib/bpf/Makefile
 107 +++ b/tools/lib/bpf/Makefile
 108 @@ -149,7 +149,8 @@ CMD_TARGETS = $(LIB_FILE)
 109
 110  TARGETS = $(CMD_TARGETS)
 111
 112 -all: fixdep all_cmd
 113 +all: fixdep
 114 +       $(Q)$(MAKE) all_cmd
 115
 116  all_cmd: $(CMD_TARGETS)
 117
 118 --
 119 2.19.1
 120