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=1795023768; b=a7DP/6PQtQYgkiZzF8T6T6ZMQk1Bl7Ebaf1MBmwLWL6W7+46X+O4LGgJ8cdmOruJ2X4J /HEVb8KdEzuwsjhvbbDDlJlZIGNf3OkfVfHsVa8hifl1/ke/eWj3y8AX8ExQPFmfbBrzx smyIs7vbgpRkiqxnLObMLfVAv6DV09jmav/VAY0PY1OjZ731ro6sUTiUnPZzgkPrzhDB5 LsUdMfRRAO9fa4mypAsrVYTN7c5PgHRWLCUngpIrOA2lUz5ANQFT3WPAssN6EHT4ISwQE 20aw3pFsK0lgzZ+dhOFW0z3tnsuY3kQHarJTfl9JNIuwVqoPStXByriDwF7iWXLFiQA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795023768; 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=8EmlXMWa1k36rGscE5DMmvKCySvt7oNtgtBBnvD5c8c=; b=mzeXuHDsDmcELu4dUT7JGZR/jt4FDdQw+LemquKNc5wQNulHCC0ttDATL4XzM/Vu532g 05iTfmeBJRXWPBHZM87Ji2RNnD63h+L78qq0kfRi3is5WP/8S65h4uzf3pMJ4poNWmq16 mRoM+soXJ2kfU4n97cWY5xg4yARZIkRbaiGOjUSxP1Fs2uQZrRmpIqvg3vk+4mDJ8M+pF qtuqN835j3+3STPdaCBuuhqs1IOoor/02LcSs18NkUYW/1KwVXNHIqqkezqlAHqvGymQn Fa/CzLSPtkrAmZ2Zf7kz0zSwTz8BW07YLPUt8IzCFlatadiBKMqjXjjT4MTyDRo2wfQ== 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=LNv8C8z7; 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 73A67606A31C; Wed, 18 Nov 2026 17:42:48 +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=LNv8C8z7 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C921D1F000C4; Wed, 18 Nov 2026 17:42:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795023768; bh=8EmlXMWa1k36rGscE5DMmvKCySvt7oNtgtBBnvD5c8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LNv8C8z7aKuJeN5S06bB6qF/O1uu7R0wLIRv62nYxZ4EuQWlmnAE3NwrHdUEep5cN sOs1SKwV2rx6e4Sd6MPPfAEVIYWEL0OY3aUIhng23REcpwr37495OBYbdkvBl49c9w vMBx3fB0bC33gFYfwVpR3nRBrnQ85XNYzQRbyQKk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shakeel Butt , "Christian Brauner (Amutable)" , Sasha Levin Subject: [PATCH 6.18 0488/2151] kernfs: dont hold kernfs_rwsem across dir_emit() Date: Wed, 18 Nov 2026 15:37:03 +0100 Message-ID: <20261118150139.827749020@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shakeel Butt [ Upstream commit 341c65579de5b632eb7913bb68b3e375eeeb3ddf ] kernfs_fop_readdir() holds kernfs_rwsem for reading across the whole listing, dir_emit() included. dir_emit() copies to userspace, so it can fault into reclaim while holding the lock that every create, remove and rename in the hierarchy needs. sysfs and cgroupfs have one per machine. Under memory pressure the monitoring daemons fault on their own getdents(2) buffer with it held: below: page allocation stall for 120 secs: order:0, mode:0x140dca(GFP_HIGHUSER_MOVABLE|__GFP_ZERO|__GFP_COMP) nodemask=(null),cpuset=hostcritical.slice,mems_allowed=0 Call Trace: dump_stack_lvl+0x5d/0x80 __alloc_frozen_pages_noprof+0x5f4d/0x6300 ? memcg_list_lru_alloc+0x73/0x320 ? ima_file_check+0xd0/0x7d0 vma_alloc_folio_noprof+0x145/0x560 handle_mm_fault+0x17c9/0x2720 ? find_vma+0x27/0x30 do_user_addr_fault+0x39f/0x6e0 exc_page_fault+0x8f/0x110 asm_exc_page_fault+0x22/0x30 RIP: 0010:filldir64+0xd7/0x1a0 [Code:/RSP:/RAX:..R15: register block elided] kernfs_fop_readdir+0x2de/0x420 iterate_dir+0x8c/0x1f0 __se_sys_getdents64+0x61/0xe0 ? copy_page_from_iter+0x860/0x860 do_syscall_64+0x6a/0x250 entry_SYSCALL_64_after_hwframe+0x4b/0x53 Commit 9aab10a0249e ("kernfs: Don't re-lock kernfs_root::kernfs_rwsem in kernfs_fop_readdir().") took the lock drop out because dir_emit() was handed kernfs_node::name, which a rename can free. The previous patch emits a copy instead, so drop the lock around dir_emit(). A listing is no longer atomic within one getdents(2) call, which for most sysfs and cgroup directories is all of it. POSIX leaves that unspecified for an entry added or removed since opendir(3). Fixes: 9aab10a0249e ("kernfs: Don't re-lock kernfs_root::kernfs_rwsem in kernfs_fop_readdir().") Signed-off-by: Shakeel Butt Link: https://patch.msgid.link/20260911182815.1992483-4-shakeel.butt@linux.dev Signed-off-by: Christian Brauner (Amutable) Signed-off-by: Sasha Levin --- fs/kernfs/dir.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index 8730e0ab96d27..34941369dcfb4 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c @@ -1938,10 +1938,14 @@ static int kernfs_fop_readdir(struct file *file, struct dir_context *ctx) file->private_data = pos; kernfs_get(pos); - if (!dir_emit(ctx, name, len, ino, type)) { - up_read(&root->kernfs_rwsem); + /* + * dir_emit() can fault, so run it unlocked. @pos is pinned + * above and kernfs_dir_pos() rechecks it on the way back. + */ + up_read(&root->kernfs_rwsem); + if (!dir_emit(ctx, name, len, ino, type)) return 0; - } + down_read(&root->kernfs_rwsem); } up_read(&root->kernfs_rwsem); file->private_data = NULL; -- 2.53.0