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=-3.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,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 03B06C6778D for ; Tue, 11 Sep 2018 10:21:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A195F20867 for ; Tue, 11 Sep 2018 10:21:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="MVMTdios" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A195F20867 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727682AbeIKPUL (ORCPT ); Tue, 11 Sep 2018 11:20:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:52808 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726563AbeIKPUL (ORCPT ); Tue, 11 Sep 2018 11:20:11 -0400 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 DC69C20839; Tue, 11 Sep 2018 10:21:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1536661291; bh=VhMKXO9xnelWzO/hB7qA/k0BhKI/ErxXQMPPrcdNaeI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MVMTdioszVNvrqty1gwSRO+QdRUIMLhCXzDiqcBbetvr3S4SPLRdeInXoBOaCBrN3 q6ezYp4c3mmt+fyweCrflPAvM72SQP3igS7Yg0Io9ZzNk4VvgspzfeVW8TjztINSX8 Z+TgOrZnWMJzqWGckhOK1mPekiq13BT3MnorvO10= From: Masami Hiramatsu To: Ingo Molnar Cc: "Naveen N . Rao" , Anil S Keshavamurthy , "David S . Miller" , Masami Hiramatsu , linux-kernel@vger.kernel.org Subject: [PATCH -tip v2 5/5] kprobes: Don't call BUG_ON if there is a kprobe in use on free list Date: Tue, 11 Sep 2018 19:21:09 +0900 Message-Id: <153666126882.21306.10738207224288507996.stgit@devbox> X-Mailer: git-send-email 2.13.6 In-Reply-To: <153666112297.21306.4621579144717171778.stgit@devbox> References: <153666112297.21306.4621579144717171778.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of calling BUG_ON, if we find a kprobe in use on free kprobe list, just remove it from the list and keep it on kprobe hash list as same as other in-use kprobes. Signed-off-by: Masami Hiramatsu --- Changes in v2: - Use WARN_ON_ONCE() for unusual case. --- kernel/kprobes.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 63c342e5e6c3..90e98e233647 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -546,8 +546,14 @@ static void do_free_cleaned_kprobes(void) struct optimized_kprobe *op, *tmp; list_for_each_entry_safe(op, tmp, &freeing_list, list) { - BUG_ON(!kprobe_unused(&op->kp)); list_del_init(&op->list); + if (WARN_ON_ONCE(!kprobe_unused(&op->kp))) { + /* + * This must not happen, but if there is a kprobe + * still in use, keep it on kprobes hash list. + */ + continue; + } free_aggr_kprobe(&op->kp); } }