Merge git://git.infradead.org/users/eparis/audit

[firefly-linux-kernel-4.4.55.git] / include / linux / compaction.h

diff --git a/include/linux/compaction.h b/include/linux/compaction.h
index 01e3132820da5bc86fa3db31f526436e73ef7a5d..60bdf8dc02a3dcb9ea4b27cf5414b4a408e95a51 100644 (file)
--- a/include/linux/compaction.h
+++ b/include/linux/compaction.h
@@ -2,14 +2,24 @@
 #define _LINUX_COMPACTION_H
 
 /* Return values for compact_zone() and try_to_compact_pages() */
+/* compaction didn't start as it was deferred due to past failures */
+#define COMPACT_DEFERRED       0
 /* compaction didn't start as it was not possible or direct reclaim was more suitable */
-#define COMPACT_SKIPPED                0
+#define COMPACT_SKIPPED                1
 /* compaction should continue to another pageblock */
-#define COMPACT_CONTINUE       1
+#define COMPACT_CONTINUE       2
 /* direct compaction partially compacted a zone and there are suitable pages */
-#define COMPACT_PARTIAL                2
+#define COMPACT_PARTIAL                3
 /* The full zone was compacted */
-#define COMPACT_COMPLETE       3
+#define COMPACT_COMPLETE       4
+
+/* Used to signal whether compaction detected need_sched() or lock contention */
+/* No contention detected */
+#define COMPACT_CONTENDED_NONE 0
+/* Either need_sched() was true or fatal signal pending */
+#define COMPACT_CONTENDED_SCHED        1
+/* Zone lock or lru_lock was contended in async compaction */
+#define COMPACT_CONTENDED_LOCK 2
 
 #ifdef CONFIG_COMPACTION
 extern int sysctl_compact_memory;
@@ -22,7 +32,8 @@ extern int sysctl_extfrag_handler(struct ctl_table *table, int write,
 extern int fragmentation_index(struct zone *zone, unsigned int order);
 extern unsigned long try_to_compact_pages(struct zonelist *zonelist,
                        int order, gfp_t gfp_mask, nodemask_t *mask,
-                       enum migrate_mode mode, bool *contended);
+                       enum migrate_mode mode, int *contended,
+                       struct zone **candidate_zone);
 extern void compact_pgdat(pg_data_t *pgdat, int order);
 extern void reset_isolation_suitable(pg_data_t *pgdat);
 extern unsigned long compaction_suitable(struct zone *zone, int order);
@@ -91,7 +102,8 @@ static inline bool compaction_restarting(struct zone *zone, int order)
 #else
 static inline unsigned long try_to_compact_pages(struct zonelist *zonelist,
                        int order, gfp_t gfp_mask, nodemask_t *nodemask,
-                       enum migrate_mode mode, bool *contended)
+                       enum migrate_mode mode, int *contended,
+                       struct zone **candidate_zone)
 {
        return COMPACT_CONTINUE;
 }