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

net/octeontx: support xstats

Browse Source 
Adding support for xstats eth operations.

Signed-off-by: Harman Kalra <hkalra@marvell.com>
This commit is contained in:
Harman Kalra 2022-05-24 14:12:32 +05:30 committed by Jerin Jacob
parent 8f79c43ffa
commit c6b97d6786
5 changed files with 188 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/guides/nics/features/octeontx.ini
View File

@ -23,6 +23,7 @@ Inner L4 checksum = Y
Packet type parsing = Y
Flow control = Y
Basic stats = Y
Extended stats = Y
Linux = Y
ARMv8 = Y
Usage doc = Y

17
drivers/net/octeontx/base/octeontx_bgx.c
View File

@ -144,6 +144,23 @@ octeontx_bgx_port_status(int port, octeontx_mbox_bgx_port_status_t *stat)
return res;
}
int
octeontx_bgx_port_xstats(int port, octeontx_mbox_bgx_port_stats_t *stats)
{
struct octeontx_mbox_hdr hdr;
int len = sizeof(octeontx_mbox_bgx_port_stats_t);
int res;
hdr.coproc = OCTEONTX_BGX_COPROC;
hdr.msg = MBOX_BGX_PORT_GET_STATS;
hdr.vfid = port;
res = octeontx_mbox_send(&hdr, NULL, 0, stats, len);
if (res < 0)
return -EACCES;
return res;
}
int
octeontx_bgx_port_stats(int port, octeontx_mbox_bgx_port_stats_t *stats)
{

3
drivers/net/octeontx/base/octeontx_bgx.h
View File

@ -117,6 +117,8 @@ typedef struct octeontx_mbox_bgx_port_stats {
uint64_t rx_oversize_errors;
uint64_t rx_fragmented_errors;
uint64_t rx_jabber_errors;
uint64_t rx_pause_packets;
uint64_t tx_pause_packets;
} octeontx_mbox_bgx_port_stats_t;
struct octeontx_mbox_bgx_port_mac_filter {
@ -161,6 +163,7 @@ int octeontx_bgx_port_get_config(int port, octeontx_mbox_bgx_port_conf_t *conf);
int octeontx_bgx_port_status(int port, octeontx_mbox_bgx_port_status_t *stat);
int octeontx_bgx_port_stats(int port, octeontx_mbox_bgx_port_stats_t *stats);
int octeontx_bgx_port_stats_clr(int port);
int octeontx_bgx_port_xstats(int port, octeontx_mbox_bgx_port_stats_t *stats);
int octeontx_bgx_port_link_status(int port);
int octeontx_bgx_port_promisc_set(int port, int en);
int octeontx_bgx_port_mac_set(int port, uint8_t *mac_addr);

126
drivers/net/octeontx/octeontx_ethdev.c
View File

@ -25,6 +25,7 @@
#include "octeontx_ethdev.h"
#include "octeontx_rxtx.h"
#include "octeontx_logs.h"
#include "octeontx_stats.h"
/* Useful in stopping/closing event device if no of
* eth ports are using it.
@ -846,6 +847,127 @@ octeontx_dev_link_update(struct rte_eth_dev *dev,
return rte_eth_linkstatus_set(dev, &link);
}
static inline int octeontx_dev_total_xstat(void)
{
return NUM_BGX_XSTAT;
}
static int
octeontx_port_xstats(struct octeontx_nic *nic, struct rte_eth_xstat *xstats,
unsigned int n)
{
octeontx_mbox_bgx_port_stats_t bgx_stats;
int stat_cnt, res, si, i;
res = octeontx_bgx_port_xstats(nic->port_id, &bgx_stats);
if (res < 0) {
octeontx_log_err("failed to get port stats %d", nic->port_id);
return res;
}
si = 0;
/* Fill BGX stats */
stat_cnt = (n > NUM_BGX_XSTAT) ? NUM_BGX_XSTAT : n;
n = n - stat_cnt;
for (i = 0; i < stat_cnt; i++) {
xstats[si].id = si;
xstats[si].value = *(uint64_t *)(((char *)&bgx_stats) +
octeontx_bgx_xstats[i].soffset);
si++;
}
/*TODO: Similarly fill rest of HW stats */
return si;
}
static int
octeontx_dev_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids,
uint64_t *stat_val, unsigned int n)
{
unsigned int i, xstat_cnt = octeontx_dev_total_xstat();
struct octeontx_nic *nic = octeontx_pmd_priv(dev);
struct rte_eth_xstat xstats[xstat_cnt];
octeontx_port_xstats(nic, xstats, xstat_cnt);
for (i = 0; i < n; i++) {
if (ids[i] >= xstat_cnt) {
PMD_INIT_LOG(ERR, "out of range id value");
return -1;
}
stat_val[i] = xstats[ids[i]].value;
}
return n;
}
static int
octeontx_dev_xstats_get_names(struct rte_eth_dev *dev __rte_unused,
struct rte_eth_xstat_name *xstats_names,
unsigned int size)
{
int stat_cnt, si, i;
if (xstats_names) {
si = 0;
/* Fill BGX stats */
stat_cnt = (size > NUM_BGX_XSTAT) ? NUM_BGX_XSTAT : size;
size = size - stat_cnt;
for (i = 0; i < stat_cnt; i++) {
strlcpy(xstats_names[si].name,
octeontx_bgx_xstats[i].sname,
sizeof(xstats_names[si].name));
si++;
}
/*TODO: Similarly fill rest of HW stats */
return si;
} else {
return octeontx_dev_total_xstat();
}
}
static void build_xstat_names(struct rte_eth_xstat_name *xstat_names)
{
unsigned int i;
for (i = 0; i < NUM_BGX_XSTAT; i++) {
strlcpy(xstat_names[i].name, octeontx_bgx_xstats[i].sname,
RTE_ETH_XSTATS_NAME_SIZE);
}
}
static int
octeontx_dev_xstats_get_names_by_id(struct rte_eth_dev *dev __rte_unused,
const uint64_t *ids,
struct rte_eth_xstat_name *stat_names,
unsigned int n)
{
unsigned int i, xstat_cnt = octeontx_dev_total_xstat();
struct rte_eth_xstat_name xstat_names[xstat_cnt];
build_xstat_names(xstat_names);
for (i = 0; i < n; i++) {
if (ids[i] >= xstat_cnt) {
PMD_INIT_LOG(ERR, "out of range id value");
return -1;
}
strlcpy(stat_names[i].name, xstat_names[ids[i]].name,
sizeof(stat_names[i].name));
}
/*TODO: Similarly fill rest of HW stats */
return n;
}
static int
octeontx_dev_xstats_get(struct rte_eth_dev *dev,
struct rte_eth_xstat *xstats,
unsigned int n)
{
struct octeontx_nic *nic = octeontx_pmd_priv(dev);
PMD_INIT_FUNC_TRACE();
return octeontx_port_xstats(nic, xstats, n);
}
static int
octeontx_dev_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
{
@ -1354,6 +1476,10 @@ static const struct eth_dev_ops octeontx_dev_ops = {
.pool_ops_supported = octeontx_pool_ops,
.flow_ctrl_get = octeontx_dev_flow_ctrl_get,
.flow_ctrl_set = octeontx_dev_flow_ctrl_set,
.xstats_get = octeontx_dev_xstats_get,
.xstats_get_by_id = octeontx_dev_xstats_get_by_id,
.xstats_get_names = octeontx_dev_xstats_get_names,
.xstats_get_names_by_id = octeontx_dev_xstats_get_names_by_id,
};
/* Create Ethdev interface per BGX LMAC ports */

41
drivers/net/octeontx/octeontx_stats.h Normal file
View File

@ -0,0 +1,41 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(C) 2022 Marvell.
*/
#ifndef __OCTEONTX_STATS_H__
#define __OCTEONTX_STATS_H__
#define BGX_XSTAT(stat) \
{#stat, offsetof(octeontx_mbox_bgx_port_stats_t, stat)}
struct octeontx_xstats {
char sname[RTE_ETH_XSTATS_NAME_SIZE];
uint32_t soffset;
};
struct octeontx_xstats octeontx_bgx_xstats[] = {
BGX_XSTAT(rx_packets),
BGX_XSTAT(tx_packets),
BGX_XSTAT(rx_broadcast_packets),
BGX_XSTAT(multicast),
BGX_XSTAT(tx_multicast_packets),
BGX_XSTAT(tx_broadcast_packets),
BGX_XSTAT(rx_undersized_errors),
BGX_XSTAT(rx_oversize_errors),
BGX_XSTAT(rx_jabber_errors),
BGX_XSTAT(rx_crc_errors),
BGX_XSTAT(collisions),
BGX_XSTAT(tx_1_to_64_packets),
BGX_XSTAT(tx_65_to_127_packets),
BGX_XSTAT(tx_128_to_255_packets),
BGX_XSTAT(tx_256_to_511_packets),
BGX_XSTAT(tx_512_to_1023_packets),
BGX_XSTAT(tx_1024_to_1522_packets),
BGX_XSTAT(tx_1523_to_max_packets),
BGX_XSTAT(rx_fragmented_errors),
BGX_XSTAT(rx_pause_packets),
BGX_XSTAT(tx_pause_packets),
};
#define NUM_BGX_XSTAT \
(sizeof(octeontx_bgx_xstats) / sizeof(struct octeontx_xstats))
#endif /* __OCTEONTX_STATS_H__ */