From patchwork Wed Sep 21 13:43:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 115789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id E4B52B6F7E for ; Wed, 21 Sep 2011 23:43:29 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1R6N4y-0003tt-6a; Wed, 21 Sep 2011 13:43:12 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1R6N4v-0003om-Sy for kernel-team@lists.ubuntu.com; Wed, 21 Sep 2011 13:43:10 +0000 Received: from [10.0.2.5] (host-174-44-187-184.hln-mt.client.bresnan.net [174.44.187.184]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mail.tpi.com (Postfix) with ESMTP id 694A02C59EA for ; Wed, 21 Sep 2011 06:42:46 -0700 (PDT) Message-ID: <4E79E9EB.2060302@canonical.com> Date: Wed, 21 Sep 2011 07:43:07 -0600 From: Tim Gardner User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.21) Gecko/20110831 Thunderbird/3.1.13 MIME-Version: 1.0 To: Ubuntu Kernel Team Subject: Lucid SRU: UBUNTU: SAUCE: igb: Protect stats update X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This patch is a partial backport of upstream 12dcd86b75d571772512676ab301279952efc0b0. Its purpose is twofold; 1) Protect simultaneous readers and writers, 2) refresh statistics when read from ethtool. rtg Acked-by: John Johansen From 805de5028e59d721c2f6058a16399db1e8c434f5 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Tue, 20 Sep 2011 14:06:12 -0600 Subject: [PATCH] UBUNTU: SAUCE: igb: Protect stats update BugLink: http://bugs.launchpad.net/bugs/829566 Partial backport from upstream 12dcd86b75d571772512676ab301279952efc0b0 The stats structure was improperly protected against simultaneous reads and writes. Also update stats at the time the user reads them. Signed-off-by: Tim Gardner --- drivers/net/igb/igb.h | 2 ++ drivers/net/igb/igb_ethtool.c | 2 ++ drivers/net/igb/igb_main.c | 16 ++++++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h index b1c1eb8..ce42798 100644 --- a/drivers/net/igb/igb.h +++ b/drivers/net/igb/igb.h @@ -284,6 +284,8 @@ struct igb_adapter { struct timecompare compare; struct hwtstamp_config hwtstamp_config; + spinlock_t stats_lock; + /* structs defined in e1000_hw.h */ struct e1000_hw hw; struct e1000_hw_stats stats; diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c index 550ad93..5bda682 100644 --- a/drivers/net/igb/igb_ethtool.c +++ b/drivers/net/igb/igb_ethtool.c @@ -1992,6 +1992,7 @@ static void igb_get_ethtool_stats(struct net_device *netdev, int i, j, k; char *p; + spin_lock(&adapter->stats_lock); igb_update_stats(adapter); for (i = 0; i < IGB_GLOBAL_STATS_LEN; i++) { @@ -2014,6 +2015,7 @@ static void igb_get_ethtool_stats(struct net_device *netdev, for (k = 0; k < IGB_RX_QUEUE_STATS_LEN; k++, i++) data[i] = queue_stat[k]; } + spin_unlock(&adapter->stats_lock); } static void igb_get_strings(struct net_device *netdev, u32 stringset, u8 *data) diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 4370842..c159b93 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -1191,7 +1191,9 @@ void igb_down(struct igb_adapter *adapter) netif_carrier_off(netdev); /* record the stats before reset*/ + spin_lock(&adapter->stats_lock); igb_update_stats(adapter); + spin_unlock(&adapter->stats_lock); adapter->link_speed = 0; adapter->link_duplex = 0; @@ -1534,6 +1536,8 @@ static int __devinit igb_probe(struct pci_dev *pdev, goto err_eeprom; } + spin_lock_init(&adapter->stats_lock); + setup_timer(&adapter->watchdog_timer, &igb_watchdog, (unsigned long) adapter); setup_timer(&adapter->phy_info_timer, &igb_update_phy_info, @@ -3120,7 +3124,10 @@ static void igb_watchdog_task(struct work_struct *work) } } + spin_lock(&adapter->stats_lock); igb_update_stats(adapter); + spin_unlock(&adapter->stats_lock); + igb_update_adaptive(hw); for (i = 0; i < adapter->num_tx_queues; i++) { @@ -3856,7 +3863,12 @@ static void igb_reset_task(struct work_struct *work) **/ static struct net_device_stats *igb_get_stats(struct net_device *netdev) { - /* only return the current stats */ + struct igb_adapter *adapter = netdev_priv(netdev); + + spin_lock(&adapter->stats_lock); + igb_update_stats(adapter); + spin_unlock(&adapter->stats_lock); + return &netdev->stats; } @@ -3930,7 +3942,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu) void igb_update_stats(struct igb_adapter *adapter) { - struct net_device_stats *net_stats = igb_get_stats(adapter->netdev); + struct net_device_stats *net_stats = &adapter->netdev->stats; struct e1000_hw *hw = &adapter->hw; struct pci_dev *pdev = adapter->pdev; u32 rnbc; -- 1.7.0.4