evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

arm64 fixes for 4.3-rc5

Browse source 
- A couple of locking fixes for RT kernels
 - Avoid printing bogus initrd warnings when initrd isn't present
 - Performance fix for random mmap file readahead
 - Typo fix
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCgAGBQJWFO+aAAoJELescNyEwWM0z14IALpleyenZXl+xqxMjNyOXouG
 /2SbTZH7iD/vnfCL6G7/Poq00I2ghtBSRFGXajfg7V0mjH1HTfVXVN19IXaUUwjW
 IfAMqSyC43dDBdsGn3A1ZqPRNk+chxjwz7zimGqPowuM87C4aj/sqetBSnuybZtB
 lSYfCFGpDj8cpsJ0xwYYhuq8xUgixQMslTj+rVAFtfsLkDHUu175l+vP7t2xOv5v
 bmyPlz15O/v9febnLYFVFPWZB2IWfvaFkR30qUGsMe6BGWdGDe/RGUPksZDLlPdL
 Yj4AKq+9Bx0lPvO+vNEqfvScKdVjMpttVEMfi2cQ8kUbD1rRPZ7ZTHsfcEOuB1w=
 =Zi+I
 -----END PGP SIGNATURE-----

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Will Deacon:
 "This addresses a couple of issues found with RT, a broken initrd
  message in the console log and a simple performance fix for some MMC
  workloads.

  Summary:

   - A couple of locking fixes for RT kernels
   - Avoid printing bogus initrd warnings when initrd isn't present
   - Performance fix for random mmap file readahead
   - Typo fix"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: replace read_lock to rcu lock in call_break_hook
  arm64: Don't relocate non-existent initrd
  arm64: convert patch_lock to raw lock
  arm64: readahead: fault retry breaks mmap file read random detection
  arm64: debug: Fix typo in debug-monitors.c
This commit is contained in:
Linus Torvalds 2015-10-07 18:17:46 +01:00
commit c6fa8e6de3
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
arch/arm64/kernel/debug-monitors.c
View file

@ -201,7 +201,7 @@ void unregister_step_hook(struct step_hook *hook)
} }
/* /*
* Call registered single step handers * Call registered single step handlers
* There is no Syndrome info to check for determining the handler. * There is no Syndrome info to check for determining the handler.
* So we call all the registered handlers, until the right handler is * So we call all the registered handlers, until the right handler is
* found which returns zero. * found which returns zero.
@ -271,20 +271,21 @@ static int single_step_handler(unsigned long addr, unsigned int esr,
* Use reader/writer locks instead of plain spinlock. * Use reader/writer locks instead of plain spinlock.
*/ */
static LIST_HEAD(break_hook); static LIST_HEAD(break_hook);
static DEFINE_RWLOCK(break_hook_lock); static DEFINE_SPINLOCK(break_hook_lock);
void register_break_hook(struct break_hook *hook) void register_break_hook(struct break_hook *hook)
{ {
write_lock(&break_hook_lock); spin_lock(&break_hook_lock);
list_add(&hook->node, &break_hook); list_add_rcu(&hook->node, &break_hook);
write_unlock(&break_hook_lock); spin_unlock(&break_hook_lock);
} }
void unregister_break_hook(struct break_hook *hook) void unregister_break_hook(struct break_hook *hook)
{ {
write_lock(&break_hook_lock); spin_lock(&break_hook_lock);
list_del(&hook->node); list_del_rcu(&hook->node);
write_unlock(&break_hook_lock); spin_unlock(&break_hook_lock);
synchronize_rcu();
} }
static int call_break_hook(struct pt_regs *regs, unsigned int esr) static int call_break_hook(struct pt_regs *regs, unsigned int esr)
@ -292,11 +293,11 @@ static int call_break_hook(struct pt_regs *regs, unsigned int esr)
struct break_hook *hook; struct break_hook *hook;
int (*fn)(struct pt_regs *regs, unsigned int esr) = NULL; int (*fn)(struct pt_regs *regs, unsigned int esr) = NULL;
read_lock(&break_hook_lock); rcu_read_lock();
list_for_each_entry(hook, &break_hook, node) list_for_each_entry_rcu(hook, &break_hook, node)
if ((esr & hook->esr_mask) == hook->esr_val) if ((esr & hook->esr_mask) == hook->esr_val)
fn = hook->fn; fn = hook->fn;
read_unlock(&break_hook_lock); rcu_read_unlock();
return fn ? fn(regs, esr) : DBG_HOOK_ERROR; return fn ? fn(regs, esr) : DBG_HOOK_ERROR;
} }

6
arch/arm64/kernel/insn.c
View file

@ -85,7 +85,7 @@ bool aarch64_insn_is_branch_imm(u32 insn)
aarch64_insn_is_bcond(insn)); aarch64_insn_is_bcond(insn));
} }
static DEFINE_SPINLOCK(patch_lock); static DEFINE_RAW_SPINLOCK(patch_lock);
static void __kprobes *patch_map(void *addr, int fixmap) static void __kprobes *patch_map(void *addr, int fixmap)
{ {
@ -131,13 +131,13 @@ static int __kprobes __aarch64_insn_write(void *addr, u32 insn)
unsigned long flags = 0; unsigned long flags = 0;
int ret; int ret;
spin_lock_irqsave(&patch_lock, flags); raw_spin_lock_irqsave(&patch_lock, flags);
waddr = patch_map(addr, FIX_TEXT_POKE0); waddr = patch_map(addr, FIX_TEXT_POKE0);
ret = probe_kernel_write(waddr, &insn, AARCH64_INSN_SIZE); ret = probe_kernel_write(waddr, &insn, AARCH64_INSN_SIZE);
patch_unmap(FIX_TEXT_POKE0); patch_unmap(FIX_TEXT_POKE0);
spin_unlock_irqrestore(&patch_lock, flags); raw_spin_unlock_irqrestore(&patch_lock, flags);
return ret; return ret;
} }

2
arch/arm64/kernel/setup.c
View file

@ -364,6 +364,8 @@ static void __init relocate_initrd(void)
to_free = ram_end - orig_start; to_free = ram_end - orig_start;
size = orig_end - orig_start; size = orig_end - orig_start;
if (!size)
return;
/* initrd needs to be relocated completely inside linear mapping */ /* initrd needs to be relocated completely inside linear mapping */
new_start = memblock_find_in_range(0, PFN_PHYS(max_pfn), new_start = memblock_find_in_range(0, PFN_PHYS(max_pfn),

1
arch/arm64/mm/fault.c
View file

@ -287,6 +287,7 @@ retry:
* starvation. * starvation.
*/ */
mm_flags &= ~FAULT_FLAG_ALLOW_RETRY; mm_flags &= ~FAULT_FLAG_ALLOW_RETRY;
mm_flags |= FAULT_FLAG_TRIED;
goto retry; goto retry;
} }
} }