From: Xiongwei Song <sxwjean@me.com>
To: Michael Ellerman <mpe@ellerman.id.au>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>,
benh@kernel.crashing.org, paulus@samba.org, oleg@redhat.com,
npiggin@gmail.com, aneesh.kumar@linux.ibm.com,
ravi.bangoria@linux.ibm.com, mikey@neuling.org,
haren@linux.ibm.com, akpm@linux-foundation.org, rppt@kernel.org,
jniethe5@gmail.com, atrajeev@linux.vnet.ibm.com,
maddy@linux.ibm.com, peterz@infradead.org, kjain@linux.ibm.com,
kan.liang@linux.intel.com, aik@ozlabs.ru, alistair@popple.id.au,
pmladek@suse.com, john.ogness@linutronix.de,
linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org,
Xiongwei Song <sxwjean@gmail.com>
Subject: Re: [PATCH v3] powerpc/traps: Enhance readability for trap types
Date: Sat, 10 Apr 2021 16:33:49 +0800 [thread overview]
Message-ID: <15CACAC1-95CE-4964-9221-A4EBF97590B4@me.com> (raw)
In-Reply-To: <874kgfdmxq.fsf@mpe.ellerman.id.au>
> On Apr 10, 2021, at 8:04 AM, Michael Ellerman <mpe@ellerman.id.au> wrote:
>
> Christophe Leroy <christophe.leroy@csgroup.eu> writes:
>> Le 08/04/2021 à 16:07, Xiongwei Song a écrit :
>>> From: Xiongwei Song <sxwjean@gmail.com>
>>>
>>> Create a new header named traps.h, define macros to list ppc interrupt
>>> types in traps.h, replace the reference of the trap hex values with these
>>> macros.
> ...
>>> diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
>>> index 7c633896d758..5ce9898bc9a6 100644
>>> --- a/arch/powerpc/include/asm/interrupt.h
>>> +++ b/arch/powerpc/include/asm/interrupt.h
>>> @@ -8,6 +8,7 @@
>>> #include <asm/ftrace.h>
>>> #include <asm/kprobes.h>
>>> #include <asm/runlatch.h>
>>> +#include <asm/traps.h>
>>>
>>> struct interrupt_state {
>>> #ifdef CONFIG_PPC_BOOK3E_64
>>> @@ -59,7 +60,7 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs, struct interrup
>>> * CT_WARN_ON comes here via program_check_exception,
>>> * so avoid recursion.
>>> */
>>> - if (TRAP(regs) != 0x700)
>>> + if (TRAP(regs) != INTERRUPT_PROGRAM)
>>> CT_WARN_ON(ct_state() != CONTEXT_KERNEL);
>>> }
>>> #endif
>>> @@ -156,7 +157,8 @@ static inline void interrupt_nmi_enter_prepare(struct pt_regs *regs, struct inte
>>> /* Don't do any per-CPU operations until interrupt state is fixed */
>>> #endif
>>> /* Allow DEC and PMI to be traced when they are soft-NMI */
>>> - if (TRAP(regs) != 0x900 && TRAP(regs) != 0xf00 && TRAP(regs) != 0x260) {
>>> + if (TRAP(regs) != INTERRUPT_DECREMENTER &&
>>> + TRAP(regs) != INTERRUPT_PERFMON) {
>>
>> I think too long names hinder readability, see later for suggestions.
>
> I asked for the longer names :)
>
> I think they make it easier for people who are less familiar with the
> architecture than us to make sense of the names.
>
> And there's only a couple of cases where it requires splitting a line,
> and they could be converted to use switch if we think it's a problem.
>
>>> diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
>>> index 0c0b1c2cfb49..641b3feef7ee 100644
>>> --- a/arch/powerpc/mm/fault.c
>>> +++ b/arch/powerpc/mm/fault.c
>>> @@ -588,20 +589,24 @@ void __bad_page_fault(struct pt_regs *regs, int sig)
>>> /* kernel has accessed a bad area */
>>>
>>> switch (TRAP(regs)) {
>>> - case 0x300:
>>> - case 0x380:
>>> - case 0xe00:
>>> + case INTERRUPT_DATA_STORAGE:
>>> +#ifdef CONFIG_PPC_BOOK3S
>>> + case INTERRUPT_DATA_SEGMENT:
>>> + case INTERRUPT_H_DATA_STORAGE:
>>> +#endif
>>
>> It would be better to avoid #ifdefs when none where necessary before.
>
> Yes I agree.
>
> I think these can all be avoided by defining most of the values
> regardless of what platform we're building for. Only the values that
> overlap need to be kept behind an ifdef.
Ok.
Regards,
Xiongwei
>
> cheers
next prev parent reply other threads:[~2021-04-10 8:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 14:07 Xiongwei Song
2021-04-09 16:14 ` Christophe Leroy
2021-04-09 17:45 ` Segher Boessenkool
2021-04-10 0:04 ` Michael Ellerman
2021-04-10 8:33 ` Xiongwei Song [this message]
2021-04-10 9:42 ` Christophe Leroy
2021-04-10 16:46 ` Segher Boessenkool
2021-04-10 8:31 ` Xiongwei Song
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=15CACAC1-95CE-4964-9221-A4EBF97590B4@me.com \
--to=sxwjean@me.com \
--cc=aik@ozlabs.ru \
--cc=akpm@linux-foundation.org \
--cc=alistair@popple.id.au \
--cc=aneesh.kumar@linux.ibm.com \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=christophe.leroy@csgroup.eu \
--cc=haren@linux.ibm.com \
--cc=jniethe5@gmail.com \
--cc=john.ogness@linutronix.de \
--cc=kan.liang@linux.intel.com \
--cc=kjain@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.ibm.com \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=npiggin@gmail.com \
--cc=oleg@redhat.com \
--cc=paulus@samba.org \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=ravi.bangoria@linux.ibm.com \
--cc=rppt@kernel.org \
--cc=sxwjean@gmail.com \
/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
all inboxes | Powered by JetHome®