From patchwork Mon Aug 8 04:49:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 108857 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 E0CE1B6F71 for ; Mon, 8 Aug 2011 14:49:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751047Ab1HHEtk (ORCPT ); Mon, 8 Aug 2011 00:49:40 -0400 Received: from smtp-out.google.com ([74.125.121.67]:13042 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750899Ab1HHEtj (ORCPT ); Mon, 8 Aug 2011 00:49:39 -0400 Received: from wpaz17.hot.corp.google.com (wpaz17.hot.corp.google.com [172.24.198.81]) by smtp-out.google.com with ESMTP id p784naus020103; Sun, 7 Aug 2011 21:49:36 -0700 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1312778976; bh=I3x7URwIapz9L0FqXqcn/W9+KW0=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=XoBwalDlO0RM/jsc7XxBMtIC2JkiMVdg6KKibdak4MbH5IO3n991wcwvT0hmjt+Qi lvPSialwSdErwGzbYRcLQ== DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=date:from:to:subject:message-id:user-agent:mime-version:content-type; b=qYCWuzYfhaOcv+ivOD23teqdkIQQKBnO5xePg4TpZsUqB8fbk/t5N7gdnYZDlpQmL OTFDLwgQF9hnFCZn9NAdQ== Received: from pokey.mtv.corp.google.com (pokey.mtv.corp.google.com [172.18.96.23]) by wpaz17.hot.corp.google.com with ESMTP id p784nZ4x009833; Sun, 7 Aug 2011 21:49:35 -0700 Received: by pokey.mtv.corp.google.com (Postfix, from userid 60832) id 0F56422F00B; Sun, 7 Aug 2011 21:49:35 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by pokey.mtv.corp.google.com (Postfix) with ESMTP id 0EE1422EED5; Sun, 7 Aug 2011 21:49:35 -0700 (PDT) Date: Sun, 7 Aug 2011 21:49:35 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org Subject: [RFC PATCH v2 5/9] e1000e: Support for byte queue limits Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Changes to e1000e to use byte queue limits. Signed-off-by: Tom Herbert --- drivers/net/e1000e/netdev.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 4353ad5..4ce114c 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -998,6 +998,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) unsigned int i, eop; unsigned int count = 0; unsigned int total_tx_bytes = 0, total_tx_packets = 0; + unsigned int bytes_compl = 0, pkts_compl = 0; i = tx_ring->next_to_clean; eop = tx_ring->buffer_info[i].next_to_watch; @@ -1015,6 +1016,11 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) if (cleaned) { total_tx_packets += buffer_info->segs; total_tx_bytes += buffer_info->bytecount; + if (buffer_info->skb) { + bytes_compl += buffer_info->skb->len; + pkts_compl++; + } + } e1000_put_txbuf(adapter, buffer_info); @@ -1033,6 +1039,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) tx_ring->next_to_clean = i; + netdev_completed_queue(netdev, pkts_compl, bytes_compl); + #define TX_WAKE_THRESHOLD 32 if (count && netif_carrier_ok(netdev) && e1000_desc_unused(tx_ring) >= TX_WAKE_THRESHOLD) { @@ -2164,6 +2172,7 @@ static void e1000_clean_tx_ring(struct e1000_adapter *adapter) e1000_put_txbuf(adapter, buffer_info); } + netdev_reset_queue(adapter->netdev); size = sizeof(struct e1000_buffer) * tx_ring->count; memset(tx_ring->buffer_info, 0, size); @@ -4882,6 +4891,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, /* if count is 0 then mapping error has occurred */ count = e1000_tx_map(adapter, skb, first, max_per_txd, nr_frags, mss); if (count) { + netdev_sent_queue(netdev, 1, skb->len); e1000_tx_queue(adapter, tx_flags, count); /* Make sure there is space in the ring for the next send. */ e1000_maybe_stop_tx(netdev, MAX_SKB_FRAGS + 2);