2022-01-25 19:27:11

by Miaohe Lin

Subject: [PATCH] mm/balloon_compaction: make balloon page compaction callbacks static

Since commit b1123ea6d3b3 ("mm: balloon: use general non-lru movable page
feature"), these functions are called via balloon_aops callbacks. They're
not called directly outside this file. So make them static and clean up
the relevant code.

Signed-off-by: Miaohe Lin <[email protected]>
---
include/linux/balloon_compaction.h | 22 ----------------------
mm/balloon_compaction.c | 6 +++---
2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h
index 338aa27e4773..edb7f6d41faa 100644
--- a/include/linux/balloon_compaction.h
+++ b/include/linux/balloon_compaction.h
@@ -80,12 +80,6 @@ static inline void balloon_devinfo_init(struct balloon_dev_info *balloon)

#ifdef CONFIG_BALLOON_COMPACTION
extern const struct address_space_operations balloon_aops;
-extern bool balloon_page_isolate(struct page *page,
- isolate_mode_t mode);
-extern void balloon_page_putback(struct page *page);
-extern int balloon_page_migrate(struct address_space *mapping,
- struct page *newpage,
- struct page *page, enum migrate_mode mode);

/*
* balloon_page_insert - insert a page into the balloon's page list and make
@@ -155,22 +149,6 @@ static inline void balloon_page_delete(struct page *page)
list_del(&page->lru);
}

-static inline bool balloon_page_isolate(struct page *page)
-{
- return false;
-}
-
-static inline void balloon_page_putback(struct page *page)
-{
- return;
-}
-
-static inline int balloon_page_migrate(struct page *newpage,
- struct page *page, enum migrate_mode mode)
-{
- return 0;
-}
-
static inline gfp_t balloon_mapping_gfp_mask(void)
{
return GFP_HIGHUSER;
diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c
index 907fefde2572..4b8eab4b3f45 100644
--- a/mm/balloon_compaction.c
+++ b/mm/balloon_compaction.c
@@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(balloon_page_dequeue);

#ifdef CONFIG_BALLOON_COMPACTION

-bool balloon_page_isolate(struct page *page, isolate_mode_t mode)
+static bool balloon_page_isolate(struct page *page, isolate_mode_t mode)

{
struct balloon_dev_info *b_dev_info = balloon_page_device(page);
@@ -217,7 +217,7 @@ bool balloon_page_isolate(struct page *page, isolate_mode_t mode)
return true;
}

-void balloon_page_putback(struct page *page)
+static void balloon_page_putback(struct page *page)
{
struct balloon_dev_info *b_dev_info = balloon_page_device(page);
unsigned long flags;
@@ -230,7 +230,7 @@ void balloon_page_putback(struct page *page)


/* move_to_new_page() counterpart for a ballooned page */
-int balloon_page_migrate(struct address_space *mapping,
+static int balloon_page_migrate(struct address_space *mapping,
struct page *newpage, struct page *page,
enum migrate_mode mode)
{
--
2.23.0

2022-01-25 19:37:51

by David Hildenbrand

Subject: Re: [PATCH] mm/balloon_compaction: make balloon page compaction callbacks static

On 25.01.22 14:22, Miaohe Lin wrote:
> Since commit b1123ea6d3b3 ("mm: balloon: use general non-lru movable page
> feature"), these functions are called via balloon_aops callbacks. They're
> not called directly outside this file. So make them static and clean up
> the relevant code.
>
> Signed-off-by: Miaohe Lin <[email protected]>

Reviewed-by: David Hildenbrand <[email protected]>


--
Thanks,

David / dhildenb

2022-01-25 20:19:43

by Muchun Song

Subject: Re: [PATCH] mm/balloon_compaction: make balloon page compaction callbacks static

On Tue, Jan 25, 2022 at 9:29 PM Miaohe Lin <[email protected]> wrote:
>
> Since commit b1123ea6d3b3 ("mm: balloon: use general non-lru movable page
> feature"), these functions are called via balloon_aops callbacks. They're
> not called directly outside this file. So make them static and clean up
> the relevant code.
>
> Signed-off-by: Miaohe Lin <[email protected]>

Reviewed-by: Muchun Song <[email protected]>

2022-01-26 03:11:45

by Rafael Aquini

Subject: Re: [PATCH] mm/balloon_compaction: make balloon page compaction callbacks static

On Tue, Jan 25, 2022 at 09:22:21PM +0800, Miaohe Lin wrote:
> Since commit b1123ea6d3b3 ("mm: balloon: use general non-lru movable page
> feature"), these functions are called via balloon_aops callbacks. They're
> not called directly outside this file. So make them static and clean up
> the relevant code.
>
> Signed-off-by: Miaohe Lin <[email protected]>
> ---
> include/linux/balloon_compaction.h | 22 ----------------------
> mm/balloon_compaction.c | 6 +++---
> 2 files changed, 3 insertions(+), 25 deletions(-)
>
> diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h
> index 338aa27e4773..edb7f6d41faa 100644
> --- a/include/linux/balloon_compaction.h
> +++ b/include/linux/balloon_compaction.h
> @@ -80,12 +80,6 @@ static inline void balloon_devinfo_init(struct balloon_dev_info *balloon)
>
> #ifdef CONFIG_BALLOON_COMPACTION
> extern const struct address_space_operations balloon_aops;
> -extern bool balloon_page_isolate(struct page *page,
> - isolate_mode_t mode);
> -extern void balloon_page_putback(struct page *page);
> -extern int balloon_page_migrate(struct address_space *mapping,
> - struct page *newpage,
> - struct page *page, enum migrate_mode mode);
>
> /*
> * balloon_page_insert - insert a page into the balloon's page list and make
> @@ -155,22 +149,6 @@ static inline void balloon_page_delete(struct page *page)
> list_del(&page->lru);
> }
>
> -static inline bool balloon_page_isolate(struct page *page)
> -{
> - return false;
> -}
> -
> -static inline void balloon_page_putback(struct page *page)
> -{
> - return;
> -}
> -
> -static inline int balloon_page_migrate(struct page *newpage,
> - struct page *page, enum migrate_mode mode)
> -{
> - return 0;
> -}
> -
> static inline gfp_t balloon_mapping_gfp_mask(void)
> {
> return GFP_HIGHUSER;
> diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c
> index 907fefde2572..4b8eab4b3f45 100644
> --- a/mm/balloon_compaction.c
> +++ b/mm/balloon_compaction.c
> @@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(balloon_page_dequeue);
>
> #ifdef CONFIG_BALLOON_COMPACTION
>
> -bool balloon_page_isolate(struct page *page, isolate_mode_t mode)
> +static bool balloon_page_isolate(struct page *page, isolate_mode_t mode)
>
> {
> struct balloon_dev_info *b_dev_info = balloon_page_device(page);
> @@ -217,7 +217,7 @@ bool balloon_page_isolate(struct page *page, isolate_mode_t mode)
> return true;
> }
>
> -void balloon_page_putback(struct page *page)
> +static void balloon_page_putback(struct page *page)
> {
> struct balloon_dev_info *b_dev_info = balloon_page_device(page);
> unsigned long flags;
> @@ -230,7 +230,7 @@ void balloon_page_putback(struct page *page)
>
>
> /* move_to_new_page() counterpart for a ballooned page */
> -int balloon_page_migrate(struct address_space *mapping,
> +static int balloon_page_migrate(struct address_space *mapping,
> struct page *newpage, struct page *page,
> enum migrate_mode mode)
> {
> --
> 2.23.0
>
>
Acked-by: Rafael Aquini <[email protected]>

2022-01-26 03:11:49

by Michael S. Tsirkin

Subject: Re: [PATCH] mm/balloon_compaction: make balloon page compaction callbacks static

On Tue, Jan 25, 2022 at 09:22:21PM +0800, Miaohe Lin wrote:
> Since commit b1123ea6d3b3 ("mm: balloon: use general non-lru movable page
> feature"), these functions are called via balloon_aops callbacks. They're
> not called directly outside this file. So make them static and clean up
> the relevant code.
>
> Signed-off-by: Miaohe Lin <[email protected]>

Acked-by: Michael S. Tsirkin <[email protected]>

I'll queue this unless someone else does first.

> ---
> include/linux/balloon_compaction.h | 22 ----------------------
> mm/balloon_compaction.c | 6 +++---
> 2 files changed, 3 insertions(+), 25 deletions(-)
>
> diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h
> index 338aa27e4773..edb7f6d41faa 100644
> --- a/include/linux/balloon_compaction.h
> +++ b/include/linux/balloon_compaction.h
> @@ -80,12 +80,6 @@ static inline void balloon_devinfo_init(struct balloon_dev_info *balloon)
>
> #ifdef CONFIG_BALLOON_COMPACTION
> extern const struct address_space_operations balloon_aops;
> -extern bool balloon_page_isolate(struct page *page,
> - isolate_mode_t mode);
> -extern void balloon_page_putback(struct page *page);
> -extern int balloon_page_migrate(struct address_space *mapping,
> - struct page *newpage,
> - struct page *page, enum migrate_mode mode);
>
> /*
> * balloon_page_insert - insert a page into the balloon's page list and make
> @@ -155,22 +149,6 @@ static inline void balloon_page_delete(struct page *page)
> list_del(&page->lru);
> }
>
> -static inline bool balloon_page_isolate(struct page *page)
> -{
> - return false;
> -}
> -
> -static inline void balloon_page_putback(struct page *page)
> -{
> - return;
> -}
> -
> -static inline int balloon_page_migrate(struct page *newpage,
> - struct page *page, enum migrate_mode mode)
> -{
> - return 0;
> -}
> -
> static inline gfp_t balloon_mapping_gfp_mask(void)
> {
> return GFP_HIGHUSER;
> diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c
> index 907fefde2572..4b8eab4b3f45 100644
> --- a/mm/balloon_compaction.c
> +++ b/mm/balloon_compaction.c
> @@ -203,7 +203,7 @@ EXPORT_SYMBOL_GPL(balloon_page_dequeue);
>
> #ifdef CONFIG_BALLOON_COMPACTION
>
> -bool balloon_page_isolate(struct page *page, isolate_mode_t mode)
> +static bool balloon_page_isolate(struct page *page, isolate_mode_t mode)
>
> {
> struct balloon_dev_info *b_dev_info = balloon_page_device(page);
> @@ -217,7 +217,7 @@ bool balloon_page_isolate(struct page *page, isolate_mode_t mode)
> return true;
> }
>
> -void balloon_page_putback(struct page *page)
> +static void balloon_page_putback(struct page *page)
> {
> struct balloon_dev_info *b_dev_info = balloon_page_device(page);
> unsigned long flags;
> @@ -230,7 +230,7 @@ void balloon_page_putback(struct page *page)
>
>
> /* move_to_new_page() counterpart for a ballooned page */
> -int balloon_page_migrate(struct address_space *mapping,
> +static int balloon_page_migrate(struct address_space *mapping,
> struct page *newpage, struct page *page,
> enum migrate_mode mode)
> {
> --
> 2.23.0