Address CVE-2024-46701
Subsystems (4)
cover Address CVE-2024-46701
From: Chuck Lever <[email protected]>
This series backports several upstream fixes to origin/linux-6.6.y in order to address CVE-2024-46701:
https://nvd.nist.gov/vuln/detail/CVE-2024-46701
As applied to origin/linux-6.6.y, this series passes fstests and the git regression suite.
Before officially requesting that stable@ merge this series, I'd like to provide an opportunity for community review of the backport patches.
You can also find them them in the "nfsd-6.6.y" branch in
https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
Chuck Lever (10):
libfs: Re-arrange locking in offset_iterate_dir()
libfs: Define a minimum directory offset
libfs: Add simple_offset_empty()
libfs: Fix simple_offset_rename_exchange()
libfs: Add simple_offset_rename() API
shmem: Fix shmem_rename2()
libfs: Return ENOSPC when the directory offset range is exhausted Revert "libfs: Add simple_offset_empty()"
libfs: Replace simple_offset end-of-directory detection
libfs: Use d_children list to iterate simple_offset directories
fs/libfs.c | 177 +++++++++++++++++++++++++++++++++------------ include/linux/fs.h | 2 + mm/shmem.c | 3 +- 3 files changed, 134 insertions(+), 48 deletions(-)
Signature · 1 line
2.47.0
RFC PATCH 1/10 libfs: Re-arrange locking in offset_iterate_dir()
From: Chuck Lever <[email protected]>
[ Upstream commit 3f6d810665dfde0d33785420618ceb03fba0619d ]
Liam and Matthew say that once the RCU read lock is released, xa_state is not safe to re-use for the next xas_find() call. But the RCU read lock must be released on each loop iteration so that dput(), which might_sleep(), can be called safely.
Thus we are forced to walk the offset tree with fresh state for each directory entry. xa_find() can do this for us, though it might be a little less efficient than maintaining xa_state locally.
We believe that in the current code base, inode->i_rwsem provides protection for the xa_state maintained in offset_iterate_dir(). However, there is no guarantee that will continue to be the case in the future.
Since offset_iterate_dir() doesn't build xa_state locally any more, there's no longer a strong need for offset_find_next(). Clean up by rolling these two helpers together.
Message-ID: <170785993027.11135.8830043889278631735.stgit@91.116.238.104.host.secureserver.net>
--- fs/libfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/libfs.c +6 -6
@@ -401,12 +401,13 @@ static loff_t offset_dir_llseek(struct file *file, loff_t offset, int whence)return vfs_setpos (file, offset,U32_MAX ); } -static struct dentry *offset_find_next (struct xa_state *xas) +static struct dentry *offset_find_next (struct offset_ctx *octx,loff_t offset) {struct dentry *child, *found =NULL ; +XA_STATE (xas, &octx->xa, offset);rcu_read_lock (); - child =xas_next_entry (xas,U32_MAX ); + child =xas_next_entry (&xas,U32_MAX );if (!child) goto out;spin_lock (&child->d_lock);
@@ -429,12 +430,11 @@ static bool offset_dir_emit(struct dir_context *ctx, struct dentry *dentry)static void *offset_iterate_dir (struct inode *inode,struct dir_context *ctx) { -struct offset_ctx *so_ctx = inode->i_op->get_offset_ctx (inode); -XA_STATE (xas, &so_ctx->xa, ctx->pos); +struct offset_ctx *octx = inode->i_op->get_offset_ctx (inode);struct dentry *dentry;while (true) { - dentry =offset_find_next (&xas); + dentry =offset_find_next (octx, ctx->pos);if (!dentry)return ERR_PTR (-ENOENT );
@@ -443,8 +443,8 @@ static void *offset_iterate_dir(struct inode *inode, struct dir_context *ctx)break ; } + ctx->pos =dentry2offset (dentry) +1 ;dput (dentry); - ctx->pos = xas.xa_index +1 ; }return NULL ; }
Signature · 1 line
2.47.0
Patch "libfs: Re-arrange locking in offset_iterate_dir()" has been added to the 6.6-stable tree
170785993027.11135.8830043889278631735.stgit@91.116.238.104.host.secureserver.net>
Message-ID: <2025013030-navigator-unzip-fad7@gregkh>
MIME-Version: 1.0
Content-Type: text/plain; charset=ANSI_X3.4-1968
Content-Transfer-Encoding: 8bit
X-stable: commit
X-Patchwork-Hint: ignore
This is a note to let you know that I've just added the patch titled
libfs: Re-arrange locking in offset_iterate_dir()
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
libfs-re-arrange-locking-in-offset_iterate_dir.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Fri Jan 24 20:20:29 2025
From: [email protected]
Date: Fri, 24 Jan 2025 14:19:36 -0500
Subject: libfs: Re-arrange locking in offset_iterate_dir()
To: Hugh Dickins <[email protected]>, Andrew Morten <[email protected]>, Christian Brauner <[email protected]>, Al Viro <[email protected]>, Greg Kroah-Hartman <[email protected]>, Sasha Levin <[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>, [email protected], [email protected], Chuck Lever <[email protected]>, "Liam R. Howlett" <[email protected]>, Jan Kara <[email protected]>
Message-ID: <[email protected]>
From: Chuck Lever <[email protected]>
[ Upstream commit 3f6d810665dfde0d33785420618ceb03fba0619d ]
Liam and Matthew say that once the RCU read lock is released, xa_state is not safe to re-use for the next xas_find() call. But the RCU read lock must be released on each loop iteration so that dput(), which might_sleep(), can be called safely.
Thus we are forced to walk the offset tree with fresh state for each directory entry. xa_find() can do this for us, though it might be a little less efficient than maintaining xa_state locally.
We believe that in the current code base, inode->i_rwsem provides protection for the xa_state maintained in offset_iterate_dir(). However, there is no guarantee that will continue to be the case in the future.
Since offset_iterate_dir() doesn't build xa_state locally any more, there's no longer a strong need for offset_find_next(). Clean up by rolling these two helpers together.
Message-ID: <170785993027.11135.8830043889278631735.stgit@91.116.238.104.host.secureserver.net>
--- fs/libfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
fs/libfs.c +6 -6
@@ -401,12 +401,13 @@ static loff_t offset_dir_llseek(struct freturn vfs_setpos (file, offset,U32_MAX ); } -static struct dentry *offset_find_next (struct xa_state *xas) +static struct dentry *offset_find_next (struct offset_ctx *octx,loff_t offset) {struct dentry *child, *found =NULL ; +XA_STATE (xas, &octx->xa, offset);rcu_read_lock (); - child =xas_next_entry (xas,U32_MAX ); + child =xas_next_entry (&xas,U32_MAX );if (!child) goto out;spin_lock (&child->d_lock);
@@ -429,12 +430,11 @@ static bool offset_dir_emit(struct dir_cstatic void *offset_iterate_dir (struct inode *inode,struct dir_context *ctx) { -struct offset_ctx *so_ctx = inode->i_op->get_offset_ctx (inode); -XA_STATE (xas, &so_ctx->xa, ctx->pos); +struct offset_ctx *octx = inode->i_op->get_offset_ctx (inode);struct dentry *dentry;while (true) { - dentry =offset_find_next (&xas); + dentry =offset_find_next (octx, ctx->pos);if (!dentry)return ERR_PTR (-ENOENT );
@@ -443,8 +443,8 @@ static void *offset_iterate_dir(struct ibreak ; } + ctx->pos =dentry2offset (dentry) +1 ;dput (dentry); - ctx->pos = xas.xa_index +1 ; }return NULL ; }
Patches currently in stable-queue which might be from [email protected] are
queue-6.6/libfs-replace-simple_offset-end-of-directory-detection.patch queue-6.6/libfs-re-arrange-locking-in-offset_iterate_dir.patch queue-6.6/libfs-add-simple_offset_empty.patch queue-6.6/shmem-fix-shmem_rename2.patch queue-6.6/revert-libfs-add-simple_offset_empty.patch queue-6.6/libfs-use-d_children-list-to-iterate-simple_offset-directories.patch queue-6.6/libfs-define-a-minimum-directory-offset.patch queue-6.6/libfs-return-enospc-when-the-directory-offset-range-is-exhausted.patch queue-6.6/libfs-fix-simple_offset_rename_exchange.patch queue-6.6/libfs-add-simple_offset_rename-api.patch
RFC PATCH 2/10 libfs: Define a minimum directory offset
In reply to [email protected]From: Chuck Lever <[email protected]>
[ Upstream commit 7beea725a8ca412c6190090ce7c3a13b169592a1 ]
This value is used in several places, so make it a symbolic constant.
Stable-dep-of: ecba88a3b32d ("libfs: Add simple_offset_empty()")
--- fs/libfs.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
fs/libfs.c +8 -5
@@ -239,6 +239,11 @@ const struct inode_operations simple_dir_inode_operations = { };EXPORT_SYMBOL (simple_dir_inode_operations); +/* 0 is '.', 1 is '..', so always start with offset 2 or more */ +enum { +DIR_OFFSET_MIN =2 , +}; +static void offset_set (struct dentry *dentry,u32 offset) { dentry->d_fsdata = (void *)((uintptr_t )(offset));
@@ -260,9 +265,7 @@ void simple_offset_init(struct offset_ctx *octx) {xa_init_flags (&octx->xa,XA_FLAGS_ALLOC1 );lockdep_set_class (&octx->xa.xa_lock, &simple_offset_xa_lock); - -/* 0 is '.', 1 is '..', so always start with offset 2 */ - octx->next_offset =2 ; + octx->next_offset =DIR_OFFSET_MIN ; }/**
@@ -275,7 +278,7 @@ void simple_offset_init(struct offset_ctx *octx)*/ int simple_offset_add (struct offset_ctx *octx,struct dentry *dentry) { -static const struct xa_limit limit =XA_LIMIT (2 ,U32_MAX ); +static const struct xa_limit limit =XA_LIMIT (DIR_OFFSET_MIN ,U32_MAX );u32 offset;int ret;
@@ -480,7 +483,7 @@ static int offset_readdir(struct file *file, struct dir_context *ctx)return 0 ;/* In this case, ->private_data is protected by f_pos_lock */ -if (ctx->pos ==2 ) +if (ctx->pos ==DIR_OFFSET_MIN ) file->private_data =NULL ;else if (file->private_data ==ERR_PTR (-ENOENT ))return 0 ;
Signature · 1 line
2.47.0
Patch "libfs: Define a minimum directory offset" has been added to the 6.6-stable tree
This is a note to let you know that I've just added the patch titled
libfs: Define a minimum directory offset
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
libfs-define-a-minimum-directory-offset.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Fri Jan 24 20:21:35 2025
From: [email protected]
Date: Fri, 24 Jan 2025 14:19:37 -0500
Subject: libfs: Define a minimum directory offset
To: Hugh Dickins <[email protected]>, Andrew Morten <[email protected]>, Christian Brauner <[email protected]>, Al Viro <[email protected]>, Greg Kroah-Hartman <[email protected]>, Sasha Levin <[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>, [email protected], [email protected], Chuck Lever <[email protected]>, Jan Kara <[email protected]>
Message-ID: <[email protected]>
From: Chuck Lever <[email protected]>
[ Upstream commit 7beea725a8ca412c6190090ce7c3a13b169592a1 ]
This value is used in several places, so make it a symbolic constant.
Stable-dep-of: ecba88a3b32d ("libfs: Add simple_offset_empty()")
--- fs/libfs.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
fs/libfs.c +8 -5
@@ -239,6 +239,11 @@ const struct inode_operations simple_dir };EXPORT_SYMBOL (simple_dir_inode_operations); +/* 0 is '.', 1 is '..', so always start with offset 2 or more */ +enum { +DIR_OFFSET_MIN =2 , +}; +static void offset_set (struct dentry *dentry,u32 offset) { dentry->d_fsdata = (void *)((uintptr_t )(offset));
@@ -260,9 +265,7 @@ void simple_offset_init(struct offset_ct {xa_init_flags (&octx->xa,XA_FLAGS_ALLOC1 );lockdep_set_class (&octx->xa.xa_lock, &simple_offset_xa_lock); - -/* 0 is '.', 1 is '..', so always start with offset 2 */ - octx->next_offset =2 ; + octx->next_offset =DIR_OFFSET_MIN ; }/**
@@ -275,7 +278,7 @@ void simple_offset_init(struct offset_ct*/ int simple_offset_add (struct offset_ctx *octx,struct dentry *dentry) { -static const struct xa_limit limit =XA_LIMIT (2 ,U32_MAX ); +static const struct xa_limit limit =XA_LIMIT (DIR_OFFSET_MIN ,U32_MAX );u32 offset;int ret;
@@ -480,7 +483,7 @@ static int offset_readdir(struct file *freturn 0 ;/* In this case, ->private_data is protected by f_pos_lock */ -if (ctx->pos ==2 ) +if (ctx->pos ==DIR_OFFSET_MIN ) file->private_data =NULL ;else if (file->private_data ==ERR_PTR (-ENOENT ))return 0 ;
Patches currently in stable-queue which might be from [email protected] are
queue-6.6/libfs-replace-simple_offset-end-of-directory-detection.patch queue-6.6/libfs-re-arrange-locking-in-offset_iterate_dir.patch queue-6.6/libfs-add-simple_offset_empty.patch queue-6.6/shmem-fix-shmem_rename2.patch queue-6.6/revert-libfs-add-simple_offset_empty.patch queue-6.6/libfs-use-d_children-list-to-iterate-simple_offset-directories.patch queue-6.6/libfs-define-a-minimum-directory-offset.patch queue-6.6/libfs-return-enospc-when-the-directory-offset-range-is-exhausted.patch queue-6.6/libfs-fix-simple_offset_rename_exchange.patch queue-6.6/libfs-add-simple_offset_rename-api.patch
RFC PATCH 3/10 libfs: Add simple_offset_empty()
In reply to [email protected]From: Chuck Lever <[email protected]>
[ Upstream commit ecba88a3b32d733d41e27973e25b2bc580f64281 ]
For simple filesystems that use directory offset mapping, rely strictly on the directory offset map to tell when a directory has no children.
After this patch is applied, the emptiness test holds only the RCU read lock when the directory being tested has no children.
In addition, this adds another layer of confirmation that simple_offset_add/remove() are working as expected.
Stable-dep-of: 5a1a25be995e ("libfs: Add simple_offset_rename() API")
--- fs/libfs.c | 32 ++++++++++++++++++++++++++++++++ include/linux/fs.h | 1 + mm/shmem.c | 4 ++-- 3 files changed, 35 insertions(+), 2 deletions(-)
fs/libfs.c +32 -0
@@ -312,6 +312,38 @@ void simple_offset_remove(struct offset_ctx *octx, struct dentry *dentry)offset_set (dentry,0 ); } +/** +* simple_offset_empty - Check if a dentry can be unlinked +* @dentry: dentry to be tested +* +* Returns 0 if @dentry is a non-empty directory; otherwise returns 1. +*/ +int simple_offset_empty (struct dentry *dentry) +{ +struct inode *inode =d_inode (dentry); +struct offset_ctx *octx; +struct dentry *child; +unsigned long index; +int ret =1 ; + +if (!inode || !S_ISDIR (inode->i_mode)) +return ret; + + index =DIR_OFFSET_MIN ; + octx = inode->i_op->get_offset_ctx (inode); +xa_for_each (&octx->xa, index, child) { +spin_lock (&child->d_lock); +if (simple_positive (child)) { +spin_unlock (&child->d_lock); + ret =0 ; +break ; + } +spin_unlock (&child->d_lock); + } + +return ret; +} +/** * simple_offset_rename_exchange - exchange rename with directory offsets * @old_dir: parent of dentry being moved
include/linux/fs.h +1 -0
@@ -3197,6 +3197,7 @@ struct offset_ctx {void simple_offset_init (struct offset_ctx *octx);int simple_offset_add (struct offset_ctx *octx,struct dentry *dentry);void simple_offset_remove (struct offset_ctx *octx,struct dentry *dentry); +int simple_offset_empty (struct dentry *dentry); int simple_offset_rename_exchange(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir,
mm/shmem.c +2 -2
@@ -3368,7 +3368,7 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry)static int shmem_rmdir (struct inode *dir,struct dentry *dentry) { -if (!simple_empty (dentry)) +if (!simple_offset_empty (dentry))return -ENOTEMPTY ;drop_nlink (d_inode (dentry));
@@ -3425,7 +3425,7 @@ static int shmem_rename2(struct mnt_idmap *idmap,return simple_offset_rename_exchange (old_dir, old_dentry, new_dir, new_dentry); -if (!simple_empty (new_dentry)) +if (!simple_offset_empty (new_dentry))return -ENOTEMPTY ;if (flags &RENAME_WHITEOUT ) {
Signature · 1 line
2.47.0
Patch "libfs: Add simple_offset_empty()" has been added to the 6.6-stable tree
This is a note to let you know that I've just added the patch titled
libfs: Add simple_offset_empty()
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
libfs-add-simple_offset_empty.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Fri Jan 24 20:20:42 2025
From: [email protected]
Date: Fri, 24 Jan 2025 14:19:38 -0500
Subject: libfs: Add simple_offset_empty()
To: Hugh Dickins <[email protected]>, Andrew Morten <[email protected]>, Christian Brauner <[email protected]>, Al Viro <[email protected]>, Greg Kroah-Hartman <[email protected]>, Sasha Levin <[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>, [email protected], [email protected], Chuck Lever <[email protected]>, Jan Kara <[email protected]>
Message-ID: <[email protected]>
From: Chuck Lever <[email protected]>
[ Upstream commit ecba88a3b32d733d41e27973e25b2bc580f64281 ]
For simple filesystems that use directory offset mapping, rely strictly on the directory offset map to tell when a directory has no children.
After this patch is applied, the emptiness test holds only the RCU read lock when the directory being tested has no children.
In addition, this adds another layer of confirmation that simple_offset_add/remove() are working as expected.
Stable-dep-of: 5a1a25be995e ("libfs: Add simple_offset_rename() API")
--- fs/libfs.c | 32 ++++++++++++++++++++++++++++++++ include/linux/fs.h | 1 + mm/shmem.c | 4 ++-- 3 files changed, 35 insertions(+), 2 deletions(-)
fs/libfs.c +32 -0
@@ -313,6 +313,38 @@ void simple_offset_remove(struct offset_ }/** +* simple_offset_empty - Check if a dentry can be unlinked +* @dentry: dentry to be tested +* +* Returns 0 if @dentry is a non-empty directory; otherwise returns 1. +*/ +int simple_offset_empty (struct dentry *dentry) +{ +struct inode *inode =d_inode (dentry); +struct offset_ctx *octx; +struct dentry *child; +unsigned long index; +int ret =1 ; + +if (!inode || !S_ISDIR (inode->i_mode)) +return ret; + + index =DIR_OFFSET_MIN ; + octx = inode->i_op->get_offset_ctx (inode); +xa_for_each (&octx->xa, index, child) { +spin_lock (&child->d_lock); +if (simple_positive (child)) { +spin_unlock (&child->d_lock); + ret =0 ; +break ; + } +spin_unlock (&child->d_lock); + } + +return ret; +} + +/** * simple_offset_rename_exchange - exchange rename with directory offsets * @old_dir: parent of dentry being moved * @old_dentry: dentry being moved
include/linux/fs.h +1 -0
@@ -3197,6 +3197,7 @@ struct offset_ctx {void simple_offset_init (struct offset_ctx *octx);int simple_offset_add (struct offset_ctx *octx,struct dentry *dentry);void simple_offset_remove (struct offset_ctx *octx,struct dentry *dentry); +int simple_offset_empty (struct dentry *dentry); int simple_offset_rename_exchange(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir,
mm/shmem.c +2 -2
@@ -3368,7 +3368,7 @@ static int shmem_unlink(struct inode *distatic int shmem_rmdir (struct inode *dir,struct dentry *dentry) { -if (!simple_empty (dentry)) +if (!simple_offset_empty (dentry))return -ENOTEMPTY ;drop_nlink (d_inode (dentry));
@@ -3425,7 +3425,7 @@ static int shmem_rename2(struct mnt_idmareturn simple_offset_rename_exchange (old_dir, old_dentry, new_dir, new_dentry); -if (!simple_empty (new_dentry)) +if (!simple_offset_empty (new_dentry))return -ENOTEMPTY ;if (flags &RENAME_WHITEOUT ) {
Patches currently in stable-queue which might be from [email protected] are
queue-6.6/libfs-replace-simple_offset-end-of-directory-detection.patch queue-6.6/libfs-re-arrange-locking-in-offset_iterate_dir.patch queue-6.6/libfs-add-simple_offset_empty.patch queue-6.6/shmem-fix-shmem_rename2.patch queue-6.6/revert-libfs-add-simple_offset_empty.patch queue-6.6/libfs-use-d_children-list-to-iterate-simple_offset-directories.patch queue-6.6/libfs-define-a-minimum-directory-offset.patch queue-6.6/libfs-return-enospc-when-the-directory-offset-range-is-exhausted.patch queue-6.6/libfs-fix-simple_offset_rename_exchange.patch queue-6.6/libfs-add-simple_offset_rename-api.patch
RFC PATCH 4/10 libfs: Fix simple_offset_rename_exchange()
In reply to [email protected]From: Chuck Lever <[email protected]>
[ Upstream commit 23cdd0eed3f1fff3af323092b0b88945a7950d8e ]
User space expects the replacement (old) directory entry to have the same directory offset after the rename.
--- fs/libfs.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
fs/libfs.c +19 -6
@@ -294,6 +294,18 @@ int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry)return 0 ; } +static int simple_offset_replace (struct offset_ctx *octx,struct dentry *dentry, +long offset) +{ +void *ret; + + ret =xa_store (&octx->xa, offset, dentry,GFP_KERNEL ); +if (xa_is_err (ret)) +return xa_err (ret); +offset_set (dentry, offset); +return 0 ; +} +/** * simple_offset_remove - Remove an entry to a directory's offset map * @octx: directory offset ctx to be updated
@@ -351,6 +363,9 @@ int simple_offset_empty(struct dentry *dentry)* @new_dir: destination parent * @new_dentry: destination dentry * +* This API preserves the directory offset values. Caller provides +* appropriate serialization. +* * Returns zero on success. Otherwise a negative errno is returned and the * rename is rolled back. */
@@ -368,11 +383,11 @@ int simple_offset_rename_exchange(struct inode *old_dir,simple_offset_remove (old_ctx, old_dentry);simple_offset_remove (new_ctx, new_dentry); - ret =simple_offset_add (new_ctx, old_dentry); + ret =simple_offset_replace (new_ctx, old_dentry, new_index);if (ret) goto out_restore; - ret =simple_offset_add (old_ctx, new_dentry); + ret =simple_offset_replace (old_ctx, new_dentry, old_index);if (ret) {simple_offset_remove (new_ctx, old_dentry); goto out_restore;
@@ -387,10 +402,8 @@ int simple_offset_rename_exchange(struct inode *old_dir,return 0 ; out_restore: -offset_set (old_dentry, old_index); -xa_store (&old_ctx->xa, old_index, old_dentry,GFP_KERNEL ); -offset_set (new_dentry, new_index); -xa_store (&new_ctx->xa, new_index, new_dentry,GFP_KERNEL ); + (void )simple_offset_replace (old_ctx, old_dentry, old_index); + (void )simple_offset_replace (new_ctx, new_dentry, new_index);return ret; }
Signature · 1 line
2.47.0
Patch "libfs: Fix simple_offset_rename_exchange()" has been added to the 6.6-stable tree
This is a note to let you know that I've just added the patch titled
libfs: Fix simple_offset_rename_exchange()
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
libfs-fix-simple_offset_rename_exchange.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Fri Jan 24 20:21:48 2025
From: [email protected]
Date: Fri, 24 Jan 2025 14:19:39 -0500
Subject: libfs: Fix simple_offset_rename_exchange()
To: Hugh Dickins <[email protected]>, Andrew Morten <[email protected]>, Christian Brauner <[email protected]>, Al Viro <[email protected]>, Greg Kroah-Hartman <[email protected]>, Sasha Levin <[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>, [email protected], [email protected], Chuck Lever <[email protected]>
Message-ID: <[email protected]>
From: Chuck Lever <[email protected]>
[ Upstream commit 23cdd0eed3f1fff3af323092b0b88945a7950d8e ]
User space expects the replacement (old) directory entry to have the same directory offset after the rename.
--- fs/libfs.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)
fs/libfs.c +19 -6
@@ -294,6 +294,18 @@ int simple_offset_add(struct offset_ctxreturn 0 ; } +static int simple_offset_replace (struct offset_ctx *octx,struct dentry *dentry, +long offset) +{ +void *ret; + + ret =xa_store (&octx->xa, offset, dentry,GFP_KERNEL ); +if (xa_is_err (ret)) +return xa_err (ret); +offset_set (dentry, offset); +return 0 ; +} +/** * simple_offset_remove - Remove an entry to a directory's offset map * @octx: directory offset ctx to be updated
@@ -351,6 +363,9 @@ int simple_offset_empty(struct dentry *d* @new_dir: destination parent * @new_dentry: destination dentry * +* This API preserves the directory offset values. Caller provides +* appropriate serialization. +* * Returns zero on success. Otherwise a negative errno is returned and the * rename is rolled back. */
@@ -368,11 +383,11 @@ int simple_offset_rename_exchange(structsimple_offset_remove (old_ctx, old_dentry);simple_offset_remove (new_ctx, new_dentry); - ret =simple_offset_add (new_ctx, old_dentry); + ret =simple_offset_replace (new_ctx, old_dentry, new_index);if (ret) goto out_restore; - ret =simple_offset_add (old_ctx, new_dentry); + ret =simple_offset_replace (old_ctx, new_dentry, old_index);if (ret) {simple_offset_remove (new_ctx, old_dentry); goto out_restore;
@@ -387,10 +402,8 @@ int simple_offset_rename_exchange(structreturn 0 ; out_restore: -offset_set (old_dentry, old_index); -xa_store (&old_ctx->xa, old_index, old_dentry,GFP_KERNEL ); -offset_set (new_dentry, new_index); -xa_store (&new_ctx->xa, new_index, new_dentry,GFP_KERNEL ); + (void )simple_offset_replace (old_ctx, old_dentry, old_index); + (void )simple_offset_replace (new_ctx, new_dentry, new_index);return ret; }
Patches currently in stable-queue which might be from [email protected] are
queue-6.6/libfs-replace-simple_offset-end-of-directory-detection.patch queue-6.6/libfs-re-arrange-locking-in-offset_iterate_dir.patch queue-6.6/libfs-add-simple_offset_empty.patch queue-6.6/shmem-fix-shmem_rename2.patch queue-6.6/revert-libfs-add-simple_offset_empty.patch queue-6.6/libfs-use-d_children-list-to-iterate-simple_offset-directories.patch queue-6.6/libfs-define-a-minimum-directory-offset.patch queue-6.6/libfs-return-enospc-when-the-directory-offset-range-is-exhausted.patch queue-6.6/libfs-fix-simple_offset_rename_exchange.patch queue-6.6/libfs-add-simple_offset_rename-api.patch
RFC PATCH 5/10 libfs: Add simple_offset_rename() API
In reply to [email protected]From: Chuck Lever <[email protected]>
[ Upstream commit 5a1a25be995e1014abd01600479915683e356f5c ]
I'm about to fix a tmpfs rename bug that requires the use of internal simple_offset helpers that are not available in mm/shmem.c
--- fs/libfs.c | 21 +++++++++++++++++++++ include/linux/fs.h | 2 ++ mm/shmem.c | 3 +-- 3 files changed, 24 insertions(+), 2 deletions(-)
fs/libfs.c +21 -0
@@ -356,6 +356,27 @@ int simple_offset_empty(struct dentry *dentry)return ret; } +/** +* simple_offset_rename - handle directory offsets for rename +* @old_dir: parent directory of source entry +* @old_dentry: dentry of source entry +* @new_dir: parent_directory of destination entry +* @new_dentry: dentry of destination +* +* Caller provides appropriate serialization. +* +* Returns zero on success, a negative errno value on failure. +*/ +int simple_offset_rename (struct inode *old_dir,struct dentry *old_dentry, +struct inode *new_dir,struct dentry *new_dentry) +{ +struct offset_ctx *old_ctx = old_dir->i_op->get_offset_ctx (old_dir); +struct offset_ctx *new_ctx = new_dir->i_op->get_offset_ctx (new_dir); + +simple_offset_remove (old_ctx, old_dentry); +return simple_offset_add (new_ctx, old_dentry); +} +/** * simple_offset_rename_exchange - exchange rename with directory offsets * @old_dir: parent of dentry being moved
include/linux/fs.h +2 -0
@@ -3198,6 +3198,8 @@ void simple_offset_init(struct offset_ctx *octx);int simple_offset_add (struct offset_ctx *octx,struct dentry *dentry);void simple_offset_remove (struct offset_ctx *octx,struct dentry *dentry);int simple_offset_empty (struct dentry *dentry); +int simple_offset_rename (struct inode *old_dir,struct dentry *old_dentry, +struct inode *new_dir,struct dentry *new_dentry); int simple_offset_rename_exchange(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir,
mm/shmem.c +1 -2
@@ -3434,8 +3434,7 @@ static int shmem_rename2(struct mnt_idmap *idmap,return error; } -simple_offset_remove (shmem_get_offset_ctx (old_dir), old_dentry); - error =simple_offset_add (shmem_get_offset_ctx (new_dir), old_dentry); + error =simple_offset_rename (old_dir, old_dentry, new_dir, new_dentry);if (error)return error;
Signature · 1 line
2.47.0
Patch "libfs: Add simple_offset_rename() API" has been added to the 6.6-stable tree
This is a note to let you know that I've just added the patch titled
libfs: Add simple_offset_rename() API
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
libfs-add-simple_offset_rename-api.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Fri Jan 24 20:21:49 2025
From: [email protected]
Date: Fri, 24 Jan 2025 14:19:40 -0500
Subject: libfs: Add simple_offset_rename() API
To: Hugh Dickins <[email protected]>, Andrew Morten <[email protected]>, Christian Brauner <[email protected]>, Al Viro <[email protected]>, Greg Kroah-Hartman <[email protected]>, Sasha Levin <[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>, [email protected], [email protected], Chuck Lever <[email protected]>
Message-ID: <[email protected]>
From: Chuck Lever <[email protected]>
[ Upstream commit 5a1a25be995e1014abd01600479915683e356f5c ]
I'm about to fix a tmpfs rename bug that requires the use of internal simple_offset helpers that are not available in mm/shmem.c
--- fs/libfs.c | 21 +++++++++++++++++++++ include/linux/fs.h | 2 ++ mm/shmem.c | 3 +-- 3 files changed, 24 insertions(+), 2 deletions(-)
fs/libfs.c +21 -0
@@ -357,6 +357,27 @@ int simple_offset_empty(struct dentry *d }/** +* simple_offset_rename - handle directory offsets for rename +* @old_dir: parent directory of source entry +* @old_dentry: dentry of source entry +* @new_dir: parent_directory of destination entry +* @new_dentry: dentry of destination +* +* Caller provides appropriate serialization. +* +* Returns zero on success, a negative errno value on failure. +*/ +int simple_offset_rename (struct inode *old_dir,struct dentry *old_dentry, +struct inode *new_dir,struct dentry *new_dentry) +{ +struct offset_ctx *old_ctx = old_dir->i_op->get_offset_ctx (old_dir); +struct offset_ctx *new_ctx = new_dir->i_op->get_offset_ctx (new_dir); + +simple_offset_remove (old_ctx, old_dentry); +return simple_offset_add (new_ctx, old_dentry); +} + +/** * simple_offset_rename_exchange - exchange rename with directory offsets * @old_dir: parent of dentry being moved * @old_dentry: dentry being moved
include/linux/fs.h +2 -0
@@ -3198,6 +3198,8 @@ void simple_offset_init(struct offset_ctint simple_offset_add (struct offset_ctx *octx,struct dentry *dentry);void simple_offset_remove (struct offset_ctx *octx,struct dentry *dentry);int simple_offset_empty (struct dentry *dentry); +int simple_offset_rename (struct inode *old_dir,struct dentry *old_dentry, +struct inode *new_dir,struct dentry *new_dentry); int simple_offset_rename_exchange(struct inode *old_dir, struct dentry *old_dentry, struct inode *new_dir,
mm/shmem.c +1 -2
@@ -3434,8 +3434,7 @@ static int shmem_rename2(struct mnt_idmareturn error; } -simple_offset_remove (shmem_get_offset_ctx (old_dir), old_dentry); - error =simple_offset_add (shmem_get_offset_ctx (new_dir), old_dentry); + error =simple_offset_rename (old_dir, old_dentry, new_dir, new_dentry);if (error)return error;
Patches currently in stable-queue which might be from [email protected] are
queue-6.6/libfs-replace-simple_offset-end-of-directory-detection.patch queue-6.6/libfs-re-arrange-locking-in-offset_iterate_dir.patch queue-6.6/libfs-add-simple_offset_empty.patch queue-6.6/shmem-fix-shmem_rename2.patch queue-6.6/revert-libfs-add-simple_offset_empty.patch queue-6.6/libfs-use-d_children-list-to-iterate-simple_offset-directories.patch queue-6.6/libfs-define-a-minimum-directory-offset.patch queue-6.6/libfs-return-enospc-when-the-directory-offset-range-is-exhausted.patch queue-6.6/libfs-fix-simple_offset_rename_exchange.patch queue-6.6/libfs-add-simple_offset_rename-api.patch
RFC PATCH 6/10 shmem: Fix shmem_rename2()
In reply to [email protected]From: Chuck Lever <[email protected]>
[ Upstream commit ad191eb6d6942bb835a0b20b647f7c53c1d99ca4 ]
When renaming onto an existing directory entry, user space expects the replacement entry to have the same directory offset as the original one.
--- fs/libfs.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/libfs.c +9 -0
@@ -365,6 +365,9 @@ int simple_offset_empty(struct dentry *dentry)* * Caller provides appropriate serialization. * +* User space expects the directory offset value of the replaced +* (new) directory entry to be unchanged after a rename. +* * Returns zero on success, a negative errno value on failure. */ int simple_offset_rename(struct inode *old_dir, struct dentry *old_dentry,
@@ -372,8 +375,14 @@ int simple_offset_rename(struct inode *old_dir, struct dentry *old_dentry, {struct offset_ctx *old_ctx = old_dir->i_op->get_offset_ctx (old_dir);struct offset_ctx *new_ctx = new_dir->i_op->get_offset_ctx (new_dir); +long new_offset =dentry2offset (new_dentry);simple_offset_remove (old_ctx, old_dentry); + +if (new_offset) { +offset_set (new_dentry,0 ); +return simple_offset_replace (new_ctx, old_dentry, new_offset); + }return simple_offset_add (new_ctx, old_dentry); }
Signature · 1 line
2.47.0
Patch "shmem: Fix shmem_rename2()" has been added to the 6.6-stable tree
This is a note to let you know that I've just added the patch titled
shmem: Fix shmem_rename2()
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
shmem-fix-shmem_rename2.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Fri Jan 24 20:22:02 2025
From: [email protected]
Date: Fri, 24 Jan 2025 14:19:41 -0500
Subject: shmem: Fix shmem_rename2()
To: Hugh Dickins <[email protected]>, Andrew Morten <[email protected]>, Christian Brauner <[email protected]>, Al Viro <[email protected]>, Greg Kroah-Hartman <[email protected]>, Sasha Levin <[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>, [email protected], [email protected], Chuck Lever <[email protected]>
Message-ID: <[email protected]>
From: Chuck Lever <[email protected]>
[ Upstream commit ad191eb6d6942bb835a0b20b647f7c53c1d99ca4 ]
When renaming onto an existing directory entry, user space expects the replacement entry to have the same directory offset as the original one.
--- fs/libfs.c | 9 +++++++++ 1 file changed, 9 insertions(+)
fs/libfs.c +9 -0
@@ -365,6 +365,9 @@ int simple_offset_empty(struct dentry *d* * Caller provides appropriate serialization. * +* User space expects the directory offset value of the replaced +* (new) directory entry to be unchanged after a rename. +* * Returns zero on success, a negative errno value on failure. */ int simple_offset_rename(struct inode *old_dir, struct dentry *old_dentry,
@@ -372,8 +375,14 @@ int simple_offset_rename(struct inode *o {struct offset_ctx *old_ctx = old_dir->i_op->get_offset_ctx (old_dir);struct offset_ctx *new_ctx = new_dir->i_op->get_offset_ctx (new_dir); +long new_offset =dentry2offset (new_dentry);simple_offset_remove (old_ctx, old_dentry); + +if (new_offset) { +offset_set (new_dentry,0 ); +return simple_offset_replace (new_ctx, old_dentry, new_offset); + }return simple_offset_add (new_ctx, old_dentry); }
Patches currently in stable-queue which might be from [email protected] are
queue-6.6/libfs-replace-simple_offset-end-of-directory-detection.patch queue-6.6/libfs-re-arrange-locking-in-offset_iterate_dir.patch queue-6.6/libfs-add-simple_offset_empty.patch queue-6.6/shmem-fix-shmem_rename2.patch queue-6.6/revert-libfs-add-simple_offset_empty.patch queue-6.6/libfs-use-d_children-list-to-iterate-simple_offset-directories.patch queue-6.6/libfs-define-a-minimum-directory-offset.patch queue-6.6/libfs-return-enospc-when-the-directory-offset-range-is-exhausted.patch queue-6.6/libfs-fix-simple_offset_rename_exchange.patch queue-6.6/libfs-add-simple_offset_rename-api.patch
RFC PATCH 7/10 libfs: Return ENOSPC when the directory offset range is exhausted
In reply to [email protected]From: Chuck Lever <[email protected]>
[ Upstream commit 903dc9c43a155e0893280c7472d4a9a3a83d75a6 ]
Testing shows that the EBUSY error return from mtree_alloc_cyclic() leaks into user space. The ERRORS section of "man creat(2)" says:
Quoted 3 lines
EBUSY
O_EXCLwas specified in flags and pathname refers
to a block device that is in use by the system (e.g., it is mounted).
ENOSPC is closer to what applications expect in this situation.
Note that the normal range of simple directory offset values is 2..2^63, so hitting this error is going to be rare to impossible.
--- fs/libfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/libfs.c +2 -2
@@ -287,8 +287,8 @@ int simple_offset_add(struct offset_ctx *octx, struct dentry *dentry) ret =xa_alloc_cyclic (&octx->xa, &offset, dentry, limit, &octx->next_offset,GFP_KERNEL ); -if (ret <0 ) -return ret; +if (unlikely (ret <0 )) +return ret == -EBUSY ? -ENOSPC : ret;offset_set (dentry, offset);return 0 ;
Signature · 1 line
2.47.0
Patch "libfs: Return ENOSPC when the directory offset range is exhausted" has been added to the 6.6-stable tree
This is a note to let you know that I've just added the patch titled
libfs: Return ENOSPC when the directory offset range is exhausted
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
libfs-return-enospc-when-the-directory-offset-range-is-exhausted.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Fri Jan 24 20:20:27 2025
From: [email protected]
Date: Fri, 24 Jan 2025 14:19:42 -0500
Subject: libfs: Return ENOSPC when the directory offset range is exhausted
To: Hugh Dickins <[email protected]>, Andrew Morten <[email protected]>, Christian Brauner <[email protected]>, Al Viro <[email protected]>, Greg Kroah-Hartman <[email protected]>, Sasha Levin <[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>, [email protected], [email protected], Chuck Lever <[email protected]>, Jeff Layton <[email protected]>
Message-ID: <[email protected]>
From: Chuck Lever <[email protected]>
[ Upstream commit 903dc9c43a155e0893280c7472d4a9a3a83d75a6 ]
Testing shows that the EBUSY error return from mtree_alloc_cyclic() leaks into user space. The ERRORS section of "man creat(2)" says:
Quoted 3 lines
EBUSY
O_EXCLwas specified in flags and pathname refers
to a block device that is in use by the system (e.g., it is mounted).
ENOSPC is closer to what applications expect in this situation.
Note that the normal range of simple directory offset values is 2..2^63, so hitting this error is going to be rare to impossible.
--- fs/libfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/libfs.c +2 -2
@@ -287,8 +287,8 @@ int simple_offset_add(struct offset_ctx ret =xa_alloc_cyclic (&octx->xa, &offset, dentry, limit, &octx->next_offset,GFP_KERNEL ); -if (ret <0 ) -return ret; +if (unlikely (ret <0 )) +return ret == -EBUSY ? -ENOSPC : ret;offset_set (dentry, offset);return 0 ;
Patches currently in stable-queue which might be from [email protected] are
queue-6.6/libfs-replace-simple_offset-end-of-directory-detection.patch queue-6.6/libfs-re-arrange-locking-in-offset_iterate_dir.patch queue-6.6/libfs-add-simple_offset_empty.patch queue-6.6/shmem-fix-shmem_rename2.patch queue-6.6/revert-libfs-add-simple_offset_empty.patch queue-6.6/libfs-use-d_children-list-to-iterate-simple_offset-directories.patch queue-6.6/libfs-define-a-minimum-directory-offset.patch queue-6.6/libfs-return-enospc-when-the-directory-offset-range-is-exhausted.patch queue-6.6/libfs-fix-simple_offset_rename_exchange.patch queue-6.6/libfs-add-simple_offset_rename-api.patch
RFC PATCH 8/10 Revert "libfs: Add simple_offset_empty()"
In reply to [email protected]From: Chuck Lever <[email protected]>
[ Upstream commit d7bde4f27ceef3dc6d72010a20d4da23db835a32 ]
simple_empty() and simple_offset_empty() perform the same task. The latter's use as a canary to find bugs has not found any new issues. A subsequent patch will remove the use of the mtree for iterating directory contents, so revert back to using a similar mechanism for determining whether a directory is indeed empty.
Only one such mechanism is ever needed.
--- fs/libfs.c | 32 -------------------------------- include/linux/fs.h | 1 - mm/shmem.c | 4 ++-- 3 files changed, 2 insertions(+), 35 deletions(-)
fs/libfs.c +0 -32
@@ -324,38 +324,6 @@ void simple_offset_remove(struct offset_ctx *octx, struct dentry *dentry)offset_set (dentry,0 ); } -/** -* simple_offset_empty - Check if a dentry can be unlinked -* @dentry: dentry to be tested -* -* Returns 0 if @dentry is a non-empty directory; otherwise returns 1. -*/ -int simple_offset_empty (struct dentry *dentry) -{ -struct inode *inode =d_inode (dentry); -struct offset_ctx *octx; -struct dentry *child; -unsigned long index; -int ret =1 ; - -if (!inode || !S_ISDIR (inode->i_mode)) -return ret; - - index =DIR_OFFSET_MIN ; - octx = inode->i_op->get_offset_ctx (inode); -xa_for_each (&octx->xa, index, child) { -spin_lock (&child->d_lock); -if (simple_positive (child)) { -spin_unlock (&child->d_lock); - ret =0 ; -break ; - } -spin_unlock (&child->d_lock); - } - -return ret; -} -/** * simple_offset_rename - handle directory offsets for rename * @old_dir: parent directory of source entry
include/linux/fs.h +0 -1
@@ -3197,7 +3197,6 @@ struct offset_ctx {void simple_offset_init (struct offset_ctx *octx);int simple_offset_add (struct offset_ctx *octx,struct dentry *dentry);void simple_offset_remove (struct offset_ctx *octx,struct dentry *dentry); -int simple_offset_empty (struct dentry *dentry);int simple_offset_rename (struct inode *old_dir,struct dentry *old_dentry,struct inode *new_dir,struct dentry *new_dentry); int simple_offset_rename_exchange(struct inode *old_dir,
mm/shmem.c +2 -2
@@ -3368,7 +3368,7 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry)static int shmem_rmdir (struct inode *dir,struct dentry *dentry) { -if (!simple_offset_empty (dentry)) +if (!simple_empty (dentry))return -ENOTEMPTY ;drop_nlink (d_inode (dentry));
@@ -3425,7 +3425,7 @@ static int shmem_rename2(struct mnt_idmap *idmap,return simple_offset_rename_exchange (old_dir, old_dentry, new_dir, new_dentry); -if (!simple_offset_empty (new_dentry)) +if (!simple_empty (new_dentry))return -ENOTEMPTY ;if (flags &RENAME_WHITEOUT ) {
Signature · 1 line
2.47.0
Patch "Revert "libfs: Add simple_offset_empty()"" has been added to the 6.6-stable tree
This is a note to let you know that I've just added the patch titled
Revert "libfs: Add simple_offset_empty()"
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-libfs-add-simple_offset_empty.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Fri Jan 24 20:21:08 2025
From: [email protected]
Date: Fri, 24 Jan 2025 14:19:43 -0500
Subject: Revert "libfs: Add simple_offset_empty()"
To: Hugh Dickins <[email protected]>, Andrew Morten <[email protected]>, Christian Brauner <[email protected]>, Al Viro <[email protected]>, Greg Kroah-Hartman <[email protected]>, Sasha Levin <[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>, [email protected], [email protected], Chuck Lever <[email protected]>
Message-ID: <[email protected]>
From: Chuck Lever <[email protected]>
[ Upstream commit d7bde4f27ceef3dc6d72010a20d4da23db835a32 ]
simple_empty() and simple_offset_empty() perform the same task. The latter's use as a canary to find bugs has not found any new issues. A subsequent patch will remove the use of the mtree for iterating directory contents, so revert back to using a similar mechanism for determining whether a directory is indeed empty.
Only one such mechanism is ever needed.
--- fs/libfs.c | 32 -------------------------------- include/linux/fs.h | 1 - mm/shmem.c | 4 ++-- 3 files changed, 2 insertions(+), 35 deletions(-)
fs/libfs.c +0 -32
@@ -325,38 +325,6 @@ void simple_offset_remove(struct offset_ }/** -* simple_offset_empty - Check if a dentry can be unlinked -* @dentry: dentry to be tested -* -* Returns 0 if @dentry is a non-empty directory; otherwise returns 1. -*/ -int simple_offset_empty (struct dentry *dentry) -{ -struct inode *inode =d_inode (dentry); -struct offset_ctx *octx; -struct dentry *child; -unsigned long index; -int ret =1 ; - -if (!inode || !S_ISDIR (inode->i_mode)) -return ret; - - index =DIR_OFFSET_MIN ; - octx = inode->i_op->get_offset_ctx (inode); -xa_for_each (&octx->xa, index, child) { -spin_lock (&child->d_lock); -if (simple_positive (child)) { -spin_unlock (&child->d_lock); - ret =0 ; -break ; - } -spin_unlock (&child->d_lock); - } - -return ret; -} - -/** * simple_offset_rename - handle directory offsets for rename * @old_dir: parent directory of source entry * @old_dentry: dentry of source entry
include/linux/fs.h +0 -1
@@ -3197,7 +3197,6 @@ struct offset_ctx {void simple_offset_init (struct offset_ctx *octx);int simple_offset_add (struct offset_ctx *octx,struct dentry *dentry);void simple_offset_remove (struct offset_ctx *octx,struct dentry *dentry); -int simple_offset_empty (struct dentry *dentry);int simple_offset_rename (struct inode *old_dir,struct dentry *old_dentry,struct inode *new_dir,struct dentry *new_dentry); int simple_offset_rename_exchange(struct inode *old_dir,
mm/shmem.c +2 -2
@@ -3368,7 +3368,7 @@ static int shmem_unlink(struct inode *distatic int shmem_rmdir (struct inode *dir,struct dentry *dentry) { -if (!simple_offset_empty (dentry)) +if (!simple_empty (dentry))return -ENOTEMPTY ;drop_nlink (d_inode (dentry));
@@ -3425,7 +3425,7 @@ static int shmem_rename2(struct mnt_idmareturn simple_offset_rename_exchange (old_dir, old_dentry, new_dir, new_dentry); -if (!simple_offset_empty (new_dentry)) +if (!simple_empty (new_dentry))return -ENOTEMPTY ;if (flags &RENAME_WHITEOUT ) {
Patches currently in stable-queue which might be from [email protected] are
queue-6.6/libfs-replace-simple_offset-end-of-directory-detection.patch queue-6.6/libfs-re-arrange-locking-in-offset_iterate_dir.patch queue-6.6/libfs-add-simple_offset_empty.patch queue-6.6/shmem-fix-shmem_rename2.patch queue-6.6/revert-libfs-add-simple_offset_empty.patch queue-6.6/libfs-use-d_children-list-to-iterate-simple_offset-directories.patch queue-6.6/libfs-define-a-minimum-directory-offset.patch queue-6.6/libfs-return-enospc-when-the-directory-offset-range-is-exhausted.patch queue-6.6/libfs-fix-simple_offset_rename_exchange.patch queue-6.6/libfs-add-simple_offset_rename-api.patch
RFC PATCH 9/10 libfs: Replace simple_offset end-of-directory detection
In reply to [email protected]From: Chuck Lever <[email protected]>
[ Upstream commit 68a3a65003145644efcbb651e91db249ccd96281 ]
According to getdents(3), the d_off field in each returned directory entry points to the next entry in the directory. The d_off field in the last returned entry in the readdir buffer must contain a valid offset value, but if it points to an actual directory entry, then readdir/getdents can loop.
This patch introduces a specific fixed offset value that is placed in the d_off field of the last entry in a directory. Some user space applications assume that the EOD offset value is larger than the offsets of real directory entries, so the largest valid offset value is reserved for this purpose. This new value is never allocated by simple_offset_add().
When ->iterate_dir() returns, getdents{64} inserts the ctx->pos value into the d_off field of the last valid entry in the readdir buffer. When it hits EOD, offset_readdir() sets ctx->pos to the EOD offset value so the last entry is updated to point to the EOD marker.
When trying to read the entry at the EOD offset, offset_readdir() terminates immediately.
It is worth noting that using a Maple tree for directory offset value allocation does not guarantee a 63-bit range of values -- on platforms where "long" is a 32-bit type, the directory offset value range is still 0..(2^31 - 1). For broad compatibility with 32-bit user space, the largest tmpfs directory cookie value is now S32_MAX.
--- fs/libfs.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)
fs/libfs.c +21 -16
@@ -239,9 +239,15 @@ const struct inode_operations simple_dir_inode_operations = { };EXPORT_SYMBOL (simple_dir_inode_operations); -/* 0 is '.', 1 is '..', so always start with offset 2 or more */ +/* simple_offset_add() never assigns these to a dentry */ enum { -DIR_OFFSET_MIN =2 , +DIR_OFFSET_EOD =S32_MAX , +}; + +/* simple_offset_add() allocation range */ +enum { +DIR_OFFSET_MIN =2 , +DIR_OFFSET_MAX =DIR_OFFSET_EOD -1 , };static void offset_set (struct dentry *dentry,u32 offset)
@@ -278,7 +284,8 @@ void simple_offset_init(struct offset_ctx *octx)*/ int simple_offset_add (struct offset_ctx *octx,struct dentry *dentry) { -static const struct xa_limit limit =XA_LIMIT (DIR_OFFSET_MIN ,U32_MAX ); +static const struct xa_limit limit =XA_LIMIT (DIR_OFFSET_MIN , +DIR_OFFSET_MAX );u32 offset;int ret;
@@ -442,8 +449,6 @@ static loff_t offset_dir_llseek(struct file *file, loff_t offset, int whence)return -EINVAL ; } -/* In this case, ->private_data is protected by f_pos_lock */ - file->private_data =NULL ;return vfs_setpos (file, offset,U32_MAX ); }
@@ -453,7 +458,7 @@ static struct dentry *offset_find_next(struct offset_ctx *octx, loff_t offset)XA_STATE (xas, &octx->xa, offset);rcu_read_lock (); - child =xas_next_entry (&xas,U32_MAX ); + child =xas_next_entry (&xas,DIR_OFFSET_MAX );if (!child) goto out;spin_lock (&child->d_lock);
@@ -474,7 +479,7 @@ static bool offset_dir_emit(struct dir_context *ctx, struct dentry *dentry) inode->i_ino, fs_umode_to_dtype(inode->i_mode)); } -static void *offset_iterate_dir (struct inode *inode,struct dir_context *ctx) +static void offset_iterate_dir (struct inode *inode,struct dir_context *ctx) {struct offset_ctx *octx = inode->i_op->get_offset_ctx (inode);struct dentry *dentry;
@@ -482,7 +487,7 @@ static void *offset_iterate_dir(struct inode *inode, struct dir_context *ctx)while (true) { dentry =offset_find_next (octx, ctx->pos);if (!dentry) -return ERR_PTR (-ENOENT ); + goto out_eod;if (!offset_dir_emit (ctx, dentry)) {dput (dentry);
@@ -492,7 +497,10 @@ static void *offset_iterate_dir(struct inode *inode, struct dir_context *ctx) ctx->pos =dentry2offset (dentry) +1 ;dput (dentry); } -return NULL ; +return ; + +out_eod: + ctx->pos =DIR_OFFSET_EOD ; }/**
@@ -512,6 +520,8 @@ static void *offset_iterate_dir(struct inode *inode, struct dir_context *ctx)* * On return, @ctx->pos contains an offset that will read the next entry * in this directory when offset_readdir() is called again with @ctx. +* Caller places this value in the d_off field of the last entry in the +* user's buffer. * * Return values: * %0 - Complete
@@ -524,13 +534,8 @@ static int offset_readdir(struct file *file, struct dir_context *ctx)if (!dir_emit_dots (file, ctx))return 0 ; - -/* In this case, ->private_data is protected by f_pos_lock */ -if (ctx->pos ==DIR_OFFSET_MIN ) - file->private_data =NULL ; -else if (file->private_data ==ERR_PTR (-ENOENT )) -return 0 ; - file->private_data =offset_iterate_dir (d_inode (dir), ctx); +if (ctx->pos !=DIR_OFFSET_EOD ) +offset_iterate_dir (d_inode (dir), ctx);return 0 ; }
Signature · 1 line
2.47.0
Patch "libfs: Replace simple_offset end-of-directory detection" has been added to the 6.6-stable tree
This is a note to let you know that I've just added the patch titled
libfs: Replace simple_offset end-of-directory detection
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
libfs-replace-simple_offset-end-of-directory-detection.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Fri Jan 24 20:22:03 2025
From: [email protected]
Date: Fri, 24 Jan 2025 14:19:44 -0500
Subject: libfs: Replace simple_offset end-of-directory detection
To: Hugh Dickins <[email protected]>, Andrew Morten <[email protected]>, Christian Brauner <[email protected]>, Al Viro <[email protected]>, Greg Kroah-Hartman <[email protected]>, Sasha Levin <[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>, [email protected], [email protected], Chuck Lever <[email protected]>
Message-ID: <[email protected]>
From: Chuck Lever <[email protected]>
[ Upstream commit 68a3a65003145644efcbb651e91db249ccd96281 ]
According to getdents(3), the d_off field in each returned directory entry points to the next entry in the directory. The d_off field in the last returned entry in the readdir buffer must contain a valid offset value, but if it points to an actual directory entry, then readdir/getdents can loop.
This patch introduces a specific fixed offset value that is placed in the d_off field of the last entry in a directory. Some user space applications assume that the EOD offset value is larger than the offsets of real directory entries, so the largest valid offset value is reserved for this purpose. This new value is never allocated by simple_offset_add().
When ->iterate_dir() returns, getdents{64} inserts the ctx->pos value into the d_off field of the last valid entry in the readdir buffer. When it hits EOD, offset_readdir() sets ctx->pos to the EOD offset value so the last entry is updated to point to the EOD marker.
When trying to read the entry at the EOD offset, offset_readdir() terminates immediately.
It is worth noting that using a Maple tree for directory offset value allocation does not guarantee a 63-bit range of values -- on platforms where "long" is a 32-bit type, the directory offset value range is still 0..(2^31 - 1). For broad compatibility with 32-bit user space, the largest tmpfs directory cookie value is now S32_MAX.
--- fs/libfs.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-)
fs/libfs.c +21 -16
@@ -239,9 +239,15 @@ const struct inode_operations simple_dir };EXPORT_SYMBOL (simple_dir_inode_operations); -/* 0 is '.', 1 is '..', so always start with offset 2 or more */ +/* simple_offset_add() never assigns these to a dentry */ enum { -DIR_OFFSET_MIN =2 , +DIR_OFFSET_EOD =S32_MAX , +}; + +/* simple_offset_add() allocation range */ +enum { +DIR_OFFSET_MIN =2 , +DIR_OFFSET_MAX =DIR_OFFSET_EOD -1 , };static void offset_set (struct dentry *dentry,u32 offset)
@@ -278,7 +284,8 @@ void simple_offset_init(struct offset_ct*/ int simple_offset_add (struct offset_ctx *octx,struct dentry *dentry) { -static const struct xa_limit limit =XA_LIMIT (DIR_OFFSET_MIN ,U32_MAX ); +static const struct xa_limit limit =XA_LIMIT (DIR_OFFSET_MIN , +DIR_OFFSET_MAX );u32 offset;int ret;
@@ -442,8 +449,6 @@ static loff_t offset_dir_llseek(struct freturn -EINVAL ; } -/* In this case, ->private_data is protected by f_pos_lock */ - file->private_data =NULL ;return vfs_setpos (file, offset,U32_MAX ); }
@@ -453,7 +458,7 @@ static struct dentry *offset_find_next(sXA_STATE (xas, &octx->xa, offset);rcu_read_lock (); - child =xas_next_entry (&xas,U32_MAX ); + child =xas_next_entry (&xas,DIR_OFFSET_MAX );if (!child) goto out;spin_lock (&child->d_lock);
@@ -474,7 +479,7 @@ static bool offset_dir_emit(struct dir_c inode->i_ino, fs_umode_to_dtype(inode->i_mode)); } -static void *offset_iterate_dir (struct inode *inode,struct dir_context *ctx) +static void offset_iterate_dir (struct inode *inode,struct dir_context *ctx) {struct offset_ctx *octx = inode->i_op->get_offset_ctx (inode);struct dentry *dentry;
@@ -482,7 +487,7 @@ static void *offset_iterate_dir(struct iwhile (true) { dentry =offset_find_next (octx, ctx->pos);if (!dentry) -return ERR_PTR (-ENOENT ); + goto out_eod;if (!offset_dir_emit (ctx, dentry)) {dput (dentry);
@@ -492,7 +497,10 @@ static void *offset_iterate_dir(struct i ctx->pos =dentry2offset (dentry) +1 ;dput (dentry); } -return NULL ; +return ; + +out_eod: + ctx->pos =DIR_OFFSET_EOD ; }/**
@@ -512,6 +520,8 @@ static void *offset_iterate_dir(struct i* * On return, @ctx->pos contains an offset that will read the next entry * in this directory when offset_readdir() is called again with @ctx. +* Caller places this value in the d_off field of the last entry in the +* user's buffer. * * Return values: * %0 - Complete
@@ -524,13 +534,8 @@ static int offset_readdir(struct file *fif (!dir_emit_dots (file, ctx))return 0 ; - -/* In this case, ->private_data is protected by f_pos_lock */ -if (ctx->pos ==DIR_OFFSET_MIN ) - file->private_data =NULL ; -else if (file->private_data ==ERR_PTR (-ENOENT )) -return 0 ; - file->private_data =offset_iterate_dir (d_inode (dir), ctx); +if (ctx->pos !=DIR_OFFSET_EOD ) +offset_iterate_dir (d_inode (dir), ctx);return 0 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-6.6/libfs-replace-simple_offset-end-of-directory-detection.patch queue-6.6/libfs-re-arrange-locking-in-offset_iterate_dir.patch queue-6.6/libfs-add-simple_offset_empty.patch queue-6.6/shmem-fix-shmem_rename2.patch queue-6.6/revert-libfs-add-simple_offset_empty.patch queue-6.6/libfs-use-d_children-list-to-iterate-simple_offset-directories.patch queue-6.6/libfs-define-a-minimum-directory-offset.patch queue-6.6/libfs-return-enospc-when-the-directory-offset-range-is-exhausted.patch queue-6.6/libfs-fix-simple_offset_rename_exchange.patch queue-6.6/libfs-add-simple_offset_rename-api.patch
RFC PATCH 10/10 libfs: Use d_children list to iterate simple_offset directories
In reply to [email protected]From: Chuck Lever <[email protected]>
[ Upstream commit b9b588f22a0c049a14885399e27625635ae6ef91 ]
The mtree mechanism has been effective at creating directory offsets that are stable over multiple opendir instances. However, it has not been able to handle the subtleties of renames that are concurrent with readdir.
Instead of using the mtree to emit entries in the order of their offset values, use it only to map incoming ctx->pos to a starting entry. Then use the directory's d_children list, which is already maintained properly by the dcache, to find the next child to emit.
One of the sneaky things about this is that when the mtree-allocated offset value wraps (which is very rare), looking up ctx->pos++ is not going to find the next entry; it will return NULL. Instead, by following the d_children list, the offset values can appear in any order but all of the entries in the directory will be visited eventually.
Note also that the readdir() is guaranteed to reach the tail of this list. Entries are added only at the head of d_children, and readdir walks from its current position in that list towards its tail.
--- fs/libfs.c | 84 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 59 insertions(+), 25 deletions(-)
fs/libfs.c +59 -25
@@ -241,12 +241,13 @@ EXPORT_SYMBOL(simple_dir_inode_operations);/* simple_offset_add() never assigns these to a dentry */ enum { +DIR_OFFSET_FIRST =2 ,/* Find first real entry */ DIR_OFFSET_EOD =S32_MAX , };/* simple_offset_add() allocation range */ enum { -DIR_OFFSET_MIN =2 , +DIR_OFFSET_MIN =DIR_OFFSET_FIRST +1 ,DIR_OFFSET_MAX =DIR_OFFSET_EOD -1 , };
@@ -452,51 +453,84 @@ static loff_t offset_dir_llseek(struct file *file, loff_t offset, int whence)return vfs_setpos (file, offset,U32_MAX ); } -static struct dentry *offset_find_next (struct offset_ctx *octx,loff_t offset) +static struct dentry *find_positive_dentry (struct dentry *parent, +struct dentry *dentry, +bool next) { +struct dentry *found =NULL ; + +spin_lock (&parent->d_lock); +if (next) + dentry =list_next_entry (dentry, d_child); +else if (!dentry) + dentry =list_first_entry_or_null (&parent->d_subdirs, + struct dentry, d_child); +for (; dentry && !list_entry_is_head (dentry, &parent->d_subdirs, d_child); + dentry =list_next_entry (dentry, d_child)) { +if (!simple_positive (dentry)) +continue ; +spin_lock_nested (&dentry->d_lock,DENTRY_D_LOCK_NESTED ); +if (simple_positive (dentry)) + found =dget_dlock (dentry); +spin_unlock (&dentry->d_lock); +if (likely (found)) +break ; + } +spin_unlock (&parent->d_lock); +return found; +} + +static noinline_for_stack struct dentry * +offset_dir_lookup (struct dentry *parent,loff_t offset) +{ +struct inode *inode =d_inode (parent); +struct offset_ctx *octx = inode->i_op->get_offset_ctx (inode);struct dentry *child, *found =NULL ; +XA_STATE (xas, &octx->xa, offset); -rcu_read_lock (); - child =xas_next_entry (&xas,DIR_OFFSET_MAX ); -if (!child) - goto out; -spin_lock (&child->d_lock); -if (simple_positive (child)) - found =dget_dlock (child); -spin_unlock (&child->d_lock); -out: -rcu_read_unlock (); +if (offset ==DIR_OFFSET_FIRST ) + found =find_positive_dentry (parent,NULL , false); +else { +rcu_read_lock (); + child =xas_next_entry (&xas,DIR_OFFSET_MAX ); + found =find_positive_dentry (parent, child, false); +rcu_read_unlock (); + }return found; }static bool offset_dir_emit (struct dir_context *ctx,struct dentry *dentry) { -u32 offset =dentry2offset (dentry);struct inode *inode =d_inode (dentry); -return ctx->actor (ctx, dentry->d_name.name, dentry->d_name.len, offset, - inode->i_ino,fs_umode_to_dtype (inode->i_mode)); +return dir_emit (ctx, dentry->d_name.name, dentry->d_name.len, + inode->i_ino,fs_umode_to_dtype (inode->i_mode)); } -static void offset_iterate_dir (struct inode *inode,struct dir_context *ctx) +static void offset_iterate_dir (struct file *file,struct dir_context *ctx) { -struct offset_ctx *octx = inode->i_op->get_offset_ctx (inode); +struct dentry *dir = file->f_path.dentry;struct dentry *dentry; + dentry =offset_dir_lookup (dir, ctx->pos); +if (!dentry) + goto out_eod;while (true) { - dentry =offset_find_next (octx, ctx->pos); -if (!dentry) - goto out_eod; +struct dentry *next; -if (!offset_dir_emit (ctx, dentry)) { -dput (dentry); + ctx->pos =dentry2offset (dentry); +if (!offset_dir_emit (ctx, dentry))break ; - } - ctx->pos =dentry2offset (dentry) +1 ; + next =find_positive_dentry (dir, dentry, true);dput (dentry); + +if (!next) + goto out_eod; + dentry = next; } +dput (dentry);return ; out_eod:
@@ -535,7 +569,7 @@ static int offset_readdir(struct file *file, struct dir_context *ctx)if (!dir_emit_dots (file, ctx))return 0 ;if (ctx->pos !=DIR_OFFSET_EOD ) -offset_iterate_dir (d_inode (dir), ctx); +offset_iterate_dir (file, ctx);return 0 ; }
Signature · 1 line
2.47.0
Patch "libfs: Use d_children list to iterate simple_offset directories" has been added to the 6.6-stable tree
This is a note to let you know that I've just added the patch titled
libfs: Use d_children list to iterate simple_offset directories
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
libfs-use-d_children-list-to-iterate-simple_offset-directories.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
From [email protected] Fri Jan 24 20:22:00 2025
From: [email protected]
Date: Fri, 24 Jan 2025 14:19:45 -0500
Subject: libfs: Use d_children list to iterate simple_offset directories
To: Hugh Dickins <[email protected]>, Andrew Morten <[email protected]>, Christian Brauner <[email protected]>, Al Viro <[email protected]>, Greg Kroah-Hartman <[email protected]>, Sasha Levin <[email protected]>
Cc: <[email protected]>, <[email protected]>, <[email protected]>, [email protected], [email protected], Chuck Lever <[email protected]>
Message-ID: <[email protected]>
From: Chuck Lever <[email protected]>
[ Upstream commit b9b588f22a0c049a14885399e27625635ae6ef91 ]
The mtree mechanism has been effective at creating directory offsets that are stable over multiple opendir instances. However, it has not been able to handle the subtleties of renames that are concurrent with readdir.
Instead of using the mtree to emit entries in the order of their offset values, use it only to map incoming ctx->pos to a starting entry. Then use the directory's d_children list, which is already maintained properly by the dcache, to find the next child to emit.
One of the sneaky things about this is that when the mtree-allocated offset value wraps (which is very rare), looking up ctx->pos++ is not going to find the next entry; it will return NULL. Instead, by following the d_children list, the offset values can appear in any order but all of the entries in the directory will be visited eventually.
Note also that the readdir() is guaranteed to reach the tail of this list. Entries are added only at the head of d_children, and readdir walks from its current position in that list towards its tail.
--- fs/libfs.c | 84 ++++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 25 deletions(-)
fs/libfs.c +59 -25
@@ -241,12 +241,13 @@ EXPORT_SYMBOL(simple_dir_inode_operation/* simple_offset_add() never assigns these to a dentry */ enum { +DIR_OFFSET_FIRST =2 ,/* Find first real entry */ DIR_OFFSET_EOD =S32_MAX , };/* simple_offset_add() allocation range */ enum { -DIR_OFFSET_MIN =2 , +DIR_OFFSET_MIN =DIR_OFFSET_FIRST +1 ,DIR_OFFSET_MAX =DIR_OFFSET_EOD -1 , };
@@ -452,51 +453,84 @@ static loff_t offset_dir_llseek(struct freturn vfs_setpos (file, offset,U32_MAX ); } -static struct dentry *offset_find_next (struct offset_ctx *octx,loff_t offset) +static struct dentry *find_positive_dentry (struct dentry *parent, +struct dentry *dentry, +bool next) +{ +struct dentry *found =NULL ; + +spin_lock (&parent->d_lock); +if (next) + dentry =list_next_entry (dentry, d_child); +else if (!dentry) + dentry =list_first_entry_or_null (&parent->d_subdirs, + struct dentry, d_child); +for (; dentry && !list_entry_is_head (dentry, &parent->d_subdirs, d_child); + dentry =list_next_entry (dentry, d_child)) { +if (!simple_positive (dentry)) +continue ; +spin_lock_nested (&dentry->d_lock,DENTRY_D_LOCK_NESTED ); +if (simple_positive (dentry)) + found =dget_dlock (dentry); +spin_unlock (&dentry->d_lock); +if (likely (found)) +break ; + } +spin_unlock (&parent->d_lock); +return found; +} + +static noinline_for_stack struct dentry * +offset_dir_lookup (struct dentry *parent,loff_t offset) { +struct inode *inode =d_inode (parent); +struct offset_ctx *octx = inode->i_op->get_offset_ctx (inode);struct dentry *child, *found =NULL ; +XA_STATE (xas, &octx->xa, offset); -rcu_read_lock (); - child =xas_next_entry (&xas,DIR_OFFSET_MAX ); -if (!child) - goto out; -spin_lock (&child->d_lock); -if (simple_positive (child)) - found =dget_dlock (child); -spin_unlock (&child->d_lock); -out: -rcu_read_unlock (); +if (offset ==DIR_OFFSET_FIRST ) + found =find_positive_dentry (parent,NULL , false); +else { +rcu_read_lock (); + child =xas_next_entry (&xas,DIR_OFFSET_MAX ); + found =find_positive_dentry (parent, child, false); +rcu_read_unlock (); + }return found; }static bool offset_dir_emit (struct dir_context *ctx,struct dentry *dentry) { -u32 offset =dentry2offset (dentry);struct inode *inode =d_inode (dentry); -return ctx->actor (ctx, dentry->d_name.name, dentry->d_name.len, offset, - inode->i_ino,fs_umode_to_dtype (inode->i_mode)); +return dir_emit (ctx, dentry->d_name.name, dentry->d_name.len, + inode->i_ino,fs_umode_to_dtype (inode->i_mode)); } -static void offset_iterate_dir (struct inode *inode,struct dir_context *ctx) +static void offset_iterate_dir (struct file *file,struct dir_context *ctx) { -struct offset_ctx *octx = inode->i_op->get_offset_ctx (inode); +struct dentry *dir = file->f_path.dentry;struct dentry *dentry; + dentry =offset_dir_lookup (dir, ctx->pos); +if (!dentry) + goto out_eod;while (true) { - dentry =offset_find_next (octx, ctx->pos); -if (!dentry) - goto out_eod; +struct dentry *next; -if (!offset_dir_emit (ctx, dentry)) { -dput (dentry); + ctx->pos =dentry2offset (dentry); +if (!offset_dir_emit (ctx, dentry))break ; - } - ctx->pos =dentry2offset (dentry) +1 ; + next =find_positive_dentry (dir, dentry, true);dput (dentry); + +if (!next) + goto out_eod; + dentry = next; } +dput (dentry);return ; out_eod:
@@ -535,7 +569,7 @@ static int offset_readdir(struct file *fif (!dir_emit_dots (file, ctx))return 0 ;if (ctx->pos !=DIR_OFFSET_EOD ) -offset_iterate_dir (d_inode (dir), ctx); +offset_iterate_dir (file, ctx);return 0 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-6.6/libfs-replace-simple_offset-end-of-directory-detection.patch queue-6.6/libfs-re-arrange-locking-in-offset_iterate_dir.patch queue-6.6/libfs-add-simple_offset_empty.patch queue-6.6/shmem-fix-shmem_rename2.patch queue-6.6/revert-libfs-add-simple_offset_empty.patch queue-6.6/libfs-use-d_children-list-to-iterate-simple_offset-directories.patch queue-6.6/libfs-define-a-minimum-directory-offset.patch queue-6.6/libfs-return-enospc-when-the-directory-offset-range-is-exhausted.patch queue-6.6/libfs-fix-simple_offset_rename_exchange.patch queue-6.6/libfs-add-simple_offset_rename-api.patch
Quoted 30 lines · On 1/24/25 2:19 PM, [email protected] wrote:
From: Chuck Lever <[email protected]>
This series backports several upstream fixes to origin/linux-6.6.y in order to address CVE-2024-46701:
https://nvd.nist.gov/vuln/detail/CVE-2024-46701As applied to origin/linux-6.6.y, this series passes fstests and the git regression suite.
Before officially requesting that stable@ merge this series, I'd like to provide an opportunity for community review of the backport patches.
You can also find them them in the "nfsd-6.6.y" branch in
https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
Chuck Lever (10):
libfs: Re-arrange locking inoffset_iterate_dir()
libfs: Define a minimum directory offset
libfs: Addsimple_offset_empty()
libfs: Fixsimple_offset_rename_exchange()
libfs: Addsimple_offset_rename()API
shmem: Fixshmem_rename2()
libfs: Return ENOSPC when the directory offset range is exhausted Revert "libfs: Addsimple_offset_empty()"
libfs: Replacesimple_offsetend-of-directory detection
libfs: Used_childrenlist to iteratesimple_offsetdirectories
Quoted 5 lines
fs/libfs.c | 177 +++++++++++++++++++++++++++++++++------------ include/linux/fs.h | 2 + mm/shmem.c | 3 +- 3 files changed, 134 insertions(+), 48 deletions(-)
I've heard no objections or other comments. Greg, Sasha, shall we proceed with merging this patch series into v6.6 ?
Signature · 1 line
Chuck Lever
Greg Kroah-Hartman
maintainerQuoted 31 lines · Chuck Lever
Quoted 30 lines · On 1/24/25 2:19 PM, [email protected] wrote:
From: Chuck Lever <[email protected]>
This series backports several upstream fixes to origin/linux-6.6.y in order to address CVE-2024-46701:
https://nvd.nist.gov/vuln/detail/CVE-2024-46701As applied to origin/linux-6.6.y, this series passes fstests and the git regression suite.
Before officially requesting that stable@ merge this series, I'd like to provide an opportunity for community review of the backport patches.
You can also find them them in the "nfsd-6.6.y" branch in
https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
Chuck Lever (10):
libfs: Re-arrange locking inoffset_iterate_dir()
libfs: Define a minimum directory offset
libfs: Addsimple_offset_empty()
libfs: Fixsimple_offset_rename_exchange()
libfs: Addsimple_offset_rename()API
shmem: Fixshmem_rename2()
libfs: Return ENOSPC when the directory offset range is exhausted Revert "libfs: Addsimple_offset_empty()"
libfs: Replacesimple_offsetend-of-directory detection
libfs: Used_childrenlist to iteratesimple_offsetdirectories
Quoted 8 lines
Quoted 5 lines
fs/libfs.c | 177 +++++++++++++++++++++++++++++++++------------ include/linux/fs.h | 2 + mm/shmem.c | 3 +- 3 files changed, 134 insertions(+), 48 deletions(-)I've heard no objections or other comments. Greg, Sasha, shall we proceed with merging this patch series into v6.6 ?
Um, but not all of these are in a released kernel yet, so we can't take them all yet. Also what about 6.12.y and 6.13.y for those commits that will be showing up in 6.14-rc1? We can't have regressions for people moving to those releases from 6.6.y, right?
thanks,
greg k-h
Quoted 38 lines · Greg Kroah-Hartman
Quoted 37 lines · Chuck Lever
Quoted 35 lines · On 1/24/25 2:19 PM, [email protected] wrote:
From: Chuck Lever <[email protected]>
This series backports several upstream fixes to origin/linux-6.6.y in order to address CVE-2024-46701:
https://nvd.nist.gov/vuln/detail/CVE-2024-46701As applied to origin/linux-6.6.y, this series passes fstests and the git regression suite.
Before officially requesting that stable@ merge this series, I'd like to provide an opportunity for community review of the backport patches.
You can also find them them in the "nfsd-6.6.y" branch in
https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
Chuck Lever (10):
libfs: Re-arrange locking inoffset_iterate_dir()
libfs: Define a minimum directory offset
libfs: Addsimple_offset_empty()
libfs: Fixsimple_offset_rename_exchange()
libfs: Addsimple_offset_rename()API
shmem: Fixshmem_rename2()
libfs: Return ENOSPC when the directory offset range is exhausted Revert "libfs: Addsimple_offset_empty()"
libfs: Replacesimple_offsetend-of-directory detection
libfs: Used_childrenlist to iteratesimple_offsetdirectoriesfs/libfs.c | 177 +++++++++++++++++++++++++++++++++------------ include/linux/fs.h | 2 + mm/shmem.c | 3 +- 3 files changed, 134 insertions(+), 48 deletions(-)
Quoted 5 lines
Quoted 2 lines
I've heard no objections or other comments. Greg, Sasha, shall we proceed with merging this patch series into v6.6 ?
Um, but not all of these are in a released kernel yet, so we can't take them all yet.
Hi Greg -
The new patches are in v6.14 now. I'm asking stable to take these whenever you are ready. Would that be v6.14-rc1? I can send a reminder if you like.
Quoted 3 lines
Also what about 6.12.y and 6.13.y for those commits that will be showing up in 6.14-rc1? We can't have regressions for people moving to those releases from 6.6.y, right?
The upstream commits have Fixes tags. I assumed that your automation will find those and apply them to those kernels -- the upstream versions of these patches I expect will apply cleanly to recent LTS.
Signature · 1 line
Chuck Lever
Greg Kroah-Hartman
maintainerQuoted 42 lines · Chuck Lever
Quoted 41 lines · Greg Kroah-Hartman
Quoted 39 lines · Chuck Lever
Quoted 30 lines · On 1/24/25 2:19 PM, [email protected] wrote:
From: Chuck Lever <[email protected]>
This series backports several upstream fixes to origin/linux-6.6.y in order to address CVE-2024-46701:
https://nvd.nist.gov/vuln/detail/CVE-2024-46701As applied to origin/linux-6.6.y, this series passes fstests and the git regression suite.
Before officially requesting that stable@ merge this series, I'd like to provide an opportunity for community review of the backport patches.
You can also find them them in the "nfsd-6.6.y" branch in
https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
Chuck Lever (10):
libfs: Re-arrange locking inoffset_iterate_dir()
libfs: Define a minimum directory offset
libfs: Addsimple_offset_empty()
libfs: Fixsimple_offset_rename_exchange()
libfs: Addsimple_offset_rename()API
shmem: Fixshmem_rename2()
libfs: Return ENOSPC when the directory offset range is exhausted Revert "libfs: Addsimple_offset_empty()"
libfs: Replacesimple_offsetend-of-directory detection
libfs: Used_childrenlist to iteratesimple_offsetdirectoriesQuoted 5 lines
fs/libfs.c | 177 +++++++++++++++++++++++++++++++++------------ include/linux/fs.h | 2 + mm/shmem.c | 3 +- 3 files changed, 134 insertions(+), 48 deletions(-)I've heard no objections or other comments. Greg, Sasha, shall we proceed with merging this patch series into v6.6 ?
Quoted 8 lines
Quoted 2 lines
Um, but not all of these are in a released kernel yet, so we can't take them all yet.
Hi Greg -
The new patches are in v6.14 now. I'm asking stable to take these whenever you are ready. Would that be v6.14-rc1? I can send a reminder if you like.
Yes, we have to wait until changes are in a -rc release unless there are "real reasons to take it now" :)
Quoted 7 lines
Quoted 3 lines
Also what about 6.12.y and 6.13.y for those commits that will be showing up in 6.14-rc1? We can't have regressions for people moving to those releases from 6.6.y, right?
The upstream commits have Fixes tags. I assumed that your automation will find those and apply them to those kernels -- the upstream versions of these patches I expect will apply cleanly to recent LTS.
"Fixes:" are never guaranteed to show up in stable kernels, they are only a "maybe when we get some spare cycles and get around to it we might do a simple pass to see what works or doesn't."
If you KNOW a change is a bugfix for stable kernels, please mark it as such! "Fixes:" is NOT how to do that, and never has been. It's only additional meta-data that helps us out.
So please send us a list of the commits that need to go to 6.12.y and 6.13.y, we have to have that before we could take the 6.6.y changes.
thanks,
greg k-h
Quoted 67 lines · Greg Kroah-Hartman
Quoted 42 lines · Chuck Lever
Quoted 41 lines · Greg Kroah-Hartman
Quoted 39 lines · Chuck Lever
Quoted 30 lines · On 1/24/25 2:19 PM, [email protected] wrote:
From: Chuck Lever <[email protected]>
This series backports several upstream fixes to origin/linux-6.6.y in order to address CVE-2024-46701:
https://nvd.nist.gov/vuln/detail/CVE-2024-46701As applied to origin/linux-6.6.y, this series passes fstests and the git regression suite.
Before officially requesting that stable@ merge this series, I'd like to provide an opportunity for community review of the backport patches.
You can also find them them in the "nfsd-6.6.y" branch in
https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
Chuck Lever (10):
libfs: Re-arrange locking inoffset_iterate_dir()
libfs: Define a minimum directory offset
libfs: Addsimple_offset_empty()
libfs: Fixsimple_offset_rename_exchange()
libfs: Addsimple_offset_rename()API
shmem: Fixshmem_rename2()
libfs: Return ENOSPC when the directory offset range is exhausted Revert "libfs: Addsimple_offset_empty()"
libfs: Replacesimple_offsetend-of-directory detection
libfs: Used_childrenlist to iteratesimple_offsetdirectoriesQuoted 5 lines
fs/libfs.c| 177 +++++++++++++++++++++++++++++++++------------
include/linux/fs.h| 2 +
mm/shmem.c| 3 +-
3 files changed, 134 insertions(+), 48 deletions(-)I've heard no objections or other comments. Greg, Sasha, shall we proceed with merging this patch series into v6.6 ?
Quoted 8 lines
Quoted 2 lines
Um, but not all of these are in a released kernel yet, so we can't take them all yet.
Hi Greg -
The new patches are in v6.14 now. I'm asking stable to take these whenever you are ready. Would that be v6.14-rc1? I can send a reminder if you like.
Yes, we have to wait until changes are in a -rc release unless there are "real reasons to take it now" :)
Quoted 7 lines
Quoted 3 lines
Also what about 6.12.y and 6.13.y for those commits that will be showing up in 6.14-rc1? We can't have regressions for people moving to those releases from 6.6.y, right?
The upstream commits have Fixes tags. I assumed that your automation will find those and apply them to those kernels -- the upstream versions of these patches I expect will apply cleanly to recent LTS.
"Fixes:" are never guaranteed to show up in stable kernels, they are only a "maybe when we get some spare cycles and get around to it we might do a simple pass to see what works or doesn't."
Quoted 6 lines
If you KNOW a change is a bugfix for stable kernels, please mark it as such! "Fixes:" is NOT how to do that, and never has been. It's only additional meta-data that helps us out.
So please send us a list of the commits that need to go to 6.12.y and 6.13.y, we have to have that before we could take the 6.6.y changes.
903dc9c43a15 ("libfs: Return ENOSPC when the directory offset range is exhausted") d7bde4f27cee ("Revert "libfs: Add simple_offset_empty()"") b662d858131d ("Revert "libfs: fix infinite directory reads for offset dir"") 68a3a6500314 ("libfs: Replace simple_offset end-of-directory detection") b9b588f22a0c ("libfs: Use d_children list to iterate simple_offset directories")
Signature · 1 line
Chuck Lever
Greg Kroah-Hartman
maintainerQuoted 75 lines · Chuck Lever
Quoted 67 lines · Greg Kroah-Hartman
Quoted 42 lines · Chuck Lever
Quoted 41 lines · Greg Kroah-Hartman
Quoted 39 lines · Chuck Lever
Quoted 30 lines · On 1/24/25 2:19 PM, [email protected] wrote:
From: Chuck Lever <[email protected]>
This series backports several upstream fixes to origin/linux-6.6.y in order to address CVE-2024-46701:
https://nvd.nist.gov/vuln/detail/CVE-2024-46701As applied to origin/linux-6.6.y, this series passes fstests and the git regression suite.
Before officially requesting that stable@ merge this series, I'd like to provide an opportunity for community review of the backport patches.
You can also find them them in the "nfsd-6.6.y" branch in
https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
Chuck Lever (10):
libfs: Re-arrange locking inoffset_iterate_dir()
libfs: Define a minimum directory offset
libfs: Addsimple_offset_empty()
libfs: Fixsimple_offset_rename_exchange()
libfs: Addsimple_offset_rename()API
shmem: Fixshmem_rename2()
libfs: Return ENOSPC when the directory offset range is exhausted Revert "libfs: Addsimple_offset_empty()"
libfs: Replacesimple_offsetend-of-directory detection
libfs: Used_childrenlist to iteratesimple_offsetdirectoriesQuoted 5 lines
fs/libfs.c| 177 +++++++++++++++++++++++++++++++++------------
include/linux/fs.h| 2 +
mm/shmem.c| 3 +-
3 files changed, 134 insertions(+), 48 deletions(-)I've heard no objections or other comments. Greg, Sasha, shall we proceed with merging this patch series into v6.6 ?
Quoted 8 lines
Quoted 2 lines
Um, but not all of these are in a released kernel yet, so we can't take them all yet.
Hi Greg -
The new patches are in v6.14 now. I'm asking stable to take these whenever you are ready. Would that be v6.14-rc1? I can send a reminder if you like.
Yes, we have to wait until changes are in a -rc release unless there are "real reasons to take it now" :)
Quoted 7 lines
Quoted 3 lines
Also what about 6.12.y and 6.13.y for those commits that will be showing up in 6.14-rc1? We can't have regressions for people moving to those releases from 6.6.y, right?
The upstream commits have Fixes tags. I assumed that your automation will find those and apply them to those kernels -- the upstream versions of these patches I expect will apply cleanly to recent LTS.
"Fixes:" are never guaranteed to show up in stable kernels, they are only a "maybe when we get some spare cycles and get around to it we might do a simple pass to see what works or doesn't."
Quoted 6 lines
If you KNOW a change is a bugfix for stable kernels, please mark it as such! "Fixes:" is NOT how to do that, and never has been. It's only additional meta-data that helps us out.
So please send us a list of the commits that need to go to 6.12.y and 6.13.y, we have to have that before we could take the 6.6.y changes.
Quoted 7 lines
903dc9c43a15("libfs: Return ENOSPC when the directory offset range is exhausted")d7bde4f27cee("Revert "libfs: Addsimple_offset_empty()"")b662d858131d("Revert "libfs: fix infinite directory reads for offset dir"")68a3a6500314("libfs: Replacesimple_offsetend-of-directory detection")b9b588f22a0c("libfs: Used_childrenlist to iteratesimple_offsetdirectories")
Cool, thanks for the list (and not all were marked with fixes, i.e. those reverts, I guess we need to start checking for reverts better. I have tooling set up for that but not integrated yet...)
I'll just queue them all up now.
greg k-h
Quoted 84 lines · Greg Kroah-Hartman
Quoted 75 lines · Chuck Lever
Quoted 67 lines · Greg Kroah-Hartman
Quoted 42 lines · Chuck Lever
Quoted 41 lines · Greg Kroah-Hartman
Quoted 39 lines · Chuck Lever
Quoted 30 lines · On 1/24/25 2:19 PM, [email protected] wrote:
From: Chuck Lever <[email protected]>
This series backports several upstream fixes to origin/linux-6.6.y in order to address CVE-2024-46701:
https://nvd.nist.gov/vuln/detail/CVE-2024-46701As applied to origin/linux-6.6.y, this series passes fstests and the git regression suite.
Before officially requesting that stable@ merge this series, I'd like to provide an opportunity for community review of the backport patches.
You can also find them them in the "nfsd-6.6.y" branch in
https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
Chuck Lever (10):
libfs: Re-arrange locking inoffset_iterate_dir()
libfs: Define a minimum directory offset
libfs: Addsimple_offset_empty()
libfs: Fixsimple_offset_rename_exchange()
libfs: Addsimple_offset_rename()API
shmem: Fixshmem_rename2()
libfs: Return ENOSPC when the directory offset range is exhausted Revert "libfs: Addsimple_offset_empty()"
libfs: Replacesimple_offsetend-of-directory detection
libfs: Used_childrenlist to iteratesimple_offsetdirectoriesQuoted 5 lines
fs/libfs.c| 177 +++++++++++++++++++++++++++++++++------------
include/linux/fs.h| 2 +
mm/shmem.c| 3 +-
3 files changed, 134 insertions(+), 48 deletions(-)I've heard no objections or other comments. Greg, Sasha, shall we proceed with merging this patch series into v6.6 ?
Quoted 8 lines
Quoted 2 lines
Um, but not all of these are in a released kernel yet, so we can't take them all yet.
Hi Greg -
The new patches are in v6.14 now. I'm asking stable to take these whenever you are ready. Would that be v6.14-rc1? I can send a reminder if you like.
Yes, we have to wait until changes are in a -rc release unless there are "real reasons to take it now" :)
Quoted 7 lines
Quoted 3 lines
Also what about 6.12.y and 6.13.y for those commits that will be showing up in 6.14-rc1? We can't have regressions for people moving to those releases from 6.6.y, right?
The upstream commits have Fixes tags. I assumed that your automation will find those and apply them to those kernels -- the upstream versions of these patches I expect will apply cleanly to recent LTS.
"Fixes:" are never guaranteed to show up in stable kernels, they are only a "maybe when we get some spare cycles and get around to it we might do a simple pass to see what works or doesn't."
Quoted 6 lines
If you KNOW a change is a bugfix for stable kernels, please mark it as such! "Fixes:" is NOT how to do that, and never has been. It's only additional meta-data that helps us out.
So please send us a list of the commits that need to go to 6.12.y and 6.13.y, we have to have that before we could take the 6.6.y changes.
Quoted 7 lines
903dc9c43a15("libfs: Return ENOSPC when the directory offset range is exhausted")d7bde4f27cee("Revert "libfs: Addsimple_offset_empty()"")b662d858131d("Revert "libfs: fix infinite directory reads for offset dir"")68a3a6500314("libfs: Replacesimple_offsetend-of-directory detection")b9b588f22a0c("libfs: Used_childrenlist to iteratesimple_offsetdirectories")
Quoted 5 lines
Cool, thanks for the list (and not all were marked with fixes, i.e. those reverts, I guess we need to start checking for reverts better. I have tooling set up for that but not integrated yet...)
I'll just queue them all up now.
My thinking was the patches marked "Fixes:" would show an obvious need for applying the unmarked patches as pre-requisites first.
I promise to do better marking patches with "Cc: stable". But also let me know if there's a way to label pre-req patches more clearly. Maybe "Cc: stable" without "Fixes:" is the way to go there.
Thank you, Greg, for your time.
Signature · 1 line
Chuck Lever
Greg Kroah-Hartman
maintainerQuoted 85 lines · Chuck Lever
Quoted 84 lines · Greg Kroah-Hartman
Quoted 82 lines · Chuck Lever
Quoted 67 lines · Greg Kroah-Hartman
Quoted 42 lines · Chuck Lever
Quoted 41 lines · Greg Kroah-Hartman
Quoted 39 lines · Chuck Lever
Quoted 30 lines · On 1/24/25 2:19 PM, [email protected] wrote:
From: Chuck Lever <[email protected]>
This series backports several upstream fixes to origin/linux-6.6.y in order to address CVE-2024-46701:
https://nvd.nist.gov/vuln/detail/CVE-2024-46701As applied to origin/linux-6.6.y, this series passes fstests and the git regression suite.
Before officially requesting that stable@ merge this series, I'd like to provide an opportunity for community review of the backport patches.
You can also find them them in the "nfsd-6.6.y" branch in
https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git
Chuck Lever (10):
libfs: Re-arrange locking inoffset_iterate_dir()
libfs: Define a minimum directory offset
libfs: Addsimple_offset_empty()
libfs: Fixsimple_offset_rename_exchange()
libfs: Addsimple_offset_rename()API
shmem: Fixshmem_rename2()
libfs: Return ENOSPC when the directory offset range is exhausted Revert "libfs: Addsimple_offset_empty()"
libfs: Replacesimple_offsetend-of-directory detection
libfs: Used_childrenlist to iteratesimple_offsetdirectoriesQuoted 5 lines
fs/libfs.c| 177 +++++++++++++++++++++++++++++++++------------
include/linux/fs.h| 2 +
mm/shmem.c| 3 +-
3 files changed, 134 insertions(+), 48 deletions(-)I've heard no objections or other comments. Greg, Sasha, shall we proceed with merging this patch series into v6.6 ?
Quoted 8 lines
Quoted 2 lines
Um, but not all of these are in a released kernel yet, so we can't take them all yet.
Hi Greg -
The new patches are in v6.14 now. I'm asking stable to take these whenever you are ready. Would that be v6.14-rc1? I can send a reminder if you like.
Yes, we have to wait until changes are in a -rc release unless there are "real reasons to take it now" :)
Quoted 7 lines
Quoted 3 lines
Also what about 6.12.y and 6.13.y for those commits that will be showing up in 6.14-rc1? We can't have regressions for people moving to those releases from 6.6.y, right?
The upstream commits have Fixes tags. I assumed that your automation will find those and apply them to those kernels -- the upstream versions of these patches I expect will apply cleanly to recent LTS.
"Fixes:" are never guaranteed to show up in stable kernels, they are only a "maybe when we get some spare cycles and get around to it we might do a simple pass to see what works or doesn't."
Quoted 6 lines
If you KNOW a change is a bugfix for stable kernels, please mark it as such! "Fixes:" is NOT how to do that, and never has been. It's only additional meta-data that helps us out.
So please send us a list of the commits that need to go to 6.12.y and 6.13.y, we have to have that before we could take the 6.6.y changes.
903dc9c43a15("libfs: Return ENOSPC when the directory offset range is exhausted")d7bde4f27cee("Revert "libfs: Addsimple_offset_empty()"")b662d858131d("Revert "libfs: fix infinite directory reads for offset dir"")68a3a6500314("libfs: Replacesimple_offsetend-of-directory detection")b9b588f22a0c("libfs: Used_childrenlist to iteratesimple_offsetdirectories")
Quoted 8 lines
Quoted 5 lines
Cool, thanks for the list (and not all were marked with fixes, i.e. those reverts, I guess we need to start checking for reverts better. I have tooling set up for that but not integrated yet...)
I'll just queue them all up now.
My thinking was the patches marked "Fixes:" would show an obvious need for applying the unmarked patches as pre-requisites first.
For when you send us a patch series for inclusion, sure, all is fine. I mean for when you merge stuff to Linus and expect us to pick them up.
Quoted 3 lines
I promise to do better marking patches with "Cc: stable". But also let me know if there's a way to label pre-req patches more clearly. Maybe "Cc: stable" without "Fixes:" is the way to go there.
Both is best, that way if you have a Fixes: tag in it, and a patch does not apply properly, you will get a "FAILED" email sent to you. If you only have the cc: stable then we just do a best-effort attempt and stop backporting when it doesn't apply and don't notify you at all about any failures.
thanks,
greg k-h