Dear RT Folks, I'm pleased to announce the 3.2.81-rt117 stable release.
You can get this release via the git tree at: git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git branch: v3.2-rt Head SHA1: fe7588485c196d9dcfb35019c846c7f9cdde64fa Or to build 3.2.81-rt117 directly, the following patches should be applied: http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.tar.xz http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.2.81.xz http://www.kernel.org/pub/linux/kernel/projects/rt/3.2/patch-3.2.81-rt117.patch.xz You can also build from 3.2.81-rt116 by applying the incremental patch: http://www.kernel.org/pub/linux/kernel/projects/rt/3.2/incr/patch-3.2.81-rt116-rt117.patch.xz Enjoy, -- Steve Changes from v3.2.81-rt116: --- Corey Minyard (1): x86: Fix an RT MCE crash Sebastian Andrzej Siewior (1): trace: correct off by one while recording the trace-event Steven Rostedt (Red Hat) (2): Revert: KVM: lapic: mark LAPIC timer handler as irqsafe Linux 3.2.81-rt117 ---- arch/x86/kernel/cpu/mcheck/mce.c | 3 ++- arch/x86/kvm/lapic.c | 42 +++------------------------------------- include/trace/ftrace.h | 3 +++ localversion-rt | 2 +- 4 files changed, 9 insertions(+), 41 deletions(-) --------------------------- diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index b08a373f66fb..fc02fe279ddc 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1206,7 +1206,8 @@ static int mce_notify_work_init(void) static void mce_notify_work(void) { - wake_up_process(mce_notify_helper); + if (mce_notify_helper) + wake_up_process(mce_notify_helper); } #else static void mce_notify_work(void) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 7198be07b406..055cc49ffb10 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -679,38 +679,8 @@ static void update_divide_count(struct kvm_lapic *apic) apic->divide_count); } - -static enum hrtimer_restart apic_timer_fn(struct hrtimer *data); - -static void apic_timer_expired(struct hrtimer *data) -{ - int ret, i = 0; - enum hrtimer_restart r; - struct kvm_timer *ktimer = container_of(data, struct kvm_timer, timer); - - r = apic_timer_fn(data); - - if (r == HRTIMER_RESTART) { - do { - ret = hrtimer_start_expires(data, HRTIMER_MODE_ABS); - if (ret == -ETIME) - hrtimer_add_expires_ns(&ktimer->timer, - ktimer->period); - i++; - } while (ret == -ETIME && i < 10); - - if (ret == -ETIME) { - printk_once(KERN_ERR "%s: failed to reprogram timer\n", - __func__); - WARN_ON_ONCE(1); - } - } -} - - static void start_apic_timer(struct kvm_lapic *apic) { - int ret; ktime_t now; atomic_set(&apic->lapic_timer.pending, 0); @@ -740,11 +710,9 @@ static void start_apic_timer(struct kvm_lapic *apic) } } - ret = hrtimer_start(&apic->lapic_timer.timer, + hrtimer_start(&apic->lapic_timer.timer, ktime_add_ns(now, apic->lapic_timer.period), HRTIMER_MODE_ABS); - if (ret == -ETIME) - apic_timer_expired(&apic->lapic_timer.timer); apic_debug("%s: bus cycle is %" PRId64 "ns, now 0x%016" PRIx64 ", " @@ -774,10 +742,8 @@ static void start_apic_timer(struct kvm_lapic *apic) ns = (tscdeadline - guest_tsc) * 1000000ULL; do_div(ns, this_tsc_khz); } - ret = hrtimer_start(&apic->lapic_timer.timer, + hrtimer_start(&apic->lapic_timer.timer, ktime_add_ns(now, ns), HRTIMER_MODE_ABS); - if (ret == -ETIME) - apic_timer_expired(&apic->lapic_timer.timer); local_irq_restore(flags); } @@ -1207,7 +1173,6 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu) hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); apic->lapic_timer.timer.function = kvm_timer_fn; - apic->lapic_timer.timer.irqsafe = 1; apic->lapic_timer.t_ops = &lapic_timer_ops; apic->lapic_timer.kvm = vcpu->kvm; apic->lapic_timer.vcpu = vcpu; @@ -1305,8 +1270,7 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu) timer = &apic->lapic_timer.timer; if (hrtimer_cancel(timer)) - if (hrtimer_start_expires(timer, HRTIMER_MODE_ABS) == -ETIME) - apic_timer_expired(timer); + hrtimer_start_expires(timer, HRTIMER_MODE_ABS); } void kvm_lapic_sync_from_vapic(struct kvm_vcpu *vcpu) diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 763bf05ccb27..73aab555b42d 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -530,6 +530,9 @@ ftrace_raw_event_##call(void *__data, proto) \ \ local_save_flags(irq_flags); \ pc = preempt_count(); \ + /* Account for tracepoint preempt disable */ \ + if (IS_ENABLED(CONFIG_PREEMPT)) \ + pc--; \ \ __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ \ diff --git a/localversion-rt b/localversion-rt index 34eca4e89203..9788245dd428 100644 --- a/localversion-rt +++ b/localversion-rt @@ -1 +1 @@ --rt116 +-rt117
