Merge branches 'perf-urgent-for-linus', 'smp-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf, cpu hotplug and timer fixes from Ingo Molnar:
"perf:
- A single tooling fix for a user-triggerable segfault.

CPU hotplug:
- Fix a CPU hotplug corner case regression, introduced by the recent
hotplug rework

timers:
- Fix a boot hang in the ARM based Tango SoC clocksource driver"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf intel-pt: Fix segfault tracing transactions

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
cpu/hotplug: Fix rollback during error-out in __cpu_disable()

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource/drivers/tango-xtal: Fix boot hang due to incorrect test

Linus Torvalds 10 years ago 82b23cb9 0e11d256

+28 -9

3 changed files

expand all

drivers

clocksource

tango_xtal.c

kernel

cpu.c

tools

perf

util

intel-pt.c

+1 -1

drivers/clocksource/tango_xtal.c

··· 42 42 43 43 ret = clocksource_mmio_init(xtal_in_cnt, "tango-xtal", xtal_freq, 350, 44 44 32, clocksource_mmio_readl_up); 45 - if (!ret) { 45 + if (ret) { 46 46 pr_err("%s: registration failed\n", np->full_name); 47 47 return; 48 48 }

+26 -7

kernel/cpu.c

··· 36 36 * @target: The target state 37 37 * @thread: Pointer to the hotplug thread 38 38 * @should_run: Thread should execute 39 + * @rollback: Perform a rollback 39 40 * @cb_stat: The state for a single callback (install/uninstall) 40 41 * @cb: Single callback function (install/uninstall) 41 42 * @result: Result of the operation ··· 48 47 #ifdef CONFIG_SMP 49 48 struct task_struct *thread; 50 49 bool should_run; 50 + bool rollback; 51 51 enum cpuhp_state cb_state; 52 52 int (*cb)(unsigned int cpu); 53 53 int result; ··· 303 301 return __cpu_notify(val, cpu, -1, NULL); 304 302 } 305 303 304 + static void cpu_notify_nofail(unsigned long val, unsigned int cpu) 305 + { 306 + BUG_ON(cpu_notify(val, cpu)); 307 + } 308 + 306 309 /* Notifier wrappers for transitioning to state machine */ 307 310 static int notify_prepare(unsigned int cpu) 308 311 { ··· 484 477 } else { 485 478 ret = cpuhp_invoke_callback(cpu, st->cb_state, st->cb); 486 479 } 480 + } else if (st->rollback) { 481 + BUG_ON(st->state < CPUHP_AP_ONLINE_IDLE); 482 + 483 + undo_cpu_down(cpu, st, cpuhp_ap_states); 484 + /* 485 + * This is a momentary workaround to keep the notifier users 486 + * happy. Will go away once we got rid of the notifiers. 487 + */ 488 + cpu_notify_nofail(CPU_DOWN_FAILED, cpu); 489 + st->rollback = false; 487 490 } else { 488 491 /* Cannot happen .... */ 489 492 BUG_ON(st->state < CPUHP_AP_ONLINE_IDLE); ··· 653 636 read_unlock(&tasklist_lock); 654 637 } 655 638 656 - static void cpu_notify_nofail(unsigned long val, unsigned int cpu) 657 - { 658 - BUG_ON(cpu_notify(val, cpu)); 659 - } 660 - 661 639 static int notify_down_prepare(unsigned int cpu) 662 640 { 663 641 int err, nr_calls = 0; ··· 733 721 */ 734 722 err = stop_machine(take_cpu_down, NULL, cpumask_of(cpu)); 735 723 if (err) { 736 - /* CPU didn't die: tell everyone. Can't complain. */ 737 - cpu_notify_nofail(CPU_DOWN_FAILED, cpu); 724 + /* CPU refused to die */ 738 725 irq_unlock_sparse(); 726 + /* Unpark the hotplug thread so we can rollback there */ 727 + kthread_unpark(per_cpu_ptr(&cpuhp_state, cpu)->thread); 739 728 return err; 740 729 } 741 730 BUG_ON(cpu_online(cpu)); ··· 845 832 * to do the further cleanups. 846 833 */ 847 834 ret = cpuhp_down_callbacks(cpu, st, cpuhp_bp_states, target); 835 + if (ret && st->state > CPUHP_TEARDOWN_CPU && st->state < prev_state) { 836 + st->target = prev_state; 837 + st->rollback = true; 838 + cpuhp_kick_ap_work(cpu); 839 + } 848 840 849 841 hasdied = prev_state != st->state && st->state == CPUHP_OFFLINE; 850 842 out: ··· 1267 1249 .name = "notify:online", 1268 1250 .startup = notify_online, 1269 1251 .teardown = notify_down_prepare, 1252 + .skip_onerr = true, 1270 1253 }, 1271 1254 #endif 1272 1255 /*

+1 -1

tools/perf/util/intel-pt.c

··· 1130 1130 pr_err("Intel Processor Trace: failed to deliver transaction event, error %d\n", 1131 1131 ret); 1132 1132 1133 - if (pt->synth_opts.callchain) 1133 + if (pt->synth_opts.last_branch) 1134 1134 intel_pt_reset_last_branch_rb(ptq); 1135 1135 1136 1136 return ret;

Configure Feed

Configure Feed