kmemleak: use rbtree instead of prio tree

[karo-tx-linux.git] / mm / vmscan.c

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 99b434b674c02b4099bcfe58632ad56e183801fd..d16bf5a5326614e54cc37cedffc8a697a16b17fa 100644 (file)
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1729,6 +1729,28 @@ static bool in_reclaim_compaction(struct scan_control *sc)
        return false;
 }
 
+#ifdef CONFIG_COMPACTION
+/*
+ * If compaction is deferred for sc->order then scale the number of pages
+ * reclaimed based on the number of consecutive allocation failures
+ */
+static unsigned long scale_for_compaction(unsigned long pages_for_compaction,
+                       struct lruvec *lruvec, struct scan_control *sc)
+{
+       struct zone *zone = lruvec_zone(lruvec);
+
+       if (zone->compact_order_failed <= sc->order)
+               pages_for_compaction <<= zone->compact_defer_shift;
+       return pages_for_compaction;
+}
+#else
+static unsigned long scale_for_compaction(unsigned long pages_for_compaction,
+                       struct lruvec *lruvec, struct scan_control *sc)
+{
+       return pages_for_compaction;
+}
+#endif
+
 /*
  * Reclaim/compaction is used for high-order allocation requests. It reclaims
  * order-0 pages before compacting the zone. should_continue_reclaim() returns
@@ -1776,6 +1798,9 @@ static inline bool should_continue_reclaim(struct lruvec *lruvec,
         * inactive lists are large enough, continue reclaiming
         */
        pages_for_compaction = (2UL << sc->order);
+
+       pages_for_compaction = scale_for_compaction(pages_for_compaction,
+                                                   lruvec, sc);
        inactive_lru_pages = get_lru_size(lruvec, LRU_INACTIVE_FILE);
        if (nr_swap_pages > 0)
                inactive_lru_pages += get_lru_size(lruvec, LRU_INACTIVE_ANON);
@@ -3101,9 +3126,9 @@ int kswapd_run(int nid)
        if (IS_ERR(pgdat->kswapd)) {
                /* failure at boot is fatal */
                BUG_ON(system_state == SYSTEM_BOOTING);
-               printk("Failed to start kswapd on node %d\n",nid);
                pgdat->kswapd = NULL;
-               ret = -1;
+               pr_err("Failed to start kswapd on node %d\n", nid);
+               ret = PTR_ERR(pgdat->kswapd);
        }
        return ret;
 }