flow_dissector: Fix to use new variables for port ranges in bpf hook

commit 59fb9b62fb6c929a756563152a89f39b07cf8893 upstream.

This patch applies new flag (FLOW_DISSECTOR_KEY_PORTS_RANGE) and
field (tp_range) to BPF flow dissector to generate appropriate flow
keys when classified by specified port ranges.

Fixes: 8ffb055beae5 ("cls_flower: Fix the behavior using port ranges with hw-offload")
Signed-off-by: Yoshiki Komachi <komachi.yoshiki@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Petar Penkov <ppenkov@google.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20200117070533.402240-2-komachi.yoshiki@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 2dbbb030fbedfa65698b2fa19cbd8c7c57f639ac..cc32d1dd78c33c8b4474e7490ee65f7f6d664036 100644 (file)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -834,10 +834,10 @@ static void __skb_flow_bpf_to_target(const struct bpf_flow_keys *flow_keys,
                                     struct flow_dissector *flow_dissector,
                                     void *target_container)
 {
+       struct flow_dissector_key_ports *key_ports = NULL;
        struct flow_dissector_key_control *key_control;
        struct flow_dissector_key_basic *key_basic;
        struct flow_dissector_key_addrs *key_addrs;
-       struct flow_dissector_key_ports *key_ports;
        struct flow_dissector_key_tags *key_tags;
 
        key_control = skb_flow_dissector_target(flow_dissector,
@@ -876,10 +876,17 @@ static void __skb_flow_bpf_to_target(const struct bpf_flow_keys *flow_keys,
                key_control->addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;
        }
 
-       if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_PORTS)) {
+       if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_PORTS))
                key_ports = skb_flow_dissector_target(flow_dissector,
                                                      FLOW_DISSECTOR_KEY_PORTS,
                                                      target_container);
+       else if (dissector_uses_key(flow_dissector,
+                                   FLOW_DISSECTOR_KEY_PORTS_RANGE))
+               key_ports = skb_flow_dissector_target(flow_dissector,
+                                                     FLOW_DISSECTOR_KEY_PORTS_RANGE,
+                                                     target_container);
+
+       if (key_ports) {
                key_ports->src = flow_keys->sport;
                key_ports->dst = flow_keys->dport;
        }