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>
Subject: [PATCH RESEND net-next 3/5] net/sched: taprio: try again to report q->qdiscs[] to qdisc_leaf()
Date:   Fri,  2 Jun 2023 13:37:48 +0300
Message-Id: <20230602103750.2290132-4-vladimir.oltean@nxp.com>
In-Reply-To: <20230602103750.2290132-1-vladimir.oltean@nxp.com>
References: <20230602103750.2290132-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?irPoHh5sN4Ff/dRLmXeKKEX5bn/K5ptcoH01sTqGWwuZWHftqrWIMe+Vr6Ve?=
 =?us-ascii?Q?NfULWcpvE+/O3aBxHyXKjSXFHEwV5X6Na5SFD1zAkF54tntksBa0gRA7XL5s?=
 =?us-ascii?Q?WpR9zzKXvdpbUFE6m6e31Xu40/l0yHqvZk/bSN3pn2QOmDdRLv15LLmaAgWT?=
 =?us-ascii?Q?pV/w7z5z4BXLkOxoqA86yFoHVq3MkOYSRdoQAjH+JYlk/XVppmpBiygUh9aN?=
 =?us-ascii?Q?rX5uGiAG7Jlj9yzuYpekJaQspVLA+ZNJDwZM/PUTrOoFoCHTqEbArMsZIkkK?=
 =?us-ascii?Q?k51SX9euhIGC91T/g4xFb9z4KspZ8QJMVq+5AnvDfYP+O+pCRv0Jubor8PqX?=
 =?us-ascii?Q?yQXIamuRq+eN4LjCpJvATaVfpHq5DjVUak07Ja2o43bGHz4eEl3FqVCTUiJo?=
 =?us-ascii?Q?DwX6LZc2w9T4uTqsVsPF279QR5KmWLYgkGjfZYphQvoHXT6iBiJklSmVyf0U?=
 =?us-ascii?Q?Upt1PR+PEtASZjKMBRMXbRGfvuv1gvcTuh2PS8PUtD8LLlyGtpM0D+ijp3q7?=
 =?us-ascii?Q?fS84pOFvEIyki2wKBqmxM73nLakBt7SYXkdSCPqFvEcWeGctyNz0HHUvcHeC?=
 =?us-ascii?Q?6BAjkgKkduNSqYZ5xhVbQKgXAi33X+RNVsMrEheCL/KRhQw9bg67xtQwifAO?=
 =?us-ascii?Q?KFwAyV3bYekcQjTUDfL1/GLGEDKN8k/DZ8BmEEY9WmiNOmtk9dd//+UErkDN?=
 =?us-ascii?Q?Pas2zS0S5+JPSC+dm02YkZlhPULriIiF2Fl8Mgd/uwFAbmZD71dajX3BKoxZ?=
 =?us-ascii?Q?/XCm6P9BiSI6itawfC7T/N8Xoc9Ro/Z8mfo6+3CZTqtm4hVmRA1FvzrAww+Z?=
 =?us-ascii?Q?I6I7mGIUZfCJoy973tfFIYEcPH8mJK+mLuT5DtxGpB+nnuTXIy6NDdsQDL6e?=
 =?us-ascii?Q?USXYA/7x7fb77U2+ujMcmgD0QWKXece/dtFh++OQS1xnLHAhzogQwy7hx5eq?=
 =?us-ascii?Q?ljjIaAo8qwwfxYe1F2zGMq5pN8NWXDOzJKlz8rR9BRYBvEvIHyxOyiT0DOWT?=
 =?us-ascii?Q?cRFRTdwCqPNGym/JV4qZ07g/yDtST4kgY75gMu6AKvR592xkJ6Ev90gS2a6q?=
 =?us-ascii?Q?XUyipJoJ78Sp+iIRZvThy141GXAYIyD4hWaSxrUph7pFwCStjbqNoZB4RR0A?=
 =?us-ascii?Q?DxyBRS2cb71QxPS2SiCoOHmUYKiJELtjNvykjkwFh34CPsVABnuZ33KLipuP?=
 =?us-ascii?Q?g+/pdNjT61ENn7gWtTZzngVdYbljJ/tSy8lmDYEFCd6Baf9JVl8mB6k9uXp0?=
 =?us-ascii?Q?IvQ8opIG4W+PjmLLMGNKzr38KiaK/hPE5ig/vRyyattfJaef546sQ0i85lX+?=
 =?us-ascii?Q?1H5ImKfyADa0Pn/brXnGHTgrf/nuH90EopmavbiUQRNgBzZ7pWO0B20O/4EQ?=
 =?us-ascii?Q?GMvYasbe7POTN33uKMM6WlgTk5sOOiT8zzq9grxLBejRjtj7a2oLYaRR7T6s?=
 =?us-ascii?Q?C3kNSDQwEhozJwhmlUEhM/LFzgbbT9K+quJEdmzQ/F9zxr7fw69SP3PcRj9n?=
 =?us-ascii?Q?IA5Tl63WL+XNOJsdw1qZ6aVrwCXLn6cenz1dnwEpUHCIa5A1uanJ/EaZIV5p?=
 =?us-ascii?Q?fKYMcvLuBANK+WN29soHVSMPA5WkweB90vVj0g5rxLMqrZ9BlH258OKU3Q6N?=
 =?us-ascii?Q?cA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: de803088-807a-4dd3-38cd-08db63557bb5
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2023 10:38:20.3559
 (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: vsWKN8GEDeBS11iNDT0L0LxBZsyRMUyfnb8khdtrZE5qVDq9bmgpJ+s0bAJxdBMnYL0yUGLeOSiaFJGGrJyG2g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8926
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>
---
 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 8807fc915b79..263306fe38d8 100644
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@ -2433,12 +2433,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 dev_queue->qdisc_sleeping;
+	return q->qdiscs[ntx];
 }
 
 static unsigned long taprio_find(struct Qdisc *sch, u32 classid)
-- 
2.34.1