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>,
        linux-kernel@vger.kernel.org,
        Giuseppe Cavallaro <peppe.cavallaro@st.com>,
        Alexandre Torgue <alexandre.torgue@foss.st.com>,
        Jose Abreu <joabreu@synopsys.com>,
        Wong Vee Khee <vee.khee.wong@linux.intel.com>,
        Michael Sit Wei Hong <michael.wei.hong.sit@intel.com>,
        Jacob Keller <jacob.e.keller@intel.com>
Subject: [PATCH v2 net-next 05/12] net: ethtool: create and export ethtool_dev_mm_supported()
Date:   Sun, 19 Feb 2023 15:53:01 +0200
Message-Id: <20230219135309.594188-6-vladimir.oltean@nxp.com>
In-Reply-To: <20230219135309.594188-1-vladimir.oltean@nxp.com>
References: <20230219135309.594188-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?fjTciUMLOQ7h6Eq0XyP5/IougvAJs29Q/R9XQHfsRnQ4s8mHIhhBdaxgtq5u?=
 =?us-ascii?Q?SGKnY0oMbIcLIvoBfjPWn8XZ6hOpAngnxN5eSrezUXS3/ExfASIbJya+OZh2?=
 =?us-ascii?Q?oihC6pJFjLO5JYoX41o5VhI+4zfj1cOWUnohru8acriMn+ET919PqRvI3PuX?=
 =?us-ascii?Q?/a72Y6AEIVM3r2STdZBAyiC4zbfzV1Cv28SjohkCgfL9uobFKqexscSkY9Kw?=
 =?us-ascii?Q?2ss5wMYqJR9vq6EHFB2iWhEdasney8fsF11YgK4MZqFK4C5LkftWSirxey+G?=
 =?us-ascii?Q?Dde8K36darnO8l6PmsmKu+91rPktvFPVJjEyNlX0OvOsX+mWuM5r5t4Avjun?=
 =?us-ascii?Q?YUSfzZHuYSFnuyr9qwP9GZnAaaLjS+540Gy7nA0iMh42533ZKnIr3MsBzM/W?=
 =?us-ascii?Q?UkNJHLqlQWxuLN/C5H6VgaZinEJ5XaG9ZuBmFUS/BDhF5GCsG4Ko73uDD/mQ?=
 =?us-ascii?Q?ACf/jBD+rC9u+AshcXqCQhQ0oQRgK5WoHneUVkalxrytZHAXp3Nyx6VgZs/g?=
 =?us-ascii?Q?6sDmpeV2rLhIDBpHYLMc3vKzcLhL/Q0mTDD1NxZsT7vMmBeh8AvwBjRxmpGo?=
 =?us-ascii?Q?WeNFhHFxNvmR2c5N72qyLSvTDWMZnrLRdI90IZ5RJlw56TWuMDlXxJ7J+eqE?=
 =?us-ascii?Q?Dxeh15w02VsqiRifTTC6K+vgGncgt97Nw4HZ9AprO0m+E6nlx7Zv5ODFJxgl?=
 =?us-ascii?Q?HdfZ7+kqdGSLcbiGcONt3oLV9WJvA0MZW8UWCZRfxRS6TP+PtgLAbB9/tAeC?=
 =?us-ascii?Q?Us2OUWqnXdUYzxag/N5OyXQBHETRS4Q+5TPX6ycLZVrhCA1Qh1uIj1efq9sA?=
 =?us-ascii?Q?cuvdiXyLVXrnLAIsMyyUS1d96rzIk15xOMEY6OogFWXxKN2M9qT20GgOtv0/?=
 =?us-ascii?Q?+sxR2VsZpi/vE1dZ7k5TBif/Wv/lfDY6zb+JB3pkpAkqGAxJ6fWIu09WSwQj?=
 =?us-ascii?Q?z7mmawhukvtLdcILf+vTh3ZqEeQSQYoREcOe710wclA/HG257lR4mV74480G?=
 =?us-ascii?Q?xOsiS/NR/wPSQX8K01KjgRwpZZ+32ISzf3l+ehu8w5SzlJee3OOxa6jcNqRx?=
 =?us-ascii?Q?Uf4asqDtw/Vd5pgPrQcPrzKUun7P3cMNUawBkxO3NMKaqvmw0FCuocga+e1B?=
 =?us-ascii?Q?92vLfeYJWfBMTpdiyQ4O+1Qcz4fwQgueqRG8C0oRqL5T6FspPXMUnYs9dtbp?=
 =?us-ascii?Q?FFP458Pw6v5TtsDQmtbcsAKLG3Q1mogCtwab3GQdjAd3yPt14y/ig4SXKhTz?=
 =?us-ascii?Q?SxNJ7VfyimdlO9p9lyMY+2iQspJ8HLFqloNbog4wLB+lKAQcnmtDlvRi+Ljf?=
 =?us-ascii?Q?PkBmCEKtp4qrZiteyNAh1j0UkGUmEEi693pvRnHjqelvNGFAmsMr35jgUUNu?=
 =?us-ascii?Q?tWX7bA11ZlQt3Kh7BvIv7OxnCAkOYhhk8DY6ZlFgZGR3HIbUX3utxdFsG+cM?=
 =?us-ascii?Q?CFRSB+KolAUh3/hSYC/ncErRcSP+SKl3Gg+l3zqxT01sO+/1bg1yz7h1ho3t?=
 =?us-ascii?Q?xi9bfN2wA1IQlxqLDg8eyDIv4xRzmVLRxgPP7q7rbuicKhJX/8QLyndhTNhT?=
 =?us-ascii?Q?5OKyXvAj3uDw8NL1X9PLL6PfOxMDZ6Q2zOsimgPe4JAIFXKrlEZzFKLVjCvN?=
 =?us-ascii?Q?Cg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3fd6d318-746a-4f54-ba83-08db1280b8d4
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2023 13:53:47.1463
 (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: +k7ScDop8URlZzzDkDgH9pYRjcDLXocvKX7XQ3GyYo8xj2ZsLdnwu3kefH9X4qOnabsbtEUmZLnEXVF5LJBxgg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8238
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>
---
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