| Message ID | 20200117004103.148068-1-andriin@fb.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf-next] libbpf: revert bpf_helper_defs.h inclusion regression | expand |
On Thu, Jan 16, 2020 at 7:52 PM Andrii Nakryiko <andriin@fb.com> wrote: > > Revert bpf_helpers.h's change to include auto-generated bpf_helper_defs.h > through <> instead of "", which causes it to be searched in include path. This > can break existing applications that don't have their include path pointing > directly to where libbpf installs its headers. > > There is ongoing work to make all (not just bpf_helper_defs.h) includes more > consistent across libbpf and its consumers, but this unbreaks user code as is > right now without any regressions. Selftests still behave sub-optimally > (taking bpf_helper_defs.h from libbpf's source directory, if it's present > there), which will be fixed in subsequent patches. > > Fixes: 6910d7d3867a ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir") > Reported-by: Toke Høiland-Jørgensen <toke@redhat.com> > Signed-off-by: Andrii Nakryiko <andriin@fb.com> Applied. Thanks
diff --git a/tools/lib/bpf/bpf_helpers.h b/tools/lib/bpf/bpf_helpers.h index 050bb7bf5be6..f69cc208778a 100644 --- a/tools/lib/bpf/bpf_helpers.h +++ b/tools/lib/bpf/bpf_helpers.h @@ -2,7 +2,7 @@ #ifndef __BPF_HELPERS__ #define __BPF_HELPERS__ -#include <bpf_helper_defs.h> +#include "bpf_helper_defs.h" #define __uint(name, val) int (*name)[val] #define __type(name, val) typeof(val) *name
Revert bpf_helpers.h's change to include auto-generated bpf_helper_defs.h through <> instead of "", which causes it to be searched in include path. This can break existing applications that don't have their include path pointing directly to where libbpf installs its headers. There is ongoing work to make all (not just bpf_helper_defs.h) includes more consistent across libbpf and its consumers, but this unbreaks user code as is right now without any regressions. Selftests still behave sub-optimally (taking bpf_helper_defs.h from libbpf's source directory, if it's present there), which will be fixed in subsequent patches. Fixes: 6910d7d3867a ("selftests/bpf: Ensure bpf_helper_defs.h are taken from selftests dir") Reported-by: Toke Høiland-Jørgensen <toke@redhat.com> Signed-off-by: Andrii Nakryiko <andriin@fb.com> --- tools/lib/bpf/bpf_helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)