Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C58AC433F5 for ; Wed, 24 Nov 2021 12:59:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346843AbhKXNC5 (ORCPT ); Wed, 24 Nov 2021 08:02:57 -0500 Received: from mail.kernel.org ([198.145.29.99]:39084 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343755AbhKXNAq (ORCPT ); Wed, 24 Nov 2021 08:00:46 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 00853619E8; Wed, 24 Nov 2021 12:34:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637757295; bh=qiKfiHU3jLJFyBGmDprA/UxBtTZXpr7xegM0qZFqK8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2E2IxpoHTyv1bp6Z21JthOmNnWkkhQPCVLsPnrMzqP6qgoaXFBtqP3HBDPhq57BKE 5DRHyCg4pRYSrSZsmPzsF1klFWQtvPxRUuqZfvMQWWiRo7YO200c0WJ86j2zt568T+ S2YLZT8CosXh1Ahkgzhd6IELd9QnOM3VCbz74ZIY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Peter Zijlstra (Intel)" , Sasha Levin Subject: [PATCH 4.19 088/323] locking/lockdep: Avoid RCU-induced noinstr fail Date: Wed, 24 Nov 2021 12:54:38 +0100 Message-Id: <20211124115721.937655496@linuxfoundation.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211124115718.822024889@linuxfoundation.org> References: <20211124115718.822024889@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Zijlstra [ Upstream commit ce0b9c805dd66d5e49fd53ec5415ae398f4c56e6 ] vmlinux.o: warning: objtool: look_up_lock_class()+0xc7: call to rcu_read_lock_any_held() leaves .noinstr.text section Signed-off-by: Peter Zijlstra (Intel) Link: https://lore.kernel.org/r/20210624095148.311980536@infradead.org Signed-off-by: Sasha Levin --- kernel/locking/lockdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 126c6d524a0f2..4dc79f57af827 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -689,7 +689,7 @@ look_up_lock_class(const struct lockdep_map *lock, unsigned int subclass) if (DEBUG_LOCKS_WARN_ON(!irqs_disabled())) return NULL; - hlist_for_each_entry_rcu(class, hash_head, hash_entry) { + hlist_for_each_entry_rcu_notrace(class, hash_head, hash_entry) { if (class->key == key) { /* * Huh! same key, different name? Did someone trample -- 2.33.0