From patchwork Wed Nov 21 03:23:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10691647 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 537DF1923 for ; Wed, 21 Nov 2018 03:26:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D4B72B406 for ; Wed, 21 Nov 2018 03:26:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30D532B40A; Wed, 21 Nov 2018 03:26:10 +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 AEFD82B409 for ; Wed, 21 Nov 2018 03:26:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E205D6B239B; Tue, 20 Nov 2018 22:26:08 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id DCDA96B239C; Tue, 20 Nov 2018 22:26:08 -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 C97B56B239D; Tue, 20 Nov 2018 22:26:08 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by kanga.kvack.org (Postfix) with ESMTP id 9C1E86B239B for ; Tue, 20 Nov 2018 22:26:08 -0500 (EST) Received: by mail-qt1-f198.google.com with SMTP id j5so2168383qtk.11 for ; Tue, 20 Nov 2018 19:26:08 -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=ctB9bvpZ9ruaYVuIaoGAbYczS2Xsp8WdFrFGH1VOZb8=; b=gm1jJ40IrZX7yjgB7n1QCX57OGtp0AwbpoE8VKcH5o6ljwGGfX+Qe11NdvvIPP1F+o DJYgyf5xBDQrNGmNiwL1yW/ffSwdvdCNrRUmtmSQXeYGBYO21ld5vmFlhyzn2uGSeOXC dzMGEX4OPo9MOLEyfn7Uek8XGv17DCO0RCDGmxBNTNyEcCC33yEBZx5pYCAtimFLdnZq OZhlpuzo45yyKL5MSps+BWH4IUU2atL9LTzwSn72MlWcwHt9Ta4yyv02bktfFIxJGeXu 8rEP4dSum2mq605HNFXDQweHUpc0MfLoVy4bQ/G9c1blEzrpFOzEmHqSj9DoXs0tmVZF DWgQ== 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+aEWbnBV8YTBdBWXlhufDbbamspA6uhxNyj+O1+t9rtBvBrRYxFmDj iQlzJ45BIVdE7klIQsSknFeGwixSK1xyGhAaYnisIy1MIy5B8Db+VeJf0IqJRK5BLdSRXWMlpoV PWBfXDh1MmXso+lw4xKr8THp7devyvMb9wAG2jSueaRZL9ewaat9G1vUpA+b1mA8PuA== X-Received: by 2002:a37:f8c:: with SMTP id 12mr1132480qkp.48.1542770768417; Tue, 20 Nov 2018 19:26:08 -0800 (PST) X-Google-Smtp-Source: AFSGD/WUTBqFVDnU4fS0tIQ1HCepH/Vq9GXJEgA6fnbWB48lpUV2DXfNxXh3US6gbjwQLRHrKsPj X-Received: by 2002:a37:f8c:: with SMTP id 12mr1132459qkp.48.1542770767642; Tue, 20 Nov 2018 19:26:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542770767; cv=none; d=google.com; s=arc-20160816; b=p43NRftd6LrLFVVPn6EBxRBWgxc6xkkbb229Dzlk8dZrs1ga3lskyyuVKhFkj/hM2+ fXzgche8f+iPGy+Z3r/nf+BtzZyjMyNZbMI90EsXg4jp4q5rt24cv3jn9rQbLzib0UxL +hxJWWzZXffpyE2VEbySD+7aGxBMBw+LdB04UX8FUI22zY77/py+byPmCPiRa5cHB0Zm lKFo+bBZLqQRQ2w1aj9lk3l7o+qG0L08k9NLAPtXpq6b7PK8YSW5iIrAk+bFF/dQI2D/ aeBNWRBFxj+ao/QmSLigyIzYBa7iBRrzJGazjD93uXtyTFlZ9BPn16xaJhsV/SvfpdgM Omhg== 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=ctB9bvpZ9ruaYVuIaoGAbYczS2Xsp8WdFrFGH1VOZb8=; b=QDnu41HMkAh3cknDZB0f/CQDswnhz+7WU/CsYyZps5S9B0Ix2rXilUnb3xTuN0OVV+ gU4ZaOoRyq7TlmHL8OwPN4MTcMyw19NzUlDVzDe7fLWcc5TRQmonnU2O5RA4NT4yu6VU GIHW6/hP/cn03X6Rm9o+ijb7JkPN/AnA0cvm2AEtHaI2yW4UcxZkLCkEgTOmhVUq33y2 8WH1GsxYF0wZQIr4RkGY2TWk4ozRh4GABbjo92FAhGqv9++NUKwDplz69Y0rth1dg5Sv tP1Dis0F17cbITnGj3zg1Wp164ZHFgfttsdwsqy6sP0TW/2VoAz9XmhDw7tmxlQxeq44 3XMA== 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 l8si202245qte.153.2018.11.20.19.26.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 19:26:07 -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 59539308428D; Wed, 21 Nov 2018 03:26:06 +0000 (UTC) Received: from localhost (ovpn-8-21.pek2.redhat.com [10.72.8.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA5367D2CF; Wed, 21 Nov 2018 03:25:48 +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 05/19] block: use bio_for_each_bvec() to map sg Date: Wed, 21 Nov 2018 11:23:13 +0800 Message-Id: <20181121032327.8434-6-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.40]); Wed, 21 Nov 2018 03:26:06 +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 It is more efficient to use bio_for_each_bvec() to map sg, meantime we have to consider splitting multipage bvec as done in blk_bio_segment_split(). Reviewed-by: Omar Sandoval Signed-off-by: Ming Lei --- block/blk-merge.c | 68 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index ec0b93fa1ff8..8829c51b4e75 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -455,6 +455,52 @@ static int blk_phys_contig_segment(struct request_queue *q, struct bio *bio, return biovec_phys_mergeable(q, &end_bv, &nxt_bv); } +static struct scatterlist *blk_next_sg(struct scatterlist **sg, + struct scatterlist *sglist) +{ + if (!*sg) + return sglist; + + /* + * If the driver previously mapped a shorter list, we could see a + * termination bit prematurely unless it fully inits the sg table + * on each mapping. We KNOW that there must be more entries here + * or the driver would be buggy, so force clear the termination bit + * to avoid doing a full sg_init_table() in drivers for each command. + */ + sg_unmark_end(*sg); + return sg_next(*sg); +} + +static unsigned blk_bvec_map_sg(struct request_queue *q, + struct bio_vec *bvec, struct scatterlist *sglist, + struct scatterlist **sg) +{ + unsigned nbytes = bvec->bv_len; + unsigned nsegs = 0, total = 0; + + while (nbytes > 0) { + unsigned seg_size; + struct page *pg; + unsigned offset, idx; + + *sg = blk_next_sg(sg, sglist); + + seg_size = min(nbytes, queue_max_segment_size(q)); + offset = (total + bvec->bv_offset) % PAGE_SIZE; + idx = (total + bvec->bv_offset) / PAGE_SIZE; + pg = nth_page(bvec->bv_page, idx); + + sg_set_page(*sg, pg, seg_size, offset); + + total += seg_size; + nbytes -= seg_size; + nsegs++; + } + + return nsegs; +} + static inline void __blk_segment_map_sg(struct request_queue *q, struct bio_vec *bvec, struct scatterlist *sglist, struct bio_vec *bvprv, @@ -472,25 +518,7 @@ __blk_segment_map_sg(struct request_queue *q, struct bio_vec *bvec, (*sg)->length += nbytes; } else { new_segment: - if (!*sg) - *sg = sglist; - else { - /* - * If the driver previously mapped a shorter - * list, we could see a termination bit - * prematurely unless it fully inits the sg - * table on each mapping. We KNOW that there - * must be more entries here or the driver - * would be buggy, so force clear the - * termination bit to avoid doing a full - * sg_init_table() in drivers for each command. - */ - sg_unmark_end(*sg); - *sg = sg_next(*sg); - } - - sg_set_page(*sg, bvec->bv_page, nbytes, bvec->bv_offset); - (*nsegs)++; + (*nsegs) += blk_bvec_map_sg(q, bvec, sglist, sg); } *bvprv = *bvec; } @@ -512,7 +540,7 @@ static int __blk_bios_map_sg(struct request_queue *q, struct bio *bio, int cluster = blk_queue_cluster(q), nsegs = 0; for_each_bio(bio) - bio_for_each_segment(bvec, bio, iter) + bio_for_each_bvec(bvec, bio, iter) __blk_segment_map_sg(q, &bvec, sglist, &bvprv, sg, &nsegs, &cluster);