From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 BB9C3263F34; Wed, 17 Sep 2025 12:40:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758112814; cv=none; b=YmXAysBar6rtTGg0R6Z0YD98dogCXy4lkbplD5dtKgC2u5bgwX33uFlyseFpD/7iWTc6tozKLoJRCCpjpP7OtIGy7lj/P89T4oPRy4QH77gB1Qh/if/RBiWgdHpo/bHZ9ihnMqCTXXGcL9kWpDNMN9Ed9ltYHMt2JbpMG4H1hIc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758112814; c=relaxed/simple; bh=NV3tlWV3nDZ6nD9X0VXLGEcpve7WuYAYYIfuSCA53zs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Lu9ogay8v+GLzCvyfy8ata4UDa6VntiCy4pyg94d9RSd186RIYMwQ7JBngn9lvSd/52h3D8cl3h07bYfARnzGxy0fIqeRO9MYTIC6sokUJVcQKjgnB5bD6MuO9Gq6+w0r8UU1+r2Y54bTgv4jR32PyQ3flZipYi5RdKjsJDCc50= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=05v8Fzm2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="05v8Fzm2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3982AC4CEF0; Wed, 17 Sep 2025 12:40:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1758112814; bh=NV3tlWV3nDZ6nD9X0VXLGEcpve7WuYAYYIfuSCA53zs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=05v8Fzm2KXiwl7r3yAoz8VFwBasD3sIMHRw//NWZ8N+0Zj8fh7eEPILUivijdRrWm RWjX1VzEWm1owMz7g55QENVQh/SwLe90NDgBJe+WOHPD+fNxqBq9OVSCF/Y7CJ1750 OvS8EAfEyfaYqX4xqXP9OV618Ibv6ztl6CX/xdKc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Josef Bacik , Filipe Manana , Leo Martins , Omar Sandoval , David Sterba Subject: [PATCH 6.16 058/189] btrfs: fix subvolume deletion lockup caused by inodes xarray race Date: Wed, 17 Sep 2025 14:32:48 +0200 Message-ID: <20250917123353.282095229@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250917123351.839989757@linuxfoundation.org> References: <20250917123351.839989757@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Omar Sandoval commit f6a6c280059c4ddc23e12e3de1b01098e240036f upstream. There is a race condition between inode eviction and inode caching that can cause a live struct btrfs_inode to be missing from the root->inodes xarray. Specifically, there is a window during evict() between the inode being unhashed and deleted from the xarray. If btrfs_iget() is called for the same inode in that window, it will be recreated and inserted into the xarray, but then eviction will delete the new entry, leaving nothing in the xarray: Thread 1 Thread 2 --------------------------------------------------------------- evict() remove_inode_hash() btrfs_iget_path() btrfs_iget_locked() btrfs_read_locked_inode() btrfs_add_inode_to_root() destroy_inode() btrfs_destroy_inode() btrfs_del_inode_from_root() __xa_erase In turn, this can cause issues for subvolume deletion. Specifically, if an inode is in this lost state, and all other inodes are evicted, then btrfs_del_inode_from_root() will call btrfs_add_dead_root() prematurely. If the lost inode has a delayed_node attached to it, then when btrfs_clean_one_deleted_snapshot() calls btrfs_kill_all_delayed_nodes(), it will loop forever because the delayed_nodes xarray will never become empty (unless memory pressure forces the inode out). We saw this manifest as soft lockups in production. Fix it by only deleting the xarray entry if it matches the given inode (using __xa_cmpxchg()). Fixes: 310b2f5d5a94 ("btrfs: use an xarray to track open inodes in a root") Cc: stable@vger.kernel.org # 6.11+ Reviewed-by: Josef Bacik Reviewed-by: Filipe Manana Co-authored-by: Leo Martins Signed-off-by: Leo Martins Signed-off-by: Omar Sandoval Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/inode.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -5685,7 +5685,17 @@ static void btrfs_del_inode_from_root(st bool empty = false; xa_lock(&root->inodes); - entry = __xa_erase(&root->inodes, btrfs_ino(inode)); + /* + * This btrfs_inode is being freed and has already been unhashed at this + * point. It's possible that another btrfs_inode has already been + * allocated for the same inode and inserted itself into the root, so + * don't delete it in that case. + * + * Note that this shouldn't need to allocate memory, so the gfp flags + * don't really matter. + */ + entry = __xa_cmpxchg(&root->inodes, btrfs_ino(inode), inode, NULL, + GFP_ATOMIC); if (entry == inode) empty = xa_empty(&root->inodes); xa_unlock(&root->inodes);