Message ID | CAD=FV=X4_AQFBxWpinDj5F9DUckC02dQ_2QPFQRs34e5_b00bQ@mail.gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Thu, Mar 08, 2018 at 08:41:59AM -0800, Doug Anderson wrote: > Hi, > > On Thu, Mar 8, 2018 at 8:19 AM, Daniel Thompson > <daniel.thompson@linaro.org> wrote: > > On 05/03/18 23:43, Douglas Anderson wrote: > >> > >> This is the equivalent of commit 001bf455d206 ("ARM: 8428/1: kgdb: Fix > >> registers on sleeping tasks") but for arm64. Nuff said. > >> > >> ...well, perhaps I could also add that task_pt_regs are userspace > >> registers and that's not what kgdb is supposed to be reporting. We're > >> supposed to be reporting kernel registers. > >> > >> Signed-off-by: Douglas Anderson <dianders@chromium.org> > > > > > > I hacked together a (still very immature) kgdb test suite[1] around the turn > > of the year. Whilst its not quite solid enough for me to recommend others > > deploy it except out of curiosity... so I haven't yet started yelling about > > test suite failures except in the privacy of my own head. > > > > However I can confirm that this patch fixes one of the test suite failures I > > haven't had time to blame allocate yet! > > > > So... > > Tested-by: Daniel Thompson <daniel.thompson@linaro.org> > > Thanks for your testing! ...I'll have to check out your test suite soon. > > > > BTW is this something that should Cc: stable? > > It wouldn't hurt if this made it back to stable on a best-effort > approach. The problem has been there since the beginning, so it's not > like it's fixing a regression that cropped up in a specific version. > ...but it does fix a bug, so probably Cc stable makes sense. I guess > I'd leave it up to the maintainer that applies the patch? I've already put this into -next, so I don't really want to rebase just for this. If you think it's important, please send to stable@vger.kernel.org once it's landed in mainline. Will
diff --git a/arch/arm64/kernel/kgdb.c b/arch/arm64/kernel/kgdb.c<br> index 2122cd187f19..a20de58061a8 100644<br> --- a/arch/arm64/kernel/kgdb.c<br> +++ b/arch/arm64/kernel/kgdb.c<br> @@ -138,14 +138,25 @@ int dbg_set_reg(int regno, void *mem, struct pt_regs *regs)<br> void<br> sleeping_thread_to_gdb_regs(un<wbr>signed long *gdb_regs, struct task_struct *task)<br> {<br> - struct pt_regs *thread_regs;<br> + struct cpu_context *cpu_context = &task->thread.cpu_context;<br> /* Initialize to zero */<br> memset((char *)gdb_regs, 0, NUMREGBYTES);<br> - thread_regs = task_pt_regs(task);<br> - memcpy((void *)gdb_regs, (void *)thread_regs->regs, GP_REG_BYTES);<br> - /* Special case for PSTATE (check comments in asm/kgdb.h for details) */<br> - dbg_get_reg(33, gdb_regs + GP_REG_BYTES, thread_regs);<br> +<br> + gdb_regs[19] = cpu_context->x19;<br> + gdb_regs[20] = cpu_context->x20;<br> + gdb_regs[21] = cpu_context->x21;<br> + gdb_regs[22] = cpu_context->x22;<br> + gdb_regs[23] = cpu_context->x23;<br> + gdb_regs[24] = cpu_context->x24;<br> + gdb_regs[25] = cpu_context->x25;<br> + gdb_regs[26] = cpu_context->x26;<br> + gdb_regs[27] = cpu_context->x27;<br> + gdb_regs[28] = cpu_context->x28;<br> + gdb_regs[29] = cpu_context->fp;<br> +<br>