From patchwork Mon Sep 2 18:41:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13787635 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 540CF19CC0F; Mon, 2 Sep 2024 18:41:49 +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=1725302509; cv=none; b=nFO2acIn+oALthQa4OQ+1sC1DYrCCaKCHdoewErOG0QfIKfgL2op1mTTJpJyEHm8myaqsnah/noNUIcxH8EX209cKMjgTCkV43dHpIxYKoLgcR5V0zF+6G+EDnEiohWEi0f6K0mtXyOvbcIbyH8PG5j5R1n5cktmLZMWcirkX4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725302509; c=relaxed/simple; bh=Izg0lOAX2A/r3OBciyS7zCcf0kw12KBzXuDxGWLXFZs=; h=Date:Subject:From:To:Cc:Message-ID:MIME-Version:In-Reply-To: References:Content-Type; b=YqsQvPOdb6NHSiaHb4sqW5ZGeaAq7KsdnG78gi/D3NS3nHVITEpm8jchobifnbBJpRIr+8R41OL53cpVVjhx/pDh3Z3OEtXWPz208cKUpKyY6f/rr56JpPmh6t6SZhiWJ9n67qs4E5w9XrozoGuSGbZpRU28cq12iljQZH222yQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rrRWek/Z; 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="rrRWek/Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7546C4CEC2; Mon, 2 Sep 2024 18:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725302508; bh=Izg0lOAX2A/r3OBciyS7zCcf0kw12KBzXuDxGWLXFZs=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=rrRWek/ZWvci/XezeKt9RA6bmy36iijebCI3fbKho/J5O9x0buRVZ9vpqRicpXo// I5rS5keKe+STHd3KYcXCWpMsS6/HInf4FkkLo4S3kkPsWC6DEPreSXk5KwFbxMMhj2 rGmFQyMltINeTPEzPI7OfNAX7qP5j2w1F+1yAzSYlRYhEvXk57lKt9wgyJ8J0UbRSK PquBKoYGPEAIvwqgX3wgbfsKEcW0B8dvvsw/Lo3OsncYnU0eG2nLcJRPWvU+k1Wzcu 1JxdzPVgd96bP2mEkV6pcCCaTinFSvggyprf+B7BB3QEnCeAViK/qyXxTA/wTYc6P5 ZzgArfLpor+WA== Date: Mon, 02 Sep 2024 11:41:48 -0700 Subject: [GIT PULL 1/8] xfs: atomic file content commits From: "Darrick J. Wong" To: chandanbabu@kernel.org, djwong@kernel.org Cc: hch@lst.de, jlayton@kernel.org, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org Message-ID: <172530247928.3348968.8631642486354912699.stg-ugh@frogsfrogsfrogs> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20240902184002.GY6224@frogsfrogsfrogs> References: <20240902184002.GY6224@frogsfrogsfrogs> Hi Chandan, Please pull this branch with changes for xfs for 6.12-rc1. As usual, I did a test-merge with the main upstream branch as of a few minutes ago, and didn't see any conflicts. Please let me know if you encounter any problems. --D The following changes since commit 431c1646e1f86b949fa3685efc50b660a364c2b6: Linux 6.11-rc6 (2024-09-01 19:46:02 +1200) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/atomic-file-commits-6.12_2024-09-02 for you to fetch changes up to 398597c3ef7fb1d8fa31491c8f4f3996cff45701: xfs: introduce new file range commit ioctls (2024-09-01 08:58:19 -0700) ---------------------------------------------------------------- xfs: atomic file content commits [v31.1 1/8] This series creates XFS_IOC_START_COMMIT and XFS_IOC_COMMIT_RANGE ioctls to perform the exchange only if the target file has not been changed since a given sampling point. This new functionality uses the mechanism underlying EXCHANGE_RANGE to stage and commit file updates such that reader programs will see either the old contents or the new contents in their entirety, with no chance of torn writes. A successful call completion guarantees that the new contents will be seen even if the system fails. The pair of ioctls allows userspace to perform what amounts to a compare and exchange operation on entire file contents. Note that there are ongoing arguments in the community about how best to implement some sort of file data write counter that nfsd could also use to signal invalidations to clients. Until such a thing is implemented, this patch will rely on ctime/mtime updates. Here are the proposed manual pages: IOCTL-XFS-COMMIT-RANGE(2) System Calls ManualIOCTL-XFS-COMMIT-RANGE(2) NAME ioctl_xfs_start_commit - prepare to exchange the contents of two files ioctl_xfs_commit_range - conditionally exchange the contents of parts of two files SYNOPSIS #include #include int ioctl(int file2_fd, XFS_IOC_START_COMMIT, struct xfs_com‐ mit_range *arg); int ioctl(int file2_fd, XFS_IOC_COMMIT_RANGE, struct xfs_com‐ mit_range *arg); DESCRIPTION Given a range of bytes in a first file file1_fd and a second range of bytes in a second file file2_fd, this ioctl(2) ex‐ changes the contents of the two ranges if file2_fd passes cer‐ tain freshness criteria. Before exchanging the contents, the program must call the XFS_IOC_START_COMMIT ioctl to sample freshness data for file2_fd. If the sampled metadata does not match the file metadata at commit time, XFS_IOC_COMMIT_RANGE will return EBUSY. Exchanges are atomic with regards to concurrent file opera‐ tions. Implementations must guarantee that readers see either the old contents or the new contents in their entirety, even if the system fails. The system call parameters are conveyed in structures of the following form: struct xfs_commit_range { __s32 file1_fd; __u32 pad; __u64 file1_offset; __u64 file2_offset; __u64 length; __u64 flags; __u64 file2_freshness[5]; }; The field pad must be zero. The fields file1_fd, file1_offset, and length define the first range of bytes to be exchanged. The fields file2_fd, file2_offset, and length define the second range of bytes to be exchanged. The field file2_freshness is an opaque field whose contents are determined by the kernel. These file attributes are used to confirm that file2_fd has not changed by another thread since the current thread began staging its own update. Both files must be from the same filesystem mount. If the two file descriptors represent the same file, the byte ranges must not overlap. Most disk-based filesystems require that the starts of both ranges must be aligned to the file block size. If this is the case, the ends of the ranges must also be so aligned unless the XFS_EXCHANGE_RANGE_TO_EOF flag is set. The field flags control the behavior of the exchange operation. XFS_EXCHANGE_RANGE_TO_EOF Ignore the length parameter. All bytes in file1_fd from file1_offset to EOF are moved to file2_fd, and file2's size is set to (file2_offset+(file1_length- file1_offset)). Meanwhile, all bytes in file2 from file2_offset to EOF are moved to file1 and file1's size is set to (file1_offset+(file2_length- file2_offset)). XFS_EXCHANGE_RANGE_DSYNC Ensure that all modified in-core data in both file ranges and all metadata updates pertaining to the exchange operation are flushed to persistent storage before the call returns. Opening either file de‐ scriptor with O_SYNC or O_DSYNC will have the same effect. XFS_EXCHANGE_RANGE_FILE1_WRITTEN Only exchange sub-ranges of file1_fd that are known to contain data written by application software. Each sub-range may be expanded (both upwards and downwards) to align with the file allocation unit. For files on the data device, this is one filesystem block. For files on the realtime device, this is the realtime extent size. This facility can be used to implement fast atomic scatter-gather writes of any complexity for software-defined storage targets if all writes are aligned to the file allocation unit. XFS_EXCHANGE_RANGE_DRY_RUN Check the parameters and the feasibility of the op‐ eration, but do not change anything. RETURN VALUE On error, -1 is returned, and errno is set to indicate the er‐ ror. ERRORS Error codes can be one of, but are not limited to, the follow‐ ing: EBADF file1_fd is not open for reading and writing or is open for append-only writes; or file2_fd is not open for reading and writing or is open for append-only writes. EBUSY The file2 inode number and timestamps supplied do not match file2_fd. EINVAL The parameters are not correct for these files. This error can also appear if either file descriptor repre‐ sents a device, FIFO, or socket. Disk filesystems gen‐ erally require the offset and length arguments to be aligned to the fundamental block sizes of both files. EIO An I/O error occurred. EISDIR One of the files is a directory. ENOMEM The kernel was unable to allocate sufficient memory to perform the operation. ENOSPC There is not enough free space in the filesystem ex‐ change the contents safely. EOPNOTSUPP The filesystem does not support exchanging bytes between the two files. EPERM file1_fd or file2_fd are immutable. ETXTBSY One of the files is a swap file. EUCLEAN The filesystem is corrupt. EXDEV file1_fd and file2_fd are not on the same mounted filesystem. CONFORMING TO This API is XFS-specific. USE CASES Several use cases are imagined for this system call. Coordina‐ tion between multiple threads is performed by the kernel. The first is a filesystem defragmenter, which copies the con‐ tents of a file into another file and wishes to exchange the space mappings of the two files, provided that the original file has not changed. An example program might look like this: int fd = open("/some/file", O_RDWR); int temp_fd = open("/some", O_TMPFILE | O_RDWR); struct stat sb; struct xfs_commit_range args = { .flags = XFS_EXCHANGE_RANGE_TO_EOF, }; /* gather file2's freshness information */ ioctl(fd, XFS_IOC_START_COMMIT, &args); fstat(fd, &sb); /* make a fresh copy of the file with terrible alignment to avoid reflink */ clone_file_range(fd, NULL, temp_fd, NULL, 1, 0); clone_file_range(fd, NULL, temp_fd, NULL, sb.st_size - 1, 0); /* commit the entire update */ args.file1_fd = temp_fd; ret = ioctl(fd, XFS_IOC_COMMIT_RANGE, &args); if (ret && errno == EBUSY) printf("file changed while defrag was underway "); The second is a data storage program that wants to commit non- contiguous updates to a file atomically. This program cannot coordinate updates to the file and therefore relies on the ker‐ nel to reject the COMMIT_RANGE command if the file has been up‐ dated by someone else. This can be done by creating a tempo‐ rary file, calling FICLONE(2) to share the contents, and stag‐ ing the updates into the temporary file. The FULL_FILES flag is recommended for this purpose. The temporary file can be deleted or punched out afterwards. An example program might look like this: int fd = open("/some/file", O_RDWR); int temp_fd = open("/some", O_TMPFILE | O_RDWR); struct xfs_commit_range args = { .flags = XFS_EXCHANGE_RANGE_TO_EOF, }; /* gather file2's freshness information */ ioctl(fd, XFS_IOC_START_COMMIT, &args); ioctl(temp_fd, FICLONE, fd); /* append 1MB of records */ lseek(temp_fd, 0, SEEK_END); write(temp_fd, data1, 1000000); /* update record index */ pwrite(temp_fd, data1, 600, 98765); pwrite(temp_fd, data2, 320, 54321); pwrite(temp_fd, data2, 15, 0); /* commit the entire update */ args.file1_fd = temp_fd; ret = ioctl(fd, XFS_IOC_COMMIT_RANGE, &args); if (ret && errno == EBUSY) printf("file changed before commit; will roll back "); NOTES Some filesystems may limit the amount of data or the number of extents that can be exchanged in a single call. SEE ALSO ioctl(2) XFS 2024-02-18 IOCTL-XFS-COMMIT-RANGE(2) With a bit of luck, this should all go splendidly. Signed-off-by: Darrick J. Wong ---------------------------------------------------------------- Darrick J. Wong (1): xfs: introduce new file range commit ioctls fs/xfs/libxfs/xfs_fs.h | 26 +++++++++ fs/xfs/xfs_exchrange.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++++- fs/xfs/xfs_exchrange.h | 16 +++++- fs/xfs/xfs_ioctl.c | 4 ++ fs/xfs/xfs_trace.h | 57 +++++++++++++++++++- 5 files changed, 243 insertions(+), 3 deletions(-) From patchwork Mon Sep 2 18:42:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13787636 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 A27C019CC0F for ; Mon, 2 Sep 2024 18:42:04 +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=1725302524; cv=none; b=sFskgPFU7RBObUrLrJhI9vA4k2vmiEA3Ra1t7IPj0e1rLn1S8Coq6DsTzkZVA4d8MyMGd8wV0vi4Ep9JHsjLXHBUtqIO6QBJSPHTkwt4bDMS9YoTyOCdDm3bZ+O7/KZvMVwY/LrbLHZGe3FUuugsTqsFTZDXaZKJ+1Mv9HjQWPY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725302524; c=relaxed/simple; bh=MBjC4jXJ+mnmulNSa6RuhCMT9BZuhOr9GrbDu+YXsGU=; h=Date:Subject:From:To:Cc:Message-ID:MIME-Version:In-Reply-To: References:Content-Type; b=H0obw4Em4r3D/v6EDvqKBNBW8b0wCMLsSehRKbbKGuGZW8UX1eRrVQQ8PxYZl9ZEEfUsj2rSTwNieNbOPI3oY7IHD0I9V+gJFpnpGtifqIiQD/IG+tsteUvU+3mGa0cHIYChMg2GBBD/xn5bXTa+DcNyfhRnnmxMI6M3rwBCzP0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=StSlhDTB; 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="StSlhDTB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7856EC4CEC2; Mon, 2 Sep 2024 18:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725302524; bh=MBjC4jXJ+mnmulNSa6RuhCMT9BZuhOr9GrbDu+YXsGU=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=StSlhDTBwamA7kewX5GMQ6KRySH3wH/Ni1MaWxoUbRIyd6OMcjW3cD8Vkl1Tv+cQc HJWL6QEF5zLwUvLbaILdQhqptyXTFbkqA2B5ip+8PBpMD2zrD5BxLKTnWc2NN3QD0R 3gdn+R3kD8FNSztIUpBc2IwfS3s9F5rNNwtDqVZlg3bu0STH5iawkFva51LY4/3T6u cIi/HpTBVxCoKzhdsdveaPtzZwPDEGBXtqHIm9EQZAwZnuXIYg9MIEvzWDbVpdTnVV oaANM9Bte8EbiDYhKuczUdXG8q261d4vkEfug4axHY0Flpr5ZekcMyVhfEtV4J+59Z 31ojoW6IJMSAg== Date: Mon, 02 Sep 2024 11:42:04 -0700 Subject: [GIT PULL 2/8] xfs: cleanups before adding metadata directories From: "Darrick J. Wong" To: chandanbabu@kernel.org, djwong@kernel.org Cc: dchinner@redhat.com, hch@lst.de, linux-xfs@vger.kernel.org Message-ID: <172530248037.3348968.17440606333983461893.stg-ugh@frogsfrogsfrogs> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20240902184002.GY6224@frogsfrogsfrogs> References: <20240902184002.GY6224@frogsfrogsfrogs> Hi Chandan, Please pull this branch with changes for xfs for 6.12-rc1. As usual, I did a test-merge with the main upstream branch as of a few minutes ago, and didn't see any conflicts. Please let me know if you encounter any problems. --D The following changes since commit 398597c3ef7fb1d8fa31491c8f4f3996cff45701: xfs: introduce new file range commit ioctls (2024-09-01 08:58:19 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/metadir-cleanups-6.12_2024-09-02 for you to fetch changes up to 390b4775d6787706b1846f15623a68e576ec900c: xfs: pass the icreate args object to xfs_dialloc (2024-09-01 08:58:19 -0700) ---------------------------------------------------------------- xfs: cleanups before adding metadata directories [v4.2 2/8] Before we start adding code for metadata directory trees, let's clean up some warts in the realtime bitmap code and the inode allocator code. With a bit of luck, this should all go splendidly. Signed-off-by: Darrick J. Wong ---------------------------------------------------------------- Christoph Hellwig (1): xfs: match on the global RT inode numbers in xfs_is_metadata_inode Darrick J. Wong (2): xfs: validate inumber in xfs_iget xfs: pass the icreate args object to xfs_dialloc fs/xfs/libxfs/xfs_ialloc.c | 5 +++-- fs/xfs/libxfs/xfs_ialloc.h | 4 +++- fs/xfs/scrub/tempfile.c | 2 +- fs/xfs/xfs_icache.c | 2 +- fs/xfs/xfs_inode.c | 4 ++-- fs/xfs/xfs_inode.h | 7 ++++--- fs/xfs/xfs_qm.c | 2 +- fs/xfs/xfs_symlink.c | 2 +- 8 files changed, 16 insertions(+), 12 deletions(-) From patchwork Mon Sep 2 18:42:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13787637 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 AB86319CC0F for ; Mon, 2 Sep 2024 18:42:20 +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=1725302540; cv=none; b=LYPFA0h+i9JnaPp76PHiDRcfIxbFhAI1t9gt26AYVsYeBx9ECpE9ZagmcWnOyAf732BparyTzkoqR756F1VUrcaBYxnSBpDGFweFMdJqmDAOfpxSLk2UNwOBE9QipZdStrYqrZrvoDBftgQDkF7CB2ESNHtkJ1iLXjfF12UFDt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725302540; c=relaxed/simple; bh=t9fji/yZarWRC6pGHSQE57a/dDJSuCweZSy6+71rMhk=; h=Date:Subject:From:To:Cc:Message-ID:MIME-Version:In-Reply-To: References:Content-Type; b=GEm9DbEd6X50WB+OdMd83uJkBtKnQLRt+EDoeECm7LHYDz5llU7PcxAVnKLvH/ikMwB/0/O4A9RCxJwPSv4SrG9pnCP/wTpXKEUy8/xZbclMcVBbOWMp3GfQJT7n5eG70M4JFaiCUhftuvoo9GgM6QbGP+CsVnqYhRoY3B3Nx2M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=n84oV0Q/; 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="n84oV0Q/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F9C0C4CEC2; Mon, 2 Sep 2024 18:42:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725302540; bh=t9fji/yZarWRC6pGHSQE57a/dDJSuCweZSy6+71rMhk=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=n84oV0Q/S7FlBa3eQFydweR90S3juEsBjXwqZCn6kPeQrPI/JkGbGyec5tDu8uFTX ut0yKn5fo9KJ9CMqv60ONmpWnylTRoPIFGLOqpvNl5QDscjsXiolQvA0jwtk28DYDQ I4v+ubvd4B6ChpuYZUtDOCr/IZkOWE2pqZxbZ0gzn4o8y0a2swUtRylTdLqYjGVCX/ 6YTnUhx9RACXcJdGxgGLK0Qiq4NHeBm1itDM7pB7JX5qttPf0vOx+vJHvqmXKHA6yO KFMxjp7t7AbS6i2/eeXku0vSyzGKUnxq0Q/XzkK8AwHfvkESa4X3EcE8UrV45+zGuD 6qDYHRHPzQfCw== Date: Mon, 02 Sep 2024 11:42:19 -0700 Subject: [GIT PULL 3/8] xfs: clean up the rtbitmap code From: "Darrick J. Wong" To: chandanbabu@kernel.org, djwong@kernel.org Cc: hch@lst.de, linux-xfs@vger.kernel.org Message-ID: <172530248144.3348968.14040388584318376231.stg-ugh@frogsfrogsfrogs> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20240902184002.GY6224@frogsfrogsfrogs> References: <20240902184002.GY6224@frogsfrogsfrogs> Hi Chandan, Please pull this branch with changes for xfs for 6.12-rc1. As usual, I did a test-merge with the main upstream branch as of a few minutes ago, and didn't see any conflicts. Please let me know if you encounter any problems. --D The following changes since commit 390b4775d6787706b1846f15623a68e576ec900c: xfs: pass the icreate args object to xfs_dialloc (2024-09-01 08:58:19 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/rtbitmap-cleanups-6.12_2024-09-02 for you to fetch changes up to 0a59e4f3e1670bc49d60e1bd1a9b19ca156ae9cb: xfs: push transaction join out of xfs_rtbitmap_lock and xfs_rtgroup_lock (2024-09-01 08:58:19 -0700) ---------------------------------------------------------------- xfs: clean up the rtbitmap code [v4.2 3/8] Here are some cleanups and reorganization of the realtime bitmap code to share more of that code between userspace and the kernel. With a bit of luck, this should all go splendidly. Signed-off-by: Darrick J. Wong ---------------------------------------------------------------- Christoph Hellwig (12): xfs: remove xfs_validate_rtextents xfs: factor out a xfs_validate_rt_geometry helper xfs: make the RT rsum_cache mandatory xfs: remove the limit argument to xfs_rtfind_back xfs: assert a valid limit in xfs_rtfind_forw xfs: add bounds checking to xfs_rt{bitmap,summary}_read_buf xfs: cleanup the calling convention for xfs_rtpick_extent xfs: push the calls to xfs_rtallocate_range out to xfs_bmap_rtalloc xfs: factor out a xfs_growfs_rt_bmblock helper xfs: factor out a xfs_last_rt_bmblock helper xfs: factor out rtbitmap/summary initialization helpers xfs: push transaction join out of xfs_rtbitmap_lock and xfs_rtgroup_lock fs/xfs/libxfs/xfs_bmap.c | 3 +- fs/xfs/libxfs/xfs_rtbitmap.c | 192 ++++++++++++++-- fs/xfs/libxfs/xfs_rtbitmap.h | 33 +-- fs/xfs/libxfs/xfs_sb.c | 64 +++--- fs/xfs/libxfs/xfs_sb.h | 1 + fs/xfs/libxfs/xfs_types.h | 12 - fs/xfs/xfs_rtalloc.c | 535 +++++++++++++++++-------------------------- 7 files changed, 438 insertions(+), 402 deletions(-) From patchwork Mon Sep 2 18:42:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13787638 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 DB8A72139DB for ; Mon, 2 Sep 2024 18:42:35 +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=1725302555; cv=none; b=dzFQBAkURs3oBf2TkXPvdb3nbxSJGiXrfkriHHT5alCGWc5oSWVdAkKLKkUrtGdp5GrU/9OgQs9I6OXwM4omIanxpUyntEEhDFv31hf5wJhapg2DDD9me9lU2Jq8xao+BFQkfObP3G71Ww059YHJJ+QR1UE63/8uRGfhhoqYTnA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725302555; c=relaxed/simple; bh=YKwI50g2mYW80tAsn/sJVibXWnpmgPG0fY5TJoArGoA=; h=Date:Subject:From:To:Cc:Message-ID:MIME-Version:In-Reply-To: References:Content-Type; b=BiqNVnShL6mh4g/wc8xJkvBWV5FV2EmYYPcJFughLjl7KBPVLdhzLnFcD7GoVuyZZdGG9p+kByQ1K8d1dF0l1jXwLv9LcxtNqhw/pN5xga+8b7OmsJRtWBCK31UPvrj0pzREkQHyO6uXQX+wYzWS5PnZJCKH2C7cyGeApuekZWk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YoPy8OPV; 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="YoPy8OPV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7CC5C4CECB; Mon, 2 Sep 2024 18:42:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725302555; bh=YKwI50g2mYW80tAsn/sJVibXWnpmgPG0fY5TJoArGoA=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=YoPy8OPVvtxnmfGaFmRcmF/kYEpp5zv5m/SguvyVBXcCPUdv9prCMT/ykDaQJxdFJ lSrYZMOaLGAvowiLd7ulIDCAKfk7CCeVtQGYpHI5g3jS4BMiUo0wshmfgkp7p19v3j Y571B5k3H7iTBuhcpXej38QXd9XkcGdk45u66xW0UtAOZTvgYMXfxtdw6uSqC2ggN7 Pjtw5N06lzQM63h/q7PT65ZznZPcoENisXC0Fh3oARTrOni08dvwhuE9WF8MqzpGqQ ugX5VrVZSFXYsnjRgQurJ9Z7WzMY7JVUQDZedY2Y/ukhFRcRMwUNcBxwDUDg/AunT8 7WH8pVIdXCCjQ== Date: Mon, 02 Sep 2024 11:42:35 -0700 Subject: [GIT PULL 4/8] xfs: fixes for the realtime allocator From: "Darrick J. Wong" To: chandanbabu@kernel.org, djwong@kernel.org Cc: hch@lst.de, linux-xfs@vger.kernel.org Message-ID: <172530248247.3348968.5957783046629027826.stg-ugh@frogsfrogsfrogs> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20240902184002.GY6224@frogsfrogsfrogs> References: <20240902184002.GY6224@frogsfrogsfrogs> Hi Chandan, Please pull this branch with changes for xfs for 6.12-rc1. As usual, I did a test-merge with the main upstream branch as of a few minutes ago, and didn't see any conflicts. Please let me know if you encounter any problems. --D The following changes since commit 0a59e4f3e1670bc49d60e1bd1a9b19ca156ae9cb: xfs: push transaction join out of xfs_rtbitmap_lock and xfs_rtgroup_lock (2024-09-01 08:58:19 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/rtalloc-fixes-6.12_2024-09-02 for you to fetch changes up to df8b181f1551581e96076a653cdca43468093c0f: xfs: simplify xfs_rtalloc_query_range (2024-09-01 08:58:19 -0700) ---------------------------------------------------------------- xfs: fixes for the realtime allocator [v4.2 4/8] While I was reviewing how to integrate realtime allocation groups with the rt allocator, I noticed several bugs in the existing allocation code with regards to calculating the maximum range of rtx to scan for free space. This series fixes those range bugs and cleans up a few things too. I also added a few cleanups from Christoph. With a bit of luck, this should all go splendidly. Signed-off-by: Darrick J. Wong ---------------------------------------------------------------- Christoph Hellwig (4): xfs: use the recalculated transaction reservation in xfs_growfs_rt_bmblock xfs: ensure rtx mask/shift are correct after growfs xfs: remove xfs_rtb_to_rtxrem xfs: simplify xfs_rtalloc_query_range Darrick J. Wong (6): xfs: don't return too-short extents from xfs_rtallocate_extent_block xfs: don't scan off the end of the rt volume in xfs_rtallocate_extent_block xfs: refactor aligning bestlen to prod xfs: clean up xfs_rtallocate_extent_exact a bit xfs: reduce excessive clamping of maxlen in xfs_rtallocate_extent_near xfs: fix broken variable-sized allocation detection in xfs_rtallocate_extent_block fs/xfs/libxfs/xfs_rtbitmap.c | 51 +++++++-------- fs/xfs/libxfs/xfs_rtbitmap.h | 21 +------ fs/xfs/libxfs/xfs_sb.c | 12 +++- fs/xfs/libxfs/xfs_sb.h | 2 + fs/xfs/xfs_discard.c | 15 +++-- fs/xfs/xfs_fsmap.c | 11 ++-- fs/xfs/xfs_rtalloc.c | 145 +++++++++++++++++++++++-------------------- 7 files changed, 124 insertions(+), 133 deletions(-) From patchwork Mon Sep 2 18:42:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13787639 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 C15241A3AA4 for ; Mon, 2 Sep 2024 18:42:51 +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=1725302571; cv=none; b=JGvW/BlJhvO02dbs0zq6Sq0Wg8FV1WRs/wYYd7xohG+r7GKSWGO4InsqAqyWUQhrmsQ1Ih7/KzhYMYq0sGQ1D77V1yKIW3nmjos5qLoP5acUbt4NmooePUWAtxvXLftZcsS+5qmu4pw+ebZ1jwSk/Y0IQ6YtzCYKy+eSCeFaz6c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725302571; c=relaxed/simple; bh=f8grYn2+lK3Nk2Yei7tiCmxSs8D5EYasaC9dBKvC2zw=; h=Date:Subject:From:To:Cc:Message-ID:MIME-Version:In-Reply-To: References:Content-Type; b=fTJ9sD5vcLCIL3IpULwg+Lz7X7gvBekDDzZmRQHlwHJBcDAUZm+cDETSABLvl3fd/liGsRo4nPnCOpO6JkKbF0zHMOjleaRwp8/FTLDfubR2W/5hWWZxe17UAiyIWMMKE5pkU748eKXieNiN/zWc1BlwzaDMMnmHtErys5osS3Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cMg9faI/; 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="cMg9faI/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EA2DC4CEC2; Mon, 2 Sep 2024 18:42:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725302571; bh=f8grYn2+lK3Nk2Yei7tiCmxSs8D5EYasaC9dBKvC2zw=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=cMg9faI/vXedhTTe2+ToX1nMPlP2ZZSWHMroDxCEDrfZiYIdXEnGleb9kBta/IgMA HOQ/7G2v1zmMLqBQb5VZDo2kReHNXTQWLZyJguhvE8It+G7wXInTG1/T15HoumqjVJ t45y8gfUjR4d9iGi0YjEDaZ4STOCB6PeNFDlVLQBqziFT7GCT7q5EIqxlTwkuPUPcy FjNtlfCh8YE+hmchDzx2AofpF0ETdgafLhV+/UrYzuXgEwYa5mxTEtNOBwGdW7QM8R BXGPuSw5EMSQWqpmgW7I06sh0AJxt/fJYo0w/HqMox9ti9A/DzEIfIf6X15Iep2N12 Y9+kho7aIrHLQ== Date: Mon, 02 Sep 2024 11:42:50 -0700 Subject: [GIT PULL 5/8] xfs: cleanups for the realtime allocator From: "Darrick J. Wong" To: chandanbabu@kernel.org, djwong@kernel.org Cc: hch@lst.de, linux-xfs@vger.kernel.org Message-ID: <172530248351.3348968.12421656957345647056.stg-ugh@frogsfrogsfrogs> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20240902184002.GY6224@frogsfrogsfrogs> References: <20240902184002.GY6224@frogsfrogsfrogs> Hi Chandan, Please pull this branch with changes for xfs for 6.12-rc1. As usual, I did a test-merge with the main upstream branch as of a few minutes ago, and didn't see any conflicts. Please let me know if you encounter any problems. --D The following changes since commit df8b181f1551581e96076a653cdca43468093c0f: xfs: simplify xfs_rtalloc_query_range (2024-09-01 08:58:19 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/rtalloc-cleanups-6.12_2024-09-02 for you to fetch changes up to 2ca7b9d7b80810b2b45b78b8a4b4fa78a1ddc2dd: xfs: move xfs_ioc_getfsmap out of xfs_ioctl.c (2024-09-01 08:58:19 -0700) ---------------------------------------------------------------- xfs: cleanups for the realtime allocator [v4.2 5/8] This third series cleans up the realtime allocator code so that it'll be somewhat less difficult to figure out what on earth it's doing. We also rearrange the fsmap code a bit. With a bit of luck, this should all go splendidly. Signed-off-by: Darrick J. Wong ---------------------------------------------------------------- Christoph Hellwig (7): xfs: clean up the ISVALID macro in xfs_bmap_adjacent xfs: factor out a xfs_rtallocate helper xfs: rework the rtalloc fallback handling xfs: factor out a xfs_rtallocate_align helper xfs: make the rtalloc start hint a xfs_rtblock_t xfs: remove xfs_{rtbitmap,rtsummary}_wordcount xfs: replace m_rsumsize with m_rsumblocks Darrick J. Wong (3): xfs: add xchk_setup_nothing and xchk_nothing helpers xfs: rearrange xfs_fsmap.c a little bit xfs: move xfs_ioc_getfsmap out of xfs_ioctl.c fs/xfs/libxfs/xfs_bmap.c | 55 +++--- fs/xfs/libxfs/xfs_rtbitmap.c | 33 +--- fs/xfs/libxfs/xfs_rtbitmap.h | 7 - fs/xfs/libxfs/xfs_trans_resv.c | 2 +- fs/xfs/scrub/common.h | 29 +-- fs/xfs/scrub/rtsummary.c | 11 +- fs/xfs/scrub/rtsummary.h | 2 +- fs/xfs/scrub/rtsummary_repair.c | 12 +- fs/xfs/scrub/scrub.h | 29 +-- fs/xfs/xfs_fsmap.c | 402 ++++++++++++++++++++++++++-------------- fs/xfs/xfs_fsmap.h | 6 +- fs/xfs/xfs_ioctl.c | 130 ------------- fs/xfs/xfs_mount.h | 2 +- fs/xfs/xfs_rtalloc.c | 246 ++++++++++++++---------- 14 files changed, 477 insertions(+), 489 deletions(-) From patchwork Mon Sep 2 18:43:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13787640 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 70C1C1A3AAA for ; Mon, 2 Sep 2024 18:43:07 +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=1725302587; cv=none; b=Ob2ZSv35NW3hxeCDr0rqsyA/rbriBdVQHAHPKdQCHWGVYd04nAf+U8MdGA2opNb1NXTtZXq57aEAKIx0tP7bK6uDB6P6wHWn4tpbvZ/v9Fn/y69B2CFOF5a0urejDmZtyVS58prQLkI2y4QvQjEJrsIFGzWZwpMf5EOmS1wNyKs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725302587; c=relaxed/simple; bh=U+0+R0IWijuWeDp/EvCRiQ/0/+fBhy7cbCZvbYsrumE=; h=Date:Subject:From:To:Cc:Message-ID:MIME-Version:In-Reply-To: References:Content-Type; b=gVdNfv05k1XneZvNJB1/OYLbjnFCndXu5omL5Fhxmodur0HF6XvQh2VRa8HjaeJJf8PKG4NrYWx1ocH+HKOcQChU4ksyQqciBD5JmtFl8ZYMOQDUnwZmCWSEShbccPwZC6LiA6z6IIaf0MXbrp2Z4kHmO/MqdfoN3+YkeXAAde4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=p+X7xE5k; 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="p+X7xE5k" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F223AC4CEC2; Mon, 2 Sep 2024 18:43:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725302587; bh=U+0+R0IWijuWeDp/EvCRiQ/0/+fBhy7cbCZvbYsrumE=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=p+X7xE5ktZK+LDk9vsC0aFCtBwZ1kfZHHSwWtihe/g5wexsm2QCTIqGmx+akemCdX qR9Qj6314+lygL61ok36oOktV4+eKrv0QmqiF0K5+AlE6X3yQBM0RtAd/QYA68Aa6u k0JnezdgQTVw9tTAciybtSmtyn9+hxghirKd18AIrZOV1CsOWWAfs6YCadF4u+uTFK G9Fn4TNdqYR9/PFI4pP3qLg+6JUEEPT5Naqo76+fr8AIqDmu+nMjsoqG8+Ixv0A1py In5fO7ggsq38ohceKhMAShRYgqe6Ii1qlzx2GVsc48nVraqidVhFsIf/Ln1tbTx/AK QY+1INYsKSR7Q== Date: Mon, 02 Sep 2024 11:43:06 -0700 Subject: [GIT PULL 6/8] xfs: cleanups for quota mount From: "Darrick J. Wong" To: chandanbabu@kernel.org, djwong@kernel.org Cc: hch@lst.de, linux-xfs@vger.kernel.org Message-ID: <172530248455.3348968.4210083940459711589.stg-ugh@frogsfrogsfrogs> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20240902184002.GY6224@frogsfrogsfrogs> References: <20240902184002.GY6224@frogsfrogsfrogs> Hi Chandan, Please pull this branch with changes for xfs for 6.12-rc1. As usual, I did a test-merge with the main upstream branch as of a few minutes ago, and didn't see any conflicts. Please let me know if you encounter any problems. --D The following changes since commit 2ca7b9d7b80810b2b45b78b8a4b4fa78a1ddc2dd: xfs: move xfs_ioc_getfsmap out of xfs_ioctl.c (2024-09-01 08:58:19 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/quota-cleanups-6.12_2024-09-02 for you to fetch changes up to 2c4162be6c10d3bc4884c211ae4787fc84c4fe3c: xfs: refactor loading quota inodes in the regular case (2024-09-01 08:58:20 -0700) ---------------------------------------------------------------- xfs: cleanups for quota mount [v4.2 6/8] Refactor the quota file loading code in preparation for adding metadata directory trees. Did you know that quotarm works even when quota isn't active? With a bit of luck, this should all go splendidly. Signed-off-by: Darrick J. Wong ---------------------------------------------------------------- Darrick J. Wong (1): xfs: refactor loading quota inodes in the regular case fs/xfs/xfs_qm.c | 46 +++++++++++++++++++++++++++++++++++------ fs/xfs/xfs_qm.h | 3 +++ fs/xfs/xfs_qm_syscalls.c | 13 ++++++------ fs/xfs/xfs_quotaops.c | 53 ++++++++++++++++++++++++++++-------------------- 4 files changed, 80 insertions(+), 35 deletions(-) From patchwork Mon Sep 2 18:43:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13787641 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 221021A3AAA for ; Mon, 2 Sep 2024 18:43:22 +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=1725302603; cv=none; b=KFetQQFA4KJnonLuQJcHEvukb8DUJqf7Gx54mwgu79gIvSrOr8oglwk8I6gB9RIPjGggsHPxw5QWrBl2s5+2ntUhTMlA0Hr77iX4zHbc2luUhPUlcQPQsV21eovKbrwy2Lrj3ZfoIS32xBBwzAVFjS9FN0pTOr1HTbLQjWuiOtE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725302603; c=relaxed/simple; bh=Ckq1jinAOObk4le8a06/7yfpjQ2YO4D4Rl8RwlL5H1Q=; h=Date:Subject:From:To:Cc:Message-ID:MIME-Version:In-Reply-To: References:Content-Type; b=bFOfysbPYQy1H/8ZrYishZdvtCYd++m/7vjNhwaf1/0CiClSakS9zO3iqJ1p+J6Z81XfibWQj2ShAiV8KIi9AYQnA2q+Qpc1Ft+jxa9KTPuVx0HSsrol6LL7IOv8fQ51bRq8vin7v1MyO3ZUCMc0/ofe0tuLALdOWtpqeHfeefo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VTkgnV60; 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="VTkgnV60" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C4C5C4CEC2; Mon, 2 Sep 2024 18:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725302602; bh=Ckq1jinAOObk4le8a06/7yfpjQ2YO4D4Rl8RwlL5H1Q=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=VTkgnV60YDrRxb6qNPRf1Oq2QF27aCKo3KOhMuF27WYURdalcjiyu+FMuKpAVXlLQ 4sFStJNkiTdo7+S1wYTSh4d7LFt++evTVQav3T1yqQV3lcPzNadEqwWovaYLTayeh/ Q3d4MrsNbmXL8lHY4ULV/x/4b4YZ+h9ufhjliQAoUvRVzW17uJY9nJJoXpzBXMTUQb eoM2my41JCCP6UtejydF1UGZ4aOY9SrepInRmR3f+hITT0BWlTooY3io+DZEU0usI1 6hKuHJ8Mz54OWwV+P4mBF85inftCyPnRwoWT2446zfF6LZ53Ox12Ursu1b5vzCv5l7 VOlrMpa75+SCg== Date: Mon, 02 Sep 2024 11:43:22 -0700 Subject: [GIT PULL 7/8] xfs: various bug fixes for 6.12 From: "Darrick J. Wong" To: chandanbabu@kernel.org, djwong@kernel.org Cc: hch@lst.de, kernel@mattwhitlock.name, linux-xfs@vger.kernel.org, sam@gentoo.org Message-ID: <172530248562.3348968.7217782771063673945.stg-ugh@frogsfrogsfrogs> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20240902184002.GY6224@frogsfrogsfrogs> References: <20240902184002.GY6224@frogsfrogsfrogs> Hi Chandan, Please pull this branch with changes for xfs for 6.12-rc1. As usual, I did a test-merge with the main upstream branch as of a few minutes ago, and didn't see any conflicts. Please let me know if you encounter any problems. --D The following changes since commit 2c4162be6c10d3bc4884c211ae4787fc84c4fe3c: xfs: refactor loading quota inodes in the regular case (2024-09-01 08:58:20 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/xfs-fixes-6.12_2024-09-02 for you to fetch changes up to de55149b6639e903c4d06eb0474ab2c05060e61d: xfs: fix a sloppy memory handling bug in xfs_iroot_realloc (2024-09-01 08:58:20 -0700) ---------------------------------------------------------------- xfs: various bug fixes for 6.12 [7/8] Various bug fixes for 6.12. With a bit of luck, this should all go splendidly. Signed-off-by: Darrick J. Wong ---------------------------------------------------------------- Darrick J. Wong (3): xfs: fix C++ compilation errors in xfs_fs.h xfs: fix FITRIM reporting again xfs: fix a sloppy memory handling bug in xfs_iroot_realloc fs/xfs/libxfs/xfs_fs.h | 5 +++-- fs/xfs/libxfs/xfs_inode_fork.c | 10 +++++----- fs/xfs/xfs_discard.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) From patchwork Mon Sep 2 18:43:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13787642 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 B9D4B1CB50F for ; Mon, 2 Sep 2024 18:43:38 +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=1725302618; cv=none; b=Ouavds7VdcOjlT+Y2MIrBtWVhs7UU5h07gnMl/ouoyjXB0lFBJ4dLzBSNHw64pyp4LOxkm/aRXzG6+eKYXtosfhJgBLJf1KtuwnyDTw+4KmGf1lsFNP/ExPtQZ4wofYlHi33Lm+vEYhTYci5iM/hhMFE8n2VkMPTZH9Zugyyvx8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725302618; c=relaxed/simple; bh=5NudYtpqF7XHNh7K6AUtYmIaJoO+k+smGo4wsWteGt8=; h=Date:Subject:From:To:Cc:Message-ID:MIME-Version:In-Reply-To: References:Content-Type; b=DDZR+6jT7vM7vqx65avo0LARppBicliYAApE5E3PcIOV/40XgnUazV3GpE+kd2sOr6WZu1kKjLXL14fkkYCiW+Id4UtnwVZAQapL8nn8XGgup8mxwrSYPGwoCtPHV08uBpU2VTOLvfBi7dzDtI1VKrV1vH+NC88cQAWmo7SDb8k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CbKhGUYP; 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="CbKhGUYP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4204BC4CEC2; Mon, 2 Sep 2024 18:43:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1725302618; bh=5NudYtpqF7XHNh7K6AUtYmIaJoO+k+smGo4wsWteGt8=; h=Date:Subject:From:To:Cc:In-Reply-To:References:From; b=CbKhGUYPy1ZjGHrp/m0AAAwzlm+mCw+Frip76+AQ6D3OlcqF+xxaFVqh+dJhNj+84 wGY5PJTkfvJojqtXLsly2OYOXEbFB5MnRr/kTukHy6P2ZX671C2nYdluPX9fS2YE7L 38Jma8bpSJ2Ekppx+4nXgWOVgVN+9VBqSn4utz4kJ763VR6WzR6MEJXD2EzQish1wH ZsVnC2an3S5qg2xI2gDvJqap3TtLDGIDkJvhx0vMHZLbNTyUgpfEsG3OHFBExtQB60 YuJ6JktiwqpV/pt3/n0xrErY2TDeBDTOaxuyiI7KsZHeg8Ckq8FmyxxRvFQZjHik7F OsY65/rY/28jA== Date: Mon, 02 Sep 2024 11:43:37 -0700 Subject: [GIT PULL 8/8] xfs: cleanups for inode rooted btree code From: "Darrick J. Wong" To: chandanbabu@kernel.org, djwong@kernel.org Cc: hch@lst.de, linux-xfs@vger.kernel.org Message-ID: <172530248669.3348968.12555145296914101501.stg-ugh@frogsfrogsfrogs> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20240902184002.GY6224@frogsfrogsfrogs> References: <20240902184002.GY6224@frogsfrogsfrogs> Hi Chandan, Please pull this branch with changes for xfs for 6.12-rc1. As usual, I did a test-merge with the main upstream branch as of a few minutes ago, and didn't see any conflicts. Please let me know if you encounter any problems. --D The following changes since commit de55149b6639e903c4d06eb0474ab2c05060e61d: xfs: fix a sloppy memory handling bug in xfs_iroot_realloc (2024-09-01 08:58:20 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux.git tags/btree-cleanups-6.12_2024-09-02 for you to fetch changes up to 411a71256de6f5a0015a28929cfbe6bc36c503dc: xfs: standardize the btree maxrecs function parameters (2024-09-01 08:58:20 -0700) ---------------------------------------------------------------- xfs: cleanups for inode rooted btree code [v4.2 8/8] This series prepares the btree code to support realtime reverse mapping btrees by refactoring xfs_ifork_realloc to be fed a per-btree ops structure so that it can handle multiple types of inode-rooted btrees. It moves on to refactoring the btree code to use the new realloc routines. With a bit of luck, this should all go splendidly. Signed-off-by: Darrick J. Wong ---------------------------------------------------------------- Darrick J. Wong (2): xfs: replace shouty XFS_BM{BT,DR} macros xfs: standardize the btree maxrecs function parameters fs/xfs/libxfs/xfs_alloc_btree.c | 6 +- fs/xfs/libxfs/xfs_alloc_btree.h | 3 +- fs/xfs/libxfs/xfs_attr_leaf.c | 8 +- fs/xfs/libxfs/xfs_bmap.c | 42 ++++---- fs/xfs/libxfs/xfs_bmap_btree.c | 24 ++--- fs/xfs/libxfs/xfs_bmap_btree.h | 207 +++++++++++++++++++++++++------------ fs/xfs/libxfs/xfs_ialloc.c | 4 +- fs/xfs/libxfs/xfs_ialloc_btree.c | 6 +- fs/xfs/libxfs/xfs_ialloc_btree.h | 3 +- fs/xfs/libxfs/xfs_inode_fork.c | 34 +++--- fs/xfs/libxfs/xfs_refcount_btree.c | 5 +- fs/xfs/libxfs/xfs_refcount_btree.h | 3 +- fs/xfs/libxfs/xfs_rmap_btree.c | 7 +- fs/xfs/libxfs/xfs_rmap_btree.h | 3 +- fs/xfs/libxfs/xfs_sb.c | 16 +-- fs/xfs/libxfs/xfs_trans_resv.c | 2 +- fs/xfs/scrub/bmap_repair.c | 2 +- fs/xfs/scrub/inode_repair.c | 12 +-- fs/xfs/xfs_bmap_util.c | 4 +- 19 files changed, 237 insertions(+), 154 deletions(-)