From: Corey Minyard <cminyard@mvista.com>
To: Matt Redfearn <matt.redfearn@mips.com>,
Ralf Baechle <ralf@linux-mips.org>,
James Hogan <james.hogan@mips.com>
Cc: Matthew Fortune <matthew.fortune@mips.com>,
linux-mips@linux-mips.org, linux-kernel@vger.kernel.org,
"Jason A. Donenfeld" <jason@zx2c4.com>,
Paul Burton <paul.burton@imgtec.com>
Subject: Re: [PATCH] MIPS: Fix exception entry when CONFIG_EVA enabled
Date: Wed, 11 Oct 2017 08:12:31 -0500 [thread overview]
Message-ID: <605f6a96-a843-085c-efc6-a2c0f2afd84a@mvista.com> (raw)
In-Reply-To: <1507712360-20657-1-git-send-email-matt.redfearn@mips.com>
On 10/11/2017 03:59 AM, Matt Redfearn wrote:
> Commit 9fef68686317b ("MIPS: Make SAVE_SOME more standard") made several
> changes to the order in which registers are saved in the SAVE_SOME
> macro, used by exception handlers to save the processor state. In
> particular, it removed the
> move k1, sp
> in the delay slot of the branch testing if the processor is already in
> kernel mode. This is replaced later in the macro by a
> move k0, sp
> When CONFIG_EVA is disabled, this instruction actually appears in the
> delay slot of the branch. However, when CONFIG_EVA is enabled, instead
> the RPS workaround of
> MFC0 k0, CP0_ENTRYHI
> appears in the delay slot. This results in k0 not containing the stack
> pointer, but some unrelated value, which is then saved to the kernel
> stack. On exit from the exception, this bogus value is restored to the
> stack pointer, resulting in an OOPS.
>
> Fix this by moving the save of SP in k0 explicitly in the delay slot of
> the branch, outside of the CONFIG_EVA section, restoring the expected
> instruction ordering when CONFIG_EVA is active.
>
> Fixes: 9fef68686317b ("MIPS: Make SAVE_SOME more standard")
> Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
> Reported-by: Vladimir Kondratiev <vladimir.kondratiev@intel.com>
I looked this over pretty carefully and it looks correct to me. It
makes no difference
in the instructions generated by the non-EVA case. I shouldn't have
missed this :(.
Reviewed-by: Corey Minyard <cminyard@mvista.com>
>
> ---
>
> Note that some of our compiler people are dubious about putting frame
> related instructions in conditionally executed blocks of code. In this
> case, presuming that we only care about unwinding the kernel stack, then
> we only care about the case in which the branch is taken, and k0 always
> contains the SP to be saved. There is also a question about putting
> frame related instructions in branch delay slots. Again, in this case,
> we think it's OK to use them since the only path that ought to be
> unwound will be the "branch taken" route where we are already on the
> kernel stack.
Since the compiler can put frame-related instructions in delay slots (see
aee16625b19 MIPS: Fix issues in backtraces), it's probably ok. I have
tested
this before with kernel dumps and gdb, and gdb had no issues with this.
That said, this is a tricky case. But looking at the generated unwinding
info, it seems to do the right thing.
> Not having access to a CFI based kernel stack unwinder makes this change
> difficult to verify, but since the same construct already existed when
> CONFIG_EVA is disabled, I don't think this change is likely to break the
> unwinder, and fixes exception entry when CONFIG_EVA is enabled.
Agreed. Thanks for fixing this.
-corey
> Thanks,
> Matt
>
> ---
> arch/mips/include/asm/stackframe.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/mips/include/asm/stackframe.h b/arch/mips/include/asm/stackframe.h
> index 5d3563c55e0c..2161357cc68f 100644
> --- a/arch/mips/include/asm/stackframe.h
> +++ b/arch/mips/include/asm/stackframe.h
> @@ -199,6 +199,10 @@
> sll k0, 3 /* extract cu0 bit */
> .set noreorder
> bltz k0, 8f
> + move k0, sp
> + .if \docfi
> + .cfi_register sp, k0
> + .endif
> #ifdef CONFIG_EVA
> /*
> * Flush interAptiv's Return Prediction Stack (RPS) by writing
> @@ -225,10 +229,6 @@
> MTC0 k0, CP0_ENTRYHI
> #endif
> .set reorder
> - move k0, sp
> - .if \docfi
> - .cfi_register sp, k0
> - .endif
> /* Called from user mode, new stack. */
> get_saved_sp docfi=\docfi tosp=1
> 8:
next prev parent reply other threads:[~2017-10-11 13:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 8:59 [PATCH] MIPS: Fix exception entry when CONFIG_EVA enabled Matt Redfearn
2017-10-11 13:12 ` Corey Minyard [this message]
2017-10-31 23:48 ` James Hogan
2017-11-13 10:47 ` Maciej W. Rozycki
2017-11-15 10:32 ` Matt Redfearn
2017-11-15 13:48 ` Maciej W. Rozycki
2017-11-15 14:53 ` Maciej W. Rozycki
2017-10-18 17:34 ` Maciej W. Rozycki
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=605f6a96-a843-085c-efc6-a2c0f2afd84a@mvista.com \
--to=cminyard@mvista.com \
--cc=james.hogan@mips.com \
--cc=jason@zx2c4.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=matt.redfearn@mips.com \
--cc=matthew.fortune@mips.com \
--cc=paul.burton@imgtec.com \
--cc=ralf@linux-mips.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).