Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 70 insertions, 21 deletions

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 8fc69891e117..d4f7fd4550e1 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -32,6 +32,7 @@
 #include <linux/nmi.h>
 #include <linux/cpu.h>
 
+#include <asm/abi.h>
 #include <asm/asm.h>
 #include <asm/bootinfo.h>
 #include <asm/cpu.h>
@@ -39,6 +40,7 @@
 #include <asm/dsp.h>
 #include <asm/fpu.h>
 #include <asm/irq.h>
+#include <asm/mips-cps.h>
 #include <asm/msa.h>
 #include <asm/pgtable.h>
 #include <asm/mipsregs.h>
@@ -645,6 +647,29 @@ out:
         return pc;
 }
 
+unsigned long mips_stack_top(void)
+{
+        unsigned long top = TASK_SIZE & PAGE_MASK;
+
+        /* One page for branch delay slot "emulation" */
+        top -= PAGE_SIZE;
+
+        /* Space for the VDSO, data page & GIC user page */
+        top -= PAGE_ALIGN(current->thread.abi->vdso->size);
+        top -= PAGE_SIZE;
+        top -= mips_gic_present() ? PAGE_SIZE : 0;
+
+        /* Space for cache colour alignment */
+        if (cpu_has_dc_aliases)
+                top -= shm_align_mask + 1;
+
+        /* Space to randomize the VDSO base */
+        if (current->flags & PF_RANDOMIZE)
+                top -= VDSO_RANDOMIZE_SIZE;
+
+        return top;
+}
+
 /*
  * Don't forget that the stack pointer must be aligned on a 8 bytes
  * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index c71d1eb7da59..8aaaa42f91ed 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -846,6 +846,34 @@ static void __init arch_mem_init(char **cmdline_p)
         struct memblock_region *reg;
         extern void plat_mem_setup(void);
 
+        /*
+         * Initialize boot_command_line to an innocuous but non-empty string in
+         * order to prevent early_init_dt_scan_chosen() from copying
+         * CONFIG_CMDLINE into it without our knowledge. We handle
+         * CONFIG_CMDLINE ourselves below & don't want to duplicate its
+         * content because repeating arguments can be problematic.
+         */
+        strlcpy(boot_command_line, " ", COMMAND_LINE_SIZE);
+
+        /* call board setup routine */
+        plat_mem_setup();
+
+        /*
+         * Make sure all kernel memory is in the maps.  The "UP" and
+         * "DOWN" are opposite for initdata since if it crosses over
+         * into another memory section you don't want that to be
+         * freed when the initdata is freed.
+         */
+        arch_mem_addpart(PFN_DOWN(__pa_symbol(&_text)) << PAGE_SHIFT,
+                         PFN_UP(__pa_symbol(&_edata)) << PAGE_SHIFT,
+                         BOOT_MEM_RAM);
+        arch_mem_addpart(PFN_UP(__pa_symbol(&__init_begin)) << PAGE_SHIFT,
+                         PFN_DOWN(__pa_symbol(&__init_end)) << PAGE_SHIFT,
+                         BOOT_MEM_INIT_RAM);
+
+        pr_info("Determined physical RAM map:\n");
+        print_memory_map();
+
 #if defined(CONFIG_CMDLINE_BOOL) && defined(CONFIG_CMDLINE_OVERRIDE)
         strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
 #else
@@ -873,26 +901,6 @@ static void __init arch_mem_init(char **cmdline_p)
         }
 #endif
 #endif
-
-        /* call board setup routine */
-        plat_mem_setup();
-
-        /*
-         * Make sure all kernel memory is in the maps.  The "UP" and
-         * "DOWN" are opposite for initdata since if it crosses over
-         * into another memory section you don't want that to be
-         * freed when the initdata is freed.
-         */
-        arch_mem_addpart(PFN_DOWN(__pa_symbol(&_text)) << PAGE_SHIFT,
-                         PFN_UP(__pa_symbol(&_edata)) << PAGE_SHIFT,
-                         BOOT_MEM_RAM);
-        arch_mem_addpart(PFN_UP(__pa_symbol(&__init_begin)) << PAGE_SHIFT,
-                         PFN_DOWN(__pa_symbol(&__init_end)) << PAGE_SHIFT,
-                         BOOT_MEM_INIT_RAM);
-
-        pr_info("Determined physical RAM map:\n");
-        print_memory_map();
-
         strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
 
         *cmdline_p = command_line;
diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c
index 8f845f6e5f42..48a9c6b90e07 100644
--- a/arch/mips/kernel/vdso.c
+++ b/arch/mips/kernel/vdso.c
@@ -15,6 +15,7 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/random.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/timekeeper_internal.h>
@@ -97,6 +98,21 @@ void update_vsyscall_tz(void)
         }
 }
 
+static unsigned long vdso_base(void)
+{
+        unsigned long base;
+
+        /* Skip the delay slot emulation page */
+        base = STACK_TOP + PAGE_SIZE;
+
+        if (current->flags & PF_RANDOMIZE) {
+                base += get_random_int() & (VDSO_RANDOMIZE_SIZE - 1);
+                base = PAGE_ALIGN(base);
+        }
+
+        return base;
+}
+
 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
 {
         struct mips_vdso_image *image = current->thread.abi->vdso;
@@ -137,7 +153,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
         if (cpu_has_dc_aliases)
                 size += shm_align_mask + 1;
 
-        base = get_unmapped_area(NULL, 0, size, 0, 0);
+        base = get_unmapped_area(NULL, vdso_base(), size, 0, 0);
         if (IS_ERR_VALUE(base)) {
                 ret = base;
                 goto out;