From patchwork Mon Nov 26 02:17:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10697349 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7396C17FE for ; Mon, 26 Nov 2018 02:19:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 62513298A1 for ; Mon, 26 Nov 2018 02:19:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5639629A2C; Mon, 26 Nov 2018 02:19:22 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED92E298A1 for ; Mon, 26 Nov 2018 02:19:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 26B406B3F74; Sun, 25 Nov 2018 21:19:21 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 241466B3F76; Sun, 25 Nov 2018 21:19:21 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 10B586B3F77; Sun, 25 Nov 2018 21:19:21 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by kanga.kvack.org (Postfix) with ESMTP id D86F96B3F74 for ; Sun, 25 Nov 2018 21:19:20 -0500 (EST) Received: by mail-qt1-f200.google.com with SMTP id u32so15455076qte.1 for ; Sun, 25 Nov 2018 18:19:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=JmcaCNMSWSxCE7cr5FHQOO01hm2NHoIVxTuAFK08snc=; b=DtsWVcpRG5DzFZjR9jvVrUaqoSDGiTuzYC22Gci9p6INWU7hg6ulJy77vsYtZzgfl6 i/GSMG7WsIq84bvQ8SmWe5JF4AlABU+6aB8Pbcy+/ox22rCUBlX0OjtOGRC3GCt3QVaH LDUHogizH8v56ZL8TsKO1pjraT8I0mMBaaveYnv8yT4ic4rCF57PRvd3+/VF6oof74C4 HfpNc1cMJFk0A7+ZJZ4jwqGe39h1KLTzlL8CCQpsDCfUSTH/JoInlYfk3BL6aYXZm56b 2aeQKCYjssLJk/lYU+BIQPgEdpRI2DD+U71ObolYWApEg1cSPuPm/lVodju5oHb7hhJp rRfw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: AGRZ1gJCIKbC+cxFwqKjlHKWXftyS0u15Pyro2etYcNSQGtmha8k6nSq sEeeR21XWyqnXCcIJCFGucFPRdq20uuLzPNvOJVR58y4cgO44+uuwutbThaoU/mTxdyVyDTRNeh ifOrg5nuswaZt09JPsxQZGlf7sYBMClRIGPryf+68zBWnIt0sfblSrxg9W5r+Xf/qxw== X-Received: by 2002:aed:2391:: with SMTP id j17mr23448851qtc.205.1543198760651; Sun, 25 Nov 2018 18:19:20 -0800 (PST) X-Google-Smtp-Source: AJdET5cB4Rvw1xKFgrUnULbJYfltVJ8BA2Y2wqF7hYga+NIFK3/fQgc+ayrVAYzmqJf6WLdPiare X-Received: by 2002:aed:2391:: with SMTP id j17mr23448830qtc.205.1543198760064; Sun, 25 Nov 2018 18:19:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543198760; cv=none; d=google.com; s=arc-20160816; b=ylty6Jaj64NRSXER9PbtBzTTap7XlKEMSLAGXO0zj3TPsf7+R+Nq8C3m13hdftfjsW pJV/wRSFAZWMbXi58dX0iGNiPwsvLvo/gAXSmGYzarnkmNvqqznuRCW6LqYPastmVns8 LnOl6YcPYgQgfJWm7Wt4ybulPQk2USE1/G3JIFEBp+pT5GOIQ09aF7U8HI10SxT4dCV1 fvAocW3XgTLIknXWgeXckO3Sd49Nzh+gM5STNBo6WSQiNtQ2Y6/UZeTIndKlwsZ5ZRXS a4COvOCUwDcEpG9vV3lvJ6pj+aA5stV3x8FpoFGpEzvB+SYZlzU/8QLPUvaOkxW9iJ/I 6Xpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=JmcaCNMSWSxCE7cr5FHQOO01hm2NHoIVxTuAFK08snc=; b=U9cG/Og/WZJiC8N2HSffIyqNXGD16PnvfPL4LP08E4yXcNlrm3epKJYupgWHuwCXYJ kvQ9Z5LiN/ukkEHWXPlUJhu3Oa8I3R/uXThUyOKyvvG2Ln5LluVdofDM8HH5K4SUUkxj Hnki8xD2xYdLgCNx4E8YvyW6bjkkZW/FnO+NKSoQQWqbFo+8c3nqrLW4Lfm+atw1D5FI rIcmHV4MR0XnlSnpskTPX08MxdIJlH4JKgarKpPRV0TnVR3Podn0wz7/xpQA4cCV3WOZ rT5cjTABSDmbCfRp59rB1cc4fy6sHnJCrhvFcLouH7+9tpZKtDsCqh3h9rg7+weDX+Zg 1IGA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id g14si5517qti.392.2018.11.25.18.19.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Nov 2018 18:19:20 -0800 (PST) Received-SPF: pass (google.com: domain of ming.lei@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EDB3130832D3; Mon, 26 Nov 2018 02:19:18 +0000 (UTC) Received: from localhost (ovpn-8-19.pek2.redhat.com [10.72.8.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0E4EC5458D; Mon, 26 Nov 2018 02:19:03 +0000 (UTC) From: Ming Lei To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Theodore Ts'o , Omar Sandoval , Sagi Grimberg , Dave Chinner , Kent Overstreet , Mike Snitzer , dm-devel@redhat.com, Alexander Viro , linux-fsdevel@vger.kernel.org, Shaohua Li , linux-raid@vger.kernel.org, David Sterba , linux-btrfs@vger.kernel.org, "Darrick J . Wong" , linux-xfs@vger.kernel.org, Gao Xiang , Christoph Hellwig , linux-ext4@vger.kernel.org, Coly Li , linux-bcache@vger.kernel.org, Boaz Harrosh , Bob Peterson , cluster-devel@redhat.com, Ming Lei Subject: [PATCH V12 08/20] block: introduce bio_for_each_bvec() and rq_for_each_bvec() Date: Mon, 26 Nov 2018 10:17:08 +0800 Message-Id: <20181126021720.19471-9-ming.lei@redhat.com> In-Reply-To: <20181126021720.19471-1-ming.lei@redhat.com> References: <20181126021720.19471-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 26 Nov 2018 02:19:19 +0000 (UTC) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP bio_for_each_bvec() is used for iterating over multi-page bvec for bio split & merge code. rq_for_each_bvec() can be used for drivers which may handle the multi-page bvec directly, so far loop is one perfect use case. Reviewed-by: Omar Sandoval Signed-off-by: Ming Lei Reviewed-by: Christoph Hellwig --- include/linux/bio.h | 10 ++++++++++ include/linux/blkdev.h | 4 ++++ include/linux/bvec.h | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/include/linux/bio.h b/include/linux/bio.h index 6a0ff02f4d1c..46fd0e03233b 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -156,6 +156,16 @@ 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_bvec(bvl, bio, iter, start) \ + for (iter = (start); \ + (iter).bi_size && \ + ((bvl = bvec_iter_bvec((bio)->bi_io_vec, (iter))), 1); \ + bio_advance_iter((bio), &(iter), (bvl).bv_len)) + +/* iterate over multi-page bvec */ +#define bio_for_each_bvec(bvl, bio, iter) \ + __bio_for_each_bvec(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/blkdev.h b/include/linux/blkdev.h index 399a7a415609..fa263de3f1d1 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -799,6 +799,10 @@ struct req_iterator { __rq_for_each_bio(_iter.bio, _rq) \ bio_for_each_segment(bvl, _iter.bio, _iter.iter) +#define rq_for_each_bvec(bvl, _rq, _iter) \ + __rq_for_each_bio(_iter.bio, _rq) \ + bio_for_each_bvec(bvl, _iter.bio, _iter.iter) + #define rq_iter_last(bvec, _iter) \ (_iter.bio->bi_next == NULL && \ bio_iter_last(bvec, _iter.iter)) diff --git a/include/linux/bvec.h b/include/linux/bvec.h index babc6316c117..d441486db605 100644 --- a/include/linux/bvec.h +++ b/include/linux/bvec.h @@ -65,6 +65,13 @@ struct bvec_iter { #define bvec_iter_page_idx(bvec, iter) \ (bvec_iter_offset((bvec), (iter)) / PAGE_SIZE) +#define bvec_iter_bvec(bvec, iter) \ +((struct bio_vec) { \ + .bv_page = bvec_iter_page((bvec), (iter)), \ + .bv_len = bvec_iter_len((bvec), (iter)), \ + .bv_offset = bvec_iter_offset((bvec), (iter)), \ +}) + /* For building single-page bvec(segment) in flight */ #define segment_iter_offset(bvec, iter) \ (bvec_iter_offset((bvec), (iter)) % PAGE_SIZE)