From: Alexey Dobriyan <adobriyan@gmail.com>
To: akpm@linux-foundation.org, brauner@kernel.org
Cc: Mateusz Guzik <mjguzik@gmail.com>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH] proc: allow to mark /proc files permanent outside of fs/proc/
Date: Wed, 9 Apr 2025 22:20:13 +0300 [thread overview]
Message-ID: <c58291cd-0775-4c90-8443-ba71897b5cbb@p183> (raw)
From 06e2ff406942fef65b9c397a7f44478dd4b61451 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Sat, 5 Apr 2025 14:50:10 +0300
Subject: [PATCH 1/1] proc: allow to mark /proc files permanent outside of
fs/proc/
From: Mateusz Guzik <mjguzik@gmail.com>
Add proc_make_permanent() function to mark PDE as permanent to speed up
open/read/close (one alloc/free and lock/unlock less).
Enable it for built-in code and for compiled-in modules.
This function becomes nop magically in modular code.
Use it on /proc/filesystems to add a user.
Note, note, note!
If built-in code creates and deletes PDEs dynamically (not in init
hook), then proc_make_permanent() must not be used.
It is intended for simple code:
static int __init xxx_module_init(void)
{
g_pde = proc_create_single();
proc_make_permanent(g_pde);
return 0;
}
static void __exit xxx_module_exit(void)
{
remove_proc_entry(g_pde);
}
If module is built-in then exit hook never executed and PDE is
permanent so it is OK to mark it as such.
If module is module then rmmod will yank PDE, but proc_make_permanent()
is nop and core /proc code will do everything right.
[adobriyan@gmail.com: unexport function (usual exporting is a bug)]
[adobriyan@gmail.com: rewrite changelog]
Signed-off-by: Mateusz Guzik <mjguzik@gmail.com>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
fs/filesystems.c | 4 +++-
fs/proc/generic.c | 12 ++++++++++++
fs/proc/internal.h | 3 +++
include/linux/proc_fs.h | 10 ++++++++++
4 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/fs/filesystems.c b/fs/filesystems.c
index 58b9067b2391..81dcd0ddadb6 100644
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
@@ -252,7 +252,9 @@ static int filesystems_proc_show(struct seq_file *m, void *v)
static int __init proc_filesystems_init(void)
{
- proc_create_single("filesystems", 0, NULL, filesystems_proc_show);
+ struct proc_dir_entry *pde =
+ proc_create_single("filesystems", 0, NULL, filesystems_proc_show);
+ proc_make_permanent(pde);
return 0;
}
module_init(proc_filesystems_init);
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index a3e22803cddf..0342600c0172 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -826,3 +826,15 @@ ssize_t proc_simple_write(struct file *f, const char __user *ubuf, size_t size,
kfree(buf);
return ret == 0 ? size : ret;
}
+
+/*
+ * Not exported to modules:
+ * modules' /proc files aren't permanent because modules aren't permanent.
+ */
+void impl_proc_make_permanent(struct proc_dir_entry *pde);
+void impl_proc_make_permanent(struct proc_dir_entry *pde)
+{
+ if (pde) {
+ pde_make_permanent(pde);
+ }
+}
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 96122e91c645..885b1cd38020 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -80,8 +80,11 @@ static inline bool pde_is_permanent(const struct proc_dir_entry *pde)
return pde->flags & PROC_ENTRY_PERMANENT;
}
+/* This is for builtin code, not even for modules which are compiled in. */
static inline void pde_make_permanent(struct proc_dir_entry *pde)
{
+ /* Ensure magic flag does something. */
+ static_assert(PROC_ENTRY_PERMANENT != 0);
pde->flags |= PROC_ENTRY_PERMANENT;
}
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index ea62201c74c4..2d59f29b49eb 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -247,4 +247,14 @@ static inline struct pid_namespace *proc_pid_ns(struct super_block *sb)
bool proc_ns_file(const struct file *file);
+static inline void proc_make_permanent(struct proc_dir_entry *pde)
+{
+ /* Don't give matches to modules. */
+#if defined CONFIG_PROC_FS && !defined MODULE
+ /* This mess is created by defining "struct proc_dir_entry" elsewhere. */
+ void impl_proc_make_permanent(struct proc_dir_entry *pde);
+ impl_proc_make_permanent(pde);
+#endif
+}
+
#endif /* _LINUX_PROC_FS_H */
--
2.47.0
next reply other threads:[~2025-04-09 19:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-09 19:20 Alexey Dobriyan [this message]
2025-04-09 20:27 ` Mateusz Guzik
2025-04-09 21:35 ` Andrew Morton
2025-04-09 22:04 ` Mateusz Guzik
2025-05-07 9:48 ` Alexey Dobriyan
2025-09-17 3:44 ` Mateusz Guzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c58291cd-0775-4c90-8443-ba71897b5cbb@p183 \
--to=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=brauner@kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mjguzik@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®