From patchwork Mon Oct 24 11:27:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9297 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp463821wru; Mon, 24 Oct 2022 06:48:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7x5nb7FmSyEEaSB3lrg18KXB43YM2MNv8Pauug2tzHjH6dnWFDjcUPY6hOWp6oLnkB6RT0 X-Received: by 2002:a17:907:3da2:b0:78d:3b45:11d9 with SMTP id he34-20020a1709073da200b0078d3b4511d9mr27889018ejc.87.1666619328677; Mon, 24 Oct 2022 06:48:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666619328; cv=none; d=google.com; s=arc-20160816; b=AT4IwzbN+qEM9zRCXIA0idOQOQPRn+6QzzivhuirsBwUvg0SLuDJuPR8GJMrazDmqS GgciC22Hgb+sqf/v3DIaRGa57WjY87rAPCl+AAOtulCIoxQPh2dsIQmjG67je+fxzvqo Yo3aV5d32zxDP6S+773Xq4yodizShVwosQ6udv066IFkD70pVBWMzmiCJs0gR3Q4VDoO clkme90+kD+GfkbltLXU3Cwkc0mMAAveW8r0eDmyJqSYdsxKSL0Wsra/Q3Ki0LKH8j+C I5aXgPBq8WElN6iZlYVq3VeT54Gsxrl1UMd1QmEd+xgV9pAT/I77ecauTXekmj1YIbAH BDRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Gj3uMH/9QCC+t5FG6HebQA4NybLx13sWwUY+LtsK+/Q=; b=ubMPslAphlANUE4tVMMK2fGW5S5Jp4XhF4epSE5OzaYguSkuW0WAfJEYozoc+L4e5W y95ofhdVGEoZZkk7H/kezyVvAxZ+wXPank7aHUJp8WYvZA/JDQfajXtSSe2e5qFj0Cro PVWkZUPYih8GKmaslUkFWWyPSC1YJh+uHdc2RfgXfTze1r9gvKOOFkXWWRAysX6/ko9S wBK6Ap5H9MB926ZdafgmZPNJv3b9PzG1IRFktF+DoDjnP+OWPkyhY4dYJ2iCPS5/tXWF Kr5FTzl2stfmdWiGWj+/whNgfWTpVkZafifaosJ+BsK2+7Q+ILoIKomKog7pO8msdNNY 8lqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IjJII296; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dn18-20020a05640222f200b004617df75676si6156089edb.245.2022.10.24.06.48.11; Mon, 24 Oct 2022 06:48:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IjJII296; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236380AbiJXNqX (ORCPT + 99 others); Mon, 24 Oct 2022 09:46:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236315AbiJXNnj (ORCPT ); Mon, 24 Oct 2022 09:43:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 746431B78A; Mon, 24 Oct 2022 05:39:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1E089612BB; Mon, 24 Oct 2022 12:38:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3040BC433B5; Mon, 24 Oct 2022 12:38:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615080; bh=fpYQr3PJKdkvwfl/0Lj8rF1ABvUZaMjB2j3raJrIsoM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IjJII296QOEiFj7QanMrDid6Jvxc9+1cHLH+1r+hdQu1A5CC4182dt8dRwApB/e4R pR0DDjJsgLOIBIXAdX73rcj0KoKW3uNaLV8pNY8eGtAVO5WkUCE9gKIQCFhxD5GPpU Ss5zh+eo8NZziwUbu9bPPTt55H4bhb7KBtjofaKo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, stable@kernel.org, Zhang Yi , Jan Kara , Theodore Tso Subject: [PATCH 5.15 097/530] ext4: ext4_read_bh_lock() should submit IO if the buffer isnt uptodate Date: Mon, 24 Oct 2022 13:27:21 +0200 Message-Id: <20221024113049.402861972@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747577029452766668?= X-GMAIL-MSGID: =?utf-8?q?1747577029452766668?= From: Zhang Yi commit 0b73284c564d3ae4feef4bc920292f004acf4980 upstream. Recently we notice that ext4 filesystem would occasionally fail to read metadata from disk and report error message, but the disk and block layer looks fine. After analyse, we lockon commit 88dbcbb3a484 ("blkdev: avoid migration stalls for blkdev pages"). It provide a migration method for the bdev, we could move page that has buffers without extra users now, but it lock the buffers on the page, which breaks the fragile metadata read operation on ext4 filesystem, ext4_read_bh_lock() was copied from ll_rw_block(), it depends on the assumption of that locked buffer means it is under IO. So it just trylock the buffer and skip submit IO if it lock failed, after wait_on_buffer() we conclude IO error because the buffer is not uptodate. This issue could be easily reproduced by add some delay just after buffer_migrate_lock_buffers() in __buffer_migrate_folio() and do fsstress on ext4 filesystem. EXT4-fs error (device pmem1): __ext4_find_entry:1658: inode #73193: comm fsstress: reading directory lblock 0 EXT4-fs error (device pmem1): __ext4_find_entry:1658: inode #75334: comm fsstress: reading directory lblock 0 Fix it by removing the trylock logic in ext4_read_bh_lock(), just lock the buffer and submit IO if it's not uptodate, and also leave over readahead helper. Cc: stable@kernel.org Signed-off-by: Zhang Yi Reviewed-by: Jan Kara Link: https://lore.kernel.org/r/20220831074629.3755110-1-yi.zhang@huawei.com Signed-off-by: Theodore Ts'o Signed-off-by: Greg Kroah-Hartman --- fs/ext4/super.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -186,19 +186,12 @@ int ext4_read_bh(struct buffer_head *bh, int ext4_read_bh_lock(struct buffer_head *bh, int op_flags, bool wait) { - if (trylock_buffer(bh)) { - if (wait) - return ext4_read_bh(bh, op_flags, NULL); + lock_buffer(bh); + if (!wait) { ext4_read_bh_nowait(bh, op_flags, NULL); return 0; } - if (wait) { - wait_on_buffer(bh); - if (buffer_uptodate(bh)) - return 0; - return -EIO; - } - return 0; + return ext4_read_bh(bh, op_flags, NULL); } /* @@ -245,7 +238,8 @@ void ext4_sb_breadahead_unmovable(struct struct buffer_head *bh = sb_getblk_gfp(sb, block, 0); if (likely(bh)) { - ext4_read_bh_lock(bh, REQ_RAHEAD, false); + if (trylock_buffer(bh)) + ext4_read_bh_nowait(bh, REQ_RAHEAD, NULL); brelse(bh); } }