From: David Sterba <dsterba@suse.cz>
To: Qu Wenruo <wqu@suse.com>
Cc: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH v2 3/4] btrfs: introduce btrfs_subpage_bitmap_info
Date: Mon, 23 Aug 2021 18:41:30 +0200 [thread overview]
Message-ID: <20210823164130.GF5047@twin.jikos.cz> (raw)
In-Reply-To: <20210817093852.48126-4-wqu@suse.com>
On Tue, Aug 17, 2021 at 05:38:51PM +0800, Qu Wenruo wrote:
> Currently we use fixed size u16 bitmap for subpage bitmap.
> This is fine for 4K sectorsize with 64K page size.
>
> But for 4K sectorsize and larger page size, the bitmap is too small,
> while for smaller page size like 16K, u16 bitmaps waste too much space.
>
> Here we introduce a new helper structure, btrfs_subpage_bitmap_info, to
> record the proper bitmap size, and where each bitmap should start at.
>
> By this, we can later compact all subpage bitmaps into one u32 bitmap.
>
> This patch is the first step towards such compact bitmap.
>
> Signed-off-by: Qu Wenruo <wqu@suse.com>
> ---
> fs/btrfs/ctree.h | 1 +
> fs/btrfs/disk-io.c | 12 +++++++++---
> fs/btrfs/subpage.c | 35 +++++++++++++++++++++++++++++++++++
> fs/btrfs/subpage.h | 36 ++++++++++++++++++++++++++++++++++++
> 4 files changed, 81 insertions(+), 3 deletions(-)
>
> diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
> index f07c82fafa04..a5297748d719 100644
> --- a/fs/btrfs/ctree.h
> +++ b/fs/btrfs/ctree.h
> @@ -899,6 +899,7 @@ struct btrfs_fs_info {
> struct btrfs_workqueue *scrub_workers;
> struct btrfs_workqueue *scrub_wr_completion_workers;
> struct btrfs_workqueue *scrub_parity_workers;
> + struct btrfs_subpage_info *subpage_info;
>
> struct btrfs_discard_ctl discard_ctl;
>
> diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
> index 2f9515dccce0..3355708919d0 100644
> --- a/fs/btrfs/disk-io.c
> +++ b/fs/btrfs/disk-io.c
> @@ -1644,6 +1644,7 @@ void btrfs_free_fs_info(struct btrfs_fs_info *fs_info)
> btrfs_extent_buffer_leak_debug_check(fs_info);
> kfree(fs_info->super_copy);
> kfree(fs_info->super_for_commit);
> + kfree(fs_info->subpage_info);
> kvfree(fs_info);
> }
>
> @@ -3392,12 +3393,12 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device
> goto fail_alloc;
> }
>
> - if (sectorsize != PAGE_SIZE) {
> + if (sectorsize < PAGE_SIZE) {
> + struct btrfs_subpage_info *subpage_info;
> +
> btrfs_warn(fs_info,
> "read-write for sector size %u with page size %lu is experimental",
> sectorsize, PAGE_SIZE);
> - }
> - if (sectorsize != PAGE_SIZE) {
> if (btrfs_super_incompat_flags(fs_info->super_copy) &
> BTRFS_FEATURE_INCOMPAT_RAID56) {
> btrfs_err(fs_info,
> @@ -3406,6 +3407,11 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device
> err = -EINVAL;
> goto fail_alloc;
> }
> + subpage_info = kzalloc(sizeof(*subpage_info), GFP_NOFS);
> + if (!subpage_info)
> + goto fail_alloc;
> + btrfs_init_subpage_info(subpage_info, sectorsize);
> + fs_info->subpage_info = subpage_info;
> }
>
> ret = btrfs_init_workqueues(fs_info, fs_devices);
> diff --git a/fs/btrfs/subpage.c b/fs/btrfs/subpage.c
> index ae6c68370a95..c4fb2ce52207 100644
> --- a/fs/btrfs/subpage.c
> +++ b/fs/btrfs/subpage.c
> @@ -63,6 +63,41 @@
> * This means a slightly higher tree locking latency.
> */
>
> +void btrfs_init_subpage_info(struct btrfs_subpage_info *subpage_info,
> + u32 sectorsize)
> +{
> + unsigned int cur = 0;
> + unsigned int nr_bits;
> +
> + /*
> + * Just in case we have super large PAGE_SIZE that unsigned int is not
> + * enough to contain the number of sectors for the minimal sectorsize.
> + */
> + BUILD_BUG_ON(UINT_MAX * SZ_4K < PAGE_SIZE);
Do you seriously expect such hardware to exist? We know there are arches
with 256K page and that's perhaps the maximum we should care about now
but UINT_MAX * 4K is 16TiB, 2^44. CPUs are barely capable of addressing
2^40 physical address space, making assertions about page size orders of
magnitude larger than that is insane.
next prev parent reply other threads:[~2021-08-23 16:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-17 9:38 [PATCH v2 0/2] btrfs: subpage: pack all subpage bitmaps into a larger bitmap Qu Wenruo
2021-08-17 9:38 ` [PATCH v2 1/4] btrfs: only call btrfs_alloc_subpage() when sectorsize is smaller than PAGE_SIZE Qu Wenruo
2021-08-17 9:38 ` [PATCH v2 2/4] btrfs: make btrfs_alloc_subpage() to return struct btrfs_subpage * directly Qu Wenruo
2021-08-17 9:38 ` [PATCH v2 3/4] btrfs: introduce btrfs_subpage_bitmap_info Qu Wenruo
2021-08-17 10:11 ` Nikolay Borisov
2021-08-23 16:45 ` David Sterba
2021-08-30 14:28 ` Nikolay Borisov
2021-08-23 16:41 ` David Sterba [this message]
2021-08-23 23:15 ` Qu Wenruo
2021-08-17 9:38 ` [PATCH v2 4/4] btrfs: subpage: pack all subpage bitmaps into a larger bitmap Qu Wenruo
2021-08-17 13:43 ` Nikolay Borisov
2021-08-23 17:00 ` David Sterba
2021-08-23 16:57 ` David Sterba
2021-08-23 23:16 ` Qu Wenruo
2021-08-24 14:20 ` David Sterba
2021-08-17 13:44 ` [PATCH v2 0/2] " Nikolay Borisov
2021-08-23 17:05 ` David Sterba
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=20210823164130.GF5047@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=wqu@suse.com \
/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