net: dsa: use ethtool string helpers

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>
Link: https://patch.msgid.link/20241028044828.1639668-1-rosenp@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index c39cb119e760db5fcbfaaf44abe033f6977e7005..285785c942b077f6538de4d762f78354ccbd86ae 100644 (file)
--- 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 9201f07839ad0805decea4096f697797b9dfa5fd..43bde1f583ffdc72c264b45386541a07047047ce 100644 (file)
--- 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 4fda075a34492755d3f56e81f3dfb3d5cdb5ca94..be9f3b29019f9346bdb52e517ee3589e5979bda8 100644 (file)
--- a/drivers/net/dsa/bcm_sf2.h
+++ b/drivers/net/dsa/bcm_sf2.h
@@ -228,8 +228,8 @@ int bcm_sf2_set_rxnfc(struct dsa_switch *ds, int port,
 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);
+void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port, 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 c88ee3dd429978d7a7406dd96e2eb00a6f1208ca..e22362e6f0cd1d80f7e5be4ae6d018a5186ac2b9 100644 (file)
--- a/drivers/net/dsa/bcm_sf2_cfp.c
+++ b/drivers/net/dsa/bcm_sf2_cfp.c
@@ -1279,27 +1279,19 @@ static const struct bcm_sf2_cfp_stat {
        },
 };
 
-void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port,
-                            u32 stringset, uint8_t *data)
+void bcm_sf2_cfp_get_strings(struct dsa_switch *ds, int port, 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 c70ed67cc18882e829f8ef1673bf3b6680a9c53f..adbab544c60ff361ec6b2d02026d9d578e5b095c 100644 (file)
--- 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 d798f17cf7ea1b66cfdc9d77fd0187cb8f8a0fe4..283ec5a6e23c9baabe273f7da16d0ef45016d4f8 100644 (file)
--- 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 5290f5ad98f39236d2359ff3572ff583b2249884..f73833e24622a9009d597e3251ad3c3c3d153255 100644 (file)
--- 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 c75005b4d86e5f3bde8d97fd0ae74c662dc55e8e..3a792f79270d9970a759f54635dc920fafed354d 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -1153,42 +1153,37 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip,
        return value;
 }
 
-static int mv88e6xxx_stats_get_strings(struct mv88e6xxx_chip *chip,
-                                      uint8_t *data, int types)
+static void mv88e6xxx_stats_get_strings(struct mv88e6xxx_chip *chip,
+                                       uint8_t **data, int types)
 {
        const struct mv88e6xxx_hw_stat *stat;
-       int i, j;
+       int i;
 
-       for (i = 0, j = 0; i < ARRAY_SIZE(mv88e6xxx_hw_stats); i++) {
+       for (i = 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);
-                       j++;
-               }
+               if (stat->type & types)
+                       ethtool_puts(data, stat->string);
        }
-
-       return j;
 }
 
-static int mv88e6095_stats_get_strings(struct mv88e6xxx_chip *chip,
-                                      uint8_t *data)
+static void mv88e6095_stats_get_strings(struct mv88e6xxx_chip *chip,
+                                       uint8_t **data)
 {
-       return mv88e6xxx_stats_get_strings(chip, data,
-                                          STATS_TYPE_BANK0 | STATS_TYPE_PORT);
+       mv88e6xxx_stats_get_strings(chip, data,
+                                   STATS_TYPE_BANK0 | STATS_TYPE_PORT);
 }
 
-static int mv88e6250_stats_get_strings(struct mv88e6xxx_chip *chip,
-                                      uint8_t *data)
+static void mv88e6250_stats_get_strings(struct mv88e6xxx_chip *chip,
+                                       uint8_t **data)
 {
-       return mv88e6xxx_stats_get_strings(chip, data, STATS_TYPE_BANK0);
+       mv88e6xxx_stats_get_strings(chip, data, STATS_TYPE_BANK0);
 }
 
-static int mv88e6320_stats_get_strings(struct mv88e6xxx_chip *chip,
-                                      uint8_t *data)
+static void mv88e6320_stats_get_strings(struct mv88e6xxx_chip *chip,
+                                       uint8_t **data)
 {
-       return mv88e6xxx_stats_get_strings(chip, data,
-                                          STATS_TYPE_BANK0 | STATS_TYPE_BANK1);
+       mv88e6xxx_stats_get_strings(chip, data,
+                                   STATS_TYPE_BANK0 | STATS_TYPE_BANK1);
 }
 
 static const uint8_t *mv88e6xxx_atu_vtu_stats_strings[] = {
@@ -1199,21 +1194,18 @@ static const uint8_t *mv88e6xxx_atu_vtu_stats_strings[] = {
        "vtu_miss_violation",
 };
 
-static void mv88e6xxx_atu_vtu_get_strings(uint8_t *data)
+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;
@@ -1221,15 +1213,12 @@ static void mv88e6xxx_get_strings(struct dsa_switch *ds, int port,
        mv88e6xxx_reg_lock(chip);
 
        if (chip->info->ops->stats_get_strings)
-               count = chip->info->ops->stats_get_strings(chip, data);
+               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);
-       }
+       if (chip->info->ops->serdes_get_strings)
+               chip->info->ops->serdes_get_strings(chip, port, &data);
 
-       data += count * ETH_GSTRING_LEN;
-       mv88e6xxx_atu_vtu_get_strings(data);
+       mv88e6xxx_atu_vtu_get_strings(&data);
 
        mv88e6xxx_reg_unlock(chip);
 }

diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h
index 48399ab5355a38b02980974f4ceea758995a2dda..9fe8e8a7856b271c2efd952b39131ba0977eb4b8 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/chip.h
+++ b/drivers/net/dsa/mv88e6xxx/chip.h
@@ -606,7 +606,7 @@ struct mv88e6xxx_ops {
 
        /* Return the number of strings describing statistics */
        int (*stats_get_sset_count)(struct mv88e6xxx_chip *chip);
-       int (*stats_get_strings)(struct mv88e6xxx_chip *chip,  uint8_t *data);
+       void (*stats_get_strings)(struct mv88e6xxx_chip *chip, uint8_t **data);
        size_t (*stats_get_stat)(struct mv88e6xxx_chip *chip, int port,
                                 const struct mv88e6xxx_hw_stat *stat,
                                 uint64_t *data);
@@ -633,8 +633,8 @@ struct mv88e6xxx_ops {
 
        /* Statistics from the SERDES interface */
        int (*serdes_get_sset_count)(struct mv88e6xxx_chip *chip, int port);
-       int (*serdes_get_strings)(struct mv88e6xxx_chip *chip,  int port,
-                                 uint8_t *data);
+       int (*serdes_get_strings)(struct mv88e6xxx_chip *chip, int port,
+                                 uint8_t **data);
        size_t (*serdes_get_stats)(struct mv88e6xxx_chip *chip, int port,
                                   uint64_t *data);
 

diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c
index 01ea53940786d077725a7bff5bcca4cec7ee8686..b3330211edbcaa4a610f1f49cfe2f937d484956a 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/serdes.c
+++ b/drivers/net/dsa/mv88e6xxx/serdes.c
@@ -132,8 +132,8 @@ int mv88e6352_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port)
        return ARRAY_SIZE(mv88e6352_serdes_hw_stats);
 }
 
-int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip,
-                                int port, uint8_t *data)
+int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip, int port,
+                                uint8_t **data)
 {
        struct mv88e6352_serdes_hw_stat *stat;
        int err, i;
@@ -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);
 }
@@ -394,8 +393,8 @@ int mv88e6390_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port)
        return ARRAY_SIZE(mv88e6390_serdes_hw_stats);
 }
 
-int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip *chip,
-                                int port, uint8_t *data)
+int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip *chip, int port,
+                                uint8_t **data)
 {
        struct mv88e6390_serdes_hw_stat *stat;
        int i;
@@ -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/mv88e6xxx/serdes.h b/drivers/net/dsa/mv88e6xxx/serdes.h
index ff5c3ab31e155e7390dafd90430bf086ed0e8d00..ad887d8601bcbb322a8b89cc5c9da92369926811 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx/serdes.h
+++ b/drivers/net/dsa/mv88e6xxx/serdes.h
@@ -125,13 +125,13 @@ unsigned int mv88e6352_serdes_irq_mapping(struct mv88e6xxx_chip *chip,
 unsigned int mv88e6390_serdes_irq_mapping(struct mv88e6xxx_chip *chip,
                                          int port);
 int mv88e6352_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port);
-int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip,
-                                int port, uint8_t *data);
+int mv88e6352_serdes_get_strings(struct mv88e6xxx_chip *chip, int port,
+                                uint8_t **data);
 size_t mv88e6352_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,
                                  uint64_t *data);
 int mv88e6390_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port);
-int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip *chip,
-                                int port, uint8_t *data);
+int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip *chip, int port,
+                                uint8_t **data);
 size_t mv88e6390_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,
                                  uint64_t *data);
 

diff --git a/drivers/net/dsa/rzn1_a5psw.c b/drivers/net/dsa/rzn1_a5psw.c
index 1135a32e4b7e94d6c45279a6db50a16c1f3acd45..66974379334a463dac9019958b691de3945f540d 100644 (file)
--- 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 decc6c931dc100b96913f5e306a75f6641434f22..2ea64b1d026d73a461c71d92f8dfcfb30b260d4b 100644 (file)
--- 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 de3b768f2ff9c0a633d7d1eb294e76f7adbb888a..4dbcc49a9e526f8aacc2e42b0a63bd114ed8f7d0 100644 (file)
--- 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 b18ad0105b01599add4b9e8863f72fcbc3845997..06c30a9e29ff820d2dd58fb1801d5e76a5928326 100644 (file)
--- 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);
        }