From patchwork Mon Jan 11 16:45:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 42631 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1147CB7BF4 for ; Tue, 12 Jan 2010 03:47:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751204Ab0AKQrG (ORCPT ); Mon, 11 Jan 2010 11:47:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751355Ab0AKQrF (ORCPT ); Mon, 11 Jan 2010 11:47:05 -0500 Received: from mail.vyatta.com ([76.74.103.46]:44415 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751050Ab0AKQrD (ORCPT ); Mon, 11 Jan 2010 11:47:03 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id D65EE4F4236; Mon, 11 Jan 2010 08:46:52 -0800 (PST) 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 5hZY6j1IVoZr; Mon, 11 Jan 2010 08:46:37 -0800 (PST) Received: from nehalam (pool-74-107-135-205.ptldor.fios.verizon.net [74.107.135.205]) by mail.vyatta.com (Postfix) with ESMTP id 6DF7B4F4232; Mon, 11 Jan 2010 08:46:37 -0800 (PST) Date: Mon, 11 Jan 2010 08:45:04 -0800 From: Stephen Hemminger To: Mike McCormack Cc: "Berck E. Nash" , "Rafael J. Wysocki" , netdev@vger.kernel.org, Jarek Poplawski Subject: Re: [Bug #14925] sky2 panic under load Message-ID: <20100111084504.7adb5a1e@nehalam> In-Reply-To: <4B4B2FBD.5090007@ring3k.org> References: <4B4A729E.9060805@gmail.com> <4B4B2FBD.5090007@ring3k.org> Organization: Vyatta X-Mailer: Claws Mail 3.7.2 (GTK+ 2.18.3; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, 11 Jan 2010 23:03:41 +0900 Mike McCormack wrote: > Perhaps only sky2_tx_done should wake the queue? > Does the patch below fix the problem too? > > thanks, > > Mike The idea is good, but what if transmit queue was full (stopped), and TX FIFO gets stuck. Then Transmit timeout happens and the reset logic clears the queue. What will start the queue? Something like this: ----------------------------------------------------------- --- a/drivers/net/sky2.c 2010-01-11 08:36:42.617426300 -0800 +++ b/drivers/net/sky2.c 2010-01-11 08:42:51.295237661 -0800 @@ -1843,9 +1843,6 @@ static void sky2_tx_complete(struct sky2 sky2->tx_cons = idx; smp_mb(); - - if (tx_avail(sky2) > MAX_SKB_TX_LE + 4) - netif_wake_queue(dev); } static void sky2_tx_reset(struct sky2_hw *hw, unsigned port) @@ -2416,8 +2413,12 @@ static inline void sky2_tx_done(struct n { struct sky2_port *sky2 = netdev_priv(dev); - if (netif_running(dev)) + if (netif_running(dev) && netif_device_present(dev)) { sky2_tx_complete(sky2, last); + + if (tx_avail(sky2) > MAX_SKB_TX_LE + 4) + netif_wake_queue(dev); + } } static inline void sky2_skb_rx(const struct sky2_port *sky2, @@ -3197,6 +3198,7 @@ static int sky2_reattach(struct net_devi } else { netif_device_attach(dev); sky2_set_multicast(dev); + netif_start_queue(dev); } }