7 files changed, 39 insertions, 15 deletions

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index cef98502b124..17828333f7c3 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -3534,6 +3534,16 @@ static ssize_t cgroup_file_write(struct kernfs_open_file *of, char *buf,
         return ret ?: nbytes;
 }
 
+static __poll_t cgroup_file_poll(struct kernfs_open_file *of, poll_table *pt)
+{
+        struct cftype *cft = of->kn->priv;
+
+        if (cft->poll)
+                return cft->poll(of, pt);
+
+        return kernfs_generic_poll(of, pt);
+}
+
 static void *cgroup_seqfile_start(struct seq_file *seq, loff_t *ppos)
 {
         return seq_cft(seq)->seq_start(seq, ppos);
@@ -3572,6 +3582,7 @@ static struct kernfs_ops cgroup_kf_single_ops = {
         .open                   = cgroup_file_open,
         .release                = cgroup_file_release,
         .write                  = cgroup_file_write,
+        .poll                   = cgroup_file_poll,
         .seq_show               = cgroup_seqfile_show,
 };
 
@@ -3580,6 +3591,7 @@ static struct kernfs_ops cgroup_kf_ops = {
         .open                   = cgroup_file_open,
         .release                = cgroup_file_release,
         .write                  = cgroup_file_write,
+        .poll                   = cgroup_file_poll,
         .seq_start              = cgroup_seqfile_start,
         .seq_next               = cgroup_seqfile_next,
         .seq_stop               = cgroup_seqfile_stop,
diff --git a/kernel/crash_core.c b/kernel/crash_core.c
index 933cb3e45b98..093c9f917ed0 100644
--- a/kernel/crash_core.c
+++ b/kernel/crash_core.c
@@ -464,6 +464,8 @@ static int __init crash_save_vmcoreinfo_init(void)
         VMCOREINFO_NUMBER(PAGE_BUDDY_MAPCOUNT_VALUE);
 #ifdef CONFIG_HUGETLB_PAGE
         VMCOREINFO_NUMBER(HUGETLB_PAGE_DTOR);
+#define PAGE_OFFLINE_MAPCOUNT_VALUE     (~PG_offline)
+        VMCOREINFO_NUMBER(PAGE_OFFLINE_MAPCOUNT_VALUE);
 #endif
 
         arch_crash_save_vmcoreinfo();
diff --git a/kernel/kthread.c b/kernel/kthread.c
index 9cf20cc5ebe3..5942eeafb9ac 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -20,6 +20,7 @@
 #include <linux/freezer.h>
 #include <linux/ptrace.h>
 #include <linux/uaccess.h>
+#include <linux/numa.h>
 #include <trace/events/sched.h>
 
 static DEFINE_SPINLOCK(kthread_create_lock);
@@ -681,7 +682,7 @@ __kthread_create_worker(int cpu, unsigned int flags,
 {
         struct kthread_worker *worker;
         struct task_struct *task;
-        int node = -1;
+        int node = NUMA_NO_NODE;
 
         worker = kzalloc(sizeof(*worker), GFP_KERNEL);
         if (!worker)
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
index 640b2034edd6..4802b039b89f 100644
--- a/kernel/power/snapshot.c
+++ b/kernel/power/snapshot.c
@@ -1215,14 +1215,16 @@ static struct page *saveable_highmem_page(struct zone *zone, unsigned long pfn)
         if (!pfn_valid(pfn))
                 return NULL;
 
-        page = pfn_to_page(pfn);
-        if (page_zone(page) != zone)
+        page = pfn_to_online_page(pfn);
+        if (!page || page_zone(page) != zone)
                 return NULL;
 
         BUG_ON(!PageHighMem(page));
 
-        if (swsusp_page_is_forbidden(page) ||  swsusp_page_is_free(page) ||
-            PageReserved(page))
+        if (swsusp_page_is_forbidden(page) ||  swsusp_page_is_free(page))
+                return NULL;
+
+        if (PageReserved(page) || PageOffline(page))
                 return NULL;
 
         if (page_is_guard(page))
@@ -1277,8 +1279,8 @@ static struct page *saveable_page(struct zone *zone, unsigned long pfn)
         if (!pfn_valid(pfn))
                 return NULL;
 
-        page = pfn_to_page(pfn);
-        if (page_zone(page) != zone)
+        page = pfn_to_online_page(pfn);
+        if (!page || page_zone(page) != zone)
                 return NULL;
 
         BUG_ON(PageHighMem(page));
@@ -1286,6 +1288,9 @@ static struct page *saveable_page(struct zone *zone, unsigned long pfn)
         if (swsusp_page_is_forbidden(page) || swsusp_page_is_free(page))
                 return NULL;
 
+        if (PageOffline(page))
+                return NULL;
+
         if (PageReserved(page)
             && (!kernel_page_present(page) || pfn_is_nosave(pfn)))
                 return NULL;
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index f3901b84d217..ead464a0f2e5 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2220,6 +2220,9 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
         INIT_HLIST_HEAD(&p->preempt_notifiers);
 #endif
 
+#ifdef CONFIG_COMPACTION
+        p->capture_control = NULL;
+#endif
         init_numa_balancing(clone_flags, p);
 }
 
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 8213ff6e365d..ea74d43924b2 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -1173,7 +1173,7 @@ void init_numa_balancing(unsigned long clone_flags, struct task_struct *p)
 
         /* New address space, reset the preferred nid */
         if (!(clone_flags & CLONE_VM)) {
-                p->numa_preferred_nid = -1;
+                p->numa_preferred_nid = NUMA_NO_NODE;
                 return;
         }
 
@@ -1193,13 +1193,13 @@ void init_numa_balancing(unsigned long clone_flags, struct task_struct *p)
 
 static void account_numa_enqueue(struct rq *rq, struct task_struct *p)
 {
-        rq->nr_numa_running += (p->numa_preferred_nid != -1);
+        rq->nr_numa_running += (p->numa_preferred_nid != NUMA_NO_NODE);
         rq->nr_preferred_running += (p->numa_preferred_nid == task_node(p));
 }
 
 static void account_numa_dequeue(struct rq *rq, struct task_struct *p)
 {
-        rq->nr_numa_running -= (p->numa_preferred_nid != -1);
+        rq->nr_numa_running -= (p->numa_preferred_nid != NUMA_NO_NODE);
         rq->nr_preferred_running -= (p->numa_preferred_nid == task_node(p));
 }
 
@@ -1413,7 +1413,7 @@ bool should_numa_migrate_memory(struct task_struct *p, struct page * page,
          * two full passes of the "multi-stage node selection" test that is
          * executed below.
          */
-        if ((p->numa_preferred_nid == -1 || p->numa_scan_seq <= 4) &&
+        if ((p->numa_preferred_nid == NUMA_NO_NODE || p->numa_scan_seq <= 4) &&
             (cpupid_pid_unset(last_cpupid) || cpupid_match_pid(p, last_cpupid)))
                 return true;
 
@@ -1861,7 +1861,7 @@ static void numa_migrate_preferred(struct task_struct *p)
         unsigned long interval = HZ;
 
         /* This task has no NUMA fault statistics yet */
-        if (unlikely(p->numa_preferred_nid == -1 || !p->numa_faults))
+        if (unlikely(p->numa_preferred_nid == NUMA_NO_NODE || !p->numa_faults))
                 return;
 
         /* Periodically retry migrating the task to the preferred node */
@@ -2108,7 +2108,7 @@ static int preferred_group_nid(struct task_struct *p, int nid)
 
 static void task_numa_placement(struct task_struct *p)
 {
-        int seq, nid, max_nid = -1;
+        int seq, nid, max_nid = NUMA_NO_NODE;
         unsigned long max_faults = 0;
         unsigned long fault_types[2] = { 0, 0 };
         unsigned long total_faults;
@@ -2651,7 +2651,8 @@ static void update_scan_period(struct task_struct *p, int new_cpu)
                  * the preferred node.
                  */
                 if (dst_nid == p->numa_preferred_nid ||
-                    (p->numa_preferred_nid != -1 && src_nid != p->numa_preferred_nid))
+                    (p->numa_preferred_nid != NUMA_NO_NODE &&
+                        src_nid != p->numa_preferred_nid))
                         return;
         }
 
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 7c2b9bc88ee8..14f30b4a1b64 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1471,7 +1471,7 @@ static struct ctl_table vm_table[] = {
                 .data           = &sysctl_extfrag_threshold,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = sysctl_extfrag_handler,
+                .proc_handler   = proc_dointvec_minmax,
                 .extra1         = &min_extfrag_threshold,
                 .extra2         = &max_extfrag_threshold,
         },