From patchwork Tue Sep 13 07:12:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 9328449 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EEDC060231 for ; Tue, 13 Sep 2016 07:31:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAEEB291D1 for ; Tue, 13 Sep 2016 07:31:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF4E2291D3; Tue, 13 Sep 2016 07:31:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AF599291D1 for ; Tue, 13 Sep 2016 07:31:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bji8h-000564-7Y; Tue, 13 Sep 2016 07:28:19 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bji8g-00055y-GI for xen-devel@lists.xen.org; Tue, 13 Sep 2016 07:28:18 +0000 Received: from [85.158.143.35] by server-6.bemta-6.messagelabs.com id DC/0A-11175-19AA7D75; Tue, 13 Sep 2016 07:28:17 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsXS1tYhrztx1fV wg8lTuS2WfFzM4sDocXT3b6YAxijWzLyk/IoE1owZ56ewFDRwVsw8MI+1gXEhexcjJ4eQQKXE oUVHWEFsCQFeiSPLZkDZARL/Ny1ihajpZ5ToPOALYrMJqEucWDyREcQWEZCWuPb5MpDNxcEsc J1RounaaTaQhLCAh8SshhfMIDaLgKrE6X8zWUBsXgFnid43Z4AWcwAtUJCYM8lmAiP3AkaGVY waxalFZalFusYGeklFmekZJbmJmTm6hgZmermpxcWJ6ak5iUnFesn5uZsYgd5lAIIdjH/XBh5 ilORgUhLl1Zp5PVyILyk/pTIjsTgjvqg0J7X4EKMMB4eSBC8DMFiEBItS01Mr0jJzgGEGk5bg 4FES4a1fCZTmLS5IzC3OTIdInWJUlBLnvQmSEABJZJTmwbXBQvsSo6yUMC8j0CFCPAWpRbmZJ ajyrxjFORiVhHmbQKbwZOaVwE1/BbSYCWjx062XQRaXJCKkpBoY45Zcuegf73HV7c9Ck2MvGD tfGO2cEiWrKrb4TWfonF/108Q6pR9OPMdlI3XtMm/O63/X36xftO9tl3WenvEi/Y2es1X/Pjj +9O7muWEHeDzkFY6HvLROMfy5TLl19oeHaseiLv586FH9xbRz+lKPvGUHNz1YHmHw7kXdnRPa WYVyf+y8VxbfZ1FiKc5INNRiLipOBAAFhfUJaAIAAA== X-Env-Sender: tianyu.lan@intel.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1473751694!27562849!1 X-Originating-IP: [134.134.136.31] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26026 invoked from network); 13 Sep 2016 07:28:16 -0000 Received: from mga06.intel.com (HELO mga06.intel.com) (134.134.136.31) by server-14.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 13 Sep 2016 07:28:16 -0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP; 13 Sep 2016 00:28:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.30,327,1470726000"; d="scan'208"; a="1039093746" Received: from lantianyu-ws.sh.intel.com (HELO localhost) ([10.239.159.159]) by fmsmga001.fm.intel.com with ESMTP; 13 Sep 2016 00:28:11 -0700 From: Lan Tianyu To: xen-devel@lists.xen.org Date: Tue, 13 Sep 2016 15:12:54 +0800 Message-Id: <1473750774-5976-1-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.7.9.5 Cc: Lan Tianyu , sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, jbeulich@suse.com Subject: [Xen-devel] [PATCH] Xen/timer: Disable watchdog during dumping timer queues X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP On a machine with a mount of cpus, dump_timerq() lasts several seconds which may exceed watchdog timeout and cause Xen hyperviosr reboot. This patch is to disable watchdog when dump timer queues to fix the issue. Signed-off-by: Lan Tianyu --- xen/common/timer.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/common/timer.c b/xen/common/timer.c index 29a60a9..2d9d828 100644 --- a/xen/common/timer.c +++ b/xen/common/timer.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -524,6 +525,7 @@ static void dump_timerq(unsigned char key) s_time_t now = NOW(); int i, j; + watchdog_disable(); printk("Dumping timer queues:\n"); for_each_online_cpu( i ) @@ -538,6 +540,8 @@ static void dump_timerq(unsigned char key) dump_timer(t, now); spin_unlock_irqrestore(&ts->lock, flags); } + + watchdog_enable(); } static void migrate_timers_from_cpu(unsigned int old_cpu)