From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756375Ab1LPLnn (ORCPT ); Fri, 16 Dec 2011 06:43:43 -0500 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:53201 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751408Ab1LPLnh (ORCPT ); Fri, 16 Dec 2011 06:43:37 -0500 Date: Fri, 16 Dec 2011 11:43:20 +0000 From: Catalin Marinas To: Peter Zijlstra Cc: "frank.rowand@am.sony.com" , "tglx@linutronix.de" , "linux-kernel@vger.kernel.org" , "rostedt@goodmis.org" Subject: Re: [PATCH] PREEMPT_RT_FULL: ARM context switch needs IRQs enabled Message-ID: <20111216114320.GC6342@arm.com> References: <4EEAB90D.3050504@am.sony.com> <1324029272.18942.73.camel@twins> <20111216111319.GB6342@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20111216111319.GB6342@arm.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Dec 16, 2011 at 11:13:19AM +0000, Catalin Marinas wrote: > On Fri, Dec 16, 2011 at 09:54:32AM +0000, Peter Zijlstra wrote: > > On Thu, 2011-12-15 at 19:20 -0800, Frank Rowand wrote: > > > ARMv6 and later have VIPT caches and the TLBs are tagged with an ASID > > > (application specific ID). The number of ASIDs is limited to 256 and > > > the allocation algorithm requires IPIs when all the ASIDs have been > > > used. The IPIs require interrupts enabled during context switch for > > > deadlock avoidance. > > > > > > The RT patch mm-protect-activate-switch-mm.patch disables irqs around > > > activate_mm() and switch_mm(), which are the portion of the ARMv6 > > > context switch that require interrupts enabled. > > > > > > The solution for the ARMv6 processors could be to _not_ disable irqs. > > > A more conservative solution is to provide the same environment that > > > the scheduler provides, that is preempt_disable(). This is more > > > resilient for possible future changes to the ARM context switch code > > > that is not aware of the RT patches. > > > > > > This patch will conflict slightly with Catalin's patch set to remove > > > __ARCH_WANT_INTERRUPTS_ON_CTXSW, when that is accepted: > > > > > > http://lkml.indiana.edu/hypermail/linux/kernel/1111.3/01893.html > > > > > > When Catalin's patch set is accepted, this RT patch will need to reverse > > > the change in patch 6 to arch/arm/include/asm/system.h: > > > > > > We could just merge Catalin's stuff in -rt to give it a test ride and > > see if anything horrible happens.. :-) > > Russell agreed for me to push this to -next (in case -rt uses that, not > sure) to get a bit more exposure. Otherwise testing the patches in -rt > would really help spotting bugs. > > But we need to sort out the dangling switch_mm() calls (without a > corresponding post-switch hook call) that I mentioned in my reply to > Frank. And that's what I meant (running some tests on a Versatile Express SMP system, they seem alright so far): >>From 26d87e955f089fd246bee29bb388f22da1297e0c Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 16 Dec 2011 11:32:26 +0000 Subject: [PATCH] sched, mm: Use activate_mm() instead of switch_mm() The ARM port tries to remove __ARCH_WANT_INTERRUPTS_ON_CTXSW. Since the actual pgd switching requires interrupts to be enabled on ARM (for latency on ARMv5 and earlier and IPIs on ARMv6+), the solution is to defer the pgd switching to a post context switch hook that is run with interrupts enabled. There are however two additional direct calls to switch_mm() without the additional post-switch hook and ARM would fail to set the new pgd. This patch changes the switch_mm() call with activate_mm() which ensures that the required pgd has been set. The activate_mm() function must be called with interrupts enabled. Signed-off-by: Catalin Marinas Cc: Ingo Molnar Cc: Peter Zijlstra --- kernel/sched.c | 2 +- mm/mmu_context.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/sched.c b/kernel/sched.c index 7b46a39..3976157 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -6310,7 +6310,7 @@ void idle_task_exit(void) BUG_ON(cpu_online(smp_processor_id())); if (mm != &init_mm) - switch_mm(mm, &init_mm, current); + activate_mm(mm, &init_mm); mmdrop(mm); } diff --git a/mm/mmu_context.c b/mm/mmu_context.c index cf332bc..4e44ac4 100644 --- a/mm/mmu_context.c +++ b/mm/mmu_context.c @@ -32,7 +32,7 @@ void use_mm(struct mm_struct *mm) tsk->active_mm = mm; } tsk->mm = mm; - switch_mm(active_mm, mm, tsk); + activate_mm(active_mm, mm); task_unlock(tsk); if (active_mm != mm) -- Catalin