linux-kernel - [PATCH] block: fix bio_add_page for non trivial merge_bvec

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>] [day] [month] [year] [list]

Message-ID: <m3lk0gh0wr.fsf@dmon-lap.sw.ru>
Date:	Sat, 05 Jul 2008 18:16:04 +0400
From:	Dmitri Monakhov <dmonakhov@...nvz.org>
To:	linux-kernel@...r.kernel.org
CC:	Jens Axboe <jens.axboe@...cle.com>,
	Alasdair G Kergon <agk@...hat.com>
Subject: [PATCH] block: fix bio_add_page for non trivial merge_bvec_fn case(v2)

We have to properly decrease bi_size in order to merge_bvec_fn return
right result.  Otherwise this result in false merge rejects for two
absolutely valid bio_vecs.  This may cause significant performance penalty
for example Itanium: page_size ==16k, fs_block_size == 1k and block device
is raid with small chunk_size.

Changes against v1:
 According to axboe@ and agk@ we don't have to decrease bi_vcnt and segments
 counters, so patch now looks like one line fix.

Signed-off-by: Dmitri Monakhov <dmonakhov@...nvz.org>
---
 fs/bio.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/bio.c b/fs/bio.c
index 25f1af0..0e6ed2a 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -330,7 +330,8 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page
 				struct bvec_merge_data bvm = {
 					.bi_bdev = bio->bi_bdev,
 					.bi_sector = bio->bi_sector,
-					.bi_size = bio->bi_size,
+					.bi_size = bio->bi_size -
+							(prev->bv_len - len),
 					.bi_rw = bio->bi_rw,
 				};
 
-- 
1.5.4.rc4

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