* [PATCH v2 38/45] MIPS: Use get/put_online_cpus_atomic() to prevent CPU offline [not found] <20130625202452.16593.22810.stgit@srivatsabhat.in.ibm.com> @ 2013-06-25 20:32 ` Srivatsa S. Bhat 2013-06-25 20:32 ` Srivatsa S. Bhat 2013-06-26 13:39 ` Ralf Baechle 0 siblings, 2 replies; 4+ messages in thread From: Srivatsa S. Bhat @ 2013-06-25 20:32 UTC (permalink / raw) To: tglx, peterz, tj, oleg, paulmck, rusty, mingo, akpm, namhyung, walken, vincent.guittot, laijs Cc: rostedt, wangyun, xiaoguangrong, sbw, fweisbec, zhong, nikunj, srivatsa.bhat, linux-pm, linux-arch, linuxppc-dev, netdev, linux-kernel, Ralf Baechle, David Daney, Yong Zhang, Thomas Gleixner, Sanjay Lal, Steven J. Hill, John Crispin, Florian Fainelli, linux-mips, Srivatsa S. Bhat 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: Ralf Baechle <ralf@linux-mips.org> Cc: David Daney <david.daney@cavium.com> Cc: Yong Zhang <yong.zhang0@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Sanjay Lal <sanjayl@kymasys.com> Cc: "Steven J. Hill" <sjhill@mips.com> Cc: John Crispin <blogic@openwrt.org> Cc: Florian Fainelli <florian@openwrt.org> Cc: linux-mips@linux-mips.org Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> --- arch/mips/kernel/cevt-smtc.c | 7 +++++++ arch/mips/kernel/smp.c | 16 ++++++++-------- arch/mips/kernel/smtc.c | 12 ++++++++++++ arch/mips/mm/c-octeon.c | 4 ++-- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/arch/mips/kernel/cevt-smtc.c b/arch/mips/kernel/cevt-smtc.c index 9de5ed7..2e6c0cd 100644 --- a/arch/mips/kernel/cevt-smtc.c +++ b/arch/mips/kernel/cevt-smtc.c @@ -11,6 +11,7 @@ #include <linux/interrupt.h> #include <linux/percpu.h> #include <linux/smp.h> +#include <linux/cpu.h> #include <linux/irq.h> #include <asm/smtc_ipi.h> @@ -84,6 +85,8 @@ static int mips_next_event(unsigned long delta, unsigned long nextcomp = 0L; int vpe = current_cpu_data.vpe_id; int cpu = smp_processor_id(); + + get_online_cpus_atomic(); local_irq_save(flags); mtflags = dmt(); @@ -164,6 +167,7 @@ static int mips_next_event(unsigned long delta, } emt(mtflags); local_irq_restore(flags); + put_online_cpus_atomic(); return 0; } @@ -177,6 +181,7 @@ void smtc_distribute_timer(int vpe) unsigned long nextstamp; unsigned long reference; + get_online_cpus_atomic(); repeat: nextstamp = 0L; @@ -229,6 +234,8 @@ repeat: > (unsigned long)LONG_MAX) goto repeat; } + + put_online_cpus_atomic(); } diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index 6e7862a..be152b6 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c @@ -250,12 +250,12 @@ static inline void smp_on_other_tlbs(void (*func) (void *info), void *info) static inline void smp_on_each_tlb(void (*func) (void *info), void *info) { - preempt_disable(); + get_online_cpus_atomic(); smp_on_other_tlbs(func, info); func(info); - preempt_enable(); + put_online_cpus_atomic(); } /* @@ -273,7 +273,7 @@ static inline void smp_on_each_tlb(void (*func) (void *info), void *info) void flush_tlb_mm(struct mm_struct *mm) { - preempt_disable(); + get_online_cpus_atomic(); if ((atomic_read(&mm->mm_users) != 1) || (current->mm != mm)) { smp_on_other_tlbs(flush_tlb_mm_ipi, mm); @@ -287,7 +287,7 @@ void flush_tlb_mm(struct mm_struct *mm) } local_flush_tlb_mm(mm); - preempt_enable(); + put_online_cpus_atomic(); } struct flush_tlb_data { @@ -307,7 +307,7 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned l { struct mm_struct *mm = vma->vm_mm; - preempt_disable(); + get_online_cpus_atomic(); if ((atomic_read(&mm->mm_users) != 1) || (current->mm != mm)) { struct flush_tlb_data fd = { .vma = vma, @@ -325,7 +325,7 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned l } } local_flush_tlb_range(vma, start, end); - preempt_enable(); + put_online_cpus_atomic(); } static void flush_tlb_kernel_range_ipi(void *info) @@ -354,7 +354,7 @@ static void flush_tlb_page_ipi(void *info) void flush_tlb_page(struct vm_area_struct *vma, unsigned long page) { - preempt_disable(); + get_online_cpus_atomic(); if ((atomic_read(&vma->vm_mm->mm_users) != 1) || (current->mm != vma->vm_mm)) { struct flush_tlb_data fd = { .vma = vma, @@ -371,7 +371,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page) } } local_flush_tlb_page(vma, page); - preempt_enable(); + put_online_cpus_atomic(); } static void flush_tlb_one_ipi(void *info) diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 75a4fd7..3cda8eb 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c @@ -21,6 +21,7 @@ #include <linux/kernel.h> #include <linux/sched.h> #include <linux/smp.h> +#include <linux/cpu.h> #include <linux/cpumask.h> #include <linux/interrupt.h> #include <linux/kernel_stat.h> @@ -1143,6 +1144,8 @@ static irqreturn_t ipi_interrupt(int irq, void *dev_idm) * for the current TC, so we ought not to have to do it explicitly here. */ + get_online_cpus_atomic(); + for_each_online_cpu(cpu) { if (cpu_data[cpu].vpe_id != my_vpe) continue; @@ -1180,6 +1183,8 @@ static irqreturn_t ipi_interrupt(int irq, void *dev_idm) } } + put_online_cpus_atomic(); + return IRQ_HANDLED; } @@ -1383,6 +1388,7 @@ void smtc_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu) * them, let's be really careful... */ + get_online_cpus_atomic(); local_irq_save(flags); if (smtc_status & SMTC_TLB_SHARED) { mtflags = dvpe(); @@ -1438,6 +1444,7 @@ void smtc_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu) else emt(mtflags); local_irq_restore(flags); + put_online_cpus_atomic(); } /* @@ -1496,6 +1503,7 @@ void smtc_cflush_lockdown(void) { int cpu; + get_online_cpus_atomic(); for_each_online_cpu(cpu) { if (cpu != smp_processor_id()) { settc(cpu_data[cpu].tc_id); @@ -1504,6 +1512,7 @@ void smtc_cflush_lockdown(void) } } mips_ihb(); + put_online_cpus_atomic(); } /* It would be cheating to change the cpu_online states during a flush! */ @@ -1512,6 +1521,8 @@ void smtc_cflush_release(void) { int cpu; + get_online_cpus_atomic(); + /* * Start with a hazard barrier to ensure * that all CACHE ops have played through. @@ -1525,4 +1536,5 @@ void smtc_cflush_release(void) } } mips_ihb(); + put_online_cpus_atomic(); } diff --git a/arch/mips/mm/c-octeon.c b/arch/mips/mm/c-octeon.c index 8557fb5..8e1bcf6 100644 --- a/arch/mips/mm/c-octeon.c +++ b/arch/mips/mm/c-octeon.c @@ -73,7 +73,7 @@ static void octeon_flush_icache_all_cores(struct vm_area_struct *vma) mb(); octeon_local_flush_icache(); #ifdef CONFIG_SMP - preempt_disable(); + get_online_cpus_atomic(); cpu = smp_processor_id(); /* @@ -88,7 +88,7 @@ static void octeon_flush_icache_all_cores(struct vm_area_struct *vma) for_each_cpu(cpu, &mask) octeon_send_ipi_single(cpu, SMP_ICACHE_FLUSH); - preempt_enable(); + put_online_cpus_atomic(); #endif } ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 38/45] MIPS: Use get/put_online_cpus_atomic() to prevent CPU offline 2013-06-25 20:32 ` [PATCH v2 38/45] MIPS: Use get/put_online_cpus_atomic() to prevent CPU offline Srivatsa S. Bhat @ 2013-06-25 20:32 ` Srivatsa S. Bhat 2013-06-26 13:39 ` Ralf Baechle 1 sibling, 0 replies; 4+ messages in thread From: Srivatsa S. Bhat @ 2013-06-25 20:32 UTC (permalink / raw) To: tglx, peterz, tj, oleg, paulmck, rusty, mingo, akpm, namhyung, walken, vincent.guittot, laijs Cc: rostedt, wangyun, xiaoguangrong, sbw, fweisbec, zhong, nikunj, srivatsa.bhat, linux-pm, linux-arch, linuxppc-dev, netdev, linux-kernel, Ralf Baechle, David Daney, Yong Zhang, Sanjay Lal, Steven J. Hill, John Crispin, Florian Fainelli, linux-mips 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: Ralf Baechle <ralf@linux-mips.org> Cc: David Daney <david.daney@cavium.com> Cc: Yong Zhang <yong.zhang0@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Sanjay Lal <sanjayl@kymasys.com> Cc: "Steven J. Hill" <sjhill@mips.com> Cc: John Crispin <blogic@openwrt.org> Cc: Florian Fainelli <florian@openwrt.org> Cc: linux-mips@linux-mips.org Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> --- arch/mips/kernel/cevt-smtc.c | 7 +++++++ arch/mips/kernel/smp.c | 16 ++++++++-------- arch/mips/kernel/smtc.c | 12 ++++++++++++ arch/mips/mm/c-octeon.c | 4 ++-- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/arch/mips/kernel/cevt-smtc.c b/arch/mips/kernel/cevt-smtc.c index 9de5ed7..2e6c0cd 100644 --- a/arch/mips/kernel/cevt-smtc.c +++ b/arch/mips/kernel/cevt-smtc.c @@ -11,6 +11,7 @@ #include <linux/interrupt.h> #include <linux/percpu.h> #include <linux/smp.h> +#include <linux/cpu.h> #include <linux/irq.h> #include <asm/smtc_ipi.h> @@ -84,6 +85,8 @@ static int mips_next_event(unsigned long delta, unsigned long nextcomp = 0L; int vpe = current_cpu_data.vpe_id; int cpu = smp_processor_id(); + + get_online_cpus_atomic(); local_irq_save(flags); mtflags = dmt(); @@ -164,6 +167,7 @@ static int mips_next_event(unsigned long delta, } emt(mtflags); local_irq_restore(flags); + put_online_cpus_atomic(); return 0; } @@ -177,6 +181,7 @@ void smtc_distribute_timer(int vpe) unsigned long nextstamp; unsigned long reference; + get_online_cpus_atomic(); repeat: nextstamp = 0L; @@ -229,6 +234,8 @@ repeat: > (unsigned long)LONG_MAX) goto repeat; } + + put_online_cpus_atomic(); } diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c index 6e7862a..be152b6 100644 --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c @@ -250,12 +250,12 @@ static inline void smp_on_other_tlbs(void (*func) (void *info), void *info) static inline void smp_on_each_tlb(void (*func) (void *info), void *info) { - preempt_disable(); + get_online_cpus_atomic(); smp_on_other_tlbs(func, info); func(info); - preempt_enable(); + put_online_cpus_atomic(); } /* @@ -273,7 +273,7 @@ static inline void smp_on_each_tlb(void (*func) (void *info), void *info) void flush_tlb_mm(struct mm_struct *mm) { - preempt_disable(); + get_online_cpus_atomic(); if ((atomic_read(&mm->mm_users) != 1) || (current->mm != mm)) { smp_on_other_tlbs(flush_tlb_mm_ipi, mm); @@ -287,7 +287,7 @@ void flush_tlb_mm(struct mm_struct *mm) } local_flush_tlb_mm(mm); - preempt_enable(); + put_online_cpus_atomic(); } struct flush_tlb_data { @@ -307,7 +307,7 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned l { struct mm_struct *mm = vma->vm_mm; - preempt_disable(); + get_online_cpus_atomic(); if ((atomic_read(&mm->mm_users) != 1) || (current->mm != mm)) { struct flush_tlb_data fd = { .vma = vma, @@ -325,7 +325,7 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned l } } local_flush_tlb_range(vma, start, end); - preempt_enable(); + put_online_cpus_atomic(); } static void flush_tlb_kernel_range_ipi(void *info) @@ -354,7 +354,7 @@ static void flush_tlb_page_ipi(void *info) void flush_tlb_page(struct vm_area_struct *vma, unsigned long page) { - preempt_disable(); + get_online_cpus_atomic(); if ((atomic_read(&vma->vm_mm->mm_users) != 1) || (current->mm != vma->vm_mm)) { struct flush_tlb_data fd = { .vma = vma, @@ -371,7 +371,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long page) } } local_flush_tlb_page(vma, page); - preempt_enable(); + put_online_cpus_atomic(); } static void flush_tlb_one_ipi(void *info) diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index 75a4fd7..3cda8eb 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c @@ -21,6 +21,7 @@ #include <linux/kernel.h> #include <linux/sched.h> #include <linux/smp.h> +#include <linux/cpu.h> #include <linux/cpumask.h> #include <linux/interrupt.h> #include <linux/kernel_stat.h> @@ -1143,6 +1144,8 @@ static irqreturn_t ipi_interrupt(int irq, void *dev_idm) * for the current TC, so we ought not to have to do it explicitly here. */ + get_online_cpus_atomic(); + for_each_online_cpu(cpu) { if (cpu_data[cpu].vpe_id != my_vpe) continue; @@ -1180,6 +1183,8 @@ static irqreturn_t ipi_interrupt(int irq, void *dev_idm) } } + put_online_cpus_atomic(); + return IRQ_HANDLED; } @@ -1383,6 +1388,7 @@ void smtc_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu) * them, let's be really careful... */ + get_online_cpus_atomic(); local_irq_save(flags); if (smtc_status & SMTC_TLB_SHARED) { mtflags = dvpe(); @@ -1438,6 +1444,7 @@ void smtc_get_new_mmu_context(struct mm_struct *mm, unsigned long cpu) else emt(mtflags); local_irq_restore(flags); + put_online_cpus_atomic(); } /* @@ -1496,6 +1503,7 @@ void smtc_cflush_lockdown(void) { int cpu; + get_online_cpus_atomic(); for_each_online_cpu(cpu) { if (cpu != smp_processor_id()) { settc(cpu_data[cpu].tc_id); @@ -1504,6 +1512,7 @@ void smtc_cflush_lockdown(void) } } mips_ihb(); + put_online_cpus_atomic(); } /* It would be cheating to change the cpu_online states during a flush! */ @@ -1512,6 +1521,8 @@ void smtc_cflush_release(void) { int cpu; + get_online_cpus_atomic(); + /* * Start with a hazard barrier to ensure * that all CACHE ops have played through. @@ -1525,4 +1536,5 @@ void smtc_cflush_release(void) } } mips_ihb(); + put_online_cpus_atomic(); } diff --git a/arch/mips/mm/c-octeon.c b/arch/mips/mm/c-octeon.c index 8557fb5..8e1bcf6 100644 --- a/arch/mips/mm/c-octeon.c +++ b/arch/mips/mm/c-octeon.c @@ -73,7 +73,7 @@ static void octeon_flush_icache_all_cores(struct vm_area_struct *vma) mb(); octeon_local_flush_icache(); #ifdef CONFIG_SMP - preempt_disable(); + get_online_cpus_atomic(); cpu = smp_processor_id(); /* @@ -88,7 +88,7 @@ static void octeon_flush_icache_all_cores(struct vm_area_struct *vma) for_each_cpu(cpu, &mask) octeon_send_ipi_single(cpu, SMP_ICACHE_FLUSH); - preempt_enable(); + put_online_cpus_atomic(); #endif } ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 38/45] MIPS: Use get/put_online_cpus_atomic() to prevent CPU offline 2013-06-25 20:32 ` [PATCH v2 38/45] MIPS: Use get/put_online_cpus_atomic() to prevent CPU offline Srivatsa S. Bhat 2013-06-25 20:32 ` Srivatsa S. Bhat @ 2013-06-26 13:39 ` Ralf Baechle 2013-06-27 7:08 ` Srivatsa S. Bhat 1 sibling, 1 reply; 4+ messages in thread From: Ralf Baechle @ 2013-06-26 13:39 UTC (permalink / raw) To: Srivatsa S. Bhat Cc: tglx, peterz, tj, oleg, paulmck, rusty, mingo, akpm, namhyung, walken, vincent.guittot, laijs, rostedt, wangyun, xiaoguangrong, sbw, fweisbec, zhong, nikunj, linux-pm, linux-arch, linuxppc-dev, netdev, linux-kernel, David Daney, Yong Zhang, Sanjay Lal, Steven J. Hill, John Crispin, Florian Fainelli, linux-mips On Wed, Jun 26, 2013 at 02:02:57AM +0530, Srivatsa S. Bhat wrote: > 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. I think the same change also needs to be applied to r4k_on_each_cpu() in arch/mips/mm/c-r4k.c which currently looks like: static inline void r4k_on_each_cpu(void (*func) (void *info), void *info) { preempt_disable(); #if !defined(CONFIG_MIPS_MT_SMP) && !defined(CONFIG_MIPS_MT_SMTC) smp_call_function(func, info, 1); #endif func(info); preempt_enable(); } This is a slightly specialized version of on_each_cpu() which only calls out to other CPUs in actual multi-core environments and also - unlike on_each_cpu() doesn't disable interrupts for the sake of better interrupt latencies. Which reminds me ... Andrew, I was wondering why did 78eef01b0fae087c5fadbd85dd4fe2918c3a015f [[PATCH] on_each_cpu(): disable local interrupts] disable interrupts? The log is: ----- snip ----- When on_each_cpu() runs the callback on other CPUs, it runs with local interrupts disabled. So we should run the function with local interrupts disabled on this CPU, too. And do the same for UP, so the callback is run in the same environment on bo UP and SMP. (strictly it should do preempt_disable() too, but I think local_irq_disable is sufficiently equivalent). [...] ----- snip ----- I'm not entirely convinced the symmetry between UP and SMP environments is really worth it. Would anybody mind removing the local_irq_disable() ... local_irq_enable() from on_each_cpu()? Ralf ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 38/45] MIPS: Use get/put_online_cpus_atomic() to prevent CPU offline 2013-06-26 13:39 ` Ralf Baechle @ 2013-06-27 7:08 ` Srivatsa S. Bhat 0 siblings, 0 replies; 4+ messages in thread From: Srivatsa S. Bhat @ 2013-06-27 7:08 UTC (permalink / raw) To: Ralf Baechle Cc: tglx, peterz, tj, oleg, paulmck, rusty, mingo, akpm, namhyung, walken, vincent.guittot, laijs, rostedt, wangyun, xiaoguangrong, sbw, fweisbec, zhong, nikunj, linux-pm, linux-arch, linuxppc-dev, netdev, linux-kernel, David Daney, Yong Zhang, Sanjay Lal, Steven J. Hill, John Crispin, Florian Fainelli, linux-mips On 06/26/2013 07:09 PM, Ralf Baechle wrote: > On Wed, Jun 26, 2013 at 02:02:57AM +0530, Srivatsa S. Bhat wrote: > >> 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. > > I think the same change also needs to be applied to r4k_on_each_cpu() in > arch/mips/mm/c-r4k.c which currently looks like: > > static inline void r4k_on_each_cpu(void (*func) (void *info), void *info) > { > preempt_disable(); > > #if !defined(CONFIG_MIPS_MT_SMP) && !defined(CONFIG_MIPS_MT_SMTC) > smp_call_function(func, info, 1); > #endif > func(info); > preempt_enable(); > } > Thanks for pointing this out! I'll include changes to this code in my next version. Regards, Srivatsa S. Bhat > This is a slightly specialized version of on_each_cpu() which only calls > out to other CPUs in actual multi-core environments and also - unlike > on_each_cpu() doesn't disable interrupts for the sake of better > interrupt latencies. > > Which reminds me ... > > Andrew, I was wondering why did 78eef01b0fae087c5fadbd85dd4fe2918c3a015f > [[PATCH] on_each_cpu(): disable local interrupts] disable interrupts? > The log is: > > ----- snip ----- > When on_each_cpu() runs the callback on other CPUs, it runs with local > interrupts disabled. So we should run the function with local interrupts > disabled on this CPU, too. > > And do the same for UP, so the callback is run in the same environment on bo > UP and SMP. (strictly it should do preempt_disable() too, but I think > local_irq_disable is sufficiently equivalent). > [...] > ----- snip ----- > > I'm not entirely convinced the symmetry between UP and SMP environments is > really worth it. Would anybody mind removing the local_irq_disable() ... > local_irq_enable() from on_each_cpu()? > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-06-27 7:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20130625202452.16593.22810.stgit@srivatsabhat.in.ibm.com>
2013-06-25 20:32 ` [PATCH v2 38/45] MIPS: Use get/put_online_cpus_atomic() to prevent CPU offline Srivatsa S. Bhat
2013-06-25 20:32 ` Srivatsa S. Bhat
2013-06-26 13:39 ` Ralf Baechle
2013-06-27 7:08 ` Srivatsa S. Bhat
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox