From patchwork Sun Sep 20 05:21:03 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: stephen hemminger <shemminger@vyatta.com>
X-Patchwork-Id: 33956
X-Patchwork-Delegate: davem@davemloft.net
Return-Path: <netdev-owner@vger.kernel.org>
X-Original-To: patchwork-incoming@ozlabs.org
Delivered-To: patchwork-incoming@ozlabs.org
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by ozlabs.org (Postfix) with ESMTP id 6A5D5B7B6F
	for <patchwork-incoming@ozlabs.org>;
	Sun, 20 Sep 2009 15:21:16 +1000 (EST)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751995AbZITFVH (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);
	Sun, 20 Sep 2009 01:21:07 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751943AbZITFVG
	(ORCPT <rfc822; netdev-outgoing>); Sun, 20 Sep 2009 01:21:06 -0400
Received: from mail.vyatta.com ([76.74.103.46]:33572 "EHLO mail.vyatta.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751269AbZITFVF (ORCPT <rfc822;netdev@vger.kernel.org>);
	Sun, 20 Sep 2009 01:21:05 -0400
Received: from localhost (localhost.localdomain [127.0.0.1])
	by mail.vyatta.com (Postfix) with ESMTP id 4430F4F422A;
	Sat, 19 Sep 2009 22:21:09 -0700 (PDT)
X-Virus-Scanned: amavisd-new at tahiti.vyatta.com
Received: from mail.vyatta.com ([127.0.0.1])
	by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id pizQ3hbpgtKJ; Sat, 19 Sep 2009 22:21:04 -0700 (PDT)
Received: from nehalam (pool-71-117-243-208.ptldor.fios.verizon.net
	[71.117.243.208])
	by mail.vyatta.com (Postfix) with ESMTP id 655F04F4041;
	Sat, 19 Sep 2009 22:21:04 -0700 (PDT)
Date: Sat, 19 Sep 2009 22:21:03 -0700
From: Stephen Hemminger <shemminger@vyatta.com>
To: David Miller <davem@davemloft.net>,
	Robert Olsson <robert@herjulf.net>
Cc: netdev@vger.kernel.org
Subject: [PATCH 2/2] pktgen: nmi watchdog keep alive
Message-ID: <20090919222103.017b5d5f@nehalam>
Organization: Vyatta
X-Mailer: Claws Mail 3.6.1 (GTK+ 2.16.1; x86_64-pc-linux-gnu)
Mime-Version: 1.0
Sender: netdev-owner@vger.kernel.org
Precedence: bulk
List-ID: <netdev.vger.kernel.org>
X-Mailing-List: netdev@vger.kernel.org

If pktgen gets really busy it takes up all the CPU,
and can starve the NMI thread and cause system reset.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
---
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

--- a/net/core/pktgen.c	2009-09-19 11:28:53.762463050 -0700
+++ b/net/core/pktgen.c	2009-09-19 11:30:36.534459968 -0700
@@ -136,6 +136,7 @@
 #include <linux/delay.h>
 #include <linux/timer.h>
 #include <linux/list.h>
+#include <linux/nmi.h>
 #include <linux/init.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
@@ -3369,6 +3370,7 @@ static void idle(struct pktgen_dev *pkt_
 {
 	ktime_t idle_start = ktime_now();
 
+	touch_nmi_watchdog();
 	if (need_resched())
 		schedule();
 	else