From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jarek Poplawski <jarkao2@gmail.com>
Subject: Re: bnx2_poll panicking kernel
Date: Sat, 12 Jul 2008 11:49:14 +0200
Message-ID: <48787E1A.3030804@gmail.com>
References: <20080710223141.GA2519@orion.carnet.hr>	<20080710.162007.04790623.davem@davemloft.net>	<20080711092416.GA26515@orion.carnet.hr> <20080711.025656.261409874.davem@davemloft.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: joy@entuzijast.net, mchan@broadcom.com, billfink@mindspring.com,
	bhutchings@solarflare.com, netdev@vger.kernel.org,
	mirrors@debian.org, kaber@trash.net, devik@cdi.cz
To: David Miller <davem@davemloft.net>
Return-path: <netdev-owner@vger.kernel.org>
Received: from fg-out-1718.google.com ([72.14.220.159]:43321 "EHLO
	fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751994AbYGLJtA (ORCPT
	<rfc822;netdev@vger.kernel.org>); Sat, 12 Jul 2008 05:49:00 -0400
Received: by fg-out-1718.google.com with SMTP id 19so1698741fgg.17
        for <netdev@vger.kernel.org>; Sat, 12 Jul 2008 02:48:58 -0700 (PDT)
In-Reply-To: <20080711.025656.261409874.davem@davemloft.net>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

David Miller wrote, On 07/11/2008 11:56 AM:
...

> diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c
> index 3fb58f4..aa20b47 100644
> --- a/net/sched/sch_htb.c
> +++ b/net/sched/sch_htb.c
> @@ -583,6 +583,7 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
>  		if (q->direct_queue.qlen < q->direct_qlen) {
>  			__skb_queue_tail(&q->direct_queue, skb);
>  			q->direct_pkts++;
> +			ret = NET_XMIT_SUCCESS;
>  		} else {
>  			kfree_skb(skb);
>  			sch->qstats.drops++;
> @@ -595,22 +596,26 @@ static int htb_enqueue(struct sk_buff *skb, struct Qdisc *sch)
>  		kfree_skb(skb);
>  		return ret;
>  #endif
> -	} else if (cl->un.leaf.q->enqueue(skb, cl->un.leaf.q) !=
> -		   NET_XMIT_SUCCESS) {
> -		sch->qstats.drops++;
> -		cl->qstats.drops++;
> -		return NET_XMIT_DROP;
>  	} else {
> -		cl->bstats.packets +=
> -			skb_is_gso(skb)?skb_shinfo(skb)->gso_segs:1;
> -		cl->bstats.bytes += skb->len;
> -		htb_activate(q, cl);
> +		ret = cl->un.leaf.q->enqueue(skb, cl->un.leaf.q);
> +		if (ret == NET_XMIT_DROP) {
> +			sch->qstats.drops++;
> +			cl->qstats.drops++;
> +		} else {
> +			cl->bstats.packets +=
> +				skb_is_gso(skb)?skb_shinfo(skb)->gso_segs:1;
> +			cl->bstats.bytes += skb->len;
> +			htb_activate(q, cl);


This isn't correct: htb_activate() needs cl->un.leaf.q->q.qlen > 0, and
only NET_XMIT_SUCCESS can guarantee this.

Jarek P.