From patchwork Fri Jan 11 11:01:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10757633 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 2A8911399 for ; Fri, 11 Jan 2019 11:02:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CB6129B7F for ; Fri, 11 Jan 2019 11:02:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10B0D29BD1; Fri, 11 Jan 2019 11:02:13 +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 A27CD29BD9 for ; Fri, 11 Jan 2019 11:02:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B3D058E0003; Fri, 11 Jan 2019 06:02:11 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AEE078E0001; Fri, 11 Jan 2019 06:02:11 -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 9B8288E0003; Fri, 11 Jan 2019 06:02:11 -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 6DC458E0001 for ; Fri, 11 Jan 2019 06:02:11 -0500 (EST) Received: by mail-qt1-f197.google.com with SMTP id w19so16241235qto.13 for ; Fri, 11 Jan 2019 03:02:11 -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=jR/ABfQzsk4snuRwt6xiKLLtmUVGlJ+rbLpyE5UJ55c=; b=pCWg71ceHguyXtlXhcKn9MQOZDJSLcZN/hy7We0xYK0pN40DqSMkD5zwGlq/vrTnEt kbaq0guAo/LYxoaAjQl3gzn9j3zkIjgQEejXXjJsszO3TiIx+C9xTrCd3TQw8f13vkcs sHxA7DiGV9/HmJnFsMCwc5FFskwE6/wXlH72GIIFBH/+Tro0eUo3k30Fj9B2IVFhECyC AlJVfIc6ZyL3mSokgR8NnCuxoEbAG0vk384+wI+0xqMafmmNtS0idvpg6ZftyOTCtWc7 AoAyEGkAW5gw2aC7ZFCn5TGkThaP6sX0m7D3eUYFNyftOWhoV57YCCsiH0h4SAS5wswt mClw== 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: AJcUukcetUVi+MKd7ge+xZJM44j1VUImzrxMWzkMUmRD5p61uz91++kQ QkXNlK++WY2Ll1AhYKGnmOLapXDeftys35qI3s5HQ9FQ7ly+tNiVoikz369oF447z/Pqp8sUuyQ TRQZ2+ogvQ0CaLs2DpoFyweTfiQN81jSP3GO1MaqH6JgEqszO5Tj9bn4uhBWjMr3idQ== X-Received: by 2002:ac8:76c3:: with SMTP id q3mr13132124qtr.48.1547204531217; Fri, 11 Jan 2019 03:02:11 -0800 (PST) X-Google-Smtp-Source: ALg8bN4FFzSjmkEULHPlfBaL9R7nafLHQSa6vuTP8csRdupQfZJVpbcmYEHMuXgHiGUE6DY1An6r X-Received: by 2002:ac8:76c3:: with SMTP id q3mr13132094qtr.48.1547204530676; Fri, 11 Jan 2019 03:02:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547204530; cv=none; d=google.com; s=arc-20160816; b=WZuzsSVej+VyxBmHPCfXgc8JlTHfeHzMVoXUiZF2FQOHSFDrdHCVRV7yFtVR8uUZF7 ctrdCp6AbxZCN5efTwQ8owNX4BcGEEupCFfZl+tre1sGEY+0e0aLMvKB0RRVeiJGUWoI owd+YeNK3D8fIvXE2d+ifrytZkEDKJAtEPw0atiIxPw7fGxicZpNN/k+gvA1r0iZgLBK WKJ3yhBnmOFhp3ZHkPt3V2WZZ7qPUFa40EivM90tETe/RSdEw7/soptmE5cNbgqn97Dm 58qaYe9Bbl4hI/XV8ttyYCI/lbf7mY1n/Z83smZyOtOsV8kzAXW4jWULPBXonaaFj9kS vh5w== 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=jR/ABfQzsk4snuRwt6xiKLLtmUVGlJ+rbLpyE5UJ55c=; b=Tp5XAubAYVhEuNQulEKg0GcyjX2gO1w5Sic0eJQ6DAaiADZuEGV5KB+b8q4zyAd5vz PTuYgeKy3fumBwfKgbYYv6wV4R/0xrClBi/XvtiBnVHCUHH3vR1cwub4MONSkV62IbqX zMsa8Metn4dRoLgnIFC2F3yCBkmyfaA+IyOpikTY2lZnIV8CF9X/Y8DkrYneRcKjNX7F IjWX7qEV0f1QGSrTi62ArjovKBda9X6e0acQUzVJ63vGw8hMaWQrqv0MMHFq7ihaEj6i 8dytWLXSt/cXBigW6KLt8A/QBk1QP8+oF2iris1ifnqGVNH9E8G98g1cAYmnz6e/AmoG tjMQ== 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 y18si818933qvo.12.2019.01.11.03.02.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jan 2019 03:02:10 -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-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D2B82DC347; Fri, 11 Jan 2019 11:02:09 +0000 (UTC) Received: from localhost (ovpn-8-28.pek2.redhat.com [10.72.8.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1CEC21E7; Fri, 11 Jan 2019 11:01:59 +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 Subject: [PATCH V13 01/19] btrfs: look at bi_size for repair decisions Date: Fri, 11 Jan 2019 19:01:09 +0800 Message-Id: <20190111110127.21664-2-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.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 11 Jan 2019 11:02:10 +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 From: Christoph Hellwig bio_readpage_error currently uses bi_vcnt to decide if it is worth retrying an I/O. But the vector count is mostly an implementation artifact - it really should figure out if there is more than a single sector worth retrying. Use bi_size for that and shift by PAGE_SHIFT. This really should be blocks/sectors, but given that btrfs doesn't support a sector size different from the PAGE_SIZE using the page size keeps the changes to a minimum. Reviewed-by: Omar Sandoval Reviewed-by: David Sterba Signed-off-by: Christoph Hellwig --- fs/btrfs/extent_io.c | 2 +- include/linux/bio.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 52abe4082680..dc8ba3ee515d 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2350,7 +2350,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset, int read_mode = 0; blk_status_t status; int ret; - unsigned failed_bio_pages = bio_pages_all(failed_bio); + unsigned failed_bio_pages = failed_bio->bi_iter.bi_size >> PAGE_SHIFT; BUG_ON(bio_op(failed_bio) == REQ_OP_WRITE); diff --git a/include/linux/bio.h b/include/linux/bio.h index 7380b094dcca..72b4f7be2106 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -263,12 +263,6 @@ static inline void bio_get_last_bvec(struct bio *bio, struct bio_vec *bv) bv->bv_len = iter.bi_bvec_done; } -static inline unsigned bio_pages_all(struct bio *bio) -{ - WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)); - return bio->bi_vcnt; -} - static inline struct bio_vec *bio_first_bvec_all(struct bio *bio) { WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED));