syscalls/<delete, init, finit>_module: Rename /proc/dummy to module specific path name
PATCH 1/1 syscalls/<delete, init, finit>_module: Rename /proc/dummy to module specific path name
In reply to a message not in the archiveTests in syscalls/delete_module/, syscalls/init_module and syscalls/finit_module use kernel modules all of which create a /proc/dummy node. When these tests run in parralel, there appears to be a situation where these tests simulatenously tries to create /proc/dummy node. This generates a kernel warning "proc_dir_entry '/proc/dummy' already registered".
This patch renames the /proc/dummy node to module specific name in order to avoid the conflict.
--- testcases/kernel/syscalls/delete_module/dummy_del_mod.c | 6 ++++-- testcases/kernel/syscalls/delete_module/dummy_del_mod_dep.c | 6 ++++-- testcases/kernel/syscalls/finit_module/finit_module.c | 6 ++++-- testcases/kernel/syscalls/init_module/init_module.c | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-)
testcases/kernel/syscalls/delete_module/dummy_del_mod.c +4 -2
@@ -14,6 +14,8 @@#include <linux/proc_fs.h> #include <linux/kernel.h> +#define DIRNAME "dummy_delmod" +/* Dummy function called by dependent module */ int dummy_func_test (void ) {
@@ -25,13 +27,13 @@ static int __init dummy_init(void) {struct proc_dir_entry *proc_dummy; - proc_dummy =proc_mkdir ("dummy" ,0 ); + proc_dummy =proc_mkdir (DIRNAME ,0 );return 0 ; } static void __exit dummy_exit(void) { -remove_proc_entry ("dummy" ,0 ); +remove_proc_entry (DIRNAME ,0 ); }module_init (dummy_init);
testcases/kernel/syscalls/delete_module/dummy_del_mod_dep.c +4 -2
@@ -16,20 +16,22 @@#include <linux/proc_fs.h> #include <linux/kernel.h> +#define DIRNAME "dummy_dep" +extern int dummy_func_test (void );static int __init dummy_init (void ) {struct proc_dir_entry *proc_dummy; - proc_dummy =proc_mkdir ("dummy_dep" ,0 ); + proc_dummy =proc_mkdir (DIRNAME ,0 );dummy_func_test ();return 0 ; } static void __exit dummy_exit(void) { -remove_proc_entry ("dummy_dep" ,0 ); +remove_proc_entry (DIRNAME ,0 ); }module_init (dummy_init);
testcases/kernel/syscalls/finit_module/finit_module.c +4 -2
@@ -13,6 +13,8 @@#include <linux/proc_fs.h> #include <linux/kernel.h> +#define DIRNAME "dummy_finit" +static char status[20 ];module_param_string (status, status,20 ,0444 );
@@ -23,14 +25,14 @@ static int dummy_init(void)if (!strcmp (status,"invalid" ))return -EINVAL ; - proc_dummy =proc_mkdir ("dummy" ,0 ); + proc_dummy =proc_mkdir (DIRNAME ,0 );return 0 ; }module_init (dummy_init);static void dummy_exit (void ) { -remove_proc_entry ("dummy" ,0 ); +remove_proc_entry (DIRNAME ,0 ); }module_exit (dummy_exit);
testcases/kernel/syscalls/init_module/init_module.c +4 -2
@@ -13,6 +13,8 @@#include <linux/proc_fs.h> #include <linux/kernel.h> +#define DIRNAME "dummy_init" +static char status[20 ];module_param_string (status, status,20 ,0444 );
@@ -23,14 +25,14 @@ static int dummy_init(void)if (!strcmp (status,"invalid" ))return -EINVAL ; - proc_dummy =proc_mkdir ("dummy" ,0 ); + proc_dummy =proc_mkdir (DIRNAME ,0 );return 0 ; }module_init (dummy_init);static void dummy_exit (void ) { -remove_proc_entry ("dummy" ,0 ); +remove_proc_entry (DIRNAME ,0 ); }module_exit (dummy_exit);
Signature · 5 lines
2.43.5 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 10 lines · Nirjhar Roy
Tests in syscalls/delete_module/, syscalls/init_module and syscalls/finit_module use kernel
modules all of which create a/proc/dummynode. When these tests run in parralel, there appears
to be a situation where these tests simulatenously tries to create/proc/dummynode. This generates
a kernel warning "proc_dir_entry'/proc/dummy' already registered". This patch renames the/proc/dummynode to module specific name in order to avoid the conflict.
Quoted 2 lines
Signed-off-by Nirjhar Roy <[email protected]>
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi,
Quoted 123 lines · On Monday, September 9, 2024 6:42:34 AM GMT+2 Nirjhar Roy wrote:
Tests in syscalls/delete_module/, syscalls/init_module and syscalls/finit_module use kernel modules all of which create a
/proc/dummynode. When these tests run in parralel, there appears to be a situation where these tests simulatenously tries to create/proc/dummynode. This generates a kernel warning "proc_dir_entry'/proc/dummy' already registered".
This patch renames the/proc/dummynode to module specific name in order to avoid the conflict.Signed-off-by Nirjhar Roy <[email protected]>--- testcases/kernel/syscalls/delete_module/dummy_del_mod.c | 6 ++++-- testcases/kernel/syscalls/delete_module/dummy_del_mod_dep.c | 6 ++++-- testcases/kernel/syscalls/finit_module/finit_module.c | 6 ++++-- testcases/kernel/syscalls/init_module/init_module.c | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-)testcases/kernel/syscalls/delete_module/dummy_del_mod.c +4
-2@@ -14,6 +14,8 @@#include <linux/proc_fs.h> #include <linux/kernel.h> +#define DIRNAME "dummy_delmod" +/* Dummy function called by dependent module */ int dummy_func_test (void ) {@@ -25,13 +27,13 @@ static int __init dummy_init(void) {struct proc_dir_entry *proc_dummy; - proc_dummy =proc_mkdir ("dummy" ,0 ); + proc_dummy =proc_mkdir (DIRNAME ,0 );return 0 ; } static void __exit dummy_exit(void) { -remove_proc_entry ("dummy" ,0 ); +remove_proc_entry (DIRNAME ,0 ); }module_init (dummy_init);testcases/kernel/syscalls/delete_module/dummy_del_mod_dep.c +4
-2@@ -16,20 +16,22 @@#include <linux/proc_fs.h> #include <linux/kernel.h> +#define DIRNAME "dummy_dep" +extern int dummy_func_test (void );static int __init dummy_init (void ) {struct proc_dir_entry *proc_dummy; - proc_dummy =proc_mkdir ("dummy_dep" ,0 ); + proc_dummy =proc_mkdir (DIRNAME ,0 );dummy_func_test ();return 0 ; } static void __exit dummy_exit(void) { -remove_proc_entry ("dummy_dep" ,0 ); +remove_proc_entry (DIRNAME ,0 ); }module_init (dummy_init);testcases/kernel/syscalls/finit_module/finit_module.c +4
-2@@ -13,6 +13,8 @@#include <linux/proc_fs.h> #include <linux/kernel.h> +#define DIRNAME "dummy_finit" +static char status[20 ];module_param_string (status, status,20 ,0444 );@@ -23,14 +25,14 @@ static int dummy_init(void)if (!strcmp (status,"invalid" ))return -EINVAL ; - proc_dummy =proc_mkdir ("dummy" ,0 ); + proc_dummy =proc_mkdir (DIRNAME ,0 );return 0 ; }module_init (dummy_init);static void dummy_exit (void ) { -remove_proc_entry ("dummy" ,0 ); +remove_proc_entry (DIRNAME ,0 ); }module_exit (dummy_exit);testcases/kernel/syscalls/init_module/init_module.c +3
-1@@ -13,6 +13,8 @@#include <linux/proc_fs.h> #include <linux/kernel.h> +#define DIRNAME "dummy_init" +static char status[20 ];module_param_string (status, status,20 ,0444 );@@ -23,14 +25,14 @@ static int dummy_init(void)if (!strcmp (status,"invalid" ))return -EINVAL ; - proc_dummy =proc_mkdir ("dummy" ,0 ); + proc_dummy =proc_mkdir (DIRNAME ,0 );return 0 ;
testcases/kernel/syscalls/init_module/init_module.c static int dummy_init(void) · line 38
Quoted 10 lines
testcases/kernel/syscalls/init_module/init_module.c +1
-1}module_init (dummy_init);static void dummy_exit (void ) { -remove_proc_entry ("dummy" ,0 ); +remove_proc_entry (DIRNAME ,0 ); }module_exit (dummy_exit);
Regards,
Avinesh
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
Applied, thanks.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp