Skip to content

Commit

Permalink
net: atlantic: split rx and tx per-queue stats
Browse files Browse the repository at this point in the history 
This patch splits rx and tx per-queue stats.
This change simplifies the follow-up introduction of PTP stats and
u64_stats_update_* usage.

Signed-off-by: Mark Starovoytov <mstarovoitov@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Mark Starovoytov authored and David S. Miller committed Jul 21, 2020
1 parent b772112 commit 508f2e3
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 63 deletions.
28 changes: 20 additions & 8 deletions drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,18 @@ static const char aq_ethtool_stat_names[][ETH_GSTRING_LEN] = {
"InDroppedDma",
};

static const char * const aq_ethtool_queue_stat_names[] = {
static const char * const aq_ethtool_queue_rx_stat_names[] = {
"%sQueue[%d] InPackets",
"%sQueue[%d] OutPackets",
"%sQueue[%d] Restarts",
"%sQueue[%d] InJumboPackets",
"%sQueue[%d] InLroPackets",
"%sQueue[%d] InErrors",
};

static const char * const aq_ethtool_queue_tx_stat_names[] = {
"%sQueue[%d] OutPackets",
"%sQueue[%d] Restarts",
};

#if IS_ENABLED(CONFIG_MACSEC)
static const char aq_macsec_stat_names[][ETH_GSTRING_LEN] = {
"MACSec InCtlPackets",
Expand Down Expand Up @@ -164,11 +167,12 @@ static const char aq_ethtool_priv_flag_names[][ETH_GSTRING_LEN] = {

static u32 aq_ethtool_n_stats(struct net_device *ndev)
{
const int rx_stat_cnt = ARRAY_SIZE(aq_ethtool_queue_rx_stat_names);
const int tx_stat_cnt = ARRAY_SIZE(aq_ethtool_queue_tx_stat_names);
struct aq_nic_s *nic = netdev_priv(ndev);
struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(nic);
u32 n_stats = ARRAY_SIZE(aq_ethtool_stat_names) +
ARRAY_SIZE(aq_ethtool_queue_stat_names) * cfg->vecs *
cfg->tcs;
(rx_stat_cnt + tx_stat_cnt) * cfg->vecs * cfg->tcs;

#if IS_ENABLED(CONFIG_MACSEC)
if (nic->macsec_cfg) {
Expand Down Expand Up @@ -237,7 +241,8 @@ static void aq_ethtool_get_strings(struct net_device *ndev,

switch (stringset) {
case ETH_SS_STATS: {
const int stat_cnt = ARRAY_SIZE(aq_ethtool_queue_stat_names);
const int rx_stat_cnt = ARRAY_SIZE(aq_ethtool_queue_rx_stat_names);
const int tx_stat_cnt = ARRAY_SIZE(aq_ethtool_queue_tx_stat_names);
char tc_string[8];
int tc;

Expand All @@ -251,9 +256,16 @@ static void aq_ethtool_get_strings(struct net_device *ndev,
snprintf(tc_string, 8, "TC%d ", tc);

for (i = 0; i < cfg->vecs; i++) {
for (si = 0; si < stat_cnt; si++) {
for (si = 0; si < rx_stat_cnt; si++) {
snprintf(p, ETH_GSTRING_LEN,
aq_ethtool_queue_rx_stat_names[si],
tc_string,
AQ_NIC_CFG_TCVEC2RING(cfg, tc, i));
p += ETH_GSTRING_LEN;
}
for (si = 0; si < tx_stat_cnt; si++) {
snprintf(p, ETH_GSTRING_LEN,
aq_ethtool_queue_stat_names[si],
aq_ethtool_queue_tx_stat_names[si],
tc_string,
AQ_NIC_CFG_TCVEC2RING(cfg, tc, i));
p += ETH_GSTRING_LEN;
Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ethernet/aquantia/atlantic/aq_ptp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ int aq_ptp_ring_init(struct aq_nic_s *aq_nic)
if (!aq_ptp)
return 0;

err = aq_ring_init(&aq_ptp->ptp_tx);
err = aq_ring_init(&aq_ptp->ptp_tx, ATL_RING_TX);
if (err < 0)
goto err_exit;
err = aq_nic->aq_hw_ops->hw_ring_tx_init(aq_nic->aq_hw,
Expand All @@ -853,7 +853,7 @@ int aq_ptp_ring_init(struct aq_nic_s *aq_nic)
if (err < 0)
goto err_exit;

err = aq_ring_init(&aq_ptp->ptp_rx);
err = aq_ring_init(&aq_ptp->ptp_rx, ATL_RING_RX);
if (err < 0)
goto err_exit;
err = aq_nic->aq_hw_ops->hw_ring_rx_init(aq_nic->aq_hw,
Expand All @@ -871,7 +871,7 @@ int aq_ptp_ring_init(struct aq_nic_s *aq_nic)
if (err < 0)
goto err_rx_free;

err = aq_ring_init(&aq_ptp->hwts_rx);
err = aq_ring_init(&aq_ptp->hwts_rx, ATL_RING_RX);
if (err < 0)
goto err_rx_free;
err = aq_nic->aq_hw_ops->hw_ring_rx_init(aq_nic->aq_hw,
Expand Down
28 changes: 22 additions & 6 deletions drivers/net/ethernet/aquantia/atlantic/aq_ring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,12 @@ aq_ring_hwts_rx_alloc(struct aq_ring_s *self, struct aq_nic_s *aq_nic,
return self;
}

int aq_ring_init(struct aq_ring_s *self)
int aq_ring_init(struct aq_ring_s *self, const enum atl_ring_type ring_type)
{
self->hw_head = 0;
self->sw_head = 0;
self->sw_tail = 0;
self->ring_type = ring_type;

return 0;
}
Expand Down Expand Up @@ -538,29 +539,44 @@ int aq_ring_rx_fill(struct aq_ring_s *self)
void aq_ring_rx_deinit(struct aq_ring_s *self)
{
if (!self)
goto err_exit;
return;

for (; self->sw_head != self->sw_tail;
self->sw_head = aq_ring_next_dx(self, self->sw_head)) {
struct aq_ring_buff_s *buff = &self->buff_ring[self->sw_head];

aq_free_rxpage(&buff->rxdata, aq_nic_get_dev(self->aq_nic));
}

err_exit:;
}

void aq_ring_free(struct aq_ring_s *self)
{
if (!self)
goto err_exit;
return;

kfree(self->buff_ring);

if (self->dx_ring)
dma_free_coherent(aq_nic_get_dev(self->aq_nic),
self->size * self->dx_size, self->dx_ring,
self->dx_ring_pa);
}

unsigned int aq_ring_fill_stats_data(struct aq_ring_s *self, u64 *data)
{
unsigned int count = 0U;

if (self->ring_type == ATL_RING_RX) {
/* This data should mimic aq_ethtool_queue_rx_stat_names structure */
data[count] = self->stats.rx.packets;
data[++count] = self->stats.rx.jumbo_packets;
data[++count] = self->stats.rx.lro_packets;
data[++count] = self->stats.rx.errors;
} else {
/* This data should mimic aq_ethtool_queue_tx_stat_names structure */
data[count] = self->stats.tx.packets;
data[++count] = self->stats.tx.queue_restarts;
}

err_exit:;
return ++count;
}
10 changes: 9 additions & 1 deletion drivers/net/ethernet/aquantia/atlantic/aq_ring.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ union aq_ring_stats_s {
struct aq_ring_stats_tx_s tx;
};

enum atl_ring_type {
ATL_RING_TX,
ATL_RING_RX,
};

struct aq_ring_s {
struct aq_ring_buff_s *buff_ring;
u8 *dx_ring; /* descriptors ring, dma shared mem */
Expand All @@ -124,6 +129,7 @@ struct aq_ring_s {
unsigned int page_order;
union aq_ring_stats_s stats;
dma_addr_t dx_ring_pa;
enum atl_ring_type ring_type;
};

struct aq_ring_param_s {
Expand Down Expand Up @@ -163,7 +169,7 @@ struct aq_ring_s *aq_ring_rx_alloc(struct aq_ring_s *self,
struct aq_nic_s *aq_nic,
unsigned int idx,
struct aq_nic_cfg_s *aq_nic_cfg);
int aq_ring_init(struct aq_ring_s *self);
int aq_ring_init(struct aq_ring_s *self, const enum atl_ring_type ring_type);
void aq_ring_rx_deinit(struct aq_ring_s *self);
void aq_ring_free(struct aq_ring_s *self);
void aq_ring_update_queue_state(struct aq_ring_s *ring);
Expand All @@ -181,4 +187,6 @@ struct aq_ring_s *aq_ring_hwts_rx_alloc(struct aq_ring_s *self,
unsigned int size, unsigned int dx_size);
void aq_ring_hwts_rx_clean(struct aq_ring_s *self, struct aq_nic_s *aq_nic);

unsigned int aq_ring_fill_stats_data(struct aq_ring_s *self, u64 *data);

#endif /* AQ_RING_H */
58 changes: 13 additions & 45 deletions drivers/net/ethernet/aquantia/atlantic/aq_vec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ int aq_vec_init(struct aq_vec_s *self, const struct aq_hw_ops *aq_hw_ops,

for (i = 0U, ring = self->ring[0];
self->tx_rings > i; ++i, ring = self->ring[i]) {
err = aq_ring_init(&ring[AQ_VEC_TX_ID]);
err = aq_ring_init(&ring[AQ_VEC_TX_ID], ATL_RING_TX);
if (err < 0)
goto err_exit;

Expand All @@ -191,7 +191,7 @@ int aq_vec_init(struct aq_vec_s *self, const struct aq_hw_ops *aq_hw_ops,
if (err < 0)
goto err_exit;

err = aq_ring_init(&ring[AQ_VEC_RX_ID]);
err = aq_ring_init(&ring[AQ_VEC_RX_ID], ATL_RING_RX);
if (err < 0)
goto err_exit;

Expand Down Expand Up @@ -350,55 +350,23 @@ cpumask_t *aq_vec_get_affinity_mask(struct aq_vec_s *self)
return &self->aq_ring_param.affinity_mask;
}

static void aq_vec_get_stats(struct aq_vec_s *self,
const unsigned int tc,
struct aq_ring_stats_rx_s *stats_rx,
struct aq_ring_stats_tx_s *stats_tx)
bool aq_vec_is_valid_tc(struct aq_vec_s *self, const unsigned int tc)
{
struct aq_ring_s *ring = self->ring[tc];

if (tc < self->rx_rings) {
struct aq_ring_stats_rx_s *rx = &ring[AQ_VEC_RX_ID].stats.rx;

stats_rx->packets = rx->packets;
stats_rx->bytes = rx->bytes;
stats_rx->errors = rx->errors;
stats_rx->jumbo_packets = rx->jumbo_packets;
stats_rx->lro_packets = rx->lro_packets;
stats_rx->pg_losts = rx->pg_losts;
stats_rx->pg_flips = rx->pg_flips;
stats_rx->pg_reuses = rx->pg_reuses;
}

if (tc < self->tx_rings) {
struct aq_ring_stats_tx_s *tx = &ring[AQ_VEC_TX_ID].stats.tx;

stats_tx->packets = tx->packets;
stats_tx->bytes = tx->bytes;
stats_tx->errors = tx->errors;
stats_tx->queue_restarts = tx->queue_restarts;
}
return tc < self->rx_rings && tc < self->tx_rings;
}

unsigned int aq_vec_get_sw_stats(struct aq_vec_s *self, const unsigned int tc, u64 *data)
{
struct aq_ring_stats_rx_s stats_rx;
struct aq_ring_stats_tx_s stats_tx;
unsigned int count = 0U;

memset(&stats_rx, 0U, sizeof(struct aq_ring_stats_rx_s));
memset(&stats_tx, 0U, sizeof(struct aq_ring_stats_tx_s));
unsigned int count;

aq_vec_get_stats(self, tc, &stats_rx, &stats_tx);
WARN_ONCE(!aq_vec_is_valid_tc(self, tc),
"Invalid tc %u (#rx=%u, #tx=%u)\n",
tc, self->rx_rings, self->tx_rings);
if (!aq_vec_is_valid_tc(self, tc))
return 0;

/* This data should mimic aq_ethtool_queue_stat_names structure
*/
data[count] = stats_rx.packets;
data[++count] = stats_tx.packets;
data[++count] = stats_tx.queue_restarts;
data[++count] = stats_rx.jumbo_packets;
data[++count] = stats_rx.lro_packets;
data[++count] = stats_rx.errors;
count = aq_ring_fill_stats_data(&self->ring[tc][AQ_VEC_RX_ID], data);
count += aq_ring_fill_stats_data(&self->ring[tc][AQ_VEC_TX_ID], data + count);

return ++count;
return count;
}
1 change: 1 addition & 0 deletions drivers/net/ethernet/aquantia/atlantic/aq_vec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ void aq_vec_ring_free(struct aq_vec_s *self);
int aq_vec_start(struct aq_vec_s *self);
void aq_vec_stop(struct aq_vec_s *self);
cpumask_t *aq_vec_get_affinity_mask(struct aq_vec_s *self);
bool aq_vec_is_valid_tc(struct aq_vec_s *self, const unsigned int tc);
unsigned int aq_vec_get_sw_stats(struct aq_vec_s *self, const unsigned int tc, u64 *data);

#endif /* AQ_VEC_H */

0 comments on commit 508f2e3

Please sign in to comment.