* [PATCH 02/11] remove pointless includes of <linux/fdtable.h>
2024-08-12 6:44 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Al Viro
@ 2024-08-12 6:44 ` Al Viro
2024-08-12 9:25 ` Christian Brauner
2024-08-12 6:44 ` [PATCH 03/11] close_files(): don't bother with xchg() Al Viro
` (9 subsequent siblings)
10 siblings, 1 reply; 20+ messages in thread
From: Al Viro @ 2024-08-12 6:44 UTC (permalink / raw)
To: viro; +Cc: brauner, jack, linux-fsdevel
some of those used to be needed, some had been cargo-culted for
no reason...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/fcntl.c | 1 -
fs/file_table.c | 1 -
fs/notify/fanotify/fanotify.c | 1 -
fs/notify/fanotify/fanotify_user.c | 1 -
fs/overlayfs/copy_up.c | 1 -
fs/proc/base.c | 1 -
io_uring/io_uring.c | 1 -
kernel/bpf/bpf_inode_storage.c | 1 -
kernel/bpf/bpf_task_storage.c | 1 -
kernel/bpf/token.c | 1 -
kernel/exit.c | 1 -
kernel/module/dups.c | 1 -
kernel/module/kmod.c | 1 -
kernel/umh.c | 1 -
net/handshake/request.c | 1 -
security/apparmor/domain.c | 1 -
16 files changed, 16 deletions(-)
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 300e5d9ad913..56262bdbc544 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -12,7 +12,6 @@
#include <linux/fs.h>
#include <linux/filelock.h>
#include <linux/file.h>
-#include <linux/fdtable.h>
#include <linux/capability.h>
#include <linux/dnotify.h>
#include <linux/slab.h>
diff --git a/fs/file_table.c b/fs/file_table.c
index ca7843dde56d..15adc085df4f 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -9,7 +9,6 @@
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/file.h>
-#include <linux/fdtable.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/fs.h>
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index 224bccaab4cc..24c7c5df4998 100644
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/fanotify.h>
-#include <linux/fdtable.h>
#include <linux/fsnotify_backend.h>
#include <linux/init.h>
#include <linux/jiffies.h>
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 9ec313e9f6e1..cc91977cf202 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include <linux/fanotify.h>
#include <linux/fcntl.h>
-#include <linux/fdtable.h>
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/anon_inodes.h>
diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c
index a5ef2005a2cc..73b502524d1c 100644
--- a/fs/overlayfs/copy_up.c
+++ b/fs/overlayfs/copy_up.c
@@ -16,7 +16,6 @@
#include <linux/sched/signal.h>
#include <linux/cred.h>
#include <linux/namei.h>
-#include <linux/fdtable.h>
#include <linux/ratelimit.h>
#include <linux/exportfs.h>
#include "overlayfs.h"
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 72a1acd03675..d4ecad2b0a2e 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -58,7 +58,6 @@
#include <linux/init.h>
#include <linux/capability.h>
#include <linux/file.h>
-#include <linux/fdtable.h>
#include <linux/generic-radix-tree.h>
#include <linux/string.h>
#include <linux/seq_file.h>
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 3942db160f18..0b4be6d5edaf 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -51,7 +51,6 @@
#include <linux/sched/signal.h>
#include <linux/fs.h>
#include <linux/file.h>
-#include <linux/fdtable.h>
#include <linux/mm.h>
#include <linux/mman.h>
#include <linux/percpu.h>
diff --git a/kernel/bpf/bpf_inode_storage.c b/kernel/bpf/bpf_inode_storage.c
index b0ef45db207c..f8b97d8a874a 100644
--- a/kernel/bpf/bpf_inode_storage.c
+++ b/kernel/bpf/bpf_inode_storage.c
@@ -16,7 +16,6 @@
#include <uapi/linux/btf.h>
#include <linux/bpf_lsm.h>
#include <linux/btf_ids.h>
-#include <linux/fdtable.h>
#include <linux/rcupdate_trace.h>
DEFINE_BPF_STORAGE_CACHE(inode_cache);
diff --git a/kernel/bpf/bpf_task_storage.c b/kernel/bpf/bpf_task_storage.c
index adf6dfe0ba68..1eb9852a9f8e 100644
--- a/kernel/bpf/bpf_task_storage.c
+++ b/kernel/bpf/bpf_task_storage.c
@@ -16,7 +16,6 @@
#include <linux/filter.h>
#include <uapi/linux/btf.h>
#include <linux/btf_ids.h>
-#include <linux/fdtable.h>
#include <linux/rcupdate_trace.h>
DEFINE_BPF_STORAGE_CACHE(task_cache);
diff --git a/kernel/bpf/token.c b/kernel/bpf/token.c
index d6ccf8d00eab..3ea6a7505662 100644
--- a/kernel/bpf/token.c
+++ b/kernel/bpf/token.c
@@ -1,6 +1,5 @@
#include <linux/bpf.h>
#include <linux/vmalloc.h>
-#include <linux/fdtable.h>
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/kernel.h>
diff --git a/kernel/exit.c b/kernel/exit.c
index 7430852a8571..d441193a4537 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -25,7 +25,6 @@
#include <linux/acct.h>
#include <linux/tsacct_kern.h>
#include <linux/file.h>
-#include <linux/fdtable.h>
#include <linux/freezer.h>
#include <linux/binfmts.h>
#include <linux/nsproxy.h>
diff --git a/kernel/module/dups.c b/kernel/module/dups.c
index 9a92f2f8c9d3..bd2149fbe117 100644
--- a/kernel/module/dups.c
+++ b/kernel/module/dups.c
@@ -18,7 +18,6 @@
#include <linux/completion.h>
#include <linux/cred.h>
#include <linux/file.h>
-#include <linux/fdtable.h>
#include <linux/workqueue.h>
#include <linux/security.h>
#include <linux/mount.h>
diff --git a/kernel/module/kmod.c b/kernel/module/kmod.c
index 0800d9891692..25f253812512 100644
--- a/kernel/module/kmod.c
+++ b/kernel/module/kmod.c
@@ -15,7 +15,6 @@
#include <linux/completion.h>
#include <linux/cred.h>
#include <linux/file.h>
-#include <linux/fdtable.h>
#include <linux/workqueue.h>
#include <linux/security.h>
#include <linux/mount.h>
diff --git a/kernel/umh.c b/kernel/umh.c
index ff1f13a27d29..be9234270777 100644
--- a/kernel/umh.c
+++ b/kernel/umh.c
@@ -13,7 +13,6 @@
#include <linux/completion.h>
#include <linux/cred.h>
#include <linux/file.h>
-#include <linux/fdtable.h>
#include <linux/fs_struct.h>
#include <linux/workqueue.h>
#include <linux/security.h>
diff --git a/net/handshake/request.c b/net/handshake/request.c
index 94d5cef3e048..274d2c89b6b2 100644
--- a/net/handshake/request.c
+++ b/net/handshake/request.c
@@ -13,7 +13,6 @@
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/inet.h>
-#include <linux/fdtable.h>
#include <linux/rhashtable.h>
#include <net/sock.h>
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
index 571158ec6188..2bc34dce9a46 100644
--- a/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@ -9,7 +9,6 @@
*/
#include <linux/errno.h>
-#include <linux/fdtable.h>
#include <linux/fs.h>
#include <linux/file.h>
#include <linux/mount.h>
--
2.39.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 03/11] close_files(): don't bother with xchg()
2024-08-12 6:44 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Al Viro
2024-08-12 6:44 ` [PATCH 02/11] remove pointless includes of <linux/fdtable.h> Al Viro
@ 2024-08-12 6:44 ` Al Viro
2024-08-12 7:56 ` [PATCH] close_files(): reimplement based on do_close_on_exec() Mateusz Guzik
2024-08-12 6:44 ` [PATCH 04/11] proc_fd_getattr(): don't bother with S_ISDIR() check Al Viro
` (8 subsequent siblings)
10 siblings, 1 reply; 20+ messages in thread
From: Al Viro @ 2024-08-12 6:44 UTC (permalink / raw)
To: viro; +Cc: brauner, jack, linux-fsdevel
At that point nobody else has references to the victim files_struct;
as the matter of fact, the caller will free it immediately after
close_files() returns, with no RCU delays or anything of that sort.
That's why we are not protecting against fdtable reallocation on
expansion, not cleaning the bitmaps, etc. There's no point
zeroing the pointers in ->fd[] either, let alone make that an
atomic operation.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/file.c b/fs/file.c
index ac9e04e97e4b..313cfb860941 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -428,7 +428,7 @@ static struct fdtable *close_files(struct files_struct * files)
set = fdt->open_fds[j++];
while (set) {
if (set & 1) {
- struct file * file = xchg(&fdt->fd[i], NULL);
+ struct file *file = fdt->fd[i];
if (file) {
filp_close(file, files);
cond_resched();
--
2.39.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH] close_files(): reimplement based on do_close_on_exec()
2024-08-12 6:44 ` [PATCH 03/11] close_files(): don't bother with xchg() Al Viro
@ 2024-08-12 7:56 ` Mateusz Guzik
2024-08-14 5:24 ` Al Viro
0 siblings, 1 reply; 20+ messages in thread
From: Mateusz Guzik @ 2024-08-12 7:56 UTC (permalink / raw)
To: viro; +Cc: brauner, jack, linux-kernel, linux-fsdevel, Mateusz Guzik
While here take more advantage of the fact nobody should be messing with
the table anymore and don't clear the fd slot.
Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
---
how about this instead, I think it's a nicer clean up.
It's literally do_close_on_exec except locking and put fd are deleted.
boots & does not blow up, but admittedly I did not bother with ltp or
any serious testing
fs/file.c | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/fs/file.c b/fs/file.c
index 74d7ad676579..3ff2e8265156 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -389,33 +389,38 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds)
return newf;
}
-static struct fdtable *close_files(struct files_struct * files)
+static struct fdtable *close_files(struct files_struct *files)
{
/*
* It is safe to dereference the fd table without RCU or
* ->file_lock because this is the last reference to the
* files structure.
+ *
+ * For the same reason we can skip locking.
*/
struct fdtable *fdt = rcu_dereference_raw(files->fdt);
- unsigned int i, j = 0;
+ unsigned i;
- for (;;) {
+ for (i = 0; ; i++) {
unsigned long set;
- i = j * BITS_PER_LONG;
- if (i >= fdt->max_fds)
+ unsigned fd = i * BITS_PER_LONG;
+ fdt = files_fdtable(files);
+ if (fd >= fdt->max_fds)
break;
- set = fdt->open_fds[j++];
- while (set) {
- if (set & 1) {
- struct file * file = xchg(&fdt->fd[i], NULL);
- if (file) {
- filp_close(file, files);
- cond_resched();
- }
- }
- i++;
- set >>= 1;
+ set = fdt->open_fds[i];
+ if (!set)
+ continue;
+ for ( ; set ; fd++, set >>= 1) {
+ struct file *file;
+ if (!(set & 1))
+ continue;
+ file = fdt->fd[fd];
+ if (!file)
+ continue;
+ filp_close(file, files);
+ cond_resched();
}
+
}
return fdt;
--
2.43.0
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH] close_files(): reimplement based on do_close_on_exec()
2024-08-12 7:56 ` [PATCH] close_files(): reimplement based on do_close_on_exec() Mateusz Guzik
@ 2024-08-14 5:24 ` Al Viro
2024-08-14 5:34 ` Mateusz Guzik
0 siblings, 1 reply; 20+ messages in thread
From: Al Viro @ 2024-08-14 5:24 UTC (permalink / raw)
To: Mateusz Guzik; +Cc: brauner, jack, linux-kernel, linux-fsdevel
On Mon, Aug 12, 2024 at 09:56:58AM +0200, Mateusz Guzik wrote:
> While here take more advantage of the fact nobody should be messing with
> the table anymore and don't clear the fd slot.
>
> Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
> ---
>
> how about this instead, I think it's a nicer clean up.
> It's literally do_close_on_exec except locking and put fd are deleted.
TBH, I don't see much benefit that way - if anything, you are doing
a bunch of extra READ_ONCE() of the same thing (files->fdt), for no
visible reason...
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] close_files(): reimplement based on do_close_on_exec()
2024-08-14 5:24 ` Al Viro
@ 2024-08-14 5:34 ` Mateusz Guzik
0 siblings, 0 replies; 20+ messages in thread
From: Mateusz Guzik @ 2024-08-14 5:34 UTC (permalink / raw)
To: Al Viro; +Cc: brauner, jack, linux-kernel, linux-fsdevel
On Wed, Aug 14, 2024 at 7:24 AM Al Viro <viro@zeniv.linux.org.uk> wrote:
>
> On Mon, Aug 12, 2024 at 09:56:58AM +0200, Mateusz Guzik wrote:
> > While here take more advantage of the fact nobody should be messing with
> > the table anymore and don't clear the fd slot.
> >
> > Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
> > ---
> >
> > how about this instead, I think it's a nicer clean up.
>
> > It's literally do_close_on_exec except locking and put fd are deleted.
>
> TBH, I don't see much benefit that way - if anything, you are doing
> a bunch of extra READ_ONCE() of the same thing (files->fdt), for no
> visible reason...
I claim the stock code avoidably implements traversal differently from
do_close_on_exec.
The fdt reload can be trivially lifted out of the loop, does not
affect what I was going for.
But now that you mention this can also be done in the do_close_on_exec
case -- the thread calling it is supposed to be the only consumer, so
fdt can't change.
that's my $0,03 here, I'm not going to further argue about it
--
Mateusz Guzik <mjguzik gmail.com>
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 04/11] proc_fd_getattr(): don't bother with S_ISDIR() check
2024-08-12 6:44 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Al Viro
2024-08-12 6:44 ` [PATCH 02/11] remove pointless includes of <linux/fdtable.h> Al Viro
2024-08-12 6:44 ` [PATCH 03/11] close_files(): don't bother with xchg() Al Viro
@ 2024-08-12 6:44 ` Al Viro
2024-08-12 6:44 ` [PATCH 05/11] move close_range(2) into fs/file.c, fold __close_range() into it Al Viro
` (7 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Al Viro @ 2024-08-12 6:44 UTC (permalink / raw)
To: viro; +Cc: brauner, jack, linux-fsdevel
that thing is callable only as ->i_op->getattr() instance and only
for directory inodes (/proc/*/fd and /proc/*/task/*/fd)
Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/proc/fd.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/fs/proc/fd.c b/fs/proc/fd.c
index 077c51ba1ba7..f3c5767db3d4 100644
--- a/fs/proc/fd.c
+++ b/fs/proc/fd.c
@@ -351,18 +351,9 @@ static int proc_fd_getattr(struct mnt_idmap *idmap,
u32 request_mask, unsigned int query_flags)
{
struct inode *inode = d_inode(path->dentry);
- int rv = 0;
generic_fillattr(&nop_mnt_idmap, request_mask, inode, stat);
-
- /* If it's a directory, put the number of open fds there */
- if (S_ISDIR(inode->i_mode)) {
- rv = proc_readfd_count(inode, &stat->size);
- if (rv < 0)
- return rv;
- }
-
- return rv;
+ return proc_readfd_count(inode, &stat->size);
}
const struct inode_operations proc_fd_inode_operations = {
--
2.39.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 05/11] move close_range(2) into fs/file.c, fold __close_range() into it
2024-08-12 6:44 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Al Viro
` (2 preceding siblings ...)
2024-08-12 6:44 ` [PATCH 04/11] proc_fd_getattr(): don't bother with S_ISDIR() check Al Viro
@ 2024-08-12 6:44 ` Al Viro
2024-08-12 6:44 ` [PATCH 06/11] sane_fdtable_size(): don't bother looking at descriptors we are not going to copy Al Viro
` (6 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Al Viro @ 2024-08-12 6:44 UTC (permalink / raw)
To: viro; +Cc: brauner, jack, linux-fsdevel
We never had callers for __close_range() except for close_range(2)
itself. Nothing of that sort has appeared in four years and if any users
do show up, we can always separate those suckers again.
Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/file.c | 6 ++++--
fs/open.c | 17 -----------------
include/linux/fdtable.h | 1 -
3 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/fs/file.c b/fs/file.c
index 313cfb860941..fbcd3da46109 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -728,7 +728,7 @@ static inline void __range_close(struct files_struct *files, unsigned int fd,
}
/**
- * __close_range() - Close all file descriptors in a given range.
+ * sys_close_range() - Close all file descriptors in a given range.
*
* @fd: starting file descriptor to close
* @max_fd: last file descriptor to close
@@ -736,8 +736,10 @@ static inline void __range_close(struct files_struct *files, unsigned int fd,
*
* This closes a range of file descriptors. All file descriptors
* from @fd up to and including @max_fd are closed.
+ * Currently, errors to close a given file descriptor are ignored.
*/
-int __close_range(unsigned fd, unsigned max_fd, unsigned int flags)
+SYSCALL_DEFINE3(close_range, unsigned int, fd, unsigned int, max_fd,
+ unsigned int, flags)
{
struct task_struct *me = current;
struct files_struct *cur_fds = me->files, *fds = NULL;
diff --git a/fs/open.c b/fs/open.c
index 22adbef7ecc2..25443d846d5e 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -1575,23 +1575,6 @@ SYSCALL_DEFINE1(close, unsigned int, fd)
return retval;
}
-/**
- * sys_close_range() - Close all file descriptors in a given range.
- *
- * @fd: starting file descriptor to close
- * @max_fd: last file descriptor to close
- * @flags: reserved for future extensions
- *
- * This closes a range of file descriptors. All file descriptors
- * from @fd up to and including @max_fd are closed.
- * Currently, errors to close a given file descriptor are ignored.
- */
-SYSCALL_DEFINE3(close_range, unsigned int, fd, unsigned int, max_fd,
- unsigned int, flags)
-{
- return __close_range(fd, max_fd, flags);
-}
-
/*
* This routine simulates a hangup on the tty, to arrange that users
* are given clean terminals at login time.
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
index b395a34eebf4..42cadad89f99 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
@@ -109,7 +109,6 @@ int iterate_fd(struct files_struct *, unsigned,
const void *);
extern int close_fd(unsigned int fd);
-extern int __close_range(unsigned int fd, unsigned int max_fd, unsigned int flags);
extern struct file *file_close_fd(unsigned int fd);
extern int unshare_fd(unsigned long unshare_flags, unsigned int max_fds,
struct files_struct **new_fdp);
--
2.39.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 06/11] sane_fdtable_size(): don't bother looking at descriptors we are not going to copy
2024-08-12 6:44 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Al Viro
` (3 preceding siblings ...)
2024-08-12 6:44 ` [PATCH 05/11] move close_range(2) into fs/file.c, fold __close_range() into it Al Viro
@ 2024-08-12 6:44 ` Al Viro
2024-08-12 9:30 ` Christian Brauner
2024-08-12 6:44 ` [PATCH 07/11] fs/file.c: remove sanity_check and add likely/unlikely in alloc_fd() Al Viro
` (5 subsequent siblings)
10 siblings, 1 reply; 20+ messages in thread
From: Al Viro @ 2024-08-12 6:44 UTC (permalink / raw)
To: viro; +Cc: brauner, jack, linux-fsdevel
when given a max_fds argument lower than that current size (that
can happen when called from close_range(..., CLOSE_RANGE_UNSHARE)),
we can ignore all descriptors >= max_fds.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/file.c | 43 +++++++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 20 deletions(-)
diff --git a/fs/file.c b/fs/file.c
index fbcd3da46109..894bd18241b5 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -272,20 +272,6 @@ static inline bool fd_is_open(unsigned int fd, const struct fdtable *fdt)
return test_bit(fd, fdt->open_fds);
}
-static unsigned int count_open_files(struct fdtable *fdt)
-{
- unsigned int size = fdt->max_fds;
- unsigned int i;
-
- /* Find the last open fd */
- for (i = size / BITS_PER_LONG; i > 0; ) {
- if (fdt->open_fds[--i])
- break;
- }
- i = (i + 1) * BITS_PER_LONG;
- return i;
-}
-
/*
* Note that a sane fdtable size always has to be a multiple of
* BITS_PER_LONG, since we have bitmaps that are sized by this.
@@ -297,16 +283,33 @@ static unsigned int count_open_files(struct fdtable *fdt)
*
* Rather than make close_range() have to worry about this,
* just make that BITS_PER_LONG alignment be part of a sane
- * fdtable size. Becuase that's really what it is.
+ * fdtable size. Because that's really what it is.
*/
static unsigned int sane_fdtable_size(struct fdtable *fdt, unsigned int max_fds)
{
- unsigned int count;
+ const unsigned int min_words = BITS_TO_LONGS(NR_OPEN_DEFAULT); // 1
+ unsigned long mask;
+ unsigned int words;
+
+ if (max_fds > fdt->max_fds)
+ max_fds = fdt->max_fds;
+
+ if (max_fds == NR_OPEN_DEFAULT)
+ return NR_OPEN_DEFAULT;
+
+ /*
+ * What follows is a simplified find_last_bit(). There's no point
+ * finding exact last bit, when we are going to round it up anyway.
+ */
+ words = BITS_TO_LONGS(max_fds);
+ mask = BITMAP_LAST_WORD_MASK(max_fds);
+
+ while (words > min_words && !(fdt->open_fds[words - 1] & mask)) {
+ mask = ~0UL;
+ words--;
+ }
- count = count_open_files(fdt);
- if (max_fds < NR_OPEN_DEFAULT)
- max_fds = NR_OPEN_DEFAULT;
- return ALIGN(min(count, max_fds), BITS_PER_LONG);
+ return words * BITS_PER_LONG;
}
/*
--
2.39.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 07/11] fs/file.c: remove sanity_check and add likely/unlikely in alloc_fd()
2024-08-12 6:44 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Al Viro
` (4 preceding siblings ...)
2024-08-12 6:44 ` [PATCH 06/11] sane_fdtable_size(): don't bother looking at descriptors we are not going to copy Al Viro
@ 2024-08-12 6:44 ` Al Viro
2024-08-12 6:44 ` [PATCH 08/11] fs/file.c: conditionally clear full_fds Al Viro
` (4 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Al Viro @ 2024-08-12 6:44 UTC (permalink / raw)
To: viro; +Cc: brauner, jack, linux-fsdevel
From: Yu Ma <yu.ma@intel.com>
alloc_fd() has a sanity check inside to make sure the struct file mapping to the
allocated fd is NULL. Remove this sanity check since it can be assured by
exisitng zero initilization and NULL set when recycling fd. Meanwhile, add
likely/unlikely and expand_file() call avoidance to reduce the work under
file_lock.
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Yu Ma <yu.ma@intel.com>
Link: https://lore.kernel.org/r/20240717145018.3972922-2-yu.ma@intel.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/file.c | 33 ++++++++++++++-------------------
1 file changed, 14 insertions(+), 19 deletions(-)
diff --git a/fs/file.c b/fs/file.c
index 894bd18241b5..e217247006a2 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -514,7 +514,7 @@ static int alloc_fd(unsigned start, unsigned end, unsigned flags)
if (fd < files->next_fd)
fd = files->next_fd;
- if (fd < fdt->max_fds)
+ if (likely(fd < fdt->max_fds))
fd = find_next_fd(fdt, fd);
/*
@@ -522,19 +522,21 @@ static int alloc_fd(unsigned start, unsigned end, unsigned flags)
* will limit the total number of files that can be opened.
*/
error = -EMFILE;
- if (fd >= end)
+ if (unlikely(fd >= end))
goto out;
- error = expand_files(files, fd);
- if (error < 0)
- goto out;
+ if (unlikely(fd >= fdt->max_fds)) {
+ error = expand_files(files, fd);
+ if (error < 0)
+ goto out;
- /*
- * If we needed to expand the fs array we
- * might have blocked - try again.
- */
- if (error)
- goto repeat;
+ /*
+ * If we needed to expand the fs array we
+ * might have blocked - try again.
+ */
+ if (error)
+ goto repeat;
+ }
if (start <= files->next_fd)
files->next_fd = fd + 1;
@@ -545,13 +547,6 @@ static int alloc_fd(unsigned start, unsigned end, unsigned flags)
else
__clear_close_on_exec(fd, fdt);
error = fd;
-#if 1
- /* Sanity check */
- if (rcu_access_pointer(fdt->fd[fd]) != NULL) {
- printk(KERN_WARNING "alloc_fd: slot %d not NULL!\n", fd);
- rcu_assign_pointer(fdt->fd[fd], NULL);
- }
-#endif
out:
spin_unlock(&files->file_lock);
@@ -617,7 +612,7 @@ void fd_install(unsigned int fd, struct file *file)
rcu_read_unlock_sched();
spin_lock(&files->file_lock);
fdt = files_fdtable(files);
- BUG_ON(fdt->fd[fd] != NULL);
+ WARN_ON(fdt->fd[fd] != NULL);
rcu_assign_pointer(fdt->fd[fd], file);
spin_unlock(&files->file_lock);
return;
--
2.39.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 08/11] fs/file.c: conditionally clear full_fds
2024-08-12 6:44 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Al Viro
` (5 preceding siblings ...)
2024-08-12 6:44 ` [PATCH 07/11] fs/file.c: remove sanity_check and add likely/unlikely in alloc_fd() Al Viro
@ 2024-08-12 6:44 ` Al Viro
2024-08-12 6:44 ` [PATCH 09/11] fs/file.c: add fast path in find_next_fd() Al Viro
` (3 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Al Viro @ 2024-08-12 6:44 UTC (permalink / raw)
To: viro; +Cc: brauner, jack, linux-fsdevel
From: Yu Ma <yu.ma@intel.com>
64 bits in open_fds are mapped to a common bit in full_fds_bits. It is very
likely that a bit in full_fds_bits has been cleared before in
__clear_open_fds()'s operation. Check the clear bit in full_fds_bits before
clearing to avoid unnecessary write and cache bouncing. See commit fc90888d07b8
("vfs: conditionally clear close-on-exec flag") for a similar optimization.
take stock kernel with patch 1 as baseline, it improves pts/blogbench-1.1.0
read for 13%, and write for 5% on Intel ICX 160 cores configuration with
v6.10-rc7.
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Yu Ma <yu.ma@intel.com>
Link: https://lore.kernel.org/r/20240717145018.3972922-3-yu.ma@intel.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/file.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/file.c b/fs/file.c
index e217247006a2..0340c811b22a 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -264,7 +264,9 @@ static inline void __set_open_fd(unsigned int fd, struct fdtable *fdt)
static inline void __clear_open_fd(unsigned int fd, struct fdtable *fdt)
{
__clear_bit(fd, fdt->open_fds);
- __clear_bit(fd / BITS_PER_LONG, fdt->full_fds_bits);
+ fd /= BITS_PER_LONG;
+ if (test_bit(fd, fdt->full_fds_bits))
+ __clear_bit(fd, fdt->full_fds_bits);
}
static inline bool fd_is_open(unsigned int fd, const struct fdtable *fdt)
--
2.39.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 09/11] fs/file.c: add fast path in find_next_fd()
2024-08-12 6:44 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Al Viro
` (6 preceding siblings ...)
2024-08-12 6:44 ` [PATCH 08/11] fs/file.c: conditionally clear full_fds Al Viro
@ 2024-08-12 6:44 ` Al Viro
2024-08-12 6:44 ` [PATCH 10/11] alloc_fdtable(): change calling conventions Al Viro
` (2 subsequent siblings)
10 siblings, 0 replies; 20+ messages in thread
From: Al Viro @ 2024-08-12 6:44 UTC (permalink / raw)
To: viro; +Cc: brauner, jack, linux-fsdevel
From: Yu Ma <yu.ma@intel.com>
Skip 2-levels searching via find_next_zero_bit() when there is free slot in the
word contains next_fd, as:
(1) next_fd indicates the lower bound for the first free fd.
(2) There is fast path inside of find_next_zero_bit() when size<=64 to speed up
searching.
(3) After fdt is expanded (the bitmap size doubled for each time of expansion),
it would never be shrunk. The search size increases but there are few open fds
available here.
This fast path is proposed by Mateusz Guzik <mjguzik@gmail.com>, and agreed by
Jan Kara <jack@suse.cz>, which is more generic and scalable than previous
versions. And on top of patch 1 and 2, it improves pts/blogbench-1.1.0 read by
8% and write by 4% on Intel ICX 160 cores configuration with v6.10-rc7.
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Yu Ma <yu.ma@intel.com>
Link: https://lore.kernel.org/r/20240717145018.3972922-4-yu.ma@intel.com
Signed-off-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/file.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/fs/file.c b/fs/file.c
index 0340c811b22a..1ee85e061ade 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -490,6 +490,15 @@ static unsigned int find_next_fd(struct fdtable *fdt, unsigned int start)
unsigned int maxfd = fdt->max_fds; /* always multiple of BITS_PER_LONG */
unsigned int maxbit = maxfd / BITS_PER_LONG;
unsigned int bitbit = start / BITS_PER_LONG;
+ unsigned int bit;
+
+ /*
+ * Try to avoid looking at the second level bitmap
+ */
+ bit = find_next_zero_bit(&fdt->open_fds[bitbit], BITS_PER_LONG,
+ start & (BITS_PER_LONG - 1));
+ if (bit < BITS_PER_LONG)
+ return bit + bitbit * BITS_PER_LONG;
bitbit = find_next_zero_bit(fdt->full_fds_bits, maxbit, bitbit) * BITS_PER_LONG;
if (bitbit >= maxfd)
--
2.39.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* [PATCH 10/11] alloc_fdtable(): change calling conventions.
2024-08-12 6:44 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Al Viro
` (7 preceding siblings ...)
2024-08-12 6:44 ` [PATCH 09/11] fs/file.c: add fast path in find_next_fd() Al Viro
@ 2024-08-12 6:44 ` Al Viro
2024-08-12 9:35 ` Christian Brauner
2024-08-12 6:44 ` [PATCH 11/11] dup_fd(): " Al Viro
2024-08-12 9:24 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Christian Brauner
10 siblings, 1 reply; 20+ messages in thread
From: Al Viro @ 2024-08-12 6:44 UTC (permalink / raw)
To: viro; +Cc: brauner, jack, linux-fsdevel
First of all, tell it how many slots do we want, not which slot
is wanted. It makes one caller (dup_fd()) more straightforward
and doesn't harm another (expand_fdtable()).
Furthermore, make it return ERR_PTR() on failure rather than
returning NULL. Simplifies the callers.
Simplify the size calculation, while we are at it - note that we
always have slots_wanted greater than BITS_PER_LONG. What the
rules boil down to is
* use the smallest power of two large enough to give us
that many slots
* on 32bit skip 64 and 128 - the minimal capacity we want
there is 256 slots (i.e. 1Kb fd array).
* on 64bit don't skip anything, the minimal capacity is
128 - and we'll never be asked for 64 or less. 128 slots means
1Kb fd array, again.
* on 128bit, if that ever happens, don't skip anything -
we'll never be asked for 128 or less, so the fd array allocation
will be at least 2Kb.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/file.c | 58 ++++++++++++++++++-------------------------------------
1 file changed, 19 insertions(+), 39 deletions(-)
diff --git a/fs/file.c b/fs/file.c
index 1ee85e061ade..01cef75ef132 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -89,18 +89,11 @@ static void copy_fdtable(struct fdtable *nfdt, struct fdtable *ofdt)
* 'unsigned long' in some places, but simply because that is how the Linux
* kernel bitmaps are defined to work: they are not "bits in an array of bytes",
* they are very much "bits in an array of unsigned long".
- *
- * The ALIGN(nr, BITS_PER_LONG) here is for clarity: since we just multiplied
- * by that "1024/sizeof(ptr)" before, we already know there are sufficient
- * clear low bits. Clang seems to realize that, gcc ends up being confused.
- *
- * On a 128-bit machine, the ALIGN() would actually matter. In the meantime,
- * let's consider it documentation (and maybe a test-case for gcc to improve
- * its code generation ;)
*/
-static struct fdtable * alloc_fdtable(unsigned int nr)
+static struct fdtable *alloc_fdtable(unsigned int slots_wanted)
{
struct fdtable *fdt;
+ unsigned int nr;
void *data;
/*
@@ -110,20 +103,22 @@ static struct fdtable * alloc_fdtable(unsigned int nr)
* the fdarray into comfortable page-tuned chunks: starting at 1024B
* and growing in powers of two from there on.
*/
- nr /= (1024 / sizeof(struct file *));
- nr = roundup_pow_of_two(nr + 1);
- nr *= (1024 / sizeof(struct file *));
- nr = ALIGN(nr, BITS_PER_LONG);
+ if (IS_ENABLED(CONFIG_32BIT) && slots_wanted < 256)
+ nr = 256;
+ else
+ nr = roundup_pow_of_two(slots_wanted);
/*
* Note that this can drive nr *below* what we had passed if sysctl_nr_open
- * had been set lower between the check in expand_files() and here. Deal
- * with that in caller, it's cheaper that way.
+ * had been set lower between the check in expand_files() and here.
*
* We make sure that nr remains a multiple of BITS_PER_LONG - otherwise
* bitmaps handling below becomes unpleasant, to put it mildly...
*/
- if (unlikely(nr > sysctl_nr_open))
- nr = ((sysctl_nr_open - 1) | (BITS_PER_LONG - 1)) + 1;
+ if (unlikely(nr > sysctl_nr_open)) {
+ nr = round_down(sysctl_nr_open, BITS_PER_LONG);
+ if (nr < slots_wanted)
+ return ERR_PTR(-EMFILE);
+ }
fdt = kmalloc(sizeof(struct fdtable), GFP_KERNEL_ACCOUNT);
if (!fdt)
@@ -152,7 +147,7 @@ static struct fdtable * alloc_fdtable(unsigned int nr)
out_fdt:
kfree(fdt);
out:
- return NULL;
+ return ERR_PTR(-ENOMEM);
}
/*
@@ -169,7 +164,7 @@ static int expand_fdtable(struct files_struct *files, unsigned int nr)
struct fdtable *new_fdt, *cur_fdt;
spin_unlock(&files->file_lock);
- new_fdt = alloc_fdtable(nr);
+ new_fdt = alloc_fdtable(nr + 1);
/* make sure all fd_install() have seen resize_in_progress
* or have finished their rcu_read_lock_sched() section.
@@ -178,16 +173,8 @@ static int expand_fdtable(struct files_struct *files, unsigned int nr)
synchronize_rcu();
spin_lock(&files->file_lock);
- if (!new_fdt)
- return -ENOMEM;
- /*
- * extremely unlikely race - sysctl_nr_open decreased between the check in
- * caller and alloc_fdtable(). Cheaper to catch it here...
- */
- if (unlikely(new_fdt->max_fds <= nr)) {
- __free_fdtable(new_fdt);
- return -EMFILE;
- }
+ if (IS_ERR(new_fdt))
+ return PTR_ERR(new_fdt);
cur_fdt = files_fdtable(files);
BUG_ON(nr < cur_fdt->max_fds);
copy_fdtable(new_fdt, cur_fdt);
@@ -357,16 +344,9 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
if (new_fdt != &newf->fdtab)
__free_fdtable(new_fdt);
- new_fdt = alloc_fdtable(open_files - 1);
- if (!new_fdt) {
- *errorp = -ENOMEM;
- goto out_release;
- }
-
- /* beyond sysctl_nr_open; nothing to do */
- if (unlikely(new_fdt->max_fds < open_files)) {
- __free_fdtable(new_fdt);
- *errorp = -EMFILE;
+ new_fdt = alloc_fdtable(open_files);
+ if (IS_ERR(new_fdt)) {
+ *errorp = PTR_ERR(new_fdt);
goto out_release;
}
--
2.39.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH 10/11] alloc_fdtable(): change calling conventions.
2024-08-12 6:44 ` [PATCH 10/11] alloc_fdtable(): change calling conventions Al Viro
@ 2024-08-12 9:35 ` Christian Brauner
0 siblings, 0 replies; 20+ messages in thread
From: Christian Brauner @ 2024-08-12 9:35 UTC (permalink / raw)
To: Al Viro; +Cc: jack, linux-fsdevel
On Mon, Aug 12, 2024 at 07:44:26AM GMT, Al Viro wrote:
> First of all, tell it how many slots do we want, not which slot
> is wanted. It makes one caller (dup_fd()) more straightforward
> and doesn't harm another (expand_fdtable()).
>
> Furthermore, make it return ERR_PTR() on failure rather than
> returning NULL. Simplifies the callers.
>
> Simplify the size calculation, while we are at it - note that we
> always have slots_wanted greater than BITS_PER_LONG. What the
> rules boil down to is
> * use the smallest power of two large enough to give us
> that many slots
> * on 32bit skip 64 and 128 - the minimal capacity we want
> there is 256 slots (i.e. 1Kb fd array).
> * on 64bit don't skip anything, the minimal capacity is
> 128 - and we'll never be asked for 64 or less. 128 slots means
> 1Kb fd array, again.
> * on 128bit, if that ever happens, don't skip anything -
> we'll never be asked for 128 or less, so the fd array allocation
> will be at least 2Kb.
>
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---
I'd copy the rules from the commit message into the function comment
(Maybe not the 128bits part).
Reviewed-by: Christian Brauner <brauner@kernel.org>
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 11/11] dup_fd(): change calling conventions
2024-08-12 6:44 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Al Viro
` (8 preceding siblings ...)
2024-08-12 6:44 ` [PATCH 10/11] alloc_fdtable(): change calling conventions Al Viro
@ 2024-08-12 6:44 ` Al Viro
2024-08-12 9:32 ` Christian Brauner
2024-08-12 9:24 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Christian Brauner
10 siblings, 1 reply; 20+ messages in thread
From: Al Viro @ 2024-08-12 6:44 UTC (permalink / raw)
To: viro; +Cc: brauner, jack, linux-fsdevel
return ERR_PTR() on failure, get rid of errorp
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/file.c | 14 ++++----------
include/linux/fdtable.h | 2 +-
kernel/fork.c | 26 ++++++++++++--------------
3 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/fs/file.c b/fs/file.c
index 01cef75ef132..b8b5b615d116 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -306,17 +306,16 @@ static unsigned int sane_fdtable_size(struct fdtable *fdt, unsigned int max_fds)
* passed in files structure.
* errorp will be valid only when the returned files_struct is NULL.
*/
-struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int *errorp)
+struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds)
{
struct files_struct *newf;
struct file **old_fds, **new_fds;
unsigned int open_files, i;
struct fdtable *old_fdt, *new_fdt;
- *errorp = -ENOMEM;
newf = kmem_cache_alloc(files_cachep, GFP_KERNEL);
if (!newf)
- goto out;
+ return ERR_PTR(-ENOMEM);
atomic_set(&newf->count, 1);
@@ -346,8 +345,8 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
new_fdt = alloc_fdtable(open_files);
if (IS_ERR(new_fdt)) {
- *errorp = PTR_ERR(new_fdt);
- goto out_release;
+ kmem_cache_free(files_cachep, newf);
+ return ERR_CAST(new_fdt);
}
/*
@@ -388,11 +387,6 @@ struct files_struct *dup_fd(struct files_struct *oldf, unsigned int max_fds, int
rcu_assign_pointer(newf->fdt, new_fdt);
return newf;
-
-out_release:
- kmem_cache_free(files_cachep, newf);
-out:
- return NULL;
}
static struct fdtable *close_files(struct files_struct * files)
diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
index 42cadad89f99..b1a913a17d04 100644
--- a/include/linux/fdtable.h
+++ b/include/linux/fdtable.h
@@ -102,7 +102,7 @@ struct task_struct;
void put_files_struct(struct files_struct *fs);
int unshare_files(void);
-struct files_struct *dup_fd(struct files_struct *, unsigned, int *) __latent_entropy;
+struct files_struct *dup_fd(struct files_struct *, unsigned) __latent_entropy;
void do_close_on_exec(struct files_struct *);
int iterate_fd(struct files_struct *, unsigned,
int (*)(const void *, struct file *, unsigned),
diff --git a/kernel/fork.c b/kernel/fork.c
index cc760491f201..67ab37db6400 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1754,33 +1754,30 @@ static int copy_files(unsigned long clone_flags, struct task_struct *tsk,
int no_files)
{
struct files_struct *oldf, *newf;
- int error = 0;
/*
* A background process may not have any files ...
*/
oldf = current->files;
if (!oldf)
- goto out;
+ return 0;
if (no_files) {
tsk->files = NULL;
- goto out;
+ return 0;
}
if (clone_flags & CLONE_FILES) {
atomic_inc(&oldf->count);
- goto out;
+ return 0;
}
- newf = dup_fd(oldf, NR_OPEN_MAX, &error);
- if (!newf)
- goto out;
+ newf = dup_fd(oldf, NR_OPEN_MAX);
+ if (IS_ERR(newf))
+ return PTR_ERR(newf);
tsk->files = newf;
- error = 0;
-out:
- return error;
+ return 0;
}
static int copy_sighand(unsigned long clone_flags, struct task_struct *tsk)
@@ -3236,13 +3233,14 @@ int unshare_fd(unsigned long unshare_flags, unsigned int max_fds,
struct files_struct **new_fdp)
{
struct files_struct *fd = current->files;
- int error = 0;
if ((unshare_flags & CLONE_FILES) &&
(fd && atomic_read(&fd->count) > 1)) {
- *new_fdp = dup_fd(fd, max_fds, &error);
- if (!*new_fdp)
- return error;
+ *new_fdp = dup_fd(fd, max_fds);
+ if (IS_ERR(*new_fdp)) {
+ *new_fdp = NULL;
+ return PTR_ERR(new_fdp);
+ }
}
return 0;
--
2.39.2
^ permalink raw reply related [flat|nested] 20+ messages in thread* Re: [PATCH 01/11] get rid of ...lookup...fdget_rcu() family
2024-08-12 6:44 ` [PATCH 01/11] get rid of ...lookup...fdget_rcu() family Al Viro
` (9 preceding siblings ...)
2024-08-12 6:44 ` [PATCH 11/11] dup_fd(): " Al Viro
@ 2024-08-12 9:24 ` Christian Brauner
10 siblings, 0 replies; 20+ messages in thread
From: Christian Brauner @ 2024-08-12 9:24 UTC (permalink / raw)
To: Al Viro; +Cc: jack, linux-fsdevel
On Mon, Aug 12, 2024 at 07:44:17AM GMT, Al Viro wrote:
> Once upon a time, predecessors of those used to do file lookup
> without bumping a refcount, provided that caller held rcu_read_lock()
> across the lookup and whatever it wanted to read from the struct
> file found. When struct file allocation switched to SLAB_TYPESAFE_BY_RCU,
> that stopped being feasible and these primitives started to bump the
> file refcount for lookup result, requiring the caller to call fput()
> afterwards.
>
> But that turned them pointless - e.g.
> rcu_read_lock();
> file = lookup_fdget_rcu(fd);
> rcu_read_unlock();
> is equivalent to
> file = fget_raw(fd);
> and all callers of lookup_fdget_rcu() are of that form. Similarly,
> task_lookup_fdget_rcu() calls can be replaced with calling fget_task().
> task_lookup_next_fdget_rcu() doesn't have direct counterparts, but
> its callers would be happier if we replaced it with an analogue that
> deals with RCU internally.
>
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
> ---
Reviewed-by: Christian Brauner <brauner@kernel.org>
^ permalink raw reply [flat|nested] 20+ messages in thread