1 files changed, 22 insertions, 30 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 43731fe51c97..977cb57d7bc9 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -167,8 +167,8 @@ struct task_group;
  *   need_sleep = false;
  *   wake_up_state(p, TASK_UNINTERRUPTIBLE);
  *
- * Where wake_up_state() (and all other wakeup primitives) imply enough
- * barriers to order the store of the variable against wakeup.
+ * where wake_up_state() executes a full memory barrier before accessing the
+ * task state.
  *
  * Wakeup will do: if (@state & p->state) p->state = TASK_RUNNING, that is,
  * once it observes the TASK_UNINTERRUPTIBLE store the waking CPU can issue a
@@ -722,8 +722,8 @@ struct task_struct {
         unsigned                        restore_sigmask:1;
 #endif
 #ifdef CONFIG_MEMCG
-        unsigned                        memcg_may_oom:1;
-#ifndef CONFIG_SLOB
+        unsigned                        in_user_fault:1;
+#ifdef CONFIG_MEMCG_KMEM
         unsigned                        memcg_kmem_skip_account:1;
 #endif
 #endif
@@ -734,6 +734,10 @@ struct task_struct {
         /* disallow userland-initiated cgroup migration */
         unsigned                        no_cgroup_migration:1;
 #endif
+#ifdef CONFIG_BLK_CGROUP
+        /* to be used once the psi infrastructure lands upstream. */
+        unsigned                        use_memdelay:1;
+#endif
 
         unsigned long                   atomic_flags; /* Flags requiring atomic access. */
 
@@ -775,7 +779,8 @@ struct task_struct {
         struct list_head                ptrace_entry;
 
         /* PID/PID hash table linkage. */
-        struct pid_link                 pids[PIDTYPE_MAX];
+        struct pid                      *thread_pid;
+        struct hlist_node               pid_links[PIDTYPE_MAX];
         struct list_head                thread_group;
         struct list_head                thread_node;
 
@@ -849,6 +854,7 @@ struct task_struct {
 #endif
 #ifdef CONFIG_DETECT_HUNG_TASK
         unsigned long                   last_switch_count;
+        unsigned long                   last_switch_time;
 #endif
         /* Filesystem information: */
         struct fs_struct                *fs;
@@ -1017,7 +1023,6 @@ struct task_struct {
         u64                             last_sum_exec_runtime;
         struct callback_head            numa_work;
 
-        struct list_head                numa_entry;
         struct numa_group               *numa_group;
 
         /*
@@ -1149,6 +1154,13 @@ struct task_struct {
 
         /* Number of pages to reclaim on returning to userland: */
         unsigned int                    memcg_nr_pages_over_high;
+
+        /* Used by memcontrol for targeted memcg charge: */
+        struct mem_cgroup               *active_memcg;
+#endif
+
+#ifdef CONFIG_BLK_CGROUP
+        struct request_queue            *throttle_queue;
 #endif
 
 #ifdef CONFIG_UPROBES
@@ -1199,27 +1211,7 @@ struct task_struct {
 
 static inline struct pid *task_pid(struct task_struct *task)
 {
-        return task->pids[PIDTYPE_PID].pid;
-}
-
-static inline struct pid *task_tgid(struct task_struct *task)
-{
-        return task->group_leader->pids[PIDTYPE_PID].pid;
-}
-
-/*
- * Without tasklist or RCU lock it is not safe to dereference
- * the result of task_pgrp/task_session even if task == current,
- * we can race with another thread doing sys_setsid/sys_setpgid.
- */
-static inline struct pid *task_pgrp(struct task_struct *task)
-{
-        return task->group_leader->pids[PIDTYPE_PGID].pid;
-}
-
-static inline struct pid *task_session(struct task_struct *task)
-{
-        return task->group_leader->pids[PIDTYPE_SID].pid;
+        return task->thread_pid;
 }
 
 /*
@@ -1268,7 +1260,7 @@ static inline pid_t task_tgid_nr(struct task_struct *tsk)
  */
 static inline int pid_alive(const struct task_struct *p)
 {
-        return p->pids[PIDTYPE_PID].pid != NULL;
+        return p->thread_pid != NULL;
 }
 
 static inline pid_t task_pgrp_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
@@ -1294,12 +1286,12 @@ static inline pid_t task_session_vnr(struct task_struct *tsk)
 
 static inline pid_t task_tgid_nr_ns(struct task_struct *tsk, struct pid_namespace *ns)
 {
-        return __task_pid_nr_ns(tsk, __PIDTYPE_TGID, ns);
+        return __task_pid_nr_ns(tsk, PIDTYPE_TGID, ns);
 }
 
 static inline pid_t task_tgid_vnr(struct task_struct *tsk)
 {
-        return __task_pid_nr_ns(tsk, __PIDTYPE_TGID, NULL);
+        return __task_pid_nr_ns(tsk, PIDTYPE_TGID, NULL);
 }
 
 static inline pid_t task_ppid_nr_ns(const struct task_struct *tsk, struct pid_namespace *ns)