| Message ID | 20200117070533.402240-2-komachi.yoshiki@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | Fix the classification based on port ranges in bpf hook | expand |
On Thu, Jan 16, 2020 at 11:09 PM Yoshiki Komachi <komachi.yoshiki@gmail.com> wrote: > > 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> Acked-by: Petar Penkov <ppenkov@google.com>
Yoshiki Komachi wrote: > 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> > --- > net/core/flow_dissector.c | 11 +++++++++-- > 1 file changed, 9 insertions(+), 2 deletions(-) > > diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c > index 2dbbb03..cc32d1d 100644 LGTM Acked-by: John Fastabend <john.fastabend@gmail.com>
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 2dbbb03..cc32d1d 100644 --- 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; }
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> --- net/core/flow_dissector.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)