From: Badari Pulavarty <pbadari@us.ibm.com>
To: christoph <hch@lst.de>
Cc: mcao@us.ibm.com, akpm@osdl.org,
lkml <linux-kernel@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>
Subject: [PATCH 2/3] map multiple blocks for mpage_readpages()
Date: Mon, 20 Feb 2006 13:23:55 -0800 [thread overview]
Message-ID: <1140470635.22756.15.camel@dyn9047017100.beaverton.ibm.com> (raw)
In-Reply-To: <1140470487.22756.12.camel@dyn9047017100.beaverton.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
[PATCH 2/3] map multiple blocks for mpage_readpages()
This patch changes mpage_readpages() and get_block() to
get the disk mapping information for multiple blocks at the
same time.
b_size represents the amount of disk mapping that needs to
mapped. On the successful get_block() b_size indicates the
amount of disk mapping thats actually mapped. Only the
filesystems who care to use this information and provide multiple
disk blocks at a time can choose to do so.
No changes are needed for the filesystems who wants to ignore this.
Thanks,
Badari
[-- Attachment #2: getblocks-readpages.patch --]
[-- Type: text/x-patch, Size: 7570 bytes --]
This patch changes mpage_readpages() and get_block() to
get the disk mapping information for multiple blocks at the
same time.
b_size represents the amount of disk mapping that needs to
mapped. On the successful get_block() b_size indicates the
amount of disk mapping thats actually mapped. Only the
filesystems who care to use this information and provide multiple
disk blocks at a time can choose to do so.
No changes are needed for the filesystems who wants to ignore this.
Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com>
fs/jfs/inode.c | 3 -
fs/mpage.c | 98 +++++++++++++++++++++++++++++++++++---------
fs/xfs/linux-2.6/xfs_aops.c | 4 -
3 files changed, 83 insertions(+), 22 deletions(-)
Index: linux-2.6.16-rc4/fs/mpage.c
===================================================================
--- linux-2.6.16-rc4.orig/fs/mpage.c 2006-02-20 09:45:37.000000000 -0800
+++ linux-2.6.16-rc4/fs/mpage.c 2006-02-20 09:51:24.000000000 -0800
@@ -165,7 +165,9 @@ map_buffer_to_page(struct page *page, st
static struct bio *
do_mpage_readpage(struct bio *bio, struct page *page, unsigned nr_pages,
- sector_t *last_block_in_bio, get_block_t get_block)
+ sector_t *last_block_in_bio, struct buffer_head *map_bh,
+ unsigned long *first_logical_block, int *map_valid,
+ get_block_t get_block)
{
struct inode *inode = page->mapping->host;
const unsigned blkbits = inode->i_blkbits;
@@ -173,34 +175,72 @@ do_mpage_readpage(struct bio *bio, struc
const unsigned blocksize = 1 << blkbits;
sector_t block_in_file;
sector_t last_block;
+ sector_t last_block_in_file;
sector_t blocks[MAX_BUF_PER_PAGE];
unsigned page_block;
unsigned first_hole = blocks_per_page;
struct block_device *bdev = NULL;
- struct buffer_head bh;
int length;
int fully_mapped = 1;
+ unsigned nblocks, i;
if (page_has_buffers(page))
goto confused;
block_in_file = (sector_t)page->index << (PAGE_CACHE_SHIFT - blkbits);
- last_block = (i_size_read(inode) + blocksize - 1) >> blkbits;
+ last_block = block_in_file + (nr_pages * blocks_per_page);
+ last_block_in_file = (i_size_read(inode) + blocksize - 1) >> blkbits;
+ if (last_block > last_block_in_file)
+ last_block = last_block_in_file;
+ page_block = 0;
+
+ /*
+ * Map blocks using the result from the last get_blocks call first.
+ */
+ nblocks = map_bh->b_size >> blkbits;
+ if (*map_valid &&
+ block_in_file > *first_logical_block &&
+ block_in_file < (*first_logical_block + nblocks)) {
+ unsigned map_offset = block_in_file - *first_logical_block;
+ unsigned last = nblocks - map_offset;
+
+ for (i = 0; ; i++) {
+ if (i == last) {
+ *map_valid = 0;
+ break;
+ }
+ if (page_block == blocks_per_page)
+ break;
+ blocks[page_block] = map_bh->b_blocknr + map_offset + i;
+ page_block++;
+ block_in_file++;
+ }
+ bdev = map_bh->b_bdev;
+ }
+
+ /*
+ * Then do more get_blocks calls until we are done with this page.
+ */
+ map_bh->b_page = page;
+ while (page_block < blocks_per_page) {
+ map_bh->b_state = 0;
+ map_bh->b_size = 0;
- bh.b_page = page;
- for (page_block = 0; page_block < blocks_per_page;
- page_block++, block_in_file++) {
- bh.b_state = 0;
if (block_in_file < last_block) {
- bh.b_size = blocksize;
- if (get_block(inode, block_in_file, &bh, 0))
+ map_bh->b_size = (last_block - block_in_file) << blkbits;
+ if (get_block(inode, block_in_file, map_bh, 0))
goto confused;
+ *first_logical_block = block_in_file;
+ *map_valid = 1;
}
- if (!buffer_mapped(&bh)) {
+ if (!buffer_mapped(map_bh)) {
fully_mapped = 0;
if (first_hole == blocks_per_page)
first_hole = page_block;
+ page_block++;
+ block_in_file++;
+ *map_valid = 0;
continue;
}
@@ -210,8 +250,8 @@ do_mpage_readpage(struct bio *bio, struc
* we just collected from get_block into the page's buffers
* so readpage doesn't have to repeat the get_block call
*/
- if (buffer_uptodate(&bh)) {
- map_buffer_to_page(page, &bh, page_block);
+ if (buffer_uptodate(map_bh)) {
+ map_buffer_to_page(page, map_bh, page_block);
goto confused;
}
@@ -219,10 +259,20 @@ do_mpage_readpage(struct bio *bio, struc
goto confused; /* hole -> non-hole */
/* Contiguous blocks? */
- if (page_block && blocks[page_block-1] != bh.b_blocknr-1)
+ if (page_block && blocks[page_block-1] != map_bh->b_blocknr-1)
goto confused;
- blocks[page_block] = bh.b_blocknr;
- bdev = bh.b_bdev;
+ nblocks = map_bh->b_size >> blkbits;
+ for (i = 0; ; i++) {
+ if (i == nblocks) {
+ *map_valid = 0;
+ break;
+ } else if (page_block == blocks_per_page)
+ break;
+ blocks[page_block] = map_bh->b_blocknr + i;
+ page_block++;
+ block_in_file++;
+ }
+ bdev = map_bh->b_bdev;
}
if (first_hole != blocks_per_page) {
@@ -261,7 +311,7 @@ alloc_new:
goto alloc_new;
}
- if (buffer_boundary(&bh) || (first_hole != blocks_per_page))
+ if (buffer_boundary(map_bh) || (first_hole != blocks_per_page))
bio = mpage_bio_submit(READ, bio);
else
*last_block_in_bio = blocks[blocks_per_page - 1];
@@ -332,6 +382,9 @@ mpage_readpages(struct address_space *ma
unsigned page_idx;
sector_t last_block_in_bio = 0;
struct pagevec lru_pvec;
+ struct buffer_head map_bh;
+ unsigned long first_logical_block = 0;
+ int map_valid = 0;
pagevec_init(&lru_pvec, 0);
for (page_idx = 0; page_idx < nr_pages; page_idx++) {
@@ -343,7 +396,9 @@ mpage_readpages(struct address_space *ma
page->index, GFP_KERNEL)) {
bio = do_mpage_readpage(bio, page,
nr_pages - page_idx,
- &last_block_in_bio, get_block);
+ &last_block_in_bio, &map_bh,
+ &first_logical_block,
+ &map_valid, get_block);
if (!pagevec_add(&lru_pvec, page))
__pagevec_lru_add(&lru_pvec);
} else {
@@ -365,9 +420,14 @@ int mpage_readpage(struct page *page, ge
{
struct bio *bio = NULL;
sector_t last_block_in_bio = 0;
+ struct buffer_head map_bh;
+ unsigned long first_logical_block = 0;
+ int map_valid = 0;
+
- bio = do_mpage_readpage(bio, page, 1,
- &last_block_in_bio, get_block);
+ bio = do_mpage_readpage(bio, page, 1, &last_block_in_bio,
+ &map_bh, &first_logical_block, &map_valid,
+ get_block);
if (bio)
mpage_bio_submit(READ, bio);
return 0;
Index: linux-2.6.16-rc4/fs/jfs/inode.c
===================================================================
--- linux-2.6.16-rc4.orig/fs/jfs/inode.c 2006-02-17 14:23:45.000000000 -0800
+++ linux-2.6.16-rc4/fs/jfs/inode.c 2006-02-20 09:48:33.000000000 -0800
@@ -257,7 +257,8 @@ jfs_get_blocks(struct inode *ip, sector_
static int jfs_get_block(struct inode *ip, sector_t lblock,
struct buffer_head *bh_result, int create)
{
- return jfs_get_blocks(ip, lblock, 1, bh_result, create);
+ return jfs_get_blocks(ip, lblock, bh_result->b_size >> ip->i_blkbits,
+ bh_result, create);
}
static int jfs_writepage(struct page *page, struct writeback_control *wbc)
Index: linux-2.6.16-rc4/fs/xfs/linux-2.6/xfs_aops.c
===================================================================
--- linux-2.6.16-rc4.orig/fs/xfs/linux-2.6/xfs_aops.c 2006-02-17 14:23:45.000000000 -0800
+++ linux-2.6.16-rc4/fs/xfs/linux-2.6/xfs_aops.c 2006-02-20 09:48:33.000000000 -0800
@@ -1136,8 +1136,8 @@ linvfs_get_block(
struct buffer_head *bh_result,
int create)
{
- return __linvfs_get_block(inode, iblock, 0, bh_result,
- create, 0, BMAPI_WRITE);
+ return __linvfs_get_block(inode, iblock, bh_result->b_size >> inode->i_blkbits,
+ bh_result, create, 0, BMAPI_WRITE);
}
STATIC int
next prev parent reply other threads:[~2006-02-20 21:22 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-20 21:21 [PATCH 0/3] map multiple blocks in get_block() and mpage_readpages() Badari Pulavarty
2006-02-20 21:23 ` [PATCH 1/3] pass b_size to ->get_block() Badari Pulavarty
2006-02-20 21:23 ` Badari Pulavarty [this message]
2006-02-23 3:29 ` [PATCH 2/3] map multiple blocks for mpage_readpages() Suparna Bhattacharya
2006-02-23 22:18 ` Badari Pulavarty
2006-02-20 21:24 ` [PATCH 3/3] remove ->get_blocks() support Badari Pulavarty
2006-02-20 21:59 ` [PATCH 0/3] map multiple blocks in get_block() and mpage_readpages() Nathan Scott
2006-02-20 23:06 ` Badari Pulavarty
2006-02-20 23:16 ` Nathan Scott
2006-02-21 2:41 ` Jeremy Higdon
2006-02-21 16:03 ` Badari Pulavarty
2006-02-21 21:39 ` Nathan Scott
2006-02-22 15:12 ` christoph
2006-02-22 16:58 ` Badari Pulavarty
2006-02-22 16:59 ` christoph
2006-02-23 1:40 ` Nathan Scott
2006-02-23 1:59 ` Andrew Morton
2006-02-23 16:28 ` [PATCH] change b_size to size_t Badari Pulavarty
2006-02-23 16:32 ` Benjamin LaHaise
2006-02-23 17:20 ` Badari Pulavarty
2006-02-23 17:28 ` Badari Pulavarty
2006-02-23 17:29 ` Benjamin LaHaise
2006-02-23 18:46 ` Badari Pulavarty
2006-02-23 17:40 ` Badari Pulavarty
2006-02-23 16:40 ` Dave Kleikamp
2006-02-22 17:23 ` [PATCH 0/3] map multiple blocks in get_block() and mpage_readpages() Peter Staubach
2006-02-22 18:37 ` Dave Kleikamp
2006-02-22 19:00 ` Badari Pulavarty
2006-02-24 17:19 ` Badari Pulavarty
2006-03-06 10:03 ` Suparna Bhattacharya
2006-03-06 22:39 ` Nathan Scott
2006-03-07 9:00 ` Badari Pulavarty
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=1140470635.22756.15.camel@dyn9047017100.beaverton.ibm.com \
--to=pbadari@us.ibm.com \
--cc=akpm@osdl.org \
--cc=hch@lst.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcao@us.ibm.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;
as well as URLs for NNTP newsgroup(s).