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

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

Saeed Mahameed says:

====================
mlx5 fixes 2022-05-31

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

* tag 'mlx5-fixes-2022-05-31' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5: Fix mlx5_get_next_dev() peer device matching
  net/mlx5e: Update netdev features after changing XDP state
  net/mlx5: correct ECE offset in query qp output
  net/mlx5e: Disable softirq in mlx5e_activate_rq to avoid race condition
  net/mlx5: CT: Fix header-rewrite re-use for tupels
  net/mlx5e: TC NIC mode, fix tc chains miss table
  net/mlx5: Don't use already freed action pointer
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 11049c9e 1c5de097

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

+23 −11
Original line number Diff line number Diff line
@@ -571,18 +571,32 @@ static int _next_phys_dev(struct mlx5_core_dev *mdev, 
	return 1;

}



static void *pci_get_other_drvdata(struct device *this, struct device *other)

{

	if (this->driver != other->driver)

		return NULL;



	return pci_get_drvdata(to_pci_dev(other));

}



static int next_phys_dev(struct device *dev, const void *data)

{

	struct mlx5_adev *madev = container_of(dev, struct mlx5_adev, adev.dev);

	struct mlx5_core_dev *mdev = madev->mdev;

	struct mlx5_core_dev *mdev, *this = (struct mlx5_core_dev *)data;



	mdev = pci_get_other_drvdata(this->device, dev);

	if (!mdev)

		return 0;



	return _next_phys_dev(mdev, data);

}



static int next_phys_dev_lag(struct device *dev, const void *data)

{

	struct mlx5_adev *madev = container_of(dev, struct mlx5_adev, adev.dev);

	struct mlx5_core_dev *mdev = madev->mdev;

	struct mlx5_core_dev *mdev, *this = (struct mlx5_core_dev *)data;



	mdev = pci_get_other_drvdata(this->device, dev);

	if (!mdev)

		return 0;



	if (!MLX5_CAP_GEN(mdev, vport_group_manager) ||

	    !MLX5_CAP_GEN(mdev, lag_master) ||
@@ -596,19 +610,17 @@ static int next_phys_dev_lag(struct device *dev, const void *data) 
static struct mlx5_core_dev *mlx5_get_next_dev(struct mlx5_core_dev *dev,

					       int (*match)(struct device *dev, const void *data))

{

	struct auxiliary_device *adev;

	struct mlx5_adev *madev;

	struct device *next;



	if (!mlx5_core_is_pf(dev))

		return NULL;



	adev = auxiliary_find_device(NULL, dev, match);

	if (!adev)

	next = bus_find_device(&pci_bus_type, NULL, dev, match);

	if (!next)

		return NULL;



	madev = container_of(adev, struct mlx5_adev, adev);

	put_device(&adev->dev);

	return madev->mdev;

	put_device(next);

	return pci_get_drvdata(to_pci_dev(next));

}



/* Must be called with intf_mutex held */

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

+4 −0
Original line number Diff line number Diff line
@@ -764,6 +764,7 @@ struct mlx5e_rq { 
	u8                     wq_type;

	u32                    rqn;

	struct mlx5_core_dev  *mdev;

	struct mlx5e_channel  *channel;

	u32  umr_mkey;

	struct mlx5e_dma_info  wqe_overflow;
@@ -1076,6 +1077,9 @@ void mlx5e_close_cq(struct mlx5e_cq *cq); 
int mlx5e_open_locked(struct net_device *netdev);

int mlx5e_close_locked(struct net_device *netdev);



void mlx5e_trigger_napi_icosq(struct mlx5e_channel *c);

void mlx5e_trigger_napi_sched(struct napi_struct *napi);



int mlx5e_open_channels(struct mlx5e_priv *priv,

			struct mlx5e_channels *chs);

void mlx5e_close_channels(struct mlx5e_channels *chs);

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

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ struct mlx5e_post_act; 
enum {

	MLX5E_TC_FT_LEVEL = 0,

	MLX5E_TC_TTC_FT_LEVEL,

	MLX5E_TC_MISS_LEVEL,

};



struct mlx5e_tc_table {
@@ -20,6 +21,7 @@ struct mlx5e_tc_table { 
	 */

	struct mutex			t_lock;

	struct mlx5_flow_table		*t;

	struct mlx5_flow_table		*miss_t;

	struct mlx5_fs_chains           *chains;

	struct mlx5e_post_act		*post_act;

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

+1 −0
Original line number Diff line number Diff line
@@ -736,6 +736,7 @@ void mlx5e_ptp_activate_channel(struct mlx5e_ptp *c) 
	if (test_bit(MLX5E_PTP_STATE_RX, c->state)) {

		mlx5e_ptp_rx_set_fs(c->priv);

		mlx5e_activate_rq(&c->rq);

		mlx5e_trigger_napi_sched(&c->napi);

	}

}

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

+6 −0
Original line number Diff line number Diff line
@@ -123,6 +123,8 @@ static int mlx5e_rx_reporter_err_icosq_cqe_recover(void *ctx) 
		xskrq->stats->recover++;

	}



	mlx5e_trigger_napi_icosq(icosq->channel);



	mutex_unlock(&icosq->channel->icosq_recovery_lock);



	return 0;
@@ -166,6 +168,10 @@ static int mlx5e_rx_reporter_err_rq_cqe_recover(void *ctx) 
	clear_bit(MLX5E_RQ_STATE_RECOVERING, &rq->state);

	mlx5e_activate_rq(rq);

	rq->stats->recover++;

	if (rq->channel)

		mlx5e_trigger_napi_icosq(rq->channel);

	else

		mlx5e_trigger_napi_sched(rq->cq.napi);

	return 0;

out:

	clear_bit(MLX5E_RQ_STATE_RECOVERING, &rq->state);