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

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



Saeed Mahameed says:

====================
Mellanox, mlx5 fixes 2020-03-05

This series introduces some fixes to mlx5 driver.

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

For -stable v5.4
 ('net/mlx5: DR, Fix postsend actions write length')

For -stable v5.5
 ('net/mlx5e: kTLS, Fix TCP seq off-by-1 issue in TX resync flow')
 ('net/mlx5e: Fix endianness handling in pedit mask')
====================

Reviewed-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6cd6cbf5 0b136454

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ enum { 


enum {

	MLX5E_TLS_PROGRESS_PARAMS_RECORD_TRACKER_STATE_START     = 0,

	MLX5E_TLS_PROGRESS_PARAMS_RECORD_TRACKER_STATE_SEARCHING = 1,

	MLX5E_TLS_PROGRESS_PARAMS_RECORD_TRACKER_STATE_TRACKING  = 2,

	MLX5E_TLS_PROGRESS_PARAMS_RECORD_TRACKER_STATE_TRACKING  = 1,

	MLX5E_TLS_PROGRESS_PARAMS_RECORD_TRACKER_STATE_SEARCHING = 2,

};



struct mlx5e_ktls_offload_context_tx {

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

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ tx_sync_info_get(struct mlx5e_ktls_offload_context_tx *priv_tx, 
	 *    this packet was already acknowledged and its record info

	 *    was released.

	 */

	ends_before = before(tcp_seq + datalen, tls_record_start_seq(record));

	ends_before = before(tcp_seq + datalen - 1, tls_record_start_seq(record));



	if (unlikely(tls_record_is_start_marker(record))) {

		ret = ends_before ? MLX5E_KTLS_SYNC_SKIP_NO_DATA : MLX5E_KTLS_SYNC_FAIL;

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

+3 −2
Original line number Diff line number Diff line
@@ -2476,10 +2476,11 @@ static int offload_pedit_fields(struct pedit_headers_action *hdrs, 
			continue;



		if (f->field_bsize == 32) {

			mask_be32 = *(__be32 *)&mask;

			mask_be32 = (__be32)mask;

			mask = (__force unsigned long)cpu_to_le32(be32_to_cpu(mask_be32));

		} else if (f->field_bsize == 16) {

			mask_be16 = *(__be16 *)&mask;

			mask_be32 = (__be32)mask;

			mask_be16 = *(__be16 *)&mask_be32;

			mask = (__force unsigned long)cpu_to_le16(be16_to_cpu(mask_be16));

		}

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

+3 −1
Original line number Diff line number Diff line
@@ -615,8 +615,10 @@ void mlx5_lag_remove(struct mlx5_core_dev *dev) 
			break;



	if (i == MLX5_MAX_PORTS) {

		if (ldev->nb.notifier_call)

		if (ldev->nb.notifier_call) {

			unregister_netdevice_notifier_net(&init_net, &ldev->nb);

			ldev->nb.notifier_call = NULL;

		}

		mlx5_lag_mp_cleanup(ldev);

		cancel_delayed_work_sync(&ldev->bond_work);

		mlx5_lag_dev_free(ldev);

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

+0 −1
Original line number Diff line number Diff line
@@ -933,7 +933,6 @@ static int dr_actions_l2_rewrite(struct mlx5dr_domain *dmn, 


	action->rewrite.data = (void *)ops;

	action->rewrite.num_of_actions = i;

	action->rewrite.chunk->byte_size = i * sizeof(*ops);



	ret = mlx5dr_send_postsend_action(dmn, action);

	if (ret) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE