From: Christophe Leroy <christophe.leroy@csgroup.eu> To: Oleg Nesterov <oleg@redhat.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>, Madhavan Srinivasan <maddy@linux.vnet.ibm.com>, Michael Ellerman <mpe@ellerman.id.au>, Paul Mackerras <paulus@samba.org>, Al Viro <viro@zeniv.linux.org.uk>, "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>, Christophe Leroy <christophe.leroy@c-s.fr>, Jan Kratochvil <jan.kratochvil@redhat.com>, Nicholas Piggin <npiggin@gmail.com>, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 2/2] powerpc/ptrace: Hard wire PT_SOFTE value to 1 in gpr_get() too Date: Thu, 19 Nov 2020 22:10:33 +0100 [thread overview] Message-ID: <20201119221033.Horde.be-msjDTeIW4XeXARjUu7g1@messagerie.c-s.fr> (raw) In-Reply-To: <20201119160247.GB5188@redhat.com> Quoting Oleg Nesterov <oleg@redhat.com>: > The commit a8a4b03ab95f ("powerpc: Hard wire PT_SOFTE value to 1 in > ptrace & signals") changed ptrace_get_reg(PT_SOFTE) to report 0x1, > but PTRACE_GETREGS still copies pt_regs->softe as is. > > This is not consistent and this breaks the user-regs-peekpoke test > from https://sourceware.org/systemtap/wiki/utrace/tests/ > > Reported-by: Jan Kratochvil <jan.kratochvil@redhat.com> > Signed-off-by: Oleg Nesterov <oleg@redhat.com> > --- > arch/powerpc/kernel/ptrace/ptrace-tm.c | 8 +++++++- > arch/powerpc/kernel/ptrace/ptrace-view.c | 8 +++++++- > 2 files changed, 14 insertions(+), 2 deletions(-) > I think the following should work, and not require the first patch (compile tested only). diff --git a/arch/powerpc/kernel/ptrace/ptrace-tm.c b/arch/powerpc/kernel/ptrace/ptrace-tm.c index 54f2d076206f..f779b3bc0279 100644 --- a/arch/powerpc/kernel/ptrace/ptrace-tm.c +++ b/arch/powerpc/kernel/ptrace/ptrace-tm.c @@ -104,8 +104,14 @@ int tm_cgpr_get(struct task_struct *target, const struct user_regset *regset, offsetof(struct pt_regs, msr) + sizeof(long)); membuf_write(&to, &target->thread.ckpt_regs.orig_gpr3, - sizeof(struct user_pt_regs) - - offsetof(struct pt_regs, orig_gpr3)); + offsetof(struct pt_regs, softe) - offsetof(struct pt_regs, orig_gpr3)); + membuf_store(&to, 1UL); + + BUILD_BUG_ON(offsetof(struct pt_regs, trap) != + offsetof(struct pt_regs, softe) + sizeof(long)); + + membuf_write(&to, &target->thread.ckpt_regs.trap, + sizeof(struct user_pt_regs) - offsetof(struct pt_regs, trap)); return membuf_zero(&to, ELF_NGREG * sizeof(unsigned long) - sizeof(struct user_pt_regs)); } diff --git a/arch/powerpc/kernel/ptrace/ptrace-view.c b/arch/powerpc/kernel/ptrace/ptrace-view.c index 7e6478e7ed07..736bfbf33890 100644 --- a/arch/powerpc/kernel/ptrace/ptrace-view.c +++ b/arch/powerpc/kernel/ptrace/ptrace-view.c @@ -234,9 +234,21 @@ static int gpr_get(struct task_struct *target, const struct user_regset *regset, BUILD_BUG_ON(offsetof(struct pt_regs, orig_gpr3) != offsetof(struct pt_regs, msr) + sizeof(long)); +#ifdef CONFIG_PPC64 + membuf_write(&to, &target->thread.regs->orig_gpr3, + offsetof(struct pt_regs, softe) - offsetof(struct pt_regs, orig_gpr3)); + membuf_store(&to, 1UL); + + BUILD_BUG_ON(offsetof(struct pt_regs, trap) != + offsetof(struct pt_regs, softe) + sizeof(long)); + + membuf_write(&to, &target->thread.regs->trap, + sizeof(struct user_pt_regs) - offsetof(struct pt_regs, trap)); +#else membuf_write(&to, &target->thread.regs->orig_gpr3, sizeof(struct user_pt_regs) - offsetof(struct pt_regs, orig_gpr3)); +#endif return membuf_zero(&to, ELF_NGREG * sizeof(unsigned long) - sizeof(struct user_pt_regs)); } --- Christophe
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@csgroup.eu> To: Oleg Nesterov <oleg@redhat.com> Cc: Christophe Leroy <christophe.leroy@c-s.fr>, Madhavan Srinivasan <maddy@linux.vnet.ibm.com>, linuxppc-dev@lists.ozlabs.org, Nicholas Piggin <npiggin@gmail.com>, linux-kernel@vger.kernel.org, Paul Mackerras <paulus@samba.org>, Al Viro <viro@zeniv.linux.org.uk>, "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com>, Jan Kratochvil <jan.kratochvil@redhat.com> Subject: Re: [PATCH v3 2/2] powerpc/ptrace: Hard wire PT_SOFTE value to 1 in gpr_get() too Date: Thu, 19 Nov 2020 22:10:33 +0100 [thread overview] Message-ID: <20201119221033.Horde.be-msjDTeIW4XeXARjUu7g1@messagerie.c-s.fr> (raw) In-Reply-To: <20201119160247.GB5188@redhat.com> Quoting Oleg Nesterov <oleg@redhat.com>: > The commit a8a4b03ab95f ("powerpc: Hard wire PT_SOFTE value to 1 in > ptrace & signals") changed ptrace_get_reg(PT_SOFTE) to report 0x1, > but PTRACE_GETREGS still copies pt_regs->softe as is. > > This is not consistent and this breaks the user-regs-peekpoke test > from https://sourceware.org/systemtap/wiki/utrace/tests/ > > Reported-by: Jan Kratochvil <jan.kratochvil@redhat.com> > Signed-off-by: Oleg Nesterov <oleg@redhat.com> > --- > arch/powerpc/kernel/ptrace/ptrace-tm.c | 8 +++++++- > arch/powerpc/kernel/ptrace/ptrace-view.c | 8 +++++++- > 2 files changed, 14 insertions(+), 2 deletions(-) > I think the following should work, and not require the first patch (compile tested only). diff --git a/arch/powerpc/kernel/ptrace/ptrace-tm.c b/arch/powerpc/kernel/ptrace/ptrace-tm.c index 54f2d076206f..f779b3bc0279 100644 --- a/arch/powerpc/kernel/ptrace/ptrace-tm.c +++ b/arch/powerpc/kernel/ptrace/ptrace-tm.c @@ -104,8 +104,14 @@ int tm_cgpr_get(struct task_struct *target, const struct user_regset *regset, offsetof(struct pt_regs, msr) + sizeof(long)); membuf_write(&to, &target->thread.ckpt_regs.orig_gpr3, - sizeof(struct user_pt_regs) - - offsetof(struct pt_regs, orig_gpr3)); + offsetof(struct pt_regs, softe) - offsetof(struct pt_regs, orig_gpr3)); + membuf_store(&to, 1UL); + + BUILD_BUG_ON(offsetof(struct pt_regs, trap) != + offsetof(struct pt_regs, softe) + sizeof(long)); + + membuf_write(&to, &target->thread.ckpt_regs.trap, + sizeof(struct user_pt_regs) - offsetof(struct pt_regs, trap)); return membuf_zero(&to, ELF_NGREG * sizeof(unsigned long) - sizeof(struct user_pt_regs)); } diff --git a/arch/powerpc/kernel/ptrace/ptrace-view.c b/arch/powerpc/kernel/ptrace/ptrace-view.c index 7e6478e7ed07..736bfbf33890 100644 --- a/arch/powerpc/kernel/ptrace/ptrace-view.c +++ b/arch/powerpc/kernel/ptrace/ptrace-view.c @@ -234,9 +234,21 @@ static int gpr_get(struct task_struct *target, const struct user_regset *regset, BUILD_BUG_ON(offsetof(struct pt_regs, orig_gpr3) != offsetof(struct pt_regs, msr) + sizeof(long)); +#ifdef CONFIG_PPC64 + membuf_write(&to, &target->thread.regs->orig_gpr3, + offsetof(struct pt_regs, softe) - offsetof(struct pt_regs, orig_gpr3)); + membuf_store(&to, 1UL); + + BUILD_BUG_ON(offsetof(struct pt_regs, trap) != + offsetof(struct pt_regs, softe) + sizeof(long)); + + membuf_write(&to, &target->thread.regs->trap, + sizeof(struct user_pt_regs) - offsetof(struct pt_regs, trap)); +#else membuf_write(&to, &target->thread.regs->orig_gpr3, sizeof(struct user_pt_regs) - offsetof(struct pt_regs, orig_gpr3)); +#endif return membuf_zero(&to, ELF_NGREG * sizeof(unsigned long) - sizeof(struct user_pt_regs)); } --- Christophe
next prev parent reply other threads:[~2020-11-19 21:07 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-19 16:01 [PATCH v3 0/2] powerpc/ptrace: Hard wire PT_SOFTE value to 1 in gpr_get() too Oleg Nesterov 2020-11-19 16:01 ` Oleg Nesterov 2020-11-19 16:02 ` [PATCH v3 1/2] powerpc/ptrace: simplify gpr_get/tm_cgpr_get Oleg Nesterov 2020-11-19 16:02 ` Oleg Nesterov 2020-11-19 17:16 ` Christophe Leroy 2020-11-19 17:16 ` Christophe Leroy 2020-11-19 18:18 ` Oleg Nesterov 2020-11-19 18:18 ` Oleg Nesterov 2020-11-19 16:02 ` [PATCH v3 2/2] powerpc/ptrace: Hard wire PT_SOFTE value to 1 in gpr_get() too Oleg Nesterov 2020-11-19 16:02 ` Oleg Nesterov 2020-11-19 16:05 ` Oleg Nesterov 2020-11-19 16:05 ` Oleg Nesterov 2020-11-19 17:18 ` Christophe Leroy 2020-11-19 17:18 ` Christophe Leroy 2020-11-19 21:10 ` Christophe Leroy [this message] 2020-11-19 21:10 ` Christophe Leroy 2020-11-19 22:43 ` Oleg Nesterov 2020-11-19 22:43 ` Oleg Nesterov 2020-11-23 18:01 ` Oleg Nesterov 2020-11-23 18:01 ` Oleg Nesterov 2020-11-24 0:53 ` Michael Ellerman 2020-11-24 0:53 ` Michael Ellerman 2020-11-19 17:19 ` [PATCH v3 0/2] " Christophe Leroy 2020-11-19 17:19 ` Christophe Leroy 2020-11-19 18:22 ` Oleg Nesterov 2020-11-19 18:22 ` Oleg Nesterov 2020-12-10 11:30 ` Michael Ellerman 2020-12-10 11:30 ` 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=20201119221033.Horde.be-msjDTeIW4XeXARjUu7g1@messagerie.c-s.fr \ --to=christophe.leroy@csgroup.eu \ --cc=aneesh.kumar@linux.ibm.com \ --cc=benh@kernel.crashing.org \ --cc=christophe.leroy@c-s.fr \ --cc=jan.kratochvil@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=maddy@linux.vnet.ibm.com \ --cc=mpe@ellerman.id.au \ --cc=npiggin@gmail.com \ --cc=oleg@redhat.com \ --cc=paulus@samba.org \ --cc=viro@zeniv.linux.org.uk \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.