Commit 60187bd4 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "Two areas addressed by these fixes:

   - Fixes from Dave Martin for the signal frames that were broken with
     certain configurations. No one noticed until recently.

   - More kexec fixes to ensure that the crashkernel region is correctly
     allocated, and a fix for the location of the device tree when
     several kexec kernels are loaded"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8687/1: signal: Fix unparseable iwmmxt_sigframe in uc_regspace[]
  ARM: 8686/1: iwmmxt: Add missing __user annotations to sigframe accessors
  ARM: kexec: fix failure to boot crash kernel
  ARM: kexec: avoid allocating crashkernel region outside lowmem
parents da08f35b ce184a0d
...@@ -19,6 +19,11 @@ ...@@ -19,6 +19,11 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#define ARCH_HAS_KIMAGE_ARCH
struct kimage_arch {
u32 kernel_r2;
};
/** /**
* crash_setup_regs() - save registers for the panic kernel * crash_setup_regs() - save registers for the panic kernel
* @newregs: registers are saved here * @newregs: registers are saved here
......
...@@ -35,6 +35,12 @@ struct ucontext { ...@@ -35,6 +35,12 @@ struct ucontext {
* bytes, to prevent unpredictable padding in the signal frame. * bytes, to prevent unpredictable padding in the signal frame.
*/ */
/*
* Dummy padding block: if this magic is encountered, the block should
* be skipped using the corresponding size field.
*/
#define DUMMY_MAGIC 0xb0d9ed01
#ifdef CONFIG_CRUNCH #ifdef CONFIG_CRUNCH
#define CRUNCH_MAGIC 0x5065cf03 #define CRUNCH_MAGIC 0x5065cf03
#define CRUNCH_STORAGE_SIZE (CRUNCH_SIZE + 8) #define CRUNCH_STORAGE_SIZE (CRUNCH_SIZE + 8)
......
...@@ -30,7 +30,6 @@ extern unsigned long kexec_boot_atags; ...@@ -30,7 +30,6 @@ extern unsigned long kexec_boot_atags;
static atomic_t waiting_for_crash_ipi; static atomic_t waiting_for_crash_ipi;
static unsigned long dt_mem;
/* /*
* Provide a dummy crash_notes definition while crash dump arrives to arm. * Provide a dummy crash_notes definition while crash dump arrives to arm.
* This prevents breakage of crash_notes attribute in kernel/ksysfs.c. * This prevents breakage of crash_notes attribute in kernel/ksysfs.c.
...@@ -42,6 +41,9 @@ int machine_kexec_prepare(struct kimage *image) ...@@ -42,6 +41,9 @@ int machine_kexec_prepare(struct kimage *image)
__be32 header; __be32 header;
int i, err; int i, err;
image->arch.kernel_r2 = image->start - KEXEC_ARM_ZIMAGE_OFFSET
+ KEXEC_ARM_ATAGS_OFFSET;
/* /*
* Validate that if the current HW supports SMP, then the SW supports * Validate that if the current HW supports SMP, then the SW supports
* and implements CPU hotplug for the current HW. If not, we won't be * and implements CPU hotplug for the current HW. If not, we won't be
...@@ -66,8 +68,8 @@ int machine_kexec_prepare(struct kimage *image) ...@@ -66,8 +68,8 @@ int machine_kexec_prepare(struct kimage *image)
if (err) if (err)
return err; return err;
if (be32_to_cpu(header) == OF_DT_HEADER) if (header == cpu_to_be32(OF_DT_HEADER))
dt_mem = current_segment->mem; image->arch.kernel_r2 = current_segment->mem;
} }
return 0; return 0;
} }
...@@ -165,8 +167,7 @@ void machine_kexec(struct kimage *image) ...@@ -165,8 +167,7 @@ void machine_kexec(struct kimage *image)
kexec_start_address = image->start; kexec_start_address = image->start;
kexec_indirection_page = page_list; kexec_indirection_page = page_list;
kexec_mach_type = machine_arch_type; kexec_mach_type = machine_arch_type;
kexec_boot_atags = dt_mem ?: image->start - KEXEC_ARM_ZIMAGE_OFFSET kexec_boot_atags = image->arch.kernel_r2;
+ KEXEC_ARM_ATAGS_OFFSET;
/* copy our kernel relocation code to the control code page */ /* copy our kernel relocation code to the control code page */
reboot_entry = fncpy(reboot_code_buffer, reboot_entry = fncpy(reboot_code_buffer,
......
...@@ -987,6 +987,9 @@ static void __init reserve_crashkernel(void) ...@@ -987,6 +987,9 @@ static void __init reserve_crashkernel(void)
if (crash_base <= 0) { if (crash_base <= 0) {
unsigned long long crash_max = idmap_to_phys((u32)~0); unsigned long long crash_max = idmap_to_phys((u32)~0);
unsigned long long lowmem_max = __pa(high_memory - 1) + 1;
if (crash_max > lowmem_max)
crash_max = lowmem_max;
crash_base = memblock_find_in_range(CRASH_ALIGN, crash_max, crash_base = memblock_find_in_range(CRASH_ALIGN, crash_max,
crash_size, CRASH_ALIGN); crash_size, CRASH_ALIGN);
if (!crash_base) { if (!crash_base) {
......
...@@ -40,8 +40,10 @@ static int preserve_crunch_context(struct crunch_sigframe __user *frame) ...@@ -40,8 +40,10 @@ static int preserve_crunch_context(struct crunch_sigframe __user *frame)
return __copy_to_user(frame, kframe, sizeof(*frame)); return __copy_to_user(frame, kframe, sizeof(*frame));
} }
static int restore_crunch_context(struct crunch_sigframe __user *frame) static int restore_crunch_context(char __user **auxp)
{ {
struct crunch_sigframe __user *frame =
(struct crunch_sigframe __user *)*auxp;
char kbuf[sizeof(*frame) + 8]; char kbuf[sizeof(*frame) + 8];
struct crunch_sigframe *kframe; struct crunch_sigframe *kframe;
...@@ -52,6 +54,7 @@ static int restore_crunch_context(struct crunch_sigframe __user *frame) ...@@ -52,6 +54,7 @@ static int restore_crunch_context(struct crunch_sigframe __user *frame)
if (kframe->magic != CRUNCH_MAGIC || if (kframe->magic != CRUNCH_MAGIC ||
kframe->size != CRUNCH_STORAGE_SIZE) kframe->size != CRUNCH_STORAGE_SIZE)
return -1; return -1;
*auxp += CRUNCH_STORAGE_SIZE;
crunch_task_restore(current_thread_info(), &kframe->storage); crunch_task_restore(current_thread_info(), &kframe->storage);
return 0; return 0;
} }
...@@ -59,21 +62,39 @@ static int restore_crunch_context(struct crunch_sigframe __user *frame) ...@@ -59,21 +62,39 @@ static int restore_crunch_context(struct crunch_sigframe __user *frame)
#ifdef CONFIG_IWMMXT #ifdef CONFIG_IWMMXT
static int preserve_iwmmxt_context(struct iwmmxt_sigframe *frame) static int preserve_iwmmxt_context(struct iwmmxt_sigframe __user *frame)
{ {
char kbuf[sizeof(*frame) + 8]; char kbuf[sizeof(*frame) + 8];
struct iwmmxt_sigframe *kframe; struct iwmmxt_sigframe *kframe;
int err = 0;
/* the iWMMXt context must be 64 bit aligned */ /* the iWMMXt context must be 64 bit aligned */
kframe = (struct iwmmxt_sigframe *)((unsigned long)(kbuf + 8) & ~7); kframe = (struct iwmmxt_sigframe *)((unsigned long)(kbuf + 8) & ~7);
if (test_thread_flag(TIF_USING_IWMMXT)) {
kframe->magic = IWMMXT_MAGIC; kframe->magic = IWMMXT_MAGIC;
kframe->size = IWMMXT_STORAGE_SIZE; kframe->size = IWMMXT_STORAGE_SIZE;
iwmmxt_task_copy(current_thread_info(), &kframe->storage); iwmmxt_task_copy(current_thread_info(), &kframe->storage);
return __copy_to_user(frame, kframe, sizeof(*frame));
err = __copy_to_user(frame, kframe, sizeof(*frame));
} else {
/*
* For bug-compatibility with older kernels, some space
* has to be reserved for iWMMXt even if it's not used.
* Set the magic and size appropriately so that properly
* written userspace can skip it reliably:
*/
__put_user_error(DUMMY_MAGIC, &frame->magic, err);
__put_user_error(IWMMXT_STORAGE_SIZE, &frame->size, err);
}
return err;
} }
static int restore_iwmmxt_context(struct iwmmxt_sigframe *frame) static int restore_iwmmxt_context(char __user **auxp)
{ {
struct iwmmxt_sigframe __user *frame =
(struct iwmmxt_sigframe __user *)*auxp;
char kbuf[sizeof(*frame) + 8]; char kbuf[sizeof(*frame) + 8];
struct iwmmxt_sigframe *kframe; struct iwmmxt_sigframe *kframe;
...@@ -81,10 +102,28 @@ static int restore_iwmmxt_context(struct iwmmxt_sigframe *frame) ...@@ -81,10 +102,28 @@ static int restore_iwmmxt_context(struct iwmmxt_sigframe *frame)
kframe = (struct iwmmxt_sigframe *)((unsigned long)(kbuf + 8) & ~7); kframe = (struct iwmmxt_sigframe *)((unsigned long)(kbuf + 8) & ~7);
if (__copy_from_user(kframe, frame, sizeof(*frame))) if (__copy_from_user(kframe, frame, sizeof(*frame)))
return -1; return -1;
if (kframe->magic != IWMMXT_MAGIC ||
kframe->size != IWMMXT_STORAGE_SIZE) /*
* For non-iWMMXt threads: a single iwmmxt_sigframe-sized dummy
* block is discarded for compatibility with setup_sigframe() if
* present, but we don't mandate its presence. If some other
* magic is here, it's not for us:
*/
if (!test_thread_flag(TIF_USING_IWMMXT) &&
kframe->magic != DUMMY_MAGIC)
return 0;
if (kframe->size != IWMMXT_STORAGE_SIZE)
return -1;
if (test_thread_flag(TIF_USING_IWMMXT)) {
if (kframe->magic != IWMMXT_MAGIC)
return -1; return -1;
iwmmxt_task_restore(current_thread_info(), &kframe->storage); iwmmxt_task_restore(current_thread_info(), &kframe->storage);
}
*auxp += IWMMXT_STORAGE_SIZE;
return 0; return 0;
} }
...@@ -107,8 +146,10 @@ static int preserve_vfp_context(struct vfp_sigframe __user *frame) ...@@ -107,8 +146,10 @@ static int preserve_vfp_context(struct vfp_sigframe __user *frame)
return vfp_preserve_user_clear_hwstate(&frame->ufp, &frame->ufp_exc); return vfp_preserve_user_clear_hwstate(&frame->ufp, &frame->ufp_exc);
} }
static int restore_vfp_context(struct vfp_sigframe __user *frame) static int restore_vfp_context(char __user **auxp)
{ {
struct vfp_sigframe __user *frame =
(struct vfp_sigframe __user *)*auxp;
unsigned long magic; unsigned long magic;
unsigned long size; unsigned long size;
int err = 0; int err = 0;
...@@ -121,6 +162,7 @@ static int restore_vfp_context(struct vfp_sigframe __user *frame) ...@@ -121,6 +162,7 @@ static int restore_vfp_context(struct vfp_sigframe __user *frame)
if (magic != VFP_MAGIC || size != VFP_STORAGE_SIZE) if (magic != VFP_MAGIC || size != VFP_STORAGE_SIZE)
return -EINVAL; return -EINVAL;
*auxp += size;
return vfp_restore_user_hwstate(&frame->ufp, &frame->ufp_exc); return vfp_restore_user_hwstate(&frame->ufp, &frame->ufp_exc);
} }
...@@ -141,7 +183,7 @@ struct rt_sigframe { ...@@ -141,7 +183,7 @@ struct rt_sigframe {
static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf) static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf)
{ {
struct aux_sigframe __user *aux; char __user *aux;
sigset_t set; sigset_t set;
int err; int err;
...@@ -169,18 +211,18 @@ static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf) ...@@ -169,18 +211,18 @@ static int restore_sigframe(struct pt_regs *regs, struct sigframe __user *sf)
err |= !valid_user_regs(regs); err |= !valid_user_regs(regs);
aux = (struct aux_sigframe __user *) sf->uc.uc_regspace; aux = (char __user *) sf->uc.uc_regspace;
#ifdef CONFIG_CRUNCH #ifdef CONFIG_CRUNCH
if (err == 0) if (err == 0)
err |= restore_crunch_context(&aux->crunch); err |= restore_crunch_context(&aux);
#endif #endif
#ifdef CONFIG_IWMMXT #ifdef CONFIG_IWMMXT
if (err == 0 && test_thread_flag(TIF_USING_IWMMXT)) if (err == 0)
err |= restore_iwmmxt_context(&aux->iwmmxt); err |= restore_iwmmxt_context(&aux);
#endif #endif
#ifdef CONFIG_VFP #ifdef CONFIG_VFP
if (err == 0) if (err == 0)
err |= restore_vfp_context(&aux->vfp); err |= restore_vfp_context(&aux);
#endif #endif
return err; return err;
...@@ -286,7 +328,7 @@ setup_sigframe(struct sigframe __user *sf, struct pt_regs *regs, sigset_t *set) ...@@ -286,7 +328,7 @@ setup_sigframe(struct sigframe __user *sf, struct pt_regs *regs, sigset_t *set)
err |= preserve_crunch_context(&aux->crunch); err |= preserve_crunch_context(&aux->crunch);
#endif #endif
#ifdef CONFIG_IWMMXT #ifdef CONFIG_IWMMXT
if (err == 0 && test_thread_flag(TIF_USING_IWMMXT)) if (err == 0)
err |= preserve_iwmmxt_context(&aux->iwmmxt); err |= preserve_iwmmxt_context(&aux->iwmmxt);
#endif #endif
#ifdef CONFIG_VFP #ifdef CONFIG_VFP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment