From patchwork Mon Mar 5 23:43:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 10260281 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4398F60134 for ; Mon, 5 Mar 2018 23:43:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35C8628CEE for ; Mon, 5 Mar 2018 23:43:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A73228CF2; Mon, 5 Mar 2018 23:43:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CC1F928CEE for ; Mon, 5 Mar 2018 23:43:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=ylYQUnzgcdm8qsw6z9OAVB5smEHr6STsZVe7le4dY0Q=; b=mUb UqXr8hzgDwfPfmFBLrRwsOmSDt5UbGVXjYO6PX9BLI4VOgB4cVpOyQXfKIHBzCjhdRyR4xAGMdtiA T/p9TRPu6LPxHrP8nUyxYgmYdI0ni/mHIBRmucldb0iA/U1OIS1nSInTEWUtimVpm90w5aMf6qg9K miMOrph9ZYgh7TXfZxxdK2sm/8UvreWZhbXsKbXb9GRSNkkMWIl0RTBu24eJPNscZIlEgb94ZptLz W8JiF6HNvddbWhw5AzqTEX0TNthJ9kKR+CLkAxCxFVjlQhqh4XCMCo/uYhfQK7qRBWI8IiWixiLiM p/um5S8kXrRwnGTb/TJ2Ab78jurLA7A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eszln-0007k0-5u; Mon, 05 Mar 2018 23:43:51 +0000 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eszlj-0007hR-MO for linux-arm-kernel@lists.infradead.org; Mon, 05 Mar 2018 23:43:49 +0000 Received: by mail-pf0-x242.google.com with SMTP id z10so7946549pfh.13 for ; Mon, 05 Mar 2018 15:43:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=pWm8qhhCrZdzI4vbjEsYNnsvwGeCmgrTePnCy7lwldM=; b=hRXvj/a7zQF9GhDKCYVaYj6OM1j+8ahsWzQinVtolJPXiqGtq59Q8sAMFvKe/Iqcm1 gWvtiyYtxwtUB1RX7QD4e7m1oVXNp5uWXevZZY8UxPvjJH6VI8uiSm2p2GVfc4ydmx1u GqSul/7mJOPKN0DQTOqc3S0hSxWkXc0/Jm8Ys= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=pWm8qhhCrZdzI4vbjEsYNnsvwGeCmgrTePnCy7lwldM=; b=OWk0yNkJNjZWfIKWR7AfMT40vyeSjFhltb5cfFruck/xRmZJ81Nqt737lADjz5KI+i +f+RKxv1g2ZyeRIvCXOvsA0wm0U/g5p69genFQSlGohRz/zTMtw4SmqUnNh4cozn7eBp LQ2P2Pz8yt9aURYEMINZmvzuInTFv+6piM3YQ1zBlHgZ4GscCCRPfsv1QjNdv1xT4/NN Kh6RqtP9hoIZwddo37bwyTtZJ9YL/pmt1aXkrLxSd7I+zE1GCSjwbARXDf7fN2LxHIk2 bm2KKutu89y5VsTdlFvbZBnYk3U4ZtK2PVEfQQnEZ/1VxVJe21DO+vtG8di7vhqayRk2 tBWQ== X-Gm-Message-State: APf1xPBZ1frmeRmH1J+zlJReo37rg3yX5CIO1HUV+qq3G2C5ZyfcRo51 bCtGyTjuekWIs7AazAnfmVq61g== X-Google-Smtp-Source: AG47ELv1AEPMVqavz6LUHF72horAdYW2sd1RrDiKC6WSV4tBOGaxU3AybZpXYksbARUWBGGZ2gTBKA== X-Received: by 10.98.55.7 with SMTP id e7mr17096570pfa.112.1520293415935; Mon, 05 Mar 2018 15:43:35 -0800 (PST) Received: from tictac2.mtv.corp.google.com ([2620:0:1000:1501:38e4:86fe:ec0c:4007]) by smtp.gmail.com with ESMTPSA id a6sm6661966pgq.82.2018.03.05.15.43.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 15:43:34 -0800 (PST) From: Douglas Anderson To: Catalin Marinas , Will Deacon , Mark Rutland Subject: [PATCH v2] arm64/debug: Fix registers on sleeping tasks Date: Mon, 5 Mar 2018 15:43:09 -0800 Message-Id: <20180305234309.233226-1-dianders@chromium.org> X-Mailer: git-send-email 2.16.2.395.g2e18187dfd-goog X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180305_154347_827259_2FB759ED X-CRM114-Status: GOOD ( 14.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: briannorris@chromium.org, linux-kernel@vger.kernel.org, evgreen@chromium.org, Douglas Anderson , swboyd@chromium.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Tested-by: Daniel Thompson --- Changes in v2: - Init cpu_context in one line - Explain that task_pt_regs are userspace arch/arm64/kernel/kgdb.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/kgdb.c b/arch/arm64/kernel/kgdb.c index 2122cd187f19..a20de58061a8 100644 --- a/arch/arm64/kernel/kgdb.c +++ b/arch/arm64/kernel/kgdb.c @@ -138,14 +138,25 @@ int dbg_set_reg(int regno, void *mem, struct pt_regs *regs) void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task) { - struct pt_regs *thread_regs; + struct cpu_context *cpu_context = &task->thread.cpu_context; /* Initialize to zero */ memset((char *)gdb_regs, 0, NUMREGBYTES); - thread_regs = task_pt_regs(task); - memcpy((void *)gdb_regs, (void *)thread_regs->regs, GP_REG_BYTES); - /* Special case for PSTATE (check comments in asm/kgdb.h for details) */ - dbg_get_reg(33, gdb_regs + GP_REG_BYTES, thread_regs); + + gdb_regs[19] = cpu_context->x19; + gdb_regs[20] = cpu_context->x20; + gdb_regs[21] = cpu_context->x21; + gdb_regs[22] = cpu_context->x22; + gdb_regs[23] = cpu_context->x23; + gdb_regs[24] = cpu_context->x24; + gdb_regs[25] = cpu_context->x25; + gdb_regs[26] = cpu_context->x26; + gdb_regs[27] = cpu_context->x27; + gdb_regs[28] = cpu_context->x28; + gdb_regs[29] = cpu_context->fp; + + gdb_regs[31] = cpu_context->sp; + gdb_regs[32] = cpu_context->pc; } void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long pc)