From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B7F4C54E4B for ; Tue, 12 May 2020 08:03:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B2052078E for ; Tue, 12 May 2020 08:03:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589270594; bh=uGqLN9OKnBbyA8w53Dt2jn5v0hokTKXjpPNu+Z3TREY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ldk4aD555aoRrxb5tfT5/f0kZXcQtGi+YEygvBogUv3N0jsmrHF+kf4YFuu88Sbnq wPfKmK/PdGsSG/Kwx7c24cqPE1BlWigWpnW2535/w+8V0QkNhwzh/zA/pFiWutuSrM WDKQUKBuB2uxDu/uWC6CfbPOffJM2Gl+2Kp0Qb4M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729132AbgELIDN (ORCPT ); Tue, 12 May 2020 04:03:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:57052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725813AbgELIDN (ORCPT ); Tue, 12 May 2020 04:03:13 -0400 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B2786206D6; Tue, 12 May 2020 08:03:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589270593; bh=uGqLN9OKnBbyA8w53Dt2jn5v0hokTKXjpPNu+Z3TREY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0gi/XUHkXNrFoSQ58sTZCZX1aa/exW8DVu18vCuWkGZiq3bG4XgL5UFU3FLRvG9nw XBXiAOf0jpCMkwwS4TonwB1pU65RU0zs0/zyAB6l/9XQthn+pSLJjQIYFIk3K0+4c9 cTY9kDPbli8nvOWtmaA9ORRulZ3/ilX7a4b0bv+M= From: Masami Hiramatsu To: Ingo Molnar Cc: "Gustavo A . R . Silva" , Anders Roxell , paulmck@kernel.org, joel@joelfernandes.org, "Naveen N . Rao" , Anil S Keshavamurthy , David Miller , Masami Hiramatsu , Linux Kernel Mailing List , Steven Rostedt , Ingo Molnar , Peter Zijlstra , Ziqian SUN Subject: [PATCH -tip V6 4/6] kprobes: Remove redundant arch_disarm_kprobe() call Date: Tue, 12 May 2020 17:03:07 +0900 Message-Id: <158927058719.27680.17183632908465341189.stgit@devnote2> X-Mailer: git-send-email 2.20.1 In-Reply-To: <158927054236.27680.18209720730136003586.stgit@devnote2> References: <158927054236.27680.18209720730136003586.stgit@devnote2> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix to remove redundant arch_disarm_kprobe() call in force_unoptimize_kprobe(). This arch_disarm_kprobe() will be invoked if the kprobe is optimized but disabled, but that means the kprobe (optprobe) is unused (and unoptimized) state. In that case, unoptimize_kprobe() puts it in freeing_list and kprobe_optimizer (do_unoptimize_kprobes()) automatically disarm it. Thus this arch_disarm_kprobe() is redundant. Signed-off-by: Masami Hiramatsu --- kernel/kprobes.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 6d76a6e3e1a5..627fc1b7011a 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -675,8 +675,6 @@ static void force_unoptimize_kprobe(struct optimized_kprobe *op) lockdep_assert_cpus_held(); arch_unoptimize_kprobe(op); op->kp.flags &= ~KPROBE_FLAG_OPTIMIZED; - if (kprobe_disabled(&op->kp)) - arch_disarm_kprobe(&op->kp); } /* Unoptimize a kprobe if p is optimized */