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

Merge tag 'mlx5-fixes-2019-10-24' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2019-10-24

This series introduces misc fixes to mlx5 driver.

v1->v2:
 - Dropped the kTLS counter documentation patch, Tariq will fix it and
   send it later.
 - Added a new fix for link speed mode reporting.
  ('net/mlx5e: Initialize link modes bitmap on stack')

For -stable v4.14
  ('net/mlx5e: Fix handling of compressed CQEs in case of low NAPI budget')

For -stable v4.19
  ('net/mlx5e: Fix ethtool self test: link speed')

For -stable v5.2
  ('net/mlx5: Fix flow counter list auto bits struct')
  ('net/mlx5: Fix rtable reference leak')

For -stable v5.3
  ('net/mlx5e: Remove incorrect match criteria assignment line')
  ('net/mlx5e: Determine source port properly for vlan push action')
  ('net/mlx5e: Initialize link modes bitmap on stack')
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8b73018f 926b37f7

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

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ int mlx5e_hv_vhca_stats_create(struct mlx5e_priv *priv) 
				    "Failed to create hv vhca stats agent, err = %ld\n",

				    PTR_ERR(agent));



		kfree(priv->stats_agent.buf);

		kvfree(priv->stats_agent.buf);

		return IS_ERR_OR_NULL(agent);

	}
@@ -157,5 +157,5 @@ void mlx5e_hv_vhca_stats_destroy(struct mlx5e_priv *priv) 
		return;



	mlx5_hv_vhca_agent_destroy(priv->stats_agent.agent);

	kfree(priv->stats_agent.buf);

	kvfree(priv->stats_agent.buf);

}

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

+9 −3
Original line number Diff line number Diff line
@@ -97,15 +97,19 @@ static int mlx5e_route_lookup_ipv4(struct mlx5e_priv *priv, 
	if (ret)

		return ret;



	if (mlx5_lag_is_multipath(mdev) && rt->rt_gw_family != AF_INET)

	if (mlx5_lag_is_multipath(mdev) && rt->rt_gw_family != AF_INET) {

		ip_rt_put(rt);

		return -ENETUNREACH;

	}

#else

	return -EOPNOTSUPP;

#endif



	ret = get_route_and_out_devs(priv, rt->dst.dev, route_dev, out_dev);

	if (ret < 0)

	if (ret < 0) {

		ip_rt_put(rt);

		return ret;

	}



	if (!(*out_ttl))

		*out_ttl = ip4_dst_hoplimit(&rt->dst);
@@ -149,8 +153,10 @@ static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv, 
		*out_ttl = ip6_dst_hoplimit(dst);



	ret = get_route_and_out_devs(priv, dst->dev, route_dev, out_dev);

	if (ret < 0)

	if (ret < 0) {

		dst_release(dst);

		return ret;

	}

#else

	return -EOPNOTSUPP;

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ static bool ext_link_mode_requested(const unsigned long *adver) 
{

#define MLX5E_MIN_PTYS_EXT_LINK_MODE_BIT ETHTOOL_LINK_MODE_50000baseKR_Full_BIT

	int size = __ETHTOOL_LINK_MODE_MASK_NBITS - MLX5E_MIN_PTYS_EXT_LINK_MODE_BIT;

	__ETHTOOL_DECLARE_LINK_MODE_MASK(modes);

	__ETHTOOL_DECLARE_LINK_MODE_MASK(modes) = {0,};



	bitmap_set(modes, MLX5E_MIN_PTYS_EXT_LINK_MODE_BIT, size);

	return bitmap_intersects(modes, adver, __ETHTOOL_LINK_MODE_MASK_NBITS);

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

+2 −2
Original line number Diff line number Diff line
@@ -611,7 +611,7 @@ static void mlx5e_rep_update_flows(struct mlx5e_priv *priv, 


	mutex_lock(&esw->offloads.encap_tbl_lock);

	encap_connected = !!(e->flags & MLX5_ENCAP_ENTRY_VALID);

	if (e->compl_result || (encap_connected == neigh_connected &&

	if (e->compl_result < 0 || (encap_connected == neigh_connected &&

				    ether_addr_equal(e->h_dest, ha)))

		goto unlock;

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

+4 −1
Original line number Diff line number Diff line
@@ -1386,8 +1386,11 @@ int mlx5e_poll_rx_cq(struct mlx5e_cq *cq, int budget) 
	if (unlikely(!test_bit(MLX5E_RQ_STATE_ENABLED, &rq->state)))

		return 0;



	if (rq->cqd.left)

	if (rq->cqd.left) {

		work_done += mlx5e_decompress_cqes_cont(rq, cqwq, 0, budget);

		if (rq->cqd.left || work_done >= budget)

			goto out;

	}



	cqe = mlx5_cqwq_get_cqe(cqwq);

	if (!cqe) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE