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>,
        Jamal Hadi Salim <jhs@mojatatu.com>,
        Cong Wang <xiyou.wangcong@gmail.com>,
        Jiri Pirko <jiri@resnulli.us>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org,
        Muhammad Husaini Zulkifli <muhammad.husaini.zulkifli@intel.com>,
        Peilin Ye <yepeilin.cs@gmail.com>,
        Pedro Tammela <pctammela@mojatatu.com>,
        Richard Cochran <richardcochran@gmail.com>,
        Zhengchao Shao <shaozhengchao@huawei.com>,
        Maxim Georgiev <glipus@gmail.com>
Subject: [PATCH v4 net-next 03/11] net/sched: taprio: try again to report q->qdiscs[] to qdisc_leaf()
Date:   Mon,  7 Aug 2023 22:33:16 +0300
Message-Id: <20230807193324.4128292-4-vladimir.oltean@nxp.com>
In-Reply-To: <20230807193324.4128292-1-vladimir.oltean@nxp.com>
References: <20230807193324.4128292-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?939Iat91FbZIpcF0ORkUfb3H8WPikun7l/ndKj3eMCxtTTe9d26k7+K8N45S?=
 =?us-ascii?Q?eikeElJsUkqa8lwW1n3G8flYNLvwNEBWXNF5gQIF4w3eolZcXtFP0mVmKndN?=
 =?us-ascii?Q?+iHmi8dsrywymrs2C4dsBrSknYWrskQSECJgTyOelNzV/qWXz8qIlZUXnLzJ?=
 =?us-ascii?Q?4ykoU/k3G86S0q7H4UTEetqqyzdTqisktTCkmtZr90V7nzOJyWm4dwC9IY6/?=
 =?us-ascii?Q?34EWYfirM/xrLKifxQIdeT8tWmIx9WZ35FBTroC1169g+KTnzYIh8amUkS2O?=
 =?us-ascii?Q?3dwBoA0sFixJ+ic+3/K5K+t/SxvNCLfWpA+wf8S99AXa+5TxNooPTJaA51tC?=
 =?us-ascii?Q?3E2j6kr5g+oiORUC1UCsLdbMEQnIdSRLgxohUHJKaO/G3AG4LpNPf+UfhE3k?=
 =?us-ascii?Q?MAVaySpzgWrUoeUnuGJZfrDc5ItEOtstczFrde87P1BoVqWBx0QAztc+hRDd?=
 =?us-ascii?Q?dX0V+hfDBK869OCTNg2nBtCDXnT6T21ZsSkasE8lsHhTs7p0tR0TA3dWwHPU?=
 =?us-ascii?Q?KMRhKs2fKhW7ojbSNdLHMxOQJqqeXgxixE0ck0baI4hioQZT2qJPlWEe3Z8+?=
 =?us-ascii?Q?xyv7vKigWXWuZsSVdMZdyvFZ+Q3SYJ6cXRhLJtbvmtQG/vy7vVCxjrC1eaEP?=
 =?us-ascii?Q?e9gy5EG8PsEF15CG4U7qhgREe9/Q9+tcSt42mjhIJVSHJs4fvSSepD+kNgV1?=
 =?us-ascii?Q?q2ceXhHGgThlUvbKsKzuspLDxedy3I/x8q+FPYhOqELMAFvOpOzTH5AlVttK?=
 =?us-ascii?Q?+jgKICP2S0rDFE2aq4seCmdQ6/ZDWXCXNK8ADSGrkyLdipzaxCT5060tmWsn?=
 =?us-ascii?Q?T1tIn/9bBndp7o5uinZn8H7BKlB6buldGh2/yCGE5FZCOqV9zyb5NPmMap8R?=
 =?us-ascii?Q?AJOcmpSKE0xVgeJ15R/IwxM1ZDgfTA9e01wOQspls6JOJjx8hiQxW7ikwPdy?=
 =?us-ascii?Q?M6Ss0HFAP2MlzTACDlXH7gEHBVuxYVvNPCBHBUlqecvdgd15+WocGRpNNyyf?=
 =?us-ascii?Q?O18QKYvAgUY1fM+llD5izb47NPyfy+eXdGftFV19NocjVys4KITp5aWKLNOS?=
 =?us-ascii?Q?JqsuHzBnRfHyjen91G2SctW7UzUhGGy8al5HWjBpyfc6+aV5dMB/gcU4j5Ws?=
 =?us-ascii?Q?L0JBWg/Y0ETeWaSHw7b+KhK62K6XnQQzberjZmKaGSqvkQQ/MN+8/6ALlIR2?=
 =?us-ascii?Q?zxBzuI6ElgMVSuvY0JCvcEGChupA98YvAoCfhKOIvC+nekESNXxkvGGLe9YJ?=
 =?us-ascii?Q?8/CSklXxeB/jS4GdD4JP4nGleb4bwez2b4hJbtyAHu+7Ko5HynzL4bbX0oL7?=
 =?us-ascii?Q?IzzHwKTZ60jIswJoNQcZwTOOgJv3PfQrH7XW6DSfyUwh8vqVeFDvAh7WIRJa?=
 =?us-ascii?Q?EB6oO9XpHmFZptl7DmqEIcZqe4yWGDEGDp8nk3U+TUk/u8WzZ4KyCZxsBkq+?=
 =?us-ascii?Q?+gU14J/oC+Rpt8wfIgkfXVTDpr1DUPlT5ozIPXsd6G1L4u6jpFziutZhsRsk?=
 =?us-ascii?Q?sc/AtiEyKA25nUcN5tCH2w/+ta8fnW/1I2w2FvMvveudfB/qrx7D5GhLRRCi?=
 =?us-ascii?Q?2+zABRwIKniFqHpGR6eFbtntO/iX1HJ19Vd3/QsCymo1DpB76BWP7j644XzQ?=
 =?us-ascii?Q?Wg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 76ac0363-ce45-4345-59df-08db977dc07d
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Aug 2023 19:37:36.0860
 (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: KDpzV8BmLeJiRf67jpojMSmJDBQh0Zk3lnYedW2SEFYTc3lKrIK1jZB3uvMUWkzNJxylfwGmuMMpOA0xHiBWAQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9451
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_BLOCKED,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,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

This is another stab at commit 1461d212ab27 ("net/sched: taprio: make
qdisc_leaf() see the per-netdev-queue pfifo child qdiscs"), later
reverted in commit af7b29b1deaa ("Revert "net/sched: taprio: make
qdisc_leaf() see the per-netdev-queue pfifo child qdiscs"").

I believe that the problems that caused the revert were fixed, and thus,
this change is identical to the original patch.

Its purpose is to properly reject attaching a software taprio child
qdisc to a software taprio parent. Because unoffloaded taprio currently
reports itself (the root Qdisc) as the return value from qdisc_leaf(),
then the process of attaching another taprio as child to a Qdisc class
of the root will just result in a Qdisc_ops :: change() call for the
root. Whereas that's not we want. We want Qdisc_ops :: init() to be
called for the taprio child, in order to give the taprio child a chance
to check whether its sch->parent is TC_H_ROOT or not (and reject this
configuration).

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
v2->v4: none
v1->v2: rebase on top of rtnl_dereference() change for txq->qdisc_sleeping

 net/sched/sch_taprio.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c
index 7c1fc3dc3e55..831e6f3fda2a 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -2453,12 +2453,14 @@ static int taprio_dump(struct Qdisc *sch, struct sk_buff *skb)
 
 static struct Qdisc *taprio_leaf(struct Qdisc *sch, unsigned long cl)
 {
-	struct netdev_queue *dev_queue = taprio_queue_get(sch, cl);
+	struct taprio_sched *q = qdisc_priv(sch);
+	struct net_device *dev = qdisc_dev(sch);
+	unsigned int ntx = cl - 1;
 
-	if (!dev_queue)
+	if (ntx >= dev->num_tx_queues)
 		return NULL;
 
-	return rtnl_dereference(dev_queue->qdisc_sleeping);
+	return q->qdiscs[ntx];
 }
 
 static unsigned long taprio_find(struct Qdisc *sch, u32 classid)
-- 
2.34.1