浏览代码

net: use this_cpu_ptr()

use this_cpu_ptr(p) instead of per_cpu_ptr(p, smp_processor_id())

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Eric Dumazet 15 年之前
父节点
当前提交
7a9b2d5950
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 2 2
      net/core/flow.c
  2. 1 1
      net/ipv4/ip_input.c
  3. 1 1
      net/ipv4/tcp.c

+ 2 - 2
net/core/flow.c

@@ -222,7 +222,7 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
 	unsigned int hash;
 	unsigned int hash;
 
 
 	local_bh_disable();
 	local_bh_disable();
-	fcp = per_cpu_ptr(fc->percpu, smp_processor_id());
+	fcp = this_cpu_ptr(fc->percpu);
 
 
 	fle = NULL;
 	fle = NULL;
 	flo = NULL;
 	flo = NULL;
@@ -302,7 +302,7 @@ static void flow_cache_flush_tasklet(unsigned long data)
 	LIST_HEAD(gc_list);
 	LIST_HEAD(gc_list);
 	int i, deleted = 0;
 	int i, deleted = 0;
 
 
-	fcp = per_cpu_ptr(fc->percpu, smp_processor_id());
+	fcp = this_cpu_ptr(fc->percpu);
 	for (i = 0; i < flow_cache_hash_size(fc); i++) {
 	for (i = 0; i < flow_cache_hash_size(fc); i++) {
 		hlist_for_each_entry_safe(fle, entry, tmp,
 		hlist_for_each_entry_safe(fle, entry, tmp,
 					  &fcp->hash_table[i], u.hlist) {
 					  &fcp->hash_table[i], u.hlist) {

+ 1 - 1
net/ipv4/ip_input.c

@@ -342,7 +342,7 @@ static int ip_rcv_finish(struct sk_buff *skb)
 
 
 #ifdef CONFIG_NET_CLS_ROUTE
 #ifdef CONFIG_NET_CLS_ROUTE
 	if (unlikely(skb_dst(skb)->tclassid)) {
 	if (unlikely(skb_dst(skb)->tclassid)) {
-		struct ip_rt_acct *st = per_cpu_ptr(ip_rt_acct, smp_processor_id());
+		struct ip_rt_acct *st = this_cpu_ptr(ip_rt_acct);
 		u32 idx = skb_dst(skb)->tclassid;
 		u32 idx = skb_dst(skb)->tclassid;
 		st[idx&0xFF].o_packets++;
 		st[idx&0xFF].o_packets++;
 		st[idx&0xFF].o_bytes += skb->len;
 		st[idx&0xFF].o_bytes += skb->len;

+ 1 - 1
net/ipv4/tcp.c

@@ -2962,7 +2962,7 @@ struct tcp_md5sig_pool *tcp_get_md5sig_pool(void)
 	spin_unlock(&tcp_md5sig_pool_lock);
 	spin_unlock(&tcp_md5sig_pool_lock);
 
 
 	if (p)
 	if (p)
-		return *per_cpu_ptr(p, smp_processor_id());
+		return *this_cpu_ptr(p);
 
 
 	local_bh_enable();
 	local_bh_enable();
 	return NULL;
 	return NULL;