| Message ID | 20200914223210.1831262-1-yhs@fb.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf-next] libbpf: fix a compilation error with xsk.c for ubuntu 16.04 | expand |
On Mon, Sep 14, 2020 at 3:32 PM Yonghong Song <yhs@fb.com> wrote: > > When syncing latest libbpf repo to bcc, ubuntu 16.04 (4.4.0 LTS kernel) > failed compilation for xsk.c: > In file included from /tmp/debuild.0jkauG/bcc/src/cc/libbpf/src/xsk.c:23:0: > /tmp/debuild.0jkauG/bcc/src/cc/libbpf/src/xsk.c: In function ‘xsk_get_ctx’: > /tmp/debuild.0jkauG/bcc/src/cc/libbpf/include/linux/list.h:81:9: warning: implicit > declaration of function ‘container_of’ [-Wimplicit-function-declaration] > container_of(ptr, type, member) > ^ > /tmp/debuild.0jkauG/bcc/src/cc/libbpf/include/linux/list.h:83:9: note: in expansion > of macro ‘list_entry’ > list_entry((ptr)->next, type, member) > ... > src/cc/CMakeFiles/bpf-static.dir/build.make:209: recipe for target > 'src/cc/CMakeFiles/bpf-static.dir/libbpf/src/xsk.c.o' failed > > Commit 2f6324a3937f ("libbpf: Support shared umems between queues and devices") > added include file <linux/list.h>, which uses macro "container_of". > xsk.c file also includes <linux/ethtool.h> before <linux/list.h>. > > In a more recent distro kernel, <linux/ethtool.h> includes <linux/kernel.h> > which contains the macro definition for "container_of". So compilation is all fine. > But in ubuntu 16.04 kernel, <linux/ethtool.h> does not contain <linux/kernel.h> > which caused the above compilation error. > > Let explicitly add <linux/kernel.h> in xsk.c to avoid compilation error > in old distro's. > > Fixes: 2f6324a3937f ("libbpf: Support shared umems between queues and devices") > Signed-off-by: Yonghong Song <yhs@fb.com> > --- Acked-by: Andrii Nakryiko <andriin@fb.com> > tools/lib/bpf/xsk.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c > index 49c324594792..30b4ca5d2ac7 100644 > --- a/tools/lib/bpf/xsk.c > +++ b/tools/lib/bpf/xsk.c > @@ -20,6 +20,7 @@ > #include <linux/if_ether.h> > #include <linux/if_packet.h> > #include <linux/if_xdp.h> > +#include <linux/kernel.h> > #include <linux/list.h> > #include <linux/sockios.h> > #include <net/if.h> > -- > 2.24.1 >
On Mon, Sep 14, 2020 at 3:47 PM Andrii Nakryiko <andrii.nakryiko@gmail.com> wrote: > > On Mon, Sep 14, 2020 at 3:32 PM Yonghong Song <yhs@fb.com> wrote: > > > > When syncing latest libbpf repo to bcc, ubuntu 16.04 (4.4.0 LTS kernel) > > failed compilation for xsk.c: > > In file included from /tmp/debuild.0jkauG/bcc/src/cc/libbpf/src/xsk.c:23:0: > > /tmp/debuild.0jkauG/bcc/src/cc/libbpf/src/xsk.c: In function ‘xsk_get_ctx’: > > /tmp/debuild.0jkauG/bcc/src/cc/libbpf/include/linux/list.h:81:9: warning: implicit > > declaration of function ‘container_of’ [-Wimplicit-function-declaration] > > container_of(ptr, type, member) > > ^ > > /tmp/debuild.0jkauG/bcc/src/cc/libbpf/include/linux/list.h:83:9: note: in expansion > > of macro ‘list_entry’ > > list_entry((ptr)->next, type, member) > > ... > > src/cc/CMakeFiles/bpf-static.dir/build.make:209: recipe for target > > 'src/cc/CMakeFiles/bpf-static.dir/libbpf/src/xsk.c.o' failed > > > > Commit 2f6324a3937f ("libbpf: Support shared umems between queues and devices") > > added include file <linux/list.h>, which uses macro "container_of". > > xsk.c file also includes <linux/ethtool.h> before <linux/list.h>. > > > > In a more recent distro kernel, <linux/ethtool.h> includes <linux/kernel.h> > > which contains the macro definition for "container_of". So compilation is all fine. > > But in ubuntu 16.04 kernel, <linux/ethtool.h> does not contain <linux/kernel.h> > > which caused the above compilation error. > > > > Let explicitly add <linux/kernel.h> in xsk.c to avoid compilation error > > in old distro's. > > > > Fixes: 2f6324a3937f ("libbpf: Support shared umems between queues and devices") > > Signed-off-by: Yonghong Song <yhs@fb.com> > > --- > > Acked-by: Andrii Nakryiko <andriin@fb.com> Acked-by: Song Liu <songliubraving@fb.com>
On Mon, Sep 14, 2020 at 3:50 PM Song Liu <song@kernel.org> wrote: > > On Mon, Sep 14, 2020 at 3:47 PM Andrii Nakryiko > <andrii.nakryiko@gmail.com> wrote: > > > > On Mon, Sep 14, 2020 at 3:32 PM Yonghong Song <yhs@fb.com> wrote: > > > > > > When syncing latest libbpf repo to bcc, ubuntu 16.04 (4.4.0 LTS kernel) > > > failed compilation for xsk.c: > > > In file included from /tmp/debuild.0jkauG/bcc/src/cc/libbpf/src/xsk.c:23:0: > > > /tmp/debuild.0jkauG/bcc/src/cc/libbpf/src/xsk.c: In function ‘xsk_get_ctx’: > > > /tmp/debuild.0jkauG/bcc/src/cc/libbpf/include/linux/list.h:81:9: warning: implicit > > > declaration of function ‘container_of’ [-Wimplicit-function-declaration] > > > container_of(ptr, type, member) > > > ^ > > > /tmp/debuild.0jkauG/bcc/src/cc/libbpf/include/linux/list.h:83:9: note: in expansion > > > of macro ‘list_entry’ > > > list_entry((ptr)->next, type, member) > > > ... > > > src/cc/CMakeFiles/bpf-static.dir/build.make:209: recipe for target > > > 'src/cc/CMakeFiles/bpf-static.dir/libbpf/src/xsk.c.o' failed > > > > > > Commit 2f6324a3937f ("libbpf: Support shared umems between queues and devices") > > > added include file <linux/list.h>, which uses macro "container_of". > > > xsk.c file also includes <linux/ethtool.h> before <linux/list.h>. > > > > > > In a more recent distro kernel, <linux/ethtool.h> includes <linux/kernel.h> > > > which contains the macro definition for "container_of". So compilation is all fine. > > > But in ubuntu 16.04 kernel, <linux/ethtool.h> does not contain <linux/kernel.h> > > > which caused the above compilation error. > > > > > > Let explicitly add <linux/kernel.h> in xsk.c to avoid compilation error > > > in old distro's. > > > > > > Fixes: 2f6324a3937f ("libbpf: Support shared umems between queues and devices") > > > Signed-off-by: Yonghong Song <yhs@fb.com> > > > --- > > > > Acked-by: Andrii Nakryiko <andriin@fb.com> > > Acked-by: Song Liu <songliubraving@fb.com> Applied. Thanks
diff --git a/tools/lib/bpf/xsk.c b/tools/lib/bpf/xsk.c index 49c324594792..30b4ca5d2ac7 100644 --- a/tools/lib/bpf/xsk.c +++ b/tools/lib/bpf/xsk.c @@ -20,6 +20,7 @@ #include <linux/if_ether.h> #include <linux/if_packet.h> #include <linux/if_xdp.h> +#include <linux/kernel.h> #include <linux/list.h> #include <linux/sockios.h> #include <net/if.h>
When syncing latest libbpf repo to bcc, ubuntu 16.04 (4.4.0 LTS kernel) failed compilation for xsk.c: In file included from /tmp/debuild.0jkauG/bcc/src/cc/libbpf/src/xsk.c:23:0: /tmp/debuild.0jkauG/bcc/src/cc/libbpf/src/xsk.c: In function ‘xsk_get_ctx’: /tmp/debuild.0jkauG/bcc/src/cc/libbpf/include/linux/list.h:81:9: warning: implicit declaration of function ‘container_of’ [-Wimplicit-function-declaration] container_of(ptr, type, member) ^ /tmp/debuild.0jkauG/bcc/src/cc/libbpf/include/linux/list.h:83:9: note: in expansion of macro ‘list_entry’ list_entry((ptr)->next, type, member) ... src/cc/CMakeFiles/bpf-static.dir/build.make:209: recipe for target 'src/cc/CMakeFiles/bpf-static.dir/libbpf/src/xsk.c.o' failed Commit 2f6324a3937f ("libbpf: Support shared umems between queues and devices") added include file <linux/list.h>, which uses macro "container_of". xsk.c file also includes <linux/ethtool.h> before <linux/list.h>. In a more recent distro kernel, <linux/ethtool.h> includes <linux/kernel.h> which contains the macro definition for "container_of". So compilation is all fine. But in ubuntu 16.04 kernel, <linux/ethtool.h> does not contain <linux/kernel.h> which caused the above compilation error. Let explicitly add <linux/kernel.h> in xsk.c to avoid compilation error in old distro's. Fixes: 2f6324a3937f ("libbpf: Support shared umems between queues and devices") Signed-off-by: Yonghong Song <yhs@fb.com> --- tools/lib/bpf/xsk.c | 1 + 1 file changed, 1 insertion(+)