Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-23 13:40:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

net: replace percpu_xxx funcs with this_cpu_xxx or __this_cpu_xxx

Browse Source 
percpu_xxx funcs are duplicated with this_cpu_xxx funcs, so replace
them for further code clean up.

And in preempt safe scenario, __this_cpu_xxx funcs may has a bit
better performance since __this_cpu_xxx has no redundant
preempt_enable/preempt_disable on some architectures.

Signed-off-by: Alex Shi <alex.shi@intel.com>
Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Alex Shi 2012-05-14 14:15:31 -07:00 committed by Tejun Heo
parent 9ff00d58a9
commit 19e8d69c54
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/netfilter/xt_TEE.c
View File

@ -87,7 +87,7 @@ tee_tg4(struct sk_buff *skb, const struct xt_action_param *par)
const struct xt_tee_tginfo *info = par->targinfo; const struct xt_tee_tginfo *info = par->targinfo;
struct iphdr *iph; struct iphdr *iph;
if (percpu_read(tee_active)) if (__this_cpu_read(tee_active))
return XT_CONTINUE; return XT_CONTINUE;
/* /*
* Copy the skb, and route the copy. Will later return %XT_CONTINUE for * Copy the skb, and route the copy. Will later return %XT_CONTINUE for
@ -124,9 +124,9 @@ tee_tg4(struct sk_buff *skb, const struct xt_action_param *par)
ip_send_check(iph); ip_send_check(iph);
if (tee_tg_route4(skb, info)) { if (tee_tg_route4(skb, info)) {
percpu_write(tee_active, true); __this_cpu_write(tee_active, true);
ip_local_out(skb); ip_local_out(skb);
percpu_write(tee_active, false); __this_cpu_write(tee_active, false);
} else { } else {
kfree_skb(skb); kfree_skb(skb);
} }
@ -168,7 +168,7 @@ tee_tg6(struct sk_buff *skb, const struct xt_action_param *par)
{ {
const struct xt_tee_tginfo *info = par->targinfo; const struct xt_tee_tginfo *info = par->targinfo;
if (percpu_read(tee_active)) if (__this_cpu_read(tee_active))
return XT_CONTINUE; return XT_CONTINUE;
skb = pskb_copy(skb, GFP_ATOMIC); skb = pskb_copy(skb, GFP_ATOMIC);
if (skb == NULL) if (skb == NULL)
@ -186,9 +186,9 @@ tee_tg6(struct sk_buff *skb, const struct xt_action_param *par)
--iph->hop_limit; --iph->hop_limit;
} }
if (tee_tg_route6(skb, info)) { if (tee_tg_route6(skb, info)) {
percpu_write(tee_active, true); __this_cpu_write(tee_active, true);
ip6_local_out(skb); ip6_local_out(skb);
percpu_write(tee_active, false); __this_cpu_write(tee_active, false);
} else { } else {
kfree_skb(skb); kfree_skb(skb);
} }

4
net/socket.c
View File

@ -479,7 +479,7 @@ static struct socket *sock_alloc(void)
inode->i_uid = current_fsuid(); inode->i_uid = current_fsuid();
inode->i_gid = current_fsgid(); inode->i_gid = current_fsgid();
percpu_add(sockets_in_use, 1); this_cpu_add(sockets_in_use, 1);
return sock; return sock;
} }
@ -522,7 +522,7 @@ void sock_release(struct socket *sock)
if (rcu_dereference_protected(sock->wq, 1)->fasync_list) if (rcu_dereference_protected(sock->wq, 1)->fasync_list)
printk(KERN_ERR "sock_release: fasync list not empty!\n"); printk(KERN_ERR "sock_release: fasync list not empty!\n");
percpu_sub(sockets_in_use, 1); this_cpu_sub(sockets_in_use, 1);
if (!sock->file) { if (!sock->file) {
iput(SOCK_INODE(sock)); iput(SOCK_INODE(sock));
return; return;