Commit 943af647 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'mlx5-misc-fixes-2025-10-05' 

Tariq Toukan says:

====================
mlx5 misc fixes 2025-10-05

This patchset provides misc bug fixes from the team to the mlx5 core and
Eth drivers.
====================

Link: https://patch.msgid.link/1759652999-858513-1-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 3d3c4cd5 8e87b3ed

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

+27 −11
Original line number Diff line number Diff line
@@ -772,6 +772,7 @@ static int mlx5e_xfrm_add_state(struct net_device *dev, 
				struct netlink_ext_ack *extack)

{

	struct mlx5e_ipsec_sa_entry *sa_entry = NULL;

	bool allow_tunnel_mode = false;

	struct mlx5e_ipsec *ipsec;

	struct mlx5e_priv *priv;

	gfp_t gfp;
@@ -803,6 +804,20 @@ static int mlx5e_xfrm_add_state(struct net_device *dev, 
		goto err_xfrm;

	}



	if (mlx5_eswitch_block_mode(priv->mdev))

		goto unblock_ipsec;



	if (x->props.mode == XFRM_MODE_TUNNEL &&

	    x->xso.type == XFRM_DEV_OFFLOAD_PACKET) {

		allow_tunnel_mode = mlx5e_ipsec_fs_tunnel_allowed(sa_entry);

		if (!allow_tunnel_mode) {

			NL_SET_ERR_MSG_MOD(extack,

					   "Packet offload tunnel mode is disabled due to encap settings");

			err = -EINVAL;

			goto unblock_mode;

		}

	}



	/* check esn */

	if (x->props.flags & XFRM_STATE_ESN)

		mlx5e_ipsec_update_esn_state(sa_entry);
@@ -817,7 +832,7 @@ static int mlx5e_xfrm_add_state(struct net_device *dev, 


	err = mlx5_ipsec_create_work(sa_entry);

	if (err)

		goto unblock_ipsec;

		goto unblock_encap;



	err = mlx5e_ipsec_create_dwork(sa_entry);

	if (err)
@@ -832,14 +847,6 @@ static int mlx5e_xfrm_add_state(struct net_device *dev, 
	if (err)

		goto err_hw_ctx;



	if (x->props.mode == XFRM_MODE_TUNNEL &&

	    x->xso.type == XFRM_DEV_OFFLOAD_PACKET &&

	    !mlx5e_ipsec_fs_tunnel_enabled(sa_entry)) {

		NL_SET_ERR_MSG_MOD(extack, "Packet offload tunnel mode is disabled due to encap settings");

		err = -EINVAL;

		goto err_add_rule;

	}



	/* We use *_bh() variant because xfrm_timer_handler(), which runs

	 * in softirq context, can reach our state delete logic and we need

	 * xa_erase_bh() there.
@@ -855,8 +862,7 @@ static int mlx5e_xfrm_add_state(struct net_device *dev, 
		queue_delayed_work(ipsec->wq, &sa_entry->dwork->dwork,

				   MLX5_IPSEC_RESCHED);



	if (x->xso.type == XFRM_DEV_OFFLOAD_PACKET &&

	    x->props.mode == XFRM_MODE_TUNNEL) {

	if (allow_tunnel_mode) {

		xa_lock_bh(&ipsec->sadb);

		__xa_set_mark(&ipsec->sadb, sa_entry->ipsec_obj_id,

			      MLX5E_IPSEC_TUNNEL_SA);
@@ -865,6 +871,11 @@ static int mlx5e_xfrm_add_state(struct net_device *dev, 


out:

	x->xso.offload_handle = (unsigned long)sa_entry;

	if (allow_tunnel_mode)

		mlx5_eswitch_unblock_encap(priv->mdev);



	mlx5_eswitch_unblock_mode(priv->mdev);



	return 0;



err_add_rule:
@@ -877,6 +888,11 @@ static int mlx5e_xfrm_add_state(struct net_device *dev, 
	if (sa_entry->work)

		kfree(sa_entry->work->data);

	kfree(sa_entry->work);

unblock_encap:

	if (allow_tunnel_mode)

		mlx5_eswitch_unblock_encap(priv->mdev);

unblock_mode:

	mlx5_eswitch_unblock_mode(priv->mdev);

unblock_ipsec:

	mlx5_eswitch_unblock_ipsec(priv->mdev);

err_xfrm:

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

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ void mlx5e_accel_ipsec_fs_del_rule(struct mlx5e_ipsec_sa_entry *sa_entry); 
int mlx5e_accel_ipsec_fs_add_pol(struct mlx5e_ipsec_pol_entry *pol_entry);

void mlx5e_accel_ipsec_fs_del_pol(struct mlx5e_ipsec_pol_entry *pol_entry);

void mlx5e_accel_ipsec_fs_modify(struct mlx5e_ipsec_sa_entry *sa_entry);

bool mlx5e_ipsec_fs_tunnel_enabled(struct mlx5e_ipsec_sa_entry *sa_entry);

bool mlx5e_ipsec_fs_tunnel_allowed(struct mlx5e_ipsec_sa_entry *sa_entry);



int mlx5_ipsec_create_sa_ctx(struct mlx5e_ipsec_sa_entry *sa_entry);

void mlx5_ipsec_free_sa_ctx(struct mlx5e_ipsec_sa_entry *sa_entry);

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

+21 −11
Original line number Diff line number Diff line
@@ -1069,7 +1069,9 @@ static int rx_create(struct mlx5_core_dev *mdev, struct mlx5e_ipsec *ipsec, 


	/* Create FT */

	if (mlx5_ipsec_device_caps(mdev) & MLX5_IPSEC_CAP_TUNNEL)

		rx->allow_tunnel_mode = mlx5_eswitch_block_encap(mdev);

		rx->allow_tunnel_mode =

			mlx5_eswitch_block_encap(mdev, rx == ipsec->rx_esw);



	if (rx->allow_tunnel_mode)

		flags = MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT;

	ft = ipsec_ft_create(attr.ns, attr.sa_level, attr.prio, 1, 2, flags);
@@ -1310,7 +1312,9 @@ static int tx_create(struct mlx5e_ipsec *ipsec, struct mlx5e_ipsec_tx *tx, 
		goto err_status_rule;



	if (mlx5_ipsec_device_caps(mdev) & MLX5_IPSEC_CAP_TUNNEL)

		tx->allow_tunnel_mode = mlx5_eswitch_block_encap(mdev);

		tx->allow_tunnel_mode =

			mlx5_eswitch_block_encap(mdev, tx == ipsec->tx_esw);



	if (tx->allow_tunnel_mode)

		flags = MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT;

	ft = ipsec_ft_create(tx->ns, attr.sa_level, attr.prio, 1, 4, flags);
@@ -2846,18 +2850,24 @@ void mlx5e_accel_ipsec_fs_modify(struct mlx5e_ipsec_sa_entry *sa_entry) 
	memcpy(sa_entry, &sa_entry_shadow, sizeof(*sa_entry));

}



bool mlx5e_ipsec_fs_tunnel_enabled(struct mlx5e_ipsec_sa_entry *sa_entry)

bool mlx5e_ipsec_fs_tunnel_allowed(struct mlx5e_ipsec_sa_entry *sa_entry)

{

	struct mlx5_accel_esp_xfrm_attrs *attrs = &sa_entry->attrs;

	struct mlx5e_ipsec_rx *rx;

	struct mlx5e_ipsec_tx *tx;

	struct mlx5e_ipsec *ipsec = sa_entry->ipsec;

	struct xfrm_state *x = sa_entry->x;

	bool from_fdb;



	rx = ipsec_rx(sa_entry->ipsec, attrs->addrs.family, attrs->type);

	tx = ipsec_tx(sa_entry->ipsec, attrs->type);

	if (sa_entry->attrs.dir == XFRM_DEV_OFFLOAD_OUT)

		return tx->allow_tunnel_mode;

	if (x->xso.dir == XFRM_DEV_OFFLOAD_OUT) {

		struct mlx5e_ipsec_tx *tx = ipsec_tx(ipsec, x->xso.type);



		from_fdb = (tx == ipsec->tx_esw);

	} else {

		struct mlx5e_ipsec_rx *rx = ipsec_rx(ipsec, x->props.family,

						     x->xso.type);



		from_fdb = (rx == ipsec->rx_esw);

	}



	return rx->allow_tunnel_mode;

	return mlx5_eswitch_block_encap(ipsec->mdev, from_fdb);

}



void mlx5e_ipsec_handle_mpv_event(int event, struct mlx5e_priv *slave_priv,

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

+5 −5
Original line number Diff line number Diff line
@@ -893,27 +893,27 @@ int mlx5e_psp_init(struct mlx5e_priv *priv) 


	if (!mlx5_is_psp_device(mdev)) {

		mlx5_core_dbg(mdev, "PSP offload not supported\n");

		return -EOPNOTSUPP;

		return 0;

	}



	if (!MLX5_CAP_ETH(mdev, swp)) {

		mlx5_core_dbg(mdev, "SWP not supported\n");

		return -EOPNOTSUPP;

		return 0;

	}



	if (!MLX5_CAP_ETH(mdev, swp_csum)) {

		mlx5_core_dbg(mdev, "SWP checksum not supported\n");

		return -EOPNOTSUPP;

		return 0;

	}



	if (!MLX5_CAP_ETH(mdev, swp_csum_l4_partial)) {

		mlx5_core_dbg(mdev, "SWP L4 partial checksum not supported\n");

		return -EOPNOTSUPP;

		return 0;

	}



	if (!MLX5_CAP_ETH(mdev, swp_lso)) {

		mlx5_core_dbg(mdev, "PSP LSO not supported\n");

		return -EOPNOTSUPP;

		return 0;

	}



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

drivers/net/ethernet/mellanox/mlx5/core/eswitch.h

+3 −2
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ void mlx5_eswitch_offloads_single_fdb_del_one(struct mlx5_eswitch *master_esw, 
					      struct mlx5_eswitch *slave_esw);

int mlx5_eswitch_reload_ib_reps(struct mlx5_eswitch *esw);



bool mlx5_eswitch_block_encap(struct mlx5_core_dev *dev);

bool mlx5_eswitch_block_encap(struct mlx5_core_dev *dev, bool from_fdb);

void mlx5_eswitch_unblock_encap(struct mlx5_core_dev *dev);



int mlx5_eswitch_block_mode(struct mlx5_core_dev *dev);
@@ -974,7 +974,8 @@ mlx5_eswitch_reload_ib_reps(struct mlx5_eswitch *esw) 
	return 0;

}



static inline bool mlx5_eswitch_block_encap(struct mlx5_core_dev *dev)

static inline bool

mlx5_eswitch_block_encap(struct mlx5_core_dev *dev, bool from_fdb)

{

	return true;

}