Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 903ceff7 authored by Christoph Lameter's avatar Christoph Lameter Committed by Tejun Heo
Browse files

net: Replace get_cpu_var through this_cpu_ptr 



Replace uses of get_cpu_var for address calculation through this_cpu_ptr.

Cc: netdev@vger.kernel.org
Cc: Eric Dumazet <edumazet@google.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent f7f66b05

include/net/netfilter/nf_conntrack.h

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ extern s32 (*nf_ct_nat_offset)(const struct nf_conn *ct, 
DECLARE_PER_CPU(struct nf_conn, nf_conntrack_untracked);

static inline struct nf_conn *nf_ct_untracked_get(void)

{

	return &__raw_get_cpu_var(nf_conntrack_untracked);

	return raw_cpu_ptr(&nf_conntrack_untracked);

}

void nf_ct_untracked_status_or(unsigned long bits);

include/net/snmp.h

+3 −3
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ struct linux_xfrm_mib { 


#define SNMP_ADD_STATS64_BH(mib, field, addend) 			\

	do {								\

		__typeof__(*mib) *ptr = __this_cpu_ptr(mib);		\

		__typeof__(*mib) *ptr = raw_cpu_ptr(mib);		\

		u64_stats_update_begin(&ptr->syncp);			\

		ptr->mibs[field] += addend;				\

		u64_stats_update_end(&ptr->syncp);			\
@@ -190,7 +190,7 @@ struct linux_xfrm_mib { 
#define SNMP_UPD_PO_STATS64_BH(mib, basefield, addend)			\

	do {								\

		__typeof__(*mib) *ptr;				\

		ptr = __this_cpu_ptr(mib);				\

		ptr = raw_cpu_ptr((mib));				\

		u64_stats_update_begin(&ptr->syncp);			\

		ptr->mibs[basefield##PKTS]++;				\

		ptr->mibs[basefield##OCTETS] += addend;			\

net/core/dev.c

+7 −7
Original line number Diff line number Diff line
@@ -2153,7 +2153,7 @@ static inline void __netif_reschedule(struct Qdisc *q) 
	unsigned long flags;



	local_irq_save(flags);

	sd = &__get_cpu_var(softnet_data);

	sd = this_cpu_ptr(&softnet_data);

	q->next_sched = NULL;

	*sd->output_queue_tailp = q;

	sd->output_queue_tailp = &q->next_sched;
@@ -3195,7 +3195,7 @@ static void rps_trigger_softirq(void *data) 
static int rps_ipi_queued(struct softnet_data *sd)

{

#ifdef CONFIG_RPS

	struct softnet_data *mysd = &__get_cpu_var(softnet_data);

	struct softnet_data *mysd = this_cpu_ptr(&softnet_data);



	if (sd != mysd) {

		sd->rps_ipi_next = mysd->rps_ipi_list;
@@ -3222,7 +3222,7 @@ static bool skb_flow_limit(struct sk_buff *skb, unsigned int qlen) 
	if (qlen < (netdev_max_backlog >> 1))

		return false;



	sd = &__get_cpu_var(softnet_data);

	sd = this_cpu_ptr(&softnet_data);



	rcu_read_lock();

	fl = rcu_dereference(sd->flow_limit);
@@ -3369,7 +3369,7 @@ EXPORT_SYMBOL(netif_rx_ni); 


static void net_tx_action(struct softirq_action *h)

{

	struct softnet_data *sd = &__get_cpu_var(softnet_data);

	struct softnet_data *sd = this_cpu_ptr(&softnet_data);



	if (sd->completion_queue) {

		struct sk_buff *clist;
@@ -3794,7 +3794,7 @@ EXPORT_SYMBOL(netif_receive_skb); 
static void flush_backlog(void *arg)

{

	struct net_device *dev = arg;

	struct softnet_data *sd = &__get_cpu_var(softnet_data);

	struct softnet_data *sd = this_cpu_ptr(&softnet_data);

	struct sk_buff *skb, *tmp;



	rps_lock(sd);
@@ -4301,7 +4301,7 @@ void __napi_schedule(struct napi_struct *n) 
	unsigned long flags;



	local_irq_save(flags);

	____napi_schedule(&__get_cpu_var(softnet_data), n);

	____napi_schedule(this_cpu_ptr(&softnet_data), n);

	local_irq_restore(flags);

}

EXPORT_SYMBOL(__napi_schedule);
@@ -4422,7 +4422,7 @@ EXPORT_SYMBOL(netif_napi_del); 


static void net_rx_action(struct softirq_action *h)

{

	struct softnet_data *sd = &__get_cpu_var(softnet_data);

	struct softnet_data *sd = this_cpu_ptr(&softnet_data);

	unsigned long time_limit = jiffies + 2;

	int budget = netdev_budget;

	void *have;

net/core/drop_monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static void trace_drop_common(struct sk_buff *skb, void *location) 
	unsigned long flags;



	local_irq_save(flags);

	data = &__get_cpu_var(dm_cpu_data);

	data = this_cpu_ptr(&dm_cpu_data);

	spin_lock(&data->lock);

	dskb = data->skb;

net/core/skbuff.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) 
	unsigned long flags;



	local_irq_save(flags);

	nc = &__get_cpu_var(netdev_alloc_cache);

	nc = this_cpu_ptr(&netdev_alloc_cache);

	if (unlikely(!nc->frag.page)) {

refill:

		for (order = NETDEV_FRAG_PAGE_MAX_ORDER; ;) {