RDMA/mlx5: Add NIC TX namespace when getting a flow table

Add the ability to get a NIC TX flow table when using _get_flow_table(). This will allow to create a matcher and a flow rule on the NIC TX path.

Mark Bloch committed 8 years ago

Commit b47fd4f1 parent fa76d243 files · +32 −11Browse files

Unified · Split

3 files

drivers/infiniband/hw/mlx5/flow.c +1 −0
drivers/infiniband/hw/mlx5/main.c +30 −11
drivers/infiniband/hw/mlx5/mlx5_ib.h +1 −0

drivers/infiniband/hw/mlx5/flow.c+1−0

@@ -189,6 +189,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_FLOW_MATCHER_CREATE)( · 188 unmodified lines
189	if (!obj)	189	if (!obj)
190	return -ENOMEM;	190	return -ENOMEM;
191		191
		192	obj->ns_type = MLX5_FLOW_NAMESPACE_BYPASS;
192	obj->mask_len = uverbs_attr_get_len(	193	obj->mask_len = uverbs_attr_get_len(
193	attrs, MLX5_IB_ATTR_FLOW_MATCHER_MATCH_MASK);	194	attrs, MLX5_IB_ATTR_FLOW_MATCHER_MATCH_MASK);
194	err = uverbs_copy_from(&obj->matcher_mask,	195	err = uverbs_copy_from(&obj->matcher_mask,

drivers/infiniband/hw/mlx5/main.c+30−11

 	return ERR_PTR(err);
 }
-static struct mlx5_ib_flow_prio *_get_flow_table(struct mlx5_ib_dev *dev,
+static struct mlx5_ib_flow_prio *
-						 int priority, bool mcast)
+_get_flow_table(struct mlx5_ib_dev *dev,
+		struct mlx5_ib_flow_matcher *fs_matcher,
+		bool mcast)
 {
-	int max_table_size;
 	struct mlx5_flow_namespace *ns = NULL;
 	struct mlx5_ib_flow_prio *prio;
+	int max_table_size;
+	u32 flags = 0;
+	int priority;
+	if (fs_matcher->ns_type == MLX5_FLOW_NAMESPACE_BYPASS) {
+		max_table_size = BIT(MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev,
+					log_max_ft_size));
+		if (MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev, decap))
+			flags |= MLX5_FLOW_TABLE_TUNNEL_EN_DECAP;
+		if (MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev,
+					      reformat_l3_tunnel_to_l2))
+			flags |= MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT;
+	} else { /* Can only be MLX5_FLOW_NAMESPACE_EGRESS */
+		max_table_size = BIT(MLX5_CAP_FLOWTABLE_NIC_TX(dev->mdev,
+					log_max_ft_size));
+		if (MLX5_CAP_FLOWTABLE_NIC_TX(dev->mdev, reformat))
+			flags |= MLX5_FLOW_TABLE_TUNNEL_EN_REFORMAT;
+	}
-	max_table_size = BIT(MLX5_CAP_FLOWTABLE_NIC_RX(dev->mdev,
-			     log_max_ft_size));
 	if (max_table_size < MLX5_FS_MAX_ENTRIES)
 		return ERR_PTR(-ENOMEM);
 	if (mcast)
 		priority = MLX5_IB_FLOW_MCAST_PRIO;
 	else
-		priority = ib_prio_to_core_prio(priority, false);
+		priority = ib_prio_to_core_prio(fs_matcher->priority, false);
-	ns = mlx5_get_flow_namespace(dev->mdev, MLX5_FLOW_NAMESPACE_BYPASS);
+	ns = mlx5_get_flow_namespace(dev->mdev, fs_matcher->ns_type);
 	if (!ns)
 		return ERR_PTR(-ENOTSUPP);
-	prio = &dev->flow_db->prios[priority];
+	if (fs_matcher->ns_type == MLX5_FLOW_NAMESPACE_BYPASS)
+		prio = &dev->flow_db->prios[priority];
+	else
+		prio = &dev->flow_db->egress_prios[priority];
 	if (prio->flow_table)
 		return prio;
 	return _get_prio(ns, prio, priority, MLX5_FS_MAX_ENTRIES,
-			 MLX5_FS_MAX_TYPES, 0);
+			 MLX5_FS_MAX_TYPES, flags);
 }
 static struct mlx5_ib_flow_handler *
 {
 	struct mlx5_flow_destination *dst;
 	struct mlx5_ib_flow_prio *ft_prio;
-	int priority = fs_matcher->priority;
 	struct mlx5_ib_flow_handler *handler;
 	bool mcast;
 	int err;
 	mcast = raw_fs_is_multicast(fs_matcher, cmd_in);
 	mutex_lock(&dev->flow_db->lock);
-	ft_prio = _get_flow_table(dev, priority, mcast);
+	ft_prio = _get_flow_table(dev, fs_matcher, mcast);
 	if (IS_ERR(ft_prio)) {
 		err = PTR_ERR(ft_prio);
 		goto unlock;

drivers/infiniband/hw/mlx5/mlx5_ib.h+1−0

@@ -190,6 +190,7 @@ struct mlx5_ib_flow_matcher { · 189 unmodified lines
190	struct mlx5_ib_match_params matcher_mask;	190	struct mlx5_ib_match_params matcher_mask;
191	int mask_len;	191	int mask_len;
192	enum mlx5_ib_flow_type flow_type;	192	enum mlx5_ib_flow_type flow_type;
		193	enum mlx5_flow_namespace_type ns_type;
193	u16 priority;	194	u16 priority;
194	struct mlx5_core_dev *mdev;	195	struct mlx5_core_dev *mdev;
195	atomic_t usecnt;	196	atomic_t usecnt;

RDMA/mlx5: Add NIC TX namespace when getting a flow table

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code