From patchwork Mon Nov 26 02:17:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10697375 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 604EE1750 for ; Mon, 26 Nov 2018 02:19:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 500FE29A36 for ; Mon, 26 Nov 2018 02:19:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4321029A35; Mon, 26 Nov 2018 02:19:47 +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 D85EE29A33 for ; Mon, 26 Nov 2018 02:19:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 021AE6B3F78; Sun, 25 Nov 2018 21:19:46 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F384B6B3F7A; Sun, 25 Nov 2018 21:19:45 -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 E297A6B3F7B; Sun, 25 Nov 2018 21:19:45 -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 B8B416B3F78 for ; Sun, 25 Nov 2018 21:19:45 -0500 (EST) Received: by mail-qt1-f198.google.com with SMTP id b16so15142343qtc.22 for ; Sun, 25 Nov 2018 18:19:45 -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=5dXOAXvdCY1pHWNmtmr9I2FodyP1Hp94z8fKZgHrHiU=; b=SG1SUqAyXCxR77/hm9Sn9PMOMfPVIr6JMOmXICNUQLKboIhhHvonUp8oTvTbQ/gD1B t8cfYhM2Id61RWW1Ztz+EhPuod3DHTOBpun5roK82dQ2zgVCwfuaR6NUUyM80OoTRhZe Y0VC2c4XDpDjLzfvFu+aceIchYAT0KfHtyZyKY1j1EvnsvJTWt8oV/k+PHllTD+nIoPj Evvm08qB04XpWuyIIkViWA5Pz84S7ahgYnR8zG9hncSQfGID3UdpBAf/aGdzPnQK2p6g dJY+YqgRQYrzvW3KIgN7PPi6Sg2PE4uuFb3ZEO/5MAZhZFxNm9XMkt/NG0QrgUS5pEqK 75MA== 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+aEWandBxDBLsLgU/zCZKiXIFfDDXcoG4thSMdKRqKBAgSDaIgRiCr ik92JH+DibvirafGRdN+z66qvYGjVJUllockoZk5kpFc7GZ4vWaQXOB+mqufOJ1CQhQ91YR8R4I Cq6FwamQc6d5o6E0zyQgHiB1GX6puqJKYe+lJ6OjXN4m9jNAmK3VTLjnD1v2bOyLINQ== X-Received: by 2002:a0c:e091:: with SMTP id l17mr23805314qvk.144.1543198785494; Sun, 25 Nov 2018 18:19:45 -0800 (PST) X-Google-Smtp-Source: AFSGD/WsybKY4peN1vpgs3SoSHVMVslyYlzyd5Wr2Qgf7c83s1H9WwCBJhnIA8i3fStu1RxeFaTL X-Received: by 2002:a0c:e091:: with SMTP id l17mr23805295qvk.144.1543198784779; Sun, 25 Nov 2018 18:19:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543198784; cv=none; d=google.com; s=arc-20160816; b=vgt82ppEVAWsTKJ5z8zsKZ8y91aZ7YrxVqYuHRRVI/feRIsN8VJnHU1AAaj8xWi+3g JmPQiO3lx+MaXjwN5F0K/FdGAmQAPgZEs4kN9wf8Vd0P9k117cFzlwMfCbXiLmcljipW q+V521hGKmmzYMPJSgdwzDsj+i7ss4wuUalh4ZhOMVL2w9qOl4vDoZB3peMA2xdg3GZe olXm+oHoxn/RN77Tq1yWreAjimjRNbh2q/X4t0jlDPYFRseBDZpHuvrEtUb2lfuzFvoh 5oHYpcJuLp1r+2NVdzeJbL4OJjcu56MKwyIQSa/h3+E8/sep1PxcoKWleGIltJ1+pbOs zPoA== 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=5dXOAXvdCY1pHWNmtmr9I2FodyP1Hp94z8fKZgHrHiU=; b=BNmOXvttipsIzPTkZHgLRoI5CUARz0tSGv2iwadhJ5ONslQsAspxOW+RDQm7ST4GAS 7bChWl4T+enQZy624KNfdxt3+3R0QDvks+iB7PfKtuGdzrdJJV/cmG/VWR2FYaqXIvHj 08MpY7kD/4xXpIaX0uBab/RqgVLVbzpux2KbRtjz1npRdd7nXvqOKAOYZEItdahRiDMd bOY6Qfl8WK2a1c7APzzZy7okVKuaHtkTNiXbwzoXDMsqfkeVUygv1rWMpGoCrFjXbpHe 3h+j0E0KuElGWYGPc/xOLI/DhgbBsdTzl+IuUAduzHKLzANBtwfwf2Vu5rCkzF//LBWB iqaA== 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 y27si5895264qtk.149.2018.11.25.18.19.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Nov 2018 18:19:44 -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-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B13B188304; Mon, 26 Nov 2018 02:19:43 +0000 (UTC) Received: from localhost (ovpn-8-19.pek2.redhat.com [10.72.8.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CC843781; Mon, 26 Nov 2018 02:19:32 +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 V12 10/20] block: use bio_for_each_bvec() to map sg Date: Mon, 26 Nov 2018 10:17:10 +0800 Message-Id: <20181126021720.19471-11-ming.lei@redhat.com> In-Reply-To: <20181126021720.19471-1-ming.lei@redhat.com> References: <20181126021720.19471-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 26 Nov 2018 02:19:44 +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 Reviewed-by: Christoph Hellwig --- block/blk-merge.c | 70 +++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 20 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index 2d8f388d43de..20b5b0c3e182 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -462,6 +462,54 @@ 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, offset = 0; + + while (nbytes > 0) { + unsigned seg_size; + struct page *pg; + unsigned idx; + + *sg = blk_next_sg(sg, sglist); + + seg_size = get_max_segment_size(q, bvec->bv_offset + total); + seg_size = min(nbytes, seg_size); + + 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, @@ -479,25 +527,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; } @@ -519,7 +549,7 @@ static int __blk_bios_map_sg(struct request_queue *q, struct bio *bio, int 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);