From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751769AbdAQKho (ORCPT ); Tue, 17 Jan 2017 05:37:44 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:32845 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751053AbdAQKhl (ORCPT ); Tue, 17 Jan 2017 05:37:41 -0500 From: Michal Hocko To: Andrew Morton Cc: Johannes Weiner , Mel Gorman , Minchan Kim , Hillf Danton , , LKML , Michal Hocko Subject: [PATCH 3/3] Revert "mm: bail out in shrink_inactive_list()" Date: Tue, 17 Jan 2017 11:37:02 +0100 Message-Id: <20170117103702.28542-4-mhocko@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170117103702.28542-1-mhocko@kernel.org> References: <20170117103702.28542-1-mhocko@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michal Hocko This reverts commit 91dcade47a3d0e7c31464ef05f56c08e92a0e9c2. inactive_reclaimable_pages shouldn't be needed anymore since that get_scan_count is aware of the eligble zones ("mm, vmscan: consider eligible zones in get_scan_count"). Acked-by: Hillf Danton Acked-by: Minchan Kim Signed-off-by: Michal Hocko --- mm/vmscan.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index ffac8fa7bdd8..f3255702f3df 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1701,30 +1701,6 @@ static int current_may_throttle(void) bdi_write_congested(current->backing_dev_info); } -static bool inactive_reclaimable_pages(struct lruvec *lruvec, - struct scan_control *sc, enum lru_list lru) -{ - int zid; - struct zone *zone; - int file = is_file_lru(lru); - struct pglist_data *pgdat = lruvec_pgdat(lruvec); - - if (!global_reclaim(sc)) - return true; - - for (zid = sc->reclaim_idx; zid >= 0; zid--) { - zone = &pgdat->node_zones[zid]; - if (!managed_zone(zone)) - continue; - - if (zone_page_state_snapshot(zone, NR_ZONE_LRU_BASE + - LRU_FILE * file) >= SWAP_CLUSTER_MAX) - return true; - } - - return false; -} - /* * shrink_inactive_list() is a helper for shrink_node(). It returns the number * of reclaimed pages @@ -1743,9 +1719,6 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec, struct pglist_data *pgdat = lruvec_pgdat(lruvec); struct zone_reclaim_stat *reclaim_stat = &lruvec->reclaim_stat; - if (!inactive_reclaimable_pages(lruvec, sc, lru)) - return 0; - while (unlikely(too_many_isolated(pgdat, file, sc))) { congestion_wait(BLK_RW_ASYNC, HZ/10); -- 2.11.0