From: Vladimir Oltean <vladimir.oltean@nxp.com>
To: Colin Foster <colin.foster@in-advantage.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Jakub Kicinski <kuba@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
"UNGLinuxDriver@microchip.com" <UNGLinuxDriver@microchip.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
Claudiu Manoil <claudiu.manoil@nxp.com>
Subject: Re: [PATCH v6 net-next 2/5] net: mscc: ocelot: remove unnecessary stat reading from ethtool
Date: Thu, 10 Feb 2022 10:34:47 +0000 [thread overview]
Message-ID: <20220210103446.3rdnulyk5p7tzgn6@skbuf> (raw)
In-Reply-To: <20220210041345.321216-3-colin.foster@in-advantage.com>
On Wed, Feb 09, 2022 at 08:13:42PM -0800, Colin Foster wrote:
> The ocelot_update_stats function only needs to read from one port, yet it
> was updating the stats for all ports. Update to only read the stats that
> are necessary.
>
> Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
> ---
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
> drivers/net/ethernet/mscc/ocelot.c | 33 +++++++++++++++---------------
> 1 file changed, 16 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
> index 6933dff1dd37..ab36732e7d3f 100644
> --- a/drivers/net/ethernet/mscc/ocelot.c
> +++ b/drivers/net/ethernet/mscc/ocelot.c
> @@ -1738,27 +1738,24 @@ void ocelot_get_strings(struct ocelot *ocelot, int port, u32 sset, u8 *data)
> EXPORT_SYMBOL(ocelot_get_strings);
>
> /* Caller must hold &ocelot->stats_lock */
> -static void ocelot_update_stats(struct ocelot *ocelot)
> +static void ocelot_update_stats_for_port(struct ocelot *ocelot, int port)
If you need to resend, I think a name more consistent with the rest of
the driver would be "ocelot_port_update_stats".
> {
> - int i, j;
> + int j;
>
> - for (i = 0; i < ocelot->num_phys_ports; i++) {
> - /* Configure the port to read the stats from */
> - ocelot_write(ocelot, SYS_STAT_CFG_STAT_VIEW(i), SYS_STAT_CFG);
> + /* Configure the port to read the stats from */
> + ocelot_write(ocelot, SYS_STAT_CFG_STAT_VIEW(port), SYS_STAT_CFG);
>
> - for (j = 0; j < ocelot->num_stats; j++) {
> - u32 val;
> - unsigned int idx = i * ocelot->num_stats + j;
> + for (j = 0; j < ocelot->num_stats; j++) {
> + u32 val;
> + unsigned int idx = port * ocelot->num_stats + j;
>
> - val = ocelot_read_rix(ocelot, SYS_COUNT_RX_OCTETS,
> - ocelot->stats_layout[j].offset);
> + val = ocelot_read_rix(ocelot, SYS_COUNT_RX_OCTETS,
> + ocelot->stats_layout[j].offset);
>
> - if (val < (ocelot->stats[idx] & U32_MAX))
> - ocelot->stats[idx] += (u64)1 << 32;
> + if (val < (ocelot->stats[idx] & U32_MAX))
> + ocelot->stats[idx] += (u64)1 << 32;
>
> - ocelot->stats[idx] = (ocelot->stats[idx] &
> - ~(u64)U32_MAX) + val;
> - }
> + ocelot->stats[idx] = (ocelot->stats[idx] & ~(u64)U32_MAX) + val;
> }
> }
>
> @@ -1767,9 +1764,11 @@ static void ocelot_check_stats_work(struct work_struct *work)
> struct delayed_work *del_work = to_delayed_work(work);
> struct ocelot *ocelot = container_of(del_work, struct ocelot,
> stats_work);
> + int i;
>
> mutex_lock(&ocelot->stats_lock);
> - ocelot_update_stats(ocelot);
> + for (i = 0; i < ocelot->num_phys_ports; i++)
> + ocelot_update_stats_for_port(ocelot, i);
> mutex_unlock(&ocelot->stats_lock);
>
> queue_delayed_work(ocelot->stats_queue, &ocelot->stats_work,
> @@ -1783,7 +1782,7 @@ void ocelot_get_ethtool_stats(struct ocelot *ocelot, int port, u64 *data)
> mutex_lock(&ocelot->stats_lock);
>
> /* check and update now */
> - ocelot_update_stats(ocelot);
> + ocelot_update_stats_for_port(ocelot, port);
>
> /* Copy all counters */
> for (i = 0; i < ocelot->num_stats; i++)
> --
> 2.25.1
>
next prev parent reply other threads:[~2022-02-10 10:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 4:13 [PATCH v6 net-next 0/5] use bulk reads for ocelot statistics Colin Foster
2022-02-10 4:13 ` [PATCH v6 net-next 1/5] net: mscc: ocelot: fix mutex lock error during ethtool stats read Colin Foster
2022-02-10 9:50 ` Vladimir Oltean
2022-02-10 4:13 ` [PATCH v6 net-next 2/5] net: mscc: ocelot: remove unnecessary stat reading from ethtool Colin Foster
2022-02-10 10:34 ` Vladimir Oltean [this message]
2022-02-10 4:13 ` [PATCH v6 net-next 3/5] net: ocelot: align macros for consistency Colin Foster
2022-02-10 4:13 ` [PATCH v6 net-next 4/5] net: mscc: ocelot: add ability to perform bulk reads Colin Foster
2022-02-10 4:13 ` [PATCH v6 net-next 5/5] net: mscc: ocelot: use bulk reads for stats Colin Foster
2022-02-10 10:36 ` Vladimir Oltean
2022-02-10 14:37 ` Colin Foster
2022-02-10 15:21 ` Colin Foster
2022-02-10 15:27 ` Vladimir Oltean
2022-02-10 15:35 ` Colin Foster
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=20220210103446.3rdnulyk5p7tzgn6@skbuf \
--to=vladimir.oltean@nxp.com \
--cc=UNGLinuxDriver@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=claudiu.manoil@nxp.com \
--cc=colin.foster@in-advantage.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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).