| Message ID | 20241025200807.189223-1-rosenp@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [PATCHv4,net-next] net: dsa: use ethtool string helpers | expand |
Reviewed-by: Lee Trager <lee@trager.us> On 10/25/24 1:08 PM, Rosen Penev wrote: > These are the preferred way to copy ethtool strings. > > Avoids incrementing pointers all over the place. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> > (for hellcreek driver) > Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de> > --- > v4: add back pointer math for b53_get_strings. Needed as prototype > can't be change to double pointer. > v3: remove curly braces from ksz_common.c > v2: remove curly braces from rzn1_a5psw.c > drivers/net/dsa/b53/b53_common.c | 3 +-- > drivers/net/dsa/bcm_sf2.c | 4 ++-- > drivers/net/dsa/bcm_sf2.h | 2 +- > drivers/net/dsa/bcm_sf2_cfp.c | 20 ++++++-------------- > drivers/net/dsa/dsa_loop.c | 3 +-- > drivers/net/dsa/hirschmann/hellcreek.c | 8 ++------ > drivers/net/dsa/microchip/ksz_common.c | 6 ++---- > drivers/net/dsa/mv88e6xxx/chip.c | 17 ++--------------- > drivers/net/dsa/mv88e6xxx/serdes.c | 6 ++---- > drivers/net/dsa/rzn1_a5psw.c | 6 ++---- > drivers/net/dsa/sja1105/sja1105_ethtool.c | 7 ++----- > drivers/net/dsa/xrs700x/xrs700x.c | 6 ++---- > net/dsa/user.c | 13 +++++-------- > 13 files changed, 30 insertions(+), 71 deletions(-) > > diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c > index c39cb119e760..285785c942b0 100644 > --- a/drivers/net/dsa/b53/b53_common.c > +++ b/drivers/net/dsa/b53/b53_common.c > @@ -989,8 +989,7 @@ void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset, > > if (stringset == ETH_SS_STATS) { > for (i = 0; i < mib_size; i++) > - strscpy(data + i * ETH_GSTRING_LEN, > - mibs[i].name, ETH_GSTRING_LEN); > + ethtool_puts(&data, mibs[i].name); > } else if (stringset == ETH_SS_PHY_STATS) { > phydev = b53_get_phy_device(ds, port); > if (!phydev) > diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c > index 9201f07839ad..43bde1f583ff 100644 > --- a/drivers/net/dsa/bcm_sf2.c > +++ b/drivers/net/dsa/bcm_sf2.c > @@ -1183,8 +1183,8 @@ static void bcm_sf2_sw_get_strings(struct dsa_switch *ds, int port, > int cnt = b53_get_sset_count(ds, port, stringset); > > b53_get_strings(ds, port, stringset, data); > - bcm_sf2_cfp_get_strings(ds, port, stringset, > - data + cnt * ETH_GSTRING_LEN); > + data += cnt * ETH_GSTRING_LEN; > + bcm_sf2_cfp_get_strings(ds, port, stringset, &data); > } > > static void bcm_sf2_sw_get_ethtool_stats(struct dsa_switch *ds, int port, > diff --git a/drivers/net/dsa/bcm_sf2.h b/drivers/net/dsa/bcm_sf2.h > index 4fda075a3449..e61e3bf688ff 100644 > --- a/drivers/net/dsa/bcm_sf2.h > +++ b/drivers/net/dsa/bcm_sf2.h > @@ -229,7 +229,7 @@ int bcm_sf2_cfp_rst(struct bcm_sf2_priv *priv); > void bcm_sf2_cfp_exit(struct dsa_switch *ds); > int bcm_sf2_cfp_resume(struct dsa_switch *ds); > void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port, > - u32 stringset, uint8_t *data); > + u32 stringset, uint8_t **data); > void bcm_sf2_cfp_get_ethtool_stats(struct dsa_switch *ds, int port, > uint64_t *data); > int bcm_sf2_cfp_get_sset_count(struct dsa_switch *ds, int port, int sset); > diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c > index c88ee3dd4299..95991334561e 100644 > --- a/drivers/net/dsa/bcm_sf2_cfp.c > +++ b/drivers/net/dsa/bcm_sf2_cfp.c > @@ -1280,26 +1280,18 @@ static const struct bcm_sf2_cfp_stat { > }; > > void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port, > - u32 stringset, uint8_t *data) > + u32 stringset, uint8_t **data) > { > struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); > - unsigned int s = ARRAY_SIZE(bcm_sf2_cfp_stats); > - char buf[ETH_GSTRING_LEN]; > - unsigned int i, j, iter; > + unsigned int i, j; > > if (stringset != ETH_SS_STATS) > return; > > - for (i = 1; i < priv->num_cfp_rules; i++) { > - for (j = 0; j < s; j++) { > - snprintf(buf, sizeof(buf), > - "CFP%03d_%sCntr", > - i, bcm_sf2_cfp_stats[j].name); > - iter = (i - 1) * s + j; > - strscpy(data + iter * ETH_GSTRING_LEN, > - buf, ETH_GSTRING_LEN); > - } > - } > + for (i = 1; i < priv->num_cfp_rules; i++) > + for (j = 0; j < ARRAY_SIZE(bcm_sf2_cfp_stats); j++) > + ethtool_sprintf(data, "CFP%03d_%sCntr", i, > + bcm_sf2_cfp_stats[j].name); > } > > void bcm_sf2_cfp_get_ethtool_stats(struct dsa_switch *ds, int port, > diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c > index c70ed67cc188..adbab544c60f 100644 > --- a/drivers/net/dsa/dsa_loop.c > +++ b/drivers/net/dsa/dsa_loop.c > @@ -121,8 +121,7 @@ static void dsa_loop_get_strings(struct dsa_switch *ds, int port, > return; > > for (i = 0; i < __DSA_LOOP_CNT_MAX; i++) > - memcpy(data + i * ETH_GSTRING_LEN, > - ps->ports[port].mib[i].name, ETH_GSTRING_LEN); > + ethtool_puts(&data, ps->ports[port].mib[i].name); > } > > static void dsa_loop_get_ethtool_stats(struct dsa_switch *ds, int port, > diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c > index d798f17cf7ea..283ec5a6e23c 100644 > --- a/drivers/net/dsa/hirschmann/hellcreek.c > +++ b/drivers/net/dsa/hirschmann/hellcreek.c > @@ -294,12 +294,8 @@ static void hellcreek_get_strings(struct dsa_switch *ds, int port, > { > int i; > > - for (i = 0; i < ARRAY_SIZE(hellcreek_counter); ++i) { > - const struct hellcreek_counter *counter = &hellcreek_counter[i]; > - > - strscpy(data + i * ETH_GSTRING_LEN, > - counter->name, ETH_GSTRING_LEN); > - } > + for (i = 0; i < ARRAY_SIZE(hellcreek_counter); ++i) > + ethtool_puts(&data, hellcreek_counter[i].name); > } > > static int hellcreek_get_sset_count(struct dsa_switch *ds, int port, int sset) > diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c > index 5290f5ad98f3..f73833e24622 100644 > --- a/drivers/net/dsa/microchip/ksz_common.c > +++ b/drivers/net/dsa/microchip/ksz_common.c > @@ -2112,10 +2112,8 @@ static void ksz_get_strings(struct dsa_switch *ds, int port, > if (stringset != ETH_SS_STATS) > return; > > - for (i = 0; i < dev->info->mib_cnt; i++) { > - memcpy(buf + i * ETH_GSTRING_LEN, > - dev->info->mib_names[i].string, ETH_GSTRING_LEN); > - } > + for (i = 0; i < dev->info->mib_cnt; i++) > + ethtool_puts(&buf, dev->info->mib_names[i].string); > } > > /** > diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c > index 4f5193d86e65..1893fed00467 100644 > --- a/drivers/net/dsa/mv88e6xxx/chip.c > +++ b/drivers/net/dsa/mv88e6xxx/chip.c > @@ -1162,8 +1162,7 @@ static int mv88e6xxx_stats_get_strings(struct mv88e6xxx_chip *chip, > for (i = 0, j = 0; i < ARRAY_SIZE(mv88e6xxx_hw_stats); i++) { > stat = &mv88e6xxx_hw_stats[i]; > if (stat->type & types) { > - memcpy(data + j * ETH_GSTRING_LEN, stat->string, > - ETH_GSTRING_LEN); > + ethtool_puts(&data, stat->string); > j++; > } > } > @@ -1204,31 +1203,19 @@ static void mv88e6xxx_atu_vtu_get_strings(uint8_t *data) > unsigned int i; > > for (i = 0; i < ARRAY_SIZE(mv88e6xxx_atu_vtu_stats_strings); i++) > - strscpy(data + i * ETH_GSTRING_LEN, > - mv88e6xxx_atu_vtu_stats_strings[i], > - ETH_GSTRING_LEN); > + ethtool_puts(&data, mv88e6xxx_atu_vtu_stats_strings[i]); > } > > static void mv88e6xxx_get_strings(struct dsa_switch *ds, int port, > u32 stringset, uint8_t *data) > { > struct mv88e6xxx_chip *chip = ds->priv; > - int count = 0; > > if (stringset != ETH_SS_STATS) > return; > > mv88e6xxx_reg_lock(chip); > > - if (chip->info->ops->stats_get_strings) > - count = chip->info->ops->stats_get_strings(chip, data); > - > - if (chip->info->ops->serdes_get_strings) { > - data += count * ETH_GSTRING_LEN; > - count = chip->info->ops->serdes_get_strings(chip, port, data); > - } > - > - data += count * ETH_GSTRING_LEN; > mv88e6xxx_atu_vtu_get_strings(data); > > mv88e6xxx_reg_unlock(chip); > diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c > index 01ea53940786..327831d2b547 100644 > --- a/drivers/net/dsa/mv88e6xxx/serdes.c > +++ b/drivers/net/dsa/mv88e6xxx/serdes.c > @@ -144,8 +144,7 @@ int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip, > > for (i = 0; i < ARRAY_SIZE(mv88e6352_serdes_hw_stats); i++) { > stat = &mv88e6352_serdes_hw_stats[i]; > - memcpy(data + i * ETH_GSTRING_LEN, stat->string, > - ETH_GSTRING_LEN); > + ethtool_puts(&data, stat->string); > } > return ARRAY_SIZE(mv88e6352_serdes_hw_stats); > } > @@ -405,8 +404,7 @@ int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip *chip, > > for (i = 0; i < ARRAY_SIZE(mv88e6390_serdes_hw_stats); i++) { > stat = &mv88e6390_serdes_hw_stats[i]; > - memcpy(data + i * ETH_GSTRING_LEN, stat->string, > - ETH_GSTRING_LEN); > + ethtool_puts(&data, stat->string); > } > return ARRAY_SIZE(mv88e6390_serdes_hw_stats); > } > diff --git a/drivers/net/dsa/rzn1_a5psw.c b/drivers/net/dsa/rzn1_a5psw.c > index 1135a32e4b7e..66974379334a 100644 > --- a/drivers/net/dsa/rzn1_a5psw.c > +++ b/drivers/net/dsa/rzn1_a5psw.c > @@ -802,10 +802,8 @@ static void a5psw_get_strings(struct dsa_switch *ds, int port, u32 stringset, > if (stringset != ETH_SS_STATS) > return; > > - for (u = 0; u < ARRAY_SIZE(a5psw_stats); u++) { > - memcpy(data + u * ETH_GSTRING_LEN, a5psw_stats[u].name, > - ETH_GSTRING_LEN); > - } > + for (u = 0; u < ARRAY_SIZE(a5psw_stats); u++) > + ethtool_puts(&data, a5psw_stats[u].name); > } > > static void a5psw_get_ethtool_stats(struct dsa_switch *ds, int port, > diff --git a/drivers/net/dsa/sja1105/sja1105_ethtool.c b/drivers/net/dsa/sja1105/sja1105_ethtool.c > index decc6c931dc1..2ea64b1d026d 100644 > --- a/drivers/net/dsa/sja1105/sja1105_ethtool.c > +++ b/drivers/net/dsa/sja1105/sja1105_ethtool.c > @@ -586,7 +586,6 @@ void sja1105_get_strings(struct dsa_switch *ds, int port, > { > struct sja1105_private *priv = ds->priv; > enum sja1105_counter_index max_ctr, i; > - char *p = data; > > if (stringset != ETH_SS_STATS) > return; > @@ -597,10 +596,8 @@ void sja1105_get_strings(struct dsa_switch *ds, int port, > else > max_ctr = __MAX_SJA1105PQRS_PORT_COUNTER; > > - for (i = 0; i < max_ctr; i++) { > - strscpy(p, sja1105_port_counters[i].name, ETH_GSTRING_LEN); > - p += ETH_GSTRING_LEN; > - } > + for (i = 0; i < max_ctr; i++) > + ethtool_puts(&data, sja1105_port_counters[i].name); > } > > int sja1105_get_sset_count(struct dsa_switch *ds, int port, int sset) > diff --git a/drivers/net/dsa/xrs700x/xrs700x.c b/drivers/net/dsa/xrs700x/xrs700x.c > index de3b768f2ff9..4dbcc49a9e52 100644 > --- a/drivers/net/dsa/xrs700x/xrs700x.c > +++ b/drivers/net/dsa/xrs700x/xrs700x.c > @@ -91,10 +91,8 @@ static void xrs700x_get_strings(struct dsa_switch *ds, int port, > if (stringset != ETH_SS_STATS) > return; > > - for (i = 0; i < ARRAY_SIZE(xrs700x_mibs); i++) { > - strscpy(data, xrs700x_mibs[i].name, ETH_GSTRING_LEN); > - data += ETH_GSTRING_LEN; > - } > + for (i = 0; i < ARRAY_SIZE(xrs700x_mibs); i++) > + ethtool_puts(&data, xrs700x_mibs[i].name); > } > > static int xrs700x_get_sset_count(struct dsa_switch *ds, int port, int sset) > diff --git a/net/dsa/user.c b/net/dsa/user.c > index 91a1fa5f8ab0..f7b0630dd2b6 100644 > --- a/net/dsa/user.c > +++ b/net/dsa/user.c > @@ -1042,15 +1042,12 @@ static void dsa_user_get_strings(struct net_device *dev, > struct dsa_switch *ds = dp->ds; > > if (stringset == ETH_SS_STATS) { > - int len = ETH_GSTRING_LEN; > - > - strscpy_pad(data, "tx_packets", len); > - strscpy_pad(data + len, "tx_bytes", len); > - strscpy_pad(data + 2 * len, "rx_packets", len); > - strscpy_pad(data + 3 * len, "rx_bytes", len); > + ethtool_puts(&data, "tx_packets"); > + ethtool_puts(&data, "tx_bytes"); > + ethtool_puts(&data, "rx_packets"); > + ethtool_puts(&data, "rx_bytes"); > if (ds->ops->get_strings) > - ds->ops->get_strings(ds, dp->index, stringset, > - data + 4 * len); > + ds->ops->get_strings(ds, dp->index, stringset, data); > } else if (stringset == ETH_SS_TEST) { > net_selftest_get_strings(data); > }
On Fri, Oct 25, 2024 at 1:08 PM Rosen Penev <rosenp@gmail.com> wrote: > > These are the preferred way to copy ethtool strings. > > Avoids incrementing pointers all over the place. > > Signed-off-by: Rosen Penev <rosenp@gmail.com> > (for hellcreek driver) > Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de> > --- > v4: add back pointer math for b53_get_strings. Needed as prototype > can't be change to double pointer. > v3: remove curly braces from ksz_common.c > v2: remove curly braces from rzn1_a5psw.c > drivers/net/dsa/b53/b53_common.c | 3 +-- > drivers/net/dsa/bcm_sf2.c | 4 ++-- > drivers/net/dsa/bcm_sf2.h | 2 +- > drivers/net/dsa/bcm_sf2_cfp.c | 20 ++++++-------------- > drivers/net/dsa/dsa_loop.c | 3 +-- > drivers/net/dsa/hirschmann/hellcreek.c | 8 ++------ > drivers/net/dsa/microchip/ksz_common.c | 6 ++---- > drivers/net/dsa/mv88e6xxx/chip.c | 17 ++--------------- > drivers/net/dsa/mv88e6xxx/serdes.c | 6 ++---- > drivers/net/dsa/rzn1_a5psw.c | 6 ++---- > drivers/net/dsa/sja1105/sja1105_ethtool.c | 7 ++----- > drivers/net/dsa/xrs700x/xrs700x.c | 6 ++---- > net/dsa/user.c | 13 +++++-------- > 13 files changed, 30 insertions(+), 71 deletions(-) > > diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c > index c39cb119e760..285785c942b0 100644 > --- a/drivers/net/dsa/b53/b53_common.c > +++ b/drivers/net/dsa/b53/b53_common.c > @@ -989,8 +989,7 @@ void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset, > > if (stringset == ETH_SS_STATS) { > for (i = 0; i < mib_size; i++) > - strscpy(data + i * ETH_GSTRING_LEN, > - mibs[i].name, ETH_GSTRING_LEN); > + ethtool_puts(&data, mibs[i].name); > } else if (stringset == ETH_SS_PHY_STATS) { > phydev = b53_get_phy_device(ds, port); > if (!phydev) > diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c > index 9201f07839ad..43bde1f583ff 100644 > --- a/drivers/net/dsa/bcm_sf2.c > +++ b/drivers/net/dsa/bcm_sf2.c > @@ -1183,8 +1183,8 @@ static void bcm_sf2_sw_get_strings(struct dsa_switch *ds, int port, > int cnt = b53_get_sset_count(ds, port, stringset); > > b53_get_strings(ds, port, stringset, data); > - bcm_sf2_cfp_get_strings(ds, port, stringset, > - data + cnt * ETH_GSTRING_LEN); > + data += cnt * ETH_GSTRING_LEN; > + bcm_sf2_cfp_get_strings(ds, port, stringset, &data); > } > > static void bcm_sf2_sw_get_ethtool_stats(struct dsa_switch *ds, int port, > diff --git a/drivers/net/dsa/bcm_sf2.h b/drivers/net/dsa/bcm_sf2.h > index 4fda075a3449..e61e3bf688ff 100644 > --- a/drivers/net/dsa/bcm_sf2.h > +++ b/drivers/net/dsa/bcm_sf2.h > @@ -229,7 +229,7 @@ int bcm_sf2_cfp_rst(struct bcm_sf2_priv *priv); > void bcm_sf2_cfp_exit(struct dsa_switch *ds); > int bcm_sf2_cfp_resume(struct dsa_switch *ds); > void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port, > - u32 stringset, uint8_t *data); > + u32 stringset, uint8_t **data); > void bcm_sf2_cfp_get_ethtool_stats(struct dsa_switch *ds, int port, > uint64_t *data); > int bcm_sf2_cfp_get_sset_count(struct dsa_switch *ds, int port, int sset); > diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c > index c88ee3dd4299..95991334561e 100644 > --- a/drivers/net/dsa/bcm_sf2_cfp.c > +++ b/drivers/net/dsa/bcm_sf2_cfp.c > @@ -1280,26 +1280,18 @@ static const struct bcm_sf2_cfp_stat { > }; > > void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port, > - u32 stringset, uint8_t *data) > + u32 stringset, uint8_t **data) > { > struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); > - unsigned int s = ARRAY_SIZE(bcm_sf2_cfp_stats); > - char buf[ETH_GSTRING_LEN]; > - unsigned int i, j, iter; > + unsigned int i, j; > > if (stringset != ETH_SS_STATS) > return; > > - for (i = 1; i < priv->num_cfp_rules; i++) { > - for (j = 0; j < s; j++) { > - snprintf(buf, sizeof(buf), > - "CFP%03d_%sCntr", > - i, bcm_sf2_cfp_stats[j].name); > - iter = (i - 1) * s + j; > - strscpy(data + iter * ETH_GSTRING_LEN, > - buf, ETH_GSTRING_LEN); > - } > - } > + for (i = 1; i < priv->num_cfp_rules; i++) > + for (j = 0; j < ARRAY_SIZE(bcm_sf2_cfp_stats); j++) > + ethtool_sprintf(data, "CFP%03d_%sCntr", i, > + bcm_sf2_cfp_stats[j].name); > } > > void bcm_sf2_cfp_get_ethtool_stats(struct dsa_switch *ds, int port, > diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c > index c70ed67cc188..adbab544c60f 100644 > --- a/drivers/net/dsa/dsa_loop.c > +++ b/drivers/net/dsa/dsa_loop.c > @@ -121,8 +121,7 @@ static void dsa_loop_get_strings(struct dsa_switch *ds, int port, > return; > > for (i = 0; i < __DSA_LOOP_CNT_MAX; i++) > - memcpy(data + i * ETH_GSTRING_LEN, > - ps->ports[port].mib[i].name, ETH_GSTRING_LEN); > + ethtool_puts(&data, ps->ports[port].mib[i].name); > } > > static void dsa_loop_get_ethtool_stats(struct dsa_switch *ds, int port, > diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c > index d798f17cf7ea..283ec5a6e23c 100644 > --- a/drivers/net/dsa/hirschmann/hellcreek.c > +++ b/drivers/net/dsa/hirschmann/hellcreek.c > @@ -294,12 +294,8 @@ static void hellcreek_get_strings(struct dsa_switch *ds, int port, > { > int i; > > - for (i = 0; i < ARRAY_SIZE(hellcreek_counter); ++i) { > - const struct hellcreek_counter *counter = &hellcreek_counter[i]; > - > - strscpy(data + i * ETH_GSTRING_LEN, > - counter->name, ETH_GSTRING_LEN); > - } > + for (i = 0; i < ARRAY_SIZE(hellcreek_counter); ++i) > + ethtool_puts(&data, hellcreek_counter[i].name); > } > > static int hellcreek_get_sset_count(struct dsa_switch *ds, int port, int sset) > diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c > index 5290f5ad98f3..f73833e24622 100644 > --- a/drivers/net/dsa/microchip/ksz_common.c > +++ b/drivers/net/dsa/microchip/ksz_common.c > @@ -2112,10 +2112,8 @@ static void ksz_get_strings(struct dsa_switch *ds, int port, > if (stringset != ETH_SS_STATS) > return; > > - for (i = 0; i < dev->info->mib_cnt; i++) { > - memcpy(buf + i * ETH_GSTRING_LEN, > - dev->info->mib_names[i].string, ETH_GSTRING_LEN); > - } > + for (i = 0; i < dev->info->mib_cnt; i++) > + ethtool_puts(&buf, dev->info->mib_names[i].string); > } > > /** > diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c > index 4f5193d86e65..1893fed00467 100644 > --- a/drivers/net/dsa/mv88e6xxx/chip.c > +++ b/drivers/net/dsa/mv88e6xxx/chip.c > @@ -1162,8 +1162,7 @@ static int mv88e6xxx_stats_get_strings(struct mv88e6xxx_chip *chip, > for (i = 0, j = 0; i < ARRAY_SIZE(mv88e6xxx_hw_stats); i++) { > stat = &mv88e6xxx_hw_stats[i]; > if (stat->type & types) { > - memcpy(data + j * ETH_GSTRING_LEN, stat->string, > - ETH_GSTRING_LEN); > + ethtool_puts(&data, stat->string); > j++; > } > } > @@ -1204,31 +1203,19 @@ static void mv88e6xxx_atu_vtu_get_strings(uint8_t *data) > unsigned int i; > > for (i = 0; i < ARRAY_SIZE(mv88e6xxx_atu_vtu_stats_strings); i++) > - strscpy(data + i * ETH_GSTRING_LEN, > - mv88e6xxx_atu_vtu_stats_strings[i], > - ETH_GSTRING_LEN); > + ethtool_puts(&data, mv88e6xxx_atu_vtu_stats_strings[i]); > } > > static void mv88e6xxx_get_strings(struct dsa_switch *ds, int port, > u32 stringset, uint8_t *data) > { > struct mv88e6xxx_chip *chip = ds->priv; > - int count = 0; > > if (stringset != ETH_SS_STATS) > return; > > mv88e6xxx_reg_lock(chip); > > - if (chip->info->ops->stats_get_strings) > - count = chip->info->ops->stats_get_strings(chip, data); > - > - if (chip->info->ops->serdes_get_strings) { > - data += count * ETH_GSTRING_LEN; > - count = chip->info->ops->serdes_get_strings(chip, port, data); > - } Removal of these function calls looks wrong. To get rid of pointer arithmetic here, I think they need to be changed to u8**. > - > - data += count * ETH_GSTRING_LEN; > mv88e6xxx_atu_vtu_get_strings(data); > > mv88e6xxx_reg_unlock(chip); > diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c > index 01ea53940786..327831d2b547 100644 > --- a/drivers/net/dsa/mv88e6xxx/serdes.c > +++ b/drivers/net/dsa/mv88e6xxx/serdes.c > @@ -144,8 +144,7 @@ int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip, > > for (i = 0; i < ARRAY_SIZE(mv88e6352_serdes_hw_stats); i++) { > stat = &mv88e6352_serdes_hw_stats[i]; > - memcpy(data + i * ETH_GSTRING_LEN, stat->string, > - ETH_GSTRING_LEN); > + ethtool_puts(&data, stat->string); > } > return ARRAY_SIZE(mv88e6352_serdes_hw_stats); > } > @@ -405,8 +404,7 @@ int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip *chip, > > for (i = 0; i < ARRAY_SIZE(mv88e6390_serdes_hw_stats); i++) { > stat = &mv88e6390_serdes_hw_stats[i]; > - memcpy(data + i * ETH_GSTRING_LEN, stat->string, > - ETH_GSTRING_LEN); > + ethtool_puts(&data, stat->string); > } > return ARRAY_SIZE(mv88e6390_serdes_hw_stats); > } > diff --git a/drivers/net/dsa/rzn1_a5psw.c b/drivers/net/dsa/rzn1_a5psw.c > index 1135a32e4b7e..66974379334a 100644 > --- a/drivers/net/dsa/rzn1_a5psw.c > +++ b/drivers/net/dsa/rzn1_a5psw.c > @@ -802,10 +802,8 @@ static void a5psw_get_strings(struct dsa_switch *ds, int port, u32 stringset, > if (stringset != ETH_SS_STATS) > return; > > - for (u = 0; u < ARRAY_SIZE(a5psw_stats); u++) { > - memcpy(data + u * ETH_GSTRING_LEN, a5psw_stats[u].name, > - ETH_GSTRING_LEN); > - } > + for (u = 0; u < ARRAY_SIZE(a5psw_stats); u++) > + ethtool_puts(&data, a5psw_stats[u].name); > } > > static void a5psw_get_ethtool_stats(struct dsa_switch *ds, int port, > diff --git a/drivers/net/dsa/sja1105/sja1105_ethtool.c b/drivers/net/dsa/sja1105/sja1105_ethtool.c > index decc6c931dc1..2ea64b1d026d 100644 > --- a/drivers/net/dsa/sja1105/sja1105_ethtool.c > +++ b/drivers/net/dsa/sja1105/sja1105_ethtool.c > @@ -586,7 +586,6 @@ void sja1105_get_strings(struct dsa_switch *ds, int port, > { > struct sja1105_private *priv = ds->priv; > enum sja1105_counter_index max_ctr, i; > - char *p = data; > > if (stringset != ETH_SS_STATS) > return; > @@ -597,10 +596,8 @@ void sja1105_get_strings(struct dsa_switch *ds, int port, > else > max_ctr = __MAX_SJA1105PQRS_PORT_COUNTER; > > - for (i = 0; i < max_ctr; i++) { > - strscpy(p, sja1105_port_counters[i].name, ETH_GSTRING_LEN); > - p += ETH_GSTRING_LEN; > - } > + for (i = 0; i < max_ctr; i++) > + ethtool_puts(&data, sja1105_port_counters[i].name); > } > > int sja1105_get_sset_count(struct dsa_switch *ds, int port, int sset) > diff --git a/drivers/net/dsa/xrs700x/xrs700x.c b/drivers/net/dsa/xrs700x/xrs700x.c > index de3b768f2ff9..4dbcc49a9e52 100644 > --- a/drivers/net/dsa/xrs700x/xrs700x.c > +++ b/drivers/net/dsa/xrs700x/xrs700x.c > @@ -91,10 +91,8 @@ static void xrs700x_get_strings(struct dsa_switch *ds, int port, > if (stringset != ETH_SS_STATS) > return; > > - for (i = 0; i < ARRAY_SIZE(xrs700x_mibs); i++) { > - strscpy(data, xrs700x_mibs[i].name, ETH_GSTRING_LEN); > - data += ETH_GSTRING_LEN; > - } > + for (i = 0; i < ARRAY_SIZE(xrs700x_mibs); i++) > + ethtool_puts(&data, xrs700x_mibs[i].name); > } > > static int xrs700x_get_sset_count(struct dsa_switch *ds, int port, int sset) > diff --git a/net/dsa/user.c b/net/dsa/user.c > index 91a1fa5f8ab0..f7b0630dd2b6 100644 > --- a/net/dsa/user.c > +++ b/net/dsa/user.c > @@ -1042,15 +1042,12 @@ static void dsa_user_get_strings(struct net_device *dev, > struct dsa_switch *ds = dp->ds; > > if (stringset == ETH_SS_STATS) { > - int len = ETH_GSTRING_LEN; > - > - strscpy_pad(data, "tx_packets", len); > - strscpy_pad(data + len, "tx_bytes", len); > - strscpy_pad(data + 2 * len, "rx_packets", len); > - strscpy_pad(data + 3 * len, "rx_bytes", len); > + ethtool_puts(&data, "tx_packets"); > + ethtool_puts(&data, "tx_bytes"); > + ethtool_puts(&data, "rx_packets"); > + ethtool_puts(&data, "rx_bytes"); > if (ds->ops->get_strings) > - ds->ops->get_strings(ds, dp->index, stringset, > - data + 4 * len); > + ds->ops->get_strings(ds, dp->index, stringset, data); > } else if (stringset == ETH_SS_TEST) { > net_selftest_get_strings(data); > } > -- > 2.47.0 >
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index c39cb119e760..285785c942b0 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -989,8 +989,7 @@ void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset, if (stringset == ETH_SS_STATS) { for (i = 0; i < mib_size; i++) - strscpy(data + i * ETH_GSTRING_LEN, - mibs[i].name, ETH_GSTRING_LEN); + ethtool_puts(&data, mibs[i].name); } else if (stringset == ETH_SS_PHY_STATS) { phydev = b53_get_phy_device(ds, port); if (!phydev) diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c index 9201f07839ad..43bde1f583ff 100644 --- a/drivers/net/dsa/bcm_sf2.c +++ b/drivers/net/dsa/bcm_sf2.c @@ -1183,8 +1183,8 @@ static void bcm_sf2_sw_get_strings(struct dsa_switch *ds, int port, int cnt = b53_get_sset_count(ds, port, stringset); b53_get_strings(ds, port, stringset, data); - bcm_sf2_cfp_get_strings(ds, port, stringset, - data + cnt * ETH_GSTRING_LEN); + data += cnt * ETH_GSTRING_LEN; + bcm_sf2_cfp_get_strings(ds, port, stringset, &data); } static void bcm_sf2_sw_get_ethtool_stats(struct dsa_switch *ds, int port, diff --git a/drivers/net/dsa/bcm_sf2.h b/drivers/net/dsa/bcm_sf2.h index 4fda075a3449..e61e3bf688ff 100644 --- a/drivers/net/dsa/bcm_sf2.h +++ b/drivers/net/dsa/bcm_sf2.h @@ -229,7 +229,7 @@ int bcm_sf2_cfp_rst(struct bcm_sf2_priv *priv); void bcm_sf2_cfp_exit(struct dsa_switch *ds); int bcm_sf2_cfp_resume(struct dsa_switch *ds); void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port, - u32 stringset, uint8_t *data); + u32 stringset, uint8_t **data); void bcm_sf2_cfp_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data); int bcm_sf2_cfp_get_sset_count(struct dsa_switch *ds, int port, int sset); diff --git a/drivers/net/dsa/bcm_sf2_cfp.c b/drivers/net/dsa/bcm_sf2_cfp.c index c88ee3dd4299..95991334561e 100644 --- a/drivers/net/dsa/bcm_sf2_cfp.c +++ b/drivers/net/dsa/bcm_sf2_cfp.c @@ -1280,26 +1280,18 @@ static const struct bcm_sf2_cfp_stat { }; void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port, - u32 stringset, uint8_t *data) + u32 stringset, uint8_t **data) { struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); - unsigned int s = ARRAY_SIZE(bcm_sf2_cfp_stats); - char buf[ETH_GSTRING_LEN]; - unsigned int i, j, iter; + unsigned int i, j; if (stringset != ETH_SS_STATS) return; - for (i = 1; i < priv->num_cfp_rules; i++) { - for (j = 0; j < s; j++) { - snprintf(buf, sizeof(buf), - "CFP%03d_%sCntr", - i, bcm_sf2_cfp_stats[j].name); - iter = (i - 1) * s + j; - strscpy(data + iter * ETH_GSTRING_LEN, - buf, ETH_GSTRING_LEN); - } - } + for (i = 1; i < priv->num_cfp_rules; i++) + for (j = 0; j < ARRAY_SIZE(bcm_sf2_cfp_stats); j++) + ethtool_sprintf(data, "CFP%03d_%sCntr", i, + bcm_sf2_cfp_stats[j].name); } void bcm_sf2_cfp_get_ethtool_stats(struct dsa_switch *ds, int port, diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c index c70ed67cc188..adbab544c60f 100644 --- a/drivers/net/dsa/dsa_loop.c +++ b/drivers/net/dsa/dsa_loop.c @@ -121,8 +121,7 @@ static void dsa_loop_get_strings(struct dsa_switch *ds, int port, return; for (i = 0; i < __DSA_LOOP_CNT_MAX; i++) - memcpy(data + i * ETH_GSTRING_LEN, - ps->ports[port].mib[i].name, ETH_GSTRING_LEN); + ethtool_puts(&data, ps->ports[port].mib[i].name); } static void dsa_loop_get_ethtool_stats(struct dsa_switch *ds, int port, diff --git a/drivers/net/dsa/hirschmann/hellcreek.c b/drivers/net/dsa/hirschmann/hellcreek.c index d798f17cf7ea..283ec5a6e23c 100644 --- a/drivers/net/dsa/hirschmann/hellcreek.c +++ b/drivers/net/dsa/hirschmann/hellcreek.c @@ -294,12 +294,8 @@ static void hellcreek_get_strings(struct dsa_switch *ds, int port, { int i; - for (i = 0; i < ARRAY_SIZE(hellcreek_counter); ++i) { - const struct hellcreek_counter *counter = &hellcreek_counter[i]; - - strscpy(data + i * ETH_GSTRING_LEN, - counter->name, ETH_GSTRING_LEN); - } + for (i = 0; i < ARRAY_SIZE(hellcreek_counter); ++i) + ethtool_puts(&data, hellcreek_counter[i].name); } static int hellcreek_get_sset_count(struct dsa_switch *ds, int port, int sset) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 5290f5ad98f3..f73833e24622 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -2112,10 +2112,8 @@ static void ksz_get_strings(struct dsa_switch *ds, int port, if (stringset != ETH_SS_STATS) return; - for (i = 0; i < dev->info->mib_cnt; i++) { - memcpy(buf + i * ETH_GSTRING_LEN, - dev->info->mib_names[i].string, ETH_GSTRING_LEN); - } + for (i = 0; i < dev->info->mib_cnt; i++) + ethtool_puts(&buf, dev->info->mib_names[i].string); } /** diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 4f5193d86e65..1893fed00467 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -1162,8 +1162,7 @@ static int mv88e6xxx_stats_get_strings(struct mv88e6xxx_chip *chip, for (i = 0, j = 0; i < ARRAY_SIZE(mv88e6xxx_hw_stats); i++) { stat = &mv88e6xxx_hw_stats[i]; if (stat->type & types) { - memcpy(data + j * ETH_GSTRING_LEN, stat->string, - ETH_GSTRING_LEN); + ethtool_puts(&data, stat->string); j++; } } @@ -1204,31 +1203,19 @@ static void mv88e6xxx_atu_vtu_get_strings(uint8_t *data) unsigned int i; for (i = 0; i < ARRAY_SIZE(mv88e6xxx_atu_vtu_stats_strings); i++) - strscpy(data + i * ETH_GSTRING_LEN, - mv88e6xxx_atu_vtu_stats_strings[i], - ETH_GSTRING_LEN); + ethtool_puts(&data, mv88e6xxx_atu_vtu_stats_strings[i]); } static void mv88e6xxx_get_strings(struct dsa_switch *ds, int port, u32 stringset, uint8_t *data) { struct mv88e6xxx_chip *chip = ds->priv; - int count = 0; if (stringset != ETH_SS_STATS) return; mv88e6xxx_reg_lock(chip); - if (chip->info->ops->stats_get_strings) - count = chip->info->ops->stats_get_strings(chip, data); - - if (chip->info->ops->serdes_get_strings) { - data += count * ETH_GSTRING_LEN; - count = chip->info->ops->serdes_get_strings(chip, port, data); - } - - data += count * ETH_GSTRING_LEN; mv88e6xxx_atu_vtu_get_strings(data); mv88e6xxx_reg_unlock(chip); diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c index 01ea53940786..327831d2b547 100644 --- a/drivers/net/dsa/mv88e6xxx/serdes.c +++ b/drivers/net/dsa/mv88e6xxx/serdes.c @@ -144,8 +144,7 @@ int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip, for (i = 0; i < ARRAY_SIZE(mv88e6352_serdes_hw_stats); i++) { stat = &mv88e6352_serdes_hw_stats[i]; - memcpy(data + i * ETH_GSTRING_LEN, stat->string, - ETH_GSTRING_LEN); + ethtool_puts(&data, stat->string); } return ARRAY_SIZE(mv88e6352_serdes_hw_stats); } @@ -405,8 +404,7 @@ int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip *chip, for (i = 0; i < ARRAY_SIZE(mv88e6390_serdes_hw_stats); i++) { stat = &mv88e6390_serdes_hw_stats[i]; - memcpy(data + i * ETH_GSTRING_LEN, stat->string, - ETH_GSTRING_LEN); + ethtool_puts(&data, stat->string); } return ARRAY_SIZE(mv88e6390_serdes_hw_stats); } diff --git a/drivers/net/dsa/rzn1_a5psw.c b/drivers/net/dsa/rzn1_a5psw.c index 1135a32e4b7e..66974379334a 100644 --- a/drivers/net/dsa/rzn1_a5psw.c +++ b/drivers/net/dsa/rzn1_a5psw.c @@ -802,10 +802,8 @@ static void a5psw_get_strings(struct dsa_switch *ds, int port, u32 stringset, if (stringset != ETH_SS_STATS) return; - for (u = 0; u < ARRAY_SIZE(a5psw_stats); u++) { - memcpy(data + u * ETH_GSTRING_LEN, a5psw_stats[u].name, - ETH_GSTRING_LEN); - } + for (u = 0; u < ARRAY_SIZE(a5psw_stats); u++) + ethtool_puts(&data, a5psw_stats[u].name); } static void a5psw_get_ethtool_stats(struct dsa_switch *ds, int port, diff --git a/drivers/net/dsa/sja1105/sja1105_ethtool.c b/drivers/net/dsa/sja1105/sja1105_ethtool.c index decc6c931dc1..2ea64b1d026d 100644 --- a/drivers/net/dsa/sja1105/sja1105_ethtool.c +++ b/drivers/net/dsa/sja1105/sja1105_ethtool.c @@ -586,7 +586,6 @@ void sja1105_get_strings(struct dsa_switch *ds, int port, { struct sja1105_private *priv = ds->priv; enum sja1105_counter_index max_ctr, i; - char *p = data; if (stringset != ETH_SS_STATS) return; @@ -597,10 +596,8 @@ void sja1105_get_strings(struct dsa_switch *ds, int port, else max_ctr = __MAX_SJA1105PQRS_PORT_COUNTER; - for (i = 0; i < max_ctr; i++) { - strscpy(p, sja1105_port_counters[i].name, ETH_GSTRING_LEN); - p += ETH_GSTRING_LEN; - } + for (i = 0; i < max_ctr; i++) + ethtool_puts(&data, sja1105_port_counters[i].name); } int sja1105_get_sset_count(struct dsa_switch *ds, int port, int sset) diff --git a/drivers/net/dsa/xrs700x/xrs700x.c b/drivers/net/dsa/xrs700x/xrs700x.c index de3b768f2ff9..4dbcc49a9e52 100644 --- a/drivers/net/dsa/xrs700x/xrs700x.c +++ b/drivers/net/dsa/xrs700x/xrs700x.c @@ -91,10 +91,8 @@ static void xrs700x_get_strings(struct dsa_switch *ds, int port, if (stringset != ETH_SS_STATS) return; - for (i = 0; i < ARRAY_SIZE(xrs700x_mibs); i++) { - strscpy(data, xrs700x_mibs[i].name, ETH_GSTRING_LEN); - data += ETH_GSTRING_LEN; - } + for (i = 0; i < ARRAY_SIZE(xrs700x_mibs); i++) + ethtool_puts(&data, xrs700x_mibs[i].name); } static int xrs700x_get_sset_count(struct dsa_switch *ds, int port, int sset) diff --git a/net/dsa/user.c b/net/dsa/user.c index 91a1fa5f8ab0..f7b0630dd2b6 100644 --- a/net/dsa/user.c +++ b/net/dsa/user.c @@ -1042,15 +1042,12 @@ static void dsa_user_get_strings(struct net_device *dev, struct dsa_switch *ds = dp->ds; if (stringset == ETH_SS_STATS) { - int len = ETH_GSTRING_LEN; - - strscpy_pad(data, "tx_packets", len); - strscpy_pad(data + len, "tx_bytes", len); - strscpy_pad(data + 2 * len, "rx_packets", len); - strscpy_pad(data + 3 * len, "rx_bytes", len); + ethtool_puts(&data, "tx_packets"); + ethtool_puts(&data, "tx_bytes"); + ethtool_puts(&data, "rx_packets"); + ethtool_puts(&data, "rx_bytes"); if (ds->ops->get_strings) - ds->ops->get_strings(ds, dp->index, stringset, - data + 4 * len); + ds->ops->get_strings(ds, dp->index, stringset, data); } else if (stringset == ETH_SS_TEST) { net_selftest_get_strings(data); }