lkml.org 
[lkml]   [2008]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[NET-NEXT PATCH 09/18] igb: update ethtool stats to support multiqueue
    Date
    From: Alexander Duyck <alexander.h.duyck@intel.com>

    Addesses problems seen earlier with igb driver not correctly reporting rx
    and tx stats.

    Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    ---

    drivers/net/igb/igb.h | 1 +
    drivers/net/igb/igb_ethtool.c | 13 +++++++++----
    drivers/net/igb/igb_main.c | 2 ++
    3 files changed, 12 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h
    index 4534283..0551a63 100644
    --- a/drivers/net/igb/igb.h
    +++ b/drivers/net/igb/igb.h
    @@ -158,6 +158,7 @@ struct igb_ring {
    union {
    /* TX */
    struct {
    + struct igb_queue_stats tx_stats;
    bool detect_tx_hung;
    };
    /* RX */
    diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c
    index 0447f9b..ed756c1 100644
    --- a/drivers/net/igb/igb_ethtool.c
    +++ b/drivers/net/igb/igb_ethtool.c
    @@ -96,10 +96,8 @@ static const struct igb_stats igb_gstrings_stats[] = {
    };

    #define IGB_QUEUE_STATS_LEN \
    - ((((((struct igb_adapter *)netdev->priv)->num_rx_queues > 1) ? \
    - ((struct igb_adapter *)netdev->priv)->num_rx_queues : 0) + \
    - (((((struct igb_adapter *)netdev->priv)->num_tx_queues > 1) ? \
    - ((struct igb_adapter *)netdev->priv)->num_tx_queues : 0))) * \
    + ((((struct igb_adapter *)netdev->priv)->num_rx_queues + \
    + ((struct igb_adapter *)netdev->priv)->num_tx_queues) * \
    (sizeof(struct igb_queue_stats) / sizeof(u64)))
    #define IGB_GLOBAL_STATS_LEN \
    sizeof(igb_gstrings_stats) / sizeof(struct igb_stats)
    @@ -1842,6 +1840,13 @@ static void igb_get_ethtool_stats(struct net_device *netdev,
    data[i] = (igb_gstrings_stats[i].sizeof_stat ==
    sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
    }
    + for (j = 0; j < adapter->num_tx_queues; j++) {
    + int k;
    + queue_stat = (u64 *)&adapter->tx_ring[j].tx_stats;
    + for (k = 0; k < stat_count; k++)
    + data[i + k] = queue_stat[k];
    + i += k;
    + }
    for (j = 0; j < adapter->num_rx_queues; j++) {
    int k;
    queue_stat = (u64 *)&adapter->rx_ring[j].rx_stats;
    diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
    index 3699cf0..5fcc043 100644
    --- a/drivers/net/igb/igb_main.c
    +++ b/drivers/net/igb/igb_main.c
    @@ -3404,6 +3404,8 @@ done_cleaning:
    }
    tx_ring->total_bytes += total_bytes;
    tx_ring->total_packets += total_packets;
    + tx_ring->tx_stats.bytes += total_bytes;
    + tx_ring->tx_stats.packets += total_packets;
    adapter->net_stats.tx_bytes += total_bytes;
    adapter->net_stats.tx_packets += total_packets;
    return retval;


    \
     
     \ /
      Last update: 2008-06-27 20:07    [W:0.024 / U:62.464 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site