IB/core: Introduce inner flow steering

For a tunneled packet which contains external and internal headers,
we refer to the external headers as "outer fields" and the internal
headers as "inner fields".

Example of a tunneled packet:

{ L2 | L3 | L4 | tunnel header | L2 | L3 | l4 | data }
  |     |    |         |         |    |    |
{       outer fields           }{ inner fields }

This patch introduces a new flag for flow steering rules
- IB_FLOW_SPEC_INNER - which specifies that the rule applies
to the inner fields, rather than to the outer fields of the packet.

Signed-off-by: Moses Reuben <mosesr@mellanox.com>
Reviewed-by: Maor Gottlieb <maorg@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index deb06fa3548ba7e80ef49c2c8e864f439a313945..d84dcde7a8bbaf09587a8c86e9b3b6d185f8705b 100644 (file)
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -3124,8 +3124,10 @@ static int kern_spec_to_ib_spec(struct ib_uverbs_flow_spec *kern_spec,
        kern_spec_val = (void *)kern_spec +
                sizeof(struct ib_uverbs_flow_spec_hdr);
        kern_spec_mask = kern_spec_val + kern_filter_sz;
+       if (ib_spec->type == (IB_FLOW_SPEC_INNER | IB_FLOW_SPEC_VXLAN_TUNNEL))
+               return -EINVAL;
 
-       switch (ib_spec->type) {
+       switch (ib_spec->type & ~IB_FLOW_SPEC_INNER) {
        case IB_FLOW_SPEC_ETH:
                ib_filter_sz = offsetof(struct ib_flow_eth_filter, real_sz);
                actual_filter_sz = spec_filter_size(kern_spec_mask,

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 4bc748fddcaca503c6d61775973ba693d9e8264c..6d0dd6525e14773cc7bf233c9a77bdf284b8c4b3 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1601,9 +1601,10 @@ enum ib_flow_spec_type {
        IB_FLOW_SPEC_TCP                = 0x40,
        IB_FLOW_SPEC_UDP                = 0x41,
        IB_FLOW_SPEC_VXLAN_TUNNEL       = 0x50,
+       IB_FLOW_SPEC_INNER              = 0x100,
 };
 #define IB_FLOW_SPEC_LAYER_MASK        0xF0
-#define IB_FLOW_SPEC_SUPPORT_LAYERS 4
+#define IB_FLOW_SPEC_SUPPORT_LAYERS 8
 
 /* Flow steering rule priority is set according to it's domain.
  * Lower domain value means higher priority.
@@ -1631,7 +1632,7 @@ struct ib_flow_eth_filter {
 };
 
 struct ib_flow_spec_eth {
-       enum ib_flow_spec_type    type;
+       u32                       type;
        u16                       size;
        struct ib_flow_eth_filter val;
        struct ib_flow_eth_filter mask;
@@ -1645,7 +1646,7 @@ struct ib_flow_ib_filter {
 };
 
 struct ib_flow_spec_ib {
-       enum ib_flow_spec_type   type;
+       u32                      type;
        u16                      size;
        struct ib_flow_ib_filter val;
        struct ib_flow_ib_filter mask;
@@ -1670,7 +1671,7 @@ struct ib_flow_ipv4_filter {
 };
 
 struct ib_flow_spec_ipv4 {
-       enum ib_flow_spec_type     type;
+       u32                        type;
        u16                        size;
        struct ib_flow_ipv4_filter val;
        struct ib_flow_ipv4_filter mask;
@@ -1688,7 +1689,7 @@ struct ib_flow_ipv6_filter {
 };
 
 struct ib_flow_spec_ipv6 {
-       enum ib_flow_spec_type     type;
+       u32                        type;
        u16                        size;
        struct ib_flow_ipv6_filter val;
        struct ib_flow_ipv6_filter mask;
@@ -1702,7 +1703,7 @@ struct ib_flow_tcp_udp_filter {
 };
 
 struct ib_flow_spec_tcp_udp {
-       enum ib_flow_spec_type        type;
+       u32                           type;
        u16                           size;
        struct ib_flow_tcp_udp_filter val;
        struct ib_flow_tcp_udp_filter mask;
@@ -1717,7 +1718,7 @@ struct ib_flow_tunnel_filter {
  * the tunnel_id from val has the vni value
  */
 struct ib_flow_spec_tunnel {
-       enum ib_flow_spec_type        type;
+       u32                           type;
        u16                           size;
        struct ib_flow_tunnel_filter  val;
        struct ib_flow_tunnel_filter  mask;
@@ -1725,7 +1726,7 @@ struct ib_flow_spec_tunnel {
 
 union ib_flow_spec {
        struct {
-               enum ib_flow_spec_type  type;
+               u32                     type;
                u16                     size;
        };
        struct ib_flow_spec_eth         eth;