From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 248D9C761AF for ; Thu, 30 Mar 2023 06:09:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D6A86B0072; Thu, 30 Mar 2023 02:09:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 187416B0074; Thu, 30 Mar 2023 02:09:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 04FD36B0075; Thu, 30 Mar 2023 02:09:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E94A76B0072 for ; Thu, 30 Mar 2023 02:09:38 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id AA8CE80742 for ; Thu, 30 Mar 2023 06:09:38 +0000 (UTC) X-FDA: 80624538036.07.3E1C36A Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by imf11.hostedemail.com (Postfix) with ESMTP id 8F3B540005 for ; Thu, 30 Mar 2023 06:09:35 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf11.hostedemail.com: domain of gehao@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=gehao@kylinos.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680156576; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references; bh=kGd8DTaczYIEPI7GuNItYDlm+CZDDK7tjUQUdga4wFc=; b=gHExRzvVxAEXMsG6yB2NYxwBd4Y3NoVuKhn09yN7n1RmMcIGeWvLvCc1QRti1euaMFpitr sgHePNCBp0me2t/LD0HeXtOVzaYgLW6QynKiF+c9MZmnWg6maX+e/rYlTGehh6SvczRgYb l4heRVKf3DneC2NimjZxi5eoHKS1njo= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf11.hostedemail.com: domain of gehao@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=gehao@kylinos.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680156576; a=rsa-sha256; cv=none; b=zvX1tWiy4PEdfeXE6CceH6h/2t7tadQm5GKxonHEkKZzXZfywLHwJXZPqdHZY8VTt++Zjw OUC5U7E3N4Dv24vA1m5eAYfXdJjiOK0xVtEdAKV3eSiHqTkxZr+ZTDjaAr49IzQjEQUng4 MqM8/6iQeMg3HMJ57D9Yl7I8IQpBkOU= X-UUID: 033a14a9cd8241bb9dfdbc7bef98356a-20230330 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.22,REQID:ebafa566-ce38-4805-b97e-5c459c92663f,IP:5,U RL:0,TC:0,Content:-25,EDM:25,RT:0,SF:-5,FILE:0,BULK:0,RULE:Release_Ham,ACT ION:release,TS:0 X-CID-INFO: VERSION:1.1.22,REQID:ebafa566-ce38-4805-b97e-5c459c92663f,IP:5,URL :0,TC:0,Content:-25,EDM:25,RT:0,SF:-5,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:0 X-CID-META: VersionHash:120426c,CLOUDID:491df029-564d-42d9-9875-7c868ee415ec,B ulkID:230330140918KLMIUS1O,BulkQuantity:0,Recheck:0,SF:38|24|17|19|44|102, TC:nil,Content:0,EDM:5,IP:-2,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0, OSI:0,OSA:0,AV:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-UUID: 033a14a9cd8241bb9dfdbc7bef98356a-20230330 X-User: gehao@kylinos.cn Received: from localhost.localdomain [(116.128.244.169)] by mailgw (envelope-from ) (Generic MTA) with ESMTP id 39918076; Thu, 30 Mar 2023 14:09:17 +0800 From: Hao Ge To: akpm@linux-foundation.org, alex.williamson@redhat.com, jgg@ziepe.ca, akrowiak@linux.ibm.com, arnd@arndb.de, mark.rutland@arm.com, ye.xingchen@zte.com.cn, ojeda@kernel.org, alex.gaynor@gmail.com, me@kloenk.de, gregkh@linuxfoundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, gehao618@163.com, Hao Ge Subject: [RESEND PATCH] kmemleak-test: Optimize kmemleak_test.c build flow Date: Thu, 30 Mar 2023 14:09:04 +0800 Message-Id: <20230330060904.292975-1-gehao@kylinos.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 8F3B540005 X-Stat-Signature: pghtjt16egrhwxt4u1iyyoip3jqjudat X-Rspam-User: X-HE-Tag: 1680156575-877958 X-HE-Meta: U2FsdGVkX196d3T4K6viot1Qgirryn1zB1B0hxPBdoBGrfEcCjmk0mKH7aeA7NpBCnRV/HqgkEn1a7vOv9aunC7TBisNXuPVwGIgDksNi3ePwwWhpKY6vK4fgPAHcb8eBIhmR4fBBAo8vVSSGf1gzFtqPNhflh6+Aawe313cYpGZdM3U3f0vlTjpjJPj9Mbfz74GtQsf0k0jSnfe38OCwhoaiN+miysHtGUTsgn9a0WSyoxbliiXqD2Z8+gInCcja7sC91s9Pem5uNkhfw+MVOl+6URZFtz+TzaBiU6nXuAGyS1MzhiS3Jc7cm13qkqRzuM4HYPS34rltvWGry50DCERfcqmIHPbW+IviV+9nMCEXIFq6IPnYMXmN0z6wCDLbXYwrlNMW0YD8IiEO301kIp0FcAxuAGBR2hrY/c3iIGRN+oQctNvqC/5aSuPI/NUIpgsO/mj/TaKeJL2e7orCEudzdi5qyaYbGA5PRgMf7XAc7XnrHZKu5J4z1/Uvh+uplZpf7Gsn9LuxcTfeYe3V4Q11ehdRti6mVREdg1yIkBRZqWISpExqeZ5zvgU2zw1+TUB65CpC+DTnGqRjlqtx2qi8lqdeFpNlgVvkkXODZruoNIh9fuVbw4DdCM0Qf3EfveN95+GpIOYaySYK4gE1R9FZcJugJuMYPqqU2FTqWdsNyGVWbNqcf9xEhVIteWIG3cBh7kyEjPljhhsBRVeJp0+2eGnHVyLjjAoicQRKeirr5Vlw7pTyBTaGLZYUewr5ZGzPzEWNVffUx7RsH/nyI3LzPAknGJJ+Q0DekFTdw0koBomv+sl+R5mzV08gm72Wkt/3/2qjLMHRB7zNnFZl5e+YJh9S6mgbBuS2QiCl7SC8rDQ4iM5TWor8Az4FkK6hpvvw7CJwPKWzKJkzCCP9kljSKRLAPij0OklUT9x8L8B2gHFJgDEKj+hEBYNZjg/+2BK5jShWdj/m32H+1f uV6h2kzv q/v8Ktz2UayGtnpSSNjZlU9KAoqJ+NDhtqPXHdAfbFr2e9r1gKI1oeUFDggRC4nvEKknb2tH0n9F1rnCVWHSui5UXX7c8qLkFOgCv3pXsrFECugth/1SFTFMrO8enEzd/P1Q8aB2aniQ6N6dWsIhXeqOEzWYzsmdVnW4r9TyWQNPJ+X4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Now kmemleak-test.c is moved to samples directory, if CONFIG_DEBUG_KMEMLEAK_TEST=m,but CONFIG_SAMPLES is not set,it will be meaningless. So we will remove CONFIG_DEBUG_KMEMLEAK_TEST and add CONFIG_SAMPLE_KMEMLEAK which in samples directory to control kmemleak-test.c build or not Signed-off-by: Hao Ge --- mm/Kconfig.debug | 8 -------- samples/Kconfig | 7 +++++++ samples/Makefile | 2 +- samples/kmemleak/Makefile | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug index c3547a373c9c..fb86e9952bac 100644 --- a/mm/Kconfig.debug +++ b/mm/Kconfig.debug @@ -249,14 +249,6 @@ config DEBUG_KMEMLEAK_MEM_POOL_SIZE fully initialised, this memory pool acts as an emergency one if slab allocations fail. -config DEBUG_KMEMLEAK_TEST - tristate "Simple test for the kernel memory leak detector" - depends on DEBUG_KMEMLEAK && m - help - This option enables a module that explicitly leaks memory. - - If unsure, say N. - config DEBUG_KMEMLEAK_DEFAULT_OFF bool "Default kmemleak to off" depends on DEBUG_KMEMLEAK diff --git a/samples/Kconfig b/samples/Kconfig index 30ef8bd48ba3..69076fbf3298 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -273,6 +273,13 @@ config SAMPLE_CORESIGHT_SYSCFG This demonstrates how a user may create their own CoreSight configurations and easily load them into the system at runtime. +config SAMPLE_KMEMLEAK + tristate "Simple test for the kernel memory leak detector" + depends on DEBUG_KMEMLEAK && m + help + Build a sample program which have explicitly leaks memory to test + kmemleak + source "samples/rust/Kconfig" endif # SAMPLES diff --git a/samples/Makefile b/samples/Makefile index 7cb632ef88ee..7727f1a0d6d1 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -33,7 +33,7 @@ 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/ +obj-$(CONFIG_SAMPLE_KMEMLEAK) += kmemleak/ obj-$(CONFIG_SAMPLE_CORESIGHT_SYSCFG) += coresight/ obj-$(CONFIG_SAMPLE_FPROBE) += fprobe/ obj-$(CONFIG_SAMPLES_RUST) += rust/ diff --git a/samples/kmemleak/Makefile b/samples/kmemleak/Makefile index 16b6132c540c..8a999ab43b6d 100644 --- a/samples/kmemleak/Makefile +++ b/samples/kmemleak/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-$(CONFIG_DEBUG_KMEMLEAK_TEST) += kmemleak-test.o +obj-$(CONFIG_SAMPLE_KMEMLEAK) += kmemleak-test.o -- 2.25.1 No virus found Checked by Hillstone Network AntiVirus