Commit 2e36437f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'ipv4-convert-several-tos-fields-to-dscp_t' 

Guillaume Nault says:

====================
ipv4: Convert several tos fields to dscp_t

Continue the work started with commit a410a0cf ("ipv6: Define
dscp_t and stop taking ECN bits into account in fib6-rules") and
convert more structure fields and variables to dscp_t. This series
focuses on struct fib_rt_info, struct fib_entry_notifier_info and their
users (networking drivers).

The purpose of dscp_t is to ensure that ECN bits don't influence IP
route lookups. It does so by ensuring that dscp_t variables have the
ECN bits cleared.

Notes:
  * This series is entirely about type annotation and isn't supposed
to have any user visible effect.

  * The first two patches have to introduce a few dsfield <-> dscp
conversions in the affected drivers, but those are then removed when
converting the internal driver structures (patches 3-5). In the end,
drivers don't have to handle any conversion.
====================

Link: https://lore.kernel.org/r/cover.1649445279.git.gnault@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d072c88c 9f6982e9

drivers/net/ethernet/marvell/prestera/prestera_router.c

+6 −5
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/inetdevice.h>

#include <net/inet_dscp.h>

#include <net/switchdev.h>

#include <linux/rhashtable.h>
@@ -26,7 +27,7 @@ struct prestera_kern_fib_cache { 
	/* Indicate if route is not overlapped by another table */

	struct rhash_head ht_node; /* node of prestera_router */

	struct fib_info *fi;

	u8 kern_tos;

	dscp_t kern_dscp;

	u8 kern_type;

	bool reachable;

};
@@ -88,7 +89,7 @@ prestera_kern_fib_cache_destroy(struct prestera_switch *sw, 
static struct prestera_kern_fib_cache *

prestera_kern_fib_cache_create(struct prestera_switch *sw,

			       struct prestera_kern_fib_cache_key *key,

			       struct fib_info *fi, u8 tos, u8 type)

			       struct fib_info *fi, dscp_t dscp, u8 type)

{

	struct prestera_kern_fib_cache *fib_cache;

	int err;
@@ -100,7 +101,7 @@ prestera_kern_fib_cache_create(struct prestera_switch *sw, 
	memcpy(&fib_cache->key, key, sizeof(*key));

	fib_info_hold(fi);

	fib_cache->fi = fi;

	fib_cache->kern_tos = tos;

	fib_cache->kern_dscp = dscp;

	fib_cache->kern_type = type;



	err = rhashtable_insert_fast(&sw->router->kern_fib_cache_ht,
@@ -132,7 +133,7 @@ __prestera_k_arb_fib_lpm_offload_set(struct prestera_switch *sw, 
	fri.tb_id = fc->key.kern_tb_id;

	fri.dst = fc->key.addr.u.ipv4;

	fri.dst_len = fc->key.prefix_len;

	fri.tos = fc->kern_tos;

	fri.dscp = fc->kern_dscp;

	fri.type = fc->kern_type;

	/* flags begin */

	fri.offload = offload;
@@ -305,7 +306,7 @@ prestera_k_arb_fib_evt(struct prestera_switch *sw, 
	if (replace) {

		fib_cache = prestera_kern_fib_cache_create(sw, &fc_key,

							   fen_info->fi,

							   fen_info->tos,

							   fen_info->dscp,

							   fen_info->type);

		if (!fib_cache) {

			dev_err(sw->dev->dev, "fib_cache == NULL");

drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c

+8 −7
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <net/netevent.h>

#include <net/neighbour.h>

#include <net/arp.h>

#include <net/inet_dscp.h>

#include <net/ip_fib.h>

#include <net/ip6_fib.h>

#include <net/nexthop.h>
@@ -507,7 +508,7 @@ struct mlxsw_sp_fib4_entry { 
	struct mlxsw_sp_fib_entry common;

	struct fib_info *fi;

	u32 tb_id;

	u8 tos;

	dscp_t dscp;

	u8 type;

};
@@ -5559,7 +5560,7 @@ mlxsw_sp_fib4_entry_should_offload(const struct mlxsw_sp_fib_entry *fib_entry) 


	fib4_entry = container_of(fib_entry, struct mlxsw_sp_fib4_entry,

				  common);

	return !fib4_entry->tos;

	return !fib4_entry->dscp;

}



static bool
@@ -5620,7 +5621,7 @@ mlxsw_sp_fib4_offload_failed_flag_set(struct mlxsw_sp *mlxsw_sp, 
	fri.tb_id = fen_info->tb_id;

	fri.dst = cpu_to_be32(*p_dst);

	fri.dst_len = fen_info->dst_len;

	fri.tos = fen_info->tos;

	fri.dscp = fen_info->dscp;

	fri.type = fen_info->type;

	fri.offload = false;

	fri.trap = false;
@@ -5645,7 +5646,7 @@ mlxsw_sp_fib4_entry_hw_flags_set(struct mlxsw_sp *mlxsw_sp, 
	fri.tb_id = fib4_entry->tb_id;

	fri.dst = cpu_to_be32(*p_dst);

	fri.dst_len = dst_len;

	fri.tos = fib4_entry->tos;

	fri.dscp = fib4_entry->dscp;

	fri.type = fib4_entry->type;

	fri.offload = should_offload;

	fri.trap = !should_offload;
@@ -5668,7 +5669,7 @@ mlxsw_sp_fib4_entry_hw_flags_clear(struct mlxsw_sp *mlxsw_sp, 
	fri.tb_id = fib4_entry->tb_id;

	fri.dst = cpu_to_be32(*p_dst);

	fri.dst_len = dst_len;

	fri.tos = fib4_entry->tos;

	fri.dscp = fib4_entry->dscp;

	fri.type = fib4_entry->type;

	fri.offload = false;

	fri.trap = false;
@@ -6250,7 +6251,7 @@ mlxsw_sp_fib4_entry_create(struct mlxsw_sp *mlxsw_sp, 
	fib_info_hold(fib4_entry->fi);

	fib4_entry->tb_id = fen_info->tb_id;

	fib4_entry->type = fen_info->type;

	fib4_entry->tos = fen_info->tos;

	fib4_entry->dscp = fen_info->dscp;



	fib_entry->fib_node = fib_node;
@@ -6304,7 +6305,7 @@ mlxsw_sp_fib4_entry_lookup(struct mlxsw_sp *mlxsw_sp, 
	fib4_entry = container_of(fib_node->fib_entry,

				  struct mlxsw_sp_fib4_entry, common);

	if (fib4_entry->tb_id == fen_info->tb_id &&

	    fib4_entry->tos == fen_info->tos &&

	    fib4_entry->dscp == fen_info->dscp &&

	    fib4_entry->type == fen_info->type &&

	    fib4_entry->fi == fen_info->fi)

		return fib4_entry;

drivers/net/netdevsim/fib.c

+5 −4
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/spinlock_types.h>

#include <linux/types.h>

#include <net/fib_notifier.h>

#include <net/inet_dscp.h>

#include <net/ip_fib.h>

#include <net/ip6_fib.h>

#include <net/fib_rules.h>
@@ -78,7 +79,7 @@ struct nsim_fib_rt { 
struct nsim_fib4_rt {

	struct nsim_fib_rt common;

	struct fib_info *fi;

	u8 tos;

	dscp_t dscp;

	u8 type;

};
@@ -283,7 +284,7 @@ nsim_fib4_rt_create(struct nsim_fib_data *data, 


	fib4_rt->fi = fen_info->fi;

	fib_info_hold(fib4_rt->fi);

	fib4_rt->tos = fen_info->tos;

	fib4_rt->dscp = fen_info->dscp;

	fib4_rt->type = fen_info->type;



	return fib4_rt;
@@ -322,7 +323,7 @@ nsim_fib4_rt_offload_failed_flag_set(struct net *net, 
	fri.tb_id = fen_info->tb_id;

	fri.dst = cpu_to_be32(*p_dst);

	fri.dst_len = fen_info->dst_len;

	fri.tos = fen_info->tos;

	fri.dscp = fen_info->dscp;

	fri.type = fen_info->type;

	fri.offload = false;

	fri.trap = false;
@@ -342,7 +343,7 @@ static void nsim_fib4_rt_hw_flags_set(struct net *net, 
	fri.tb_id = fib4_rt->common.key.tb_id;

	fri.dst = cpu_to_be32(*p_dst);

	fri.dst_len = dst_len;

	fri.tos = fib4_rt->tos;

	fri.dscp = fib4_rt->dscp;

	fri.type = fib4_rt->type;

	fri.offload = false;

	fri.trap = trap;

include/net/ip_fib.h

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ struct fib_rt_info { 
	u32			tb_id;

	__be32			dst;

	int			dst_len;

	u8			tos;

	dscp_t			dscp;

	u8			type;

	u8			offload:1,

				trap:1,
@@ -225,7 +225,7 @@ struct fib_entry_notifier_info { 
	u32 dst;

	int dst_len;

	struct fib_info *fi;

	u8 tos;

	dscp_t dscp;

	u8 type;

	u32 tb_id;

};

net/ipv4/fib_semantics.c

+2 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ void rtmsg_fib(int event, __be32 key, struct fib_alias *fa, 
	fri.tb_id = tb_id;

	fri.dst = key;

	fri.dst_len = dst_len;

	fri.tos = inet_dscp_to_dsfield(fa->fa_dscp);

	fri.dscp = fa->fa_dscp;

	fri.type = fa->fa_type;

	fri.offload = READ_ONCE(fa->offload);

	fri.trap = READ_ONCE(fa->trap);
@@ -1781,7 +1781,7 @@ int fib_dump_info(struct sk_buff *skb, u32 portid, u32 seq, int event, 
	rtm->rtm_family = AF_INET;

	rtm->rtm_dst_len = fri->dst_len;

	rtm->rtm_src_len = 0;

	rtm->rtm_tos = fri->tos;

	rtm->rtm_tos = inet_dscp_to_dsfield(fri->dscp);

	if (tb_id < 256)

		rtm->rtm_table = tb_id;

	else