Changes in Makefile

548762f0 - samples/bpf: Fix compilation failure for samples/bpf on LoongArch Fedora

Fri, 25 Apr 2025 09:50:42 +0000

samples/bpf: Fix compilation failure for samples/bpf on LoongArch FedoraWhen building the latest samples/bpf on LoongArch Fedora make M=samples/bpfThere are compilation errors as follows:In file included from ./linux/samples/bpf/sockex2_kern.c:2:In file included from ./include/uapi/linux/in.h:25:In file included from ./include/linux/socket.h:8:In file included from ./include/linux/uio.h:9:In file included from ./include/linux/thread_info.h:60:In file included from ./arch/loongarch/include/asm/thread_info.h:15:In file included from ./arch/loongarch/include/asm/processor.h:13:In file included from ./arch/loongarch/include/asm/cpu-info.h:11:./arch/loongarch/include/asm/loongarch.h:13:10: fatal error: 'larchintrin.h' file not found ^~~~~~~~~~~~~~~1 error generated.larchintrin.h is included in /usr/lib64/clang/14.0.6/include,and the header file location is specified at compile time.Test on LoongArch Fedora:https://github.com/fedora-remix-loongarch/releases-infoSigned-off-by: Haoran Jiang Signed-off-by: zhangxi Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20250425095042.838824-1-jianghaoran@kylinos.cn List of files: /linux-6.15/samples/bpf/Makefile

94f53edc - samples/bpf: Fix broken vmlinux path for VMLINUX_BTF

Mon, 03 Feb 2025 08:55:05 +0000

samples/bpf: Fix broken vmlinux path for VMLINUX_BTFCommit 13b25489b6f8 ("kbuild: change working directory to externalmodule directory with M=") changed kbuild working directory of bpfsample programs to samples/bpf, which broke the vmlinux path forVMLINUX_BTF, as the Makefiles assume the current work directory to bethe kernel output directory and use a relative path (i.e., ./vmlinux): Makefile:316: *** Cannot find a vmlinux for VMLINUX_BTF at any of " /path/to/linux/samples/bpf/vmlinux", build the kernel or set VMLINUX_BTF like "VMLINUX_BTF=/sys/kernel/btf/vmlinux" or VMLINUX_H variable. Stop.Correctly refer to the kernel output directory using $(objtree).Fixes: 13b25489b6f8 ("kbuild: change working directory to external module directory with M=")Signed-off-by: Jinghao Jia Signed-off-by: Andrii Nakryiko Tested-by: Ruowen Qin Link: https://lore.kernel.org/bpf/20250203085506.220297-3-jinghao7@illinois.edu List of files: /linux-6.15/samples/bpf/Makefile

dff8470b - samples/bpf: Pass TPROGS_USER_CFLAGS to libbpf makefile

Wed, 04 Dec 2024 17:34:16 +0000

samples/bpf: Pass TPROGS_USER_CFLAGS to libbpf makefileBefore commit [1], the value of a variable TPROGS_USER_CFLAGS waspassed to libbpf make command as a part of EXTRA_CFLAGS.This commit makes sure that the value of TPROGS_USER_CFLAGS is stillpassed to libbpf make command, in order to maintain backwards buildscripts compatibility.[1] commit 5a6ea7022ff4 ("samples/bpf: Remove unnecessary -I flags from libbpf EXTRA_CFLAGS")Fixes: 5a6ea7022ff4 ("samples/bpf: Remove unnecessary -I flags from libbpf EXTRA_CFLAGS")Suggested-by: Viktor Malik Signed-off-by: Eduard Zingerman Signed-off-by: Andrii Nakryiko Acked-by: Viktor Malik Link: https://lore.kernel.org/bpf/20241204173416.142240-1-eddyz87@gmail.com List of files: /linux-6.15/samples/bpf/Makefile

5a6ea702 - samples/bpf: Remove unnecessary -I flags from libbpf EXTRA_CFLAGS

Tue, 03 Dec 2024 18:22:22 +0000

samples/bpf: Remove unnecessary -I flags from libbpf EXTRA_CFLAGSCommit [0] breaks samples/bpf build: $ make M=samples/bpf ... make -C /path/to/kernel/samples/bpf/../../tools/lib/bpf \ ... EXTRA_CFLAGS=" \ ... -fsanitize=bounds \ -I/path/to/kernel/usr/include \ ... /path/to/kernel/samples/bpf/libbpf/libbpf.a install_headers CC /path/to/kernel/samples/bpf/libbpf/staticobjs/libbpf.o In file included from libbpf.c:29: /path/to/kernel/tools/include/linux/err.h:35:8: error: 'inline' can only appear on functions 35 | static inline void * __must_check ERR_PTR(long error_) | ^The error is caused by `objtree` variable changing definition from `.`(dot) to an absolute path:- The variable TPROGS_CFLAGS is constructed as follows: ... TPROGS_CFLAGS += -I$(objtree)/usr/include- It is passed as EXTRA_CFLAGS for libbpf compilation: $(LIBBPF): ... ... $(MAKE) -C $(LIBBPF_SRC) RM='rm -rf' EXTRA_CFLAGS="$(TPROGS_CFLAGS)"- Before commit [0], the line passed to libbpf makefile was '-I./usr/include', where '.' referred to LIBBPF_SRC due to -C flag. The directory $(LIBBPF_SRC)/usr/include does not exist and thus was never resolved by C compiler.- After commit [0], the line passed to libbpf makefile became: '/usr/include', this directory exists and is resolved by C compiler.- Both 'tools/include' and 'usr/include' define files err.h and types.h.- libbpf expects headers like 'linux/err.h' and 'linux/types.h' defined in 'tools/include', not 'usr/include', hence the compilation error.This commit removes unnecessary -I flags from libbpf compilation.(libbpf sets up the necessary includes at lib/bpf/Makefile:63).Changes v1 [1] -> v2:- dropped unnecessary replacement of KBUILD_OUTPUT with $(objtree) (Andrii)Changes v2 [2] -> v3:- make sure --sysroot option is set for libbpf's EXTRA_CFLAGS, if $(SYSROOT) is set (Stanislav)[0] commit 13b25489b6f8 ("kbuild: change working directory to external module directory with M=")[1] https://lore.kernel.org/bpf/20241202212154.3174402-1-eddyz87@gmail.com/[2] https://lore.kernel.org/bpf/20241202234741.3492084-1-eddyz87@gmail.com/Fixes: 13b25489b6f8 ("kbuild: change working directory to external module directory with M=")Signed-off-by: Eduard Zingerman Signed-off-by: Andrii Nakryiko Acked-by: Stanislav Fomichev Link: https://lore.kernel.org/bpf/20241203182222.3915763-1-eddyz87@gmail.com List of files: /linux-6.15/samples/bpf/Makefile

118740b8 - samples/bpf: remove obsolete tracing related tests

Fri, 11 Oct 2024 04:48:47 +0000

samples/bpf: remove obsolete tracing related testsThe samples/bpf has become outdated and often does not follow up withthe latest. This commit removes obsolete tracing-related tests.Specifically, 'test_overhead' is duplicate with selftests (and bench),and 'test_override_return', 'test_probe_write_user' tests are obsoletesince they have been replaced by kprobe_multi_override and probe_userfrom selftests respectively.The following files are removed:- test_overhead: tests the overhead of BPF programs with task_rename, now covered by selftests and benchmark tests (rename-*). [1]- test_override_return: tests the return override functionality, now handled by kprobe_multi_override in selftests.- test_probe_write_user: tests the probe_write_user functionality, now replaced by the probe_user test in selftests.This cleanup will help to streamline the testing framework by removingredundant tests.[1]: https://patchwork.kernel.org/cover/13759916Signed-off-by: Daniel T. Lee Link: https://lore.kernel.org/r/20241011044847.51584-5-danieltimlee@gmail.comSigned-off-by: Alexei Starovoitov List of files: /linux-6.15/samples/bpf/Makefile

5ea68f04 - samples/bpf: remove obsolete cgroup related tests

Fri, 11 Oct 2024 04:48:46 +0000

samples/bpf: remove obsolete cgroup related testsThis patch removes the obsolete cgroup related tests. These tests arenow redundant because their functionality is already covered by moremodern and comprehensive tests under selftests/bpf.The following files are removed:- test_current_task_under_cgroup: tests bpf_current_task_under_cgroup() to check if a task belongs to a cgroup. Already covered by task_under_cgroup at selftest and other cgroup ID tests.- test_cgrp2_tc: tests bpf_skb_under_cgroup() to filter packets based on cgroup. This behavior is now validated by cgroup_skb_sk_lookup, which uses bpf_skb_cgroup_id, making this test redundant.By removing these outdated tests, this patch helps streamline andmodernize the test suite, avoiding duplication of test coverage.Signed-off-by: Daniel T. Lee Link: https://lore.kernel.org/r/20241011044847.51584-4-danieltimlee@gmail.comSigned-off-by: Alexei Starovoitov List of files: /linux-6.15/samples/bpf/Makefile

64a4658d - selftests/bpf: migrate cgroup sock create test for prohibiting sockets

Fri, 11 Oct 2024 04:48:45 +0000

selftests/bpf: migrate cgroup sock create test for prohibiting socketsThis patch continues the migration and removal process for cgroupsock_create tests to selftests.The test being migrated verifies the ability of cgroup BPF to block thecreation of specific types of sockets using a verdict. Specifically, thetest denies socket creation when the socket is of type AF_INET{6},SOCK_DGRAM, and IPPROTO_ICMP{V6}. If the requested socket type matchesthese attributes, the cgroup BPF verdict blocks the socket creation.As with the previous commit, this test currently lacks coverage inselftests, so this patch migrates the functionality into the sock_createtests under selftests. This migration ensures that the socket creationblocking behavior with cgroup bpf program is properly tested within theselftest framework.Signed-off-by: Daniel T. Lee Link: https://lore.kernel.org/r/20241011044847.51584-3-danieltimlee@gmail.comSigned-off-by: Alexei Starovoitov List of files: /linux-6.15/samples/bpf/Makefile

ec6c4be0 - selftests/bpf: migrate cgroup sock create test for setting iface/mark/prio

Fri, 11 Oct 2024 04:48:44 +0000

selftests/bpf: migrate cgroup sock create test for setting iface/mark/prioThis patch migrates the old test for cgroup BPF that setssk_bound_dev_if, mark, and priority when AF_INET{6} sockets are created.The most closely related tests under selftests are 'test_sock' and'sockopt'. However, these existing tests serve different purposes.'test_sock' focuses mainly on verifying the socket binding process,while 'sockopt' concentrates on testing the behavior of getsockopt andsetsockopt operations for various socket options.Neither of these existing tests directly covers the ability of cgroupBPF to set socket attributes such as sk_bound_dev_if, mark, and priorityduring socket creation. To address this gap, this patch introduces amigration of the old cgroup socket attribute test, now included as the'sock_create' test in selftests/bpf. This ensures that the ability toconfigure these attributes during socket creation is properly tested.Signed-off-by: Daniel T. Lee Link: https://lore.kernel.org/r/20241011044847.51584-2-danieltimlee@gmail.comSigned-off-by: Alexei Starovoitov List of files: /linux-6.15/samples/bpf/Makefile

46f4ea04 - samples/bpf: Remove sample tracex2

Sat, 31 Aug 2024 00:03:38 +0000

samples/bpf: Remove sample tracex2In commit ba8de796baf4 ("net: introduce sk_skb_reason_drop function")kfree_skb_reason() becomes an inline function and cannot be traced.samples/bpf is abandonware by now, and we should slowly but surelyconvert whatever makes sense into BPF selftests undertools/testing/selftests/bpf and just get rid of the rest.Link: https://github.com/torvalds/linux/commit/ba8de796baf4bdc03530774fb284fe3c97875566Signed-off-by: Rong Tao Link: https://lore.kernel.org/r/tencent_30ADAC88CB2915CA57E9512D4460035BA107@qq.comSigned-off-by: Alexei Starovoitov List of files: /linux-6.15/samples/bpf/Makefile

fdf1c728 - samples/bpf: Fix compilation errors with cf-protection option

Thu, 15 Aug 2024 13:55:24 +0000

samples/bpf: Fix compilation errors with cf-protection optionCurrently, compiling the bpf programs will result the compilation errorswith the cf-protection option as follows in arm64 and loongarch64 machinewhen using gcc 12.3.1 and clang 17.0.6. This commit fixes the compilationerrors by limited the cf-protection option only used in x86 platform.[root@localhost linux]# make M=samples/bpf ...... CLANG-bpf samples/bpf/xdp2skb_meta_kern.oerror: option 'cf-protection=return' cannot be specified on this targeterror: option 'cf-protection=branch' cannot be specified on this target2 errors generated. CLANG-bpf samples/bpf/syscall_tp_kern.oerror: option 'cf-protection=return' cannot be specified on this targeterror: option 'cf-protection=branch' cannot be specified on this target2 errors generated. ......Fixes: 34f6e38f58db ("samples/bpf: fix warning with ignored-attributes")Reported-by: Jiangshan Yi Signed-off-by: Jiangshan Yi Signed-off-by: Andrii Nakryiko Tested-by: Qiang Wang Link: https://lore.kernel.org/bpf/20240815135524.140675-1-13667453960@163.com List of files: /linux-6.15/samples/bpf/Makefile

b1992c37 - kbuild: use $(src) instead of $(srctree)/$(src) for source directory

Sat, 27 Apr 2024 14:55:02 +0000

kbuild: use $(src) instead of $(srctree)/$(src) for source directoryKbuild conventionally uses $(obj)/ for generated files, and $(src)/ forchecked-in source files. It is merely a convention without any functionaldifference. In fact, $(obj) and $(src) are exactly the same, as definedin scripts/Makefile.build: src := $(obj)When the kernel is built in a separate output directory, $(src) doesnot accurately reflect the source directory location. While Kbuildresolves this discrepancy by specifying VPATH=$(srctree) to search forsource files, it does not cover all cases. For example, when adding aheader search path for local headers, -I$(srctree)/$(src) is typicallypassed to the compiler.This introduces inconsistency between upstream and downstream Makefilesbecause $(src) is used instead of $(srctree)/$(src) for the latter.To address this inconsistency, this commit changes the semantics of$(src) so that it always points to the directory in the source tree.Going forward, the variables used in Makefiles will have the followingmeanings: $(obj) - directory in the object tree $(src) - directory in the source tree (changed by this commit) $(objtree) - the top of the kernel object tree $(srctree) - the top of the kernel source treeConsequently, $(srctree)/$(src) in upstream Makefiles need to be replacedwith $(src).Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier List of files: /linux-6.15/samples/bpf/Makefile

397658dd - samples/bpf: Add valid info for VMLINUX_BTF

Sun, 28 Apr 2024 16:10:32 +0000

samples/bpf: Add valid info for VMLINUX_BTFWhen I use the command 'make M=samples/bpf' to compile samples/bpf codein ubuntu 22.04, the error info occured:Cannot find a vmlinux for VMLINUX_BTF at any of " /home/ubuntu/code/linux/vmlinux",build the kernel or set VMLINUX_BTF or VMLINUX_H variableOthers often encounter this kind of issue, new kernel has the vmlinux, so we canset the path in error info which seems more intuitive, like:Cannot find a vmlinux for VMLINUX_BTF at any of " /home/ubuntu/code/linux/vmlinux",buiild the kernel or set VMLINUX_BTF like "VMLINUX_BTF=/sys/kernel/btf/vmlinux" orVMLINUX_H variableSigned-off-by: Tao Chen Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20240428161032.239043-1-chen.dylane@gmail.com List of files: /linux-6.15/samples/bpf/Makefile

37db10bc - samples/bpf: Allow building with custom bpftool

Wed, 25 Oct 2023 06:19:14 +0000

samples/bpf: Allow building with custom bpftoolsamples/bpf build its own bpftool boostrap to generate vmlinux.h as wellas some BPF objects. This is a redundant step if bpftool has beenalready built, so update samples/bpf/Makefile such that it accepts apath to bpftool passed via the BPFTOOL variable. The approach ispractically the same as tools/testing/selftests/bpf/Makefile uses.Signed-off-by: Viktor Malik Signed-off-by: Daniel Borkmann Link: https://lore.kernel.org/bpf/bd746954ac271b02468d8d951ff9f11e655d485b.1698213811.git.vmalik@redhat.com List of files: /linux-6.15/samples/bpf/Makefile

f56bcfad - samples/bpf: Fix passing LDFLAGS to libbpf

Wed, 25 Oct 2023 06:19:13 +0000

samples/bpf: Fix passing LDFLAGS to libbpfsamples/bpf/Makefile passes LDFLAGS=$(TPROGS_LDFLAGS) to libbpf buildwithout surrounding quotes, which may cause compilation errors whenpassing custom TPROGS_USER_LDFLAGS.For example: $ make -C samples/bpf/ TPROGS_USER_LDFLAGS="-Wl,--as-needed -specs=/usr/lib/gcc/x86_64-redhat-linux/13/libsanitizer.spec" make: Entering directory './samples/bpf' make -C ../../ M=./samples/bpf BPF_SAMPLES_PATH=./samples/bpf make[1]: Entering directory '.' make -C ./samples/bpf/../../tools/lib/bpf RM='rm -rf' EXTRA_CFLAGS="-Wall -O2 -Wmissing-prototypes -Wstrict-prototypes -I./usr/include -I./tools/testing/selftests/bpf/ -I./samples/bpf/libbpf/include -I./tools/include -I./tools/perf -I./tools/lib -DHAVE_ATTR_TEST=0" \ LDFLAGS=-Wl,--as-needed -specs=/usr/lib/gcc/x86_64-redhat-linux/13/libsanitizer.spec srctree=./samples/bpf/../../ \ O= OUTPUT=./samples/bpf/libbpf/ DESTDIR=./samples/bpf/libbpf prefix= \ ./samples/bpf/libbpf/libbpf.a install_headers make: invalid option -- 'c' make: invalid option -- '=' make: invalid option -- '/' make: invalid option -- 'u' make: invalid option -- '/' [...]Fix the error by properly quoting $(TPROGS_LDFLAGS).Suggested-by: Donald Zickus Signed-off-by: Viktor Malik Signed-off-by: Daniel Borkmann Link: https://lore.kernel.org/bpf/c690de6671cc6c983d32a566d33fd7eabd18b526.1698213811.git.vmalik@redhat.com List of files: /linux-6.15/samples/bpf/Makefile

870f09f1 - samples/bpf: Allow building with custom CFLAGS/LDFLAGS

Wed, 25 Oct 2023 06:19:12 +0000

samples/bpf: Allow building with custom CFLAGS/LDFLAGSCurrently, it is not possible to specify custom flags when buildingsamples/bpf. The flags are defined in TPROGS_CFLAGS/TPROGS_LDFLAGSvariables, however, when trying to override those from the make command,compilation fails.For example, when trying to build with PIE: $ make -C samples/bpf TPROGS_CFLAGS="-fpie" TPROGS_LDFLAGS="-pie"This is because samples/bpf/Makefile updates these variables, especiallyappends include paths to TPROGS_CFLAGS and these updates are overriddenby setting the variables from the make command.This patch introduces variables TPROGS_USER_CFLAGS/TPROGS_USER_LDFLAGSfor this purpose, which can be set from the make command and theirvalues are propagated to TPROGS_CFLAGS/TPROGS_LDFLAGS.Signed-off-by: Viktor Malik Signed-off-by: Daniel Borkmann Link: https://lore.kernel.org/bpf/2d81100b830a71f0e72329cc7781edaefab75f62.1698213811.git.vmalik@redhat.com List of files: /linux-6.15/samples/bpf/Makefile

9e09b750 - samples/bpf: Add -fsanitize=bounds to userspace programs

Wed, 27 Sep 2023 04:50:30 +0000

samples/bpf: Add -fsanitize=bounds to userspace programsThe sanitizer flag, which is supported by both clang and gcc, would makeit easier to debug array index out-of-bounds problems in these programs.Make the Makfile smarter to detect ubsan support from the compiler andadd the '-fsanitize=bounds' accordingly.Suggested-by: Mimi Zohar Signed-off-by: Jinghao Jia Signed-off-by: Jinghao Jia Signed-off-by: Ruowen Qin Signed-off-by: Andrii Nakryiko Tested-by: Jiri Olsa Acked-by: Jiri Olsa Link: https://lore.kernel.org/bpf/20230927045030.224548-2-ruowenq2@illinois.edu List of files: /linux-6.15/samples/bpf/Makefile

c698eaeb - selftests/bpf: trace_helpers.c: Optimize kallsyms cache

Thu, 07 Sep 2023 01:59:13 +0000

selftests/bpf: trace_helpers.c: Optimize kallsyms cacheStatic ksyms often have problems because the number of symbols exceeds theMAX_SYMS limit. Like changing the MAX_SYMS from 300000 to 400000 incommit e76a014334a6("selftests/bpf: Bump and validate MAX_SYMS") solvesthe problem somewhat, but it's not the perfect way.This commit uses dynamic memory allocation, which completely solves theproblem caused by the limitation of the number of kallsyms. At the sametime, add APIs: load_kallsyms_local() ksym_search_local() ksym_get_addr_local() free_kallsyms_local()There are used to solve the problem of selftests/bpf updating kallsymsafter attach new symbols during testmod testing.Signed-off-by: Rong Tao Signed-off-by: Andrii Nakryiko Acked-by: Jiri Olsa Acked-by: Stanislav Fomichev Link: https://lore.kernel.org/bpf/tencent_C9BDA68F9221F21BE4081566A55D66A9700A@qq.com List of files: /linux-6.15/samples/bpf/Makefile

cced0699 - samples/bpf: Remove the xdp_sample_pkts utility

Thu, 24 Aug 2023 10:22:48 +0000

samples/bpf: Remove the xdp_sample_pkts utilityThe functionality of this utility is covered by the xdpdump utility inxdp-tools.There's a slight difference in usage as the xdpdump utility's main focus isto dump packets before or after they are processed by an existing XDPprogram. However, xdpdump also has the --load-xdp-program switch, whichwill make it attach its own program if no existing program is loaded. Withthis, xdp_sample_pkts usage can be converted as:xdp_sample_pkts eth0 --> xdpdump --load-xdp-program eth0To get roughly equivalent behaviour.Signed-off-by: Toke Høiland-Jørgensen Link: https://lore.kernel.org/r/20230824102255.1561885-6-toke@redhat.comSigned-off-by: Alexei Starovoitov List of files: /linux-6.15/samples/bpf/Makefile

eaca21d6 - samples/bpf: Remove the xdp1 and xdp2 utilities

Thu, 24 Aug 2023 10:22:47 +0000

samples/bpf: Remove the xdp1 and xdp2 utilitiesThe functionality of these utilities have been incorporated into thexdp-bench utility in xdp-tools.Equivalent functionality is:xdp1 eth0 --> xdp-bench drop -p parse-ip -l load-bytes eth0xdp2 eth0 --> xdp-bench drop -p swap-macs eth0Note that there's a slight difference in behaviour of those examples: theswap-macs operation of xdp-bench doesn't use the bpf_xdp_load_bytes()helper to load the packet data, whereas the xdp2 utility did sounconditionally. For the parse-ip action the use of bpf_xdp_load_bytes()can be selected by the '-l load-bytes' switch, with the difference that thexdp-bench utility will perform two separate calls to the helper, one toload the ethernet header and another to load the IP header; where the xdp1utility only performed one call always loading 60 bytes of data.Signed-off-by: Toke Høiland-Jørgensen Link: https://lore.kernel.org/r/20230824102255.1561885-5-toke@redhat.comSigned-off-by: Alexei Starovoitov List of files: /linux-6.15/samples/bpf/Makefile

0e445e11 - samples/bpf: Remove the xdp_rxq_info utility

Thu, 24 Aug 2023 10:22:46 +0000

samples/bpf: Remove the xdp_rxq_info utilityThe functionality of this utility has been incorporated into the xdp-benchutility in xdp-tools, by way of the --rxq-stats argument to the 'drop','pass' and 'tx' commands of xdp-bench.Some examples of how to convert xdp_rxq_info invocations into equivalentxdp-bench commands:xdp_rxq_info -d eth0 --> xdp-bench pass --rxq-stats eth0xdp_rxq_info -d eth0 -a XDP_DROP -m --> xdp-bench drop --rxq-stats -p swap-macs eth0Signed-off-by: Toke Høiland-Jørgensen Link: https://lore.kernel.org/r/20230824102255.1561885-4-toke@redhat.comSigned-off-by: Alexei Starovoitov List of files: /linux-6.15/samples/bpf/Makefile