From patchwork Thu Nov 15 08:52:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10683739 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 7227814D6 for ; Thu, 15 Nov 2018 08:54:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 615DA29B7E for ; Thu, 15 Nov 2018 08:54:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5317B2B678; Thu, 15 Nov 2018 08:54:28 +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=ham 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 B2C10299C2 for ; Thu, 15 Nov 2018 08:54:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CAEFE6B0273; Thu, 15 Nov 2018 03:54:26 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C84C56B0274; Thu, 15 Nov 2018 03:54:26 -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 B755B6B0275; Thu, 15 Nov 2018 03:54:26 -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 8F1436B0273 for ; Thu, 15 Nov 2018 03:54:26 -0500 (EST) Received: by mail-qk1-f199.google.com with SMTP id z68so19249514qkb.14 for ; Thu, 15 Nov 2018 00:54:26 -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=UAC3xfu38p9M5OE/1aJqJB2xtFYtd9P0GOC7iU0x+2Q=; b=jUIWN7H5OWXaZZTahXKK0Js5a89PucnFAgzBREkax0fON1aMYIeeO8QCsmCy4j/vK1 AohcYjZ345rfhLVlkEJV2E0yN/sv0qzOTn6G94LGp7Ht7CVkfscmZqlg+pl3mWzo6/kO PN72ggOl7cvyVVc/JXHptG7CVOqvD2k2Mt6tDWptgDOsuyxN0Fn0G1iwTZ5ie/wJKpmi y1g3HEFipLO+Fmpvwb6mwJhzNvViiZ5RmSx9KuAf7Gvqh+zgHAh7BXsBhp0a1GnYpOZy R3VgwDh9kp5SzkK0L7VktLwOqIONvu+2rL52qkwIc1Rg86Xw1iQRNwzBS7w/j+n5eQ6b 2gAQ== 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: AGRZ1gJ71J5VSJ5EscMdSVsXE2MrfXqqvkAa9gxFEEOPTbBic2DgP3qz BVkk8QWLUc7YkNb07mOCcmYx6hti68evjHLTuHtlC86xBk7hnPGBaB5BzIA9yqweKK/4TWXOARn rKQrv0TF6MDKnENHnSocUo7P09jaOpLcr/7Kbsw7aaIQ0KF6kqMsNUK8g9nl5lW3xJQ== X-Received: by 2002:ac8:748:: with SMTP id k8mr5064753qth.235.1542272066334; Thu, 15 Nov 2018 00:54:26 -0800 (PST) X-Google-Smtp-Source: AJdET5fD95U46OXgRf04fupUL+dMa5HBmlzinxkxWjX4r7pWZYK6pLvOcp1D+plSDkkZNm7dULTL X-Received: by 2002:ac8:748:: with SMTP id k8mr5064732qth.235.1542272065769; Thu, 15 Nov 2018 00:54:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542272065; cv=none; d=google.com; s=arc-20160816; b=dAZte4I5BFAW0V6XWbIJ/Ek6JAeXykdGWv9XeM55RR6cgykgE2AnXtRRjBtjY0jhhk s56q1qPXmoUpxEs3e3Vf7W25p0jeQAAoK/Ce3AEL24b7LjjM8fMods0XKz5LDrHiW+jg JcU2WHZt0gq2i+JhCBuntEtm6+QvjuonHDb24tiLXUtthY+oazVtOygcn7FuZ3jVihD8 SuvThkdTjp+D+8k7XsSqWflESOhnoVg3WmvzOAXhDQrv8zt30R99g6QbBdPCURZXaK1u zRgZ9ccq+eG96M65Erd8mdZUe0qoO+XeTKyMygOMQMHMPnfOQIwqmJ+axnCvHW4oayms AAOg== 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=UAC3xfu38p9M5OE/1aJqJB2xtFYtd9P0GOC7iU0x+2Q=; b=fRmTS+OQ7UpA2YcKVqaAO45KlQJjg5lYfs4Yfg+uFbk5UGj0eiPcZ8H/ybxOkp0Cbd uL9QGeCkrIyav6Kb8Ys7xLspwpIY3yfnNX9WSU36yI/oV1o8tqNW+HYkKVjzjra3Y/Vf AOeuRtANcwWe5/Y+nna4hUIb5ZndWdz3NLEExL0jKJPoyoZp3BrinQbNlOjV1t95oo4S TBZJ28QEcLVg6BMdFsbEIzH8Rdum8aJ1L3+h+YSRiJzU6L3BZp/h7+qMuwJYDP1s2x2F ZL7gppD0g+sz3o0F8zgdgzYy1X4RsBh70dxd+6xpZJnDiKOeQpglxlZLwrRv8hGbkww2 TpJg== 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 36si278339qta.249.2018.11.15.00.54.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Nov 2018 00:54:25 -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 980BA30024FC; Thu, 15 Nov 2018 08:54:24 +0000 (UTC) Received: from localhost (ovpn-8-23.pek2.redhat.com [10.72.8.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B4F55D739; Thu, 15 Nov 2018 08:54:13 +0000 (UTC) From: Ming Lei To: Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Ming Lei , Dave Chinner , Kent Overstreet , Mike Snitzer , dm-devel@redhat.com, Alexander Viro , linux-fsdevel@vger.kernel.org, Shaohua Li , linux-raid@vger.kernel.org, linux-erofs@lists.ozlabs.org, David Sterba , linux-btrfs@vger.kernel.org, "Darrick J . Wong" , linux-xfs@vger.kernel.org, Gao Xiang , Christoph Hellwig , Theodore Ts'o , linux-ext4@vger.kernel.org, Coly Li , linux-bcache@vger.kernel.org, Boaz Harrosh , Bob Peterson , cluster-devel@redhat.com Subject: [PATCH V10 04/19] block: use bio_for_each_bvec() to map sg Date: Thu, 15 Nov 2018 16:52:51 +0800 Message-Id: <20181115085306.9910-5-ming.lei@redhat.com> In-Reply-To: <20181115085306.9910-1-ming.lei@redhat.com> References: <20181115085306.9910-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.45]); Thu, 15 Nov 2018 08:54:24 +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(). Cc: Dave Chinner Cc: Kent Overstreet Cc: Mike Snitzer Cc: dm-devel@redhat.com Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org Cc: Shaohua Li Cc: linux-raid@vger.kernel.org Cc: linux-erofs@lists.ozlabs.org Cc: David Sterba Cc: linux-btrfs@vger.kernel.org Cc: Darrick J. Wong Cc: linux-xfs@vger.kernel.org Cc: Gao Xiang Cc: Christoph Hellwig Cc: Theodore Ts'o Cc: linux-ext4@vger.kernel.org Cc: Coly Li Cc: linux-bcache@vger.kernel.org Cc: Boaz Harrosh Cc: Bob Peterson Cc: cluster-devel@redhat.com Signed-off-by: Ming Lei Reviewed-by: Omar Sandoval --- block/blk-merge.c | 72 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 20 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index 6f7deb94a23f..cb9f49bcfd36 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -473,6 +473,56 @@ 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; + 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); + 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, @@ -490,25 +540,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; } @@ -530,7 +562,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);