| From 59fb9b62fb6c929a756563152a89f39b07cf8893 Mon Sep 17 00:00:00 2001 |
| From: Yoshiki Komachi <komachi.yoshiki@gmail.com> |
| Date: Fri, 17 Jan 2020 16:05:32 +0900 |
| Subject: flow_dissector: Fix to use new variables for port ranges in bpf hook |
| |
| From: Yoshiki Komachi <komachi.yoshiki@gmail.com> |
| |
| 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> |
| |
| --- |
| net/core/flow_dissector.c | 11 +++++++++-- |
| 1 file changed, 9 insertions(+), 2 deletions(-) |
| |
| --- a/net/core/flow_dissector.c |
| +++ b/net/core/flow_dissector.c |
| @@ -834,10 +834,10 @@ static void __skb_flow_bpf_to_target(con |
| 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(con |
| 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; |
| } |