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 1D8C4C7EE30 for ; Tue, 1 Jul 2025 04:43:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B409D6B0093; Tue, 1 Jul 2025 00:43:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AF1596B00A1; Tue, 1 Jul 2025 00:43:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2DFC6B00A2; Tue, 1 Jul 2025 00:43:40 -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 92F166B0093 for ; Tue, 1 Jul 2025 00:43:40 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id F3D3A58372 for ; Tue, 1 Jul 2025 04:43:39 +0000 (UTC) X-FDA: 83614452558.17.88E5D12 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf28.hostedemail.com (Postfix) with ESMTP id 38C57C0002 for ; Tue, 1 Jul 2025 04:43:38 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf28.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751345018; 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; bh=U/mYr9d0yw1v5QdokF6pLt+pPD5/w+1m3EDgX8mbYbc=; b=Rcj8Xf5cd2Om+6owo8shUCkBkSk2/PamUnQO7qm0KwIAHGmvSxf9F69GvFGKlXQYEssReR s0YivNc0hveD1fsTWl4Yr83pFSwJ5Wf1JxZj0XirP2MaaD1Eu1wcs6Q6dFHXrcHbJJiCx5 5iLxFocopWnIYXf7OFFrOobvxhSIqOk= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf28.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751345018; a=rsa-sha256; cv=none; b=sKt49izsMpxfaRZf3oJn8jOW6Sj5FhztNL1kjmA+1eLjuxw8+A7KoijdsSDd7ZnqZweJ/q A/hLoio4K6Zv8NEQq2dFzf/0YvBTtvg/NAcdVPcBqp2QuwgLpyoEvR0zmIY39ou8LAgSCJ n70V3HIfv0S6DOR/3kvZ4ka6yZAWR0E= 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 9861815A1; Mon, 30 Jun 2025 21:43:21 -0700 (PDT) Received: from [10.164.146.16] (J09HK2D2RT.blr.arm.com [10.164.146.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BA4333F58B; Mon, 30 Jun 2025 21:43:34 -0700 (PDT) Message-ID: Date: Tue, 1 Jul 2025 10:13:31 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm/hugetlb: Use str_plural() in report_hugepages() To: Thorsten Blum , Muchun Song , Oscar Salvador , David Hildenbrand , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20250630171826.114008-2-thorsten.blum@linux.dev> Content-Language: en-US From: Anshuman Khandual In-Reply-To: <20250630171826.114008-2-thorsten.blum@linux.dev> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 38C57C0002 X-Stat-Signature: pycq6ygkaauw5qaauz3tre1wk1kr7buu X-HE-Tag: 1751345018-415435 X-HE-Meta: U2FsdGVkX18JJyc71TLuhxjP9iXL/2v0QnKHFwgwGIJ/ZajqhZtUfeJNPGsB7L1NFlg1pX1MWkcyReCPQK9MzSZISldM5xsnkbTPFO8F5i4swAgo7mWWBdBtefcEXmnlXI3CRJTZ76gLRjTRCGO3axcLBFrq+qKbtGHMElvgbJP+bedUBhmWIHcUCaYGf++hClAY3xQzBZIhppMA1mj3YqpzVgZmtQjb1KoEITc3k/L/b7Ch948dRmYYhxEQKkVgPi0FF1HkemUWsiK/yNUQ7JzKysKHhIFnWJlQJ64V9bnJh1LRidD6Nqx9iXuFAtSs56zwDHt+NGn5WItNZ7Pb8KK9uaMvxmNzB/Q4fOmL3Nm/TQ7JHwo8nbjJP9mu7f+CUQ+SGHp+Rt9/tAXuVbDy0E8/D3UBWGMHcMY4aWkF4Tz8JtQvxV9Nw+rWCIizz3oT6UXZvkm7Ucq7J9NLdkZR4tpNOKgwt4AUlBNe/xTE66/6/EM94auNmdsnnUjANY5OLABrzvTfzUf2PEKgUtMSt0LOaj6v5pQe4G609tq0scmlb1OgCFTYQDJH+sQ2VpGQX5Jm2lpySiHbt2JkYIy4TY4T2PfLEFnRev4McChxg4pFoz3fdIQFJh/LD1DxGRPsDKpRELQMU2VmqWnxpQhmdK6Y6bH8eXzoVuY71mLrwo5nuobAlE7R43Nt2iZ7EwuLu4IFMG9PdLrMDjblYKAg+PFVJSRSCZKugK3jouxGJ6oDVazOYOn8uO+5vgfx46NcCH6zRoAY6qCbMXtRQoJ050/U+jnEUW6zrRvOtmggdBd5CWUtIg0Og86LgloQEIEW3+5yViPsZ5Ah4dJ4IH+h5cmeBi4GkwDyP9PIuckjLQKkGrMHifsQB8cQLXmXrHF/5DHtYpFTMAZenACCR+Tq4iN4Z1wtu3MnDMfTnZ/mZVYhWi3AmGGGreerdhX+N/nmWEKzp62ilYtB8l90Ysq cNIa6emA +H0in9A69uPKtIfq8M5NB2EAEYg3vg+Awe7vxPawRg8IebJaPTqENgGXVggY79rVamoeNmJT9w9TIHBvviP35f9aLmC8fm6g2lnq5c6fKlbdZU/Xu5h8Ds+/NG0snxzkI4jbZU14fl+lblwKU+8z7aMikco+zxBuXyB3wsTjn/ea2CYGutYxhsEngWo9ZpTUANFNS0erxuDnah/TXHKIUFJ4LOaOFXZY+bBxt 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: List-Subscribe: List-Unsubscribe: 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 > --- > 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 > #include > #include > +#include > #include > #include > #include > @@ -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.