Received: by 2002:a25:f815:0:0:0:0:0 with SMTP id u21csp2233431ybd; Mon, 24 Jun 2019 03:02:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqw+fKUHRDRX29uAd+CfB1SUNG+kFb+KYOny9xDcH/5PXZHgwliBjUhlSilHajFJ1lP/jexS X-Received: by 2002:a17:90a:c503:: with SMTP id k3mr24122778pjt.46.1561370526772; Mon, 24 Jun 2019 03:02:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561370526; cv=none; d=google.com; s=arc-20160816; b=jR/02jy/zOViY1PkoEruEEnKQ362EWZT/okSvSR5AIFO/KAHAMqMo7p+sfXBEDvsHv lySWtXyy17QI/QGHjbB7xwLvm2UGmM/J8QJVDb0rELjJ8vatM2hdX6UfyXQG93RP1eP4 457unsexBJU2+oy3x2G1JNl/RpyRCmZqW5tGV3/1rzbA7JXT2/fEKG6f2vA3QnHCJuqJ ae0H1RcB5WhP8YhzE5VXbK1xGzoTCtQABl/FkN2w/VrKkwNcx8O3X8SKFI9HVvtW8ber EZHxFUOeDPA6Urc8DYYciPFosnBo0FZfPqFfz8wvMA0zL/Tn+rZdikxyB6Wjb/nnhoRG 12uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=40d6cj52pzUZvBC22Zo9sdf1LTCPPx14EY0iSsViL3Q=; b=aX5WBONkE8MKYf+0IGbKRTgQN08xFq4CwYCrxRQvc4OIcacDr4rFrcZ8TPYZgXgcLM bsoVehHiW2uI+H5JpuwwZn0BQ/N4ILFdTbHgowdCG3CurVYzgM58FREuQG7B1mVJGsdI nA82DRXTle2pE7csOCdtSC7KlhwaZAR5caOO+KdBMHpcOO3qKoNMqQDjqgMPcit9Ex1L PFPfUm6qUBnMk96ynqtx5ODbPqAz8zOTuhTbjLhtdPkOyA45G2crsUJgor6kGXQed4Jy vdQJI3s+JBFisI7d8PNf4yNI+R0S190APysXBofVbGFxX5qXNJ4B2K/5p9QYpdE6zn0F 5EBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MnkSmBhW; 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 37si10500068pld.231.2019.06.24.03.01.50; Mon, 24 Jun 2019 03:02:06 -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; dkim=pass header.i=@kernel.org header.s=default header.b=MnkSmBhW; 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 S1729278AbfFXJ7q (ORCPT + 99 others); Mon, 24 Jun 2019 05:59:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:59086 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729263AbfFXJ7p (ORCPT ); Mon, 24 Jun 2019 05:59:45 -0400 Received: from localhost (f4.8f.5177.ip4.static.sl-reverse.com [119.81.143.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 86F23205ED; Mon, 24 Jun 2019 09:59:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561370385; bh=rmZhShVbSyi1ZR/CTwHwPw4v+qk5JBg4Vmc46R0vNs4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MnkSmBhWKegeE6V7d7A6VAxmucQCkVqeg72on9jbQYDoR6F+XFdlL0TKqCWLp3r2O xVUPeo2EW1iwPO+1PZ7U/Cne6JMvEJu+ZLiWRsZDuqQzLPCA3O68b4fncpVcdcxJKF gBW/it+9MFZfRfbjPoxgcAiqT5Fuhd9aIKKCF9oQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Filipe Manana , Naohiro Aota , David Sterba Subject: [PATCH 4.14 39/51] btrfs: start readahead also in seed devices Date: Mon, 24 Jun 2019 17:56:57 +0800 Message-Id: <20190624092310.601848981@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624092305.919204959@linuxfoundation.org> References: <20190624092305.919204959@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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") Cc: stable@vger.kernel.org # 3.2+: ce7791ffee1e: Btrfs: fix race between readahead and device replace/removal Cc: stable@vger.kernel.org # 3.2+ Reviewed-by: Filipe Manana Signed-off-by: Naohiro Aota Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/reada.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/fs/btrfs/reada.c +++ b/fs/btrfs/reada.c @@ -759,6 +759,7 @@ static void __reada_start_machine(struct u64 total = 0; int i; +again: do { enqueued = 0; mutex_lock(&fs_devices->device_list_mutex); @@ -770,6 +771,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;