From patchwork Wed Aug 25 21:43:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Glauber Costa X-Patchwork-Id: 132981 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7PLxTsX027490 for ; Wed, 25 Aug 2010 21:59:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753856Ab0HYV72 (ORCPT ); Wed, 25 Aug 2010 17:59:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58913 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753308Ab0HYV7V (ORCPT ); Wed, 25 Aug 2010 17:59:21 -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 o7PLxKPY022013 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 25 Aug 2010 17:59:21 -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 o7PLxDaZ022101; Wed, 25 Aug 2010 17:59:20 -0400 From: Glauber Costa To: kvm@vger.kernel.org Cc: avi@redhat.com, zamsden@redhat.com, mtosatti@redhat.com, riel@redhat.com Subject: [RFC 6/7] touch softlockup watchdog Date: Wed, 25 Aug 2010 17:43:16 -0400 Message-Id: <1282772597-4183-7-git-send-email-glommer@redhat.com> In-Reply-To: <1282772597-4183-6-git-send-email-glommer@redhat.com> References: <1282772597-4183-1-git-send-email-glommer@redhat.com> <1282772597-4183-2-git-send-email-glommer@redhat.com> <1282772597-4183-3-git-send-email-glommer@redhat.com> <1282772597-4183-4-git-send-email-glommer@redhat.com> <1282772597-4183-5-git-send-email-glommer@redhat.com> <1282772597-4183-6-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 (demeter.kernel.org [140.211.167.41]); Wed, 25 Aug 2010 21:59:30 +0000 (UTC) diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index a1f4852..1c496c8 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -104,6 +104,9 @@ cputime_t kvm_get_steal_time(void) delta = this_steal_info - *last_steal_info; + if (delta > 1000UL) + touch_softlockup_watchdog(); + *last_steal_info = this_steal_info; put_cpu_var(steal_info);