[PATCH] mm/hugetlb: use account_new_hugetlb_folio() in add_hugetlb_folio()

[PATCH] mm/hugetlb: use account_new_hugetlb_folio() in add_hugetlb_folio()

[Enze Li]

Every other place that accounts a new huge page already calls
account_new_hugetlb_folio(), and add_hugetlb_folio() was the odd one
out, still open-coding the same two increments.  Swap it over.

The helper is defined further down the file, so add a forward
declaration for it.

No functional change intended.

Signed-off-by: Enze Li <lienze@kylinos.cn>
---
 mm/hugetlb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 4a008afaedf9..a8d162449daa 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -142,6 +142,7 @@ static void hugetlb_unmap_range(struct mmu_gather *tlb,
 				unsigned long end, struct folio *folio,
 				zap_flags_t zap_flags);
 static struct resv_map *vma_resv_map(struct vm_area_struct *vma);
+static void account_new_hugetlb_folio(struct hstate *h, struct folio *folio);
 
 static inline bool subpool_is_free(struct hugepage_subpool *spool)
 {
@@ -1444,8 +1445,7 @@ void add_hugetlb_folio(struct hstate *h, struct folio *folio,
 	lockdep_assert_held(&hugetlb_lock);
 
 	INIT_LIST_HEAD(&folio->lru);
-	h->nr_huge_pages++;
-	h->nr_huge_pages_node[nid]++;
+	account_new_hugetlb_folio(h, folio);
 
 	if (adjust_surplus) {
 		h->surplus_huge_pages++;

base-commit: bae9a042b03b27924c6fd5bdc00a20d6a44d6041
-- 
2.56.0

Re: [PATCH] mm/hugetlb: use account_new_hugetlb_folio() in add_hugetlb_folio()

[Muchun Song]

> On Oct 27, 2026, at 14:04, Enze Li <lienze@kylinos.cn> wrote:
> 
> Every other place that accounts a new huge page already calls
> account_new_hugetlb_folio(), and add_hugetlb_folio() was the odd one
> out, still open-coding the same two increments.  Swap it over.
> 
> The helper is defined further down the file, so add a forward
> declaration for it.
> 
> No functional change intended.
> 
> Signed-off-by: Enze Li <lienze@kylinos.cn>

Reviewed-by: Muchun Song <muchun.song@linux.dev>

Thanks.

Re: [PATCH] mm/hugetlb: use account_new_hugetlb_folio() in add_hugetlb_folio()

[David Hildenbrand (Arm)]

On 10/27/26 07:04, Enze Li wrote:
> Every other place that accounts a new huge page already calls
> account_new_hugetlb_folio(), and add_hugetlb_folio() was the odd one
> out, still open-coding the same two increments.  Swap it over.
> 
> The helper is defined further down the file, so add a forward
> declaration for it.
> 
> No functional change intended.
> 
> Signed-off-by: Enze Li <lienze@kylinos.cn>
> ---
>  mm/hugetlb.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 4a008afaedf9..a8d162449daa 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -142,6 +142,7 @@ static void hugetlb_unmap_range(struct mmu_gather *tlb,
>  				unsigned long end, struct folio *folio,
>  				zap_flags_t zap_flags);
>  static struct resv_map *vma_resv_map(struct vm_area_struct *vma);
> +static void account_new_hugetlb_folio(struct hstate *h, struct folio *folio);
>  
>  static inline bool subpool_is_free(struct hugepage_subpool *spool)
>  {
> @@ -1444,8 +1445,7 @@ void add_hugetlb_folio(struct hstate *h, struct folio *folio,
>  	lockdep_assert_held(&hugetlb_lock);
>  
>  	INIT_LIST_HEAD(&folio->lru);
> -	h->nr_huge_pages++;
> -	h->nr_huge_pages_node[nid]++;
> +	account_new_hugetlb_folio(h, folio);
>  
>  	if (adjust_surplus) {
>  		h->surplus_huge_pages++;
> 
> base-commit: bae9a042b03b27924c6fd5bdc00a20d6a44d6041

I have a fix in that area planned. So let's revisit that in a couple of weeks.


-- 
Cheers,

David

Re: [PATCH] mm/hugetlb: use account_new_hugetlb_folio() in add_hugetlb_folio()

[Enze Li]

On 10/27/26 5:03 PM, David Hildenbrand (Arm) wrote:
> On 10/27/26 07:04, Enze Li wrote:
>> Every other place that accounts a new huge page already calls
>> account_new_hugetlb_folio(), and add_hugetlb_folio() was the odd one
>> out, still open-coding the same two increments.  Swap it over.
>>
>> The helper is defined further down the file, so add a forward
>> declaration for it.
>>
>> No functional change intended.
>>
>> Signed-off-by: Enze Li <lienze@kylinos.cn>
>> ---
>>  mm/hugetlb.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
>> index 4a008afaedf9..a8d162449daa 100644
>> --- a/mm/hugetlb.c
>> +++ b/mm/hugetlb.c
>> @@ -142,6 +142,7 @@ static void hugetlb_unmap_range(struct mmu_gather *tlb,
>>  				unsigned long end, struct folio *folio,
>>  				zap_flags_t zap_flags);
>>  static struct resv_map *vma_resv_map(struct vm_area_struct *vma);
>> +static void account_new_hugetlb_folio(struct hstate *h, struct folio *folio);
>>  
>>  static inline bool subpool_is_free(struct hugepage_subpool *spool)
>>  {
>> @@ -1444,8 +1445,7 @@ void add_hugetlb_folio(struct hstate *h, struct folio *folio,
>>  	lockdep_assert_held(&hugetlb_lock);
>>  
>>  	INIT_LIST_HEAD(&folio->lru);
>> -	h->nr_huge_pages++;
>> -	h->nr_huge_pages_node[nid]++;
>> +	account_new_hugetlb_folio(h, folio);
>>  
>>  	if (adjust_surplus) {
>>  		h->surplus_huge_pages++;
>>
>> base-commit: bae9a042b03b27924c6fd5bdc00a20d6a44d6041
> 
> I have a fix in that area planned. So let's revisit that in a couple of weeks.
> 

Thanks for the heads-up.  I'll hold off on this one and resend in a
couple of weeks once your changes land, if it's still needed.

Best regards,
Enze

Re: [PATCH] mm/hugetlb: use account_new_hugetlb_folio() in add_hugetlb_folio()

[David Hildenbrand (Arm)]

On 10/27/26 11:01, Enze Li wrote:
> 
> 
> On 10/27/26 5:03 PM, David Hildenbrand (Arm) wrote:
>> On 10/27/26 07:04, Enze Li wrote:
>>> Every other place that accounts a new huge page already calls
>>> account_new_hugetlb_folio(), and add_hugetlb_folio() was the odd one
>>> out, still open-coding the same two increments.  Swap it over.
>>>
>>> The helper is defined further down the file, so add a forward
>>> declaration for it.
>>>
>>> No functional change intended.
>>>
>>> Signed-off-by: Enze Li <lienze@kylinos.cn>
>>> ---
>>>  mm/hugetlb.c | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
>>> index 4a008afaedf9..a8d162449daa 100644
>>> --- a/mm/hugetlb.c
>>> +++ b/mm/hugetlb.c
>>> @@ -142,6 +142,7 @@ static void hugetlb_unmap_range(struct mmu_gather *tlb,
>>>  				unsigned long end, struct folio *folio,
>>>  				zap_flags_t zap_flags);
>>>  static struct resv_map *vma_resv_map(struct vm_area_struct *vma);
>>> +static void account_new_hugetlb_folio(struct hstate *h, struct folio *folio);
>>>  
>>>  static inline bool subpool_is_free(struct hugepage_subpool *spool)
>>>  {
>>> @@ -1444,8 +1445,7 @@ void add_hugetlb_folio(struct hstate *h, struct folio *folio,
>>>  	lockdep_assert_held(&hugetlb_lock);
>>>  
>>>  	INIT_LIST_HEAD(&folio->lru);
>>> -	h->nr_huge_pages++;
>>> -	h->nr_huge_pages_node[nid]++;
>>> +	account_new_hugetlb_folio(h, folio);
>>>  
>>>  	if (adjust_surplus) {
>>>  		h->surplus_huge_pages++;
>>>
>>> base-commit: bae9a042b03b27924c6fd5bdc00a20d6a44d6041
>>
>> I have a fix in that area planned. So let's revisit that in a couple of weeks.
>>
> 
> Thanks for the heads-up.  I'll hold off on this one and resend in a
> couple of weeks once your changes land, if it's still needed.

Thanks. In general, try avoiding things that are not fixes during the merge
window as we try to focus on fixing things (right now more than ever).

-- 
Cheers,

David