From patchwork Fri Dec 13 04:09:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naohiro Aota X-Patchwork-Id: 11289861 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6D86F14DB for ; Fri, 13 Dec 2019 04:11:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 411082073B for ; Fri, 13 Dec 2019 04:11:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="HpZc94di" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732003AbfLMELT (ORCPT ); Thu, 12 Dec 2019 23:11:19 -0500 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:11924 "EHLO esa6.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731971AbfLMELS (ORCPT ); Thu, 12 Dec 2019 23:11:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1576210279; x=1607746279; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2f1KnAdryzEpvsmmQ2tYt34P/Jq9D6Z656c9K+/XHbQ=; b=HpZc94diZtF5CZYUzwFnKs71LPDoWskolvjKTP6Miy5irMFmpOsZEdu4 z0WYRBu/2yy0LiHHqx1UIE7i49U7dVrEAmppneZkDUyjIVqsTvpG0NSeE e48dsE/YK2QPbYpqmpCM3nlaSsOPeMsdEBJwW+owYIg3+iVgTElybiSIb tHiLnq6XLnj/eszqqg89pPfr/tOMpYJm1JO1n0ACXt6vab1Xza0KpiHSI 4OYAF/owMCrZyn37uNw6QBdg8WfBImKQmM4RYjv2a+22nW+06hcauvCp8 udiWf5NKoYdPK6h/LHR9Cj97C45ZGXmCqzednR9HVuBFcuVYr5mSFbXzX A==; IronPort-SDR: IswPuFSi9bEJSdbj1rig2AYM8jrU25ZmwVTmcWrkpn14HiTEhnoxnkE2Gmz2lsImYzBhC66Re5 2Mj0jdqE54liUsQmV26nZAMI5Qy14Oe6lAW2cenG8ZNNHg2ye4ocsQQgGiJS3fJmytEBN5YxUf Os5mnrRSIXmAqJ/Up74NNoB3W3/byMXGtzVgSUqKn3mHkTwfkkJx6NWdkx4phMhuL1GkIieS6Y MKkeCW5szfxfDMZRA9Tda+lEjpcn8e0Ow2sanT8TDBsAQRvYQk2t0SwMRQAya5aAdsBgNnIuKq CIA= X-IronPort-AV: E=Sophos;i="5.69,308,1571673600"; d="scan'208";a="126860148" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 13 Dec 2019 12:11:19 +0800 IronPort-SDR: Tuum0WBXjtbNia1kfvQyzbMvqv8yIYoKZZ4JZ2GDU8U2prXvpXrLgUjTMRA1O2LFDfw/vJ4sy8 5cNtfZksLQFT/EGJSHABIIBN8HnhPrBmZ4lF/AhAyOOy1I0sQhtL8hNDwO2Euyisoiuf21YNI3 hULpcrGB8+jNI+T2t4bK768CA/pO/QY3gGzVcwJNqEch7Cz4KI9VpliOpGpLEdVViqzCgVqIhb TDnPOqzUkT3YQojyvO45NghuwPik6Sd/3zkKp/BK9WGawlBJQO34CdWdAitssxWdLphTEvy3WV urK/buS9Sgri7G9pe3jkGVly Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2019 20:05:50 -0800 IronPort-SDR: 5rkzRzy73BH6awY1s1P9gsisVEN87XoV9PaZCnoDRu1iJCm6ln9UA8Kztcs0ea7GiJ09WR3GsH cLsEkjLHU7qEjOhdX34Y5ZjSNZrlp6ZjtS5L2v6Fh+DzNbPOM7q1c/+TU9AD6y/FMLpZP2oYpx ahQMCA4jtOxuev8qp2UsqNw+5DmzPl7UTpsNTsDdA7aGfQMKBK3MV2sm5/3eiSJpo/Gw7epK13 yaG5YpzVMHei/IWcVucVTWy3Nhv5u5iakz2Ev0ru3+MRrwp1sc8/d+ssbGlJCYW8aa0nKzwFKL g+w= WDCIronportException: Internal Received: from naota.dhcp.fujisawa.hgst.com (HELO naota.fujisawa.hgst.com) ([10.149.53.115]) by uls-op-cesaip02.wdc.com with ESMTP; 12 Dec 2019 20:11:16 -0800 From: Naohiro Aota To: linux-btrfs@vger.kernel.org, David Sterba Cc: Chris Mason , Josef Bacik , Nikolay Borisov , Damien Le Moal , Johannes Thumshirn , Hannes Reinecke , Anand Jain , linux-fsdevel@vger.kernel.org, Naohiro Aota Subject: [PATCH v6 18/28] btrfs: serialize meta IOs on HMZONED mode Date: Fri, 13 Dec 2019 13:09:05 +0900 Message-Id: <20191213040915.3502922-19-naohiro.aota@wdc.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191213040915.3502922-1-naohiro.aota@wdc.com> References: <20191213040915.3502922-1-naohiro.aota@wdc.com> MIME-Version: 1.0 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org As same as in data IO path, we must serialize write IOs for metadata. We cannot add mutex around allocation and submit because metadata blocks are allocated in an earlier stage to build up B-trees. Thus, this commit add hmzoned_meta_io_lock and hold it during metadata IO submission in btree_write_cache_pages() to serialize IOs. Furthermore, this commit add per-block group metadata IO submission pointer "meta_write_pointer" to ensure sequential writing, which can be caused when writing back blocks in a not finished transaction. Signed-off-by: Naohiro Aota --- fs/btrfs/block-group.h | 1 + fs/btrfs/ctree.h | 2 ++ fs/btrfs/disk-io.c | 1 + fs/btrfs/extent_io.c | 27 +++++++++++++++++++++- fs/btrfs/hmzoned.c | 52 ++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/hmzoned.h | 27 ++++++++++++++++++++++ 6 files changed, 109 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/block-group.h b/fs/btrfs/block-group.h index 57c8d6f4b3d1..8827869f1744 100644 --- a/fs/btrfs/block-group.h +++ b/fs/btrfs/block-group.h @@ -166,6 +166,7 @@ struct btrfs_block_group { */ u64 alloc_offset; struct mutex zone_io_lock; + u64 meta_write_pointer; }; #ifdef CONFIG_BTRFS_DEBUG diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 44517802b9e5..18d2d0581e68 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -905,6 +905,8 @@ struct btrfs_fs_info { spinlock_t ref_verify_lock; struct rb_root block_tree; #endif + + struct mutex hmzoned_meta_io_lock; }; static inline struct btrfs_fs_info *btrfs_sb(struct super_block *sb) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index fbbc313f9f46..4abadd9317d1 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2707,6 +2707,7 @@ int __cold open_ctree(struct super_block *sb, mutex_init(&fs_info->delete_unused_bgs_mutex); mutex_init(&fs_info->reloc_mutex); mutex_init(&fs_info->delalloc_root_mutex); + mutex_init(&fs_info->hmzoned_meta_io_lock); seqlock_init(&fs_info->profiles_lock); INIT_LIST_HEAD(&fs_info->dirty_cowonly_roots); diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 6e25c8790ef4..24f7b05e1f4c 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3921,7 +3921,9 @@ int btree_write_cache_pages(struct address_space *mapping, struct writeback_control *wbc) { struct extent_io_tree *tree = &BTRFS_I(mapping->host)->io_tree; + struct btrfs_fs_info *fs_info = tree->fs_info; struct extent_buffer *eb, *prev_eb = NULL; + struct btrfs_block_group *cache = NULL; struct extent_page_data epd = { .bio = NULL, .tree = tree, @@ -3951,6 +3953,7 @@ int btree_write_cache_pages(struct address_space *mapping, tag = PAGECACHE_TAG_TOWRITE; else tag = PAGECACHE_TAG_DIRTY; + btrfs_hmzoned_meta_io_lock(fs_info); retry: if (wbc->sync_mode == WB_SYNC_ALL) tag_pages_for_writeback(mapping, index, end); @@ -3994,12 +3997,30 @@ int btree_write_cache_pages(struct address_space *mapping, if (!ret) continue; + if (!btrfs_check_meta_write_pointer(fs_info, eb, + &cache)) { + /* + * If for_sync, this hole will be + * filled with trasnsaction commit. + */ + if (wbc->sync_mode == WB_SYNC_ALL && + !wbc->for_sync) + ret = -EAGAIN; + else + ret = 0; + done = 1; + free_extent_buffer(eb); + break; + } + prev_eb = eb; ret = lock_extent_buffer_for_io(eb, &epd); if (!ret) { + btrfs_revert_meta_write_pointer(cache, eb); free_extent_buffer(eb); continue; } else if (ret < 0) { + btrfs_revert_meta_write_pointer(cache, eb); done = 1; free_extent_buffer(eb); break; @@ -4032,12 +4053,16 @@ int btree_write_cache_pages(struct address_space *mapping, index = 0; goto retry; } + if (cache) + btrfs_put_block_group(cache); ASSERT(ret <= 0); if (ret < 0) { end_write_bio(&epd, ret); - return ret; + goto out; } ret = flush_write_bio(&epd); +out: + btrfs_hmzoned_meta_io_unlock(fs_info); return ret; } diff --git a/fs/btrfs/hmzoned.c b/fs/btrfs/hmzoned.c index 0c0ee9a46009..1aa4c9d1032e 100644 --- a/fs/btrfs/hmzoned.c +++ b/fs/btrfs/hmzoned.c @@ -1069,6 +1069,9 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache) } } + if (!ret) + cache->meta_write_pointer = cache->alloc_offset + cache->start; + kfree(alloc_offsets); free_extent_map(em); @@ -1171,3 +1174,52 @@ void btrfs_free_redirty_list(struct btrfs_transaction *trans) } spin_unlock(&trans->releasing_ebs_lock); } + +bool btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info, + struct extent_buffer *eb, + struct btrfs_block_group **cache_ret) +{ + struct btrfs_block_group *cache; + + if (!btrfs_fs_incompat(fs_info, HMZONED)) + return true; + + cache = *cache_ret; + + if (cache && + (eb->start < cache->start || + cache->start + cache->length <= eb->start)) { + btrfs_put_block_group(cache); + cache = NULL; + *cache_ret = NULL; + } + + if (!cache) + cache = btrfs_lookup_block_group(fs_info, + eb->start); + + if (cache) { + *cache_ret = cache; + + if (cache->meta_write_pointer != eb->start) { + btrfs_put_block_group(cache); + cache = NULL; + *cache_ret = NULL; + return false; + } + + cache->meta_write_pointer = eb->start + eb->len; + } + + return true; +} + +void btrfs_revert_meta_write_pointer(struct btrfs_block_group *cache, + struct extent_buffer *eb) +{ + if (!btrfs_fs_incompat(eb->fs_info, HMZONED) || !cache) + return; + + ASSERT(cache->meta_write_pointer == eb->start + eb->len); + cache->meta_write_pointer = eb->start; +} diff --git a/fs/btrfs/hmzoned.h b/fs/btrfs/hmzoned.h index f6682ead575b..54f1affa6919 100644 --- a/fs/btrfs/hmzoned.h +++ b/fs/btrfs/hmzoned.h @@ -50,6 +50,11 @@ void btrfs_redirty_list_add(struct btrfs_transaction *trans, struct extent_buffer *eb); void btrfs_free_redirty_list(struct btrfs_transaction *trans); void btrfs_hmzoned_data_io_unlock_at(struct inode *inode, u64 start, u64 len); +bool btrfs_check_meta_write_pointer(struct btrfs_fs_info *fs_info, + struct extent_buffer *eb, + struct btrfs_block_group **cache_ret); +void btrfs_revert_meta_write_pointer(struct btrfs_block_group *cache, + struct extent_buffer *eb); #else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone(struct btrfs_device *device, u64 pos, struct blk_zone *zone) @@ -120,6 +125,14 @@ static inline void btrfs_redirty_list_add(struct btrfs_transaction *trans, static inline void btrfs_free_redirty_list(struct btrfs_transaction *trans) { } static inline void btrfs_hmzoned_data_io_unlock_at(struct inode *inode, u64 start, u64 len) { } +static inline bool btrfs_check_meta_write_pointer( + struct btrfs_fs_info *fs_info, struct extent_buffer *eb, + struct btrfs_block_group **cache_ret) +{ + return true; +} +static inline void btrfs_revert_meta_write_pointer( + struct btrfs_block_group *cache, struct extent_buffer *eb) { } #endif static inline bool btrfs_dev_is_sequential(struct btrfs_device *device, u64 pos) @@ -254,4 +267,18 @@ static inline void btrfs_hmzoned_data_io_unlock_logical( btrfs_put_block_group(cache); } +static inline void btrfs_hmzoned_meta_io_lock(struct btrfs_fs_info *fs_info) +{ + if (!btrfs_fs_incompat(fs_info, HMZONED)) + return; + mutex_lock(&fs_info->hmzoned_meta_io_lock); +} + +static inline void btrfs_hmzoned_meta_io_unlock(struct btrfs_fs_info *fs_info) +{ + if (!btrfs_fs_incompat(fs_info, HMZONED)) + return; + mutex_unlock(&fs_info->hmzoned_meta_io_lock); +} + #endif