samples/bpf: remove unnecessary -I flags from libbpf EXTRA_CFLAGS #4730
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![kernel-patches-daemon-bpf-rc[bot]](https://avatars.githubusercontent.com/u/70728002?s=60&v=4){kind=small}
|
Upstream branch: 537a252 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
f8fc3a6 to
a55dd53
Compare
|
Upstream branch: 537a252 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/913901=>bpf
branch
from
2231d31 to
0e07c1a
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
a55dd53 to
d6e0f06
Compare
|
Upstream branch: d4c4435 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/913901=>bpf
branch
from
0e07c1a to
a8ced2e
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
d6e0f06 to
9c9d649
Compare
|
Upstream branch: bd74e23 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/913901=>bpf
branch
from
a8ced2e to
12367a4
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
9c9d649 to
de5336c
Compare
|
Upstream branch: bd74e23 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/913901=>bpf
branch
from
12367a4 to
4a95982
Compare
|
Upstream branch: bd74e23 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/913901=>bpf
branch
from
4a95982 to
8fa4fe4
Compare
Commit [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:
'<output-dir>/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 13b2548 ("kbuild: change working directory to external module directory with M=")
[1] https://lore.kernel.org/bpf/[email protected]/
[2] https://lore.kernel.org/bpf/[email protected]/
Fixes: 13b2548 ("kbuild: change working directory to external module directory with M=")
Acked-by: Stanislav Fomichev <[email protected]>
Signed-off-by: Eduard Zingerman <[email protected]>
|
Upstream branch: bd74e23 |
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
series/913901=>bpf
branch
from
8fa4fe4 to
4fb6668
Compare
kernel-patches-daemon-bpf-rc
bot
force-pushed
the
bpf_base
branch
from
de5336c to
1590fbf
Compare
|
At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=914290 irrelevant now. Closing PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request for series with
subject: samples/bpf: remove unnecessary -I flags from libbpf EXTRA_CFLAGS
version: 2
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=913926