Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2075bd9c authored by Wilson Sung's avatar Wilson Sung Committed by Pranav Vashi
Browse files

Revert "mm: reduce the time spend by killed tasks in alloc path" 



This reverts commit c31eadb2.

Bug: 128591321
Bug: 128639903
Bug: 127924739
Change-Id: I4c022958a52cf6e82130a1dc87bc73210ad53245
Signed-off-by: default avatarWilson Sung <wilsonsung@google.com>
Signed-off-by: default avatarPranav Vashi <neobuddy89@gmail.com>
parent 5371dadb

mm/page_alloc.c

+0 −4
Original line number Diff line number Diff line
@@ -4233,10 +4233,6 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, 
	if (current->flags & PF_MEMALLOC)

		goto nopage;



	if (fatal_signal_pending(current) && !(gfp_mask & __GFP_NOFAIL) &&

			(gfp_mask & __GFP_FS))

		goto nopage;



	/* Try direct reclaim and then allocating */

	page = __alloc_pages_direct_reclaim(gfp_mask, order, alloc_flags, ac,

							&did_some_progress);

mm/vmscan.c

+4 −4
Original line number Diff line number Diff line
@@ -1875,13 +1875,13 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec, 
		if (stalled)

			return 0;



		/* We are about to die and free our memory. Return now. */

		if (fatal_signal_pending(current))

			return SWAP_CLUSTER_MAX;



		/* wait a bit for the reclaimer. */

		msleep(100);

		stalled = true;



		/* We are about to die and free our memory. Return now. */

		if (fatal_signal_pending(current))

			return SWAP_CLUSTER_MAX;

	}



	lru_add_drain();