From patchwork Mon Aug 30 16:06:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 142821 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o7UGO95t010852 for ; Mon, 30 Aug 2010 16:24:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755930Ab0H3QYE (ORCPT ); Mon, 30 Aug 2010 12:24:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14618 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755917Ab0H3QYA (ORCPT ); Mon, 30 Aug 2010 12:24:00 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7UGNmqh015294 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 30 Aug 2010 12:23:48 -0400 Received: from localhost.localdomain (virtlab1.virt.bos.redhat.com [10.16.72.21]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o7UGNW5c005506; Mon, 30 Aug 2010 12:23:47 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: avi@redhat.com, zamsden@redhat.com, mtosatti@redhat.com, riel@redhat.com, peterz@infradead.org, mingo@elte.hu, jeremy@goop.org Subject: [RFC 7/8] touch softlockup watchdog Date: Mon, 30 Aug 2010 12:06:30 -0400 Message-Id: <1283184391-7785-15-git-send-email-glommer@redhat.com> In-Reply-To: <1283184391-7785-14-git-send-email-glommer@redhat.com> References: <1283184391-7785-1-git-send-email-glommer@redhat.com> <1283184391-7785-2-git-send-email-glommer@redhat.com> <1283184391-7785-3-git-send-email-glommer@redhat.com> <1283184391-7785-4-git-send-email-glommer@redhat.com> <1283184391-7785-5-git-send-email-glommer@redhat.com> <1283184391-7785-6-git-send-email-glommer@redhat.com> <1283184391-7785-7-git-send-email-glommer@redhat.com> <1283184391-7785-8-git-send-email-glommer@redhat.com> <1283184391-7785-9-git-send-email-glommer@redhat.com> <1283184391-7785-10-git-send-email-glommer@redhat.com> <1283184391-7785-11-git-send-email-glommer@redhat.com> <1283184391-7785-12-git-send-email-glommer@redhat.com> <1283184391-7785-13-git-send-email-glommer@redhat.com> <1283184391-7785-14-git-send-email-glommer@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 30 Aug 2010 16:24:10 +0000 (UTC) diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index a1f4852..d217475 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -91,6 +91,7 @@ cputime_t kvm_get_steal_time(void) { u64 delta = 0; u64 *last_steal_info, this_steal_info; + int touch_wd; struct pvclock_vcpu_time_info *src; src = &get_cpu_var(hv_clock); @@ -104,6 +105,10 @@ cputime_t kvm_get_steal_time(void) delta = this_steal_info - *last_steal_info; + touch_wd = softlockup_thresh * 1000UL; + if ((touch_wd > 0) && (delta > touch_wd)) + touch_softlockup_watchdog(); + *last_steal_info = this_steal_info; put_cpu_var(steal_info);