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

Merge tag 'mlx5-updates-2020-01-07' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2020-01-07

This series adds 2 sets of changes to mlx5 driver
1) Misc updates and cleanups:

1.1) Stack usages warning cleanups and log level reduction
1.2) Increase the max number of supported rings
1.3) Support accept TC action on native NIC netdev.

2) Software steering support for multi destination steering rules:
First three patches from Erez are adding the low level FW command support
and SW steering infrastructure to create the mult-destination FW tables.

Last four patches from Alex are introducing the needed changes and APIs in
SW steering to create and manage multi-destination actions and rules.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 53ebeca2 7ee3f6d2

drivers/net/ethernet/mellanox/mlx5/core/alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static void *mlx5_dma_zalloc_coherent_node(struct mlx5_core_dev *dev, 
	return cpu_handle;

}



int mlx5_buf_alloc_node(struct mlx5_core_dev *dev, int size,

static int mlx5_buf_alloc_node(struct mlx5_core_dev *dev, int size,

			       struct mlx5_frag_buf *buf, int node)

{

	dma_addr_t t;

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

+3 −3
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ struct page_pool; 
#define MLX5E_LOG_INDIR_RQT_SIZE       0x7

#define MLX5E_INDIR_RQT_SIZE           BIT(MLX5E_LOG_INDIR_RQT_SIZE)

#define MLX5E_MIN_NUM_CHANNELS         0x1

#define MLX5E_MAX_NUM_CHANNELS         (MLX5E_INDIR_RQT_SIZE >> 1)

#define MLX5E_MAX_NUM_CHANNELS         MLX5E_INDIR_RQT_SIZE

#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
@@ -1175,11 +1175,11 @@ int mlx5e_attach_netdev(struct mlx5e_priv *priv); 
void mlx5e_detach_netdev(struct mlx5e_priv *priv);

void mlx5e_destroy_netdev(struct mlx5e_priv *priv);

void mlx5e_set_netdev_mtu_boundaries(struct mlx5e_priv *priv);

void mlx5e_build_nic_params(struct mlx5_core_dev *mdev,

void mlx5e_build_nic_params(struct mlx5e_priv *priv,

			    struct mlx5e_xsk *xsk,

			    struct mlx5e_rss_params *rss_params,

			    struct mlx5e_params *params,

			    u16 max_channels, u16 mtu);

			    u16 mtu);

void mlx5e_build_rq_params(struct mlx5_core_dev *mdev,

			   struct mlx5e_params *params);

void mlx5e_build_rss_params(struct mlx5e_rss_params *rss_params,

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+7 −5
Original line number Diff line number Diff line
@@ -4739,17 +4739,19 @@ void mlx5e_build_rss_params(struct mlx5e_rss_params *rss_params, 
			tirc_default_config[tt].rx_hash_fields;

}



void mlx5e_build_nic_params(struct mlx5_core_dev *mdev,

void mlx5e_build_nic_params(struct mlx5e_priv *priv,

			    struct mlx5e_xsk *xsk,

			    struct mlx5e_rss_params *rss_params,

			    struct mlx5e_params *params,

			    u16 max_channels, u16 mtu)

			    u16 mtu)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	u8 rx_cq_period_mode;



	params->sw_mtu = mtu;

	params->hard_mtu = MLX5E_ETH_HARD_MTU;

	params->num_channels = max_channels;

	params->num_channels = min_t(unsigned int, MLX5E_MAX_NUM_CHANNELS / 2,

				     priv->max_nch);

	params->num_tc       = 1;



	/* SQ */
@@ -4986,8 +4988,8 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev, 
	if (err)

		return err;



	mlx5e_build_nic_params(mdev, &priv->xsk, rss, &priv->channels.params,

			       priv->max_nch, netdev->mtu);

	mlx5e_build_nic_params(priv, &priv->xsk, rss, &priv->channels.params,

			       netdev->mtu);



	mlx5e_timestamp_init(priv);

drivers/net/ethernet/mellanox/mlx5/core/en_stats.c

+3 −0
Original line number Diff line number Diff line
@@ -297,6 +297,9 @@ static void mlx5e_grp_sw_update_stats(struct mlx5e_priv *priv) 
			s->tx_tls_drop_bypass_req   += sq_stats->tls_drop_bypass_req;

#endif

			s->tx_cqes		+= sq_stats->cqes;



			/* https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92657 */

			barrier();

		}

	}

}

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

+4 −0
Original line number Diff line number Diff line
@@ -2842,6 +2842,10 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv, 


	flow_action_for_each(i, act, flow_action) {

		switch (act->id) {

		case FLOW_ACTION_ACCEPT:

			action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |

				  MLX5_FLOW_CONTEXT_ACTION_COUNT;

			break;

		case FLOW_ACTION_DROP:

			action |= MLX5_FLOW_CONTEXT_ACTION_DROP;

			if (MLX5_CAP_FLOWTABLE(priv->mdev,

CRA Git | Maintained and supported by SUSTech CRA and CCSE