leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net_sched: prepare tcf_hashinfo_destroy() for netns support

Browse Source 
We only release the memory of the hashtable itself, not its
entries inside. This is not a problem yet since we only call
it in module release path, and module is refcount'ed by
actions. This would be a problem after we move the per module
hinfo into per netns in the latter patch.

Cc: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
WANG Cong
2016-02-22 15:57:52 -08:00
committed by David S. Miller
parent 555d5b70f1
commit 1d4150c02c
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/act_api.h
View File

@@ -65,11 +65,6 @@ static inline int tcf_hashinfo_init(struct tcf_hashinfo *hf, unsigned int mask)
return 0; return 0;
} }
static inline void tcf_hashinfo_destroy(struct tcf_hashinfo *hf)
{
kfree(hf->htab);
}
/* Update lastuse only if needed, to avoid dirtying a cache line. /* Update lastuse only if needed, to avoid dirtying a cache line.
* We use a temp variable to avoid fetching jiffies twice. * We use a temp variable to avoid fetching jiffies twice.
*/ */

32
net/sched/act_api.c
View File

@@ -69,7 +69,7 @@ int __tcf_hash_release(struct tc_action *a, bool bind, bool strict)
if (a->ops->cleanup) if (a->ops->cleanup)
a->ops->cleanup(a, bind); a->ops->cleanup(a, bind);
tcf_hash_destroy(a); tcf_hash_destroy(a);
ret = 1; ret = ACT_P_DELETED;
} }
} }
@@ -302,6 +302,32 @@ void tcf_hash_insert(struct tc_action *a)
} }
EXPORT_SYMBOL(tcf_hash_insert); EXPORT_SYMBOL(tcf_hash_insert);
static void tcf_hashinfo_destroy(const struct tc_action_ops *ops)
{
struct tcf_hashinfo *hinfo = ops->hinfo;
struct tc_action a = {
.ops = ops,
};
int i;
for (i = 0; i < hinfo->hmask + 1; i++) {
struct tcf_common *p;
struct hlist_node *n;
hlist_for_each_entry_safe(p, n, &hinfo->htab[i], tcfc_head) {
int ret;
a.priv = p;
ret = __tcf_hash_release(&a, false, true);
if (ret == ACT_P_DELETED)
module_put(ops->owner);
else if (ret < 0)
return;
}
}
kfree(hinfo->htab);
}
static LIST_HEAD(act_base); static LIST_HEAD(act_base);
static DEFINE_RWLOCK(act_mod_lock); static DEFINE_RWLOCK(act_mod_lock);
@@ -333,7 +359,7 @@ int tcf_register_action(struct tc_action_ops *act, unsigned int mask)
list_for_each_entry(a, &act_base, head) { list_for_each_entry(a, &act_base, head) {
if (act->type == a->type || (strcmp(act->kind, a->kind) == 0)) { if (act->type == a->type || (strcmp(act->kind, a->kind) == 0)) {
write_unlock(&act_mod_lock); write_unlock(&act_mod_lock);
tcf_hashinfo_destroy(act->hinfo); tcf_hashinfo_destroy(act);
kfree(act->hinfo); kfree(act->hinfo);
return -EEXIST; return -EEXIST;
} }
@@ -353,7 +379,7 @@ int tcf_unregister_action(struct tc_action_ops *act)
list_for_each_entry(a, &act_base, head) { list_for_each_entry(a, &act_base, head) {
if (a == act) { if (a == act) {
list_del(&act->head); list_del(&act->head);
tcf_hashinfo_destroy(act->hinfo); tcf_hashinfo_destroy(act);
kfree(act->hinfo); kfree(act->hinfo);
err = 0; err = 0;
break; break;