From patchwork Fri Jan 11 11:01:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10757643 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 DCB4E1399 for ; Fri, 11 Jan 2019 11:02:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCF5529C2A for ; Fri, 11 Jan 2019 11:02:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0DCB29C1B; Fri, 11 Jan 2019 11:02: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 5BFE329C06 for ; Fri, 11 Jan 2019 11:02:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F79C8E0004; Fri, 11 Jan 2019 06:02:27 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6A6EB8E0001; Fri, 11 Jan 2019 06:02:27 -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 5BE438E0004; Fri, 11 Jan 2019 06:02:27 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by kanga.kvack.org (Postfix) with ESMTP id 33BC68E0001 for ; Fri, 11 Jan 2019 06:02:27 -0500 (EST) Received: by mail-qt1-f197.google.com with SMTP id b16so15942710qtc.22 for ; Fri, 11 Jan 2019 03:02:27 -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=kgAfY1HEbqNSMiieT7oOyFavhmPgP8oQkn+rEkTMTAoEFCVB3u8maOfzuaukbBzlGt 6nrmuhLaG/nMOb/6ifYbjk32cAzYDTsfahVXu3uWOanEAAgeWGkEH4xo2jmHg38RqU2d qdQ6JeDzdOfB45cqSsSJ9KGmHBPDEVrixpWjyn5O7+7fkaF4kKl/RlltfVj5eSP7U6e7 unewMGF9Vl+6ZFc0+2kcR168W0o/30Yp89m7GbLIHVgFeET+NZ2LDbtKAA4JBDbCxQId p7IxxkXwxRQXi64Gewj1NfBkAGoZhrlSJe+ULGjp+Eybe6L9P/8915eA15n38EBARVwC 6c6Q== 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: AJcUukeXFPJbvcE8RdIMSOuqCrW9OwMinHuF50fgrxl0/i6R7fUvZAHZ rJtSSQshqyNhk+tQ5/8UvdXJYIOnq5cHnfXHSVeLbAGnfJfOJrIdPUwGC02YBjjlOfYg2kGLYHY SqmpcpwQ+DBNlbIkAa14aRGfXDSKROFuEZhtsXc5vQ8YRbxqId+tlGY+DCvLqxhXP+g== X-Received: by 2002:ac8:18fa:: with SMTP id o55mr13536849qtk.256.1547204546995; Fri, 11 Jan 2019 03:02:26 -0800 (PST) X-Google-Smtp-Source: ALg8bN4UaEvJX+47KnRauO4LxYWE0Gi13Zdb+7HQz0brqFqJqer1fd5EC88dCNqhoLnl2pIbntSu X-Received: by 2002:ac8:18fa:: with SMTP id o55mr13536822qtk.256.1547204546519; Fri, 11 Jan 2019 03:02:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547204546; cv=none; d=google.com; s=arc-20160816; b=ohs+KJuxEIvOGBpCplWeZPrpuklLtYhvuI42G8OkImB+Nu+O82MIQOJHKLxAVBD41q gnnHUx3/In/fCpZLXj9XWUYBgTdjSSCWbDxz475LR1qLtK8ceC5FW5xeqDhVYQo++/uD IxhgfXm6nv+CsnWCwml3VVlyU6yeDOKRXrRjh5OLj8jcYxshojrtAP8YEjmH5C61+w4P sDotcrggRGEJYIChqedLRJdbGS+czr22aECibBym+PHVMskl+3PjkXG/HVkj7Nx0qbR8 NCpCkLkA+BC5gUBNpsLHDOOChqCyGlNrvlq3WG+CtKSbB1CP2/w7/RevdjLe1C+cV54s 5RpA== 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=X57q7bUW3w5VPoMBAmxHl0MnGKy0t6e6TqfWA09bxvt7P7v5jf0w/hzn3l3MHfvgKy NX+3L61qjTHcqteoCVK2jnRRQZBd8Kwy3i3RHg3dIZKph8O81oP5oYDDohjK8hdlrA2q 6CpKo/8A/m3aBFEUAG3AXaWZBzLm5CUCUhew1T20DcMs0KCgS0ib/7yHKxygUeQx1fAh EKwjlZ+N4gN/C91mdu4k93GB5OQtMsQdUXsoiqqNb83buowGj3rvE0eHGNnFIwq6+Dla PPUyJiEOiZkEI9/t8M4nW0F6ef08l1BA9mPfzktyvB9HMb0aXmvQipTv7zoaVfiXpz1Q dqrg== 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 a18si311002qtd.222.2019.01.11.03.02.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 03:02:26 -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-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6BF0CC01CB7D; Fri, 11 Jan 2019 11:02:25 +0000 (UTC) Received: from localhost (ovpn-8-28.pek2.redhat.com [10.72.8.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33172605AE; Fri, 11 Jan 2019 11:02:11 +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 V13 02/19] block: don't use bio->bi_vcnt to figure out segment number Date: Fri, 11 Jan 2019 19:01:10 +0800 Message-Id: <20190111110127.21664-3-ming.lei@redhat.com> In-Reply-To: <20190111110127.21664-1-ming.lei@redhat.com> References: <20190111110127.21664-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 11 Jan 2019 11:02:25 +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)))