From patchwork Thu Apr 27 01:15:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryusuke Konishi X-Patchwork-Id: 88079 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp617495vqo; Wed, 26 Apr 2023 19:03:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ555XQeBWiuInDKkumm+ZhIjfpVTRfstuyI+vaetVt0aQHyJ809nBJ8gbxrsyG2nWFWFL81 X-Received: by 2002:a17:90a:f09:b0:247:8029:fb30 with SMTP id 9-20020a17090a0f0900b002478029fb30mr109717pjy.42.1682561034038; Wed, 26 Apr 2023 19:03:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682561034; cv=none; d=google.com; s=arc-20160816; b=dX+X0CJBE5M50njqhIJ8cP7RbitTfAD+yGph1yt/22xEItN4n8zw2NDR1t1kAwCPIc TmP8TN1742pRJl7erxXT8NbcQYmi0nOzCFO/c44vXxVO/VTFrSVEBz3vzYed6qqN+MD9 wq/0ly5tKcswxOswooBp1+zRjzVUMWoN3eM5xsa70sIJ6Z5jnhsN+hNHNLWXLesa2sk0 tfpXsUvzcYjqc71x1DC2lR+2KYNacYrzgJYLdcznGlJfzIXxh4xD6kDG6xm9NQgmxVto GuaC8wYUndI8+vZEBci9eFHneQNnTu8rX3LOnNt0vHXnNLCECSDHUpiIYPC6yPX07NIi BFaw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=zrhaHXbwFsAd0/GaXjow7H0L4+tY0cPhGmnifdoJQXg=; b=AOUpE16AbaYk7Rdh4HhsJxx847PHHdT0gmN87qYXNVpu2bi/IpOj5MwO0iPyWfNryh OF5R5LBkdVp7Ekv2BrAx/jPQ96IrrorDjDcqbwoNjKVsxEGxJZ34oFlEdR43OlZwAVk5 ovI+2siIFKtHxU3g6I5CMaFRvD65x1YbdpjAPm1fFx16f8z1V7O+qoZFJhXrqfK82x0B Ri9iO4KPFY+oUez7J/0LGLVVHajDEIUzcALYjY4W7mGY3MULKU3p152WXUzx5cYsyD7K 0XKCYFmVOoQcbgkd3YwuuDg0/ls6et3H45qNdVK6uyspUEXPZkwwMdVkLPMk+C9XWXHl 76nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20221208 header.b="UHPmzD/J"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kk17-20020a17090b4a1100b0022c9cb7662csi22189060pjb.159.2023.04.26.19.03.26; Wed, 26 Apr 2023 19:03:54 -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=@gmail.com header.s=20221208 header.b="UHPmzD/J"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242836AbjD0BPi (ORCPT + 99 others); Wed, 26 Apr 2023 21:15:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242823AbjD0BPe (ORCPT ); Wed, 26 Apr 2023 21:15:34 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B81240C7; Wed, 26 Apr 2023 18:15:32 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1a6670671e3so65766395ad.0; Wed, 26 Apr 2023 18:15:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682558131; x=1685150131; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zrhaHXbwFsAd0/GaXjow7H0L4+tY0cPhGmnifdoJQXg=; b=UHPmzD/Jv7A/n5d3rtYTtbcJMUMUlwDvrekWM3+ffCgmlYi440mf723O21x1cz+6bJ LMpmg4Nq7ivKgB6odqiW+Rp+s+PQy9DVqNpI0Lq4EHtDlgsyL2HGRyDH6GiF8Cd1xFSQ DuwwoJSBJz9pzwZFv1Oc7IR34uUZqEvT/WD1Y0UErcaAFXc9ojvtvOuxExoxJeB61UIt ySp5r5U2/F26BAQLK1xavfLN23IoEepEuXqxeuMNKXRVWjR2KhKAHmNnqfaJ76dCTCL+ 10qSEQmxSsvPC7T7dx1ddWXHR/vwVS5Hr++krWyiyDC33myHP+pGCcg/5IDZtzglHt14 UXIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682558131; x=1685150131; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zrhaHXbwFsAd0/GaXjow7H0L4+tY0cPhGmnifdoJQXg=; b=TLR60Pau3kElH+gEejiEA490FgFanIroBlOND1u1/CIe6sWRMMlc8vcURogzvgMPv+ UaSq71WAJDvUt+8RC/TofVHwVDXzIWaOkomp20U9Hk2OXuQS1g2MZPuXeeMMmwXIznKe lPD//Cez/Rbcuhtw38CtU50NakgXSazB7LqvXxePZlu3buImIelCI/FLo4iBJmr+xK1+ KjOEhbr3tZtoICopVRM0h4gwiW3h5GVjNOj/rLQ3982YVSNpbmr4NQ3i1eSmDBzRD/Zx f+WFozp1IWE925wXhvQSrFCZ7Or/Sx2Dv//RsGCCQ+X8Anjwi+1IpCQXrTlAlRhi68Cs RpXA== X-Gm-Message-State: AAQBX9dT9eqkNPJz/jqQ/W2hXk9zhEbxNyNwU8aC2f+zVYYbAElfLxZA uvK/jDz4//aZU90hjK3Xyyo= X-Received: by 2002:a17:902:c411:b0:19b:dbf7:f9ca with SMTP id k17-20020a170902c41100b0019bdbf7f9camr27202077plk.0.1682558131253; Wed, 26 Apr 2023 18:15:31 -0700 (PDT) Received: from carrot.. (i223-217-187-146.s42.a014.ap.plala.or.jp. [223.217.187.146]) by smtp.gmail.com with ESMTPSA id g4-20020a1709026b4400b0019f3cc463absm10565352plt.0.2023.04.26.18.15.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 18:15:30 -0700 (PDT) From: Ryusuke Konishi To: Andrew Morton Cc: linux-nilfs , syzbot , syzkaller-bugs@googlegroups.com, LKML Subject: [PATCH] nilfs2: do not write dirty data after degenerating to read-only Date: Thu, 27 Apr 2023 10:15:26 +0900 Message-Id: <20230427011526.13457-1-konishi.ryusuke@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1764293118724516243?= X-GMAIL-MSGID: =?utf-8?q?1764293118724516243?= According to syzbot's report, mark_buffer_dirty() called from nilfs_segctor_do_construct() outputs a warning with some patterns after nilfs2 detects metadata corruption and degrades to read-only mode. After such read-only degeneration, page cache data may be cleared through nilfs_clear_dirty_page() which may also clear the uptodate flag for their buffer heads. However, even after the degeneration, log writes are still performed by unmount processing etc., which causes mark_buffer_dirty() to be called for buffer heads without the "uptodate" flag and causes the warning. Since any writes should not be done to a read-only file system in the first place, this fixes the warning in mark_buffer_dirty() by letting nilfs_segctor_do_construct() abort early if in read-only mode. This also changes the retry check of nilfs_segctor_write_out() to avoid unnecessary log write retries if it detects -EROFS that nilfs_segctor_do_construct() returned. Signed-off-by: Ryusuke Konishi Reported-by: syzbot+2af3bc9585be7f23f290@syzkaller.appspotmail.com Link: https://syzkaller.appspot.com/bug?extid=2af3bc9585be7f23f290 Tested-by: Ryusuke Konishi Cc: --- fs/nilfs2/segment.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 228659612c0d..ac949fd7603f 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -2041,6 +2041,9 @@ static int nilfs_segctor_do_construct(struct nilfs_sc_info *sci, int mode) struct the_nilfs *nilfs = sci->sc_super->s_fs_info; int err; + if (sb_rdonly(sci->sc_super)) + return -EROFS; + nilfs_sc_cstage_set(sci, NILFS_ST_INIT); sci->sc_cno = nilfs->ns_cno; @@ -2724,7 +2727,7 @@ static void nilfs_segctor_write_out(struct nilfs_sc_info *sci) flush_work(&sci->sc_iput_work); - } while (ret && retrycount-- > 0); + } while (ret && ret != -EROFS && retrycount-- > 0); } /**