ANDROID: adjust vendor hook to control blk_plug

We shouldn't hold lru_lock to proceed blk_finish_plug. Fixes: 89fed37 ("ANDROID: vendor hook to control blk_plug for shrink_lruvec") Bug: 255471591 Change-Id: Ie9d9b0e4ee76b4735e802b2a202fbb79d0ae090e Signed-off-by: Martin Liu <[email protected]>
celtare21 · Nov 15, 2022 · b4b4c3c · b4b4c3c
1 parent da7bcb7
commit b4b4c3c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/mm/vmscan.c b/mm/vmscan.c
@@ -2051,8 +2051,6 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec,
 	spin_lock_irq(&pgdat->lru_lock);
 
 	move_pages_to_lru(lruvec, &page_list);
-	if (do_plug)
-		blk_finish_plug(&plug);
 
 	__mod_node_page_state(pgdat, NR_ISOLATED_ANON + file, -nr_taken);
 	lru_note_cost(lruvec, file, stat.nr_pageout);
@@ -2064,6 +2062,9 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec,
 
 	spin_unlock_irq(&pgdat->lru_lock);
 
+	if (do_plug)
+		blk_finish_plug(&plug);
+
 	mem_cgroup_uncharge_list(&page_list);
 	free_unref_page_list(&page_list);