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

Merge tag 'mlx5-fixes-2019-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2019-07-25

This series introduces some fixes to mlx5 driver.

1) Ariel is addressing an issue with enacp flow counter race condition
2) Aya fixes ethtool speed handling
3) Edward fixes modify_cq hw bits alignment
4) Maor fixes RDMA_RX capabilities handling
5) Mark reverses unregister devices order to address an issue with LAG
6) From Tariq,
  - wrong max num channels indication regression
  - TLS counters naming and documentation as suggested by Jakub
  - kTLS, Call WARN_ONCE on netdev mismatch

There is one patch in this series that touches nfp driver to align
TLS statistics names with latest documentation, Jakub is CC'ed.

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

For -stable v4.9:
  ('net/mlx5: Use reversed order when unregister devices')

For -stable v4.20
  ('net/mlx5e: Prevent encap flow counter update async to user query')
  ('net/mlx5: Fix modify_cq_in alignment')

For -stable v5.1
  ('net/mlx5e: Fix matching of speed to PRM link modes')

For -stable v5.2
  ('net/mlx5: Add missing RDMA_RX capabilities')
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a7cf3d24 280c0899

Documentation/networking/tls-offload.rst

+17 −6
Original line number Diff line number Diff line
@@ -424,13 +424,24 @@ Statistics 
Following minimum set of TLS-related statistics should be reported

by the driver:



 * ``rx_tls_decrypted`` - number of successfully decrypted TLS segments

 * ``tx_tls_encrypted`` - number of in-order TLS segments passed to device

   for encryption

 * ``rx_tls_decrypted_packets`` - number of successfully decrypted RX packets

   which were part of a TLS stream.

 * ``rx_tls_decrypted_bytes`` - number of TLS payload bytes in RX packets

   which were successfully decrypted.

 * ``tx_tls_encrypted_packets`` - number of TX packets passed to the device

   for encryption of their TLS payload.

 * ``tx_tls_encrypted_bytes`` - number of TLS payload bytes in TX packets

   passed to the device for encryption.

 * ``tx_tls_ctx`` - number of TLS TX HW offload contexts added to device for

   encryption.

 * ``tx_tls_ooo`` - number of TX packets which were part of a TLS stream

   but did not arrive in the expected order

 * ``tx_tls_drop_no_sync_data`` - number of TX packets dropped because

   they arrived out of order and associated record could not be found

   but did not arrive in the expected order.

 * ``tx_tls_drop_no_sync_data`` - number of TX packets which were part of

   a TLS stream dropped, because they arrived out of order and associated

   record could not be found.

 * ``tx_tls_drop_bypass_req`` - number of TX packets which were part of a TLS

   stream dropped, because they contain both data that has been encrypted by

   software and data that expects hardware crypto offload.



Notable corner cases, exceptions and additional requirements

============================================================

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

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ void mlx5_unregister_device(struct mlx5_core_dev *dev) 
	struct mlx5_interface *intf;



	mutex_lock(&mlx5_intf_mutex);

	list_for_each_entry(intf, &intf_list, list)

	list_for_each_entry_reverse(intf, &intf_list, list)

		mlx5_remove_device(intf, priv);

	list_del(&priv->dev_list);

	mutex_unlock(&mlx5_intf_mutex);

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

+3 −9
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ do { \ 
enum mlx5e_rq_group {

	MLX5E_RQ_GROUP_REGULAR,

	MLX5E_RQ_GROUP_XSK,

	MLX5E_NUM_RQ_GROUPS /* Keep last. */

#define MLX5E_NUM_RQ_GROUPS(g) (1 + MLX5E_RQ_GROUP_##g)

};



static inline u16 mlx5_min_rx_wqes(int wq_type, u32 wq_size)
@@ -182,14 +182,6 @@ static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev) 
		min_t(int, mlx5_comp_vectors_count(mdev), MLX5E_MAX_NUM_CHANNELS);

}



/* Use this function to get max num channels after netdev was created */

static inline int mlx5e_get_netdev_max_channels(struct net_device *netdev)

{

	return min_t(unsigned int,

		     netdev->num_rx_queues / MLX5E_NUM_RQ_GROUPS,

		     netdev->num_tx_queues);

}



struct mlx5e_tx_wqe {

	struct mlx5_wqe_ctrl_seg ctrl;

	struct mlx5_wqe_eth_seg  eth;
@@ -830,6 +822,7 @@ struct mlx5e_priv { 
	struct net_device         *netdev;

	struct mlx5e_stats         stats;

	struct mlx5e_channel_stats channel_stats[MLX5E_MAX_NUM_CHANNELS];

	u16                        max_nch;

	u8                         max_opened_tc;

	struct hwtstamp_config     tstamp;

	u16                        q_counter;
@@ -871,6 +864,7 @@ struct mlx5e_profile { 
		mlx5e_fp_handle_rx_cqe handle_rx_cqe_mpwqe;

	} rx_handlers;

	int	max_tc;

	u8	rq_groups;

};



void mlx5e_build_ptys2ethtool_map(void);

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

+3 −2
Original line number Diff line number Diff line
@@ -66,9 +66,10 @@ static inline void mlx5e_qid_get_ch_and_group(struct mlx5e_params *params, 
	*group = qid / nch;

}



static inline bool mlx5e_qid_validate(struct mlx5e_params *params, u64 qid)

static inline bool mlx5e_qid_validate(const struct mlx5e_profile *profile,

				      struct mlx5e_params *params, u64 qid)

{

	return qid < params->num_channels * MLX5E_NUM_RQ_GROUPS;

	return qid < params->num_channels * profile->rq_groups;

}



/* Parameter calculations */

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

+18 −9
Original line number Diff line number Diff line
@@ -78,9 +78,10 @@ static const u32 mlx5e_ext_link_speed[MLX5E_EXT_LINK_MODES_NUMBER] = { 
};



static void mlx5e_port_get_speed_arr(struct mlx5_core_dev *mdev,

				     const u32 **arr, u32 *size)

				     const u32 **arr, u32 *size,

				     bool force_legacy)

{

	bool ext = MLX5_CAP_PCAM_FEATURE(mdev, ptys_extended_ethernet);

	bool ext = force_legacy ? false : MLX5_CAP_PCAM_FEATURE(mdev, ptys_extended_ethernet);



	*size = ext ? ARRAY_SIZE(mlx5e_ext_link_speed) :

		      ARRAY_SIZE(mlx5e_link_speed);
@@ -152,7 +153,8 @@ int mlx5_port_set_eth_ptys(struct mlx5_core_dev *dev, bool an_disable, 
			    sizeof(out), MLX5_REG_PTYS, 0, 1);

}



u32 mlx5e_port_ptys2speed(struct mlx5_core_dev *mdev, u32 eth_proto_oper)

u32 mlx5e_port_ptys2speed(struct mlx5_core_dev *mdev, u32 eth_proto_oper,

			  bool force_legacy)

{

	unsigned long temp = eth_proto_oper;

	const u32 *table;
@@ -160,7 +162,7 @@ u32 mlx5e_port_ptys2speed(struct mlx5_core_dev *mdev, u32 eth_proto_oper) 
	u32 max_size;

	int i;



	mlx5e_port_get_speed_arr(mdev, &table, &max_size);

	mlx5e_port_get_speed_arr(mdev, &table, &max_size, force_legacy);

	i = find_first_bit(&temp, max_size);

	if (i < max_size)

		speed = table[i];
@@ -170,6 +172,7 @@ u32 mlx5e_port_ptys2speed(struct mlx5_core_dev *mdev, u32 eth_proto_oper) 
int mlx5e_port_linkspeed(struct mlx5_core_dev *mdev, u32 *speed)

{

	struct mlx5e_port_eth_proto eproto;

	bool force_legacy = false;

	bool ext;

	int err;
@@ -177,8 +180,13 @@ int mlx5e_port_linkspeed(struct mlx5_core_dev *mdev, u32 *speed) 
	err = mlx5_port_query_eth_proto(mdev, 1, ext, &eproto);

	if (err)

		goto out;



	*speed = mlx5e_port_ptys2speed(mdev, eproto.oper);

	if (ext && !eproto.admin) {

		force_legacy = true;

		err = mlx5_port_query_eth_proto(mdev, 1, false, &eproto);

		if (err)

			goto out;

	}

	*speed = mlx5e_port_ptys2speed(mdev, eproto.oper, force_legacy);

	if (!(*speed))

		err = -EINVAL;
@@ -201,7 +209,7 @@ int mlx5e_port_max_linkspeed(struct mlx5_core_dev *mdev, u32 *speed) 
	if (err)

		return err;



	mlx5e_port_get_speed_arr(mdev, &table, &max_size);

	mlx5e_port_get_speed_arr(mdev, &table, &max_size, false);

	for (i = 0; i < max_size; ++i)

		if (eproto.cap & MLX5E_PROT_MASK(i))

			max_speed = max(max_speed, table[i]);
@@ -210,14 +218,15 @@ int mlx5e_port_max_linkspeed(struct mlx5_core_dev *mdev, u32 *speed) 
	return 0;

}



u32 mlx5e_port_speed2linkmodes(struct mlx5_core_dev *mdev, u32 speed)

u32 mlx5e_port_speed2linkmodes(struct mlx5_core_dev *mdev, u32 speed,

			       bool force_legacy)

{

	u32 link_modes = 0;

	const u32 *table;

	u32 max_size;

	int i;



	mlx5e_port_get_speed_arr(mdev, &table, &max_size);

	mlx5e_port_get_speed_arr(mdev, &table, &max_size, force_legacy);

	for (i = 0; i < max_size; ++i) {

		if (table[i] == speed)

			link_modes |= MLX5E_PROT_MASK(i);

CRA Git | Maintained and supported by SUSTech CRA and CCSE