lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <1014e04b-5e74-4f7e-b2a5-ed0f8d01629d@intel.com> Date: Thu, 26 Oct 2023 12:36:37 +0200 From: Wojciech Drewek <wojciech.drewek@...el.com> To: Michael Chan <michael.chan@...adcom.com>, <davem@...emloft.net> CC: <netdev@...r.kernel.org>, <edumazet@...gle.com>, <kuba@...nel.org>, <pabeni@...hat.com>, <gospo@...adcom.com>, Ajit Khaparde <ajit.khaparde@...adcom.com> Subject: Re: [PATCH net-next] bnxt_en: Fix 2 stray ethtool -S counters On 26.10.2023 03:32, Michael Chan wrote: > The recent firmware interface change has added 2 counters in struct > rx_port_stats_ext. This caused 2 stray ethtool counters to be > displayed. > > Since new counters are added from time to time, fix it so that the > ethtool logic will only display up to the maximum known counters. > These 2 counters are not used by production firmware yet. > > Fixes: 754fbf604ff6 ("bnxt_en: Update firmware interface to 1.10.2.171") If this is a fix than the target should be "net" not "net-next". > Reviewed-by: Ajit Khaparde <ajit.khaparde@...adcom.com> > Signed-off-by: Michael Chan <michael.chan@...adcom.com> > --- > .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 28 +++++++++++++++---- > 1 file changed, 22 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c > index 53442aaabe5e..f3f384773ac0 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c > @@ -535,6 +535,7 @@ static int bnxt_get_num_ring_stats(struct bnxt *bp) > static int bnxt_get_num_stats(struct bnxt *bp) > { > int num_stats = bnxt_get_num_ring_stats(bp); > + int len; > > num_stats += BNXT_NUM_RING_ERR_STATS; > > @@ -542,8 +543,12 @@ static int bnxt_get_num_stats(struct bnxt *bp) > num_stats += BNXT_NUM_PORT_STATS; > > if (bp->flags & BNXT_FLAG_PORT_STATS_EXT) { > - num_stats += bp->fw_rx_stats_ext_size + > - bp->fw_tx_stats_ext_size; > + len = min_t(int, bp->fw_rx_stats_ext_size, > + ARRAY_SIZE(bnxt_port_stats_ext_arr)); You don't need "len" var. Why not just: num_stats += min_t(int, bp->fw_rx_stats_ext_size, ARRAY_SIZE(bnxt_port_stats_ext_arr)); > + num_stats += len; > + len = min_t(int, bp->fw_tx_stats_ext_size, > + ARRAY_SIZE(bnxt_tx_port_stats_ext_arr)); > + num_stats += len; > if (bp->pri2cos_valid) > num_stats += BNXT_NUM_STATS_PRI; > } > @@ -653,12 +658,17 @@ static void bnxt_get_ethtool_stats(struct net_device *dev, > if (bp->flags & BNXT_FLAG_PORT_STATS_EXT) { > u64 *rx_port_stats_ext = bp->rx_port_stats_ext.sw_stats; > u64 *tx_port_stats_ext = bp->tx_port_stats_ext.sw_stats; > + u32 len; > > - for (i = 0; i < bp->fw_rx_stats_ext_size; i++, j++) { > + len = min_t(u32, bp->fw_rx_stats_ext_size, > + ARRAY_SIZE(bnxt_port_stats_ext_arr)); > + for (i = 0; i < len; i++, j++) { > buf[j] = *(rx_port_stats_ext + > bnxt_port_stats_ext_arr[i].offset); > } > - for (i = 0; i < bp->fw_tx_stats_ext_size; i++, j++) { > + len = min_t(u32, bp->fw_tx_stats_ext_size, > + ARRAY_SIZE(bnxt_tx_port_stats_ext_arr)); > + for (i = 0; i < len; i++, j++) { > buf[j] = *(tx_port_stats_ext + > bnxt_tx_port_stats_ext_arr[i].offset); > } > @@ -757,11 +767,17 @@ static void bnxt_get_strings(struct net_device *dev, u32 stringset, u8 *buf) > } > } > if (bp->flags & BNXT_FLAG_PORT_STATS_EXT) { > - for (i = 0; i < bp->fw_rx_stats_ext_size; i++) { > + u32 len; > + > + len = min_t(u32, bp->fw_rx_stats_ext_size, > + ARRAY_SIZE(bnxt_port_stats_ext_arr)); > + for (i = 0; i < len; i++) { > strcpy(buf, bnxt_port_stats_ext_arr[i].string); > buf += ETH_GSTRING_LEN; > } > - for (i = 0; i < bp->fw_tx_stats_ext_size; i++) { > + len = min_t(u32, bp->fw_tx_stats_ext_size, > + ARRAY_SIZE(bnxt_tx_port_stats_ext_arr)); > + for (i = 0; i < len; i++) { > strcpy(buf, > bnxt_tx_port_stats_ext_arr[i].string); > buf += ETH_GSTRING_LEN;
Powered by blists - more mailing lists