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 AC066C6FD1D for ; Thu, 30 Mar 2023 20:10:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 164536B0074; Thu, 30 Mar 2023 16:10:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0EE5B6B007D; Thu, 30 Mar 2023 16:10:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ECFDF6B007E; Thu, 30 Mar 2023 16:10:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D919E6B0074 for ; Thu, 30 Mar 2023 16:10:20 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 6C1CB80201 for ; Thu, 30 Mar 2023 20:10:20 +0000 (UTC) X-FDA: 80626656600.27.3684387 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf26.hostedemail.com (Postfix) with ESMTP id 7BE1A14000D for ; Thu, 30 Mar 2023 20:10:17 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=qjk+6lnb; spf=pass (imf26.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680207017; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=eHusj1vxLKHmfZbDLNTVgE6VVrMZqdcAufPNiukWAsM=; b=V0kLeUOM94/IbP54yF3hUoiZEdMd7ayvZVztJfs8eOUHG6N0sB9HOjCHz5Cgig9f7hkVY8 3KcAoK3wne2bvyu+dLe+xpybf7aAXC9RPF1V714Uvyx+4Pv72mkj1f6SorDTAtQF6vgajP I4IJQHc5LCdAf6Z+Y0zYYg6PYzD5XzI= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=qjk+6lnb; spf=pass (imf26.hostedemail.com: domain of akpm@linux-foundation.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680207017; a=rsa-sha256; cv=none; b=dd+pVeblsvEEFmYvENdINAJ3V6imIrjU9UrhOcsGdktzBsWxkTViQxarOz9E1PS+FjKW5W FZtXP6RSmTSBOAqiY0rySTaJIdyG3/kWOek9g90gRg/DET8+P4WmNFsVDLjwyERexgPI87 1ihQE29uVsuY6DxasQFhy5Ze/A0G0Qc= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id B6084B82A21; Thu, 30 Mar 2023 20:10:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0DB6C433EF; Thu, 30 Mar 2023 20:10:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1680207014; bh=65urcWDJM1aNO6xZxCWkwK2KeKrFuD7Q79vl5/+iSAE=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=qjk+6lnbBXu33eRAEN5TzklCabFGfi+TkC/IEih7eBLKrE9s9kUY7cAnstztsGRxG H1qhQ9hK0FnoQZUFUUHBY4ZeZ1vl+mzRZrb/pvyYbR4qYgnuWjJTJuOjzLY0fVkCP4 9OcykttciEicNRpp4A2ZV3dddXLPnBLaTMiMjbrE= Date: Thu, 30 Mar 2023 13:10:13 -0700 From: Andrew Morton To: Hao Ge Cc: 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, linux-mm@kvack.org, linux-kernel@vger.kernel.org, gehao618@163.com, Catalin Marinas Subject: Re: [RESEND PATCH] kmemleak-test: Optimize kmemleak_test.c build flow Message-Id: <20230330131013.2685eeee5f7db76b850512ed@linux-foundation.org> In-Reply-To: <20230330060904.292975-1-gehao@kylinos.cn> References: <20230330060904.292975-1-gehao@kylinos.cn> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 7BE1A14000D X-Stat-Signature: h6gfoc4u3gp89buumpm9x1767zs4mo4q X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1680207017-890011 X-HE-Meta: U2FsdGVkX1+YECgFdl9EpXoDScw+LL4SmNVZhQF6HpRR9C6bDxjHI8BGwccKOeLCK+EvBfnka3jXCDNTcA35kFj0+EylzdPLRYnzE53pVBqCuGlHQu9PbNUebm5mmCSpfZthjJFBT9QCfBayUa79CSFsPJzvdknkN+jrZiyfzIjHiF5UDoQTT0WHm26zaDXztwwRM7gZe7GEeNm9fxWkXr76UOXv3Q1OrEhiuXKJz2dH8ISmd/VqhuMtKGoczyhiVxgz1RW59JRsrB7tQkce11KYz6aYspKOlVaD9JG5ul8OZwrqRDozsuukJ3gudWA8APkJzcNLPfCX3NE555qZ20/HV/vGUxzt4SNw31MpjNN7ohp2c7jBcNDyuN+VOL7R/atS4xC0zh6T5kOxhMcK+Ye9JuHPMgD+kPam6SPgZyvhCnoEr4dYkSro/IAkzZXFO2aJn6co0lePStrV7KfimRsLtmiFLtj1t7+GH8pHNjTnijhKRu563JS6aUiesrsDTh0IPYiJF1xt65glmYVZwTlKmjEls1dfMmNak1YJ670ckOq/X0YP0nVX+2c68iG0vLkh6ESU0e6Q6PmOxsUbwoA868NQdKeQDQPQOD7cKxtrENkphomd32mXiNh04qsvXjHW28EWUXhvrmP7zvE3F+7Y2MQKgsm1vqySBZ1FZAao7FcJ2BUy+VqIgbNvWLxo0ygz0J/XFbgtegUZs/fTNdaHluEI/VZ4s1knLljSFj7x5cCLNEuO3LYN/ZrTxLKRQotFSh7LhkbAilLrEs9uyDRLLVxVFg8egdSDL+Zx5J5f1N1BREc8k0z+1V6e8RUdmx03TjuYcri9A1AfZkP95p3NIFD8loipkGr7vI0SilKsLssaSOGZmZgf+5toEWxns83OtWl6ebynDUag0Y2EodwKY/49RHj0WQh6I9y9f2xNHJvbGaTKt6A1pN/eR+DRzk5Zv1p+sroC44dFfzt ppvPT2V0 pCzjWRlIl5o5w2hHnOMVhx6YsjZ+QOixLzit+XI92MpRtK5MczVW8QVlQVoAvsSHKNvNl0fLmTXHb60OwI8kd+zNskq9yFI/Em81iWDIjK7sarwqiidPuY1B8cugxiHIx4pCS+ruTCQmPz8g5mPvyB2kvkQ2PRynWaTheLPBtjm0KdDhdVoTteT8loAg3SmqTHtA11G9b/qGNmb3X3bY1h+wbpBDBFSo3G+XeP40hwAJ4vGsfyhu3haeef0aO6o7SUrInrZ7yfhGvpNVTrQ9kwalTY5sJ+unTX6cPlixMAIOmB58UAdzjwPfe4tzKHVtTLqM62PclKdm2rX7NH82SmZeUQS42WmIh4CIEEv4RL+leDiA= 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: On Thu, 30 Mar 2023 14:09:04 +0800 Hao Ge wrote: > 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 Thanks. I changed the patch title, reworked the changelog and added the Fixes: information. Please check all this carefully. From: Hao Ge Subject: kmemleak-test: fix kmemleak_test.c build logic Date: Thu, 30 Mar 2023 14:09:04 +0800 kmemleak-test.c was moved to the samples directory in 1abbef4f51724 ("mm,kmemleak-test.c: move kmemleak-test.c to samples dir"). If CONFIG_DEBUG_KMEMLEAK_TEST=m and CONFIG_SAMPLES is unset, kmemleak-test.c will be unnecessarily compiled. So move the entry for CONFIG_DEBUG_KMEMLEAK_TEST from mm/Kconfig and add a new CONFIG_SAMPLE_KMEMLEAK in samples/ to control whether kmemleak-test.c is built or not. Link: https://lkml.kernel.org/r/20230330060904.292975-1-gehao@kylinos.cn Fixes: 1abbef4f51724 ("mm,kmemleak-test.c: move kmemleak-test.c to samples dir") Signed-off-by: Hao Ge Cc: Catalin Marinas Cc: Alex Gaynor Cc: Alex Williamson Cc: Arnd Bergmann Cc: Finn Behrens Cc: Greg Kroah-Hartman Cc: Jason Gunthorpe Cc: Mark Rutland Cc: Miguel Ojeda Cc: Tony Krowiak Cc: Ye Xingchen Signed-off-by: Andrew Morton --- mm/Kconfig.debug | 8 -------- samples/Kconfig | 7 +++++++ samples/Makefile | 2 +- samples/kmemleak/Makefile | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) --- a/mm/Kconfig.debug~kmemleak-test-optimize-kmemleak_testc-build-flow +++ a/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 --- a/samples/Kconfig~kmemleak-test-optimize-kmemleak_testc-build-flow +++ a/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 --- a/samples/kmemleak/Makefile~kmemleak-test-optimize-kmemleak_testc-build-flow +++ a/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 --- a/samples/Makefile~kmemleak-test-optimize-kmemleak_testc-build-flow +++ a/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/ _