diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-10-24 06:13:17 -0700 | 
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-24 06:13:17 -0700 | 
| commit | 7c28bd0b8ec4d128bd7660671d1b626b0abc471f (patch) | |
| tree | dbde8ba53e2059dbd6cb19aca18133b33112ddf5 /net/core/rtnetlink.c | |
| parent | 8d5b2c084d2e71587e30a6ef528a8a8051e59dcd (diff) | |
rtnetlink: speedup rtnl_dump_ifinfo()
When handling large number of netdevice, rtnl_dump_ifinfo()
is very slow because it has O(N^2) complexity.
Instead of scanning one single list, we can use the 256 sub lists
of the dev_index hash table.
This considerably speedups "ip link" operations
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/rtnetlink.c')
| -rw-r--r-- | net/core/rtnetlink.c | 37 | 
1 files changed, 24 insertions, 13 deletions
| diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index ba13b0974a7..52ea418d530 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -682,22 +682,33 @@ nla_put_failure:  static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)  {  	struct net *net = sock_net(skb->sk); -	int idx; -	int s_idx = cb->args[0]; +	int h, s_h; +	int idx = 0, s_idx;  	struct net_device *dev; - -	idx = 0; -	for_each_netdev(net, dev) { -		if (idx < s_idx) -			goto cont; -		if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, -				     NETLINK_CB(cb->skb).pid, -				     cb->nlh->nlmsg_seq, 0, NLM_F_MULTI) <= 0) -			break; +	struct hlist_head *head; +	struct hlist_node *node; + +	s_h = cb->args[0]; +	s_idx = cb->args[1]; + +	for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) { +		idx = 0; +		head = &net->dev_index_head[h]; +		hlist_for_each_entry(dev, node, head, index_hlist) { +			if (idx < s_idx) +				goto cont; +			if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, +					     NETLINK_CB(cb->skb).pid, +					     cb->nlh->nlmsg_seq, 0, +					     NLM_F_MULTI) <= 0) +				goto out;  cont: -		idx++; +			idx++; +		}  	} -	cb->args[0] = idx; +out: +	cb->args[1] = idx; +	cb->args[0] = h;  	return skb->len;  } | 
