On Mon, 2018-07-16 at 19:45 +0800, Ming Lei wrote: > On Sat, Jul 14, 2018 at 6:29 AM, Martin Wilck <mwilck@xxxxxxxx> > wrote: > > Hi Ming & Jens, > > > > On Fri, 2018-07-13 at 12:54 -0600, Jens Axboe wrote: > > > On 7/12/18 5:29 PM, Ming Lei wrote: > > > > > > > > Maybe you can try the following patch from Christoph to see if > > > > it > > > > makes a > > > > difference: > > > > > > > > https://marc.info/?l=linux-kernel&m=153013977816825&w=2 > > > > > > That's not a bad idea. > > > > Are you saying that the previous "nasty hack" in > > bio_iov_iter_get_pages() was broken, and the new one is not? > > I've scratched my head over that (old) code lately, but I couldn't > > spot > > an actual error in it. > > Yeah, I think the new patch in above link is better, and looks its > correctness > is easy to prove. > > https://marc.info/?t=152812081400001&r=1&w=2 > > So please test the patch if possible. I haven't tested yet, but upon further inspection, I can tell that the current code (without Christoph's patch) is actually broken if the function is called with bio->bi_vcnt > 0. The following patch explains the problem. AFAICS, Christoph's new code is correct. >From b75adc856119346e02126cf8975755300f2d9b7f Mon Sep 17 00:00:00 2001 From: Martin Wilck <mwilck@xxxxxxxx> Date: Wed, 18 Jul 2018 01:56:37 +0200 Subject: [PATCH] block: bio_iov_iter_get_pages: fix size of last iovec If the last page of the bio is not "full", the length of the last vector bin needs to be corrected. This bin has the index (bio->bi_vcnt - 1), but in bio->bi_io_vec, not in the "bv" helper array which is shifted by the value of bio->bi_vcnt at function invocation. Signed-off-by: Martin Wilck <mwilck@xxxxxxxx> --- block/bio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/bio.c b/block/bio.c index 53e0f0a..c22e76f 100644 --- a/block/bio.c +++ b/block/bio.c @@ -913,7 +913,7 @@ int bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter) bv[0].bv_offset += offset; bv[0].bv_len -= offset; if (diff) - bv[bio->bi_vcnt - 1].bv_len -= diff; + bio->bi_io_vec[bio->bi_vcnt - 1].bv_len -= diff; iov_iter_advance(iter, size); return 0; -- 2.17.1
