linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tixy@linaro.org (Jon Medhurst (Tixy))
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: efi: don't restore TTBR0 if active_mm points at init_mm
Date: Mon, 23 Mar 2015 17:22:57 +0000	[thread overview]
Message-ID: <1427131377.2693.25.camel@linaro.org> (raw)
In-Reply-To: <20150323154458.GC12757@e104818-lin.cambridge.arm.com>

On Mon, 2015-03-23 at 15:44 +0000, Catalin Marinas wrote:
[...]
> I think for stable, we can do
> with the patch below. We could clean up the cpu_switch_mm() uses through
> the arch/arm64 and set the reserved ttbr0 but we only have two at the
> moment (__cpu_suspend and efi_set_pgd).
> 
> -----------------8<-------------------------
> 
> From 5d9e3540b6480558528612dd3672543fa8ab3528 Mon Sep 17 00:00:00 2001
> From: Catalin Marinas <catalin.marinas@arm.com>
> Date: Mon, 23 Mar 2015 15:06:50 +0000
> Subject: [PATCH] arm64: Use the reserved TTBR0 if context switching to the
>  init_mm
> 
> The idle_task_exit() function may call switch_mm() with next ==
> &init_mm. On arm64, init_mm.pgd cannot be used for user mappings, so
> this patch simply sets the reserved TTBR0.
> 
> Cc: <stable@vger.kernel.org>
> Reported-by: Jon Medhurst (Tixy) <tixy@linaro.org>
> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

That unsurprising fixes the BUG_ON I was seeing on Juno, so...
Tested-by: Jon Medhurst (Tixy) <tixy@linaro.org>

One question, is bypassing setting the mm_cpumask and context.id for
init_mm OK? I'm not familiar with the code but had a quick look, and it
looks like they are just used for ASID management, in which case I
assume everything is OK - ASIDs only being relevant for user mappings in
ttbr0?
 
> ---
>  arch/arm64/include/asm/mmu_context.h | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h
> index a9eee33dfa62..101a42bde728 100644
> --- a/arch/arm64/include/asm/mmu_context.h
> +++ b/arch/arm64/include/asm/mmu_context.h
> @@ -151,6 +151,15 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
>  {
>  	unsigned int cpu = smp_processor_id();
>  
> +	/*
> +	 * init_mm.pgd does not contain any user mappings and it is always
> +	 * active for kernel addresses in TTBR1. Just set the reserved TTBR0.
> +	 */
> +	if (next == &init_mm) {
> +		cpu_set_reserved_ttbr0();
> +		return;
> +	}
> +
>  	if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next)) || prev != next)
>  		check_and_switch_context(next, tsk);
>  }

  reply	other threads:[~2015-03-23 17:22 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-19 15:43 [PATCH] arm64: efi: don't restore TTBR0 if active_mm points at init_mm Will Deacon
2015-03-19 16:01 ` Ard Biesheuvel
2015-03-23 13:22 ` Jon Medhurst (Tixy)
2015-03-23 15:44   ` Catalin Marinas
2015-03-23 17:22     ` Jon Medhurst (Tixy) [this message]
2015-03-23 17:50       ` Catalin Marinas
2015-03-23 18:00         ` Will Deacon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1427131377.2693.25.camel@linaro.org \
    --to=tixy@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).