Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752590AbdFZMSK (ORCPT ); Mon, 26 Jun 2017 08:18:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47048 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751461AbdFZMR6 (ORCPT ); Mon, 26 Jun 2017 08:17:58 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 6851580F63 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ming.lei@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 6851580F63 From: Ming Lei To: Jens Axboe , Christoph Hellwig , Huang Ying , Andrew Morton , Alexander Viro Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Ming Lei Subject: [PATCH v2 29/51] block: bio: introduce single/multi page version of bio_for_each_segment_all() Date: Mon, 26 Jun 2017 20:10:12 +0800 Message-Id: <20170626121034.3051-30-ming.lei@redhat.com> In-Reply-To: <20170626121034.3051-1-ming.lei@redhat.com> References: <20170626121034.3051-1-ming.lei@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 26 Jun 2017 12:17:47 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2549 Lines: 69 This patches introduce bio_for_each_segment_all_sp() and bio_for_each_segment_all_mp(). bio_for_each_segment_all_sp() is for replacing bio_for_each_segment_all() in case that the returned bvec has to be single page bvec. bio_for_each_segment_all_mp() is for replacing bio_for_each_segment_all() in case that user wants to update the returned bvec via the pointer. Signed-off-by: Ming Lei --- include/linux/bio.h | 24 ++++++++++++++++++++++++ include/linux/blk_types.h | 6 ++++++ 2 files changed, 30 insertions(+) diff --git a/include/linux/bio.h b/include/linux/bio.h index bdbc9480229d..a4bb694b4da5 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -216,6 +216,30 @@ static inline void bio_advance_iter_mp(struct bio *bio, struct bvec_iter *iter, #define bio_for_each_segment_mp(bvl, bio, iter) \ __bio_for_each_segment_mp(bvl, bio, iter, (bio)->bi_iter) +/* + * This helper returns each bvec stored in bvec table directly, + * so the returned bvec points to one multipage bvec in the table + * and caller can update the bvec via the returnd pointer. + */ +#define bio_for_each_segment_all_mp(bvl, bio, i) \ + bio_for_each_segment_all((bvl), (bio), (i)) + +/* + * This helper returns singlepage bvec to caller, and the sp bvec + * is generated in-flight from multipage bvec stored in bvec table. + * So we can _not_ change the bvec stored in bio->bi_io_vec[] via + * this helper. + * + * If someone need to update bvec in the table, please use + * bio_for_each_segment_all_mp() and make sure it is correctly used + * since the bvec points to one multipage bvec. + */ +#define bio_for_each_segment_all_sp(bvl, bio, i, bi) \ + for ((bi).iter = BVEC_ITER_ALL_INIT, i = 0, bvl = &(bi).bv; \ + (bi).iter.bi_idx < (bio)->bi_vcnt && \ + (((bi).bv = bio_iter_iovec((bio), (bi).iter)), 1); \ + bio_advance_iter((bio), &(bi).iter, (bi).bv.bv_len), i++) + #define bio_iter_last(bvec, iter) ((iter).bi_size == (bvec).bv_len) static inline unsigned bio_segments(struct bio *bio) diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index e210da6d14b8..3650932f2080 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -118,6 +118,12 @@ struct bio { #define BIO_RESET_BYTES offsetof(struct bio, bi_max_vecs) +/* this iter is only for implementing bio_for_each_segment_rd() */ +struct bvec_iter_all { + struct bvec_iter iter; + struct bio_vec bv; /* in-flight singlepage bvec */ +}; + /* * bio flags */ -- 2.9.4