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 v5 net-next 2/9] net/sched: mqprio: simplify handling of nlattr portion of TCA_OPTIONS
Date:   Tue, 11 Apr 2023 21:01:50 +0300
Message-Id: <20230411180157.1850527-3-vladimir.oltean@nxp.com>
In-Reply-To: <20230411180157.1850527-1-vladimir.oltean@nxp.com>
References: <20230411180157.1850527-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?JvROdNK7oFLYZc+1wutND6ia3cAx+ePCRsAisNYZgIjWVvQAnba+oaXQEvZl?=
 =?us-ascii?Q?SUVwbWWOq76skbnoEabP3vz0MBQcKAIbPNAo5PMuAcEZw2+z6WKGQ9yEQ6v/?=
 =?us-ascii?Q?U7qIwdSipXNdMh6R/9jnLlvjlyflkgIXr8b4rVQ+LWDDRZzshBrvRgpj4am1?=
 =?us-ascii?Q?noGVFWvFhW0GIXDXBumILqaKnQp6QWSPJW1a3mTxAZ//8XdUk0jONPvOY4ao?=
 =?us-ascii?Q?ZH8anyeRNzJtqpE8OSEknQlsCPiUP5zUcsn10mTkgPPEJ/yWrfVV3JnuXYCd?=
 =?us-ascii?Q?QfmRw4ZyKdWoXMJHaZsVVpQzXvWI8+W5b3grFGktF2QReKkWyLfzCIXKmsgX?=
 =?us-ascii?Q?q6mohEfQIw1fciyAEaJ4jGLSSSC9Cxs5unvEIACp+Xg6y2rhTqLrtG5LrFRh?=
 =?us-ascii?Q?Zk39eNlmiE0lSDa5W7CqCnqgWssBoiy1jWt313QCM7SPesvVYaKX4vf8QpGt?=
 =?us-ascii?Q?ivDi3otJ9ns8qdPkUok5Ajb1CgVboDhSrd1Qs279glsmzxrSRmcnYBfVcF8X?=
 =?us-ascii?Q?cdsUxLyULMKN41wDZmkaddDRR2OMd5irdZDyZC95GASD1gn2gLRoyM3iAiL6?=
 =?us-ascii?Q?o+o7/dYyHDrEdd5QawIRUE027W39umCOHVnsdtUSRNHpXIWd7FDmEaiazLWk?=
 =?us-ascii?Q?b1cidllQ0g7KkNA8SSaP8KxIWSmCt8oX1xkWWA1outQa4ER6bHfHtjvzd4fK?=
 =?us-ascii?Q?6WLYe1Fy1g3Dbtr8MN37Swzj5zRZJU1uP2veT4fZl/nA6Qr6aEevgPLmtbII?=
 =?us-ascii?Q?CHczgDX3xlwF3j85SIjOQylm1SEmyYiHPWJV1xQpEqEqjRFYVJ+x9xuUFtXu?=
 =?us-ascii?Q?am2ssAvnaVSXs7VOX1lYwBZCsXsARYv0xTxSaGB6a6E9TwLMEVsfG/nDYpgk?=
 =?us-ascii?Q?mLyRVbzH8mUP3fEepqOvXm9/cG+Xqvke5lzoOKiAWXu4nKgayVvkVCJ++H8Y?=
 =?us-ascii?Q?ADHvH+qUJ6SpFBo8FWlnZAOc8XADdjRWhKQuDfauL+ybY4i2Mx43YFQQgf8Z?=
 =?us-ascii?Q?4j20YZEqxUl22rOYeCwclGgNM6+T7unLQxo+uqLNmO61Y/H9geRLHIKbsN9x?=
 =?us-ascii?Q?075Dwmg8G76UreBSYG4W5AzaFfJta6S4Uzu+ZFS5hHkB6IJX1y4v3GeRNFZa?=
 =?us-ascii?Q?ynSgZqut3grq5SF8e6X01oI//k7ik+p9DzWSxdxb4l8SueWMGYEb18IbmcoJ?=
 =?us-ascii?Q?JjFBIG2WD9ybeuauz1D4EmX1bv4WoZcsZyYtvw/bxt354sEoGEziJRvz/4e7?=
 =?us-ascii?Q?8+SBh9OZOYml/2wgnN4rrZkdXPyPNchFMMWUMz4Ved/q+fxyZQSzzjZR1/Ky?=
 =?us-ascii?Q?oMuSRDcHEPDrFpF1BXiTnKffHAEzp87xYIvew2YgfrGaHxmli52Fty5fPe1Y?=
 =?us-ascii?Q?UB11RNFk7xV0skZvTIZkUBrJb1BWXmAiOyHH1rzpGpfUOXHCXJYhEwOBBawu?=
 =?us-ascii?Q?aZ7fPaJ0u3kVyjuKe+qyr7q9Uk3BznZqqLsiyy9qTwxpgw9GRoHQvTwYIb2c?=
 =?us-ascii?Q?hx5PMARTOrrwgyWNj3y9C2lEUFggtQhNQGld2wrjeUdMHAHwOQalG+TkD3eO?=
 =?us-ascii?Q?NExcgv0elkizsdaua0br89yFM9bcwph93i738W00AJp9DUhvCC9KD1vmXQIA?=
 =?us-ascii?Q?yA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e5ce62a9-6dc2-4829-efdf-08db3ab6e6ef
X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB6452.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2023 18:02:23.8427
 (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: XvWb2A846lsAGUFYJbM1GAA0Y805I2rTlBBqbBXYgwf+4na7Ne+Wx6fNUeH3YA/GO9BIo00fRtNbzkeXN9sXjA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7829
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>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
---
v1->v5: 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 fdd6a6575a54..89e5dfb22db6 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