Skip to contentSkip to conversation

tracefs: Annotate tracefs_ops with __ro_after_init

PATCH Superseded Zubin Mithra 3 participants 3 messages Jul 24, 2018 Tracing

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tracefs: Annotate tracefs_ops with __ro_after_init

tracefs_ops is initialized inside tracefs_create_instance_dir and not modified after. tracefs_create_instance_dir allows for initialization only once, and is called from create_trace_instances(marked __init), which is called from tracer_init_tracefs(marked __init).

---
 fs/tracefs/inode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/tracefs/inode.c +1 -1
index bea8ad876bf9..20e965873f27 100644
@@ -53,7 +53,7 @@ static const struct file_operations tracefs_file_operations = {
 static struct tracefs_dir_ops {
 	int (*mkdir)(const char *name);
 	int (*rmdir)(const char *name);
-} tracefs_ops;
+} tracefs_ops __ro_after_init;
 
 static char *get_dname(struct dentry *dentry)
 {
Signature · 1 line
2.18.0.233.g985f88cf7e-goog
#1 lore raw

Adding Steven (maintainer) and Al (fs) to CC...

Quoted 7 lines · Zubin Mithra

tracefs_ops is initialized inside tracefs_create_instance_dir and not modified after. tracefs_create_instance_dir allows for initialization only once, and is called from create_trace_instances(marked __init), which is called from tracer_init_tracefs(marked __init).

Who's tree should this go through?

Thanks!

-Kees

Quoted 20 lines
---
 fs/tracefs/inode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/tracefs/inode.c +1 -2
index bea8ad876bf9..20e965873f27 100644
@@ -53,7 +53,7 @@ static const struct file_operations tracefs_file_operations = {
 static struct tracefs_dir_ops {
        int (*mkdir)(const char *name);
        int (*rmdir)(const char *name);
-} tracefs_ops;
+} tracefs_ops __ro_after_init;
 
 static char *get_dname(struct dentry *dentry)
 {
--

2.18.0.233.g985f88cf7e-goog

Signature · 2 lines
Kees Cook
Pixel Security
maintainer
#2 lore raw
Quoted 1 line · On Tue, 24 Jul 2018 15:07:18 -0700 Kees Cook <[email protected]> wrote:

Adding Steven (maintainer) and Al (fs) to CC...

Thanks, first I've seen of this.

Quoted 6 lines · Zubin Mithra
Quoted 4 lines

tracefs_ops is initialized inside tracefs_create_instance_dir and not modified after. tracefs_create_instance_dir allows for initialization only once, and is called from create_trace_instances(marked __init), which is called from tracer_init_tracefs(marked __init).

Then, especially with this change, we should mark tracefs_create_instance_dir() as init, as it would fail any other time.

Quoted 5 lines
Quoted 3 lines

Who's tree should this go through?

I can take it or someone else can, and I'll ack it if need be.

-- Steve

Quoted 28 lines

Thanks!

-Kees

Quoted 20 lines
---
 fs/tracefs/inode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/tracefs/inode.c +1 -2
index bea8ad876bf9..20e965873f27 100644
@@ -53,7 +53,7 @@ static const struct file_operations tracefs_file_operations = {
 static struct tracefs_dir_ops {
        int (*mkdir)(const char *name);
        int (*rmdir)(const char *name);
-} tracefs_ops;
+} tracefs_ops __ro_after_init;
 
 static char *get_dname(struct dentry *dentry)
 {
--

2.18.0.233.g985f88cf7e-goog