Commit 006e8964 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mlx5-updates-2024-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 

Saeed Mahameed says:

====================
mlx5-updates-2024-02-01

1) IPSec global stats for xfrm and mlx5
2) XSK memory improvements for non-linear SKBs
3) Software steering debug dump to use seq_file ops
4) Various code clean-ups

* tag 'mlx5-updates-2024-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5e: XDP, Exclude headroom and tailroom from memory calculations
  net/mlx5e: XSK, Exclude tailroom from non-linear SKBs memory calculations
  net/mlx5: DR, Change SWS usage to debug fs seq_file interface
  net/mlx5: Change missing SyncE capability print to debug
  net/mlx5: Remove initial segmentation duplicate definitions
  net/mlx5: Return specific error code for timeout on wait_fw_init
  net/mlx5: SF, Stop waiting for FW as teardown was called
  net/mlx5: remove fw reporter dump option for non PF
  net/mlx5: remove fw_fatal reporter dump option for non PF
  net/mlx5: Rename mlx5_sf_dev_remove
  Documentation: Fix counter name of mlx5 vnic reporter
  net/mlx5e: Delete obsolete IPsec code
  net/mlx5e: Connect mlx5 IPsec statistics with XFRM core
  xfrm: get global statistics from the offloaded device
  xfrm: generalize xdo_dev_state_update_curlft to allow statistics update
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 313fb184 a90f5591

Documentation/networking/devlink/mlx5.rst

+3 −2
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ them in realtime. 


Description of the vnic counters:



- total_q_under_processor_handle

- total_error_queues

        number of queues in an error state due to

        an async error or errored command.

- send_queue_priority_update_flow
@@ -259,7 +259,8 @@ Description of the vnic counters: 
        number of times CQ entered an error state due to an overflow.

- async_eq_overrun

        number of times an EQ mapped to async events was overrun.

        comp_eq_overrun number of times an EQ mapped to completion events was

- comp_eq_overrun

        number of times an EQ mapped to completion events was

        overrun.

- quota_exceeded_command

        number of commands issued and failed due to quota exceeded.

Documentation/networking/xfrm_device.rst

+2 −2
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ Callbacks to implement 
	bool	(*xdo_dev_offload_ok) (struct sk_buff *skb,

				       struct xfrm_state *x);

	void    (*xdo_dev_state_advance_esn) (struct xfrm_state *x);

	void    (*xdo_dev_state_update_stats) (struct xfrm_state *x);



        /* Solely packet offload callbacks */

	void    (*xdo_dev_state_update_curlft) (struct xfrm_state *x);

	int	(*xdo_dev_policy_add) (struct xfrm_policy *x, struct netlink_ext_ack *extack);

	void	(*xdo_dev_policy_delete) (struct xfrm_policy *x);

	void	(*xdo_dev_policy_free) (struct xfrm_policy *x);
@@ -191,6 +191,6 @@ xdo_dev_policy_free() on any remaining offloaded states. 


Outcome of HW handling packets, the XFRM core can't count hard, soft limits.

The HW/driver are responsible to perform it and provide accurate data when

xdo_dev_state_update_curlft() is called. In case of one of these limits

xdo_dev_state_update_stats() is called. In case of one of these limits

occuried, the driver needs to call to xfrm_state_check_expire() to make sure

that XFRM performs rekeying sequence.

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

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static bool is_dpll_supported(struct mlx5_core_dev *dev) 
		return false;



	if (!MLX5_CAP_MCAM_REG2(dev, synce_registers)) {

		mlx5_core_warn(dev, "Missing SyncE capability\n");

		mlx5_core_dbg(dev, "Missing SyncE capability\n");

		return false;

	}

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

+19 −5
Original line number Diff line number Diff line
@@ -240,11 +240,14 @@ static u32 mlx5e_rx_get_linear_sz_xsk(struct mlx5e_params *params, 
	return xsk->headroom + hw_mtu;

}



static u32 mlx5e_rx_get_linear_sz_skb(struct mlx5e_params *params, bool xsk)

static u32 mlx5e_rx_get_linear_sz_skb(struct mlx5e_params *params, bool no_head_tail_room)

{

	/* SKBs built on XDP_PASS on XSK RQs don't have headroom. */

	u16 headroom = xsk ? 0 : mlx5e_get_linear_rq_headroom(params, NULL);

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

	u16 headroom;



	if (no_head_tail_room)

		return SKB_DATA_ALIGN(hw_mtu);

	headroom = mlx5e_get_linear_rq_headroom(params, NULL);



	return MLX5_SKB_FRAG_SZ(headroom + hw_mtu);

}
@@ -254,6 +257,7 @@ static u32 mlx5e_rx_get_linear_stride_sz(struct mlx5_core_dev *mdev, 
					 struct mlx5e_xsk_param *xsk,

					 bool mpwqe)

{

	bool no_head_tail_room;

	u32 sz;



	/* XSK frames are mapped as individual pages, because frames may come in
@@ -262,7 +266,13 @@ static u32 mlx5e_rx_get_linear_stride_sz(struct mlx5_core_dev *mdev, 
	if (xsk)

		return mpwqe ? 1 << mlx5e_mpwrq_page_shift(mdev, xsk) : PAGE_SIZE;



	sz = roundup_pow_of_two(mlx5e_rx_get_linear_sz_skb(params, false));

	no_head_tail_room = params->xdp_prog && mpwqe && !mlx5e_rx_is_linear_skb(mdev, params, xsk);



	/* When no_head_tail_room is set, headroom and tailroom are excluded from skb calculations.

	 * no_head_tail_room should be set in the case of XDP with Striding RQ

	 * when SKB is not linear. This is because another page is allocated for the linear part.

	 */

	sz = roundup_pow_of_two(mlx5e_rx_get_linear_sz_skb(params, no_head_tail_room));



	/* XDP in mlx5e doesn't support multiple packets per page.

	 * Do not assume sz <= PAGE_SIZE if params->xdp_prog is set.
@@ -289,7 +299,11 @@ bool mlx5e_rx_is_linear_skb(struct mlx5_core_dev *mdev, 
	if (params->packet_merge.type != MLX5E_PACKET_MERGE_NONE)

		return false;



	/* Both XSK and non-XSK cases allocate an SKB on XDP_PASS. Packet data

	/* Call mlx5e_rx_get_linear_sz_skb with the no_head_tail_room parameter set

	 * to exclude headroom and tailroom from calculations.

	 * no_head_tail_room is true when SKB is built on XDP_PASS on XSK RQs

	 * since packet data buffers don't have headroom and tailroom resreved for the SKB.

	 * Both XSK and non-XSK cases allocate an SKB on XDP_PASS. Packet data

	 * must fit into a CPU page.

	 */

	if (mlx5e_rx_get_linear_sz_skb(params, xsk) > PAGE_SIZE)

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

+23 −3
Original line number Diff line number Diff line
@@ -984,21 +984,41 @@ static void mlx5e_xfrm_advance_esn_state(struct xfrm_state *x) 
	queue_work(sa_entry->ipsec->wq, &work->work);

}



static void mlx5e_xfrm_update_curlft(struct xfrm_state *x)

static void mlx5e_xfrm_update_stats(struct xfrm_state *x)

{

	struct mlx5e_ipsec_sa_entry *sa_entry = to_ipsec_sa_entry(x);

	struct mlx5e_ipsec_rule *ipsec_rule = &sa_entry->ipsec_rule;

	struct net *net = dev_net(x->xso.dev);

	u64 packets, bytes, lastuse;



	lockdep_assert(lockdep_is_held(&x->lock) ||

		       lockdep_is_held(&dev_net(x->xso.real_dev)->xfrm.xfrm_cfg_mutex));

		       lockdep_is_held(&dev_net(x->xso.real_dev)->xfrm.xfrm_cfg_mutex) ||

		       lockdep_is_held(&dev_net(x->xso.real_dev)->xfrm.xfrm_state_lock));



	if (x->xso.flags & XFRM_DEV_OFFLOAD_FLAG_ACQ)

		return;



	if (sa_entry->attrs.dir == XFRM_DEV_OFFLOAD_IN) {

		mlx5_fc_query_cached(ipsec_rule->auth.fc, &bytes, &packets, &lastuse);

		x->stats.integrity_failed += packets;

		XFRM_ADD_STATS(net, LINUX_MIB_XFRMINSTATEPROTOERROR, packets);



		mlx5_fc_query_cached(ipsec_rule->trailer.fc, &bytes, &packets, &lastuse);

		XFRM_ADD_STATS(net, LINUX_MIB_XFRMINHDRERROR, packets);

	}



	if (x->xso.type != XFRM_DEV_OFFLOAD_PACKET)

		return;



	mlx5_fc_query_cached(ipsec_rule->fc, &bytes, &packets, &lastuse);

	x->curlft.packets += packets;

	x->curlft.bytes += bytes;



	if (sa_entry->attrs.dir == XFRM_DEV_OFFLOAD_IN) {

		mlx5_fc_query_cached(ipsec_rule->replay.fc, &bytes, &packets, &lastuse);

		x->stats.replay += packets;

		XFRM_ADD_STATS(net, LINUX_MIB_XFRMINSTATESEQERROR, packets);

	}

}



static int mlx5e_xfrm_validate_policy(struct mlx5_core_dev *mdev,
@@ -1156,7 +1176,7 @@ static const struct xfrmdev_ops mlx5e_ipsec_xfrmdev_ops = { 
	.xdo_dev_offload_ok	= mlx5e_ipsec_offload_ok,

	.xdo_dev_state_advance_esn = mlx5e_xfrm_advance_esn_state,



	.xdo_dev_state_update_curlft = mlx5e_xfrm_update_curlft,

	.xdo_dev_state_update_stats = mlx5e_xfrm_update_stats,

	.xdo_dev_policy_add = mlx5e_xfrm_add_policy,

	.xdo_dev_policy_delete = mlx5e_xfrm_del_policy,

	.xdo_dev_policy_free = mlx5e_xfrm_free_policy,