Commit 0dbcac3a authored by David S. Miller's avatar David S. Miller
Browse files

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



Saeed Mahameed says:

====================
mlx5-fixes-2023-06-16

This series provides bug fixes to mlx5 driver.
Please pull and let me know if there is any problem.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 92717c23 a128f9d4

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

+6 −2
Original line number Diff line number Diff line
@@ -732,7 +732,8 @@ static void mlx5e_rx_compute_wqe_bulk_params(struct mlx5e_params *params, 
static int mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev,

				     struct mlx5e_params *params,

				     struct mlx5e_xsk_param *xsk,

				     struct mlx5e_rq_frags_info *info)

				     struct mlx5e_rq_frags_info *info,

				     u32 *xdp_frag_size)

{

	u32 byte_count = MLX5E_SW2HW_MTU(params, params->sw_mtu);

	int frag_size_max = DEFAULT_FRAG_SIZE;
@@ -845,6 +846,8 @@ static int mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev, 


	info->log_num_frags = order_base_2(info->num_frags);



	*xdp_frag_size = info->num_frags > 1 && params->xdp_prog ? PAGE_SIZE : 0;



	return 0;

}
@@ -989,7 +992,8 @@ int mlx5e_build_rq_param(struct mlx5_core_dev *mdev, 
	}

	default: /* MLX5_WQ_TYPE_CYCLIC */

		MLX5_SET(wq, wq, log_wq_sz, params->log_rq_mtu_frames);

		err = mlx5e_build_rq_frags_info(mdev, params, xsk, &param->frags_info);

		err = mlx5e_build_rq_frags_info(mdev, params, xsk, &param->frags_info,

						&param->xdp_frag_size);

		if (err)

			return err;

		ndsegs = param->frags_info.num_frags;

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

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ struct mlx5e_rq_param { 
	u32                        rqc[MLX5_ST_SZ_DW(rqc)];

	struct mlx5_wq_param       wq;

	struct mlx5e_rq_frags_info frags_info;

	u32                        xdp_frag_size;

};



struct mlx5e_sq_param {

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

+2 −0
Original line number Diff line number Diff line
@@ -2021,6 +2021,8 @@ 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 */

		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/xsk/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int mlx5e_init_xsk_rq(struct mlx5e_channel *c, 
	if (err)

		return err;



	return  xdp_rxq_info_reg(&rq->xdp_rxq, rq->netdev, rq_xdp_ix, 0);

	return xdp_rxq_info_reg(&rq->xdp_rxq, rq->netdev, rq_xdp_ix, c->napi.napi_id);

}



static int mlx5e_open_xsk_rq(struct mlx5e_channel *c, struct mlx5e_params *params,

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c

+16 −6
Original line number Diff line number Diff line
@@ -61,16 +61,19 @@ static void mlx5e_ipsec_handle_tx_limit(struct work_struct *_work) 
	struct mlx5e_ipsec_sa_entry *sa_entry = dwork->sa_entry;

	struct xfrm_state *x = sa_entry->x;



	spin_lock(&x->lock);

	if (sa_entry->attrs.drop)

		return;



	spin_lock_bh(&x->lock);

	xfrm_state_check_expire(x);

	if (x->km.state == XFRM_STATE_EXPIRED) {

		sa_entry->attrs.drop = true;

		mlx5e_accel_ipsec_fs_modify(sa_entry);

	}

	spin_unlock(&x->lock);

		spin_unlock_bh(&x->lock);



	if (sa_entry->attrs.drop)

		mlx5e_accel_ipsec_fs_modify(sa_entry);

		return;

	}

	spin_unlock_bh(&x->lock);



	queue_delayed_work(sa_entry->ipsec->wq, &dwork->dwork,

			   MLX5_IPSEC_RESCHED);
@@ -1040,11 +1043,17 @@ static int mlx5e_xfrm_add_policy(struct xfrm_policy *x, 
	return err;

}



static void mlx5e_xfrm_free_policy(struct xfrm_policy *x)

static void mlx5e_xfrm_del_policy(struct xfrm_policy *x)

{

	struct mlx5e_ipsec_pol_entry *pol_entry = to_ipsec_pol_entry(x);



	mlx5e_accel_ipsec_fs_del_pol(pol_entry);

}



static void mlx5e_xfrm_free_policy(struct xfrm_policy *x)

{

	struct mlx5e_ipsec_pol_entry *pol_entry = to_ipsec_pol_entry(x);



	kfree(pol_entry);

}
@@ -1065,6 +1074,7 @@ static const struct xfrmdev_ops mlx5e_ipsec_packet_xfrmdev_ops = { 


	.xdo_dev_state_update_curlft = mlx5e_xfrm_update_curlft,

	.xdo_dev_policy_add = mlx5e_xfrm_add_policy,

	.xdo_dev_policy_delete = mlx5e_xfrm_del_policy,

	.xdo_dev_policy_free = mlx5e_xfrm_free_policy,

};