From patchwork Mon Jan 21 08:17:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10773219 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 7238C1390 for ; Mon, 21 Jan 2019 08:21:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6496429B02 for ; Mon, 21 Jan 2019 08:21:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 57A7F29EEA; Mon, 21 Jan 2019 08:21:04 +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 DDA8A29B02 for ; Mon, 21 Jan 2019 08:21:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2A3E8E002F; Mon, 21 Jan 2019 03:21:02 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id CDA908E0025; Mon, 21 Jan 2019 03:21:02 -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 BA4998E002F; Mon, 21 Jan 2019 03:21:02 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by kanga.kvack.org (Postfix) with ESMTP id 8BFDF8E0025 for ; Mon, 21 Jan 2019 03:21:02 -0500 (EST) Received: by mail-qk1-f197.google.com with SMTP id p79so18689364qki.15 for ; Mon, 21 Jan 2019 00:21:02 -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=NAJKvHdjxb7DLCXVIzyMQVkFlr/qOzN82sw+t/1K9Ec=; b=Cg3YNAPteoA8r4Q2sLZ2YFDG4gKRIHQHeBLOOTqnbElZq6PgD7Igh2CCHpJnMIuDTu 8kzAmFPu7c351TSVRt88E5O5lSpkGuMZlfpWo523WJ+2Y5jF+VfeAUqeidWx9KRFSUNo jQlQtvCrzzTDQ8Q1HkiowG4RC4pVh1JlwW4XmavzISUbFtk7CwIN7Prpx3ckohRJ5vs9 RFnpc7NHzfF9t4Z6x3yQwKirkh8OkBXdnOPEIFWmg6itlZyj2bTlAtv5wX9ZIRT6vSZ/ ab5SkcteQ3HsxGrfiITw5fVpgsN24u4Z+5wC4jY+LYnciQ78EsKh/gMRO9HqW/Q0ImIf WGkw== 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: AJcUukcrMUbUNOUk/IbVScdhRD8Xfr4CHq05HZBeEhAXDeR8PZpBtqQK u54tjm66LsmuyYW9pp53Wi0oK8kLeeOwUeGye/VFq9M1bSp7njVn/CjdCg1QBD//kZdUJQAxN70 b3S9F0LnaYoJAA+3/jgo/tq/CW/QLW1Un/XBVlwNZIxj3uRyCrzvSdQ2f+MymnT7F6w== X-Received: by 2002:ac8:203:: with SMTP id k3mr26637684qtg.64.1548058862345; Mon, 21 Jan 2019 00:21:02 -0800 (PST) X-Google-Smtp-Source: ALg8bN7s0RBIdSlNxannykfWF/8nNM+ZKcZeGt1jb2X3MaIAAgnzIwGJ3M6U4BBIaI1sJSGeQLpE X-Received: by 2002:ac8:203:: with SMTP id k3mr26637663qtg.64.1548058861874; Mon, 21 Jan 2019 00:21:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548058861; cv=none; d=google.com; s=arc-20160816; b=N/70Q2uVgJIuPEleKLnRu1eMxpxg30HZEWBHAh+cXtWtVWR1IbFfCIhaUtPpOQXd3O b6aq4+AcAADnqDg+E+BcXGNSHhHuG2X/GAmYw9N7XO1l0yTs6vuAVvAKPduN+PLH9KFn xtwOIGbpnrTXzFJqQJuVj3B7bvul6feEnY4AidSIp2+KnAb7zg92cu1fdMmk37WYdlWY h8ExslDzZ8ZNHjhuUNOuaVbfbJRzOEo+6fnZZ1rkkdQYW8xtX1Ef0j2v/Utsyb2oOTUP fRlBHLOACUdeRl/fXpeiNQpsi37XRVm9qi1IxlpULDAbd2oQStAwio1G6l0kXQLeYVTg UDAg== 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=NAJKvHdjxb7DLCXVIzyMQVkFlr/qOzN82sw+t/1K9Ec=; b=TIAAwxWqISEB3ZPJpn0J5ikfVt71Du7xhcRRNzG3mX7s3Puw/fmADGJdlY4aTuhyBq iG2+iY2tHZUiuzfiTmuXJTqGZYjbUgIk2lWsYoePbpSYiSH8gJCmVCMNQ57e/+081UPt h8k6xNsbGOwWc79o1/4FRDv04jldODx4Ru4Ap2FMMRmN8azfM46SOAWvcFj8DQGm/CJR M8Qwuat9gS1AeAVT36GBSDv96IrlSvbvUYpj3b1fa/Ou/ZVYJhD9Sh0eOOBMAxXCTvcu PdUhUTjjEb7Z0GVASaeSXiSu+VB4k6lRpMwNHMyJGkpyGDH5tQdqvpH3pAWLI3PUlGBd 2zcA== 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 g14si2282589qvj.193.2019.01.21.00.21.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 00:21:01 -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 97BC7C0B2014; Mon, 21 Jan 2019 08:21:00 +0000 (UTC) Received: from localhost (ovpn-8-22.pek2.redhat.com [10.72.8.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85D09608E1; Mon, 21 Jan 2019 08:20:59 +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 V14 11/18] block: loop: pass multi-page bvec to iov_iter Date: Mon, 21 Jan 2019 16:17:58 +0800 Message-Id: <20190121081805.32727-12-ming.lei@redhat.com> In-Reply-To: <20190121081805.32727-1-ming.lei@redhat.com> References: <20190121081805.32727-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.31]); Mon, 21 Jan 2019 08:21:01 +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 cf5538942834..168a151aba49 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_mp_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_mp_bvec * API will take care of all details for us. */ - rq_for_each_segment(tmp, rq, iter) { + rq_for_each_mp_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;