4 files changed, 76 insertions, 87 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 2081a4d3d917..f5dbc6d4261b 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -470,17 +470,15 @@ choice
 config TREE_RCU
         bool "Tree-based hierarchical RCU"
         depends on !PREEMPT && SMP
-        select IRQ_WORK
         help
           This option selects the RCU implementation that is
           designed for very large SMP system with hundreds or
           thousands of CPUs.  It also scales down nicely to
           smaller systems.
 
-config TREE_PREEMPT_RCU
+config PREEMPT_RCU
         bool "Preemptible tree-based hierarchical RCU"
         depends on PREEMPT
-        select IRQ_WORK
         help
           This option selects the RCU implementation that is
           designed for very large SMP systems with hundreds or
@@ -501,15 +499,17 @@ config TINY_RCU
 
 endchoice
 
-config PREEMPT_RCU
-        def_bool TREE_PREEMPT_RCU
+config SRCU
+        bool
         help
-          This option enables preemptible-RCU code that is common between
-          TREE_PREEMPT_RCU and, in the old days, TINY_PREEMPT_RCU.
+          This option selects the sleepable version of RCU. This version
+          permits arbitrary sleeping or blocking within RCU read-side critical
+          sections.
 
 config TASKS_RCU
         bool "Task_based RCU implementation using voluntary context switch"
         default n
+        select SRCU
         help
           This option enables a task-based RCU implementation that uses
           only voluntary context switch (not preemption!), idle, and
@@ -518,7 +518,7 @@ config TASKS_RCU
           If unsure, say N.
 
 config RCU_STALL_COMMON
-        def_bool ( TREE_RCU || TREE_PREEMPT_RCU || RCU_TRACE )
+        def_bool ( TREE_RCU || PREEMPT_RCU || RCU_TRACE )
         help
           This option enables RCU CPU stall code that is common between
           the TINY and TREE variants of RCU.  The purpose is to allow
@@ -576,7 +576,7 @@ config RCU_FANOUT
         int "Tree-based hierarchical RCU fanout value"
         range 2 64 if 64BIT
         range 2 32 if !64BIT
-        depends on TREE_RCU || TREE_PREEMPT_RCU
+        depends on TREE_RCU || PREEMPT_RCU
         default 64 if 64BIT
         default 32 if !64BIT
         help
@@ -596,7 +596,7 @@ config RCU_FANOUT_LEAF
         int "Tree-based hierarchical RCU leaf-level fanout value"
         range 2 RCU_FANOUT if 64BIT
         range 2 RCU_FANOUT if !64BIT
-        depends on TREE_RCU || TREE_PREEMPT_RCU
+        depends on TREE_RCU || PREEMPT_RCU
         default 16
         help
           This option controls the leaf-level fanout of hierarchical
@@ -621,7 +621,7 @@ config RCU_FANOUT_LEAF
 
 config RCU_FANOUT_EXACT
         bool "Disable tree-based hierarchical RCU auto-balancing"
-        depends on TREE_RCU || TREE_PREEMPT_RCU
+        depends on TREE_RCU || PREEMPT_RCU
         default n
         help
           This option forces use of the exact RCU_FANOUT value specified,
@@ -652,11 +652,11 @@ config RCU_FAST_NO_HZ
           Say N if you are unsure.
 
 config TREE_RCU_TRACE
-        def_bool RCU_TRACE && ( TREE_RCU || TREE_PREEMPT_RCU )
+        def_bool RCU_TRACE && ( TREE_RCU || PREEMPT_RCU )
         select DEBUG_FS
         help
           This option provides tracing for the TREE_RCU and
-          TREE_PREEMPT_RCU implementations, permitting Makefile to
+          PREEMPT_RCU implementations, permitting Makefile to
           trivially select kernel/rcutree_trace.c.
 
 config RCU_BOOST
@@ -672,30 +672,32 @@ config RCU_BOOST
           Say Y here if you are working with real-time apps or heavy loads
           Say N here if you are unsure.
 
-config RCU_BOOST_PRIO
-        int "Real-time priority to boost RCU readers to"
-        range 1 99
-        depends on RCU_BOOST
-        default 1
-        help
-          This option specifies the real-time priority to which long-term
-          preempted RCU readers are to be boosted.  If you are working
-          with a real-time application that has one or more CPU-bound
-          threads running at a real-time priority level, you should set
-          RCU_BOOST_PRIO to a priority higher then the highest-priority
-          real-time CPU-bound thread.  The default RCU_BOOST_PRIO value
-          of 1 is appropriate in the common case, which is real-time
+config RCU_KTHREAD_PRIO
+        int "Real-time priority to use for RCU worker threads"
+        range 1 99 if RCU_BOOST
+        range 0 99 if !RCU_BOOST
+        default 1 if RCU_BOOST
+        default 0 if !RCU_BOOST
+        help
+          This option specifies the SCHED_FIFO priority value that will be
+          assigned to the rcuc/n and rcub/n threads and is also the value
+          used for RCU_BOOST (if enabled). If you are working with a
+          real-time application that has one or more CPU-bound threads
+          running at a real-time priority level, you should set
+          RCU_KTHREAD_PRIO to a priority higher than the highest-priority
+          real-time CPU-bound application thread.  The default RCU_KTHREAD_PRIO
+          value of 1 is appropriate in the common case, which is real-time
           applications that do not have any CPU-bound threads.
 
           Some real-time applications might not have a single real-time
           thread that saturates a given CPU, but instead might have
           multiple real-time threads that, taken together, fully utilize
-          that CPU.  In this case, you should set RCU_BOOST_PRIO to
+          that CPU.  In this case, you should set RCU_KTHREAD_PRIO to
           a priority higher than the lowest-priority thread that is
           conspiring to prevent the CPU from running any non-real-time
           tasks.  For example, if one thread at priority 10 and another
           thread at priority 5 are between themselves fully consuming
-          the CPU time on a given CPU, then RCU_BOOST_PRIO should be
+          the CPU time on a given CPU, then RCU_KTHREAD_PRIO should be
           set to priority 6 or higher.
 
           Specify the real-time priority, or take the default if unsure.
@@ -715,7 +717,7 @@ config RCU_BOOST_DELAY
 
 config RCU_NOCB_CPU
         bool "Offload RCU callback processing from boot-selected CPUs"
-        depends on TREE_RCU || TREE_PREEMPT_RCU
+        depends on TREE_RCU || PREEMPT_RCU
         default n
         help
           Use this option to reduce OS jitter for aggressive HPC or
@@ -739,6 +741,7 @@ config RCU_NOCB_CPU
 choice
         prompt "Build-forced no-CBs CPUs"
         default RCU_NOCB_CPU_NONE
+        depends on RCU_NOCB_CPU
         help
           This option allows no-CBs CPUs (whose RCU callbacks are invoked
           from kthreads rather than from softirq context) to be specified
@@ -747,7 +750,6 @@ choice
 
 config RCU_NOCB_CPU_NONE
         bool "No build_forced no-CBs CPUs"
-        depends on RCU_NOCB_CPU
         help
           This option does not force any of the CPUs to be no-CBs CPUs.
           Only CPUs designated by the rcu_nocbs= boot parameter will be
@@ -761,7 +763,6 @@ config RCU_NOCB_CPU_NONE
 
 config RCU_NOCB_CPU_ZERO
         bool "CPU 0 is a build_forced no-CBs CPU"
-        depends on RCU_NOCB_CPU
         help
           This option forces CPU 0 to be a no-CBs CPU, so that its RCU
           callbacks are invoked by a per-CPU kthread whose name begins
@@ -776,7 +777,6 @@ config RCU_NOCB_CPU_ZERO
 
 config RCU_NOCB_CPU_ALL
         bool "All CPUs are build_forced no-CBs CPUs"
-        depends on RCU_NOCB_CPU
         help
           This option forces all CPUs to be no-CBs CPUs.  The rcu_nocbs=
           boot parameter will be ignored.  All CPUs' RCU callbacks will
@@ -900,14 +900,6 @@ config ARCH_SUPPORTS_INT128
 config ARCH_WANT_NUMA_VARIABLE_LOCALITY
         bool
 
-config NUMA_BALANCING_DEFAULT_ENABLED
-        bool "Automatically enable NUMA aware memory/task placement"
-        default y
-        depends on NUMA_BALANCING
-        help
-          If set, automatic NUMA balancing will be enabled if running on a NUMA
-          machine.
-
 config NUMA_BALANCING
         bool "Memory placement aware NUMA scheduler"
         depends on ARCH_SUPPORTS_NUMA_BALANCING
@@ -920,8 +912,16 @@ config NUMA_BALANCING
 
           This system will be inactive on UMA systems.
 
+config NUMA_BALANCING_DEFAULT_ENABLED
+        bool "Automatically enable NUMA aware memory/task placement"
+        default y
+        depends on NUMA_BALANCING
+        help
+          If set, automatic NUMA balancing will be enabled if running on a NUMA
+          machine.
+
 menuconfig CGROUPS
-        boolean "Control Group support"
+        bool "Control Group support"
         select KERNFS
         help
           This option adds support for grouping sets of processes together, for
@@ -979,32 +979,17 @@ config CGROUP_CPUACCT
           Provides a simple Resource Controller for monitoring the
           total CPU consumed by the tasks in a cgroup.
 
-config RESOURCE_COUNTERS
-        bool "Resource counters"
-        help
-          This option enables controller independent resource accounting
-          infrastructure that works with cgroups.
+config PAGE_COUNTER
+       bool
 
 config MEMCG
         bool "Memory Resource Controller for Control Groups"
-        depends on RESOURCE_COUNTERS
+        select PAGE_COUNTER
         select EVENTFD
         help
           Provides a memory resource controller that manages both anonymous
           memory and page cache. (See Documentation/cgroups/memory.txt)
 
-          Note that setting this option increases fixed memory overhead
-          associated with each page of memory in the system. By this,
-          8(16)bytes/PAGE_SIZE on 32(64)bit system will be occupied by memory
-          usage tracking struct at boot. Total amount of this is printed out
-          at boot.
-
-          Only enable when you're ok with these trade offs and really
-          sure you need the memory resource controller. Even when you enable
-          this, you can set "cgroup_disable=memory" at your boot option to
-          disable memory resource controller and you can avoid overheads.
-          (and lose benefits of memory resource controller)
-
 config MEMCG_SWAP
         bool "Memory Resource Controller Swap Extension"
         depends on MEMCG && SWAP
@@ -1055,7 +1040,8 @@ config MEMCG_KMEM
 
 config CGROUP_HUGETLB
         bool "HugeTLB Resource Controller for Control Groups"
-        depends on RESOURCE_COUNTERS && HUGETLB_PAGE
+        depends on HUGETLB_PAGE
+        select PAGE_COUNTER
         default n
         help
           Provides a cgroup Resource Controller for HugeTLB pages.
@@ -1304,8 +1290,8 @@ endif
 config CC_OPTIMIZE_FOR_SIZE
         bool "Optimize for size"
         help
-          Enabling this option will pass "-Os" instead of "-O2" to gcc
-          resulting in a smaller kernel.
+          Enabling this option will pass "-Os" instead of "-O2" to
+          your compiler resulting in a smaller kernel.
 
           If unsure, say N.
 
@@ -1600,6 +1586,7 @@ config PERF_EVENTS
         depends on HAVE_PERF_EVENTS
         select ANON_INODES
         select IRQ_WORK
+        select SRCU
         help
           Enable kernel support for various performance events provided
           by software and hardware.
@@ -1775,7 +1762,7 @@ config SLABINFO
         default y
 
 config RT_MUTEXES
-        boolean
+        bool
 
 config BASE_SMALL
         int
diff --git a/init/do_mounts.c b/init/do_mounts.c
index 9b3565c41502..eb410083e8e0 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -395,8 +395,6 @@ retry:
                         case 0:
                                 goto out;
                         case -EACCES:
-                                flags |= MS_RDONLY;
-                                goto retry;
                         case -EINVAL:
                                 continue;
                 }
@@ -419,6 +417,10 @@ retry:
 #endif
                 panic("VFS: Unable to mount root fs on %s", b);
         }
+        if (!(flags & MS_RDONLY)) {
+                flags |= MS_RDONLY;
+                goto retry;
+        }
 
         printk("List of all partitions:\n");
         printk_all_partitions();
diff --git a/init/main.c b/init/main.c
index b0c705515089..54565bf57beb 100644
--- a/init/main.c
+++ b/init/main.c
@@ -51,7 +51,7 @@
 #include <linux/mempolicy.h>
 #include <linux/key.h>
 #include <linux/buffer_head.h>
-#include <linux/page_cgroup.h>
+#include <linux/page_ext.h>
 #include <linux/debug_locks.h>
 #include <linux/debugobjects.h>
 #include <linux/lockdep.h>
@@ -78,6 +78,8 @@
 #include <linux/context_tracking.h>
 #include <linux/random.h>
 #include <linux/list.h>
+#include <linux/integrity.h>
+#include <linux/proc_ns.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -85,10 +87,6 @@
 #include <asm/sections.h>
 #include <asm/cacheflush.h>
 
-#ifdef CONFIG_X86_LOCAL_APIC
-#include <asm/smp.h>
-#endif
-
 static int kernel_init(void *);
 
 extern void init_IRQ(void);
@@ -349,15 +347,6 @@ __setup("rdinit=", rdinit_setup);
 
 #ifndef CONFIG_SMP
 static const unsigned int setup_max_cpus = NR_CPUS;
-#ifdef CONFIG_X86_LOCAL_APIC
-static void __init smp_init(void)
-{
-        APIC_init_uniprocessor();
-}
-#else
-#define smp_init()      do { } while (0)
-#endif
-
 static inline void setup_nr_cpu_ids(void) { }
 static inline void smp_prepare_cpus(unsigned int maxcpus) { }
 #endif
@@ -486,10 +475,10 @@ void __init __weak thread_info_cache_init(void)
 static void __init mm_init(void)
 {
         /*
-         * page_cgroup requires contiguous pages,
+         * page_ext requires contiguous pages,
          * bigger than MAX_ORDER unless SPARSEMEM.
          */
-        page_cgroup_init_flatmem();
+        page_ext_init_flatmem();
         mem_init();
         kmem_cache_init();
         percpu_init_late();
@@ -577,6 +566,10 @@ asmlinkage __visible void __init start_kernel(void)
                 local_irq_disable();
         idr_init_cache();
         rcu_init();
+
+        /* trace_printk() and trace points may be used after this */
+        trace_init();
+
         context_tracking_init();
         radix_tree_init();
         /* init some links before init_ISA_irqs() */
@@ -627,7 +620,7 @@ asmlinkage __visible void __init start_kernel(void)
                 initrd_start = 0;
         }
 #endif
-        page_cgroup_init();
+        page_ext_init();
         debug_objects_mem_init();
         kmemleak_init();
         setup_per_cpu_pageset();
@@ -660,8 +653,9 @@ asmlinkage __visible void __init start_kernel(void)
         /* rootfs populating might need page-writeback */
         page_writeback_init();
         proc_root_init();
-        cgroup_init();
+        nsfs_init();
         cpuset_init();
+        cgroup_init();
         taskstats_init_early();
         delayacct_init();
 
@@ -959,8 +953,8 @@ static int __ref kernel_init(void *unused)
                 ret = run_init_process(execute_command);
                 if (!ret)
                         return 0;
-                pr_err("Failed to execute %s (error %d).  Attempting defaults...\n",
-                        execute_command, ret);
+                panic("Requested init %s failed (error %d).",
+                      execute_command, ret);
         }
         if (!try_to_run_init_process("/sbin/init") ||
             !try_to_run_init_process("/etc/init") ||
@@ -1026,8 +1020,11 @@ static noinline void __init kernel_init_freeable(void)
          * Ok, we have completed the initial bootup, and
          * we're essentially up and running. Get rid of the
          * initmem segments and start the user-mode stuff..
+         *
+         * rootfs is available now, try loading the public keys
+         * and default modules
          */
 
-        /* rootfs is available now, try loading default modules */
+        integrity_load_keys();
         load_default_modules();
 }
diff --git a/init/version.c b/init/version.c
index 1a4718e500fe..fe41a63efed6 100644
--- a/init/version.c
+++ b/init/version.c
@@ -35,7 +35,10 @@ struct uts_namespace init_uts_ns = {
                 .domainname     = UTS_DOMAINNAME,
         },
         .user_ns = &init_user_ns,
-        .proc_inum = PROC_UTS_INIT_INO,
+        .ns.inum = PROC_UTS_INIT_INO,
+#ifdef CONFIG_UTS_NS
+        .ns.ops = &utsns_operations,
+#endif
 };
 EXPORT_SYMBOL_GPL(init_uts_ns);