diff options
author | Dongbo Cao <cdbdyx@163.com> | 2018-10-08 08:41:21 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2018-10-08 10:19:59 -0400 |
commit | 3a646fd77684dd5fbe20748bb04e12077bbecddc (patch) | |
tree | 50d9cfe4ec782133acf6154baa24b75a445688ff /drivers/md | |
parent | f6027bca9e382efc4d4f28a2d9678e0a07428363 (diff) |
bcache: panic fix for making cache device
when the nbuckets of cache device is smaller than 1024, making cache
device will trigger BUG_ON in kernel, add a condition to avoid this.
Reported-by: nitroxis <n@nxs.re>
Signed-off-by: Dongbo Cao <cdbdyx@163.com>
Signed-off-by: Coly Li <colyli@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/bcache/super.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index 4e89d6d4bbd6..7bbd670a5a84 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c | |||
@@ -2071,6 +2071,11 @@ static int cache_alloc(struct cache *ca) | |||
2071 | */ | 2071 | */ |
2072 | btree_buckets = ca->sb.njournal_buckets ?: 8; | 2072 | btree_buckets = ca->sb.njournal_buckets ?: 8; |
2073 | free = roundup_pow_of_two(ca->sb.nbuckets) >> 10; | 2073 | free = roundup_pow_of_two(ca->sb.nbuckets) >> 10; |
2074 | if (!free) { | ||
2075 | ret = -EPERM; | ||
2076 | err = "ca->sb.nbuckets is too small"; | ||
2077 | goto err_free; | ||
2078 | } | ||
2074 | 2079 | ||
2075 | if (!init_fifo(&ca->free[RESERVE_BTREE], btree_buckets, | 2080 | if (!init_fifo(&ca->free[RESERVE_BTREE], btree_buckets, |
2076 | GFP_KERNEL)) { | 2081 | GFP_KERNEL)) { |
@@ -2148,6 +2153,7 @@ err_movinggc_alloc: | |||
2148 | err_prio_alloc: | 2153 | err_prio_alloc: |
2149 | free_fifo(&ca->free[RESERVE_BTREE]); | 2154 | free_fifo(&ca->free[RESERVE_BTREE]); |
2150 | err_btree_alloc: | 2155 | err_btree_alloc: |
2156 | err_free: | ||
2151 | module_put(THIS_MODULE); | 2157 | module_put(THIS_MODULE); |
2152 | if (err) | 2158 | if (err) |
2153 | pr_notice("error %s: %s", ca->cache_dev_name, err); | 2159 | pr_notice("error %s: %s", ca->cache_dev_name, err); |
@@ -2177,6 +2183,8 @@ static int register_cache(struct cache_sb *sb, struct page *sb_page, | |||
2177 | blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL); | 2183 | blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL); |
2178 | if (ret == -ENOMEM) | 2184 | if (ret == -ENOMEM) |
2179 | err = "cache_alloc(): -ENOMEM"; | 2185 | err = "cache_alloc(): -ENOMEM"; |
2186 | else if (ret == -EPERM) | ||
2187 | err = "cache_alloc(): cache device is too small"; | ||
2180 | else | 2188 | else |
2181 | err = "cache_alloc(): unknown error"; | 2189 | err = "cache_alloc(): unknown error"; |
2182 | goto err; | 2190 | goto err; |