From: Jan Kara <jack@suse.cz> To: linux-fsdevel@vger.kernel.org Cc: Jan Kara <jack@suse.cz>, linux-nvdimm@lists.01.org, linux-mm@kvack.org, linux-ext4@vger.kernel.org Subject: [PATCH 01/18] ext4: Handle transient ENOSPC properly for DAX Date: Mon, 18 Apr 2016 23:35:24 +0200 [thread overview] Message-ID: <1461015341-20153-2-git-send-email-jack@suse.cz> (raw) In-Reply-To: <1461015341-20153-1-git-send-email-jack@suse.cz> ext4_dax_get_blocks() was accidentally omitted fixing get blocks handlers to properly handle transient ENOSPC errors. Fix it now to use ext4_get_blocks_trans() helper which takes care of these errors. Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ext4/inode.c | 75 +++++++++++++++------------------------------------------ 1 file changed, 20 insertions(+), 55 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 981a1fc30eaa..3e0c06028668 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3218,72 +3218,37 @@ static int ext4_releasepage(struct page *page, gfp_t wait) int ext4_dax_mmap_get_block(struct inode *inode, sector_t iblock, struct buffer_head *bh_result, int create) { - int ret, err; - int credits; - struct ext4_map_blocks map; - handle_t *handle = NULL; - int flags = 0; + int ret; ext4_debug("ext4_dax_mmap_get_block: inode %lu, create flag %d\n", inode->i_ino, create); - map.m_lblk = iblock; - map.m_len = bh_result->b_size >> inode->i_blkbits; - credits = ext4_chunk_trans_blocks(inode, map.m_len); - if (create) { - flags |= EXT4_GET_BLOCKS_PRE_IO | EXT4_GET_BLOCKS_CREATE_ZERO; - handle = ext4_journal_start(inode, EXT4_HT_MAP_BLOCKS, credits); - if (IS_ERR(handle)) { - ret = PTR_ERR(handle); - return ret; - } - } + if (!create) + return _ext4_get_block(inode, iblock, bh_result, 0); - ret = ext4_map_blocks(handle, inode, &map, flags); - if (create) { - err = ext4_journal_stop(handle); - if (ret >= 0 && err < 0) - ret = err; - } - if (ret <= 0) - goto out; - if (map.m_flags & EXT4_MAP_UNWRITTEN) { - int err2; + ret = ext4_get_block_trans(inode, iblock, bh_result, + EXT4_GET_BLOCKS_PRE_IO | + EXT4_GET_BLOCKS_CREATE_ZERO); + if (ret < 0) + return ret; + if (buffer_unwritten(bh_result)) { /* * We are protected by i_mmap_sem so we know block cannot go * away from under us even though we dropped i_data_sem. * Convert extent to written and write zeros there. - * - * Note: We may get here even when create == 0. */ - handle = ext4_journal_start(inode, EXT4_HT_MAP_BLOCKS, credits); - if (IS_ERR(handle)) { - ret = PTR_ERR(handle); - goto out; - } - - err = ext4_map_blocks(handle, inode, &map, - EXT4_GET_BLOCKS_CONVERT | EXT4_GET_BLOCKS_CREATE_ZERO); - if (err < 0) - ret = err; - err2 = ext4_journal_stop(handle); - if (err2 < 0 && ret > 0) - ret = err2; - } -out: - WARN_ON_ONCE(ret == 0 && create); - if (ret > 0) { - map_bh(bh_result, inode->i_sb, map.m_pblk); - /* - * At least for now we have to clear BH_New so that DAX code - * doesn't attempt to zero blocks again in a racy way. - */ - map.m_flags &= ~EXT4_MAP_NEW; - ext4_update_bh_state(bh_result, map.m_flags); - bh_result->b_size = map.m_len << inode->i_blkbits; - ret = 0; + ret = ext4_get_block_trans(inode, iblock, bh_result, + EXT4_GET_BLOCKS_CONVERT | + EXT4_GET_BLOCKS_CREATE_ZERO); + if (ret < 0) + return ret; } - return ret; + /* + * At least for now we have to clear BH_New so that DAX code + * doesn't attempt to zero blocks again in a racy way. + */ + clear_buffer_new(bh_result); + return 0; } #endif -- 2.6.6 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: linux-fsdevel@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-mm@kvack.org, Ross Zwisler <ross.zwisler@linux.intel.com>, Dan Williams <dan.j.williams@intel.com>, linux-nvdimm@lists.01.org, Matthew Wilcox <willy@linux.intel.com>, Jan Kara <jack@suse.cz> Subject: [PATCH 01/18] ext4: Handle transient ENOSPC properly for DAX Date: Mon, 18 Apr 2016 23:35:24 +0200 [thread overview] Message-ID: <1461015341-20153-2-git-send-email-jack@suse.cz> (raw) In-Reply-To: <1461015341-20153-1-git-send-email-jack@suse.cz> ext4_dax_get_blocks() was accidentally omitted fixing get blocks handlers to properly handle transient ENOSPC errors. Fix it now to use ext4_get_blocks_trans() helper which takes care of these errors. Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ext4/inode.c | 75 +++++++++++++++------------------------------------------ 1 file changed, 20 insertions(+), 55 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 981a1fc30eaa..3e0c06028668 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3218,72 +3218,37 @@ static int ext4_releasepage(struct page *page, gfp_t wait) int ext4_dax_mmap_get_block(struct inode *inode, sector_t iblock, struct buffer_head *bh_result, int create) { - int ret, err; - int credits; - struct ext4_map_blocks map; - handle_t *handle = NULL; - int flags = 0; + int ret; ext4_debug("ext4_dax_mmap_get_block: inode %lu, create flag %d\n", inode->i_ino, create); - map.m_lblk = iblock; - map.m_len = bh_result->b_size >> inode->i_blkbits; - credits = ext4_chunk_trans_blocks(inode, map.m_len); - if (create) { - flags |= EXT4_GET_BLOCKS_PRE_IO | EXT4_GET_BLOCKS_CREATE_ZERO; - handle = ext4_journal_start(inode, EXT4_HT_MAP_BLOCKS, credits); - if (IS_ERR(handle)) { - ret = PTR_ERR(handle); - return ret; - } - } + if (!create) + return _ext4_get_block(inode, iblock, bh_result, 0); - ret = ext4_map_blocks(handle, inode, &map, flags); - if (create) { - err = ext4_journal_stop(handle); - if (ret >= 0 && err < 0) - ret = err; - } - if (ret <= 0) - goto out; - if (map.m_flags & EXT4_MAP_UNWRITTEN) { - int err2; + ret = ext4_get_block_trans(inode, iblock, bh_result, + EXT4_GET_BLOCKS_PRE_IO | + EXT4_GET_BLOCKS_CREATE_ZERO); + if (ret < 0) + return ret; + if (buffer_unwritten(bh_result)) { /* * We are protected by i_mmap_sem so we know block cannot go * away from under us even though we dropped i_data_sem. * Convert extent to written and write zeros there. - * - * Note: We may get here even when create == 0. */ - handle = ext4_journal_start(inode, EXT4_HT_MAP_BLOCKS, credits); - if (IS_ERR(handle)) { - ret = PTR_ERR(handle); - goto out; - } - - err = ext4_map_blocks(handle, inode, &map, - EXT4_GET_BLOCKS_CONVERT | EXT4_GET_BLOCKS_CREATE_ZERO); - if (err < 0) - ret = err; - err2 = ext4_journal_stop(handle); - if (err2 < 0 && ret > 0) - ret = err2; - } -out: - WARN_ON_ONCE(ret == 0 && create); - if (ret > 0) { - map_bh(bh_result, inode->i_sb, map.m_pblk); - /* - * At least for now we have to clear BH_New so that DAX code - * doesn't attempt to zero blocks again in a racy way. - */ - map.m_flags &= ~EXT4_MAP_NEW; - ext4_update_bh_state(bh_result, map.m_flags); - bh_result->b_size = map.m_len << inode->i_blkbits; - ret = 0; + ret = ext4_get_block_trans(inode, iblock, bh_result, + EXT4_GET_BLOCKS_CONVERT | + EXT4_GET_BLOCKS_CREATE_ZERO); + if (ret < 0) + return ret; } - return ret; + /* + * At least for now we have to clear BH_New so that DAX code + * doesn't attempt to zero blocks again in a racy way. + */ + clear_buffer_new(bh_result); + return 0; } #endif -- 2.6.6 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-04-18 21:35 UTC|newest] Thread overview: 122+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-04-18 21:35 [RFC v3] [PATCH 0/18] DAX page fault locking Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara [this message] 2016-04-18 21:35 ` [PATCH 01/18] ext4: Handle transient ENOSPC properly for DAX Jan Kara 2016-04-18 21:35 ` [PATCH 02/18] ext4: Fix race in transient ENOSPC detection Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` [PATCH 03/18] DAX: move RADIX_DAX_ definitions to dax.c Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` [PATCH 04/18] dax: Remove complete_unwritten argument Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` [PATCH 05/18] ext2: Avoid DAX zeroing to corrupt data Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 16:30 ` Ross Zwisler 2016-04-29 16:30 ` Ross Zwisler 2016-04-29 16:30 ` Ross Zwisler 2016-04-18 21:35 ` [PATCH 06/18] dax: Remove dead zeroing code from fault handlers Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 16:48 ` Ross Zwisler 2016-04-18 21:35 ` [PATCH 07/18] ext4: Refactor direct IO code Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` [PATCH 08/18] ext4: Pre-zero allocated blocks for DAX IO Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 18:01 ` Ross Zwisler 2016-04-29 18:01 ` Ross Zwisler 2016-04-29 18:01 ` Ross Zwisler 2016-05-02 13:09 ` Jan Kara 2016-05-02 13:09 ` Jan Kara 2016-04-18 21:35 ` [PATCH 09/18] dax: Remove zeroing from dax_io() Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 18:56 ` Ross Zwisler 2016-04-29 18:56 ` Ross Zwisler 2016-04-18 21:35 ` [PATCH 10/18] dax: Remove pointless writeback from dax_do_io() Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 19:00 ` Ross Zwisler 2016-04-29 19:00 ` Ross Zwisler 2016-04-29 19:00 ` Ross Zwisler 2016-04-18 21:35 ` [PATCH 11/18] dax: Fix condition for filling of PMD holes Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 19:08 ` Ross Zwisler 2016-04-29 19:08 ` Ross Zwisler 2016-04-29 19:08 ` Ross Zwisler 2016-05-02 13:16 ` Jan Kara 2016-05-02 13:16 ` Jan Kara 2016-04-18 21:35 ` [PATCH 12/18] dax: Remove redundant inode size checks Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` [PATCH 13/18] dax: Make huge page handling depend of CONFIG_BROKEN Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 19:53 ` Ross Zwisler 2016-04-29 19:53 ` Ross Zwisler 2016-05-02 13:19 ` Jan Kara 2016-05-02 13:19 ` Jan Kara 2016-05-02 13:19 ` Jan Kara 2016-04-18 21:35 ` [PATCH 14/18] dax: Define DAX lock bit for radix tree exceptional entry Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 20:03 ` Ross Zwisler 2016-04-29 20:03 ` Ross Zwisler 2016-04-29 20:03 ` Ross Zwisler 2016-04-18 21:35 ` [PATCH 15/18] dax: Allow DAX code to replace exceptional entries Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-29 20:29 ` Ross Zwisler 2016-04-29 20:29 ` Ross Zwisler 2016-04-18 21:35 ` [PATCH 16/18] dax: New fault locking Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-27 4:27 ` NeilBrown 2016-04-27 4:27 ` NeilBrown 2016-05-06 4:13 ` Ross Zwisler 2016-05-06 4:13 ` Ross Zwisler 2016-05-06 4:13 ` Ross Zwisler 2016-05-10 12:27 ` Jan Kara 2016-05-10 12:27 ` Jan Kara 2016-05-11 19:26 ` Ross Zwisler 2016-05-11 19:26 ` Ross Zwisler 2016-05-12 7:58 ` Jan Kara 2016-05-12 7:58 ` Jan Kara 2016-04-18 21:35 ` [PATCH 17/18] dax: Use radix tree entry lock to protect cow faults Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-19 11:46 ` Jerome Glisse 2016-04-19 11:46 ` Jerome Glisse 2016-04-19 11:46 ` Jerome Glisse 2016-04-19 14:33 ` Jan Kara 2016-04-19 14:33 ` Jan Kara 2016-04-19 14:33 ` Jan Kara 2016-04-19 15:19 ` Jerome Glisse 2016-04-19 15:19 ` Jerome Glisse 2016-04-19 15:19 ` Jerome Glisse 2016-04-19 15:19 ` Jerome Glisse 2016-04-18 21:35 ` [PATCH 18/18] dax: Remove i_mmap_lock protection Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-04-18 21:35 ` Jan Kara 2016-05-06 3:35 ` [RFC v3] [PATCH 0/18] DAX page fault locking Ross Zwisler 2016-05-06 3:35 ` Ross Zwisler 2016-05-06 20:33 ` Ross Zwisler 2016-05-06 20:33 ` Ross Zwisler 2016-05-09 9:38 ` Jan Kara 2016-05-09 9:38 ` Jan Kara 2016-05-09 9:38 ` Jan Kara 2016-05-10 15:28 ` Jan Kara 2016-05-10 15:28 ` Jan Kara 2016-05-10 15:28 ` Jan Kara 2016-05-10 20:30 ` Ross Zwisler 2016-05-10 20:30 ` Ross Zwisler 2016-05-10 20:30 ` Ross Zwisler 2016-05-10 22:39 ` Ross Zwisler 2016-05-10 22:39 ` Ross Zwisler 2016-05-11 9:19 ` Jan Kara 2016-05-11 9:19 ` Jan Kara 2016-05-11 9:19 ` Jan Kara 2016-05-11 15:52 ` Ross Zwisler 2016-05-11 15:52 ` Ross Zwisler 2016-05-11 15:52 ` Ross Zwisler 2016-05-09 21:28 ` Verma, Vishal L 2016-05-10 11:52 ` Jan Kara 2016-05-10 11:52 ` Jan Kara
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=1461015341-20153-2-git-send-email-jack@suse.cz \ --to=jack@suse.cz \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nvdimm@lists.01.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.