From patchwork Mon Nov 26 02:17:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10697275 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 C177516B1 for ; Mon, 26 Nov 2018 02:18:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF5222933F for ; Mon, 26 Nov 2018 02:18:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A231229618; Mon, 26 Nov 2018 02:18:06 +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 3C63D2933F for ; Mon, 26 Nov 2018 02:18:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 663FC6B3F66; Sun, 25 Nov 2018 21:18:05 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 638DF6B3F67; Sun, 25 Nov 2018 21:18:05 -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 502CF6B3F68; Sun, 25 Nov 2018 21:18:05 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by kanga.kvack.org (Postfix) with ESMTP id 1F9C06B3F66 for ; Sun, 25 Nov 2018 21:18:05 -0500 (EST) Received: by mail-qk1-f198.google.com with SMTP id 98so17818932qkp.22 for ; Sun, 25 Nov 2018 18:18:05 -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=J28GifHhq0vbZn3piUaltnQEoZPZaE4eSIHOBz8uDr0=; b=Q2gSTRF3tIJfvYWgTZXKu90Bq0RpNmg6ZryzcA9QzFZHyZiFO99+3JTt2zBXiy7RVS RGSnqIijRggmBhEEee+KjisYsnyfMvkuOiGHSi7mqpNkhDRjDA4gErQDKHaV8rDZrP4C l7uP2+yPcpFDyMiCqpxZcZwfwd3VPj7635PB4pzPpn/LyPP00grBkC2VJkKMnqdNPDAS SgRSNMbN0YcnHdYV7qxPQlfC3AzYkbBgkfVX2KpHD4KzUqVfJN6F2ZAFK1YxiYVwJ1aD 0GJP1qnTPZ7Yp8t9F+9MdJDkWuVKu5c1KDcbkMM58zQndNBPOlWcjkIHR3tVe+RTGVL+ Jjeg== 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+aEWY0E0hvY1VX9h5VmDedq14q26yDs5VvtvSgYg5MxHFLtZBZ+n8U Rgy/X/4r+JZmWt4Vf44dI0LifL4Bueuaj+lx3eatMA98O5UhlZuBBa1xLg4t9ZHHa65yxN52Wj2 GdCswUPRFMYcDI/yPGaC9ys6w7Of+SMSorPreggAxlh8cC24eeYhNvO2+i6T2kUK/NQ== X-Received: by 2002:a37:d1c5:: with SMTP id o66mr23547246qkl.293.1543198684894; Sun, 25 Nov 2018 18:18:04 -0800 (PST) X-Google-Smtp-Source: AFSGD/VmkZQRYIZYpV7SHpgkEELiJqqmlD0CUlSJ1f5gKIfejVZBiKupNFYlphCPA0+DJWqfBDTF X-Received: by 2002:a37:d1c5:: with SMTP id o66mr23547229qkl.293.1543198684338; Sun, 25 Nov 2018 18:18:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543198684; cv=none; d=google.com; s=arc-20160816; b=Zun4SG3o7rfmEUXQ25PPWcK3E/dTDypyKzGWRP6SNfsZz8Ut3yYB6XmAGyB1o8NX3L ZclOfdhXPTsA2r38aLH7l7Tqwy4bKsU2SBwh+smH1ThDv4kUN7pCXvncQbPiV+fpQQHc 5RXBqkuisJwwL5Qy+VbdLBsycG007snii2jknWBhJLDYpJr0cTKjm95mhchQ1sUeHbyM I2/JyuTtihcv0i6ieL6lfk1xCDzqoGps5O9CBsbg5l+j1F9MlMrAEQ+qG2Bvwoz4FRPF iM56GXrVr5MYhuK23N+4pK86T+VKjFGtnqqil3SrWd+AjMUD7ZaRRs0nyp9tudEbOAbT Oc4g== 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=J28GifHhq0vbZn3piUaltnQEoZPZaE4eSIHOBz8uDr0=; b=Qb2iHAIetvScdYbKMqyynjp01oBt65mzunQ+x9ooU9rDhdsAUVbgy2LOyrI9FFlOk4 pUAIs7CcvHbpsbTR9f0/yt23t2y+M8D61y1+udOWDdCecwsBRAaWwPQmXgKlNO0PNh6g iiy1vGd8C2FZ4gSCkIYQQ8yEk8coGsgkUviZR8x7U+OOLK77vrMAZPdx1BPS4WOxs5Ze aMS/oll3uRq2CuUhbTTkBQ+9Cd2CRf/5RrwiJsGQ0Sdy0IWq1nyNBx5J4WefH5Sv4gKM Z9erHMY3IthbDGxT2S3W3G6U8ZhaPz+/Rif1uT71J0WlCmS9pDdF9ltGh0McNgndkpm2 qyzQ== 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 s16si5789310qtk.382.2018.11.25.18.18.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Nov 2018 18:18:04 -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-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 06E193084035; Mon, 26 Nov 2018 02:18:03 +0000 (UTC) Received: from localhost (ovpn-8-19.pek2.redhat.com [10.72.8.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 077FA6A6B4; Mon, 26 Nov 2018 02:17:55 +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 Subject: [PATCH V12 02/20] btrfs: look at bi_size for repair decisions Date: Mon, 26 Nov 2018 10:17:02 +0800 Message-Id: <20181126021720.19471-3-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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 26 Nov 2018 02:18:03 +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: David Sterba Signed-off-by: Christoph Hellwig Reviewed-by: Omar Sandoval --- 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 15fd46582bb2..40751e86a2a9 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2368,7 +2368,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 056fb627edb3..6f6bc331a5d1 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));