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 09/12] net: mscc: ocelot: allow ocelot_stat_layout elements with no name
Date:   Thu, 19 Jan 2023 14:27:01 +0200
Message-Id: <20230119122705.73054-10-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?px9LiMhy9FgDNUWT8r91TRSSboiqmx5eyvs2S/VcmXlWE5rX6yccK5yxljWH?=
 =?us-ascii?Q?9RdjMs0VycHP6f6pMcxXMLFYMY6a5NP39tJPzGi82/e7isforgTmEA7R1g8e?=
 =?us-ascii?Q?2dJee3bTzsXhztAElnjvWd1YGDrdVdM0KNY2TwCox52fEFVHaqNXDEmpnAwh?=
 =?us-ascii?Q?PY/aPILXs6VZDv0JyhhXVZGpZpif5cvxpR+/RcLhqYtUie+EvpxMs+26CAnd?=
 =?us-ascii?Q?ANqZbyOeAGpneYJAdeYM4LMuJwt5ixQ8NuiOwHOdlLm926H/q+jyCm8+5ita?=
 =?us-ascii?Q?Zg7yYhGpVgY+O56+OlrrV+78xtpaAywzanz51tYNNpUgXSiEWpEDdVzmjFmI?=
 =?us-ascii?Q?dE04MNbfOEf3Co+CrYMHKoiMOQhgr727Obh0NS47AFhX+S4CN01SqNsGR6l3?=
 =?us-ascii?Q?ZAmoRfZEFEVqu0ElhNcvWBQ1FPNaRzsCL5Bnxnn7iO3ok9w7/s9VwedrGntL?=
 =?us-ascii?Q?qAbOG6rfO8MqelOx8xMNizZuxAqGKBhbWtk5A5VG5h8KHiWFM5A67RMmpkR5?=
 =?us-ascii?Q?c2VDKeUnDkW761e9vwf3/defos7RBxNLWTaisou+nTqRt+hvK8eEdIYJpZNB?=
 =?us-ascii?Q?Odprv7bdJJL5UE68EKzr3sapWeL1TaEBAyZyg2e6YOqYBmWy+AKBxcPNLVkb?=
 =?us-ascii?Q?7ztvGUqKhlyIPr/GDV/KPK46Ek2c/ZwXIoeaon2Z8nt2GvNioByiFKRrC1si?=
 =?us-ascii?Q?x0JDt8X1/Hh55ePhVYVKei8BYQr3VwoB1pIRQNGGFfxph37whZgeQf70i7ID?=
 =?us-ascii?Q?dvUYcaMR0rtbZiRVwRTfbajpiYIrE6sRdA96xKDZYg+5WwrTgsjKgjyiKJ+t?=
 =?us-ascii?Q?WQOeOnUInPnGG+vcG+SnX7KPzVEZQqJsgBS37VF9GtSJhQN0qLOwbIJuLhfh?=
 =?us-ascii?Q?CwaRBQHM3dwmselbl95PmMjDSlCMh30+ffBr8Lyh4KvOP40Qdl1TvOuqFJiM?=
 =?us-ascii?Q?9q+VfwZ5MyBpH9LQzevayqSgRmJpNzo/Q2kbf2sEPgDsC877x72xnOe/ULvY?=
 =?us-ascii?Q?DuIGIGWjK/c4NZ3WJESbpUQ3COf0EwUsQvETGwjB7DIEnLAyqo4+TW017egn?=
 =?us-ascii?Q?BDS51ENHTVwu+wBvrJfhd/TOnn+dSuwU4ajS0J1NueGW1/568Gp0C7VLE+kJ?=
 =?us-ascii?Q?dqbpb01XhbACXackGrYDZmuiA8PCYeRFCKlbMM8mNPpgEP85EjkZ/j9NDEcl?=
 =?us-ascii?Q?OceGhdG1WUY3Ymtere8GC4hIqTbaULNIOkIK7HnJmyEV2EJT9A34Wp9GPr9b?=
 =?us-ascii?Q?ZgnEZ68PAIP85levef8n6lOQ7qNLsdsKzGJlr++79L6XaFSmLrEe+OKZ/8FF?=
 =?us-ascii?Q?1yA6zEtClUPz6Tw5TNE+230cudrMT83Pm1hAwOL+I5VQRpR7CgDgTSv6ULBm?=
 =?us-ascii?Q?jSOKyyLRPWvuH72Q4M2x0wZ+5hLd/DTob8Feg4zsbeTP/9AwrOd9D/Yc0pFG?=
 =?us-ascii?Q?Y1FhqD4gsDteOfCP+rrHPpfqpaQ51+vsZyR08Q/A5YkOXqCI8Htx+uPr6FEC?=
 =?us-ascii?Q?YxskaTjEzPe5Wtw/xWNeYdxMGqp1101OTcaNTLeIjHwhTsL+S7EtO+OamGW9?=
 =?us-ascii?Q?Bcik4Rmi8Gu+kR2yOhteixlkxS+InMfedqQUN2PxuEHi/dmhXmFbIsV3Ntkt?=
 =?us-ascii?Q?cw=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e6105401-86f8-4a5d-1878-08dafa1898bc
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:57.7938
 (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: zb22irZWNVWYN0wxhFBP8+pXg5dyIo8KRMaXjGvSUXF4DCAaZnyHebvNJdTM1byGt030VOEiRnk8V3mQp+cZvw==
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 will add support for pMAC counters and MAC merge layer counters,
which are only reported via the structured stats, and the current
ocelot_get_strings() stands in our way, because it expects that the
statistics should be placed in the data array at the same index as found
in the ocelot_stats_layout array.

That is not true. Statistics which don't have a name should not be
exported to the unstructured ethtool -S, so we need to have different
indices into the ocelot_stats_layout array (i) and into the data array
(data itself).

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
v2->v4: none
v1->v2: patch is new (v1 was written for enetc)

 drivers/net/ethernet/mscc/ocelot_stats.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot_stats.c b/drivers/net/ethernet/mscc/ocelot_stats.c
index 1478c3b21af1..01306172b7f7 100644
--- a/drivers/net/ethernet/mscc/ocelot_stats.c
+++ b/drivers/net/ethernet/mscc/ocelot_stats.c
@@ -315,8 +315,8 @@ void ocelot_get_strings(struct ocelot *ocelot, int port, u32 sset, u8 *data)
 		if (ocelot_stats_layout[i].name[0] == '\0')
 			continue;
 
-		memcpy(data + i * ETH_GSTRING_LEN, ocelot_stats_layout[i].name,
-		       ETH_GSTRING_LEN);
+		memcpy(data, ocelot_stats_layout[i].name, ETH_GSTRING_LEN);
+		data += ETH_GSTRING_LEN;
 	}
 }
 EXPORT_SYMBOL(ocelot_get_strings);
-- 
2.34.1