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:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Richie Pearn <richard.pearn@nxp.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH net] net: dsa: felix: fix min gate len calculation for tc when its first gate is closed
Date:   Thu,  4 Aug 2022 23:28:17 +0300
Message-Id: <20220804202817.1677572-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?Nd/I0MrQ6L+mzMnuoIzg5KR9kx9q4FZMgQcuB2+28wsS583NRi3siuw7AgMK?=
 =?us-ascii?Q?em65XqjUpwAh7tHKYYMhNEOeJK++HiEtiJaH0y0tNxai5FX3kBLlddiNCYgR?=
 =?us-ascii?Q?U5O+ELxy7A5hxDmutn3v4eElN72JZ/MaJv83+SGmEM6OKvapu5RJurvyEYPD?=
 =?us-ascii?Q?DWMtx0NsKAqHC4YbLNpb6UlSjHAwd+3Z8KN386dOUGp1KE1UcAS3dF+nzMtv?=
 =?us-ascii?Q?IkXQR6qzrmfQFJRLF0xSCoqCNjhdprwijP/r7oJiAs+mOIcPGaY5tx3/xD/W?=
 =?us-ascii?Q?0V5Hf8WsFjWRUUkaL8C8J4iKIq9Mj+K8X91SlxLyk2q2syKht6TKeK5+DPam?=
 =?us-ascii?Q?WpGPuEJ+egW83DoETGcx0clS+xRVg+/OVEQnQtsAH2MAWwCfNqQQa0BLKm0r?=
 =?us-ascii?Q?YvICL/OucqOzn6vlQ6ChJPM+bjM4p6GTub+rARsbSYqb0E6CzHbMPFkhTXD/?=
 =?us-ascii?Q?zHl4MaDyol/V5W+b9yCalZkElcy4fdAG2POssj/0GbazIKOeMhVcEglZbKID?=
 =?us-ascii?Q?hZJdm7EVwTiLcD4pLl47f8wJA2qQL7wREIdiUVdXUQ+NosnBL5WP/aTO3XcQ?=
 =?us-ascii?Q?uP1eDN+Xsj6bHbLHvg6g4WtfWdYbOZgYvAHKEqdBIryfN1JS5dyhhLF+uOBa?=
 =?us-ascii?Q?sr9dr0vuKc/VSd1zip6TRwAXutYCYRG7WaVgUQWYMN9aL9ypU9AaJYguCSE7?=
 =?us-ascii?Q?DSbw+lB7xzvUY81TUg0Eh7l/4De5kKblSsWW5pYxp0rYhYw+g6XDP5N7I4LP?=
 =?us-ascii?Q?2hKDpym2pPj3en5A1YB0kBKskmUV7DMqJf0Yj8gwj7CZR/tFXF4cfbGhbIbY?=
 =?us-ascii?Q?PvG7QqWpNfrIROYYK2ezhsl0KpQYkroGqoYNA8HrbYmo7vOAIHfDaFZiDdJT?=
 =?us-ascii?Q?uM0T4JTc8B8KKISDX3/5CEMfB/RTdqoD2V6P7l3Wy5sWORjhdNuhI+01kHs9?=
 =?us-ascii?Q?5TGUOmxJrxeiyNS5YiNWDKXOjNHp0aWMUwXvvfXy2Gg0i2C5tul1FeSS5CeT?=
 =?us-ascii?Q?UM1p2vx/i/BXIiqi6JA4zhX2T58xH89rM5D33JNhriVdUk84PShFzpC3Z/0x?=
 =?us-ascii?Q?kHUAKqAKJujqhe8kosbBxWDDrxh5MUyXSn6qbGNM7fJiLeqi+PxfygjALZX8?=
 =?us-ascii?Q?cZDlLZt4zKIt+dc0MEYxnXyOYI9w9kARQ+ZCD8apPJXxCPK9ba9I1UnH+mD0?=
 =?us-ascii?Q?ubFB9JVNzMYSol4Ak9Uprkptbbm8m56yP+2XbxFYUNFHTA8yolaygOBow9+Q?=
 =?us-ascii?Q?4g21lfw0Otoi1rt8EIAcsXDMOK9wNv0A9hKWfVjqnEsJd6e5LjQwHh8IwH1P?=
 =?us-ascii?Q?I2VVneo0wz4CHMBYy/mOVB7UVKeL7pn7uhXcLQEvOqiwBlfu0aEUAF5KBfly?=
 =?us-ascii?Q?fFOO4KMKJ4/GdiTXGDoQObhco6gpzUjyLeUIYSsBBNnhnfi9JqYdMI2JkHd5?=
 =?us-ascii?Q?gEb/Gj8iq11ffZjt0/SoNqOnJiUcckIzyOSOifnpZ9v7x0V2nncXJp/s1kWJ?=
 =?us-ascii?Q?R3CU03Q9OIe5h1cIH12C6TF9YDBj7nBfDtZWmDt8mrjj0zTt2Klom7qgYh1D?=
 =?us-ascii?Q?qa4R2OcgTDJqAbS9p4tjncCRmEhTzLGqrGviVgQ61LsruGotFIVkOvqymqAb?=
 =?us-ascii?Q?qQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1b572595-c1da-4593-13d6-08da7657ea2c
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2022 20:28:39.2773
 (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: qxcIeA+o1lRPy42UD9mTrtp3Qx50wPF69XzqtmPGVYoUJbd5RgZUXp3s49r10WBuV+/HQv9oCWFftAmGJkbmDg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5114
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        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

min_gate_len[tc] is supposed to track the shortest interval of
continuously open gates for a traffic class. For example, in the
following case:

TC 76543210

t0 00000001b 200000 ns
t1 00000010b 200000 ns

min_gate_len[0] and min_gate_len[1] should be 200000, while
min_gate_len[2-7] should be 0.

However what happens is that min_gate_len[0] is 200000, but
min_gate_len[1] ends up being 0 (despite gate_len[1] being 200000 at the
point where the logic detects the gate close event for TC 1).

The problem is that the code considers a "gate close" event whenever it
sees that there is a 0 for that TC (essentially it's level rather than
edge triggered). By doing that, any time a gate is seen as closed
without having been open prior, gate_len, which is 0, will be written
into min_gate_len. Once min_gate_len becomes 0, it's impossible for it
to track anything higher than that (the length of actually open
intervals).

To fix this, we make the writing to min_gate_len[tc] be edge-triggered,
which avoids writes for gates that are closed in consecutive intervals.
However what this does is it makes us need to special-case the
permanently closed gates at the end.

Fixes: 55a515b1f5a9 ("net: dsa: felix: drop oversized frames with tc-taprio instead of hanging the port")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/dsa/ocelot/felix_vsc9959.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index c09acbc0804f..0cbf846a29bf 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -1141,6 +1141,7 @@ static void vsc9959_tas_min_gate_lengths(struct tc_taprio_qopt_offload *taprio,
 {
 	struct tc_taprio_sched_entry *entry;
 	u64 gate_len[OCELOT_NUM_TC];
+	u8 gates_ever_opened = 0;
 	int tc, i, n;
 
 	/* Initialize arrays */
@@ -1168,16 +1169,28 @@ static void vsc9959_tas_min_gate_lengths(struct tc_taprio_qopt_offload *taprio,
 		for (tc = 0; tc < OCELOT_NUM_TC; tc++) {
 			if (entry->gate_mask & BIT(tc)) {
 				gate_len[tc] += entry->interval;
+				gates_ever_opened |= BIT(tc);
 			} else {
 				/* Gate closes now, record a potential new
 				 * minimum and reinitialize length
 				 */
-				if (min_gate_len[tc] > gate_len[tc])
+				if (min_gate_len[tc] > gate_len[tc] &&
+				    gate_len[tc])
 					min_gate_len[tc] = gate_len[tc];
 				gate_len[tc] = 0;
 			}
 		}
 	}
+
+	/* min_gate_len[tc] actually tracks minimum *open* gate time, so for
+	 * permanently closed gates, min_gate_len[tc] will still be U64_MAX.
+	 * Therefore they are currently indistinguishable from permanently
+	 * open gates. Overwrite the gate len with 0 when we know they're
+	 * actually permanently closed, i.e. after the loop above.
+	 */
+	for (tc = 0; tc < OCELOT_NUM_TC; tc++)
+		if (!(gates_ever_opened & BIT(tc)))
+			min_gate_len[tc] = 0;
 }
 
 /* Update QSYS_PORT_MAX_SDU to make sure the static guard bands added by the
-- 
2.34.1