From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Srivatsa S. Bhat" Subject: [PATCH v3 21/45] net: Use get/put_online_cpus_atomic() to prevent CPU offline Date: Fri, 28 Jun 2013 01:26:28 +0530 Message-ID: <20130627195627.29830.19367.stgit@srivatsabhat.in.ibm.com> References: <20130627195136.29830.10445.stgit@srivatsabhat.in.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20130627195136.29830.10445.stgit@srivatsabhat.in.ibm.com> Sender: linux-kernel-owner@vger.kernel.org To: tglx@linutronix.de, peterz@infradead.org, tj@kernel.org, oleg@redhat.com, paulmck@linux.vnet.ibm.com, rusty@rustcorp.com.au, mingo@kernel.org, akpm@linux-foundation.org, namhyung@kernel.org, walken@google.com, vincent.guittot@linaro.org, laijs@cn.fujitsu.com, David.Laight@aculab.com Cc: rostedt@goodmis.org, wangyun@linux.vnet.ibm.com, xiaoguangrong@linux.vnet.ibm.com, sbw@mit.edu, fweisbec@gmail.com, zhong@linux.vnet.ibm.com, nikunj@linux.vnet.ibm.com, srivatsa.bhat@linux.vnet.ibm.com, linux-pm@vger.kernel.org, linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , Eric Dumazet , Alexander Duyck , Cong Wang , Ben Hutchings netdev@vger.kernel.org"Srivatsa S. Bhat" List-Id: linux-arch.vger.kernel.org Once stop_machine() is gone from the CPU offline path, we won't be able to depend on disabling preemption to prevent CPUs from going offline from under us. Use the get/put_online_cpus_atomic() APIs to prevent CPUs from going offline, while invoking from atomic context. Cc: "David S. Miller" Cc: Eric Dumazet Cc: Alexander Duyck Cc: Cong Wang Cc: Ben Hutchings Cc: netdev@vger.kernel.org Signed-off-by: Srivatsa S. Bhat --- net/core/dev.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index faebb39..1530633 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3175,7 +3175,7 @@ int netif_rx(struct sk_buff *skb) struct rps_dev_flow voidflow, *rflow = &voidflow; int cpu; - preempt_disable(); + get_online_cpus_atomic(); rcu_read_lock(); cpu = get_rps_cpu(skb->dev, skb, &rflow); @@ -3185,7 +3185,7 @@ int netif_rx(struct sk_buff *skb) ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail); rcu_read_unlock(); - preempt_enable(); + put_online_cpus_atomic(); } else #endif { @@ -3604,6 +3604,7 @@ int netif_receive_skb(struct sk_buff *skb) struct rps_dev_flow voidflow, *rflow = &voidflow; int cpu, ret; + get_online_cpus_atomic(); rcu_read_lock(); cpu = get_rps_cpu(skb->dev, skb, &rflow); @@ -3611,9 +3612,11 @@ int netif_receive_skb(struct sk_buff *skb) if (cpu >= 0) { ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail); rcu_read_unlock(); + put_online_cpus_atomic(); return ret; } rcu_read_unlock(); + put_online_cpus_atomic(); } #endif return __netif_receive_skb(skb); @@ -3991,6 +3994,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd) local_irq_enable(); /* Send pending IPI's to kick RPS processing on remote cpus. */ + get_online_cpus_atomic(); while (remsd) { struct softnet_data *next = remsd->rps_ipi_next; @@ -3999,6 +4003,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd) &remsd->csd, 0); remsd = next; } + put_online_cpus_atomic(); } else #endif local_irq_enable(); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e28smtp09.in.ibm.com ([122.248.162.9]:39973 "EHLO e28smtp09.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754539Ab3F0T7w (ORCPT ); Thu, 27 Jun 2013 15:59:52 -0400 Received: from /spool/local by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 28 Jun 2013 01:25:08 +0530 From: "Srivatsa S. Bhat" Subject: [PATCH v3 21/45] net: Use get/put_online_cpus_atomic() to prevent CPU offline Date: Fri, 28 Jun 2013 01:26:28 +0530 Message-ID: <20130627195627.29830.19367.stgit@srivatsabhat.in.ibm.com> In-Reply-To: <20130627195136.29830.10445.stgit@srivatsabhat.in.ibm.com> References: <20130627195136.29830.10445.stgit@srivatsabhat.in.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: tglx@linutronix.de, peterz@infradead.org, tj@kernel.org, oleg@redhat.com, paulmck@linux.vnet.ibm.com, rusty@rustcorp.com.au, mingo@kernel.org, akpm@linux-foundation.org, namhyung@kernel.org, walken@google.com, vincent.guittot@linaro.org, laijs@cn.fujitsu.com, David.Laight@aculab.com Cc: rostedt@goodmis.org, wangyun@linux.vnet.ibm.com, xiaoguangrong@linux.vnet.ibm.com, sbw@mit.edu, fweisbec@gmail.com, zhong@linux.vnet.ibm.com, nikunj@linux.vnet.ibm.com, srivatsa.bhat@linux.vnet.ibm.com, linux-pm@vger.kernel.org, linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , Eric Dumazet , Alexander Duyck , Cong Wang , Ben Hutchings netdev@vger.kernel.org"Srivatsa S. Bhat" Message-ID: <20130627195628._LSTB6zRwVWVSYvNp_t6maJjJayx0KSsN8GSNKCVrYQ@z> Once stop_machine() is gone from the CPU offline path, we won't be able to depend on disabling preemption to prevent CPUs from going offline from under us. Use the get/put_online_cpus_atomic() APIs to prevent CPUs from going offline, while invoking from atomic context. Cc: "David S. Miller" Cc: Eric Dumazet Cc: Alexander Duyck Cc: Cong Wang Cc: Ben Hutchings Cc: netdev@vger.kernel.org Signed-off-by: Srivatsa S. Bhat --- net/core/dev.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index faebb39..1530633 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3175,7 +3175,7 @@ int netif_rx(struct sk_buff *skb) struct rps_dev_flow voidflow, *rflow = &voidflow; int cpu; - preempt_disable(); + get_online_cpus_atomic(); rcu_read_lock(); cpu = get_rps_cpu(skb->dev, skb, &rflow); @@ -3185,7 +3185,7 @@ int netif_rx(struct sk_buff *skb) ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail); rcu_read_unlock(); - preempt_enable(); + put_online_cpus_atomic(); } else #endif { @@ -3604,6 +3604,7 @@ int netif_receive_skb(struct sk_buff *skb) struct rps_dev_flow voidflow, *rflow = &voidflow; int cpu, ret; + get_online_cpus_atomic(); rcu_read_lock(); cpu = get_rps_cpu(skb->dev, skb, &rflow); @@ -3611,9 +3612,11 @@ int netif_receive_skb(struct sk_buff *skb) if (cpu >= 0) { ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail); rcu_read_unlock(); + put_online_cpus_atomic(); return ret; } rcu_read_unlock(); + put_online_cpus_atomic(); } #endif return __netif_receive_skb(skb); @@ -3991,6 +3994,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd) local_irq_enable(); /* Send pending IPI's to kick RPS processing on remote cpus. */ + get_online_cpus_atomic(); while (remsd) { struct softnet_data *next = remsd->rps_ipi_next; @@ -3999,6 +4003,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd) &remsd->csd, 0); remsd = next; } + put_online_cpus_atomic(); } else #endif local_irq_enable();