Commit 6f076ce6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'mlx5-fixes-2020-12-01' 

Saeed Mahameed says:

====================
mlx5 fixes 2020-12-01

This series introduces some fixes to mlx5 driver.
====================

Link: https://lore.kernel.org/r/20201203043946.235385-1-saeedm@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9608fa65 d421e466

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

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static void accel_fs_tcp_set_ipv4_flow(struct mlx5_flow_spec *spec, struct sock 
			 outer_headers.dst_ipv4_dst_ipv6.ipv4_layout.ipv4);

}



#if IS_ENABLED(CONFIG_IPV6)

static void accel_fs_tcp_set_ipv6_flow(struct mlx5_flow_spec *spec, struct sock *sk)

{

	MLX5_SET_TO_ONES(fte_match_param, spec->match_criteria, outer_headers.ip_protocol);
@@ -63,6 +64,7 @@ static void accel_fs_tcp_set_ipv6_flow(struct mlx5_flow_spec *spec, struct sock 
			    outer_headers.dst_ipv4_dst_ipv6.ipv6_layout.ipv6),

	       0xff, 16);

}

#endif



void mlx5e_accel_fs_del_sk(struct mlx5_flow_handle *rule)

{

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

+15 −7
Original line number Diff line number Diff line
@@ -161,7 +161,9 @@ ipsec_txwqe_build_eseg_csum(struct mlx5e_txqsq *sq, struct sk_buff *skb, 
}



static inline void

mlx5e_txwqe_build_eseg_csum(struct mlx5e_txqsq *sq, struct sk_buff *skb, struct mlx5_wqe_eth_seg *eseg)

mlx5e_txwqe_build_eseg_csum(struct mlx5e_txqsq *sq, struct sk_buff *skb,

			    struct mlx5e_accel_tx_state *accel,

			    struct mlx5_wqe_eth_seg *eseg)

{

	if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {

		eseg->cs_flags = MLX5_ETH_WQE_L3_CSUM;
@@ -173,6 +175,11 @@ mlx5e_txwqe_build_eseg_csum(struct mlx5e_txqsq *sq, struct sk_buff *skb, struct 
			eseg->cs_flags |= MLX5_ETH_WQE_L4_CSUM;

			sq->stats->csum_partial++;

		}

#ifdef CONFIG_MLX5_EN_TLS

	} else if (unlikely(accel && accel->tls.tls_tisn)) {

		eseg->cs_flags = MLX5_ETH_WQE_L3_CSUM | MLX5_ETH_WQE_L4_CSUM;

		sq->stats->csum_partial++;

#endif

	} else if (unlikely(eseg->flow_table_metadata & cpu_to_be32(MLX5_ETH_WQE_FT_META_IPSEC))) {

		ipsec_txwqe_build_eseg_csum(sq, skb, eseg);
@@ -607,12 +614,13 @@ void mlx5e_tx_mpwqe_ensure_complete(struct mlx5e_txqsq *sq) 
}



static bool mlx5e_txwqe_build_eseg(struct mlx5e_priv *priv, struct mlx5e_txqsq *sq,

				   struct sk_buff *skb, struct mlx5_wqe_eth_seg *eseg)

				   struct sk_buff *skb, struct mlx5e_accel_tx_state *accel,

				   struct mlx5_wqe_eth_seg *eseg)

{

	if (unlikely(!mlx5e_accel_tx_eseg(priv, skb, eseg)))

		return false;



	mlx5e_txwqe_build_eseg_csum(sq, skb, eseg);

	mlx5e_txwqe_build_eseg_csum(sq, skb, accel, eseg);



	return true;

}
@@ -639,7 +647,7 @@ netdev_tx_t mlx5e_xmit(struct sk_buff *skb, struct net_device *dev) 
		if (mlx5e_tx_skb_supports_mpwqe(skb, &attr)) {

			struct mlx5_wqe_eth_seg eseg = {};



			if (unlikely(!mlx5e_txwqe_build_eseg(priv, sq, skb, &eseg)))

			if (unlikely(!mlx5e_txwqe_build_eseg(priv, sq, skb, &accel, &eseg)))

				return NETDEV_TX_OK;



			mlx5e_sq_xmit_mpwqe(sq, skb, &eseg, netdev_xmit_more());
@@ -656,7 +664,7 @@ netdev_tx_t mlx5e_xmit(struct sk_buff *skb, struct net_device *dev) 
	/* May update the WQE, but may not post other WQEs. */

	mlx5e_accel_tx_finish(sq, wqe, &accel,

			      (struct mlx5_wqe_inline_seg *)(wqe->data + wqe_attr.ds_cnt_inl));

	if (unlikely(!mlx5e_txwqe_build_eseg(priv, sq, skb, &wqe->eth)))

	if (unlikely(!mlx5e_txwqe_build_eseg(priv, sq, skb, &accel, &wqe->eth)))

		return NETDEV_TX_OK;



	mlx5e_sq_xmit_wqe(sq, skb, &attr, &wqe_attr, wqe, pi, netdev_xmit_more());
@@ -675,7 +683,7 @@ void mlx5e_sq_xmit_simple(struct mlx5e_txqsq *sq, struct sk_buff *skb, bool xmit 
	mlx5e_sq_calc_wqe_attr(skb, &attr, &wqe_attr);

	pi = mlx5e_txqsq_get_next_pi(sq, wqe_attr.num_wqebbs);

	wqe = MLX5E_TX_FETCH_WQE(sq, pi);

	mlx5e_txwqe_build_eseg_csum(sq, skb, &wqe->eth);

	mlx5e_txwqe_build_eseg_csum(sq, skb, NULL, &wqe->eth);

	mlx5e_sq_xmit_wqe(sq, skb, &attr, &wqe_attr, wqe, pi, xmit_more);

}
@@ -944,7 +952,7 @@ void mlx5i_sq_xmit(struct mlx5e_txqsq *sq, struct sk_buff *skb, 


	mlx5i_txwqe_build_datagram(av, dqpn, dqkey, datagram);



	mlx5e_txwqe_build_eseg_csum(sq, skb, eseg);

	mlx5e_txwqe_build_eseg_csum(sq, skb, NULL, eseg);



	eseg->mss = attr.mss;

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

+19 −2
Original line number Diff line number Diff line
@@ -422,6 +422,24 @@ static void release_all_pages(struct mlx5_core_dev *dev, u32 func_id, 
		      npages, ec_function, func_id);

}



static u32 fwp_fill_manage_pages_out(struct fw_page *fwp, u32 *out, u32 index,

				     u32 npages)

{

	u32 pages_set = 0;

	unsigned int n;



	for_each_clear_bit(n, &fwp->bitmask, MLX5_NUM_4K_IN_PAGE) {

		MLX5_ARRAY_SET64(manage_pages_out, out, pas, index + pages_set,

				 fwp->addr + (n * MLX5_ADAPTER_PAGE_SIZE));

		pages_set++;



		if (!--npages)

			break;

	}



	return pages_set;

}



static int reclaim_pages_cmd(struct mlx5_core_dev *dev,

			     u32 *in, int in_size, u32 *out, int out_size)

{
@@ -448,8 +466,7 @@ static int reclaim_pages_cmd(struct mlx5_core_dev *dev, 
		fwp = rb_entry(p, struct fw_page, rb_node);

		p = rb_next(p);



		MLX5_ARRAY_SET64(manage_pages_out, out, pas, i, fwp->addr);

		i++;

		i += fwp_fill_manage_pages_out(fwp, out, i, npages - i);

	}



	MLX5_SET(manage_pages_out, out, output_num_entries, i);

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_cmd.c

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ int mlx5dr_cmd_query_device(struct mlx5_core_dev *mdev, 
	caps->eswitch_manager	= MLX5_CAP_GEN(mdev, eswitch_manager);

	caps->gvmi		= MLX5_CAP_GEN(mdev, vhca_id);

	caps->flex_protocols	= MLX5_CAP_GEN(mdev, flex_parser_protocols);

	caps->sw_format_ver	= MLX5_CAP_GEN(mdev, steering_format_version);



	if (mlx5dr_matcher_supp_flex_parser_icmp_v4(caps)) {

		caps->flex_parser_id_icmp_dw0 = MLX5_CAP_GEN(mdev, flex_parser_id_icmp_dw0);

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_domain.c

+5 −0
Original line number Diff line number Diff line
@@ -223,6 +223,11 @@ static int dr_domain_caps_init(struct mlx5_core_dev *mdev, 
	if (ret)

		return ret;



	if (dmn->info.caps.sw_format_ver != MLX5_STEERING_FORMAT_CONNECTX_5) {

		mlx5dr_err(dmn, "SW steering is not supported on this device\n");

		return -EOPNOTSUPP;

	}



	ret = dr_domain_query_fdb_caps(mdev, dmn);

	if (ret)

		return ret;