]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
tools/bpftool: copy a few net uapi headers to tools directory
authorYonghong Song <yhs@fb.com>
Thu, 8 Nov 2018 03:55:36 +0000 (19:55 -0800)
committerDaniel Borkmann <daniel@iogearbox.net>
Fri, 9 Nov 2018 07:18:31 +0000 (08:18 +0100)
commit49a249c387268882e8393dd1fafc51e3b21cb7a2
tree5cd53dfb63cee2fe911fa9ab6303b95c94eef49a
parentb13b8787c95c156b093305e9f006a6fb7d9119b1
tools/bpftool: copy a few net uapi headers to tools directory

Commit f6f3bac08ff9 ("tools/bpf: bpftool: add net support")
added certain networking support to bpftool.
The implementation relies on a relatively recent uapi header file
linux/tc_act/tc_bpf.h on the host which contains the marco
definition of TCA_ACT_BPF_ID.

Unfortunately, this is not the case for all distributions.
See the email message below where rhel-7.2 does not have
an up-to-date linux/tc_act/tc_bpf.h.
  https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1799211.html
Further investigation found that linux/pkt_cls.h is also needed for macro
TCA_BPF_TAG.

This patch fixed the issue by copying linux/tc_act/tc_bpf.h
and linux/pkt_cls.h from kernel include/uapi directory to
tools/include/uapi directory so building the bpftool does not depend
on host system for these files.

Fixes: f6f3bac08ff9 ("tools/bpf: bpftool: add net support")
Reported-by: kernel test robot <rong.a.chen@intel.com>
Cc: Li Zhijian <zhijianx.li@intel.com>
Signed-off-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
tools/include/uapi/linux/pkt_cls.h [new file with mode: 0644]
tools/include/uapi/linux/tc_act/tc_bpf.h [new file with mode: 0644]