From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc:     Vladimir Oltean <vladimir.oltean@nxp.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH v1 net-next 2/2] net: mscc: ocelot: use bulk reads for stats
Date:   Sun,  9 Jan 2022 17:06:18 -0800
Message-Id: <20220110010618.428927-3-colin.foster@in-advantage.com>
In-Reply-To: <20220110010618.428927-1-colin.foster@in-advantage.com>
References: <20220110010618.428927-1-colin.foster@in-advantage.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8scODctQZJCfNabggLV4NNQFuiWuRXOKGcfiZUCEzVK90uxUYSFO9Wza9Kpg?=
 =?us-ascii?Q?L/ytiTalf08lxZhhouWXRz3LZrnwhnzWb+BgZp5OBtA4SvNDsMAa8bDVnM5+?=
 =?us-ascii?Q?wyxG1ZmZDhgDqoFQ8hGNHoTiM7i/hs5LFYg09WL1nNwlQSEns9fZ+KDYR1Qa?=
 =?us-ascii?Q?28f/FbWpb6NZM5whVdgjers7WIPEGgQC8eb9eD5B2BSsSAbSTnNwKZAvgelF?=
 =?us-ascii?Q?PDYTS6KInQRf03ZPAlAv8KCLEmwmiLSwRP0ryHxqKzrMdXwKCTTAHxrDDiV9?=
 =?us-ascii?Q?4j0Hx9KUZ69DYUww4JfY+w6ph0JsESR15x0ln3vrvl/v4W1+mL3bj25fInPq?=
 =?us-ascii?Q?75W7pfPmM2LcyYIf7aPc/pX0k0HxVQ/utOpk74Go2FokartJM++BqVmwUWku?=
 =?us-ascii?Q?T+SC/ckqHYanoZYg8Qc8SOKYC3f9R0mHKwAcxel2ZxJywhTWhb4iqpq3QXUb?=
 =?us-ascii?Q?1MP69Ci63Yb1nsJk4eaPn5Uh63Dd+zcKNn46FJ0rNxnCQoyD8BZdwjF795Xn?=
 =?us-ascii?Q?GOhzmZpXEbF/qAfpP3GVnyBkHO/GTWgsZzs3z0DkQdrhXaZy/nqGXcXCT1PP?=
 =?us-ascii?Q?kv9ftL3zopiEBcXE4QxVKEv8Q95+lPt2NUujop41PagEgWCZvRHgnlhdNp1d?=
 =?us-ascii?Q?/yp0m3oi1PxWBQ/0I61DSdRtiQNHR66iuRezANmkZjnqa7JUk7Jag7gQvVWD?=
 =?us-ascii?Q?DtJeTsSDaR+cw8Sx7YnnbCV1EKph4OhI3o0w0HlFNmHCMbstV/E1gxb7aYgj?=
 =?us-ascii?Q?17M3J1YbcL3vJjzdDEMoIUaHQcWWlryMjschEvT5J1ETPupQT+NnCoUvwbH1?=
 =?us-ascii?Q?mIyTQ4p5nqjAwO8yITH3HOKZE1FQjj1G1sRVRWnG9SrPWyB658S9uHqknzKu?=
 =?us-ascii?Q?MkwN3EtIl8giQPAoZi84YYC7u1zZbNbZz1FV3nBJp95dhNEgpzM6G6mFvQ5C?=
 =?us-ascii?Q?qA7m5hxSoP4g4aJxAFxfrJd53DBHFZin6r0Sg99obimH8tGj5lv4gWPEtWWU?=
 =?us-ascii?Q?QBKIYiHNJulEECkSlGaEDtRugwrGaXOYHWH5DO8F19ipKMIzXiMHAU4dfR22?=
 =?us-ascii?Q?4SJHbrUHTHw+w0efiC9KDPcSp7E4Se4IefpqLD9rY8Z6Ut4kjtzYZO7VfpWV?=
 =?us-ascii?Q?f3ULRRC4xic/Ow0anhMF+wcD/LZ4CJ4Pd2P33kxVnMcMtnSCUVeMR3W8UtIJ?=
 =?us-ascii?Q?FOztQcM3smdXSdGSYJjY6NIb7Ot65RljfRYCiMWcQ8LwAj7iJRta5p2322WC?=
 =?us-ascii?Q?SB6K9kXgRWnNI2qSNP79T20pVRAlofKU2fuW1yd8JWRtvT0CjuDMSA0CuicM?=
 =?us-ascii?Q?h+kMh6jpd19mdd87/G5xSUHCT4WKJAwPYXQTJQeHehM05u8+ES39cuLBLGnZ?=
 =?us-ascii?Q?3rHMYraKa91cU14pdqIlMQE2BDieVV9tDF7qtKHlGnRNJFdXdqtocfq7tYdR?=
 =?us-ascii?Q?oPNbgdLfayF01yZw4DPC7XSOlfkKTNoz0g855/T4jKl2TtgtS6q09s1tu/sb?=
 =?us-ascii?Q?qx2vqfr5LmARCxa0zlbkX2jxAJUBlFzomlkEifLOYdP/eBjw6Gb5OJSN4C7X?=
 =?us-ascii?Q?VtwTGivjrqrJ8+eMfbEGGsOd+UbNy/WFkkbzNCghFk4or6SgeICZJP/Dyj0N?=
 =?us-ascii?Q?eNatqCq4Gc0Z6KRgtj53sqzIhYgM9/LsB41JnWWByYuedF/UO9kZzEp8iSU4?=
 =?us-ascii?Q?Z1ICnQ=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: aa46bf4a-6459-4bb0-55fc-08d9d3d570ac
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 01:06:32.2566
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 655vbQJTtE0QyAG0YxRyWNGUQmVetF1Jhb/bMepOKTInSU6twqukA+AUzGdXVrfYnpQe3rS9ybyKMlh4LRevWL9gwjf+nsA7uJTyYFveo5w=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5810
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Create and utilize bulk regmap reads instead of single access for gathering
stats. This will allow slower buses (SPI) the ability to drop significant
overhead performing new transactions that could instead be sequential
access.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
---
 drivers/net/ethernet/mscc/ocelot.c | 76 +++++++++++++++++++++++++-----
 include/soc/mscc/ocelot.h          |  8 ++++
 2 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 9b42187a026a..57b40de9fcdc 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -1697,32 +1697,40 @@ void ocelot_get_strings(struct ocelot *ocelot, int port, u32 sset, u8 *data)
 }
 EXPORT_SYMBOL(ocelot_get_strings);
 
-static void ocelot_update_stats(struct ocelot *ocelot)
+static int ocelot_update_stats(struct ocelot *ocelot)
 {
-	int i, j;
+	struct ocelot_stats_region *region;
+	int i, j, err = 0;
 
 	mutex_lock(&ocelot->stats_lock);
 
 	for (i = 0; i < ocelot->num_phys_ports; i++) {
+		unsigned int idx = 0;
 		/* Configure the port to read the stats from */
 		ocelot_write(ocelot, SYS_STAT_CFG_STAT_VIEW(i), SYS_STAT_CFG);
 
-		for (j = 0; j < ocelot->num_stats; j++) {
-			u32 val;
-			unsigned int idx = i * ocelot->num_stats + j;
+		list_for_each_entry(region, &ocelot->stats_regions, node) {
+			err = ocelot_bulk_read_rix(ocelot, SYS_COUNT_RX_OCTETS,
+						   region->offset, region->buf,
+						   region->count);
+			if (err)
+				goto out;
 
-			val = ocelot_read_rix(ocelot, SYS_COUNT_RX_OCTETS,
-					      ocelot->stats_layout[j].offset);
+			for (j = 0; j < region->count; j++) {
+				if (region->buf[j] < (ocelot->stats[idx + j] & U32_MAX))
+					ocelot->stats[idx + j] += (u64)1 << 32;
 
-			if (val < (ocelot->stats[idx] & U32_MAX))
-				ocelot->stats[idx] += (u64)1 << 32;
+				ocelot->stats[idx + j] = (ocelot->stats[idx + j] &
+							~(u64)U32_MAX) + region->buf[j];
+			}
 
-			ocelot->stats[idx] = (ocelot->stats[idx] &
-					      ~(u64)U32_MAX) + val;
+			idx += region->count;
 		}
 	}
 
+out:
 	mutex_unlock(&ocelot->stats_lock);
+	return err;
 }
 
 static void ocelot_check_stats_work(struct work_struct *work)
@@ -1739,10 +1747,11 @@ static void ocelot_check_stats_work(struct work_struct *work)
 
 void ocelot_get_ethtool_stats(struct ocelot *ocelot, int port, u64 *data)
 {
-	int i;
+	int i, err;
 
 	/* check and update now */
-	ocelot_update_stats(ocelot);
+	err = ocelot_update_stats(ocelot);
+	WARN_ONCE(err, "Error %d updating ethtool stats\n", err);
 
 	/* Copy all counters */
 	for (i = 0; i < ocelot->num_stats; i++)
@@ -1759,6 +1768,43 @@ int ocelot_get_sset_count(struct ocelot *ocelot, int port, int sset)
 }
 EXPORT_SYMBOL(ocelot_get_sset_count);
 
+static int ocelot_prepare_stats_regions(struct ocelot *ocelot)
+{
+	struct ocelot_stats_region *region = NULL;
+	unsigned int last;
+	int i;
+
+	INIT_LIST_HEAD(&ocelot->stats_regions);
+
+	for (i = 0; i < ocelot->num_stats; i++) {
+		if (region && ocelot->stats_layout[i].offset == last + 1) {
+			region->count++;
+		} else {
+			region = devm_kzalloc(ocelot->dev, sizeof(*region),
+					      GFP_KERNEL);
+			if (!region)
+				return -ENOMEM;
+
+			region->offset = ocelot->stats_layout[i].offset;
+			region->count = 1;
+			list_add_tail(&region->node, &ocelot->stats_regions);
+		}
+
+		last = ocelot->stats_layout[i].offset;
+	}
+
+	list_for_each_entry(region, &ocelot->stats_regions, node) {
+		region->buf = devm_kzalloc(ocelot->dev,
+					   region->count * sizeof(*region->buf),
+					   GFP_KERNEL);
+
+		if (!region->buf)
+			return -ENOMEM;
+	}
+
+	return 0;
+}
+
 int ocelot_get_ts_info(struct ocelot *ocelot, int port,
 		       struct ethtool_ts_info *info)
 {
@@ -2763,6 +2809,10 @@ int ocelot_init(struct ocelot *ocelot)
 				 ANA_CPUQ_8021_CFG_CPUQ_BPDU_VAL(6),
 				 ANA_CPUQ_8021_CFG, i);
 
+	ret = ocelot_prepare_stats_regions(ocelot);
+	if (ret)
+		return ret;
+
 	INIT_DELAYED_WORK(&ocelot->stats_work, ocelot_check_stats_work);
 	queue_delayed_work(ocelot->stats_queue, &ocelot->stats_work,
 			   OCELOT_STATS_CHECK_DELAY);
diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
index 6f74015032fc..1f11c27bf29f 100644
--- a/include/soc/mscc/ocelot.h
+++ b/include/soc/mscc/ocelot.h
@@ -542,6 +542,13 @@ struct ocelot_stat_layout {
 	char name[ETH_GSTRING_LEN];
 };
 
+struct ocelot_stats_region {
+	struct list_head node;
+	u32 offset;
+	int count;
+	u32 *buf;
+};
+
 enum ocelot_tag_prefix {
 	OCELOT_TAG_PREFIX_DISABLED	= 0,
 	OCELOT_TAG_PREFIX_NONE,
@@ -673,6 +680,7 @@ struct ocelot {
 	struct regmap_field		*regfields[REGFIELD_MAX];
 	const u32 *const		*map;
 	const struct ocelot_stat_layout	*stats_layout;
+	struct list_head		stats_regions;
 	unsigned int			num_stats;
 
 	u32				pool_size[OCELOT_SB_NUM][OCELOT_SB_POOL_NUM];
-- 
2.25.1