From patchwork Wed Nov 21 03:23:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10691709 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 6666216B1 for ; Wed, 21 Nov 2018 03:27:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50A2F2B40C for ; Wed, 21 Nov 2018 03:27:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 417332B413; Wed, 21 Nov 2018 03:27:20 +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 C41122B415 for ; Wed, 21 Nov 2018 03:27:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EE2516B23A7; Tue, 20 Nov 2018 22:27:18 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E917B6B23A8; Tue, 20 Nov 2018 22:27:18 -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 D81946B23A9; Tue, 20 Nov 2018 22:27:18 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by kanga.kvack.org (Postfix) with ESMTP id A94F46B23A7 for ; Tue, 20 Nov 2018 22:27:18 -0500 (EST) Received: by mail-qk1-f199.google.com with SMTP id y83so5410722qka.7 for ; Tue, 20 Nov 2018 19:27:18 -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=TSBLWrtYdTLJ/i/PjrMa6QoZNwXwGBQxVHczPRHzxZo=; b=HNh1xdhvQM0lPtdB86LOWo/Hkp65SHpQ99G7nl3QeXKiqugoF/33DyEztk/WgUDQ31 ex89r8Kh1MdJ6oSxjwmA3/ySegSAU1eth1b0aKgz98836VywAdUNyAmR8WJldK9of4eO c8J3Vj6J2cZ7beRvhoX2hMlKXhWisLHQTurZRnyqWzxhU2EdanmhlPI9wj2j9jhvhVwB U6ndcNWHzcN4w6mnwbpJcRTNDjwBDK3d2mJD9B/AgF4nRwEMWFdYlr5NwoiEyBw/aNuS C1WhsgObzQwKE7xOy9hUu6pLT7E/AY8VmHzujaT2/J/xtmDL80b4bx03x3njqtbcagPC WdPA== 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: AA+aEWZGUVGndWP0QNfqQfAYT0dV+3WroJ4SUAsB97Ch/Z7hebC/oWau uHAHdl3l43YPMXI+2PVRDtoX7348z/2XLPobDiqZd6c6AnrqcOPN/f4a0MhXALiZPByOzd/LQrm e0FJNiWv0neqKI+TjES4UL4xYrq/Y/URoBVHLLMUQcMi9pSa13IjgBZWHXzscyuCWaA== X-Received: by 2002:ae9:edd8:: with SMTP id c207mr3924879qkg.184.1542770838447; Tue, 20 Nov 2018 19:27:18 -0800 (PST) X-Google-Smtp-Source: AFSGD/XTb0Z1Wij/ybRJqgIsrDHu+bSpPLlHDUZiAkZ7tkpZGz7twgTJInmQSpDIgBMXq3JlvO13 X-Received: by 2002:ae9:edd8:: with SMTP id c207mr3924856qkg.184.1542770837798; Tue, 20 Nov 2018 19:27:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542770837; cv=none; d=google.com; s=arc-20160816; b=kpTfFjyS1MVVHT3ClzpY7fh2Yxuvmoiuz/EWBoo5sxbnrdqIABHkCrPKN5BToL4iPS hbYHNeX7T+YGtJEGHq75T1K1DnfcYyKko16jO5/C4cWzPN9vMpFktt4RBrB7b65eqNSB ygltvjp7pd9hOG9wZ0zGnhiNKouFivP++cYVfawJSj4lhaT23VywV8LZ1Zc85raS3sCo OJ+xQOSXV/4aTHTgQ65PKB3JMnDnAMA0A2nU/a/u0W9fs0icNei8MJ9f5wujIdVPeyNg hAOCtGk7KLD7oN6QcJ6RGi8fiFxQY5BvrBlyWQqI2zcwmAJn0RciuU6/uxotEbRTJx5/ pd7w== 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=TSBLWrtYdTLJ/i/PjrMa6QoZNwXwGBQxVHczPRHzxZo=; b=F5NMpUwsorG2xb4MBwItYO5xOgAkOD0xhnKwBzjcJM+PZhjm+Ea1I+6NT709rQBHDl LICC0ZZOyUdbttDq8Plzc3h2dsfciuXxu0S7yHJDz/GhDKhPXGFnGQBiQ15k3zTl4Eqv 8GGexCnQhYFq1LnkI622zqn/1y932hO4RNp0PP2vALRe1qeJTfKH3yX0imYHHKeWmNIX tXnPqGK1KuLQTekgVbcjnX0rFN1lG1+A8TJcH1cs+qp1vCWppUzoGr4WwYP9UnRb49LI PhlVlC1SeqIHXYyHv/7vREdnBnQWKaRf+rGI7g9mx5w3uyQPpKISA4pgphZyXSfK7dSe Fwyw== 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 p190si2376772qke.19.2018.11.20.19.27.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 19:27:17 -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-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9CB3E30B2537; Wed, 21 Nov 2018 03:27:16 +0000 (UTC) Received: from localhost (ovpn-8-21.pek2.redhat.com [10.72.8.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 991F47D2F2; Wed, 21 Nov 2018 03:27:01 +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 V11 10/19] block: loop: pass multi-page bvec to iov_iter Date: Wed, 21 Nov 2018 11:23:18 +0800 Message-Id: <20181121032327.8434-11-ming.lei@redhat.com> In-Reply-To: <20181121032327.8434-1-ming.lei@redhat.com> References: <20181121032327.8434-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 21 Nov 2018 03:27:16 +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. Signed-off-by: Ming Lei Reviewed-by: Christoph Hellwig --- drivers/block/loop.c | 20 ++++++++++---------- include/linux/blkdev.h | 4 ++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 176ab1f28eca..e3683211f12d 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c @@ -510,21 +510,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; @@ -533,10 +534,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++; } @@ -550,11 +551,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; diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 1ad6eafc43f2..a281b6737b61 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -805,6 +805,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))