Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'mlx5-updates-2018-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2018-03-22 (Misc updates)

This series includes misc updates for mlx5 core and netdev dirver,

Highlights:

From Inbar, three patches to add support for PFC stall prevention
statistics and enable/disable through new ethtool tunable, as requested
from previous submission.

From Moshe, four patches, added more drop counters:
	- drop counter for netdev steering miss
	- drop counter for when VF logical link is down
        - drop counter for when netdev logical link is down.

From Or, three patches to support vlan push/pop offload via tc HW action,
for newer HW (Connectx-5 and onward) via HW steering flow actions rather
than the emulated path for the older HW brands.

And five more misc small trivial patches.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4171ec06 71186172

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

+3 −1
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_MODIFY_HCA_VPORT_CONTEXT:

	case MLX5_CMD_OP_QUERY_HCA_VPORT_GID:

	case MLX5_CMD_OP_QUERY_HCA_VPORT_PKEY:

	case MLX5_CMD_OP_QUERY_VNIC_ENV:

	case MLX5_CMD_OP_QUERY_VPORT_COUNTER:

	case MLX5_CMD_OP_ALLOC_Q_COUNTER:

	case MLX5_CMD_OP_QUERY_Q_COUNTER:
@@ -501,6 +502,7 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(MODIFY_HCA_VPORT_CONTEXT);

	MLX5_COMMAND_STR_CASE(QUERY_HCA_VPORT_GID);

	MLX5_COMMAND_STR_CASE(QUERY_HCA_VPORT_PKEY);

	MLX5_COMMAND_STR_CASE(QUERY_VNIC_ENV);

	MLX5_COMMAND_STR_CASE(QUERY_VPORT_COUNTER);

	MLX5_COMMAND_STR_CASE(ALLOC_Q_COUNTER);

	MLX5_COMMAND_STR_CASE(DEALLOC_Q_COUNTER);
@@ -1802,7 +1804,7 @@ int mlx5_cmd_init(struct mlx5_core_dev *dev) 


	cmd->checksum_disabled = 1;

	cmd->max_reg_cmds = (1 << cmd->log_sz) - 1;

	cmd->bitmask = (1 << cmd->max_reg_cmds) - 1;

	cmd->bitmask = (1UL << cmd->max_reg_cmds) - 1;



	cmd->cmdif_rev = ioread32be(&dev->iseg->cmdif_rev_fw_sub) >> 16;

	if (cmd->cmdif_rev > CMD_IF_REV) {

drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ TRACE_EVENT(mlx5_fs_del_fg, 
	{MLX5_FLOW_CONTEXT_ACTION_ENCAP,	 "ENCAP"},\

	{MLX5_FLOW_CONTEXT_ACTION_DECAP,	 "DECAP"},\

	{MLX5_FLOW_CONTEXT_ACTION_MOD_HDR,	 "MOD_HDR"},\

	{MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH,	 "VLAN_PUSH"},\

	{MLX5_FLOW_CONTEXT_ACTION_VLAN_POP,	 "VLAN_POP"},\

	{MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO, "NEXT_PRIO"}



TRACE_EVENT(mlx5_fs_set_fte,

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

+2 −2
Original line number Diff line number Diff line
@@ -782,6 +782,7 @@ struct mlx5e_priv { 
	struct mlx5e_stats         stats;

	struct hwtstamp_config     tstamp;

	u16                        q_counter;

	u16                        drop_rq_q_counter;

#ifdef CONFIG_MLX5_CORE_EN_DCB

	struct mlx5e_dcbx          dcbx;

#endif
@@ -1061,7 +1062,6 @@ void mlx5e_cleanup_nic_tx(struct mlx5e_priv *priv); 
int mlx5e_close(struct net_device *netdev);

int mlx5e_open(struct net_device *netdev);

void mlx5e_update_stats_work(struct work_struct *work);

u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout);



int mlx5e_bits_invert(unsigned long a, int size);

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

+57 −3
Original line number Diff line number Diff line
@@ -203,9 +203,6 @@ void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv, 
{

	int i, idx = 0;



	if (!data)

		return;



	mutex_lock(&priv->state_lock);

	mlx5e_update_stats(priv);

	mutex_unlock(&priv->state_lock);
@@ -1066,6 +1063,57 @@ static int mlx5e_get_rxnfc(struct net_device *netdev, 
	return err;

}



#define MLX5E_PFC_PREVEN_AUTO_TOUT_MSEC		100

#define MLX5E_PFC_PREVEN_TOUT_MAX_MSEC		8000

#define MLX5E_PFC_PREVEN_MINOR_PRECENT		85

#define MLX5E_PFC_PREVEN_TOUT_MIN_MSEC		80

#define MLX5E_DEVICE_STALL_MINOR_WATERMARK(critical_tout) \

	max_t(u16, MLX5E_PFC_PREVEN_TOUT_MIN_MSEC, \

	      (critical_tout * MLX5E_PFC_PREVEN_MINOR_PRECENT) / 100)



static int mlx5e_get_pfc_prevention_tout(struct net_device *netdev,

					 u16 *pfc_prevention_tout)

{

	struct mlx5e_priv *priv    = netdev_priv(netdev);

	struct mlx5_core_dev *mdev = priv->mdev;



	if (!MLX5_CAP_PCAM_FEATURE((priv)->mdev, pfcc_mask) ||

	    !MLX5_CAP_DEBUG((priv)->mdev, stall_detect))

		return -EOPNOTSUPP;



	return mlx5_query_port_stall_watermark(mdev, pfc_prevention_tout, NULL);

}



static int mlx5e_set_pfc_prevention_tout(struct net_device *netdev,

					 u16 pfc_preven)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);

	struct mlx5_core_dev *mdev = priv->mdev;

	u16 critical_tout;

	u16 minor;



	if (!MLX5_CAP_PCAM_FEATURE((priv)->mdev, pfcc_mask) ||

	    !MLX5_CAP_DEBUG((priv)->mdev, stall_detect))

		return -EOPNOTSUPP;



	critical_tout = (pfc_preven == PFC_STORM_PREVENTION_AUTO) ?

			MLX5E_PFC_PREVEN_AUTO_TOUT_MSEC :

			pfc_preven;



	if (critical_tout != PFC_STORM_PREVENTION_DISABLE &&

	    (critical_tout > MLX5E_PFC_PREVEN_TOUT_MAX_MSEC ||

	     critical_tout < MLX5E_PFC_PREVEN_TOUT_MIN_MSEC)) {

		netdev_info(netdev, "%s: pfc prevention tout not in range (%d-%d)\n",

			    __func__, MLX5E_PFC_PREVEN_TOUT_MIN_MSEC,

			    MLX5E_PFC_PREVEN_TOUT_MAX_MSEC);

		return -EINVAL;

	}



	minor = MLX5E_DEVICE_STALL_MINOR_WATERMARK(critical_tout);

	return mlx5_set_port_stall_watermark(mdev, critical_tout,

					     minor);

}



static int mlx5e_get_tunable(struct net_device *dev,

			     const struct ethtool_tunable *tuna,

			     void *data)
@@ -1077,6 +1125,9 @@ static int mlx5e_get_tunable(struct net_device *dev, 
	case ETHTOOL_TX_COPYBREAK:

		*(u32 *)data = priv->channels.params.tx_max_inline;

		break;

	case ETHTOOL_PFC_PREVENTION_TOUT:

		err = mlx5e_get_pfc_prevention_tout(dev, data);

		break;

	default:

		err = -EINVAL;

		break;
@@ -1118,6 +1169,9 @@ static int mlx5e_set_tunable(struct net_device *dev, 
			break;

		mlx5e_switch_priv_channels(priv, &new_channels, NULL);



		break;

	case ETHTOOL_PFC_PREVENTION_TOUT:

		err = mlx5e_set_pfc_prevention_tout(dev, *(u16 *)data);

		break;

	default:

		err = -EINVAL;

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

+45 −32
Original line number Diff line number Diff line
@@ -615,8 +615,7 @@ static int mlx5e_create_rq(struct mlx5e_rq *rq, 
static int mlx5e_modify_rq_state(struct mlx5e_rq *rq, int curr_state,

				 int next_state)

{

	struct mlx5e_channel *c = rq->channel;

	struct mlx5_core_dev *mdev = c->mdev;

	struct mlx5_core_dev *mdev = rq->mdev;



	void *in;

	void *rqc;
@@ -1768,14 +1767,16 @@ static void mlx5e_build_rq_param(struct mlx5e_priv *priv, 
	param->wq.linear = 1;

}



static void mlx5e_build_drop_rq_param(struct mlx5_core_dev *mdev,

static void mlx5e_build_drop_rq_param(struct mlx5e_priv *priv,

				      struct mlx5e_rq_param *param)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	void *rqc = param->rqc;

	void *wq = MLX5_ADDR_OF(rqc, rqc, wq);



	MLX5_SET(wq, wq, wq_type, MLX5_WQ_TYPE_LINKED_LIST);

	MLX5_SET(wq, wq, log_wq_stride,    ilog2(sizeof(struct mlx5e_rx_wqe)));

	MLX5_SET(rqc, rqc, counter_set_id, priv->drop_rq_q_counter);



	param->wq.buf_numa_node = dev_to_node(&mdev->pdev->dev);

}
@@ -2643,15 +2644,16 @@ static int mlx5e_alloc_drop_cq(struct mlx5_core_dev *mdev, 
	return mlx5e_alloc_cq_common(mdev, param, cq);

}



static int mlx5e_open_drop_rq(struct mlx5_core_dev *mdev,

static int mlx5e_open_drop_rq(struct mlx5e_priv *priv,

			      struct mlx5e_rq *drop_rq)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	struct mlx5e_cq_param cq_param = {};

	struct mlx5e_rq_param rq_param = {};

	struct mlx5e_cq *cq = &drop_rq->cq;

	int err;



	mlx5e_build_drop_rq_param(mdev, &rq_param);

	mlx5e_build_drop_rq_param(priv, &rq_param);



	err = mlx5e_alloc_drop_cq(mdev, cq, &cq_param);

	if (err)
@@ -2669,6 +2671,10 @@ static int mlx5e_open_drop_rq(struct mlx5_core_dev *mdev, 
	if (err)

		goto err_free_rq;



	err = mlx5e_modify_rq_state(drop_rq, MLX5_RQC_STATE_RST, MLX5_RQC_STATE_RDY);

	if (err)

		mlx5_core_warn(priv->mdev, "modify_rq_state failed, rx_if_down_packets won't be counted %d\n", err);



	return 0;



err_free_rq:
@@ -3236,24 +3242,20 @@ static int mlx5e_set_features(struct net_device *netdev, 
			      netdev_features_t features)

{

	netdev_features_t oper_features = netdev->features;

	int err;

	int err = 0;



#define MLX5E_HANDLE_FEATURE(feature, handler) \

	mlx5e_handle_feature(netdev, &oper_features, features, feature, handler)



	err  = mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_LRO, set_feature_lro);

	err |= mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_HW_VLAN_CTAG_FILTER,

	err |= MLX5E_HANDLE_FEATURE(NETIF_F_LRO, set_feature_lro);

	err |= MLX5E_HANDLE_FEATURE(NETIF_F_HW_VLAN_CTAG_FILTER,

				    set_feature_cvlan_filter);

	err |= mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_HW_TC, set_feature_tc_num_filters);

	err |= mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_RXALL, set_feature_rx_all);

	err |= mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_RXFCS, set_feature_rx_fcs);

	err |= mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_HW_VLAN_CTAG_RX, set_feature_rx_vlan);

	err |= MLX5E_HANDLE_FEATURE(NETIF_F_HW_TC, set_feature_tc_num_filters);

	err |= MLX5E_HANDLE_FEATURE(NETIF_F_RXALL, set_feature_rx_all);

	err |= MLX5E_HANDLE_FEATURE(NETIF_F_RXFCS, set_feature_rx_fcs);

	err |= MLX5E_HANDLE_FEATURE(NETIF_F_HW_VLAN_CTAG_RX, set_feature_rx_vlan);

#ifdef CONFIG_RFS_ACCEL

	err |= mlx5e_handle_feature(netdev, &oper_features, features,

				    NETIF_F_NTUPLE, set_feature_arfs);

	err |= MLX5E_HANDLE_FEATURE(NETIF_F_NTUPLE, set_feature_arfs);

#endif



	if (err) {
@@ -3961,7 +3963,7 @@ void mlx5e_set_rx_cq_mode_params(struct mlx5e_params *params, u8 cq_period_mode) 
				MLX5_CQ_PERIOD_MODE_START_FROM_CQE);

}



u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout)

static u32 mlx5e_choose_lro_timeout(struct mlx5_core_dev *mdev, u32 wanted_timeout)

{

	int i;
@@ -4104,6 +4106,9 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
	netdev->vlan_features    |= NETIF_F_RXCSUM;

	netdev->vlan_features    |= NETIF_F_RXHASH;



	netdev->hw_enc_features  |= NETIF_F_HW_VLAN_CTAG_TX;

	netdev->hw_enc_features  |= NETIF_F_HW_VLAN_CTAG_RX;



	if (!!MLX5_CAP_ETH(mdev, lro_cap))

		netdev->vlan_features    |= NETIF_F_LRO;
@@ -4183,7 +4188,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
	mlx5e_ipsec_build_netdev(priv);

}



static void mlx5e_create_q_counter(struct mlx5e_priv *priv)

static void mlx5e_create_q_counters(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	int err;
@@ -4193,14 +4198,21 @@ static void mlx5e_create_q_counter(struct mlx5e_priv *priv) 
		mlx5_core_warn(mdev, "alloc queue counter failed, %d\n", err);

		priv->q_counter = 0;

	}



	err = mlx5_core_alloc_q_counter(mdev, &priv->drop_rq_q_counter);

	if (err) {

		mlx5_core_warn(mdev, "alloc drop RQ counter failed, %d\n", err);

		priv->drop_rq_q_counter = 0;

	}

}



static void mlx5e_destroy_q_counter(struct mlx5e_priv *priv)

static void mlx5e_destroy_q_counters(struct mlx5e_priv *priv)

{

	if (!priv->q_counter)

		return;



	if (priv->q_counter)

		mlx5_core_dealloc_q_counter(priv->mdev, priv->q_counter);



	if (priv->drop_rq_q_counter)

		mlx5_core_dealloc_q_counter(priv->mdev, priv->drop_rq_q_counter);

}



static void mlx5e_nic_init(struct mlx5_core_dev *mdev,
@@ -4439,18 +4451,18 @@ int mlx5e_attach_netdev(struct mlx5e_priv *priv) 
	if (err)

		goto out;



	err = mlx5e_open_drop_rq(mdev, &priv->drop_rq);

	mlx5e_create_q_counters(priv);



	err = mlx5e_open_drop_rq(priv, &priv->drop_rq);

	if (err) {

		mlx5_core_err(mdev, "open drop rq failed, %d\n", err);

		goto err_cleanup_tx;

		goto err_destroy_q_counters;

	}



	err = profile->init_rx(priv);

	if (err)

		goto err_close_drop_rq;



	mlx5e_create_q_counter(priv);



	if (profile->enable)

		profile->enable(priv);
@@ -4459,7 +4471,8 @@ int mlx5e_attach_netdev(struct mlx5e_priv *priv) 
err_close_drop_rq:

	mlx5e_close_drop_rq(&priv->drop_rq);



err_cleanup_tx:

err_destroy_q_counters:

	mlx5e_destroy_q_counters(priv);

	profile->cleanup_tx(priv);



out:
@@ -4476,9 +4489,9 @@ void mlx5e_detach_netdev(struct mlx5e_priv *priv) 
		profile->disable(priv);

	flush_workqueue(priv->wq);



	mlx5e_destroy_q_counter(priv);

	profile->cleanup_rx(priv);

	mlx5e_close_drop_rq(&priv->drop_rq);

	mlx5e_destroy_q_counters(priv);

	profile->cleanup_tx(priv);

	cancel_delayed_work_sync(&priv->update_stats_work);

}