Commit 19e8d69c authored by Alex Shi's avatar Alex Shi Committed by Tejun Heo
Browse files

net: replace percpu_xxx funcs with this_cpu_xxx or __this_cpu_xxx 



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: default avatarAlex Shi <alex.shi@intel.com>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 9ff00d58

net/netfilter/xt_TEE.c

+6 −6
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ tee_tg4(struct sk_buff *skb, const struct xt_action_param *par) 
	const struct xt_tee_tginfo *info = par->targinfo;

	struct iphdr *iph;



	if (percpu_read(tee_active))

	if (__this_cpu_read(tee_active))

		return XT_CONTINUE;

	/*

	 * 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);



	if (tee_tg_route4(skb, info)) {

		percpu_write(tee_active, true);

		__this_cpu_write(tee_active, true);

		ip_local_out(skb);

		percpu_write(tee_active, false);

		__this_cpu_write(tee_active, false);

	} else {

		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;



	if (percpu_read(tee_active))

	if (__this_cpu_read(tee_active))

		return XT_CONTINUE;

	skb = pskb_copy(skb, GFP_ATOMIC);

	if (skb == NULL)
@@ -186,9 +186,9 @@ tee_tg6(struct sk_buff *skb, const struct xt_action_param *par) 
		--iph->hop_limit;

	}

	if (tee_tg_route6(skb, info)) {

		percpu_write(tee_active, true);

		__this_cpu_write(tee_active, true);

		ip6_local_out(skb);

		percpu_write(tee_active, false);

		__this_cpu_write(tee_active, false);

	} else {

		kfree_skb(skb);

	}

net/socket.c

+2 −2
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static struct socket *sock_alloc(void) 
	inode->i_uid = current_fsuid();

	inode->i_gid = current_fsgid();



	percpu_add(sockets_in_use, 1);

	this_cpu_add(sockets_in_use, 1);

	return sock;

}
@@ -522,7 +522,7 @@ void sock_release(struct socket *sock) 
	if (rcu_dereference_protected(sock->wq, 1)->fasync_list)

		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) {

		iput(SOCK_INODE(sock));

		return;

CRA Git | Maintained and supported by SUSTech CRA and CCSE