diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-10-24 09:13:17 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-24 09:13:17 -0400 |
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 ba13b0974a7b..52ea418d5302 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c | |||
@@ -682,22 +682,33 @@ nla_put_failure: | |||
682 | static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) | 682 | static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb) |
683 | { | 683 | { |
684 | struct net *net = sock_net(skb->sk); | 684 | struct net *net = sock_net(skb->sk); |
685 | int idx; | 685 | int h, s_h; |
686 | int s_idx = cb->args[0]; | 686 | int idx = 0, s_idx; |
687 | struct net_device *dev; | 687 | struct net_device *dev; |
688 | 688 | struct hlist_head *head; | |
689 | idx = 0; | 689 | struct hlist_node *node; |
690 | for_each_netdev(net, dev) { | 690 | |
691 | if (idx < s_idx) | 691 | s_h = cb->args[0]; |
692 | goto cont; | 692 | s_idx = cb->args[1]; |
693 | if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, | 693 | |
694 | NETLINK_CB(cb->skb).pid, | 694 | for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) { |
695 | cb->nlh->nlmsg_seq, 0, NLM_F_MULTI) <= 0) | 695 | idx = 0; |
696 | break; | 696 | head = &net->dev_index_head[h]; |
697 | hlist_for_each_entry(dev, node, head, index_hlist) { | ||
698 | if (idx < s_idx) | ||
699 | goto cont; | ||
700 | if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, | ||
701 | NETLINK_CB(cb->skb).pid, | ||
702 | cb->nlh->nlmsg_seq, 0, | ||
703 | NLM_F_MULTI) <= 0) | ||
704 | goto out; | ||
697 | cont: | 705 | cont: |
698 | idx++; | 706 | idx++; |
707 | } | ||
699 | } | 708 | } |
700 | cb->args[0] = idx; | 709 | out: |
710 | cb->args[1] = idx; | ||
711 | cb->args[0] = h; | ||
701 | 712 | ||
702 | return skb->len; | 713 | return skb->len; |
703 | } | 714 | } |