IB/core: Add more fields to IPv6 flow specification

Add the following fields to IPv6 flow filter specification:
1. Traffic Class
2. Flow Label
3. Next Header
4. Hop Limit

Signed-off-by: Maor Gottlieb <maorg@mellanox.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
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 b9fb256c25fad1227a8c3b6a176e1ac79dec7e85..cb3f515a2285df3de9fea45cd07167a20da41483 100644 (file)
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -3158,6 +3158,10 @@ static int kern_spec_to_ib_spec(struct ib_uverbs_flow_spec *kern_spec,
                ib_spec->size = sizeof(struct ib_flow_spec_ipv6);
                memcpy(&ib_spec->ipv6.val, kern_spec_val, actual_filter_sz);
                memcpy(&ib_spec->ipv6.mask, kern_spec_mask, actual_filter_sz);
+
+               if ((ntohl(ib_spec->ipv6.mask.flow_label)) >= BIT(20) ||
+                   (ntohl(ib_spec->ipv6.val.flow_label)) >= BIT(20))
+                       return -EINVAL;
                break;
        case IB_FLOW_SPEC_TCP:
        case IB_FLOW_SPEC_UDP:

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 990220b757f0c7ee78c55a1fc487a85033c1e248..0cec4da51eb7eab4473428625e27d77f6c4c62fa 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1676,6 +1676,10 @@ struct ib_flow_spec_ipv4 {
 struct ib_flow_ipv6_filter {
        u8      src_ip[16];
        u8      dst_ip[16];
+       __be32  flow_label;
+       u8      next_hdr;
+       u8      traffic_class;
+       u8      hop_limit;
        /* Must be last */
        u8      real_sz[0];
 };

diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
index 804f086835c6da00c8e1c88bb3abcb3d8575b635..25225ebbc7d5255625a0f5abffdf9605c17dcf81 100644 (file)
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
@@ -886,8 +886,13 @@ struct ib_uverbs_flow_spec_tcp_udp {
 };
 
 struct ib_uverbs_flow_ipv6_filter {
-       __u8 src_ip[16];
-       __u8 dst_ip[16];
+       __u8    src_ip[16];
+       __u8    dst_ip[16];
+       __be32  flow_label;
+       __u8    next_hdr;
+       __u8    traffic_class;
+       __u8    hop_limit;
+       __u8    reserved;
 };
 
 struct ib_uverbs_flow_spec_ipv6 {