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>,
        Jamal Hadi Salim <jhs@mojatatu.com>,
        Cong Wang <xiyou.wangcong@gmail.com>,
        Jiri Pirko <jiri@resnulli.us>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Gerhard Engleder <gerhard@engleder-embedded.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH net-next 1/3] net/sched: taprio: fix calculation of maximum gate durations
Date:   Thu, 16 Feb 2023 00:46:30 +0200
Message-Id: <20230215224632.2532685-2-vladimir.oltean@nxp.com>
In-Reply-To: <20230215224632.2532685-1-vladimir.oltean@nxp.com>
References: <20230215224632.2532685-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?PKYFKPMhNBaybkRFSUZbGEN5R6uLKoA1HsnLEn1W1Em9mGHecAWeZ+jFJz2v?=
 =?us-ascii?Q?+spdl7ZuTWqltFYha+w2iRleyG4F7FaLWoGb9GE7ZHBoWpjEbytj5lUNzLSH?=
 =?us-ascii?Q?dyMz+y1cNYIb60jeDWCc5eVF5wf3HeyaTbUu07J8ZTddgKHqtRNcaI5PFPDG?=
 =?us-ascii?Q?yhOW/+C9NfAeiN+pYkoHyW0IaF5hIqG7NPxWkS45I3RwvwSL01orNcheVuOu?=
 =?us-ascii?Q?erdaSzbTHdT1x3kwh+p4keDtO15UYJG10DJS16JiVdA7WOql7fcZZP5YjIvL?=
 =?us-ascii?Q?sdGcJIc/iBVvKxGFtF5UiVxCzj0VoU3FDBlRUm/2Szc7y6BTWRkLZde482ne?=
 =?us-ascii?Q?l8LdzxcTCSU1w0HFbdyS2oJN0LU+/WBctrsD58wJMMXnKKpJIKSCRBI1UWZ+?=
 =?us-ascii?Q?6ekQgpeAFFjUaRD5G7AL2IHkL5KorCoRFaGjjsnXeIEj0cowClJxkmuN+0I6?=
 =?us-ascii?Q?LuFSm1L5SR9e+yoESWGYqmV6txTC97kulk7nmPubPVaEpUMMLkYThdlegQlC?=
 =?us-ascii?Q?t547HsAlyXmNMcF0uwM4GXyeNBtZiFTEdm+TZom/qOW9SGXkrprkj57585ke?=
 =?us-ascii?Q?H0mD8Fn1Gl+WEVoMJcdcdYg930Z4YIzge1alopx/j1ZsRthNVW16IHbkZOxo?=
 =?us-ascii?Q?jq5x0XyyPUzdqxknGm17/s1PV6qUDgrqjfAsDD2ELkS+2QEoQBoiMpGlspcu?=
 =?us-ascii?Q?ri1j/y40ePE3wD2yc0mi4uBTc8LxZkA1qSYb9BUj2OmDTZH3hHakBnzaHpoM?=
 =?us-ascii?Q?HrHgfa4NUpFfdk43ni+3V8NLklyzb+TciQq7A0o+IPob0OCSgL/tti3KQKxF?=
 =?us-ascii?Q?rsXScZO3v2MpB05eYZ4zvo/pzQkwbhyvSz8P6nC0GEWRttcr717e/yORWUP8?=
 =?us-ascii?Q?udYE2/2JTEnkIBEFmb/JJstTGs4C5dlrXgRmSHhy1AGcZue6zJyu/vaxV4Ex?=
 =?us-ascii?Q?AfdgaR7zLXP29dC+IBReOlMTJOEOK/NT8t8E1A9MEe5IjhVG93sWWhDjlPoz?=
 =?us-ascii?Q?PGf1ZOS2MvmHw/gD8kTosvKPZ9dTLQWZG7REix/rK8Yz6V761Avvqe8uqBmi?=
 =?us-ascii?Q?zBO6WOu8OqyHgADL0XX40p+vmVjnNokC/+k6r5HMge/rnXt70H+3iTah1ol8?=
 =?us-ascii?Q?t7LMHHwUAQ5BK5kWTYNQH3yCCnXiXovOCufUz/WwJbQiSOBaWBMCvSwdXO31?=
 =?us-ascii?Q?PJXhHYpgATPJs8hWLUeeCp2Vifg9D0R9cjp0CPXhpUkKar4TM8BHroyXz9TM?=
 =?us-ascii?Q?GTg+ZEUEfL91kbKVAYFyVDV7+TaYph4E/Bxv/f0oxUcCmmwXLB0c63TMYwmN?=
 =?us-ascii?Q?hNQNIhOxqlI8M4N9Zq+DytaQSU6rYqTWAEQeGyHOYq1zLzuTITCTV4kKsR4O?=
 =?us-ascii?Q?laz/TC8lzd0AwCoesoi+8ooIrDfNkUo+E1tASfVABGURMeJGoj6evAYCffRK?=
 =?us-ascii?Q?S5cK84kX7K8ovalTCONj5f+78g7HukoUXDr/N4Bct50Nb3JUr4NAB2jz+QkB?=
 =?us-ascii?Q?c9zHaT7Cuu8YW2swFFLk2e12d/DFAdvX1xRIpOO3HkPWbSGj8f4JK+S8mLor?=
 =?us-ascii?Q?uhxXJz4RQZaiu4FLlLrrn3TCnCiAK7FTJ2m+I1fTviKBtPNtU7B+u7uNCaz1?=
 =?us-ascii?Q?Eg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 429af7f4-87f4-4883-034f-08db0fa685c3
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2023 22:46:48.8382
 (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: x3f+6eotfawQy/x38LiU7m0vQiqtiFmSBput6NxttyHZp8VBnt70RLCCQG+pbUWAA+Dmf5ujL7i2yKCQQuHYmw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8748
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

taprio_calculate_gate_durations() depends on netdev_get_num_tc() and
this returns 0. So it calculates the maximum gate durations for no
traffic class.

I had tested the blamed commit only with another patch in my tree, one
which in the end I decided isn't valuable enough to submit ("net/sched:
taprio: mask off bits in gate mask that exceed number of TCs").

The problem is that having this patch threw off my testing. By moving
the netdev_set_num_tc() call earlier, we implicitly gave to
taprio_calculate_gate_durations() the information it needed.

Extract only the portion from the unsubmitted change which applies the
mqprio configuration to the netdev earlier.

Link: https://patchwork.kernel.org/project/netdevbpf/patch/20230130173145.475943-15-vladimir.oltean@nxp.com/
Fixes: a306a90c8ffe ("net/sched: taprio: calculate tc gate durations")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 net/sched/sch_taprio.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index 9781b47962bb..556e72ec0f38 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -1833,23 +1833,6 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
 		goto free_sched;
 	}
 
-	err = parse_taprio_schedule(q, tb, new_admin, extack);
-	if (err < 0)
-		goto free_sched;
-
-	if (new_admin->num_entries == 0) {
-		NL_SET_ERR_MSG(extack, "There should be at least one entry in the schedule");
-		err = -EINVAL;
-		goto free_sched;
-	}
-
-	err = taprio_parse_clockid(sch, tb, extack);
-	if (err < 0)
-		goto free_sched;
-
-	taprio_set_picos_per_byte(dev, q);
-	taprio_update_queue_max_sdu(q, new_admin, stab);
-
 	if (mqprio) {
 		err = netdev_set_num_tc(dev, mqprio->num_tc);
 		if (err)
@@ -1867,6 +1850,23 @@ static int taprio_change(struct Qdisc *sch, struct nlattr *opt,
 					       mqprio->prio_tc_map[i]);
 	}
 
+	err = parse_taprio_schedule(q, tb, new_admin, extack);
+	if (err < 0)
+		goto free_sched;
+
+	if (new_admin->num_entries == 0) {
+		NL_SET_ERR_MSG(extack, "There should be at least one entry in the schedule");
+		err = -EINVAL;
+		goto free_sched;
+	}
+
+	err = taprio_parse_clockid(sch, tb, extack);
+	if (err < 0)
+		goto free_sched;
+
+	taprio_set_picos_per_byte(dev, q);
+	taprio_update_queue_max_sdu(q, new_admin, stab);
+
 	if (FULL_OFFLOAD_IS_ENABLED(q->flags))
 		err = taprio_enable_offload(dev, q, new_admin, extack);
 	else
-- 
2.34.1