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

net: rps: add the shortcut for one rps_cpus

Browse Source 
When there is only one rps_cpus, skb_get_rxhash() can be eliminated.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Changli Gao 2010-09-03 23:12:37 +00:00 committed by David S. Miller
parent 65040c33ee
commit 6febfca98f
1 changed files with 11 additions and 3 deletions

14
net/core/dev.c
View File

@ -2343,7 +2343,7 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,
struct rps_dev_flow **rflowp) struct rps_dev_flow **rflowp)
{ {
struct netdev_rx_queue *rxqueue; struct netdev_rx_queue *rxqueue;
struct rps_map *map; struct rps_map *map = NULL;
struct rps_dev_flow_table *flow_table; struct rps_dev_flow_table *flow_table;
struct rps_sock_flow_table *sock_flow_table; struct rps_sock_flow_table *sock_flow_table;
int cpu = -1; int cpu = -1;
@ -2361,8 +2361,17 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,
} else } else
rxqueue = dev->_rx; rxqueue = dev->_rx;
if (!rxqueue->rps_map && !rxqueue->rps_flow_table) if (rxqueue->rps_map) {
map = rcu_dereference(rxqueue->rps_map);
if (map && map->len == 1) {
tcpu = map->cpus[0];
if (cpu_online(tcpu))
cpu = tcpu;
goto done;
}
} else if (!rxqueue->rps_flow_table) {
goto done; goto done;
}
skb_reset_network_header(skb); skb_reset_network_header(skb);
if (!skb_get_rxhash(skb)) if (!skb_get_rxhash(skb))
@ -2407,7 +2416,6 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,
} }
} }
map = rcu_dereference(rxqueue->rps_map);
if (map) { if (map) {
tcpu = map->cpus[((u64) skb->rxhash * map->len) >> 32]; tcpu = map->cpus[((u64) skb->rxhash * map->len) >> 32];