* [PATCH net-next] octeontx2-af: Show DMAC filter drop count
@ 2026-09-01 4:25 nshettyj
2026-09-04 7:26 ` netdev-bot+sashiko
0 siblings, 1 reply; 2+ messages in thread
From: nshettyj @ 2026-09-01 4:25 UTC (permalink / raw)
To: netdev, linux-kernel
Cc: Hariprasad Kelam, Nitin Shetty J, Sunil Goutham, Ratheesh Kannoth,
Geetha sowjanya, Subbaraya Sundeep, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Richard Cochran
From: Hariprasad Kelam <hkelam@marvell.com>
Show the number of packets dropped by DMAC filters in the CGX/RPM
debugfs mac_filter entry.
CGX uses RX_STAT4 for this counter, while RPM/RPM2 use RX_STAT2.
Signed-off-by: Hariprasad Kelam <hkelam@marvell.com>
Signed-off-by: Nitin Shetty J <nshettyj@marvell.com>
---
.../net/ethernet/marvell/octeontx2/af/cgx.c | 13 +++++-
.../net/ethernet/marvell/octeontx2/af/cgx.h | 2 +
.../marvell/octeontx2/af/lmac_common.h | 2 +
.../net/ethernet/marvell/octeontx2/af/rpm.c | 40 +++++++++++++------
.../net/ethernet/marvell/octeontx2/af/rpm.h | 2 +
.../net/ethernet/marvell/octeontx2/af/rvu.h | 1 +
.../ethernet/marvell/octeontx2/af/rvu_cgx.c | 12 ++++++
.../marvell/octeontx2/af/rvu_debugfs.c | 8 ++++
8 files changed, 67 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
index f5fd6138c352..3696bec7a8fc 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
@@ -752,6 +752,16 @@ u64 cgx_features_get(void *cgxd)
return ((struct cgx *)cgxd)->hw_features;
}
+u64 cgx_get_dmacflt_dropped_pktcnt(void *cgxd, int lmac_id)
+{
+ struct cgx *cgx = cgxd;
+
+ if (!is_lmac_valid(cgx, lmac_id))
+ return 0;
+
+ return cgx_read(cgx, lmac_id, CGXX_CMRX_RX_STAT4);
+}
+
int cgx_stats_reset(void *cgxd, int lmac_id)
{
struct cgx *cgx = cgxd;
@@ -1943,7 +1953,8 @@ static struct mac_ops cgx_mac_ops = {
.pfc_config = cgx_lmac_pfc_config,
.mac_get_pfc_frm_cfg = cgx_lmac_get_pfc_frm_cfg,
.mac_reset = cgx_lmac_reset,
- .mac_stats_reset = cgx_stats_reset,
+ .get_dmacflt_dropped_pktcnt = cgx_get_dmacflt_dropped_pktcnt,
+ .mac_stats_reset = cgx_stats_reset,
.mac_x2p_reset = cgx_x2p_reset,
.mac_enadis_rx = cgx_enadis_rx,
};
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.h b/drivers/net/ethernet/marvell/octeontx2/af/cgx.h
index 8411a75dd723..cd8858c4e41c 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.h
@@ -39,6 +39,7 @@
#define CGXX_CMRX_INT_ENA_W1S 0x058
#define CGXX_CMRX_RX_ID_MAP 0x060
#define CGXX_CMRX_RX_STAT0 0x070
+#define CGXX_CMRX_RX_STAT4 0x090
#define CGXX_CMRX_RX_LOGL_XON 0x100
#define CGXX_CMRX_RX_LMACS 0x128
#define CGXX_CMRX_RX_DMAC_CTL0 (0x1F8 + mac_ops->csr_offset)
@@ -187,5 +188,6 @@ int cgx_lmac_get_pfc_frm_cfg(void *cgxd, int lmac_id, u8 *tx_pause,
int verify_lmac_fc_cfg(void *cgxd, int lmac_id, u8 tx_pause, u8 rx_pause,
int pfvf_idx);
int cgx_lmac_reset(void *cgxd, int lmac_id, u8 pf_req_flr);
+u64 cgx_get_dmacflt_dropped_pktcnt(void *cgx, int lmac_id);
u32 cgx_get_fifo_len(void *cgxd);
#endif /* CGX_H */
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h b/drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h
index 6180e68e1765..f07139e1f4ce 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h
@@ -128,6 +128,8 @@ struct mac_ops {
u8 *tx_pause, u8 *rx_pause);
int (*mac_reset)(void *cgxd, int lmac_id, u8 pf_req_flr);
+ u64 (*get_dmacflt_dropped_pktcnt)(void *cgxd, int lmac_id);
+
/* FEC stats */
int (*get_fec_stats)(void *cgxd, int lmac_id,
struct cgx_fec_stats_rsp *rsp);
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rpm.c b/drivers/net/ethernet/marvell/octeontx2/af/rpm.c
index 2e9945446199..d46e8ec7230f 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rpm.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rpm.c
@@ -29,18 +29,19 @@ static struct mac_ops rpm_mac_ops = {
.mac_get_tx_stats = rpm_get_tx_stats,
.get_fec_stats = rpm_get_fec_stats,
.mac_enadis_rx_pause_fwding = rpm_lmac_enadis_rx_pause_fwding,
- .mac_get_pause_frm_status = rpm_lmac_get_pause_frm_status,
- .mac_enadis_pause_frm = rpm_lmac_enadis_pause_frm,
- .mac_pause_frm_config = rpm_lmac_pause_frm_config,
- .mac_enadis_ptp_config = rpm_lmac_ptp_config,
- .mac_rx_tx_enable = rpm_lmac_rx_tx_enable,
- .mac_tx_enable = rpm_lmac_tx_enable,
- .pfc_config = rpm_lmac_pfc_config,
- .mac_get_pfc_frm_cfg = rpm_lmac_get_pfc_frm_cfg,
- .mac_reset = rpm_lmac_reset,
- .mac_stats_reset = rpm_stats_reset,
- .mac_x2p_reset = rpm_x2p_reset,
- .mac_enadis_rx = rpm_enadis_rx,
+ .mac_get_pause_frm_status = rpm_lmac_get_pause_frm_status,
+ .mac_enadis_pause_frm = rpm_lmac_enadis_pause_frm,
+ .mac_pause_frm_config = rpm_lmac_pause_frm_config,
+ .mac_enadis_ptp_config = rpm_lmac_ptp_config,
+ .mac_rx_tx_enable = rpm_lmac_rx_tx_enable,
+ .mac_tx_enable = rpm_lmac_tx_enable,
+ .pfc_config = rpm_lmac_pfc_config,
+ .mac_get_pfc_frm_cfg = rpm_lmac_get_pfc_frm_cfg,
+ .mac_reset = rpm_lmac_reset,
+ .get_dmacflt_dropped_pktcnt = rpm_get_dmacflt_dropped_pktcnt,
+ .mac_stats_reset = rpm_stats_reset,
+ .mac_x2p_reset = rpm_x2p_reset,
+ .mac_enadis_rx = rpm_enadis_rx,
};
static struct mac_ops rpm2_mac_ops = {
@@ -73,6 +74,7 @@ static struct mac_ops rpm2_mac_ops = {
.pfc_config = rpm_lmac_pfc_config,
.mac_get_pfc_frm_cfg = rpm_lmac_get_pfc_frm_cfg,
.mac_reset = rpm_lmac_reset,
+ .get_dmacflt_dropped_pktcnt = rpm_get_dmacflt_dropped_pktcnt,
.mac_stats_reset = rpm_stats_reset,
.mac_x2p_reset = rpm_x2p_reset,
.mac_enadis_rx = rpm_enadis_rx,
@@ -449,6 +451,20 @@ int rpm_get_tx_stats(void *rpmd, int lmac_id, int idx, u64 *tx_stat)
return 0;
}
+u64 rpm_get_dmacflt_dropped_pktcnt(void *rpmd, int lmac_id)
+{
+ rpm_t *rpm = rpmd;
+ u64 dmac_flt_stat;
+
+ if (!is_lmac_valid(rpm, lmac_id))
+ return 0;
+
+ dmac_flt_stat = is_dev_rpm2(rpm) ? RPM2_CMRX_RX_STAT2 :
+ RPMX_CMRX_RX_STAT2;
+
+ return rpm_read(rpm, lmac_id, dmac_flt_stat);
+}
+
int rpm_stats_reset(void *rpmd, int lmac_id)
{
rpm_t *rpm = rpmd;
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rpm.h b/drivers/net/ethernet/marvell/octeontx2/af/rpm.h
index b8d3972e096a..443481010aba 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rpm.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rpm.h
@@ -60,6 +60,7 @@
#define RPMX_MTI_STAT_RX_STAT_PAGES_COUNTERX 0x12000
#define RPMX_MTI_STAT_TX_STAT_PAGES_COUNTERX 0x13000
#define RPMX_MTI_STAT_DATA_HI_CDC 0x10038
+#define RPMX_CMRX_RX_STAT2 0x4010
#define RPM_LMAC_FWI 0xa
#define RPM_TX_EN BIT_ULL(0)
@@ -129,6 +130,7 @@ int rpm_lmac_enadis_pause_frm(void *rpmd, int lmac_id, u8 tx_pause,
u8 rx_pause);
int rpm_get_tx_stats(void *rpmd, int lmac_id, int idx, u64 *tx_stat);
int rpm_get_rx_stats(void *rpmd, int lmac_id, int idx, u64 *rx_stat);
+u64 rpm_get_dmacflt_dropped_pktcnt(void *rpmd, int lmac_id);
void rpm_lmac_ptp_config(void *rpmd, int lmac_id, bool enable);
int rpm_lmac_rx_tx_enable(void *rpmd, int lmac_id, bool enable);
int rpm_lmac_tx_enable(void *rpmd, int lmac_id, bool enable);
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
index 094227404ef9..9afb7ac8969b 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
@@ -1127,6 +1127,7 @@ int rvu_cgx_prio_flow_ctrl_cfg(struct rvu *rvu, u16 pcifunc, u8 tx_pause, u8 rx_
u16 pfc_en);
int rvu_cgx_cfg_pause_frm(struct rvu *rvu, u16 pcifunc, u8 tx_pause, u8 rx_pause);
void rvu_mac_reset(struct rvu *rvu, u16 pcifunc);
+u64 rvu_cgx_get_dmacflt_dropped_pktcnt(void *cgxd, int lmac_id);
u32 rvu_cgx_get_lmac_fifolen(struct rvu *rvu, int cgx, int lmac);
void cgx_start_linkup(struct rvu *rvu);
int npc_get_nixlf_mcam_index(struct npc_mcam *mcam,
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
index 87d21889dc49..41f157ea27f4 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c
@@ -1356,6 +1356,18 @@ void rvu_mac_reset(struct rvu *rvu, u16 pcifunc)
dev_err(rvu->dev, "Failed to reset MAC\n");
}
+u64 rvu_cgx_get_dmacflt_dropped_pktcnt(void *cgxd, int lmac_id)
+{
+ struct mac_ops *mac_ops;
+
+ mac_ops = get_mac_ops(cgxd);
+
+ if (!mac_ops || !mac_ops->get_dmacflt_dropped_pktcnt)
+ return 0;
+
+ return mac_ops->get_dmacflt_dropped_pktcnt(cgxd, lmac_id);
+}
+
/* Do not allow CGX-mapped VFs to overwrite PKIND when special parse kinds
* (HiGig, EDSA, etc.) are in use on the shared LMAC. VFs must not program
* NPC_TX_DEF_PKIND on NIX_AF_LFX_TX_PARSE_CFG in that case: the PF owns
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
index 3456313d3b3c..e6ccaa29e05c 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
@@ -2957,8 +2957,10 @@ static int cgx_print_dmac_flt(struct seq_file *s, int lmac_id)
struct rvu_cgx_lmac_dbgfs_ctx *dctx = s->private;
struct rvu *rvu = dctx->rvu;
struct pci_dev *pdev = NULL;
+ struct mac_ops *mac_ops;
void *cgxd = dctx->cgxd;
char *bcast, *mcast;
+ u64 drop_cnt;
u16 index, domain;
u8 dmac[ETH_ALEN];
u64 cfg, mac;
@@ -2997,6 +2999,12 @@ static int cgx_print_dmac_flt(struct seq_file *s, int lmac_id)
}
}
+ mac_ops = get_mac_ops(cgxd);
+ if (mac_ops && mac_ops->get_dmacflt_dropped_pktcnt) {
+ drop_cnt = rvu_cgx_get_dmacflt_dropped_pktcnt(cgxd, lmac_id);
+ seq_printf(s, "\nDMAC filter drop count: %llu\n", drop_cnt);
+ }
+
pci_dev_put(pdev);
return 0;
}
--
2.48.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] octeontx2-af: Show DMAC filter drop count
2026-09-01 4:25 [PATCH net-next] octeontx2-af: Show DMAC filter drop count nshettyj
@ 2026-09-04 7:26 ` netdev-bot+sashiko
0 siblings, 0 replies; 2+ messages in thread
From: netdev-bot+sashiko @ 2026-09-04 7:26 UTC (permalink / raw)
To: nshettyj
Cc: netdev, linux-kernel, hkelam, sgoutham, rkannoth, gakula, sbhatta,
andrew+netdev, davem, edumazet, kuba, pabeni, richardcochran
Thank you for your contribution! Sashiko AI review found 1 potential
issue(s) to consider:
Critical: 0 · High: 0 · Medium: 1 · Low: 0
- [Medium] New debugfs label contradicts the driver's own name for the
same CGX register.
--
octeontx2-af: Show DMAC filter drop count
This adds a new mac_ops callback, get_dmacflt_dropped_pktcnt, implemented
for CGX (reading CGXX_CMRX_RX_STAT4) and RPM/RPM2 (reading RX_STAT2), and
prints the value in the mac_filter debugfs entry.
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
> index f5fd6138c352f..3696bec7a8fc1 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c
> @@ -752,6 +752,16 @@ u64 cgx_features_get(void *cgxd)
> return ((struct cgx *)cgxd)->hw_features;
> }
>
> +u64 cgx_get_dmacflt_dropped_pktcnt(void *cgxd, int lmac_id)
> +{
> + struct cgx *cgx = cgxd;
> +
> + if (!is_lmac_valid(cgx, lmac_id))
> + return 0;
> +
> + return cgx_read(cgx, lmac_id, CGXX_CMRX_RX_STAT4);
> +}
> +
[Severity: Medium]
Is CGXX_CMRX_RX_STAT4 really the DMAC filter drop counter? This driver
already exposes that same register under a different name.
cgx_get_rx_stats() reads:
*rx_stat = cgx_read(cgx, lmac_id, CGXX_CMRX_RX_STAT0 + (idx * 8));
For idx == 4 that is 0x070 + 32 == 0x090, i.e. the newly added
CGXX_CMRX_RX_STAT4. The name printed for it in the cgx_stat debugfs file
is:
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:
[CGX_STAT4] = "Filtered DMAC0 (NIX-bound) packets",
[CGX_STAT5] = "Filtered DMAC0 (NIX-bound) octets",
[CGX_STAT6] = "Packets dropped due to RX FIFO full",
[CGX_STAT7] = "Octets dropped due to RX FIFO full",
...
[CGX_STAT11] = "NCSI-bound packets dropped",
That table uses "dropped" wording for STAT6/7 and STAT11/12, and the
"Filtered DMAC<n> (<channel>-bound)" wording for STAT4/5 and STAT9/10,
which reads as packets that passed the DMAC filter towards NIX rather than
packets discarded by it.
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cgx.h b/drivers/net/ethernet/marvell/octeontx2/af/cgx.h
> index 8411a75dd723f..cd8858c4e41ce 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/cgx.h
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/cgx.h
> @@ -39,6 +39,7 @@
> #define CGXX_CMRX_INT_ENA_W1S 0x058
> #define CGXX_CMRX_RX_ID_MAP 0x060
> #define CGXX_CMRX_RX_STAT0 0x070
> +#define CGXX_CMRX_RX_STAT4 0x090
> #define CGXX_CMRX_RX_LOGL_XON 0x100
[ ... ]
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
> index 22ee996768796..f6320d6b959f0 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
> @@ -3003,6 +3005,12 @@ static int cgx_print_dmac_flt(struct seq_file *s, int lmac_id)
> }
> }
>
> + mac_ops = get_mac_ops(cgxd);
> + if (mac_ops && mac_ops->get_dmacflt_dropped_pktcnt) {
> + drop_cnt = rvu_cgx_get_dmacflt_dropped_pktcnt(cgxd, lmac_id);
> + seq_printf(s, "\nDMAC filter drop count: %llu\n", drop_cnt);
> + }
> +
[Severity: Medium]
After this change, the same CGX register is presented to users with two
opposite meanings in two debugfs files of the same driver:
cgx_print_stats() prints it via cgx_rx_stats_fields[CGX_STAT4] as
"Filtered DMAC0 (NIX-bound) packets", while cgx_print_dmac_flt() prints it
as "DMAC filter drop count".
One of the two descriptions has to be wrong. If the existing table is the
correct one, then any interface passing traffic will show a large and
continuously growing "DMAC filter drop count" that is really the accepted
packet count.
Could the two labels be reconciled, i.e. either correct
cgx_rx_stats_fields[CGX_STAT4] or use a different register for the drop
count here?
The commit message says:
CGX uses RX_STAT4 for this counter, while RPM/RPM2 use RX_STAT2.
Can a reference to the CGX/RPM register descriptions be added so it is
clear which of the two in-tree descriptions of RX_STAT4 matches the
hardware?
[ ... ]
--
Sashiko AI review · https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260901042503.1182121-1-nshettyj%40marvell.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-09-04 7:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-09-01 4:25 [PATCH net-next] octeontx2-af: Show DMAC filter drop count nshettyj
2026-09-04 7:26 ` netdev-bot+sashiko
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).