Skip to contentSkip to conversation

samples/bpf: Add a .gitignore for binaries

PATCH In review Mickaël Salaün 4 participants 6 messages Feb 12, 2017 – May 18, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 samples/bpf: Add a .gitignore for binaries

Cc Alexei Starovoitov <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Daniel Borkmann <[email protected]>
Cc Wang Nan <[email protected]>
---
 samples/bpf/.gitignore | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 samples/bpf/.gitignore
samples/bpf/.gitignore new file +32 -0
new file mode 100644
index 000000000000..a7562a5ef4c2
@@ -0,0 +1,32 @@
+fds_example
+lathist
+lwt_len_hist
+map_perf_test
+offwaketime
+sampleip
+sockex1
+sockex2
+sockex3
+sock_example
+spintest
+tc_l2_redirect
+test_cgrp2_array_pin
+test_cgrp2_attach
+test_cgrp2_attach2
+test_cgrp2_sock
+test_cgrp2_sock2
+test_current_task_under_cgroup
+test_lru_dist
+test_overhead
+test_probe_write_user
+trace_event
+trace_output
+tracex1
+tracex2
+tracex3
+tracex4
+tracex5
+tracex6
+xdp1
+xdp2
+xdp_tx_iptunnel
Signature · 1 line
2.11.0
#1 lore raw

samples/bpf/.gitignore line 2

Quoted 8 lines · Mickaël Salaün
samples/bpf/.gitignore new file +2 -0
new file mode 100644
index 000000000000..a7562a5ef4c2
@@ -0,0 +1,32 @@
+fds_example
+lathist

...

Listing each target is going to be a PITA to maintain. It would be better to put targets into a build directory (bin?) and ignore the directory.

#2 lore raw
Quoted 12 lines · David Ahern
Quoted 8 lines · Mickaël Salaün
samples/bpf/.gitignore new file +2 -0
new file mode 100644
index 000000000000..a7562a5ef4c2
@@ -0,0 +1,32 @@
+fds_example
+lathist

...

Quoted 4 lines

Listing each target is going to be a PITA to maintain. It would be better to put targets into a build directory (bin?) and ignore the directory.

It would require a lot of modifications to the Makefile and more complexity. It seems much more simple for everyone to stick to a simple gitignore file easily maintainable:

$ awk '$1 == "hostprogs-y" { print $3 }' < Makefile > .gitignore

Alexei, Daniel, what do you think about this? Do you want me to send a v2 with the new tests?

Mickaël

#3 lore raw
Quoted 19 lines · Mickaël Salaün
Quoted 12 lines · David Ahern
Quoted 8 lines · Mickaël Salaün
samples/bpf/.gitignore new file +2 -0
new file mode 100644
index 000000000000..a7562a5ef4c2
@@ -0,0 +1,32 @@
+fds_example
+lathist

...

Quoted 4 lines

Listing each target is going to be a PITA to maintain. It would be better to put targets into a build directory (bin?) and ignore the directory.

Quoted 8 lines

It would require a lot of modifications to the Makefile and more complexity. It seems much more simple for everyone to stick to a simple gitignore file easily maintainable:

$ awk '$1 == "hostprogs-y" { print $3 }' < Makefile > .gitignore

Alexei, Daniel, what do you think about this? Do you want me to send a v2 with the new tests?

The problem stems from the fact that bpf samples do not really fall into the 'hostprogs' category (see "4 Host Program support" in Documentation/kbuild/makefiles.txt). Fixing samples/bpf to not rely on it is the better long term solution. Building of tools/ for example does not rely on it so there is an existing example of leveraging kernel headers without the overhead.

#4 lore raw
Quoted 7 lines · David Ahern

The problem stems from the fact that bpf samples do not really fall into the 'hostprogs' category (see "4 Host Program support" in Documentation/kbuild/makefiles.txt). Fixing samples/bpf to not rely on it is the better long term solution. Building of tools/ for example does not rely on it so there is an existing example of leveraging kernel headers without the overhead.

+1

I have looked into this but found it to be not easy and all attempts to change the Makefile has resulted in obscure errors :/

Getting clang to output in a different directory was easy[0], but I guess this is not the right approach either. Have you tried making the change?

[0]:

samples/bpf/Makefile +8 -1
index 6c7468eb3684..79268d310ba5 100644
@@ -1,6 +1,13 @@
 # kbuild trick to avoid linker error. Can be omitted if a module is built.
 obj- := dummy.o
 
+ifndef O
+  OUTPUT := $(shell pwd)/samples/bpf/_build/
+else
+  OUTPUT := $O/
+endif
+$(shell mkdir -p $(OUTPUT))
+
 # List of programs to build
 hostprogs-y := test_lru_dist
 hostprogs-y += sock_example
@@ -190,4 +197,4 @@ $(obj)/%.o: $(src)/%.c
 		-Wno-gnu-variable-sized-type-not-at-end \
 		-Wno-address-of-packed-member -Wno-tautological-compare \
 		-Wno-unknown-warning-option \
-		-O2 -emit-llvm -c $< -o -| $(LLC) -march=bpf -filetype=obj -o $@
+		-O2 -emit-llvm -c $< -o -| $(LLC) -march=bpf -filetype=obj -o $(OUTPUT)$(shell basename $@)
Signature · 3 lines
Mit freundlichen Grüßen

Alexander Alemayhu
#5 lore raw
Quoted 5 lines · Alexander Alemayhu

I have looked into this but found it to be not easy and all attempts to change the Makefile has resulted in obscure errors :/

Getting clang to output in a different directory was easy[0], but I guess this is not the right approach either. Have you tried making the change?

spent an hour so a few weeks back. It is not trivial, but someone needs to find to fix it now.

perf is the example to use: you can build it from both top level kernel directory (e.g, make -C tools/perf O=/tmp/perf) and the perf directory (cd tools/perf; make O=/tmp/perf). Both are wanted for samples/bpf and it would be nice to keep the O= option as well.

I don't have the time for the next few weeks. Perhaps mid-June I can take a look.