From nobody Mon Feb 9 01:50:31 2026 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 595F622B8A6; Fri, 31 Oct 2025 06:31:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761892287; cv=none; b=p2xn36lKAZ6LEFP0kvacpIHTm45ydVj9xRnrIqIlJF5iGKdvc9iVTSjo4+OsqjTn52wt0eu0XVPTPEQmdzEfjDbb/ujighHP1A2u70lFzzhuSYGWN9RJg5F4XPzXoI03wYRa/jsNtpp/AT75PLJ8dkKHR1nUHA7RzlZI1IWKtho= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761892287; c=relaxed/simple; bh=leoAbH0HXwb0I5NGo8h9qWyQO0l6o+QHE2KaGPaDlNg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W86KzrVnaeAip6C2KP5vTe3GloYRs2sUzoXLOZaKnrOLTYY6iL5OkpPAIUWCQ2ZjQgeodvkTzUtUL+z5RX+uxSvKntycGIczyYEiDLA2N+6oAg0amRkJUHIDLMFEnnY2jfK4N0LunCrS06dcJyzvNSeDotOMWLfPbOt/tN4jfs0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTPS id 4cyWMj0ZZDzYQtkN; Fri, 31 Oct 2025 14:31:13 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 0BEB21A084B; Fri, 31 Oct 2025 14:31:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.50.85.155]) by APP2 (Coremail) with SMTP id Syh0CgBHnESuVwRpEFrWCA--.33311S5; Fri, 31 Oct 2025 14:31:20 +0800 (CST) From: Zhang Yi To: linux-ext4@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, yi.zhang@huawei.com, yi.zhang@huaweicloud.com, libaokun1@huawei.com, yangerkun@huawei.com Subject: [PATCH 1/4] ext4: make ext4_es_cache_extent() support overwrite existing extents Date: Fri, 31 Oct 2025 14:29:02 +0800 Message-ID: <20251031062905.4135909-2-yi.zhang@huaweicloud.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20251031062905.4135909-1-yi.zhang@huaweicloud.com> References: <20251031062905.4135909-1-yi.zhang@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Syh0CgBHnESuVwRpEFrWCA--.33311S5 X-Coremail-Antispam: 1UD129KBjvJXoWxury5KFWfGFy5Xr45ZFy8uFg_yoWrurW7pr 9Ikr4UJrWrX34vkayxJa1UXr1rKa4fG3y7Ary7Kw1SkFy5XFySqF1UtayjvFyFgFW8XF1Y vF40kw1UGa15C3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUm014x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jr4l82xGYIkIc2 x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kIc2 xKxwCY1x0262kKe7AKxVWUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWU JVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67 kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY 6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0x vEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVj vjDU0xZFpf9x0JUqkskUUUUU= X-CM-SenderInfo: d1lo6xhdqjqx5xdzvxpfor3voofrz/ Content-Type: text/plain; charset="utf-8" From: Zhang Yi Currently, ext4_es_cache_extent() is used to load extents into the extent status tree when reading on-disk extent blocks. Since it may be called while moving or modifying the extent tree, so it does not overwrite existing extents in the extent status tree and is only used for the initial loading. There are many other places in ext4 where on-disk extents are inserted into the extent status tree, such as in ext4_map_query_blocks(). Currently, they call ext4_es_insert_extent() to perform the insertion, but they don't modify the extents, so ext4_es_cache_extent() would be a more appropriate choice. However, when ext4_map_query_blocks() inserts an extent, it may overwrite a short existing extent of the same type. Therefore, to prepare for the replacements, we need to extend ext4_es_cache_extent() to allow it to overwrite existing extents with the same type. In addition, since cached extents can be more lenient than the extents they modify and do not involve modifying reserved blocks, it is not necessary to ensure that the insertion operation succeeds as strictly as in the ext4_es_insert_extent() function. Signed-off-by: Zhang Yi --- fs/ext4/extents.c | 4 ++-- fs/ext4/extents_status.c | 28 +++++++++++++++++++++------- fs/ext4/extents_status.h | 2 +- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index ca5499e9412b..c42ceb5aae37 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -537,12 +537,12 @@ static void ext4_cache_extents(struct inode *inode, =20 if (prev && (prev !=3D lblk)) ext4_es_cache_extent(inode, prev, lblk - prev, ~0, - EXTENT_STATUS_HOLE); + EXTENT_STATUS_HOLE, false); =20 if (ext4_ext_is_unwritten(ex)) status =3D EXTENT_STATUS_UNWRITTEN; ext4_es_cache_extent(inode, lblk, len, - ext4_ext_pblock(ex), status); + ext4_ext_pblock(ex), status, false); prev =3D lblk + len; } } diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 31dc0496f8d0..f9546ecf7340 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -986,13 +986,19 @@ void ext4_es_insert_extent(struct inode *inode, ext4_= lblk_t lblk, } =20 /* - * ext4_es_cache_extent() inserts information into the extent status - * tree if and only if there isn't information about the range in - * question already. + * ext4_es_cache_extent() inserts extent information into the extent status + * tree. If 'overwrite' is not set, it inserts extent only if there isn't + * information about the specified range. Otherwise, it overwrites the + * current information. + * + * Note that this interface is only used for caching on-disk extent + * information and cannot be used to convert existing extents in the extent + * status tree. To convert existing extents, use ext4_es_insert_extent() + * instead. */ void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk, ext4_lblk_t len, ext4_fsblk_t pblk, - unsigned int status) + unsigned int status, bool overwrite) { struct extent_status *es; struct extent_status newes; @@ -1012,10 +1018,18 @@ void ext4_es_cache_extent(struct inode *inode, ext4= _lblk_t lblk, BUG_ON(end < lblk); =20 write_lock(&EXT4_I(inode)->i_es_lock); - es =3D __es_tree_search(&EXT4_I(inode)->i_es_tree.root, lblk); - if (!es || es->es_lblk > end) - __es_insert_extent(inode, &newes, NULL); + if (es && es->es_lblk <=3D end) { + if (!overwrite) + goto unlock; + + /* Only extents of the same type can be overwritten. */ + WARN_ON_ONCE(ext4_es_type(es) !=3D status); + if (__es_remove_extent(inode, lblk, end, NULL, NULL)) + goto unlock; + } + __es_insert_extent(inode, &newes, NULL); +unlock: write_unlock(&EXT4_I(inode)->i_es_lock); } =20 diff --git a/fs/ext4/extents_status.h b/fs/ext4/extents_status.h index 8f9c008d11e8..415f7c223a46 100644 --- a/fs/ext4/extents_status.h +++ b/fs/ext4/extents_status.h @@ -139,7 +139,7 @@ extern void ext4_es_insert_extent(struct inode *inode, = ext4_lblk_t lblk, bool delalloc_reserve_used); extern void ext4_es_cache_extent(struct inode *inode, ext4_lblk_t lblk, ext4_lblk_t len, ext4_fsblk_t pblk, - unsigned int status); + unsigned int status, bool overwrite); extern void ext4_es_remove_extent(struct inode *inode, ext4_lblk_t lblk, ext4_lblk_t len); extern void ext4_es_find_extent_range(struct inode *inode, --=20 2.46.1 From nobody Mon Feb 9 01:50:31 2026 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E0E72E6125; Fri, 31 Oct 2025 06:31:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.56 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761892286; cv=none; b=Zttol9tuderhy2pFz7+UQ1wwJPP+FmtbOPb0IlgRRArb5AUSGS0IDVWv9MWv41JdHnjCxrNFiM2HM3l42KnOPNRGQScuMP6HEck5xw6RfypkFEHurjTI+QYoW05J+kZ3JPhaxyqJ0uf7cdhbNb8RnmbxQlb3V8HoWawvQB+lJ0c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761892286; c=relaxed/simple; bh=W6rXC4yik0dnsYjY60VbMqpNeSek+IzWHWPrGzxVmnQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oRBPr4CxpBbdlF5Hw3wPFmxEKmGCf6eXm3ZEEfApKS0H3nCZjYGWqEhld0dM5BORg/9WEAJEWUP0jd+Ex9jv7uKM+RvDKK4DND8x9xir6LItUGCEEuEl2i9lzkp7dCS9UYgynvsbdeowZnBTGD7i/136HF4jObriiWFPDOZFM7Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4cyWLh2nclzKHM0T; Fri, 31 Oct 2025 14:30:20 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 154031A1B8E; Fri, 31 Oct 2025 14:31:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.50.85.155]) by APP2 (Coremail) with SMTP id Syh0CgBHnESuVwRpEFrWCA--.33311S6; Fri, 31 Oct 2025 14:31:20 +0800 (CST) From: Zhang Yi To: linux-ext4@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, yi.zhang@huawei.com, yi.zhang@huaweicloud.com, libaokun1@huawei.com, yangerkun@huawei.com Subject: [PATCH 2/4] ext4: check for conflicts when caching extents Date: Fri, 31 Oct 2025 14:29:03 +0800 Message-ID: <20251031062905.4135909-3-yi.zhang@huaweicloud.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20251031062905.4135909-1-yi.zhang@huaweicloud.com> References: <20251031062905.4135909-1-yi.zhang@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Syh0CgBHnESuVwRpEFrWCA--.33311S6 X-Coremail-Antispam: 1UD129KBjvJXoWxAw1fAF13tF45KFWrAw13Jwb_yoW5CrWDpr ZIkr15Jrn3WwnI9ayfAa1UXr1fKa18GrW7C34fKw1S9a45Zry3KF1jyFyjvF95XFW8Xr1a vF4Fkr18Ga1UJrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUm014x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kIc2 xKxwCY1x0262kKe7AKxVWUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWU JVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67 kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY 6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0x vEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVj vjDU0xZFpf9x0JUczV8UUUUU= X-CM-SenderInfo: d1lo6xhdqjqx5xdzvxpfor3voofrz/ Content-Type: text/plain; charset="utf-8" From: Zhang Yi Since ext4_es_cache_extent() can only be used to load on-disk extents and does not permit modifying extents, it is not possible to overwrite an extent of a different type. To prevent misuse of the interface, the current implementation checks only the first existing extent but does not verify all extents within the range to be inserted, as doing so would be time-consuming in highly fragmented scenarios. Furthermore, adding such checks to __es_remove_extent() would complicate its logic. Therefore, a full check can be performed in debug mode to ensure that the function does not overwrite any valuable extents. Signed-off-by: Zhang Yi --- fs/ext4/extents_status.c | 50 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index f9546ecf7340..55103c331b6b 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -985,6 +985,48 @@ void ext4_es_insert_extent(struct inode *inode, ext4_l= blk_t lblk, return; } =20 +#ifdef CONFIG_EXT4_DEBUG +/* + * If we find an extent that already exists during caching extents, its + * status must match the one to be cached. Otherwise, the extent status + * tree may have been corrupted. + */ +static void ext4_es_cache_extent_check(struct inode *inode, + struct extent_status *es, struct extent_status *newes) +{ + unsigned int status =3D ext4_es_type(newes); + struct rb_node *node; + + if (ext4_es_type(es) !=3D status) + goto conflict; + + while ((node =3D rb_next(&es->rb_node)) !=3D NULL) { + es =3D rb_entry(node, struct extent_status, rb_node); + + if (es->es_lblk >=3D newes->es_lblk + newes->es_len) + break; + if (ext4_es_type(es) !=3D status) + goto conflict; + } + return; + +conflict: + ext4_warning_inode(inode, + "ES cache extent failed: add [%d,%d,%llu,0x%x] conflict with existin= g [%d,%d,%llu,0x%x]\n", + newes->es_lblk, newes->es_len, ext4_es_pblock(newes), + ext4_es_status(newes), es->es_lblk, es->es_len, + ext4_es_pblock(es), ext4_es_status(es)); + + WARN_ON_ONCE(1); +} +#else +static void ext4_es_cache_extent_check(struct inode __maybe_unused *inode, + struct extent_status *es, struct extent_status *newes) +{ + WARN_ON_ONCE(ext4_es_type(es) !=3D ext4_es_type(newes)); +} +#endif + /* * ext4_es_cache_extent() inserts extent information into the extent status * tree. If 'overwrite' is not set, it inserts extent only if there isn't @@ -1022,9 +1064,11 @@ void ext4_es_cache_extent(struct inode *inode, ext4_= lblk_t lblk, if (es && es->es_lblk <=3D end) { if (!overwrite) goto unlock; - - /* Only extents of the same type can be overwritten. */ - WARN_ON_ONCE(ext4_es_type(es) !=3D status); + /* + * Check whether the overwrites are safe. Only extents + * of the same type can be overwritten. + */ + ext4_es_cache_extent_check(inode, es, &newes); if (__es_remove_extent(inode, lblk, end, NULL, NULL)) goto unlock; } --=20 2.46.1 From nobody Mon Feb 9 01:50:31 2026 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5966F239E61; Fri, 31 Oct 2025 06:31:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761892285; cv=none; b=bUb4T82IH9qoc6hVvvy/nfbmb4qFTtzZXd7EQJEhVfKMdspki445dSolhD+3Q/Z5VBFf5w87RWFOduyZ7GiyyIsTSzDs9795OH4LNCj1fjIhlTAHf4QdNOMMR4r5SW/t3oN3ql404YNFfu3Ny+YAgv8MxkzeeTi1fcZbQJ56lgg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761892285; c=relaxed/simple; bh=o44F4mLmP19tNT6q7Oqbg6UcUMAts5UKj4rziyYtqm0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tR+BRT5sNRAro4XNkHLG6vGHMy42fYzPOKAPxAvS2LUI0bw3VJbdLb+PBLAabNg0p6S5fuK3NvNZHN8n//Bxol5HVclASd7HrLAVCmK6aBAbNs7WOS4PgTtLsg/9Gg1oijtiVjOiA0roRMLWhVyWyDuCKubeZEzO6IMJHHUIULo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=none smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTPS id 4cyWMj17vkzYQtkN; Fri, 31 Oct 2025 14:31:13 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 248E01A1B8A; Fri, 31 Oct 2025 14:31:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.50.85.155]) by APP2 (Coremail) with SMTP id Syh0CgBHnESuVwRpEFrWCA--.33311S7; Fri, 31 Oct 2025 14:31:21 +0800 (CST) From: Zhang Yi To: linux-ext4@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, yi.zhang@huawei.com, yi.zhang@huaweicloud.com, libaokun1@huawei.com, yangerkun@huawei.com Subject: [PATCH 3/4] ext4: adjust the debug info in ext4_es_cache_extent() Date: Fri, 31 Oct 2025 14:29:04 +0800 Message-ID: <20251031062905.4135909-4-yi.zhang@huaweicloud.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20251031062905.4135909-1-yi.zhang@huaweicloud.com> References: <20251031062905.4135909-1-yi.zhang@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Syh0CgBHnESuVwRpEFrWCA--.33311S7 X-Coremail-Antispam: 1UD129KBjvJXoWruw4fCr43Ary5Cw4rCFy8Zrb_yoW8Jr1Dpa s3CF1UJr1rZ3yq9a4xGr48Jr13Way8GrW7JrZ3tw1ruay8ZryrKF1qyFyYvFyUXFWxXw4a vF40kw1UWa1jy3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUm014x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JrWl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2kIc2 xKxwCY1x0262kKe7AKxVWUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWU JVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67 kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY 6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0x vEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVj vjDU0xZFpf9x0JUHWlkUUUUU= X-CM-SenderInfo: d1lo6xhdqjqx5xdzvxpfor3voofrz/ Content-Type: text/plain; charset="utf-8" From: Zhang Yi Print a trace point after successfully inserting an extent in the ext4_es_cache_extent() function. Additionally, similar to other extent cache operation functions, call ext4_print_pending_tree() to display the extent debug information of the inode when in ES_DEBUG mode. Signed-off-by: Zhang Yi --- fs/ext4/extents_status.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 55103c331b6b..ae25a3888de4 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c @@ -1052,7 +1052,6 @@ void ext4_es_cache_extent(struct inode *inode, ext4_l= blk_t lblk, newes.es_lblk =3D lblk; newes.es_len =3D len; ext4_es_store_pblock_status(&newes, pblk, status); - trace_ext4_es_cache_extent(inode, &newes); =20 if (!len) return; @@ -1073,6 +1072,8 @@ void ext4_es_cache_extent(struct inode *inode, ext4_l= blk_t lblk, goto unlock; } __es_insert_extent(inode, &newes, NULL); + trace_ext4_es_cache_extent(inode, &newes); + ext4_es_print_tree(inode); unlock: write_unlock(&EXT4_I(inode)->i_es_lock); } --=20 2.46.1 From nobody Mon Feb 9 01:50:31 2026 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 596E52848B4; Fri, 31 Oct 2025 06:31:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761892286; cv=none; b=Nj7KoP+H0Sagc02ieNW5DFPoj/jMNq+dQazOyx0GPTL1ta1Fgw2EGaHpB82N4OI1W15ABEdJ5pdZtsCkDTzRVxrIq3bcvhbyQShZJyHFJ0uUCpgC9X48lvH18l5NxQG92Gv0UgFJK2/83YG50dDU9fl9PqzvWKb9K8+bkgX3QrU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761892286; c=relaxed/simple; bh=o+LIBORoXhKHcJTxfihkDW044OArupUAC8XHP4fDIVo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HCkuDYLjcgXrxusmzFda2c3khv2nd55d6Ai1dAmT+wcxTqkATA/owCY1q4bb/JUz4v/oYrqAbT5WG+9B1PwG/gS8+trIHbcR9uPQBannnsGop7C6GxyshKRiaeKtTYSEdmua/MPG3ZxfS4HjsAvAv3oDgmMvsBcSpSgjq8Asu4E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTPS id 4cyWMj1mljzYQthv; Fri, 31 Oct 2025 14:31:13 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 35A1B1A07BD; Fri, 31 Oct 2025 14:31:21 +0800 (CST) Received: from huaweicloud.com (unknown [10.50.85.155]) by APP2 (Coremail) with SMTP id Syh0CgBHnESuVwRpEFrWCA--.33311S8; Fri, 31 Oct 2025 14:31:21 +0800 (CST) From: Zhang Yi To: linux-ext4@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca, jack@suse.cz, yi.zhang@huawei.com, yi.zhang@huaweicloud.com, libaokun1@huawei.com, yangerkun@huawei.com Subject: [PATCH 4/4] ext4: replace ext4_es_insert_extent() when caching on-disk extents Date: Fri, 31 Oct 2025 14:29:05 +0800 Message-ID: <20251031062905.4135909-5-yi.zhang@huaweicloud.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20251031062905.4135909-1-yi.zhang@huaweicloud.com> References: <20251031062905.4135909-1-yi.zhang@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: Syh0CgBHnESuVwRpEFrWCA--.33311S8 X-Coremail-Antispam: 1UD129KBjvJXoWxWF43tr4DXFyxGrWrtrykGrg_yoW5Ww15pr ZrCr1rGws8Ww1q9FWxJF4UZF15C3WakrW7Gw4IvryrAayrGFyfJF1UtFW2vFWvqrW8Xw1F qF4UK34UCayfCa7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUm214x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628vn2 kIc2xKxwCY1x0262kKe7AKxVWUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkE bVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67 AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI 42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMI IF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVF xhVjvjDU0xZFpf9x0JUQFxUUUUUU= X-CM-SenderInfo: d1lo6xhdqjqx5xdzvxpfor3voofrz/ Content-Type: text/plain; charset="utf-8" From: Zhang Yi In ext4, the remaining places for inserting extents into the extent status tree within ext4_ext_determine_insert_hole() and ext4_map_query_blocks() directly cache on-disk extents. We can use ext4_es_cache_extent() instead of ext4_es_insert_extent() in these cases. This will help reduce unnecessary increases in extent sequence numbers and cache invalidations after supporting IOMAP in the future. Signed-off-by: Zhang Yi --- fs/ext4/extents.c | 4 ++-- fs/ext4/inode.c | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index c42ceb5aae37..7dc80141350d 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4160,8 +4160,8 @@ static ext4_lblk_t ext4_ext_determine_insert_hole(str= uct inode *inode, insert_hole: /* Put just found gap into cache to speed up subsequent requests */ ext_debug(inode, " -> %u:%u\n", hole_start, len); - ext4_es_insert_extent(inode, hole_start, len, ~0, - EXTENT_STATUS_HOLE, false); + ext4_es_cache_extent(inode, hole_start, len, ~0, + EXTENT_STATUS_HOLE, true); =20 /* Update hole_len to reflect hole size after lblk */ if (hole_start !=3D lblk) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index e99306a8f47c..a3c37de552e9 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -504,8 +504,8 @@ static int ext4_map_query_blocks_next_in_leaf(handle_t = *handle, retval =3D ext4_ext_map_blocks(handle, inode, &map2, 0); =20 if (retval <=3D 0) { - ext4_es_insert_extent(inode, map->m_lblk, map->m_len, - map->m_pblk, status, false); + ext4_es_cache_extent(inode, map->m_lblk, map->m_len, + map->m_pblk, status, true); return map->m_len; } =20 @@ -526,13 +526,13 @@ static int ext4_map_query_blocks_next_in_leaf(handle_= t *handle, */ if (map->m_pblk + map->m_len =3D=3D map2.m_pblk && status =3D=3D status2) { - ext4_es_insert_extent(inode, map->m_lblk, - map->m_len + map2.m_len, map->m_pblk, - status, false); + ext4_es_cache_extent(inode, map->m_lblk, + map->m_len + map2.m_len, map->m_pblk, + status, true); map->m_len +=3D map2.m_len; } else { - ext4_es_insert_extent(inode, map->m_lblk, map->m_len, - map->m_pblk, status, false); + ext4_es_cache_extent(inode, map->m_lblk, map->m_len, + map->m_pblk, status, true); } =20 return map->m_len; @@ -571,8 +571,8 @@ static int ext4_map_query_blocks(handle_t *handle, stru= ct inode *inode, map->m_len =3D=3D orig_mlen) { status =3D map->m_flags & EXT4_MAP_UNWRITTEN ? EXTENT_STATUS_UNWRITTEN : EXTENT_STATUS_WRITTEN; - ext4_es_insert_extent(inode, map->m_lblk, map->m_len, - map->m_pblk, status, false); + ext4_es_cache_extent(inode, map->m_lblk, map->m_len, + map->m_pblk, status, true); return retval; } =20 --=20 2.46.1