Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 78 insertions, 24 deletions

diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
index 5bb13b3db84d..961ecc7d30bc 100644
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
@@ -1,8 +1,26 @@
 #ifndef __LINUX_PAGE_CGROUP_H
 #define __LINUX_PAGE_CGROUP_H
 
+enum {
+        /* flags for mem_cgroup */
+        PCG_LOCK,  /* Lock for pc->mem_cgroup and following bits. */
+        PCG_CACHE, /* charged as cache */
+        PCG_USED, /* this object is in use. */
+        PCG_MIGRATION, /* under page migration */
+        /* flags for mem_cgroup and file and I/O status */
+        PCG_MOVE_LOCK, /* For race between move_account v.s. following bits */
+        PCG_FILE_MAPPED, /* page is accounted as "mapped" */
+        /* No lock in page_cgroup */
+        PCG_ACCT_LRU, /* page has been accounted for (under lru_lock) */
+        __NR_PCG_FLAGS,
+};
+
+#ifndef __GENERATING_BOUNDS_H
+#include <generated/bounds.h>
+
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR
 #include <linux/bit_spinlock.h>
+
 /*
  * Page Cgroup can be considered as an extended mem_map.
  * A page_cgroup page is associated with every page descriptor. The
@@ -13,7 +31,6 @@
 struct page_cgroup {
         unsigned long flags;
         struct mem_cgroup *mem_cgroup;
-        struct page *page;
         struct list_head lru;           /* per cgroup LRU list */
 };
 
@@ -32,16 +49,7 @@ static inline void __init page_cgroup_init(void)
 #endif
 
 struct page_cgroup *lookup_page_cgroup(struct page *page);
-
-enum {
-        /* flags for mem_cgroup */
-        PCG_LOCK,  /* page cgroup is locked */
-        PCG_CACHE, /* charged as cache */
-        PCG_USED, /* this object is in use. */
-        PCG_ACCT_LRU, /* page has been accounted for */
-        PCG_FILE_MAPPED, /* page is accounted as "mapped" */
-        PCG_MIGRATION, /* under page migration */
-};
+struct page *lookup_cgroup_page(struct page_cgroup *pc);
 
 #define TESTPCGFLAG(uname, lname)                       \
 static inline int PageCgroup##uname(struct page_cgroup *pc)     \
@@ -59,8 +67,6 @@ static inline void ClearPageCgroup##uname(struct page_cgroup *pc)	\
 static inline int TestClearPageCgroup##uname(struct page_cgroup *pc)    \
         { return test_and_clear_bit(PCG_##lname, &pc->flags);  }
 
-TESTPCGFLAG(Locked, LOCK)
-
 /* Cache flag is set only once (at allocation) */
 TESTPCGFLAG(Cache, CACHE)
 CLEARPCGFLAG(Cache, CACHE)
@@ -84,24 +90,69 @@ SETPCGFLAG(Migration, MIGRATION)
 CLEARPCGFLAG(Migration, MIGRATION)
 TESTPCGFLAG(Migration, MIGRATION)
 
-static inline int page_cgroup_nid(struct page_cgroup *pc)
+static inline void lock_page_cgroup(struct page_cgroup *pc)
 {
-        return page_to_nid(pc->page);
+        /*
+         * Don't take this lock in IRQ context.
+         * This lock is for pc->mem_cgroup, USED, CACHE, MIGRATION
+         */
+        bit_spin_lock(PCG_LOCK, &pc->flags);
 }
 
-static inline enum zone_type page_cgroup_zid(struct page_cgroup *pc)
+static inline void unlock_page_cgroup(struct page_cgroup *pc)
 {
-        return page_zonenum(pc->page);
+        bit_spin_unlock(PCG_LOCK, &pc->flags);
 }
 
-static inline void lock_page_cgroup(struct page_cgroup *pc)
+static inline void move_lock_page_cgroup(struct page_cgroup *pc,
+        unsigned long *flags)
 {
-        bit_spin_lock(PCG_LOCK, &pc->flags);
+        /*
+         * We know updates to pc->flags of page cache's stats are from both of
+         * usual context or IRQ context. Disable IRQ to avoid deadlock.
+         */
+        local_irq_save(*flags);
+        bit_spin_lock(PCG_MOVE_LOCK, &pc->flags);
 }
 
-static inline void unlock_page_cgroup(struct page_cgroup *pc)
+static inline void move_unlock_page_cgroup(struct page_cgroup *pc,
+        unsigned long *flags)
 {
-        bit_spin_unlock(PCG_LOCK, &pc->flags);
+        bit_spin_unlock(PCG_MOVE_LOCK, &pc->flags);
+        local_irq_restore(*flags);
+}
+
+#ifdef CONFIG_SPARSEMEM
+#define PCG_ARRAYID_WIDTH       SECTIONS_SHIFT
+#else
+#define PCG_ARRAYID_WIDTH       NODES_SHIFT
+#endif
+
+#if (PCG_ARRAYID_WIDTH > BITS_PER_LONG - NR_PCG_FLAGS)
+#error Not enough space left in pc->flags to store page_cgroup array IDs
+#endif
+
+/* pc->flags: ARRAY-ID | FLAGS */
+
+#define PCG_ARRAYID_MASK        ((1UL << PCG_ARRAYID_WIDTH) - 1)
+
+#define PCG_ARRAYID_OFFSET      (BITS_PER_LONG - PCG_ARRAYID_WIDTH)
+/*
+ * Zero the shift count for non-existent fields, to prevent compiler
+ * warnings and ensure references are optimized away.
+ */
+#define PCG_ARRAYID_SHIFT       (PCG_ARRAYID_OFFSET * (PCG_ARRAYID_WIDTH != 0))
+
+static inline void set_page_cgroup_array_id(struct page_cgroup *pc,
+                                            unsigned long id)
+{
+        pc->flags &= ~(PCG_ARRAYID_MASK << PCG_ARRAYID_SHIFT);
+        pc->flags |= (id & PCG_ARRAYID_MASK) << PCG_ARRAYID_SHIFT;
+}
+
+static inline unsigned long page_cgroup_array_id(struct page_cgroup *pc)
+{
+        return (pc->flags >> PCG_ARRAYID_SHIFT) & PCG_ARRAYID_MASK;
 }
 
 #else /* CONFIG_CGROUP_MEM_RES_CTLR */
@@ -124,7 +175,7 @@ static inline void __init page_cgroup_init_flatmem(void)
 {
 }
 
-#endif
+#endif /* CONFIG_CGROUP_MEM_RES_CTLR */
 
 #include <linux/swap.h>
 
@@ -160,5 +211,8 @@ static inline void swap_cgroup_swapoff(int type)
         return;
 }
 
-#endif
-#endif
+#endif /* CONFIG_CGROUP_MEM_RES_CTLR_SWAP */
+
+#endif /* !__GENERATING_BOUNDS_H */
+
+#endif /* __LINUX_PAGE_CGROUP_H */