From patchwork Mon Jun 21 10:23:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rusty Russell X-Patchwork-Id: 56299 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 153DFB7D80 for ; Mon, 21 Jun 2010 20:24:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757566Ab0FUKXx (ORCPT ); Mon, 21 Jun 2010 06:23:53 -0400 Received: from ozlabs.org ([203.10.76.45]:34712 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757232Ab0FUKXw (ORCPT ); Mon, 21 Jun 2010 06:23:52 -0400 Received: from vivaldi.localnet (ppp121-45-115-42.lns20.adl6.internode.on.net [121.45.115.42]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id 5B207B7D64; Mon, 21 Jun 2010 20:23:51 +1000 (EST) From: Rusty Russell To: "Michael S. Tsirkin" Subject: Re: [PATCH for-2.6.35] virtio_net: fix oom handling on tx Date: Mon, 21 Jun 2010 19:53:43 +0930 User-Agent: KMail/1.13.2 (Linux/2.6.32-22-generic; KDE/4.4.2; i686; ; ) Cc: Stephen Hemminger , Sridhar Samudrala , virtualization@lists.linux-foundation.org, Jiri Pirko , Shirley Ma , netdev@vger.kernel.org, linux-kernel@vger.kernel.org References: <20100610152041.GA3480@redhat.com> <201006211213.49600.rusty@rustcorp.com.au> <20100621083315.GA8665@redhat.com> In-Reply-To: <20100621083315.GA8665@redhat.com> MIME-Version: 1.0 Message-Id: <201006211953.44724.rusty@rustcorp.com.au> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, 21 Jun 2010 06:03:16 pm Michael S. Tsirkin wrote: > On Mon, Jun 21, 2010 at 12:13:49PM +0930, Rusty Russell wrote: > > - return NETDEV_TX_BUSY; > > + kfree_skb(skb); > > + return NETDEV_TX_OK; > > If we do so, let's increment the dropped counter and/or error counter? Yep, here's the extra change: --- 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 diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -571,14 +571,16 @@ static netdev_tx_t start_xmit(struct sk_ /* This can happen with OOM and indirect buffers. */ if (unlikely(capacity < 0)) { if (net_ratelimit()) { - if (likely(capacity == -ENOMEM)) + if (likely(capacity == -ENOMEM)) { dev_warn(&dev->dev, "TX queue failure: out of memory\n"); - else + } else { + dev->stats.tx_fifo_errors++; dev_warn(&dev->dev, "Unexpected TX queue failure: %d\n", capacity); } + dev->stats.tx_dropped++; kfree_skb(skb); return NETDEV_TX_OK; }