linux-ext4 - [PATCH v3 4/8] ext4: account the data request of read operations in buffered io

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1322482828-5529-4-git-send-email-wenqing.lz@taobao.com>
Date:	Mon, 28 Nov 2011 20:20:24 +0800
From:	Zheng Liu <gnehzuil.liu@...il.com>
To:	linux-fsdevel@...r.kernel.org, linux-ext4@...r.kernel.org
Cc:	Jens Axboe <axboe@...nel.dk>,
	Steven Whitehouse <swhiteho@...hat.com>,
	Aditya Kali <adityakali@...gle.com>,
	Wang Shaoyan <wangshaoyan.pt@...bao.com>,
	Zheng Liu <wenqing.lz@...bao.com>
Subject: [PATCH v3 4/8] ext4: account the data request of read operations in buffered io

From: Zheng Liu <wenqing.lz@...bao.com>

ll_rw_block in ext4_discard_partial_page_buffers_no_lock and
ext4_block_zero_page_range are replaced with ext4_ll_rw_block, and
ext4_ios_read are called in ext4_readpage and ext4_readpages in order to
account the data request.

CC: Jens Axboe <axboe@...nel.dk>
CC: Steven Whitehouse <swhiteho@...hat.com>
CC: Aditya Kali <adityakali@...gle.com>
Signed-off-by: Wang Shaoyan <wangshaoyan.pt@...bao.com>
Signed-off-by: Zheng Liu <wenqing.lz@...bao.com>
---
 fs/ext4/inode.c |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 52fcaab..426ac55 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2679,6 +2679,8 @@ static sector_t ext4_bmap(struct address_space *mapping, sector_t block)
 static int ext4_readpage(struct file *file, struct page *page)
 {
 	trace_ext4_readpage(page);
+	ext4_ios_read(page->mapping->host->i_sb, EXT4_IOS_REGULAR_DATA,
+		      ext4_blocks_per_page(page->mapping->host));
 	return mpage_readpage(page, ext4_get_block);
 }
 
@@ -2686,6 +2688,8 @@ static int
 ext4_readpages(struct file *file, struct address_space *mapping,
 		struct list_head *pages, unsigned nr_pages)
 {
+	ext4_ios_read(mapping->host->i_sb, EXT4_IOS_REGULAR_DATA,
+		      ext4_blocks_per_page(mapping->host));
 	return mpage_readpages(mapping, pages, nr_pages, ext4_get_block);
 }
 
@@ -3300,12 +3304,12 @@ int ext4_discard_partial_page_buffers_no_lock(handle_t *handle,
 		if (PageUptodate(page))
 			set_buffer_uptodate(bh);
 
-		if (!buffer_uptodate(bh)) {
-			err = -EIO;
-			ll_rw_block(READ, 1, &bh);
-			wait_on_buffer(bh);
+		if (!bh_uptodate_or_lock(bh)) {
+			err = ext4_submit_bh_read(READ, bh, inode->i_sb,
+						  EXT4_IOS_REGULAR_DATA,
+						  ext4_blocks_per_page(inode));
 			/* Uhhuh. Read error. Complain and punt.*/
-			if (!buffer_uptodate(bh))
+			if (err)
 				goto next;
 		}
 
@@ -3422,12 +3426,11 @@ int ext4_block_zero_page_range(handle_t *handle,
 	if (PageUptodate(page))
 		set_buffer_uptodate(bh);
 
-	if (!buffer_uptodate(bh)) {
-		err = -EIO;
-		ll_rw_block(READ, 1, &bh);
-		wait_on_buffer(bh);
+	if (!bh_uptodate_or_lock(bh)) {
+		err = ext4_submit_bh_read(READ, bh, inode->i_sb,
+					  EXT4_IOS_REGULAR_DATA, 1);
 		/* Uhhuh. Read error. Complain and punt. */
-		if (!buffer_uptodate(bh))
+		if (err)
 			goto unlock;
 	}
 
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html