From nobody Tue Dec 16 23:50:40 2025 Received: from SHSQR01.spreadtrum.com (unknown [222.66.158.135]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 282CBBE68 for ; Wed, 17 Jan 2024 07:50:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=222.66.158.135 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705477829; cv=none; b=kEMmua6tM0xmb+J1KUl/waoL6+iXK617F/TxQf/p7LngvC9NloybTyzKBJzVAiQrZ5rzl2LhLOf8ik2Zy3AeTL+GcIWYVRxiyVJ44M3PcKHomoj/1LmzNJll12eo3bqO++GZJ5t/vzdWQAZlaQ48sxueZ0YC+3U9quvn1nag4+s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705477829; c=relaxed/simple; bh=1JXndiYp2iQAHGlw0oYGUG+S46QUqzUPAszRxkP/nzc=; h=Received:Received:Received:From:To:CC:Subject:Date:Message-ID: X-Mailer:MIME-Version:Content-Type:X-Originating-IP: X-ClientProxiedBy:X-MAIL; b=sHRo/FBNxMgcevqKdIcTEj6EVIAnkmSxCcNSQstXfzba3AUpKxbeE9LM6/s81iccc2gJIBNOBJ43xgfLYJL1Ou6QvvSjAL8iDJVxRKkpPwDKg+gyjtzzGdFWLzYI2oebjuQ3JFPSGtJsk7cWwTACVtobfDgIZRlup2De66L8Zjk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com; spf=pass smtp.mailfrom=unisoc.com; arc=none smtp.client-ip=222.66.158.135 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=unisoc.com Received: from dlp.unisoc.com ([10.29.3.86]) by SHSQR01.spreadtrum.com with ESMTP id 40H7nI9d052752; Wed, 17 Jan 2024 15:49:18 +0800 (+08) (envelope-from Zhiguo.Niu@unisoc.com) Received: from SHDLP.spreadtrum.com (bjmbx02.spreadtrum.com [10.0.64.8]) by dlp.unisoc.com (SkyGuard) with ESMTPS id 4TFHrw4tb8z2RvjMG; Wed, 17 Jan 2024 15:42:08 +0800 (CST) Received: from bj08434pcu.spreadtrum.com (10.0.73.87) by BJMBX02.spreadtrum.com (10.0.64.8) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Wed, 17 Jan 2024 15:49:16 +0800 From: Zhiguo Niu To: , , , , CC: , , , , Subject: [PATCH V2] lockdep: fix deadlock issue between lockdep and rcu Date: Wed, 17 Jan 2024 15:48:34 +0800 Message-ID: <1705477714-10467-1-git-send-email-zhiguo.niu@unisoc.com> X-Mailer: git-send-email 1.9.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SHCAS01.spreadtrum.com (10.0.1.201) To BJMBX02.spreadtrum.com (10.0.64.8) X-MAIL: SHSQR01.spreadtrum.com 40H7nI9d052752 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is a deadlock scenario between lockdep and rcu when rcu nocb feature is enabled, just as following call stack: rcuop/x -000|queued_spin_lock_slowpath(lock =3D 0xFFFFFF817F2A8A80, val =3D ?) -001|queued_spin_lock(inline) // try to hold nocb_gp_lock -001|do_raw_spin_lock(lock =3D 0xFFFFFF817F2A8A80) -002|__raw_spin_lock_irqsave(inline) -002|_raw_spin_lock_irqsave(lock =3D 0xFFFFFF817F2A8A80) -003|wake_nocb_gp_defer(inline) -003|__call_rcu_nocb_wake(rdp =3D 0xFFFFFF817F30B680) -004|__call_rcu_common(inline) -004|call_rcu(head =3D 0xFFFFFFC082EECC28, func =3D ?) -005|call_rcu_zapped(inline) -005|free_zapped_rcu(ch =3D ?)// hold graph lock -006|rcu_do_batch(rdp =3D 0xFFFFFF817F245680) -007|nocb_cb_wait(inline) -007|rcu_nocb_cb_kthread(arg =3D 0xFFFFFF817F245680) -008|kthread(_create =3D 0xFFFFFF80803122C0) -009|ret_from_fork(asm) rcuop/y -000|queued_spin_lock_slowpath(lock =3D 0xFFFFFFC08291BBC8, val =3D 0) -001|queued_spin_lock() -001|lockdep_lock() -001|graph_lock() // try to hold graph lock -002|lookup_chain_cache_add() -002|validate_chain() -003|lock_acquire -004|_raw_spin_lock_irqsave(lock =3D 0xFFFFFF817F211D80) -005|lock_timer_base(inline) -006|mod_timer(inline) -006|wake_nocb_gp_defer(inline)// hold nocb_gp_lock -006|__call_rcu_nocb_wake(rdp =3D 0xFFFFFF817F2A8680) -007|__call_rcu_common(inline) -007|call_rcu(head =3D 0xFFFFFFC0822E0B58, func =3D ?) -008|call_rcu_hurry(inline) -008|rcu_sync_call(inline) -008|rcu_sync_func(rhp =3D 0xFFFFFFC0822E0B58) -009|rcu_do_batch(rdp =3D 0xFFFFFF817F266680) -010|nocb_cb_wait(inline) -010|rcu_nocb_cb_kthread(arg =3D 0xFFFFFF817F266680) -011|kthread(_create =3D 0xFFFFFF8080363740) -012|ret_from_fork(asm) rcuop/x and rcuop/y are rcu nocb threads with the same nocb gp thread. This patch release the graph lock before lockdep call_rcu. Fixes: a0b0fd53e1e6 ("locking/lockdep: Free lock classes that are no longer= in use") Signed-off-by: Zhiguo Niu Signed-off-by: Xuewen Yan Reviewed-by: Boqun Feng Reviewed-by: Waiman Long --- changes of v2: update patch according to Boqun's suggestions. --- --- kernel/locking/lockdep.c | 47 +++++++++++++++++++++++++++++++-------------= --- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index 151bd3d..ddcaa69 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -6184,25 +6184,27 @@ static struct pending_free *get_pending_free(void) static void free_zapped_rcu(struct rcu_head *cb); =20 /* - * Schedule an RCU callback if no RCU callback is pending. Must be called = with - * the graph lock held. - */ -static void call_rcu_zapped(struct pending_free *pf) +* See if we need to queue an RCU callback, must called with +* the lockdep lock held, returns false if either we don't have +* any pending free or the callback is already scheduled. +* Otherwise, a call_rcu() must follow this function call. +*/ +static bool prepare_call_rcu_zapped(struct pending_free *pf) { WARN_ON_ONCE(inside_selftest()); =20 if (list_empty(&pf->zapped)) - return; + return false; =20 if (delayed_free.scheduled) - return; + return false; =20 delayed_free.scheduled =3D true; =20 WARN_ON_ONCE(delayed_free.pf + delayed_free.index !=3D pf); delayed_free.index ^=3D 1; =20 - call_rcu(&delayed_free.rcu_head, free_zapped_rcu); + return true; } =20 /* The caller must hold the graph lock. May be called from RCU context. */ @@ -6228,6 +6230,7 @@ static void free_zapped_rcu(struct rcu_head *ch) { struct pending_free *pf; unsigned long flags; + bool need_callback; =20 if (WARN_ON_ONCE(ch !=3D &delayed_free.rcu_head)) return; @@ -6239,14 +6242,17 @@ static void free_zapped_rcu(struct rcu_head *ch) pf =3D delayed_free.pf + (delayed_free.index ^ 1); __free_zapped_classes(pf); delayed_free.scheduled =3D false; + need_callback =3D + prepare_call_rcu_zapped(delayed_free.pf + delayed_free.index); + lockdep_unlock(); + raw_local_irq_restore(flags); =20 /* - * If there's anything on the open list, close and start a new callback. - */ - call_rcu_zapped(delayed_free.pf + delayed_free.index); + * If there's anything on the open list, close and start a new callback. + */ + if (need_callback) + call_rcu(&delayed_free.rcu_head, free_zapped_rcu); =20 - lockdep_unlock(); - raw_local_irq_restore(flags); } =20 /* @@ -6286,6 +6292,7 @@ static void lockdep_free_key_range_reg(void *start, u= nsigned long size) { struct pending_free *pf; unsigned long flags; + bool need_callback; =20 init_data_structures_once(); =20 @@ -6293,10 +6300,11 @@ static void lockdep_free_key_range_reg(void *start,= unsigned long size) lockdep_lock(); pf =3D get_pending_free(); __lockdep_free_key_range(pf, start, size); - call_rcu_zapped(pf); + need_callback =3D prepare_call_rcu_zapped(pf); lockdep_unlock(); raw_local_irq_restore(flags); - + if (need_callback) + call_rcu(&delayed_free.rcu_head, free_zapped_rcu); /* * Wait for any possible iterators from look_up_lock_class() to pass * before continuing to free the memory they refer to. @@ -6390,6 +6398,7 @@ static void lockdep_reset_lock_reg(struct lockdep_map= *lock) struct pending_free *pf; unsigned long flags; int locked; + bool need_callback =3D false; =20 raw_local_irq_save(flags); locked =3D graph_lock(); @@ -6398,11 +6407,13 @@ static void lockdep_reset_lock_reg(struct lockdep_m= ap *lock) =20 pf =3D get_pending_free(); __lockdep_reset_lock(pf, lock); - call_rcu_zapped(pf); + need_callback =3D prepare_call_rcu_zapped(pf); =20 graph_unlock(); out_irq: raw_local_irq_restore(flags); + if (need_callback) + call_rcu(&delayed_free.rcu_head, free_zapped_rcu); } =20 /* @@ -6446,6 +6457,7 @@ void lockdep_unregister_key(struct lock_class_key *ke= y) struct pending_free *pf; unsigned long flags; bool found =3D false; + bool need_callback =3D false; =20 might_sleep(); =20 @@ -6466,11 +6478,14 @@ void lockdep_unregister_key(struct lock_class_key *= key) if (found) { pf =3D get_pending_free(); __lockdep_free_key_range(pf, key, 1); - call_rcu_zapped(pf); + need_callback =3D prepare_call_rcu_zapped(pf); } lockdep_unlock(); raw_local_irq_restore(flags); =20 + if (need_callback) + call_rcu(&delayed_free.rcu_head, free_zapped_rcu); + /* Wait until is_dynamic_key() has finished accessing k->hash_entry. */ synchronize_rcu(); } --=20 1.9.1