From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 3DA1F45B96;
Tue, 22 Oct 2024 00:39:59 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 2C9E140B90;
Tue, 22 Oct 2024 00:39:59 +0200 (CEST)
Received: from egress-ip11a.ess.de.barracuda.com
(egress-ip11a.ess.de.barracuda.com [18.184.203.234])
by mails.dpdk.org (Postfix) with ESMTP id 543D84069F
for <dev@dpdk.org>; Tue, 22 Oct 2024 00:39:57 +0200 (CEST)
Received: from EUR05-VI1-obe.outbound.protection.outlook.com
(mail-vi1eur05lp2176.outbound.protection.outlook.com [104.47.17.176]) by
mx-outbound46-162.eu-central-1c.ess.aws.cudaops.com (version=TLSv1.2
cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
Mon, 21 Oct 2024 22:39:55 +0000
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=j6znkilCtWmFEodRN1nu4XGpmn7E/O56hgjbF8U9kV3M+PuJoKou5H68EnkRjWTx79reYsYb60nWiPcVeAlLNGXokcqGOkFLW3Cy+nXZwYQShhmwpG2RAk/uIebv0nk8ZkT5oBAnvuT9obJwbPc4eAFPk0VJzA8kCFA8ya61k/l6wQBZZSpCnEA3lEL9Mt/hRrAMViqq2pU/z9fC9IFuW3uhXDd4Scoe8GmEI3xuVJRO1cg2XEJ/Lbl4nEIPSHW8ah+ROmo5/iMoj8e3hMe5Ch+MltqpkchC6IF4c7F/u0+TtjVFUU9YYwhMFtiOuJZF61G+bp9qtBLlIX5aqgaS+g==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector10001;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=n+S2yTkAV1xyll+UZycrSDgV6cASy9EwRezUuB/QzQ0=;
b=De1RqCcaWpb9rIsbHEpZ5btZg3pAJOPbJhB5XrFO8S+Boi8HGgURQroTcAzdYU2MTq1zQ4BFL646VDcVX5kENbZ2vTjoaOfoQcURUVhyFuqmf0A+WylMs/LRMNkztNRgLFSfmgkCM8k0pCticTDl30y0DpcdLLBNUCLyWAOwFKryZTGoFlt9WvXT3uY7HdS+Lh8hcgEOgvcmkHAmSKiNT5hfw45gSPSbSD9IkC2Ye1chefrT961G6YpZIbVjfcWeJ/ivO7cGBQWnfkOjMaaS66/Emn3GcCl01ILTNGc8UVx8ZeqrhkB5+jM0463MUj75u8OtcqSfh2z65hTCyqJNHQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=fail (sender ip is
178.72.21.4) smtp.rcpttodomain=dpdk.org smtp.mailfrom=napatech.com;
dmarc=fail (p=reject sp=reject pct=100) action=oreject
header.from=napatech.com; dkim=none (message not signed); arc=none (0)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=napatech.com;
s=selector1;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=n+S2yTkAV1xyll+UZycrSDgV6cASy9EwRezUuB/QzQ0=;
b=k5OsrFyfa2CA9Vs5NQc35TOssEOzYfNfWZ4VaD1omT8Zvny2s9JLizGBEk3kYvI1C76OfRLo8y4PyBEM7IxOyQhCE/8gvwn01GkkKwWtR+k7aWgJIqpey/Y5hoUTfQCraerdHyubMmECaBizqeKzckLkee1Odpn6T3Ks7hS1Qas=
Received: from AS9PR04CA0149.eurprd04.prod.outlook.com (2603:10a6:20b:48a::22)
by AM7P190MB0792.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:11a::17)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.28; Mon, 21 Oct
2024 21:06:14 +0000
Received: from AMS0EPF000001A8.eurprd05.prod.outlook.com
(2603:10a6:20b:48a:cafe::89) by AS9PR04CA0149.outlook.office365.com
(2603:10a6:20b:48a::22) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.29 via Frontend
Transport; Mon, 21 Oct 2024 21:06:14 +0000
X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 178.72.21.4)
smtp.mailfrom=napatech.com; dkim=none (message not signed)
header.d=none;dmarc=fail action=oreject header.from=napatech.com;
Received-SPF: Fail (protection.outlook.com: domain of napatech.com does not
designate 178.72.21.4 as permitted sender) receiver=protection.outlook.com;
client-ip=178.72.21.4; helo=localhost.localdomain;
Received: from localhost.localdomain (178.72.21.4) by
AMS0EPF000001A8.mail.protection.outlook.com (10.167.16.148) with Microsoft
SMTP Server id 15.20.8093.14 via Frontend Transport; Mon, 21 Oct 2024
21:06:14 +0000
From: Serhii Iliushyk <sil-plv@napatech.com>
To: dev@dpdk.org
Cc: mko-plv@napatech.com, sil-plv@napatech.com, ckm@napatech.com,
andrew.rybchenko@oktetlabs.ru, ferruh.yigit@amd.com,
Danylo Vodopianov <dvo-plv@napatech.com>
Subject: [PATCH v1 61/73] net/ntnic: add xstats
Date: Mon, 21 Oct 2024 23:05:03 +0200
Message-ID: <20241021210527.2075431-62-sil-plv@napatech.com>
X-Mailer: git-send-email 2.45.0
In-Reply-To: <20241021210527.2075431-1-sil-plv@napatech.com>
References: <20241021210527.2075431-1-sil-plv@napatech.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: AMS0EPF000001A8:EE_|AM7P190MB0792:EE_
Content-Type: text/plain
X-MS-Office365-Filtering-Correlation-Id: 7ef397e4-4136-41cc-0c87-08dcf21432d7
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
ARA:13230040|82310400026|1800799024|36860700013|376014;
X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?405cnNzhSc6hjZi3guqsEbHqqr1SK1/spUbVx/4czczTcVEG4AkK226i+9kN?=
=?us-ascii?Q?vkAbKBgaHdV9TRvapGTE30BEi9bnlM4VRhhB5IHJyZsD/z8AxDhnmi9OanhY?=
=?us-ascii?Q?v3kEtspTgu8O8u2HARrwDAZ/LMZgQKwz533ITdymqLIQhlqH+H08mo2ccYts?=
=?us-ascii?Q?SViHF5rtUbILGQCejzJr8IH4D/C8aSg3OZMW29d0JHD18w7GIj+mBZXhJBUj?=
=?us-ascii?Q?D07GSoJLeyBGWjn1JLZy9JpCmEUW2E0VYMVqoM2TnPgfPFuLUEGzV6KlgOJ9?=
=?us-ascii?Q?Sq7Bd7zLT+dIifgk3iYbx+XKCIcIRELFvjyKeJLT3/MHH8uAscLmYrpsAsY2?=
=?us-ascii?Q?7MYJGQg2rRqcJeaX1CfVxRdZ4oas+oPlbaZWOjq9gglns9CwPghdPOunw+LO?=
=?us-ascii?Q?WgZpRQuNgdslV79o7svi3z0qF5Nc7VZaqQL8Eol03VLRyjllIgLz5/HJlF48?=
=?us-ascii?Q?0Fg679DbuvypMBQ2wpCqqY0t9eOA0xSpMszOirA2n2K25u8AT87p7CHfj0uW?=
=?us-ascii?Q?vimMSGnzgooWjSn6P232l00F7URq9TgL6H+eHYwBnSUgz/WEzPnuOuEIiLy9?=
=?us-ascii?Q?sz0R2akOWKikk0X6CjgY340ON1f426ooJpR9rcB4NLJet04P2l7xqYu31IGO?=
=?us-ascii?Q?mjWw3MDkcQaPLWanOSdEQIqN9x1mgGZzVULE3lEzdD/I+AN+U79BARNTzecJ?=
=?us-ascii?Q?C10rImb/DRnhu4TJJs3Cik4BfdwMs/7sDeTMNVpWblx/j6VUhUnzclHDlc6b?=
=?us-ascii?Q?H0D21zUTGBzoVrxUcm5VjN8Fc+Mg1EcLaTigadR9fkD4nML/GHmSgCydceWS?=
=?us-ascii?Q?TnmuFxziRPA3PouMSTDSg5KsKWk+3OQFce7I1M9fq3uXmNzgVFrr6ZYDl8P3?=
=?us-ascii?Q?JYGOp0yFoNkJAzf6Kknjs/TGQMkgVPgwRnUG9LAxJny2l2TOyXzkKkAbzqzA?=
=?us-ascii?Q?Oq64JdtwJZkItiEgkjVXtEcOUpD6UlLljw5HLlwp0ZEggrtkHLavLoS5OzJ0?=
=?us-ascii?Q?8DoDJM+r53ZYXtP/UeKKhCmFK8MqCzAQdWfTYTMfSHO7X455snf6oiNB2V3n?=
=?us-ascii?Q?VRb6pCQTFJBiKpuIVhivvIfqyrpp6SBI3lbEWNzDtwGtFup14UkRIcnr7fBJ?=
=?us-ascii?Q?BYFzNZjOJaEiRS3f9Sdu2xdBYAtPl53LzzhD0OhrMfLca/RT+W7Ex+3jYWQa?=
=?us-ascii?Q?NGw9fZoPV+2XZHytelDropufryOcBoyXoY4v01ckzxO7UWFCrolvXMLDcQ03?=
=?us-ascii?Q?pF3zNeiCRmDFKiWV43x1IV2oSNTO4nru5mQ9USrfY998Mmq+03FfJKAQlkNN?=
=?us-ascii?Q?EQ82fPd0WM7kDMSUzozFvrblQcdftxLwfY61A66NwVobRukbcCgUFYEOuQmn?=
=?us-ascii?Q?7by8k4qVUrx/XYHe+vluqVv+G+/UJgdobPD07KCKLzeC1m36ig=3D=3D?=
X-Forefront-Antispam-Report: CIP:178.72.21.4; CTRY:DK; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:localhost.localdomain; PTR:InfoDomainNonexistent;
CAT:NONE; SFS:(13230040)(82310400026)(1800799024)(36860700013)(376014);
DIR:OUT; SFP:1102;
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: zPyGvqV8S4JYiQ+4Xvm3A2+VoY3aC4RgtCLsu9jPTWn+j8UToihznMUH48Br9rqMhzXgKZq/AANXc5QRuac2KfM+IE9d5I2Xf0jMEtZRQRV0d9Qmg/lG9a/0ddAcZxoFCszBboAN5mN1HnEZWE3NiuUX2joAxk65ct/WEuu37J/5NpDngwIn8l3DzRUAY3MhOs8AvlM0Lxu7WAKRMPKquCisVOTFywf0+356N+dww9IFug0zruNk2iHW9FAt17eS0cOIwwdNl/qpNgJzOSel0HwJdxArtzaEXNnxUMRGFUWg6wJ+HnTIgseF71HlHJz/lmIdxUazzmF6avw4fZ0rvI8CRc+/W2D/jxBpkiEqkhvlbDFc411HFeavM2JCMg6mHQkFjdU2wqoBdEDaE3HGoih5X2dpWot6fWJ92uY6Isrf7ejX/yHa6+HAzObGRGnTB9HmQu7/rk6fHL+W+VAFa+/OhO+jfJb20PCKSLOLKl8ZcgmXrIuRPrP5Z/DPmAdRWRbBBkbt47KoZRueGhmF/4dcoMWvZXDDoJoGtTgLP3ZC0/dOFXyWP8fS0jXU+Stpxfyxot3kdeOvl5hSfcfOq7m1ViFsmn3YHW808fdalmvrBr/vSb6BWcyL5M6/DBhc3a957WoCFiSRk4lcYFa8oajyl0vPePzd0T227+bJm90=
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2024 21:06:14.4271 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 7ef397e4-4136-41cc-0c87-08dcf21432d7
X-MS-Exchange-CrossTenant-Id: c4540d0b-728a-4233-9da5-9ea30c7ec3ed
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=c4540d0b-728a-4233-9da5-9ea30c7ec3ed; Ip=[178.72.21.4];
Helo=[localhost.localdomain]
X-MS-Exchange-CrossTenant-AuthSource: AMS0EPF000001A8.eurprd05.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7P190MB0792
X-OriginatorOrg: napatech.com
X-BESS-ID: 1729550395-311938-13027-44311-1
X-BESS-VER: 2019.1_20241018.1852
X-BESS-Apparent-Source-IP: 104.47.17.176
X-BESS-Parts: H4sIAAAAAAACA4uuVkqtKFGyUioBkjpK+cVKVsaWRuYGQGYGUNQ4Kc3UxDLJ1N
zCLNXE2DTNzMwszcA02cDIwDI5LSXVQKk2FgCTsqsNQgAAAA==
X-BESS-Outbound-Spam-Score: 0.50
X-BESS-Outbound-Spam-Report: Code version 3.2,
rules version 3.2.2.259884 [from
cloudscan17-111.eu-central-1b.ess.aws.cudaops.com]
Rule breakdown below
pts rule name description
---- ---------------------- --------------------------------
0.50 BSF_RULE7568M META: Custom Rule 7568M
0.00 BSF_BESS_OUTBOUND META: BESS Outbound
X-BESS-Outbound-Spam-Status: SCORE=0.50 using account:ESS113687 scores of
KILL_LEVEL=7.0 tests=BSF_RULE7568M, BSF_BESS_OUTBOUND
X-BESS-BRTS-Status: 1
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
From: Danylo Vodopianov <dvo-plv@napatech.com>
Extended statistics implementation and
initialization were added.
eth_dev_ops api was extended with new xstats apis.
Signed-off-by: Danylo Vodopianov <dvo-plv@napatech.com>
---
doc/guides/nics/features/ntnic.ini | 1 +
drivers/net/ntnic/include/ntnic_stat.h | 36 +
drivers/net/ntnic/meson.build | 1 +
drivers/net/ntnic/ntnic_ethdev.c | 112 +++
drivers/net/ntnic/ntnic_mod_reg.c | 15 +
drivers/net/ntnic/ntnic_mod_reg.h | 28 +
drivers/net/ntnic/ntnic_xstats/ntnic_xstats.c | 829 ++++++++++++++++++
7 files changed, 1022 insertions(+)
create mode 100644 drivers/net/ntnic/ntnic_xstats/ntnic_xstats.c
diff --git a/doc/guides/nics/features/ntnic.ini b/doc/guides/nics/features/ntnic.ini
index 64351bcdc7..947c7ba3a1 100644
--- a/doc/guides/nics/features/ntnic.ini
+++ b/doc/guides/nics/features/ntnic.ini
@@ -13,6 +13,7 @@ Multicast MAC filter = Y
RSS hash = Y
RSS key update = Y
Basic stats = Y
+Extended stats = Y
Linux = Y
x86-64 = Y
diff --git a/drivers/net/ntnic/include/ntnic_stat.h b/drivers/net/ntnic/include/ntnic_stat.h
index 0735dbc085..4d4affa3cf 100644
--- a/drivers/net/ntnic/include/ntnic_stat.h
+++ b/drivers/net/ntnic/include/ntnic_stat.h
@@ -169,6 +169,39 @@ struct port_counters_v2 {
};
struct flm_counters_v1 {
+ /* FLM 0.17 */
+ uint64_t current;
+ uint64_t learn_done;
+ uint64_t learn_ignore;
+ uint64_t learn_fail;
+ uint64_t unlearn_done;
+ uint64_t unlearn_ignore;
+ uint64_t auto_unlearn_done;
+ uint64_t auto_unlearn_ignore;
+ uint64_t auto_unlearn_fail;
+ uint64_t timeout_unlearn_done;
+ uint64_t rel_done;
+ uint64_t rel_ignore;
+ /* FLM 0.20 */
+ uint64_t prb_done;
+ uint64_t prb_ignore;
+ uint64_t sta_done;
+ uint64_t inf_done;
+ uint64_t inf_skip;
+ uint64_t pck_hit;
+ uint64_t pck_miss;
+ uint64_t pck_unh;
+ uint64_t pck_dis;
+ uint64_t csh_hit;
+ uint64_t csh_miss;
+ uint64_t csh_unh;
+ uint64_t cuc_start;
+ uint64_t cuc_move;
+ /* FLM 0.17 Load */
+ uint64_t load_lps;
+ uint64_t load_aps;
+ uint64_t max_lps;
+ uint64_t max_aps;
};
struct nt4ga_stat_s {
@@ -200,6 +233,9 @@ struct nt4ga_stat_s {
struct host_buffer_counters *mp_stat_structs_hb;
struct port_load_counters *mp_port_load;
+ int flm_stat_ver;
+ struct flm_counters_v1 *mp_stat_structs_flm;
+
/* Rx/Tx totals: */
uint64_t n_totals_reset_timestamp; /* timestamp for last totals reset */
diff --git a/drivers/net/ntnic/meson.build b/drivers/net/ntnic/meson.build
index a6c4fec0be..e59ac5bdb3 100644
--- a/drivers/net/ntnic/meson.build
+++ b/drivers/net/ntnic/meson.build
@@ -31,6 +31,7 @@ sources = files(
'link_mgmt/nt4ga_link.c',
'nim/i2c_nim.c',
'ntnic_filter/ntnic_filter.c',
+ 'ntnic_xstats/ntnic_xstats.c',
'nthw/dbs/nthw_dbs.c',
'nthw/supported/nthw_fpga_9563_055_049_0000.c',
'nthw/supported/nthw_fpga_instances.c',
diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c
index f94340f489..f6a74c7df2 100644
--- a/drivers/net/ntnic/ntnic_ethdev.c
+++ b/drivers/net/ntnic/ntnic_ethdev.c
@@ -1496,6 +1496,113 @@ static int dev_flow_ops_get(struct rte_eth_dev *dev __rte_unused, const struct r
return 0;
}
+static int eth_xstats_get(struct rte_eth_dev *eth_dev, struct rte_eth_xstat *stats, unsigned int n)
+{
+ struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private;
+ struct drv_s *p_drv = internals->p_drv;
+ ntdrv_4ga_t *p_nt_drv = &p_drv->ntdrv;
+ nt4ga_stat_t *p_nt4ga_stat = &p_nt_drv->adapter_info.nt4ga_stat;
+ int if_index = internals->n_intf_no;
+ int nb_xstats;
+
+ const struct ntnic_xstats_ops *ntnic_xstats_ops = get_ntnic_xstats_ops();
+
+ if (ntnic_xstats_ops == NULL) {
+ NT_LOG(INF, NTNIC, "ntnic_xstats module not included");
+ return -1;
+ }
+
+ pthread_mutex_lock(&p_nt_drv->stat_lck);
+ nb_xstats = ntnic_xstats_ops->nthw_xstats_get(p_nt4ga_stat, stats, n, if_index);
+ pthread_mutex_unlock(&p_nt_drv->stat_lck);
+ return nb_xstats;
+}
+
+static int eth_xstats_get_by_id(struct rte_eth_dev *eth_dev,
+ const uint64_t *ids,
+ uint64_t *values,
+ unsigned int n)
+{
+ struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private;
+ struct drv_s *p_drv = internals->p_drv;
+ ntdrv_4ga_t *p_nt_drv = &p_drv->ntdrv;
+ nt4ga_stat_t *p_nt4ga_stat = &p_nt_drv->adapter_info.nt4ga_stat;
+ int if_index = internals->n_intf_no;
+ int nb_xstats;
+
+ const struct ntnic_xstats_ops *ntnic_xstats_ops = get_ntnic_xstats_ops();
+
+ if (ntnic_xstats_ops == NULL) {
+ NT_LOG(INF, NTNIC, "ntnic_xstats module not included");
+ return -1;
+ }
+
+ pthread_mutex_lock(&p_nt_drv->stat_lck);
+ nb_xstats =
+ ntnic_xstats_ops->nthw_xstats_get_by_id(p_nt4ga_stat, ids, values, n, if_index);
+ pthread_mutex_unlock(&p_nt_drv->stat_lck);
+ return nb_xstats;
+}
+
+static int eth_xstats_reset(struct rte_eth_dev *eth_dev)
+{
+ struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private;
+ struct drv_s *p_drv = internals->p_drv;
+ ntdrv_4ga_t *p_nt_drv = &p_drv->ntdrv;
+ nt4ga_stat_t *p_nt4ga_stat = &p_nt_drv->adapter_info.nt4ga_stat;
+ int if_index = internals->n_intf_no;
+
+ struct ntnic_xstats_ops *ntnic_xstats_ops = get_ntnic_xstats_ops();
+
+ if (ntnic_xstats_ops == NULL) {
+ NT_LOG(INF, NTNIC, "ntnic_xstats module not included");
+ return -1;
+ }
+
+ pthread_mutex_lock(&p_nt_drv->stat_lck);
+ ntnic_xstats_ops->nthw_xstats_reset(p_nt4ga_stat, if_index);
+ pthread_mutex_unlock(&p_nt_drv->stat_lck);
+ return dpdk_stats_reset(internals, p_nt_drv, if_index);
+}
+
+static int eth_xstats_get_names(struct rte_eth_dev *eth_dev,
+ struct rte_eth_xstat_name *xstats_names, unsigned int size)
+{
+ struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private;
+ struct drv_s *p_drv = internals->p_drv;
+ ntdrv_4ga_t *p_nt_drv = &p_drv->ntdrv;
+ nt4ga_stat_t *p_nt4ga_stat = &p_nt_drv->adapter_info.nt4ga_stat;
+
+ const struct ntnic_xstats_ops *ntnic_xstats_ops = get_ntnic_xstats_ops();
+
+ if (ntnic_xstats_ops == NULL) {
+ NT_LOG(INF, NTNIC, "ntnic_xstats module not included");
+ return -1;
+ }
+
+ return ntnic_xstats_ops->nthw_xstats_get_names(p_nt4ga_stat, xstats_names, size);
+}
+
+static int eth_xstats_get_names_by_id(struct rte_eth_dev *eth_dev,
+ const uint64_t *ids,
+ struct rte_eth_xstat_name *xstats_names,
+ unsigned int size)
+{
+ struct pmd_internals *internals = (struct pmd_internals *)eth_dev->data->dev_private;
+ struct drv_s *p_drv = internals->p_drv;
+ ntdrv_4ga_t *p_nt_drv = &p_drv->ntdrv;
+ nt4ga_stat_t *p_nt4ga_stat = &p_nt_drv->adapter_info.nt4ga_stat;
+ const struct ntnic_xstats_ops *ntnic_xstats_ops = get_ntnic_xstats_ops();
+
+ if (ntnic_xstats_ops == NULL) {
+ NT_LOG(INF, NTNIC, "ntnic_xstats module not included");
+ return -1;
+ }
+
+ return ntnic_xstats_ops->nthw_xstats_get_names_by_id(p_nt4ga_stat, xstats_names, ids,
+ size);
+}
+
static int
promiscuous_enable(struct rte_eth_dev __rte_unused(*dev))
{
@@ -1594,6 +1701,11 @@ static const struct eth_dev_ops nthw_eth_dev_ops = {
.mac_addr_set = eth_mac_addr_set,
.set_mc_addr_list = eth_set_mc_addr_list,
.flow_ops_get = dev_flow_ops_get,
+ .xstats_get = eth_xstats_get,
+ .xstats_get_names = eth_xstats_get_names,
+ .xstats_reset = eth_xstats_reset,
+ .xstats_get_by_id = eth_xstats_get_by_id,
+ .xstats_get_names_by_id = eth_xstats_get_names_by_id,
.promiscuous_enable = promiscuous_enable,
.rss_hash_update = eth_dev_rss_hash_update,
.rss_hash_conf_get = rss_hash_conf_get,
diff --git a/drivers/net/ntnic/ntnic_mod_reg.c b/drivers/net/ntnic/ntnic_mod_reg.c
index 355e2032b1..6737d18a6f 100644
--- a/drivers/net/ntnic/ntnic_mod_reg.c
+++ b/drivers/net/ntnic/ntnic_mod_reg.c
@@ -192,3 +192,18 @@ const struct rte_flow_ops *get_dev_flow_ops(void)
return dev_flow_ops;
}
+
+static struct ntnic_xstats_ops *ntnic_xstats_ops;
+
+void register_ntnic_xstats_ops(struct ntnic_xstats_ops *ops)
+{
+ ntnic_xstats_ops = ops;
+}
+
+struct ntnic_xstats_ops *get_ntnic_xstats_ops(void)
+{
+ if (ntnic_xstats_ops == NULL)
+ ntnic_xstats_ops_init();
+
+ return ntnic_xstats_ops;
+}
diff --git a/drivers/net/ntnic/ntnic_mod_reg.h b/drivers/net/ntnic/ntnic_mod_reg.h
index 8703d478b6..65e7972c68 100644
--- a/drivers/net/ntnic/ntnic_mod_reg.h
+++ b/drivers/net/ntnic/ntnic_mod_reg.h
@@ -7,6 +7,10 @@
#define __NTNIC_MOD_REG_H__
#include <stdint.h>
+
+#include "rte_ethdev.h"
+#include "rte_flow_driver.h"
+
#include "flow_api.h"
#include "stream_binary_flow_api.h"
#include "nthw_fpga_model.h"
@@ -354,4 +358,28 @@ void register_flow_filter_ops(const struct flow_filter_ops *ops);
const struct flow_filter_ops *get_flow_filter_ops(void);
void init_flow_filter(void);
+struct ntnic_xstats_ops {
+ int (*nthw_xstats_get_names)(nt4ga_stat_t *p_nt4ga_stat,
+ struct rte_eth_xstat_name *xstats_names,
+ unsigned int size);
+ int (*nthw_xstats_get)(nt4ga_stat_t *p_nt4ga_stat,
+ struct rte_eth_xstat *stats,
+ unsigned int n,
+ uint8_t port);
+ void (*nthw_xstats_reset)(nt4ga_stat_t *p_nt4ga_stat, uint8_t port);
+ int (*nthw_xstats_get_names_by_id)(nt4ga_stat_t *p_nt4ga_stat,
+ struct rte_eth_xstat_name *xstats_names,
+ const uint64_t *ids,
+ unsigned int size);
+ int (*nthw_xstats_get_by_id)(nt4ga_stat_t *p_nt4ga_stat,
+ const uint64_t *ids,
+ uint64_t *values,
+ unsigned int n,
+ uint8_t port);
+};
+
+void register_ntnic_xstats_ops(struct ntnic_xstats_ops *ops);
+struct ntnic_xstats_ops *get_ntnic_xstats_ops(void);
+void ntnic_xstats_ops_init(void);
+
#endif /* __NTNIC_MOD_REG_H__ */
diff --git a/drivers/net/ntnic/ntnic_xstats/ntnic_xstats.c b/drivers/net/ntnic/ntnic_xstats/ntnic_xstats.c
new file mode 100644
index 0000000000..7604afe6a0
--- /dev/null
+++ b/drivers/net/ntnic/ntnic_xstats/ntnic_xstats.c
@@ -0,0 +1,829 @@
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Napatech A/S
+ */
+
+#include <rte_ethdev.h>
+
+#include "include/ntdrv_4ga.h"
+#include "ntlog.h"
+#include "nthw_drv.h"
+#include "nthw_fpga.h"
+#include "stream_binary_flow_api.h"
+#include "ntnic_mod_reg.h"
+
+struct rte_nthw_xstats_names_s {
+ char name[RTE_ETH_XSTATS_NAME_SIZE];
+ uint8_t source;
+ unsigned int offset;
+};
+
+/*
+ * Extended stat for Capture/Inline - implements RMON
+ * FLM 0.17
+ */
+static struct rte_nthw_xstats_names_s nthw_cap_xstats_names_v1[] = {
+ { "rx_drop_events", 1, offsetof(struct port_counters_v2, drop_events) },
+ { "rx_octets", 1, offsetof(struct port_counters_v2, octets) },
+ { "rx_packets", 1, offsetof(struct port_counters_v2, pkts) },
+ { "rx_broadcast_packets", 1, offsetof(struct port_counters_v2, broadcast_pkts) },
+ { "rx_multicast_packets", 1, offsetof(struct port_counters_v2, multicast_pkts) },
+ { "rx_unicast_packets", 1, offsetof(struct port_counters_v2, unicast_pkts) },
+ { "rx_align_errors", 1, offsetof(struct port_counters_v2, pkts_alignment) },
+ { "rx_code_violation_errors", 1, offsetof(struct port_counters_v2, pkts_code_violation) },
+ { "rx_crc_errors", 1, offsetof(struct port_counters_v2, pkts_crc) },
+ { "rx_undersize_packets", 1, offsetof(struct port_counters_v2, undersize_pkts) },
+ { "rx_oversize_packets", 1, offsetof(struct port_counters_v2, oversize_pkts) },
+ { "rx_fragments", 1, offsetof(struct port_counters_v2, fragments) },
+ {
+ "rx_jabbers_not_truncated", 1,
+ offsetof(struct port_counters_v2, jabbers_not_truncated)
+ },
+ { "rx_jabbers_truncated", 1, offsetof(struct port_counters_v2, jabbers_truncated) },
+ { "rx_size_64_packets", 1, offsetof(struct port_counters_v2, pkts_64_octets) },
+ {
+ "rx_size_65_to_127_packets", 1,
+ offsetof(struct port_counters_v2, pkts_65_to_127_octets)
+ },
+ {
+ "rx_size_128_to_255_packets", 1,
+ offsetof(struct port_counters_v2, pkts_128_to_255_octets)
+ },
+ {
+ "rx_size_256_to_511_packets", 1,
+ offsetof(struct port_counters_v2, pkts_256_to_511_octets)
+ },
+ {
+ "rx_size_512_to_1023_packets", 1,
+ offsetof(struct port_counters_v2, pkts_512_to_1023_octets)
+ },
+ {
+ "rx_size_1024_to_1518_packets", 1,
+ offsetof(struct port_counters_v2, pkts_1024_to_1518_octets)
+ },
+ {
+ "rx_size_1519_to_2047_packets", 1,
+ offsetof(struct port_counters_v2, pkts_1519_to_2047_octets)
+ },
+ {
+ "rx_size_2048_to_4095_packets", 1,
+ offsetof(struct port_counters_v2, pkts_2048_to_4095_octets)
+ },
+ {
+ "rx_size_4096_to_8191_packets", 1,
+ offsetof(struct port_counters_v2, pkts_4096_to_8191_octets)
+ },
+ {
+ "rx_size_8192_to_max_packets", 1,
+ offsetof(struct port_counters_v2, pkts_8192_to_max_octets)
+ },
+ { "rx_ip_checksum_error", 1, offsetof(struct port_counters_v2, pkts_ip_chksum_error) },
+ { "rx_udp_checksum_error", 1, offsetof(struct port_counters_v2, pkts_udp_chksum_error) },
+ { "rx_tcp_checksum_error", 1, offsetof(struct port_counters_v2, pkts_tcp_chksum_error) },
+
+ { "tx_drop_events", 2, offsetof(struct port_counters_v2, drop_events) },
+ { "tx_octets", 2, offsetof(struct port_counters_v2, octets) },
+ { "tx_packets", 2, offsetof(struct port_counters_v2, pkts) },
+ { "tx_broadcast_packets", 2, offsetof(struct port_counters_v2, broadcast_pkts) },
+ { "tx_multicast_packets", 2, offsetof(struct port_counters_v2, multicast_pkts) },
+ { "tx_unicast_packets", 2, offsetof(struct port_counters_v2, unicast_pkts) },
+ { "tx_align_errors", 2, offsetof(struct port_counters_v2, pkts_alignment) },
+ { "tx_code_violation_errors", 2, offsetof(struct port_counters_v2, pkts_code_violation) },
+ { "tx_crc_errors", 2, offsetof(struct port_counters_v2, pkts_crc) },
+ { "tx_undersize_packets", 2, offsetof(struct port_counters_v2, undersize_pkts) },
+ { "tx_oversize_packets", 2, offsetof(struct port_counters_v2, oversize_pkts) },
+ { "tx_fragments", 2, offsetof(struct port_counters_v2, fragments) },
+ {
+ "tx_jabbers_not_truncated", 2,
+ offsetof(struct port_counters_v2, jabbers_not_truncated)
+ },
+ { "tx_jabbers_truncated", 2, offsetof(struct port_counters_v2, jabbers_truncated) },
+ { "tx_size_64_packets", 2, offsetof(struct port_counters_v2, pkts_64_octets) },
+ {
+ "tx_size_65_to_127_packets", 2,
+ offsetof(struct port_counters_v2, pkts_65_to_127_octets)
+ },
+ {
+ "tx_size_128_to_255_packets", 2,
+ offsetof(struct port_counters_v2, pkts_128_to_255_octets)
+ },
+ {
+ "tx_size_256_to_511_packets", 2,
+ offsetof(struct port_counters_v2, pkts_256_to_511_octets)
+ },
+ {
+ "tx_size_512_to_1023_packets", 2,
+ offsetof(struct port_counters_v2, pkts_512_to_1023_octets)
+ },
+ {
+ "tx_size_1024_to_1518_packets", 2,
+ offsetof(struct port_counters_v2, pkts_1024_to_1518_octets)
+ },
+ {
+ "tx_size_1519_to_2047_packets", 2,
+ offsetof(struct port_counters_v2, pkts_1519_to_2047_octets)
+ },
+ {
+ "tx_size_2048_to_4095_packets", 2,
+ offsetof(struct port_counters_v2, pkts_2048_to_4095_octets)
+ },
+ {
+ "tx_size_4096_to_8191_packets", 2,
+ offsetof(struct port_counters_v2, pkts_4096_to_8191_octets)
+ },
+ {
+ "tx_size_8192_to_max_packets", 2,
+ offsetof(struct port_counters_v2, pkts_8192_to_max_octets)
+ },
+
+ /* FLM 0.17 */
+ { "flm_count_current", 3, offsetof(struct flm_counters_v1, current) },
+ { "flm_count_learn_done", 3, offsetof(struct flm_counters_v1, learn_done) },
+ { "flm_count_learn_ignore", 3, offsetof(struct flm_counters_v1, learn_ignore) },
+ { "flm_count_learn_fail", 3, offsetof(struct flm_counters_v1, learn_fail) },
+ { "flm_count_unlearn_done", 3, offsetof(struct flm_counters_v1, unlearn_done) },
+ { "flm_count_unlearn_ignore", 3, offsetof(struct flm_counters_v1, unlearn_ignore) },
+ { "flm_count_auto_unlearn_done", 3, offsetof(struct flm_counters_v1, auto_unlearn_done) },
+ {
+ "flm_count_auto_unlearn_ignore", 3,
+ offsetof(struct flm_counters_v1, auto_unlearn_ignore)
+ },
+ { "flm_count_auto_unlearn_fail", 3, offsetof(struct flm_counters_v1, auto_unlearn_fail) },
+ {
+ "flm_count_timeout_unlearn_done", 3,
+ offsetof(struct flm_counters_v1, timeout_unlearn_done)
+ },
+ { "flm_count_rel_done", 3, offsetof(struct flm_counters_v1, rel_done) },
+ { "flm_count_rel_ignore", 3, offsetof(struct flm_counters_v1, rel_ignore) },
+ { "flm_count_prb_done", 3, offsetof(struct flm_counters_v1, prb_done) },
+ { "flm_count_prb_ignore", 3, offsetof(struct flm_counters_v1, prb_ignore) }
+};
+
+/*
+ * Extended stat for Capture/Inline - implements RMON
+ * FLM 0.18
+ */
+static struct rte_nthw_xstats_names_s nthw_cap_xstats_names_v2[] = {
+ { "rx_drop_events", 1, offsetof(struct port_counters_v2, drop_events) },
+ { "rx_octets", 1, offsetof(struct port_counters_v2, octets) },
+ { "rx_packets", 1, offsetof(struct port_counters_v2, pkts) },
+ { "rx_broadcast_packets", 1, offsetof(struct port_counters_v2, broadcast_pkts) },
+ { "rx_multicast_packets", 1, offsetof(struct port_counters_v2, multicast_pkts) },
+ { "rx_unicast_packets", 1, offsetof(struct port_counters_v2, unicast_pkts) },
+ { "rx_align_errors", 1, offsetof(struct port_counters_v2, pkts_alignment) },
+ { "rx_code_violation_errors", 1, offsetof(struct port_counters_v2, pkts_code_violation) },
+ { "rx_crc_errors", 1, offsetof(struct port_counters_v2, pkts_crc) },
+ { "rx_undersize_packets", 1, offsetof(struct port_counters_v2, undersize_pkts) },
+ { "rx_oversize_packets", 1, offsetof(struct port_counters_v2, oversize_pkts) },
+ { "rx_fragments", 1, offsetof(struct port_counters_v2, fragments) },
+ {
+ "rx_jabbers_not_truncated", 1,
+ offsetof(struct port_counters_v2, jabbers_not_truncated)
+ },
+ { "rx_jabbers_truncated", 1, offsetof(struct port_counters_v2, jabbers_truncated) },
+ { "rx_size_64_packets", 1, offsetof(struct port_counters_v2, pkts_64_octets) },
+ {
+ "rx_size_65_to_127_packets", 1,
+ offsetof(struct port_counters_v2, pkts_65_to_127_octets)
+ },
+ {
+ "rx_size_128_to_255_packets", 1,
+ offsetof(struct port_counters_v2, pkts_128_to_255_octets)
+ },
+ {
+ "rx_size_256_to_511_packets", 1,
+ offsetof(struct port_counters_v2, pkts_256_to_511_octets)
+ },
+ {
+ "rx_size_512_to_1023_packets", 1,
+ offsetof(struct port_counters_v2, pkts_512_to_1023_octets)
+ },
+ {
+ "rx_size_1024_to_1518_packets", 1,
+ offsetof(struct port_counters_v2, pkts_1024_to_1518_octets)
+ },
+ {
+ "rx_size_1519_to_2047_packets", 1,
+ offsetof(struct port_counters_v2, pkts_1519_to_2047_octets)
+ },
+ {
+ "rx_size_2048_to_4095_packets", 1,
+ offsetof(struct port_counters_v2, pkts_2048_to_4095_octets)
+ },
+ {
+ "rx_size_4096_to_8191_packets", 1,
+ offsetof(struct port_counters_v2, pkts_4096_to_8191_octets)
+ },
+ {
+ "rx_size_8192_to_max_packets", 1,
+ offsetof(struct port_counters_v2, pkts_8192_to_max_octets)
+ },
+ { "rx_ip_checksum_error", 1, offsetof(struct port_counters_v2, pkts_ip_chksum_error) },
+ { "rx_udp_checksum_error", 1, offsetof(struct port_counters_v2, pkts_udp_chksum_error) },
+ { "rx_tcp_checksum_error", 1, offsetof(struct port_counters_v2, pkts_tcp_chksum_error) },
+
+ { "tx_drop_events", 2, offsetof(struct port_counters_v2, drop_events) },
+ { "tx_octets", 2, offsetof(struct port_counters_v2, octets) },
+ { "tx_packets", 2, offsetof(struct port_counters_v2, pkts) },
+ { "tx_broadcast_packets", 2, offsetof(struct port_counters_v2, broadcast_pkts) },
+ { "tx_multicast_packets", 2, offsetof(struct port_counters_v2, multicast_pkts) },
+ { "tx_unicast_packets", 2, offsetof(struct port_counters_v2, unicast_pkts) },
+ { "tx_align_errors", 2, offsetof(struct port_counters_v2, pkts_alignment) },
+ { "tx_code_violation_errors", 2, offsetof(struct port_counters_v2, pkts_code_violation) },
+ { "tx_crc_errors", 2, offsetof(struct port_counters_v2, pkts_crc) },
+ { "tx_undersize_packets", 2, offsetof(struct port_counters_v2, undersize_pkts) },
+ { "tx_oversize_packets", 2, offsetof(struct port_counters_v2, oversize_pkts) },
+ { "tx_fragments", 2, offsetof(struct port_counters_v2, fragments) },
+ {
+ "tx_jabbers_not_truncated", 2,
+ offsetof(struct port_counters_v2, jabbers_not_truncated)
+ },
+ { "tx_jabbers_truncated", 2, offsetof(struct port_counters_v2, jabbers_truncated) },
+ { "tx_size_64_packets", 2, offsetof(struct port_counters_v2, pkts_64_octets) },
+ {
+ "tx_size_65_to_127_packets", 2,
+ offsetof(struct port_counters_v2, pkts_65_to_127_octets)
+ },
+ {
+ "tx_size_128_to_255_packets", 2,
+ offsetof(struct port_counters_v2, pkts_128_to_255_octets)
+ },
+ {
+ "tx_size_256_to_511_packets", 2,
+ offsetof(struct port_counters_v2, pkts_256_to_511_octets)
+ },
+ {
+ "tx_size_512_to_1023_packets", 2,
+ offsetof(struct port_counters_v2, pkts_512_to_1023_octets)
+ },
+ {
+ "tx_size_1024_to_1518_packets", 2,
+ offsetof(struct port_counters_v2, pkts_1024_to_1518_octets)
+ },
+ {
+ "tx_size_1519_to_2047_packets", 2,
+ offsetof(struct port_counters_v2, pkts_1519_to_2047_octets)
+ },
+ {
+ "tx_size_2048_to_4095_packets", 2,
+ offsetof(struct port_counters_v2, pkts_2048_to_4095_octets)
+ },
+ {
+ "tx_size_4096_to_8191_packets", 2,
+ offsetof(struct port_counters_v2, pkts_4096_to_8191_octets)
+ },
+ {
+ "tx_size_8192_to_max_packets", 2,
+ offsetof(struct port_counters_v2, pkts_8192_to_max_octets)
+ },
+
+ /* FLM 0.17 */
+ { "flm_count_current", 3, offsetof(struct flm_counters_v1, current) },
+ { "flm_count_learn_done", 3, offsetof(struct flm_counters_v1, learn_done) },
+ { "flm_count_learn_ignore", 3, offsetof(struct flm_counters_v1, learn_ignore) },
+ { "flm_count_learn_fail", 3, offsetof(struct flm_counters_v1, learn_fail) },
+ { "flm_count_unlearn_done", 3, offsetof(struct flm_counters_v1, unlearn_done) },
+ { "flm_count_unlearn_ignore", 3, offsetof(struct flm_counters_v1, unlearn_ignore) },
+ { "flm_count_auto_unlearn_done", 3, offsetof(struct flm_counters_v1, auto_unlearn_done) },
+ {
+ "flm_count_auto_unlearn_ignore", 3,
+ offsetof(struct flm_counters_v1, auto_unlearn_ignore)
+ },
+ { "flm_count_auto_unlearn_fail", 3, offsetof(struct flm_counters_v1, auto_unlearn_fail) },
+ {
+ "flm_count_timeout_unlearn_done", 3,
+ offsetof(struct flm_counters_v1, timeout_unlearn_done)
+ },
+ { "flm_count_rel_done", 3, offsetof(struct flm_counters_v1, rel_done) },
+ { "flm_count_rel_ignore", 3, offsetof(struct flm_counters_v1, rel_ignore) },
+ { "flm_count_prb_done", 3, offsetof(struct flm_counters_v1, prb_done) },
+ { "flm_count_prb_ignore", 3, offsetof(struct flm_counters_v1, prb_ignore) },
+
+ /* FLM 0.20 */
+ { "flm_count_sta_done", 3, offsetof(struct flm_counters_v1, sta_done) },
+ { "flm_count_inf_done", 3, offsetof(struct flm_counters_v1, inf_done) },
+ { "flm_count_inf_skip", 3, offsetof(struct flm_counters_v1, inf_skip) },
+ { "flm_count_pck_hit", 3, offsetof(struct flm_counters_v1, pck_hit) },
+ { "flm_count_pck_miss", 3, offsetof(struct flm_counters_v1, pck_miss) },
+ { "flm_count_pck_unh", 3, offsetof(struct flm_counters_v1, pck_unh) },
+ { "flm_count_pck_dis", 3, offsetof(struct flm_counters_v1, pck_dis) },
+ { "flm_count_csh_hit", 3, offsetof(struct flm_counters_v1, csh_hit) },
+ { "flm_count_csh_miss", 3, offsetof(struct flm_counters_v1, csh_miss) },
+ { "flm_count_csh_unh", 3, offsetof(struct flm_counters_v1, csh_unh) },
+ { "flm_count_cuc_start", 3, offsetof(struct flm_counters_v1, cuc_start) },
+ { "flm_count_cuc_move", 3, offsetof(struct flm_counters_v1, cuc_move) }
+};
+
+/*
+ * Extended stat for Capture/Inline - implements RMON
+ * STA 0.9
+ */
+
+static struct rte_nthw_xstats_names_s nthw_cap_xstats_names_v3[] = {
+ { "rx_drop_events", 1, offsetof(struct port_counters_v2, drop_events) },
+ { "rx_octets", 1, offsetof(struct port_counters_v2, octets) },
+ { "rx_packets", 1, offsetof(struct port_counters_v2, pkts) },
+ { "rx_broadcast_packets", 1, offsetof(struct port_counters_v2, broadcast_pkts) },
+ { "rx_multicast_packets", 1, offsetof(struct port_counters_v2, multicast_pkts) },
+ { "rx_unicast_packets", 1, offsetof(struct port_counters_v2, unicast_pkts) },
+ { "rx_align_errors", 1, offsetof(struct port_counters_v2, pkts_alignment) },
+ { "rx_code_violation_errors", 1, offsetof(struct port_counters_v2, pkts_code_violation) },
+ { "rx_crc_errors", 1, offsetof(struct port_counters_v2, pkts_crc) },
+ { "rx_undersize_packets", 1, offsetof(struct port_counters_v2, undersize_pkts) },
+ { "rx_oversize_packets", 1, offsetof(struct port_counters_v2, oversize_pkts) },
+ { "rx_fragments", 1, offsetof(struct port_counters_v2, fragments) },
+ {
+ "rx_jabbers_not_truncated", 1,
+ offsetof(struct port_counters_v2, jabbers_not_truncated)
+ },
+ { "rx_jabbers_truncated", 1, offsetof(struct port_counters_v2, jabbers_truncated) },
+ { "rx_size_64_packets", 1, offsetof(struct port_counters_v2, pkts_64_octets) },
+ {
+ "rx_size_65_to_127_packets", 1,
+ offsetof(struct port_counters_v2, pkts_65_to_127_octets)
+ },
+ {
+ "rx_size_128_to_255_packets", 1,
+ offsetof(struct port_counters_v2, pkts_128_to_255_octets)
+ },
+ {
+ "rx_size_256_to_511_packets", 1,
+ offsetof(struct port_counters_v2, pkts_256_to_511_octets)
+ },
+ {
+ "rx_size_512_to_1023_packets", 1,
+ offsetof(struct port_counters_v2, pkts_512_to_1023_octets)
+ },
+ {
+ "rx_size_1024_to_1518_packets", 1,
+ offsetof(struct port_counters_v2, pkts_1024_to_1518_octets)
+ },
+ {
+ "rx_size_1519_to_2047_packets", 1,
+ offsetof(struct port_counters_v2, pkts_1519_to_2047_octets)
+ },
+ {
+ "rx_size_2048_to_4095_packets", 1,
+ offsetof(struct port_counters_v2, pkts_2048_to_4095_octets)
+ },
+ {
+ "rx_size_4096_to_8191_packets", 1,
+ offsetof(struct port_counters_v2, pkts_4096_to_8191_octets)
+ },
+ {
+ "rx_size_8192_to_max_packets", 1,
+ offsetof(struct port_counters_v2, pkts_8192_to_max_octets)
+ },
+ { "rx_ip_checksum_error", 1, offsetof(struct port_counters_v2, pkts_ip_chksum_error) },
+ { "rx_udp_checksum_error", 1, offsetof(struct port_counters_v2, pkts_udp_chksum_error) },
+ { "rx_tcp_checksum_error", 1, offsetof(struct port_counters_v2, pkts_tcp_chksum_error) },
+
+ { "tx_drop_events", 2, offsetof(struct port_counters_v2, drop_events) },
+ { "tx_octets", 2, offsetof(struct port_counters_v2, octets) },
+ { "tx_packets", 2, offsetof(struct port_counters_v2, pkts) },
+ { "tx_broadcast_packets", 2, offsetof(struct port_counters_v2, broadcast_pkts) },
+ { "tx_multicast_packets", 2, offsetof(struct port_counters_v2, multicast_pkts) },
+ { "tx_unicast_packets", 2, offsetof(struct port_counters_v2, unicast_pkts) },
+ { "tx_align_errors", 2, offsetof(struct port_counters_v2, pkts_alignment) },
+ { "tx_code_violation_errors", 2, offsetof(struct port_counters_v2, pkts_code_violation) },
+ { "tx_crc_errors", 2, offsetof(struct port_counters_v2, pkts_crc) },
+ { "tx_undersize_packets", 2, offsetof(struct port_counters_v2, undersize_pkts) },
+ { "tx_oversize_packets", 2, offsetof(struct port_counters_v2, oversize_pkts) },
+ { "tx_fragments", 2, offsetof(struct port_counters_v2, fragments) },
+ {
+ "tx_jabbers_not_truncated", 2,
+ offsetof(struct port_counters_v2, jabbers_not_truncated)
+ },
+ { "tx_jabbers_truncated", 2, offsetof(struct port_counters_v2, jabbers_truncated) },
+ { "tx_size_64_packets", 2, offsetof(struct port_counters_v2, pkts_64_octets) },
+ {
+ "tx_size_65_to_127_packets", 2,
+ offsetof(struct port_counters_v2, pkts_65_to_127_octets)
+ },
+ {
+ "tx_size_128_to_255_packets", 2,
+ offsetof(struct port_counters_v2, pkts_128_to_255_octets)
+ },
+ {
+ "tx_size_256_to_511_packets", 2,
+ offsetof(struct port_counters_v2, pkts_256_to_511_octets)
+ },
+ {
+ "tx_size_512_to_1023_packets", 2,
+ offsetof(struct port_counters_v2, pkts_512_to_1023_octets)
+ },
+ {
+ "tx_size_1024_to_1518_packets", 2,
+ offsetof(struct port_counters_v2, pkts_1024_to_1518_octets)
+ },
+ {
+ "tx_size_1519_to_2047_packets", 2,
+ offsetof(struct port_counters_v2, pkts_1519_to_2047_octets)
+ },
+ {
+ "tx_size_2048_to_4095_packets", 2,
+ offsetof(struct port_counters_v2, pkts_2048_to_4095_octets)
+ },
+ {
+ "tx_size_4096_to_8191_packets", 2,
+ offsetof(struct port_counters_v2, pkts_4096_to_8191_octets)
+ },
+ {
+ "tx_size_8192_to_max_packets", 2,
+ offsetof(struct port_counters_v2, pkts_8192_to_max_octets)
+ },
+
+ /* FLM 0.17 */
+ { "flm_count_current", 3, offsetof(struct flm_counters_v1, current) },
+ { "flm_count_learn_done", 3, offsetof(struct flm_counters_v1, learn_done) },
+ { "flm_count_learn_ignore", 3, offsetof(struct flm_counters_v1, learn_ignore) },
+ { "flm_count_learn_fail", 3, offsetof(struct flm_counters_v1, learn_fail) },
+ { "flm_count_unlearn_done", 3, offsetof(struct flm_counters_v1, unlearn_done) },
+ { "flm_count_unlearn_ignore", 3, offsetof(struct flm_counters_v1, unlearn_ignore) },
+ { "flm_count_auto_unlearn_done", 3, offsetof(struct flm_counters_v1, auto_unlearn_done) },
+ {
+ "flm_count_auto_unlearn_ignore", 3,
+ offsetof(struct flm_counters_v1, auto_unlearn_ignore)
+ },
+ { "flm_count_auto_unlearn_fail", 3, offsetof(struct flm_counters_v1, auto_unlearn_fail) },
+ {
+ "flm_count_timeout_unlearn_done", 3,
+ offsetof(struct flm_counters_v1, timeout_unlearn_done)
+ },
+ { "flm_count_rel_done", 3, offsetof(struct flm_counters_v1, rel_done) },
+ { "flm_count_rel_ignore", 3, offsetof(struct flm_counters_v1, rel_ignore) },
+ { "flm_count_prb_done", 3, offsetof(struct flm_counters_v1, prb_done) },
+ { "flm_count_prb_ignore", 3, offsetof(struct flm_counters_v1, prb_ignore) },
+
+ /* FLM 0.20 */
+ { "flm_count_sta_done", 3, offsetof(struct flm_counters_v1, sta_done) },
+ { "flm_count_inf_done", 3, offsetof(struct flm_counters_v1, inf_done) },
+ { "flm_count_inf_skip", 3, offsetof(struct flm_counters_v1, inf_skip) },
+ { "flm_count_pck_hit", 3, offsetof(struct flm_counters_v1, pck_hit) },
+ { "flm_count_pck_miss", 3, offsetof(struct flm_counters_v1, pck_miss) },
+ { "flm_count_pck_unh", 3, offsetof(struct flm_counters_v1, pck_unh) },
+ { "flm_count_pck_dis", 3, offsetof(struct flm_counters_v1, pck_dis) },
+ { "flm_count_csh_hit", 3, offsetof(struct flm_counters_v1, csh_hit) },
+ { "flm_count_csh_miss", 3, offsetof(struct flm_counters_v1, csh_miss) },
+ { "flm_count_csh_unh", 3, offsetof(struct flm_counters_v1, csh_unh) },
+ { "flm_count_cuc_start", 3, offsetof(struct flm_counters_v1, cuc_start) },
+ { "flm_count_cuc_move", 3, offsetof(struct flm_counters_v1, cuc_move) },
+
+ /* FLM 0.17 */
+ { "flm_count_load_lps", 3, offsetof(struct flm_counters_v1, load_lps) },
+ { "flm_count_load_aps", 3, offsetof(struct flm_counters_v1, load_aps) },
+ { "flm_count_max_lps", 3, offsetof(struct flm_counters_v1, max_lps) },
+ { "flm_count_max_aps", 3, offsetof(struct flm_counters_v1, max_aps) },
+
+ { "rx_packet_per_second", 4, offsetof(struct port_load_counters, rx_pps) },
+ { "rx_max_packet_per_second", 4, offsetof(struct port_load_counters, rx_pps_max) },
+ { "rx_bits_per_second", 4, offsetof(struct port_load_counters, rx_bps) },
+ { "rx_max_bits_per_second", 4, offsetof(struct port_load_counters, rx_bps_max) },
+ { "tx_packet_per_second", 4, offsetof(struct port_load_counters, tx_pps) },
+ { "tx_max_packet_per_second", 4, offsetof(struct port_load_counters, tx_pps_max) },
+ { "tx_bits_per_second", 4, offsetof(struct port_load_counters, tx_bps) },
+ { "tx_max_bits_per_second", 4, offsetof(struct port_load_counters, tx_bps_max) }
+};
+
+#define NTHW_CAP_XSTATS_NAMES_V1 RTE_DIM(nthw_cap_xstats_names_v1)
+#define NTHW_CAP_XSTATS_NAMES_V2 RTE_DIM(nthw_cap_xstats_names_v2)
+#define NTHW_CAP_XSTATS_NAMES_V3 RTE_DIM(nthw_cap_xstats_names_v3)
+
+/*
+ * Container for the reset values
+ */
+#define NTHW_XSTATS_SIZE NTHW_CAP_XSTATS_NAMES_V3
+
+static uint64_t nthw_xstats_reset_val[NUM_ADAPTER_PORTS_MAX][NTHW_XSTATS_SIZE] = { 0 };
+
+/*
+ * These functions must only be called with stat mutex locked
+ */
+static int nthw_xstats_get(nt4ga_stat_t *p_nt4ga_stat,
+ struct rte_eth_xstat *stats,
+ unsigned int n,
+ uint8_t port)
+{
+ unsigned int i;
+ uint8_t *pld_ptr;
+ uint8_t *flm_ptr;
+ uint8_t *rx_ptr;
+ uint8_t *tx_ptr;
+ uint32_t nb_names;
+ struct rte_nthw_xstats_names_s *names;
+
+ pld_ptr = (uint8_t *)&p_nt4ga_stat->mp_port_load[port];
+ flm_ptr = (uint8_t *)p_nt4ga_stat->mp_stat_structs_flm;
+ rx_ptr = (uint8_t *)&p_nt4ga_stat->cap.mp_stat_structs_port_rx[port];
+ tx_ptr = (uint8_t *)&p_nt4ga_stat->cap.mp_stat_structs_port_tx[port];
+
+ if (p_nt4ga_stat->flm_stat_ver < 18) {
+ names = nthw_cap_xstats_names_v1;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V1;
+
+ } else if (p_nt4ga_stat->mp_nthw_stat->mn_stat_layout_version < 7 ||
+ p_nt4ga_stat->flm_stat_ver < 23) {
+ names = nthw_cap_xstats_names_v2;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V2;
+
+ } else {
+ names = nthw_cap_xstats_names_v3;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V3;
+ }
+
+ for (i = 0; i < n && i < nb_names; i++) {
+ stats[i].id = i;
+
+ switch (names[i].source) {
+ case 1:
+ /* RX stat */
+ stats[i].value = *((uint64_t *)&rx_ptr[names[i].offset]) -
+ nthw_xstats_reset_val[port][i];
+ break;
+
+ case 2:
+ /* TX stat */
+ stats[i].value = *((uint64_t *)&tx_ptr[names[i].offset]) -
+ nthw_xstats_reset_val[port][i];
+ break;
+
+ case 3:
+
+ /* FLM stat */
+ if (flm_ptr) {
+ stats[i].value = *((uint64_t *)&flm_ptr[names[i].offset]) -
+ nthw_xstats_reset_val[0][i];
+
+ } else {
+ stats[i].value = 0;
+ }
+
+ break;
+
+ case 4:
+
+ /* Port Load stat */
+ if (pld_ptr) {
+ /* No reset */
+ stats[i].value = *((uint64_t *)&pld_ptr[names[i].offset]);
+
+ } else {
+ stats[i].value = 0;
+ }
+
+ break;
+
+ default:
+ stats[i].value = 0;
+ break;
+ }
+ }
+
+ return i;
+}
+
+static int nthw_xstats_get_by_id(nt4ga_stat_t *p_nt4ga_stat,
+ const uint64_t *ids,
+ uint64_t *values,
+ unsigned int n,
+ uint8_t port)
+{
+ unsigned int i;
+ uint8_t *pld_ptr;
+ uint8_t *flm_ptr;
+ uint8_t *rx_ptr;
+ uint8_t *tx_ptr;
+ uint32_t nb_names;
+ struct rte_nthw_xstats_names_s *names;
+ int count = 0;
+
+ pld_ptr = (uint8_t *)&p_nt4ga_stat->mp_port_load[port];
+ flm_ptr = (uint8_t *)p_nt4ga_stat->mp_stat_structs_flm;
+ rx_ptr = (uint8_t *)&p_nt4ga_stat->cap.mp_stat_structs_port_rx[port];
+ tx_ptr = (uint8_t *)&p_nt4ga_stat->cap.mp_stat_structs_port_tx[port];
+
+ if (p_nt4ga_stat->flm_stat_ver < 18) {
+ names = nthw_cap_xstats_names_v1;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V1;
+
+ } else if (p_nt4ga_stat->mp_nthw_stat->mn_stat_layout_version < 7 ||
+ p_nt4ga_stat->flm_stat_ver < 23) {
+ names = nthw_cap_xstats_names_v2;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V2;
+
+ } else {
+ names = nthw_cap_xstats_names_v3;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V3;
+ }
+
+ for (i = 0; i < n; i++) {
+ if (ids[i] < nb_names) {
+ switch (names[ids[i]].source) {
+ case 1:
+ /* RX stat */
+ values[i] = *((uint64_t *)&rx_ptr[names[ids[i]].offset]) -
+ nthw_xstats_reset_val[port][ids[i]];
+ break;
+
+ case 2:
+ /* TX stat */
+ values[i] = *((uint64_t *)&tx_ptr[names[ids[i]].offset]) -
+ nthw_xstats_reset_val[port][ids[i]];
+ break;
+
+ case 3:
+
+ /* FLM stat */
+ if (flm_ptr) {
+ values[i] = *((uint64_t *)&flm_ptr[names[ids[i]].offset]) -
+ nthw_xstats_reset_val[0][ids[i]];
+
+ } else {
+ values[i] = 0;
+ }
+
+ break;
+
+ case 4:
+
+ /* Port Load stat */
+ if (pld_ptr) {
+ /* No reset */
+ values[i] = *((uint64_t *)&pld_ptr[names[i].offset]);
+
+ } else {
+ values[i] = 0;
+ }
+
+ break;
+
+ default:
+ values[i] = 0;
+ break;
+ }
+
+ count++;
+ }
+ }
+
+ return count;
+}
+
+static void nthw_xstats_reset(nt4ga_stat_t *p_nt4ga_stat, uint8_t port)
+{
+ unsigned int i;
+ uint8_t *flm_ptr;
+ uint8_t *rx_ptr;
+ uint8_t *tx_ptr;
+ uint32_t nb_names;
+ struct rte_nthw_xstats_names_s *names;
+
+ flm_ptr = (uint8_t *)p_nt4ga_stat->mp_stat_structs_flm;
+ rx_ptr = (uint8_t *)&p_nt4ga_stat->cap.mp_stat_structs_port_rx[port];
+ tx_ptr = (uint8_t *)&p_nt4ga_stat->cap.mp_stat_structs_port_tx[port];
+
+ if (p_nt4ga_stat->flm_stat_ver < 18) {
+ names = nthw_cap_xstats_names_v1;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V1;
+
+ } else if (p_nt4ga_stat->mp_nthw_stat->mn_stat_layout_version < 7 ||
+ p_nt4ga_stat->flm_stat_ver < 23) {
+ names = nthw_cap_xstats_names_v2;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V2;
+
+ } else {
+ names = nthw_cap_xstats_names_v3;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V3;
+ }
+
+ for (i = 0; i < nb_names; i++) {
+ switch (names[i].source) {
+ case 1:
+ /* RX stat */
+ nthw_xstats_reset_val[port][i] = *((uint64_t *)&rx_ptr[names[i].offset]);
+ break;
+
+ case 2:
+ /* TX stat */
+ nthw_xstats_reset_val[port][i] = *((uint64_t *)&tx_ptr[names[i].offset]);
+ break;
+
+ case 3:
+
+ /* FLM stat */
+ /* Reset makes no sense for flm_count_current */
+ /* Reset can't be used for load_lps, load_aps, max_lps and max_aps */
+ if (flm_ptr &&
+ (strcmp(names[i].name, "flm_count_current") != 0 &&
+ strcmp(names[i].name, "flm_count_load_lps") != 0 &&
+ strcmp(names[i].name, "flm_count_load_aps") != 0 &&
+ strcmp(names[i].name, "flm_count_max_lps") != 0 &&
+ strcmp(names[i].name, "flm_count_max_aps") != 0)) {
+ nthw_xstats_reset_val[0][i] =
+ *((uint64_t *)&flm_ptr[names[i].offset]);
+ }
+
+ break;
+
+ case 4:
+ /* Port load stat*/
+ /* No reset */
+ break;
+
+ default:
+ break;
+ }
+ }
+}
+
+/*
+ * These functions does not require stat mutex locked
+ */
+static int nthw_xstats_get_names(nt4ga_stat_t *p_nt4ga_stat,
+ struct rte_eth_xstat_name *xstats_names,
+ unsigned int size)
+{
+ int count = 0;
+ unsigned int i;
+ uint32_t nb_names;
+ struct rte_nthw_xstats_names_s *names;
+
+ if (p_nt4ga_stat->flm_stat_ver < 18) {
+ names = nthw_cap_xstats_names_v1;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V1;
+
+ } else if (p_nt4ga_stat->mp_nthw_stat->mn_stat_layout_version < 7 ||
+ p_nt4ga_stat->flm_stat_ver < 23) {
+ names = nthw_cap_xstats_names_v2;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V2;
+
+ } else {
+ names = nthw_cap_xstats_names_v3;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V3;
+ }
+
+ if (!xstats_names)
+ return nb_names;
+
+ for (i = 0; i < size && i < nb_names; i++) {
+ strlcpy(xstats_names[i].name, names[i].name, sizeof(xstats_names[i].name));
+ count++;
+ }
+
+ return count;
+}
+
+static int nthw_xstats_get_names_by_id(nt4ga_stat_t *p_nt4ga_stat,
+ struct rte_eth_xstat_name *xstats_names,
+ const uint64_t *ids,
+ unsigned int size)
+{
+ int count = 0;
+ unsigned int i;
+
+ uint32_t nb_names;
+ struct rte_nthw_xstats_names_s *names;
+
+ if (p_nt4ga_stat->flm_stat_ver < 18) {
+ names = nthw_cap_xstats_names_v1;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V1;
+
+ } else if (p_nt4ga_stat->mp_nthw_stat->mn_stat_layout_version < 7 ||
+ p_nt4ga_stat->flm_stat_ver < 23) {
+ names = nthw_cap_xstats_names_v2;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V2;
+
+ } else {
+ names = nthw_cap_xstats_names_v3;
+ nb_names = NTHW_CAP_XSTATS_NAMES_V3;
+ }
+
+ if (!xstats_names)
+ return nb_names;
+
+ for (i = 0; i < size; i++) {
+ if (ids[i] < nb_names) {
+ strlcpy(xstats_names[i].name,
+ names[ids[i]].name,
+ RTE_ETH_XSTATS_NAME_SIZE);
+ }
+
+ count++;
+ }
+
+ return count;
+}
+
+static struct ntnic_xstats_ops ops = {
+ .nthw_xstats_get_names = nthw_xstats_get_names,
+ .nthw_xstats_get = nthw_xstats_get,
+ .nthw_xstats_reset = nthw_xstats_reset,
+ .nthw_xstats_get_names_by_id = nthw_xstats_get_names_by_id,
+ .nthw_xstats_get_by_id = nthw_xstats_get_by_id
+};
+
+void ntnic_xstats_ops_init(void)
+{
+ NT_LOG_DBGX(DBG, NTNIC, "xstats module was initialized");
+ register_ntnic_xstats_ops(&ops);
+}
--
2.45.0