From patchwork Fri Sep 25 18:37:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Su X-Patchwork-Id: 11800595 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E5CBD92C for ; Fri, 25 Sep 2020 18:38:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9462F208B6 for ; Fri, 25 Sep 2020 18:38:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="T4YlAJrc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9462F208B6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=163.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A6E346B005C; Fri, 25 Sep 2020 14:38:24 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A1DFE6B005D; Fri, 25 Sep 2020 14:38:24 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E74A6B0062; Fri, 25 Sep 2020 14:38:24 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0104.hostedemail.com [216.40.44.104]) by kanga.kvack.org (Postfix) with ESMTP id 6B7776B005C for ; Fri, 25 Sep 2020 14:38:24 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 25785181AE862 for ; Fri, 25 Sep 2020 18:38:24 +0000 (UTC) X-FDA: 77302444128.21.cream92_3310c0027169 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 0497E180442C3 for ; Fri, 25 Sep 2020 18:38:23 +0000 (UTC) X-Spam-Summary: 1,0,0,626802ce98c8b1bb,d41d8cd98f00b204,sh_def@163.com,,RULES_HIT:41:355:379:421:582:800:960:973:988:989:1152:1260:1277:1312:1313:1314:1345:1381:1437:1516:1518:1519:1535:1543:1593:1594:1595:1596:1711:1730:1747:1777:1792:1801:2393:2538:2553:2559:2562:2899:3138:3139:3140:3141:3142:3151:3354:3865:3866:3867:3868:3870:3871:3872:3873:3874:4321:4605:5007:6119:6261:6653:6737:7809:7875:7903:9038:10004:10400:11026:11232:11334:11473:11658:11914:12043:12048:12297:12438:12555:12895:12986:13161:13229:13439:13895:14096:14097:14181:14394:14721:21080:21451:21600:21627:30054:30056:30067:30070:30090,0,RBL:220.181.12.15:@163.com:.lbl8.mailshell.net-66.100.201.100 62.50.2.100;04yfxtma7161hbgwsyowqf3y1r1aoycixqsk5fab698pm4sj6phm4uh1xeng951.5k8pthtem6p1o3im337dqqu8g4yz33fdxmorkcxj3cb8cmmusgttsfwrzrcsffg.c-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:n one X-HE-Tag: cream92_3310c0027169 X-Filterd-Recvd-Size: 5441 Received: from m12-15.163.com (m12-15.163.com [220.181.12.15]) by imf20.hostedemail.com (Postfix) with ESMTP for ; Fri, 25 Sep 2020 18:38:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=QyxXF vM0apX/hfN8xhdDiavcUL+dbBENIYuDPC48tb8=; b=T4YlAJrcUPhI9IESDot6X ULpCWEquJOW5WVQ8Kg02ZF/3ajidZ2y6Zk6ITSVDrQRFi6Z+zywgGttqbpCuCevs KAy2CNCVBm7XgSpw7eAGSQkWbPLTXhWF12igxe99L3+1zLZE//WIxtF2TAWU6xJl nYnZNKglF6xHdF7Enh3MGk= Received: from localhost (unknown [101.86.214.224]) by smtp11 (Coremail) with SMTP id D8CowACH4aPpOG5f04wxDw--.53071S2; Sat, 26 Sep 2020 02:37:29 +0800 (CST) Date: Sat, 26 Sep 2020 02:37:29 +0800 From: Hui Su To: catalin.marinas@arm.com, corbet@lwn.net, akpm@linux-foundation.org, mchehab+huawei@kernel.org, davem@davemloft.net, robh@kernel.org, yamada.masahiro@socionext.com, sam@ravnborg.org, jpoimboe@redhat.com, rostedt@goodmis.org, miguel.ojeda.sandonis@gmail.com, divya.indi@oracle.com, sh_def@163.com, tomas.winkler@intel.com, dhowells@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH] mm,kmemleak-test.c: move kmemleak-test.c to samples dir Message-ID: <20200925183729.GA172837@rlk> MIME-Version: 1.0 Content-Disposition: inline X-CM-TRANSID: D8CowACH4aPpOG5f04wxDw--.53071S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxWr45Kw1xAw43Cr1xWF4kWFg_yoWrJr13pr 4Fvr1ftrn7Ar1UW3y8tFyrGryUtwn7WFnruFWrZw4UXF9rXw18ZrsIk3y2yay3JayxWFWf Gas7KFy7Cr1rJ3JanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jwID7UUUUU= X-Originating-IP: [101.86.214.224] X-CM-SenderInfo: xvkbvvri6rljoofrz/1tbiJgmqX1v2eVoAzwAAsb X-Bogosity: Ham, tests=bogofilter, spamicity=0.117027, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 Acked-by: Catalin Marinas --- Documentation/dev-tools/kmemleak.rst | 2 +- MAINTAINERS | 2 +- mm/Makefile | 1 - samples/Makefile | 1 + samples/kmemleak/Makefile | 3 +++ {mm => samples/kmemleak}/kmemleak-test.c | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 samples/kmemleak/Makefile rename {mm => samples/kmemleak}/kmemleak-test.c (98%) diff --git a/Documentation/dev-tools/kmemleak.rst b/Documentation/dev-tools/kmemleak.rst index a41a2d238af2..1c935f41cd3a 100644 --- 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 190c7fa2ea01..8172787535fc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9712,8 +9712,8 @@ M: Catalin Marinas 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 diff --git a/mm/Makefile b/mm/Makefile index d5649f1c12c0..d73aed0fc99c 100644 --- 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/samples/Makefile b/samples/Makefile index 754553597581..c3392a595e4b 100644 --- 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 index 000000000000..16b6132c540c --- /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/mm/kmemleak-test.c b/samples/kmemleak/kmemleak-test.c similarity index 98% rename from mm/kmemleak-test.c rename to samples/kmemleak/kmemleak-test.c index e19279ff6aa3..7b476eb8285f 100644 --- a/mm/kmemleak-test.c +++ b/samples/kmemleak/kmemleak-test.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * mm/kmemleak-test.c + * samples/kmemleak/kmemleak-test.c * * Copyright (C) 2008 ARM Limited * Written by Catalin Marinas