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:     Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Jamal Hadi Salim <jhs@mojatatu.com>,
        Cong Wang <xiyou.wangcong@gmail.com>,
        Jiri Pirko <jiri@resnulli.us>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Voon Weifeng <weifeng.voon@intel.com>,
        Vladimir Oltean <olteanv@gmail.com>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        linux-kernel@vger.kernel.org
Subject: [PATCH v2 net-next 7/7] net/sched: taprio: replace safety precautions with comments
Date:   Thu, 15 Sep 2022 13:50:46 +0300
Message-Id: <20220915105046.2404072-8-vladimir.oltean@nxp.com>
In-Reply-To: <20220915105046.2404072-1-vladimir.oltean@nxp.com>
References: <20220915105046.2404072-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?ZiIIunfDhheC4nEi6l+M1hqOmqmzNZmzVpI8Ej38+v2DN/sITgY6GJ8N8x1/?=
 =?us-ascii?Q?MdkyAj93Sb+KmaEf2gONn9fQoy78cQlyBAqzQI2q6SI8VCGRZr+b5XsUbh9w?=
 =?us-ascii?Q?JtO3VDID8Ctw6CwIHyS50d3M2EosCl+gW/+oJt9g7dG40S1q3bjS0Xd3ct5o?=
 =?us-ascii?Q?q5y1lAnVMKrtcaurQblyYtlU4thFSrn8LIsgPXfCPFpBFRE8cj6CqANUnYAK?=
 =?us-ascii?Q?2wdMXdge/XKyG+e0d3j7S6FFGAll/V6Owro0tFeiZo3E0jOTyw1ybwyM3XKs?=
 =?us-ascii?Q?Rrtb4wlhtF1jCJSP5nTq2DHdv6hn9rj0nlIHWx1Xxb0P6CV7G6EaR4nneAoq?=
 =?us-ascii?Q?d9xNTEBDmhoS213uux+b6+SR6tDA20bd+2DITFB+UexwiOQI90/Yh3UotBEf?=
 =?us-ascii?Q?r5LmRS+Uz2CqV2SaROBm2wseghTdZJZeLzWxYYHOeDYnff8SaJJufI/KIjKg?=
 =?us-ascii?Q?5M1Qw41j6zs4AHCmQhbtuizx3R+v14ug7/ilHM1RO/rPyWk3zdgVyYSqlyfZ?=
 =?us-ascii?Q?qaY61b70vYg0RLOcswV9uAS0skQy861lcnKKB459I+i0LiBLN1JvaNgDKmbS?=
 =?us-ascii?Q?UTYnrKJvmPoNwGZ2HkEzyIokQV5gfom56JYE0Eh4HtXW6vnFOFt4wVgquv2k?=
 =?us-ascii?Q?6IWrY/CkQ1iGEvVr97G5c0doizIZBw2cYpb0yC1vEtkLIhCNvI40LS/Mk2Z/?=
 =?us-ascii?Q?CnFlPq+JoUPb/fJx0QZh6XBQLZAZz0oKuPGscG0L/k0gepXjWv0PWUf5nHNt?=
 =?us-ascii?Q?FnDsn5luIR1DpuY6n4dt2iMMwt48rtmU7WNcnJNCTnnstNHjuOaoIG4ABRPC?=
 =?us-ascii?Q?9QqaSyqn4j9rjBWey9EnbspJyPFweXdfGykQMRTrxJOILFDorVp+JkHdbxtY?=
 =?us-ascii?Q?UAOsrwU+EzA6vAswXH7pmFWbP/d+5x/n/undfktSQlpRws99LNxzCxFFiByz?=
 =?us-ascii?Q?75fuBwih2j6hDLxsTxv5XqoaOJLT1I/h/c23/ylMNcBK42XQ5/2+gWN9qQXp?=
 =?us-ascii?Q?MWg6rfJQWPlM+T+I6WRvcXzgEO4KkVlLx8VHC3HysVQHQBdYyhJt4Y1EzAy6?=
 =?us-ascii?Q?hYhmzx1xLBI9a1KUoEj5+wD6szMYzCkzsKleiZlaskRf4Li0ZVVAAlM+QFI1?=
 =?us-ascii?Q?GYIbZ8XvThhLd1AIClJ92Rd0oWFZRekeYj2JwRpeGqLT44GePBAYP+bErsff?=
 =?us-ascii?Q?TTMAFcu4xO+ifMb3wRpg3p9RvEj0P6CKM9t4IKa1Y+l/ZcpZ3rdtVhRYfN9Q?=
 =?us-ascii?Q?X5FuZOAoVSV1wpcMtS3m+Ug9POk8wGMbDIicuhdc/UOTSDITXZjzemEFKdHM?=
 =?us-ascii?Q?mPNqbLRLKa+STauOtyMPDCCzB3QlNXbe55qRYWoXsJfb9Z5gk4JzsU6SeYc9?=
 =?us-ascii?Q?UlsiPKcUTra72DhU3OYJ5OpJLoX5JNe8FNJNJuecBh/jX0nOjzRb8cVEDVyC?=
 =?us-ascii?Q?rOooIY/VZLp+E45mZdFXmjBoGp1l3vS/rD/JqgONNStPoavxaS4qrORarGVF?=
 =?us-ascii?Q?Mm1mMKv3Pkd0EsMn6t/WwqUFK7zDtEfca0vaV8md8GJ/Q0muHW77Orktfl5H?=
 =?us-ascii?Q?xI8QupwmW4KJFbEaz9fQuqHancP8kbY0xTjF27Lq3rRhKm25XdpAEqWt4b+6?=
 =?us-ascii?Q?UQ=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d0cfe20c-a5b5-4897-d0f5-08da97082ead
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2022 10:51:02.7521
 (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: 2CxonATBTueT+K2MVQdWosPMQJ+34bM3+V7qCapqzMCN3tAXBPRwTEFxeHHQKT+YmO7pTej1y5EXoWELBRAAsw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB7163
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

The WARN_ON_ONCE() checks introduced in commit 13511704f8d7 ("net:
taprio offload: enforce qdisc to netdev queue mapping") take a small
toll on performance, but otherwise, the conditions are never expected to
happen. Replace them with comments, such that the information is still
conveyed to developers.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
v1->v2: patch is new

 net/sched/sch_taprio.c | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index bc93f709d354..8ae454052201 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -433,6 +433,9 @@ static int taprio_enqueue_one(struct sk_buff *skb, struct Qdisc *sch,
 	return qdisc_enqueue(skb, child, to_free);
 }
 
+/* Will not be called in the full offload case, since the TX queues are
+ * attached to the Qdisc created using qdisc_create_dflt()
+ */
 static int taprio_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 			  struct sk_buff **to_free)
 {
@@ -440,11 +443,6 @@ static int taprio_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 	struct Qdisc *child;
 	int queue;
 
-	if (unlikely(FULL_OFFLOAD_IS_ENABLED(q->flags))) {
-		WARN_ONCE(1, "Trying to enqueue skb into the root of a taprio qdisc configured with full offload\n");
-		return qdisc_drop(skb, sch, to_free);
-	}
-
 	queue = skb_get_queue_mapping(skb);
 
 	child = q->qdiscs[queue];
@@ -490,6 +488,9 @@ static int taprio_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 	return taprio_enqueue_one(skb, sch, child, to_free);
 }
 
+/* Will not be called in the full offload case, since the TX queues are
+ * attached to the Qdisc created using qdisc_create_dflt()
+ */
 static struct sk_buff *taprio_peek(struct Qdisc *sch)
 {
 	struct taprio_sched *q = qdisc_priv(sch);
@@ -499,11 +500,6 @@ static struct sk_buff *taprio_peek(struct Qdisc *sch)
 	u32 gate_mask;
 	int i;
 
-	if (unlikely(FULL_OFFLOAD_IS_ENABLED(q->flags))) {
-		WARN_ONCE(1, "Trying to peek into the root of a taprio qdisc configured with full offload\n");
-		return NULL;
-	}
-
 	rcu_read_lock();
 	entry = rcu_dereference(q->current_entry);
 	gate_mask = entry ? entry->gate_mask : TAPRIO_ALL_GATES_OPEN;
@@ -546,6 +542,9 @@ static void taprio_set_budget(struct taprio_sched *q, struct sched_entry *entry)
 			     atomic64_read(&q->picos_per_byte)));
 }
 
+/* Will not be called in the full offload case, since the TX queues are
+ * attached to the Qdisc created using qdisc_create_dflt()
+ */
 static struct sk_buff *taprio_dequeue(struct Qdisc *sch)
 {
 	struct taprio_sched *q = qdisc_priv(sch);
@@ -555,11 +554,6 @@ static struct sk_buff *taprio_dequeue(struct Qdisc *sch)
 	u32 gate_mask;
 	int i;
 
-	if (unlikely(FULL_OFFLOAD_IS_ENABLED(q->flags))) {
-		WARN_ONCE(1, "Trying to dequeue from the root of a taprio qdisc configured with full offload\n");
-		return NULL;
-	}
-
 	rcu_read_lock();
 	entry = rcu_dereference(q->current_entry);
 	/* if there's no entry, it means that the schedule didn't
-- 
2.34.1