Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[deliverable/linux.git] / drivers / infiniband / hw / mlx5 / mlx5_ib.h

diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index d475f83c295b83d443e1b1b9235f406ee3071623..d2b9737baa3675b1dc9ced794767f1790ada35ee 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -125,6 +125,36 @@ struct mlx5_ib_pd {
        u32                     pdn;
 };
 
+#define MLX5_IB_FLOW_MCAST_PRIO                (MLX5_BY_PASS_NUM_PRIOS - 1)
+#define MLX5_IB_FLOW_LAST_PRIO         (MLX5_IB_FLOW_MCAST_PRIO - 1)
+#if (MLX5_IB_FLOW_LAST_PRIO <= 0)
+#error "Invalid number of bypass priorities"
+#endif
+#define MLX5_IB_FLOW_LEFTOVERS_PRIO    (MLX5_IB_FLOW_MCAST_PRIO + 1)
+
+#define MLX5_IB_NUM_FLOW_FT            (MLX5_IB_FLOW_LEFTOVERS_PRIO + 1)
+struct mlx5_ib_flow_prio {
+       struct mlx5_flow_table          *flow_table;
+       unsigned int                    refcount;
+};
+
+struct mlx5_ib_flow_handler {
+       struct list_head                list;
+       struct ib_flow                  ibflow;
+       unsigned int                    prio;
+       struct mlx5_flow_rule   *rule;
+};
+
+struct mlx5_ib_flow_db {
+       struct mlx5_ib_flow_prio        prios[MLX5_IB_NUM_FLOW_FT];
+       /* Protect flow steering bypass flow tables
+        * when add/del flow rules.
+        * only single add/removal of flow steering rule could be done
+        * simultaneously.
+        */
+       struct mutex                    lock;
+};
+
 /* Use macros here so that don't have to duplicate
  * enum ib_send_flags and enum ib_qp_type for low-level driver
  */
@@ -500,6 +530,7 @@ struct mlx5_ib_dev {
         */
        struct srcu_struct      mr_srcu;
 #endif
+       struct mlx5_ib_flow_db  flow_db;
 };
 
 static inline struct mlx5_ib_cq *to_mibcq(struct mlx5_core_cq *mcq)