netfilter: flowtable: remove redundant field in flow_offload_work struct
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/2 netfilter: flowtable: remove redundant field in flow_offload_work struct
Already available through the flowtable object, remove it.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_flow_table_offload.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/netfilter/nf_flow_table_offload.c +6 -5
@@ -20,7 +20,6 @@ static struct workqueue_struct *nf_flow_offload_stats_wq;struct flow_offload_work {struct list_head list;enum flow_cls_command cmd; -int priority;struct nf_flowtable *flowtable;struct flow_offload *flow;struct work_struct work;
@@ -874,7 +873,8 @@ static int flow_offload_tuple_add(struct flow_offload_work *offload, enum flow_offload_tuple_dir dir) {return nf_flow_offload_tuple (offload->flowtable, offload->flow, - flow_rule, dir, offload->priority, + flow_rule, dir, + offload->flowtable->priority,FLOW_CLS_REPLACE ,NULL , &offload->flowtable->flow_block.cb_list); }
@@ -883,7 +883,8 @@ static void flow_offload_tuple_del(struct flow_offload_work *offload, enum flow_offload_tuple_dir dir) {nf_flow_offload_tuple (offload->flowtable, offload->flow,NULL , dir, - offload->priority,FLOW_CLS_DESTROY ,NULL , + offload->flowtable->priority, +FLOW_CLS_DESTROY ,NULL , &offload->flowtable->flow_block.cb_list); }
@@ -934,7 +935,8 @@ static void flow_offload_tuple_stats(struct flow_offload_work *offload, struct flow_stats *stats) {nf_flow_offload_tuple (offload->flowtable, offload->flow,NULL , dir, - offload->priority,FLOW_CLS_STATS , stats, + offload->flowtable->priority, +FLOW_CLS_STATS , stats, &offload->flowtable->flow_block.cb_list); }
@@ -1012,7 +1014,6 @@ nf_flow_offload_work_alloc(struct nf_flowtable *flowtable, offload->cmd = cmd; offload->flow = flow; - offload->priority = flowtable->priority; offload->flowtable = flowtable;INIT_WORK (&offload->work, flow_offload_work_handler);
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH 2/2 netfilter: flowtable: pass flowtable to nf_flow_table_iterate()
The flowtable object is already passed as argument to nf_flow_table_iterate(), do use not data pointer to pass flowtable.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_flow_table_core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
net/netfilter/nf_flow_table_core.c +10 -10
@@ -405,7 +405,8 @@ EXPORT_SYMBOL_GPL(flow_offload_lookup);static int nf_flow_table_iterate (struct nf_flowtable *flow_table, -void (*iter)(struct flow_offload *flow,void *data), +void (*iter)(struct nf_flowtable *flowtable, +struct flow_offload *flow,void *data),void *data) {struct flow_offload_tuple_rhash *tuplehash;
@@ -429,7 +430,7 @@ nf_flow_table_iterate(struct nf_flowtable *flow_table, flow = container_of(tuplehash, struct flow_offload, tuplehash[0]); -iter (flow, data); +iter (flow_table, flow, data); }rhashtable_walk_stop (&hti);rhashtable_walk_exit (&hti);
@@ -457,10 +458,9 @@ static bool nf_flow_has_stale_dst(struct flow_offload *flow)flow_offload_stale_dst (&flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY ].tuple); } -static void nf_flow_offload_gc_step (struct flow_offload *flow,void *data) +static void nf_flow_offload_gc_step (struct nf_flowtable *flow_table, +struct flow_offload *flow,void *data) { -struct nf_flowtable *flow_table = data; -if (nf_flow_has_expired (flow) ||nf_ct_is_dying (flow->ct) ||nf_flow_has_stale_dst (flow))
@@ -485,7 +485,7 @@ static void nf_flow_offload_work_gc(struct work_struct *work)struct nf_flowtable *flow_table; flow_table = container_of(work, struct nf_flowtable, gc_work.work); -nf_flow_table_iterate (flow_table, nf_flow_offload_gc_step, flow_table); +nf_flow_table_iterate (flow_table, nf_flow_offload_gc_step,NULL );queue_delayed_work (system_power_efficient_wq, &flow_table->gc_work,HZ ); }
@@ -601,7 +601,8 @@ int nf_flow_table_init(struct nf_flowtable *flowtable) }EXPORT_SYMBOL_GPL (nf_flow_table_init); -static void nf_flow_table_do_cleanup (struct flow_offload *flow,void *data) +static void nf_flow_table_do_cleanup (struct nf_flowtable *flow_table, +struct flow_offload *flow,void *data) {struct net_device *dev = data;
@@ -643,11 +644,10 @@ void nf_flow_table_free(struct nf_flowtable *flow_table)cancel_delayed_work_sync (&flow_table->gc_work);nf_flow_table_iterate (flow_table, nf_flow_table_do_cleanup,NULL ); -nf_flow_table_iterate (flow_table, nf_flow_offload_gc_step, flow_table); +nf_flow_table_iterate (flow_table, nf_flow_offload_gc_step,NULL );nf_flow_table_offload_flush (flow_table);if (nf_flowtable_hw_offload (flow_table)) -nf_flow_table_iterate (flow_table, nf_flow_offload_gc_step, - flow_table); +nf_flow_table_iterate (flow_table, nf_flow_offload_gc_step,NULL );rhashtable_destroy (&flow_table->rhashtable); }EXPORT_SYMBOL_GPL (nf_flow_table_free);
Signature · 1 line
2.30.2