OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net: sched: cls_u32: use block instead of q in tc_u_common 

tc_u_common is now per-q. With blocks, it has to be converted to be
per-block.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2017-10-13 14:01:02 +02:00 committed by David S. Miller
parent c1954561cd
commit 7fa9d974f3
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/sched/cls_u32.c
View File

@ -93,7 +93,7 @@ struct tc_u_hnode {
struct tc_u_common { struct tc_u_common {
struct tc_u_hnode __rcu *hlist; struct tc_u_hnode __rcu *hlist;
struct Qdisc *q; struct tcf_block *block;
int refcnt; int refcnt;
struct idr handle_idr; struct idr handle_idr;
struct hlist_node hnode; struct hlist_node hnode;
@ -335,11 +335,7 @@ static struct hlist_head *tc_u_common_hash;
static unsigned int tc_u_hash(const struct tcf_proto *tp) static unsigned int tc_u_hash(const struct tcf_proto *tp)
{ {
struct net_device *dev = tp->q->dev_queue->dev; return hash_64((u64) tp->chain->block, U32_HASH_SHIFT);
u32 qhandle = tp->q->handle;
int ifindex = dev->ifindex;
return hash_64((u64)ifindex << 32 | qhandle, 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(const struct tcf_proto *tp)
@ -349,7 +345,7 @@ static struct tc_u_common *tc_u_common_find(const struct tcf_proto *tp)
h = tc_u_hash(tp); h = tc_u_hash(tp);
hlist_for_each_entry(tc, &tc_u_common_hash[h], hnode) { hlist_for_each_entry(tc, &tc_u_common_hash[h], hnode) {
if (tc->q == tp->q) if (tc->block == tp->chain->block)
return tc; return tc;
} }
return NULL; return NULL;
@ -378,7 +374,7 @@ static int u32_init(struct tcf_proto *tp)
kfree(root_ht); kfree(root_ht);
return -ENOBUFS; return -ENOBUFS;
} }
tp_c->q = tp->q; tp_c->block = tp->chain->block;
INIT_HLIST_NODE(&tp_c->hnode); INIT_HLIST_NODE(&tp_c->hnode);
idr_init(&tp_c->handle_idr); idr_init(&tp_c->handle_idr);