Commit 1bc61c9d authored by David S. Miller's avatar David S. Miller
Browse files

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



Saeed Mahameed says:

====================
This series provides some cleanups to mlx5 driver
For more information please see tag log below.

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

mlx5-updates-2021-03-11

Cleanups for mlx5 driver

1) Fix build warnings form Arnd and Vlad
2) Leon improves locking for driver load/unload flows
3) From Roi, Lockdep false dependency warning
4) Other trivial cleanups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2a0186a3 9f4d9283

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

+3 −3
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static int mlx5_devlink_reload_down(struct devlink *devlink, bool netns_change, 


	switch (action) {

	case DEVLINK_RELOAD_ACTION_DRIVER_REINIT:

		mlx5_unload_one(dev, false);

		mlx5_unload_one(dev);

		return 0;

	case DEVLINK_RELOAD_ACTION_FW_ACTIVATE:

		if (limit == DEVLINK_RELOAD_LIMIT_NO_RESET)
@@ -170,13 +170,13 @@ static int mlx5_devlink_reload_up(struct devlink *devlink, enum devlink_reload_a 
	*actions_performed = BIT(action);

	switch (action) {

	case DEVLINK_RELOAD_ACTION_DRIVER_REINIT:

		return mlx5_load_one(dev, false);

		return mlx5_load_one(dev);

	case DEVLINK_RELOAD_ACTION_FW_ACTIVATE:

		if (limit == DEVLINK_RELOAD_LIMIT_NO_RESET)

			break;

		/* On fw_activate action, also driver is reloaded and reinit performed */

		*actions_performed |= BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT);

		return mlx5_load_one(dev, false);

		return mlx5_load_one(dev);

	default:

		/* Unsupported action should not get to this function */

		WARN_ON(1);

drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c

+2 −3
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ int mlx5_fw_tracer_reload(struct mlx5_fw_tracer *tracer) 
	int err;



	if (IS_ERR_OR_NULL(tracer))

		return -EINVAL;

		return 0;



	dev = tracer->dev;

	mlx5_fw_tracer_cleanup(tracer);
@@ -1126,7 +1126,6 @@ static int fw_tracer_event(struct notifier_block *nb, unsigned long action, void 


	switch (eqe->sub_type) {

	case MLX5_TRACER_SUBTYPE_OWNERSHIP_CHANGE:

		if (test_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state))

		queue_work(tracer->work_queue, &tracer->ownership_change_work);

		break;

	case MLX5_TRACER_SUBTYPE_TRACES_AVAILABLE:

drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c

+3 −5
Original line number Diff line number Diff line
@@ -621,11 +621,7 @@ bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe, 
	int err;



	reg_c0 = (be32_to_cpu(cqe->sop_drop_qpn) & MLX5E_TC_FLOW_ID_MASK);

	if (reg_c0 == MLX5_FS_DEFAULT_FLOW_TAG)

		reg_c0 = 0;

	reg_c1 = be32_to_cpu(cqe->ft_metadata);



	if (!reg_c0)

	if (!reg_c0 || reg_c0 == MLX5_FS_DEFAULT_FLOW_TAG)

		return true;



	/* If reg_c0 is not equal to the default flow tag then skb->mark
@@ -633,6 +629,8 @@ bool mlx5e_rep_tc_update_skb(struct mlx5_cqe64 *cqe, 
	 */

	skb->mark = 0;



	reg_c1 = be32_to_cpu(cqe->ft_metadata);



	priv = netdev_priv(skb->dev);

	esw = priv->mdev->priv.eswitch;

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

+17 −7
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ mlx5_tc_ct_entry_add_rule(struct mlx5_tc_ct_priv *ct_priv, 


	zone_rule->nat = nat;



	spec = kzalloc(sizeof(*spec), GFP_KERNEL);

	spec = kvzalloc(sizeof(*spec), GFP_KERNEL);

	if (!spec)

		return -ENOMEM;
@@ -737,7 +737,7 @@ mlx5_tc_ct_entry_add_rule(struct mlx5_tc_ct_priv *ct_priv, 


	zone_rule->attr = attr;



	kfree(spec);

	kvfree(spec);

	ct_dbg("Offloaded ct entry rule in zone %d", entry->tuple.zone);



	return 0;
@@ -749,7 +749,7 @@ mlx5_tc_ct_entry_add_rule(struct mlx5_tc_ct_priv *ct_priv, 
err_mod_hdr:

	kfree(attr);

err_attr:

	kfree(spec);

	kvfree(spec);

	return err;

}
@@ -1539,6 +1539,14 @@ mlx5_tc_ct_free_pre_ct_tables(struct mlx5_ct_ft *ft) 
	mlx5_tc_ct_free_pre_ct(ft, &ft->pre_ct);

}



/* To avoid false lock dependency warning set the ct_entries_ht lock

 * class different than the lock class of the ht being used when deleting

 * last flow from a group and then deleting a group, we get into del_sw_flow_group()

 * which call rhashtable_destroy on fg->ftes_hash which will take ht->mutex but

 * it's different than the ht->mutex here.

 */

static struct lock_class_key ct_entries_ht_lock_key;



static struct mlx5_ct_ft *

mlx5_tc_ct_add_ft_cb(struct mlx5_tc_ct_priv *ct_priv, u16 zone,

		     struct nf_flowtable *nf_ft)
@@ -1573,6 +1581,8 @@ mlx5_tc_ct_add_ft_cb(struct mlx5_tc_ct_priv *ct_priv, u16 zone, 
	if (err)

		goto err_init;



	lockdep_set_class(&ft->ct_entries_ht.mutex, &ct_entries_ht_lock_key);



	err = rhashtable_insert_fast(&ct_priv->zone_ht, &ft->node,

				     zone_params);

	if (err)
@@ -1674,10 +1684,10 @@ __mlx5_tc_ct_flow_offload(struct mlx5_tc_ct_priv *ct_priv, 
	struct mlx5_ct_ft *ft;

	u32 fte_id = 1;



	post_ct_spec = kzalloc(sizeof(*post_ct_spec), GFP_KERNEL);

	post_ct_spec = kvzalloc(sizeof(*post_ct_spec), GFP_KERNEL);

	ct_flow = kzalloc(sizeof(*ct_flow), GFP_KERNEL);

	if (!post_ct_spec || !ct_flow) {

		kfree(post_ct_spec);

		kvfree(post_ct_spec);

		kfree(ct_flow);

		return ERR_PTR(-ENOMEM);

	}
@@ -1812,7 +1822,7 @@ __mlx5_tc_ct_flow_offload(struct mlx5_tc_ct_priv *ct_priv, 


	attr->ct_attr.ct_flow = ct_flow;

	dealloc_mod_hdr_actions(&pre_mod_acts);

	kfree(post_ct_spec);

	kvfree(post_ct_spec);



	return rule;
@@ -1833,7 +1843,7 @@ __mlx5_tc_ct_flow_offload(struct mlx5_tc_ct_priv *ct_priv, 
err_idr:

	mlx5_tc_ct_del_ft_cb(ct_priv, ft);

err_ft:

	kfree(post_ct_spec);

	kvfree(post_ct_spec);

	kfree(ct_flow);

	netdev_warn(priv->netdev, "Failed to offload ct flow, err %d\n", err);

	return ERR_PTR(err);

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

+6 −4
Original line number Diff line number Diff line
@@ -76,8 +76,10 @@ int mlx5e_tc_tun_update_header_ipv6(struct mlx5e_priv *priv, 
static inline int

mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv,

				struct net_device *mirred_dev,

				struct mlx5e_encap_entry *e) { return -EOPNOTSUPP; }

int mlx5e_tc_tun_update_header_ipv6(struct mlx5e_priv *priv,

				struct mlx5e_encap_entry *e)

{ return -EOPNOTSUPP; }

static inline int

mlx5e_tc_tun_update_header_ipv6(struct mlx5e_priv *priv,

				struct net_device *mirred_dev,

				struct mlx5e_encap_entry *e)

{ return -EOPNOTSUPP; }