android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: sched: cls_u32: clean tc_u_common hashtable

Browse Source 
* calculate key *once*, not for each hash chain element
* let tc_u_hash() return the pointer to chain head rather than index -
callers are cleaner that way.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro
2018-10-08 06:22:39 -04:00
committed by David S. Miller
parent 07743ca5c9
commit 4895c42f62
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
net/sched/cls_u32.c
View File

@ -343,19 +343,16 @@ static void *tc_u_common_ptr(const struct tcf_proto *tp)
return block->q; return block->q;
} }
static unsigned int tc_u_hash(const struct tcf_proto *tp) static struct hlist_head *tc_u_hash(void *key)
{ {
return hash_ptr(tc_u_common_ptr(tp), U32_HASH_SHIFT); return tc_u_common_hash + hash_ptr(key, U32_HASH_SHIFT);
} }
static struct tc_u_common *tc_u_common_find(const struct tcf_proto *tp) static struct tc_u_common *tc_u_common_find(void *key)
{ {
struct tc_u_common *tc; struct tc_u_common *tc;
unsigned int h; hlist_for_each_entry(tc, tc_u_hash(key), hnode) {
if (tc->ptr == key)
h = tc_u_hash(tp);
hlist_for_each_entry(tc, &tc_u_common_hash[h], hnode) {
if (tc->ptr == tc_u_common_ptr(tp))
return tc; return tc;
} }
return NULL; return NULL;
@ -364,10 +361,8 @@ static struct tc_u_common *tc_u_common_find(const struct tcf_proto *tp)
static int u32_init(struct tcf_proto *tp) static int u32_init(struct tcf_proto *tp)
{ {
struct tc_u_hnode *root_ht; struct tc_u_hnode *root_ht;
struct tc_u_common *tp_c; void *key = tc_u_common_ptr(tp);
unsigned int h; struct tc_u_common *tp_c = tc_u_common_find(key);
tp_c = tc_u_common_find(tp);
root_ht = kzalloc(sizeof(*root_ht), GFP_KERNEL); root_ht = kzalloc(sizeof(*root_ht), GFP_KERNEL);
if (root_ht == NULL) if (root_ht == NULL)
@ -385,12 +380,11 @@ static int u32_init(struct tcf_proto *tp)
kfree(root_ht); kfree(root_ht);
return -ENOBUFS; return -ENOBUFS;
} }
tp_c->ptr = tc_u_common_ptr(tp); tp_c->ptr = key;
INIT_HLIST_NODE(&tp_c->hnode); INIT_HLIST_NODE(&tp_c->hnode);
idr_init(&tp_c->handle_idr); idr_init(&tp_c->handle_idr);
h = tc_u_hash(tp); hlist_add_head(&tp_c->hnode, tc_u_hash(key));
hlist_add_head(&tp_c->hnode, &tc_u_common_hash[h]);
} }
tp_c->refcnt++; tp_c->refcnt++;