Commit fb8b0067 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

Pull microblaze changes from Michal Simek.

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Setup correct pointer to TLS area
  microblaze: Add TLS support to sys_clone
  microblaze: ftrace: Pass the first calling instruction for dynamic ftrace
  microblaze: Port OOM changes to do_page_fault
  microblaze: Do not select GENERIC_GPIO by default
parents b48b2c3e d5c15f17
...@@ -52,7 +52,7 @@ config GENERIC_CALIBRATE_DELAY ...@@ -52,7 +52,7 @@ config GENERIC_CALIBRATE_DELAY
def_bool y def_bool y
config GENERIC_GPIO config GENERIC_GPIO
def_bool y bool
config GENERIC_CSUM config GENERIC_CSUM
def_bool y def_bool y
......
...@@ -492,10 +492,11 @@ C_ENTRY(sys_clone): ...@@ -492,10 +492,11 @@ C_ENTRY(sys_clone):
bnei r6, 1f; /* See if child SP arg (arg 1) is 0. */ bnei r6, 1f; /* See if child SP arg (arg 1) is 0. */
lwi r6, r1, PT_R1; /* If so, use paret's stack ptr */ lwi r6, r1, PT_R1; /* If so, use paret's stack ptr */
1: addik r7, r1, 0; /* Arg 2: parent context */ 1: addik r7, r1, 0; /* Arg 2: parent context */
add r8, r0, r0; /* Arg 3: (unused) */ lwi r9, r1, PT_R8; /* parent tid. */
add r9, r0, r0; /* Arg 4: (unused) */ lwi r10, r1, PT_R9; /* child tid. */
/* do_fork will pick up TLS from regs->r10. */
brid do_fork /* Do real work (tail-call) */ brid do_fork /* Do real work (tail-call) */
add r10, r0, r0; /* Arg 5: (unused) */ add r8, r0, r0; /* Arg 3: (unused) */
C_ENTRY(sys_execve): C_ENTRY(sys_execve):
brid microblaze_execve; /* Do real work (tail-call).*/ brid microblaze_execve; /* Do real work (tail-call).*/
......
...@@ -138,7 +138,7 @@ NOALIGN_ENTRY(ftrace_call) ...@@ -138,7 +138,7 @@ NOALIGN_ENTRY(ftrace_call)
#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_DYNAMIC_FTRACE */
/* static normal trace */ /* static normal trace */
lwi r6, r1, 120; /* MS: load parent addr */ lwi r6, r1, 120; /* MS: load parent addr */
addik r5, r15, 0; /* MS: load current function addr */ addik r5, r15, -4; /* MS: load current function addr */
/* MS: here is dependency on previous code */ /* MS: here is dependency on previous code */
brald r15, r20; /* MS: jump to ftrace handler */ brald r15, r20; /* MS: jump to ftrace handler */
nop; nop;
......
...@@ -182,8 +182,12 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, ...@@ -182,8 +182,12 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
#endif #endif
ti->cpu_context.r15 = (unsigned long)ret_from_fork - 8; ti->cpu_context.r15 = (unsigned long)ret_from_fork - 8;
/*
* r21 is the thread reg, r10 is 6th arg to clone
* which contains TLS area
*/
if (clone_flags & CLONE_SETTLS) if (clone_flags & CLONE_SETTLS)
; childregs->r21 = childregs->r10;
return 0; return 0;
} }
......
...@@ -92,6 +92,8 @@ void do_page_fault(struct pt_regs *regs, unsigned long address, ...@@ -92,6 +92,8 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
int code = SEGV_MAPERR; int code = SEGV_MAPERR;
int is_write = error_code & ESR_S; int is_write = error_code & ESR_S;
int fault; int fault;
unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
(is_write ? FAULT_FLAG_WRITE : 0);
regs->ear = address; regs->ear = address;
regs->esr = error_code; regs->esr = error_code;
...@@ -138,6 +140,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long address, ...@@ -138,6 +140,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
if (kernel_mode(regs) && !search_exception_tables(regs->pc)) if (kernel_mode(regs) && !search_exception_tables(regs->pc))
goto bad_area_nosemaphore; goto bad_area_nosemaphore;
retry:
down_read(&mm->mmap_sem); down_read(&mm->mmap_sem);
} }
...@@ -210,7 +213,11 @@ void do_page_fault(struct pt_regs *regs, unsigned long address, ...@@ -210,7 +213,11 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
* make sure we exit gracefully rather than endlessly redo * make sure we exit gracefully rather than endlessly redo
* the fault. * the fault.
*/ */
fault = handle_mm_fault(mm, vma, address, is_write ? FAULT_FLAG_WRITE : 0); fault = handle_mm_fault(mm, vma, address, flags);
if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))
return;
if (unlikely(fault & VM_FAULT_ERROR)) { if (unlikely(fault & VM_FAULT_ERROR)) {
if (fault & VM_FAULT_OOM) if (fault & VM_FAULT_OOM)
goto out_of_memory; goto out_of_memory;
...@@ -218,11 +225,27 @@ void do_page_fault(struct pt_regs *regs, unsigned long address, ...@@ -218,11 +225,27 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
goto do_sigbus; goto do_sigbus;
BUG(); BUG();
} }
if (flags & FAULT_FLAG_ALLOW_RETRY) {
if (unlikely(fault & VM_FAULT_MAJOR)) if (unlikely(fault & VM_FAULT_MAJOR))
current->maj_flt++; current->maj_flt++;
else else
current->min_flt++; current->min_flt++;
if (fault & VM_FAULT_RETRY) {
flags &= ~FAULT_FLAG_ALLOW_RETRY;
/*
* No need to up_read(&mm->mmap_sem) as we would
* have already released it in __lock_page_or_retry
* in mm/filemap.c.
*/
goto retry;
}
}
up_read(&mm->mmap_sem); up_read(&mm->mmap_sem);
/* /*
* keep track of tlb+htab misses that are good addrs but * keep track of tlb+htab misses that are good addrs but
* just need pte's created via handle_mm_fault() * just need pte's created via handle_mm_fault()
......
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