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 1/9] net: ethtool: create and export ethtool_dev_mm_supported()
Date:   Mon,  3 Apr 2023 13:34:32 +0300
Message-Id: <20230403103440.2895683-2-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?oVuhACjhAENuuOC/7phPgONv/X4B4qFMdIxiRUi3RcJ2WVGtwe2787NffkgO?=
 =?us-ascii?Q?9CLxOhNGkMuOiDyX8WWqbRFsbRc6Jl1X2Nlz6uZUXfLvtyxOrCZKFpWVq66Q?=
 =?us-ascii?Q?kkopAYN/fXnpTS0A8tjGr/0whuJzfuPfAuyubaZZq9uPunJrbdETqUWcGpUh?=
 =?us-ascii?Q?vhOjy/8LrIOHlLS2mFhBMWBDi8ON5Ua+5ES1gbY6V/vO0p4kM5sj8OUqKSAS?=
 =?us-ascii?Q?Sxgn5NrqcmlaTOvV9aaevS9xNP7S/8uOx9THhXBw5F3lEoC4L+CFP3rb6Hk1?=
 =?us-ascii?Q?/4q6Vaw8vRrNdlTUPPt0bmHYv9A8XATeaorH5bORJAEO98VIehJM96BQkTEX?=
 =?us-ascii?Q?ZCdESkKw7rrrTSukVl5xIzHahYA9nV1jmuF1ErQ60L+Fz/DuzKyTwgjH5iZx?=
 =?us-ascii?Q?C6M7f2K4U1zjvo0BTm6bvPZuUwjlwPKRFQGL92kfSbFjLMJw1KgG+tXtID8q?=
 =?us-ascii?Q?irbC+5sRyM3TCWLQgJuPi1BKBErxDEX95YejzmSXLduztkP/JWVT9kU5lNAB?=
 =?us-ascii?Q?DlmQacdzTwc8ejaEym7eO061SUeMLibH2VioPy8z6yaYjuGGNW2FHPhVHQXC?=
 =?us-ascii?Q?hC7QSvfmpOc0qwuF/xEHqyYw7lvyMkVscpZu7HgcK0X66ElvPABXujskLJ00?=
 =?us-ascii?Q?GFESVyAhIeDl2wZWyZBpwa5LPHUhg2ACOETg1PbfPz3cbh0mecl89Fig2rNp?=
 =?us-ascii?Q?Q2daWBo7mrngOaum/ruup3CFJXgpPGidR0KDyrlaDl0WWNCTJb9jpFNnkB1M?=
 =?us-ascii?Q?ihp0Mkp2++jxWETNd9kbO5rDpZKhiRQJNTAtK+0qD1kt4S+UrGpculXQTefI?=
 =?us-ascii?Q?Gr54mhtsaTqBACDSRdfGM9k7cjvjt1cQXxohA/+al8HOP6u2vdZomUBtbiiW?=
 =?us-ascii?Q?YWutKLyRdKHR6lCR4GozX5QajSBi4TmEcaI39iFCO9WF7L1vp92o34VC9cDB?=
 =?us-ascii?Q?uatP9VApxPt35EUQXpW6EfV7Ry6VuiXJUacI9WxLIA8fcJcbqGi/lltYQxS4?=
 =?us-ascii?Q?tg4we/i+Og0myI5lYRuCnom+SKSivCQq6vmcNjGRrJzzDuBz8TU9QKV0jVUx?=
 =?us-ascii?Q?yRZXIYzGIs673rrG5xObIhwn7flyiUcioUk35XX76d6bc4MlwShh6vkSF5Ry?=
 =?us-ascii?Q?5DkNvVHNs2vUIrkGl5StYaHazOcwwsXr8f28vcr40OT80YEtxzXYFtFWg0R6?=
 =?us-ascii?Q?18CT3Nkxk2ZUUDeO258tSpdZ7D3zInIU3q8p34Rafh/DrTDmmNzg3/gjBGnh?=
 =?us-ascii?Q?v66hW0XBx6F8Qpe2lIGVr012WPI71cLWEbz0wIdAbPTe0ssilIRZjJC6VzzB?=
 =?us-ascii?Q?wf1PIkmSaS7Y0N2RNaO+8wCbUzmDEL/pa6V2Y6DL9Mtl+T/4hbPE3y4lPnFS?=
 =?us-ascii?Q?qI9UNQ6CqGlVOhbJA3Nx5EPNfZ+IZ/YuWSA0eNNi1wG6WKIzjHckuNi4OJVE?=
 =?us-ascii?Q?UMmO7AMkQN79wXjYyAi+tMkgA2Cgz+p8FkoLrAFn/BGjUT0GdFipYQUcFgAw?=
 =?us-ascii?Q?LM9fWYE2NkcfpWUM/AQlnMUcdHJqTpFTmfQ1mwblO+CbbZdwcWvrkbQN1PRc?=
 =?us-ascii?Q?9GXmRjHVeciGdq5gc7bqLgX6UL4oP/A0k57AmC2pk9k/usG34SITORWW3Zsb?=
 =?us-ascii?Q?xw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b1056332-5de2-4e39-f36e-08db342f1274
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:34:58.2977
 (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: 5dWNy+QN/yNZXRoHgIRoEtgbcqmGffwDyiuoOBu7Ob9WLEj9lgbuWvxJ75ULZJAqZsbBQwpIaIYE82ANcyhJdA==
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

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>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
---
v3->v4: none
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