Re: [PATCH 11/31] net: Replace get_cpu_var through this_cpu_ptr
On Fri, Jun 20, 2014 at 02:31:26PM -0500, Christoph Lameter wrote: > Replace uses of get_cpu_var for address calculation through this_cpu_ptr. > > Cc: net...@vger.kernel.org > Cc: Eric Dumazet > Acked-by: David S. Miller > Signed-off-by: Christoph Lameter Applied to wq/for-3.17-consistent-ops. If this patch should be routed differently, please holler. Thanks. -- tejun -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 11/31] net: Replace get_cpu_var through this_cpu_ptr
On Fri, Jun 20, 2014 at 02:31:26PM -0500, Christoph Lameter wrote: Replace uses of get_cpu_var for address calculation through this_cpu_ptr. Cc: net...@vger.kernel.org Cc: Eric Dumazet eduma...@google.com Acked-by: David S. Miller da...@davemloft.net Signed-off-by: Christoph Lameter c...@linux.com Applied to wq/for-3.17-consistent-ops. If this patch should be routed differently, please holler. Thanks. -- tejun -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 11/31] net: Replace get_cpu_var through this_cpu_ptr
Replace uses of get_cpu_var for address calculation through this_cpu_ptr.
Cc: net...@vger.kernel.org
Cc: Eric Dumazet
Acked-by: David S. Miller
Signed-off-by: Christoph Lameter
Index: linux/net/core/dev.c
===
--- linux.orig/net/core/dev.c 2014-06-16 15:39:50.092473884 -0500
+++ linux/net/core/dev.c2014-06-16 15:39:50.084474033 -0500
@@ -2135,7 +2135,7 @@
unsigned long flags;
local_irq_save(flags);
- sd = &__get_cpu_var(softnet_data);
+ sd = this_cpu_ptr(_data);
q->next_sched = NULL;
*sd->output_queue_tailp = q;
sd->output_queue_tailp = >next_sched;
@@ -3174,7 +3174,7 @@
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(_data);
if (sd != mysd) {
sd->rps_ipi_next = mysd->rps_ipi_list;
@@ -3201,7 +3201,7 @@
if (qlen < (netdev_max_backlog >> 1))
return false;
- sd = &__get_cpu_var(softnet_data);
+ sd = this_cpu_ptr(_data);
rcu_read_lock();
fl = rcu_dereference(sd->flow_limit);
@@ -3348,7 +3348,7 @@
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(_data);
if (sd->completion_queue) {
struct sk_buff *clist;
@@ -3773,7 +3773,7 @@
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(_data);
struct sk_buff *skb, *tmp;
rps_lock(sd);
@@ -4279,7 +4279,7 @@
unsigned long flags;
local_irq_save(flags);
- napi_schedule(&__get_cpu_var(softnet_data), n);
+ napi_schedule(this_cpu_ptr(_data), n);
local_irq_restore(flags);
}
EXPORT_SYMBOL(__napi_schedule);
@@ -4400,7 +4400,7 @@
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(_data);
unsigned long time_limit = jiffies + 2;
int budget = netdev_budget;
void *have;
Index: linux/net/core/drop_monitor.c
===
--- linux.orig/net/core/drop_monitor.c 2014-06-16 15:39:50.092473884 -0500
+++ linux/net/core/drop_monitor.c 2014-06-16 15:39:50.084474033 -0500
@@ -146,7 +146,7 @@
unsigned long flags;
local_irq_save(flags);
- data = &__get_cpu_var(dm_cpu_data);
+ data = this_cpu_ptr(_cpu_data);
spin_lock(>lock);
dskb = data->skb;
Index: linux/net/core/skbuff.c
===
--- linux.orig/net/core/skbuff.c2014-06-16 15:39:50.092473884 -0500
+++ linux/net/core/skbuff.c 2014-06-16 15:39:50.084474033 -0500
@@ -344,7 +344,7 @@
unsigned long flags;
local_irq_save(flags);
- nc = &__get_cpu_var(netdev_alloc_cache);
+ nc = this_cpu_ptr(_alloc_cache);
if (unlikely(!nc->frag.page)) {
refill:
for (order = NETDEV_FRAG_PAGE_MAX_ORDER; ;) {
Index: linux/net/ipv4/tcp_output.c
===
--- linux.orig/net/ipv4/tcp_output.c2014-06-16 15:39:50.092473884 -0500
+++ linux/net/ipv4/tcp_output.c 2014-06-16 15:39:50.088473959 -0500
@@ -842,7 +842,7 @@
/* queue this socket to tasklet queue */
local_irq_save(flags);
- tsq = &__get_cpu_var(tsq_tasklet);
+ tsq = this_cpu_ptr(_tasklet);
list_add(>tsq_node, >head);
tasklet_schedule(>tasklet);
local_irq_restore(flags);
Index: linux/net/ipv6/syncookies.c
===
--- linux.orig/net/ipv6/syncookies.c2014-06-16 15:39:50.092473884 -0500
+++ linux/net/ipv6/syncookies.c 2014-06-16 15:39:50.088473959 -0500
@@ -67,7 +67,7 @@
net_get_random_once(syncookie6_secret, sizeof(syncookie6_secret));
- tmp = __get_cpu_var(ipv6_cookie_scratch);
+ tmp = this_cpu_ptr(ipv6_cookie_scratch);
/*
* we have 320 bits of information to hash, copy in the remaining
Index: linux/net/rds/ib_rdma.c
===
--- linux.orig/net/rds/ib_rdma.c2014-06-16 15:39:50.092473884 -0500
+++ linux/net/rds/ib_rdma.c 2014-06-16 15:39:50.088473959 -0500
@@ -267,7 +267,7 @@
unsigned long *flag;
preempt_disable();
- flag = &__get_cpu_var(clean_list_grace);
+ flag = this_cpu_ptr(_list_grace);
set_bit(CLEAN_LIST_BUSY_BIT, flag);
ret = llist_del_first(>clean_list);
[PATCH 11/31] net: Replace get_cpu_var through this_cpu_ptr
Replace uses of get_cpu_var for address calculation through this_cpu_ptr.
Cc: net...@vger.kernel.org
Cc: Eric Dumazet eduma...@google.com
Acked-by: David S. Miller da...@davemloft.net
Signed-off-by: Christoph Lameter c...@linux.com
Index: linux/net/core/dev.c
===
--- linux.orig/net/core/dev.c 2014-06-16 15:39:50.092473884 -0500
+++ linux/net/core/dev.c2014-06-16 15:39:50.084474033 -0500
@@ -2135,7 +2135,7 @@
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;
@@ -3174,7 +3174,7 @@
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;
@@ -3201,7 +3201,7 @@
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);
@@ -3348,7 +3348,7 @@
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;
@@ -3773,7 +3773,7 @@
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);
@@ -4279,7 +4279,7 @@
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);
@@ -4400,7 +4400,7 @@
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;
Index: linux/net/core/drop_monitor.c
===
--- linux.orig/net/core/drop_monitor.c 2014-06-16 15:39:50.092473884 -0500
+++ linux/net/core/drop_monitor.c 2014-06-16 15:39:50.084474033 -0500
@@ -146,7 +146,7 @@
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;
Index: linux/net/core/skbuff.c
===
--- linux.orig/net/core/skbuff.c2014-06-16 15:39:50.092473884 -0500
+++ linux/net/core/skbuff.c 2014-06-16 15:39:50.084474033 -0500
@@ -344,7 +344,7 @@
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; ;) {
Index: linux/net/ipv4/tcp_output.c
===
--- linux.orig/net/ipv4/tcp_output.c2014-06-16 15:39:50.092473884 -0500
+++ linux/net/ipv4/tcp_output.c 2014-06-16 15:39:50.088473959 -0500
@@ -842,7 +842,7 @@
/* queue this socket to tasklet queue */
local_irq_save(flags);
- tsq = __get_cpu_var(tsq_tasklet);
+ tsq = this_cpu_ptr(tsq_tasklet);
list_add(tp-tsq_node, tsq-head);
tasklet_schedule(tsq-tasklet);
local_irq_restore(flags);
Index: linux/net/ipv6/syncookies.c
===
--- linux.orig/net/ipv6/syncookies.c2014-06-16 15:39:50.092473884 -0500
+++ linux/net/ipv6/syncookies.c 2014-06-16 15:39:50.088473959 -0500
@@ -67,7 +67,7 @@
net_get_random_once(syncookie6_secret, sizeof(syncookie6_secret));
- tmp = __get_cpu_var(ipv6_cookie_scratch);
+ tmp = this_cpu_ptr(ipv6_cookie_scratch);
/*
* we have 320 bits of information to hash, copy in the remaining
Index: linux/net/rds/ib_rdma.c
===
--- linux.orig/net/rds/ib_rdma.c2014-06-16 15:39:50.092473884 -0500
+++ linux/net/rds/ib_rdma.c 2014-06-16 15:39:50.088473959 -0500
@@ -267,7 +267,7 @@
unsigned long *flag;
preempt_disable();
- flag = __get_cpu_var(clean_list_grace);
+ flag =
