1 files changed, 247 insertions, 32 deletions

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 7b371c37061d..e58a462949b1 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -42,6 +42,9 @@
 #include <linux/reboot.h>
 #include <linux/topology.h>
 #include <linux/ftrace.h>
+#include <linux/kexec.h>
+#include <linux/crash_dump.h>
+#include <linux/memory.h>
 
 #include <asm/ipl.h>
 #include <asm/uaccess.h>
@@ -57,12 +60,13 @@
 #include <asm/ebcdic.h>
 #include <asm/compat.h>
 #include <asm/kvm_virtio.h>
+#include <asm/diag.h>
 
-long psw_kernel_bits    = (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_PRIMARY |
-                           PSW_MASK_MCHECK | PSW_DEFAULT_KEY);
-long psw_user_bits      = (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_HOME |
-                           PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK |
-                           PSW_MASK_PSTATE | PSW_DEFAULT_KEY);
+long psw_kernel_bits    = PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_ASC_PRIMARY |
+                          PSW_MASK_EA | PSW_MASK_BA;
+long psw_user_bits      = PSW_MASK_DAT | PSW_MASK_IO | PSW_MASK_EXT |
+                          PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_MCHECK |
+                          PSW_MASK_PSTATE | PSW_ASC_HOME;
 
 /*
  * User copy operations.
@@ -207,6 +211,8 @@ static void __init setup_zfcpdump(unsigned int console_devno)
 
         if (ipl_info.type != IPL_TYPE_FCP_DUMP)
                 return;
+        if (OLDMEM_BASE)
+                return;
         if (console_devno != -1)
                 sprintf(str, " cio_ignore=all,!0.0.%04x,!0.0.%04x",
                         ipl_info.data.fcp.dev_id.devno, console_devno);
@@ -274,22 +280,14 @@ early_param("mem", early_parse_mem);
 unsigned int user_mode = HOME_SPACE_MODE;
 EXPORT_SYMBOL_GPL(user_mode);
 
-static int set_amode_and_uaccess(unsigned long user_amode,
-                                 unsigned long user32_amode)
+static int set_amode_primary(void)
 {
-        psw_user_bits = PSW_BASE_BITS | PSW_MASK_DAT | user_amode |
-                        PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK |
-                        PSW_MASK_PSTATE | PSW_DEFAULT_KEY;
+        psw_kernel_bits = (psw_kernel_bits & ~PSW_MASK_ASC) | PSW_ASC_HOME;
+        psw_user_bits = (psw_user_bits & ~PSW_MASK_ASC) | PSW_ASC_PRIMARY;
 #ifdef CONFIG_COMPAT
-        psw_user32_bits = PSW_BASE32_BITS | PSW_MASK_DAT | user_amode |
-                          PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK |
-                          PSW_MASK_PSTATE | PSW_DEFAULT_KEY;
-        psw32_user_bits = PSW32_BASE_BITS | PSW32_MASK_DAT | user32_amode |
-                          PSW32_MASK_IO | PSW32_MASK_EXT | PSW32_MASK_MCHECK |
-                          PSW32_MASK_PSTATE;
+        psw32_user_bits =
+                (psw32_user_bits & ~PSW32_MASK_ASC) | PSW32_ASC_PRIMARY;
 #endif
-        psw_kernel_bits = PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_HOME |
-                          PSW_MASK_MCHECK | PSW_DEFAULT_KEY;
 
         if (MACHINE_HAS_MVCOS) {
                 memcpy(&uaccess, &uaccess_mvcos_switch, sizeof(uaccess));
@@ -325,7 +323,7 @@ early_param("user_mode", early_parse_user_mode);
 static void setup_addressing_mode(void)
 {
         if (user_mode == PRIMARY_SPACE_MODE) {
-                if (set_amode_and_uaccess(PSW_ASC_PRIMARY, PSW32_ASC_PRIMARY))
+                if (set_amode_primary())
                         pr_info("Address spaces switched, "
                                 "mvcos available\n");
                 else
@@ -344,24 +342,25 @@ setup_lowcore(void)
          */
         BUILD_BUG_ON(sizeof(struct _lowcore) != LC_PAGES * 4096);
         lc = __alloc_bootmem_low(LC_PAGES * PAGE_SIZE, LC_PAGES * PAGE_SIZE, 0);
-        lc->restart_psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
+        lc->restart_psw.mask = psw_kernel_bits;
         lc->restart_psw.addr =
                 PSW_ADDR_AMODE | (unsigned long) psw_restart_int_handler;
-        if (user_mode != HOME_SPACE_MODE)
-                lc->restart_psw.mask |= PSW_ASC_HOME;
-        lc->external_new_psw.mask = psw_kernel_bits;
+        lc->external_new_psw.mask = psw_kernel_bits |
+                PSW_MASK_DAT | PSW_MASK_MCHECK;
         lc->external_new_psw.addr =
                 PSW_ADDR_AMODE | (unsigned long) ext_int_handler;
-        lc->svc_new_psw.mask = psw_kernel_bits | PSW_MASK_IO | PSW_MASK_EXT;
+        lc->svc_new_psw.mask = psw_kernel_bits |
+                PSW_MASK_DAT | PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK;
         lc->svc_new_psw.addr = PSW_ADDR_AMODE | (unsigned long) system_call;
-        lc->program_new_psw.mask = psw_kernel_bits;
+        lc->program_new_psw.mask = psw_kernel_bits |
+                PSW_MASK_DAT | PSW_MASK_MCHECK;
         lc->program_new_psw.addr =
-                PSW_ADDR_AMODE | (unsigned long)pgm_check_handler;
-        lc->mcck_new_psw.mask =
-                psw_kernel_bits & ~PSW_MASK_MCHECK & ~PSW_MASK_DAT;
+                PSW_ADDR_AMODE | (unsigned long) pgm_check_handler;
+        lc->mcck_new_psw.mask = psw_kernel_bits;
         lc->mcck_new_psw.addr =
                 PSW_ADDR_AMODE | (unsigned long) mcck_int_handler;
-        lc->io_new_psw.mask = psw_kernel_bits;
+        lc->io_new_psw.mask = psw_kernel_bits |
+                PSW_MASK_DAT | PSW_MASK_MCHECK;
         lc->io_new_psw.addr = PSW_ADDR_AMODE | (unsigned long) io_int_handler;
         lc->clock_comparator = -1ULL;
         lc->kernel_stack = ((unsigned long) &init_thread_union) + THREAD_SIZE;
@@ -435,10 +434,14 @@ static void __init setup_resources(void)
         for (i = 0; i < MEMORY_CHUNKS; i++) {
                 if (!memory_chunk[i].size)
                         continue;
+                if (memory_chunk[i].type == CHUNK_OLDMEM ||
+                    memory_chunk[i].type == CHUNK_CRASHK)
+                        continue;
                 res = alloc_bootmem_low(sizeof(*res));
                 res->flags = IORESOURCE_BUSY | IORESOURCE_MEM;
                 switch (memory_chunk[i].type) {
                 case CHUNK_READ_WRITE:
+                case CHUNK_CRASHK:
                         res->name = "System RAM";
                         break;
                 case CHUNK_READ_ONLY:
@@ -479,8 +482,9 @@ static void __init setup_memory_end(void)
         unsigned long max_mem;
         int i;
 
+
 #ifdef CONFIG_ZFCPDUMP
-        if (ipl_info.type == IPL_TYPE_FCP_DUMP) {
+        if (ipl_info.type == IPL_TYPE_FCP_DUMP && !OLDMEM_BASE) {
                 memory_end = ZFCPDUMP_HSA_SIZE;
                 memory_end_set = 1;
         }
@@ -545,11 +549,201 @@ static void __init setup_restart_psw(void)
          * Setup restart PSW for absolute zero lowcore. This is necesary
          * if PSW restart is done on an offline CPU that has lowcore zero
          */
-        psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
+        psw.mask = PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA | PSW_MASK_BA;
         psw.addr = PSW_ADDR_AMODE | (unsigned long) psw_restart_int_handler;
         copy_to_absolute_zero(&S390_lowcore.restart_psw, &psw, sizeof(psw));
 }
 
+static void __init setup_vmcoreinfo(void)
+{
+#ifdef CONFIG_KEXEC
+        unsigned long ptr = paddr_vmcoreinfo_note();
+
+        copy_to_absolute_zero(&S390_lowcore.vmcore_info, &ptr, sizeof(ptr));
+#endif
+}
+
+#ifdef CONFIG_CRASH_DUMP
+
+/*
+ * Find suitable location for crashkernel memory
+ */
+static unsigned long __init find_crash_base(unsigned long crash_size,
+                                            char **msg)
+{
+        unsigned long crash_base;
+        struct mem_chunk *chunk;
+        int i;
+
+        if (memory_chunk[0].size < crash_size) {
+                *msg = "first memory chunk must be at least crashkernel size";
+                return 0;
+        }
+        if (is_kdump_kernel() && (crash_size == OLDMEM_SIZE))
+                return OLDMEM_BASE;
+
+        for (i = MEMORY_CHUNKS - 1; i >= 0; i--) {
+                chunk = &memory_chunk[i];
+                if (chunk->size == 0)
+                        continue;
+                if (chunk->type != CHUNK_READ_WRITE)
+                        continue;
+                if (chunk->size < crash_size)
+                        continue;
+                crash_base = (chunk->addr + chunk->size) - crash_size;
+                if (crash_base < crash_size)
+                        continue;
+                if (crash_base < ZFCPDUMP_HSA_SIZE_MAX)
+                        continue;
+                if (crash_base < (unsigned long) INITRD_START + INITRD_SIZE)
+                        continue;
+                return crash_base;
+        }
+        *msg = "no suitable area found";
+        return 0;
+}
+
+/*
+ * Check if crash_base and crash_size is valid
+ */
+static int __init verify_crash_base(unsigned long crash_base,
+                                    unsigned long crash_size,
+                                    char **msg)
+{
+        struct mem_chunk *chunk;
+        int i;
+
+        /*
+         * Because we do the swap to zero, we must have at least 'crash_size'
+         * bytes free space before crash_base
+         */
+        if (crash_size > crash_base) {
+                *msg = "crashkernel offset must be greater than size";
+                return -EINVAL;
+        }
+
+        /* First memory chunk must be at least crash_size */
+        if (memory_chunk[0].size < crash_size) {
+                *msg = "first memory chunk must be at least crashkernel size";
+                return -EINVAL;
+        }
+        /* Check if we fit into the respective memory chunk */
+        for (i = 0; i < MEMORY_CHUNKS; i++) {
+                chunk = &memory_chunk[i];
+                if (chunk->size == 0)
+                        continue;
+                if (crash_base < chunk->addr)
+                        continue;
+                if (crash_base >= chunk->addr + chunk->size)
+                        continue;
+                /* we have found the memory chunk */
+                if (crash_base + crash_size > chunk->addr + chunk->size) {
+                        *msg = "selected memory chunk is too small for "
+                                "crashkernel memory";
+                        return -EINVAL;
+                }
+                return 0;
+        }
+        *msg = "invalid memory range specified";
+        return -EINVAL;
+}
+
+/*
+ * Reserve kdump memory by creating a memory hole in the mem_chunk array
+ */
+static void __init reserve_kdump_bootmem(unsigned long addr, unsigned long size,
+                                         int type)
+{
+
+        create_mem_hole(memory_chunk, addr, size, type);
+}
+
+/*
+ * When kdump is enabled, we have to ensure that no memory from
+ * the area [0 - crashkernel memory size] and
+ * [crashk_res.start - crashk_res.end] is set offline.
+ */
+static int kdump_mem_notifier(struct notifier_block *nb,
+                              unsigned long action, void *data)
+{
+        struct memory_notify *arg = data;
+
+        if (arg->start_pfn < PFN_DOWN(resource_size(&crashk_res)))
+                return NOTIFY_BAD;
+        if (arg->start_pfn > PFN_DOWN(crashk_res.end))
+                return NOTIFY_OK;
+        if (arg->start_pfn + arg->nr_pages - 1 < PFN_DOWN(crashk_res.start))
+                return NOTIFY_OK;
+        return NOTIFY_BAD;
+}
+
+static struct notifier_block kdump_mem_nb = {
+        .notifier_call = kdump_mem_notifier,
+};
+
+#endif
+
+/*
+ * Make sure that oldmem, where the dump is stored, is protected
+ */
+static void reserve_oldmem(void)
+{
+#ifdef CONFIG_CRASH_DUMP
+        if (!OLDMEM_BASE)
+                return;
+
+        reserve_kdump_bootmem(OLDMEM_BASE, OLDMEM_SIZE, CHUNK_OLDMEM);
+        reserve_kdump_bootmem(OLDMEM_SIZE, memory_end - OLDMEM_SIZE,
+                              CHUNK_OLDMEM);
+        if (OLDMEM_BASE + OLDMEM_SIZE == real_memory_size)
+                saved_max_pfn = PFN_DOWN(OLDMEM_BASE) - 1;
+        else
+                saved_max_pfn = PFN_DOWN(real_memory_size) - 1;
+#endif
+}
+
+/*
+ * Reserve memory for kdump kernel to be loaded with kexec
+ */
+static void __init reserve_crashkernel(void)
+{
+#ifdef CONFIG_CRASH_DUMP
+        unsigned long long crash_base, crash_size;
+        char *msg;
+        int rc;
+
+        rc = parse_crashkernel(boot_command_line, memory_end, &crash_size,
+                               &crash_base);
+        if (rc || crash_size == 0)
+                return;
+        crash_base = ALIGN(crash_base, KEXEC_CRASH_MEM_ALIGN);
+        crash_size = ALIGN(crash_size, KEXEC_CRASH_MEM_ALIGN);
+        if (register_memory_notifier(&kdump_mem_nb))
+                return;
+        if (!crash_base)
+                crash_base = find_crash_base(crash_size, &msg);
+        if (!crash_base) {
+                pr_info("crashkernel reservation failed: %s\n", msg);
+                unregister_memory_notifier(&kdump_mem_nb);
+                return;
+        }
+        if (verify_crash_base(crash_base, crash_size, &msg)) {
+                pr_info("crashkernel reservation failed: %s\n", msg);
+                unregister_memory_notifier(&kdump_mem_nb);
+                return;
+        }
+        if (!OLDMEM_BASE && MACHINE_IS_VM)
+                diag10_range(PFN_DOWN(crash_base), PFN_DOWN(crash_size));
+        crashk_res.start = crash_base;
+        crashk_res.end = crash_base + crash_size - 1;
+        insert_resource(&iomem_resource, &crashk_res);
+        reserve_kdump_bootmem(crash_base, crash_size, CHUNK_CRASHK);
+        pr_info("Reserving %lluMB of memory at %lluMB "
+                "for crashkernel (System RAM: %luMB)\n",
+                crash_size >> 20, crash_base >> 20, memory_end >> 20);
+#endif
+}
+
 static void __init
 setup_memory(void)
 {
@@ -580,6 +774,14 @@ setup_memory(void)
                 if (PFN_PHYS(start_pfn) + bmap_size > INITRD_START) {
                         start = PFN_PHYS(start_pfn) + bmap_size + PAGE_SIZE;
 
+#ifdef CONFIG_CRASH_DUMP
+                        if (OLDMEM_BASE) {
+                                /* Move initrd behind kdump oldmem */
+                                if (start + INITRD_SIZE > OLDMEM_BASE &&
+                                    start < OLDMEM_BASE + OLDMEM_SIZE)
+                                        start = OLDMEM_BASE + OLDMEM_SIZE;
+                        }
+#endif
                         if (start + INITRD_SIZE > memory_end) {
                                 pr_err("initrd extends beyond end of "
                                        "memory (0x%08lx > 0x%08lx) "
@@ -610,7 +812,8 @@ setup_memory(void)
         for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {
                 unsigned long start_chunk, end_chunk, pfn;
 
-                if (memory_chunk[i].type != CHUNK_READ_WRITE)
+                if (memory_chunk[i].type != CHUNK_READ_WRITE &&
+                    memory_chunk[i].type != CHUNK_CRASHK)
                         continue;
                 start_chunk = PFN_DOWN(memory_chunk[i].addr);
                 end_chunk = start_chunk + PFN_DOWN(memory_chunk[i].size);
@@ -644,6 +847,15 @@ setup_memory(void)
         reserve_bootmem(start_pfn << PAGE_SHIFT, bootmap_size,
                         BOOTMEM_DEFAULT);
 
+#ifdef CONFIG_CRASH_DUMP
+        if (crashk_res.start)
+                reserve_bootmem(crashk_res.start,
+                                crashk_res.end - crashk_res.start + 1,
+                                BOOTMEM_DEFAULT);
+        if (is_kdump_kernel())
+                reserve_bootmem(elfcorehdr_addr - OLDMEM_BASE,
+                                PAGE_ALIGN(elfcorehdr_size), BOOTMEM_DEFAULT);
+#endif
 #ifdef CONFIG_BLK_DEV_INITRD
         if (INITRD_START && INITRD_SIZE) {
                 if (INITRD_START + INITRD_SIZE <= memory_end) {
@@ -812,8 +1024,11 @@ setup_arch(char **cmdline_p)
         setup_ipl();
         setup_memory_end();
         setup_addressing_mode();
+        reserve_oldmem();
+        reserve_crashkernel();
         setup_memory();
         setup_resources();
+        setup_vmcoreinfo();
         setup_restart_psw();
         setup_lowcore();