| Message ID | 1360055531-26309-11-git-send-email-lczerner@redhat.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Tue, 5 Feb 2013 10:12:03 +0100 Lukas Czerner <lczerner@redhat.com> wrote: > This commit changes truncate_inode_pages_range() so it can handle non > page aligned regions of the truncate. Currently we can hit BUG_ON when > the end of the range is not page aligned, but we can handle unaligned > start of the range. > > Being able to handle non page aligned regions of the page can help file > system punch_hole implementations and save some work, because once we're > holding the page we might as well deal with it right away. > > In previous commits we've changed ->invalidatepage() prototype to accept > 'length' argument to be able to specify range to invalidate. No we can > use that new ability in truncate_inode_pages_range(). > > ... > > + /* > + * 'start' and 'end' always covers the range of pages to be fully > + * truncated. Partial pages are covered with 'partial_start' at the > + * start of the range and 'partial_end' at the end of the range. > + * Note that 'end' is exclusive while 'lend' is inclusive. > + */ That helped ;) So the bytes to be truncated are (start*PAGE_SIZE + partial_start) -> (end*PAGE_SIZE + partial_end) - 1 yes? -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 7 Feb 2013, Andrew Morton wrote: > Date: Thu, 7 Feb 2013 15:40:42 -0800 > From: Andrew Morton <akpm@linux-foundation.org> > To: Lukas Czerner <lczerner@redhat.com> > Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, > linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, > Hugh Dickins <hughd@google.com> > Subject: Re: [PATCH v2 10/18] mm: teach truncate_inode_pages_range() to handle > non page aligned ranges > > On Tue, 5 Feb 2013 10:12:03 +0100 > Lukas Czerner <lczerner@redhat.com> wrote: > > > This commit changes truncate_inode_pages_range() so it can handle non > > page aligned regions of the truncate. Currently we can hit BUG_ON when > > the end of the range is not page aligned, but we can handle unaligned > > start of the range. > > > > Being able to handle non page aligned regions of the page can help file > > system punch_hole implementations and save some work, because once we're > > holding the page we might as well deal with it right away. > > > > In previous commits we've changed ->invalidatepage() prototype to accept > > 'length' argument to be able to specify range to invalidate. No we can > > use that new ability in truncate_inode_pages_range(). > > > > ... > > > > + /* > > + * 'start' and 'end' always covers the range of pages to be fully > > + * truncated. Partial pages are covered with 'partial_start' at the > > + * start of the range and 'partial_end' at the end of the range. > > + * Note that 'end' is exclusive while 'lend' is inclusive. > > + */ > > That helped ;) So the bytes to be truncated are > > (start*PAGE_SIZE + partial_start) -> (end*PAGE_SIZE + partial_end) - 1 > > yes? The start of the range is not right, because 'start' and 'end' covers pages to be _fully_ truncated. See the while cycle and then 'if (partial_start)' condition where we search for the page (start - 1) and do_invalidate within that page. So it should be like this: (start*PAGE_SIZE - partial_start*(PAGE_SIZE - partial_start) -> (end*PAGE_END + partial_end) - 1 assuming that you want the range to be inclusive on both sides. -Lukas -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 8 Feb 2013, Lukáš Czerner wrote: > Date: Fri, 8 Feb 2013 10:08:05 +0100 (CET) > From: Lukáš Czerner <lczerner@redhat.com> > To: Andrew Morton <akpm@linux-foundation.org> > Cc: Lukas Czerner <lczerner@redhat.com>, linux-mm@kvack.org, > linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, > linux-ext4@vger.kernel.org, Hugh Dickins <hughd@google.com> > Subject: Re: [PATCH v2 10/18] mm: teach truncate_inode_pages_range() to handle > non page aligned ranges ..snip.. > > > + /* > > > + * 'start' and 'end' always covers the range of pages to be fully > > > + * truncated. Partial pages are covered with 'partial_start' at the > > > + * start of the range and 'partial_end' at the end of the range. > > > + * Note that 'end' is exclusive while 'lend' is inclusive. > > > + */ > > > > That helped ;) So the bytes to be truncated are > > > > (start*PAGE_SIZE + partial_start) -> (end*PAGE_SIZE + partial_end) - 1 > > > > yes? > > The start of the range is not right, because 'start' and 'end' > covers pages to be _fully_ truncated. See the while cycle and > then 'if (partial_start)' condition where we search for the > page (start - 1) and do_invalidate within that page. > > So it should be like this: > > > (start*PAGE_SIZE - partial_start*(PAGE_SIZE - partial_start) -> > (end*PAGE_END + partial_end) - 1 > > > assuming that you want the range to be inclusive on both sides. > > -Lukas > Hi Andrew, what's the status of the patch set ? Do you have any more comments or questions ? Can we get this in in this merge window ? Thanks! -Lukas
On Thu, 21 Feb 2013 09:33:56 +0100 (CET) Luk____ Czerner <lczerner@redhat.com> wrote: > what's the status of the patch set ? Forgotten about :( > Can we get this in in this merge window ? Please do a full resend after 3.9-rc1 and let's take it up again. -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 21 Feb 2013, Andrew Morton wrote: > Date: Thu, 21 Feb 2013 13:49:04 -0800 > From: Andrew Morton <akpm@linux-foundation.org> > To: Lukáš Czerner <lczerner@redhat.com> > Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, > linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, > Hugh Dickins <hughd@google.com> > Subject: Re: [PATCH v2 10/18] mm: teach truncate_inode_pages_range() to handle > non page aligned ranges > > On Thu, 21 Feb 2013 09:33:56 +0100 (CET) > Luk____ Czerner <lczerner@redhat.com> wrote: > > > what's the status of the patch set ? > > Forgotten about :( > > > Can we get this in in this merge window ? > > Please do a full resend after 3.9-rc1 and let's take it up again. > I'll do that. Thanks. -Lukas
diff --git a/mm/truncate.c b/mm/truncate.c index fdba083..e2e8a8a 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -52,14 +52,6 @@ void do_invalidatepage(struct page *page, unsigned int offset, (*invalidatepage)(page, offset, length); } -static inline void truncate_partial_page(struct page *page, unsigned partial) -{ - zero_user_segment(page, partial, PAGE_CACHE_SIZE); - cleancache_invalidate_page(page->mapping, page); - if (page_has_private(page)) - do_invalidatepage(page, partial, PAGE_CACHE_SIZE - partial); -} - /* * This cancels just the dirty bit on the kernel page itself, it * does NOT actually remove dirty bits on any mmap's that may be @@ -188,11 +180,11 @@ int invalidate_inode_page(struct page *page) * truncate_inode_pages_range - truncate range of pages specified by start & end byte offsets * @mapping: mapping to truncate * @lstart: offset from which to truncate - * @lend: offset to which to truncate + * @lend: offset to which to truncate (inclusive) * * Truncate the page cache, removing the pages that are between - * specified offsets (and zeroing out partial page - * (if lstart is not page aligned)). + * specified offsets (and zeroing out partial pages + * if lstart or lend + 1 is not page aligned). * * Truncate takes two passes - the first pass is nonblocking. It will not * block on page locks and it will not block on writeback. The second pass @@ -203,35 +195,58 @@ int invalidate_inode_page(struct page *page) * We pass down the cache-hot hint to the page freeing code. Even if the * mapping is large, it is probably the case that the final pages are the most * recently touched, and freeing happens in ascending file offset order. + * + * Note that since ->invalidatepage() accepts range to invalidate + * truncate_inode_pages_range is able to handle cases where lend + 1 is not + * page aligned properly. */ void truncate_inode_pages_range(struct address_space *mapping, loff_t lstart, loff_t lend) { - const pgoff_t start = (lstart + PAGE_CACHE_SIZE-1) >> PAGE_CACHE_SHIFT; - const unsigned partial = lstart & (PAGE_CACHE_SIZE - 1); - struct pagevec pvec; - pgoff_t index; - pgoff_t end; - int i; + pgoff_t start; /* inclusive */ + pgoff_t end; /* exclusive */ + unsigned int partial_start; /* inclusive */ + unsigned int partial_end; /* exclusive */ + struct pagevec pvec; + pgoff_t index; + int i; cleancache_invalidate_inode(mapping); if (mapping->nrpages == 0) return; - BUG_ON((lend & (PAGE_CACHE_SIZE - 1)) != (PAGE_CACHE_SIZE - 1)); - end = (lend >> PAGE_CACHE_SHIFT); + /* Offsets within partial pages */ + partial_start = lstart & (PAGE_CACHE_SIZE - 1); + partial_end = (lend + 1) & (PAGE_CACHE_SIZE - 1); + + /* + * 'start' and 'end' always covers the range of pages to be fully + * truncated. Partial pages are covered with 'partial_start' at the + * start of the range and 'partial_end' at the end of the range. + * Note that 'end' is exclusive while 'lend' is inclusive. + */ + start = (lstart + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; + if (lend == -1) + /* + * lend == -1 indicates end-of-file so we have to set 'end' + * to the highest possible pgoff_t and since the type is + * unsigned we're using -1. + */ + end = -1; + else + end = (lend + 1) >> PAGE_CACHE_SHIFT; pagevec_init(&pvec, 0); index = start; - while (index <= end && pagevec_lookup(&pvec, mapping, index, - min(end - index, (pgoff_t)PAGEVEC_SIZE - 1) + 1)) { + while (index < end && pagevec_lookup(&pvec, mapping, index, + min(end - index, (pgoff_t)PAGEVEC_SIZE))) { mem_cgroup_uncharge_start(); for (i = 0; i < pagevec_count(&pvec); i++) { struct page *page = pvec.pages[i]; /* We rely upon deletion not changing page->index */ index = page->index; - if (index > end) + if (index >= end) break; if (!trylock_page(page)) @@ -250,27 +265,56 @@ void truncate_inode_pages_range(struct address_space *mapping, index++; } - if (partial) { + if (partial_start) { struct page *page = find_lock_page(mapping, start - 1); if (page) { + unsigned int top = PAGE_CACHE_SIZE; + if (start > end) { + /* Truncation within a single page */ + top = partial_end; + partial_end = 0; + } wait_on_page_writeback(page); - truncate_partial_page(page, partial); + zero_user_segment(page, partial_start, top); + cleancache_invalidate_page(mapping, page); + if (page_has_private(page)) + do_invalidatepage(page, partial_start, + top - partial_start); unlock_page(page); page_cache_release(page); } } + if (partial_end) { + struct page *page = find_lock_page(mapping, end); + if (page) { + wait_on_page_writeback(page); + zero_user_segment(page, 0, partial_end); + cleancache_invalidate_page(mapping, page); + if (page_has_private(page)) + do_invalidatepage(page, 0, + partial_end); + unlock_page(page); + page_cache_release(page); + } + } + /* + * If the truncation happened within a single page no pages + * will be released, just zeroed, so we can bail out now. + */ + if (start >= end) + return; index = start; for ( ; ; ) { cond_resched(); if (!pagevec_lookup(&pvec, mapping, index, - min(end - index, (pgoff_t)PAGEVEC_SIZE - 1) + 1)) { + min(end - index, (pgoff_t)PAGEVEC_SIZE))) { if (index == start) break; index = start; continue; } - if (index == start && pvec.pages[0]->index > end) { + if (index == start && pvec.pages[0]->index >= end) { pagevec_release(&pvec); break; } @@ -280,7 +324,7 @@ void truncate_inode_pages_range(struct address_space *mapping, /* We rely upon deletion not changing page->index */ index = page->index; - if (index > end) + if (index >= end) break; lock_page(page); @@ -601,10 +645,8 @@ void truncate_pagecache_range(struct inode *inode, loff_t lstart, loff_t lend) * This rounding is currently just for example: unmap_mapping_range * expands its hole outwards, whereas we want it to contract the hole * inwards. However, existing callers of truncate_pagecache_range are - * doing their own page rounding first; and truncate_inode_pages_range - * currently BUGs if lend is not pagealigned-1 (it handles partial - * page at start of hole, but not partial page at end of hole). Note - * unmap_mapping_range allows holelen 0 for all, and we allow lend -1. + * doing their own page rounding first. Note that unmap_mapping_range + * allows holelen 0 for all, and we allow lend -1 for end of file. */ /*
This commit changes truncate_inode_pages_range() so it can handle non page aligned regions of the truncate. Currently we can hit BUG_ON when the end of the range is not page aligned, but we can handle unaligned start of the range. Being able to handle non page aligned regions of the page can help file system punch_hole implementations and save some work, because once we're holding the page we might as well deal with it right away. In previous commits we've changed ->invalidatepage() prototype to accept 'length' argument to be able to specify range to invalidate. No we can use that new ability in truncate_inode_pages_range(). Signed-off-by: Lukas Czerner <lczerner@redhat.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Hugh Dickins <hughd@google.com> --- mm/truncate.c | 104 ++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 73 insertions(+), 31 deletions(-)