Commit 48171c65 authored Nov 06, 2024 by Guillaume Nault Committed by Jakub Kicinski Nov 07, 2024

ipv4: Prepare ip_route_output() to future .flowi4_tos conversion.



Convert the "tos" parameter of ip_route_output() to dscp_t. This way
we'll have a dscp_t value directly available when .flowi4_tos will
eventually be converted to dscp_t.

All ip_route_output() callers but one set this "tos" parameter to 0 and
therefore don't need to be adapted to the new prototype.

Only br_nf_pre_routing_finish() needs conversion. It can just use
ip4h_dscp() to get the DSCP field from the IPv4 header.

Signed-off-by: Guillaume Nault <gnault@redhat.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/0f10d031dd44c70aae9bc6e19391cb30d5c2fe71.1730928699.git.gnault@redhat.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent 334fef7a

include/net/route.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -156,12 +156,12 @@ static inline struct rtable ip_route_output_key(struct net net, struct flowi4
		* structure is only partially set, it may bypass some fib-rules.
		*/
		static inline struct rtable ip_route_output(struct net net, __be32 daddr,
		__be32 saddr, u8 tos, int oif,
		__u8 scope)
		__be32 saddr, dscp_t dscp,
		int oif, __u8 scope)
		{
		struct flowi4 fl4 = {
		.flowi4_oif = oif,
		.flowi4_tos = tos,
		.flowi4_tos = inet_dscp_to_dsfield(dscp),
		.flowi4_scope = scope,
		.daddr = daddr,
		.saddr = saddr,

net/bridge/br_netfilter_hooks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -406,7 +406,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,
		iph->tos & INET_DSCP_MASK, 0,
		ip4h_dscp(iph), 0,
		RT_SCOPE_UNIVERSE);
		if (!IS_ERR(rt)) {
		/* - Bridged-and-DNAT'ed traffic doesn't