From: Ye Bin <yebin@huaweicloud.com>
To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org
Cc: jack@suse.cz
Subject: [PATCH v2 4/4] ext4: show orphan file inode detail info
Date: Wed, 15 Apr 2026 18:55:05 +0800 [thread overview]
Message-ID: <20260415105505.342358-5-yebin@huaweicloud.com> (raw)
In-Reply-To: <20260415105505.342358-1-yebin@huaweicloud.com>
From: Ye Bin <yebin10@huawei.com>
Support show inode information in orphan file.
Signed-off-by: Ye Bin <yebin10@huawei.com>
---
fs/ext4/orphan.c | 179 ++++++++++++++++++++++++++++++++++++++---------
1 file changed, 146 insertions(+), 33 deletions(-)
diff --git a/fs/ext4/orphan.c b/fs/ext4/orphan.c
index 4d6f8c9edaeb..715d04e386d0 100644
--- a/fs/ext4/orphan.c
+++ b/fs/ext4/orphan.c
@@ -680,6 +680,11 @@ int ext4_orphan_file_empty(struct super_block *sb)
struct ext4_proc_orphan {
struct ext4_inode_info cursor;
+ struct ext4_orphan_info *oi;
+ int inodes_per_ob;
+ int block_idx;
+ int offset;
+ bool orphan_file;
};
static struct inode *ext4_list_next(struct ext4_proc_orphan *s,
@@ -724,24 +729,94 @@ static struct inode *ext4_list_next(struct ext4_proc_orphan *s,
return NULL;
}
+static struct inode *ext4_orphan_file_next(struct ext4_proc_orphan *s,
+ struct super_block *sb)
+{
+ struct inode *inode = NULL;
+ struct ext4_orphan_info *oi = s->oi;
+
+ for (; s->block_idx < oi->of_blocks; s->block_idx++) {
+ int idx = s->block_idx;
+ struct ext4_orphan_block *binfo = &oi->of_binfo[idx];
+ __le32 *bdata = (__le32 *)(binfo->ob_bh->b_data);
+
+ if (atomic_read(&binfo->ob_free_entries) ==
+ s->inodes_per_ob) {
+ s->offset = 0;
+ continue;
+ }
+ for (; s->offset < s->inodes_per_ob; s->offset++) {
+ u64 ino = le32_to_cpu(bdata[s->offset]);
+
+ if (!ino)
+ continue;
+ /*
+ * Orphan nodes in the running state are those
+ * inodes that are still in use, so here we get
+ * them from the cache if available.
+ */
+ inode = ilookup(sb, ino);
+ if (!inode)
+ continue;
+
+ if (!ext4_test_inode_state(inode,
+ EXT4_STATE_ORPHAN_FILE)) {
+ iput(inode);
+ continue;
+ }
+
+ s->offset++;
+ if (s->offset == s->inodes_per_ob) {
+ s->offset = 0;
+ s->block_idx++;
+ }
+ return inode;
+ }
+
+ s->offset = 0;
+ }
+
+ return NULL;
+}
+
static void *ext4_orphan_seq_start(struct seq_file *seq, loff_t *pos)
{
struct ext4_proc_orphan *s = seq->private;
struct super_block *sb = pde_data(file_inode(seq->file));
struct ext4_sb_info *sbi = EXT4_SB(sb);
struct list_head *prev;
+ void *ret;
- mutex_lock(&sbi->s_orphan_lock);
+ if (!s->orphan_file) {
+ mutex_lock(&sbi->s_orphan_lock);
+ if (!*pos)
+ prev = &sbi->s_orphan;
+ else
+ prev = &s->cursor.i_orphan;
- if (!*pos) {
- prev = &sbi->s_orphan;
- } else {
- prev = &s->cursor.i_orphan;
- if (list_empty(prev))
+ /*
+ * Here, the code checks whether the linked list is empty
+ * because when the orphan_file feature is supported, the
+ * cursor is removed from the linked list after the orphan
+ * list is traversed. If the orphan_file feature is not
+ * enabled, calling ext4_orphan_seq_start() again would
+ * cause an infinite loop.
+ */
+ if (!list_empty(prev)) {
+ ret = ext4_list_next(s, &sbi->s_orphan, prev);
+ if (ret)
+ return ret;
+ }
+
+ if (!s->oi)
return NULL;
+
+ list_del_init(&s->cursor.i_orphan);
+ mutex_unlock(&sbi->s_orphan_lock);
+ s->orphan_file = true;
}
- return ext4_list_next(s, &sbi->s_orphan, prev);
+ return ext4_orphan_file_next(s, sb);
}
static void *ext4_orphan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
@@ -750,19 +825,36 @@ static void *ext4_orphan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
struct ext4_sb_info *sbi = EXT4_SB(sb);
struct ext4_proc_orphan *s = seq->private;
struct inode *inode = v;
+ void *ret;
++*pos;
- /*
- * To prevent the deadlock caused by orphan node deletion when the
- * last inode reference count is released, the inode reference
- * count needs to be released in the unlocked state.
- */
- mutex_unlock(&sbi->s_orphan_lock);
- iput(inode);
- mutex_lock(&sbi->s_orphan_lock);
+ if (!s->orphan_file) {
+ /*
+ * To prevent the deadlock caused by orphan node deletion
+ * when the last inode reference count is released, the
+ * inode reference count needs to be released in the
+ * unlocked state.
+ */
+ mutex_unlock(&sbi->s_orphan_lock);
+ iput(inode);
+ mutex_lock(&sbi->s_orphan_lock);
+
+ ret = ext4_list_next(s, &sbi->s_orphan,
+ &s->cursor.i_orphan);
+ if (ret)
+ return ret;
+ if (!s->oi)
+ return NULL;
+ list_del_init(&s->cursor.i_orphan);
+ mutex_unlock(&sbi->s_orphan_lock);
+ s->orphan_file = true;
+ } else {
+ iput(inode);
+ }
+
- return ext4_list_next(s, &sbi->s_orphan, &s->cursor.i_orphan);
+ return ext4_orphan_file_next(s, sb);
}
static void ext4_show_filename(struct seq_file *seq, struct inode *inode)
@@ -811,16 +903,28 @@ static void ext4_orphan_seq_stop(struct seq_file *seq, void *v)
struct ext4_proc_orphan *s = seq->private;
struct inode *inode = v;
- /*
- * stop() is called when the cache is full, so the traversal
- * position needs to be moved back to the front of the current
- * inode.
- */
- if (v)
- list_move_tail(&s->cursor.i_orphan,
- &EXT4_I(inode)->i_orphan);
+ if (!s->orphan_file) {
+ /*
+ * stop() is called when the cache is full, so the
+ * traversal position needs to be moved back to the
+ * front of the current inode. If stop() due to EOF
+ * then remove cursor from orphan list.
+ */
+ if (inode)
+ list_move_tail(&s->cursor.i_orphan,
+ &EXT4_I(inode)->i_orphan);
+ else
+ list_del_init(&s->cursor.i_orphan);
- mutex_unlock(&sbi->s_orphan_lock);
+ mutex_unlock(&sbi->s_orphan_lock);
+ } else if (inode) {
+ if (s->offset) {
+ s->offset--;
+ } else if (s->block_idx) {
+ s->block_idx--;
+ s->offset = s->inodes_per_ob - 1;
+ }
+ }
iput(inode);
}
@@ -836,15 +940,21 @@ static int ext4_seq_orphan_open(struct inode *inode, struct file *file)
{
int rc;
struct seq_file *m;
- struct ext4_proc_orphan *private;
+ struct ext4_proc_orphan *s;
rc = seq_open_private(file, &ext4_orphan_seq_ops,
sizeof(struct ext4_proc_orphan));
if (!rc) {
+ struct super_block *sb = pde_data(file_inode(file));
m = file->private_data;
- private = m->private;
- INIT_LIST_HEAD(&private->cursor.i_orphan);
- private->cursor.vfs_inode.i_ino = 0;
+ s = m->private;
+ INIT_LIST_HEAD(&s->cursor.i_orphan);
+ s->cursor.vfs_inode.i_ino = 0;
+ s->orphan_file = 0;
+ if (ext4_has_feature_orphan_file(sb)) {
+ s->oi = &EXT4_SB(sb)->s_orphan_info;
+ s->inodes_per_ob = ext4_inodes_per_orphan_block(sb);
+ }
}
return rc;
@@ -862,11 +972,14 @@ static int ext4_seq_orphan_release(struct inode *inode, struct file *file)
* the entry from the 'pde->pde_openers' list. Therefore, when the
* file is closed, proc_reg_release() will not call close_pdeo()
* again because it cannot find the node on the 'pde->pde_openers'
- * list. This prevents the UAF issue from occurring.
+ * list. This prevents the UAF issue from occurring. Maybe, cursor
+ * already removed in stop().
*/
- mutex_lock(&sbi->s_orphan_lock);
- list_del(&s->cursor.i_orphan);
- mutex_unlock(&sbi->s_orphan_lock);
+ if (!s->orphan_file) {
+ mutex_lock(&sbi->s_orphan_lock);
+ list_del(&s->cursor.i_orphan);
+ mutex_unlock(&sbi->s_orphan_lock);
+ }
return seq_release_private(inode, file);
}
--
2.34.1
next prev parent reply other threads:[~2026-04-15 10:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-15 10:55 [PATCH v2 0/4] show orphan file inode detail info Ye Bin
2026-04-15 10:55 ` [PATCH v2 1/4] ext4: register 'orphan_list' procfs Ye Bin
2026-04-15 10:55 ` [PATCH v2 2/4] ext4: skip cursor node in ext4_orphan_del() Ye Bin
2026-04-15 23:56 ` Darrick J. Wong
2026-04-15 10:55 ` [PATCH v2 3/4] ext4: show inode orphan list detail information Ye Bin
2026-04-15 10:55 ` Ye Bin [this message]
2026-04-15 17:59 ` [PATCH v2 0/4] show orphan file inode detail info Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260415105505.342358-5-yebin@huaweicloud.com \
--to=yebin@huaweicloud.com \
--cc=adilger.kernel@dilger.ca \
--cc=jack@suse.cz \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox