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

Merge tag 'mlx5-fixes-2021-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5 fixes 2021-11-30

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 74b95b07 8c8cf038

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

+1 −1
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_DEALLOC_SF:

	case MLX5_CMD_OP_DESTROY_UCTX:

	case MLX5_CMD_OP_DESTROY_UMEM:

	case MLX5_CMD_OP_MODIFY_RQT:

		return MLX5_CMD_STAT_OK;



	case MLX5_CMD_OP_QUERY_HCA_CAP:
@@ -446,7 +447,6 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_MODIFY_TIS:

	case MLX5_CMD_OP_QUERY_TIS:

	case MLX5_CMD_OP_CREATE_RQT:

	case MLX5_CMD_OP_MODIFY_RQT:

	case MLX5_CMD_OP_QUERY_RQT:



	case MLX5_CMD_OP_CREATE_FLOW_TABLE:

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

+40 −1
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ struct mlx5e_rx_res { 
	unsigned int max_nch;

	u32 drop_rqn;



	struct mlx5e_packet_merge_param pkt_merge_param;

	struct rw_semaphore pkt_merge_param_sem;



	struct mlx5e_rss *rss[MLX5E_MAX_NUM_RSS];

	bool rss_active;

	u32 rss_rqns[MLX5E_INDIR_RQT_SIZE];
@@ -392,6 +395,7 @@ static int mlx5e_rx_res_ptp_init(struct mlx5e_rx_res *res) 
	if (err)

		goto out;



	/* Separated from the channels RQs, does not share pkt_merge state with them */

	mlx5e_tir_builder_build_rqt(builder, res->mdev->mlx5e_res.hw_objs.td.tdn,

				    mlx5e_rqt_get_rqtn(&res->ptp.rqt),

				    inner_ft_support);
@@ -447,6 +451,9 @@ int mlx5e_rx_res_init(struct mlx5e_rx_res *res, struct mlx5_core_dev *mdev, 
	res->max_nch = max_nch;

	res->drop_rqn = drop_rqn;



	res->pkt_merge_param = *init_pkt_merge_param;

	init_rwsem(&res->pkt_merge_param_sem);



	err = mlx5e_rx_res_rss_init_def(res, init_pkt_merge_param, init_nch);

	if (err)

		goto err_out;
@@ -513,7 +520,7 @@ u32 mlx5e_rx_res_get_tirn_ptp(struct mlx5e_rx_res *res) 
	return mlx5e_tir_get_tirn(&res->ptp.tir);

}



u32 mlx5e_rx_res_get_rqtn_direct(struct mlx5e_rx_res *res, unsigned int ix)

static u32 mlx5e_rx_res_get_rqtn_direct(struct mlx5e_rx_res *res, unsigned int ix)

{

	return mlx5e_rqt_get_rqtn(&res->channels[ix].direct_rqt);

}
@@ -656,6 +663,9 @@ int mlx5e_rx_res_packet_merge_set_param(struct mlx5e_rx_res *res, 
	if (!builder)

		return -ENOMEM;



	down_write(&res->pkt_merge_param_sem);

	res->pkt_merge_param = *pkt_merge_param;



	mlx5e_tir_builder_build_packet_merge(builder, pkt_merge_param);



	final_err = 0;
@@ -681,6 +691,7 @@ int mlx5e_rx_res_packet_merge_set_param(struct mlx5e_rx_res *res, 
		}

	}



	up_write(&res->pkt_merge_param_sem);

	mlx5e_tir_builder_free(builder);

	return final_err;

}
@@ -689,3 +700,31 @@ struct mlx5e_rss_params_hash mlx5e_rx_res_get_current_hash(struct mlx5e_rx_res * 
{

	return mlx5e_rss_get_hash(res->rss[0]);

}



int mlx5e_rx_res_tls_tir_create(struct mlx5e_rx_res *res, unsigned int rxq,

				struct mlx5e_tir *tir)

{

	bool inner_ft_support = res->features & MLX5E_RX_RES_FEATURE_INNER_FT;

	struct mlx5e_tir_builder *builder;

	u32 rqtn;

	int err;



	builder = mlx5e_tir_builder_alloc(false);

	if (!builder)

		return -ENOMEM;



	rqtn = mlx5e_rx_res_get_rqtn_direct(res, rxq);



	mlx5e_tir_builder_build_rqt(builder, res->mdev->mlx5e_res.hw_objs.td.tdn, rqtn,

				    inner_ft_support);

	mlx5e_tir_builder_build_direct(builder);

	mlx5e_tir_builder_build_tls(builder);

	down_read(&res->pkt_merge_param_sem);

	mlx5e_tir_builder_build_packet_merge(builder, &res->pkt_merge_param);

	err = mlx5e_tir_init(tir, builder, res->mdev, false);

	up_read(&res->pkt_merge_param_sem);



	mlx5e_tir_builder_free(builder);



	return err;

}

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

+3 −3
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ u32 mlx5e_rx_res_get_tirn_rss(struct mlx5e_rx_res *res, enum mlx5_traffic_types 
u32 mlx5e_rx_res_get_tirn_rss_inner(struct mlx5e_rx_res *res, enum mlx5_traffic_types tt);

u32 mlx5e_rx_res_get_tirn_ptp(struct mlx5e_rx_res *res);



/* RQTN getters for modules that create their own TIRs */

u32 mlx5e_rx_res_get_rqtn_direct(struct mlx5e_rx_res *res, unsigned int ix);



/* Activate/deactivate API */

void mlx5e_rx_res_channels_activate(struct mlx5e_rx_res *res, struct mlx5e_channels *chs);

void mlx5e_rx_res_channels_deactivate(struct mlx5e_rx_res *res);
@@ -69,4 +66,7 @@ struct mlx5e_rss *mlx5e_rx_res_rss_get(struct mlx5e_rx_res *res, u32 rss_idx); 
/* Workaround for hairpin */

struct mlx5e_rss_params_hash mlx5e_rx_res_get_current_hash(struct mlx5e_rx_res *res);



/* Accel TIRs */

int mlx5e_rx_res_tls_tir_create(struct mlx5e_rx_res *res, unsigned int rxq,

				struct mlx5e_tir *tir);

#endif /* __MLX5_EN_RX_RES_H__ */

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

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static void mlx5e_ipsec_set_swp(struct sk_buff *skb, 
			eseg->swp_inner_l3_offset = skb_inner_network_offset(skb) / 2;

			eseg->swp_inner_l4_offset =

				(skb->csum_start + skb->head - skb->data) / 2;

			if (skb->protocol == htons(ETH_P_IPV6))

			if (inner_ip_hdr(skb)->version == 6)

				eseg->swp_flags |= MLX5_ETH_WQE_SWP_INNER_L3_IPV6;

			break;

		default:

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

+1 −23
Original line number Diff line number Diff line
@@ -100,25 +100,6 @@ mlx5e_ktls_rx_resync_create_resp_list(void) 
	return resp_list;

}



static int mlx5e_ktls_create_tir(struct mlx5_core_dev *mdev, struct mlx5e_tir *tir, u32 rqtn)

{

	struct mlx5e_tir_builder *builder;

	int err;



	builder = mlx5e_tir_builder_alloc(false);

	if (!builder)

		return -ENOMEM;



	mlx5e_tir_builder_build_rqt(builder, mdev->mlx5e_res.hw_objs.td.tdn, rqtn, false);

	mlx5e_tir_builder_build_direct(builder);

	mlx5e_tir_builder_build_tls(builder);

	err = mlx5e_tir_init(tir, builder, mdev, false);



	mlx5e_tir_builder_free(builder);



	return err;

}



static void accel_rule_handle_work(struct work_struct *work)

{

	struct mlx5e_ktls_offload_context_rx *priv_rx;
@@ -609,7 +590,6 @@ int mlx5e_ktls_add_rx(struct net_device *netdev, struct sock *sk, 
	struct mlx5_core_dev *mdev;

	struct mlx5e_priv *priv;

	int rxq, err;

	u32 rqtn;



	tls_ctx = tls_get_ctx(sk);

	priv = netdev_priv(netdev);
@@ -635,9 +615,7 @@ int mlx5e_ktls_add_rx(struct net_device *netdev, struct sock *sk, 
	priv_rx->sw_stats = &priv->tls->sw_stats;

	mlx5e_set_ktls_rx_priv_ctx(tls_ctx, priv_rx);



	rqtn = mlx5e_rx_res_get_rqtn_direct(priv->rx_res, rxq);



	err = mlx5e_ktls_create_tir(mdev, &priv_rx->tir, rqtn);

	err = mlx5e_rx_res_tls_tir_create(priv->rx_res, rxq, &priv_rx->tir);

	if (err)

		goto err_create_tir;