From patchwork Mon Jan 21 08:17:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10773121 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 64D401390 for ; Mon, 21 Jan 2019 08:18:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 562B329E6A for ; Mon, 21 Jan 2019 08:18:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A00729E70; Mon, 21 Jan 2019 08:18:57 +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 DCE6E29E63 for ; Mon, 21 Jan 2019 08:18:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 206CB8E002C; Mon, 21 Jan 2019 03:18:56 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 190188E0025; Mon, 21 Jan 2019 03:18:56 -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 056858E002C; Mon, 21 Jan 2019 03:18:55 -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 CA75D8E0025 for ; Mon, 21 Jan 2019 03:18:55 -0500 (EST) Received: by mail-qt1-f198.google.com with SMTP id n45so20394572qta.5 for ; Mon, 21 Jan 2019 00:18:55 -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=slTW8uoG6sTMlKcMLmau18LMT15MeeTevHwmv3l5NcU=; b=aSaHXv9GcV7Hy+0wn5pzI6axcV57oT0QQ6vcD7AvJIvDMQNwIa/4kW7pqKx9tfW88X 8v8rXK9Kwkt+8P2iSYVMGGIqArEML8V2aIH8EdneZRtBnBF4pQP2o20fGE8TeNKGIq01 CF58jIh4G5y9hGeO3kVBQ8brmcHCzAv6t1wCTrxwgf77xsilKmXDHzUATOLVkkVb/bb4 1vcCrBaF9qEL2WrB7Tl6J0ABivIgSV9vFTk5E+cfYCqJRwTxPsbqTR0ihJMAVpwFARWu +2wR3kOrmtR4iQAO+nB4cY5kTFLyF5FqIkJ76iBAHOvw6M1HaLLkekfnRKeEBWoDpSoy hAqQ== 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: AJcUukdSkzavPwoHjnTDYEgVPB42OdEBH6+sOgK6xfp08M6ggIlgftVx 2v12ozp3gbQ0xZAHV9T1bF9mNHlXKVHdP/KeIsLTnYRZLSsSJeN8xdspUvopkntCs0B8nCNVBlR TkvuTDK9ZgdywhPUvAUnpEIP/3gsELqgIJgqWIrQX1ByhO6+oeN+fNm9R1plKC9wFHA== X-Received: by 2002:aed:3a69:: with SMTP id n96mr26354689qte.246.1548058735612; Mon, 21 Jan 2019 00:18:55 -0800 (PST) X-Google-Smtp-Source: ALg8bN69Jq/1jPPO2zzS1EmVkvhbL/2AnkEEOR/DaVw7sSVVLD5bxbPLuDBnS08TAM89vr3aB7Q/ X-Received: by 2002:aed:3a69:: with SMTP id n96mr26354668qte.246.1548058735140; Mon, 21 Jan 2019 00:18:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548058735; cv=none; d=google.com; s=arc-20160816; b=cSths778IUVBYGQQiUegOgSHlIo52lfwtTG4wb3q9GXuj6gbbl/l3paFPJmb10/2BT ZROro0v5qqz0yxoVXc+H1C8YlJZvU/JCnBsIq1QZiI7uL+L63OQkyBoWT++jEwUM9BBg KdoGh5bGKRMfI2tz3BwDE8N2/YrD9z0yviyt3ROPHcFhAZgFl/x+ux9DnLvZolT509DY isc1YpOmTohxfelDc3nL4DQcJ2TA5z7BM+a4mu4Is5obXSFIGOoySLIEDOWcjDxV7gXB JwYT+UGxVjhf76lUYVrufG2OFpKpi6KQ3I6yxcJGvZoSs1URnqb6IKd7pF+SV9wxOsTB 92yA== 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=slTW8uoG6sTMlKcMLmau18LMT15MeeTevHwmv3l5NcU=; b=G8TG9WobJ5wHAEkcirIbVe6W9IN3Xw1FwGOgBNVqiw7auvorWdZoKCU3GdVUAwqVPU tD2dJrWvuxFPlvpG6RuDGv2mARyHdEFqtuO2P0ookhYqmwyoNMzQ6s674ngYkB+1Yxbd l7yV5f/KRal8R1X9GFWlidtabWbWkembDvfaroWRNOTO2R8GkcfioMI9RR5wejLRAkKn XjUMYBuWOTF/4UcrnlRd8SSSvn/WtmwbbImbbc01GGYO24fo1BQrXbUMeA7f5mhmVvGL RXLJHmDYnOl3BVaCrQQNcyBfCzkmnSaEy0LryeK6mluhVeSGpsBXGaQGSm594s3l3Ma/ tgzA== 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 s34si562308qtb.17.2019.01.21.00.18.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 00:18:55 -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 264568535D; Mon, 21 Jan 2019 08:18:54 +0000 (UTC) Received: from localhost (ovpn-8-22.pek2.redhat.com [10.72.8.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 78F0E5D737; Mon, 21 Jan 2019 08:18:35 +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 02/18] block: don't use bio->bi_vcnt to figure out segment number Date: Mon, 21 Jan 2019 16:17:49 +0800 Message-Id: <20190121081805.32727-3-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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 21 Jan 2019 08:18:54 +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 wrong to use bio->bi_vcnt to figure out how many segments there are in the bio even though CLONED flag isn't set on this bio, because this bio may be splitted or advanced. So always use bio_segments() in blk_recount_segments(), and it shouldn't cause any performance loss now because the physical segment number is figured out in blk_queue_split() and BIO_SEG_VALID is set meantime since bdced438acd83ad83a6c ("block: setup bi_phys_segments after splitting"). Reviewed-by: Omar Sandoval Reviewed-by: Christoph Hellwig Fixes: 76d8137a3113 ("blk-merge: recaculate segment if it isn't less than max segments") Signed-off-by: Ming Lei --- block/blk-merge.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index 71e9ac03f621..f85d878f313d 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -367,13 +367,7 @@ void blk_recalc_rq_segments(struct request *rq) void blk_recount_segments(struct request_queue *q, struct bio *bio) { - unsigned short seg_cnt; - - /* estimate segment number by bi_vcnt for non-cloned bio */ - if (bio_flagged(bio, BIO_CLONED)) - seg_cnt = bio_segments(bio); - else - seg_cnt = bio->bi_vcnt; + unsigned short seg_cnt = bio_segments(bio); if (test_bit(QUEUE_FLAG_NO_SG_MERGE, &q->queue_flags) && (seg_cnt < queue_max_segments(q)))