From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932150AbbETO5v (ORCPT ); Wed, 20 May 2015 10:57:51 -0400 Received: from smtprelay0219.hostedemail.com ([216.40.44.219]:37306 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752331AbbETO5s (ORCPT ); Wed, 20 May 2015 10:57:48 -0400 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 50,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::,RULES_HIT:41:69:355:379:541:960:967:969:973:988:989:1260:1263:1277:1311:1313:1314:1345:1437:1515:1516:1518:1534:1543:1593:1594:1711:1730:1747:1777:1792:2194:2199:2393:2525:2566:2682:2685:2687:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3354:3770:3834:3865:3867:3871:3873:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4250:4321:4560:4605:5007:6119:6261:6684:7266:7875:7903:7974:8509:8599:8985:9025:9072:9388:10004:10049:10400:10848:11026:11232:11233:11473:11658:11914:12043:12266:12291:12296:12438:12517:12519:12555:12663:12679:12683:13019:13868:14096:14097:14394:21080,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0 X-HE-Tag: glue25_7e0123bfb2b59 X-Filterd-Recvd-Size: 4786 Date: Wed, 20 May 2015 10:57:45 -0400 From: Steven Rostedt To: LKML , linux-rt-users Cc: Thomas Gleixner , Carsten Emde , John Kacur , Sebastian Andrzej Siewior Subject: [ANNOUNCE] 3.2.68-rt100 Message-ID: <20150520105745.2fabfb66@gandalf.local.home> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.25; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dear RT Folks, I'm pleased to announce the 3.2.68-rt100 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: 0ebfe81f7a834713ae0b2e0718aa34057fafa106 Or to build 3.2.68-rt100 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.68.xz http://www.kernel.org/pub/linux/kernel/projects/rt/3.2/patch-3.2.68-rt100.patch.xz You can also build from 3.2.68-rt99 by applying the incremental patch: http://www.kernel.org/pub/linux/kernel/projects/rt/3.2/incr/patch-3.2.68-rt99-rt100.patch.xz Enjoy, -- Steve Changes from v3.2.68-rt99: --- Marcelo Tosatti (1): KVM: lapic: mark LAPIC timer handler as irqsafe Steven Rostedt (Red Hat) (1): Linux 3.2.68-rt100 ---- arch/x86/kvm/lapic.c | 42 +++++++++++++++++++++++++++++++++++++++--- localversion-rt | 2 +- 2 files changed, 40 insertions(+), 4 deletions(-) --------------------------- diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 176205ab0ca8..745cbfe4b51c 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -679,8 +679,38 @@ 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); @@ -710,9 +740,11 @@ static void start_apic_timer(struct kvm_lapic *apic) } } - hrtimer_start(&apic->lapic_timer.timer, + ret = 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 ", " @@ -742,8 +774,10 @@ static void start_apic_timer(struct kvm_lapic *apic) ns = (tscdeadline - guest_tsc) * 1000000ULL; do_div(ns, this_tsc_khz); } - hrtimer_start(&apic->lapic_timer.timer, + ret = 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); } @@ -1173,6 +1207,7 @@ 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; @@ -1269,7 +1304,8 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu) timer = &apic->lapic_timer.timer; if (hrtimer_cancel(timer)) - hrtimer_start_expires(timer, HRTIMER_MODE_ABS); + if (hrtimer_start_expires(timer, HRTIMER_MODE_ABS) == -ETIME) + apic_timer_expired(timer); } void kvm_lapic_sync_from_vapic(struct kvm_vcpu *vcpu) diff --git a/localversion-rt b/localversion-rt index 31145e774bbe..79d3e2b9f550 100644 --- a/localversion-rt +++ b/localversion-rt @@ -1 +1 @@ --rt99 +-rt100