From: Matthew Wilcox <matthew.r.wilcox@intel.com>
To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Cc: Jan Kara <jack@suse.cz>,
willy@linux.intel.com,
Matthew Wilcox <matthew.r.wilcox@intel.com>
Subject: [PATCH v9 20/22] ext4: Avoid lock inversion between i_mmap_mutex and transaction start
Date: Fri, 1 Aug 2014 09:27:36 -0400 [thread overview]
Message-ID: <b153961fec89926502fbe24c571a5dc2172d9a5e.1406897885.git.willy@linux.intel.com> (raw)
In-Reply-To: <cover.1406897885.git.willy@linux.intel.com>
In-Reply-To: <cover.1406897885.git.willy@linux.intel.com>
From: Jan Kara <jack@suse.cz>
When DAX is enabled, it uses i_mmap_mutex as a protection against
truncate during page fault. This inevitably forces i_mmap_mutex to rank
outside of a transaction start and thus we have to avoid calling
pagecache purging operations when transaction is started.
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
---
fs/ext4/inode.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 8a06473..494a864 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3631,13 +3631,19 @@ int ext4_punch_hole(struct inode *inode, loff_t offset, loff_t length)
if (IS_SYNC(inode))
ext4_handle_sync(handle);
- /* Now release the pages again to reduce race window */
+ inode->i_mtime = inode->i_ctime = ext4_current_time(inode);
+ ext4_mark_inode_dirty(handle, inode);
+ ext4_journal_stop(handle);
+
+ /*
+ * Now release the pages again to reduce race window. This has to happen
+ * outside of a transaction to avoid lock inversion on i_mmap_mutex
+ * when DAX is enabled.
+ */
if (last_block_offset > first_block_offset)
truncate_pagecache_range(inode, first_block_offset,
last_block_offset);
-
- inode->i_mtime = inode->i_ctime = ext4_current_time(inode);
- ext4_mark_inode_dirty(handle, inode);
+ goto out_dio;
out_stop:
ext4_journal_stop(handle);
out_dio:
--
2.0.1
--
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:[~2014-08-01 13:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-01 13:27 [PATCH v9 00/22] Support ext4 on NV-DIMMs Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 01/22] axonram: Fix bug in direct_access Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 02/22] Change direct_access calling convention Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 03/22] Fix XIP fault vs truncate race Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 04/22] Allow page fault handlers to perform the COW Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 05/22] Introduce IS_DAX(inode) Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 06/22] Add copy_to_iter(), copy_from_iter() and iov_iter_zero() Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 07/22] Replace XIP read and write with DAX I/O Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 08/22] Replace ext2_clear_xip_target with dax_clear_blocks Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 09/22] Replace the XIP page fault handler with the DAX page fault handler Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 10/22] Replace xip_truncate_page with dax_truncate_page Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 11/22] Replace XIP documentation with DAX documentation Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 12/22] Remove get_xip_mem Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 13/22] ext2: Remove ext2_xip_verify_sb() Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 14/22] ext2: Remove ext2_use_xip Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 15/22] ext2: Remove xip.c and xip.h Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 16/22] Remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAX Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 17/22] ext2: Remove ext2_aops_xip Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 18/22] Get rid of most mentions of XIP in ext2 Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 19/22] xip: Add xip_zero_page_range Matthew Wilcox
2014-08-01 13:27 ` Matthew Wilcox [this message]
2014-08-01 13:27 ` [PATCH v9 21/22] ext4: Add DAX functionality Matthew Wilcox
2014-08-01 13:27 ` [PATCH v9 22/22] brd: Rename XIP to DAX Matthew Wilcox
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=b153961fec89926502fbe24c571a5dc2172d9a5e.1406897885.git.willy@linux.intel.com \
--to=matthew.r.wilcox@intel.com \
--cc=jack@suse.cz \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=willy@linux.intel.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