flow_dissector: Add control/reporting of encapsulation

Add an input flag to flow dissector on rather dissection should stop
when encapsulation is detected (IP/IP or GRE). Also, add a key_control
flag that indicates encapsulation was encountered during the
dissection.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h
index 66dbc3498efb2636b8c441793d9716b2f854fa0c..bddd1089dbce243866310ee2fe758883f8081c5a 100644 (file)
--- a/include/net/flow_dissector.h
+++ b/include/net/flow_dissector.h
@@ -14,6 +14,7 @@ struct flow_dissector_key_control {
        u16     addr_type;
        u32     is_fragment:1;
        u32     first_frag:1;
+       u32     encapsulation:1;
 };
 
 /**
@@ -127,6 +128,7 @@ enum flow_dissector_key_id {
 #define FLOW_DISSECTOR_F_PARSE_1ST_FRAG                BIT(0)
 #define FLOW_DISSECTOR_F_STOP_AT_L3            BIT(1)
 #define FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL    BIT(2)
+#define FLOW_DISSECTOR_F_STOP_AT_ENCAP         BIT(3)
 
 struct flow_dissector_key {
        enum flow_dissector_key_id key_id;

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 094e34354627b6b001f17ce97d8d86435d945648..8d890132e2d78ffd85c4b25b0b97d9781f3c9cfc 100644 (file)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -397,6 +397,11 @@ ip_proto_again:
                        proto = eth->h_proto;
                        nhoff += sizeof(*eth);
                }
+
+               key_control->encapsulation = 1;
+               if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)
+                       goto out_good;
+
                goto again;
        }
        case NEXTHDR_HOP:
@@ -444,9 +449,19 @@ ip_proto_again:
        }
        case IPPROTO_IPIP:
                proto = htons(ETH_P_IP);
+
+               key_control->encapsulation = 1;
+               if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)
+                       goto out_good;
+
                goto ip;
        case IPPROTO_IPV6:
                proto = htons(ETH_P_IPV6);
+
+               key_control->encapsulation = 1;
+               if (flags & FLOW_DISSECTOR_F_STOP_AT_ENCAP)
+                       goto out_good;
+
                goto ipv6;
        case IPPROTO_MPLS:
                proto = htons(ETH_P_MPLS_UC);