Skip to contentSkip to conversation

samples: bpf: fix outdated README build command

PATCH In review Daniel T. Lee 4 participants 7 messages Nov 10, 2019 – Nov 12, 2019

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

PATCH 1/1 samples: bpf: fix outdated README build command

Currently, building the bpf samples under samples/bpf directory isn't working. Running make from the directory 'samples/bpf' will just shows following result without compiling any samples.

 $ make
 make -C ../../ /git/linux/samples/bpf/ BPF_SAMPLES_PATH=/git/linux/samples/bpf
 make[1]: Entering directory '/git/linux'
   CALL    scripts/checksyscalls.sh
   CALL    scripts/atomic/check-atomics.sh
   DESCEND  objtool
 make[1]: Leaving directory '/git/linux'

Due to commit 394053f4a4b3 ("kbuild: make single targets work more correctly"), building samples/bpf without support of samples/Makefile is unavailable. Instead, building the samples with 'make M=samples/bpf' from the root source directory will solve this issue.[1]

This commit fixes the outdated README build command with samples/bpf.

[0]: https://patchwork.kernel.org/patch/11168393/

---
 samples/bpf/README.rst | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
samples/bpf/README.rst +9 -10
index 5f27e4faca50..bfd2405705ed 100644
@@ -32,12 +32,10 @@ Compiling
 For building the BPF samples, issue the below command from the kernel
 top level directory::
 
- make samples/bpf/
+ make M=samples/bpf
 
-Do notice the "/" slash after the directory name.
-
-It is also possible to call make from this directory.  This will just
-hide the the invocation of make as above with the appended "/".
+Due to samples/bpf cannot be built without support in the
+samples/Makefile, it is unavailable to call make from this directory.
 
 Manually compiling LLVM with 'bpf' support
 ------------------------------------------
@@ -63,14 +61,15 @@ Quick sniplet for manually compiling LLVM and clang
 It is also possible to point make to the newly compiled 'llc' or
 'clang' command via redefining LLC or CLANG on the make command line::
 
- make samples/bpf/ LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang
+ make M=samples/bpf LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang
 
 Cross compiling samples
 -----------------------
 In order to cross-compile, say for arm64 targets, export CROSS_COMPILE and ARCH
 environment variables before calling make. This will direct make to build
-samples for the cross target.
+samples for the cross target.::
+
+ export ARCH=arm64
+ export CROSS_COMPILE="aarch64-linux-gnu-"
+ make M=samples/bpf LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang
 
-export ARCH=arm64
-export CROSS_COMPILE="aarch64-linux-gnu-"
-make samples/bpf/ LLC=~/git/llvm/build/bin/llc CLANG=~/git/llvm/build/bin/clang
Signature · 1 line
2.20.1
#1 lore raw
Quoted 5 lines · Daniel T. Lee

Currently, building the bpf samples under samples/bpf directory isn't working. Running make from the directory 'samples/bpf' will just shows following result without compiling any samples.

Do you mind trying to see if it's possible to detect that plain make is being run from samples/bpf subdirectory, and if that's the case, just running something like make M=samples/bpf -C ../../? If that's not too hard, it would be a nice touch to still have it working old (and intuitive) way, IMO.

Quoted 22 lines
 $ make
 make -C ../../ /git/linux/samples/bpf/ BPF_SAMPLES_PATH=/git/linux/samples/bpf
 make[1]: Entering directory '/git/linux'
   CALL    scripts/checksyscalls.sh
   CALL    scripts/atomic/check-atomics.sh
   DESCEND  objtool
 make[1]: Leaving directory '/git/linux'

Due to commit 394053f4a4b3 ("kbuild: make single targets work more correctly"), building samples/bpf without support of samples/Makefile is unavailable. Instead, building the samples with 'make M=samples/bpf' from the root source directory will solve this issue.[1]

This commit fixes the outdated README build command with samples/bpf.

[0]: https://patchwork.kernel.org/patch/11168393/

---
 samples/bpf/README.rst | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

[...]

#2 lore raw
Quoted 7 lines · Andrii Nakryiko
Quoted 5 lines · Daniel T. Lee

Currently, building the bpf samples under samples/bpf directory isn't working. Running make from the directory 'samples/bpf' will just shows following result without compiling any samples.

Quoted 5 lines

Do you mind trying to see if it's possible to detect that plain make is being run from samples/bpf subdirectory, and if that's the case, just running something like make M=samples/bpf -C ../../? If that's not too hard, it would be a nice touch to still have it working old (and intuitive) way, IMO.

I think it's just the M= that's missing. Tentatively, the below seems to work for me (I get some other compile errors, but I think that is unrelated).

-Toke

samples/bpf/Makefile +1 -1
index 8a9af3ab7769..48e7f1ff7861 100644
@@ -246,7 +246,7 @@ endif
 
 # Trick to allow make to be run from this directory
 all:
-       $(MAKE) -C ../../ $(CURDIR)/ BPF_SAMPLES_PATH=$(CURDIR)
+       $(MAKE) -C ../../ M=$(CURDIR) BPF_SAMPLES_PATH=$(CURDIR)
 
 clean:
        $(MAKE) -C ../../ M=$(CURDIR) clean
#3 lore raw
Quoted 16 lines · Toke Høiland-Jørgensen
Quoted 7 lines · Andrii Nakryiko
Quoted 5 lines · Daniel T. Lee

Currently, building the bpf samples under samples/bpf directory isn't working. Running make from the directory 'samples/bpf' will just shows following result without compiling any samples.

Quoted 5 lines

Do you mind trying to see if it's possible to detect that plain make is being run from samples/bpf subdirectory, and if that's the case, just running something like make M=samples/bpf -C ../../? If that's not too hard, it would be a nice touch to still have it working old (and intuitive) way, IMO.

Quoted 7 lines

I think it's just the M= that's missing. Tentatively, the below seems to work for me (I get some other compile errors, but I think that is unrelated).

-Toke

Thanks for the review!
Modifying the Makefile seems better solution!

Again, It's just the issue has been solved as Daniel Borkmann mentioned. Thanks for the review!

Best,
Daniel

Quoted 14 lines
samples/bpf/Makefile +1 -1
index 8a9af3ab7769..48e7f1ff7861 100644
@@ -246,7 +246,7 @@ endif
 
 # Trick to allow make to be run from this directory
 all:
-       $(MAKE) -C ../../ $(CURDIR)/ BPF_SAMPLES_PATH=$(CURDIR)
+       $(MAKE) -C ../../ M=$(CURDIR) BPF_SAMPLES_PATH=$(CURDIR)
 
 clean:
        $(MAKE) -C ../../ M=$(CURDIR) clean
#4 lore raw
In reply to Andrii Nakryiko
Quoted 8 lines · Andrii Nakryiko
Quoted 5 lines · Daniel T. Lee

Currently, building the bpf samples under samples/bpf directory isn't working. Running make from the directory 'samples/bpf' will just shows following result without compiling any samples.

Quoted 6 lines

Do you mind trying to see if it's possible to detect that plain make is being run from samples/bpf subdirectory, and if that's the case, just running something like make M=samples/bpf -C ../../? If that's not too hard, it would be a nice touch to still have it working old (and intuitive) way, IMO.

Thanks for the review!
And seems it works with make M=samples/bpf -C ../../ and it's better solution!

It's just the issue has been solved as Daniel Borkmann mentioned. Anyway, thanks for the review!

Best,
Daniel

Quoted 25 lines
Quoted 23 lines
 $ make
 make -C ../../ /git/linux/samples/bpf/ BPF_SAMPLES_PATH=/git/linux/samples/bpf
 make[1]: Entering directory '/git/linux'
   CALL    scripts/checksyscalls.sh
   CALL    scripts/atomic/check-atomics.sh
   DESCEND  objtool
 make[1]: Leaving directory '/git/linux'

Due to commit 394053f4a4b3 ("kbuild: make single targets work more correctly"), building samples/bpf without support of samples/Makefile is unavailable. Instead, building the samples with 'make M=samples/bpf' from the root source directory will solve this issue.[1]

This commit fixes the outdated README build command with samples/bpf.

[0]: https://patchwork.kernel.org/patch/11168393/

---
 samples/bpf/README.rst | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

[...]

maintainer
#5 lore raw
In reply to Daniel T. Lee
Quoted 17 lines · Daniel T. Lee

Currently, building the bpf samples under samples/bpf directory isn't working. Running make from the directory 'samples/bpf' will just shows following result without compiling any samples.

  $ make
  make -C ../../ /git/linux/samples/bpf/ BPF_SAMPLES_PATH=/git/linux/samples/bpf
  make[1]: Entering directory '/git/linux'
    CALL    scripts/checksyscalls.sh
    CALL    scripts/atomic/check-atomics.sh
    DESCEND  objtool
  make[1]: Leaving directory '/git/linux'

Due to commit 394053f4a4b3 ("kbuild: make single targets work more correctly"), building samples/bpf without support of samples/Makefile is unavailable. Instead, building the samples with 'make M=samples/bpf' from the root source directory will solve this issue.[1]

Quoted 5 lines

This commit fixes the outdated README build command with samples/bpf.

[0]: https://patchwork.kernel.org/patch/11168393/

Thanks for the patch, Daniel! Looks like it's not rebased to the latest bpf-next tree and therefore doesn't apply cleanly.

Meanwhile, https://patchwork.ozlabs.org/patch/1192639/ was sent which addresses the same issue.

Best,
Daniel

#6 lore raw
Quoted 25 lines · Daniel Borkmann
Quoted 17 lines · Daniel T. Lee

Currently, building the bpf samples under samples/bpf directory isn't working. Running make from the directory 'samples/bpf' will just shows following result without compiling any samples.

  $ make
  make -C ../../ /git/linux/samples/bpf/ BPF_SAMPLES_PATH=/git/linux/samples/bpf
  make[1]: Entering directory '/git/linux'
    CALL    scripts/checksyscalls.sh
    CALL    scripts/atomic/check-atomics.sh
    DESCEND  objtool
  make[1]: Leaving directory '/git/linux'

Due to commit 394053f4a4b3 ("kbuild: make single targets work more correctly"), building samples/bpf without support of samples/Makefile is unavailable. Instead, building the samples with 'make M=samples/bpf' from the root source directory will solve this issue.[1]

Quoted 5 lines

This commit fixes the outdated README build command with samples/bpf.

[0]: https://patchwork.kernel.org/patch/11168393/

Quoted 8 lines

Thanks for the patch, Daniel! Looks like it's not rebased to the latest bpf-next tree and therefore doesn't apply cleanly.

Meanwhile, https://patchwork.ozlabs.org/patch/1192639/ was sent which addresses the same issue.

Best,
Daniel

Thanks for the review.
Seems the issue has been already solved!