Commit 046e64f5 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ipv4-convert-ip_route_input_slow-and-its-callers-to-dscp_t' 

Guillaume Nault says:

====================
ipv4: Convert ip_route_input_slow() and its callers to dscp_t.

Prepare ip_route_input_slow() and its call chain to future conversion
of ->flowi4_tos.

The ->flowi4_tos field of "struct flowi4" is used in many different
places, which makes it hard to convert it from __u8 to dscp_t.

In order to avoid a big patch updating all its users at once, this
patch series gradually converts some users to dscp_t. Those users now
set ->flowi4_tos from a dscp_t variable that is converted to __u8 using
inet_dscp_to_dsfield().

When all users of ->flowi4_tos will use a dscp_t variable, converting
that field to dscp_t will just be a matter of removing all the
inet_dscp_to_dsfield() conversions.

This series concentrates on ip_route_input_slow() and its direct and
indirect callers.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9b8ca048 783946aa

drivers/net/ipvlan/ipvlan_l3s.c

+4 −2
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
/* Copyright (c) 2014 Mahesh Bandewar <maheshb@google.com>

 */



#include <net/ip.h>



#include "ipvlan.h"



static unsigned int ipvlan_netid __read_mostly;
@@ -48,11 +50,11 @@ static struct sk_buff *ipvlan_l3_rcv(struct net_device *dev, 
	switch (proto) {

	case AF_INET:

	{

		struct iphdr *ip4h = ip_hdr(skb);

		const struct iphdr *ip4h = ip_hdr(skb);

		int err;



		err = ip_route_input_noref(skb, ip4h->daddr, ip4h->saddr,

					   ip4h->tos, sdev);

					   ip4h_dscp(ip4h), sdev);

		if (unlikely(err))

			goto out;

		break;

include/net/ip.h

+5 −0
Original line number Diff line number Diff line
@@ -424,6 +424,11 @@ int ip_decrease_ttl(struct iphdr *iph) 
	return --iph->ttl;

}



static inline dscp_t ip4h_dscp(const struct iphdr *ip4h)

{

	return inet_dsfield_to_dscp(ip4h->tos);

}



static inline int ip_mtu_locked(const struct dst_entry *dst)

{

	const struct rtable *rt = dst_rtable(dst);

include/net/route.h

+4 −4
Original line number Diff line number Diff line
@@ -201,19 +201,19 @@ static inline struct rtable *ip_route_output_gre(struct net *net, struct flowi4 
int ip_mc_validate_source(struct sk_buff *skb, __be32 daddr, __be32 saddr,

			  u8 tos, struct net_device *dev,

			  struct in_device *in_dev, u32 *itag);

int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 src,

			 u8 tos, struct net_device *devin);

int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,

			 dscp_t dscp, struct net_device *dev);

int ip_route_use_hint(struct sk_buff *skb, __be32 dst, __be32 src,

		      u8 tos, struct net_device *devin,

		      const struct sk_buff *hint);



static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src,

				 u8 tos, struct net_device *devin)

				 dscp_t dscp, struct net_device *devin)

{

	int err;



	rcu_read_lock();

	err = ip_route_input_noref(skb, dst, src, tos, devin);

	err = ip_route_input_noref(skb, dst, src, dscp, devin);

	if (!err) {

		skb_dst_force(skb);

		if (!skb_dst(skb))

net/bridge/br_netfilter_hooks.c

+5 −3
Original line number Diff line number Diff line
@@ -369,9 +369,9 @@ br_nf_ipv4_daddr_was_changed(const struct sk_buff *skb, 
 */

static int br_nf_pre_routing_finish(struct net *net, struct sock *sk, struct sk_buff *skb)

{

	struct net_device *dev = skb->dev, *br_indev;

	struct iphdr *iph = ip_hdr(skb);

	struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb);

	struct net_device *dev = skb->dev, *br_indev;

	const struct iphdr *iph = ip_hdr(skb);

	struct rtable *rt;

	int err;
@@ -389,7 +389,9 @@ static int br_nf_pre_routing_finish(struct net *net, struct sock *sk, struct sk_ 
	}

	nf_bridge->in_prerouting = 0;

	if (br_nf_ipv4_daddr_was_changed(skb, nf_bridge)) {

		if ((err = ip_route_input(skb, iph->daddr, iph->saddr, iph->tos, dev))) {

		err = ip_route_input(skb, iph->daddr, iph->saddr,

				     ip4h_dscp(iph), dev);

		if (err) {

			struct in_device *in_dev = __in_dev_get_rcu(dev);



			/* If err equals -EHOSTUNREACH the error is due to a

net/core/lwt_bpf.c

+3 −2
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/bpf.h>

#include <net/lwtunnel.h>

#include <net/gre.h>

#include <net/ip.h>

#include <net/ip6_route.h>

#include <net/ipv6_stubs.h>

#include <net/inet_dscp.h>
@@ -91,12 +92,12 @@ static int bpf_lwt_input_reroute(struct sk_buff *skb) 


	if (skb->protocol == htons(ETH_P_IP)) {

		struct net_device *dev = skb_dst(skb)->dev;

		struct iphdr *iph = ip_hdr(skb);

		const struct iphdr *iph = ip_hdr(skb);



		dev_hold(dev);

		skb_dst_drop(skb);

		err = ip_route_input_noref(skb, iph->daddr, iph->saddr,

					   iph->tos, dev);

					   ip4h_dscp(iph), dev);

		dev_put(dev);

	} else if (skb->protocol == htons(ETH_P_IPV6)) {

		skb_dst_drop(skb);