Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1722905iob; Thu, 5 May 2022 07:08:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyj1CY1UUby4wQ6e2Uos9MIhoRIXPTHMBQzCZKcrS0isUTnenTbN9UIlpdp1Z3+x6yosBB1 X-Received: by 2002:a17:90b:1b07:b0:1dc:5ec5:56b0 with SMTP id nu7-20020a17090b1b0700b001dc5ec556b0mr6401726pjb.165.1651759735271; Thu, 05 May 2022 07:08:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651759735; cv=none; d=google.com; s=arc-20160816; b=dh4s0hgesXR3olo29htMOYuJPaqhQSCe0OorCPXPGSDs24tASLR1jCWn8Oh05OdT3M KIaeGvWjfsDq8IHrArb1afuu9P8FesgPdMKNXh3Do+sTYJ1zpXEYYACu/kSEBTXp0FR/ +fxvUcxR7ptucCHYTGelQpX5OAUbXzeTFqRALoOQi8nUYCM8/EyzNMx6mW2G7gz6xGhK k/QfJ7+VnoBMMCbHDVZHDqv35D+K9QhE57HiG4OsVTpVVgs0t6/OFt3C8UFW1+dKTCT9 k3NaW50wUiAkM86pbPONmHY47+aR+DjnzSnZ1LJNX19KWJYfjHaoAqZgWx6vVTuK6mNG II/w== 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; bh=jCmqepN1kW6O7M03Cj/ok2gQKlILbVh3ELjZSSgFAFs=; b=XZULjBAej+pxyAOBmuAoOWZjOdmKyesg2YS4/B8XH8N31qAYytCCNQrrZ6dNk/13mC Jg4LGEsaulUqnQBVHldbrU3iU0aPVmgSZ1cUgWOLH9nN7+Cvv+VBcnZ83RqYrBd7h1SA 2Wt+iWREElVp3502KzMkX/R8DpIJ1oTnuVHxP53ju/TYcrA53PHpRlWOzkh76MfaWTfJ Tq/8Qpuv2mp5r/A7Z1ELVBVQzBIPABmsbtI3+iU0pM60DzJAuJJOKwfAp7zlbfAsXpYu VJHPb0ACj6zByHYkIUm3OdPvJ5P/wcdRoAATQLVHYT+IGeCRDkl0YXtYSO5uJwXQSD68 AACg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t184-20020a6381c1000000b003ab3dd01959si1484883pgd.699.2022.05.05.07.08.31; Thu, 05 May 2022 07:08:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-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; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348504AbiEENqv (ORCPT + 99 others); Thu, 5 May 2022 09:46:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239808AbiEENqu (ORCPT ); Thu, 5 May 2022 09:46:50 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5875357158; Thu, 5 May 2022 06:43:10 -0700 (PDT) Received: from canpemm500010.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4KvFHx3QByzhYqf; Thu, 5 May 2022 21:42:37 +0800 (CST) Received: from huawei.com (10.175.127.227) by canpemm500010.china.huawei.com (7.192.105.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 5 May 2022 21:43:07 +0800 From: Ye Bin To: , , CC: , , , Ye Bin Subject: [PATCH -next] ext4: fix bug_on in ext4_writepages Date: Thu, 5 May 2022 21:57:08 +0800 Message-ID: <20220505135708.2629657-1-yebin10@huawei.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.127.227] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500010.china.huawei.com (7.192.105.118) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, 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-ext4@vger.kernel.org we got issue as follows: EXT4-fs error (device loop0): ext4_mb_generate_buddy:1141: group 0, block bitmap and bg descriptor inconsistent: 25 vs 31513 free cls ------------[ cut here ]------------ kernel BUG at fs/ext4/inode.c:2708! invalid opcode: 0000 [#1] PREEMPT SMP KASAN PTI CPU: 2 PID: 2147 Comm: rep Not tainted 5.18.0-rc2-next-20220413+ #155 RIP: 0010:ext4_writepages+0x1977/0x1c10 RSP: 0018:ffff88811d3e7880 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000001 RCX: ffff88811c098000 RDX: 0000000000000000 RSI: ffff88811c098000 RDI: 0000000000000002 RBP: ffff888128140f50 R08: ffffffffb1ff6387 R09: 0000000000000000 R10: 0000000000000007 R11: ffffed10250281ea R12: 0000000000000001 R13: 00000000000000a4 R14: ffff88811d3e7bb8 R15: ffff888128141028 FS: 00007f443aed9740(0000) GS:ffff8883aef00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000020007200 CR3: 000000011c2a4000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: do_writepages+0x130/0x3a0 filemap_fdatawrite_wbc+0x83/0xa0 filemap_flush+0xab/0xe0 ext4_alloc_da_blocks+0x51/0x120 __ext4_ioctl+0x1534/0x3210 __x64_sys_ioctl+0x12c/0x170 do_syscall_64+0x3b/0x90 It may happen as follows: 1. write inline_data inode vfs_write new_sync_write ext4_file_write_iter ext4_buffered_write_iter generic_perform_write ext4_da_write_begin ext4_da_write_inline_data_begin -> If inline data size too small will allocate block to write, then mapping will has dirty page ext4_da_convert_inline_data_to_extent ->clear EXT4_STATE_MAY_INLINE_DATA 2. fallocate do_vfs_ioctl ioctl_preallocate vfs_fallocate ext4_fallocate ext4_convert_inline_data ext4_convert_inline_data_nolock ext4_map_blocks -> fail will goto restore data ext4_restore_inline_data ext4_create_inline_data ext4_write_inline_data ext4_set_inode_state -> set inode EXT4_STATE_MAY_INLINE_DATA 3. writepages __ext4_ioctl ext4_alloc_da_blocks filemap_flush filemap_fdatawrite_wbc do_writepages ext4_writepages if (ext4_has_inline_data(inode)) BUG_ON(ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) To solved this issue, record origin 'EXT4_STATE_MAY_INLINE_DATA' flag, then pass value to 'ext4_restore_inline_data', 'ext4_restore_inline_data' will decide to if recovery 'EXT4_STATE_MAY_INLINE_DATA' flag according to parameter. Signed-off-by: Ye Bin --- fs/ext4/inline.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 9c076262770d..407061c79adc 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1125,8 +1125,8 @@ static int ext4_update_inline_dir(handle_t *handle, struct inode *dir, } static void ext4_restore_inline_data(handle_t *handle, struct inode *inode, - struct ext4_iloc *iloc, - void *buf, int inline_size) + struct ext4_iloc *iloc, void *buf, + int inline_size, bool has_data) { int ret; @@ -1138,7 +1138,8 @@ static void ext4_restore_inline_data(handle_t *handle, struct inode *inode, return; } ext4_write_inline_data(inode, iloc, buf, 0, inline_size); - ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA); + if (has_data) + ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA); } static int ext4_finish_convert_inline_dir(handle_t *handle, @@ -1194,6 +1195,7 @@ static int ext4_convert_inline_data_nolock(handle_t *handle, struct buffer_head *data_bh = NULL; struct ext4_map_blocks map; int inline_size; + bool has_data; inline_size = ext4_get_inline_size(inode); buf = kmalloc(inline_size, GFP_NOFS); @@ -1222,6 +1224,8 @@ static int ext4_convert_inline_data_nolock(handle_t *handle, if (error) goto out; + has_data = !!ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA); + map.m_lblk = 0; map.m_len = 1; map.m_flags = 0; @@ -1262,7 +1266,8 @@ static int ext4_convert_inline_data_nolock(handle_t *handle, unlock_buffer(data_bh); out_restore: if (error) - ext4_restore_inline_data(handle, inode, iloc, buf, inline_size); + ext4_restore_inline_data(handle, inode, iloc, buf, + inline_size, has_data); out: brelse(data_bh); -- 2.31.1