flow_dissector: Add flags argument to skb_flow_dissector functions

The flags argument will allow control of the dissection process (for
instance whether to parse beyond L3).

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

5 files changed, 9 insertions, 8 deletions

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 22f3d768b459..c3d9807cb34e 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -121,7 +121,8 @@ EXPORT_SYMBOL(__skb_flow_get_ports);
 bool __skb_flow_dissect(const struct sk_buff *skb,
                         struct flow_dissector *flow_dissector,
                         void *target_container,
-                        void *data, __be16 proto, int nhoff, int hlen)
+                        void *data, __be16 proto, int nhoff, int hlen,
+                        unsigned int flags)
 {
         struct flow_dissector_key_control *key_control;
         struct flow_dissector_key_basic *key_basic;
@@ -556,7 +557,7 @@ EXPORT_SYMBOL(flow_hash_from_keys);
 static inline u32 ___skb_get_hash(const struct sk_buff *skb,
                                   struct flow_keys *keys, u32 keyval)
 {
-        if (!skb_flow_dissect_flow_keys(skb, keys))
+        if (!skb_flow_dissect_flow_keys(skb, keys, 0))
                 return 0;
 
         return __flow_hash_from_keys(keys, keyval);
@@ -726,7 +727,7 @@ u32 skb_get_poff(const struct sk_buff *skb)
 {
         struct flow_keys keys;
 
-        if (!skb_flow_dissect_flow_keys(skb, &keys))
+        if (!skb_flow_dissect_flow_keys(skb, &keys, 0))
                 return 0;
 
         return __skb_get_poff(skb, skb->data, &keys, skb_headlen(skb));
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c
index 217127c3a3ef..d850fdc828f9 100644
--- a/net/ethernet/eth.c
+++ b/net/ethernet/eth.c
@@ -132,7 +132,7 @@ u32 eth_get_headlen(void *data, unsigned int len)
 
         /* parse any remaining L2/L3 headers, check for L4 */
         if (!skb_flow_dissect_flow_keys_buf(&keys, data, eth->h_proto,
-                                            sizeof(*eth), len))
+                                            sizeof(*eth), len, 0))
                 return max_t(u32, keys.control.thoff, sizeof(*eth));
 
         /* parse for any L4 headers */
diff --git a/net/sched/cls_flow.c b/net/sched/cls_flow.c
index bb2a0f529c1f..536838b657bf 100644
--- a/net/sched/cls_flow.c
+++ b/net/sched/cls_flow.c
@@ -301,7 +301,7 @@ static int flow_classify(struct sk_buff *skb, const struct tcf_proto *tp,
 
                 keymask = f->keymask;
                 if (keymask & FLOW_KEYS_NEEDED)
-                        skb_flow_dissect_flow_keys(skb, &flow_keys);
+                        skb_flow_dissect_flow_keys(skb, &flow_keys, 0);
 
                 for (n = 0; n < f->nkeys; n++) {
                         key = ffs(keymask) - 1;
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index 2f3d03f99487..57692947ebbe 100644
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -129,7 +129,7 @@ static int fl_classify(struct sk_buff *skb, const struct tcf_proto *tp,
          * so do it rather here.
          */
         skb_key.basic.n_proto = skb->protocol;
-        skb_flow_dissect(skb, &head->dissector, &skb_key);
+        skb_flow_dissect(skb, &head->dissector, &skb_key, 0);
 
         fl_set_masked_key(&skb_mkey, &skb_key, &head->mask);
 
diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index 665bde07916b..02bfd3d1c4f0 100644
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -170,13 +170,13 @@ static bool choke_match_flow(struct sk_buff *skb1,
 
         if (!choke_skb_cb(skb1)->keys_valid) {
                 choke_skb_cb(skb1)->keys_valid = 1;
-                skb_flow_dissect_flow_keys(skb1, &temp);
+                skb_flow_dissect_flow_keys(skb1, &temp, 0);
                 make_flow_keys_digest(&choke_skb_cb(skb1)->keys, &temp);
         }
 
         if (!choke_skb_cb(skb2)->keys_valid) {
                 choke_skb_cb(skb2)->keys_valid = 1;
-                skb_flow_dissect_flow_keys(skb2, &temp);
+                skb_flow_dissect_flow_keys(skb2, &temp, 0);
                 make_flow_keys_digest(&choke_skb_cb(skb2)->keys, &temp);
         }