From patchwork Tue Jun 19 16:12:22 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: 10474945 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 1BFA260532 for ; Tue, 19 Jun 2018 16:13:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D8FB28741 for ; Tue, 19 Jun 2018 16:13:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 025A5287A4; Tue, 19 Jun 2018 16:13:42 +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 AB45F28777 for ; Tue, 19 Jun 2018 16:13:42 +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=qhg7L+oytNCLnqz6EACtH1zuplAtWzGpsislsUervi0=; b=cvJeFHistAH2gL WYhga2hQWIsDzanpjVumC4tUy0oBC+bzkaB69jecZLGsEHaiVYHZkBXsPWamIwZef+BxaKMRrWuUx qIyF5r5ZvSWOhlZ4Vs/oCi0/5RtoV2X4/4ar7sOZ6uQy6C3vAuPiDr0xphc4HvhMW1mY7/ynr+exy hcFH5rPnQuTvAX8LewQ4pctTN3tufYc1QKZ1q4a3LjQn7X/kdUMCqEnFNAkCs2c0buWHuHOpF1Zkv nu3LAUBE9/1n3/ak0QDbee/+k3ktBTzTCUNHrk19HOL+vSvOVUh1fzBDeLSx1uNaT7lhlos3IATgb M0OKfeM9tz4fzSiPAdTw==; 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 1fVJG8-0002vu-LL; Tue, 19 Jun 2018 16:13:32 +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 1fVJFY-0002bu-J7 for linux-arm-kernel@lists.infradead.org; Tue, 19 Jun 2018 16:13:29 +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 5335920661; Tue, 19 Jun 2018 16:12:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1529424766; bh=Qpl6EHWZ7cA1Fbqgdfw/Ll+jcdb8sds5r74Fiz8iGKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HYDML+Rynyz0PzE1/F1l8dBYqWadVZ0GsdWa/NUtlOXnRxeln6ml6OQbL9o3JxihT 5V73yOKxUW6PMYbrtb83dFZRB2ExxpWszDLWLPuOgfzmq1i3+DtCJxFBaR2KwFs2xR QrmJNXerVNE1uY2LycLRrVOAWmOYOCP32WKYcHKk= From: Masami Hiramatsu To: Thomas Gleixner , Ingo Molnar Subject: [PATCH -tip v6 17/27] arm64: kprobes: Don't call the ->break_handler() in arm64 kprobes code Date: Wed, 20 Jun 2018 01:12:22 +0900 Message-Id: <152942474231.15209.17684808374429473004.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_091256_696579_246D9CB5 X-CRM114-Status: GOOD ( 11.04 ) 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, Catalin Marinas , linux-kernel@vger.kernel.org, Ananth N Mavinakayanahalli , 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 arm64 kprobes code, because it was only used by jprobes which got removed. Signed-off-by: Masami Hiramatsu Acked-by: Will Deacon Cc: Catalin Marinas Cc: linux-arm-kernel@lists.infradead.org --- arch/arm64/kernel/probes/kprobes.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c index 3ca2351109a6..076c3c0775a6 100644 --- a/arch/arm64/kernel/probes/kprobes.c +++ b/arch/arm64/kernel/probes/kprobes.c @@ -408,14 +408,6 @@ static void __kprobes kprobe_handler(struct pt_regs *regs) return; } } - } else if ((le32_to_cpu(*(kprobe_opcode_t *) addr) == - BRK64_OPCODE_KPROBES) && cur_kprobe) { - /* We probably hit a jprobe. Call its break handler. */ - if (cur_kprobe->break_handler && - cur_kprobe->break_handler(cur_kprobe, regs)) { - setup_singlestep(cur_kprobe, regs, kcb, 0); - return; - } } /* * The breakpoint instruction was removed right