Commit 65d6b6e5 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: Move management of indir traffic types to rx_res 



This commit moves the responsibility of keeping the RSS configuration
for different traffic types to en/rx_res.{c,h}, hiding the
implementation details behind the new getters, and abandons all usage of
struct mlx5e_tirc_config, which is no longer useful and superseded by
struct mlx5e_rss_params_traffic_type.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent a6696735

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \ 
		en_selftest.o en/port.o en/monitor_stats.o en/health.o \

		en/reporter_tx.o en/reporter_rx.o en/params.o en/xsk/pool.o \

		en/xsk/setup.o en/xsk/rx.o en/xsk/tx.o en/devlink.o en/ptp.o \

		en/qos.o en/trap.o en/fs_tt_redirect.o en/rqt.o en/tir.o

		en/qos.o en/trap.o en/fs_tt_redirect.o en/rqt.o en/tir.o \

		en/rx_res.o



#

# Netdev extra

drivers/net/ethernet/mellanox/mlx5/core/en.h

+0 −1
Original line number Diff line number Diff line
@@ -922,7 +922,6 @@ int mlx5e_vlan_rx_kill_vid(struct net_device *dev, __always_unused __be16 proto, 
void mlx5e_timestamp_init(struct mlx5e_priv *priv);



int mlx5e_modify_tirs_hash(struct mlx5e_priv *priv);

struct mlx5e_tirc_config mlx5e_tirc_get_default_config(enum mlx5e_traffic_types tt);



struct mlx5e_xsk_param;

drivers/net/ethernet/mellanox/mlx5/core/en/fs.h

+0 −6
Original line number Diff line number Diff line
@@ -83,12 +83,6 @@ enum mlx5e_traffic_types { 
	MLX5E_NUM_INDIR_TIRS = MLX5E_TT_ANY,

};



struct mlx5e_tirc_config {

	u8 l3_prot_type;

	u8 l4_prot_type;

	u32 rx_hash_fields;

};



#define MLX5_HASH_IP		(MLX5_HASH_FIELD_SEL_SRC_IP   |\

				 MLX5_HASH_FIELD_SEL_DST_IP)

#define MLX5_HASH_IP_L4PORTS	(MLX5_HASH_FIELD_SEL_SRC_IP   |\

drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c

0 → 100644
+73 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

/* Copyright (c) 2021, Mellanox Technologies inc. All rights reserved. */



#include "rx_res.h"



static const struct mlx5e_rss_params_traffic_type rss_default_config[MLX5E_NUM_INDIR_TIRS] = {

	[MLX5E_TT_IPV4_TCP] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV4,

		.l4_prot_type = MLX5_L4_PROT_TYPE_TCP,

		.rx_hash_fields = MLX5_HASH_IP_L4PORTS,

	},

	[MLX5E_TT_IPV6_TCP] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV6,

		.l4_prot_type = MLX5_L4_PROT_TYPE_TCP,

		.rx_hash_fields = MLX5_HASH_IP_L4PORTS,

	},

	[MLX5E_TT_IPV4_UDP] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV4,

		.l4_prot_type = MLX5_L4_PROT_TYPE_UDP,

		.rx_hash_fields = MLX5_HASH_IP_L4PORTS,

	},

	[MLX5E_TT_IPV6_UDP] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV6,

		.l4_prot_type = MLX5_L4_PROT_TYPE_UDP,

		.rx_hash_fields = MLX5_HASH_IP_L4PORTS,

	},

	[MLX5E_TT_IPV4_IPSEC_AH] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV4,

		.l4_prot_type = 0,

		.rx_hash_fields = MLX5_HASH_IP_IPSEC_SPI,

	},

	[MLX5E_TT_IPV6_IPSEC_AH] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV6,

		.l4_prot_type = 0,

		.rx_hash_fields = MLX5_HASH_IP_IPSEC_SPI,

	},

	[MLX5E_TT_IPV4_IPSEC_ESP] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV4,

		.l4_prot_type = 0,

		.rx_hash_fields = MLX5_HASH_IP_IPSEC_SPI,

	},

	[MLX5E_TT_IPV6_IPSEC_ESP] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV6,

		.l4_prot_type = 0,

		.rx_hash_fields = MLX5_HASH_IP_IPSEC_SPI,

	},

	[MLX5E_TT_IPV4] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV4,

		.l4_prot_type = 0,

		.rx_hash_fields = MLX5_HASH_IP,

	},

	[MLX5E_TT_IPV6] = {

		.l3_prot_type = MLX5_L3_PROT_TYPE_IPV6,

		.l4_prot_type = 0,

		.rx_hash_fields = MLX5_HASH_IP,

	},

};



struct mlx5e_rss_params_traffic_type

mlx5e_rss_get_default_tt_config(enum mlx5e_traffic_types tt)

{

	return rss_default_config[tt];

}



struct mlx5e_rss_params_traffic_type

mlx5e_rx_res_rss_get_current_tt_config(struct mlx5e_rx_res *res, enum mlx5e_traffic_types tt)

{

	struct mlx5e_rss_params_traffic_type rss_tt;



	rss_tt = mlx5e_rss_get_default_tt_config(tt);

	rss_tt.rx_hash_fields = res->rss_params.rx_hash_fields[tt];

	return rss_tt;

}

drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h

+5 −0
Original line number Diff line number Diff line
@@ -39,4 +39,9 @@ struct mlx5e_rx_res { 
	} ptp;

};



struct mlx5e_rss_params_traffic_type

mlx5e_rss_get_default_tt_config(enum mlx5e_traffic_types tt);

struct mlx5e_rss_params_traffic_type

mlx5e_rx_res_rss_get_current_tt_config(struct mlx5e_rx_res *res, enum mlx5e_traffic_types tt);



#endif /* __MLX5_EN_RX_RES_H__ */