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 v2 net-next 3/9] net/sched: taprio: try again to report q->qdiscs[] to qdisc_leaf()
Date:   Wed, 14 Jun 2023 00:54:34 +0300
Message-Id: <20230613215440.2465708-4-vladimir.oltean@nxp.com>
In-Reply-To: <20230613215440.2465708-1-vladimir.oltean@nxp.com>
References: <20230613215440.2465708-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?HdfRJboseWcgx/8M/zLytk9HdfK1gfoDgu0B1SHDOxfjQT0ABl0j7N7MHPkN?=
 =?us-ascii?Q?F1+pQvLoNh7o1y5D2WcDJldy1pwh71GdAmJLisJujzbUTvmgUYM1e5kLdWwY?=
 =?us-ascii?Q?AqyxIO4sTleXl6ESORSgDCkBqN8hH4/E2HBw1NuIFfKy3YV3Ekl6RO/67IPi?=
 =?us-ascii?Q?4/V0vtw/1jJMO53i7ideSysayrI6L4Tng7YQnEjTLuIL59sIIwAFQXCuSm5f?=
 =?us-ascii?Q?ejKQch2g8eNc7xv9eWHJQ//b11Z3oCC8eEChIvtNQ4XuW5XgiIVddlHQll9S?=
 =?us-ascii?Q?9Tx25PFtAaJo2ianquIkwNJPyyljyxdl9vBCwhirU+HopAwdS64wqUHOrR4C?=
 =?us-ascii?Q?m/K/GENqWVssNhIRi/8df1Jmz0y8sbC6/Y9OpNCg2S7hmUh6vCcmhj6iMH99?=
 =?us-ascii?Q?cmRTci2irUxVMAeRcYWy8r34P5QrYIIv8W/3e2cW1W85daHoDnYcFYPY0wH2?=
 =?us-ascii?Q?pdonES/VuWsZKTONq3A/TJzNii5s7QlYI7wutyzz6uwNHvL2ng4/7mCyOgUI?=
 =?us-ascii?Q?6PrPWP8FFdSr6wXCMCIw8K1grCYu+N8BGIa5wKVyezg7uzSxLmlbFNWVEw9O?=
 =?us-ascii?Q?648RdGTL8QEeeirN3dA6+vgrz83pxAhmCBFa+CdKNgyimKAnOy0q41+XDV8u?=
 =?us-ascii?Q?8NCfhYAKNwluva3Z3e0q0pWabwOd7xgMiyp0r+HHBqXB7D+p+797PjHtmSil?=
 =?us-ascii?Q?5vxb6SCcm/0hEDhXnS1j5Iyc88q9KH/r9pqgV3Y5QwOoZ6XebFjkjbqVksLt?=
 =?us-ascii?Q?NKG+y2+/gkWECMRZgDksgfVbsfe2awNyPVILXiXbbLlHl8jXiTZZOh8PtrYP?=
 =?us-ascii?Q?73SfoAGgsUs2kaR/FMrQoFhzr6UH3AZhEvWLxZs0Ju7+Tk52DcPggv4qH/Hp?=
 =?us-ascii?Q?iIPePEvR/SP7j/ADVLjKXlZL0HljhW+EmG+pN5tGiBZqpLpyb74pZbu7QJbh?=
 =?us-ascii?Q?sOvi34SmVv+0FEWLgT2vC6bd7f8yOF2pK3yKzyy/P6yaNpOj/5EIEGErx0Ah?=
 =?us-ascii?Q?zcEmWWafSUFhbACdpoOIqKNoRjfxdGhJQDVhD+T8I1gVIXxgn2BPzgRgBzGe?=
 =?us-ascii?Q?QETk7DjXn2RKfsKMA/dNNb1lAS/zhUskCoE6G873gJkBPNzHrlXucZqSk6Nr?=
 =?us-ascii?Q?KDSMxPOgfUjjN9UCCIak13hPzOkORkPG9ge4AtkLn4XMwlP1xX3iBoSD92Jr?=
 =?us-ascii?Q?alZTHMjebWe0O+yA4buJ5/Sz35RImXHtxXhHfEOIu/L+J58ApifcxURi8SM0?=
 =?us-ascii?Q?dv4SMuwQGVmX54BmWID82twahyd+srHMsubsThAL8tdsgEOqL9wtct3Yh+Xt?=
 =?us-ascii?Q?yTx1AZsqjL7F700z45jKqKc49NMW4UCXMu/POZIfuXqqpqLPg+fTqKKk/VSq?=
 =?us-ascii?Q?4X+5d5qrprNKtHo9z0/+Fvv7NCpFlDMGsOWKROx5J0qMyoaq9N/y/Jwvd0O/?=
 =?us-ascii?Q?YNUJdQ6MSnQlQoF9OUxZPvr6QhXSPWgOIM74Ji6iQWmnub3zm7sNX1sR6Dqf?=
 =?us-ascii?Q?W7l3icn1eN0jKRpz0f1EQOSA3ns6jb/SKszZIlqkXV9x+LLuCtUtAqGn/tq4?=
 =?us-ascii?Q?WI0agOVEaK+VjAqzN+YkJpDxqEIMO312KaXmhkjzp6dQ9iG/5sIKP+LyU/pe?=
 =?us-ascii?Q?Pg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 402fba01-dace-4e23-7666-08db6c58d2a0
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2023 21:54:55.1497
 (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: J2+rR5t3sbS26AfIpoRB+C+5skYqmtQnfZOzsQTJ9b+mtK7svSyd20buyKZucd6SvL4SUWv/7ip20AXGFDtgAQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8081
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,T_SCC_BODY_TEXT_LINE,
        URIBL_BLOCKED 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>
---
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 b5f533914415..14d628926d61 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -2439,12 +2439,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