From patchwork Tue Jun 19 16:11:53 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: 10474929 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 B7228603B5 for ; Tue, 19 Jun 2018 16:12:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6CA128E7E for ; Tue, 19 Jun 2018 16:12:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B77428E96; Tue, 19 Jun 2018 16:12:52 +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 3422E28E7E for ; Tue, 19 Jun 2018 16:12:52 +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=c8VLivrM6s243r mBZJhs7RD1DyhrKG06skjXYLe3vPyw+rM+DQqZ1BpgzB+zYnc2q8z0YiRf7xlmgj/JN3GPeQubmzh vaxAUsJ2T6l9uhdh3OKb20TvO6VgLwkazVxtTjl+sE1qwW7M/QIu3pSPxSSFHEjv8ZbvkJg6jhsFG ngYQH7c02rZ5MBij1G4MZtQh4aoTVbKctzR76yFyZatCX87M16ewHuBeG4I26QcAEva2SmSd0N83i ljDoTy6mHcCUdcEEmmtFNyGNhiaEPoR6iLE0CCVnkiY1KodlGhnvYjuDOxIc6+61B1Llgw0fLJK2E i+XuKO+Gk87I0S4C84AQ==; 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 1fVJFI-0002XI-So; Tue, 19 Jun 2018 16:12:40 +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 1fVJF5-0002JW-AD for linux-arm-kernel@lists.infradead.org; Tue, 19 Jun 2018 16:12:33 +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 43D9D20661; Tue, 19 Jun 2018 16:12:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1529424737; bh=tiIwAuGIS5wWobRDA1udon1kPHWVmxikknYqeb7Y9vQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SMQC78p0QuMUsSoZIJuPMD/kn/lQxGhGAdPsS8h6RZSoMfnNytgP9EGzenHJNGLI1 PAGnG5ejbv56cijE4lpr3ICA2sRjDRJ4JqCNVCsn4UXUQZ7NwMbMD4QZA0dk8z46yZ tTEgnNgKY5L2Qf13HxNc58bgDaiaeYelQU24TO38= From: Masami Hiramatsu To: Thomas Gleixner , Ingo Molnar Subject: [PATCH -tip v6 16/27] ARM: kprobes: Don't call the ->break_handler() in arm kprobes code Date: Wed, 20 Jun 2018 01:11:53 +0900 Message-Id: <152942471328.15209.10625693210204476080.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <152942424698.15209.15245996287444292393.stgit@devbox> References: <152942424698.15209.15245996287444292393.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-20180619_091227_408800_EE7FA895 X-CRM114-Status: GOOD ( 11.00 ) 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.