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:   Shenwei Wang <shenwei.wang@nxp.com>
To:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
Cc:     Jesper Dangaard Brouer <hawk@kernel.org>,
        Ilias Apalodimas <ilias.apalodimas@linaro.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        John Fastabend <john.fastabend@gmail.com>,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        imx@lists.linux.dev, Shenwei Wang <shenwei.wang@nxp.com>
Subject: [PATCH v5 3/3] net: fec: add page pool statistics
Date:   Tue, 15 Nov 2022 14:49:51 -0600
Message-Id: <20221115204951.370217-4-shenwei.wang@nxp.com>
In-Reply-To: <20221115204951.370217-1-shenwei.wang@nxp.com>
References: <20221115204951.370217-1-shenwei.wang@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?RLTqxAuWSJp9vO6Oi74sLEi99yZxm5PplD6jjxQz65nVZYYXIjaOxnkBXDIm?=
 =?us-ascii?Q?Uf9iFsFsuIp4/eAyB9TePjrg28vFzpoM3143L8ddIC7IfOpIhIrXkQgi/1XY?=
 =?us-ascii?Q?TGOiX2ky4xknwi8/E+Kq8J9R8rT9IDfP+2YSbBbW/jSFp+k6HsbDLWGBrXer?=
 =?us-ascii?Q?Ofc+d9Xw81onO3xoJnImwe3M231sjbvtZZFURmbLvqUTns5KI0dyk5yirSp5?=
 =?us-ascii?Q?W23eWYM/GG/RbyZqK7ThEZooFK8OKbMthRwFglQQ9O1ie2VC/3z+xYQQSx9u?=
 =?us-ascii?Q?4ZiXKCNeWDSKZ8Wgm+tTQFEBCGMKSkIbFYZQIm68eZIgGty0DHu9A40K2qLV?=
 =?us-ascii?Q?OsBqp3XHM9HBuiUmw1muPACoUxMjW0h2lw3Myiu2R/7LcWEcX0hI2U6gvUgq?=
 =?us-ascii?Q?TtVqclUx4N6quVrqJkRghU0RPPFq1+WQMcg9cNB/Lb2cP4O9kNdKaalyxl0W?=
 =?us-ascii?Q?rhbFSlIL1ZOZ2/PSF3ifz5s7hWXlowoHv2h67PR+AJCHKpw5XOoRqJ27B9Gr?=
 =?us-ascii?Q?4YB433wGvYeC7HGyZQPCG2cHQC/xCSzNLS1f414D2m34bvg5ayoL2Drs8dEc?=
 =?us-ascii?Q?nY3EO9BT5Mq9DIrjfpHYkTQSGFB5yk/9j0k+vzYSbztWiFIYbN34tAYXvy74?=
 =?us-ascii?Q?RbEm/2TB3hzK+vkdjCXvMOQ+oNOfRYIuCiH29tZdOkWmZZMAXOWnSm1dU85w?=
 =?us-ascii?Q?k5HDYIHhN5w+XaBUTU0qfyS0Zmbphkor5BFb4nH9Ps1AwoCdHPqj22zgUBOv?=
 =?us-ascii?Q?fmUH5a2a9speeTn8BiS+ki4i3D4Qc33/KRDgMgCypP1qwvcfRk7rHgPoGl9M?=
 =?us-ascii?Q?UPqH8whjswLd5PCNuKT11LR4598gOEVyr6xqfgUBTvN7K4sV+r87o9BfiWS8?=
 =?us-ascii?Q?e9a1Iywj3l8O85LqAYbjSTJV1ruhJv5RDjbKrZDMnDHLi2t9sSJqC64RSWEN?=
 =?us-ascii?Q?b1nFZGark8clu8RrVma8OoBujEN02P5mDrN/kANnY8WQPNTh5MkbKoy4obV0?=
 =?us-ascii?Q?hI0poaR0XL73VRhGKtAy8+9PUOj4YyMZ0EAJAiWqVZEVYQX+jraOdSpMtNXM?=
 =?us-ascii?Q?/b2u24K8fHph4U0I7XTcDzxBDwMDdA22X81Y2KTc7fYCyQxusCt5oUhzfxZO?=
 =?us-ascii?Q?4AO3ydcIcmYGWLT4NutDFUxQaxejsNAiir4JZWqebZh8fvrJr/mJIdp5C+nV?=
 =?us-ascii?Q?3Ctgb37pgi/EB1MNyiV9FrM+zM68t5wJMuaRldKD+Nv6l9Slolx3kBggYwcj?=
 =?us-ascii?Q?hcqDWZ3LYorBr/uJub6xlovCte9qWUHlJV1sjdWu2saUgrqob7tLV2KCEt8S?=
 =?us-ascii?Q?jkmNN53KwaPNTdudDpOr9U+hQewJhls6QGQ0UjcbPkNailh3Z7r9u6zSjHIn?=
 =?us-ascii?Q?VwnLfFYymtP0V6mlBulvCn3filobx51WXW4KBIPpG9cVV1mX4IQAvhPURp2B?=
 =?us-ascii?Q?VcvWP5L1dPPmwjpsSInNGsotnvytS+Y40KRXZJwGFugxYiZLQIhAwe63dJwi?=
 =?us-ascii?Q?aMpDr29ttE32oBQ2VTmKDaAk1wtkg9+r/0q+nY0fxf0jq3/tlmLLNGU4CS+z?=
 =?us-ascii?Q?4+z3OGSVuFJSIv4A1Nop0dxmawtG9Q2tOXc1cOzZ?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 525f1f06-9446-408c-b0b0-08dac74b0515
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9185.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2022 20:50:25.0472
 (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: UMwhrdbenGfTfKBkrOgKJ7Pbo1DZlwi9wVd/PiQZ874PrVpAt/+NV8AXuuX+lF5UbbLSBnBX6TAqcl3hAyfEkw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB7129
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

add page pool statistics to ethtool stats.

Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
---
 drivers/net/ethernet/freescale/fec_main.c | 24 ++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index bb2157022022..ae905ea1ab7d 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -2755,6 +2755,24 @@ static void fec_enet_get_xdp_stats(struct fec_enet_private *fep, u64 *data)
 	memcpy(data, xdp_stats, sizeof(xdp_stats));
 }
 
+static void fec_enet_page_pool_stats(struct fec_enet_private *fep, u64 *data)
+{
+	struct page_pool_stats stats = {};
+	struct fec_enet_priv_rx_q *rxq;
+	int i;
+
+	for (i = fep->num_rx_queues - 1; i >= 0; i--) {
+		rxq = fep->rx_queue[i];
+
+		if (!rxq->page_pool)
+			continue;
+
+		page_pool_get_stats(rxq->page_pool, &stats);
+	}
+
+	page_pool_ethtool_stats_get(data, &stats);
+}
+
 static void fec_enet_get_ethtool_stats(struct net_device *dev,
 				       struct ethtool_stats *stats, u64 *data)
 {
@@ -2768,6 +2786,8 @@ static void fec_enet_get_ethtool_stats(struct net_device *dev,
 
 	fec_enet_get_xdp_stats(fep, data);
 	data += XDP_STATS_TOTAL;
+
+	fec_enet_page_pool_stats(fep, data);
 }
 
 static void fec_enet_get_strings(struct net_device *netdev,
@@ -2784,6 +2804,7 @@ static void fec_enet_get_strings(struct net_device *netdev,
 			strscpy(data, fec_xdp_stat_strs[i], ETH_GSTRING_LEN);
 			data += ETH_GSTRING_LEN;
 		}
+		page_pool_ethtool_stats_get_strings(data);
 		break;
 	case ETH_SS_TEST:
 		net_selftest_get_strings(data);
@@ -2795,7 +2816,8 @@ static int fec_enet_get_sset_count(struct net_device *dev, int sset)
 {
 	switch (sset) {
 	case ETH_SS_STATS:
-		return (ARRAY_SIZE(fec_stats) + XDP_STATS_TOTAL);
+		return (ARRAY_SIZE(fec_stats) + XDP_STATS_TOTAL
+				+ page_pool_ethtool_stats_get_count());
 	case ETH_SS_TEST:
 		return net_selftest_get_count();
 	default:
-- 
2.34.1