From owner-svn-src-head@FreeBSD.ORG  Wed Sep 29 09:22:12 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F25DD106566C;
	Wed, 29 Sep 2010 09:22:12 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E1CC98FC14;
	Wed, 29 Sep 2010 09:22:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8T9MC4J002873;
	Wed, 29 Sep 2010 09:22:12 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8T9MCuJ002871;
	Wed, 29 Sep 2010 09:22:12 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201009290922.o8T9MCuJ002871@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Wed, 29 Sep 2010 09:22:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213265 - head/sys/netinet/ipfw
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Sep 2010 09:22:13 -0000

Author: luigi
Date: Wed Sep 29 09:22:12 2010
New Revision: 213265
URL: http://svn.freebsd.org/changeset/base/213265

Log:
  fix handling of initial credit for an idle pipe.
  This fixes the bug where setting bw > 1 MTU/tick resulted in
  infinite bandwidth if io_fast=1
  
  PR:		147245 148429
  Obtained from:	Riccardo Panicucci
  MFC after:	3 days

Modified:
  head/sys/netinet/ipfw/ip_dn_io.c

Modified: head/sys/netinet/ipfw/ip_dn_io.c
==============================================================================
--- head/sys/netinet/ipfw/ip_dn_io.c	Wed Sep 29 09:20:18 2010	(r213264)
+++ head/sys/netinet/ipfw/ip_dn_io.c	Wed Sep 29 09:22:12 2010	(r213265)
@@ -752,8 +752,11 @@ dummynet_io(struct mbuf **m0, int dir, s
 	}
 
 	/* compute the initial allowance */
-	{
+	if (si->idle_time < dn_cfg.curr_time) {
+	    /* Do this only on the first packet on an idle pipe */
 	    struct dn_link *p = &fs->sched->link;
+
+	    si->sched_time = dn_cfg.curr_time;
 	    si->credit = dn_cfg.io_fast ? p->bandwidth : 0;
 	    if (p->burst) {
 		uint64_t burst = (dn_cfg.curr_time - si->idle_time) * p->bandwidth;