From patchwork Mon Aug 8 01:32:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 12938426 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAB52C25B0D for ; Mon, 8 Aug 2022 01:33:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242170AbiHHBdE (ORCPT ); Sun, 7 Aug 2022 21:33:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242063AbiHHBcR (ORCPT ); Sun, 7 Aug 2022 21:32:17 -0400 Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B6E9BC08; Sun, 7 Aug 2022 18:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1659922336; x=1691458336; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Li3AcQqvWPFS5yhQcZu3nuMYh+jjP936Zdb1cpbCddU=; b=ZQz+yso92ROMyh14U87mk4W5zn9qfnjHohmFtz57XDzM7T8ouCxSiijp H5fk9pJSwbrU2m1dNFA31Mo95ql1Bweg27ziLRAQ+UK3K2h1CkVAFW4vD UzrH0UzuX2HZ8zxjyBa2dhXqPHYjlJYSyCZZmMMQKSWP2w/4wkaAMA2Eg +6Sv2RZtGyZS4lxMzUvbZiD9r4GPEjL7lJKqg+qUO/+Zc3u+6AN6Kejbg vRLPrd+ITUg2sV7XVgKG9+2C6VNyZtOJPlWl7npVOr68kRRHIfu4jKgh7 IS0h6+v//ltgiqZgAqmsV5lvFnj++ubo27bS3hyG0O70lfMocXNHGGZ/B A==; X-IronPort-AV: E=Sophos;i="5.93,221,1654531200"; d="scan'208";a="320180305" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 08 Aug 2022 09:32:14 +0800 IronPort-SDR: phunDwEr8+AiEcsOLuyjdpaK6DLe37NL2rLW3iwfdKN9qrYMFTJOy80RgqxVjFxNvWX0OMVcUZ q2NabMnKf0nIiFDVerSMEXylCEB8c9r3/jkKxYq9r3qOtBdh64FUCn8boMLhWq0EVtlLwHAs2E xObUrDBU5PzxElrJXrNRHAv6nTijAn64yxfgPWOSCbvwKx70hfgspAO1BBlPi8xLlY1dCYBWVm h9cC3Y7IuJjtE0K+yZ8W+fihwCv/7dNw+tltPwtwBwtV5krRY6QfsvWIRuadTPC3uIA9NrVy/P hQdptdBhQc2EIFlOYL8dMSAT Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 07 Aug 2022 17:47:55 -0700 IronPort-SDR: nsZYxloROoHb/YqIZgO0xKuEW5YV0QOmQvmLQJkDs/c9+idnllZ5b+a2WvZV5UfVNgOMumRseM sXh8ukomG8k1d4E20IQWIW6WG+5LoCyevsm63taFhT4Bkukg9yitm08O1eCkEhIZmNKBhT63n5 DReWj3dRHYS0rRcScWtUAcjDLOHBz1jNoBYhu9Hqf/7pIxaL/TEQ9Sus096XIt9dJn5+AmQI1J Q2HM/iizXaKeEhd4RmbyBNN7GCoUOoRlYQM+Lf5fTWv/JLGe1AbSck5OXcpQzQPiYjVJ0j0ns8 Vog= WDCIronportException: Internal Received: from ctl002.ad.shared (HELO naota-xeon.wdc.com) ([10.225.53.129]) by uls-op-cesaip01.wdc.com with ESMTP; 07 Aug 2022 18:32:14 -0700 From: Naohiro Aota To: linux-btrfs@vger.kernel.org, stable@vger.kernel.org Cc: Naohiro Aota , David Sterba Subject: [PATCH STABLE 5.18 1/3] btrfs: zoned: prevent allocation from previous data relocation BG Date: Mon, 8 Aug 2022 10:32:08 +0900 Message-Id: <20220808013210.646680-2-naohiro.aota@wdc.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013210.646680-1-naohiro.aota@wdc.com> References: <20220808013210.646680-1-naohiro.aota@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org commit 343d8a30851c48a4ef0f5ef61d5e9fbd847a6883 upstream After commit 5f0addf7b890 ("btrfs: zoned: use dedicated lock for data relocation"), we observe IO errors on e.g, btrfs/232 like below. [09.0][T4038707] WARNING: CPU: 3 PID: 4038707 at fs/btrfs/extent-tree.c:2381 btrfs_cross_ref_exist+0xfc/0x120 [btrfs] [09.9][T4038707] Call Trace: [09.5][T4038707] [09.3][T4038707] run_delalloc_nocow+0x7f1/0x11a0 [btrfs] [09.6][T4038707] ? test_range_bit+0x174/0x320 [btrfs] [09.2][T4038707] ? fallback_to_cow+0x980/0x980 [btrfs] [09.3][T4038707] ? find_lock_delalloc_range+0x33e/0x3e0 [btrfs] [09.5][T4038707] btrfs_run_delalloc_range+0x445/0x1320 [btrfs] [09.2][T4038707] ? test_range_bit+0x320/0x320 [btrfs] [09.4][T4038707] ? lock_downgrade+0x6a0/0x6a0 [09.2][T4038707] ? orc_find.part.0+0x1ed/0x300 [09.5][T4038707] ? __module_address.part.0+0x25/0x300 [09.0][T4038707] writepage_delalloc+0x159/0x310 [btrfs] [09.4][ C3] sd 10:0:1:0: [sde] tag#2620 FAILED Result: hostbyte=DID_OK driverbyte=DRIVER_OK cmd_age=0s [09.5][ C3] sd 10:0:1:0: [sde] tag#2620 Sense Key : Illegal Request [current] [09.9][ C3] sd 10:0:1:0: [sde] tag#2620 Add. Sense: Unaligned write command [09.5][ C3] sd 10:0:1:0: [sde] tag#2620 CDB: Write(16) 8a 00 00 00 00 00 02 f3 63 87 00 00 00 2c 00 00 [09.4][ C3] critical target error, dev sde, sector 396041272 op 0x1:(WRITE) flags 0x800 phys_seg 3 prio class 0 [09.9][ C3] BTRFS error (device dm-1): bdev /dev/mapper/dml_102_2 errs: wr 1, rd 0, flush 0, corrupt 0, gen 0 The IO errors occur when we allocate a regular extent in previous data relocation block group. On zoned btrfs, we use a dedicated block group to relocate a data extent. Thus, we allocate relocating data extents (pre-alloc) only from the dedicated block group and vice versa. Once the free space in the dedicated block group gets tight, a relocating extent may not fit into the block group. In that case, we need to switch the dedicated block group to the next one. Then, the previous one is now freed up for allocating a regular extent. The BG is already not enough to allocate the relocating extent, but there is still room to allocate a smaller extent. Now the problem happens. By allocating a regular extent while nocow IOs for the relocation is still on-going, we will issue WRITE IOs (for relocation) and ZONE APPEND IOs (for the regular writes) at the same time. That mixed IOs confuses the write pointer and arises the unaligned write errors. This commit introduces a new bit 'zoned_data_reloc_ongoing' to the btrfs_block_group. We set this bit before releasing the dedicated block group, and no extent are allocated from a block group having this bit set. This bit is similar to setting block_group->ro, but is different from it by allowing nocow writes to start. Once all the nocow IO for relocation is done (hooked from btrfs_finish_ordered_io), we reset the bit to release the block group for further allocation. Fixes: c2707a255623 ("btrfs: zoned: add a dedicated data relocation block group") CC: stable@vger.kernel.org # 5.16+ Signed-off-by: Naohiro Aota Reviewed-by: David Sterba Signed-off-by: David Sterba --- fs/btrfs/block-group.h | 1 + fs/btrfs/extent-tree.c | 20 ++++++++++++++++++-- fs/btrfs/inode.c | 2 ++ fs/btrfs/zoned.c | 27 +++++++++++++++++++++++++++ fs/btrfs/zoned.h | 5 +++++ 5 files changed, 53 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h index 19db5693175f..2a0ead57db71 100644 --- a/fs/btrfs/block-group.h +++ b/fs/btrfs/block-group.h @@ -104,6 +104,7 @@ struct btrfs_block_group { unsigned int relocating_repair:1; unsigned int chunk_item_inserted:1; unsigned int zone_is_active:1; + unsigned int zoned_data_reloc_ongoing:1; int disk_cache_state; diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 6aa92f84f465..f45ecd939a2c 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -3836,7 +3836,7 @@ static int do_allocation_zoned(struct btrfs_block_group *block_group, block_group->start == fs_info->data_reloc_bg || fs_info->data_reloc_bg == 0); - if (block_group->ro) { + if (block_group->ro || block_group->zoned_data_reloc_ongoing) { ret = 1; goto out; } @@ -3898,8 +3898,24 @@ static int do_allocation_zoned(struct btrfs_block_group *block_group, out: if (ret && ffe_ctl->for_treelog) fs_info->treelog_bg = 0; - if (ret && ffe_ctl->for_data_reloc) + if (ret && ffe_ctl->for_data_reloc && + fs_info->data_reloc_bg == block_group->start) { + /* + * Do not allow further allocations from this block group. + * Compared to increasing the ->ro, setting the + * ->zoned_data_reloc_ongoing flag still allows nocow + * writers to come in. See btrfs_inc_nocow_writers(). + * + * We need to disable an allocation to avoid an allocation of + * regular (non-relocation data) extent. With mix of relocation + * extents and regular extents, we can dispatch WRITE commands + * (for relocation extents) and ZONE APPEND commands (for + * regular extents) at the same time to the same zone, which + * easily break the write pointer. + */ + block_group->zoned_data_reloc_ongoing = 1; fs_info->data_reloc_bg = 0; + } spin_unlock(&fs_info->relocation_bg_lock); spin_unlock(&fs_info->treelog_bg_lock); spin_unlock(&block_group->lock); diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 9ae79342631a..5d15e374d032 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3102,6 +3102,8 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent) ordered_extent->file_offset, ordered_extent->file_offset + logical_len); + btrfs_zoned_release_data_reloc_bg(fs_info, ordered_extent->disk_bytenr, + ordered_extent->disk_num_bytes); } else { BUG_ON(root == fs_info->tree_root); ret = insert_ordered_extent_file_extent(trans, ordered_extent); diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c index 5091d679a602..2c0851d94eff 100644 --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -2116,3 +2116,30 @@ void btrfs_free_zone_cache(struct btrfs_fs_info *fs_info) } mutex_unlock(&fs_devices->device_list_mutex); } + +void btrfs_zoned_release_data_reloc_bg(struct btrfs_fs_info *fs_info, u64 logical, + u64 length) +{ + struct btrfs_block_group *block_group; + + if (!btrfs_is_zoned(fs_info)) + return; + + block_group = btrfs_lookup_block_group(fs_info, logical); + /* It should be called on a previous data relocation block group. */ + ASSERT(block_group && (block_group->flags & BTRFS_BLOCK_GROUP_DATA)); + + spin_lock(&block_group->lock); + if (!block_group->zoned_data_reloc_ongoing) + goto out; + + /* All relocation extents are written. */ + if (block_group->start + block_group->alloc_offset == logical + length) { + /* Now, release this block group for further allocations. */ + block_group->zoned_data_reloc_ongoing = 0; + } + +out: + spin_unlock(&block_group->lock); + btrfs_put_block_group(block_group); +} diff --git a/fs/btrfs/zoned.h b/fs/btrfs/zoned.h index 2d898970aec5..cf6320feef46 100644 --- a/fs/btrfs/zoned.h +++ b/fs/btrfs/zoned.h @@ -80,6 +80,8 @@ void btrfs_schedule_zone_finish_bg(struct btrfs_block_group *bg, struct extent_buffer *eb); void btrfs_clear_data_reloc_bg(struct btrfs_block_group *bg); void btrfs_free_zone_cache(struct btrfs_fs_info *fs_info); +void btrfs_zoned_release_data_reloc_bg(struct btrfs_fs_info *fs_info, u64 logical, + u64 length); #else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos, struct blk_zone *zone) @@ -241,6 +243,9 @@ static inline void btrfs_schedule_zone_finish_bg(struct btrfs_block_group *bg, static inline void btrfs_clear_data_reloc_bg(struct btrfs_block_group *bg) { } static inline void btrfs_free_zone_cache(struct btrfs_fs_info *fs_info) { } + +static inline void btrfs_zoned_release_data_reloc_bg(struct btrfs_fs_info *fs_info, + u64 logical, u64 length) { } #endif static inline bool btrfs_dev_is_sequential(struct btrfs_device *device, u64 pos) From patchwork Mon Aug 8 01:32:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 12938425 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB8A4C25B0C for ; Mon, 8 Aug 2022 01:33:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242159AbiHHBc6 (ORCPT ); Sun, 7 Aug 2022 21:32:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242062AbiHHBcR (ORCPT ); Sun, 7 Aug 2022 21:32:17 -0400 Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA704B859; Sun, 7 Aug 2022 18:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1659922336; x=1691458336; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4iRH2Heg/YztVNHuPLG+Pi5cN1PMuYAJr1dtblZ5aQE=; b=B/yZbIFUf5Cqr+TxUea9Ft1QSSdeKwRtsohxcf+OwPTMUtoZGSgvgyYY 1/eeWFy+Cg9m+VvGzR+rchziT7U9kZBOZgygDb27urDoCQos0KXsYlDZb HzU3w5GpNjxBHNS+XAbFbmQv/qeaPpB7YL1MOd/XWsa6FxP5v63lCKKNV rBNj0yl7iF9Z2jFZDbLNRtrThyafLnnMBy3Wtj2P2ffJb9NN7+PQkdVWK b2TcfX1x5yP6D7+4wjnH5GnLCEnWdwaNzL7WEzYTbIy9vFXYnwemPjCQD nhkaBWdnTaRBprz0a7ypAhQcvd8nNFjXNWCzNc4X8W/vRJx6MlrhvZNMB Q==; X-IronPort-AV: E=Sophos;i="5.93,221,1654531200"; d="scan'208";a="320180306" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 08 Aug 2022 09:32:15 +0800 IronPort-SDR: nhUYnPGi6nijPjh/L/GzmPwXoay1EX3kgLHknyX/IcLAZxiu8xU3yOjGOcHLOso5M//Qb/1yRn c+Q9lvEn6JPJjU9yycqfsxbdaChVxAeybBDjQQMsf9Jn/mcLBF8l2Ze7h1246wSAHf+W7rYhQc iOtPv4Q2ZDGW9YRl5QnsB8UQzbaWWU2rG1nj1Akby6vNMS+KhtbZF5qxGw6C087c5PuIP9CXTN lg5qN2cTSpolxK4c/0WNYbhABilbjMqXtRfbWkGjX92TSrHW6LJR4Lj1/E5ibZptOgad6J40D4 QKUMZxkueGs7WMmuZX6Ddp2I Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 07 Aug 2022 17:47:56 -0700 IronPort-SDR: 5ugjVepvgjD4wh9FSoYFYexJJmjtGxMmeARorLemJybAnawW3QAQJhF4QJErqfsIk5Dnx0neZR f8ZopckzcbGItNWU+kWzSGZJLhtHU1e9ActiDhtbbfIvkNcQA4iB3J5JM9gdBkjCFAvnAOYvWe RGJ3w6TqWdWM8VYzYIkZog8tUwqi3VHkIZzrNLahQBwrsx5XuNScV/mbIAux2xmZ41Q9ToRFXo 3Wf65sKAlxnc6KPloPj84y+nHie6Z7D2/V5QFjJBhcQbQFpgAtWrh3fgY6rv1R3A6M0kgxLyRe 4UQ= WDCIronportException: Internal Received: from ctl002.ad.shared (HELO naota-xeon.wdc.com) ([10.225.53.129]) by uls-op-cesaip01.wdc.com with ESMTP; 07 Aug 2022 18:32:14 -0700 From: Naohiro Aota To: linux-btrfs@vger.kernel.org, stable@vger.kernel.org Cc: Naohiro Aota , Johannes Thumshirn , David Sterba Subject: [PATCH STABLE 5.18 2/3] btrfs: zoned: fix critical section of relocation inode writeback Date: Mon, 8 Aug 2022 10:32:09 +0900 Message-Id: <20220808013210.646680-3-naohiro.aota@wdc.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013210.646680-1-naohiro.aota@wdc.com> References: <20220808013210.646680-1-naohiro.aota@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org commit 19ab78ca86981e0e1e73036fb73a508731a7c078 upstream We use btrfs_zoned_data_reloc_{lock,unlock} to allow only one process to write out to the relocation inode. That critical section must include all the IO submission for the inode. However, flush_write_bio() in extent_writepages() is out of the critical section, causing an IO submission outside of the lock. This leads to an out of the order IO submission and fail the relocation process. Fix it by extending the critical section. Fixes: 35156d852762 ("btrfs: zoned: only allow one process to add pages to a relocation inode") CC: stable@vger.kernel.org # 5.16+ Reviewed-by: Johannes Thumshirn Signed-off-by: Naohiro Aota Signed-off-by: David Sterba --- fs/btrfs/extent_io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index a23a42ba88ca..68ddd90685d9 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -5214,13 +5214,14 @@ int extent_writepages(struct address_space *mapping, */ btrfs_zoned_data_reloc_lock(BTRFS_I(inode)); ret = extent_write_cache_pages(mapping, wbc, &epd); - btrfs_zoned_data_reloc_unlock(BTRFS_I(inode)); ASSERT(ret <= 0); if (ret < 0) { + btrfs_zoned_data_reloc_unlock(BTRFS_I(inode)); end_write_bio(&epd, ret); return ret; } ret = flush_write_bio(&epd); + btrfs_zoned_data_reloc_unlock(BTRFS_I(inode)); return ret; } From patchwork Mon Aug 8 01:32:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 12938427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAD87C3F6B0 for ; Mon, 8 Aug 2022 01:33:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242077AbiHHBdF (ORCPT ); Sun, 7 Aug 2022 21:33:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242068AbiHHBcS (ORCPT ); Sun, 7 Aug 2022 21:32:18 -0400 Received: from esa1.hgst.iphmx.com (esa1.hgst.iphmx.com [68.232.141.245]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD9E9BC2E; Sun, 7 Aug 2022 18:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1659922336; x=1691458336; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ePe/leNB1O/kP2sUpa4Iv//3RWITAIwumR1lD34h+8Q=; b=hkInb3H3pBFFJAIpuJ4jlHM2SAvG/I21c2IIkMxmlEokOJB9HZWQo7od iyeq3PmMjLJJc9wjJJMTkNw+V6xxYKhwb1v8NyMxHQTjVsDa1qCDsxp6P T9ktE99jbeU+41Y3THbJ9uH43WtaJxEXeP+l1cgXtuD+s49GyLUpp1tw7 YFDfk0gwLA2SXPxH6pcIZSMa7D5vgY1+K5Uo2k9IHe8UtfIpa/aDVFwT/ RXxBmMyLwbVTDO/Nfu8IuJ65p5X1Oq0qO7/84YN2/JloGBds375HOlyPm GiPYrSfoCOlBBphAZNXZxzsrVOwboAy7bTHgzfegvmgcAHzYNMjs/4Jvb w==; X-IronPort-AV: E=Sophos;i="5.93,221,1654531200"; d="scan'208";a="320180309" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 08 Aug 2022 09:32:16 +0800 IronPort-SDR: VLovlB3K8O2CZMDS9tp6wOjibBq1CRaRRY2rzPKlzWx8khFgn4SvDLd2isQ3I8Pe4CkU9BncTa 83sFbtS+Uzvk+0r3ke4IirDN/NczzrJuXha6wY3j6PcikgE1IkByJt+N3kZySnj5gqmvQIq2MZ f2JdN4mDuBP3s/VbnDb440Ll+DzVq+TifUWOGxxDXEWOJqJSuqiwSk282gr/73sRfJc+8qhFeT H4pZAcA6lVt3k0wEN+IbP+RMZc1JqXtzyEc2N6vxny/cFOgeYaaSg1E2YdOk+2lZBozbk36IGt wu25BCWbfHyxb01+VxflE+1m Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 07 Aug 2022 17:47:57 -0700 IronPort-SDR: IJwsZcwgR8a5mM6YI59J5YDKMaKH2cVGUAndHCAEWMbY0fiGqVZkV0nBaxgeowDzNxxjoqKyLN AvNW2ues3WBS03tHKx9zSwC9GYGwoN12tO0g03TplXIdyFKdpM6zcPfyaQTgNpzuIn0Jpf/Lnh f4MAWBQfz2QuYEddNSmy09pxUnEB+SAQnpmVgy5r7+Tug3DEIYeSFCjNZYvnRqib3UpoEbKehb KB1K8HrksaKd72Rt4sUiPbtK1+R1UiIUwl4ignM7O0pStzP3Be7+f8XQU4c5lsEbtxpG0hbT0X 8ww= WDCIronportException: Internal Received: from ctl002.ad.shared (HELO naota-xeon.wdc.com) ([10.225.53.129]) by uls-op-cesaip01.wdc.com with ESMTP; 07 Aug 2022 18:32:16 -0700 From: Naohiro Aota To: linux-btrfs@vger.kernel.org, stable@vger.kernel.org Cc: Naohiro Aota , Johannes Thumshirn , David Sterba Subject: [PATCH STABLE 5.18 3/3] btrfs: zoned: drop optimization of zone finish Date: Mon, 8 Aug 2022 10:32:10 +0900 Message-Id: <20220808013210.646680-4-naohiro.aota@wdc.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220808013210.646680-1-naohiro.aota@wdc.com> References: <20220808013210.646680-1-naohiro.aota@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org commit b3a3b0255797e1d395253366ba24a4cc6c8bdf9c upstream We have an optimization in do_zone_finish() to send REQ_OP_ZONE_FINISH only when necessary, i.e. we don't send REQ_OP_ZONE_FINISH when we assume we wrote fully into the zone. The assumption is determined by "alloc_offset == capacity". This condition won't work if the last ordered extent is canceled due to some errors. In that case, we consider the zone is deactivated without sending the finish command while it's still active. This inconstancy results in activating another block group while we cannot really activate the underlying zone, which causes the active zone exceeds errors like below. BTRFS error (device nvme3n2): allocation failed flags 1, wanted 520192 tree-log 0, relocation: 0 nvme3n2: I/O Cmd(0x7d) @ LBA 160432128, 127 blocks, I/O Error (sct 0x1 / sc 0xbd) MORE DNR active zones exceeded error, dev nvme3n2, sector 0 op 0xd:(ZONE_APPEND) flags 0x4800 phys_seg 1 prio class 0 nvme3n2: I/O Cmd(0x7d) @ LBA 160432128, 127 blocks, I/O Error (sct 0x1 / sc 0xbd) MORE DNR active zones exceeded error, dev nvme3n2, sector 0 op 0xd:(ZONE_APPEND) flags 0x4800 phys_seg 1 prio class 0 Fix the issue by removing the optimization for now. Fixes: 8376d9e1ed8f ("btrfs: zoned: finish superblock zone once no space left for new SB") Reviewed-by: Johannes Thumshirn Signed-off-by: Naohiro Aota Signed-off-by: David Sterba --- fs/btrfs/zoned.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c index 2c0851d94eff..b6b64da3422c 100644 --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -2039,13 +2039,25 @@ void btrfs_zone_finish_endio(struct btrfs_fs_info *fs_info, u64 logical, u64 len spin_unlock(&block_group->lock); map = block_group->physical_map; - device = map->stripes[0].dev; - physical = map->stripes[0].physical; + for (i = 0; i < map->num_stripes; i++) { + int ret; - if (!device->zone_info->max_active_zones) - goto out; + device = map->stripes[i].dev; + physical = map->stripes[i].physical; - btrfs_dev_clear_active_zone(device, physical); + if (device->zone_info->max_active_zones == 0) + continue; + + ret = blkdev_zone_mgmt(device->bdev, REQ_OP_ZONE_FINISH, + physical >> SECTOR_SHIFT, + device->zone_info->zone_size >> SECTOR_SHIFT, + GFP_NOFS); + + if (ret) + return; + + btrfs_dev_clear_active_zone(device, physical); + } spin_lock(&fs_info->zone_active_bgs_lock); ASSERT(!list_empty(&block_group->active_bg_list));