netfilter: flowtable: fetch stats only if flow is still alive
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v3 1/9 netfilter: flowtable: fetch stats only if flow is still alive
Do not fetch statistics if flow has expired since it might not in hardware anymore. After this update, remove the FLOW_OFFLOAD_HW_DYING check from nf_flow_offload_stats() since this flag is never set on.
---
v3: Rebase on top of nf-next.
net/netfilter/nf_flow_table_core.c | 5 ++--- net/netfilter/nf_flow_table_offload.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-)
net/netfilter/nf_flow_table_core.c +2 -3
@@ -348,9 +348,6 @@ static void nf_flow_offload_gc_step(struct flow_offload *flow, void *data) {struct nf_flowtable *flow_table = data; -if (flow->flags &FLOW_OFFLOAD_HW ) -nf_flow_offload_stats (flow_table, flow); -if (nf_flow_has_expired (flow) ||nf_ct_is_dying (flow->ct) || (flow->flags & (FLOW_OFFLOAD_DYING |FLOW_OFFLOAD_TEARDOWN ))) {if (flow->flags &FLOW_OFFLOAD_HW ) {
@@ -361,6 +358,8 @@ static void nf_flow_offload_gc_step(struct flow_offload *flow, void *data) }else {flow_offload_del (flow_table, flow); } + }else if (flow->flags &FLOW_OFFLOAD_HW ) { +nf_flow_offload_stats (flow_table, flow); } }
net/netfilter/nf_flow_table_offload.c +1 -2
@@ -784,8 +784,7 @@ void nf_flow_offload_stats(struct nf_flowtable *flowtable,__s32 delta; delta =nf_flow_timeout_delta (flow->timeout); -if ((delta >= (9 *NF_FLOW_TIMEOUT ) /10 ) || - flow->flags &FLOW_OFFLOAD_HW_DYING ) +if ((delta >= (9 *NF_FLOW_TIMEOUT ) /10 ))return ; offload =kzalloc (sizeof (struct flow_offload_work ),GFP_ATOMIC );
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH v2 2/9 netfilter: flowtable: restrict flow dissector match on meta ingress device
Set on FLOW_DISSECTOR_KEY_META meta key using flow tuple ingress interface.
---
v2: rebased on top of nf-next.
net/netfilter/nf_flow_table_offload.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/netfilter/nf_flow_table_offload.c +7 -1
@@ -24,6 +24,7 @@ struct flow_offload_work { };struct nf_flow_key { +struct flow_dissector_key_meta meta;struct flow_dissector_key_control control;struct flow_dissector_key_basic basic;union {
@@ -55,6 +56,7 @@ static int nf_flow_rule_match(struct nf_flow_match *match,struct nf_flow_key *mask = &match->mask;struct nf_flow_key *key = &match->key; +NF_FLOW_DISSECTOR (match,FLOW_DISSECTOR_KEY_META , meta);NF_FLOW_DISSECTOR (match,FLOW_DISSECTOR_KEY_CONTROL , control);NF_FLOW_DISSECTOR (match,FLOW_DISSECTOR_KEY_BASIC , basic);NF_FLOW_DISSECTOR (match,FLOW_DISSECTOR_KEY_IPV4_ADDRS , ipv4);
@@ -62,6 +64,9 @@ static int nf_flow_rule_match(struct nf_flow_match *match,NF_FLOW_DISSECTOR (match,FLOW_DISSECTOR_KEY_TCP , tcp);NF_FLOW_DISSECTOR (match,FLOW_DISSECTOR_KEY_PORTS , tp); + key->meta.ingress_ifindex = tuple->iifidx; + mask->meta.ingress_ifindex =0xffffffff ; +switch (tuple->l3proto) {case AF_INET : key->control.addr_type =FLOW_DISSECTOR_KEY_IPV4_ADDRS ;
@@ -105,7 +110,8 @@ static int nf_flow_rule_match(struct nf_flow_match *match, key->tp.dst = tuple->dst_port; mask->tp.dst =0xffff ; - match->dissector.used_keys |=BIT (FLOW_DISSECTOR_KEY_CONTROL ) | + match->dissector.used_keys |=BIT (FLOW_DISSECTOR_KEY_META ) | +BIT (FLOW_DISSECTOR_KEY_CONTROL ) |BIT (FLOW_DISSECTOR_KEY_BASIC ) |BIT (FLOW_DISSECTOR_KEY_PORTS );return 0 ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH v2 3/9 netfilter: flowtable: add nf_flow_offload_work_alloc()
In reply to Pablo Neira AyusoAdd helper function to allocate and initialize flow offload work and use it to consolidate existing code.
---
v2: rebase on top of nf-next.
net/netfilter/nf_flow_table_offload.c | 38 ++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 16 deletions(-)
net/netfilter/nf_flow_table_offload.c +22 -16
@@ -748,21 +748,35 @@ static void flow_offload_queue_work(struct flow_offload_work *offload)schedule_work (&nf_flow_offload_work); } -void nf_flow_offload_add (struct nf_flowtable *flowtable, -struct flow_offload *flow) +static struct flow_offload_work * +nf_flow_offload_work_alloc (struct nf_flowtable *flowtable, +struct flow_offload *flow,unsigned int cmd) {struct flow_offload_work *offload; offload =kmalloc (sizeof (struct flow_offload_work ),GFP_ATOMIC );if (!offload) -return ; +return NULL ; - offload->cmd =FLOW_CLS_REPLACE ; + offload->cmd = cmd; offload->flow = flow; offload->priority = flowtable->priority; offload->flowtable = flowtable; - flow->flags |=FLOW_OFFLOAD_HW ; +return offload; +} + + +void nf_flow_offload_add (struct nf_flowtable *flowtable, +struct flow_offload *flow) +{ +struct flow_offload_work *offload; + + offload =nf_flow_offload_work_alloc (flowtable, flow,FLOW_CLS_REPLACE ); +if (!offload) +return ; + + flow->flags |=FLOW_OFFLOAD_HW ;flow_offload_queue_work (offload); }
@@ -771,15 +785,11 @@ void nf_flow_offload_del(struct nf_flowtable *flowtable, {struct flow_offload_work *offload; - offload =kzalloc (sizeof (struct flow_offload_work ),GFP_ATOMIC ); + offload =nf_flow_offload_work_alloc (flowtable, flow,FLOW_CLS_DESTROY );if (!offload)return ; - offload->cmd =FLOW_CLS_DESTROY ; - offload->flow = flow; - offload->flow->flags |=FLOW_OFFLOAD_HW_DYING ; - offload->flowtable = flowtable; - + flow->flags |=FLOW_OFFLOAD_HW_DYING ;flow_offload_queue_work (offload); }
@@ -793,14 +803,10 @@ void nf_flow_offload_stats(struct nf_flowtable *flowtable,if ((delta >= (9 *NF_FLOW_TIMEOUT ) /10 ))return ; - offload =kzalloc (sizeof (struct flow_offload_work ),GFP_ATOMIC ); + offload =nf_flow_offload_work_alloc (flowtable, flow,FLOW_CLS_STATS );if (!offload)return ; - offload->cmd =FLOW_CLS_STATS ; - offload->flow = flow; - offload->flowtable = flowtable; -flow_offload_queue_work (offload); }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH v2 4/9 netfilter: flowtable: remove dying bit, use teardown bit instead
In reply to Pablo Neira AyusoThe dying bit removes the conntrack entry if the netdev that owns this flow is going down. Instead, use the teardown mechanism to push back the flow to conntrack to let the classic software path decide what to do with it.
---
v2: rebase on top of nf-next.
include/net/netfilter/nf_flow_table.h | 5 ----- net/netfilter/nf_flow_table_core.c | 8 +++----- 2 files changed, 3 insertions(+), 10 deletions(-)
include/net/netfilter/nf_flow_table.h +0 -5
@@ -85,7 +85,6 @@ struct flow_offload_tuple_rhash {#define FLOW_OFFLOAD_SNAT 0x1#define FLOW_OFFLOAD_DNAT 0x2 -#define FLOW_OFFLOAD_DYING 0x4#define FLOW_OFFLOAD_TEARDOWN 0x8#define FLOW_OFFLOAD_HW 0x10#define FLOW_OFFLOAD_HW_DYING 0x20
@@ -134,10 +133,6 @@ int nf_flow_table_init(struct nf_flowtable *flow_table);void nf_flow_table_free (struct nf_flowtable *flow_table);void flow_offload_teardown (struct flow_offload *flow); -static inline void flow_offload_dead (struct flow_offload *flow) -{ - flow->flags |=FLOW_OFFLOAD_DYING ; -} int nf_flow_snat_port(const struct flow_offload *flow, struct sk_buff *skb, unsigned int thoff,
net/netfilter/nf_flow_table_core.c +3 -5
@@ -182,8 +182,6 @@ void flow_offload_free(struct flow_offload *flow)default :break ; } -if (flow->flags &FLOW_OFFLOAD_DYING ) -nf_ct_delete (flow->ct,0 ,0 );nf_ct_put (flow->ct);kfree_rcu (flow, rcu_head); }
@@ -300,7 +298,7 @@ flow_offload_lookup(struct nf_flowtable *flow_table, dir = tuplehash->tuple.dir; flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]); -if (flow->flags & (FLOW_OFFLOAD_DYING |FLOW_OFFLOAD_TEARDOWN )) +if (flow->flags &FLOW_OFFLOAD_TEARDOWN )return NULL ;if (unlikely (nf_ct_is_dying (flow->ct)))
@@ -349,7 +347,7 @@ static void nf_flow_offload_gc_step(struct flow_offload *flow, void *data)struct nf_flowtable *flow_table = data;if (nf_flow_has_expired (flow) ||nf_ct_is_dying (flow->ct) || - (flow->flags & (FLOW_OFFLOAD_DYING |FLOW_OFFLOAD_TEARDOWN ))) { + (flow->flags &FLOW_OFFLOAD_TEARDOWN )) {if (flow->flags &FLOW_OFFLOAD_HW ) {if (!(flow->flags &FLOW_OFFLOAD_HW_DYING ))nf_flow_offload_del (flow_table, flow);
@@ -523,7 +521,7 @@ static void nf_flow_table_do_cleanup(struct flow_offload *flow, void *data)if (net_eq (nf_ct_net (flow->ct),dev_net (dev)) && (flow->tuplehash[0 ].tuple.iifidx == dev->ifindex || flow->tuplehash[1 ].tuple.iifidx == dev->ifindex)) -flow_offload_dead (flow); +flow_offload_teardown (flow); } static void nf_flow_table_iterate_cleanup(struct nf_flowtable *flowtable,
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 6/9 netfilter: flowtable: add nf_flowtable_hw_offload() helper function
In reply to Pablo Neira AyusoThis function checks for the NF_FLOWTABLE_HW_OFFLOAD flag, meaning that the flowtable hardware offload is enabled.
--- include/net/netfilter/nf_flow_table.h | 5 +++++ net/netfilter/nf_flow_table_core.c | 2 +- net/netfilter/nf_flow_table_offload.c | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-)
include/net/netfilter/nf_flow_table.h +5 -0
@@ -47,6 +47,11 @@ struct nf_flowtable {possible_net_t net; }; +static inline bool nf_flowtable_hw_offload (struct nf_flowtable *flowtable) +{ +return flowtable->flags &NF_FLOWTABLE_HW_OFFLOAD ; +} +enum flow_offload_tuple_dir {FLOW_OFFLOAD_DIR_ORIGINAL =IP_CT_DIR_ORIGINAL ,FLOW_OFFLOAD_DIR_REPLY =IP_CT_DIR_REPLY ,
net/netfilter/nf_flow_table_core.c +1 -1
@@ -243,7 +243,7 @@ int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow)return err; } -if (flow_table->flags &NF_FLOWTABLE_HW_OFFLOAD ) +if (nf_flowtable_hw_offload (flow_table))nf_flow_offload_add (flow_table, flow);return 0 ;
net/netfilter/nf_flow_table_offload.c +2 -2
@@ -812,7 +812,7 @@ void nf_flow_offload_stats(struct nf_flowtable *flowtable,void nf_flow_table_offload_flush (struct nf_flowtable *flowtable) { -if (flowtable->flags &NF_FLOWTABLE_HW_OFFLOAD ) +if (nf_flowtable_hw_offload (flowtable))flush_work (&nf_flow_offload_work); }
@@ -849,7 +849,7 @@ int nf_flow_table_offload_setup(struct nf_flowtable *flowtable,struct flow_block_offload bo = {};int err; -if (!(flowtable->flags &NF_FLOWTABLE_HW_OFFLOAD )) +if (!nf_flowtable_hw_offload (flowtable))return 0 ;if (!dev->netdev_ops->ndo_setup_tc)
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 8/9 netfilter: flowtable: add flow_offload_tuple() helper
In reply to Pablo Neira AyusoConsolidate code to configure the flow_cls_offload structure into one helper function.
--- net/netfilter/nf_flow_table_offload.c | 47 ++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 23 deletions(-)
net/netfilter/nf_flow_table_offload.c +24 -23
@@ -592,23 +592,25 @@ static void nf_flow_offload_init(struct flow_cls_offload *cls_flow, cls_flow->cookie = (unsigned long )tuple; } -static int flow_offload_tuple_add (struct flow_offload_work *offload, -struct nf_flow_rule *flow_rule, -enum flow_offload_tuple_dir dir) +static int flow_offload_tuple (struct nf_flowtable *flowtable, +struct flow_offload *flow, +struct nf_flow_rule *flow_rule, +enum flow_offload_tuple_dir dir, +int priority,int cmd, +struct list_head *block_cb_list) { -struct nf_flowtable *flowtable = offload->flowtable;struct flow_cls_offload cls_flow = {};struct flow_block_cb *block_cb;struct netlink_ext_ack extack;__be16 proto =ETH_P_ALL ;int err, i =0 ; -nf_flow_offload_init (&cls_flow, proto, offload->priority, -FLOW_CLS_REPLACE , - &offload->flow->tuplehash[dir].tuple, &extack); - cls_flow.rule = flow_rule->rule; +nf_flow_offload_init (&cls_flow, proto, priority, cmd, + &flow->tuplehash[dir].tuple, &extack); +if (cmd ==FLOW_CLS_REPLACE ) + cls_flow.rule = flow_rule->rule; -list_for_each_entry (block_cb, &flowtable->flow_block.cb_list, list) { +list_for_each_entry (block_cb, block_cb_list, list) { err = block_cb->cb (TC_SETUP_CLSFLOWER , &cls_flow, block_cb->cb_priv);if (err <0 )
@@ -619,24 +621,23 @@ static int flow_offload_tuple_add(struct flow_offload_work *offload,return i; } +EXPORT_SYMBOL_GPL (flow_offload_tuple); + +static int flow_offload_tuple_add (struct flow_offload_work *offload, +struct nf_flow_rule *flow_rule, +enum flow_offload_tuple_dir dir) +{ +return flow_offload_tuple (offload->flowtable, offload->flow, flow_rule, + dir, offload->priority,FLOW_CLS_REPLACE , + &offload->flowtable->flow_block.cb_list); +}static void flow_offload_tuple_del (struct flow_offload_work *offload,enum flow_offload_tuple_dir dir) { -struct nf_flowtable *flowtable = offload->flowtable; -struct flow_cls_offload cls_flow = {}; -struct flow_block_cb *block_cb; -struct netlink_ext_ack extack; -__be16 proto =ETH_P_ALL ; - -nf_flow_offload_init (&cls_flow, proto, offload->priority, -FLOW_CLS_DESTROY , - &offload->flow->tuplehash[dir].tuple, &extack); - -list_for_each_entry (block_cb, &flowtable->flow_block.cb_list, list) - block_cb->cb (TC_SETUP_CLSFLOWER , &cls_flow, block_cb->cb_priv); - -set_bit (NF_FLOW_HW_DEAD , &offload->flow->flags); +flow_offload_tuple (offload->flowtable, offload->flow,NULL , + dir, offload->priority,FLOW_CLS_DESTROY , + &offload->flowtable->flow_block.cb_list); } static int flow_offload_rule_add(struct flow_offload_work *offload,
Signature · 1 line
2.11.0
Re: [PATCH nf-next 8/9] netfilter: flowtable: add flow_offload_tuple() helper
Quoted 48 lines · Pablo Neira Ayuso
Consolidate code to configure the
flow_cls_offloadstructure into one helper function.Signed-off-by Pablo Neira Ayuso <[email protected]>--- net/netfilter/nf_flow_table_offload.c | 47 ++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 23 deletions(-)net/netfilter/nf_flow_table_offload.c +11
-9@@ -592,23 +592,25 @@ static void nf_flow_offload_init(struct flow_cls_offload *cls_flow, cls_flow->cookie = (unsigned long )tuple; } -static int flow_offload_tuple_add (struct flow_offload_work *offload, -struct nf_flow_rule *flow_rule, -enum flow_offload_tuple_dir dir) +static int flow_offload_tuple (struct nf_flowtable *flowtable, +struct flow_offload *flow, +struct nf_flow_rule *flow_rule, +enum flow_offload_tuple_dir dir, +int priority,int cmd, +struct list_head *block_cb_list) { -struct nf_flowtable *flowtable = offload->flowtable;struct flow_cls_offload cls_flow = {};struct flow_block_cb *block_cb;struct netlink_ext_ack extack;__be16 proto =ETH_P_ALL ;int err, i =0 ; -nf_flow_offload_init (&cls_flow, proto, offload->priority, -FLOW_CLS_REPLACE , - &offload->flow->tuplehash[dir].tuple, &extack); - cls_flow.rule = flow_rule->rule; +nf_flow_offload_init (&cls_flow, proto, priority, cmd, + &flow->tuplehash[dir].tuple, &extack); +if (cmd ==FLOW_CLS_REPLACE ) + cls_flow.rule = flow_rule->rule; -list_for_each_entry (block_cb, &flowtable->flow_block.cb_list, list) { +list_for_each_entry (block_cb, block_cb_list, list) { err = block_cb->cb (TC_SETUP_CLSFLOWER , &cls_flow, block_cb->cb_priv);if (err <0 )
net/netfilter/nf_flow_table_offload.c static int flow_offload_tuple_add(struct flow_offload_work *offload, · line 624
Quoted 4 lines
net/netfilter/nf_flow_table_offload.c +1
-0@@ -619,24 +621,23 @@ static int flow_offload_tuple_add(struct flow_offload_work *offload,return i; } +EXPORT_SYMBOL_GPL (flow_offload_tuple);
flow_offload_tuple is a static EXPORT_SYMBOL_GPL?
Quoted 33 lines
net/netfilter/nf_flow_table_offload.c +12
-14+ +static int flow_offload_tuple_add (struct flow_offload_work *offload, +struct nf_flow_rule *flow_rule, +enum flow_offload_tuple_dir dir) +{ +return flow_offload_tuple (offload->flowtable, offload->flow, flow_rule, + dir, offload->priority,FLOW_CLS_REPLACE , + &offload->flowtable->flow_block.cb_list); +}static void flow_offload_tuple_del (struct flow_offload_work *offload,enum flow_offload_tuple_dir dir) { -struct nf_flowtable *flowtable = offload->flowtable; -struct flow_cls_offload cls_flow = {}; -struct flow_block_cb *block_cb; -struct netlink_ext_ack extack; -__be16 proto =ETH_P_ALL ; - -nf_flow_offload_init (&cls_flow, proto, offload->priority, -FLOW_CLS_DESTROY , - &offload->flow->tuplehash[dir].tuple, &extack); - -list_for_each_entry (block_cb, &flowtable->flow_block.cb_list, list) - block_cb->cb (TC_SETUP_CLSFLOWER , &cls_flow, block_cb->cb_priv); - -set_bit (NF_FLOW_HW_DEAD , &offload->flow->flags); +flow_offload_tuple (offload->flowtable, offload->flow,NULL , + dir, offload->priority,FLOW_CLS_DESTROY , + &offload->flowtable->flow_block.cb_list); } static int flow_offload_rule_add(struct flow_offload_work *offload,
Pablo Neira Ayuso
maintainerPATCH v2 5/9 netfilter: flowtable: use atomic bitwise operations for flow flags
In reply to Pablo Neira AyusoOriginally, all flow flag bits were set on only from the workqueue. With the introduction of the flow teardown state and hardware offload this is no longer true. Let's be safe and use atomic bitwise operation to operation with flow flags.
---
v2: rebase on top of nf-next.
include/net/netfilter/nf_flow_table.h | 16 +++++++++------- net/netfilter/nf_flow_table_core.c | 20 ++++++++++---------- net/netfilter/nf_flow_table_ip.c | 8 ++++---- net/netfilter/nf_flow_table_offload.c | 20 ++++++++++---------- 4 files changed, 33 insertions(+), 31 deletions(-)
include/net/netfilter/nf_flow_table.h +9 -7
@@ -83,12 +83,14 @@ struct flow_offload_tuple_rhash {struct flow_offload_tuple tuple; }; -#define FLOW_OFFLOAD_SNAT 0x1 -#define FLOW_OFFLOAD_DNAT 0x2 -#define FLOW_OFFLOAD_TEARDOWN 0x8 -#define FLOW_OFFLOAD_HW 0x10 -#define FLOW_OFFLOAD_HW_DYING 0x20 -#define FLOW_OFFLOAD_HW_DEAD 0x40 +enum nf_flow_flags { +NF_FLOW_SNAT , +NF_FLOW_DNAT , +NF_FLOW_TEARDOWN , +NF_FLOW_HW , +NF_FLOW_HW_DYING , +NF_FLOW_HW_DEAD , +};enum flow_offload_type {NF_FLOW_OFFLOAD_UNSPEC =0 ,
@@ -98,7 +100,7 @@ enum flow_offload_type {struct flow_offload {struct flow_offload_tuple_rhash tuplehash[FLOW_OFFLOAD_DIR_MAX ];struct nf_conn *ct; -u16 flags; +unsigned long flags;u16 type;u32 timeout;struct rcu_head rcu_head;
net/netfilter/nf_flow_table_core.c +10 -10
@@ -61,9 +61,9 @@ struct flow_offload *flow_offload_alloc(struct nf_conn *ct)flow_offload_fill_dir (flow,FLOW_OFFLOAD_DIR_REPLY );if (ct->status &IPS_SRC_NAT ) - flow->flags |=FLOW_OFFLOAD_SNAT ; +__set_bit (NF_FLOW_SNAT , &flow->flags);if (ct->status &IPS_DST_NAT ) - flow->flags |=FLOW_OFFLOAD_DNAT ; +__set_bit (NF_FLOW_DNAT , &flow->flags);return flow;
@@ -269,7 +269,7 @@ static void flow_offload_del(struct nf_flowtable *flow_table,if (nf_flow_has_expired (flow))flow_offload_fixup_ct (flow->ct); -else if (flow->flags &FLOW_OFFLOAD_TEARDOWN ) +else if (test_bit (NF_FLOW_TEARDOWN , &flow->flags))flow_offload_fixup_ct_timeout (flow->ct);flow_offload_free (flow);
@@ -277,7 +277,7 @@ static void flow_offload_del(struct nf_flowtable *flow_table,void flow_offload_teardown (struct flow_offload *flow) { - flow->flags |=FLOW_OFFLOAD_TEARDOWN ; +set_bit (NF_FLOW_TEARDOWN , &flow->flags);flow_offload_fixup_ct_state (flow->ct); }
@@ -298,7 +298,7 @@ flow_offload_lookup(struct nf_flowtable *flow_table, dir = tuplehash->tuple.dir; flow = container_of(tuplehash, struct flow_offload, tuplehash[dir]); -if (flow->flags &FLOW_OFFLOAD_TEARDOWN ) +if (test_bit (NF_FLOW_TEARDOWN , &flow->flags))return NULL ;if (unlikely (nf_ct_is_dying (flow->ct)))
@@ -347,16 +347,16 @@ static void nf_flow_offload_gc_step(struct flow_offload *flow, void *data)struct nf_flowtable *flow_table = data;if (nf_flow_has_expired (flow) ||nf_ct_is_dying (flow->ct) || - (flow->flags &FLOW_OFFLOAD_TEARDOWN )) { -if (flow->flags &FLOW_OFFLOAD_HW ) { -if (!(flow->flags &FLOW_OFFLOAD_HW_DYING )) +test_bit (NF_FLOW_TEARDOWN , &flow->flags)) { +if (test_bit (NF_FLOW_HW , &flow->flags)) { +if (!test_bit (NF_FLOW_HW_DYING , &flow->flags))nf_flow_offload_del (flow_table, flow); -else if (flow->flags &FLOW_OFFLOAD_HW_DEAD ) +else if (test_bit (NF_FLOW_HW_DEAD , &flow->flags))flow_offload_del (flow_table, flow); }else {flow_offload_del (flow_table, flow); } - }else if (flow->flags &FLOW_OFFLOAD_HW ) { + }else if (test_bit (NF_FLOW_HW , &flow->flags)) {nf_flow_offload_stats (flow_table, flow); } }
net/netfilter/nf_flow_table_ip.c +4 -4
@@ -144,11 +144,11 @@ static int nf_flow_nat_ip(const struct flow_offload *flow, struct sk_buff *skb, {struct iphdr *iph =ip_hdr (skb); -if (flow->flags &FLOW_OFFLOAD_SNAT && +if (test_bit (NF_FLOW_SNAT , &flow->flags) && (nf_flow_snat_port (flow, skb, thoff, iph->protocol, dir) <0 ||nf_flow_snat_ip (flow, skb, iph, thoff, dir) <0 ))return -1 ; -if (flow->flags &FLOW_OFFLOAD_DNAT && +if (test_bit (NF_FLOW_DNAT , &flow->flags) && (nf_flow_dnat_port (flow, skb, thoff, iph->protocol, dir) <0 ||nf_flow_dnat_ip (flow, skb, iph, thoff, dir) <0 ))return -1 ;
@@ -414,11 +414,11 @@ static int nf_flow_nat_ipv6(const struct flow_offload *flow,struct ipv6hdr *ip6h =ipv6_hdr (skb);unsigned int thoff =sizeof (*ip6h); -if (flow->flags &FLOW_OFFLOAD_SNAT && +if (test_bit (NF_FLOW_SNAT , &flow->flags) && (nf_flow_snat_port (flow, skb, thoff, ip6h->nexthdr, dir) <0 ||nf_flow_snat_ipv6 (flow, skb, ip6h, thoff, dir) <0 ))return -1 ; -if (flow->flags &FLOW_OFFLOAD_DNAT && +if (test_bit (NF_FLOW_DNAT , &flow->flags) && (nf_flow_dnat_port (flow, skb, thoff, ip6h->nexthdr, dir) <0 ||nf_flow_dnat_ipv6 (flow, skb, ip6h, thoff, dir) <0 ))return -1 ;
net/netfilter/nf_flow_table_offload.c +10 -10
@@ -450,16 +450,16 @@ int nf_flow_rule_route_ipv4(struct net *net, const struct flow_offload *flow, flow_offload_eth_dst(net, flow, dir, flow_rule) < 0)return -1 ; -if (flow->flags &FLOW_OFFLOAD_SNAT ) { +if (test_bit (NF_FLOW_SNAT , &flow->flags)) {flow_offload_ipv4_snat (net, flow, dir, flow_rule);flow_offload_port_snat (net, flow, dir, flow_rule); } -if (flow->flags &FLOW_OFFLOAD_DNAT ) { +if (test_bit (NF_FLOW_DNAT , &flow->flags)) {flow_offload_ipv4_dnat (net, flow, dir, flow_rule);flow_offload_port_dnat (net, flow, dir, flow_rule); } -if (flow->flags &FLOW_OFFLOAD_SNAT || - flow->flags &FLOW_OFFLOAD_DNAT ) +if (test_bit (NF_FLOW_SNAT , &flow->flags) || +test_bit (NF_FLOW_DNAT , &flow->flags))flow_offload_ipv4_checksum (net, flow, flow_rule);flow_offload_redirect (flow, dir, flow_rule);
@@ -476,11 +476,11 @@ int nf_flow_rule_route_ipv6(struct net *net, const struct flow_offload *flow, flow_offload_eth_dst(net, flow, dir, flow_rule) < 0)return -1 ; -if (flow->flags &FLOW_OFFLOAD_SNAT ) { +if (test_bit (NF_FLOW_SNAT , &flow->flags)) {flow_offload_ipv6_snat (net, flow, dir, flow_rule);flow_offload_port_snat (net, flow, dir, flow_rule); } -if (flow->flags &FLOW_OFFLOAD_DNAT ) { +if (test_bit (NF_FLOW_DNAT , &flow->flags)) {flow_offload_ipv6_dnat (net, flow, dir, flow_rule);flow_offload_port_dnat (net, flow, dir, flow_rule); }
@@ -636,7 +636,7 @@ static void flow_offload_tuple_del(struct flow_offload_work *offload,list_for_each_entry (block_cb, &flowtable->flow_block.cb_list, list) block_cb->cb (TC_SETUP_CLSFLOWER , &cls_flow, block_cb->cb_priv); - offload->flow->flags |=FLOW_OFFLOAD_HW_DEAD ; +set_bit (NF_FLOW_HW_DEAD , &offload->flow->flags); } static int flow_offload_rule_add(struct flow_offload_work *offload,
@@ -723,7 +723,7 @@ static void flow_offload_work_handler(struct work_struct *work)case FLOW_CLS_REPLACE : ret =flow_offload_work_add (offload);if (ret <0 ) - offload->flow->flags &= ~FLOW_OFFLOAD_HW ; +__clear_bit (NF_FLOW_HW , &offload->flow->flags);break ;case FLOW_CLS_DESTROY :flow_offload_work_del (offload);
@@ -776,7 +776,7 @@ void nf_flow_offload_add(struct nf_flowtable *flowtable,if (!offload)return ; - flow->flags |=FLOW_OFFLOAD_HW ; +__set_bit (NF_FLOW_HW , &flow->flags);flow_offload_queue_work (offload); }
@@ -789,7 +789,7 @@ void nf_flow_offload_del(struct nf_flowtable *flowtable,if (!offload)return ; - flow->flags |=FLOW_OFFLOAD_HW_DYING ; +set_bit (NF_FLOW_HW_DYING , &flow->flags);flow_offload_queue_work (offload); }
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 9/9 netfilter: flowtable: add nf_flow_table_offload_cmd()
In reply to Pablo Neira AyusoSplit nf_flow_table_offload_setup() in two functions to make it more maintainable.
--- net/netfilter/nf_flow_table_offload.c | 38 +++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 11 deletions(-)
net/netfilter/nf_flow_table_offload.c +27 -11
@@ -838,12 +838,12 @@ static int nf_flow_table_block_setup(struct nf_flowtable *flowtable,return err; } -int nf_flow_table_offload_setup (struct nf_flowtable *flowtable, -struct net_device *dev, -enum flow_block_command cmd) +static int nf_flow_table_offload_cmd (struct flow_block_offload *bo, +struct nf_flowtable *flowtable, +struct net_device *dev, +enum flow_block_command cmd, +struct netlink_ext_ack *extack) { -struct netlink_ext_ack extack = {}; -struct flow_block_offload bo = {};int err;if (!nf_flowtable_hw_offload (flowtable))
@@ -852,17 +852,33 @@ int nf_flow_table_offload_setup(struct nf_flowtable *flowtable,if (!dev->netdev_ops->ndo_setup_tc)return -EOPNOTSUPP ; - bo.net =dev_net (dev); - bo.block = &flowtable->flow_block; - bo.command = cmd; - bo.binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ; - bo.extack = &extack; -INIT_LIST_HEAD (&bo.cb_list); +memset (bo,0 ,sizeof (*bo)); + bo->net =dev_net (dev); + bo->block = &flowtable->flow_block; + bo->command = cmd; + bo->binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ; + bo->extack = extack; +INIT_LIST_HEAD (&bo->cb_list); err = dev->netdev_ops->ndo_setup_tc (dev,TC_SETUP_FT , &bo);if (err <0 )return err; +return 0 ; +} + +int nf_flow_table_offload_setup (struct nf_flowtable *flowtable, +struct net_device *dev, +enum flow_block_command cmd) +{ +struct netlink_ext_ack extack = {}; +struct flow_block_offload bo; +int err; + + err =nf_flow_table_offload_cmd (&bo, flowtable, dev, cmd, &extack); +if (err <0 ) +return err; +return nf_flow_table_block_setup (flowtable, &bo, cmd); }EXPORT_SYMBOL_GPL (nf_flow_table_offload_setup);
Signature · 1 line
2.11.0
Re: [PATCH nf-next 9/9] netfilter: flowtable: add nf_flow_table_offload_cmd()
Quoted 39 lines · Pablo Neira Ayuso
Split
nf_flow_table_offload_setup()in two functions to make it more maintainable.Signed-off-by Pablo Neira Ayuso <[email protected]>--- net/netfilter/nf_flow_table_offload.c | 38 +++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 11 deletions(-)net/netfilter/nf_flow_table_offload.c +5
-10@@ -838,12 +838,12 @@ static int nf_flow_table_block_setup(struct nf_flowtable *flowtable,return err; } -int nf_flow_table_offload_setup (struct nf_flowtable *flowtable, -struct net_device *dev, -enum flow_block_command cmd) +static int nf_flow_table_offload_cmd (struct flow_block_offload *bo, +struct nf_flowtable *flowtable, +struct net_device *dev, +enum flow_block_command cmd, +struct netlink_ext_ack *extack) { -struct netlink_ext_ack extack = {}; -struct flow_block_offload bo = {};int err;if (!nf_flowtable_hw_offload (flowtable))@@ -852,17 +852,33 @@ int nf_flow_table_offload_setup(struct nf_flowtable *flowtable,if (!dev->netdev_ops->ndo_setup_tc)return -EOPNOTSUPP ; - bo.net =dev_net (dev); - bo.block = &flowtable->flow_block; - bo.command = cmd; - bo.binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ; - bo.extack = &extack;
net/netfilter/nf_flow_table_offload.c int nf_flow_table_offload_setup(struct nf_flowtable *flowtable, · line 863
Quoted 10 lines
net/netfilter/nf_flow_table_offload.c +7
-1-INIT_LIST_HEAD (&bo.cb_list); +memset (bo,0 ,sizeof (*bo)); + bo->net =dev_net (dev); + bo->block = &flowtable->flow_block; + bo->command = cmd; + bo->binder_type =FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS ; + bo->extack = extack; +INIT_LIST_HEAD (&bo->cb_list); err = dev->netdev_ops->ndo_setup_tc (dev,TC_SETUP_FT , &bo);
This callback should be :
err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_FT, bo);
Quoted 21 lines
net/netfilter/nf_flow_table_offload.c +15
-0if (err <0 )return err; +return 0 ; +} + +int nf_flow_table_offload_setup (struct nf_flowtable *flowtable, +struct net_device *dev, +enum flow_block_command cmd) +{ +struct netlink_ext_ack extack = {}; +struct flow_block_offload bo; +int err; + + err =nf_flow_table_offload_cmd (&bo, flowtable, dev, cmd, &extack); +if (err <0 ) +return err; +return nf_flow_table_block_setup (flowtable, &bo, cmd); }EXPORT_SYMBOL_GPL (nf_flow_table_offload_setup);
Pablo Neira Ayuso
maintainerPATCH v2 7/9 netfilter: flowtable: refresh flow if hardware offload fails
In reply to Pablo Neira AyusoIf nf_flow_offload_add() fails to add the flow to hardware, then the NF_FLOW_HW_REFRESH flag bit is set and the flow remains in the flowtable software path.
If flowtable hardware offload is enabled, this patch enqueues a new request to offload this flow to hardware.
---
v2: rebase on top of nf-next.
include/net/netfilter/nf_flow_table.h | 1 + net/netfilter/nf_flow_table_core.c | 4 +++- net/netfilter/nf_flow_table_ip.c | 13 +++++++++++++ net/netfilter/nf_flow_table_offload.c | 14 +++++--------- 4 files changed, 22 insertions(+), 10 deletions(-)
include/net/netfilter/nf_flow_table.h +1 -0
@@ -95,6 +95,7 @@ enum nf_flow_flags {NF_FLOW_HW ,NF_FLOW_HW_DYING ,NF_FLOW_HW_DEAD , + NF_FLOW_HW_REFRESH, }; enum flow_offload_type {
net/netfilter/nf_flow_table_core.c +3 -1
@@ -243,8 +243,10 @@ int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow)return err; } -if (nf_flowtable_hw_offload (flow_table)) +if (nf_flowtable_hw_offload (flow_table)) { +__set_bit (NF_FLOW_HW , &flow->flags);nf_flow_offload_add (flow_table, flow); + }return 0 ; }
net/netfilter/nf_flow_table_ip.c +13 -0
@@ -232,6 +232,13 @@ static unsigned int nf_flow_xmit_xfrm(struct sk_buff *skb,return NF_STOLEN ; } +static bool nf_flow_offload_refresh (struct nf_flowtable *flow_table, +struct flow_offload *flow) +{ +return nf_flowtable_hw_offload (flow_table) && +test_and_clear_bit (NF_FLOW_HW_REFRESH , &flow->flags); +} +unsigned int nf_flow_offload_ip_hook (void *priv,struct sk_buff *skb,const struct nf_hook_state *state)
@@ -272,6 +279,9 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,if (nf_flow_state_check (flow,ip_hdr (skb)->protocol, skb, thoff))return NF_ACCEPT ; +if (unlikely (nf_flow_offload_refresh (flow_table, flow))) +nf_flow_offload_add (flow_table, flow); +if (nf_flow_offload_dst_check (&rt->dst)) {flow_offload_teardown (flow);return NF_ACCEPT ;
@@ -498,6 +508,9 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb, sizeof(*ip6h)))return NF_ACCEPT ; +if (unlikely (nf_flow_offload_refresh (flow_table, flow))) +nf_flow_offload_add (flow_table, flow); +if (nf_flow_offload_dst_check (&rt->dst)) {flow_offload_teardown (flow);return NF_ACCEPT ;
net/netfilter/nf_flow_table_offload.c +5 -9
@@ -654,20 +654,20 @@ static int flow_offload_rule_add(struct flow_offload_work *offload,return 0 ; } -static int flow_offload_work_add (struct flow_offload_work *offload) +static void flow_offload_work_add (struct flow_offload_work *offload) {struct nf_flow_rule *flow_rule[FLOW_OFFLOAD_DIR_MAX ];int err; err =nf_flow_offload_alloc (offload, flow_rule);if (err <0 ) -return -ENOMEM ; +return ; err =flow_offload_rule_add (offload, flow_rule); +if (err <0 ) +set_bit (NF_FLOW_HW_REFRESH , &offload->flow->flags);nf_flow_offload_destroy (flow_rule); - -return err; }static void flow_offload_work_del (struct flow_offload_work *offload)
@@ -712,7 +712,6 @@ static void flow_offload_work_handler(struct work_struct *work) {struct flow_offload_work *offload, *next;LIST_HEAD (offload_pending_list); -int ret;spin_lock_bh (&flow_offload_pending_list_lock);list_replace_init (&flow_offload_pending_list, &offload_pending_list);
@@ -721,9 +720,7 @@ static void flow_offload_work_handler(struct work_struct *work)list_for_each_entry_safe (offload, next, &offload_pending_list, list) {switch (offload->cmd) {case FLOW_CLS_REPLACE : - ret =flow_offload_work_add (offload); -if (ret <0 ) -__clear_bit (NF_FLOW_HW , &offload->flow->flags); +flow_offload_work_add (offload);break ;case FLOW_CLS_DESTROY :flow_offload_work_del (offload);
@@ -776,7 +773,6 @@ void nf_flow_offload_add(struct nf_flowtable *flowtable,if (!offload)return ; -__set_bit (NF_FLOW_HW , &flow->flags);flow_offload_queue_work (offload); }
Signature · 1 line
2.11.0