linux-kernel - Re: [PATCH] mm/hugetlb: Use str_plural() in report

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <b1d80881-89da-41a2-8402-c07ec704775a@arm.com>
Date: Tue, 1 Jul 2025 10:13:31 +0530
From: Anshuman Khandual <anshuman.khandual@....com>
To: Thorsten Blum <thorsten.blum@...ux.dev>,
 Muchun Song <muchun.song@...ux.dev>, Oscar Salvador <osalvador@...e.de>,
 David Hildenbrand <david@...hat.com>,
 Andrew Morton <akpm@...ux-foundation.org>
Cc: linux-mm@...ck.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] mm/hugetlb: Use str_plural() in report_hugepages()



On 30/06/25 10:48 PM, Thorsten Blum wrote:
> Use the string choice helper function str_plural() to simplify the code
> and to fix the following Coccinelle/coccicheck warning reported by
> string_choices.cocci:
> 
>   opportunity for str_plural(nrinvalid)
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@...ux.dev>
> ---
>  mm/hugetlb.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 9dc95eac558c..08abe7395f2f 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -25,6 +25,7 @@
>  #include <linux/mmdebug.h>
>  #include <linux/sched/signal.h>
>  #include <linux/rmap.h>
> +#include <linux/string_choices.h>
>  #include <linux/string_helpers.h>
>  #include <linux/swap.h>
>  #include <linux/swapops.h>
> @@ -3724,7 +3725,7 @@ static void __init report_hugepages(void)
>  			buf, h->nr_huge_pages);
>  		if (nrinvalid)
>  			pr_info("HugeTLB: %s page size: %lu invalid page%s discarded\n",
> -					buf, nrinvalid, nrinvalid > 1 ? "s" : "");
> +					buf, nrinvalid, str_plural(nrinvalid));
>  		pr_info("HugeTLB: %d KiB vmemmap can be freed for a %s page\n",
>  			hugetlb_vmemmap_optimizable_size(h) / SZ_1K, buf);
>  	}

Seems like there be more than one place where such str_plural() changes
could be made. Hence could you please collate them all part of a series
instead.