[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Mon, 1 Jan 2024 10:56:21 -0800
From: Cong Wang <xiyou.wangcong@...il.com>
To: Stephen Hemminger <stephen@...workplumber.org>
Cc: Jamal Hadi Salim <jhs@...atatu.com>, davem@...emloft.net,
kuba@...nel.org, edumazet@...gle.com, pabeni@...hat.com,
jiri@...nulli.us, netdev@...r.kernel.org, dsahern@...il.com,
pctammela@...atatu.com, victor@...atatu.com
Subject: Re: [PATCH net-next 1/5] net/sched: Remove uapi support for rsvp
classifier
On Sat, Dec 23, 2023 at 09:16:57AM -0800, Stephen Hemminger wrote:
> On Sat, 23 Dec 2023 09:01:50 -0500
> Jamal Hadi Salim <jhs@...atatu.com> wrote:
>
> > diff --git a/tools/include/uapi/linux/pkt_cls.h b/tools/include/uapi/linux/pkt_cls.h
> > index 3faee0199a9b..82eccb6a4994 100644
> > --- a/tools/include/uapi/linux/pkt_cls.h
> > +++ b/tools/include/uapi/linux/pkt_cls.h
> > @@ -204,37 +204,6 @@ struct tc_u32_pcnt {
> >
>
> Seems like a mistake for kernel source tree to include two copies of same file.
> Shouldn't there be an automated make rule to update?
It is intentional, based on the initial commit which created this file:
commit 49a249c387268882e8393dd1fafc51e3b21cb7a2
Author: Yonghong Song <yhs@...com>
Date: Wed Nov 7 19:55:36 2018 -0800
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@...el.com>
Cc: Li Zhijian <zhijianx.li@...el.com>
Signed-off-by: Yonghong Song <yhs@...com>
Signed-off-by: Daniel Borkmann <daniel@...earbox.net>
Powered by blists - more mailing lists