net: extract port range fields from fl_flow_key

So it can be used for port range filter offloading.

Co-developed-by: Volodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>
Signed-off-by: Volodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>
Signed-off-by: Maksym Glubokiy <maksym.glubokiy@plvision.eu>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h
index a4c6057c70972a81f880be521beedbad5bf1905f..0f9544a9bb9e6069144181513d658e05251591a4 100644 (file)
--- a/include/net/flow_dissector.h
+++ b/include/net/flow_dissector.h
@@ -178,6 +178,22 @@ struct flow_dissector_key_ports {
        };
 };
 
+/**
+ * struct flow_dissector_key_ports_range
+ * @tp: port number from packet
+ * @tp_min: min port number in range
+ * @tp_max: max port number in range
+ */
+struct flow_dissector_key_ports_range {
+       union {
+               struct flow_dissector_key_ports tp;
+               struct {
+                       struct flow_dissector_key_ports tp_min;
+                       struct flow_dissector_key_ports tp_max;
+               };
+       };
+};
+
 /**
  * flow_dissector_key_icmp:
  *             type: ICMP type

diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h
index 7ac313858037aebe2c2b89fdb8c26c5785748d30..a8d8512b7059ef4e04fb123b4de16dfafbf8489e 100644 (file)
--- a/include/net/flow_offload.h
+++ b/include/net/flow_offload.h
@@ -48,6 +48,10 @@ struct flow_match_ports {
        struct flow_dissector_key_ports *key, *mask;
 };
 
+struct flow_match_ports_range {
+       struct flow_dissector_key_ports_range *key, *mask;
+};
+
 struct flow_match_icmp {
        struct flow_dissector_key_icmp *key, *mask;
 };
@@ -94,6 +98,8 @@ void flow_rule_match_ip(const struct flow_rule *rule,
                        struct flow_match_ip *out);
 void flow_rule_match_ports(const struct flow_rule *rule,
                           struct flow_match_ports *out);
+void flow_rule_match_ports_range(const struct flow_rule *rule,
+                                struct flow_match_ports_range *out);
 void flow_rule_match_tcp(const struct flow_rule *rule,
                         struct flow_match_tcp *out);
 void flow_rule_match_icmp(const struct flow_rule *rule,

diff --git a/net/core/flow_offload.c b/net/core/flow_offload.c
index 929f6379a279897b5b307134d39bc0c7c8fd62ae..0d3075d3c8fb94b545ffcda6af9489b1b90ed323 100644 (file)
--- a/net/core/flow_offload.c
+++ b/net/core/flow_offload.c
@@ -125,6 +125,13 @@ void flow_rule_match_ports(const struct flow_rule *rule,
 }
 EXPORT_SYMBOL(flow_rule_match_ports);
 
+void flow_rule_match_ports_range(const struct flow_rule *rule,
+                                struct flow_match_ports_range *out)
+{
+       FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_PORTS_RANGE, out);
+}
+EXPORT_SYMBOL(flow_rule_match_ports_range);
+
 void flow_rule_match_tcp(const struct flow_rule *rule,
                         struct flow_match_tcp *out)
 {

diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c
index dcca70144dffdabc70da3ad9912426c0b2ae590d..1a1e34480b7e3b256752c704e11ce9482f961735 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -63,13 +63,7 @@ struct fl_flow_key {
        struct flow_dissector_key_ip ip;
        struct flow_dissector_key_ip enc_ip;
        struct flow_dissector_key_enc_opts enc_opts;
-       union {
-               struct flow_dissector_key_ports tp;
-               struct {
-                       struct flow_dissector_key_ports tp_min;
-                       struct flow_dissector_key_ports tp_max;
-               };
-       } tp_range;
+       struct flow_dissector_key_ports_range tp_range;
        struct flow_dissector_key_ct ct;
        struct flow_dissector_key_hash hash;
        struct flow_dissector_key_num_of_vlans num_of_vlans;