Commit 4863b57b authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Saeed Mahameed says:

====================
mlx5 fixes 2023-07-05

This series provides bug fixes to mlx5 driver.

* tag 'mlx5-fixes-2023-07-05' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5e: RX, Fix page_pool page fragment tracking for XDP
  net/mlx5: Query hca_cap_2 only when supported
  net/mlx5e: TC, CT: Offload ct clear only once
  net/mlx5e: Check for NOT_READY flag state after locking
  net/mlx5: Register a unique thermal zone per device
  net/mlx5e: RX, Fix flush and close release flow of regular rq for legacy rq
  net/mlx5e: fix memory leak in mlx5e_ptp_open
  net/mlx5e: fix memory leak in mlx5e_fs_tt_redirect_any_create
  net/mlx5e: fix double free in mlx5e_destroy_flow_table
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0323bce5 7abd955a

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

+3 −3
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ int mlx5e_fs_tt_redirect_any_create(struct mlx5e_flow_steering *fs) 


	err = fs_any_create_table(fs);

	if (err)

		return err;

		goto err_free_any;



	err = fs_any_enable(fs);

	if (err)
@@ -606,8 +606,8 @@ int mlx5e_fs_tt_redirect_any_create(struct mlx5e_flow_steering *fs) 


err_destroy_table:

	fs_any_destroy_table(fs_any);



	kfree(fs_any);

err_free_any:

	mlx5e_fs_set_any(fs, NULL);

	kfree(fs_any);

	return err;

}

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

+4 −2
Original line number Diff line number Diff line
@@ -729,8 +729,10 @@ int mlx5e_ptp_open(struct mlx5e_priv *priv, struct mlx5e_params *params, 


	c = kvzalloc_node(sizeof(*c), GFP_KERNEL, dev_to_node(mlx5_core_dma_dev(mdev)));

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

	if (!c || !cparams)

		return -ENOMEM;

	if (!c || !cparams) {

		err = -ENOMEM;

		goto err_free;

	}



	c->priv     = priv;

	c->mdev     = priv->mdev;

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

+11 −3
Original line number Diff line number Diff line
@@ -1545,6 +1545,7 @@ mlx5_tc_ct_parse_action(struct mlx5_tc_ct_priv *priv, 


	attr->ct_attr.ct_action |= act->ct.action; /* So we can have clear + ct */

	attr->ct_attr.zone = act->ct.zone;

	if (!(act->ct.action & TCA_CT_ACT_CLEAR))

		attr->ct_attr.nf_ft = act->ct.flow_table;

	attr->ct_attr.act_miss_cookie = act->miss_cookie;
@@ -1990,6 +1991,9 @@ mlx5_tc_ct_flow_offload(struct mlx5_tc_ct_priv *priv, struct mlx5_flow_attr *att 
	if (!priv)

		return -EOPNOTSUPP;



	if (attr->ct_attr.offloaded)

		return 0;



	if (attr->ct_attr.ct_action & TCA_CT_ACT_CLEAR) {

		err = mlx5_tc_ct_entry_set_registers(priv, &attr->parse_attr->mod_hdr_acts,

						     0, 0, 0, 0);
@@ -1999,11 +2003,15 @@ mlx5_tc_ct_flow_offload(struct mlx5_tc_ct_priv *priv, struct mlx5_flow_attr *att 
		attr->action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;

	}



	if (!attr->ct_attr.nf_ft) /* means only ct clear action, and not ct_clear,ct() */

	if (!attr->ct_attr.nf_ft) { /* means only ct clear action, and not ct_clear,ct() */

		attr->ct_attr.offloaded = true;

		return 0;

	}



	mutex_lock(&priv->control_lock);

	err = __mlx5_tc_ct_flow_offload(priv, attr);

	if (!err)

		attr->ct_attr.offloaded = true;

	mutex_unlock(&priv->control_lock);



	return err;
@@ -2021,7 +2029,7 @@ void 
mlx5_tc_ct_delete_flow(struct mlx5_tc_ct_priv *priv,

		       struct mlx5_flow_attr *attr)

{

	if (!attr->ct_attr.ft) /* no ct action, return */

	if (!attr->ct_attr.offloaded) /* no ct action, return */

		return;

	if (!attr->ct_attr.nf_ft) /* means only ct clear action, and not ct_clear,ct() */

		return;

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

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ struct mlx5_ct_attr { 
	u32 ct_labels_id;

	u32 act_miss_mapping;

	u64 act_miss_cookie;

	bool offloaded;

	struct mlx5_ct_ft *ft;

};

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

+1 −2
Original line number Diff line number Diff line
@@ -662,8 +662,7 @@ static void mlx5e_free_xdpsq_desc(struct mlx5e_xdpsq *sq, 
				/* No need to check ((page->pp_magic & ~0x3UL) == PP_SIGNATURE)

				 * as we know this is a page_pool page.

				 */

				page_pool_put_defragged_page(page->pp,

							     page, -1, true);

				page_pool_recycle_direct(page->pp, page);

			} while (++n < num);



			break;