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 9B852C54E4B for ; Tue, 12 May 2020 08:02:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C0D82075E for ; Tue, 12 May 2020 08:02:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589270567; bh=PfXVwen4hTVjQMRYwec2sWG+kkHoy5njpKLA4uQB6ls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2wUlzWSSannFXB9nLEr6fxC+LtEQORP9DPyBKsQM93pOVDNg23KdJF3aTfnwCu91X VXLLdlu2THt298RBnTqCopTMwLCnuEqg2OZcHJ/d3vWSomtDU3aQzt+nloVXjnO8Sx X3WuS4d0mbu0Tr8N/MjsGgSDc9QDsiBTvzsX2neE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729053AbgELICk (ORCPT ); Tue, 12 May 2020 04:02:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:55758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725813AbgELICj (ORCPT ); Tue, 12 May 2020 04:02:39 -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 09C00206D6; Tue, 12 May 2020 08:02:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589270559; bh=PfXVwen4hTVjQMRYwec2sWG+kkHoy5njpKLA4uQB6ls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nuIVK9esc4IuqzN8htWahwcQJ4Xp6qlLLIY5YamLBfAejBGGrJQtzzzfHaBpdJ7th 1HkWQXRoAZ4NwltX5braNoLfGP2QH34FzTCchywf6RDfsdPSX0qYUzQ2+ElLAQJjk3 NwfNtjNvKL7QPu1BXhAMowo0kNUxT3gMFK2Iefv8= 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 1/6] kprobes: Suppress the suspicious RCU warning on kprobes Date: Tue, 12 May 2020 17:02:33 +0900 Message-Id: <158927055350.27680.10261450713467997503.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 Anders reported that the lockdep warns that suspicious RCU list usage in register_kprobe() (detected by CONFIG_PROVE_RCU_LIST.) This is because get_kprobe() access kprobe_table[] by hlist_for_each_entry_rcu() without rcu_read_lock. If we call get_kprobe() from the breakpoint handler context, it is run with preempt disabled, so this is not a problem. But in other cases, instead of rcu_read_lock(), we locks kprobe_mutex so that the kprobe_table[] is not updated. So, current code is safe, but still not good from the view point of RCU. Joel suggested that we can silent that warning by passing lockdep_is_held() to the last argument of hlist_for_each_entry_rcu(). Add lockdep_is_held(&kprobe_mutex) at the end of the hlist_for_each_entry_rcu() to suppress the warning. Reported-by: Anders Roxell Suggested-by: Joel Fernandes Signed-off-by: Masami Hiramatsu Reviewed-by: Joel Fernandes (Google) --- kernel/kprobes.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 2625c241ac00..bd484392d789 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -326,7 +326,8 @@ struct kprobe *get_kprobe(void *addr) struct kprobe *p; head = &kprobe_table[hash_ptr(addr, KPROBE_HASH_BITS)]; - hlist_for_each_entry_rcu(p, head, hlist) { + hlist_for_each_entry_rcu(p, head, hlist, + lockdep_is_held(&kprobe_mutex)) { if (p->addr == addr) return p; }