Re: [PATCH] mm/hugetlb: Use str_plural() in report_hugepages()

Dev Jain
2025-07-01T03:53:25Z

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@linux.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);
> }

LGTM

Reviewed-by: Dev Jain <dev.jain@arm.com>