Received-SPF: pass (google.com: domain of linux-kernel+bounces-125550-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
From: Hillf Danton <hdanton@sina.com>
To: syzbot <syzbot+1fa663a2100308ab6eab@syzkaller.appspotmail.com>
Cc: linux-kernel@vger.kernel.org,
	syzkaller-bugs@googlegroups.com
Subject: Re: [syzbot] [bpf?] possible deadlock in kvfree_call_rcu
Date: Sat, 30 Mar 2024 08:27:32 +0800
Message-Id: <20240330002732.3029-1-hdanton@sina.com>
In-Reply-To: <000000000000716bb60614acbf37@google.com>
References: 
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

On Wed, 27 Mar 2024 16:27:19 -0700
> syzbot has found a reproducer for the following issue on:
> 
> HEAD commit:    443574b03387 riscv, bpf: Fix kfunc parameters incompatibil..
> git tree:       bpf
> C reproducer:   https://syzkaller.appspot.com/x/repro.c?x=16ca53c9180000

#syz test https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git  fe46a7dd189e

--- x/kernel/rcu/tree.c
+++ y/kernel/rcu/tree.c
@@ -5149,6 +5149,8 @@ static void __init rcu_dump_rcu_node_tre
 
 struct workqueue_struct *rcu_gp_wq;
 
+static DEFINE_PER_CPU(struct lock_class_key, krc_lock_key);
+
 static void __init kfree_rcu_batch_init(void)
 {
 	int cpu;
@@ -5169,6 +5171,11 @@ static void __init kfree_rcu_batch_init(
 
 	for_each_possible_cpu(cpu) {
 		struct kfree_rcu_cpu *krcp = per_cpu_ptr(&krc, cpu);
+		struct lock_class_key *key = per_cpu_ptr(&krc_lock_key, cpu);
+		char name[32] = {0};
+
+		sprintf(name, "krc%d", cpu);
+		lockdep_set_class_and_name(&krcp->lock, key, name);
 
 		for (i = 0; i < KFREE_N_BATCHES; i++) {
 			INIT_RCU_WORK(&krcp->krw_arr[i].rcu_work, kfree_rcu_work);
--