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>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Ferenc Fejes <ferenc.fejes@ericsson.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        linux-kernel@vger.kernel.org
Subject: [PATCH net-next 05/12] net: ethtool: create and export ethtool_dev_mm_supported()
Date:   Fri, 17 Feb 2023 01:21:19 +0200
Message-Id: <20230216232126.3402975-6-vladimir.oltean@nxp.com>
In-Reply-To: <20230216232126.3402975-1-vladimir.oltean@nxp.com>
References: <20230216232126.3402975-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?2wSA+VQm9o+P0E/RXpjDLfJyc64lBTj4TaWCpWJ1oRI0uZI3KoDbY5B0UCaJ?=
 =?us-ascii?Q?KioZSuNF4LQSNCucXbttsINIJ+3CfrGwGP3JfL3EXQjlV9wi2WuNm1H6/jMv?=
 =?us-ascii?Q?0f/TBylZ8bpa/P7QLpa86KeWfzvyqw6haZxj/C1eaL0gdQgeOGIEvEVoWqa2?=
 =?us-ascii?Q?JtAZRvxEo5Ym/tFvZ4rr1BM7EviYYHYiZJDMmwo1pXud0lZ0whEPmmSPPJ8/?=
 =?us-ascii?Q?LSaDBjue1G6yscFQ3EYour1PEHVLkY+UKSJeoG2TI1cm2TmZ+toZNYTDVa/u?=
 =?us-ascii?Q?e09nuQTOrUC9uX0iLmMn1cBMHlOHRrF3M9UltxKPFmmNKR7FJEuUu/SQOETZ?=
 =?us-ascii?Q?Gb1OdE/7Ew21v5eHA7/iiIz/Wk7X1E4/M/xBjuwungF/sMoLh+A+QO8LbWCo?=
 =?us-ascii?Q?QCnAxvtoZAHACxn8pi8RfmG/U4kyBjxnUjTiYdemcEVGKj2sNIxNeiEKHSEe?=
 =?us-ascii?Q?fjhEGkuc6YikphnlnKxRpN4/ZGurnI47JuRmHDjh50YQ4BFAd4qs9pA7ztfQ?=
 =?us-ascii?Q?DKif09XzOdPY6PN9OjUJYIf+6K2Z7hNkmzhDQ03kWZUc+HGdVcrv10Rptxrf?=
 =?us-ascii?Q?tMiOW3rIIVrXcu8JKTxuRPEY1iMjp3kddnHl1W4TkEqNjzjQMe/I3Rg1wOVD?=
 =?us-ascii?Q?vnpOykpjSyWIHZaM8YAnYaTHgIVsVcnvNiomAACdb3YL9MOnSlIy2CmUlU4L?=
 =?us-ascii?Q?KYhzo5ZreyWiTLkKlHZK/0WfxjCeYrOJB9UthuVVOgsCQINtAZAiyNk1BAW7?=
 =?us-ascii?Q?LzVHOZwdFkWbF8uMYwzmqjAKroHnBtVo5/ZBjaqyaP5ajaFSUdDlnupJ4sO9?=
 =?us-ascii?Q?J4tgJz5Sib4BMGQtc5483XxixyxJYEygmGn6DJt4DJIs/sW6qRICIphSKZu5?=
 =?us-ascii?Q?UpEo20Bj39TxI8/cTbN6Y3tV4gGt8+b1xHauDS/UnJt3NaktPBSMV/QTioCK?=
 =?us-ascii?Q?COJu/v9rBo3TYT23MO7SZe/YoS7uWBdNcqoKYfwkX/Rj1jbVKPh5lDj6Eozz?=
 =?us-ascii?Q?DSgzr8PZgjVGJvCmQb8SPjwVuPeH9DARhXoqruPc1LeXZSGTyWukCJbTeLvp?=
 =?us-ascii?Q?8NgU/i/GKPgipnngakSCoFJTpigpWSqHTrpLxoxOxQwgddsx831vWy3j5q7W?=
 =?us-ascii?Q?Gc0PCNcr7u849cNeO6z69eq/viiBLom/ZZBft/F9iVNTaj2JxsjALf9Df0Tj?=
 =?us-ascii?Q?2gVhHG1sL+Y4izgOoPV8TcJUgtBiUhKKc/Rzy3ybeuhoBhEZLEPSdgDYVZ0K?=
 =?us-ascii?Q?joQsin5Wb9TTMLVpF+OqUtzTC8YskEDziP5eNbBxzzHCrPvf8pansj4UqmEz?=
 =?us-ascii?Q?B6y3RSuHx6Sb+XjEym+Deq42C7s7gYokJeBLBfMslaUt20Sqr7xyudfL1lPL?=
 =?us-ascii?Q?+TXx+bMszg5U0e47huaYgpt1FL3r39k638W1CAkMGfVdtkezj6Q26k4BSCOw?=
 =?us-ascii?Q?NrFN2knA5OB/IGmMkb6aZPM2DuLYEUr7xyY/vXHrflCTu11QzXSjSBMr/kov?=
 =?us-ascii?Q?6+dLICXUugHTM5AiibFxppxY5PBUVKAWn8wrm6bxRhVLHMD4uTvF6zYQurIN?=
 =?us-ascii?Q?vbwwMmLda5DGbZ54gLf4lkgNOqqLUK5FpdkYkSQjhPcxO94Gh6v+9WN/ofRB?=
 =?us-ascii?Q?PA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c9dc0b9f-162d-4194-0875-08db10749283
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Feb 2023 23:21:46.5087
 (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: DT5QGLsZWs1zCKvJBDC+AluQr+SeRJnE4pXzIezGTG83buNu2x/oSQ3ljVI48t+zL0FKuwAjNdV4PHxQ9RYKRw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7436
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Create a wrapper over __ethtool_dev_mm_supported() which also calls
ethnl_ops_begin() and ethnl_ops_complete(). It can be used by other code
layers, such as tc, to make sure that preemptible TCs are supported
(this is true if an underlying MAC Merge layer exists).

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 include/linux/ethtool_netlink.h |  6 ++++++
 net/ethtool/mm.c                | 22 ++++++++++++++++++++++
 net/sched/sch_mqprio.c          |  1 +
 3 files changed, 29 insertions(+)

diff --git a/include/linux/ethtool_netlink.h b/include/linux/ethtool_netlink.h
index 17003b385756..fae0dfb9a9c8 100644
--- a/include/linux/ethtool_netlink.h
+++ b/include/linux/ethtool_netlink.h
@@ -39,6 +39,7 @@ void ethtool_aggregate_pause_stats(struct net_device *dev,
 				   struct ethtool_pause_stats *pause_stats);
 void ethtool_aggregate_rmon_stats(struct net_device *dev,
 				  struct ethtool_rmon_stats *rmon_stats);
+bool ethtool_dev_mm_supported(struct net_device *dev);
 
 #else
 static inline int ethnl_cable_test_alloc(struct phy_device *phydev, u8 cmd)
@@ -112,5 +113,10 @@ ethtool_aggregate_rmon_stats(struct net_device *dev,
 {
 }
 
+static inline bool ethtool_dev_mm_supported(struct net_device *dev)
+{
+	return false;
+}
+
 #endif /* IS_ENABLED(CONFIG_ETHTOOL_NETLINK) */
 #endif /* _LINUX_ETHTOOL_NETLINK_H_ */
diff --git a/net/ethtool/mm.c b/net/ethtool/mm.c
index fce3cc2734f9..87d9682efadd 100644
--- a/net/ethtool/mm.c
+++ b/net/ethtool/mm.c
@@ -249,3 +249,25 @@ bool __ethtool_dev_mm_supported(struct net_device *dev)
 
 	return !ret;
 }
+
+bool ethtool_dev_mm_supported(struct net_device *dev)
+{
+	const struct ethtool_ops *ops = dev->ethtool_ops;
+	bool supported;
+	int ret;
+
+	ASSERT_RTNL();
+
+	if (!ops)
+		return false;
+
+	ret = ethnl_ops_begin(dev);
+	if (ret < 0)
+		return false;
+
+	supported = __ethtool_dev_mm_supported(dev);
+
+	ethnl_ops_complete(dev);
+
+	return supported;
+}
diff --git a/net/sched/sch_mqprio.c b/net/sched/sch_mqprio.c
index 48ed87b91086..f0232783ced7 100644
--- a/net/sched/sch_mqprio.c
+++ b/net/sched/sch_mqprio.c
@@ -5,6 +5,7 @@
  * Copyright (c) 2010 John Fastabend <john.r.fastabend@intel.com>
  */
 
+#include <linux/ethtool_netlink.h>
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
-- 
2.34.1