Message ID | 1459492512-31435-3-git-send-email-quwenruo@cn.fujitsu.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Wang,
[auto build test ERROR on btrfs/next]
[also build test ERROR on v4.6-rc1 next-20160401]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]
url: https://github.com/0day-ci/linux/commits/Qu-Wenruo/Btrfs-dedupe-framework/20160401-143937
base: https://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next
config: x86_64-rhel (attached as .config)
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
Note: the linux-review/Qu-Wenruo/Btrfs-dedupe-framework/20160401-143937 HEAD 0a445f5009c064ee1d3fc966e41bb75627594afe builds fine.
It only hurts bisectibility.
All errors (new ones prefixed by >>):
>> ERROR: "btrfs_dedupe_disable" [fs/btrfs/btrfs.ko] undefined!
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
On Fri, Apr 01, 2016 at 05:59:13PM +0800, kbuild test robot wrote: > Hi Wang, > > [auto build test ERROR on btrfs/next] > [also build test ERROR on v4.6-rc1 next-20160401] > [if your patch is applied to the wrong git tree, please drop us a note to help improving the system] > > url: https://github.com/0day-ci/linux/commits/Qu-Wenruo/Btrfs-dedupe-framework/20160401-143937 > base: https://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next > config: x86_64-rhel (attached as .config) > reproduce: > # save the attached .config to linux build tree > make ARCH=x86_64 > > Note: the linux-review/Qu-Wenruo/Btrfs-dedupe-framework/20160401-143937 HEAD 0a445f5009c064ee1d3fc966e41bb75627594afe builds fine. > It only hurts bisectibility. > > All errors (new ones prefixed by >>): > > >> ERROR: "btrfs_dedupe_disable" [fs/btrfs/btrfs.ko] undefined! > > --- > 0-DAY kernel test infrastructure Open Source Technology Center > https://lists.01.org/pipermail/kbuild-all Intel Corporation Please correct this, we need to be able to bisect a kernel without random patches breaking the build. --Mark -- Mark Fasheh -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Mark Fasheh wrote on 2016/05/10 17:00 -0700: > On Fri, Apr 01, 2016 at 05:59:13PM +0800, kbuild test robot wrote: >> Hi Wang, >> >> [auto build test ERROR on btrfs/next] >> [also build test ERROR on v4.6-rc1 next-20160401] >> [if your patch is applied to the wrong git tree, please drop us a note to help improving the system] >> >> url: https://github.com/0day-ci/linux/commits/Qu-Wenruo/Btrfs-dedupe-framework/20160401-143937 >> base: https://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git next >> config: x86_64-rhel (attached as .config) >> reproduce: >> # save the attached .config to linux build tree >> make ARCH=x86_64 >> >> Note: the linux-review/Qu-Wenruo/Btrfs-dedupe-framework/20160401-143937 HEAD 0a445f5009c064ee1d3fc966e41bb75627594afe builds fine. >> It only hurts bisectibility. >> >> All errors (new ones prefixed by >>): >> >>>> ERROR: "btrfs_dedupe_disable" [fs/btrfs/btrfs.ko] undefined! >> >> --- >> 0-DAY kernel test infrastructure Open Source Technology Center >> https://lists.01.org/pipermail/kbuild-all Intel Corporation > > Please correct this, we need to be able to bisect a kernel without random > patches breaking the build. > --Mark > > -- > Mark Fasheh > > The build bot is just using wrong branch. We're using integration-4.6, which is not in their build bot branching. Thanks, Qu -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Qu Wenruo wrote on 2016/05/11 08:21 +0800: > > > Mark Fasheh wrote on 2016/05/10 17:00 -0700: >> On Fri, Apr 01, 2016 at 05:59:13PM +0800, kbuild test robot wrote: >>> Hi Wang, >>> >>> [auto build test ERROR on btrfs/next] >>> [also build test ERROR on v4.6-rc1 next-20160401] >>> [if your patch is applied to the wrong git tree, please drop us a >>> note to help improving the system] >>> >>> url: >>> https://github.com/0day-ci/linux/commits/Qu-Wenruo/Btrfs-dedupe-framework/20160401-143937 >>> >>> base: >>> https://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git >>> next >>> config: x86_64-rhel (attached as .config) >>> reproduce: >>> # save the attached .config to linux build tree >>> make ARCH=x86_64 >>> >>> Note: the >>> linux-review/Qu-Wenruo/Btrfs-dedupe-framework/20160401-143937 HEAD >>> 0a445f5009c064ee1d3fc966e41bb75627594afe builds fine. >>> It only hurts bisectibility. >>> >>> All errors (new ones prefixed by >>): >>> >>>>> ERROR: "btrfs_dedupe_disable" [fs/btrfs/btrfs.ko] undefined! >>> >>> --- >>> 0-DAY kernel test infrastructure Open Source >>> Technology Center >>> https://lists.01.org/pipermail/kbuild-all Intel >>> Corporation >> >> Please correct this, we need to be able to bisect a kernel without random >> patches breaking the build. >> --Mark >> >> -- >> Mark Fasheh >> >> > The build bot is just using wrong branch. > > We're using integration-4.6, which is not in their build bot branching. > > Thanks, > Qu Oh, my fault, I just get confused it with old days when it uses wrong branch. Will fix it in v11 patchset. Thanks, Qu > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile index 128ce17..1b8c627 100644 --- a/fs/btrfs/Makefile +++ b/fs/btrfs/Makefile @@ -9,7 +9,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 \ 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 + uuid-tree.o props.o hash.o free-space-tree.o dedupe.o btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o diff --git a/fs/btrfs/dedupe.c b/fs/btrfs/dedupe.c new file mode 100644 index 0000000..2211588 --- /dev/null +++ b/fs/btrfs/dedupe.c @@ -0,0 +1,154 @@ +/* + * Copyright (C) 2016 Fujitsu. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License v2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 021110-1307, USA. + */ +#include "ctree.h" +#include "dedupe.h" +#include "btrfs_inode.h" +#include "transaction.h" +#include "delayed-ref.h" + +struct inmem_hash { + struct rb_node hash_node; + struct rb_node bytenr_node; + struct list_head lru_list; + + u64 bytenr; + u32 num_bytes; + + u8 hash[]; +}; + +static int init_dedupe_info(struct btrfs_dedupe_info **ret_info, u16 type, + u16 backend, u64 blocksize, u64 limit) +{ + struct btrfs_dedupe_info *dedupe_info; + + dedupe_info = kzalloc(sizeof(*dedupe_info), GFP_NOFS); + if (!dedupe_info) + return -ENOMEM; + + dedupe_info->hash_type = type; + dedupe_info->backend = backend; + dedupe_info->blocksize = blocksize; + dedupe_info->limit_nr = limit; + + /* only support SHA256 yet */ + dedupe_info->dedupe_driver = crypto_alloc_shash("sha256", 0, 0); + if (IS_ERR(dedupe_info->dedupe_driver)) { + int ret; + + ret = PTR_ERR(dedupe_info->dedupe_driver); + kfree(dedupe_info); + return ret; + } + + dedupe_info->hash_root = RB_ROOT; + dedupe_info->bytenr_root = RB_ROOT; + dedupe_info->current_nr = 0; + INIT_LIST_HEAD(&dedupe_info->lru_list); + mutex_init(&dedupe_info->lock); + + *ret_info = dedupe_info; + return 0; +} + +static int check_dedupe_parameter(struct btrfs_fs_info *fs_info, u16 hash_type, + u16 backend, u64 blocksize, u64 limit_nr, + u64 limit_mem, u64 *ret_limit) +{ + if (blocksize > BTRFS_DEDUPE_BLOCKSIZE_MAX || + blocksize < BTRFS_DEDUPE_BLOCKSIZE_MIN || + blocksize < fs_info->tree_root->sectorsize || + !is_power_of_2(blocksize)) + return -EINVAL; + /* + * For new backend and hash type, we return special return code + * as they can be easily expended. + */ + if (hash_type >= ARRAY_SIZE(btrfs_dedupe_sizes)) + return -EOPNOTSUPP; + if (backend >= BTRFS_DEDUPE_BACKEND_COUNT) + return -EOPNOTSUPP; + + /* Backend specific check */ + if (backend == BTRFS_DEDUPE_BACKEND_INMEMORY) { + if (!limit_nr && !limit_mem) + *ret_limit = BTRFS_DEDUPE_LIMIT_NR_DEFAULT; + else { + u64 tmp = (u64)-1; + + if (limit_mem) { + tmp = limit_mem / (sizeof(struct inmem_hash) + + btrfs_dedupe_hash_size(hash_type)); + /* Too small limit_mem to fill a hash item */ + if (!tmp) + return -EINVAL; + } + if (!limit_nr) + limit_nr = (u64)-1; + + *ret_limit = min(tmp, limit_nr); + } + } + if (backend == BTRFS_DEDUPE_BACKEND_ONDISK) + *ret_limit = 0; + return 0; +} + +int btrfs_dedupe_enable(struct btrfs_fs_info *fs_info, u16 type, u16 backend, + u64 blocksize, u64 limit_nr, u64 limit_mem) +{ + struct btrfs_dedupe_info *dedupe_info; + u64 limit = 0; + int ret = 0; + + /* only one limit is accepted for enable*/ + if (limit_nr && limit_mem) + return -EINVAL; + + ret = check_dedupe_parameter(fs_info, type, backend, blocksize, + limit_nr, limit_mem, &limit); + if (ret < 0) + return ret; + + dedupe_info = fs_info->dedupe_info; + if (dedupe_info) { + /* Check if we are re-enable for different dedupe config */ + if (dedupe_info->blocksize != blocksize || + dedupe_info->hash_type != type || + dedupe_info->backend != backend) { + btrfs_dedupe_disable(fs_info); + goto enable; + } + + /* On-fly limit change is OK */ + mutex_lock(&dedupe_info->lock); + fs_info->dedupe_info->limit_nr = limit; + mutex_unlock(&dedupe_info->lock); + return 0; + } + +enable: + ret = init_dedupe_info(&dedupe_info, type, backend, blocksize, limit); + if (ret < 0) + return ret; + fs_info->dedupe_info = dedupe_info; + /* We must ensure dedupe_enabled is modified after dedupe_info */ + smp_wmb(); + fs_info->dedupe_enabled = 1; + return ret; +} diff --git a/fs/btrfs/dedupe.h b/fs/btrfs/dedupe.h index 40f4808..e5d0d34 100644 --- a/fs/btrfs/dedupe.h +++ b/fs/btrfs/dedupe.h @@ -39,6 +39,9 @@ #define BTRFS_DEDUPE_BLOCKSIZE_MIN (16 * 1024) #define BTRFS_DEDUPE_BLOCKSIZE_DEFAULT (128 * 1024) +/* Default dedupe limit on number of hash */ +#define BTRFS_DEDUPE_LIMIT_NR_DEFAULT (32 * 1024) + /* Hash algorithm, only support SHA256 yet */ #define BTRFS_DEDUPE_HASH_SHA256 0 @@ -81,8 +84,17 @@ static inline int btrfs_dedupe_hash_hit(struct btrfs_dedupe_hash *hash) return (hash && hash->bytenr); } -int btrfs_dedupe_hash_size(u16 type); -struct btrfs_dedupe_hash *btrfs_dedupe_alloc_hash(u16 type); +static inline int btrfs_dedupe_hash_size(u16 type) +{ + if (WARN_ON(type >= ARRAY_SIZE(btrfs_dedupe_sizes))) + return -EINVAL; + return sizeof(struct btrfs_dedupe_hash) + btrfs_dedupe_sizes[type]; +} + +static inline struct btrfs_dedupe_hash *btrfs_dedupe_alloc_hash(u16 type) +{ + return kzalloc(btrfs_dedupe_hash_size(type), GFP_NOFS); +} /* * Initial inband dedupe info