module: Remove obsolete create_module(2) and query_module(2)

PATCH New Xiao Yang 2 participants 3 messages Sep 28, 2018 – Oct 1, 2018

Share & tools

Xiao Yang

author

2018-09-28 08:52 UTC #0 lore raw

PATCH 1/2 module: Remove obsolete create_module(2) and query_module(2)

From manpage, create_module(2) or query_module(2) is only present on Linux up until 2.4 and is removed in Linux 2.6, so we remove these obsolete syscalls.

Fix: #380

Signed-off-by Xiao Yang <[email protected]>

---
 include/lapi/syscalls/i386.in                      |   2 -
 include/lapi/syscalls/powerpc.in                   |   2 -
 include/lapi/syscalls/powerpc64.in                 |   2 -
 include/lapi/syscalls/s390.in                      |   2 -
 include/lapi/syscalls/s390x.in                     |   2 -
 include/lapi/syscalls/sh.in                        |   2 -
 include/lapi/syscalls/sparc.in                     |   2 -
 include/lapi/syscalls/sparc64.in                   |   2 -
 include/lapi/syscalls/x86_64.in                    |   2 -
 testcases/kernel/module/README                     |   3 -
 testcases/kernel/module/create_module/Makefile     |  36 --
 .../kernel/module/create_module/create_module01.c  | 162 ---------
 .../kernel/module/create_module/create_module02.c  | 279 ---------------
 testcases/kernel/module/query_module/Makefile      |  49 ---
 .../kernel/module/query_module/dummy_query_mod.c   |  53 ---
 .../module/query_module/dummy_query_mod_dep.c      |  52 ---
 .../kernel/module/query_module/query_module01.c    | 373 ---------------------
 .../kernel/module/query_module/query_module02.c    | 205 -----------
 .../kernel/module/query_module/query_module03.c    | 272 ---------------
 19 files changed, 1502 deletions(-)
 delete mode 100644 testcases/kernel/module/README
 delete mode 100644 testcases/kernel/module/create_module/Makefile
 delete mode 100644 testcases/kernel/module/create_module/create_module01.c
 delete mode 100644 testcases/kernel/module/create_module/create_module02.c
 delete mode 100644 testcases/kernel/module/query_module/Makefile
 delete mode 100644 testcases/kernel/module/query_module/dummy_query_mod.c
 delete mode 100644 testcases/kernel/module/query_module/dummy_query_mod_dep.c
 delete mode 100644 testcases/kernel/module/query_module/query_module01.c
 delete mode 100644 testcases/kernel/module/query_module/query_module02.c
 delete mode 100644 testcases/kernel/module/query_module/query_module03.c

include/lapi/syscalls/i386.in +0 -2

index a000564..5d7bc11 100644
@@ -125,7 +125,6 @@ modify_ldt 123
 adjtimex 124
 mprotect 125
 sigprocmask 126
-create_module 127
 init_module 128
 delete_module 129
 get_kernel_syms 130

@@ -163,7 +162,6 @@ mremap 163
 setresuid 164
 getresuid 165
 vm86 166
-query_module 167
 poll 168
 nfsservctl 169
 setresgid 170

include/lapi/syscalls/powerpc.in +0 -2

index c0b4226..79d8f58 100644
@@ -125,7 +125,6 @@ modify_ldt 123
 adjtimex 124
 mprotect 125
 sigprocmask 126
-create_module 127
 init_module 128
 delete_module 129
 get_kernel_syms 130

@@ -162,7 +161,6 @@ nanosleep 162
 mremap 163
 setresuid 164
 getresuid 165
-query_module 166
 poll 167
 nfsservctl 168
 setresgid 169

include/lapi/syscalls/powerpc64.in +0 -2

index c0b4226..79d8f58 100644
@@ -125,7 +125,6 @@ modify_ldt 123
 adjtimex 124
 mprotect 125
 sigprocmask 126
-create_module 127
 init_module 128
 delete_module 129
 get_kernel_syms 130

@@ -162,7 +161,6 @@ nanosleep 162
 mremap 163
 setresuid 164
 getresuid 165
-query_module 166
 poll 167
 nfsservctl 168
 setresgid 169

include/lapi/syscalls/s390.in +0 -2

index 47a04de..203cbe6 100644
@@ -89,7 +89,6 @@ uname 122
 adjtimex 124
 mprotect 125
 sigprocmask 126
-create_module 127
 init_module 128
 delete_module 129
 get_kernel_syms 130

@@ -122,7 +121,6 @@ sched_get_priority_min 160
 sched_rr_get_interval 161
 nanosleep 162
 mremap 163
-query_module 167
 poll 168
 nfsservctl 169
 prctl 172

include/lapi/syscalls/s390x.in +0 -2

index 83732ff..914d94f 100644
@@ -89,7 +89,6 @@ uname 122
 adjtimex 124
 mprotect 125
 sigprocmask 126
-create_module 127
 init_module 128
 delete_module 129
 get_kernel_syms 130

@@ -122,7 +121,6 @@ sched_get_priority_min 160
 sched_rr_get_interval 161
 nanosleep 162
 mremap 163
-query_module 167
 poll 168
 nfsservctl 169
 prctl 172

include/lapi/syscalls/sh.in +0 -2

index 407be7a..e1de98c 100644
@@ -125,7 +125,6 @@ cacheflush 123
 adjtimex 124
 mprotect 125
 sigprocmask 126
-create_module 127
 init_module 128
 delete_module 129
 get_kernel_syms 130

@@ -163,7 +162,6 @@ mremap 163
 setresuid 164
 getresuid 165
 vm86 166
-query_module 167
 poll 168
 nfsservctl 169
 setresgid 170

include/lapi/syscalls/sparc.in +0 -2

index 2b06a79..06533d6 100644
@@ -186,7 +186,6 @@ flistxattr 180
 removexattr 181
 lremovexattr 182
 sigpending 183
-query_module 184
 setpgid 185
 fremovexattr 186
 tkill 187

@@ -223,7 +222,6 @@ clone 217
 ioprio_get 218
 adjtimex 219
 sigprocmask 220
-create_module 221
 delete_module 222
 get_kernel_syms 223
 getpgid 224

include/lapi/syscalls/sparc64.in +0 -2

index 8c8a866..ce66c05 100644
@@ -164,7 +164,6 @@ flistxattr 180
 removexattr 181
 lremovexattr 182
 sigpending 183
-query_module 184
 setpgid 185
 fremovexattr 186
 tkill 187

@@ -201,7 +200,6 @@ clone 217
 ioprio_get 218
 adjtimex 219
 sigprocmask 220
-create_module 221
 delete_module 222
 get_kernel_syms 223
 getpgid 224

include/lapi/syscalls/x86_64.in +0 -2

index 4ce8477..1726f84 100644
@@ -172,11 +172,9 @@ sethostname 170
 setdomainname 171
 iopl 172
 ioperm 173
-create_module 174
 init_module 175
 delete_module 176
 get_kernel_syms 177
-query_module 178
 quotactl 179
 nfsservctl 180
 getpmsg 181

testcases/kernel/module/README deleted +0 -3

deleted file mode 100644
index 95938a0..0000000
@@ -1,3 +0,0 @@
-Many of these tests have requirements on the test machine.  To ensure proper
-build and execution, the kernel must be build on the test machine and you
-must also do a 'make modules' and 'make modules_install'.

testcases/kernel/module/create_module/Makefile deleted +0 ~~-36~~

deleted file mode 100644
index af2c873..0000000
@@ -1,36 +0,0 @@
-#
-#  Copyright (c) International Business Machines  Corp., 2001
-#
-#  This program is free software;  you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY;  without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-#  the GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program;  if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-#
-
-###########################################################################
-# name of file	: Makefile						  #
-###########################################################################
-CFLAGS+=	-Wall -O -g -I../../../../include
-LOADLIBES+=	-L../../../../lib -lltp
-
-SRCS=$(wildcard *.c)
-TARGETS=$(patsubst %.c,%,$(SRCS))
-
-all: $(TARGETS)
-
-install:
-	@set -e; for i in $(TARGETS); do ln -f $$i ../../../bin/$$i ; done
-
-clean:
-	rm -f $(TARGETS)
-
-

testcases/kernel/module/create_module/create_module01.c deleted +0 ~~-162~~

162 lines not on this page · raw message

testcases/kernel/module/create_module/create_module02.c deleted +0 ~~-279~~

279 lines not on this page · raw message

testcases/kernel/module/query_module/Makefile deleted +0 ~~-49~~

49 lines not on this page · raw message

testcases/kernel/module/query_module/dummy_query_mod.c deleted +0 ~~-53~~

53 lines not on this page · raw message

testcases/kernel/module/query_module/dummy_query_mod_dep.c deleted +0 ~~-52~~

52 lines not on this page · raw message

testcases/kernel/module/query_module/query_module01.c deleted +0 ~~-373~~

373 lines not on this page · raw message

testcases/kernel/module/query_module/query_module02.c deleted +0 ~~-205~~

205 lines not on this page · raw message

testcases/kernel/module/query_module/query_module03.c deleted +0 ~~-272~~

272 lines not on this page · raw message

Signature · 1 line

1.8.3.1

Xiao Yang

author

2018-09-28 08:52 UTC #1 lore raw

PATCH 2/2 delete_module*: Cleanup && Move to kernel/syscalls

1) Convert to new API && Cleanup
2) Move delete_module* tests to kernel/syscalls

Fix: #380

Signed-off-by Xiao Yang <[email protected]>

---
 runtest/modules                                    |   5 -
 runtest/syscalls                                   |   4 +
 scenario_groups/default                            |   1 -
 testcases/kernel/Makefile                          |   1 -
 testcases/kernel/module/Makefile                   |  30 ----
 testcases/kernel/module/delete_module/.gitignore   |   5 -
 testcases/kernel/module/delete_module/Makefile     |  40 ------
 .../kernel/module/delete_module/delete_module01.c  |  89 ------------
 .../kernel/module/delete_module/delete_module02.c  | 155 ---------------------
 .../kernel/module/delete_module/delete_module03.c  | 118 ----------------
 .../kernel/module/delete_module/dummy_del_mod.c    |  64 ---------
 .../module/delete_module/dummy_del_mod_dep.c       |  56 --------
 testcases/kernel/syscalls/delete_module/.gitignore |   5 +
 testcases/kernel/syscalls/delete_module/Makefile   |  25 ++++
 .../syscalls/delete_module/delete_module01.c       |  54 +++++++
 .../syscalls/delete_module/delete_module02.c       |  96 +++++++++++++
 .../syscalls/delete_module/delete_module03.c       |  78 +++++++++++
 .../kernel/syscalls/delete_module/dummy_del_mod.c  |  41 ++++++
 .../syscalls/delete_module/dummy_del_mod_dep.c     |  37 +++++
 19 files changed, 340 insertions(+), 564 deletions(-)
 delete mode 100644 runtest/modules
 delete mode 100644 testcases/kernel/module/Makefile
 delete mode 100644 testcases/kernel/module/delete_module/.gitignore
 delete mode 100644 testcases/kernel/module/delete_module/Makefile
 delete mode 100644 testcases/kernel/module/delete_module/delete_module01.c
 delete mode 100644 testcases/kernel/module/delete_module/delete_module02.c
 delete mode 100644 testcases/kernel/module/delete_module/delete_module03.c
 delete mode 100644 testcases/kernel/module/delete_module/dummy_del_mod.c
 delete mode 100644 testcases/kernel/module/delete_module/dummy_del_mod_dep.c
 create mode 100644 testcases/kernel/syscalls/delete_module/.gitignore
 create mode 100644 testcases/kernel/syscalls/delete_module/Makefile
 create mode 100644 testcases/kernel/syscalls/delete_module/delete_module01.c
 create mode 100644 testcases/kernel/syscalls/delete_module/delete_module02.c
 create mode 100644 testcases/kernel/syscalls/delete_module/delete_module03.c
 create mode 100644 testcases/kernel/syscalls/delete_module/dummy_del_mod.c
 create mode 100644 testcases/kernel/syscalls/delete_module/dummy_del_mod_dep.c

runtest/modules deleted +0 -5

deleted file mode 100644
index 0f1ba52..0000000
@@ -1,5 +0,0 @@
-#DESCRIPTION:2.6.x kernel module tests
-delete_module01 delete_module01
-delete_module02 delete_module02
-delete_module03 delete_module03
-

runtest/syscalls +4 -0

index 0d0be77..2416f80 100644
@@ -105,6 +105,10 @@ creat06 creat06
 creat07 creat07
 creat08 creat08
 
+delete_module01 delete_module01
+delete_module02 delete_module02
+delete_module03 delete_module03
+
 dup01 dup01
 dup02 dup02
 dup03 dup03

scenario_groups/default +0 -1

index 5658a61..9d7d3c3 100644
@@ -25,7 +25,6 @@ hugetlb
 commands
 hyperthreading
 kernel_misc
-modules
 fs_ext4
 pipes
 can

testcases/kernel/Makefile +0 -1

index 5acc9b8..39d79c7 100644
@@ -54,7 +54,6 @@ SUBDIRS			+= connectors \
 			   security \
 			   timers \
 			   tracing \
-			   module \
 
 ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes)
 SUBDIRS			+= power_management

testcases/kernel/module/Makefile deleted +0 ~~-30~~

deleted file mode 100644
index cc2a0e0..0000000
@@ -1,30 +0,0 @@
-#
-#    kernel/module test suite Makefile.
-#
-#    Copyright (C) 2009, Cisco Systems Inc.
-#
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License along
-#    with this program; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Ngie Cooper, July 2009
-#
-
-top_srcdir	?= ../../..
-
-include $(top_srcdir)/include/mk/env_pre.mk
-
-# Only delete_module works at this time...
-SUBDIRS		:= delete_module
-
-include $(top_srcdir)/include/mk/generic_trunk_target.mk

testcases/kernel/module/delete_module/.gitignore deleted +0 -5

deleted file mode 100644
index 8ffd425..0000000
@@ -1,5 +0,0 @@
-/delete_module01
-/delete_module02
-/delete_module03
-/dummy_del_mod.ko
-/dummy_del_mod_dep.ko

testcases/kernel/module/delete_module/Makefile deleted +0 ~~-40~~

deleted file mode 100644
index 95693b1..0000000
@@ -1,40 +0,0 @@
-#
-# Copyright (c) Wipro Technologies Ltd, 2002.  All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-###########################################################################
-# name of file		 : Makefile		 		 	  #
-# description		 : make file for the delete_module(2) testcases	  #
-###########################################################################
-
-ifneq ($(KERNELRELEASE),)
-
-obj-m := dummy_del_mod.o dummy_del_mod_dep.o
-
-else
-
-top_srcdir		?= ../../../..
-
-include $(top_srcdir)/include/mk/testcases.mk
-
-REQ_VERSION_MAJOR	:= 2
-REQ_VERSION_PATCH	:= 6
-
-MAKE_TARGETS		:= delete_module01 delete_module02 delete_module03 \
-			   dummy_del_mod.ko dummy_del_mod_dep.ko
-
-include $(top_srcdir)/include/mk/module.mk
-include $(top_srcdir)/include/mk/generic_leaf_target.mk
-
-endif

testcases/kernel/module/delete_module/delete_module01.c deleted +0 ~~-89~~

89 lines not on this page · raw message

testcases/kernel/module/delete_module/delete_module02.c deleted +0 ~~-155~~

155 lines not on this page · raw message

testcases/kernel/module/delete_module/delete_module03.c deleted +0 ~~-118~~

118 lines not on this page · raw message

testcases/kernel/module/delete_module/dummy_del_mod.c deleted +0 ~~-64~~

64 lines not on this page · raw message

testcases/kernel/module/delete_module/dummy_del_mod_dep.c deleted +0 ~~-56~~

56 lines not on this page · raw message

testcases/kernel/syscalls/delete_module/.gitignore new file +5 -0

new file mode 100644
index 0000000..8ffd425
@@ -0,0 +1,5 @@
+/delete_module01
+/delete_module02
+/delete_module03
+/dummy_del_mod.ko
+/dummy_del_mod_dep.ko

testcases/kernel/syscalls/delete_module/Makefile new file +25 -0

new file mode 100644
index 0000000..b98dcd3
@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) Wipro Technologies Ltd, 2002.  All Rights Reserved.
+# Copyright (c) 2018 Xiao Yang <[email protected]>
+#
+
+ifneq ($(KERNELRELEASE),)
+
+obj-m := dummy_del_mod.o dummy_del_mod_dep.o
+
+else
+
+top_srcdir		?= ../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+
+REQ_VERSION_MAJOR	:= 2
+REQ_VERSION_PATCH	:= 6
+
+MAKE_TARGETS		:= delete_module01 delete_module02 delete_module03 \
+			   dummy_del_mod.ko dummy_del_mod_dep.ko
+
+include $(top_srcdir)/include/mk/module.mk
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
+
+endif

testcases/kernel/syscalls/delete_module/delete_module01.c new file +54 -0

54 lines not on this page · raw message

testcases/kernel/syscalls/delete_module/delete_module02.c new file +96 -0

96 lines not on this page · raw message

testcases/kernel/syscalls/delete_module/delete_module03.c new file +78 -0

78 lines not on this page · raw message

testcases/kernel/syscalls/delete_module/dummy_del_mod.c new file +41 -0

41 lines not on this page · raw message

testcases/kernel/syscalls/delete_module/dummy_del_mod_dep.c new file +37 -0

new file mode 100644
index 0000000..85b3279
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) Wipro Technologies Ltd, 2002.  All Rights Reserved.
+ * Copyright (c) 2018 Xiao Yang <[email protected]>
+ */
+/*
+ * Description:
+ * This is a kernel loadable module programme used by delete_module03
+ * testcase which inserts this module as part of setup. This module
+ * has dependency on dummy_del_mod module (calls function of dummy_del_mod
+ * during initialization).
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/proc_fs.h>
+#include <linux/kernel.h>
+
+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);
+	dummy_func_test();
+	return 0;
+}
+
+static void __exit dummy_exit(void)
+{
+	remove_proc_entry("dummy_dep", 0);
+}
+
+module_init(dummy_init);
+module_exit(dummy_exit);
+MODULE_LICENSE("GPL");

Signature · 1 line

1.8.3.1

Cyril Hrubis

2018-10-01 14:38 UTC #2 lore raw

PATCH 1/2 module: Remove obsolete create_module(2) and query_module(2)

In reply to Xiao Yang

Hi!
Both pushed, thanks.

Signature · 2 lines

Cyril Hrubis
[email protected]