From patchwork Mon Nov 21 12:14:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Bin X-Patchwork-Id: 23696 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1539730wrr; Mon, 21 Nov 2022 04:01:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf584ReghPYigbChiEhjCpczapOJuAsDT0kGbzdBAg0FAfi8EapnptDB7zygLyME7YkTIRfD X-Received: by 2002:aa7:d943:0:b0:469:cdb7:7fe4 with SMTP id l3-20020aa7d943000000b00469cdb77fe4mr401317eds.261.1669032096830; Mon, 21 Nov 2022 04:01:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669032096; cv=none; d=google.com; s=arc-20160816; b=W+Dcks4NB3rP+plFosPjW5QHfRQboWhE2HWXVqDH9iYoQA6toh+pvYPQxgYpac4GDT hwpTCJFAGQ7tbbqrcf83cEGqE1beOHWn5/Zvv7Ni/Z/UlPCcTXvVOtAMXWsKv8qD1lhL 3oFTv4StzqJmxdxKSkKSYMX6Gi++WujrIIjs9+ViV7I0AgL30vwrfKY4ZwCMRKxL6nia 5CT6ukb676SfumXoKUP1kN28WHf4LA+qLksbv8QTVzaHPekgCRgdRzMuJho6GQ5VP6EP P1vmNnMq2aKurbvgJd3kBky+D/N1piAKvTa4hS3WEP9/rM8ZszbVaOUB0lcMz/9OWULZ 2LdA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=rF5Lvy+GBvTgMPTvYUX1GdfrM3aRiPx5u6wmebZ2N2Q=; b=lzYrbDwF/iGPH8PanQXdWz/iSNcaoXAnMpQsyMKUbGKovllko2mnHjOIumvfs8t01I yfE3APeLviwRj08CyrcryqGslfAUM0WvULa09bSr44D7op+hPlTscISfxrpogkkqU0zl eYxuzUz+kX/RoDlee0rpsErHg3NN09bvpRGealRfFulQE0WSPXoFxI/Epe1mfNSqGQH7 O84eeEZ6MBcF6TC61ypVdYLaGgyYUHB+ztkFvWfOfK5IoVnfH4szmP9bfFgGvbYWDMZV trkz0/sPXNrRbs8+Huy/GhpZgcWocS5PsomEWvmDW91tCVsCkV/NPhXWPKaxF0Dp+BWK 2sGQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id di13-20020a170906730d00b007af039d0bd0si3153942ejc.404.2022.11.21.04.00.59; Mon, 21 Nov 2022 04:01:36 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230441AbiKULxm (ORCPT + 99 others); Mon, 21 Nov 2022 06:53:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230438AbiKULxY (ORCPT ); Mon, 21 Nov 2022 06:53:24 -0500 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9956016589; Mon, 21 Nov 2022 03:53:22 -0800 (PST) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4NG5PT0BnLz4f3m6Z; Mon, 21 Nov 2022 19:53:17 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.127.227]) by APP4 (Coremail) with SMTP id gCh0CgDHONatZntj0uehAw--.51112S7; Mon, 21 Nov 2022 19:53:20 +0800 (CST) From: Ye Bin To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jack@suse.cz, Ye Bin , syzbot+05a0f0ccab4a25626e38@syzkaller.appspotmail.com Subject: [PATCH v2 3/3] ext4: add check pending tree when evict inode Date: Mon, 21 Nov 2022 20:14:34 +0800 Message-Id: <20221121121434.1061725-4-yebin@huaweicloud.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221121121434.1061725-1-yebin@huaweicloud.com> References: <20221121121434.1061725-1-yebin@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgDHONatZntj0uehAw--.51112S7 X-Coremail-Antispam: 1UD129KBjvJXoWxGrWxAF1kKw4DJr1UAF4rGrg_yoWrCryUp3 y5Cw15Cr48Xw1kuFWfKF4UXr1Yga48CFWUArZakr1aqFy8Xa4ftF18tr1YvF15JrZ8Gr1Y qF40k34j9w4UG3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvCb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUWw A2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr 0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY 17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcV C0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY 6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4UJVWxJrUvcSsGvfC2Kf nxnUUI43ZEXa7IU8-zVUUUUUU== X-CM-SenderInfo: p1hex046kxt4xhlfz01xgou0bp/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,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?1750107000067881958?= X-GMAIL-MSGID: =?utf-8?q?1750107000067881958?= From: Ye Bin Syzbot found the following issue: BUG: memory leak unreferenced object 0xffff8881bde17420 (size 32): comm "rep", pid 2327, jiffies 4295381963 (age 32.265s) hex dump (first 32 bytes): 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<00000000ac6d38f8>] __insert_pending+0x13c/0x2d0 [<00000000d717de3b>] ext4_es_insert_delayed_block+0x399/0x4e0 [<000000004be03913>] ext4_da_map_blocks.constprop.0+0x739/0xfa0 [<00000000885a832a>] ext4_da_get_block_prep+0x10c/0x440 [<0000000029b7f8ef>] __block_write_begin_int+0x28d/0x860 [<00000000e182ebc3>] ext4_da_write_inline_data_begin+0x2d1/0xf30 [<00000000ced0c8a2>] ext4_da_write_begin+0x612/0x860 [<000000008d5f27fa>] generic_perform_write+0x215/0x4d0 [<00000000552c1cde>] ext4_buffered_write_iter+0x101/0x3b0 [<0000000052177ae8>] do_iter_readv_writev+0x19f/0x340 [<000000004b9de834>] do_iter_write+0x13b/0x650 [<00000000e2401b9b>] iter_file_splice_write+0x5a5/0xab0 [<0000000023aa5d90>] direct_splice_actor+0x103/0x1e0 [<0000000089e00fc1>] splice_direct_to_actor+0x2c9/0x7b0 [<000000004386851e>] do_splice_direct+0x159/0x280 [<00000000b567e609>] do_sendfile+0x932/0x1200 Above issue fixed by 1b8f787ef547 "ext4: fix warning in 'ext4_da_release_space'" in this scene. To make things better add check pending tree when evit inode. To avoid possible memleak free pending tree when check tree isn't cleared. Reported-by: syzbot+05a0f0ccab4a25626e38@syzkaller.appspotmail.com Signed-off-by: Ye Bin --- fs/ext4/extents_status.c | 28 ++++++++++++++++++++++++++++ fs/ext4/extents_status.h | 1 + fs/ext4/super.c | 3 +++ 3 files changed, 32 insertions(+) diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 4684eaea9471..a7a612eb70fe 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -1948,6 +1948,34 @@ void ext4_remove_pending(struct inode *inode, ext4_lblk_t lblk) write_unlock(&ei->i_es_lock); } +void ext4_check_inode_pending(struct inode *inode) +{ + struct ext4_inode_info *ei = EXT4_I(inode); + struct pending_reservation *pr; + struct ext4_pending_tree *tree; + struct rb_node *node; + int count = 0; + + write_lock(&ei->i_es_lock); + tree = &EXT4_I(inode)->i_pending_tree; + node = rb_first(&tree->root); + while (node) { + pr = rb_entry(node, struct pending_reservation, rb_node); + node = rb_next(node); + rb_erase(&pr->rb_node, &tree->root); + kmem_cache_free(ext4_pending_cachep, pr); + count++; + } + write_unlock(&ei->i_es_lock); + + if (count) + ext4_error(inode->i_sb, + "Inode %lu: pending tree has %d not cleared!", + inode->i_ino, count); + + return; +} + /* * ext4_is_pending - determine whether a cluster has a pending reservation * on it diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h index 4ec30a798260..631267d45ab2 100644 --- a/fs/ext4/extents_status.h +++ b/fs/ext4/extents_status.h @@ -248,6 +248,7 @@ extern int __init ext4_init_pending(void); extern void ext4_exit_pending(void); extern void ext4_init_pending_tree(struct ext4_pending_tree *tree); extern void ext4_remove_pending(struct inode *inode, ext4_lblk_t lblk); +extern void ext4_check_inode_pending(struct inode *inode); extern bool ext4_is_pending(struct inode *inode, ext4_lblk_t lblk); extern int ext4_es_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk, bool allocated); diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 3d30007502a4..0498feecf10d 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1390,6 +1390,9 @@ static void ext4_destroy_inode(struct inode *inode) ext4_error(inode->i_sb, "Inode %lu (%p) i_reserved_data_blocks" " (%u) not cleared!", inode->i_ino, EXT4_I(inode), EXT4_I(inode)->i_reserved_data_blocks); + + if (EXT4_SB(inode->i_sb)->s_cluster_ratio != 1) + ext4_check_inode_pending(inode); } static void init_once(void *foo)