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:     linux-kernel@vger.kernel.org,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Michal Kubecek <mkubecek@suse.cz>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Vinicius Costa Gomes <vinicius.gomes@intel.com>,
        Xiaoliang Yang <xiaoliang.yang_1@nxp.com>,
        Kurt Kanzenbach <kurt@linutronix.de>,
        Rui Sousa <rui.sousa@nxp.com>,
        Ferenc Fejes <ferenc.fejes@ericsson.com>,
        Pranavi Somisetty <pranavi.somisetty@amd.com>,
        Harini Katakam <harini.katakam@amd.com>,
        Colin Foster <colin.foster@in-advantage.com>,
        UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH v4 net-next 07/12] net: ethtool: add helpers for MM fragment size translation
Date:   Thu, 19 Jan 2023 14:26:59 +0200
Message-Id: <20230119122705.73054-8-vladimir.oltean@nxp.com>
In-Reply-To: <20230119122705.73054-1-vladimir.oltean@nxp.com>
References: <20230119122705.73054-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?UrKRnffKYWbqdXyJZTSKzS2dNE5tZzkasIOdNr0Il3X/cmuGSOxVXt/rc1J0?=
 =?us-ascii?Q?Orzx/+bs71vSzSN4gvM+9eEGtZ5boc/Ojgl+LEoy1U48DArDFUdk9fMnjY71?=
 =?us-ascii?Q?MQy7bHq7wHuZbNDQ3oIqCVM0YRCC0DlkF4FfHYx/ubHYRn2JvcKg/LjNPDO/?=
 =?us-ascii?Q?7lyobvglkqIcfYAMp9S1u1ELDCcIYvZ7xC7+wCkcrWZxLp2jY98LEh41/bt+?=
 =?us-ascii?Q?ziRqsfoE8qMeEwg9FW0x0Lo7c8ZXRq8gUVhBwPN4i3W3g7uRCSRxuCNOq1mE?=
 =?us-ascii?Q?BmuJY4VOWyNq1cf+EctIn+ukuxr7FwymkfZ0Hg9Qj/hnkHrRBnYzjDgl3W7u?=
 =?us-ascii?Q?7tjC7zEk62srGffPvMBR2H/w2Ewc9AkI1CdfZZ7vVMZEZsoNtbjjXEaX7BSx?=
 =?us-ascii?Q?cUxJI8H8gJCdfcugGbMidHCsGS/6w2v/B4ALtYT4s21GIrw4jRsoQ8jrohwq?=
 =?us-ascii?Q?3w2jJDg+/vrTM6yvjalCdSUieX4rd2p9TZQ/fRE2/bCW7TWmtK2S1rHQvbld?=
 =?us-ascii?Q?PgtgCqfdkfaRJZe5adz57crleMXbqUGmyYa7W4diuNBKqFQOTxKwvHl89hOj?=
 =?us-ascii?Q?2dQ2ziesHEjy24//QI/wmP6cNjX5XMJx1Fl2jUUDex3KlZhgiUV+d3VuvgLR?=
 =?us-ascii?Q?JGWggmw9zASqA2gHVhtGDZSTzuii7t86ezkkuDdlG6dSNkLAlVOJVBm0Yey7?=
 =?us-ascii?Q?f0ZsycuS7ihi7bTxwt1asSbhMdTScR2yOiECbiIQjmwCCOSHXNQM2G2nQfLx?=
 =?us-ascii?Q?0BdGiI0uRHfyAizMlGvs4o+b+suRof31zacygPoanf8G+PgiVDSxQ66XiGBG?=
 =?us-ascii?Q?apbrqu1CigbiySYsRNjJdYCY/aqmQD/ggM3PEgSNgBCZXA0PxNIGWkpBOzQZ?=
 =?us-ascii?Q?EDvbXudVPvmx6+Tf00pff+RnjX+7OaUsG5vrGE5RBv/ZZOGuufakUS0iTHsp?=
 =?us-ascii?Q?cq0d38WvJheha6TQjOVezf93j1p3qji4k+NYUwGge09LQDZrEMaNubfGjmVK?=
 =?us-ascii?Q?ewzqeR/k89EZ5lwAHGtLtP0iLVOZqhjmI3ygit+Yw6cLdbfQzA8YyJvyGdXD?=
 =?us-ascii?Q?Dazic8BcxzC09P1x5wFzOXBAWjxCI9JeiBCuhbg5yRPOA2nR9zUXHqPtr4NO?=
 =?us-ascii?Q?t0ajodiLucLX6gUvpVHzqNKySKf/p9IcdF1D3uvwhbepNwf222cwdHGv/gTI?=
 =?us-ascii?Q?m5ELCfS2lERr5TFNRO0hvWGMiM0lyyOdX6r/Ds9bz6S9ruoKv868NE7ikfF1?=
 =?us-ascii?Q?ERUOyEI4Z8HQj1ob4sZmjBCaIc4fimAaQNGfpI30rXEllmOJN0qAl0ZLOBUB?=
 =?us-ascii?Q?0faNXMwEf/ZrMiBHEuKRZRu5gqJ7EG+eQww2aakxIBLaAd7RKASYPOAX3QOC?=
 =?us-ascii?Q?eBIDge69dE4ejY1+EmpENsQYv/477RbLXdXac3Jvj03T/JVgRITNoSU65ZKk?=
 =?us-ascii?Q?h6Sm/lLTRh7XlxI+DNTx80/OfMbd4kfkyWu2jay8YpPzdmBbcgvevZykYMDA?=
 =?us-ascii?Q?Yib0237h1ICRZedOHmIWSRbuZYd7h1sNe03khhSJSIEdNmQ23eLxsr2d1NYQ?=
 =?us-ascii?Q?iC3eK01koZrMSZK/nTtT9Wv5HVbxIOPssFA3c0gvRmKOZaSE2ycv3cvoicaQ?=
 =?us-ascii?Q?FA=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 20c8a780-0550-4991-54ae-08dafa189644
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2023 12:27:53.6847
 (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: OMM/F9L3+LsZ8FJz7OeNLwDkT0HqNcGIZ10NsRf+VWbP66vCc7eA1id4vVhQUBbdZL3ID0d0Z3R9X/poVSeSbw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9376
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        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

We deliberately make the Linux UAPI pass the minimum fragment size in
octets, even though IEEE 802.3 defines it as discrete values, and
addFragSize is just the multiplier. This is because there is nothing
impossible in operating with an in-between value for the fragment size
of non-final preempted fragments, and there may even appear hardware
which supports the in-between sizes.

For the hardware which just understands the addFragSize multiplier,
create two helpers which translate back and forth the values passed in
octets.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
v3->v4: none
v2->v3:
- adapt to renaming of "add_frag_size" to "min_frag_size"
- use some macros instead of 4 and 64
v1->v2: patch is new

 include/linux/ethtool.h | 42 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 6746dee5a3fd..6a8253d3fea8 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -15,6 +15,7 @@
 
 #include <linux/bitmap.h>
 #include <linux/compat.h>
+#include <linux/if_ether.h>
 #include <linux/netlink.h>
 #include <uapi/linux/ethtool.h>
 
@@ -1001,6 +1002,47 @@ void ethtool_aggregate_pause_stats(struct net_device *dev,
 void ethtool_aggregate_rmon_stats(struct net_device *dev,
 				  struct ethtool_rmon_stats *rmon_stats);
 
+/**
+ * ethtool_mm_frag_size_add_to_min - Translate (standard) additional fragment
+ *	size expressed as multiplier into (absolute) minimum fragment size
+ *	value expressed in octets
+ * @val_add: Value of addFragSize multiplier
+ */
+static inline u32 ethtool_mm_frag_size_add_to_min(u32 val_add)
+{
+	return (ETH_ZLEN + ETH_FCS_LEN) * (1 + val_add) - ETH_FCS_LEN;
+}
+
+/**
+ * ethtool_mm_frag_size_min_to_add - Translate (absolute) minimum fragment size
+ *	expressed in octets into (standard) additional fragment size expressed
+ *	as multiplier
+ * @val_min: Value of addFragSize variable in octets
+ * @val_add: Pointer where the standard addFragSize value is to be returned
+ * @extack: Netlink extended ack
+ *
+ * Translate a value in octets to one of 0, 1, 2, 3 according to the reverse
+ * application of the 802.3 formula 64 * (1 + addFragSize) - 4. To be called
+ * by drivers which do not support programming the minimum fragment size to a
+ * continuous range. Returns error on other fragment length values.
+ */
+static inline int ethtool_mm_frag_size_min_to_add(u32 val_min, u32 *val_add,
+						  struct netlink_ext_ack *extack)
+{
+	u32 add_frag_size;
+
+	for (add_frag_size = 0; add_frag_size < 4; add_frag_size++) {
+		if (ethtool_mm_frag_size_add_to_min(add_frag_size) == val_min) {
+			*val_add = add_frag_size;
+			return 0;
+		}
+	}
+
+	NL_SET_ERR_MSG_MOD(extack,
+			   "minFragSize required to be one of 60, 124, 188 or 252");
+	return -EINVAL;
+}
+
 /**
  * ethtool_sprintf - Write formatted string to ethtool string data
  * @data: Pointer to start of string to update
-- 
2.34.1