Skip to content

debugfs: debugfs_remove_recursive() must not rely on list_empty(d_subdirs)

Oleg Nesterov lkml 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest1 patch 7 repliesIn review

Changes from the cover letter

- s/list_next_entry/list_entry/. It would be nice to move list_next_entry() from kernel/events/core.c to list.h but this needs another patch

- Do "parent = parent->d_parent" before "!= dentry" check, this factors out the common code in "goto up" and final __debugfs_remove(dentry)

- Add simple_release_fs() back.

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/1debugfs: debugfs_remove_recursive() must not rely on list_empty(d_subdirs)fs/debugfs/inode.c+22 -472 replies

Reviews trailers per patch

The patch has a Reviewed-by or Acked-by.

PatchGreg Kroah-Hartman
1/1A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH 0/1] debugfs: debugfs_remove_recursive() must not rely on list_empty(d_subdirs)
Quoted 3 lines · Greg Kroah-Hartman

Anyway, your changes below look good in this version, I don't see anything obviously wrong with it, but maybe others do?

Please see 1/1.

Changes:

- s/list_next_entry/list_entry/. It would be nice to move list_next_entry() from kernel/events/core.c to list.h but this needs another patch

- Do "parent = parent->d_parent" before "!= dentry" check, this factors out the common code in "goto up" and final __debugfs_remove(dentry)

- Add simple_release_fs() back.

The patch is hardly readable, so I attached the code below again.

Note!!! The changelog contains the simple test-case. However, this test-case can actually reveal more problems because kernel/trace/ is buggy too. (hopefully we already have the necessary fixes).

Steven, Greg. Assuming that nobody objects and the patch is fine. Perhaps this patch can be routed via rostedt/linux-trace tree?

This connects to other problems we are working on, it would be nice to have this patch in the same tree to simplify the testing.

Oleg.

void debugfs_remove_recursive(struct dentry *dentry)

{
	struct dentry *child, *next, *parent;

	if (IS_ERR_OR_NULL(dentry))
		return;

	parent = dentry->d_parent;
	if (!parent || !parent->d_inode)
		return;

	parent = dentry;
 down:
	mutex_lock(&parent->d_inode->i_mutex);
	list_for_each_entry_safe(child, next, &parent->d_subdirs, d_u.d_child) {
		if (!debugfs_positive(child))
			continue;

		/* perhaps simple_empty(child) makes more sense */
		if (!list_empty(&child->d_subdirs)) {
			mutex_unlock(&parent->d_inode->i_mutex);
			parent = child;
			goto down;
		}
 up:
		if (!__debugfs_remove(child, parent))
			simple_release_fs(&debugfs_mount, &debugfs_mount_count);
	}

	mutex_unlock(&parent->d_inode->i_mutex);
	child = parent;
	parent = parent->d_parent;
	mutex_lock(&parent->d_inode->i_mutex);

	if (child != dentry) {
		next = list_entry(child->d_u.d_child.next, struct dentry,
					d_u.d_child);
		goto up;
	}

	if (!__debugfs_remove(child, parent))
		simple_release_fs(&debugfs_mount, &debugfs_mount_count);
	mutex_unlock(&parent->d_inode->i_mutex);
}