From patchwork Sat Oct 29 08:08:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 9403361 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3AEA260587 for ; Sat, 29 Oct 2016 08:25:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 271D22A60D for ; Sat, 29 Oct 2016 08:25:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1BBFF2A623; Sat, 29 Oct 2016 08:25:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AAAF92A60D for ; Sat, 29 Oct 2016 08:25:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965024AbcJ2IZE (ORCPT ); Sat, 29 Oct 2016 04:25:04 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33116 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S943070AbcJ2IOd (ORCPT ); Sat, 29 Oct 2016 04:14:33 -0400 Received: by mail-pf0-f196.google.com with SMTP id a136so1389pfa.0; Sat, 29 Oct 2016 01:14:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+dLnPssRzqxKvT333dyQ4X7hFbmjCMncp0BWmi5SUn0=; b=gY4HOX7MkiVFnE0pSPl+J3++M3ik9rYjTNeV/YCuxnrNFk3IPFDFv/sj/swjMu1bRe xhVQM1cLRylTQkQqchyxiNSUp2n1SW52a6+5e2hfcVwVEol+KYXUS9O/r8lpcCOguoVS s6kxvCvhFdYmwMp2s5FoHlzEGA6ptE4+nzBTG+7f7sMbzJFHzXZTgMxZdMaoJ31dWU0j HYmOBk9sJxbEiF6erYwpXagQjBmREHBb+ovXhf4Y8vXXnoC4uPdgqEkepW2Z0u+Gufmt d4uNi291MYyxnf1LhHUWW4yrwkEV1uE+9gkrUGbwCj+28XvNbXr+fFFS/0Tvk/oWBWM9 +ELA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+dLnPssRzqxKvT333dyQ4X7hFbmjCMncp0BWmi5SUn0=; b=fn616KkhVXWdNa2l663GJ0feiMepHNTc0pBPejUYJpjL/tET0waozfqPwAX3zkAFdQ VeTg9zqFM6uNaryYE2hevv2wyHZ2WlOvA332t5JrB30ormr4P/6nV7APlht2aRm/t9T1 IIkH6u9mFjLCUn5ytBXgdLVz+YfA8uDy/0WCHuXw3i1JfVJXa3L5xRSHekbGzCAwX077 1AHaAXHSwTTpYzDJRkyV5OWZPxx9Rkd8Zlon/gJKkaQAUnQCODXp7SowOwvmT4ihv+8a a2q0AqVzWCNavBvjS8BJAMtgeI9nBntvY4YcBok9ygu4NEqZYAV0Rpr0XkAGeQk4nJEO xAQQ== X-Gm-Message-State: ABUngveTqsgQjaahkx7IIVTmeGEu2lmY1o8V/sBMDbsfDfE/c9jQZWCQGy4ZIeVVNL8PAQ== X-Received: by 10.98.44.212 with SMTP id s203mr31877348pfs.84.1477728872984; Sat, 29 Oct 2016 01:14:32 -0700 (PDT) Received: from localhost ([45.34.23.101]) by smtp.gmail.com with ESMTPSA id s25sm23485785pfj.93.2016.10.29.01.14.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Oct 2016 01:14:32 -0700 (PDT) From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, Christoph Hellwig , "Kirill A . Shutemov" , Ming Lei , Mike Christie , Hannes Reinecke , Keith Busch , Mike Snitzer , Johannes Berg Subject: [PATCH 33/60] block: introduce bio_for_each_segment_mp() Date: Sat, 29 Oct 2016 16:08:32 +0800 Message-Id: <1477728600-12938-34-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477728600-12938-1-git-send-email-tom.leiming@gmail.com> References: <1477728600-12938-1-git-send-email-tom.leiming@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This helper is used to iterate multipage bvec and it is required in bio_clone(). Signed-off-by: Ming Lei --- include/linux/bio.h | 38 +++++++++++++++++++++++++++++++++----- include/linux/bvec.h | 37 ++++++++++++++++++++++++++++++++----- 2 files changed, 65 insertions(+), 10 deletions(-) diff --git a/include/linux/bio.h b/include/linux/bio.h index fa71f6a57f81..17852ba0e40f 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -65,6 +65,9 @@ #define bio_sectors(bio) ((bio)->bi_iter.bi_size >> 9) #define bio_end_sector(bio) ((bio)->bi_iter.bi_sector + bio_sectors((bio))) +#define bio_iter_iovec_mp(bio, iter) \ + bvec_iter_bvec_mp((bio)->bi_io_vec, (iter)) + /* * Check whether this bio carries any data or not. A NULL bio is allowed. */ @@ -167,15 +170,31 @@ static inline void *bio_data(struct bio *bio) #define bio_for_each_segment_all(bvl, bio, i) \ for (i = 0, bvl = (bio)->bi_io_vec; i < (bio)->bi_vcnt; i++, bvl++) -static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter, - unsigned bytes) +static inline void __bio_advance_iter(struct bio *bio, struct bvec_iter *iter, + unsigned bytes, bool mp) { iter->bi_sector += bytes >> 9; - if (bio_no_advance_iter(bio)) + if (bio_no_advance_iter(bio)) { iter->bi_size -= bytes; - else - bvec_iter_advance(bio->bi_io_vec, iter, bytes); + } else { + if (!mp) + bvec_iter_advance(bio->bi_io_vec, iter, bytes); + else + bvec_iter_advance_mp(bio->bi_io_vec, iter, bytes); + } +} + +static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter, + unsigned bytes) +{ + __bio_advance_iter(bio, iter, bytes, false); +} + +static inline void bio_advance_iter_mp(struct bio *bio, struct bvec_iter *iter, + unsigned bytes) +{ + __bio_advance_iter(bio, iter, bytes, true); } #define __bio_for_each_segment(bvl, bio, iter, start) \ @@ -187,6 +206,15 @@ static inline void bio_advance_iter(struct bio *bio, struct bvec_iter *iter, #define bio_for_each_segment(bvl, bio, iter) \ __bio_for_each_segment(bvl, bio, iter, (bio)->bi_iter) +#define __bio_for_each_segment_mp(bvl, bio, iter, start) \ + for (iter = (start); \ + (iter).bi_size && \ + ((bvl = bio_iter_iovec_mp((bio), (iter))), 1); \ + bio_advance_iter_mp((bio), &(iter), (bvl).bv_len)) + +#define bio_for_each_segment_mp(bvl, bio, iter) \ + __bio_for_each_segment_mp(bvl, bio, iter, (bio)->bi_iter) + #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/bvec.h b/include/linux/bvec.h index 12c53a0eee52..9df9e582bd3f 100644 --- a/include/linux/bvec.h +++ b/include/linux/bvec.h @@ -128,16 +128,29 @@ struct bvec_iter { .bv_offset = bvec_iter_offset((bvec), (iter)), \ }) -static inline void bvec_iter_advance(const struct bio_vec *bv, - struct bvec_iter *iter, - unsigned bytes) +#define bvec_iter_bvec_mp(bvec, iter) \ +((struct bio_vec) { \ + .bv_page = bvec_iter_page_mp((bvec), (iter)), \ + .bv_len = bvec_iter_len_mp((bvec), (iter)), \ + .bv_offset = bvec_iter_offset_mp((bvec), (iter)), \ +}) + +static inline void __bvec_iter_advance(const struct bio_vec *bv, + struct bvec_iter *iter, + unsigned bytes, bool mp) { WARN_ONCE(bytes > iter->bi_size, "Attempted to advance past end of bvec iter\n"); while (bytes) { - unsigned iter_len = bvec_iter_len(bv, *iter); - unsigned len = min(bytes, iter_len); + unsigned len; + + if (mp) + len = bvec_iter_len_mp(bv, *iter); + else + len = bvec_iter_len_sp(bv, *iter); + + len = min(bytes, len); bytes -= len; iter->bi_size -= len; @@ -150,6 +163,20 @@ static inline void bvec_iter_advance(const struct bio_vec *bv, } } +static inline void bvec_iter_advance(const struct bio_vec *bv, + struct bvec_iter *iter, + unsigned bytes) +{ + __bvec_iter_advance(bv, iter, bytes, false); +} + +static inline void bvec_iter_advance_mp(const struct bio_vec *bv, + struct bvec_iter *iter, + unsigned bytes) +{ + __bvec_iter_advance(bv, iter, bytes, true); +} + #define for_each_bvec(bvl, bio_vec, iter, start) \ for (iter = (start); \ (iter).bi_size && \