* [PATCH net-next] net: DSCP in IPv4 routing
@ 2020-11-13 2:06 Russell Strong
2020-11-13 3:36 ` Stephen Hemminger
0 siblings, 1 reply; 8+ messages in thread
From: Russell Strong @ 2020-11-13 2:06 UTC (permalink / raw)
To: netdev
TOS handling in ipv4 routing does not support using dscp.
This change widens masks to use the 6 DSCP bits in routing.
Tested with
ip rule add dsfield EF lookup main
ip rule
0: from all lookup local
32765: from all tos EF lookup main
32766: from all lookup main
32767: from all lookup default
and verified that lookups are indeed performed from the
correct table.
This now works instead of failing with "Error: Invalid tos."
Signed-off-by: Russell Strong <russell@strong.id.au>
---
include/net/route.h | 2 +-
include/uapi/linux/in_route.h | 2 +-
include/uapi/linux/ip.h | 2 ++
net/ipv4/fib_rules.c | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/net/route.h b/include/net/route.h
index ff021cab657e..519448ad37d0 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -255,7 +255,7 @@ static inline void ip_rt_put(struct rtable *rt)
dst_release(&rt->dst);
}
-#define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3)
+#define IPTOS_RT_MASK (IPTOS_DS_MASK & ~3)
extern const __u8 ip_tos2prio[16];
diff --git a/include/uapi/linux/in_route.h
b/include/uapi/linux/in_route.h index 0cc2c23b47f8..db5d236b9c50 100644
--- a/include/uapi/linux/in_route.h
+++ b/include/uapi/linux/in_route.h
@@ -28,6 +28,6 @@
#define RTCF_NAT (RTCF_DNAT|RTCF_SNAT)
-#define RT_TOS(tos) ((tos)&IPTOS_TOS_MASK)
+#define RT_TOS(tos) ((tos)&IPTOS_DS_MASK)
#endif /* _LINUX_IN_ROUTE_H */
diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h
index e42d13b55cf3..fafd9470ae78 100644
--- a/include/uapi/linux/ip.h
+++ b/include/uapi/linux/ip.h
@@ -20,6 +20,8 @@
#include <linux/types.h>
#include <asm/byteorder.h>
+#define IPTOS_DS_MASK 0xfc
+#define IPTOS_DS(tos) ((tos)&IPTOS_DS_MASK)
#define IPTOS_TOS_MASK 0x1E
#define IPTOS_TOS(tos) ((tos)&IPTOS_TOS_MASK)
#define IPTOS_LOWDELAY 0x10
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index ce54a30c2ef1..1499105d1efd 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -229,7 +229,7 @@ static int fib4_rule_configure(struct fib_rule
*rule, struct sk_buff *skb, int err = -EINVAL;
struct fib4_rule *rule4 = (struct fib4_rule *) rule;
- if (frh->tos & ~IPTOS_TOS_MASK) {
+ if (frh->tos & ~IPTOS_RT_MASK) {
NL_SET_ERR_MSG(extack, "Invalid tos");
goto errout;
}
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH net-next] net: DSCP in IPv4 routing
2020-11-13 2:06 [PATCH net-next] net: DSCP in IPv4 routing Russell Strong
@ 2020-11-13 3:36 ` Stephen Hemminger
2020-11-13 9:02 ` Guillaume Nault
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Hemminger @ 2020-11-13 3:36 UTC (permalink / raw)
To: Russell Strong; +Cc: netdev
On Fri, 13 Nov 2020 12:06:37 +1000
Russell Strong <russell@strong.id.au> wrote:
> diff --git a/include/uapi/linux/in_route.h
> b/include/uapi/linux/in_route.h index 0cc2c23b47f8..db5d236b9c50 100644
> --- a/include/uapi/linux/in_route.h
> +++ b/include/uapi/linux/in_route.h
> @@ -28,6 +28,6 @@
>
> #define RTCF_NAT (RTCF_DNAT|RTCF_SNAT)
>
> -#define RT_TOS(tos) ((tos)&IPTOS_TOS_MASK)
> +#define RT_TOS(tos) ((tos)&IPTOS_DS_MASK)
>
Changing behavior of existing header files risks breaking applications.
> diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
> index ce54a30c2ef1..1499105d1efd 100644
> --- a/net/ipv4/fib_rules.c
> +++ b/net/ipv4/fib_rules.c
> @@ -229,7 +229,7 @@ static int fib4_rule_configure(struct fib_rule
> *rule, struct sk_buff *skb, int err = -EINVAL;
> struct fib4_rule *rule4 = (struct fib4_rule *) rule;
>
> - if (frh->tos & ~IPTOS_TOS_MASK) {
> + if (frh->tos & ~IPTOS_RT_MASK) {
This needs to be behind a sysctl and the default has to be to keep
the old behavior
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next] net: DSCP in IPv4 routing
2020-11-13 3:36 ` Stephen Hemminger
@ 2020-11-13 9:02 ` Guillaume Nault
2020-11-14 23:03 ` Russell Strong
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Guillaume Nault @ 2020-11-13 9:02 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: Russell Strong, netdev
On Thu, Nov 12, 2020 at 07:36:56PM -0800, Stephen Hemminger wrote:
> On Fri, 13 Nov 2020 12:06:37 +1000
> Russell Strong <russell@strong.id.au> wrote:
>
> > diff --git a/include/uapi/linux/in_route.h
> > b/include/uapi/linux/in_route.h index 0cc2c23b47f8..db5d236b9c50 100644
> > --- a/include/uapi/linux/in_route.h
> > +++ b/include/uapi/linux/in_route.h
> > @@ -28,6 +28,6 @@
> >
> > #define RTCF_NAT (RTCF_DNAT|RTCF_SNAT)
> >
> > -#define RT_TOS(tos) ((tos)&IPTOS_TOS_MASK)
> > +#define RT_TOS(tos) ((tos)&IPTOS_DS_MASK)
> >
>
> Changing behavior of existing header files risks breaking applications.
>
> > diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
> > index ce54a30c2ef1..1499105d1efd 100644
> > --- a/net/ipv4/fib_rules.c
> > +++ b/net/ipv4/fib_rules.c
> > @@ -229,7 +229,7 @@ static int fib4_rule_configure(struct fib_rule
> > *rule, struct sk_buff *skb, int err = -EINVAL;
> > struct fib4_rule *rule4 = (struct fib4_rule *) rule;
> >
> > - if (frh->tos & ~IPTOS_TOS_MASK) {
> > + if (frh->tos & ~IPTOS_RT_MASK) {
>
> This needs to be behind a sysctl and the default has to be to keep
> the old behavior
Can't we just define a new DSCP mask and replace the users of TOS one
by one? In most cases DSCP just makes the 3 highest bits available,
which souldn't change existing behaviours. We just need to pay
attention to the ECN bit that'd be masked out by DSCP but not by old
TOS. However, ECN has been supported for a long time, so most usages of
TOS already clear both ECN bits.
Let's not add a new sysctl if not necessary and, in any case, let's not
change macros blindly.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next] net: DSCP in IPv4 routing
2020-11-13 9:02 ` Guillaume Nault
@ 2020-11-14 23:03 ` Russell Strong
2020-11-14 23:09 ` Russell Strong
2020-11-14 23:10 ` Russell Strong
2 siblings, 0 replies; 8+ messages in thread
From: Russell Strong @ 2020-11-14 23:03 UTC (permalink / raw)
To: Guillaume Nault, Stephen Hemminger; +Cc: netdev
On Fri, 13 Nov 2020 10:02:25 +0100
Guillaume Nault <gnault@redhat.com> wrote:
> On Thu, Nov 12, 2020 at 07:36:56PM -0800, Stephen Hemminger wrote:
> > On Fri, 13 Nov 2020 12:06:37 +1000
> > Russell Strong <russell@strong.id.au> wrote:
> >
> > > diff --git a/include/uapi/linux/in_route.h
> > > b/include/uapi/linux/in_route.h index 0cc2c23b47f8..db5d236b9c50
> > > 100644 --- a/include/uapi/linux/in_route.h
> > > +++ b/include/uapi/linux/in_route.h
> > > @@ -28,6 +28,6 @@
> > >
> > > #define RTCF_NAT (RTCF_DNAT|RTCF_SNAT)
> > >
> > > -#define RT_TOS(tos) ((tos)&IPTOS_TOS_MASK)
> > > +#define RT_TOS(tos) ((tos)&IPTOS_DS_MASK)
> > >
> >
> > Changing behavior of existing header files risks breaking
> > applications.
> > > diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
> > > index ce54a30c2ef1..1499105d1efd 100644
> > > --- a/net/ipv4/fib_rules.c
> > > +++ b/net/ipv4/fib_rules.c
> > > @@ -229,7 +229,7 @@ static int fib4_rule_configure(struct fib_rule
> > > *rule, struct sk_buff *skb, int err = -EINVAL;
> > > struct fib4_rule *rule4 = (struct fib4_rule *) rule;
> > >
> > > - if (frh->tos & ~IPTOS_TOS_MASK) {
> > > + if (frh->tos & ~IPTOS_RT_MASK) {
> >
> > This needs to be behind a sysctl and the default has to be to keep
> > the old behavior
>
> Can't we just define a new DSCP mask and replace the users of TOS one
> by one? In most cases DSCP just makes the 3 highest bits available,
> which souldn't change existing behaviours. We just need to pay
> attention to the ECN bit that'd be masked out by DSCP but not by old
> TOS. However, ECN has been supported for a long time, so most usages
> of TOS already clear both ECN bits.
>
> Let's not add a new sysctl if not necessary and, in any case, let's
> not change macros blindly.
>
I've implemented the change ( patches to follow ) using a sysctl and
did some playing around with it. There are some odd behaviours that
aren't intuitive to a user.
With the sysctl off:
]# ip rule add dsfield EF lookup 1234
Error: Invalid tos.
Turning the sysctl on:
]# sysctl net.ipv4.route_tos_as_dscp=1
]# ip rule add dsfield EF lookup 1234
]# ip route add prohibit 8.8.8.8 table 1234
]# ping 8.8.8.8
64 bytes from 8.8.8.8: icmp_seq=1 ttl=115 time=31.2 ms
64 bytes from 8.8.8.8: icmp_seq=2 ttl=115 time=23.7 ms
]# ping 8.8.8.8 -Q 0xb8
ping: Do you want to ping broadcast? Then -b. If not, check your local
firewall rules
All good.
Turning the sysctl off again:
]# sysctl net.ipv4.route_tos_as_dscp=0
]# ip rule
]# ip rule
0: from all lookup local
32765: from all tos EF lookup 1234
32766: from all lookup main
32767: from all lookup default
The rule is still present. So as a user I would expect it to work...
But....
]# ping 8.8.8.8 -Q 0xb8
64 bytes from 8.8.8.8: icmp_seq=2 ttl=115 time=23.2 ms
64 bytes from 8.8.8.8: icmp_seq=3 ttl=115 time=23.9 ms
The rule is no longer triggered. Which is what I would expect.
But users may not.
So my questions would be:
What should happen here?
Should clearing the sysctl remove rules that could no longer be added?
Is clearing the rules even more confusing?
Is Guillaume's suggestion the right way as it avoids the confusion?
iproute2 is already presenting dscp to the users. I didn't modify
it.
Thanks,
Russell Strong
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next] net: DSCP in IPv4 routing
2020-11-13 9:02 ` Guillaume Nault
2020-11-14 23:03 ` Russell Strong
@ 2020-11-14 23:09 ` Russell Strong
2020-11-14 23:10 ` Russell Strong
2 siblings, 0 replies; 8+ messages in thread
From: Russell Strong @ 2020-11-14 23:09 UTC (permalink / raw)
To: Guillaume Nault, Stephen Hemminger; +Cc: netdev
[PATCH 1/2] DSCP in IPv4 routing
TOS handling in ipv4 routing does not use all the bits in a DSCP
value. This change introduces a sysctl "route_tos_as_dscp" control
that, when enabled, widens masks to used the 6 DSCP bits in routing.
This commit adds the sysctl
Signed-off-by: Russell Strong <russell@strong.id.au>
---
Documentation/networking/ip-sysctl.rst | 5 +++++
include/net/netns/ipv4.h | 2 ++
include/net/route.h | 16 ++++++++++++++++
include/uapi/linux/in_route.h | 3 +++
include/uapi/linux/ip.h | 2 ++
net/ipv4/sysctl_net_ipv4.c | 9 +++++++++
6 files changed, 37 insertions(+)
diff --git a/Documentation/networking/ip-sysctl.rst b/Documentation/networking/ip-sysctl.rst
index dd2b12a32b73..e728c58dbc08 100644
--- a/Documentation/networking/ip-sysctl.rst
+++ b/Documentation/networking/ip-sysctl.rst
@@ -1596,6 +1596,11 @@ igmp_link_local_mcast_reports - BOOLEAN
Default TRUE
+route_tos_as_dscp - BOOLEAN
+ Interpret TOS as DSCP for routing purposes
+
+ Default 0
+
Alexey Kuznetsov.
kuznet@ms2.inr.ac.ru
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 8e4fcac4df72..8c4230090149 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -197,6 +197,8 @@ struct netns_ipv4 {
int sysctl_igmp_llm_reports;
int sysctl_igmp_qrv;
+ int sysctl_route_tos_as_dscp;
+
struct ping_group_range ping_group_range;
atomic_t dev_addr_genid;
diff --git a/include/net/route.h b/include/net/route.h
index ff021cab657e..0cc8ce316940 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -38,6 +38,22 @@
/* IPv4 datagram length is stored into 16bit field (tot_len) */
#define IP_MAX_MTU 0xFFFFU
+static inline u8 iptos_rt_mask(const struct net *net)
+{
+ if (net->ipv4.sysctl_route_tos_as_dscp)
+ return IPTOS_DS_MASK;
+ else
+ return IPTOS_TOS_MASK & ~3;
+}
+
+static inline u8 rt_tos(const struct net *net, u8 tos)
+{
+ if (net->ipv4.sysctl_route_tos_as_dscp)
+ return RT_DS(tos);
+ else
+ return RT_TOS(tos);
+}
+
#define RTO_ONLINK 0x01
#define RT_CONN_FLAGS(sk) (RT_TOS(inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
diff --git a/include/uapi/linux/in_route.h b/include/uapi/linux/in_route.h
index 0cc2c23b47f8..61a95ed2a2e0 100644
--- a/include/uapi/linux/in_route.h
+++ b/include/uapi/linux/in_route.h
@@ -28,6 +28,9 @@
#define RTCF_NAT (RTCF_DNAT|RTCF_SNAT)
+/* sysctl route_tos_as_dscp = 0 */
#define RT_TOS(tos) ((tos)&IPTOS_TOS_MASK)
+/* sysctl route_tos_as_dscp = 1 */
+#define RT_DS(tos) ((tos)&IPTOS_DS_MASK)
#endif /* _LINUX_IN_ROUTE_H */
diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h
index e42d13b55cf3..4a6b01e03cab 100644
--- a/include/uapi/linux/ip.h
+++ b/include/uapi/linux/ip.h
@@ -20,6 +20,8 @@
#include <linux/types.h>
#include <asm/byteorder.h>
+#define IPTOS_DS_MASK 0xFC
+#define IPTOS_DS(tos) ((tos)&IPTOS_DS_MASK)
#define IPTOS_TOS_MASK 0x1E
#define IPTOS_TOS(tos) ((tos)&IPTOS_TOS_MASK)
#define IPTOS_LOWDELAY 0x10
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 3e5f4f2e705e..61b1e2bd6bc5 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -790,6 +790,15 @@ static struct ctl_table ipv4_net_table[] = {
.extra2 = SYSCTL_ONE,
},
#endif
+ {
+ .procname = "route_tos_as_dscp",
+ .data = &init_net.ipv4.sysctl_route_tos_as_dscp,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = proc_dointvec_minmax,
+ .extra1 = SYSCTL_ZERO,
+ .extra2 = SYSCTL_ONE,
+ },
{
.procname = "tcp_mtu_probing",
.data = &init_net.ipv4.sysctl_tcp_mtu_probing,
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH net-next] net: DSCP in IPv4 routing
2020-11-13 9:02 ` Guillaume Nault
2020-11-14 23:03 ` Russell Strong
2020-11-14 23:09 ` Russell Strong
@ 2020-11-14 23:10 ` Russell Strong
2020-11-17 0:21 ` kernel test robot
2 siblings, 1 reply; 8+ messages in thread
From: Russell Strong @ 2020-11-14 23:10 UTC (permalink / raw)
To: Guillaume Nault, Stephen Hemminger; +Cc: netdev
[PATCH 2/2] DSCP in IPv4 routing
TOS handling in ipv4 routing does not use all the bits in a DSCP
value. This change introduces a sysctl "route_tos_as_dscp" control
that, when enabled, widens masks to used the 6 DSCP bits in routing.
This commit converts macros
RT_TOS -> rt_tos
IPTOS_RT_MASK -> iptos_rt_mask
Signed-off-by: Russell Strong <russell@strong.id.au>
---
.../ethernet/mellanox/mlx5/core/en/tc_tun.c | 3 +-
drivers/net/geneve.c | 4 +--
drivers/net/ipvlan/ipvlan_core.c | 2 +-
drivers/net/ppp/pptp.c | 2 +-
drivers/net/vrf.c | 2 +-
drivers/net/vxlan.c | 4 +--
include/net/ip.h | 3 +-
include/net/route.h | 6 ++--
net/bridge/br_netfilter_hooks.c | 2 +-
net/core/filter.c | 4 +--
net/core/lwt_bpf.c | 2 +-
net/ipv4/fib_frontend.c | 2 +-
net/ipv4/fib_rules.c | 2 +-
net/ipv4/icmp.c | 8 ++---
net/ipv4/ip_gre.c | 2 +-
net/ipv4/ip_output.c | 2 +-
net/ipv4/ip_tunnel.c | 6 ++--
net/ipv4/ipmr.c | 6 ++--
net/ipv4/netfilter.c | 2 +-
net/ipv4/netfilter/ipt_rpfilter.c | 2 +-
net/ipv4/netfilter/nf_dup_ipv4.c | 2 +-
net/ipv4/route.c | 34 +++++++++++--------
net/ipv6/ip6_output.c | 2 +-
net/ipv6/ip6_tunnel.c | 10 +++---
net/ipv6/sit.c | 4 +--
net/xfrm/xfrm_policy.c | 13 ++-----
26 files changed, 65 insertions(+), 66 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
index 90930e54b6f2..ebc001e5b890 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
@@ -354,6 +354,7 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
int max_encap_size = MLX5_CAP_ESW(priv->mdev, max_encap_header_size);
const struct ip_tunnel_key *tun_key = &e->tun_info->key;
struct net_device *out_dev, *route_dev;
+ struct net *net = dev_net(mirred_dev);
struct flowi6 fl6 = {};
struct ipv6hdr *ip6h;
struct neighbour *n = NULL;
@@ -364,7 +365,7 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,
ttl = tun_key->ttl;
- fl6.flowlabel = ip6_make_flowinfo(RT_TOS(tun_key->tos), tun_key->label);
+ fl6.flowlabel = ip6_make_flowinfo(rt_tos(net, tun_key->tos), tun_key->label);
fl6.daddr = tun_key->u.ipv6.dst;
fl6.saddr = tun_key->u.ipv6.src;
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index a3c8ce6deb93..544a42ba8506 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -797,7 +797,7 @@ static struct rtable *geneve_get_v4_rt(struct sk_buff *skb,
tos = ip_tunnel_get_dsfield(ip_hdr(skb), skb);
use_cache = false;
}
- fl4->flowi4_tos = RT_TOS(tos);
+ fl4->flowi4_tos = rt_tos(geneve->net, tos);
dst_cache = (struct dst_cache *)&info->dst_cache;
if (use_cache) {
@@ -851,7 +851,7 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb,
use_cache = false;
}
- fl6->flowlabel = ip6_make_flowinfo(RT_TOS(prio),
+ fl6->flowlabel = ip6_make_flowinfo(rt_tos(geneve->net, prio),
info->key.label);
dst_cache = (struct dst_cache *)&info->dst_cache;
if (use_cache) {
diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
index 8801d093135c..a2cee2633fc1 100644
--- a/drivers/net/ipvlan/ipvlan_core.c
+++ b/drivers/net/ipvlan/ipvlan_core.c
@@ -421,7 +421,7 @@ static int ipvlan_process_v4_outbound(struct sk_buff *skb)
int err, ret = NET_XMIT_DROP;
struct flowi4 fl4 = {
.flowi4_oif = dev->ifindex,
- .flowi4_tos = RT_TOS(ip4h->tos),
+ .flowi4_tos = rt_tos(net, ip4h->tos),
.flowi4_flags = FLOWI_FLAG_ANYSRC,
.flowi4_mark = skb->mark,
.daddr = ip4h->daddr,
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c
index ee5058445d06..c2c4a242e163 100644
--- a/drivers/net/ppp/pptp.c
+++ b/drivers/net/ppp/pptp.c
@@ -155,7 +155,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
opt->dst_addr.sin_addr.s_addr,
opt->src_addr.sin_addr.s_addr,
0, 0, IPPROTO_GRE,
- RT_TOS(0), sk->sk_bound_dev_if);
+ rt_tos(net, 0), sk->sk_bound_dev_if);
if (IS_ERR(rt))
goto tx_error;
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index f2793ffde191..c477c3e165a1 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -534,7 +534,7 @@ static netdev_tx_t vrf_process_v4_outbound(struct sk_buff *skb,
/* needed to match OIF rule */
fl4.flowi4_oif = vrf_dev->ifindex;
fl4.flowi4_iif = LOOPBACK_IFINDEX;
- fl4.flowi4_tos = RT_TOS(ip4h->tos);
+ fl4.flowi4_tos = rt_tos(net, ip4h->tos);
fl4.flowi4_flags = FLOWI_FLAG_ANYSRC | FLOWI_FLAG_SKIP_NH_OIF;
fl4.flowi4_proto = ip4h->protocol;
fl4.daddr = ip4h->daddr;
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 236fcc55a5fd..533e7ef087a6 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -2412,7 +2412,7 @@ static struct rtable *vxlan_get_route(struct vxlan_dev *vxlan, struct net_device
memset(&fl4, 0, sizeof(fl4));
fl4.flowi4_oif = oif;
- fl4.flowi4_tos = RT_TOS(tos);
+ fl4.flowi4_tos = rt_tos(vxlan->net, tos);
fl4.flowi4_mark = skb->mark;
fl4.flowi4_proto = IPPROTO_UDP;
fl4.daddr = daddr;
@@ -2469,7 +2469,7 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan,
fl6.flowi6_oif = oif;
fl6.daddr = *daddr;
fl6.saddr = *saddr;
- fl6.flowlabel = ip6_make_flowinfo(RT_TOS(tos), label);
+ fl6.flowlabel = ip6_make_flowinfo(rt_tos(vxlan->net, tos), label);
fl6.flowi6_mark = skb->mark;
fl6.flowi6_proto = IPPROTO_UDP;
fl6.fl6_dport = dport;
diff --git a/include/net/ip.h b/include/net/ip.h
index e20874059f82..11482f265b31 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -241,7 +241,8 @@ static inline struct sk_buff *ip_finish_skb(struct sock *sk, struct flowi4 *fl4)
static inline __u8 get_rttos(struct ipcm_cookie* ipc, struct inet_sock *inet)
{
- return (ipc->tos != -1) ? RT_TOS(ipc->tos) : RT_TOS(inet->tos);
+ struct net *net = sock_net(&inet->sk);
+ return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
}
static inline __u8 get_rtconn_flags(struct ipcm_cookie* ipc, struct sock* sk)
diff --git a/include/net/route.h b/include/net/route.h
index 0cc8ce316940..705137be768b 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -56,8 +56,8 @@ static inline u8 rt_tos(const struct net *net, u8 tos)
#define RTO_ONLINK 0x01
-#define RT_CONN_FLAGS(sk) (RT_TOS(inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
-#define RT_CONN_FLAGS_TOS(sk,tos) (RT_TOS(tos) | sock_flag(sk, SOCK_LOCALROUTE))
+#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
+#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
struct fib_nh;
struct fib_info;
@@ -271,8 +271,6 @@ static inline void ip_rt_put(struct rtable *rt)
dst_release(&rt->dst);
}
-#define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3)
-
extern const __u8 ip_tos2prio[16];
static inline char rt_tos2priority(u8 tos)
diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c
index 04c3f9a82650..2e7de791936c 100644
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
@@ -379,7 +379,7 @@ static int br_nf_pre_routing_finish(struct net *net, struct sock *sk, struct sk_
goto free_skb;
rt = ip_route_output(net, iph->daddr, 0,
- RT_TOS(iph->tos), 0);
+ rt_tos(net, iph->tos), 0);
if (!IS_ERR(rt)) {
/* - Bridged-and-DNAT'ed traffic doesn't
* require ip_forwarding. */
diff --git a/net/core/filter.c b/net/core/filter.c
index 2ca5eecebacf..94cb0a4ee9b3 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -2345,7 +2345,7 @@ static int __bpf_redirect_neigh_v4(struct sk_buff *skb, struct net_device *dev,
struct flowi4 fl4 = {
.flowi4_flags = FLOWI_FLAG_ANYSRC,
.flowi4_mark = skb->mark,
- .flowi4_tos = RT_TOS(ip4h->tos),
+ .flowi4_tos = rt_tos(net, ip4h->tos),
.flowi4_oif = dev->ifindex,
.flowi4_proto = ip4h->protocol,
.daddr = ip4h->daddr,
@@ -5309,7 +5309,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params,
fl4.flowi4_iif = params->ifindex;
fl4.flowi4_oif = 0;
}
- fl4.flowi4_tos = params->tos & IPTOS_RT_MASK;
+ fl4.flowi4_tos = params->tos & iptos_rt_mask(net);
fl4.flowi4_scope = RT_SCOPE_UNIVERSE;
fl4.flowi4_flags = 0;
diff --git a/net/core/lwt_bpf.c b/net/core/lwt_bpf.c
index 7d3438215f32..81f673111423 100644
--- a/net/core/lwt_bpf.c
+++ b/net/core/lwt_bpf.c
@@ -206,7 +206,7 @@ static int bpf_lwt_xmit_reroute(struct sk_buff *skb)
fl4.flowi4_oif = oif;
fl4.flowi4_mark = skb->mark;
fl4.flowi4_uid = sock_net_uid(net, sk);
- fl4.flowi4_tos = RT_TOS(iph->tos);
+ fl4.flowi4_tos = rt_tos(net, iph->tos);
fl4.flowi4_flags = FLOWI_FLAG_ANYSRC;
fl4.flowi4_proto = iph->protocol;
fl4.daddr = iph->daddr;
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index 86a23e4a6a50..6a3b6036d8e6 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -292,7 +292,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb)
.flowi4_iif = LOOPBACK_IFINDEX,
.flowi4_oif = l3mdev_master_ifindex_rcu(dev),
.daddr = ip_hdr(skb)->saddr,
- .flowi4_tos = RT_TOS(ip_hdr(skb)->tos),
+ .flowi4_tos = rt_tos(net, ip_hdr(skb)->tos),
.flowi4_scope = scope,
.flowi4_mark = vmark ? skb->mark : 0,
};
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index ce54a30c2ef1..6f82604d3715 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -229,7 +229,7 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
int err = -EINVAL;
struct fib4_rule *rule4 = (struct fib4_rule *) rule;
- if (frh->tos & ~IPTOS_TOS_MASK) {
+ if (frh->tos & ~iptos_rt_mask(net)) {
NL_SET_ERR_MSG(extack, "Invalid tos");
goto errout;
}
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 005faea415a4..5433455596d2 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -444,7 +444,7 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb)
fl4.saddr = saddr;
fl4.flowi4_mark = mark;
fl4.flowi4_uid = sock_net_uid(net, NULL);
- fl4.flowi4_tos = RT_TOS(ip_hdr(skb)->tos);
+ fl4.flowi4_tos = rt_tos(net, ip_hdr(skb)->tos);
fl4.flowi4_proto = IPPROTO_ICMP;
fl4.flowi4_oif = l3mdev_master_ifindex(skb->dev);
security_skb_classify_flow(skb, flowi4_to_flowi(&fl4));
@@ -496,7 +496,7 @@ static struct rtable *icmp_route_lookup(struct net *net,
fl4->saddr = saddr;
fl4->flowi4_mark = mark;
fl4->flowi4_uid = sock_net_uid(net, NULL);
- fl4->flowi4_tos = RT_TOS(tos);
+ fl4->flowi4_tos = rt_tos(net, tos);
fl4->flowi4_proto = IPPROTO_ICMP;
fl4->fl4_icmp_type = type;
fl4->fl4_icmp_code = code;
@@ -544,7 +544,7 @@ static struct rtable *icmp_route_lookup(struct net *net,
orefdst = skb_in->_skb_refdst; /* save old refdst */
skb_dst_set(skb_in, NULL);
err = ip_route_input(skb_in, fl4_dec.daddr, fl4_dec.saddr,
- RT_TOS(tos), rt2->dst.dev);
+ rt_tos(net, tos), rt2->dst.dev);
dst_release(&rt2->dst);
rt2 = skb_rtable(skb_in);
@@ -712,7 +712,7 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info,
rcu_read_unlock();
}
- tos = icmp_pointers[type].error ? (RT_TOS(iph->tos) |
+ tos = icmp_pointers[type].error ? (rt_tos(net, iph->tos) |
IPTOS_PREC_INTERNETCONTROL) :
iph->tos;
mark = IP4_REPLY_MARK(net, skb_in->mark);
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index a68bf4c6fe9b..17042cf9750d 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -882,7 +882,7 @@ static int ipgre_open(struct net_device *dev)
t->parms.iph.daddr,
t->parms.iph.saddr,
t->parms.o_key,
- RT_TOS(t->parms.iph.tos),
+ rt_tos(t->net, t->parms.iph.tos),
t->parms.link);
if (IS_ERR(rt))
return -EADDRNOTAVAIL;
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 879b76ae4435..b564bf9a908b 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1694,7 +1694,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb,
flowi4_init_output(&fl4, oif,
IP4_REPLY_MARK(net, skb->mark) ?: sk->sk_mark,
- RT_TOS(arg->tos),
+ rt_tos(net, arg->tos),
RT_SCOPE_UNIVERSE, ip_hdr(skb)->protocol,
ip_reply_arg_flowi_flags(arg),
daddr, saddr,
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index ee65c9225178..b2c01ba8476a 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -294,7 +294,7 @@ static int ip_tunnel_bind_dev(struct net_device *dev)
ip_tunnel_init_flow(&fl4, iph->protocol, iph->daddr,
iph->saddr, tunnel->parms.o_key,
- RT_TOS(iph->tos), tunnel->parms.link,
+ rt_tos(tunnel->net, iph->tos), tunnel->parms.link,
tunnel->fwmark, 0);
rt = ip_route_output_key(tunnel->net, &fl4);
@@ -565,7 +565,7 @@ void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
tos = ipv6_get_dsfield((const struct ipv6hdr *)inner_iph);
}
ip_tunnel_init_flow(&fl4, proto, key->u.ipv4.dst, key->u.ipv4.src,
- tunnel_id_to_key32(key->tun_id), RT_TOS(tos),
+ tunnel_id_to_key32(key->tun_id), rt_tos(tunnel->net, tos),
0, skb->mark, skb_get_hash(skb));
if (tunnel->encap.type != TUNNEL_ENCAP_NONE)
goto tx_error;
@@ -722,7 +722,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
}
ip_tunnel_init_flow(&fl4, protocol, dst, tnl_params->saddr,
- tunnel->parms.o_key, RT_TOS(tos), tunnel->parms.link,
+ tunnel->parms.o_key, rt_tos(tunnel->net, tos), tunnel->parms.link,
tunnel->fwmark, skb_get_hash(skb));
if (ip_tunnel_encap(skb, tunnel, &protocol, &fl4) < 0)
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 939792a38814..142124fb85c5 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1840,7 +1840,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,
vif->remote, vif->local,
0, 0,
IPPROTO_IPIP,
- RT_TOS(iph->tos), vif->link);
+ rt_tos(net, iph->tos), vif->link);
if (IS_ERR(rt))
goto out_free;
encap = sizeof(struct iphdr);
@@ -1848,7 +1848,7 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,
rt = ip_route_output_ports(net, &fl4, NULL, iph->daddr, 0,
0, 0,
IPPROTO_IPIP,
- RT_TOS(iph->tos), vif->link);
+ rt_tos(net, iph->tos), vif->link);
if (IS_ERR(rt))
goto out_free;
}
@@ -2048,7 +2048,7 @@ static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff *skb)
struct flowi4 fl4 = {
.daddr = iph->daddr,
.saddr = iph->saddr,
- .flowi4_tos = RT_TOS(iph->tos),
+ .flowi4_tos = rt_tos(net, iph->tos),
.flowi4_oif = (rt_is_output_route(rt) ?
skb->dev->ifindex : 0),
.flowi4_iif = (rt_is_output_route(rt) ?
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index 7c841037c533..acb8fc28f27a 100644
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -42,7 +42,7 @@ int ip_route_me_harder(struct net *net, struct sock *sk, struct sk_buff *skb, un
*/
fl4.daddr = iph->daddr;
fl4.saddr = saddr;
- fl4.flowi4_tos = RT_TOS(iph->tos);
+ fl4.flowi4_tos = rt_tos(net, iph->tos);
fl4.flowi4_oif = sk ? sk->sk_bound_dev_if : 0;
if (!fl4.flowi4_oif)
fl4.flowi4_oif = l3mdev_master_ifindex(dev);
diff --git a/net/ipv4/netfilter/ipt_rpfilter.c b/net/ipv4/netfilter/ipt_rpfilter.c
index cc23f1ce239c..e7b793919c63 100644
--- a/net/ipv4/netfilter/ipt_rpfilter.c
+++ b/net/ipv4/netfilter/ipt_rpfilter.c
@@ -76,7 +76,7 @@ static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par)
flow.daddr = iph->saddr;
flow.saddr = rpfilter_get_saddr(iph->daddr);
flow.flowi4_mark = info->flags & XT_RPFILTER_VALID_MARK ? skb->mark : 0;
- flow.flowi4_tos = RT_TOS(iph->tos);
+ flow.flowi4_tos = rt_tos(xt_net(par), iph->tos);
flow.flowi4_scope = RT_SCOPE_UNIVERSE;
flow.flowi4_oif = l3mdev_master_ifindex_rcu(xt_in(par));
diff --git a/net/ipv4/netfilter/nf_dup_ipv4.c b/net/ipv4/netfilter/nf_dup_ipv4.c
index 6cc5743c553a..8b8c685f6436 100644
--- a/net/ipv4/netfilter/nf_dup_ipv4.c
+++ b/net/ipv4/netfilter/nf_dup_ipv4.c
@@ -32,7 +32,7 @@ static bool nf_dup_ipv4_route(struct net *net, struct sk_buff *skb,
fl4.flowi4_oif = oif;
fl4.daddr = gw->s_addr;
- fl4.flowi4_tos = RT_TOS(iph->tos);
+ fl4.flowi4_tos = rt_tos(net, iph->tos);
fl4.flowi4_scope = RT_SCOPE_UNIVERSE;
fl4.flowi4_flags = FLOWI_FLAG_KNOWN_NH;
rt = ip_route_output_key(net, &fl4);
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index a3b60c41cbad..b27a7abda30a 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -112,9 +112,6 @@
#include "fib_lookup.h"
-#define RT_FL_TOS(oldflp4) \
- ((oldflp4)->flowi4_tos & (IPTOS_RT_MASK | RTO_ONLINK))
-
#define RT_GC_TIMEOUT (300*HZ)
static int ip_rt_max_size;
@@ -549,7 +546,7 @@ static void build_skb_flow_key(struct flowi4 *fl4, const struct sk_buff *skb,
const struct net *net = dev_net(skb->dev);
const struct iphdr *iph = ip_hdr(skb);
int oif = skb->dev->ifindex;
- u8 tos = RT_TOS(iph->tos);
+ u8 tos = rt_tos(net, iph->tos);
u8 prot = iph->protocol;
u32 mark = skb->mark;
@@ -825,7 +822,7 @@ static void ip_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_buf
const struct iphdr *iph = (const struct iphdr *) skb->data;
struct net *net = dev_net(skb->dev);
int oif = skb->dev->ifindex;
- u8 tos = RT_TOS(iph->tos);
+ u8 tos = rt_tos(net, iph->tos);
u8 prot = iph->protocol;
u32 mark = skb->mark;
@@ -1073,7 +1070,7 @@ void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,
u32 mark = IP4_REPLY_MARK(net, skb->mark);
__build_flow_key(net, &fl4, NULL, iph, oif,
- RT_TOS(iph->tos), protocol, mark, 0);
+ rt_tos(net, iph->tos), protocol, mark, 0);
rt = __ip_route_output_key(net, &fl4);
if (!IS_ERR(rt)) {
__ip_rt_update_pmtu(rt, &fl4, mtu);
@@ -1162,7 +1159,7 @@ void ipv4_redirect(struct sk_buff *skb, struct net *net,
struct rtable *rt;
__build_flow_key(net, &fl4, NULL, iph, oif,
- RT_TOS(iph->tos), protocol, 0, 0);
+ rt_tos(net, iph->tos), protocol, 0, 0);
rt = __ip_route_output_key(net, &fl4);
if (!IS_ERR(rt)) {
__ip_do_redirect(rt, skb, &fl4, false);
@@ -1271,18 +1268,23 @@ void ip_rt_get_source(u8 *addr, struct sk_buff *skb, struct rtable *rt)
else {
struct fib_result res;
struct iphdr *iph = ip_hdr(skb);
+ struct net *net;
+
struct flowi4 fl4 = {
.daddr = iph->daddr,
.saddr = iph->saddr,
- .flowi4_tos = RT_TOS(iph->tos),
.flowi4_oif = rt->dst.dev->ifindex,
.flowi4_iif = skb->dev->ifindex,
.flowi4_mark = skb->mark,
};
rcu_read_lock();
- if (fib_lookup(dev_net(rt->dst.dev), &fl4, &res, 0) == 0)
- src = fib_result_prefsrc(dev_net(rt->dst.dev), &res);
+
+ net = dev_net(rt->dst.dev);
+ fl4.flowi4_tos = rt_tos(net, iph->tos);
+
+ if (fib_lookup(net, &fl4, &res, 0) == 0)
+ src = fib_result_prefsrc(net, &res);
else
src = inet_select_addr(rt->dst.dev,
rt_nexthop(rt, iph->daddr),
@@ -2055,7 +2057,7 @@ int ip_route_use_hint(struct sk_buff *skb, __be32 daddr, __be32 saddr,
if (rt->rt_type != RTN_LOCAL)
goto skip_validate_source;
- tos &= IPTOS_RT_MASK;
+ tos &= iptos_rt_mask(net);
err = fib_validate_source(skb, saddr, daddr, tos, 0, dev, in_dev, &tag);
if (err < 0)
goto martian_source;
@@ -2297,8 +2299,9 @@ int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,
{
struct fib_result res;
int err;
+ struct net *net = dev_net(dev);
- tos &= IPTOS_RT_MASK;
+ tos &= iptos_rt_mask(net);
rcu_read_lock();
err = ip_route_input_rcu(skb, daddr, saddr, tos, dev, &res);
rcu_read_unlock();
@@ -2489,7 +2492,8 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
struct rtable *ip_route_output_key_hash(struct net *net, struct flowi4 *fl4,
const struct sk_buff *skb)
{
- __u8 tos = RT_FL_TOS(fl4);
+ __u8 tos = fl4->flowi4_tos & (iptos_rt_mask(net) | RTO_ONLINK);
+
struct fib_result res = {
.type = RTN_UNSPEC,
.fi = NULL,
@@ -2499,7 +2503,7 @@ struct rtable *ip_route_output_key_hash(struct net *net, struct flowi4 *fl4,
struct rtable *rth;
fl4->flowi4_iif = LOOPBACK_IFINDEX;
- fl4->flowi4_tos = tos & IPTOS_RT_MASK;
+ fl4->flowi4_tos = tos & iptos_rt_mask(net);
fl4->flowi4_scope = ((tos & RTO_ONLINK) ?
RT_SCOPE_LINK : RT_SCOPE_UNIVERSE);
@@ -2808,7 +2812,7 @@ struct rtable *ip_route_output_tunnel(struct sk_buff *skb,
fl4.daddr = info->key.u.ipv4.dst;
fl4.saddr = info->key.u.ipv4.src;
tos = info->key.tos;
- fl4.flowi4_tos = RT_TOS(tos);
+ fl4.flowi4_tos = rt_tos(net, tos);
rt = ip_route_output_key(net, &fl4);
if (IS_ERR(rt)) {
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 749ad72386b2..6880b7ef2730 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1243,7 +1243,7 @@ struct dst_entry *ip6_dst_lookup_tunnel(struct sk_buff *skb,
fl6.daddr = info->key.u.ipv6.dst;
fl6.saddr = info->key.u.ipv6.src;
prio = info->key.tos;
- fl6.flowlabel = ip6_make_flowinfo(RT_TOS(prio),
+ fl6.flowlabel = ip6_make_flowinfo(rt_tos(net, prio),
info->key.label);
dst = ipv6_stub->ipv6_dst_lookup_flow(net, sock->sk, &fl6,
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index a7950baa05e5..65d51b3be259 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -571,6 +571,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
u8 rel_code = code;
struct rtable *rt;
struct flowi4 fl4;
+ struct net *net;
err = ip6_tnl_err(skb, IPPROTO_IPIP, opt, &rel_type, &rel_code,
&rel_msg, &rel_info, offset);
@@ -611,8 +612,9 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
eiph = ip_hdr(skb2);
/* Try to guess incoming interface */
- rt = ip_route_output_ports(dev_net(skb->dev), &fl4, NULL, eiph->saddr,
- 0, 0, 0, IPPROTO_IPIP, RT_TOS(eiph->tos), 0);
+ net = dev_net(skb->dev);
+ rt = ip_route_output_ports(net, &fl4, NULL, eiph->saddr,
+ 0, 0, 0, IPPROTO_IPIP, rt_tos(net, eiph->tos), 0);
if (IS_ERR(rt))
goto out;
@@ -621,9 +623,9 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
/* route "incoming" packet */
if (rt->rt_flags & RTCF_LOCAL) {
- rt = ip_route_output_ports(dev_net(skb->dev), &fl4, NULL,
+ rt = ip_route_output_ports(net, &fl4, NULL,
eiph->daddr, eiph->saddr, 0, 0,
- IPPROTO_IPIP, RT_TOS(eiph->tos), 0);
+ IPPROTO_IPIP, rt_tos(net, eiph->tos), 0);
if (IS_ERR(rt) || rt->dst.dev->type != ARPHRD_TUNNEL6) {
if (!IS_ERR(rt))
ip_rt_put(rt);
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 2da0ee703779..a4158c92e68a 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -937,7 +937,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
}
flowi4_init_output(&fl4, tunnel->parms.link, tunnel->fwmark,
- RT_TOS(tos), RT_SCOPE_UNIVERSE, IPPROTO_IPV6,
+ rt_tos(tunnel->net, tos), RT_SCOPE_UNIVERSE, IPPROTO_IPV6,
0, dst, tiph->saddr, 0, 0,
sock_net_uid(tunnel->net, NULL));
@@ -1112,7 +1112,7 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev)
iph->daddr, iph->saddr,
0, 0,
IPPROTO_IPV6,
- RT_TOS(iph->tos),
+ rt_tos(tunnel->net, iph->tos),
tunnel->parms.link);
if (!IS_ERR(rt)) {
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index d622c2548d22..1a7a77be3cf0 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2447,14 +2447,6 @@ xfrm_tmpl_resolve(struct xfrm_policy **pols, int npols, const struct flowi *fl,
}
-static int xfrm_get_tos(const struct flowi *fl, int family)
-{
- if (family == AF_INET)
- return IPTOS_RT_MASK & fl->u.ip4.flowi4_tos;
-
- return 0;
-}
-
static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family)
{
const struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family);
@@ -2541,13 +2533,14 @@ static struct dst_entry *xfrm_bundle_create(struct xfrm_policy *policy,
int header_len = 0;
int nfheader_len = 0;
int trailer_len = 0;
- int tos;
+ int tos = 0;
int family = policy->selector.family;
xfrm_address_t saddr, daddr;
xfrm_flowi_addr_get(fl, &saddr, &daddr, family);
- tos = xfrm_get_tos(fl, family);
+ if (family == AF_INET)
+ tos = iptos_rt_mask(net) & fl->u.ip4.flowi4_tos;
dst_hold(dst);
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: Re: [PATCH net-next] net: DSCP in IPv4 routing
2020-11-14 23:10 ` Russell Strong
@ 2020-11-17 0:21 ` kernel test robot
0 siblings, 0 replies; 8+ messages in thread
From: kernel test robot @ 2020-11-17 0:21 UTC (permalink / raw)
To: Russell Strong, Guillaume Nault, Stephen Hemminger
Cc: kbuild-all, clang-built-linux, netdev
[-- Attachment #1: Type: text/plain, Size: 25258 bytes --]
Hi Russell,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on net-next/master]
url: https://github.com/0day-ci/linux/commits/Russell-Strong/Re-PATCH-net-next-net-DSCP-in-IPv4-routing/20201115-071518
base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 9e6cad531c9de1ba39334fca535af0da5fdf8770
config: x86_64-randconfig-r014-20201116 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project c044709b8fbea2a9a375e4173a6bd735f6866c0c)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# https://github.com/0day-ci/linux/commit/f5e2676aa421caddeef6d412be65f35d9e4d3b85
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Russell-Strong/Re-PATCH-net-next-net-DSCP-in-IPv4-routing/20201115-071518
git checkout f5e2676aa421caddeef6d412be65f35d9e4d3b85
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
In file included from net/core/filter.c:33:
In file included from include/net/ip.h:29:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/core/filter.c:33:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/core/filter.c:2348:20: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
.flowi4_tos = rt_tos(net, ip4h->tos),
^
>> net/core/filter.c:5312:33: error: implicit declaration of function 'iptos_rt_mask' [-Werror,-Wimplicit-function-declaration]
fl4.flowi4_tos = params->tos & iptos_rt_mask(net);
^
5 errors generated.
--
In file included from net/ipv4/route.c:90:
In file included from include/net/dst_metadata.h:6:
In file included from include/net/ip_tunnels.h:18:
In file included from include/net/lwtunnel.h:9:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/route.c:93:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/route.c:533:9: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
tos = RT_CONN_FLAGS(sk);
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/route.c:549:11: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
u8 tos = rt_tos(net, iph->tos);
^
net/ipv4/route.c:567:7: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/route.c:825:11: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
u8 tos = rt_tos(net, iph->tos);
^
net/ipv4/route.c:1073:5: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
rt_tos(net, iph->tos), protocol, mark, 0);
^
net/ipv4/route.c:1162:5: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
rt_tos(net, iph->tos), protocol, 0, 0);
^
net/ipv4/route.c:1284:20: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
fl4.flowi4_tos = rt_tos(net, iph->tos);
^
>> net/ipv4/route.c:2060:9: error: implicit declaration of function 'iptos_rt_mask' [-Werror,-Wimplicit-function-declaration]
tos &= iptos_rt_mask(net);
^
net/ipv4/route.c:2304:9: error: implicit declaration of function 'iptos_rt_mask' [-Werror,-Wimplicit-function-declaration]
tos &= iptos_rt_mask(net);
^
net/ipv4/route.c:2495:32: error: implicit declaration of function 'iptos_rt_mask' [-Werror,-Wimplicit-function-declaration]
__u8 tos = fl4->flowi4_tos & (iptos_rt_mask(net) | RTO_ONLINK);
^
net/ipv4/route.c:2815:19: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
fl4.flowi4_tos = rt_tos(net, tos);
^
14 errors generated.
--
In file included from net/ipv4/ip_output.c:67:
In file included from include/net/ip.h:29:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/ip_output.c:67:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/ip_output.c:493:9: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS_TOS(sk, tos),
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/ip_output.c:1697:7: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
rt_tos(net, arg->tos),
^
5 errors generated.
--
In file included from net/ipv4/inet_connection_sock.c:16:
In file included from include/net/inet_hashtables.h:27:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/inet_connection_sock.c:18:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/inet_connection_sock.c:600:7: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/inet_connection_sock.c:638:7: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/inet_connection_sock.c:1085:8: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), sk->sk_bound_dev_if);
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
6 errors generated.
--
In file included from net/ipv4/tcp_ipv4.c:62:
In file included from include/net/icmp.h:21:
In file included from include/net/ip.h:29:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/tcp_ipv4.c:62:
In file included from include/net/icmp.h:21:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/tcp_ipv4.c:230:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), sk->sk_bound_dev_if,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
4 errors generated.
--
In file included from net/ipv4/datagram.c:14:
In file included from include/net/ip.h:29:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/datagram.c:14:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/datagram.c:49:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), oif,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/datagram.c:122:8: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), sk->sk_bound_dev_if);
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
5 errors generated.
--
In file included from net/ipv4/icmp.c:76:
In file included from include/net/ip.h:29:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/icmp.c:76:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/icmp.c:447:19: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
fl4.flowi4_tos = rt_tos(net, ip_hdr(skb)->tos);
^
net/ipv4/icmp.c:499:20: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
fl4->flowi4_tos = rt_tos(net, tos);
^
net/ipv4/icmp.c:715:37: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
tos = icmp_pointers[type].error ? (rt_tos(net, iph->tos) |
^
6 errors generated.
--
In file included from net/ipv4/af_inet.c:96:
In file included from include/net/ip.h:29:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/af_inet.c:96:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/af_inet.c:1235:39: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
rt = ip_route_connect(fl4, daddr, 0, RT_CONN_FLAGS(sk),
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/af_inet.c:1289:25: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
sk->sk_protocol, RT_CONN_FLAGS(sk),
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
5 errors generated.
..
vim +/rt_tos +2348 net/core/filter.c
2336
2337 static int __bpf_redirect_neigh_v4(struct sk_buff *skb, struct net_device *dev,
2338 struct bpf_nh_params *nh)
2339 {
2340 const struct iphdr *ip4h = ip_hdr(skb);
2341 struct net *net = dev_net(dev);
2342 int err, ret = NET_XMIT_DROP;
2343
2344 if (!nh) {
2345 struct flowi4 fl4 = {
2346 .flowi4_flags = FLOWI_FLAG_ANYSRC,
2347 .flowi4_mark = skb->mark,
> 2348 .flowi4_tos = rt_tos(net, ip4h->tos),
2349 .flowi4_oif = dev->ifindex,
2350 .flowi4_proto = ip4h->protocol,
2351 .daddr = ip4h->daddr,
2352 .saddr = ip4h->saddr,
2353 };
2354 struct rtable *rt;
2355
2356 rt = ip_route_output_flow(net, &fl4, NULL);
2357 if (IS_ERR(rt))
2358 goto out_drop;
2359 if (rt->rt_type != RTN_UNICAST && rt->rt_type != RTN_LOCAL) {
2360 ip_rt_put(rt);
2361 goto out_drop;
2362 }
2363
2364 skb_dst_set(skb, &rt->dst);
2365 }
2366
2367 err = bpf_out_neigh_v4(net, skb, dev, nh);
2368 if (unlikely(net_xmit_eval(err)))
2369 dev->stats.tx_errors++;
2370 else
2371 ret = NET_XMIT_SUCCESS;
2372 goto out_xmit;
2373 out_drop:
2374 dev->stats.tx_errors++;
2375 kfree_skb(skb);
2376 out_xmit:
2377 return ret;
2378 }
2379 #else
2380 static int __bpf_redirect_neigh_v4(struct sk_buff *skb, struct net_device *dev,
2381 struct bpf_nh_params *nh)
2382 {
2383 kfree_skb(skb);
2384 return NET_XMIT_DROP;
2385 }
2386 #endif /* CONFIG_INET */
2387
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 38645 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH net-next] net: DSCP in IPv4 routing
@ 2020-11-17 0:21 ` kernel test robot
0 siblings, 0 replies; 8+ messages in thread
From: kernel test robot @ 2020-11-17 0:21 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 25677 bytes --]
Hi Russell,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on net-next/master]
url: https://github.com/0day-ci/linux/commits/Russell-Strong/Re-PATCH-net-next-net-DSCP-in-IPv4-routing/20201115-071518
base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 9e6cad531c9de1ba39334fca535af0da5fdf8770
config: x86_64-randconfig-r014-20201116 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project c044709b8fbea2a9a375e4173a6bd735f6866c0c)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# install x86_64 cross compiling tool for clang build
# apt-get install binutils-x86-64-linux-gnu
# https://github.com/0day-ci/linux/commit/f5e2676aa421caddeef6d412be65f35d9e4d3b85
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Russell-Strong/Re-PATCH-net-next-net-DSCP-in-IPv4-routing/20201115-071518
git checkout f5e2676aa421caddeef6d412be65f35d9e4d3b85
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
In file included from net/core/filter.c:33:
In file included from include/net/ip.h:29:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/core/filter.c:33:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/core/filter.c:2348:20: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
.flowi4_tos = rt_tos(net, ip4h->tos),
^
>> net/core/filter.c:5312:33: error: implicit declaration of function 'iptos_rt_mask' [-Werror,-Wimplicit-function-declaration]
fl4.flowi4_tos = params->tos & iptos_rt_mask(net);
^
5 errors generated.
--
In file included from net/ipv4/route.c:90:
In file included from include/net/dst_metadata.h:6:
In file included from include/net/ip_tunnels.h:18:
In file included from include/net/lwtunnel.h:9:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/route.c:93:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/route.c:533:9: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
tos = RT_CONN_FLAGS(sk);
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/route.c:549:11: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
u8 tos = rt_tos(net, iph->tos);
^
net/ipv4/route.c:567:7: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/route.c:825:11: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
u8 tos = rt_tos(net, iph->tos);
^
net/ipv4/route.c:1073:5: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
rt_tos(net, iph->tos), protocol, mark, 0);
^
net/ipv4/route.c:1162:5: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
rt_tos(net, iph->tos), protocol, 0, 0);
^
net/ipv4/route.c:1284:20: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
fl4.flowi4_tos = rt_tos(net, iph->tos);
^
>> net/ipv4/route.c:2060:9: error: implicit declaration of function 'iptos_rt_mask' [-Werror,-Wimplicit-function-declaration]
tos &= iptos_rt_mask(net);
^
net/ipv4/route.c:2304:9: error: implicit declaration of function 'iptos_rt_mask' [-Werror,-Wimplicit-function-declaration]
tos &= iptos_rt_mask(net);
^
net/ipv4/route.c:2495:32: error: implicit declaration of function 'iptos_rt_mask' [-Werror,-Wimplicit-function-declaration]
__u8 tos = fl4->flowi4_tos & (iptos_rt_mask(net) | RTO_ONLINK);
^
net/ipv4/route.c:2815:19: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
fl4.flowi4_tos = rt_tos(net, tos);
^
14 errors generated.
--
In file included from net/ipv4/ip_output.c:67:
In file included from include/net/ip.h:29:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/ip_output.c:67:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/ip_output.c:493:9: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS_TOS(sk, tos),
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/ip_output.c:1697:7: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
rt_tos(net, arg->tos),
^
5 errors generated.
--
In file included from net/ipv4/inet_connection_sock.c:16:
In file included from include/net/inet_hashtables.h:27:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/inet_connection_sock.c:18:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/inet_connection_sock.c:600:7: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/inet_connection_sock.c:638:7: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/inet_connection_sock.c:1085:8: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), sk->sk_bound_dev_if);
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
6 errors generated.
--
In file included from net/ipv4/tcp_ipv4.c:62:
In file included from include/net/icmp.h:21:
In file included from include/net/ip.h:29:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/tcp_ipv4.c:62:
In file included from include/net/icmp.h:21:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/tcp_ipv4.c:230:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), sk->sk_bound_dev_if,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
4 errors generated.
--
In file included from net/ipv4/datagram.c:14:
In file included from include/net/ip.h:29:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/datagram.c:14:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/datagram.c:49:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), oif,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/datagram.c:122:8: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), sk->sk_bound_dev_if);
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
5 errors generated.
--
In file included from net/ipv4/icmp.c:76:
In file included from include/net/ip.h:29:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/icmp.c:76:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/icmp.c:447:19: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
fl4.flowi4_tos = rt_tos(net, ip_hdr(skb)->tos);
^
net/ipv4/icmp.c:499:20: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
fl4->flowi4_tos = rt_tos(net, tos);
^
net/ipv4/icmp.c:715:37: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
tos = icmp_pointers[type].error ? (rt_tos(net, iph->tos) |
^
6 errors generated.
--
In file included from net/ipv4/af_inet.c:96:
In file included from include/net/ip.h:29:
include/net/route.h:337:10: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
RT_CONN_FLAGS(sk), fl4->daddr,
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/net/route.h:337:10: note: did you mean 'rt_task'?
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
include/linux/sched/rt.h:16:19: note: 'rt_task' declared here
static inline int rt_task(struct task_struct *p)
^
In file included from net/ipv4/af_inet.c:96:
include/net/ip.h:245:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? rt_tos(net, ipc->tos) : rt_tos(net, inet->tos);
^
include/net/ip.h:250:28: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
return (ipc->tos != -1) ? RT_CONN_FLAGS_TOS(sk, ipc->tos) : RT_CONN_FLAGS(sk);
^
include/net/route.h:44:38: note: expanded from macro 'RT_CONN_FLAGS_TOS'
#define RT_CONN_FLAGS_TOS(sk,tos) (rt_tos(sock_net(sk), tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
>> net/ipv4/af_inet.c:1235:39: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
rt = ip_route_connect(fl4, daddr, 0, RT_CONN_FLAGS(sk),
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
net/ipv4/af_inet.c:1289:25: error: implicit declaration of function 'rt_tos' [-Werror,-Wimplicit-function-declaration]
sk->sk_protocol, RT_CONN_FLAGS(sk),
^
include/net/route.h:43:30: note: expanded from macro 'RT_CONN_FLAGS'
#define RT_CONN_FLAGS(sk) (rt_tos(sock_net(sk), inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
^
5 errors generated.
..
vim +/rt_tos +2348 net/core/filter.c
2336
2337 static int __bpf_redirect_neigh_v4(struct sk_buff *skb, struct net_device *dev,
2338 struct bpf_nh_params *nh)
2339 {
2340 const struct iphdr *ip4h = ip_hdr(skb);
2341 struct net *net = dev_net(dev);
2342 int err, ret = NET_XMIT_DROP;
2343
2344 if (!nh) {
2345 struct flowi4 fl4 = {
2346 .flowi4_flags = FLOWI_FLAG_ANYSRC,
2347 .flowi4_mark = skb->mark,
> 2348 .flowi4_tos = rt_tos(net, ip4h->tos),
2349 .flowi4_oif = dev->ifindex,
2350 .flowi4_proto = ip4h->protocol,
2351 .daddr = ip4h->daddr,
2352 .saddr = ip4h->saddr,
2353 };
2354 struct rtable *rt;
2355
2356 rt = ip_route_output_flow(net, &fl4, NULL);
2357 if (IS_ERR(rt))
2358 goto out_drop;
2359 if (rt->rt_type != RTN_UNICAST && rt->rt_type != RTN_LOCAL) {
2360 ip_rt_put(rt);
2361 goto out_drop;
2362 }
2363
2364 skb_dst_set(skb, &rt->dst);
2365 }
2366
2367 err = bpf_out_neigh_v4(net, skb, dev, nh);
2368 if (unlikely(net_xmit_eval(err)))
2369 dev->stats.tx_errors++;
2370 else
2371 ret = NET_XMIT_SUCCESS;
2372 goto out_xmit;
2373 out_drop:
2374 dev->stats.tx_errors++;
2375 kfree_skb(skb);
2376 out_xmit:
2377 return ret;
2378 }
2379 #else
2380 static int __bpf_redirect_neigh_v4(struct sk_buff *skb, struct net_device *dev,
2381 struct bpf_nh_params *nh)
2382 {
2383 kfree_skb(skb);
2384 return NET_XMIT_DROP;
2385 }
2386 #endif /* CONFIG_INET */
2387
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 38645 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-11-17 0:22 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-13 2:06 [PATCH net-next] net: DSCP in IPv4 routing Russell Strong
2020-11-13 3:36 ` Stephen Hemminger
2020-11-13 9:02 ` Guillaume Nault
2020-11-14 23:03 ` Russell Strong
2020-11-14 23:09 ` Russell Strong
2020-11-14 23:10 ` Russell Strong
2020-11-17 0:21 ` kernel test robot
2020-11-17 0:21 ` kernel test robot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.