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>,
        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>,
        Jacob Keller <jacob.e.keller@intel.com>,
        linux-kernel@vger.kernel.org, Ferenc Fejes <fejes@inf.elte.hu>
Subject: [PATCH v3 net-next 02/13] net: ethtool: create and export ethtool_dev_mm_supported()
Date:   Mon, 20 Feb 2023 14:23:32 +0200
Message-Id: <20230220122343.1156614-3-vladimir.oltean@nxp.com>
In-Reply-To: <20230220122343.1156614-1-vladimir.oltean@nxp.com>
References: <20230220122343.1156614-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?6qqPHthMlxQIaKfNZmPP8wZdOyG4OrrVrCsMDA0QDk6iSM4LvDDePIUrEO7A?=
 =?us-ascii?Q?h8tPlb7iUIPnqDrEjOu2vmlurmJbFFG04qwiCY2kklXSSgk32QfnAmqKBSVr?=
 =?us-ascii?Q?JA7J5sXjIeQwTFNxuKKpoN9bGXLvW0Tq4iMwIaDljcX8/4/LBJXsLV6GzY44?=
 =?us-ascii?Q?YuDiWWUX6FJxBQtiRhfB9SSc3V8MZexB7IhEl76vOwtP4GZxqYRCBLu6/a0Z?=
 =?us-ascii?Q?aed+pEqWF4SaWw1TSwW2zXS6L0RccOY3G4iybcYMtgimSMzpIRSOpt7K+/89?=
 =?us-ascii?Q?9V0oGiIQre2Jd+046OOq+ySIz8OMwabZlksUR2yMeJCEJvYb04DFpY2FCq+v?=
 =?us-ascii?Q?SN6w4HE9VO1lC9g71xgkvbFoqFlqbgtADElsd7xtlL6LVMFVYM8tdWupZJsw?=
 =?us-ascii?Q?ZJQb7bquIGA8rCqG5/GN0WWv5MddLnHe3bZ6xA4Hlpm9g3uIJLQdJnEIv7+V?=
 =?us-ascii?Q?H9+LLSbeQmaqDFGeF6vM67G/merHbljn5Wun6TzE8s7uaOhF09UVSSQ4lc9t?=
 =?us-ascii?Q?WIQHe0Kc9sHJUPniNLpDBQrtD/CBwc4HGpl3Duef46DgVsV3nPwhsxN/h/NN?=
 =?us-ascii?Q?Fswv+eA4DRkVgSG7/kY7WZ3I5Wtwxggl9taTs6zM6w1KcfJ6wAn3Gn4n/Acv?=
 =?us-ascii?Q?jv31N+lyc2XfAQo+XK+3u+Ma7aI5VaUjQgk4zllb4GQioZ3e0ZYqJ+epUg43?=
 =?us-ascii?Q?24tn0oIWIpWKy1jBRfhLmwGJY7vuXKXC7Zex655MKQ1+i0wZ85cyZCuNcePo?=
 =?us-ascii?Q?ZgjJNsEny68zJOfDtVmjTptq2F5CUndjsj6xo/MXqNF0GGwnayWN5CgsLU+t?=
 =?us-ascii?Q?MKOvxrP8KAv8wbL3fp+2wCHWlWhunx2TRHaY9eFF+rAk+dGuYh1+Hp4eTN5a?=
 =?us-ascii?Q?UqZwYzjF3Rc95o+qPFZQwwdJYVLCjE1PWfamC/bzPnIDyVYLQqJBE1zHS7Os?=
 =?us-ascii?Q?gFmTdv5SSc4ymNh+KwgfFa39imrehJcY0CzBeLezu0ziAEjEXsngtHFY1Lrq?=
 =?us-ascii?Q?bC3FS72L+7zxeEB9EMw3KBprIiHCENkA/pWm+64oN/vZ2ltMQSO0LTH4xEON?=
 =?us-ascii?Q?KmZvGjkQHvzkqpBXQC+JU8QvHrXak0hktruuS+SSb13t0Knn/vdPSFmJ0VPU?=
 =?us-ascii?Q?R3dVSyohnywv5q/Lo6M3xTZWO9diAF0zg41/xM+1dna2abC7JOpeWVQnRiLa?=
 =?us-ascii?Q?i/Y1GTbz42xianICj2TbkqSfq/VzctGgoRhkUKulIRY2mQ8LQlXAH6Da381z?=
 =?us-ascii?Q?34bNFdasukkxqmKx4E8TD6wLzPZsfEIiz/1fuqZR971PJzN/oGoG8nSD4wDh?=
 =?us-ascii?Q?zPQ+Ua+Uptqx9bNAUDGsW33Z3G3fkdnaCodG88yKlRNcVbxu1/kVSDNJmNFg?=
 =?us-ascii?Q?i15MjarRny33VM/1eV21tVFIxGIkPg2AZ+/ER3wpsaHM5maKm7g74ZwDc+86?=
 =?us-ascii?Q?dTqegE+gmqiFVee1uQgy4DI9Fs2xteJJK2rYcDrVEbK4neU1iJkF6cC2jRW5?=
 =?us-ascii?Q?zCnGtGgXjI7ZaJkpmxd5v1a/+ZQEfY0mJwJ/ID2aaGRNdO9i82T9BMA0q6Mu?=
 =?us-ascii?Q?nUzca4vPbs1D/3JZCtdkZ89IrsETcvCJyRNtj9C7DmQAVwstyPl+ANqyZ61z?=
 =?us-ascii?Q?7A=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 30e014fd-7528-4ac0-6ac0-08db133d58a4
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2023 12:24:00.7441
 (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: XeiYf6nO3aU10/ehX+UpewjiObwScvPPei1m/C63lRtyJGnH+EHmP87x9mNqypW2QGox8YE1q9o74GQE9F9xKQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7725
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>
Reviewed-by: Ferenc Fejes <fejes@inf.elte.hu>
---
v2->v3: none
v1->v2:
- don't touch net/sched/sch_mqprio.c in this patch
- add missing EXPORT_SYMBOL_GPL(ethtool_dev_mm_supported)

 include/linux/ethtool_netlink.h |  6 ++++++
 net/ethtool/mm.c                | 23 +++++++++++++++++++++++
 2 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..e00d7d5cea7e 100644
--- a/net/ethtool/mm.c
+++ b/net/ethtool/mm.c
@@ -249,3 +249,26 @@ 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;
+}
+EXPORT_SYMBOL_GPL(ethtool_dev_mm_supported);
-- 
2.34.1