From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795016536; b=uVB/2gBtrQnlL5cXKNR5vwb8eVE2TS/m80jI0ixXfre8GxZrZAt0u4Fir32fQREKPUt/ j9+MSO7k47ZDPH6/j1rVpwMF/vOeNFnJm3oCCck9CaYfBw9AJOGxryaLuD9NP8VKs1AIK mkdjmp58mduSH/kLokDSB1eo2TVID5I5AC+FvrR9UpsdN1dBR7CHccbHs9V9Pm+9C9HHR FM4FoVM9BrCyrWCi4YbM/bCe1ZIXvS33JmwJDB+bdU8eVeyATK/q4VuaOsT4IeqMAhUkh AIEsgSUOMXnfBf5WR0gJNDPfOfsF8mpqQpImRturzTNIzGtR/vI7GF3YMutTR0mpc0Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795016536; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=Rq/VyMLICmE24P4bKUsaNA271E6XXiRqJTC0Bt4Buks=; b=CuI/ldfowtL+ovDxGytUyY8WDKds1hykbB4pnUvDKEIGOBYRvB9MpZp/kJvbQ7Zldnw3 zQazcSxq9gOBvFJEen1t7NQeRFV7o/gNuhDf5Sl9GwGNUgVVXEWJkQe7pdeK8Q0NmrSOj i1+tVE2W4WqHdrlPCj/94FZ9Ven/wmMCeQNzxxaR2i0e+MOZz3JbywBrFPgo9udLuFtyZ 38zt8SH5sqo7tIBs61I39wlJ8HrymQnm50KgP5IlLPpNyKKvAAHAHuUksyZB68Ad+sBc4 OcPz4/pn+WdluBIp/cpbzVd9/kG5PfTnhEpmncZ4J2PpcM/P/VYqe7M9hf2GHnEvW5A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=PO1WSS4M; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 27EFA606A31C; Wed, 18 Nov 2026 15:42:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=PO1WSS4M Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F9F41F000C4; Wed, 18 Nov 2026 15:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795016535; bh=Rq/VyMLICmE24P4bKUsaNA271E6XXiRqJTC0Bt4Buks=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PO1WSS4MeGIxq1JabiLL3OKsgpzqr9TdTnkyJtU6DQ3NlX9pVwRl7+X3cAHPRea/K 3kjEfo4m2VUyWzgp2TJqPUugtkxOTZ5skOf3Jgd0HxQ6np0FCOcCf0+3QQtQB+42Oy kaZTE6+6Bl9/z6m4JLD1ithqUc4UbLkAsb17Sceg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tejun Heo , Shakeel Butt , "Christian Brauner (Amutable)" , Sasha Levin Subject: [PATCH 7.3 0520/2651] kernfs: dont repeat or skip an entry when readdir resumes Date: Wed, 18 Nov 2026 15:29:20 +0100 Message-ID: <20261118150306.469509964@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150247.972732815@linuxfoundation.org> References: <20261118150247.972732815@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shakeel Butt [ Upstream commit 5ebcb578adeec7407dd501108ab2f423ca8e3e55 ] readdir keeps its place as a name hash in ctx->pos and pins the entry in file->private_data. If that entry is gone when the listing comes back, kernfs_dir_pos() searches the rbtree for the hash and keeps whatever node the descent stopped on. That is the entry before or after the missing one, depending on the shape of the tree. Landing before it repeats an entry the previous getdents(2) call already reported. Landing after it, kernfs_dir_next_pos() calls rb_next() and steps over an unreported entry. With children A(10), B(20), C(30): report A, ctx->pos = 10 A removed kernfs_dir_next_pos(10, A) A is gone, the search for 10 stops at B rb_next(B) -> C, so B is never reported Only the repeat happens today, between two getdents(2) calls. The skip needs the pinned entry to go away inside one call, which the next patch allows when it drops kernfs_rwsem around dir_emit(). Before the commit 4e4d6d860b93 the descent kept a node only on the way left, which is a search for the first entry at or after the hash. That commit moved the assignment to the top of the loop, where it runs on right turns too. Restore that search, and step forward only when the pinned entry is still there rather than when the hash matches, since two entries in one directory can share a hash. While here, kernfs_dir_next_pos() called the hash @ino. It is never an inode number, so name it @hash. Fixes: 4e4d6d860b93 ("sysfs: Add s_hash to sysfs_dirent and order directory entries by hash") Acked-by: Tejun Heo Signed-off-by: Shakeel Butt Link: https://patch.msgid.link/20260911182815.1992483-2-shakeel.butt@linux.dev Signed-off-by: Christian Brauner (Amutable) Signed-off-by: Sasha Levin --- fs/kernfs/dir.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index 4bfb7a353f429..cb55dc3397acc 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -1915,9 +1915,16 @@ static int kernfs_dir_fop_release(struct inode *inode, struct file *filp) return 0; } +/* + * Find where a listing left off. @resumed says whether @pos is still that + * entry; if not, the first entry at or after @hash is returned instead. + */ static struct kernfs_node *kernfs_dir_pos(const struct ns_common *ns, - struct kernfs_node *parent, loff_t hash, struct kernfs_node *pos) + struct kernfs_node *parent, loff_t hash, struct kernfs_node *pos, + bool *resumed) { + if (resumed) + *resumed = false; if (pos) { int valid = kernfs_active(pos) && rcu_access_pointer(pos->__parent) == parent && @@ -1925,23 +1932,26 @@ static struct kernfs_node *kernfs_dir_pos(const struct ns_common *ns, kernfs_put(pos); if (!valid) pos = NULL; + else if (resumed) + *resumed = true; } if (!pos && (hash > 1) && (hash < INT_MAX)) { struct rb_node *node = parent->dir.children.rb_node; - u64 ns_id = kernfs_ns_id(ns); + + /* + * Keep a node only on the way left, so the search ends on the + * first entry at or after @hash. The empty name sorts before + * every entry sharing the hash, so it lands on the first. + */ while (node) { - pos = rb_to_kn(node); + struct kernfs_node *kn = rb_to_kn(node); - if (hash < pos->hash) + if (kernfs_name_compare(hash, "", ns, kn) < 0) { + pos = kn; node = node->rb_left; - else if (hash > pos->hash) + } else { node = node->rb_right; - else if (ns_id < kernfs_ns_id(pos->ns)) - node = node->rb_left; - else if (ns_id > kernfs_ns_id(pos->ns)) - node = node->rb_right; - else - break; + } } } /* Skip over entries which are dying/dead or in the wrong namespace */ @@ -1957,10 +1967,13 @@ static struct kernfs_node *kernfs_dir_pos(const struct ns_common *ns, } static struct kernfs_node *kernfs_dir_next_pos(const struct ns_common *ns, - struct kernfs_node *parent, ino_t ino, struct kernfs_node *pos) + struct kernfs_node *parent, loff_t hash, struct kernfs_node *pos) { - pos = kernfs_dir_pos(ns, parent, ino, pos); - if (pos) { + bool resumed; + + pos = kernfs_dir_pos(ns, parent, hash, pos, &resumed); + /* Step over @pos only if it survived; two entries can share a hash. */ + if (pos && resumed) { do { struct rb_node *node = rb_next(&pos->rb); if (!node) @@ -1990,7 +2003,7 @@ static int kernfs_fop_readdir(struct file *file, struct dir_context *ctx) if (kernfs_ns_enabled(parent)) ns = kernfs_info(dentry->d_sb)->ns; - for (pos = kernfs_dir_pos(ns, parent, ctx->pos, pos); + for (pos = kernfs_dir_pos(ns, parent, ctx->pos, pos, NULL); pos; pos = kernfs_dir_next_pos(ns, parent, ctx->pos, pos)) { const char *name = kernfs_rcu_name(pos); -- 2.53.0