From: "J. Bruce Fields" <bfields@fieldses.org> To: Lukas Czerner <lczerner@redhat.com> Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, tytso@mit.edu, hughd@google.com, linux-mm@kvack.org Subject: Re: [PATCH 02/15 v2] jbd2: implement jbd2_journal_invalidatepage_range Date: Tue, 4 Sep 2012 10:52:13 -0400 [thread overview] Message-ID: <20120904145213.GA26656@fieldses.org> (raw) In-Reply-To: <1346451711-1931-3-git-send-email-lczerner@redhat.com> On Fri, Aug 31, 2012 at 06:21:38PM -0400, Lukas Czerner wrote: > mm now supports invalidatepage_range address space operation and there > are two file system using jbd2 also implementing punch hole feature > which can benefit from this. We need to implement the same thing for > jbd2 layer in order to allow those file system take benefit of this > functionality. > > With new function jbd2_journal_invalidatepage_range() we can now specify > length to invalidate, rather than assuming invalidate to the end of the > page. > > Signed-off-by: Lukas Czerner <lczerner@redhat.com> > --- > fs/jbd2/journal.c | 1 + > fs/jbd2/transaction.c | 19 +++++++++++++++++-- > include/linux/jbd2.h | 2 ++ > 3 files changed, 20 insertions(+), 2 deletions(-) > > diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c > index e149b99..e4618e9 100644 > --- a/fs/jbd2/journal.c > +++ b/fs/jbd2/journal.c > @@ -86,6 +86,7 @@ EXPORT_SYMBOL(jbd2_journal_force_commit_nested); > EXPORT_SYMBOL(jbd2_journal_wipe); > EXPORT_SYMBOL(jbd2_journal_blocks_per_page); > EXPORT_SYMBOL(jbd2_journal_invalidatepage); > +EXPORT_SYMBOL(jbd2_journal_invalidatepage_range); > EXPORT_SYMBOL(jbd2_journal_try_to_free_buffers); > EXPORT_SYMBOL(jbd2_journal_force_commit); > EXPORT_SYMBOL(jbd2_journal_file_inode); > diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c > index fb1ab953..65c1374 100644 > --- a/fs/jbd2/transaction.c > +++ b/fs/jbd2/transaction.c > @@ -1993,10 +1993,20 @@ zap_buffer_unlocked: > * > */ > void jbd2_journal_invalidatepage(journal_t *journal, > - struct page *page, > - unsigned long offset) > + struct page *page, > + unsigned long offset) > +{ > + jbd2_journal_invalidatepage_range(journal, page, offset, > + PAGE_CACHE_SIZE - offset); > +} > + > +void jbd2_journal_invalidatepage_range(journal_t *journal, > + struct page *page, > + unsigned int offset, > + unsigned int length) > { > struct buffer_head *head, *bh, *next; > + unsigned int stop = offset + length; > unsigned int curr_off = 0; > int may_free = 1; > > @@ -2005,6 +2015,8 @@ void jbd2_journal_invalidatepage(journal_t *journal, > if (!page_has_buffers(page)) > return; > > + BUG_ON(stop > PAGE_CACHE_SIZE || stop < length); This misses e.g. length == (unsigned int)(-1), offset = 1. Could make it obvious with: BUG_ON(offset > PAGE_CACHE_SIZE || length > PAGE_CACHE_SIZE); BUG_ON(stop > PAGE_CACHE_SIZE); Or is that overkill? --b. > + > /* We will potentially be playing with lists other than just the > * data lists (especially for journaled data mode), so be > * cautious in our locking. */ > @@ -2014,6 +2026,9 @@ void jbd2_journal_invalidatepage(journal_t *journal, > unsigned int next_off = curr_off + bh->b_size; > next = bh->b_this_page; > > + if (next_off > stop) > + return; > + > if (offset <= curr_off) { > /* This block is wholly outside the truncation point */ > lock_buffer(bh); > diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h > index 3efc43f..21288fa 100644 > --- a/include/linux/jbd2.h > +++ b/include/linux/jbd2.h > @@ -1101,6 +1101,8 @@ extern int jbd2_journal_forget (handle_t *, struct buffer_head *); > extern void journal_sync_buffer (struct buffer_head *); > extern void jbd2_journal_invalidatepage(journal_t *, > struct page *, unsigned long); > +extern void jbd2_journal_invalidatepage_range(journal_t *, struct page *, > + unsigned int, unsigned int); > extern int jbd2_journal_try_to_free_buffers(journal_t *, struct page *, gfp_t); > extern int jbd2_journal_stop(handle_t *); > extern int jbd2_journal_flush (journal_t *); > -- > 1.7.7.6 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: "J. Bruce Fields" <bfields@fieldses.org> To: Lukas Czerner <lczerner@redhat.com> Cc: linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, tytso@mit.edu, hughd@google.com, linux-mm@kvack.org Subject: Re: [PATCH 02/15 v2] jbd2: implement jbd2_journal_invalidatepage_range Date: Tue, 4 Sep 2012 10:52:13 -0400 [thread overview] Message-ID: <20120904145213.GA26656@fieldses.org> (raw) In-Reply-To: <1346451711-1931-3-git-send-email-lczerner@redhat.com> On Fri, Aug 31, 2012 at 06:21:38PM -0400, Lukas Czerner wrote: > mm now supports invalidatepage_range address space operation and there > are two file system using jbd2 also implementing punch hole feature > which can benefit from this. We need to implement the same thing for > jbd2 layer in order to allow those file system take benefit of this > functionality. > > With new function jbd2_journal_invalidatepage_range() we can now specify > length to invalidate, rather than assuming invalidate to the end of the > page. > > Signed-off-by: Lukas Czerner <lczerner@redhat.com> > --- > fs/jbd2/journal.c | 1 + > fs/jbd2/transaction.c | 19 +++++++++++++++++-- > include/linux/jbd2.h | 2 ++ > 3 files changed, 20 insertions(+), 2 deletions(-) > > diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c > index e149b99..e4618e9 100644 > --- a/fs/jbd2/journal.c > +++ b/fs/jbd2/journal.c > @@ -86,6 +86,7 @@ EXPORT_SYMBOL(jbd2_journal_force_commit_nested); > EXPORT_SYMBOL(jbd2_journal_wipe); > EXPORT_SYMBOL(jbd2_journal_blocks_per_page); > EXPORT_SYMBOL(jbd2_journal_invalidatepage); > +EXPORT_SYMBOL(jbd2_journal_invalidatepage_range); > EXPORT_SYMBOL(jbd2_journal_try_to_free_buffers); > EXPORT_SYMBOL(jbd2_journal_force_commit); > EXPORT_SYMBOL(jbd2_journal_file_inode); > diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c > index fb1ab953..65c1374 100644 > --- a/fs/jbd2/transaction.c > +++ b/fs/jbd2/transaction.c > @@ -1993,10 +1993,20 @@ zap_buffer_unlocked: > * > */ > void jbd2_journal_invalidatepage(journal_t *journal, > - struct page *page, > - unsigned long offset) > + struct page *page, > + unsigned long offset) > +{ > + jbd2_journal_invalidatepage_range(journal, page, offset, > + PAGE_CACHE_SIZE - offset); > +} > + > +void jbd2_journal_invalidatepage_range(journal_t *journal, > + struct page *page, > + unsigned int offset, > + unsigned int length) > { > struct buffer_head *head, *bh, *next; > + unsigned int stop = offset + length; > unsigned int curr_off = 0; > int may_free = 1; > > @@ -2005,6 +2015,8 @@ void jbd2_journal_invalidatepage(journal_t *journal, > if (!page_has_buffers(page)) > return; > > + BUG_ON(stop > PAGE_CACHE_SIZE || stop < length); This misses e.g. length == (unsigned int)(-1), offset = 1. Could make it obvious with: BUG_ON(offset > PAGE_CACHE_SIZE || length > PAGE_CACHE_SIZE); BUG_ON(stop > PAGE_CACHE_SIZE); Or is that overkill? --b. > + > /* We will potentially be playing with lists other than just the > * data lists (especially for journaled data mode), so be > * cautious in our locking. */ > @@ -2014,6 +2026,9 @@ void jbd2_journal_invalidatepage(journal_t *journal, > unsigned int next_off = curr_off + bh->b_size; > next = bh->b_this_page; > > + if (next_off > stop) > + return; > + > if (offset <= curr_off) { > /* This block is wholly outside the truncation point */ > lock_buffer(bh); > diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h > index 3efc43f..21288fa 100644 > --- a/include/linux/jbd2.h > +++ b/include/linux/jbd2.h > @@ -1101,6 +1101,8 @@ extern int jbd2_journal_forget (handle_t *, struct buffer_head *); > extern void journal_sync_buffer (struct buffer_head *); > extern void jbd2_journal_invalidatepage(journal_t *, > struct page *, unsigned long); > +extern void jbd2_journal_invalidatepage_range(journal_t *, struct page *, > + unsigned int, unsigned int); > extern int jbd2_journal_try_to_free_buffers(journal_t *, struct page *, gfp_t); > extern int jbd2_journal_stop(handle_t *); > extern int jbd2_journal_flush (journal_t *); > -- > 1.7.7.6 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- 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:[~2012-09-04 14:52 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-08-31 22:21 [PATCH 00/15 v2] Add invalidatepage_range address space operation Lukas Czerner 2012-08-31 22:21 ` [PATCH 01/15 v2] mm: add " Lukas Czerner 2012-09-04 23:43 ` Andrew Morton 2012-09-05 14:36 ` Lukáš Czerner 2012-09-05 15:56 ` Christoph Hellwig 2012-09-05 15:56 ` Christoph Hellwig 2012-09-05 16:42 ` Lukáš Czerner 2012-09-14 13:21 ` Lukáš Czerner 2012-09-14 13:21 ` Lukáš Czerner 2012-08-31 22:21 ` [PATCH 02/15 v2] jbd2: implement jbd2_journal_invalidatepage_range Lukas Czerner 2012-09-04 14:52 ` J. Bruce Fields [this message] 2012-09-04 14:52 ` J. Bruce Fields 2012-09-04 15:37 ` Lukáš Czerner 2012-09-04 17:44 ` J. Bruce Fields 2012-09-04 17:44 ` J. Bruce Fields 2012-08-31 22:21 ` [PATCH 03/15 v2] ext4: implement invalidatepage_range aop Lukas Czerner 2012-08-31 22:21 ` [PATCH 04/15 v2] xfs: " Lukas Czerner 2012-08-31 22:21 ` Lukas Czerner 2012-08-31 22:21 ` [PATCH 05/15 v2] ocfs2: " Lukas Czerner 2012-08-31 22:21 ` [PATCH 06/15 v2] mm: teach truncate_inode_pages_range() to handle non page aligned ranges Lukas Czerner 2012-08-31 22:21 ` [PATCH 07/15 v2] ext4: Take i_mutex before punching hole Lukas Czerner 2012-09-10 12:00 ` Ashish Sangwan 2012-09-13 15:15 ` Lukáš Czerner 2012-09-13 15:15 ` Lukáš Czerner 2012-08-31 22:21 ` [PATCH 08/15 v2] Revert "ext4: remove no longer used functions in inode.c" Lukas Czerner 2012-08-31 22:21 ` [PATCH 09/15 v2] Revert "ext4: fix fsx truncate failure" Lukas Czerner 2012-08-31 22:21 ` [PATCH 10/15 v2] ext4: use ext4_zero_partial_blocks in punch_hole Lukas Czerner 2012-08-31 22:21 ` [PATCH 11/15 v2] ext4: remove unused discard_partial_page_buffers Lukas Czerner 2012-08-31 22:21 ` [PATCH 12/15 v2] ext4: remove unused code from ext4_remove_blocks() Lukas Czerner 2012-08-31 22:21 ` [PATCH 13/15 v2] ext4: update ext4_ext_remove_space trace point Lukas Czerner 2012-08-31 22:21 ` [PATCH 14/15 v2] ext4: make punch hole code path work with bigalloc Lukas Czerner 2012-08-31 22:21 ` [PATCH 15/15 v2] ext4: Allow punch hole with bigalloc enabled Lukas Czerner
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=20120904145213.GA26656@fieldses.org \ --to=bfields@fieldses.org \ --cc=hughd@google.com \ --cc=lczerner@redhat.com \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=tytso@mit.edu \ /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.