Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BEE5C433ED for ; Tue, 18 May 2021 02:38:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 151A7610CB for ; Tue, 18 May 2021 02:38:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346264AbhERCja (ORCPT ); Mon, 17 May 2021 22:39:30 -0400 Received: from mx2.suse.de ([195.135.220.15]:39216 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344300AbhERCj1 (ORCPT ); Mon, 17 May 2021 22:39:27 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1621305489; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0m+5IFwl4nVRs4vqKIIWeXec3j0B5tFSMJVCAjy8938=; b=FeY984WvwhlPUJK1bTnlnQMehQ5c59zUUoLKuRXu6CqZMXaN8wwj9fiaowvKvD6d7/aSvW T6k9Q7M7CCb8oMj1q8I49XrKDmoQDCIBgDvt8YOle8R527Lzq+cX2BKpDnKR5XoHpQo8nx AX63qok1GTyjJRBcrdl+8hfGDkM1D/U= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 20DF2B151 for ; Tue, 18 May 2021 02:38:09 +0000 (UTC) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH v2 1/2] btrfs: fix the never finishing ordered extent when it get cleaned up Date: Tue, 18 May 2021 10:38:02 +0800 Message-Id: <20210518023803.107768-2-wqu@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518023803.107768-1-wqu@suse.com> References: <20210518023803.107768-1-wqu@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org [BUG] When running subpage preparation patches on x86, btrfs/125 will hang forever with one ordered extent never finished. [CAUSE] The test case btrfs/125 itself will always fail as the fix is never merged. When the test fails at balance, btrfs needs to cleanup the ordered extent in btrfs_cleanup_ordered_extents() for data reloc inode. The problem is in the sequence how we cleanup the page Order bit. Currently it works like: btrfs_cleanup_ordered_extents() |- find_get_page(); |- btrfs_page_clear_ordered(page); | Now the page doesn't have Ordered bit anymore. | !!! This also includes the first (locked) page !!! | |- offset += PAGE_SIZE | This is to skip the first page |- __endio_write_update_ordered() |- btrfs_mark_ordered_io_finished(NULL) Except the first page, all ordered extent is finished. Then the locked page is cleaned up in __extent_writepage(): __extent_writepage() |- If (PageError(page)) |- end_extent_writepage() |- btrfs_mark_ordered_io_finished(page) |- if (btrfs_test_page_ordered(page)) |- !!! The page get skipped !!! The ordered extent is not decreased as the page doesn't have ordered bit anymore. This leaves the ordered extent with bytes_left == sectorsize, thus never finish. [FIX] The proper fix is to ensure the one cleaning up the locked page to clear page Ordered and finish ordered io range at the same time. Thus it's no longer possible to clear page ordered then do the ordered extent io accounting. This patch choose to fix the call site in btrfs_cleanup_ordered_extents(). Also since we're here, also make btrfs_cleanup_ordered_extents() to properly clamp the range for the incoming subpage support. Signed-off-by: Qu Wenruo --- fs/btrfs/inode.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 48bcb351aad6..6004f72d0474 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -144,6 +144,8 @@ void btrfs_inode_unlock(struct inode *inode, unsigned int ilock_flags) inode_unlock(inode); } +static void finish_ordered_fn(struct btrfs_work *work); + /* * Cleanup all submitted ordered extents in specified range to handle errors * from the btrfs_run_delalloc_range() callback. @@ -166,11 +168,28 @@ static inline void btrfs_cleanup_ordered_extents(struct btrfs_inode *inode, struct page *page; while (index <= end_index) { + u64 range_start; + u64 range_len; + page = find_get_page(inode->vfs_inode.i_mapping, index); index++; if (!page) continue; - ClearPageOrdered(page); + + range_start = max_t(u64, page_offset(page), offset); + range_len = min(offset + bytes, page_offset(page) + PAGE_SIZE) - + range_start; + /* + * Clear page Ordered and its ordered range manually. + * + * We used to clear page Ordered first, but since Ordered bit + * indicates whether we have ordered extent, if it get cleared + * without finishing the ordered io range, the ordered extent + * will hang forever, as later btrfs_mark_ordered_io_finished() + * will just skip the range. + */ + btrfs_mark_ordered_io_finished(inode, page, range_start, + range_len, finish_ordered_fn, false); put_page(page); } -- 2.31.1