From patchwork Fri Jan 11 11:01:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10757765 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 E55AC14E5 for ; Fri, 11 Jan 2019 11:04:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 64D9129AF7 for ; Fri, 11 Jan 2019 11:04:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 55DF029BC7; Fri, 11 Jan 2019 11:04:53 +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 EC3F429BC4 for ; Fri, 11 Jan 2019 11:04:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 150C48E000E; Fri, 11 Jan 2019 06:04:52 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 1014E8E0001; Fri, 11 Jan 2019 06:04:52 -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 017798E000E; Fri, 11 Jan 2019 06:04:51 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by kanga.kvack.org (Postfix) with ESMTP id CE5548E0001 for ; Fri, 11 Jan 2019 06:04:51 -0500 (EST) Received: by mail-qt1-f199.google.com with SMTP id d31so16264293qtc.4 for ; Fri, 11 Jan 2019 03:04:51 -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=E1/V22YK1RqnSgKHi3tHzYVp+KRqmLHwTzVJ4IlRnC4=; b=d/eoSjZlEyH3lhJ73NVzu+t7/ulM7f86EYrhGKR9AqpZNf/wcAz3kYhvRi4z3QGb3K eVXoZq0ll1NpX9J+B9wucJFRVQynxIzMrR5yxPJTccVw5ZPesFbcNl3F5TWJXLKXD3w+ 2CVpPzgFQ4ZXHP962+5iB1KwPj8hpQSzhFWPkhmVVKiPf7nlsivimIRYgoeg/U6skAT9 iszt3Q05/HuxHmHagk/o9OqmPDGjugRCfc31TQmHNOWZ3B9J0NE0mUYIYm8XXufPnr+u 0WwLg8Jj+YDk1OkxQnX5FNZOgKqzvGvp7hiiPBekpZmcycrCrVUvCWWk48CtfbsRDAM7 0Iqw== 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: AJcUukdZjZCdyA5X09W8ZMpi2z0EpYgG+MyzF4VuYY0GhESeJ06zjlxq q5U3QxODbbDxZd99zrQSwshuuCvVdBXFAMh7Ih9qEmXymILGqMYf5Ca+JBmvEsmivCD9ZPYJgAw 4eVT4BiH++PA9sjKsOKstm9zb2zZ4PQIQFxc5gGclk/AQDhTsZOn8Lg4Gibk+h/lmyw== X-Received: by 2002:a37:b703:: with SMTP id h3mr12155811qkf.33.1547204691612; Fri, 11 Jan 2019 03:04:51 -0800 (PST) X-Google-Smtp-Source: ALg8bN5d8pKBu3hlqE2/3sq5BxnLjQc0YCIs6NxJg0JDrJeDepgpnMvKz6f2gTry2PKmTX+l7DFI X-Received: by 2002:a37:b703:: with SMTP id h3mr12155787qkf.33.1547204691047; Fri, 11 Jan 2019 03:04:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547204691; cv=none; d=google.com; s=arc-20160816; b=E/XM51P6QajUcbOmTGIQPKUYECxBv1DrUZja86vgMpzhIb3wB2La6N8503Mc4z3z1e 9IDU0LCEblMeCE25os2uS5Rn35XlyAc+zmPU3umrNGKXa8qZPSIZA0wMgrVHpIiftBHb PkOJBRbjcbG1DVRS43jbnYwcKpoQVUQse3da5hFpp+7zoZcSD6++sonE1iYRNHri91ud sHHFIAKiRTaEl/X93KGy0jvLpHQAAWrbwF29FUy04JT0nhrWZ7swpveI83ljiUi/Mpgf 2BWR+RJzcZOQQQ8JXt66Mqn7PDoV0Ht94kBaxmLoEWgfib1yLPtgkfe951v//ULO8MoS qo3g== 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=E1/V22YK1RqnSgKHi3tHzYVp+KRqmLHwTzVJ4IlRnC4=; b=EH1qKCarxa34WyVY2ajbSLQt9xIE3bCMeFzQOMGXhwoSym2GQqZuJPwbgouomT+YEU TeQI39gtN5FBfvzZN5I1Zfk/xKgL7K3ycPHHPBRXYS/o2eFevM8Wq20OwdpxCyCsWTKp xgzyS/1Ytuow0E/jFQ5zGR6oliNut+VbeQnppuGAo5DLyugcwOUU6i0SbxWQQVRtBN6I aGl21CMLAgALxZsKruX4yYBdmrIs6pjEvEnEc3w0Y/QUVzTopKz7aKCq8y4MexATWBk8 wH6FCkWn2un+lgvK3M/W83PmYLXevItS0T13J9UWXevU/0qupdA9EPhFMC87GeYJ2rC2 Jbtw== 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 l23si1010038qkg.227.2019.01.11.03.04.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 03:04:51 -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-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EF600AB439; Fri, 11 Jan 2019 11:04:49 +0000 (UTC) Received: from localhost (ovpn-8-28.pek2.redhat.com [10.72.8.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 277195D6B3; Fri, 11 Jan 2019 11:04:35 +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, 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 V13 12/19] block: loop: pass multi-page bvec to iov_iter Date: Fri, 11 Jan 2019 19:01:20 +0800 Message-Id: <20190111110127.21664-13-ming.lei@redhat.com> In-Reply-To: <20190111110127.21664-1-ming.lei@redhat.com> References: <20190111110127.21664-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 11 Jan 2019 11:04:50 +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 iov_iter is implemented on bvec itererator helpers, so it is safe to pass multi-page bvec to it, and this way is much more efficient than passing one page in each bvec. Reviewed-by: Christoph Hellwig Reviewed-by: Omar Sandoval Signed-off-by: Ming Lei --- drivers/block/loop.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index b8a0720d3653..28dd22c6f83f 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -511,21 +511,22 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, loff_t pos, bool rw) { struct iov_iter iter; + struct req_iterator rq_iter; struct bio_vec *bvec; struct request *rq = blk_mq_rq_from_pdu(cmd); struct bio *bio = rq->bio; struct file *file = lo->lo_backing_file; + struct bio_vec tmp; unsigned int offset; - int segments = 0; + int nr_bvec = 0; int ret; + rq_for_each_bvec(tmp, rq, rq_iter) + nr_bvec++; + if (rq->bio != rq->biotail) { - struct req_iterator iter; - struct bio_vec tmp; - __rq_for_each_bio(bio, rq) - segments += bio_segments(bio); - bvec = kmalloc_array(segments, sizeof(struct bio_vec), + bvec = kmalloc_array(nr_bvec, sizeof(struct bio_vec), GFP_NOIO); if (!bvec) return -EIO; @@ -534,10 +535,10 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, /* * The bios of the request may be started from the middle of * the 'bvec' because of bio splitting, so we can't directly - * copy bio->bi_iov_vec to new bvec. The rq_for_each_segment + * copy bio->bi_iov_vec to new bvec. The rq_for_each_bvec * API will take care of all details for us. */ - rq_for_each_segment(tmp, rq, iter) { + rq_for_each_bvec(tmp, rq, rq_iter) { *bvec = tmp; bvec++; } @@ -551,11 +552,10 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd, */ offset = bio->bi_iter.bi_bvec_done; bvec = __bvec_iter_bvec(bio->bi_io_vec, bio->bi_iter); - segments = bio_segments(bio); } atomic_set(&cmd->ref, 2); - iov_iter_bvec(&iter, rw, bvec, segments, blk_rq_bytes(rq)); + iov_iter_bvec(&iter, rw, bvec, nr_bvec, blk_rq_bytes(rq)); iter.iov_offset = offset; cmd->iocb.ki_pos = pos;