[PATCH 1/2] mm/mmu_gather: remove unused __tlb_remove_page()

[PATCH 1/2] mm/mmu_gather: remove unused __tlb_remove_page()

[Baoquan He]

Nobody is using __tlb_remove_page() now, clean it up.

Signed-off-by: Baoquan He <bhe@redhat.com>
---
 include/asm-generic/tlb.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
index e402aef79c93..9ae4ca02f29f 100644
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
@@ -489,12 +489,6 @@ static inline void tlb_remove_page_size(struct mmu_gather *tlb,
 		tlb_flush_mmu(tlb);
 }
 
-static __always_inline bool __tlb_remove_page(struct mmu_gather *tlb,
-		struct page *page, bool delay_rmap)
-{
-	return __tlb_remove_page_size(tlb, page, delay_rmap, PAGE_SIZE);
-}
-
 /* tlb_remove_page
  *	Similar to __tlb_remove_page but will call tlb_flush_mmu() itself when
  *	required.
-- 
2.41.0

[PATCH 2/2] mm/mmu_gather: clean up the stale code comment

[Baoquan He]

In commit d7f861b9c43a ("mm/mmu_gather: add __tlb_remove_folio_pages()"),
helper function __tlb_remove_folio_pages_size() was added. And based on
the helper, wrapper functions __tlb_remove_folio_pages() and
__tlb_remove_page_size() are created and used by upper level functions.

So let's update the code comment to reflect the current code about
tlb_remove_page()/tlb_remove_page_size(), etc.

Signed-off-by: Baoquan He <bhe@redhat.com>
---
 include/asm-generic/tlb.h | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
index 9ae4ca02f29f..5f99b3cf73fc 100644
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
@@ -67,22 +67,21 @@
  *
  *    See also MMU_GATHER_TABLE_FREE and MMU_GATHER_RCU_TABLE_FREE.
  *
- *  - tlb_remove_page() / __tlb_remove_page()
- *  - tlb_remove_page_size() / __tlb_remove_page_size()
- *  - __tlb_remove_folio_pages()
+ *  - tlb_remove_page() / tlb_remove_page_size()
+ *  - __tlb_remove_folio_pages() / __tlb_remove_page_size()
+ *  - __tlb_remove_folio_pages_size()
  *
- *    __tlb_remove_page_size() is the basic primitive that queues a page for
- *    freeing. __tlb_remove_page() assumes PAGE_SIZE. Both will return a
- *    boolean indicating if the queue is (now) full and a call to
- *    tlb_flush_mmu() is required.
+ *    __tlb_remove_folio_pages_size() is the basic primitive that queues pages
+ *    for freeing. It will return a boolean indicating if the queue is (now)
+ *    full and a call to tlb_flush_mmu() is required.
  *
  *    tlb_remove_page() and tlb_remove_page_size() imply the call to
  *    tlb_flush_mmu() when required and has no return value.
  *
- *    __tlb_remove_folio_pages() is similar to __tlb_remove_page(), however,
- *    instead of removing a single page, remove the given number of consecutive
- *    pages that are all part of the same (large) folio: just like calling
- *    __tlb_remove_page() on each page individually.
+ *    __tlb_remove_folio_pages() is similar to __tlb_remove_page_size(),
+ *    however, instead of removing a single page, assume PAGE_SIZE and remove
+ *    the given number of consecutive pages that are all part of the
+ *    same (large) folio.
  *
  *  - tlb_change_page_size()
  *
-- 
2.41.0

Re: [PATCH 1/2] mm/mmu_gather: remove unused __tlb_remove_page()

[Qi Zheng]

On 2025/2/11 11:43, Baoquan He wrote:
> Nobody is using __tlb_remove_page() now, clean it up.
> 
> Signed-off-by: Baoquan He <bhe@redhat.com>
> ---
>   include/asm-generic/tlb.h | 6 ------
>   1 file changed, 6 deletions(-)
> 
> diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
> index e402aef79c93..9ae4ca02f29f 100644
> --- a/include/asm-generic/tlb.h
> +++ b/include/asm-generic/tlb.h
> @@ -489,12 +489,6 @@ static inline void tlb_remove_page_size(struct mmu_gather *tlb,
>   		tlb_flush_mmu(tlb);
>   }
>   
> -static __always_inline bool __tlb_remove_page(struct mmu_gather *tlb,
> -		struct page *page, bool delay_rmap)
> -{
> -	return __tlb_remove_page_size(tlb, page, delay_rmap, PAGE_SIZE);
> -}
> -
>   /* tlb_remove_page
>    *	Similar to __tlb_remove_page but will call tlb_flush_mmu() itself when

                    ^
                    please update this too

Otherwise:

Reviewed-by: Qi Zheng <zhengqi.arch@bytedance.com>

>    *	required.

Re: [PATCH 2/2] mm/mmu_gather: clean up the stale code comment

[Qi Zheng]

On 2025/2/11 11:43, Baoquan He wrote:
> In commit d7f861b9c43a ("mm/mmu_gather: add __tlb_remove_folio_pages()"),
> helper function __tlb_remove_folio_pages_size() was added. And based on
> the helper, wrapper functions __tlb_remove_folio_pages() and
> __tlb_remove_page_size() are created and used by upper level functions.
> 
> So let's update the code comment to reflect the current code about
> tlb_remove_page()/tlb_remove_page_size(), etc.
> 
> Signed-off-by: Baoquan He <bhe@redhat.com>
> ---
>   include/asm-generic/tlb.h | 21 ++++++++++-----------
>   1 file changed, 10 insertions(+), 11 deletions(-)

Reviewed-by: Qi Zheng <zhengqi.arch@bytedance.com>

Thanks!

> 
> diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
> index 9ae4ca02f29f..5f99b3cf73fc 100644
> --- a/include/asm-generic/tlb.h
> +++ b/include/asm-generic/tlb.h
> @@ -67,22 +67,21 @@
>    *
>    *    See also MMU_GATHER_TABLE_FREE and MMU_GATHER_RCU_TABLE_FREE.
>    *
> - *  - tlb_remove_page() / __tlb_remove_page()
> - *  - tlb_remove_page_size() / __tlb_remove_page_size()
> - *  - __tlb_remove_folio_pages()
> + *  - tlb_remove_page() / tlb_remove_page_size()
> + *  - __tlb_remove_folio_pages() / __tlb_remove_page_size()
> + *  - __tlb_remove_folio_pages_size()
>    *
> - *    __tlb_remove_page_size() is the basic primitive that queues a page for
> - *    freeing. __tlb_remove_page() assumes PAGE_SIZE. Both will return a
> - *    boolean indicating if the queue is (now) full and a call to
> - *    tlb_flush_mmu() is required.
> + *    __tlb_remove_folio_pages_size() is the basic primitive that queues pages
> + *    for freeing. It will return a boolean indicating if the queue is (now)
> + *    full and a call to tlb_flush_mmu() is required.
>    *
>    *    tlb_remove_page() and tlb_remove_page_size() imply the call to
>    *    tlb_flush_mmu() when required and has no return value.
>    *
> - *    __tlb_remove_folio_pages() is similar to __tlb_remove_page(), however,
> - *    instead of removing a single page, remove the given number of consecutive
> - *    pages that are all part of the same (large) folio: just like calling
> - *    __tlb_remove_page() on each page individually.
> + *    __tlb_remove_folio_pages() is similar to __tlb_remove_page_size(),
> + *    however, instead of removing a single page, assume PAGE_SIZE and remove
> + *    the given number of consecutive pages that are all part of the
> + *    same (large) folio.
>    *
>    *  - tlb_change_page_size()
>    *

Re: [PATCH 1/2] mm/mmu_gather: remove unused __tlb_remove_page()

[Baoquan He]

On 02/11/25 at 03:45pm, Qi Zheng wrote:
> 
> 
> On 2025/2/11 11:43, Baoquan He wrote:
> > Nobody is using __tlb_remove_page() now, clean it up.
> > 
> > Signed-off-by: Baoquan He <bhe@redhat.com>
> > ---
> >   include/asm-generic/tlb.h | 6 ------
> >   1 file changed, 6 deletions(-)
> > 
> > diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
> > index e402aef79c93..9ae4ca02f29f 100644
> > --- a/include/asm-generic/tlb.h
> > +++ b/include/asm-generic/tlb.h
> > @@ -489,12 +489,6 @@ static inline void tlb_remove_page_size(struct mmu_gather *tlb,
> >   		tlb_flush_mmu(tlb);
> >   }
> > -static __always_inline bool __tlb_remove_page(struct mmu_gather *tlb,
> > -		struct page *page, bool delay_rmap)
> > -{
> > -	return __tlb_remove_page_size(tlb, page, delay_rmap, PAGE_SIZE);
> > -}
> > -
> >   /* tlb_remove_page
> >    *	Similar to __tlb_remove_page but will call tlb_flush_mmu() itself when
> 
>                    ^
>                    please update this too

Good catch, will remove the unneeded code comment. Thanks for reviewing.

> 
> Otherwise:
> 
> Reviewed-by: Qi Zheng <zhengqi.arch@bytedance.com>
> 
> >    *	required.
> 

[PATCH v2 1/2] mm/mmu_gather: remove unused __tlb_remove_page()

[Baoquan He]

Nobody is using __tlb_remove_page() now, clean it up.

And also remove the code comment above tlb_remove_page() because
it's not meaningful any more.

Signed-off-by: Baoquan He <bhe@redhat.com>
Reviewed-by: Qi Zheng <zhengqi.arch@bytedance.com>
---
 include/asm-generic/tlb.h | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
index e402aef79c93..1fac1985127d 100644
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
@@ -489,16 +489,6 @@ static inline void tlb_remove_page_size(struct mmu_gather *tlb,
 		tlb_flush_mmu(tlb);
 }
 
-static __always_inline bool __tlb_remove_page(struct mmu_gather *tlb,
-		struct page *page, bool delay_rmap)
-{
-	return __tlb_remove_page_size(tlb, page, delay_rmap, PAGE_SIZE);
-}
-
-/* tlb_remove_page
- *	Similar to __tlb_remove_page but will call tlb_flush_mmu() itself when
- *	required.
- */
 static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
 {
 	return tlb_remove_page_size(tlb, page, PAGE_SIZE);
-- 
2.41.0