Commit 66dae28a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ipv4-prepare-bpf-helpers-to-flowi4_tos-conversion' 

Guillaume Nault says:

====================
ipv4: Prepare bpf helpers to .flowi4_tos conversion.

Continue the process of making a dscp_t variable available when setting
.flowi4_tos. This series focuses on the BPF helpers that initialise a
struct flowi4 manually.

The objective is to eventually convert .flowi4_tos to dscp_t, (to get
type annotation and prevent ECN bits from interfering with DSCP).
====================

Link: https://patch.msgid.link/cover.1731064982.git.gnault@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 59b6c043 dab9c630

net/core/filter.c

+1 −1
Original line number Diff line number Diff line
@@ -2355,7 +2355,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   = ip4h->tos & INET_DSCP_MASK,

			.flowi4_tos   = inet_dscp_to_dsfield(ip4h_dscp(ip4h)),

			.flowi4_oif   = dev->ifindex,

			.flowi4_proto = ip4h->protocol,

			.daddr	      = ip4h->daddr,

net/core/lwt_bpf.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,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 = iph->tos & INET_DSCP_MASK;

		fl4.flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(iph));

		fl4.flowi4_flags = FLOWI_FLAG_ANYSRC;

		fl4.flowi4_proto = iph->protocol;

		fl4.daddr = iph->daddr;