From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mackerras <paulus@samba.org>,
mikey@neuling.org
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: Re: [RFC PATCH v2 02/12] powerpc/ptrace: drop unnecessary #ifdefs CONFIG_PPC64
Date: Wed, 26 Feb 2020 13:06:33 +0100 [thread overview]
Message-ID: <66e65eec-ce09-4e7e-aa71-38d19b3d4fee@c-s.fr> (raw)
In-Reply-To: <878sks1csl.fsf@mpe.ellerman.id.au>
Le 24/02/2020 à 11:48, Michael Ellerman a écrit :
> Christophe Leroy <christophe.leroy@c-s.fr> writes:
>> Drop a bunch of #ifdefs CONFIG_PPC64 that are not vital.
>>
>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
>> ---
>> arch/powerpc/include/asm/ptrace.h | 9 ++++-----
>> arch/powerpc/include/uapi/asm/ptrace.h | 12 ++++--------
>> arch/powerpc/kernel/ptrace/ptrace.c | 24 +++---------------------
>> 3 files changed, 11 insertions(+), 34 deletions(-)
>>
>> diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
>> index faa5a338ac5a..1506a9c61d50 100644
>> --- a/arch/powerpc/include/asm/ptrace.h
>> +++ b/arch/powerpc/include/asm/ptrace.h
>> @@ -36,11 +36,10 @@ struct pt_regs
>> unsigned long link;
>> unsigned long xer;
>> unsigned long ccr;
>> -#ifdef CONFIG_PPC64
>> - unsigned long softe;
>> -#else
>> - unsigned long mq;
>> -#endif
>> + union {
>> + unsigned long softe;
>> + unsigned long mq;
>> + };
>> unsigned long trap;
>> unsigned long dar;
>> unsigned long dsisr;
>> diff --git a/arch/powerpc/include/uapi/asm/ptrace.h b/arch/powerpc/include/uapi/asm/ptrace.h
>> index f5f1ccc740fc..37d7befbb8dc 100644
>> --- a/arch/powerpc/include/uapi/asm/ptrace.h
>> +++ b/arch/powerpc/include/uapi/asm/ptrace.h
>> @@ -43,12 +43,11 @@ struct pt_regs
>> unsigned long link;
>> unsigned long xer;
>> unsigned long ccr;
>> -#ifdef __powerpc64__
>> - unsigned long softe; /* Soft enabled/disabled */
>> -#else
>> - unsigned long mq; /* 601 only (not used at present) */
>> + union {
>> + unsigned long softe; /* Soft enabled/disabled */
>> + unsigned long mq; /* 601 only (not used at present) */
>> /* Used on APUS to hold IPL value. */
>> -#endif
>> + };
>
> As Andreas pointed out this is not safe as this is a uapi header.
Ok, dropped
>
>> unsigned long trap; /* Reason for being here */
>> /* N.B. for critical exceptions on 4xx, the dar and dsisr
>> fields are overloaded to hold srr0 and srr1. */
>> @@ -105,11 +104,8 @@ struct pt_regs
>> #define PT_LNK 36
>> #define PT_XER 37
>> #define PT_CCR 38
>> -#ifndef __powerpc64__
>> #define PT_MQ 39
>> -#else
>> #define PT_SOFTE 39
>> -#endif
>
> I'd also rather leave that as it is.
>
> There's a slim chance it could break some code that already has either
> of those defined.
>
> If you need them both defined to make other code work in the kernel
> that's fine, in the kernel header we can do:
>
> // Ensure these are always defined inside the kernel to avoid #ifdefs
> #ifdef CONFIG_PPC64
> #define PT_MQ 39
> #else
> #define PT_SOFTE 39
> #endif
Ok.
Only the PT_SOFTE is missing, I added the following in the relevant case:
#define PT_SOFTE PT_MQ
>
>
>> #define PT_TRAP 40
>> #define PT_DAR 41
>> #define PT_DSISR 42
>> diff --git a/arch/powerpc/kernel/ptrace/ptrace.c b/arch/powerpc/kernel/ptrace/ptrace.c
>> index 684b0b315c32..0afb223c4d57 100644
>> --- a/arch/powerpc/kernel/ptrace/ptrace.c
>> +++ b/arch/powerpc/kernel/ptrace/ptrace.c
>> @@ -113,11 +113,8 @@ static const struct pt_regs_offset regoffset_table[] = {
>> REG_OFFSET_NAME(link),
>> REG_OFFSET_NAME(xer),
>> REG_OFFSET_NAME(ccr),
>> -#ifdef CONFIG_PPC64
>> REG_OFFSET_NAME(softe),
>> -#else
>> REG_OFFSET_NAME(mq),
>> -#endif
>
> Pretty sure that will cause breakage. The offset is ABI.
Ok, dropped
Christophe
next prev parent reply other threads:[~2020-02-26 12:51 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-28 15:47 [RFC PATCH v2 00/12] Reduce ifdef mess in ptrace Christophe Leroy
2019-06-28 15:47 ` [RFC PATCH v2 01/12] powerpc: move ptrace into a subdirectory Christophe Leroy
2019-06-28 15:47 ` [RFC PATCH v2 02/12] powerpc/ptrace: drop unnecessary #ifdefs CONFIG_PPC64 Christophe Leroy
2019-06-28 16:36 ` Andreas Schwab
2019-06-28 16:39 ` Christophe Leroy
2019-06-28 17:08 ` Andreas Schwab
2020-02-24 10:48 ` Michael Ellerman
2020-02-26 12:06 ` Christophe Leroy [this message]
2019-06-28 15:47 ` [RFC PATCH v2 03/12] powerpc/ptrace: drop PARAMETER_SAVE_AREA_OFFSET Christophe Leroy
2019-06-28 15:47 ` [RFC PATCH v2 04/12] powerpc/ptrace: split out VSX related functions Christophe Leroy
2020-02-24 10:51 ` Michael Ellerman
2020-02-26 12:04 ` Christophe Leroy
2019-06-28 15:47 ` [RFC PATCH v2 05/12] powerpc/ptrace: split out ALTIVEC " Christophe Leroy
2019-06-28 15:47 ` [RFC PATCH v2 06/12] powerpc/ptrace: split out SPE " Christophe Leroy
2019-06-28 15:47 ` [RFC PATCH v2 07/12] powerpc/ptrace: split out TRANSACTIONAL_MEM " Christophe Leroy
2019-06-28 15:47 ` [RFC PATCH v2 08/12] powerpc/ptrace: move register viewing functions out of ptrace.c Christophe Leroy
2019-06-28 15:47 ` [RFC PATCH v2 09/12] powerpc/ptrace: split out ADV_DEBUG_REGS related functions Christophe Leroy
2019-07-03 2:52 ` Ravi Bangoria
2019-06-28 15:47 ` [RFC PATCH v2 10/12] powerpc/ptrace: create ptrace_get_debugreg() Christophe Leroy
2019-07-03 3:03 ` Ravi Bangoria
2019-06-28 15:48 ` [RFC PATCH v2 11/12] powerpc/ptrace: create ppc_gethwdinfo() Christophe Leroy
2019-07-03 3:18 ` Ravi Bangoria
2019-06-28 15:48 ` [RFC PATCH v2 12/12] powerpc/ptrace: move ptrace_triggered() into hw_breakpoint.c Christophe Leroy
2019-07-03 3:05 ` Ravi Bangoria
2019-07-03 6:29 ` [RFC PATCH v2 00/12] Reduce ifdef mess in ptrace Ravi Bangoria
2020-02-17 6:49 ` Christophe Leroy
2020-02-24 2:15 ` Michael Neuling
2020-02-24 5:58 ` Christophe Leroy
2020-02-24 10:54 ` Michael Ellerman
2020-02-26 12:03 ` Christophe Leroy
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=66e65eec-ce09-4e7e-aa71-38d19b3d4fee@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=benh@kernel.crashing.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.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).