Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Fri, 19 Jun 2020 18:39:59 +0000
To:     "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>
From:   Alexander Lobakin <alobakin@pm.me>
Cc:     Michal Kubecek <mkubecek@suse.cz>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>, Jiri Pirko <jiri@mellanox.com>,
        Antoine Tenart <antoine.tenart@bootlin.com>,
        Steffen Klassert <steffen.klassert@secunet.com>,
        Aya Levin <ayal@mellanox.com>,
        Tom Herbert <therbert@google.com>,
        Alexander Lobakin <alobakin@pm.me>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Reply-To: Alexander Lobakin <alobakin@pm.me>
Subject: [PATCH net 3/3] net: ethtool: sync netdev_features_strings order with enum netdev_features
Message-ID: <sqZrzUWnFxtxVcoxsWQF4Nv8G9fd9g61ZQV90btG1FJpZVRU1lf2Wa6pX4XBQq1fkkUxaotZDm9Bb0z01hODC2HEhShi_GOVWqLE7pDSr8w=@pm.me>
In-Reply-To: <x6AQUs_HEHFh9N-5HYIEIDvv9krP6Fg6OgEuqUBC6jHmWwaeXSkyLVi05uelpCPAZXlXKlJqbJk8ox3xkIs33KVna41w5es0wJlc-cQhb8g=@pm.me>
References: <x6AQUs_HEHFh9N-5HYIEIDvv9krP6Fg6OgEuqUBC6jHmWwaeXSkyLVi05uelpCPAZXlXKlJqbJk8ox3xkIs33KVna41w5es0wJlc-cQhb8g=@pm.me>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

The ordering of netdev_features_strings[] makes no sense when it comes
to user interaction, as list of features in `ethtool -k` input is sorted
according to the corresponding bit's position.
Instead, it *does* make sense when it comes to adding new netdev_features
or modifying existing ones. We have at least 2 occasions of forgetting to
add the strings for newly introduced features, and one of them existed
since 3.1x times till now.

Let's keep this stringtable sorted according to bit's position in enum
netdev_features, as this simplifies both reading and modification of the
source code and can help not to miss or forget anything.

Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
 net/ethtool/common.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/net/ethtool/common.c b/net/ethtool/common.c
index c8e3fce6e48d..24f35d47832d 100644
--- a/net/ethtool/common.c
+++ b/net/ethtool/common.c
@@ -8,25 +8,25 @@
 const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] =
=3D {
 =09[NETIF_F_SG_BIT]=09=09=09=3D "tx-scatter-gather",
 =09[NETIF_F_IP_CSUM_BIT]=09=09=09=3D "tx-checksum-ipv4",
+
+=09/* __UNUSED_NETIF_F_1 - deprecated */
+
 =09[NETIF_F_HW_CSUM_BIT]=09=09=09=3D "tx-checksum-ip-generic",
 =09[NETIF_F_IPV6_CSUM_BIT]=09=09=09=3D "tx-checksum-ipv6",
 =09[NETIF_F_HIGHDMA_BIT]=09=09=09=3D "highdma",
 =09[NETIF_F_FRAGLIST_BIT]=09=09=09=3D "tx-scatter-gather-fraglist",
 =09[NETIF_F_HW_VLAN_CTAG_TX_BIT]=09=09=3D "tx-vlan-hw-insert",
-
 =09[NETIF_F_HW_VLAN_CTAG_RX_BIT]=09=09=3D "rx-vlan-hw-parse",
 =09[NETIF_F_HW_VLAN_CTAG_FILTER_BIT]=09=3D "rx-vlan-filter",
-=09[NETIF_F_HW_VLAN_STAG_TX_BIT]=09=09=3D "tx-vlan-stag-hw-insert",
-=09[NETIF_F_HW_VLAN_STAG_RX_BIT]=09=09=3D "rx-vlan-stag-hw-parse",
-=09[NETIF_F_HW_VLAN_STAG_FILTER_BIT]=09=3D "rx-vlan-stag-filter",
 =09[NETIF_F_VLAN_CHALLENGED_BIT]=09=09=3D "vlan-challenged",
 =09[NETIF_F_GSO_BIT]=09=09=09=3D "tx-generic-segmentation",
 =09[NETIF_F_LLTX_BIT]=09=09=09=3D "tx-lockless",
 =09[NETIF_F_NETNS_LOCAL_BIT]=09=09=3D "netns-local",
 =09[NETIF_F_GRO_BIT]=09=09=09=3D "rx-gro",
-=09[NETIF_F_GRO_HW_BIT]=09=09=09=3D "rx-gro-hw",
 =09[NETIF_F_LRO_BIT]=09=09=09=3D "rx-lro",
=20
+=09/* NETIF_F_GSO_SHIFT =3D NETIF_F_TSO_BIT */
+
 =09[NETIF_F_TSO_BIT]=09=09=09=3D "tx-tcp-segmentation",
 =09[NETIF_F_GSO_ROBUST_BIT]=09=09=3D "tx-gso-robust",
 =09[NETIF_F_TSO_ECN_BIT]=09=09=09=3D "tx-tcp-ecn-segmentation",
@@ -43,9 +43,14 @@ const char netdev_features_strings[NETDEV_FEATURE_COUNT]=
[ETH_GSTRING_LEN] =3D {
 =09[NETIF_F_GSO_TUNNEL_REMCSUM_BIT]=09=3D "tx-tunnel-remcsum-segmentation"=
,
 =09[NETIF_F_GSO_SCTP_BIT]=09=09=09=3D "tx-sctp-segmentation",
 =09[NETIF_F_GSO_ESP_BIT]=09=09=09=3D "tx-esp-segmentation",
+
+=09/* NETIF_F_GSO_UDP_BIT - deprecated */
+
 =09[NETIF_F_GSO_UDP_L4_BIT]=09=09=3D "tx-udp-segmentation",
 =09[NETIF_F_GSO_FRAGLIST_BIT]=09=09=3D "tx-gso-list",
=20
+=09/* NETIF_F_GSO_LAST =3D NETIF_F_GSO_FRAGLIST_BIT */
+
 =09[NETIF_F_FCOE_CRC_BIT]=09=09=09=3D "tx-checksum-fcoe-crc",
 =09[NETIF_F_SCTP_CRC_BIT]=09=09=09=3D "tx-checksum-sctp",
 =09[NETIF_F_FCOE_MTU_BIT]=09=09=09=3D "fcoe-mtu",
@@ -56,16 +61,25 @@ const char netdev_features_strings[NETDEV_FEATURE_COUNT=
][ETH_GSTRING_LEN] =3D {
 =09[NETIF_F_LOOPBACK_BIT]=09=09=09=3D "loopback",
 =09[NETIF_F_RXFCS_BIT]=09=09=09=3D "rx-fcs",
 =09[NETIF_F_RXALL_BIT]=09=09=09=3D "rx-all",
+=09[NETIF_F_HW_VLAN_STAG_TX_BIT]=09=09=3D "tx-vlan-stag-hw-insert",
+=09[NETIF_F_HW_VLAN_STAG_RX_BIT]=09=09=3D "rx-vlan-stag-hw-parse",
+=09[NETIF_F_HW_VLAN_STAG_FILTER_BIT]=09=3D "rx-vlan-stag-filter",
 =09[NETIF_F_HW_L2FW_DOFFLOAD_BIT]=09=09=3D "l2-fwd-offload",
+
 =09[NETIF_F_HW_TC_BIT]=09=09=09=3D "hw-tc-offload",
 =09[NETIF_F_HW_ESP_BIT]=09=09=09=3D "esp-hw-offload",
 =09[NETIF_F_HW_ESP_TX_CSUM_BIT]=09=09=3D "esp-tx-csum-hw-offload",
 =09[NETIF_F_RX_UDP_TUNNEL_PORT_BIT]=09=3D "rx-udp_tunnel-port-offload",
-=09[NETIF_F_HW_TLS_RECORD_BIT]=09=09=3D "tls-hw-record",
 =09[NETIF_F_HW_TLS_TX_BIT]=09=09=09=3D "tls-hw-tx-offload",
 =09[NETIF_F_HW_TLS_RX_BIT]=09=09=09=3D "tls-hw-rx-offload",
+
+=09[NETIF_F_GRO_HW_BIT]=09=09=09=3D "rx-gro-hw",
+=09[NETIF_F_HW_TLS_RECORD_BIT]=09=09=3D "tls-hw-record",
 =09[NETIF_F_GRO_FRAGLIST_BIT]=09=09=3D "rx-gro-list",
+
 =09[NETIF_F_HW_MACSEC_BIT]=09=09=09=3D "macsec-hw-offload",
+
+=09/* NETDEV_FEATURE_COUNT */
 };
=20
 const char
--=20
2.27.0