From: Hannes Reinecke <hare@suse.de>
To: Coly Li <colyli@suse.de>, linux-bcache@vger.kernel.org
Cc: linux-block@vger.kernel.org
Subject: Re: [PATCH v2 02/17] bcache: add read_super_basic() to read major part of super block
Date: Wed, 15 Jul 2020 08:03:57 +0200 [thread overview]
Message-ID: <07a49e09-5938-fed6-818e-0393acd1cbfe@suse.de> (raw)
In-Reply-To: <20200715054612.6349-3-colyli@suse.de>
On 7/15/20 7:45 AM, Coly Li wrote:
> Later patches will introduce feature set bits to on-disk super block and
> increase super block version. Current code in read_super() which reads
> basic part of super block for version BCACHE_SB_VERSION_CDEV and version
> BCACHE_SB_VERSION_CDEV_WITH_UUID will be shared with the new version.
>
> Therefore this patch moves the reusable part into read_super_basic(),
> this preparation patch will make later patches more simplier and only
> focus on new feature set bits.
>
> Signed-off-by: Coly Li <colyli@suse.de>
> ---
> drivers/md/bcache/super.c | 111 +++++++++++++++++++++-----------------
> 1 file changed, 63 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
> index 7aa1d6737f66..74681fb92158 100644
> --- a/drivers/md/bcache/super.c
> +++ b/drivers/md/bcache/super.c
> @@ -59,6 +59,67 @@ struct workqueue_struct *bch_journal_wq;
>
> /* Superblock */
>
> +static const char *read_super_basic(struct cache_sb *sb, struct block_device *bdev,
> + struct cache_sb_disk *s)
> +{
> + const char *err;
> + unsigned int i;
> +
> + sb->nbuckets = le64_to_cpu(s->nbuckets);
> + sb->bucket_size = le16_to_cpu(s->bucket_size);
> +
> + sb->nr_in_set = le16_to_cpu(s->nr_in_set);
> + sb->nr_this_dev = le16_to_cpu(s->nr_this_dev);
> +
> + err = "Too many buckets";
> + if (sb->nbuckets > LONG_MAX)
> + goto err;
> +
> + err = "Not enough buckets";
> + if (sb->nbuckets < 1 << 7)
> + goto err;
> +
> + err = "Bad block/bucket size";
> + if (!is_power_of_2(sb->block_size) ||
> + sb->block_size > PAGE_SECTORS ||
> + !is_power_of_2(sb->bucket_size) ||
> + sb->bucket_size < PAGE_SECTORS)
> + goto err;
> +
> + err = "Invalid superblock: device too small";
> + if (get_capacity(bdev->bd_disk) <
> + sb->bucket_size * sb->nbuckets)
> + goto err;
> +
> + err = "Bad UUID";
> + if (bch_is_zero(sb->set_uuid, 16))
> + goto err;
> +
> + err = "Bad cache device number in set";
> + if (!sb->nr_in_set ||
> + sb->nr_in_set <= sb->nr_this_dev ||
> + sb->nr_in_set > MAX_CACHES_PER_SET)
> + goto err;
> +
> + err = "Journal buckets not sequential";
> + for (i = 0; i < sb->keys; i++)
> + if (sb->d[i] != sb->first_bucket + i)
> + goto err;
> +
> + err = "Too many journal buckets";
> + if (sb->first_bucket + sb->keys > sb->nbuckets)
> + goto err;
> +
> + err = "Invalid superblock: first bucket comes before end of super";
> + if (sb->first_bucket * sb->bucket_size < 16)
> + goto err;
> +
> + err = NULL;
> +err:
> + return err;
> +}
> +
> +
> static const char *read_super(struct cache_sb *sb, struct block_device *bdev,
> struct cache_sb_disk **res)
> {
> @@ -133,55 +194,9 @@ static const char *read_super(struct cache_sb *sb, struct block_device *bdev,
> break;
> case BCACHE_SB_VERSION_CDEV:
> case BCACHE_SB_VERSION_CDEV_WITH_UUID:
> - sb->nbuckets = le64_to_cpu(s->nbuckets);
> - sb->bucket_size = le16_to_cpu(s->bucket_size);
> -
> - sb->nr_in_set = le16_to_cpu(s->nr_in_set);
> - sb->nr_this_dev = le16_to_cpu(s->nr_this_dev);
> -
> - err = "Too many buckets";
> - if (sb->nbuckets > LONG_MAX)
> - goto err;
> -
> - err = "Not enough buckets";
> - if (sb->nbuckets < 1 << 7)
> - goto err;
> -
> - err = "Bad block/bucket size";
> - if (!is_power_of_2(sb->block_size) ||
> - sb->block_size > PAGE_SECTORS ||
> - !is_power_of_2(sb->bucket_size) ||
> - sb->bucket_size < PAGE_SECTORS)
> - goto err;
> -
> - err = "Invalid superblock: device too small";
> - if (get_capacity(bdev->bd_disk) <
> - sb->bucket_size * sb->nbuckets)
> - goto err;
> -
> - err = "Bad UUID";
> - if (bch_is_zero(sb->set_uuid, 16))
> - goto err;
> -
> - err = "Bad cache device number in set";
> - if (!sb->nr_in_set ||
> - sb->nr_in_set <= sb->nr_this_dev ||
> - sb->nr_in_set > MAX_CACHES_PER_SET)
> - goto err;
> -
> - err = "Journal buckets not sequential";
> - for (i = 0; i < sb->keys; i++)
> - if (sb->d[i] != sb->first_bucket + i)
> - goto err;
> -
> - err = "Too many journal buckets";
> - if (sb->first_bucket + sb->keys > sb->nbuckets)
> - goto err;
> -
> - err = "Invalid superblock: first bucket comes before end of super";
> - if (sb->first_bucket * sb->bucket_size < 16)
> + err = read_super_basic(sb, bdev, s);
> + if (err)
> goto err;
> -
> break;
> default:
> err = "Unsupported superblock version";
>
read_super_common(), maybe?
'basic' sounds more like a degraded functionality...
Cheers,
Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
hare@suse.de +49 911 74053 688
SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg
HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
next prev parent reply other threads:[~2020-07-15 6:04 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 5:45 [PATCH v2 00/17] bcache: extend bucket size to 32bit width Coly Li
2020-07-15 5:45 ` [PATCH v2 01/17] bcache: add comments to mark member offset of struct cache_sb_disk Coly Li
2020-07-15 6:02 ` Hannes Reinecke
2020-07-15 9:03 ` Coly Li
2020-07-15 9:08 ` Johannes Thumshirn
2020-07-15 10:35 ` Coly Li
2020-07-15 5:45 ` [PATCH v2 02/17] bcache: add read_super_basic() to read major part of super block Coly Li
2020-07-15 6:03 ` Hannes Reinecke [this message]
2020-07-15 5:45 ` [PATCH v2 03/17] bcache: add more accurate error information in read_super_basic() Coly Li
2020-07-15 6:04 ` Hannes Reinecke
2020-07-15 5:45 ` [PATCH v2 04/17] bcache: disassemble the big if() checks in bch_cache_set_alloc() Coly Li
2020-07-15 6:08 ` Hannes Reinecke
2020-07-15 5:46 ` [PATCH v2 05/17] bcache: fix super block seq numbers comparision in register_cache_set() Coly Li
2020-07-15 6:10 ` Hannes Reinecke
2020-07-15 5:46 ` [PATCH v2 06/17] bcache: increase super block version for cache device and backing device Coly Li
2020-07-15 6:11 ` Hannes Reinecke
2020-07-15 5:46 ` [PATCH v2 07/17] bcache: move bucket related code into read_super_basic() Coly Li
2020-07-15 6:44 ` Hannes Reinecke
2020-07-15 5:46 ` [PATCH v2 08/17] bcache: struct cache_sb is only for in-memory super block now Coly Li
2020-07-15 6:45 ` Hannes Reinecke
2020-07-15 5:46 ` [PATCH v2 09/17] bcache: introduce meta_bucket_pages() related helper routines Coly Li
2020-07-15 5:46 ` [PATCH v2 10/17] bcache: handle c->uuids properly for bucket size > 8MB Coly Li
2020-07-15 5:46 ` [PATCH v2 11/17] bcache: handle cache prio_buckets and disk_buckets " Coly Li
2020-07-15 5:46 ` [PATCH v2 12/17] bcache: handle cache set verify_ondisk " Coly Li
2020-07-15 5:46 ` [PATCH v2 13/17] bcache: handle btree node memory allocation " Coly Li
2020-07-15 5:46 ` [PATCH v2 14/17] bcache: add bucket_size_hi into struct cache_sb_disk for large bucket Coly Li
2020-07-15 5:46 ` [PATCH v2 15/17] bcache: add sysfs file to display feature sets information of cache set Coly Li
2020-07-15 5:46 ` [PATCH v2 16/17] bcache: avoid extra memory allocation from mempool c->fill_iter Coly Li
2020-07-15 5:46 ` [PATCH v2 17/17] bcache: avoid extra memory consumption in struct bbio for large bucket size Coly Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=07a49e09-5938-fed6-818e-0393acd1cbfe@suse.de \
--to=hare@suse.de \
--cc=colyli@suse.de \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox