Received-SPF: pass (google.com: domain of linux-kernel+bounces-108789-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Hillf Danton <hdanton@sina.com>
To: syzbot <syzbot+9d95beb2a3c260622518@syzkaller.appspotmail.com>
Cc: linux-kernel@vger.kernel.org,
	syzkaller-bugs@googlegroups.com
Subject: Re: [syzbot] [bpf?] possible deadlock in trie_delete_elem
Date: Wed, 20 Mar 2024 18:32:24 +0800
Message-Id: <20240320103224.2123-1-hdanton@sina.com>
In-Reply-To: <000000000000adb08b061413919e@google.com>
References: 
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

On Wed, 20 Mar 2024 01:42:21 -0700
> syzbot found the following issue on:
> 
> HEAD commit:    32fa4366cc4d net: phy: fix phy_read_poll_timeout argument ..
> git tree:       net
> C reproducer:   https://syzkaller.appspot.com/x/repro.c?x=1676fc6e180000

#syz test https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git  32fa4366cc4d

--- x/kernel/bpf/lpm_trie.c
+++ y/kernel/bpf/lpm_trie.c
@@ -321,7 +321,7 @@ static long trie_update_elem(struct bpf_
 	if (key->prefixlen > trie->max_prefixlen)
 		return -EINVAL;
 
-	spin_lock_irqsave(&trie->lock, irq_flags);
+	spin_lock_irqsave_nested(&trie->lock, irq_flags, 1);
 
 	/* Allocate and fill a new node */
 
@@ -448,7 +448,7 @@ static long trie_delete_elem(struct bpf_
 	if (key->prefixlen > trie->max_prefixlen)
 		return -EINVAL;
 
-	spin_lock_irqsave(&trie->lock, irq_flags);
+	spin_lock_irqsave_nested(&trie->lock, irq_flags, 2);
 
 	/* Walk the tree looking for an exact key/length match and keeping
 	 * track of the path we traverse.  We will need to know the node
--