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

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



Saeed Mahameed says:

====================
mlx5 fixes 2020-06-11

This series introduces some fixes to mlx5 driver.
For more information please see tag log below.

Please pull and let me know if there is any problem.

For -stable v5.2
  ('net/mlx5: drain health workqueue in case of driver load error')

For -stable v5.3
  ('net/mlx5e: Fix repeated XSK usage on one channel')
  ('net/mlx5: Fix fatal error handling during device load')

For -stable v5.5
 ('net/mlx5: Disable reload while removing the device')

For -stable v5.7
  ('net/mlx5e: CT: Fix ipv6 nat header rewrite actions')
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2ad6691d 09a92975

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

+0 −2
Original line number Diff line number Diff line
@@ -283,7 +283,6 @@ int mlx5_devlink_register(struct devlink *devlink, struct device *dev) 
		goto params_reg_err;

	mlx5_devlink_set_params_init_values(devlink);

	devlink_params_publish(devlink);

	devlink_reload_enable(devlink);

	return 0;



params_reg_err:
@@ -293,7 +292,6 @@ params_reg_err: 


void mlx5_devlink_unregister(struct devlink *devlink)

{

	devlink_reload_disable(devlink);

	devlink_params_unregister(devlink, mlx5_devlink_params,

				  ARRAY_SIZE(mlx5_devlink_params));

	devlink_unregister(devlink);

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

+8 −8
Original line number Diff line number Diff line
@@ -328,21 +328,21 @@ mlx5_tc_ct_parse_mangle_to_mod_act(struct flow_action_entry *act, 


	case FLOW_ACT_MANGLE_HDR_TYPE_IP6:

		MLX5_SET(set_action_in, modact, length, 0);

		if (offset == offsetof(struct ipv6hdr, saddr))

		if (offset == offsetof(struct ipv6hdr, saddr) + 12)

			field = MLX5_ACTION_IN_FIELD_OUT_SIPV6_31_0;

		else if (offset == offsetof(struct ipv6hdr, saddr) + 4)

			field = MLX5_ACTION_IN_FIELD_OUT_SIPV6_63_32;

		else if (offset == offsetof(struct ipv6hdr, saddr) + 8)

			field = MLX5_ACTION_IN_FIELD_OUT_SIPV6_63_32;

		else if (offset == offsetof(struct ipv6hdr, saddr) + 4)

			field = MLX5_ACTION_IN_FIELD_OUT_SIPV6_95_64;

		else if (offset == offsetof(struct ipv6hdr, saddr) + 12)

		else if (offset == offsetof(struct ipv6hdr, saddr))

			field = MLX5_ACTION_IN_FIELD_OUT_SIPV6_127_96;

		else if (offset == offsetof(struct ipv6hdr, daddr))

		else if (offset == offsetof(struct ipv6hdr, daddr) + 12)

			field = MLX5_ACTION_IN_FIELD_OUT_DIPV6_31_0;

		else if (offset == offsetof(struct ipv6hdr, daddr) + 4)

			field = MLX5_ACTION_IN_FIELD_OUT_DIPV6_63_32;

		else if (offset == offsetof(struct ipv6hdr, daddr) + 8)

			field = MLX5_ACTION_IN_FIELD_OUT_DIPV6_63_32;

		else if (offset == offsetof(struct ipv6hdr, daddr) + 4)

			field = MLX5_ACTION_IN_FIELD_OUT_DIPV6_95_64;

		else if (offset == offsetof(struct ipv6hdr, daddr) + 12)

		else if (offset == offsetof(struct ipv6hdr, daddr))

			field = MLX5_ACTION_IN_FIELD_OUT_DIPV6_127_96;

		else

			return -EOPNOTSUPP;

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c

+4 −0
Original line number Diff line number Diff line
@@ -152,6 +152,10 @@ void mlx5e_close_xsk(struct mlx5e_channel *c) 
	mlx5e_close_cq(&c->xskicosq.cq);

	mlx5e_close_xdpsq(&c->xsksq);

	mlx5e_close_cq(&c->xsksq.cq);



	memset(&c->xskrq, 0, sizeof(c->xskrq));

	memset(&c->xsksq, 0, sizeof(c->xsksq));

	memset(&c->xskicosq, 0, sizeof(c->xskicosq));

}



void mlx5e_activate_xsk(struct mlx5e_channel *c)

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

+22 −19
Original line number Diff line number Diff line
@@ -1173,7 +1173,8 @@ int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir, 
	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5e_rss_params *rss = &priv->rss_params;

	int inlen = MLX5_ST_SZ_BYTES(modify_tir_in);

	bool hash_changed = false;

	bool refresh_tirs = false;

	bool refresh_rqt = false;

	void *in;



	if ((hfunc != ETH_RSS_HASH_NO_CHANGE) &&
@@ -1189,15 +1190,23 @@ int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir, 


	if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != rss->hfunc) {

		rss->hfunc = hfunc;

		hash_changed = true;

		refresh_rqt = true;

		refresh_tirs = true;

	}



	if (indir) {

		memcpy(rss->indirection_rqt, indir,

		       sizeof(rss->indirection_rqt));

		refresh_rqt = true;

	}



		if (test_bit(MLX5E_STATE_OPENED, &priv->state)) {

			u32 rqtn = priv->indir_rqt.rqtn;

	if (key) {

		memcpy(rss->toeplitz_hash_key, key,

		       sizeof(rss->toeplitz_hash_key));

		refresh_tirs = refresh_tirs || rss->hfunc == ETH_RSS_HASH_TOP;

	}



	if (refresh_rqt && test_bit(MLX5E_STATE_OPENED, &priv->state)) {

		struct mlx5e_redirect_rqt_param rrp = {

			.is_rss = true,

			{
@@ -1207,18 +1216,12 @@ int mlx5e_set_rxfh(struct net_device *dev, const u32 *indir, 
				},

			},

		};

		u32 rqtn = priv->indir_rqt.rqtn;



		mlx5e_redirect_rqt(priv, rqtn, MLX5E_INDIR_RQT_SIZE, rrp);

	}

	}



	if (key) {

		memcpy(rss->toeplitz_hash_key, key,

		       sizeof(rss->toeplitz_hash_key));

		hash_changed = hash_changed || rss->hfunc == ETH_RSS_HASH_TOP;

	}



	if (hash_changed)

	if (refresh_tirs)

		mlx5e_modify_tirs_hash(priv, in);



	mutex_unlock(&priv->state_lock);

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c

+4 −2
Original line number Diff line number Diff line
@@ -162,10 +162,12 @@ int esw_acl_ingress_lgcy_setup(struct mlx5_eswitch *esw, 


	if (MLX5_CAP_ESW_INGRESS_ACL(esw->dev, flow_counter)) {

		counter = mlx5_fc_create(esw->dev, false);

		if (IS_ERR(counter))

		if (IS_ERR(counter)) {

			esw_warn(esw->dev,

				 "vport[%d] configure ingress drop rule counter failed\n",

				 vport->vport);

			counter = NULL;

		}

		vport->ingress.legacy.drop_counter = counter;

	}
@@ -272,7 +274,7 @@ void esw_acl_ingress_lgcy_cleanup(struct mlx5_eswitch *esw, 
	esw_acl_ingress_table_destroy(vport);



clean_drop_counter:

	if (!IS_ERR_OR_NULL(vport->ingress.legacy.drop_counter)) {

	if (vport->ingress.legacy.drop_counter) {

		mlx5_fc_destroy(esw->dev, vport->ingress.legacy.drop_counter);

		vport->ingress.legacy.drop_counter = NULL;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE