From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 40D84267B02 for ; Mon, 17 Nov 2025 11:15:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763378112; cv=none; b=hia6q9KJLRXDCMxvxfD1L+QCXZ1jL0QDvVLCdbJ+Tg6w2r2p++ClU4Q/WEUifZUMUM8risXAq9MYcNpbtIFK5zYguP0Nkc4fZI6Ypf/Ol4KpeVRCC9gugi4v9TatgNtOY2/sa1uxG330D0j41O7Ch7z8GHnYIXKHGsMRDjC/SgI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763378112; c=relaxed/simple; bh=BcdOu2Id8V8Ko4IPptxxqZjBUbH634ptndCIsvqmNTc=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NgQ1XCEzRhtI0pgcfoKDLleZp0Vl9M7/yVOX4t+x9zmXB/JmFu0tWiif8FkwK9do9eOZcKdFpKg/vqHlvWwb9qiuNnt/u5tea+PLjzxLh2vce1WiPDjzHpoX432ae3tgSdPEUOapUSGdh55t9r5riokWofR+Rs5f9h1pXVH+Sis= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=fgWmHfwd; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=FsHHCzg5; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=fgWmHfwd; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=FsHHCzg5; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="fgWmHfwd"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="FsHHCzg5"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="fgWmHfwd"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="FsHHCzg5" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C666721224; Mon, 17 Nov 2025 11:15:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763378103; h=from:from:reply-to: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; bh=u8LX1CW21QZOgAC8hwcxilXQWcwm8K+BwFeQUI1VU0A=; b=fgWmHfwdFCVvoYUGCjyesWkdlVvHfuKOodgpWU00s3MQhoLQWa5rTchwzSMXsew026IAz/ VbRooUVi1WbJY6rTy49h2SXvSTZuCcpN25GGMiQXFUO02HEdbR0ZssFAQ2r00yW5G5cY1a mHl35KmEQxZps38AKb2eKH9MQk4cjDk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763378103; h=from:from:reply-to: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; bh=u8LX1CW21QZOgAC8hwcxilXQWcwm8K+BwFeQUI1VU0A=; b=FsHHCzg5meUB/o4OdfBARNkCJMJCr9yjawIEZtb1Op3vKvvEO3x9oi90LI4rCJZDQwl+sz VYX+LKWMLidYagDQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1763378103; h=from:from:reply-to: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; bh=u8LX1CW21QZOgAC8hwcxilXQWcwm8K+BwFeQUI1VU0A=; b=fgWmHfwdFCVvoYUGCjyesWkdlVvHfuKOodgpWU00s3MQhoLQWa5rTchwzSMXsew026IAz/ VbRooUVi1WbJY6rTy49h2SXvSTZuCcpN25GGMiQXFUO02HEdbR0ZssFAQ2r00yW5G5cY1a mHl35KmEQxZps38AKb2eKH9MQk4cjDk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1763378103; h=from:from:reply-to: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; bh=u8LX1CW21QZOgAC8hwcxilXQWcwm8K+BwFeQUI1VU0A=; b=FsHHCzg5meUB/o4OdfBARNkCJMJCr9yjawIEZtb1Op3vKvvEO3x9oi90LI4rCJZDQwl+sz VYX+LKWMLidYagDQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 87FCC3EA61; Mon, 17 Nov 2025 11:15:03 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id EOAsH7cDG2lDcwAAD6G6ig (envelope-from ); Mon, 17 Nov 2025 11:15:03 +0000 Date: Mon, 17 Nov 2025 12:15:02 +0100 From: Jean Delvare To: linux-mm@kvack.org Cc: LKML , David Hildenbrand , Oscar Salvador , SeongJae Park Subject: [PATCH RFC 2/2] mm/cma: Consolidate accounting in dedicated functions Message-ID: <20251117121502.6db0fd7a@endymion> In-Reply-To: <20251117115602.7b9c7ccd@endymion> References: <20251117115602.7b9c7ccd@endymion> Organization: SUSE Linux X-Mailer: Claws Mail 4.2.0 (GTK 3.24.43; x86_64-suse-linux-gnu) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Level: X-Spamd-Result: default: False [-3.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_RHS_NOT_FQDN(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; HAS_ORG_HEADER(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:email] X-Spam-Flag: NO X-Spam-Score: -3.80 Move all accounting to dedicated functions and rename them accordingly. Signed-off-by: Jean Delvare --- This is based on a suggestion by SeongJae Park. Comments welcome. mm/cma.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) --- linux-6.17.orig/mm/cma.c +++ linux-6.17/mm/cma.c @@ -37,31 +37,27 @@ struct cma cma_areas[MAX_CMA_AREAS]; unsigned int cma_area_count; #ifdef CONFIG_SYSFS -static void cma_sysfs_account_success_pages(struct cma *cma, - unsigned long nr_pages) +#define cma_inc_page_counter(n, a) atomic64_add((n), (a)) +#else +#define cma_inc_page_counter(n, a) do {} while (0) +#endif + +static void cma_account_success(struct cma *cma, unsigned long nr_pages) { - atomic64_add(nr_pages, &cma->nr_pages_succeeded); + count_vm_event(CMA_ALLOC_SUCCESS); + cma_inc_page_counter(nr_pages, &cma->nr_pages_succeeded); } -static void cma_sysfs_account_fail_pages(struct cma *cma, - unsigned long nr_pages) +static void cma_account_fail(struct cma *cma, unsigned long nr_pages) { - atomic64_add(nr_pages, &cma->nr_pages_failed); + count_vm_event(CMA_ALLOC_FAIL); + cma_inc_page_counter(nr_pages, &cma->nr_pages_failed); } -static void cma_sysfs_account_release_pages(struct cma *cma, - unsigned long nr_pages) +static void cma_account_release(struct cma *cma, unsigned long nr_pages) { - atomic64_add(nr_pages, &cma->nr_pages_released); + cma_inc_page_counter(nr_pages, &cma->nr_pages_released); } -#else -static void cma_sysfs_account_success_pages(struct cma *cma, - unsigned long nr_pages) {}; -static void cma_sysfs_account_fail_pages(struct cma *cma, - unsigned long nr_pages) {}; -static void cma_sysfs_account_release_pages(struct cma *cma, - unsigned long nr_pages) {}; -#endif phys_addr_t cma_get_base(const struct cma *cma) { @@ -921,13 +917,10 @@ static struct page *__cma_alloc(struct c pr_debug("%s(): returned %p\n", __func__, page); trace_cma_alloc_finish(name, page ? page_to_pfn(page) : 0, page, count, align, ret); - if (page) { - count_vm_event(CMA_ALLOC_SUCCESS); - cma_sysfs_account_success_pages(cma, count); - } else { - count_vm_event(CMA_ALLOC_FAIL); - cma_sysfs_account_fail_pages(cma, count); - } + if (page) + cma_account_success(cma, count); + else + cma_account_fail(cma, count); return page; } @@ -1029,7 +1022,7 @@ bool cma_release(struct cma *cma, const free_contig_range(pfn, count); cma_clear_bitmap(cma, cmr, pfn, count); - cma_sysfs_account_release_pages(cma, count); + cma_account_release(cma, count); trace_cma_release(cma->name, pfn, pages, count); return true; -- Jean Delvare SUSE L3 Support