Commit fa976624 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2021-08-02' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
This patch-set changes the TTC (Traffic Type Classification) logic
to be independent from the mlx5 ethernet driver by renaming the traffic
types enums and making the TTC API generic to the mlx5 core driver.

It allows to decouple TTC logic from mlx5e and reused by other parts
of mlx5 drivers, namely ADQ and lag TX steering hashing.

Patches overview:
1 - Rename traffic type enums to be mlx5 generic.
2 - Rename related TTC arguments and functions.
3 - Remove dependency in the mlx5e driver from the TTC implementation.
4 - Move TTC logic to fs_ttc.
5 - Embed struct mlx5_ttc_table in fs_ttc.

The refactoring series is followed by misc' cleanup patches.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7cdd0a89 bcd68c04

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

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ mlx5_core-y := main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \ 
		health.o mcg.o cq.o alloc.o port.o mr.o pd.o \

		transobj.o vport.o sriov.o fs_cmd.o fs_core.o pci_irq.o \

		fs_counters.o fs_ft_pool.o rl.o lag.o dev.o events.o wq.o lib/gid.o \

		lib/devcom.o lib/pci_vsc.o lib/dm.o diag/fs_tracepoint.o \

		lib/devcom.o lib/pci_vsc.o lib/dm.o lib/fs_ttc.o diag/fs_tracepoint.o \

		diag/fw_tracer.o diag/crdump.o devlink.o diag/rsc_dump.o \

		fw_reset.o qos.o
@@ -28,7 +28,7 @@ mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.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/rx_res.o

		en/rx_res.o en/channels.o



#

# Netdev extra

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

+1 −19
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ struct page_pool; 
#define MLX5E_METADATA_ETHER_TYPE (0x8CE4)

#define MLX5E_METADATA_ETHER_LEN 8



#define MLX5_SET_CFG(p, f, v) MLX5_SET(create_flow_group_in, p, f, v)



#define MLX5E_ETH_HARD_MTU (ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN)



#define MLX5E_HW2SW_MTU(params, hwmtu) ((hwmtu) - ((params)->hard_mtu))
@@ -140,6 +138,7 @@ struct page_pool; 
#define MLX5E_PARAMS_DEFAULT_MIN_RX_WQES_MPW            0x2



#define MLX5E_MIN_NUM_CHANNELS         0x1

#define MLX5E_MAX_NUM_CHANNELS         (MLX5E_INDIR_RQT_SIZE / 2)

#define MLX5E_MAX_NUM_SQS              (MLX5E_MAX_NUM_CHANNELS * MLX5E_MAX_NUM_TC)

#define MLX5E_TX_CQ_POLL_BUDGET        128

#define MLX5E_TX_XSK_POLL_BUDGET       64
@@ -921,8 +920,6 @@ int mlx5e_vlan_rx_kill_vid(struct net_device *dev, __always_unused __be16 proto, 
			   u16 vid);

void mlx5e_timestamp_init(struct mlx5e_priv *priv);



int mlx5e_modify_tirs_hash(struct mlx5e_priv *priv);



struct mlx5e_xsk_param;



struct mlx5e_rq_param;
@@ -984,9 +981,6 @@ void mlx5e_activate_priv_channels(struct mlx5e_priv *priv); 
void mlx5e_deactivate_priv_channels(struct mlx5e_priv *priv);

int mlx5e_ptp_rx_manage_fs_ctx(struct mlx5e_priv *priv, void *ctx);



void mlx5e_build_default_indir_rqt(u32 *indirection_rqt, int len,

				   int num_channels);



int mlx5e_modify_rq_state(struct mlx5e_rq *rq, int curr_state, int next_state);

void mlx5e_activate_rq(struct mlx5e_rq *rq);

void mlx5e_deactivate_rq(struct mlx5e_rq *rq);
@@ -1036,16 +1030,6 @@ void mlx5e_close_drop_rq(struct mlx5e_rq *drop_rq); 
int mlx5e_init_di_list(struct mlx5e_rq *rq, int wq_sz, int node);

void mlx5e_free_di_list(struct mlx5e_rq *rq);



int mlx5e_create_indirect_rqt(struct mlx5e_priv *priv);



int mlx5e_create_indirect_tirs(struct mlx5e_priv *priv, bool inner_ttc);

void mlx5e_destroy_indirect_tirs(struct mlx5e_priv *priv);



int mlx5e_create_direct_rqts(struct mlx5e_priv *priv);

void mlx5e_destroy_direct_rqts(struct mlx5e_priv *priv);

int mlx5e_create_direct_tirs(struct mlx5e_priv *priv);

void mlx5e_destroy_direct_tirs(struct mlx5e_priv *priv);



int mlx5e_create_tis(struct mlx5_core_dev *mdev, void *in, u32 *tisn);

void mlx5e_destroy_tis(struct mlx5_core_dev *mdev, u32 tisn);
@@ -1133,8 +1117,6 @@ int mlx5e_netdev_change_profile(struct mlx5e_priv *priv, 
void mlx5e_netdev_attach_nic_profile(struct mlx5e_priv *priv);

void mlx5e_set_netdev_mtu_boundaries(struct mlx5e_priv *priv);

void mlx5e_build_nic_params(struct mlx5e_priv *priv, struct mlx5e_xsk *xsk, u16 mtu);

void mlx5e_build_rss_params(struct mlx5e_rss_params *rss_params,

			    u16 num_channels);

void mlx5e_rx_dim_work(struct work_struct *work);

void mlx5e_tx_dim_work(struct work_struct *work);

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

0 → 100644
+46 −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 "channels.h"

#include "en.h"

#include "en/ptp.h"



unsigned int mlx5e_channels_get_num(struct mlx5e_channels *chs)

{

	return chs->num;

}



void mlx5e_channels_get_regular_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn)

{

	struct mlx5e_channel *c;



	WARN_ON(ix >= mlx5e_channels_get_num(chs));

	c = chs->c[ix];



	*rqn = c->rq.rqn;

}



bool mlx5e_channels_get_xsk_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn)

{

	struct mlx5e_channel *c;



	WARN_ON(ix >= mlx5e_channels_get_num(chs));

	c = chs->c[ix];



	if (!test_bit(MLX5E_CHANNEL_STATE_XSK, c->state))

		return false;



	*rqn = c->xskrq.rqn;

	return true;

}



bool mlx5e_channels_get_ptp_rqn(struct mlx5e_channels *chs, u32 *rqn)

{

	struct mlx5e_ptp *c = chs->ptp;



	if (!c || !test_bit(MLX5E_PTP_STATE_RX, c->state))

		return false;



	*rqn = c->rq.rqn;

	return true;

}

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

0 → 100644
+16 −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. */



#ifndef __MLX5_EN_CHANNELS_H__

#define __MLX5_EN_CHANNELS_H__



#include <linux/kernel.h>



struct mlx5e_channels;



unsigned int mlx5e_channels_get_num(struct mlx5e_channels *chs);

void mlx5e_channels_get_regular_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn);

bool mlx5e_channels_get_xsk_rqn(struct mlx5e_channels *chs, unsigned int ix, u32 *rqn);

bool mlx5e_channels_get_ptp_rqn(struct mlx5e_channels *chs, u32 *rqn);



#endif /* __MLX5_EN_CHANNELS_H__ */

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

+8 −76
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#define __MLX5E_FLOW_STEER_H__



#include "mod_hdr.h"

#include "lib/fs_ttc.h"



enum {

	MLX5E_TC_FT_LEVEL = 0,
@@ -67,21 +68,7 @@ struct mlx5e_l2_table { 
	bool                       promisc_enabled;

};



enum mlx5e_traffic_types {

	MLX5E_TT_IPV4_TCP,

	MLX5E_TT_IPV6_TCP,

	MLX5E_TT_IPV4_UDP,

	MLX5E_TT_IPV6_UDP,

	MLX5E_TT_IPV4_IPSEC_AH,

	MLX5E_TT_IPV6_IPSEC_AH,

	MLX5E_TT_IPV4_IPSEC_ESP,

	MLX5E_TT_IPV6_IPSEC_ESP,

	MLX5E_TT_IPV4,

	MLX5E_TT_IPV6,

	MLX5E_TT_ANY,

	MLX5E_NUM_TT,

	MLX5E_NUM_INDIR_TIRS = MLX5E_TT_ANY,

};

#define MLX5E_NUM_INDIR_TIRS (MLX5_NUM_TT - 1)



#define MLX5_HASH_IP		(MLX5_HASH_FIELD_SEL_SRC_IP   |\

				 MLX5_HASH_FIELD_SEL_DST_IP)
@@ -93,30 +80,6 @@ enum mlx5e_traffic_types { 
				 MLX5_HASH_FIELD_SEL_DST_IP   |\

				 MLX5_HASH_FIELD_SEL_IPSEC_SPI)



enum mlx5e_tunnel_types {

	MLX5E_TT_IPV4_GRE,

	MLX5E_TT_IPV6_GRE,

	MLX5E_TT_IPV4_IPIP,

	MLX5E_TT_IPV6_IPIP,

	MLX5E_TT_IPV4_IPV6,

	MLX5E_TT_IPV6_IPV6,

	MLX5E_NUM_TUNNEL_TT,

};



bool mlx5e_tunnel_inner_ft_supported(struct mlx5_core_dev *mdev);



struct mlx5e_ttc_rule {

	struct mlx5_flow_handle *rule;

	struct mlx5_flow_destination default_dest;

};



/* L3/L4 traffic type classifier */

struct mlx5e_ttc_table {

	struct mlx5e_flow_table ft;

	struct mlx5e_ttc_rule rules[MLX5E_NUM_TT];

	struct mlx5_flow_handle *tunnel_rules[MLX5E_NUM_TUNNEL_TT];

};



/* NIC prio FTS */

enum {

	MLX5E_PROMISC_FT_LEVEL,
@@ -138,22 +101,6 @@ enum { 
#endif

};



#define MLX5E_TTC_NUM_GROUPS	3

#define MLX5E_TTC_GROUP1_SIZE	(BIT(3) + MLX5E_NUM_TUNNEL_TT)

#define MLX5E_TTC_GROUP2_SIZE	 BIT(1)

#define MLX5E_TTC_GROUP3_SIZE	 BIT(0)

#define MLX5E_TTC_TABLE_SIZE	(MLX5E_TTC_GROUP1_SIZE +\

				 MLX5E_TTC_GROUP2_SIZE +\

				 MLX5E_TTC_GROUP3_SIZE)



#define MLX5E_INNER_TTC_NUM_GROUPS	3

#define MLX5E_INNER_TTC_GROUP1_SIZE	BIT(3)

#define MLX5E_INNER_TTC_GROUP2_SIZE	BIT(1)

#define MLX5E_INNER_TTC_GROUP3_SIZE	BIT(0)

#define MLX5E_INNER_TTC_TABLE_SIZE	(MLX5E_INNER_TTC_GROUP1_SIZE +\

					 MLX5E_INNER_TTC_GROUP2_SIZE +\

					 MLX5E_INNER_TTC_GROUP3_SIZE)



struct mlx5e_priv;



#ifdef CONFIG_MLX5_EN_RXNFC
@@ -222,8 +169,8 @@ struct mlx5e_flow_steering { 
	struct mlx5e_promisc_table      promisc;

	struct mlx5e_vlan_table         *vlan;

	struct mlx5e_l2_table           l2;

	struct mlx5e_ttc_table          ttc;

	struct mlx5e_ttc_table          inner_ttc;

	struct mlx5_ttc_table           *ttc;

	struct mlx5_ttc_table           *inner_ttc;

#ifdef CONFIG_MLX5_EN_ARFS

	struct mlx5e_arfs_tables       *arfs;

#endif
@@ -235,27 +182,13 @@ struct mlx5e_flow_steering { 
	struct mlx5e_ptp_fs            *ptp_fs;

};



struct ttc_params {

	struct mlx5_flow_table_attr ft_attr;

	u32 any_tt_tirn;

	u32 indir_tirn[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_ttc_table *inner_ttc;

};



void mlx5e_set_ttc_basic_params(struct mlx5e_priv *priv, struct ttc_params *ttc_params);

void mlx5e_set_ttc_ft_params(struct ttc_params *ttc_params);

void mlx5e_set_ttc_params(struct mlx5e_priv *priv,

			  struct ttc_params *ttc_params, bool tunnel);



int mlx5e_create_ttc_table(struct mlx5e_priv *priv, struct ttc_params *params,

			   struct mlx5e_ttc_table *ttc);

void mlx5e_destroy_ttc_table(struct mlx5e_priv *priv,

			     struct mlx5e_ttc_table *ttc);

void mlx5e_destroy_ttc_table(struct mlx5e_priv *priv);

int mlx5e_create_ttc_table(struct mlx5e_priv *priv);



void mlx5e_destroy_flow_table(struct mlx5e_flow_table *ft);

int mlx5e_ttc_fwd_dest(struct mlx5e_priv *priv, enum mlx5e_traffic_types type,

		       struct mlx5_flow_destination *new_dest);

struct mlx5_flow_destination

mlx5e_ttc_get_default_dest(struct mlx5e_priv *priv, enum mlx5e_traffic_types type);

int mlx5e_ttc_fwd_default_dest(struct mlx5e_priv *priv, enum mlx5e_traffic_types type);



void mlx5e_enable_cvlan_filter(struct mlx5e_priv *priv);

void mlx5e_disable_cvlan_filter(struct mlx5e_priv *priv);
@@ -263,7 +196,6 @@ void mlx5e_disable_cvlan_filter(struct mlx5e_priv *priv); 
int mlx5e_create_flow_steering(struct mlx5e_priv *priv);

void mlx5e_destroy_flow_steering(struct mlx5e_priv *priv);



u8 mlx5e_get_proto_by_tunnel_type(enum mlx5e_tunnel_types tt);

int mlx5e_add_vlan_trap(struct mlx5e_priv *priv, int  trap_id, int tir_num);

void mlx5e_remove_vlan_trap(struct mlx5e_priv *priv);

int mlx5e_add_mac_trap(struct mlx5e_priv *priv, int  trap_id, int tir_num);