2022-02-24 12:31:03

by Miaohe Lin

[permalink] [raw]
Subject: [PATCH] mm/oom_kill: remove unneeded is_memcg_oom check

oom_cpuset_eligible is always called when !is_memcg_oom. Remove this
unnecessary check.

Signed-off-by: Miaohe Lin <[email protected]>
---
mm/oom_kill.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 9fea6d3c1ec7..c70a4330e548 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -122,9 +122,6 @@ static bool oom_cpuset_eligible(struct task_struct *start,
bool ret = false;
const nodemask_t *mask = oc->nodemask;

- if (is_memcg_oom(oc))
- return true;
-
rcu_read_lock();
for_each_thread(start, tsk) {
if (mask) {
--
2.23.0


2022-02-24 20:11:57

by David Rientjes

[permalink] [raw]
Subject: Re: [PATCH] mm/oom_kill: remove unneeded is_memcg_oom check

On Thu, 24 Feb 2022, Miaohe Lin wrote:

> oom_cpuset_eligible is always called when !is_memcg_oom. Remove this
> unnecessary check.
>
> Signed-off-by: Miaohe Lin <[email protected]>

Acked-by: David Rientjes <[email protected]>

This keeps oom_cpuset_eligible() only in the nodemask eligibility business
and memcg criteria remains isolated in its own function.

2022-02-28 17:44:50

by Michal Hocko

[permalink] [raw]
Subject: Re: [PATCH] mm/oom_kill: remove unneeded is_memcg_oom check

On Thu 24-02-22 19:59:33, Miaohe Lin wrote:
> oom_cpuset_eligible is always called when !is_memcg_oom. Remove this
> unnecessary check.
>
> Signed-off-by: Miaohe Lin <[email protected]>

Acked-by: Michal Hocko <[email protected]>
Thanks!

> ---
> mm/oom_kill.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/mm/oom_kill.c b/mm/oom_kill.c
> index 9fea6d3c1ec7..c70a4330e548 100644
> --- a/mm/oom_kill.c
> +++ b/mm/oom_kill.c
> @@ -122,9 +122,6 @@ static bool oom_cpuset_eligible(struct task_struct *start,
> bool ret = false;
> const nodemask_t *mask = oc->nodemask;
>
> - if (is_memcg_oom(oc))
> - return true;
> -
> rcu_read_lock();
> for_each_thread(start, tsk) {
> if (mask) {
> --
> 2.23.0

--
Michal Hocko
SUSE Labs