d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/cxgbe: add VF port statistics

Browse Source 
Signed-off-by: Kumar Sanghvi <kumaras@chelsio.com>
Signed-off-by: Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>
This commit is contained in:
Kumar Sanghvi 2018-03-11 04:18:26 +05:30 committed by Ferruh Yigit
parent 880ead4e14
commit a0a344a8f7
7 changed files with 180 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/cxgbe/base/common.h
View File

@ -484,6 +484,8 @@ unsigned int t4_get_mps_bg_map(struct adapter *adapter, unsigned int pidx);
unsigned int t4_get_tp_ch_map(struct adapter *adapter, unsigned int pidx);
const char *t4_get_port_type_description(enum fw_port_type port_type);
void t4_get_port_stats(struct adapter *adap, int idx, struct port_stats *p);
void t4vf_get_port_stats(struct adapter *adapter, int pidx,
struct port_stats *p);
void t4_get_port_stats_offset(struct adapter *adap, int idx,
struct port_stats *stats,
struct port_stats *offset);

10
drivers/net/cxgbe/base/t4_regs.h
View File

@ -601,6 +601,7 @@
/* registers for module MPS */
#define MPS_BASE_ADDR 0x9000
#define T4VF_MPS_BASE_ADDR 0x0100
#define S_REPLICATE 11
#define V_REPLICATE(x) ((x) << S_REPLICATE)
@ -807,6 +808,15 @@
#define A_MPS_STAT_RX_BG_3_LB_TRUNC_FRAME_L 0x96b8
#define A_MPS_STAT_RX_BG_3_LB_TRUNC_FRAME_H 0x96bc
#define A_MPS_VF_STAT_TX_VF_BCAST_FRAMES_L 0x88
#define A_MPS_VF_STAT_TX_VF_MCAST_FRAMES_L 0x98
#define A_MPS_VF_STAT_TX_VF_UCAST_FRAMES_L 0xa8
#define A_MPS_VF_STAT_TX_VF_DROP_FRAMES_L 0xb0
#define A_MPS_VF_STAT_RX_VF_BCAST_FRAMES_L 0xd0
#define A_MPS_VF_STAT_RX_VF_MCAST_FRAMES_L 0xe0
#define A_MPS_VF_STAT_RX_VF_UCAST_FRAMES_L 0xf0
#define A_MPS_VF_STAT_RX_VF_ERR_FRAMES_L 0xf8
/* registers for module ULP_RX */
#define ULP_RX_BASE_ADDR 0x19150

13
drivers/net/cxgbe/base/t4fw_interface.h
View File

@ -210,6 +210,7 @@ enum fw_cmd_opcodes {
FW_VI_MAC_CMD = 0x15,
FW_VI_RXMODE_CMD = 0x16,
FW_VI_ENABLE_CMD = 0x17,
FW_VI_STATS_CMD = 0x1a,
FW_PORT_CMD = 0x1b,
FW_RSS_IND_TBL_CMD = 0x20,
FW_RSS_GLB_CONFIG_CMD = 0x22,
@ -1183,6 +1184,9 @@ struct fw_vi_enable_cmd {
(((x) >> S_FW_VI_ENABLE_CMD_DCB_INFO) & M_FW_VI_ENABLE_CMD_DCB_INFO)
#define F_FW_VI_ENABLE_CMD_DCB_INFO V_FW_VI_ENABLE_CMD_DCB_INFO(1U)
/* VI VF stats offset definitions */
#define VI_VF_NUM_STATS 16
/* VI PF stats offset definitions */
#define VI_PF_NUM_STATS 17
enum fw_vi_stats_pf_index {
@ -1260,6 +1264,15 @@ struct fw_vi_stats_cmd {
} u;
};
#define S_FW_VI_STATS_CMD_VIID 0
#define V_FW_VI_STATS_CMD_VIID(x) ((x) << S_FW_VI_STATS_CMD_VIID)
#define S_FW_VI_STATS_CMD_NSTATS 12
#define V_FW_VI_STATS_CMD_NSTATS(x) ((x) << S_FW_VI_STATS_CMD_NSTATS)
#define S_FW_VI_STATS_CMD_IX 0
#define V_FW_VI_STATS_CMD_IX(x) ((x) << S_FW_VI_STATS_CMD_IX)
/* old 16-bit port capabilities bitmap */
enum fw_port_cap {
FW_PORT_CAP_SPEED_100M = 0x0001,

105
drivers/net/cxgbe/base/t4vf_hw.c
View File

@ -630,6 +630,111 @@ int t4vf_get_vfres(struct adapter *adapter)
return 0;
}
/**
* t4vf_get_port_stats_fw - collect "port" statistics via Firmware
* @adapter: the adapter
* @pidx: the port index
* @s: the stats structure to fill
*
* Collect statistics for the "port"'s Virtual Interface via Firmware
* commands.
*/
static int t4vf_get_port_stats_fw(struct adapter *adapter, int pidx,
struct port_stats *p)
{
struct port_info *pi = adap2pinfo(adapter, pidx);
unsigned int rem = VI_VF_NUM_STATS;
struct fw_vi_stats_vf fwstats;
__be64 *fwsp = (__be64 *)&fwstats;
/*
* Grab the Virtual Interface statistics a chunk at a time via mailbox
* commands. We could use a Work Request and get all of them at once
* but that's an asynchronous interface which is awkward to use.
*/
while (rem) {
unsigned int ix = VI_VF_NUM_STATS - rem;
unsigned int nstats = min(6U, rem);
struct fw_vi_stats_cmd cmd, rpl;
size_t len = (offsetof(struct fw_vi_stats_cmd, u) +
sizeof(struct fw_vi_stats_ctl));
size_t len16 = DIV_ROUND_UP(len, 16);
int ret;
memset(&cmd, 0, sizeof(cmd));
cmd.op_to_viid = cpu_to_be32(V_FW_CMD_OP(FW_VI_STATS_CMD) |
V_FW_VI_STATS_CMD_VIID(pi->viid) |
F_FW_CMD_REQUEST |
F_FW_CMD_READ);
cmd.retval_len16 = cpu_to_be32(V_FW_CMD_LEN16(len16));
cmd.u.ctl.nstats_ix =
cpu_to_be16(V_FW_VI_STATS_CMD_IX(ix) |
V_FW_VI_STATS_CMD_NSTATS(nstats));
ret = t4vf_wr_mbox_ns(adapter, &cmd, len, &rpl);
if (ret != FW_SUCCESS)
return ret;
memcpy(fwsp, &rpl.u.ctl.stat0, sizeof(__be64) * nstats);
rem -= nstats;
fwsp += nstats;
}
/*
* Translate firmware statistics into host native statistics.
*/
p->tx_bcast_frames = be64_to_cpu(fwstats.tx_bcast_frames);
p->tx_mcast_frames = be64_to_cpu(fwstats.tx_mcast_frames);
p->tx_ucast_frames = be64_to_cpu(fwstats.tx_ucast_frames);
p->tx_drop = be64_to_cpu(fwstats.tx_drop_frames);
p->rx_bcast_frames = be64_to_cpu(fwstats.rx_bcast_frames);
p->rx_mcast_frames = be64_to_cpu(fwstats.rx_mcast_frames);
p->rx_ucast_frames = be64_to_cpu(fwstats.rx_ucast_frames);
p->rx_len_err = be64_to_cpu(fwstats.rx_err_frames);
return 0;
}
/**
* t4vf_get_port_stats - collect "port" statistics
* @adapter: the adapter
* @pidx: the port index
* @s: the stats structure to fill
*
* Collect statistics for the "port"'s Virtual Interface.
*/
void t4vf_get_port_stats(struct adapter *adapter, int pidx,
struct port_stats *p)
{
/*
* If this is not the first Virtual Interface for our Virtual
* Function, we need to use Firmware commands to retrieve its
* MPS statistics.
*/
if (pidx != 0)
t4vf_get_port_stats_fw(adapter, pidx, p);
/*
* But for the first VI, we can grab its statistics via the MPS
* register mapped into the VF register space.
*/
#define GET_STAT(name) \
t4_read_reg64(adapter, \
T4VF_MPS_BASE_ADDR + A_MPS_VF_STAT_##name##_L)
p->tx_bcast_frames = GET_STAT(TX_VF_BCAST_FRAMES);
p->tx_mcast_frames = GET_STAT(TX_VF_MCAST_FRAMES);
p->tx_ucast_frames = GET_STAT(TX_VF_UCAST_FRAMES);
p->tx_drop = GET_STAT(TX_VF_DROP_FRAMES);
p->rx_bcast_frames = GET_STAT(RX_VF_BCAST_FRAMES);
p->rx_mcast_frames = GET_STAT(RX_VF_MCAST_FRAMES);
p->rx_ucast_frames = GET_STAT(RX_VF_UCAST_FRAMES);
p->rx_len_err = GET_STAT(RX_VF_ERR_FRAMES);
#undef GET_STAT
}
static int t4vf_alloc_vi(struct adapter *adapter, int port_id)
{
struct fw_vi_cmd cmd, rpl;

1
drivers/net/cxgbe/cxgbe.h
View File

@ -60,6 +60,7 @@ int cxgbe_up(struct adapter *adap);
int cxgbe_down(struct port_info *pi);
void cxgbe_close(struct adapter *adapter);
void cxgbe_stats_get(struct port_info *pi, struct port_stats *stats);
void cxgbevf_stats_get(struct port_info *pi, struct port_stats *stats);
void cxgbe_stats_reset(struct port_info *pi);
int link_start(struct port_info *pi);
void init_rspq(struct adapter *adap, struct sge_rspq *q, unsigned int us,

44
drivers/net/cxgbe/cxgbevf_ethdev.c
View File

@ -30,6 +30,49 @@
*/
#include "t4_pci_id_tbl.h"
/*
* Get port statistics.
*/
static int cxgbevf_dev_stats_get(struct rte_eth_dev *eth_dev,
struct rte_eth_stats *eth_stats)
{
struct port_info *pi = (struct port_info *)(eth_dev->data->dev_private);
struct adapter *adapter = pi->adapter;
struct sge *s = &adapter->sge;
struct port_stats ps;
unsigned int i;
cxgbevf_stats_get(pi, &ps);
/* RX Stats */
eth_stats->ierrors = ps.rx_len_err;
/* TX Stats */
eth_stats->opackets = ps.tx_bcast_frames + ps.tx_mcast_frames +
ps.tx_ucast_frames;
eth_stats->oerrors = ps.tx_drop;
for (i = 0; i < pi->n_rx_qsets; i++) {
struct sge_eth_rxq *rxq =
&s->ethrxq[pi->first_qset + i];
eth_stats->q_ipackets[i] = rxq->stats.pkts;
eth_stats->q_ibytes[i] = rxq->stats.rx_bytes;
eth_stats->ipackets += eth_stats->q_ipackets[i];
eth_stats->ibytes += eth_stats->q_ibytes[i];
}
for (i = 0; i < pi->n_tx_qsets; i++) {
struct sge_eth_txq *txq =
&s->ethtxq[pi->first_qset + i];
eth_stats->q_opackets[i] = txq->stats.pkts;
eth_stats->q_obytes[i] = txq->stats.tx_bytes;
eth_stats->q_errors[i] = txq->stats.mapping_err;
}
return 0;
}
static const struct eth_dev_ops cxgbevf_eth_dev_ops = {
.dev_start = cxgbe_dev_start,
.dev_stop = cxgbe_dev_stop,
@ -51,6 +94,7 @@ static const struct eth_dev_ops cxgbevf_eth_dev_ops = {
.rx_queue_start = cxgbe_dev_rx_queue_start,
.rx_queue_stop = cxgbe_dev_rx_queue_stop,
.rx_queue_release = cxgbe_dev_rx_queue_release,
.stats_get = cxgbevf_dev_stats_get,
};
/*

5
drivers/net/cxgbe/cxgbevf_main.c
View File

@ -74,6 +74,11 @@ static void size_nports_qsets(struct adapter *adapter)
}
}
void cxgbevf_stats_get(struct port_info *pi, struct port_stats *stats)
{
t4vf_get_port_stats(pi->adapter, pi->pidx, stats);
}
static int adap_init0vf(struct adapter *adapter)
{
u32 param, val = 0;