[PATCH net-next 07/13] net: sched: implement functions to put and flush all chains
From: Vlad Buslov <hidden>
Date: 2018-09-06 12:33:25
Subsystem:
networking [general], tc subsystem, the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Jamal Hadi Salim, Jiri Pirko, Linus Torvalds
Extract code that flushes and puts all chains on tcf block to two standalone function to be shared with functions that locklessly get/put reference to block. Signed-off-by: Vlad Buslov <redacted> Acked-by: Jiri Pirko <redacted> --- net/sched/cls_api.c | 55 +++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 25 deletions(-)
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index c3c7d4e2f84c..58b2d8443f6a 100644
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c@@ -538,6 +538,31 @@ static void tcf_qdisc_put(struct Qdisc *q, bool rtnl_held) qdisc_put_unlocked(q); } +static void tcf_block_flush_all_chains(struct tcf_block *block) +{ + struct tcf_chain *chain; + + /* Hold a refcnt for all chains, so that they don't disappear + * while we are iterating. + */ + list_for_each_entry(chain, &block->chain_list, list) + tcf_chain_hold(chain); + + list_for_each_entry(chain, &block->chain_list, list) + tcf_chain_flush(chain); +} + +static void tcf_block_put_all_chains(struct tcf_block *block) +{ + struct tcf_chain *chain, *tmp; + + /* At this point, all the chains should have refcnt >= 1. */ + list_for_each_entry_safe(chain, tmp, &block->chain_list, list) { + tcf_chain_put_explicitly_created(chain); + tcf_chain_put(chain); + } +} + /* Find tcf block. * Set q, parent, cl when appropriate. */
@@ -795,8 +820,6 @@ EXPORT_SYMBOL(tcf_block_get); void tcf_block_put_ext(struct tcf_block *block, struct Qdisc *q, struct tcf_block_ext_info *ei) { - struct tcf_chain *chain, *tmp; - if (!block) return; tcf_chain0_head_change_cb_del(block, ei);
@@ -813,32 +836,14 @@ void tcf_block_put_ext(struct tcf_block *block, struct Qdisc *q, if (tcf_block_shared(block)) tcf_block_remove(block, block->net); - - if (!free_block) { - /* Hold a refcnt for all chains, so that they don't - * disappear while we are iterating. - */ - list_for_each_entry(chain, &block->chain_list, list) - tcf_chain_hold(chain); - - list_for_each_entry(chain, &block->chain_list, list) - tcf_chain_flush(chain); - } - + if (!free_block) + tcf_block_flush_all_chains(block); tcf_block_offload_unbind(block, q, ei); - if (free_block) { + if (free_block) kfree(block); - } else { - /* At this point, all the chains should have - * refcnt >= 1. - */ - list_for_each_entry_safe(chain, tmp, &block->chain_list, - list) { - tcf_chain_put_explicitly_created(chain); - tcf_chain_put(chain); - } - } + else + tcf_block_put_all_chains(block); } else { tcf_block_offload_unbind(block, q, ei); }
--
2.7.5