From: Jan Kara <jack@suse.cz> To: LKML <linux-kernel@vger.kernel.org> Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Jan Kara <jack@suse.cz> Subject: [PATCH 3/6] fs: Provide function to take mapping lock in buffered write path Date: Thu, 31 Jan 2013 22:49:51 +0100 [thread overview] Message-ID: <1359668994-13433-4-git-send-email-jack@suse.cz> (raw) In-Reply-To: <1359668994-13433-1-git-send-email-jack@suse.cz> Add a flag to grab_cache_page_write_begin() which makes the function grab mapping range lock while creating the page in page cache. Callers that don't need special lock ordering for the mapping range lock (e.g. xfs) can use this flag. Signed-off-by: Jan Kara <jack@suse.cz> --- include/linux/fs.h | 2 ++ mm/filemap.c | 7 +++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 2027d25..1e0a1e4 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -281,6 +281,8 @@ enum positive_aop_returns { #define AOP_FLAG_NOFS 0x0004 /* used by filesystem to direct * helper code (eg buffer layer) * to clear GFP_FS from alloc */ +#define AOP_FLAG_LOCK_MAPPING 0x0008 /* Lock mapping range where + * page is create */ /* * oh the beauties of C type declarations. diff --git a/mm/filemap.c b/mm/filemap.c index 4826cb4..f4a9e9a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2266,6 +2266,7 @@ struct page *grab_cache_page_write_begin(struct address_space *mapping, gfp_t gfp_mask; struct page *page; gfp_t gfp_notmask = 0; + struct range_lock mapping_lock; gfp_mask = mapping_gfp_mask(mapping); if (mapping_cap_account_dirty(mapping)) @@ -2280,8 +2281,14 @@ repeat: page = __page_cache_alloc(gfp_mask & ~gfp_notmask); if (!page) return NULL; + if (flags & AOP_FLAG_LOCK_MAPPING) { + range_lock_init(&mapping_lock, index, index); + range_lock(&mapping->mapping_lock, &mapping_lock); + } status = add_to_page_cache_lru(page, mapping, index, GFP_KERNEL & ~gfp_notmask); + if (flags & AOP_FLAG_LOCK_MAPPING) + range_unlock(&mapping->mapping_lock, &mapping_lock); if (unlikely(status)) { page_cache_release(page); if (status == -EEXIST) -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kara <jack@suse.cz> To: LKML <linux-kernel@vger.kernel.org> Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Jan Kara <jack@suse.cz> Subject: [PATCH 3/6] fs: Provide function to take mapping lock in buffered write path Date: Thu, 31 Jan 2013 22:49:51 +0100 [thread overview] Message-ID: <1359668994-13433-4-git-send-email-jack@suse.cz> (raw) In-Reply-To: <1359668994-13433-1-git-send-email-jack@suse.cz> Add a flag to grab_cache_page_write_begin() which makes the function grab mapping range lock while creating the page in page cache. Callers that don't need special lock ordering for the mapping range lock (e.g. xfs) can use this flag. Signed-off-by: Jan Kara <jack@suse.cz> --- include/linux/fs.h | 2 ++ mm/filemap.c | 7 +++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 2027d25..1e0a1e4 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -281,6 +281,8 @@ enum positive_aop_returns { #define AOP_FLAG_NOFS 0x0004 /* used by filesystem to direct * helper code (eg buffer layer) * to clear GFP_FS from alloc */ +#define AOP_FLAG_LOCK_MAPPING 0x0008 /* Lock mapping range where + * page is create */ /* * oh the beauties of C type declarations. diff --git a/mm/filemap.c b/mm/filemap.c index 4826cb4..f4a9e9a 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2266,6 +2266,7 @@ struct page *grab_cache_page_write_begin(struct address_space *mapping, gfp_t gfp_mask; struct page *page; gfp_t gfp_notmask = 0; + struct range_lock mapping_lock; gfp_mask = mapping_gfp_mask(mapping); if (mapping_cap_account_dirty(mapping)) @@ -2280,8 +2281,14 @@ repeat: page = __page_cache_alloc(gfp_mask & ~gfp_notmask); if (!page) return NULL; + if (flags & AOP_FLAG_LOCK_MAPPING) { + range_lock_init(&mapping_lock, index, index); + range_lock(&mapping->mapping_lock, &mapping_lock); + } status = add_to_page_cache_lru(page, mapping, index, GFP_KERNEL & ~gfp_notmask); + if (flags & AOP_FLAG_LOCK_MAPPING) + range_unlock(&mapping->mapping_lock, &mapping_lock); if (unlikely(status)) { page_cache_release(page); if (status == -EEXIST) -- 1.7.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:[~2013-01-31 21:50 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-01-31 21:49 [PATCH 0/6 RFC] Mapping range lock Jan Kara 2013-01-31 21:49 ` Jan Kara 2013-01-31 21:49 ` [PATCH 1/6] lib: Implement range locks Jan Kara 2013-01-31 21:49 ` Jan Kara 2013-01-31 23:57 ` Andrew Morton 2013-01-31 23:57 ` Andrew Morton 2013-02-04 16:41 ` Jan Kara 2013-02-04 16:41 ` Jan Kara 2013-02-11 5:42 ` Michel Lespinasse 2013-02-11 5:42 ` Michel Lespinasse 2013-02-11 10:27 ` Jan Kara 2013-02-11 10:27 ` Jan Kara 2013-02-11 11:03 ` Michel Lespinasse 2013-02-11 11:03 ` Michel Lespinasse 2013-02-11 12:58 ` Jan Kara 2013-02-11 12:58 ` Jan Kara 2013-01-31 21:49 ` [PATCH 2/6] fs: Take mapping lock in generic read paths Jan Kara 2013-01-31 21:49 ` Jan Kara 2013-01-31 23:59 ` Andrew Morton 2013-01-31 23:59 ` Andrew Morton 2013-02-04 12:47 ` Jan Kara 2013-02-04 12:47 ` Jan Kara 2013-02-08 14:59 ` Jan Kara 2013-02-08 14:59 ` Jan Kara 2013-01-31 21:49 ` Jan Kara [this message] 2013-01-31 21:49 ` [PATCH 3/6] fs: Provide function to take mapping lock in buffered write path Jan Kara 2013-01-31 21:49 ` [PATCH 4/6] fs: Don't call dio_cleanup() before submitting all bios Jan Kara 2013-01-31 21:49 ` Jan Kara 2013-01-31 21:49 ` [PATCH 5/6] fs: Take mapping lock during direct IO Jan Kara 2013-01-31 21:49 ` Jan Kara 2013-01-31 21:49 ` [PATCH 6/6] ext3: Convert ext3 to use mapping lock Jan Kara 2013-01-31 21:49 ` Jan Kara 2013-02-01 0:07 ` [PATCH 0/6 RFC] Mapping range lock Andrew Morton 2013-02-01 0:07 ` Andrew Morton 2013-02-04 9:29 ` Zheng Liu 2013-02-04 9:29 ` Zheng Liu 2013-02-04 12:38 ` Jan Kara 2013-02-04 12:38 ` Jan Kara 2013-02-05 23:25 ` Dave Chinner 2013-02-05 23:25 ` Dave Chinner 2013-02-06 19:25 ` Jan Kara 2013-02-06 19:25 ` Jan Kara 2013-02-07 2:43 ` Dave Chinner 2013-02-07 2:43 ` Dave Chinner 2013-02-07 11:06 ` Jan Kara 2013-02-07 11:06 ` 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=1359668994-13433-4-git-send-email-jack@suse.cz \ --to=jack@suse.cz \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.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.