Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:steve-beattie
kernel
linux-2.6-fscache-os-support.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File linux-2.6-fscache-os-support.patch of Package kernel
Date: Thu, 27 Jul 2006 19:53:35 +0100 From: David Howells <dhowells@redhat.com> Subject: [RHEL5 PATCH 22/30] FS-Cache: Provide a filesystem-specific sync'able page bit The attached patch provides a filesystem-specific page bit that a filesystem can synchronise upon. This can be used, for example, by a netfs to synchronise with CacheFS writing its pages to disk. The PG_checked bit is replaced with PG_fs_misc, and various operations are provided based upon that. The *PageChecked() macros still exist, though now they just convert to *PageFsMisc() macros. The name of the "checked" macros seems appropriate as they're used for metadata page validation by various filesystems. Signed-Off-By: David Howells <dhowells@redhat.com> --- fs/afs/dir.c | 5 +---- fs/ext2/dir.c | 6 +++--- fs/ext3/inode.c | 10 +++++----- fs/freevxfs/vxfs_subr.c | 2 +- fs/reiserfs/inode.c | 10 +++++----- fs/ufs/dir.c | 6 +++--- include/linux/page-flags.h | 15 ++++++++++----- include/linux/pagemap.h | 11 +++++++++++ mm/filemap.c | 17 +++++++++++++++++ mm/migrate.c | 4 ++-- mm/page_alloc.c | 2 +- 11 files changed, 59 insertions(+), 29 deletions(-) diff --git a/fs/afs/dir.c b/fs/afs/dir.c index 2fc9987..3b78e70 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c @@ -155,11 +155,9 @@ #endif } } - SetPageChecked(page); return; error: - SetPageChecked(page); SetPageError(page); } /* end afs_dir_check_page() */ @@ -191,8 +189,7 @@ static struct page *afs_dir_get_page(str kmap(page); if (!PageUptodate(page)) goto fail; - if (!PageChecked(page)) - afs_dir_check_page(dir, page); + afs_dir_check_page(dir, page); if (PageError(page)) goto fail; } diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c index 92ea826..b0e7d9f 100644 --- a/fs/ext2/dir.c +++ b/fs/ext2/dir.c @@ -112,7 +112,7 @@ static void ext2_check_page(struct page if (offs != limit) goto Eend; out: - SetPageChecked(page); + SetPageFsMisc(page); return; /* Too bad, we had an error */ @@ -152,7 +152,7 @@ Eend: dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs, (unsigned long) le32_to_cpu(p->inode)); fail: - SetPageChecked(page); + SetPageFsMisc(page); SetPageError(page); } @@ -165,7 +165,7 @@ static struct page * ext2_get_page(struc kmap(page); if (!PageUptodate(page)) goto fail; - if (!PageChecked(page)) + if (!PageFsMisc(page)) ext2_check_page(page); if (PageError(page)) goto fail; diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index f804d5e..8073fc9 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -1527,12 +1527,12 @@ static int ext3_journalled_writepage(str goto no_write; } - if (!page_has_buffers(page) || PageChecked(page)) { + if (!page_has_buffers(page) || PageFsMisc(page)) { /* * It's mmapped pagecache. Add buffers and journal it. There * doesn't seem much point in redirtying the page here. */ - ClearPageChecked(page); + ClearPageFsMisc(page); ret = block_prepare_write(page, 0, PAGE_CACHE_SIZE, ext3_get_block); if (ret != 0) { @@ -1589,7 +1589,7 @@ static void ext3_invalidatepage(struct p * If it's a full truncate we just forget about the pending dirtying */ if (offset == 0) - ClearPageChecked(page); + ClearPageFsMisc(page); journal_invalidatepage(journal, page, offset); } @@ -1598,7 +1598,7 @@ static int ext3_releasepage(struct page { journal_t *journal = EXT3_JOURNAL(page->mapping->host); - WARN_ON(PageChecked(page)); + WARN_ON(PageFsMisc(page)); if (!page_has_buffers(page)) return 0; return journal_try_to_free_buffers(journal, page, wait); @@ -1694,7 +1694,7 @@ out: */ static int ext3_journalled_set_page_dirty(struct page *page) { - SetPageChecked(page); + SetPageFsMisc(page); return __set_page_dirty_nobuffers(page); } diff --git a/fs/freevxfs/vxfs_subr.c b/fs/freevxfs/vxfs_subr.c index decac62..805bbb2 100644 --- a/fs/freevxfs/vxfs_subr.c +++ b/fs/freevxfs/vxfs_subr.c @@ -78,7 +78,7 @@ vxfs_get_page(struct address_space *mapp kmap(pp); if (!PageUptodate(pp)) goto fail; - /** if (!PageChecked(pp)) **/ + /** if (!PageFsMisc(pp)) **/ /** vxfs_check_page(pp); **/ if (PageError(pp)) goto fail; diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 12dfdcf..df64f04 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c @@ -2351,7 +2351,7 @@ static int reiserfs_write_full_page(stru struct buffer_head *head, *bh; int partial = 0; int nr = 0; - int checked = PageChecked(page); + int checked = PageFsMisc(page); struct reiserfs_transaction_handle th; struct super_block *s = inode->i_sb; int bh_per_page = PAGE_CACHE_SIZE / s->s_blocksize; @@ -2420,7 +2420,7 @@ static int reiserfs_write_full_page(stru * blocks we're going to log */ if (checked) { - ClearPageChecked(page); + ClearPageFsMisc(page); reiserfs_write_lock(s); error = journal_begin(&th, s, bh_per_page + 1); if (error) { @@ -2801,7 +2801,7 @@ static void reiserfs_invalidatepage(stru BUG_ON(!PageLocked(page)); if (offset == 0) - ClearPageChecked(page); + ClearPageFsMisc(page); if (!page_has_buffers(page)) goto out; @@ -2842,7 +2842,7 @@ static int reiserfs_set_page_dirty(struc { struct inode *inode = page->mapping->host; if (reiserfs_file_data_log(inode)) { - SetPageChecked(page); + SetPageFsMisc(page); return __set_page_dirty_nobuffers(page); } return __set_page_dirty_buffers(page); @@ -2865,7 +2865,7 @@ static int reiserfs_releasepage(struct p struct buffer_head *bh; int ret = 1; - WARN_ON(PageChecked(page)); + WARN_ON(PageFsMisc(page)); spin_lock(&j->j_dirty_buffers_lock); head = page_buffers(page); bh = head; diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c index 7f0a0aa..e04327c 100644 --- a/fs/ufs/dir.c +++ b/fs/ufs/dir.c @@ -135,7 +135,7 @@ static void ufs_check_page(struct page * if (offs != limit) goto Eend; out: - SetPageChecked(page); + SetPageFsMisc(page); return; /* Too bad, we had an error */ @@ -173,7 +173,7 @@ Eend: "offset=%lu", dir->i_ino, (page->index<<PAGE_CACHE_SHIFT)+offs); fail: - SetPageChecked(page); + SetPageFsMisc(page); SetPageError(page); } @@ -187,7 +187,7 @@ static struct page *ufs_get_page(struct kmap(page); if (!PageUptodate(page)) goto fail; - if (!PageChecked(page)) + if (!PageFsMisc(page)) ufs_check_page(page); if (PageError(page)) goto fail; diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 5748642..6e017b7 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -71,7 +71,7 @@ #define PG_lru 5 #define PG_active 6 #define PG_slab 7 /* slab debug (Suparna wants this) */ -#define PG_checked 8 /* kill me in 2.5.<early>. */ +#define PG_fs_misc 8 #define PG_arch_1 9 #define PG_reserved 10 #define PG_private 11 /* Has something at ->private */ @@ -161,10 +161,6 @@ #else #define PageHighMem(page) 0 /* needed to optimize away at compile time */ #endif -#define PageChecked(page) test_bit(PG_checked, &(page)->flags) -#define SetPageChecked(page) set_bit(PG_checked, &(page)->flags) -#define ClearPageChecked(page) clear_bit(PG_checked, &(page)->flags) - #define PageReserved(page) test_bit(PG_reserved, &(page)->flags) #define SetPageReserved(page) set_bit(PG_reserved, &(page)->flags) #define ClearPageReserved(page) clear_bit(PG_reserved, &(page)->flags) @@ -263,4 +259,13 @@ static inline void set_page_writeback(st test_set_page_writeback(page); } +/* + * Filesystem-specific page bit testing + */ +#define PageFsMisc(page) test_bit(PG_fs_misc, &(page)->flags) +#define SetPageFsMisc(page) set_bit(PG_fs_misc, &(page)->flags) +#define TestSetPageFsMisc(page) test_and_set_bit(PG_fs_misc, &(page)->flags) +#define ClearPageFsMisc(page) clear_bit(PG_fs_misc, &(page)->flags) +#define TestClearPageFsMisc(page) test_and_clear_bit(PG_fs_misc, &(page)->flags) + #endif /* PAGE_FLAGS_H */ diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 0a2f5d2..82b2753 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -170,6 +170,17 @@ static inline void wait_on_page_writebac extern void end_page_writeback(struct page *page); /* + * Wait for filesystem-specific page synchronisation to complete + */ +static inline void wait_on_page_fs_misc(struct page *page) +{ + if (PageFsMisc(page)) + wait_on_page_bit(page, PG_fs_misc); +} + +extern void fastcall end_page_fs_misc(struct page *page); + +/* * Fault a userspace page into pagetables. Return non-zero on a fault. * * This assumes that two userspace pages are always sufficient. That's diff --git a/mm/filemap.c b/mm/filemap.c index d087fc3..c71d8fd 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -577,6 +577,23 @@ void fastcall __lock_page(struct page *p } EXPORT_SYMBOL(__lock_page); +/* + * Note completion of filesystem specific page synchronisation + * + * This is used to allow a page to be written to a filesystem cache in the + * background without holding up the completion of readpage + */ +void fastcall end_page_fs_misc(struct page *page) +{ + smp_mb__before_clear_bit(); + if (!TestClearPageFsMisc(page)) + BUG(); + smp_mb__after_clear_bit(); + __wake_up_bit(page_waitqueue(page), &page->flags, PG_fs_misc); +} + +EXPORT_SYMBOL(end_page_fs_misc); + /** * find_get_page - find and get a page reference * @mapping: the address_space to search diff --git a/mm/migrate.c b/mm/migrate.c index 3f1e0c2..08c9fff 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -348,8 +348,8 @@ static void migrate_page_copy(struct pag SetPageUptodate(newpage); if (PageActive(page)) SetPageActive(newpage); - if (PageChecked(page)) - SetPageChecked(newpage); + if (PageFsMisc(page)) + SetPageFsMisc(newpage); if (PageMappedToDisk(page)) SetPageMappedToDisk(newpage); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 54a4f53..8bb003b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -550,7 +550,7 @@ static int prep_new_page(struct page *pa page->flags &= ~(1 << PG_uptodate | 1 << PG_error | 1 << PG_referenced | 1 << PG_arch_1 | - 1 << PG_checked | 1 << PG_mappedtodisk); + 1 << PG_fs_misc | 1 << PG_mappedtodisk); set_page_private(page, 0); set_page_refcounted(page); kernel_map_pages(page, 1 << order, 1); Date: Thu, 27 Jul 2006 19:53:39 +0100 From: David Howells <dhowells@redhat.com> Subject: [RHEL5 PATCH 24/30] FS-Cache: Release page->private in failed readahead The attached patch causes read_cache_pages() to release page-private data on a page for which add_to_page_cache() fails or the filler function fails. This permits pages with caching references associated with them to be cleaned up. Further changes [try #9] that have been made: (*) The try_to_release_page() is called instead of calling the releasepage() op directly. (*) The page is locked before try_to_release_page() is called. (*) The call to try_to_release_page() and page_cache_release() have been abstracted out into a helper function as this bit of code occurs twice.. Further changes [try #10] that have been made: (*) The comment header on the helper function is much expanded. This states why there's a need to call the releasepage() op in the event of an error. (*) BUG() if the page is already locked when we try and lock it. (*) Don't set the page mapping pointer until we've locked the page. (*) The page is unlocked after try_to_release_page() is called. Signed-Off-By: David Howells <dhowells@redhat.com> --- mm/readahead.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/mm/readahead.c b/mm/readahead.c index aa7ec42..54d3393 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -14,6 +14,7 @@ #include <linux/module.h> #include <linux/blkdev.h> #include <linux/backing-dev.h> #include <linux/pagevec.h> +#include <linux/buffer_head.h> void default_unplug_io_fn(struct backing_dev_info *bdi, struct page *page) { @@ -117,6 +118,26 @@ static inline unsigned long get_next_ra_ #define list_to_page(head) (list_entry((head)->prev, struct page, lru)) +/* + * see if a page needs releasing upon read_cache_pages() failure + * - the caller of read_cache_pages() may have set PG_private before calling, + * such as the NFS fs marking pages that are cached locally on disk, thus we + * need to give the fs a chance to clean up in the event of an error + */ +static void read_cache_pages_release_page(struct address_space *mapping, + struct page *page) +{ + if (PagePrivate(page)) { + if (TestSetPageLocked(page)) + BUG(); + page->mapping = mapping; + try_to_release_page(page, GFP_KERNEL); + page->mapping = NULL; + unlock_page(page); + } + page_cache_release(page); +} + /** * read_cache_pages - populate an address space with some pages & start reads against them * @mapping: the address_space @@ -140,7 +161,7 @@ int read_cache_pages(struct address_spac page = list_to_page(pages); list_del(&page->lru); if (add_to_page_cache(page, mapping, page->index, GFP_KERNEL)) { - page_cache_release(page); + read_cache_pages_release_page(mapping, page); continue; } ret = filler(data, page); @@ -152,7 +173,7 @@ int read_cache_pages(struct address_spac victim = list_to_page(pages); list_del(&victim->lru); - page_cache_release(victim); + read_cache_pages_release_page(mapping, victim); } break; }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
