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

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



Saeed Mahameed says:

====================
mlx5-cleanup-2020-05-29

Accumulated cleanup patches and sparse warning fixes for mlx5 driver.

1) sync with mlx5-next branch

2) Eli Cohen declares mpls_entry_encode() helper in mpls.h as suggested
by Jakub Kicinski and David Ahern, and use it in mlx5

3) Jesper Fixes xdp data_meta setup in mlx5

4) Many sparse and build warnings cleanup
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents da4e15e3 eb243871

drivers/infiniband/hw/mlx5/flow.c

+4 −1
Original line number Diff line number Diff line
@@ -404,7 +404,10 @@ static bool mlx5_ib_modify_header_supported(struct mlx5_ib_dev *dev) 
{

	return MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev,

					 max_modify_header_actions) ||

	       MLX5_CAP_FLOWTABLE_NIC_TX(dev->mdev, max_modify_header_actions);

	       MLX5_CAP_FLOWTABLE_NIC_TX(dev->mdev,

					 max_modify_header_actions) ||

	       MLX5_CAP_FLOWTABLE_RDMA_TX(dev->mdev,

					 max_modify_header_actions);

}



static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_ACTION_CREATE_MODIFY_HEADER)(

drivers/infiniband/hw/mlx5/main.c

+10 −37
Original line number Diff line number Diff line
@@ -3698,12 +3698,13 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, 
		if (!dest_num)

			rule_dst = NULL;

	} else {

		if (is_egress)

			flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_ALLOW;

		else

		if (flow_attr->flags & IB_FLOW_ATTR_FLAGS_DONT_TRAP)

			flow_act.action |=

				dest_num ?  MLX5_FLOW_CONTEXT_ACTION_FWD_DEST :

				MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO;

		if (is_egress)

			flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_ALLOW;

		else if (dest_num)

			flow_act.action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST;

	}



	if ((spec->flow_context.flags & FLOW_CONTEXT_HAS_TAG)  &&
@@ -3747,30 +3748,6 @@ static struct mlx5_ib_flow_handler *create_flow_rule(struct mlx5_ib_dev *dev, 
	return _create_flow_rule(dev, ft_prio, flow_attr, dst, 0, NULL);

}



static struct mlx5_ib_flow_handler *create_dont_trap_rule(struct mlx5_ib_dev *dev,

							  struct mlx5_ib_flow_prio *ft_prio,

							  struct ib_flow_attr *flow_attr,

							  struct mlx5_flow_destination *dst)

{

	struct mlx5_ib_flow_handler *handler_dst = NULL;

	struct mlx5_ib_flow_handler *handler = NULL;



	handler = create_flow_rule(dev, ft_prio, flow_attr, NULL);

	if (!IS_ERR(handler)) {

		handler_dst = create_flow_rule(dev, ft_prio,

					       flow_attr, dst);

		if (IS_ERR(handler_dst)) {

			mlx5_del_flow_rules(handler->rule);

			ft_prio->refcount--;

			kfree(handler);

			handler = handler_dst;

		} else {

			list_add(&handler_dst->list, &handler->list);

		}

	}



	return handler;

}

enum {

	LEFTOVERS_MC,

	LEFTOVERS_UC,
@@ -3974,15 +3951,11 @@ static struct ib_flow *mlx5_ib_create_flow(struct ib_qp *qp, 
	}



	if (flow_attr->type == IB_FLOW_ATTR_NORMAL) {

		if (flow_attr->flags & IB_FLOW_ATTR_FLAGS_DONT_TRAP)  {

			handler = create_dont_trap_rule(dev, ft_prio,

							flow_attr, dst);

		} else {

			underlay_qpn = (mqp->flags & MLX5_IB_QP_UNDERLAY) ?

					mqp->underlay_qpn : 0;

			handler = _create_flow_rule(dev, ft_prio, flow_attr,

						    dst, underlay_qpn, ucmd);

		}

		underlay_qpn = (mqp->flags & IB_QP_CREATE_SOURCE_QPN) ?

				       mqp->underlay_qpn :

				       0;

		handler = _create_flow_rule(dev, ft_prio, flow_attr, dst,

					    underlay_qpn, ucmd);

	} else if (flow_attr->type == IB_FLOW_ATTR_ALL_DEFAULT ||

		   flow_attr->type == IB_FLOW_ATTR_MC_DEFAULT) {

		handler = create_leftovers_rule(dev, ft_prio, flow_attr,

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ config MLX5_CLS_ACT 
	default y

	help

	  mlx5 ConnectX offloads support for TC classifier action (NET_CLS_ACT),

	  works in both native NIC mdoe and Switchdev SRIOV mode.

	  works in both native NIC mode and Switchdev SRIOV mode.

	  Actions get attached to a Hardware offloaded classifiers and are

	  invoked after a successful classification. Actions are used to

	  overwrite the classification result, instantly drop or redirect and/or

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

+2 −2
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ void mlx5_accel_tls_del_flow(struct mlx5_core_dev *mdev, u32 swid, 
	mlx5_fpga_tls_del_flow(mdev, swid, GFP_KERNEL, direction_sx);

}



int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,

			     u64 rcd_sn)

int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, __be32 handle,

			     u32 seq, __be64 rcd_sn)

{

	return mlx5_fpga_tls_resync_rx(mdev, handle, seq, rcd_sn);

}

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

+4 −4
Original line number Diff line number Diff line
@@ -109,8 +109,8 @@ int mlx5_accel_tls_add_flow(struct mlx5_core_dev *mdev, void *flow, 
			    bool direction_sx);

void mlx5_accel_tls_del_flow(struct mlx5_core_dev *mdev, u32 swid,

			     bool direction_sx);

int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle, u32 seq,

			     u64 rcd_sn);

int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, __be32 handle,

			     u32 seq, __be64 rcd_sn);

bool mlx5_accel_is_tls_device(struct mlx5_core_dev *mdev);

u32 mlx5_accel_tls_device_caps(struct mlx5_core_dev *mdev);

int mlx5_accel_tls_init(struct mlx5_core_dev *mdev);
@@ -125,8 +125,8 @@ mlx5_accel_tls_add_flow(struct mlx5_core_dev *mdev, void *flow, 
			bool direction_sx) { return -ENOTSUPP; }

static inline void mlx5_accel_tls_del_flow(struct mlx5_core_dev *mdev, u32 swid,

					   bool direction_sx) { }

static inline int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, u32 handle,

					   u32 seq, u64 rcd_sn) { return 0; }

static inline int mlx5_accel_tls_resync_rx(struct mlx5_core_dev *mdev, __be32 handle,

					   u32 seq, __be64 rcd_sn) { return 0; }

static inline bool mlx5_accel_is_tls_device(struct mlx5_core_dev *mdev)

{

	return mlx5_accel_is_ktls_device(mdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE