net: extract port range fields from fl_flow_key

[ Upstream commit 83d85bb069152b790caad905fa53e6d50cd3734d ]

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>
Stable-dep-of: 3e5796862c69 ("flow_dissector: Fix handling of mixed port and port-range keys")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h
index 5eecf44369659358918bf732efc4667286191f14..4036063d047c26163c344be005e42a341dfb54d6 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 9a58274e621738d9d1d1d4f7306c5deb6a85b0bc..1ecb19a7ab0718464d7ad9a02a296605bf7cd3f1 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 8d958290b7d22ae56e8f39b3720384c4cfd9e06a..1e618398b9e81e4d751668a6a282f2b2b7b1bc04 100644 (file)
--- a/net/core/flow_offload.c
+++ b/net/core/flow_offload.c
@@ -104,6 +104,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 10d3dde238c6cf3accafec7f64b545ba751efc55..98f333aa0aac9d9b04e669770cd0fbdee860da28 100644 (file)
--- a/net/sched/cls_flower.c
+++ b/net/sched/cls_flower.c
@@ -61,13 +61,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;
 } __aligned(BITS_PER_LONG / 8); /* Ensure that we can do comparisons as longs. */