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 EE1CC128833 for ; Tue, 26 Mar 2024 03:10:55 +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=1711422656; cv=none; b=InFCH1U3mUXIjDfJG9uMhTO0po2pxc1q7yPQavkbXKP3jxDvGlHK8DaovvXaGT0eGSIQULIofRRdKzZfGa1mJ5CTFew5wIStrhdPWV91qKGaMuMTiKw6Fy0EN/Hgdup80/sjJ8SKCknKDRZONKFT/7HJDCG7dGED3ewf9baC2Qw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711422656; c=relaxed/simple; bh=hmYEMeZ6qZMi1+eHKcaZpiRDhnFnGgkXfhku5nyBLKo=; h=Date:Subject:From:To:Cc:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gxETuaahAqdvs0i5pYDODL8oWUk9TAyilpArFTb8H1Sb2l8E1grhkyOYmB8YzVkRY/LG843XJMiV5BEF/4Gr4sZm8ZUoEqZNYwFMUNHDaZ9f0aih7FrnMAoD1fynFllpR4PvZ5IApcnOadhTZ+eag2WNVEEq+sKY+eHUmSe4JWg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H51mXFai; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H51mXFai" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2CE3C433F1; Tue, 26 Mar 2024 03:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711422655; bh=hmYEMeZ6qZMi1+eHKcaZpiRDhnFnGgkXfhku5nyBLKo=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=H51mXFaiICMuOQfenK+QSA4FgUIFNAv05WeDPZtiSPgjBWw9DVZn0n5HuJ8ercw5P Pm7owV6LeT4qHM3zKnSFmmpndzq0hLGusT0KxLuZm/AwgREBRkshX6Xr6LCAV5FTgN upe61tZ5cKgMdepTcL8hjM28wCAY+lTZ3oI4CF9qwqEZGnfT9iolcqYkDko88zmJly j2u45YBXylmUpkflFUCWSBotPfli6e0n5mDqHdogBjc0c0QcJIkNpk7/2XZnkimL83 SPy+CSE93cODUKPYSmdA4JXdUTBOCtWVr/qMgJYPZrqI7FVkPgs03om4k7xNqhUgim zUz28EnyIuQvA== Date: Mon, 25 Mar 2024 20:10:55 -0700 Subject: [PATCH 31/67] xfs: read leaf blocks when computing keys for bulkloading into node blocks From: "Darrick J. Wong" To: cem@kernel.org, djwong@kernel.org Cc: Christoph Hellwig , Bill O'Donnell , linux-xfs@vger.kernel.org Message-ID: <171142127409.2212320.1624167522557864950.stgit@frogsfrogsfrogs> In-Reply-To: <171142126868.2212320.6212071954549567554.stgit@frogsfrogsfrogs> References: <171142126868.2212320.6212071954549567554.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit From: Darrick J. Wong Source kernel commit: 26de64629d8b439a03bce243f14a46f7440729f3 When constructing a new btree, xfs_btree_bload_node needs to read the btree blocks for level N to compute the keyptrs for the blocks that will be loaded into level N+1. The level N blocks must be formatted at that point. A subsequent patch will change the btree bulkloader to write new btree blocks in 256K chunks to moderate memory consumption if the new btree is very large. As a consequence of that, it's possible that the buffers for lower level blocks might have been reclaimed by the time the node builder comes back to the block. Therefore, change xfs_btree_bload_node to read the lower level blocks to handle the reclaimed buffer case. As a side effect, the read will increase the LRU refs, which will bias towards keeping new btree buffers in memory after the new btree commits. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Reviewed-by: Bill O'Donnell --- libxfs/xfs_btree.c | 2 +- libxfs/xfs_btree.h | 3 +++ libxfs/xfs_btree_staging.c | 7 ++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c index 85f8bef0610a..97962fc16ec4 100644 --- a/libxfs/xfs_btree.c +++ b/libxfs/xfs_btree.c @@ -1327,7 +1327,7 @@ xfs_btree_get_buf_block( * Read in the buffer at the given ptr and return the buffer and * the block pointer within the buffer. */ -STATIC int +int xfs_btree_read_buf_block( struct xfs_btree_cur *cur, const union xfs_btree_ptr *ptr, diff --git a/libxfs/xfs_btree.h b/libxfs/xfs_btree.h index 4d68a58be160..e0875cec4939 100644 --- a/libxfs/xfs_btree.h +++ b/libxfs/xfs_btree.h @@ -700,6 +700,9 @@ void xfs_btree_set_ptr_null(struct xfs_btree_cur *cur, int xfs_btree_get_buf_block(struct xfs_btree_cur *cur, const union xfs_btree_ptr *ptr, struct xfs_btree_block **block, struct xfs_buf **bpp); +int xfs_btree_read_buf_block(struct xfs_btree_cur *cur, + const union xfs_btree_ptr *ptr, int flags, + struct xfs_btree_block **block, struct xfs_buf **bpp); void xfs_btree_set_sibling(struct xfs_btree_cur *cur, struct xfs_btree_block *block, const union xfs_btree_ptr *ptr, int lr); diff --git a/libxfs/xfs_btree_staging.c b/libxfs/xfs_btree_staging.c index ae2d9c63f484..be0b43e45f52 100644 --- a/libxfs/xfs_btree_staging.c +++ b/libxfs/xfs_btree_staging.c @@ -489,7 +489,12 @@ xfs_btree_bload_node( ASSERT(!xfs_btree_ptr_is_null(cur, child_ptr)); - ret = xfs_btree_get_buf_block(cur, child_ptr, &child_block, + /* + * Read the lower-level block in case the buffer for it has + * been reclaimed. LRU refs will be set on the block, which is + * desirable if the new btree commits. + */ + ret = xfs_btree_read_buf_block(cur, child_ptr, 0, &child_block, &child_bp); if (ret) return ret;