From patchwork Thu Feb 2 07:31:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 13125435 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CDC16C05027 for ; Thu, 2 Feb 2023 07:33:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=X3XN13+UTKnQTSCw4CZNfhoNJN3FoNvn4oRv9/USqCM=; b=RaVdOvlRyn1nA8 sLHKjLmMzoPJJy4dXB1ttf1hsatJk6VSV7A7nkj/Dg4+sZJibpUL+Lqe/prLwQJ0N3/DWMoswzZw+ t9fzDeR+Ai8Y163j7B8J07l9LiUMQ1+w/869x/CfL0tDx/2HTyusnQTJvm3zz8l5ZYElkjvQrdhmk 6rGUECtF+lgN16OjS2JeG8y+fWVqFOeSgCm4QCpfbP9b/GfW/dehCJYivM3CPs04rtHVuMTYFgScg wfc6/puolG//ckKXvp23I8CD6DSKlqv4xjEnMHOZjAPcknhpY7ozWl7Y8XXz3ERrDzcL9HaPapBCr mqFzKLmg2nIDoK21uxRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNU54-00EeGI-Ar; Thu, 02 Feb 2023 07:32:26 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pNU4u-00EeCH-4t for linux-arm-kernel@lists.infradead.org; Thu, 02 Feb 2023 07:32:17 +0000 Received: by mail-pj1-x1034.google.com with SMTP id ha3-20020a17090af3c300b00230222051a6so1005665pjb.2 for ; Wed, 01 Feb 2023 23:32:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9HVeXriudK8VUfG7IXky8/P1/K4exUTPN02+5x1/aWk=; b=tNE1hOqgyzfZrv+m53QDibjRnzkEoudW+5axJk7qRZPfiNx4ZPtPU43HSR6CGabcyb FfbVdMAMG/ozgNRH5OvsNSFeTJTAlKJwmQ6UJ+ixxNq6Sb8D3WBlnibGhvRFS/e2aQi/ StiPFniJzGkzckBo0I/+nwJk2Lk6tacdFVbhFkdR0vUb65Lv3GBhDpz7dNxdVWmb+Cqo Gla0XpBP+XWOmZu8H01SS/pubQ73Og7aDtYUpQR5X0yhy4z8G32SJb7oFFnmqp4NjIuO 4ycrTWlX56wBMM/mcWZtRCNdbQjwrLDKxRK+aTTfr0UBM5To6KnYk+MUWxF7J3WhIUyK fNRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9HVeXriudK8VUfG7IXky8/P1/K4exUTPN02+5x1/aWk=; b=Tsxb+4yxrdDnBIWRP47eyPQaFRS8VPvh9FHwEaXjoW/Ixs1Tt58YsTSgXElFPBwdJ0 R3RRDlfEaQ0JVw5gtxJogifcLAPXFclQ1oQ7DsupuVxVHvGntkOx2KeGvOL2OlEHCa+f 1zMa7LHYXef/AHIN+GKdS4pQPqLoyPMxo2dO5LWVfPEuroNJq0hmgOkhNP+TPXNALkKB 8DjP2sq2MtXktIcQ6lhMbOoXoJelpj/+7vRDli4X6DKMhvU6QEd4ecG3q0TrGAFYRO6L qA4Hfv6fk4mxGH/KlO1WBQKO2nr3xdSCyoC1c7g7cMDKa69WtVfDfffePmFpotZIm/iQ PWKQ== X-Gm-Message-State: AO0yUKXeWlPLUk2kSTf961cNYvU5QrnZryEpUFASnvH8kp5tyKzs5Ljy nUEsFtVz7PRBa5SIK0q6QtiuiA== X-Google-Smtp-Source: AK7set+mw1dHNc9akouI86sKWRtZ8+TxnQMNzD8jTeP64nqqdVQDR6kM1hbsJzaChVbCT91YbraX7Q== X-Received: by 2002:a17:902:ecd1:b0:196:12f1:76f5 with SMTP id a17-20020a170902ecd100b0019612f176f5mr1206670plh.52.1675323133195; Wed, 01 Feb 2023 23:32:13 -0800 (PST) Received: from sumit-X1.. ([223.178.209.222]) by smtp.gmail.com with ESMTPSA id o17-20020a170902d4d100b00196077ba463sm12959015plg.123.2023.02.01.23.32.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 23:32:12 -0800 (PST) From: Sumit Garg To: will@kernel.org, catalin.marinas@arm.com Cc: mark.rutland@arm.com, daniel.thompson@linaro.org, dianders@chromium.org, liwei391@huawei.com, mhiramat@kernel.org, maz@kernel.org, ardb@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sumit Garg Subject: [PATCH v6 2/2] arm64: kgdb: Set PSTATE.SS to 1 to re-enable single-step Date: Thu, 2 Feb 2023 13:01:48 +0530 Message-Id: <20230202073148.657746-3-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230202073148.657746-1-sumit.garg@linaro.org> References: <20230202073148.657746-1-sumit.garg@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230201_233216_206312_EA77DA31 X-CRM114-Status: GOOD ( 14.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Currently only the first attempt to single-step has any effect. After that all further stepping remains "stuck" at the same program counter value. Refer to the ARM Architecture Reference Manual (ARM DDI 0487E.a) D2.12, PSTATE.SS=1 should be set at each step before transferring the PE to the 'Active-not-pending' state. The problem here is PSTATE.SS=1 is not set since the second single-step. After the first single-step, the PE transferes to the 'Inactive' state, with PSTATE.SS=0 and MDSCR.SS=1, thus PSTATE.SS won't be set to 1 due to kernel_active_single_step()=true. Then the PE transferes to the 'Active-pending' state when ERET and returns to the debugger by step exception. Before this patch: ================== Entering kdb (current=0xffff3376039f0000, pid 1) on processor 0 due to Keyboard Entry [0]kdb> [0]kdb> [0]kdb> bp write_sysrq_trigger Instruction(i) BP #0 at 0xffffa45c13d09290 (write_sysrq_trigger) is enabled addr at ffffa45c13d09290, hardtype=0 installed=0 [0]kdb> go $ echo h > /proc/sysrq-trigger Entering kdb (current=0xffff4f7e453f8000, pid 175) on processor 1 due to Breakpoint @ 0xffffad651a309290 [1]kdb> ss Entering kdb (current=0xffff4f7e453f8000, pid 175) on processor 1 due to SS trap @ 0xffffad651a309294 [1]kdb> ss Entering kdb (current=0xffff4f7e453f8000, pid 175) on processor 1 due to SS trap @ 0xffffad651a309294 [1]kdb> After this patch: ================= Entering kdb (current=0xffff6851c39f0000, pid 1) on processor 0 due to Keyboard Entry [0]kdb> bp write_sysrq_trigger Instruction(i) BP #0 at 0xffffc02d2dd09290 (write_sysrq_trigger) is enabled addr at ffffc02d2dd09290, hardtype=0 installed=0 [0]kdb> go $ echo h > /proc/sysrq-trigger Entering kdb (current=0xffff6851c53c1840, pid 174) on processor 1 due to Breakpoint @ 0xffffc02d2dd09290 [1]kdb> ss Entering kdb (current=0xffff6851c53c1840, pid 174) on processor 1 due to SS trap @ 0xffffc02d2dd09294 [1]kdb> ss Entering kdb (current=0xffff6851c53c1840, pid 174) on processor 1 due to SS trap @ 0xffffc02d2dd09298 [1]kdb> ss Entering kdb (current=0xffff6851c53c1840, pid 174) on processor 1 due to SS trap @ 0xffffc02d2dd0929c [1]kdb> Fixes: 44679a4f142b ("arm64: KGDB: Add step debugging support") Co-developed-by: Wei Li Signed-off-by: Wei Li Signed-off-by: Sumit Garg Tested-by: Douglas Anderson Acked-by: Daniel Thompson Tested-by: Daniel Thompson --- arch/arm64/include/asm/debug-monitors.h | 1 + arch/arm64/kernel/debug-monitors.c | 5 +++++ arch/arm64/kernel/kgdb.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h index 7b7e05c02691..13d437bcbf58 100644 --- a/arch/arm64/include/asm/debug-monitors.h +++ b/arch/arm64/include/asm/debug-monitors.h @@ -104,6 +104,7 @@ void user_regs_reset_single_step(struct user_pt_regs *regs, void kernel_enable_single_step(struct pt_regs *regs); void kernel_disable_single_step(void); int kernel_active_single_step(void); +void kernel_rewind_single_step(struct pt_regs *regs); #ifdef CONFIG_HAVE_HW_BREAKPOINT int reinstall_suspended_bps(struct pt_regs *regs); diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c index 3da09778267e..64f2ecbdfe5c 100644 --- a/arch/arm64/kernel/debug-monitors.c +++ b/arch/arm64/kernel/debug-monitors.c @@ -438,6 +438,11 @@ int kernel_active_single_step(void) } NOKPROBE_SYMBOL(kernel_active_single_step); +void kernel_rewind_single_step(struct pt_regs *regs) +{ + set_regs_spsr_ss(regs); +} + /* ptrace API */ void user_enable_single_step(struct task_struct *task) { diff --git a/arch/arm64/kernel/kgdb.c b/arch/arm64/kernel/kgdb.c index cda9c1e9864f..4e1f983df3d1 100644 --- a/arch/arm64/kernel/kgdb.c +++ b/arch/arm64/kernel/kgdb.c @@ -224,6 +224,8 @@ int kgdb_arch_handle_exception(int exception_vector, int signo, */ if (!kernel_active_single_step()) kernel_enable_single_step(linux_regs); + else + kernel_rewind_single_step(linux_regs); err = 0; break; default: