2023-06-10 03:52:36

by Miaohe Lin

Subject: [PATCH] mm: compaction: mark kcompactd_run() and kcompactd_stop() __meminit

Add __meminit to kcompactd_run() and kcompactd_stop() to ensure they're
default to __init when memory hotplug is not enabled.

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

diff --git a/include/linux/compaction.h b/include/linux/compaction.h
index 57b16e69c19a..e94776496049 100644
--- a/include/linux/compaction.h
+++ b/include/linux/compaction.h
@@ -98,8 +98,8 @@ extern void compaction_defer_reset(struct zone *zone, int order,
bool compaction_zonelist_suitable(struct alloc_context *ac, int order,
int alloc_flags);

-extern void kcompactd_run(int nid);
-extern void kcompactd_stop(int nid);
+extern void __meminit kcompactd_run(int nid);
+extern void __meminit kcompactd_stop(int nid);
extern void wakeup_kcompactd(pg_data_t *pgdat, int order, int highest_zoneidx);

#else
diff --git a/mm/compaction.c b/mm/compaction.c
index 3398ef3a55fe..8859cc91062f 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -3086,7 +3086,7 @@ static int kcompactd(void *p)
* This kcompactd start function will be called by init and node-hot-add.
* On node-hot-add, kcompactd will moved to proper cpus if cpus are hot-added.
*/
-void kcompactd_run(int nid)
+void __meminit kcompactd_run(int nid)
{
pg_data_t *pgdat = NODE_DATA(nid);

@@ -3104,7 +3104,7 @@ void kcompactd_run(int nid)
* Called by memory hotplug when all memory in a node is offlined. Caller must
* be holding mem_hotplug_begin/done().
*/
-void kcompactd_stop(int nid)
+void __meminit kcompactd_stop(int nid)
{
struct task_struct *kcompactd = NODE_DATA(nid)->kcompactd;

--
2.27.0

2023-06-12 10:19:11

by Baolin Wang

Subject: Re: [PATCH] mm: compaction: mark kcompactd_run() and kcompactd_stop() __meminit

On 6/10/2023 11:46 AM, Miaohe Lin wrote:
> Add __meminit to kcompactd_run() and kcompactd_stop() to ensure they're
> default to __init when memory hotplug is not enabled.
>
> Signed-off-by: Miaohe Lin <[email protected]>

LGTM.
Reviewed-by: Baolin Wang <[email protected]>

> ---
> include/linux/compaction.h | 4 ++--
> mm/compaction.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/linux/compaction.h b/include/linux/compaction.h
> index 57b16e69c19a..e94776496049 100644
> --- a/include/linux/compaction.h
> +++ b/include/linux/compaction.h
> @@ -98,8 +98,8 @@ extern void compaction_defer_reset(struct zone *zone, int order,
> bool compaction_zonelist_suitable(struct alloc_context *ac, int order,
> int alloc_flags);
>
> -extern void kcompactd_run(int nid);
> -extern void kcompactd_stop(int nid);
> +extern void __meminit kcompactd_run(int nid);
> +extern void __meminit kcompactd_stop(int nid);
> extern void wakeup_kcompactd(pg_data_t *pgdat, int order, int highest_zoneidx);
>
> #else
> diff --git a/mm/compaction.c b/mm/compaction.c
> index 3398ef3a55fe..8859cc91062f 100644
> --- a/mm/compaction.c
> +++ b/mm/compaction.c
> @@ -3086,7 +3086,7 @@ static int kcompactd(void *p)
> * This kcompactd start function will be called by init and node-hot-add.
> * On node-hot-add, kcompactd will moved to proper cpus if cpus are hot-added.
> */
> -void kcompactd_run(int nid)
> +void __meminit kcompactd_run(int nid)
> {
> pg_data_t *pgdat = NODE_DATA(nid);
>
> @@ -3104,7 +3104,7 @@ void kcompactd_run(int nid)
> * Called by memory hotplug when all memory in a node is offlined. Caller must
> * be holding mem_hotplug_begin/done().
> */
> -void kcompactd_stop(int nid)
> +void __meminit kcompactd_stop(int nid)
> {
> struct task_struct *kcompactd = NODE_DATA(nid)->kcompactd;
>