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

Merge tag 'mlx5-fixes-2018-11-19' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2018-11-19

The following fixes are for mlx5 core and netdev driver.

For -stable v4.16
bc7fda7d4637 ('net/mlx5e: IPoIB, Reset QP after channels are closed')

For -stable v4.17
36917a270395 ('net/mlx5: IPSec, Fix the SA context hash key')

For -stable v4.18
6492a432be3a ('net/mlx5e: Always use the match level enum when parsing TC rule match')
c3f81be236b1 ('net/mlx5e: Removed unnecessary warnings in FEC caps query')
c5ce2e736b64 ('net/mlx5e: Fix selftest for small MTUs')

For -stable v4.19
effcd896b25e ('net/mlx5e: Adjust to max number of channles when re-attaching')
394cbc5acd68 ('net/mlx5e: RX, verify received packet size in Linear Striding RQ')
447cbb3613c8 ('net/mlx5e: Don't match on vlan non-existence if ethertype is wildcarded')
c223c1574612 ('net/mlx5e: Claim TC hw offloads support only under a proper build config')

Please pull and let me know if there's any problem.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a5681e20 9184e51b

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

+1 −0
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ struct mlx5e_rq { 


	unsigned long          state;

	int                    ix;

	unsigned int           hw_mtu;



	struct net_dim         dim; /* Dynamic Interrupt Moderation */

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

+15 −21
Original line number Diff line number Diff line
@@ -88,10 +88,8 @@ int mlx5e_port_linkspeed(struct mlx5_core_dev *mdev, u32 *speed) 


	eth_proto_oper = MLX5_GET(ptys_reg, out, eth_proto_oper);

	*speed = mlx5e_port_ptys2speed(eth_proto_oper);

	if (!(*speed)) {

		mlx5_core_warn(mdev, "cannot get port speed\n");

	if (!(*speed))

		err = -EINVAL;

	}



	return err;

}
@@ -258,7 +256,7 @@ static int mlx5e_fec_admin_field(u32 *pplm, 
	case 40000:

		if (!write)

			*fec_policy = MLX5_GET(pplm_reg, pplm,

					       fec_override_cap_10g_40g);

					       fec_override_admin_10g_40g);

		else

			MLX5_SET(pplm_reg, pplm,

				 fec_override_admin_10g_40g, *fec_policy);
@@ -310,7 +308,7 @@ static int mlx5e_get_fec_cap_field(u32 *pplm, 
	case 10000:

	case 40000:

		*fec_cap = MLX5_GET(pplm_reg, pplm,

				    fec_override_admin_10g_40g);

				    fec_override_cap_10g_40g);

		break;

	case 25000:

		*fec_cap = MLX5_GET(pplm_reg, pplm,
@@ -394,12 +392,12 @@ int mlx5e_get_fec_mode(struct mlx5_core_dev *dev, u32 *fec_mode_active, 


int mlx5e_set_fec_mode(struct mlx5_core_dev *dev, u8 fec_policy)

{

	u8 fec_policy_nofec = BIT(MLX5E_FEC_NOFEC);

	bool fec_mode_not_supp_in_speed = false;

	u8 no_fec_policy = BIT(MLX5E_FEC_NOFEC);

	u32 out[MLX5_ST_SZ_DW(pplm_reg)] = {};

	u32 in[MLX5_ST_SZ_DW(pplm_reg)] = {};

	int sz = MLX5_ST_SZ_BYTES(pplm_reg);

	u32 current_fec_speed;

	u8 fec_policy_auto = 0;

	u8 fec_caps = 0;

	int err;

	int i;
@@ -415,22 +413,18 @@ int mlx5e_set_fec_mode(struct mlx5_core_dev *dev, u8 fec_policy) 
	if (err)

		return err;



	err = mlx5e_port_linkspeed(dev, &current_fec_speed);

	if (err)

		return err;

	MLX5_SET(pplm_reg, out, local_port, 1);



	memset(in, 0, sz);

	MLX5_SET(pplm_reg, in, local_port, 1);

	for (i = 0; i < MLX5E_FEC_SUPPORTED_SPEEDS && !!fec_policy; i++) {

	for (i = 0; i < MLX5E_FEC_SUPPORTED_SPEEDS; i++) {

		mlx5e_get_fec_cap_field(out, &fec_caps, fec_supported_speeds[i]);

		/* policy supported for link speed */

		if (!!(fec_caps & fec_policy)) {

			mlx5e_fec_admin_field(in, &fec_policy, 1,

		/* policy supported for link speed, or policy is auto */

		if (fec_caps & fec_policy || fec_policy == fec_policy_auto) {

			mlx5e_fec_admin_field(out, &fec_policy, 1,

					      fec_supported_speeds[i]);

		} else {

			if (fec_supported_speeds[i] == current_fec_speed)

				return -EOPNOTSUPP;

			mlx5e_fec_admin_field(in, &no_fec_policy, 1,

			/* turn off FEC if supported. Else, leave it the same */

			if (fec_caps & fec_policy_nofec)

				mlx5e_fec_admin_field(out, &fec_policy_nofec, 1,

						      fec_supported_speeds[i]);

			fec_mode_not_supp_in_speed = true;

		}
@@ -441,5 +435,5 @@ int mlx5e_set_fec_mode(struct mlx5_core_dev *dev, u8 fec_policy) 
			      "FEC policy 0x%x is not supported for some speeds",

			      fec_policy);



	return mlx5_core_access_reg(dev, in, sz, out, sz, MLX5_REG_PPLM, 0, 1);

	return mlx5_core_access_reg(dev, out, sz, out, sz, MLX5_REG_PPLM, 0, 1);

}

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

+3 −1
Original line number Diff line number Diff line
@@ -130,8 +130,10 @@ static u32 calculate_xoff(struct mlx5e_priv *priv, unsigned int mtu) 
	int err;



	err = mlx5e_port_linkspeed(priv->mdev, &speed);

	if (err)

	if (err) {

		mlx5_core_warn(priv->mdev, "cannot get port speed\n");

		return 0;

	}



	xoff = (301 + 216 * priv->dcbx.cable_len / 100) * speed / 1000 + 272 * mtu / 100;

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

+1 −2
Original line number Diff line number Diff line
@@ -843,8 +843,7 @@ static int mlx5e_get_link_ksettings(struct net_device *netdev, 
	ethtool_link_ksettings_add_link_mode(link_ksettings, supported,

					     Autoneg);



	err = get_fec_supported_advertised(mdev, link_ksettings);

	if (err)

	if (get_fec_supported_advertised(mdev, link_ksettings))

		netdev_dbg(netdev, "%s: FEC caps query failed: %d\n",

			   __func__, err);

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

+31 −6
Original line number Diff line number Diff line
@@ -502,6 +502,7 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, 
	rq->channel = c;

	rq->ix      = c->ix;

	rq->mdev    = mdev;

	rq->hw_mtu  = MLX5E_SW2HW_MTU(params, params->sw_mtu);

	rq->stats   = &c->priv->channel_stats[c->ix].rq;



	rq->xdp_prog = params->xdp_prog ? bpf_prog_inc(params->xdp_prog) : NULL;
@@ -1623,13 +1624,15 @@ static int mlx5e_alloc_cq_common(struct mlx5_core_dev *mdev, 
	int err;

	u32 i;



	err = mlx5_vector2eqn(mdev, param->eq_ix, &eqn_not_used, &irqn);

	if (err)

		return err;



	err = mlx5_cqwq_create(mdev, &param->wq, param->cqc, &cq->wq,

			       &cq->wq_ctrl);

	if (err)

		return err;



	mlx5_vector2eqn(mdev, param->eq_ix, &eqn_not_used, &irqn);



	mcq->cqe_sz     = 64;

	mcq->set_ci_db  = cq->wq_ctrl.db.db;

	mcq->arm_db     = cq->wq_ctrl.db.db + 1;
@@ -1687,6 +1690,10 @@ static int mlx5e_create_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param) 
	int eqn;

	int err;



	err = mlx5_vector2eqn(mdev, param->eq_ix, &eqn, &irqn_not_used);

	if (err)

		return err;



	inlen = MLX5_ST_SZ_BYTES(create_cq_in) +

		sizeof(u64) * cq->wq_ctrl.buf.npages;

	in = kvzalloc(inlen, GFP_KERNEL);
@@ -1700,8 +1707,6 @@ static int mlx5e_create_cq(struct mlx5e_cq *cq, struct mlx5e_cq_param *param) 
	mlx5_fill_page_frag_array(&cq->wq_ctrl.buf,

				  (__be64 *)MLX5_ADDR_OF(create_cq_in, in, pas));



	mlx5_vector2eqn(mdev, param->eq_ix, &eqn, &irqn_not_used);



	MLX5_SET(cqc,   cqc, cq_period_mode, param->cq_period_mode);

	MLX5_SET(cqc,   cqc, c_eqn,         eqn);

	MLX5_SET(cqc,   cqc, uar_page,      mdev->priv.uar->index);
@@ -1921,6 +1926,10 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, 
	int err;

	int eqn;



	err = mlx5_vector2eqn(priv->mdev, ix, &eqn, &irq);

	if (err)

		return err;



	c = kvzalloc_node(sizeof(*c), GFP_KERNEL, cpu_to_node(cpu));

	if (!c)

		return -ENOMEM;
@@ -1937,7 +1946,6 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, 
	c->xdp      = !!params->xdp_prog;

	c->stats    = &priv->channel_stats[ix].ch;



	mlx5_vector2eqn(priv->mdev, ix, &eqn, &irq);

	c->irq_desc = irq_to_desc(irq);



	netif_napi_add(netdev, &c->napi, mlx5e_napi_poll, 64);
@@ -3574,6 +3582,7 @@ static int set_feature_cvlan_filter(struct net_device *netdev, bool enable) 
	return 0;

}



#ifdef CONFIG_MLX5_ESWITCH

static int set_feature_tc_num_filters(struct net_device *netdev, bool enable)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);
@@ -3586,6 +3595,7 @@ static int set_feature_tc_num_filters(struct net_device *netdev, bool enable) 


	return 0;

}

#endif



static int set_feature_rx_all(struct net_device *netdev, bool enable)

{
@@ -3684,7 +3694,9 @@ static int mlx5e_set_features(struct net_device *netdev, 
	err |= MLX5E_HANDLE_FEATURE(NETIF_F_LRO, set_feature_lro);

	err |= MLX5E_HANDLE_FEATURE(NETIF_F_HW_VLAN_CTAG_FILTER,

				    set_feature_cvlan_filter);

#ifdef CONFIG_MLX5_ESWITCH

	err |= MLX5E_HANDLE_FEATURE(NETIF_F_HW_TC, set_feature_tc_num_filters);

#endif

	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);
@@ -3755,10 +3767,11 @@ int mlx5e_change_mtu(struct net_device *netdev, int new_mtu, 
	}



	if (params->rq_wq_type == MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ) {

		bool is_linear = mlx5e_rx_mpwqe_is_linear_skb(priv->mdev, &new_channels.params);

		u8 ppw_old = mlx5e_mpwqe_log_pkts_per_wqe(params);

		u8 ppw_new = mlx5e_mpwqe_log_pkts_per_wqe(&new_channels.params);



		reset = reset && (ppw_old != ppw_new);

		reset = reset && (is_linear || (ppw_old != ppw_new));

	}



	if (!reset) {
@@ -4678,7 +4691,9 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
	    FT_CAP(modify_root) &&

	    FT_CAP(identified_miss_table_mode) &&

	    FT_CAP(flow_table_modify)) {

#ifdef CONFIG_MLX5_ESWITCH

		netdev->hw_features      |= NETIF_F_HW_TC;

#endif

#ifdef CONFIG_MLX5_EN_ARFS

		netdev->hw_features	 |= NETIF_F_NTUPLE;

#endif
@@ -5004,11 +5019,21 @@ err_free_netdev: 
int mlx5e_attach_netdev(struct mlx5e_priv *priv)

{

	const struct mlx5e_profile *profile;

	int max_nch;

	int err;



	profile = priv->profile;

	clear_bit(MLX5E_STATE_DESTROYING, &priv->state);



	/* max number of channels may have changed */

	max_nch = mlx5e_get_max_num_channels(priv->mdev);

	if (priv->channels.params.num_channels > max_nch) {

		mlx5_core_warn(priv->mdev, "MLX5E: Reducing number of channels to %d\n", max_nch);

		priv->channels.params.num_channels = max_nch;

		mlx5e_build_default_indir_rqt(priv->channels.params.indirection_rqt,

					      MLX5E_INDIR_RQT_SIZE, max_nch);

	}



	err = profile->init_tx(priv);

	if (err)

		goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE