mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Miaohe Lin <linmiaohe@huawei.com>
To: <akpm@linux-foundation.org>
Cc: <hannes@cmpxchg.org>, <vbabka@suse.cz>, <mhocko@suse.com>,
	<axboe@kernel.dk>, <iamjoonsoo.kim@lge.com>, <alexs@kernel.org>,
	<apopple@nvidia.com>, <willy@infradead.org>, <minchan@kernel.org>,
	<david@redhat.com>, <shli@fb.com>, <hillf.zj@alibaba-inc.com>,
	<linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
	<linmiaohe@huawei.com>
Subject: [PATCH 4/5] mm/vmscan: add 'else' to remove check_pending label
Date: Sat, 10 Jul 2021 18:03:28 +0800	[thread overview]
Message-ID: <20210710100329.49174-5-linmiaohe@huawei.com> (raw)
In-Reply-To: <20210710100329.49174-1-linmiaohe@huawei.com>

We could add 'else' to remove the somewhat odd check_pending label to
make code core succinct.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
 mm/vmscan.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/mm/vmscan.c b/mm/vmscan.c
index c580bef6b885..a74760c48bd8 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3428,18 +3428,14 @@ static bool throttle_direct_reclaim(gfp_t gfp_mask, struct zonelist *zonelist,
 	 * blocked waiting on the same lock. Instead, throttle for up to a
 	 * second before continuing.
 	 */
-	if (!(gfp_mask & __GFP_FS)) {
+	if (!(gfp_mask & __GFP_FS))
 		wait_event_interruptible_timeout(pgdat->pfmemalloc_wait,
 			allow_direct_reclaim(pgdat), HZ);
+	else
+		/* Throttle until kswapd wakes the process */
+		wait_event_killable(zone->zone_pgdat->pfmemalloc_wait,
+			allow_direct_reclaim(pgdat));
 
-		goto check_pending;
-	}
-
-	/* Throttle until kswapd wakes the process */
-	wait_event_killable(zone->zone_pgdat->pfmemalloc_wait,
-		allow_direct_reclaim(pgdat));
-
-check_pending:
 	if (fatal_signal_pending(current))
 		return true;
 
-- 
2.23.0


  parent reply	other threads:[~2021-07-10 10:03 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-10 10:03 [PATCH 0/5] Cleanup and fixup for vmscan Miaohe Lin
2021-07-10 10:03 ` [PATCH 1/5] mm/vmscan: put the redirtied MADV_FREE pages back to anonymous LRU list Miaohe Lin
2021-07-10 23:22   ` Yu Zhao
2021-07-12  7:11     ` Miaohe Lin
2021-07-13  7:25       ` Yu Zhao
2021-07-13 13:16         ` Miaohe Lin
2021-07-12  7:22   ` Michal Hocko
2021-07-12 11:03     ` Miaohe Lin
2021-07-13  9:30       ` Michal Hocko
2021-07-13 13:13         ` Miaohe Lin
2021-07-13 13:34           ` Matthew Wilcox
2021-07-14 11:36             ` Miaohe Lin
2021-07-14 11:48               ` Matthew Wilcox
2021-07-14 19:43                 ` John Hubbard
2021-07-15 11:30                   ` Miaohe Lin
2021-07-16  0:01                     ` John Hubbard
2021-07-16  1:53                       ` Miaohe Lin
2021-07-10 10:03 ` [PATCH 2/5] mm/vmscan: remove misleading setting to sc->priority Miaohe Lin
2021-07-12  7:24   ` Michal Hocko
2021-07-12 11:10     ` Miaohe Lin
2021-07-10 10:03 ` [PATCH 3/5] mm/vmscan: remove unneeded return value of kswapd_run() Miaohe Lin
2021-07-12  7:25   ` Michal Hocko
2021-07-10 10:03 ` Miaohe Lin [this message]
2021-07-12  7:26   ` [PATCH 4/5] mm/vmscan: add 'else' to remove check_pending label Michal Hocko
2021-07-10 10:03 ` [PATCH 5/5] mm/vmscan: fix misleading comment in isolate_lru_pages() Miaohe Lin
2021-07-12  7:28   ` Michal Hocko
2021-07-12 11:16     ` Miaohe Lin
2021-07-13  9:32       ` Michal Hocko
2021-07-13 12:50         ` Miaohe Lin

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=20210710100329.49174-5-linmiaohe@huawei.com \
    --to=linmiaohe@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=alexs@kernel.org \
    --cc=apopple@nvidia.com \
    --cc=axboe@kernel.dk \
    --cc=david@redhat.com \
    --cc=hannes@cmpxchg.org \
    --cc=hillf.zj@alibaba-inc.com \
    --cc=iamjoonsoo.kim@lge.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mhocko@suse.com \
    --cc=minchan@kernel.org \
    --cc=shli@fb.com \
    --cc=vbabka@suse.cz \
    --cc=willy@infradead.org \
    /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

all inboxes | Powered by JetHome®