[11/12] btrfs: raid56: clear write-intent bimaps when a full stripe finishes.

Message ID	8f1942505029d94a66310dfd3b189c11f7044e94.1657171615.git.wqu@suse.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-btrfs-owner@kernel.org> From: Qu Wenruo <wqu@suse.com> To: linux-btrfs@vger.kernel.org Subject: [PATCH 11/12] btrfs: raid56: clear write-intent bimaps when a full stripe finishes. Date: Thu, 7 Jul 2022 13:32:36 +0800 Message-Id: <8f1942505029d94a66310dfd3b189c11f7044e94.1657171615.git.wqu@suse.com> In-Reply-To: <cover.1657171615.git.wqu@suse.com> References: <cover.1657171615.git.wqu@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	btrfs: introduce write-intent bitmaps for RAID56 \| expand [00/12] btrfs: introduce write-intent bitmaps for RAID56 [01/12] btrfs: introduce new compat RO flag, EXTRA_SUPER_RESERVED [02/12] btrfs: introduce a new experimental compat RO flag, WRITE_INTENT_BITMAP [03/12] btrfs: introduce the on-disk format of btrfs write intent bitmaps [04/12] btrfs: load/create write-intent bitmaps at mount time [05/12] btrfs: write-intent: write the newly created bitmaps to all disks [06/12] btrfs: write-intent: introduce an internal helper to set bits for a range. [07/12] btrfs: write-intent: introduce an internal helper to clear bits for a range. [08/12] btrfs: selftests: add selftests for write-intent bitmaps [09/12] btrfs: write back write intent bitmap after barrier_all_devices() [10/12] btrfs: update and writeback the write-intent bitmap for RAID56 write. [11/12] btrfs: raid56: clear write-intent bimaps when a full stripe finishes. [12/12] btrfs: warn and clear bitmaps if there is dirty bitmap at mount time

diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index 9f18d6f6f4dc..f2b0ea2315c5 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c @@ -817,6 +817,13 @@ static void rbio_orig_end_io(struct btrfs_raid_bio *rbio, blk_status_t err) if (rbio->generic_bio_cnt) btrfs_bio_counter_sub(rbio->bioc->fs_info, rbio->generic_bio_cnt); + + /* Clear the write-intent bitmap range for write operation. */ + if (rbio->operation == BTRFS_RBIO_WRITE) + btrfs_write_intent_clear_dirty(rbio->bioc->fs_info, + rbio->bioc->raid_map[0], + rbio->nr_data * BTRFS_STRIPE_LEN); + /* * Clear the data bitmap, as the rbio may be cached for later usage. * do this before before unlock_stripe() so there will be no new bio diff --git a/fs/btrfs/write-intent.c b/fs/btrfs/write-intent.c index 8520105d0d84..40d579574f3d 100644 --- a/fs/btrfs/write-intent.c +++ b/fs/btrfs/write-intent.c @@ -61,6 +61,7 @@ static int write_intent_writeback(struct btrfs_fs_info *fs_info) struct bitmap_writeback_contrl wb_ctrl = {0}; SHASH_DESC_ON_STACK(shash, fs_info->csum_shash); const int nr_devs_max = fs_info->fs_devices->open_devices + 4; + unsigned long flags; int nr_devs = 0; int total_errors = 0; int ret; @@ -75,13 +76,13 @@ static int write_intent_writeback(struct btrfs_fs_info *fs_info) shash->tfm = fs_info->csum_shash; - spin_lock(&ctrl->lock); + spin_lock_irqsave(&ctrl->lock, flags); /* No update on the bitmap, just skip this writeback. */ if (!memcmp(page_address(ctrl->page), page_address(ctrl->commit_page), WRITE_INTENT_BITMAPS_SIZE)) { ctrl->writing_event = 0; - spin_unlock(&ctrl->lock); + spin_unlock_irqrestore(&ctrl->lock, flags); wake_up(&ctrl->write_wait); return 0; } @@ -98,7 +99,7 @@ static int write_intent_writeback(struct btrfs_fs_info *fs_info) atomic64_inc(&ctrl->event); memcpy_page(ctrl->commit_page, 0, ctrl->page, 0, WRITE_INTENT_BITMAPS_SIZE); - spin_unlock(&ctrl->lock); + spin_unlock_irqrestore(&ctrl->lock, flags); init_waitqueue_head(&wb_ctrl.wait); atomic_set(&wb_ctrl.pending_bios, 0); @@ -136,11 +137,11 @@ static int write_intent_writeback(struct btrfs_fs_info *fs_info) } wait_event(wb_ctrl.wait, atomic_read(&wb_ctrl.pending_bios) == 0); - spin_lock(&ctrl->lock); + spin_lock_irqsave(&ctrl->lock, flags); if (ctrl->writing_event > ctrl->committed_event) ctrl->committed_event = ctrl->writing_event; ctrl->writing_event = 0; - spin_unlock(&ctrl->lock); + spin_unlock_irqrestore(&ctrl->lock, flags); wake_up(&ctrl->write_wait); if (total_errors + atomic_read(&wb_ctrl.errors) > @@ -648,6 +649,7 @@ void btrfs_write_intent_mark_dirty(struct btrfs_fs_info *fs_info, u64 logical, { struct write_intent_ctrl *ctrl = fs_info->wi_ctrl; struct write_intent_super *wis; + unsigned long flags; u32 entry_len; int nr_entries; @@ -658,7 +660,7 @@ void btrfs_write_intent_mark_dirty(struct btrfs_fs_info *fs_info, u64 logical, ASSERT(IS_ALIGNED(len, BTRFS_STRIPE_LEN)); again: - spin_lock(&ctrl->lock); + spin_lock_irqsave(&ctrl->lock, flags); entry_len = ctrl->blocksize * WRITE_INTENT_BITS_PER_ENTRY; nr_entries = (round_up(logical + len, entry_len) - round_down(logical, entry_len)) / entry_len; @@ -674,7 +676,7 @@ void btrfs_write_intent_mark_dirty(struct btrfs_fs_info *fs_info, u64 logical, prepare_to_wait_event(&ctrl->overflow_wait, &__wait, TASK_UNINTERRUPTIBLE); - spin_unlock(&ctrl->lock); + spin_unlock_irqrestore(&ctrl->lock, flags); schedule(); finish_wait(&ctrl->write_wait, &__wait); goto again; @@ -683,12 +685,29 @@ void btrfs_write_intent_mark_dirty(struct btrfs_fs_info *fs_info, u64 logical, /* Update the bitmap. */ write_intent_set_bits(ctrl, logical, len); *event_ret = atomic64_read(&ctrl->event); - spin_unlock(&ctrl->lock); + spin_unlock_irqrestore(&ctrl->lock, flags); +} + +void btrfs_write_intent_clear_dirty(struct btrfs_fs_info *fs_info, u64 logical, + u32 len) +{ + struct write_intent_ctrl *ctrl = fs_info->wi_ctrl; + unsigned long flags; + + if (!btrfs_fs_compat_ro(fs_info, WRITE_INTENT_BITMAP)) + return; + ASSERT(ctrl); + ASSERT(IS_ALIGNED(len, BTRFS_STRIPE_LEN)); + + spin_lock_irqsave(&ctrl->lock, flags); + write_intent_clear_bits(ctrl, logical, len); + spin_unlock_irqrestore(&ctrl->lock, flags); } int btrfs_write_intent_writeback(struct btrfs_fs_info *fs_info, u64 event) { struct write_intent_ctrl *ctrl = fs_info->wi_ctrl; + unsigned long flags; if (!btrfs_fs_compat_ro(fs_info, WRITE_INTENT_BITMAP)) return 0; @@ -696,14 +715,14 @@ int btrfs_write_intent_writeback(struct btrfs_fs_info *fs_info, u64 event) ASSERT(ctrl); again: - spin_lock(&ctrl->lock); + spin_lock_irqsave(&ctrl->lock, flags); /* * The bitmap has already been written to disk at least once. Our update * has already reached disk. */ if (event && ctrl->committed_event > event) { - spin_unlock(&ctrl->lock); + spin_unlock_irqrestore(&ctrl->lock, flags); return 0; } @@ -713,7 +732,7 @@ int btrfs_write_intent_writeback(struct btrfs_fs_info *fs_info, u64 event) prepare_to_wait_event(&ctrl->write_wait, &__wait, TASK_UNINTERRUPTIBLE); - spin_unlock(&ctrl->lock); + spin_unlock_irqrestore(&ctrl->lock, flags); schedule(); finish_wait(&ctrl->write_wait, &__wait); goto again; @@ -726,7 +745,7 @@ int btrfs_write_intent_writeback(struct btrfs_fs_info *fs_info, u64 event) ASSERT(ctrl->writing_event > event); prepare_to_wait_event(&ctrl->write_wait, &__wait, TASK_UNINTERRUPTIBLE); - spin_unlock(&ctrl->lock); + spin_unlock_irqrestore(&ctrl->lock, flags); schedule(); finish_wait(&ctrl->write_wait, &__wait); return 0; @@ -737,7 +756,7 @@ int btrfs_write_intent_writeback(struct btrfs_fs_info *fs_info, u64 event) * all the other caller will just wait for us. */ ctrl->writing_event = atomic64_read(&ctrl->event) + 1; - spin_unlock(&ctrl->lock); + spin_unlock_irqrestore(&ctrl->lock, flags); /* Slow path, do the submission and wait. */ return write_intent_writeback(fs_info); diff --git a/fs/btrfs/write-intent.h b/fs/btrfs/write-intent.h index e1e3a16f8929..872a707ef67d 100644 --- a/fs/btrfs/write-intent.h +++ b/fs/btrfs/write-intent.h @@ -284,4 +284,12 @@ int btrfs_write_intent_writeback(struct btrfs_fs_info *fs_info, u64 event); void btrfs_write_intent_mark_dirty(struct btrfs_fs_info *fs_info, u64 logical, u32 len, u64 *event_ret); +/* + * Clear the range dirty in write intent bitmaps. + * + * This function should not sleep, and no need to wait for the bitmap to be + * flushed. + */ +void btrfs_write_intent_clear_dirty(struct btrfs_fs_info *fs_info, u64 logical, + u32 len); #endif

[11/12] btrfs: raid56: clear write-intent bimaps when a full stripe finishes.

Commit Message

Patch