From patchwork Fri Sep 23 07:42:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 9347597 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 A9C34607D0 for ; Fri, 23 Sep 2016 07:36:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CB1F2A01F for ; Fri, 23 Sep 2016 07:36:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 913102A081; Fri, 23 Sep 2016 07:36:56 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 18E812A01F for ; Fri, 23 Sep 2016 07:36:56 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bnL1I-0005QD-Ri; Fri, 23 Sep 2016 07:35:40 +0000 Received: from mail-pa0-x233.google.com ([2607:f8b0:400e:c03::233]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bnL1C-0004YZ-VI for linux-arm-kernel@lists.infradead.org; Fri, 23 Sep 2016 07:35:37 +0000 Received: by mail-pa0-x233.google.com with SMTP id qn7so20233316pac.3 for ; Fri, 23 Sep 2016 00:35:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=IKe9kWAVnPYO7UE0yIe4mJz0190ylqiE+KXLb/XfKOc=; b=XBfMNUW+l2hi9+Z95CnkQL7zkofJsV0UDp7jeZXG215DPk9yqx/Vb9CFclyeMxNaAu hrdVqwNntkxFRklAwNgoa09hEj65w+WnPx8BJO1vWqYrGosqL1uzS2RGj0iJeyRYvTrf za4l5h6XYi6Q9aSXwIHxWiMaF2MvkoEkvQgNQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=IKe9kWAVnPYO7UE0yIe4mJz0190ylqiE+KXLb/XfKOc=; b=IM3L1hzxneovgG1dWhbbIOOSo+5AhIJeYQLY6wH64qe81Q/3fVMfNCNkUb+YTzpiH1 d9pVjKZ7u7zA+JYK2Rfx9I3ucC+a4g/7gXCJlSOMpY0GhAGLu2+UgMBr2aNlrjjbG54U RCynxRy7Az5yeupjh488nIxPAlF7pcOUCywJIrA8JNDA8YFkj+PAm3oZ35d4TPALlJmm 6W5Iu4uVnmjjob7Th6nrFpCMlc5qN0j53579MIhlfCQ0JZ3osubQlna9k5oMksQfRgsr 6pc/AQSbvTdX0r+dsyH046+2MBR3D6Rpep78KFR69b3M+LBW+CiWzMn3SepI3K7cVi7G nMrA== X-Gm-Message-State: AE9vXwPa5CNELUrPXk97NeRLu+IDHMmQgfeSOsz4+8gAtLPaygzV5E5kSKhVwjg4BwivwJ6h X-Received: by 10.66.176.141 with SMTP id ci13mr10223234pac.85.1474616114173; Fri, 23 Sep 2016 00:35:14 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id b188sm6091948pfa.82.2016.09.23.00.35.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Sep 2016 00:35:13 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, jason.wessel@windriver.com Subject: [PATCH v2.1] arm64: kgdb: handle read-only text / modules Date: Fri, 23 Sep 2016 16:42:08 +0900 Message-Id: <20160923074208.9899-1-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.10.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160923_003535_072309_8C015B2B X-CRM114-Status: GOOD ( 11.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, kgdb-bugreport@lists.sourceforge.net, stable@vger.kernel.org, linux-arm-kernel@lists.infradead.org, AKASHI Takahiro 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 Handle read-only cases (CONFIG_DEBUG_RODATA/CONFIG_DEBUG_SET_MODULE_RONX) by using aarch64_insn_write() instead of probe_kernel_write(). See how this works: commit 2f896d586610 ("arm64: use fixmap for text patching") Signed-off-by: AKASHI Takahiro Reviewed-by: Mark Rutland Cc: Catalin Marinas Cc: Will Deacon Cc: Jason Wessel Cc: # 3.18-3.19: 2f896d5: arm64: use fixmap Cc: # 3.18-3.19: f6242ca: arm64: Fix text Cc: # 4.0- --- arch/arm64/include/asm/debug-monitors.h | 2 -- arch/arm64/kernel/kgdb.c | 36 ++++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h index 4b6b3f7..b71420a 100644 --- a/arch/arm64/include/asm/debug-monitors.h +++ b/arch/arm64/include/asm/debug-monitors.h @@ -61,8 +61,6 @@ #define AARCH64_BREAK_KGDB_DYN_DBG \ (AARCH64_BREAK_MON | (KGDB_DYN_DBG_BRK_IMM << 5)) -#define KGDB_DYN_BRK_INS_BYTE(x) \ - ((AARCH64_BREAK_KGDB_DYN_DBG >> (8 * (x))) & 0xff) #define CACHE_FLUSH_IS_SAFE 1 diff --git a/arch/arm64/kernel/kgdb.c b/arch/arm64/kernel/kgdb.c index 6732a27..b06a7a2 100644 --- a/arch/arm64/kernel/kgdb.c +++ b/arch/arm64/kernel/kgdb.c @@ -19,6 +19,7 @@ * along with this program. If not, see . */ +#include #include #include #include @@ -26,6 +27,8 @@ #include #include #include +#include +#include #include #include @@ -370,15 +373,24 @@ void kgdb_arch_exit(void) unregister_die_notifier(&kgdb_notifier); } -/* - * ARM instructions are always in LE. - * Break instruction is encoded in LE format - */ -struct kgdb_arch arch_kgdb_ops = { - .gdb_bpt_instr = { - KGDB_DYN_BRK_INS_BYTE(0), - KGDB_DYN_BRK_INS_BYTE(1), - KGDB_DYN_BRK_INS_BYTE(2), - KGDB_DYN_BRK_INS_BYTE(3), - } -}; +struct kgdb_arch arch_kgdb_ops; + +int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt) +{ + int err; + + BUILD_BUG_ON(AARCH64_INSN_SIZE != BREAK_INSTR_SIZE); + + err = aarch64_insn_read((void *)bpt->bpt_addr, (u32 *)bpt->saved_instr); + if (err) + return err; + + return aarch64_insn_write((void *)bpt->bpt_addr, + (u32)AARCH64_BREAK_KGDB_DYN_DBG); +} + +int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) +{ + return aarch64_insn_write((void *)bpt->bpt_addr, + *(u32 *)bpt->saved_instr); +}