linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Peng Zhang <zhangpeng362@huawei.com>
To: <linux-mm@kvack.org>
Cc: <mhocko@suse.com>, <shakeelb@google.com>,
	<akpm@linux-foundation.org>, <wangkefeng.wang@huawei.com>,
	<sunnanyong@huawei.com>, ZhangPeng <zhangpeng362@huawei.com>
Subject: [PATCH 1/2] mm: oom: remove unnecessary goto in oom_evaluate_task()
Date: Mon, 14 Aug 2023 14:34:27 +0800	[thread overview]
Message-ID: <20230814063428.4111206-2-zhangpeng362@huawei.com> (raw)
In-Reply-To: <20230814063428.4111206-1-zhangpeng362@huawei.com>

From: ZhangPeng <zhangpeng362@huawei.com>

Remove redundant goto statement in oom_evaluate_task() to simplify the
code a bit. No functional modification involved.

Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
---
 mm/oom_kill.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 44bde56ecd02..10f7826c4035 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -335,14 +335,12 @@ static int oom_evaluate_task(struct task_struct *task, void *arg)
 	 */
 	if (oom_task_origin(task)) {
 		points = LONG_MAX;
-		goto select;
+	} else {
+		points = oom_badness(task, oc->totalpages);
+		if (points == LONG_MIN || points < oc->chosen_points)
+			goto next;
 	}
 
-	points = oom_badness(task, oc->totalpages);
-	if (points == LONG_MIN || points < oc->chosen_points)
-		goto next;
-
-select:
 	if (oc->chosen)
 		put_task_struct(oc->chosen);
 	get_task_struct(task);
-- 
2.25.1



  reply	other threads:[~2023-08-14  6:34 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-14  6:34 [PATCH 0/2] mm: oom: terminate the oom_evaluate_task() loop early Peng Zhang
2023-08-14  6:34 ` Peng Zhang [this message]
2023-08-16  6:46   ` [PATCH 1/2] mm: oom: remove unnecessary goto in oom_evaluate_task() Michal Hocko
2023-08-16  8:56     ` zhangpeng (AS)
2023-08-14  6:34 ` [PATCH 2/2] mm: oom: terminate the oom_evaluate_task() loop early Peng Zhang
2023-08-16  6:48   ` Michal Hocko
2023-08-16  8:57     ` zhangpeng (AS)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230814063428.4111206-2-zhangpeng362@huawei.com \
    --to=zhangpeng362@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-mm@kvack.org \
    --cc=mhocko@suse.com \
    --cc=shakeelb@google.com \
    --cc=sunnanyong@huawei.com \
    --cc=wangkefeng.wang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).