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>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Gerhard Engleder <gerhard@engleder-embedded.com>,
        Amritha Nambiar <amritha.nambiar@intel.com>,
        Ferenc Fejes <ferenc.fejes@ericsson.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Roger Quadros <rogerq@kernel.org>,
        Pranavi Somisetty <pranavi.somisetty@amd.com>,
        Harini Katakam <harini.katakam@amd.com>,
        Giuseppe Cavallaro <peppe.cavallaro@st.com>,
        Alexandre Torgue <alexandre.torgue@foss.st.com>,
        Michael Sit Wei Hong <michael.wei.hong.sit@intel.com>,
        Mohammad Athari Bin Ismail <mohammad.athari.ismail@intel.com>,
        Oleksij Rempel <linux@rempel-privat.de>,
        Jacob Keller <jacob.e.keller@intel.com>,
        linux-kernel@vger.kernel.org, Ferenc Fejes <fejes@inf.elte.hu>,
        Simon Horman <simon.horman@corigine.com>
Subject: [PATCH v4 net-next 2/9] net/sched: mqprio: simplify handling of nlattr portion of TCA_OPTIONS
Date:   Mon,  3 Apr 2023 13:34:33 +0300
Message-Id: <20230403103440.2895683-3-vladimir.oltean@nxp.com>
In-Reply-To: <20230403103440.2895683-1-vladimir.oltean@nxp.com>
References: <20230403103440.2895683-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?X/a8CJ2aIYr1uk9HYZ4wqe9lJvcfhRaD0m3srcmJ0UOnxZra3oLqOpAAkpn+?=
 =?us-ascii?Q?lwQ5gaSyeR15C0/YSi6UnPhBB38ly7QoVsEQ3GmjZ+KXQytH0OwwnGblThR0?=
 =?us-ascii?Q?m1XcyCwKYCrJ9EK01NV3hQZHlzs1b+mVJ1TLSDkEjRb4JzyFybgammPtJRSn?=
 =?us-ascii?Q?irN/EUzkVAdi4An3J4xSuX4J893ezSu3sZHTv2emSCfg3h5ktAc/1mzdFKBu?=
 =?us-ascii?Q?MsEfC7sL3o5nPSfgbHA+hs9/Fp9HgH/9Ks34fRj0EmV4h+tzYL97BUHbUwys?=
 =?us-ascii?Q?V2UckdRztFBx25hxXCcrN6y6k2WtE9B0B/1IMdBFzSzyjoBkvMYbxqVWNUsh?=
 =?us-ascii?Q?AJKShz9Rmr58GKghaVo1YPBc8AU8bv890UZpJqahZwHvpFYQt2dsjmNboNY2?=
 =?us-ascii?Q?jVLCV5F2sWH2YOEjcVQu9kt4AqR2hqEAWYwV/Ri0X04WaSoUdp9yn3dIXPjz?=
 =?us-ascii?Q?43dt7b4pFtwX+ZBlc8C4jyN0mzWNichvrYJQzrQZvyPR6XiIh/mg3oGg/ZXV?=
 =?us-ascii?Q?qbTmvK2QYOCTdR6IqZv5dWlW7forhQdCH7IYAxss9rrgIqdq7LhjUDoM5jEU?=
 =?us-ascii?Q?uVLJrt8OmG6nqwlFc0+c4tYfAg81TJgEawdknvGAgb+LUTwK/CuHbMlUnq3C?=
 =?us-ascii?Q?1algSZHbzusTHrDvNW/3Luw2JW4qmD9KpTQKirzZPpcNvLLasqTiQC+8a2Nn?=
 =?us-ascii?Q?Q9BjQBA5fqZ6lSDU7VoPG1MVzuBj1jn3YvPtCP6/rvuuDX4r4pnMsYw5PDLD?=
 =?us-ascii?Q?aPSk2+t7Fxm3C0Ots/vQ5izeSCn7gcOAJamkXbFGlyfSZgXL8UAhpxGOQJ9a?=
 =?us-ascii?Q?A0RWoN/WZHwY4cGJbNemm9ZrOsQWT+4QQRWlMVNFZ672PluwlNni5LVEy7SQ?=
 =?us-ascii?Q?jeRzK3FWmevuTJcHb5AeVX/mf/DUsAL132ga5esfvm0DWeyox/4h+yZRkrgg?=
 =?us-ascii?Q?KoNvDhH1ZJgVMrSfdI9SPI2cugdK3LVpdjCbnjPcfHBVT39WKldf3eUbO+Uv?=
 =?us-ascii?Q?4qUhTyMp6lxHkUZxnNvy6Cq5Ps1rVfFniWbF0SHdXpK2wuKRTY80A9g8lXSL?=
 =?us-ascii?Q?EoVjMikqvMvngZK5ilRuZ5vK0+2Kje5Av+MJUT9qvnvZwsfWsdL7TCBMkOaE?=
 =?us-ascii?Q?zQkzDkUll7kyV3OWwFQyUsdzCNwJd+WVJNltGc36Wd9Ioy6OHqw7jpGOrH5S?=
 =?us-ascii?Q?uZygmmpxflMCDn5MIZVcdep5NRjcfnQRhRIglaYK0csrq8EjCHtb/pvNGQuA?=
 =?us-ascii?Q?iBxPauF7DTqxY5u5EgDnftTDVpO0N2DzURXq37hvDtFnJdJT58+FB77M+eVz?=
 =?us-ascii?Q?NbjwgVAD8cuMEJdbQnZggLo6m9f9oMCqTe9gNQTAF/MPpKfNbMlcqvZ2jrua?=
 =?us-ascii?Q?BotKkFWirUHtFbfmr6qNp3m/1lCy0XuiPclqhk5c8z6/qF7SFtIJKaF1JoLg?=
 =?us-ascii?Q?6c5XtBf+cL9DYQPLE2vdOp7KGPq+kKyn7Tmjz0Svo5eldwvimFfHYFQ8GpQb?=
 =?us-ascii?Q?dGWvZhQDDu0ie+01xmbZpOvaymMVqDvqRnZ4ocX0LWSuTgEFC10TTBWbqJif?=
 =?us-ascii?Q?jSgRh8ATwS0f//MYIZDLSZm7vqelY7kix96+KI+N85zXw2+aGfJ6VR/iBjGr?=
 =?us-ascii?Q?0A=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 62ac9251-de2d-402e-d08a-08db342f1378
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2023 10:35:00.0723
 (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: BKO+++QoEc2rnRXLpWL+F645q/2o5ESE5cjMe0cKqt8lEOR+jJN5a91f6IYci78GBfT7pigpc3FcdSwct0dD0A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9292
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS autolearn=unavailable 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

In commit 4e8b86c06269 ("mqprio: Introduce new hardware offload mode and
shaper in mqprio"), the TCA_OPTIONS format of mqprio was extended to
contain a fixed portion (of size NLA_ALIGN(sizeof struct tc_mqprio_qopt))
and a variable portion of other nlattrs (in the TCA_MQPRIO_* type space)
following immediately afterwards.

In commit feb2cf3dcfb9 ("net/sched: mqprio: refactor nlattr parsing to a
separate function"), we've moved the nlattr handling to a smaller
function, but yet, a small parse_attr() still remains, and the larger
mqprio_parse_nlattr() still does not have access to the beginning, and
the length, of the TCA_OPTIONS region containing these other nlattrs.

In a future change, the mqprio qdisc will need to iterate through this
nlattr region to discover other attributes, so eliminate parse_attr()
and add 2 variables in mqprio_parse_nlattr() which hold the beginning
and the length of the nlattr range.

We avoid the need to memset when nlattr_opt_len has insufficient length
by pre-initializing the table "tb".

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Ferenc Fejes <fejes@inf.elte.hu>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
---
v1->v4: none

 net/sched/sch_mqprio.c | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index 48ed87b91086..94093971da5e 100644
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
@@ -146,32 +146,26 @@ static const struct nla_policy mqprio_policy[TCA_MQPRIO_MAX + 1] = {
 	[TCA_MQPRIO_MAX_RATE64]	= { .type = NLA_NESTED },
 };
 
-static int parse_attr(struct nlattr *tb[], int maxtype, struct nlattr *nla,
-		      const struct nla_policy *policy, int len)
-{
-	int nested_len = nla_len(nla) - NLA_ALIGN(len);
-
-	if (nested_len >= nla_attr_size(0))
-		return nla_parse_deprecated(tb, maxtype,
-					    nla_data(nla) + NLA_ALIGN(len),
-					    nested_len, policy, NULL);
-
-	memset(tb, 0, sizeof(struct nlattr *) * (maxtype + 1));
-	return 0;
-}
-
+/* Parse the other netlink attributes that represent the payload of
+ * TCA_OPTIONS, which are appended right after struct tc_mqprio_qopt.
+ */
 static int mqprio_parse_nlattr(struct Qdisc *sch, struct tc_mqprio_qopt *qopt,
 			       struct nlattr *opt)
 {
+	struct nlattr *nlattr_opt = nla_data(opt) + NLA_ALIGN(sizeof(*qopt));
+	int nlattr_opt_len = nla_len(opt) - NLA_ALIGN(sizeof(*qopt));
 	struct mqprio_sched *priv = qdisc_priv(sch);
-	struct nlattr *tb[TCA_MQPRIO_MAX + 1];
+	struct nlattr *tb[TCA_MQPRIO_MAX + 1] = {};
 	struct nlattr *attr;
 	int i, rem, err;
 
-	err = parse_attr(tb, TCA_MQPRIO_MAX, opt, mqprio_policy,
-			 sizeof(*qopt));
-	if (err < 0)
-		return err;
+	if (nlattr_opt_len >= nla_attr_size(0)) {
+		err = nla_parse_deprecated(tb, TCA_MQPRIO_MAX, nlattr_opt,
+					   nlattr_opt_len, mqprio_policy,
+					   NULL);
+		if (err < 0)
+			return err;
+	}
 
 	if (!qopt->hw)
 		return -EINVAL;
-- 
2.34.1