* [PATCH -next] memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order
@ 2024-05-09 3:26 Xiu Jianfeng
2024-05-09 19:39 ` Roman Gushchin
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Xiu Jianfeng @ 2024-05-09 3:26 UTC (permalink / raw)
To: mingo, peterz, juri.lelli, vincent.guittot, dietmar.eggemann,
rostedt, bsegall, mgorman, bristot, vschneid, hannes, mhocko,
roman.gushchin, shakeel.butt, muchun.song, akpm
Cc: linux-kernel, cgroups, linux-mm
Since commit 857f21397f71 ("memcg, oom: remove unnecessary check in
mem_cgroup_oom_synchronize()"), memcg_oom_gfp_mask and memcg_oom_order
are no longer used any more.
Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
---
include/linux/sched.h | 2 --
mm/memcontrol.c | 2 --
2 files changed, 4 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 8d1cf672ac4c..61591ac6eab6 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1449,8 +1449,6 @@ struct task_struct {
#ifdef CONFIG_MEMCG
struct mem_cgroup *memcg_in_oom;
- gfp_t memcg_oom_gfp_mask;
- int memcg_oom_order;
/* Number of pages to reclaim on returning to userland: */
unsigned int memcg_nr_pages_over_high;
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 5d4da23264fa..d127c9c5fabf 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2192,8 +2192,6 @@ static bool mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
if (current->in_user_fault) {
css_get(&memcg->css);
current->memcg_in_oom = memcg;
- current->memcg_oom_gfp_mask = mask;
- current->memcg_oom_order = order;
}
return false;
}
--
2.34.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH -next] memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order
2024-05-09 3:26 [PATCH -next] memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order Xiu Jianfeng
@ 2024-05-09 19:39 ` Roman Gushchin
2024-05-09 21:27 ` Shakeel Butt
2024-05-10 11:57 ` Michal Hocko
2 siblings, 0 replies; 4+ messages in thread
From: Roman Gushchin @ 2024-05-09 19:39 UTC (permalink / raw)
To: Xiu Jianfeng
Cc: mingo, peterz, juri.lelli, vincent.guittot, dietmar.eggemann,
rostedt, bsegall, mgorman, bristot, vschneid, hannes, mhocko,
shakeel.butt, muchun.song, akpm, linux-kernel, cgroups, linux-mm
On Thu, May 09, 2024 at 03:26:28AM +0000, Xiu Jianfeng wrote:
> Since commit 857f21397f71 ("memcg, oom: remove unnecessary check in
> mem_cgroup_oom_synchronize()"), memcg_oom_gfp_mask and memcg_oom_order
> are no longer used any more.
>
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Good catch!
Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev>
Thanks
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH -next] memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order
2024-05-09 3:26 [PATCH -next] memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order Xiu Jianfeng
2024-05-09 19:39 ` Roman Gushchin
@ 2024-05-09 21:27 ` Shakeel Butt
2024-05-10 11:57 ` Michal Hocko
2 siblings, 0 replies; 4+ messages in thread
From: Shakeel Butt @ 2024-05-09 21:27 UTC (permalink / raw)
To: Xiu Jianfeng
Cc: mingo, peterz, juri.lelli, vincent.guittot, dietmar.eggemann,
rostedt, bsegall, mgorman, bristot, vschneid, hannes, mhocko,
roman.gushchin, muchun.song, akpm, linux-kernel, cgroups,
linux-mm
On Thu, May 09, 2024 at 03:26:28AM +0000, Xiu Jianfeng wrote:
> Since commit 857f21397f71 ("memcg, oom: remove unnecessary check in
> mem_cgroup_oom_synchronize()"), memcg_oom_gfp_mask and memcg_oom_order
> are no longer used any more.
>
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH -next] memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order
2024-05-09 3:26 [PATCH -next] memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order Xiu Jianfeng
2024-05-09 19:39 ` Roman Gushchin
2024-05-09 21:27 ` Shakeel Butt
@ 2024-05-10 11:57 ` Michal Hocko
2 siblings, 0 replies; 4+ messages in thread
From: Michal Hocko @ 2024-05-10 11:57 UTC (permalink / raw)
To: Xiu Jianfeng
Cc: mingo, peterz, juri.lelli, vincent.guittot, dietmar.eggemann,
rostedt, bsegall, mgorman, bristot, vschneid, hannes,
roman.gushchin, shakeel.butt, muchun.song, akpm, linux-kernel,
cgroups, linux-mm
On Thu 09-05-24 03:26:28, Xiu Jianfeng wrote:
> Since commit 857f21397f71 ("memcg, oom: remove unnecessary check in
> mem_cgroup_oom_synchronize()"), memcg_oom_gfp_mask and memcg_oom_order
> are no longer used any more.
>
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Thanks!
> ---
> include/linux/sched.h | 2 --
> mm/memcontrol.c | 2 --
> 2 files changed, 4 deletions(-)
>
> diff --git a/include/linux/sched.h b/include/linux/sched.h
> index 8d1cf672ac4c..61591ac6eab6 100644
> --- a/include/linux/sched.h
> +++ b/include/linux/sched.h
> @@ -1449,8 +1449,6 @@ struct task_struct {
>
> #ifdef CONFIG_MEMCG
> struct mem_cgroup *memcg_in_oom;
> - gfp_t memcg_oom_gfp_mask;
> - int memcg_oom_order;
>
> /* Number of pages to reclaim on returning to userland: */
> unsigned int memcg_nr_pages_over_high;
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 5d4da23264fa..d127c9c5fabf 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -2192,8 +2192,6 @@ static bool mem_cgroup_oom(struct mem_cgroup *memcg, gfp_t mask, int order)
> if (current->in_user_fault) {
> css_get(&memcg->css);
> current->memcg_in_oom = memcg;
> - current->memcg_oom_gfp_mask = mask;
> - current->memcg_oom_order = order;
> }
> return false;
> }
> --
> 2.34.1
--
Michal Hocko
SUSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-05-10 11:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-05-09 3:26 [PATCH -next] memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order Xiu Jianfeng
2024-05-09 19:39 ` Roman Gushchin
2024-05-09 21:27 ` Shakeel Butt
2024-05-10 11:57 ` Michal Hocko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox