Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1193297ybn; Wed, 2 Oct 2019 12:13:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqwFomQiqkcf0Patn9nW4AFOfSlGTPu/vZyKUlWWsFqwOoRn2g4In3CAvWm4uVtg1fnZtZL0 X-Received: by 2002:a50:8a9a:: with SMTP id j26mr5587831edj.251.1570043631325; Wed, 02 Oct 2019 12:13:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570043631; cv=none; d=google.com; s=arc-20160816; b=b6vdNxu6ejq6yGmIp3ACW8AzS6rO/9cqAISX1ZdEz37hvuqiSNy5tlx5V0cxpDU/I7 u4QCA3WSrFM+h1X/0sWRlwSybOnDi2Lq8BXEuJYfq3W8jXt+F7yNcUxq27qaZyDMDlCZ y3w/JjfoDHbgtPyJ/FVf1p6vVRYihsSwp6R1FfSWpjTiBi3ynk/edqBq/x+HvL+GViuz W/TI2huaeg1w+78hDSnOfRPkVo2mEauDNZCIHEs2NGPT4pnmX3sV7O43NTuEKkvb00w5 soAxGR0Tp2YBJmvyquzgdlzAaVeIXQ6FTzvx6KosqW7Ql6khVB9sdfY/jWzlwea2wm1D UV9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition; bh=aH3RSSQ8m5USC2guPAubP0yW80kr+Y0Z1TJZrWHOR0A=; b=DYnothDUZvT5/jPxtifR1UnsqHKobCH7offIIfvEpaaMPrrjYUw1J62rRokgmWWcps 8OckmmHquNRZ3KeZXBsV4OdCxNBFZlRhgDTHMVzW35QbauUSSMGo8gKhfYw/9SqvudVQ VrU/J8GZtuVI2X3WOqFffnRZiFmFAeeZhnOCvCbrNlhOdSiP2m/vXymbPEeLQ6jLU9T7 Ha76K2Bd71bKkTyYCglmOsvPceq+l3gZIbCwNeSo3EjbKFnBAXL6zQvC18SZf5udMwr/ dcU/d6OyQjqF1NvL7TRFqH1L1FFN3hM9ayIoo26yBa1mLnntAk5Zj862cI/8bsXD9fHI Uflg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m12si10344ejr.180.2019.10.02.12.13.27; Wed, 02 Oct 2019 12:13:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729836AbfJBTKZ (ORCPT + 99 others); Wed, 2 Oct 2019 15:10:25 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:35902 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729321AbfJBTIR (ORCPT ); Wed, 2 Oct 2019 15:08:17 -0400 Received: from [192.168.4.242] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1iFjyx-000365-MX; Wed, 02 Oct 2019 20:08:15 +0100 Received: from ben by deadeye with local (Exim 4.92.1) (envelope-from ) id 1iFjyp-0003eu-9A; Wed, 02 Oct 2019 20:08:07 +0100 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, Denis Kirjanov , "Naohiro Aota" , "David Sterba" , "Filipe Manana" Date: Wed, 02 Oct 2019 20:06:51 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) X-Patchwork-Hint: ignore Subject: [PATCH 3.16 63/87] btrfs: start readahead also in seed devices In-Reply-To: X-SA-Exim-Connect-IP: 192.168.4.242 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.75-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Naohiro Aota commit c4e0540d0ad49c8ceab06cceed1de27c4fe29f6e upstream. Currently, btrfs does not consult seed devices to start readahead. As a result, if readahead zone is added to the seed devices, btrfs_reada_wait() indefinitely wait for the reada_ctl to finish. You can reproduce the hung by modifying btrfs/163 to have larger initial file size (e.g. xfs_io pwrite 4M instead of current 256K). Fixes: 7414a03fbf9e ("btrfs: initial readahead code and prototypes") Reviewed-by: Filipe Manana Signed-off-by: Naohiro Aota Signed-off-by: David Sterba --- fs/btrfs/reada.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/fs/btrfs/reada.c +++ b/fs/btrfs/reada.c @@ -764,6 +764,7 @@ static void __reada_start_machine(struct u64 total = 0; int i; +again: do { enqueued = 0; mutex_lock(&fs_devices->device_list_mutex); @@ -776,6 +777,10 @@ static void __reada_start_machine(struct mutex_unlock(&fs_devices->device_list_mutex); total += enqueued; } while (enqueued && total < 10000); + if (fs_devices->seed) { + fs_devices = fs_devices->seed; + goto again; + } if (enqueued == 0) return;