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

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



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2020-02-06

This series introduces some fixes to mlx5 driver.

Please pull and let me know if there is any problem.

For -stable v4.19:
 ('net/mlx5: IPsec, Fix esp modify function attribute')
 ('net/mlx5: IPsec, fix memory leak at mlx5_fpga_ipsec_delete_sa_ctx')

For -stable v5.4:
   ('net/mlx5: Deprecate usage of generic TLS HW capability bit')
   ('net/mlx5: Fix deadlock in fs_core')

For -stable v5.5:
   ('net/mlx5e: TX, Error completion is for last WQE in batch')
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 263a425a 61c00cca

drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ void mlx5_ktls_destroy_key(struct mlx5_core_dev *mdev, u32 key_id); 


static inline bool mlx5_accel_is_ktls_device(struct mlx5_core_dev *mdev)

{

	if (!MLX5_CAP_GEN(mdev, tls))

	if (!MLX5_CAP_GEN(mdev, tls_tx))

		return false;



	if (!MLX5_CAP_GEN(mdev, log_max_dek))

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

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ struct sk_buff *mlx5e_tls_handle_tx_skb(struct net_device *netdev, 
	int datalen;

	u32 skb_seq;



	if (MLX5_CAP_GEN(sq->channel->mdev, tls)) {

	if (MLX5_CAP_GEN(sq->channel->mdev, tls_tx)) {

		skb = mlx5e_ktls_handle_tx_skb(netdev, sq, skb, wqe, pi);

		goto out;

	}

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

+9 −7
Original line number Diff line number Diff line
@@ -613,13 +613,6 @@ void mlx5e_poll_ico_cq(struct mlx5e_cq *cq) 


		wqe_counter = be16_to_cpu(cqe->wqe_counter);



		if (unlikely(get_cqe_opcode(cqe) != MLX5_CQE_REQ)) {

			netdev_WARN_ONCE(cq->channel->netdev,

					 "Bad OP in ICOSQ CQE: 0x%x\n", get_cqe_opcode(cqe));

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

				queue_work(cq->channel->priv->wq, &sq->recover_work);

			break;

		}

		do {

			struct mlx5e_sq_wqe_info *wi;

			u16 ci;
@@ -629,6 +622,15 @@ void mlx5e_poll_ico_cq(struct mlx5e_cq *cq) 
			ci = mlx5_wq_cyc_ctr2ix(&sq->wq, sqcc);

			wi = &sq->db.ico_wqe[ci];



			if (last_wqe && unlikely(get_cqe_opcode(cqe) != MLX5_CQE_REQ)) {

				netdev_WARN_ONCE(cq->channel->netdev,

						 "Bad OP in ICOSQ CQE: 0x%x\n",

						 get_cqe_opcode(cqe));

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

					queue_work(cq->channel->priv->wq, &sq->recover_work);

				break;

			}



			if (likely(wi->opcode == MLX5_OPCODE_UMR)) {

				sqcc += MLX5E_UMR_WQEBBS;

				wi->umr.rq->mpwqe.umr_completed++;

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

+14 −19
Original line number Diff line number Diff line
@@ -451,34 +451,17 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget) 


	i = 0;

	do {

		struct mlx5e_tx_wqe_info *wi;

		u16 wqe_counter;

		bool last_wqe;

		u16 ci;



		mlx5_cqwq_pop(&cq->wq);



		wqe_counter = be16_to_cpu(cqe->wqe_counter);



		if (unlikely(get_cqe_opcode(cqe) == MLX5_CQE_REQ_ERR)) {

			if (!test_and_set_bit(MLX5E_SQ_STATE_RECOVERING,

					      &sq->state)) {

				struct mlx5e_tx_wqe_info *wi;

				u16 ci;



				ci = mlx5_wq_cyc_ctr2ix(&sq->wq, sqcc);

				wi = &sq->db.wqe_info[ci];

				mlx5e_dump_error_cqe(sq,

						     (struct mlx5_err_cqe *)cqe);

				mlx5_wq_cyc_wqe_dump(&sq->wq, ci, wi->num_wqebbs);

				queue_work(cq->channel->priv->wq,

					   &sq->recover_work);

			}

			stats->cqe_err++;

		}



		do {

			struct mlx5e_tx_wqe_info *wi;

			struct sk_buff *skb;

			u16 ci;

			int j;



			last_wqe = (sqcc == wqe_counter);
@@ -516,6 +499,18 @@ bool mlx5e_poll_tx_cq(struct mlx5e_cq *cq, int napi_budget) 
			napi_consume_skb(skb, napi_budget);

		} while (!last_wqe);



		if (unlikely(get_cqe_opcode(cqe) == MLX5_CQE_REQ_ERR)) {

			if (!test_and_set_bit(MLX5E_SQ_STATE_RECOVERING,

					      &sq->state)) {

				mlx5e_dump_error_cqe(sq,

						     (struct mlx5_err_cqe *)cqe);

				mlx5_wq_cyc_wqe_dump(&sq->wq, ci, wi->num_wqebbs);

				queue_work(cq->channel->priv->wq,

					   &sq->recover_work);

			}

			stats->cqe_err++;

		}



	} while ((++i < MLX5E_TX_CQ_POLL_BUDGET) && (cqe = mlx5_cqwq_get_cqe(&cq->wq)));



	stats->cqes += i;

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

+2 −1
Original line number Diff line number Diff line
@@ -850,6 +850,7 @@ void mlx5_fpga_ipsec_delete_sa_ctx(void *context) 
	mutex_lock(&fpga_xfrm->lock);

	if (!--fpga_xfrm->num_rules) {

		mlx5_fpga_ipsec_release_sa_ctx(fpga_xfrm->sa_ctx);

		kfree(fpga_xfrm->sa_ctx);

		fpga_xfrm->sa_ctx = NULL;

	}

	mutex_unlock(&fpga_xfrm->lock);
@@ -1478,7 +1479,7 @@ int mlx5_fpga_esp_modify_xfrm(struct mlx5_accel_esp_xfrm *xfrm, 
	if (!memcmp(&xfrm->attrs, attrs, sizeof(xfrm->attrs)))

		return 0;



	if (!mlx5_fpga_esp_validate_xfrm_attrs(mdev, attrs)) {

	if (mlx5_fpga_esp_validate_xfrm_attrs(mdev, attrs)) {

		mlx5_core_warn(mdev, "Tried to create an esp with unsupported attrs\n");

		return -EOPNOTSUPP;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE