Commit 6e79bd28 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mlx5-fixes-2023-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 

Saeed Mahameed says:

====================
mlx5 fixes 2023-04-19

This series provides bug fixes to mlx5 driver.

* tag 'mlx5-fixes-2023-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  Revert "net/mlx5e: Don't use termination table when redundant"
  net/mlx5e: Nullify table pointer when failing to create
  net/mlx5: Use recovery timeout on sync reset flow
  Revert "net/mlx5: Remove "recovery" arg from mlx5_load_one() function"
  net/mlx5e: Fix error flow in representor failing to add vport rx rule
  net/mlx5: Release tunnel device after tc update skb
  net/mlx5: E-switch, Don't destroy indirect table in split rule
  net/mlx5: E-switch, Create per vport table based on devlink encap mode
  net/mlx5e: Release the label when replacing existing ct entry
  net/mlx5e: Don't clone flow post action attributes second time
====================

Link: https://lore.kernel.org/r/20230421015057.355468-1-saeed@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7ecebee2 081abcac

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

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static int mlx5_devlink_reload_up(struct devlink *devlink, enum devlink_reload_a 
			break;

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

		*actions_performed |= BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT);

		ret = mlx5_load_one_devl_locked(dev, false);

		ret = mlx5_load_one_devl_locked(dev, true);

		break;

	default:

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

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

+1 −0
Original line number Diff line number Diff line
@@ -715,5 +715,6 @@ void mlx5e_rep_tc_receive(struct mlx5_cqe64 *cqe, struct mlx5e_rq *rq, 
	return;



free_skb:

	dev_put(tc_priv.fwd_dev);

	dev_kfree_skb_any(skb);

}

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

+2 −9
Original line number Diff line number Diff line
@@ -106,22 +106,17 @@ mlx5e_tc_post_act_offload(struct mlx5e_post_act *post_act, 
}



struct mlx5e_post_act_handle *

mlx5e_tc_post_act_add(struct mlx5e_post_act *post_act, struct mlx5_flow_attr *attr)

mlx5e_tc_post_act_add(struct mlx5e_post_act *post_act, struct mlx5_flow_attr *post_attr)

{

	u32 attr_sz = ns_to_attr_sz(post_act->ns_type);

	struct mlx5e_post_act_handle *handle;

	struct mlx5_flow_attr *post_attr;

	int err;



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

	post_attr = mlx5_alloc_flow_attr(post_act->ns_type);

	if (!handle || !post_attr) {

		kfree(post_attr);

	if (!handle) {

		kfree(handle);

		return ERR_PTR(-ENOMEM);

	}



	memcpy(post_attr, attr, attr_sz);

	post_attr->chain = 0;

	post_attr->prio = 0;

	post_attr->ft = post_act->ft;
@@ -145,7 +140,6 @@ mlx5e_tc_post_act_add(struct mlx5e_post_act *post_act, struct mlx5_flow_attr *at 
	return handle;



err_xarray:

	kfree(post_attr);

	kfree(handle);

	return ERR_PTR(err);

}
@@ -164,7 +158,6 @@ mlx5e_tc_post_act_del(struct mlx5e_post_act *post_act, struct mlx5e_post_act_han 
	if (!IS_ERR_OR_NULL(handle->rule))

		mlx5e_tc_post_act_unoffload(post_act, handle);

	xa_erase(&post_act->ids, handle->id);

	kfree(handle->attr);

	kfree(handle);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ void 
mlx5e_tc_post_act_destroy(struct mlx5e_post_act *post_act);



struct mlx5e_post_act_handle *

mlx5e_tc_post_act_add(struct mlx5e_post_act *post_act, struct mlx5_flow_attr *attr);

mlx5e_tc_post_act_add(struct mlx5e_post_act *post_act, struct mlx5_flow_attr *post_attr);



void

mlx5e_tc_post_act_del(struct mlx5e_post_act *post_act, struct mlx5e_post_act_handle *handle);

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

+2 −2
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ 


#define MLX5_ESW_VPORT_TBL_SIZE_SAMPLE (64 * 1024)



static const struct esw_vport_tbl_namespace mlx5_esw_vport_tbl_sample_ns = {

static struct esw_vport_tbl_namespace mlx5_esw_vport_tbl_sample_ns = {

	.max_fte = MLX5_ESW_VPORT_TBL_SIZE_SAMPLE,

	.max_num_groups = 0,    /* default num of groups */

	.flags = MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT | MLX5_FLOW_TABLE_TUNNEL_EN_DECAP,

	.flags = 0,

};



struct mlx5e_tc_psample {