Commit bdc454fc authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mlx5-fixes-2023-11-13-manual' 

Saeed Mahameed says:

====================
This series provides bug fixes to mlx5 driver.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a6a6a0a9 1b2bd0c0

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

+16 −4
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ static void mlx5e_ptpsq_mark_ts_cqes_undelivered(struct mlx5e_ptpsq *ptpsq, 


static void mlx5e_ptp_handle_ts_cqe(struct mlx5e_ptpsq *ptpsq,

				    struct mlx5_cqe64 *cqe,

				    u8 *md_buff,

				    u8 *md_buff_sz,

				    int budget)

{

	struct mlx5e_ptp_port_ts_cqe_list *pending_cqe_list = ptpsq->ts_cqe_pending_list;
@@ -211,19 +213,24 @@ static void mlx5e_ptp_handle_ts_cqe(struct mlx5e_ptpsq *ptpsq, 
	mlx5e_ptpsq_mark_ts_cqes_undelivered(ptpsq, hwtstamp);

out:

	napi_consume_skb(skb, budget);

	mlx5e_ptp_metadata_fifo_push(&ptpsq->metadata_freelist, metadata_id);

	md_buff[*md_buff_sz++] = metadata_id;

	if (unlikely(mlx5e_ptp_metadata_map_unhealthy(&ptpsq->metadata_map)) &&

	    !test_and_set_bit(MLX5E_SQ_STATE_RECOVERING, &sq->state))

		queue_work(ptpsq->txqsq.priv->wq, &ptpsq->report_unhealthy_work);

}



static bool mlx5e_ptp_poll_ts_cq(struct mlx5e_cq *cq, int budget)

static bool mlx5e_ptp_poll_ts_cq(struct mlx5e_cq *cq, int napi_budget)

{

	struct mlx5e_ptpsq *ptpsq = container_of(cq, struct mlx5e_ptpsq, ts_cq);

	struct mlx5_cqwq *cqwq = &cq->wq;

	int budget = min(napi_budget, MLX5E_TX_CQ_POLL_BUDGET);

	u8 metadata_buff[MLX5E_TX_CQ_POLL_BUDGET];

	u8 metadata_buff_sz = 0;

	struct mlx5_cqwq *cqwq;

	struct mlx5_cqe64 *cqe;

	int work_done = 0;



	cqwq = &cq->wq;



	if (unlikely(!test_bit(MLX5E_SQ_STATE_ENABLED, &ptpsq->txqsq.state)))

		return false;
@@ -234,7 +241,8 @@ static bool mlx5e_ptp_poll_ts_cq(struct mlx5e_cq *cq, int budget) 
	do {

		mlx5_cqwq_pop(cqwq);



		mlx5e_ptp_handle_ts_cqe(ptpsq, cqe, budget);

		mlx5e_ptp_handle_ts_cqe(ptpsq, cqe,

					metadata_buff, &metadata_buff_sz, napi_budget);

	} while ((++work_done < budget) && (cqe = mlx5_cqwq_get_cqe(cqwq)));



	mlx5_cqwq_update_db_record(cqwq);
@@ -242,6 +250,10 @@ static bool mlx5e_ptp_poll_ts_cq(struct mlx5e_cq *cq, int budget) 
	/* ensure cq space is freed before enabling more cqes */

	wmb();



	while (metadata_buff_sz > 0)

		mlx5e_ptp_metadata_fifo_push(&ptpsq->metadata_freelist,

					     metadata_buff[--metadata_buff_sz]);



	mlx5e_txqsq_wake(&ptpsq->txqsq);



	return work_done == budget;

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

+2 −2
Original line number Diff line number Diff line
@@ -492,11 +492,11 @@ static int mlx5e_rx_reporter_dump(struct devlink_health_reporter *reporter, 


void mlx5e_reporter_rx_timeout(struct mlx5e_rq *rq)

{

	char icosq_str[MLX5E_REPORTER_PER_Q_MAX_LEN] = {};

	char err_str[MLX5E_REPORTER_PER_Q_MAX_LEN];

	struct mlx5e_icosq *icosq = rq->icosq;

	struct mlx5e_priv *priv = rq->priv;

	struct mlx5e_err_ctx err_ctx = {};

	char icosq_str[32] = {};



	err_ctx.ctx = rq;

	err_ctx.recover = mlx5e_rx_reporter_timeout_recover;

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

+14 −16
Original line number Diff line number Diff line
@@ -300,9 +300,6 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv, 
	if (err)

		goto destroy_neigh_entry;



	e->encap_size = ipv4_encap_size;

	e->encap_header = encap_header;



	if (!(nud_state & NUD_VALID)) {

		neigh_event_send(attr.n, NULL);

		/* the encap entry will be made valid on neigh update event
@@ -322,6 +319,8 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv, 
		goto destroy_neigh_entry;

	}



	e->encap_size = ipv4_encap_size;

	e->encap_header = encap_header;

	e->flags |= MLX5_ENCAP_ENTRY_VALID;

	mlx5e_rep_queue_neigh_stats_work(netdev_priv(attr.out_dev));

	mlx5e_route_lookup_ipv4_put(&attr);
@@ -404,16 +403,12 @@ int mlx5e_tc_tun_update_header_ipv4(struct mlx5e_priv *priv, 
	if (err)

		goto free_encap;



	e->encap_size = ipv4_encap_size;

	kfree(e->encap_header);

	e->encap_header = encap_header;



	if (!(nud_state & NUD_VALID)) {

		neigh_event_send(attr.n, NULL);

		/* the encap entry will be made valid on neigh update event

		 * and not used before that.

		 */

		goto release_neigh;

		goto free_encap;

	}



	memset(&reformat_params, 0, sizeof(reformat_params));
@@ -427,6 +422,10 @@ int mlx5e_tc_tun_update_header_ipv4(struct mlx5e_priv *priv, 
		goto free_encap;

	}



	e->encap_size = ipv4_encap_size;

	kfree(e->encap_header);

	e->encap_header = encap_header;



	e->flags |= MLX5_ENCAP_ENTRY_VALID;

	mlx5e_rep_queue_neigh_stats_work(netdev_priv(attr.out_dev));

	mlx5e_route_lookup_ipv4_put(&attr);
@@ -568,9 +567,6 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, 
	if (err)

		goto destroy_neigh_entry;



	e->encap_size = ipv6_encap_size;

	e->encap_header = encap_header;



	if (!(nud_state & NUD_VALID)) {

		neigh_event_send(attr.n, NULL);

		/* the encap entry will be made valid on neigh update event
@@ -590,6 +586,8 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, 
		goto destroy_neigh_entry;

	}



	e->encap_size = ipv6_encap_size;

	e->encap_header = encap_header;

	e->flags |= MLX5_ENCAP_ENTRY_VALID;

	mlx5e_rep_queue_neigh_stats_work(netdev_priv(attr.out_dev));

	mlx5e_route_lookup_ipv6_put(&attr);
@@ -671,16 +669,12 @@ int mlx5e_tc_tun_update_header_ipv6(struct mlx5e_priv *priv, 
	if (err)

		goto free_encap;



	e->encap_size = ipv6_encap_size;

	kfree(e->encap_header);

	e->encap_header = encap_header;



	if (!(nud_state & NUD_VALID)) {

		neigh_event_send(attr.n, NULL);

		/* the encap entry will be made valid on neigh update event

		 * and not used before that.

		 */

		goto release_neigh;

		goto free_encap;

	}



	memset(&reformat_params, 0, sizeof(reformat_params));
@@ -694,6 +688,10 @@ int mlx5e_tc_tun_update_header_ipv6(struct mlx5e_priv *priv, 
		goto free_encap;

	}



	e->encap_size = ipv6_encap_size;

	kfree(e->encap_header);

	e->encap_header = encap_header;



	e->flags |= MLX5_ENCAP_ENTRY_VALID;

	mlx5e_rep_queue_neigh_stats_work(netdev_priv(attr.out_dev));

	mlx5e_route_lookup_ipv6_put(&attr);

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

+9 −4
Original line number Diff line number Diff line
@@ -43,12 +43,17 @@ void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv, 
			       struct ethtool_drvinfo *drvinfo)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	int count;



	strscpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));

	count = snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),

			 "%d.%d.%04d (%.16s)", fw_rev_maj(mdev),

			 fw_rev_min(mdev), fw_rev_sub(mdev), mdev->board_id);

	if (count == sizeof(drvinfo->fw_version))

		snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),

		 "%d.%d.%04d (%.16s)",

		 fw_rev_maj(mdev), fw_rev_min(mdev), fw_rev_sub(mdev),

		 mdev->board_id);

			 "%d.%d.%04d", fw_rev_maj(mdev),

			 fw_rev_min(mdev), fw_rev_sub(mdev));



	strscpy(drvinfo->bus_info, dev_name(mdev->device),

		sizeof(drvinfo->bus_info));

}

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

+8 −4
Original line number Diff line number Diff line
@@ -71,13 +71,17 @@ static void mlx5e_rep_get_drvinfo(struct net_device *dev, 
{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5_core_dev *mdev = priv->mdev;

	int count;



	strscpy(drvinfo->driver, mlx5e_rep_driver_name,

		sizeof(drvinfo->driver));

	count = snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),

			 "%d.%d.%04d (%.16s)", fw_rev_maj(mdev),

			 fw_rev_min(mdev), fw_rev_sub(mdev), mdev->board_id);

	if (count == sizeof(drvinfo->fw_version))

		snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),

		 "%d.%d.%04d (%.16s)",

		 fw_rev_maj(mdev), fw_rev_min(mdev),

		 fw_rev_sub(mdev), mdev->board_id);

			 "%d.%d.%04d", fw_rev_maj(mdev),

			 fw_rev_min(mdev), fw_rev_sub(mdev));

}



static const struct counter_desc sw_rep_stats_desc[] = {