From patchwork Mon Aug 1 20:13:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Wolsieffer X-Patchwork-Id: 12934027 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 C723CC00144 for ; Mon, 1 Aug 2022 20:16:13 +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=O972JNX1lxESgbPUtGvyudAWporwtQjknjqQk6Tqz3A=; b=CnEzdY7AMvCshI tOAGkIEnzsr5HqwEkfxvilYs3hoc3RosFcen947smLx9txi45fOPNNkFLOC5osjtSCKQLzS+G/o/u X3r7eHDZb9hnhrlvkgR2m/aX+8fA7YK77O7h7NWiDPuAxW4ZRiK6HuYM1HAz08kFLDsDj6l0T81Es L5ZNofUIM1ijTj5oRMAbRqdtkxLXMgGmMmw2syMkekSPw9L2I0wNphnRtt4DPEg1Eq6nPpZbM/xU4 BN0TByJPvQQZrJ8pzT6OdDVZ0i6GMk6PkuwlTtGRWlFPgfV2dLfm5ATunxe14/JVuRMgVV/GJ6pB+ YIhd0xMLv+SCG4IAyMbg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oIbop-00AFtF-2A; Mon, 01 Aug 2022 20:15:15 +0000 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oIbom-00AFrj-QM for linux-arm-kernel@lists.infradead.org; Mon, 01 Aug 2022 20:15:14 +0000 Received: by mail-qv1-xf34.google.com with SMTP id m10so9306560qvu.4 for ; Mon, 01 Aug 2022 13:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hefring-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YzbZWPC/awXZhFf2xsAbUtlwN59iYpbiuewriSD+EsE=; b=3+GZNArbYFpKf5Fywb/ATh5UrloxFjVRTkkdYUWQvEJsXJ+adhKxb/tGhlOyIyHOsH Zcd71UbGZR3g7+p2PVC8CmlZJNGhJegmPoAGVb2B1uH9mtRma5NvKV3qnnr9mKP8rHMG 3Yn8p/tUgs/6NYHR1cP0fKJQeiSWuljH3681EnVzrcSIPgwdgUry9e4qyzlLsSjEbWgl g4mXB7Tc8ccDhJuEdi4JMhRYSyVOYdkkwQGLnqJy0mvRMcRo0THxaS1XlBpSiAmsi3PM LUnPl3hStWKj/VJCMWwhD3y7M3xrS1qN640z0JYbn2dCXZOmgYFSRKA76DXHbhEsnlIu kNHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YzbZWPC/awXZhFf2xsAbUtlwN59iYpbiuewriSD+EsE=; b=NxYdN92X+vyZ9ooccagymy7mPvipRca3Q97x01XIJMrz8XDUxPF79yAUSfPxU3jmeP bD2el1Hs2+mc3IdLzlNAQF+wvvUv2lMm2Jo6jVhXPw81p/Wy60PFGRWp8jvNrUouofYo p/jOUhD4kOAaEFS74Z126zZn+hW+2Ed/lndZVkqlpBJC8FUaEIO+W1Sbg9GnpHtM59/G IqM05XxCamVud7pZoTSW5vp6nkJKJAXoH4D/gRiEAnbHAa1Ynmn3E8UDIHpFB3rnoMbQ dBJ6v8wef4RmrryYgzVTHU4FxaGA93pcrf5S4tDkmGS8PFVopWRWHAuib2yiglik2P6N bvRA== X-Gm-Message-State: ACgBeo3MGpxpgDGNhcVjiQ1NGsYaa61QwdFG97TlHohyAp2FRsAUGlin BVjieQlFlQkIOi4p3lUKMo84rFQ72BFZLA== X-Google-Smtp-Source: AA6agR7hDeg6lfiUq3q/202VwtcKoJvdC+JD6ptmlxHXn+2QC5RguPk64Lh2T0Inl/nSyYlVtYGvBw== X-Received: by 2002:a05:6214:2b0b:b0:476:cc01:93af with SMTP id jx11-20020a0562142b0b00b00476cc0193afmr2334899qvb.56.1659384911484; Mon, 01 Aug 2022 13:15:11 -0700 (PDT) Received: from hefring.. ([50.212.55.89]) by smtp.gmail.com with ESMTPSA id r20-20020a05620a299400b006b59ddb4bc5sm9288317qkp.84.2022.08.01.13.15.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Aug 2022 13:15:11 -0700 (PDT) From: Ben Wolsieffer X-Google-Original-From: Ben Wolsieffer To: Cc: Ben Wolsieffer , Russell King , Ard Biesheuvel , Arnd Bergmann , Mark Rutland , Marc Zyngier , Vladimir Murzin , "Russell King (Oracle)" , Nick Desaulniers , "Steven Rostedt (Google)" , Catalin Marinas , Nicolas Pitre , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ARM: v7m: support undefined instruction hooks Date: Mon, 1 Aug 2022 16:13:39 -0400 Message-Id: <20220801201347.1255392-3-Ben.Wolsieffer@hefring.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220801201347.1255392-1-Ben.Wolsieffer@hefring.com> References: <20220801201347.1255392-1-Ben.Wolsieffer@hefring.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220801_131512_909377_653F4AFE X-CRM114-Status: GOOD ( 17.50 ) 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 Call the common ARM undefined instruction handler, which handles running hooks to enable ptrace breakpoints and other features. Signed-off-by: Ben Wolsieffer --- arch/arm/include/asm/traps.h | 2 ++ arch/arm/kernel/traps-v7m.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/traps.h b/arch/arm/include/asm/traps.h index 987fefb0a4db..e4253f4a86e1 100644 --- a/arch/arm/include/asm/traps.h +++ b/arch/arm/include/asm/traps.h @@ -19,6 +19,8 @@ struct undef_hook { void register_undef_hook(struct undef_hook *hook); void unregister_undef_hook(struct undef_hook *hook); +void do_undefinstr(struct pt_regs *regs); + static inline int __in_irqentry_text(unsigned long ptr) { extern char __irqentry_text_start[]; diff --git a/arch/arm/kernel/traps-v7m.c b/arch/arm/kernel/traps-v7m.c index 5fd9943448e9..b324499e1010 100644 --- a/arch/arm/kernel/traps-v7m.c +++ b/arch/arm/kernel/traps-v7m.c @@ -20,6 +20,7 @@ #include #include #include +#include #include enum fault { @@ -49,7 +50,6 @@ static const struct exception exceptions[] = { {"no coprocessor", FAULT_USAGEFAULT, V7M_SCB_CFSR_NOCP, SIGILL, ILL_COPROC, UDBG_UNDEFINED}, {"return to invalid PC", FAULT_USAGEFAULT, V7M_SCB_CFSR_INVPC, SIGSEGV, SEGV_MAPERR, UDBG_SEGV}, {"invalid ISA state", FAULT_USAGEFAULT, V7M_SCB_CFSR_INVSTATE, SIGSEGV, SEGV_MAPERR, UDBG_SEGV}, - {"undefined instruction", FAULT_USAGEFAULT, V7M_SCB_CFSR_UNDEFINSTR, SIGILL, ILL_ILLOPC, UDBG_UNDEFINED}, {"floating point state error", FAULT_BUSFAULT, V7M_SCB_CFSR_LSPERR, SIGBUS, BUS_ADRERR, UDBG_BUS}, {"exception stack push error", FAULT_BUSFAULT, V7M_SCB_CFSR_STKERR, SIGBUS, BUS_ADRERR, UDBG_BUS}, {"exception stack pop error", FAULT_BUSFAULT, V7M_SCB_CFSR_UNSTKERR, SIGBUS, BUS_ADRERR, UDBG_BUS}, @@ -95,6 +95,12 @@ static void traps_v7m_common(struct pt_regs *regs, int fault) writel(hstatus, BASEADDR_V7M_SCB + V7M_SCB_HFSR); writel(cstatus, BASEADDR_V7M_SCB + V7M_SCB_CFSR); + if (fault == FAULT_USAGEFAULT && cstatus & V7M_SCB_CFSR_UNDEFINSTR) { + /* Handle undefined instruction hooks */ + do_undefinstr(regs); + return; + } + for (i = 0; exceptions[i].name != NULL; ++i) { if (fault != exceptions[i].fault) continue;