From: Oleksandr Kolomeiets <okl-plv@napatech.com>
To: dev@dpdk.org
Cc: mko-plv@napatech.com, sil-plv@napatech.com, ckm@napatech.com,
stephen@networkplumber.org, thomas@monjalon.net
Subject: [PATCH v2 06/26] net/ntnic: avoid misleading variable names
Date: Mon, 5 May 2025 09:12:46 +0200 [thread overview]
Message-ID: <20250505071309.586015-7-okl-plv@napatech.com> (raw)
In-Reply-To: <20250505071309.586015-1-okl-plv@napatech.com>
In the context of the NTNIC driver,
the variables named if_index stand for the index of the PHY.
However, the term if_index could also refer to the interface index
assigned by the OS.
To mitigate potential confusion these variables were renamed.
Signed-off-by: Oleksandr Kolomeiets <okl-plv@napatech.com>
---
drivers/net/ntnic/ntnic_ethdev.c | 24 +++++-----
drivers/net/ntnic/ntnic_filter/ntnic_filter.c | 44 +++++++++----------
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c
index 6857191ef2..6ba6769e47 100644
--- a/drivers/net/ntnic/ntnic_ethdev.c
+++ b/drivers/net/ntnic/ntnic_ethdev.c
@@ -181,15 +181,15 @@ static int dpdk_stats_collect(struct pmd_internals *internals, struct rte_eth_st
struct ntdrv_4ga_s *p_nt_drv = &p_drv->ntdrv;
nt4ga_stat_t *p_nt4ga_stat = &p_nt_drv->adapter_info.nt4ga_stat;
nthw_stat_t *p_nthw_stat = p_nt4ga_stat->mp_nthw_stat;
- const int if_index = internals->n_intf_no;
+ const int n_intf_no = internals->n_intf_no;
uint64_t rx_total = 0;
uint64_t rx_total_b = 0;
uint64_t tx_total = 0;
uint64_t tx_total_b = 0;
uint64_t tx_err_total = 0;
- if (!p_nthw_stat || !p_nt4ga_stat || !stats || if_index < 0 ||
- if_index > NUM_ADAPTER_PORTS_MAX) {
+ if (!p_nthw_stat || !p_nt4ga_stat || !stats || n_intf_no < 0 ||
+ n_intf_no > NUM_ADAPTER_PORTS_MAX) {
NT_LOG_DBGX(WRN, NTNIC, "error exit");
return -1;
}
@@ -315,8 +315,8 @@ static int eth_stats_reset(struct rte_eth_dev *eth_dev)
struct pmd_internals *internals = eth_dev->data->dev_private;
struct drv_s *p_drv = internals->p_drv;
struct ntdrv_4ga_s *p_nt_drv = &p_drv->ntdrv;
- const int if_index = internals->n_intf_no;
- dpdk_stats_reset(internals, p_nt_drv, if_index);
+ const int n_intf_no = internals->n_intf_no;
+ dpdk_stats_reset(internals, p_nt_drv, n_intf_no);
return 0;
}
@@ -1529,7 +1529,7 @@ static int eth_xstats_get(struct rte_eth_dev *eth_dev, struct rte_eth_xstat *sta
struct drv_s *p_drv = internals->p_drv;
ntdrv_4ga_t *p_nt_drv = &p_drv->ntdrv;
nt4ga_stat_t *p_nt4ga_stat = &p_nt_drv->adapter_info.nt4ga_stat;
- int if_index = internals->n_intf_no;
+ int n_intf_no = internals->n_intf_no;
int nb_xstats;
const struct ntnic_xstats_ops *ntnic_xstats_ops = get_ntnic_xstats_ops();
@@ -1540,7 +1540,7 @@ static int eth_xstats_get(struct rte_eth_dev *eth_dev, struct rte_eth_xstat *sta
}
rte_spinlock_lock(&p_nt_drv->stat_lck);
- nb_xstats = ntnic_xstats_ops->nthw_xstats_get(p_nt4ga_stat, stats, n, if_index);
+ nb_xstats = ntnic_xstats_ops->nthw_xstats_get(p_nt4ga_stat, stats, n, n_intf_no);
rte_spinlock_unlock(&p_nt_drv->stat_lck);
return nb_xstats;
}
@@ -1554,7 +1554,7 @@ static int eth_xstats_get_by_id(struct rte_eth_dev *eth_dev,
struct drv_s *p_drv = internals->p_drv;
ntdrv_4ga_t *p_nt_drv = &p_drv->ntdrv;
nt4ga_stat_t *p_nt4ga_stat = &p_nt_drv->adapter_info.nt4ga_stat;
- int if_index = internals->n_intf_no;
+ int n_intf_no = internals->n_intf_no;
int nb_xstats;
const struct ntnic_xstats_ops *ntnic_xstats_ops = get_ntnic_xstats_ops();
@@ -1566,7 +1566,7 @@ static int eth_xstats_get_by_id(struct rte_eth_dev *eth_dev,
rte_spinlock_lock(&p_nt_drv->stat_lck);
nb_xstats =
- ntnic_xstats_ops->nthw_xstats_get_by_id(p_nt4ga_stat, ids, values, n, if_index);
+ ntnic_xstats_ops->nthw_xstats_get_by_id(p_nt4ga_stat, ids, values, n, n_intf_no);
rte_spinlock_unlock(&p_nt_drv->stat_lck);
return nb_xstats;
}
@@ -1577,7 +1577,7 @@ static int eth_xstats_reset(struct rte_eth_dev *eth_dev)
struct drv_s *p_drv = internals->p_drv;
ntdrv_4ga_t *p_nt_drv = &p_drv->ntdrv;
nt4ga_stat_t *p_nt4ga_stat = &p_nt_drv->adapter_info.nt4ga_stat;
- int if_index = internals->n_intf_no;
+ int n_intf_no = internals->n_intf_no;
struct ntnic_xstats_ops *ntnic_xstats_ops = get_ntnic_xstats_ops();
@@ -1587,9 +1587,9 @@ static int eth_xstats_reset(struct rte_eth_dev *eth_dev)
}
rte_spinlock_lock(&p_nt_drv->stat_lck);
- ntnic_xstats_ops->nthw_xstats_reset(p_nt4ga_stat, if_index);
+ ntnic_xstats_ops->nthw_xstats_reset(p_nt4ga_stat, n_intf_no);
rte_spinlock_unlock(&p_nt_drv->stat_lck);
- return dpdk_stats_reset(internals, p_nt_drv, if_index);
+ return dpdk_stats_reset(internals, p_nt_drv, n_intf_no);
}
static int eth_xstats_get_names(struct rte_eth_dev *eth_dev,
diff --git a/drivers/net/ntnic/ntnic_filter/ntnic_filter.c b/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
index 1beba22b9d..29bfb2a121 100644
--- a/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
+++ b/drivers/net/ntnic/ntnic_filter/ntnic_filter.c
@@ -1155,10 +1155,10 @@ static int poll_statistics(struct pmd_internals *internals)
struct drv_s *p_drv = internals->p_drv;
struct ntdrv_4ga_s *p_nt_drv = &p_drv->ntdrv;
nt4ga_stat_t *p_nt4ga_stat = &p_nt_drv->adapter_info.nt4ga_stat;
- const int if_index = internals->n_intf_no;
+ const int n_intf_no = internals->n_intf_no;
uint64_t last_stat_rtc = 0;
- if (!p_nt4ga_stat || if_index < 0 || if_index >= NUM_ADAPTER_PORTS_MAX)
+ if (!p_nt4ga_stat || n_intf_no < 0 || n_intf_no >= NUM_ADAPTER_PORTS_MAX)
return -1;
RTE_ASSERT(rte_tsc_freq > 0);
@@ -1184,36 +1184,36 @@ static int poll_statistics(struct pmd_internals *internals)
* Add the RX statistics increments since last time we polled.
* (No difference if physical or virtual port)
*/
- internals->rxq_scg[0].rx_pkts += p_nt4ga_stat->a_port_rx_packets_total[if_index] -
- p_nt4ga_stat->a_port_rx_packets_base[if_index];
- internals->rxq_scg[0].rx_bytes += p_nt4ga_stat->a_port_rx_octets_total[if_index] -
- p_nt4ga_stat->a_port_rx_octets_base[if_index];
+ internals->rxq_scg[0].rx_pkts += p_nt4ga_stat->a_port_rx_packets_total[n_intf_no] -
+ p_nt4ga_stat->a_port_rx_packets_base[n_intf_no];
+ internals->rxq_scg[0].rx_bytes += p_nt4ga_stat->a_port_rx_octets_total[n_intf_no] -
+ p_nt4ga_stat->a_port_rx_octets_base[n_intf_no];
internals->rxq_scg[0].err_pkts += 0;
- internals->rx_missed += p_nt4ga_stat->a_port_rx_drops_total[if_index] -
- p_nt4ga_stat->a_port_rx_drops_base[if_index];
+ internals->rx_missed += p_nt4ga_stat->a_port_rx_drops_total[n_intf_no] -
+ p_nt4ga_stat->a_port_rx_drops_base[n_intf_no];
/* Update the increment bases */
- p_nt4ga_stat->a_port_rx_packets_base[if_index] =
- p_nt4ga_stat->a_port_rx_packets_total[if_index];
- p_nt4ga_stat->a_port_rx_octets_base[if_index] =
- p_nt4ga_stat->a_port_rx_octets_total[if_index];
- p_nt4ga_stat->a_port_rx_drops_base[if_index] =
- p_nt4ga_stat->a_port_rx_drops_total[if_index];
+ p_nt4ga_stat->a_port_rx_packets_base[n_intf_no] =
+ p_nt4ga_stat->a_port_rx_packets_total[n_intf_no];
+ p_nt4ga_stat->a_port_rx_octets_base[n_intf_no] =
+ p_nt4ga_stat->a_port_rx_octets_total[n_intf_no];
+ p_nt4ga_stat->a_port_rx_drops_base[n_intf_no] =
+ p_nt4ga_stat->a_port_rx_drops_total[n_intf_no];
/* Tx (here we must distinguish between physical and virtual ports) */
if (internals->type == PORT_TYPE_PHYSICAL) {
/* Add the statistics increments since last time we polled */
- internals->txq_scg[0].tx_pkts += p_nt4ga_stat->a_port_tx_packets_total[if_index] -
- p_nt4ga_stat->a_port_tx_packets_base[if_index];
- internals->txq_scg[0].tx_bytes += p_nt4ga_stat->a_port_tx_octets_total[if_index] -
- p_nt4ga_stat->a_port_tx_octets_base[if_index];
+ internals->txq_scg[0].tx_pkts += p_nt4ga_stat->a_port_tx_packets_total[n_intf_no] -
+ p_nt4ga_stat->a_port_tx_packets_base[n_intf_no];
+ internals->txq_scg[0].tx_bytes += p_nt4ga_stat->a_port_tx_octets_total[n_intf_no] -
+ p_nt4ga_stat->a_port_tx_octets_base[n_intf_no];
internals->txq_scg[0].err_pkts += 0;
/* Update the increment bases */
- p_nt4ga_stat->a_port_tx_packets_base[if_index] =
- p_nt4ga_stat->a_port_tx_packets_total[if_index];
- p_nt4ga_stat->a_port_tx_octets_base[if_index] =
- p_nt4ga_stat->a_port_tx_octets_total[if_index];
+ p_nt4ga_stat->a_port_tx_packets_base[n_intf_no] =
+ p_nt4ga_stat->a_port_tx_packets_total[n_intf_no];
+ p_nt4ga_stat->a_port_tx_octets_base[n_intf_no] =
+ p_nt4ga_stat->a_port_tx_octets_total[n_intf_no];
}
/* Globally only once a second */
--
2.47.1
next prev parent reply other threads:[~2025-05-05 7:15 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-05 7:12 [PATCH v2 00/26] net/ntnic: fixes and improvements Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 01/26] net/ntnic: remove usage of the variable-length arrays Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 02/26] net/ntnic: handle string truncations when using strlcpy Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 03/26] net/ntnic: replace pragma pack with DPDK defined macros Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 04/26] net/ntnic: remove extra memset Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 05/26] net/ntnic: include all queues into statistics Oleksandr Kolomeiets
2025-05-05 7:12 ` Oleksandr Kolomeiets [this message]
2025-05-05 7:12 ` [PATCH v2 07/26] net/ntnic: apply packing to the structure Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 08/26] net/ntnic: correct misspelled variable names Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 09/26] net/ntnic: improve logging format specifiers Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 10/26] net/ntnic: remove usless expressions Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 11/26] net/ntnic: remove unused code Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 12/26] net/ntnic: remove usless part of conditional expression Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 13/26] net/ntnic: add error logging for hsh Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 14/26] net/ntnic: add explicitly specificator Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 15/26] net/ntnic: add handle memory allocation failures Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 16/26] net/ntnic: remove redundant initialization Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 17/26] net/ntnic: enhance null checks and assertions Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 18/26] net/ntnic: add return value check Oleksandr Kolomeiets
2025-05-05 7:12 ` [PATCH v2 19/26] net/ntnic: remove redundant assignments and branching Oleksandr Kolomeiets
2025-05-05 7:13 ` [PATCH v2 20/26] net/ntnic: rework array usage Oleksandr Kolomeiets
2025-05-05 7:13 ` [PATCH v2 21/26] net/ntnic: avoid divide by zero Oleksandr Kolomeiets
2025-05-05 7:13 ` [PATCH v2 22/26] net/ntnic: remove unnecessary void cast Oleksandr Kolomeiets
2025-05-05 7:13 ` [PATCH v2 23/26] net/ntnic: remove unnecessary memset Oleksandr Kolomeiets
2025-05-05 7:13 ` [PATCH v2 24/26] net/ntnic: add null verification Oleksandr Kolomeiets
2025-05-05 7:13 ` [PATCH v2 25/26] net/ntnic: avoid possible deadlock Oleksandr Kolomeiets
2025-05-05 7:13 ` [PATCH v2 26/26] net/ntnic: fix operation with rte ring queue Oleksandr Kolomeiets
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250505071309.586015-7-okl-plv@napatech.com \
--to=okl-plv@napatech.com \
--cc=ckm@napatech.com \
--cc=dev@dpdk.org \
--cc=mko-plv@napatech.com \
--cc=sil-plv@napatech.com \
--cc=stephen@networkplumber.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).