From: Michael Ellerman <mpe@ellerman.id.au>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@lists.ozlabs.org
Cc: aneesh.kumar@linux.vnet.ibm.com
Subject: Re: [PATCH 03/24] powerpc/6xx: Handle DABR match before calling do_page_fault
Date: Thu, 03 Aug 2017 10:19:10 +1000 [thread overview]
Message-ID: <87k22lqz9d.fsf@concordia.ellerman.id.au> (raw)
In-Reply-To: <20170719044946.22030-3-benh@kernel.crashing.org>
Benjamin Herrenschmidt <benh@kernel.crashing.org> writes:
> On legacy 6xx 32-bit procesors, we checked for the DABR match bit
> in DSISR from do_page_fault(), in the middle of a pile of ifdef's
> because all other CPU types do it in assembly prior to calling
> do_page_fault. Fix that.
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
> arch/powerpc/kernel/entry_32.S | 11 +++++++++++
> arch/powerpc/mm/fault.c | 9 ---------
> 2 files changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
> index 8587059ad848..7331df033804 100644
> --- a/arch/powerpc/kernel/entry_32.S
> +++ b/arch/powerpc/kernel/entry_32.S
> @@ -586,6 +586,8 @@ ppc_swapcontext:
> handle_page_fault:
> stw r4,_DAR(r1)
> addi r3,r1,STACK_FRAME_OVERHEAD
> + andis. r0,r5,DSISR_DABRMATCH@h
> + bne- handle_dabr_fault
> bl do_page_fault
> cmpwi r3,0
> beq+ ret_from_except
> @@ -599,6 +601,15 @@ handle_page_fault:
> bl bad_page_fault
> b ret_from_except_full
>
> + /* We have a data breakpoint exception - handle it */
> +handle_dabr_fault:
> + SAVE_NVGPRS(r1)
> + lwz r0,_TRAP(r1)
> + clrrwi r0,r0,1
> + stw r0,_TRAP(r1)
> + bl do_break
> + b ret_from_except_full
This breaks ~35% of the defconfigs.
eg. ppc44x_defconfig
http://kisskb.ellerman.id.au/kisskb/buildresult/13113408/
arch/powerpc/kernel/entry_32.S:(.text+0x7ac): undefined reference to `do_break'
For now I've just wrapped the asm above in:
+#if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE) || defined(CONFIG_PPC_8xx))
But would be happy if there was something less gross.
cheers
next prev parent reply other threads:[~2017-08-03 0:19 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-19 4:49 [PATCH 01/24] powerpc/mm: Move exception_enter/exit to a do_page_fault wrapper Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 02/24] powerpc/mm: Pre-filter SRR1 bits before do_page_fault() Benjamin Herrenschmidt
2017-07-22 16:43 ` LEROY Christophe
2017-07-23 1:10 ` Benjamin Herrenschmidt
2017-07-24 13:48 ` Michael Ellerman
2017-07-19 4:49 ` [PATCH 03/24] powerpc/6xx: Handle DABR match before calling do_page_fault Benjamin Herrenschmidt
2017-08-03 0:19 ` Michael Ellerman [this message]
2017-08-03 1:00 ` Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 04/24] powerpc/mm: Update definitions of DSISR bits Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 05/24] powerpc/mm: Update bits used to skip hash_page Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 06/24] powerpc/mm: Use symbolic constants for filtering SRR1 bits on ISIs Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 07/24] powerpc/mm: Move out definition of CPU specific is_write bits Benjamin Herrenschmidt
2017-07-22 16:40 ` LEROY Christophe
2017-07-23 1:06 ` Benjamin Herrenschmidt
2017-07-24 11:58 ` Michael Ellerman
2017-07-19 4:49 ` [PATCH 08/24] powerpc/mm: Move error_code checks for bad faults earlier Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 09/24] powerpc/mm: Overhaul handling of bad page faults Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 10/24] powerpc/mm: Move debugger check to notify_page_fault() Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 11/24] powerpc/mm: Simplify returns from __do_page_fault Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 12/24] powerpc/mm: Fix reporting of kernel execute faults Benjamin Herrenschmidt
2018-11-07 8:35 ` Christophe LEROY
2018-11-07 10:39 ` Benjamin Herrenschmidt
[not found] ` <87zhtr5d1v.fsf@linux.ibm.com>
2018-11-30 6:08 ` Christophe LEROY
2017-07-19 4:49 ` [PATCH 13/24] powerpc/mm: Make bad_area* helper functions Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 14/24] powerpc/mm: Rework mm_fault_error() Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 15/24] powerpc/mm: Move CMO accounting out of do_page_fault into a helper Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 16/24] powerpc/mm: Cosmetic fix to page fault accounting Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 17/24] powerpc/mm: Move the DSISR_PROTFAULT sanity check Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 18/24] powerpc/mm: Move/simplify faulthandler_disabled() and !mm check Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 19/24] powerpc/mm: Add a bunch of (un)likely annotations to do_page_fault Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 20/24] powerpc/mm: Set fault flags earlier Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 21/24] powerpc/mm: Move page fault VMA access checks to a helper Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 22/24] powerpc/mm: Don't lose "major" fault indication on retry Benjamin Herrenschmidt
2017-07-19 4:49 ` [PATCH 23/24] powerpc/mm: Cleanup check for stack expansion Benjamin Herrenschmidt
2017-07-21 16:59 ` LEROY Christophe
2017-07-24 10:47 ` Michael Ellerman
2017-07-24 17:34 ` LEROY Christophe
2017-07-25 11:19 ` Michael Ellerman
2017-07-31 11:37 ` Christophe LEROY
2017-07-19 4:49 ` [PATCH 24/24] powerpc: Remove old unused icswx based coprocessor support Benjamin Herrenschmidt
2017-08-07 10:41 ` [01/24] powerpc/mm: Move exception_enter/exit to a do_page_fault wrapper Michael Ellerman
2017-08-07 16:37 ` Christophe LEROY
2017-08-08 2:16 ` Michael Ellerman
2017-08-08 6:45 ` Christophe LEROY
2017-08-08 10:00 ` Michael Ellerman
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=87k22lqz9d.fsf@concordia.ellerman.id.au \
--to=mpe@ellerman.id.au \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@lists.ozlabs.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).