mm,kmemleak-test.c: move kmemleak-test.c to samples dir

kmemleak-test.c is just a kmemleak test module, which also can not be used
as a built-in kernel module.  Thus, i think it may should not be in mm
dir, and move the kmemleak-test.c to samples/kmemleak/kmemleak-test.c.
Fix the spelling of built-in by the way.

Signed-off-by: Hui Su <sh_def@163.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Rob Herring <robh@kernel.org>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: Divya Indi <divya.indi@oracle.com>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: David Howells <dhowells@redhat.com>
Link: https://lkml.kernel.org/r/20200925183729.GA172837@rlk
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/Documentation/dev-tools/kmemleak.rst b/Documentation/dev-tools/kmemleak.rst
index a41a2d238af233d2802bae7fbc144ec3f96fa04a..1c935f41cd3a25b4a5c6270cc6b2c40dd1ade231 100644 (file)
--- a/Documentation/dev-tools/kmemleak.rst
+++ b/Documentation/dev-tools/kmemleak.rst
@@ -229,7 +229,7 @@ Testing with kmemleak-test
 
 To check if you have all set up to use kmemleak, you can use the kmemleak-test
 module, a module that deliberately leaks memory. Set CONFIG_DEBUG_KMEMLEAK_TEST
-as module (it can't be used as bult-in) and boot the kernel with kmemleak
+as module (it can't be used as built-in) and boot the kernel with kmemleak
 enabled. Load the module and perform a scan with::
 
         # modprobe kmemleak-test

diff --git a/MAINTAINERS b/MAINTAINERS
index 71291bb26a071c0f85378c768eed302dc0d9aa05..42f1230d1addbecf8eb90695638199b19ec0188c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9727,8 +9727,8 @@ M:        Catalin Marinas <catalin.marinas@arm.com>
 S:     Maintained
 F:     Documentation/dev-tools/kmemleak.rst
 F:     include/linux/kmemleak.h
-F:     mm/kmemleak-test.c
 F:     mm/kmemleak.c
+F:     samples/kmemleak/kmemleak-test.c
 
 KMOD KERNEL MODULE LOADER - USERMODE HELPER
 M:     Luis Chamberlain <mcgrof@kernel.org>

diff --git a/mm/Makefile b/mm/Makefile
index d5649f1c12c019a57a2f155919c0a1e97259b402..d73aed0fc99c1d408090c8175f482bbd24a6f2a9 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -94,7 +94,6 @@ obj-$(CONFIG_GUP_BENCHMARK) += gup_benchmark.o
 obj-$(CONFIG_MEMORY_FAILURE) += memory-failure.o
 obj-$(CONFIG_HWPOISON_INJECT) += hwpoison-inject.o
 obj-$(CONFIG_DEBUG_KMEMLEAK) += kmemleak.o
-obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak-test.o
 obj-$(CONFIG_DEBUG_RODATA_TEST) += rodata_test.o
 obj-$(CONFIG_DEBUG_VM_PGTABLE) += debug_vm_pgtable.o
 obj-$(CONFIG_PAGE_OWNER) += page_owner.o

diff --git a/mm/kmemleak-test.c b/mm/kmemleak-test.c
deleted file mode 100644 (file)
index e19279f..0000000
--- a/mm/kmemleak-test.c
+++ /dev/null
@@ -1,99 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * mm/kmemleak-test.c
- *
- * Copyright (C) 2008 ARM Limited
- * Written by Catalin Marinas <catalin.marinas@arm.com>
- */
-
-#define pr_fmt(fmt) "kmemleak: " fmt
-
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#include <linux/list.h>
-#include <linux/percpu.h>
-#include <linux/fdtable.h>
-
-#include <linux/kmemleak.h>
-
-struct test_node {
-       long header[25];
-       struct list_head list;
-       long footer[25];
-};
-
-static LIST_HEAD(test_list);
-static DEFINE_PER_CPU(void *, kmemleak_test_pointer);
-
-/*
- * Some very simple testing. This function needs to be extended for
- * proper testing.
- */
-static int __init kmemleak_test_init(void)
-{
-       struct test_node *elem;
-       int i;
-
-       pr_info("Kmemleak testing\n");
-
-       /* make some orphan objects */
-       pr_info("kmalloc(32) = %p\n", kmalloc(32, GFP_KERNEL));
-       pr_info("kmalloc(32) = %p\n", kmalloc(32, GFP_KERNEL));
-       pr_info("kmalloc(1024) = %p\n", kmalloc(1024, GFP_KERNEL));
-       pr_info("kmalloc(1024) = %p\n", kmalloc(1024, GFP_KERNEL));
-       pr_info("kmalloc(2048) = %p\n", kmalloc(2048, GFP_KERNEL));
-       pr_info("kmalloc(2048) = %p\n", kmalloc(2048, GFP_KERNEL));
-       pr_info("kmalloc(4096) = %p\n", kmalloc(4096, GFP_KERNEL));
-       pr_info("kmalloc(4096) = %p\n", kmalloc(4096, GFP_KERNEL));
-#ifndef CONFIG_MODULES
-       pr_info("kmem_cache_alloc(files_cachep) = %p\n",
-               kmem_cache_alloc(files_cachep, GFP_KERNEL));
-       pr_info("kmem_cache_alloc(files_cachep) = %p\n",
-               kmem_cache_alloc(files_cachep, GFP_KERNEL));
-#endif
-       pr_info("vmalloc(64) = %p\n", vmalloc(64));
-       pr_info("vmalloc(64) = %p\n", vmalloc(64));
-       pr_info("vmalloc(64) = %p\n", vmalloc(64));
-       pr_info("vmalloc(64) = %p\n", vmalloc(64));
-       pr_info("vmalloc(64) = %p\n", vmalloc(64));
-
-       /*
-        * Add elements to a list. They should only appear as orphan
-        * after the module is removed.
-        */
-       for (i = 0; i < 10; i++) {
-               elem = kzalloc(sizeof(*elem), GFP_KERNEL);
-               pr_info("kzalloc(sizeof(*elem)) = %p\n", elem);
-               if (!elem)
-                       return -ENOMEM;
-               INIT_LIST_HEAD(&elem->list);
-               list_add_tail(&elem->list, &test_list);
-       }
-
-       for_each_possible_cpu(i) {
-               per_cpu(kmemleak_test_pointer, i) = kmalloc(129, GFP_KERNEL);
-               pr_info("kmalloc(129) = %p\n",
-                       per_cpu(kmemleak_test_pointer, i));
-       }
-
-       return 0;
-}
-module_init(kmemleak_test_init);
-
-static void __exit kmemleak_test_exit(void)
-{
-       struct test_node *elem, *tmp;
-
-       /*
-        * Remove the list elements without actually freeing the
-        * memory.
-        */
-       list_for_each_entry_safe(elem, tmp, &test_list, list)
-               list_del(&elem->list);
-}
-module_exit(kmemleak_test_exit);
-
-MODULE_LICENSE("GPL");

diff --git a/samples/Makefile b/samples/Makefile
index 7545535975817d1ce590efdd09585894c3e47f1b..c3392a595e4b739ed854068d8a8de6eaf7fc0fd3 100644 (file)
--- a/samples/Makefile
+++ b/samples/Makefile
@@ -28,3 +28,4 @@ subdir-$(CONFIG_SAMPLE_VFS)           += vfs
 obj-$(CONFIG_SAMPLE_INTEL_MEI)         += mei/
 subdir-$(CONFIG_SAMPLE_WATCHDOG)       += watchdog
 subdir-$(CONFIG_SAMPLE_WATCH_QUEUE)    += watch_queue
+obj-$(CONFIG_DEBUG_KMEMLEAK_TEST)      += kmemleak/

diff --git a/samples/kmemleak/Makefile b/samples/kmemleak/Makefile
new file mode 100644 (file)
index 0000000..16b6132
--- /dev/null
+++ b/samples/kmemleak/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak-test.o

diff --git a/samples/kmemleak/kmemleak-test.c b/samples/kmemleak/kmemleak-test.c
new file mode 100644 (file)
index 0000000..7b476eb
--- /dev/null
+++ b/samples/kmemleak/kmemleak-test.c
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * samples/kmemleak/kmemleak-test.c
+ *
+ * Copyright (C) 2008 ARM Limited
+ * Written by Catalin Marinas <catalin.marinas@arm.com>
+ */
+
+#define pr_fmt(fmt) "kmemleak: " fmt
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/list.h>
+#include <linux/percpu.h>
+#include <linux/fdtable.h>
+
+#include <linux/kmemleak.h>
+
+struct test_node {
+       long header[25];
+       struct list_head list;
+       long footer[25];
+};
+
+static LIST_HEAD(test_list);
+static DEFINE_PER_CPU(void *, kmemleak_test_pointer);
+
+/*
+ * Some very simple testing. This function needs to be extended for
+ * proper testing.
+ */
+static int __init kmemleak_test_init(void)
+{
+       struct test_node *elem;
+       int i;
+
+       pr_info("Kmemleak testing\n");
+
+       /* make some orphan objects */
+       pr_info("kmalloc(32) = %p\n", kmalloc(32, GFP_KERNEL));
+       pr_info("kmalloc(32) = %p\n", kmalloc(32, GFP_KERNEL));
+       pr_info("kmalloc(1024) = %p\n", kmalloc(1024, GFP_KERNEL));
+       pr_info("kmalloc(1024) = %p\n", kmalloc(1024, GFP_KERNEL));
+       pr_info("kmalloc(2048) = %p\n", kmalloc(2048, GFP_KERNEL));
+       pr_info("kmalloc(2048) = %p\n", kmalloc(2048, GFP_KERNEL));
+       pr_info("kmalloc(4096) = %p\n", kmalloc(4096, GFP_KERNEL));
+       pr_info("kmalloc(4096) = %p\n", kmalloc(4096, GFP_KERNEL));
+#ifndef CONFIG_MODULES
+       pr_info("kmem_cache_alloc(files_cachep) = %p\n",
+               kmem_cache_alloc(files_cachep, GFP_KERNEL));
+       pr_info("kmem_cache_alloc(files_cachep) = %p\n",
+               kmem_cache_alloc(files_cachep, GFP_KERNEL));
+#endif
+       pr_info("vmalloc(64) = %p\n", vmalloc(64));
+       pr_info("vmalloc(64) = %p\n", vmalloc(64));
+       pr_info("vmalloc(64) = %p\n", vmalloc(64));
+       pr_info("vmalloc(64) = %p\n", vmalloc(64));
+       pr_info("vmalloc(64) = %p\n", vmalloc(64));
+
+       /*
+        * Add elements to a list. They should only appear as orphan
+        * after the module is removed.
+        */
+       for (i = 0; i < 10; i++) {
+               elem = kzalloc(sizeof(*elem), GFP_KERNEL);
+               pr_info("kzalloc(sizeof(*elem)) = %p\n", elem);
+               if (!elem)
+                       return -ENOMEM;
+               INIT_LIST_HEAD(&elem->list);
+               list_add_tail(&elem->list, &test_list);
+       }
+
+       for_each_possible_cpu(i) {
+               per_cpu(kmemleak_test_pointer, i) = kmalloc(129, GFP_KERNEL);
+               pr_info("kmalloc(129) = %p\n",
+                       per_cpu(kmemleak_test_pointer, i));
+       }
+
+       return 0;
+}
+module_init(kmemleak_test_init);
+
+static void __exit kmemleak_test_exit(void)
+{
+       struct test_node *elem, *tmp;
+
+       /*
+        * Remove the list elements without actually freeing the
+        * memory.
+        */
+       list_for_each_entry_safe(elem, tmp, &test_list, list)
+               list_del(&elem->list);
+}
+module_exit(kmemleak_test_exit);
+
+MODULE_LICENSE("GPL");