From: Doug Ledford <dledford@redhat.com>
Date: Sat, 22 Sep 2018 00:41:58 +0000 (-0400)
Subject: Merge branch 'mlx5-vport-loopback' into rdma.get
X-Git-Tag: v4.20-rc1~110^2~129
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f9882bb5060b956a22c4ce6d477f9860128c0f08;p=linux.git

Merge branch 'mlx5-vport-loopback' into rdma.get

For dependencies, branch based on 'mlx5-next' of
    git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git

mlx5 mcast/ucast loopback control enhancements from Leon Romanovsky:

====================
This is short series from Mark which extends handling of loopback
traffic. Originally mlx5 IB dynamically enabled/disabled both unicast
and multicast based on number of users. However RAW ethernet QPs need
more granular access.
====================

Fixed failed automerge in mlx5_ib.h (minor context conflict issue)

mlx5-vport-loopback branch:
    RDMA/mlx5: Enable vport loopback when user context or QP mandate
    RDMA/mlx5: Allow creating RAW ethernet QP with loopback support
    RDMA/mlx5: Refactor transport domain bookkeeping logic
    net/mlx5: Rename incorrect naming in IFC file

Signed-off-by: Doug Ledford <dledford@redhat.com>
---

f9882bb5060b956a22c4ce6d477f9860128c0f08
diff --cc drivers/infiniband/hw/mlx5/mlx5_ib.h
index dc34ffa4c8b3,8376408e2bc9..a28d04d4c9df
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@@ -865,12 -858,17 +865,20 @@@ to_mcounters(struct ib_counters *ibcntr
  	return container_of(ibcntrs, struct mlx5_ib_mcounters, ibcntrs);
  }
  
 +int parse_flow_flow_action(struct mlx5_ib_flow_action *maction,
 +			   bool is_egress,
 +			   struct mlx5_flow_act *action);
+ struct mlx5_ib_lb_state {
+ 	/* protect the user_td */
+ 	struct mutex		mutex;
+ 	u32			user_td;
+ 	int			qps;
+ 	bool			enabled;
+ };
+ 
  struct mlx5_ib_dev {
  	struct ib_device		ib_dev;
 -	const struct uverbs_object_tree_def *driver_trees[6];
 +	const struct uverbs_object_tree_def *driver_trees[7];
  	struct mlx5_core_dev		*mdev;
  	struct mlx5_roce		roce[MLX5_MAX_PORTS];
  	int				num_ports;