From nobody Sun Feb 8 13:53:11 2026 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 233EA8F56 for ; Mon, 5 Feb 2024 03:16:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707103019; cv=none; b=rAkTIbBaKJkWW9s8ngW6ExuQWmihX507fGwfa2DLqKm0y6dUhBawEHuoyRllzZG/yj4lKs4B2V5OafEnBsrzGltlshCMndDXlXKzrx8+tkPTJEondbNs022iQZQLbFZ5qBNdWyAfgQ0kulrlgpZF7rnzRA8V8do5ct8c+mEqXAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707103019; c=relaxed/simple; bh=kUGQIlKf+E+jZpQtg6FfXU6fycbgpqbfjW3cKjCIpA0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=NdqNsKsW0xtYJJ9zvIcaE0CqJplVkNwgvATwyJ8xL/rVd9ih3SiXzLmeZ6Ojpop9mvZOcUXF0GSUTmSNFixXyQOO44mrgStj6Cq8bZdfN6v9cZaSLPne7XgnpKwbfuXcYS6gh/DYrs4oAQnukkWX3+vI8V7mzfmWj6R06mzhWDU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 619521FB; Sun, 4 Feb 2024 19:17:37 -0800 (PST) Received: from a077893.blr.arm.com (a077893.blr.arm.com [10.162.40.23]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 54B783F762; Sun, 4 Feb 2024 19:16:53 -0800 (PST) From: Anshuman Khandual To: linux-mm@kvack.org Cc: Anshuman Khandual , Andrew Morton , linux-kernel@vger.kernel.org Subject: [PATCH] mm/cma: Drop CONFIG_CMA_DEBUG Date: Mon, 5 Feb 2024 08:46:47 +0530 Message-Id: <20240205031647.283510-1-anshuman.khandual@arm.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" All pr_debug() prints in (mm/cma.c) could be enabled via standard Makefile based method. Besides cma_debug_show_areas() should always be called during cma_alloc() failure path. This seemingly redundant config, CONFIG_CMA_DEBUG can be dropped without any problem. Cc: Andrew Morton Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Anshuman Khandual --- This applies on v6.8-rc3. mm/Kconfig | 9 --------- mm/cma.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/mm/Kconfig b/mm/Kconfig index ffc3a2ba3a8c..35fa9940e61f 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -901,15 +901,6 @@ config CMA =20 If unsure, say "n". =20 -config CMA_DEBUG - bool "CMA debug messages (DEVELOPMENT)" - depends on DEBUG_KERNEL && CMA - help - Turns on debug messages in CMA. This produces KERN_DEBUG - messages for every CMA call as well as various messages while - processing calls such as dma_alloc_from_contiguous(). - This option does not affect warning and error messages. - config CMA_DEBUGFS bool "CMA debugfs interface" depends on CMA && DEBUG_FS diff --git a/mm/cma.c b/mm/cma.c index 7c09c47e530b..ed6581ef50c1 100644 --- a/mm/cma.c +++ b/mm/cma.c @@ -14,11 +14,6 @@ =20 #define pr_fmt(fmt) "cma: " fmt =20 -#ifdef CONFIG_CMA_DEBUG -#ifndef DEBUG -# define DEBUG -#endif -#endif #define CREATE_TRACE_POINTS =20 #include @@ -387,7 +382,6 @@ int __init cma_declare_contiguous_nid(phys_addr_t base, return ret; } =20 -#ifdef CONFIG_CMA_DEBUG static void cma_debug_show_areas(struct cma *cma) { unsigned long next_zero_bit, next_set_bit, nr_zero; @@ -412,9 +406,6 @@ static void cma_debug_show_areas(struct cma *cma) pr_cont("=3D> %lu free of %lu total pages\n", nr_total, cma->count); spin_unlock_irq(&cma->lock); } -#else -static inline void cma_debug_show_areas(struct cma *cma) { } -#endif =20 /** * cma_alloc() - allocate pages from contiguous area --=20 2.25.1