[PATCH 2/2] btrfs: Remove custom crc32c init code
The custom crc32 init code was introduced in 14a958e678cd ("Btrfs: fix btrfs boot when compiled as built-in") to enable using btrfs as a built-in. However, later as pointed out by 60efa5eb2e88 ("Btrfs: use late_initcall instead of module_init") this wasn't enough and finally btrfs was switched to late_initcall which comes after the generic crc32c implementation is initiliased. The latter commit superseeded the former. Now that we don't have to maintain our own code let's just remove it and switch to using the generic implementation. Signed-off-by: Nikolay Borisov --- Despite touching a lot of files the patch is really simple. Here is the gist of the changes: 1. Select LIBCRC32C rather than the low-level modules. 2. s/btrfs_crc32c/crc32c/g 3. replace hash.h with linux/crc32c.h 4. Move the btrfs namehash funcs to ctree.h and change the tree accordingly. I've tested this with btrfs being both a module and a built-in and xfstest doesn't complain. fs/btrfs/Kconfig | 3 +-- fs/btrfs/Makefile | 2 +- fs/btrfs/check-integrity.c | 4 ++-- fs/btrfs/ctree.h | 16 ++ fs/btrfs/dir-item.c| 1 - fs/btrfs/disk-io.c | 4 ++-- fs/btrfs/extent-tree.c | 10 - fs/btrfs/hash.c| 54 -- fs/btrfs/hash.h| 43 fs/btrfs/inode-item.c | 1 - fs/btrfs/inode.c | 1 - fs/btrfs/props.c | 2 +- fs/btrfs/send.c| 4 ++-- fs/btrfs/super.c | 14 fs/btrfs/tree-log.c| 2 +- 15 files changed, 35 insertions(+), 126 deletions(-) delete mode 100644 fs/btrfs/hash.c delete mode 100644 fs/btrfs/hash.h diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig index 2e558227931a..4c2dadd8fd8d 100644 --- a/fs/btrfs/Kconfig +++ b/fs/btrfs/Kconfig @@ -1,7 +1,6 @@ config BTRFS_FS tristate "Btrfs filesystem support" - select CRYPTO - select CRYPTO_CRC32C + select LIBCRC32C select ZLIB_INFLATE select ZLIB_DEFLATE select LZO_COMPRESS diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile index 6fe881d5cb38..9cebe5366b35 100644 --- a/fs/btrfs/Makefile +++ b/fs/btrfs/Makefile @@ -10,7 +10,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ export.o tree-log.o free-space-cache.o zlib.o lzo.o zstd.o \ compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \ reada.o backref.o ulist.o qgroup.o send.o dev-replace.o raid56.o \ - uuid-tree.o props.o hash.o free-space-tree.o tree-checker.o + uuid-tree.o props.o free-space-tree.o tree-checker.o btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c index 7d51b5a5b505..3baebbc021c5 100644 --- a/fs/btrfs/check-integrity.c +++ b/fs/btrfs/check-integrity.c @@ -96,9 +96,9 @@ #include #include #include +#include #include "ctree.h" #include "disk-io.h" -#include "hash.h" #include "transaction.h" #include "extent_io.h" #include "volumes.h" @@ -1736,7 +1736,7 @@ static int btrfsic_test_for_metadata(struct btrfsic_state *state, size_t sublen = i ? PAGE_SIZE : (PAGE_SIZE - BTRFS_CSUM_SIZE); - crc = btrfs_crc32c(crc, data, sublen); + crc = crc32c(crc, data, sublen); } btrfs_csum_final(crc, csum); if (memcmp(csum, h->csum, state->csum_size)) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 13c260b525a1..120a17b958eb 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -40,6 +40,7 @@ #include #include #include +#include #include "extent_io.h" #include "extent_map.h" #include "async-thread.h" @@ -98,6 +99,7 @@ static const int btrfs_csum_sizes[] = { 4 }; #define BTRFS_MAX_EXTENT_SIZE SZ_128M + /* * Count how many BTRFS_MAX_EXTENT_SIZE cover the @size */ @@ -2555,6 +2557,20 @@ BTRFS_SETGET_STACK_FUNCS(stack_dev_replace_cursor_right, ((unsigned long)(BTRFS_LEAF_DATA_OFFSET + \ btrfs_item_offset_nr(leaf, slot))) +static inline u64 btrfs_name_hash(const char *name, int len) +{ + return crc32c((u32)~1, name, len); +} + +/* + * Figure the key offset of an extended inode ref + */ +static inline u64 btrfs_extref_hash(u64 parent_objectid, const char *name, + int len) +{ + return (u64) crc32c(parent_objectid, name, len); +} + static inline bool btrfs_mixed_space_info(struct btrfs_space_info *space_info) { return ((space_info->flags & BTRFS_BLOCK_GROUP_METADATA) && diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c index 41cb9196eaa8..176143d26d47 100644 --- a/fs/btrfs/dir-item.c +++ b/fs/btrfs/dir-item.c @@ -18,7 +18,6 @@ #include "ctree.h" #include "disk-io.h" -#include "hash.h" #include "transaction.h"
Re: [PATCH 2/2] btrfs: Remove custom crc32c init code
On Mon, Jan 08, 2018 at 11:45:05AM +0200, Nikolay Borisov wrote: > The custom crc32 init code was introduced in > 14a958e678cd ("Btrfs: fix btrfs boot when compiled as built-in") to > enable using btrfs as a built-in. However, later as pointed out by > 60efa5eb2e88 ("Btrfs: use late_initcall instead of module_init") this > wasn't enough and finally btrfs was switched to late_initcall which > comes after the generic crc32c implementation is initiliased. The > latter commit superseeded the former. Now that we don't have to > maintain our own code let's just remove it and switch to using the > generic implementation. > > Signed-off-by: Nikolay Borisov > --- > > Despite touching a lot of files the patch is really simple. Here is the gist > of the changes: > > 1. Select LIBCRC32C rather than the low-level modules. > 2. s/btrfs_crc32c/crc32c/g > 3. replace hash.h with linux/crc32c.h > 4. Move the btrfs namehash funcs to ctree.h and change the tree accordingly. > > I've tested this with btrfs being both a module and a built-in and xfstest > doesn't complain. This text could be also part of the changelog, it's useful to understand how the change is done. So this patches looks good to me and does seem to fix the longstanding problem of not automatically selectiong the crc32c module when btrfs is used. IIRC this has some workaround in dracut. The modinfo confirms that now all the module dependencies are there: before: depends:zstd_compress,zstd_decompress,raid6_pq,xor,zlib_deflate after: depends: libcrc32c,zstd_compress,zstd_decompress,raid6_pq,xor,zlib_deflate -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] btrfs: Remove custom crc32c init code
On Mon, Jan 8, 2018 at 11:45 AM, Nikolay Borisov wrote: > The custom crc32 init code was introduced in > 14a958e678cd ("Btrfs: fix btrfs boot when compiled as built-in") to > enable using btrfs as a built-in. However, later as pointed out by > 60efa5eb2e88 ("Btrfs: use late_initcall instead of module_init") this > wasn't enough and finally btrfs was switched to late_initcall which > comes after the generic crc32c implementation is initiliased. The > latter commit superseeded the former. Now that we don't have to > maintain our own code let's just remove it and switch to using the > generic implementation. > fs/btrfs/hash.c| 54 > -- > fs/btrfs/hash.h| 43 IIRC Adding -D to git format-patch will make it shorter and nicer. But please, double check that git am actually detects removals. -- With Best Regards, Andy Shevchenko -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] btrfs: Remove custom crc32c init code
On Fri, Feb 02, 2018 at 09:46:40PM +0200, Andy Shevchenko wrote: > On Mon, Jan 8, 2018 at 11:45 AM, Nikolay Borisov wrote: > > The custom crc32 init code was introduced in > > 14a958e678cd ("Btrfs: fix btrfs boot when compiled as built-in") to > > enable using btrfs as a built-in. However, later as pointed out by > > 60efa5eb2e88 ("Btrfs: use late_initcall instead of module_init") this > > wasn't enough and finally btrfs was switched to late_initcall which > > comes after the generic crc32c implementation is initiliased. The > > latter commit superseeded the former. Now that we don't have to > > maintain our own code let's just remove it and switch to using the > > generic implementation. > > > fs/btrfs/hash.c| 54 > > -- > > fs/btrfs/hash.h| 43 > > IIRC Adding -D to git format-patch will make it shorter and nicer. > But please, double check that git am actually detects removals. While the patch looks better, my 'git am' does not want to apply the deletion: $ git am 0001-btrfs-Remove-custom-crc32c-init-code.patch Applying: btrfs: Remove custom crc32c init code error: removal patch leaves file contents error: fs/btrfs/hash.c: patch does not apply error: removal patch leaves file contents error: fs/btrfs/hash.h: patch does not apply Patch failed at 0001 btrfs: Remove custom crc32c init code The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". so the ordinary diff shall be preferred. -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html