Commit b4b6e842 authored by Eran Ben Elisha's avatar Eran Ben Elisha Committed by David S. Miller

net/mlx4_en: Create new header file for all statistics info

Add mlx4_stats.h file and move there all statistics structs and marcos.
Signed-off-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 66f24a7e
...@@ -123,8 +123,6 @@ static const char main_strings[][ETH_GSTRING_LEN] = { ...@@ -123,8 +123,6 @@ static const char main_strings[][ETH_GSTRING_LEN] = {
"tx_prio_1", "tx_prio_2", "tx_prio_3", "tx_prio_4", "tx_prio_5", "tx_prio_1", "tx_prio_2", "tx_prio_3", "tx_prio_4", "tx_prio_5",
"tx_prio_6", "tx_prio_7", "tx_prio_6", "tx_prio_7",
}; };
#define NUM_MAIN_STATS 21
#define NUM_ALL_STATS (NUM_MAIN_STATS + NUM_PORT_STATS + NUM_PKT_STATS + NUM_PERF_STATS)
static const char mlx4_en_test_names[][ETH_GSTRING_LEN]= { static const char mlx4_en_test_names[][ETH_GSTRING_LEN]= {
"Interrupt Test", "Interrupt Test",
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
#include <linux/mlx4/cmd.h> #include <linux/mlx4/cmd.h>
#include "en_port.h" #include "en_port.h"
#include "mlx4_stats.h"
#define DRV_NAME "mlx4_en" #define DRV_NAME "mlx4_en"
#define DRV_VERSION "2.2-1" #define DRV_VERSION "2.2-1"
...@@ -171,7 +172,6 @@ enum { ...@@ -171,7 +172,6 @@ enum {
/* Number of samples to 'average' */ /* Number of samples to 'average' */
#define AVG_SIZE 128 #define AVG_SIZE 128
#define AVG_FACTOR 1024 #define AVG_FACTOR 1024
#define NUM_PERF_STATS NUM_PERF_COUNTERS
#define INC_PERF_COUNTER(cnt) (++(cnt)) #define INC_PERF_COUNTER(cnt) (++(cnt))
#define ADD_PERF_COUNTER(cnt, add) ((cnt) += (add)) #define ADD_PERF_COUNTER(cnt, add) ((cnt) += (add))
...@@ -182,7 +182,6 @@ enum { ...@@ -182,7 +182,6 @@ enum {
#else #else
#define NUM_PERF_STATS 0
#define INC_PERF_COUNTER(cnt) do {} while (0) #define INC_PERF_COUNTER(cnt) do {} while (0)
#define ADD_PERF_COUNTER(cnt, add) do {} while (0) #define ADD_PERF_COUNTER(cnt, add) do {} while (0)
#define AVG_PERF_COUNTER(cnt, sample) do {} while (0) #define AVG_PERF_COUNTER(cnt, sample) do {} while (0)
...@@ -435,37 +434,6 @@ struct mlx4_en_port_state { ...@@ -435,37 +434,6 @@ struct mlx4_en_port_state {
u32 flags; u32 flags;
}; };
struct mlx4_en_pkt_stats {
unsigned long broadcast;
unsigned long rx_prio[8];
unsigned long tx_prio[8];
#define NUM_PKT_STATS 17
};
struct mlx4_en_port_stats {
unsigned long tso_packets;
unsigned long xmit_more;
unsigned long queue_stopped;
unsigned long wake_queue;
unsigned long tx_timeout;
unsigned long rx_alloc_failed;
unsigned long rx_chksum_good;
unsigned long rx_chksum_none;
unsigned long rx_chksum_complete;
unsigned long tx_chksum_offload;
#define NUM_PORT_STATS 10
};
struct mlx4_en_perf_stats {
u32 tx_poll;
u64 tx_pktsz_avg;
u32 inflight_avg;
u16 tx_coal_avg;
u16 rx_coal_avg;
u32 napi_quota;
#define NUM_PERF_COUNTERS 6
};
enum mlx4_en_mclist_act { enum mlx4_en_mclist_act {
MCLIST_NONE, MCLIST_NONE,
MCLIST_REM, MCLIST_REM,
......
#ifndef _MLX4_STATS_
#define _MLX4_STATS_
#ifdef MLX4_EN_PERF_STAT
#define NUM_PERF_STATS NUM_PERF_COUNTERS
#else
#define NUM_PERF_STATS 0
#endif
#define NUM_PRIORITIES 9
#define NUM_PRIORITY_STATS 2
struct mlx4_en_pkt_stats {
unsigned long broadcast;
unsigned long rx_prio[8];
unsigned long tx_prio[8];
#define NUM_PKT_STATS 17
};
struct mlx4_en_port_stats {
unsigned long tso_packets;
unsigned long xmit_more;
unsigned long queue_stopped;
unsigned long wake_queue;
unsigned long tx_timeout;
unsigned long rx_alloc_failed;
unsigned long rx_chksum_good;
unsigned long rx_chksum_none;
unsigned long rx_chksum_complete;
unsigned long tx_chksum_offload;
#define NUM_PORT_STATS 10
};
struct mlx4_en_perf_stats {
u32 tx_poll;
u64 tx_pktsz_avg;
u32 inflight_avg;
u16 tx_coal_avg;
u16 rx_coal_avg;
u32 napi_quota;
#define NUM_PERF_COUNTERS 6
};
#define NUM_MAIN_STATS 21
#define NUM_ALL_STATS (NUM_MAIN_STATS + NUM_PORT_STATS + NUM_PKT_STATS + \
NUM_PERF_STATS)
#endif
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <linux/mlx4/cmd.h> #include <linux/mlx4/cmd.h>
#include "mlx4.h" #include "mlx4.h"
#include "mlx4_stats.h"
#define MLX4_MAC_VALID (1ull << 63) #define MLX4_MAC_VALID (1ull << 63)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment