From patchwork Mon Jun 4 15:56:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 10446933 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 74D48601A1 for ; Mon, 4 Jun 2018 15:57:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DF8F28635 for ; Mon, 4 Jun 2018 15:57:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 626B0287F5; Mon, 4 Jun 2018 15:57:03 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI 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 CF47028635 for ; Mon, 4 Jun 2018 15:57:02 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: 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: List-Owner; bh=ntgesbvlMSMbDVgRiSOQ80sCWcz4v4Y3u1atBNFbqLQ=; b=NYm5fyjjFPwUOh zfiuo61MlIxJJU0dXbyPeQ9XCQIO9cDaqcpA1bb1p8AMI+g330cSib9Ki6/nJB/5xAy39M+OKTWkO Cz4NEvporQ29WpkTpTUl+DVEGBekQGqH+hLI4wROy6CcMXXDe1UOq+nS4v2jMbD9erxHmMF4kQOnW GXh5oOGb6whOHFvBPIcXHD7+HKcS6ssFNQQOKW6KBLpJVMjDXcakcEPBNGKFHo9GZl+r3fUsIvW+U B3NFdBxEqK6Euidx+GyFfiEimmClyfjo7xTIXJtpnNLccS9kp97Rm9hR0YB4Bk9bHijIfJUJsDT45 t6ne4PrEomeqvu5Fyjhg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fPrqn-0000X0-5Z; Mon, 04 Jun 2018 15:56:53 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fPrqj-0000V4-Aj for linux-arm-kernel@lists.infradead.org; Mon, 04 Jun 2018 15:56:50 +0000 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 530D62089B; Mon, 4 Jun 2018 15:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1528127799; bh=tiIwAuGIS5wWobRDA1udon1kPHWVmxikknYqeb7Y9vQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yudmMOa4G0Kw1eq91mRSTt3xFkAbB7yEeIATBkMvwwVRx0XPZ/kZDgcS0upXc6r8t VO8TMiHL0xAScL0exixpjxfPpsdeb6rCM5lckO7/aqiXeUXeAlnAaLGzC1q/D5Pl1G uRKS4QNgNPbzIJZTzhWa4TwvOb42095WshbwSoek= From: Masami Hiramatsu To: Thomas Gleixner , Ingo Molnar Subject: [RFC PATCH -tip v5 16/27] ARM: kprobes: Don't call the ->break_handler() in arm kprobes code Date: Tue, 5 Jun 2018 00:56:15 +0900 Message-Id: <152812777535.10068.15797989424722649597.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <152812730943.10068.5166429445118734697.stgit@devbox> References: <152812730943.10068.5166429445118734697.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180604_085649_391813_D4D487B0 X-CRM114-Status: GOOD ( 11.62 ) 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: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Ananth N Mavinakayanahalli , Russell King , Ingo Molnar , Steven Rostedt , Masami Hiramatsu , "H . Peter Anvin" , Andrew Morton , linux-arm-kernel@lists.infradead.org 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 Don't call the ->break_handler() from the arm kprobes code, because it was only used by jprobes which got removed. Signed-off-by: Masami Hiramatsu Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/probes/kprobes/core.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/arch/arm/probes/kprobes/core.c b/arch/arm/probes/kprobes/core.c index 23562111c511..3192350f389d 100644 --- a/arch/arm/probes/kprobes/core.c +++ b/arch/arm/probes/kprobes/core.c @@ -315,17 +315,6 @@ void __kprobes kprobe_handler(struct pt_regs *regs) reset_current_kprobe(); } } - } else if (cur) { - /* We probably hit a jprobe. Call its break handler. */ - if (cur->break_handler && cur->break_handler(cur, regs)) { - kcb->kprobe_status = KPROBE_HIT_SS; - singlestep(cur, regs, kcb); - if (cur->post_handler) { - kcb->kprobe_status = KPROBE_HIT_SSDONE; - cur->post_handler(cur, regs, 0); - } - } - reset_current_kprobe(); } else { /* * The probe was removed and a race is in progress.