Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com,
        Colin Foster <colin.foster@in-advantage.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH net-next 8/8] net: mscc: ocelot: fix ineffective WARN_ON() in ocelot_stats.c
Date:   Wed, 12 Apr 2023 15:47:37 +0300
Message-Id: <20230412124737.2243527-9-vladimir.oltean@nxp.com>
In-Reply-To: <20230412124737.2243527-1-vladimir.oltean@nxp.com>
References: <20230412124737.2243527-1-vladimir.oltean@nxp.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?MvYcJ0w9mNfEqgWnkMszceoffGuplbqLs9tJOENUMKQ59ijPOchw6KHhhJfF?=
 =?us-ascii?Q?2a7jaPZsuj4+W0pTtHeCeX/3V4e1cHfmPzk2fo2Ph1QSiX1Tm7BTVPM7U1KJ?=
 =?us-ascii?Q?ZmOg2cLXUOyWfbSC8qKAcbEwgbI8cCzyHbJ837cA+qpVF3CEvY8AAK/OOfCa?=
 =?us-ascii?Q?kYJ8/SPuu+jOh8/jfF/BD7qcXIAHrRTRiNI25UMN3K3ArfnyiB1753zrp53p?=
 =?us-ascii?Q?tgtGnwj7TMF6GAwAJKQi8z9VoBkh5G8mmsPMxRuKDWEXqsHUeFde/UBSvizp?=
 =?us-ascii?Q?4yJq3McXFxvkWwcA9CvT3BUztxg4n3SNAlGilGnEDUpxOWwz16qLlwoHMWYM?=
 =?us-ascii?Q?aEw7PVxhuGAQylO+ilSit9n/TohDZHSF073eL/legQ1fTRqUSNi/cK1iCJ7W?=
 =?us-ascii?Q?TwrrU51BhtGQN9iqdwB+4sFPaIm2Bj04illGJhgq2U52vhL59KSYFgob9g4u?=
 =?us-ascii?Q?3inNThc5fRZw7EvOl23Et+9aUVy/v6OUjLMwejM0soAnLOxJ0XG2rg7osCj4?=
 =?us-ascii?Q?UlPtJF2xQwxga2Dggd0pqrCICh5Z+k/wNcFY9gkAs+dQpHWE8S5V+J18gzO3?=
 =?us-ascii?Q?WipP4HtTw676cCa4IdFHVW6zMeHzV4JAC++eFZwSJB7Pt9lVDQklh1/sqzhf?=
 =?us-ascii?Q?N/994e6BtBCqQYDaHp3+m4AGRXyHzLJ7Xy3sIITC+UzgSImbCtWON3U/bN9a?=
 =?us-ascii?Q?RFLD9iOlM747VN6OicVmUmYTTUo7j2rGywl2tA5eAh1pLSXVR1ig3uh9mdAZ?=
 =?us-ascii?Q?hTx5A8Se+CdghlAViK1T9SnvOz0lwzEqrGPURU5Mf0IueBr6l3iq3nqSN2Eb?=
 =?us-ascii?Q?poTMXHbaEUN5xGZgQ51SE/KpEimZQ1nTyJ1tFsNf+tE0JPu6ZWDc8E2rZImv?=
 =?us-ascii?Q?TmbrLn8y3JdFn/ueLjavAWYeN8rW9EFli1wgcvP96Htg3TZWkHgNlq+jyPeU?=
 =?us-ascii?Q?YGpuvipV7dbtGJEprIeaJJJhV3IoFr9DN72rrsc/fFs++p5I2A3gF2QtafMj?=
 =?us-ascii?Q?rhD0LnQCBgWTbzaxQBxhIsopfu3BRuyA/Yjdq4HwZV6k4um/pvoisnXUiBaK?=
 =?us-ascii?Q?6ftpJ39WMqnJEv9bA1KkyCHInYUZ5agrFws1X6ufQKsMEWb/YUcOF7UwuP/4?=
 =?us-ascii?Q?JNed7ZIp6z2a9ZBWRjKGDpfNmZDiULGzw44t4QjdqQZEvAIVSAPP+71pOIjJ?=
 =?us-ascii?Q?C1OVzpL8EdOyOxeKmrMJutiIyHwGY/HfUSie0E4jTxHJh8cC5rvX7n2v9XyS?=
 =?us-ascii?Q?ws9lsXxugr/aqw7U3P2vbcE9+loiOpXv//w1QWeMCxNKi0qf4WCeMwg5z3lx?=
 =?us-ascii?Q?K8ptXFHmlArj7JRGEw6iYK8JARLgBv94vnwRciGwSi6RTjRWbYd8xejXU7y7?=
 =?us-ascii?Q?QZDmjXmfqEFsanBsHLkMJdNFEyrCN4x4V6bMWJlnx8BrTzSOKsNGpQPlXZwr?=
 =?us-ascii?Q?Zsdjq8v4Iq0mjpLvG+nIqF7abhvsJ97sViS05CHy3tCuqOduN24sZg+6DTrk?=
 =?us-ascii?Q?iYiZ5kHcnIP+QTvuVqNn/2pl0sjFxr043Mg8rWZC2zVjNFDSrhnKajeqK/TO?=
 =?us-ascii?Q?KVHeYbhwDDkHIJ8r0LccQgbCsLXD4a2HOMp6ZH9tgXJ+HpygPO/JzYnpiM9i?=
 =?us-ascii?Q?6w=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: dcee1635-8bd0-42da-f09a-08db3b5425c4
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2023 12:48:00.2235
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 8cfa9IPEp/YWY4gQmGA5dKPUw937HsLYWAZwwXIR/gTH4+dTROIycKmRKDKhK4zXlTfwzZoAhuli4DnpHIb5BA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6888
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS,
        T_SPF_PERMERROR,URIBL_BLOCKED autolearn=no autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Since it is hopefully now clear that, since "last" and "layout[i].reg"
are enum types and not addresses, the existing WARN_ON() is ineffective
in checking that the _addresses_ are sorted in the proper order.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/ethernet/mscc/ocelot_stats.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot_stats.c b/drivers/net/ethernet/mscc/ocelot_stats.c
index e82c9d9d0ad3..5c55197c7327 100644
--- a/drivers/net/ethernet/mscc/ocelot_stats.c
+++ b/drivers/net/ethernet/mscc/ocelot_stats.c
@@ -901,6 +901,17 @@ static int ocelot_prepare_stats_regions(struct ocelot *ocelot)
 		if (!layout[i].reg)
 			continue;
 
+		/* enum ocelot_stat must be kept sorted in the same order
+		 * as the addresses behind layout[i].reg in order to have
+		 * efficient bulking
+		 */
+		if (last) {
+			WARN(ocelot->map[SYS][last & REG_MASK] >= ocelot->map[SYS][layout[i].reg & REG_MASK],
+			     "reg 0x%x had address 0x%x but reg 0x%x has address 0x%x, bulking broken!",
+			     last, ocelot->map[SYS][last & REG_MASK],
+			     layout[i].reg, ocelot->map[SYS][layout[i].reg & REG_MASK]);
+		}
+
 		if (region && ocelot->map[SYS][layout[i].reg & REG_MASK] ==
 		    ocelot->map[SYS][last & REG_MASK] + 4) {
 			region->count++;
@@ -910,12 +921,6 @@ static int ocelot_prepare_stats_regions(struct ocelot *ocelot)
 			if (!region)
 				return -ENOMEM;
 
-			/* enum ocelot_stat must be kept sorted in the same
-			 * order as layout[i].reg in order to have efficient
-			 * bulking
-			 */
-			WARN_ON(last >= layout[i].reg);
-
 			region->base = layout[i].reg;
 			region->first_stat = i;
 			region->count = 1;
-- 
2.34.1