From: Danylo Vodopianov <dvo-...@napatech.com>
Meter module was added:
1. add/remove profile
2. create/destroy flow
3. add/remove meter policy
4. read/update stats
eth_dev_ops struct was extended with ops above.
Signed-off-by: Danylo Vodopianov <dvo-...@napatech.com>
---
drivers/net/ntnic/include/ntos_drv.h | 14 +
drivers/net/ntnic/meson.build | 2 +
.../net/ntnic/nthw/ntnic_meter/ntnic_meter.c | 483 ++++++++++++++++++
drivers/net/ntnic/ntnic_ethdev.c | 11 +-
drivers/net/ntnic/ntnic_mod_reg.c | 21 +
drivers/net/ntnic/ntnic_mod_reg.h | 12 +
6 files changed, 542 insertions(+), 1 deletion(-)
create mode 100644 drivers/net/ntnic/nthw/ntnic_meter/ntnic_meter.c
diff --git a/drivers/net/ntnic/include/ntos_drv.h
b/drivers/net/ntnic/include/ntos_drv.h
index 7b3c8ff3d6..f6ce442d17 100644
--- a/drivers/net/ntnic/include/ntos_drv.h
+++ b/drivers/net/ntnic/include/ntos_drv.h
@@ -12,6 +12,7 @@
#include <inttypes.h>
#include <rte_ether.h>
+#include "rte_mtr.h"
#include "stream_binary_flow_api.h"
#include "nthw_drv.h"
@@ -90,6 +91,19 @@ struct __rte_cache_aligned ntnic_tx_queue {
enum fpga_info_profile profile; /* Inline / Capture */
};
+struct nt_mtr_profile {
+ LIST_ENTRY(nt_mtr_profile) next;
+ uint32_t profile_id;
+ struct rte_mtr_meter_profile profile;
+};
+
+struct nt_mtr {
+ LIST_ENTRY(nt_mtr) next;
+ uint32_t mtr_id;
+ int shared;
+ struct nt_mtr_profile *profile;
+};
+
struct pmd_internals {
const struct rte_pci_device *pci_dev;
struct flow_eth_dev *flw_dev;
diff --git a/drivers/net/ntnic/meson.build b/drivers/net/ntnic/meson.build
index 8c6d02a5ec..ca46541ef3 100644
--- a/drivers/net/ntnic/meson.build
+++ b/drivers/net/ntnic/meson.build
@@ -17,6 +17,7 @@ includes = [
include_directories('nthw'),
include_directories('nthw/supported'),
include_directories('nthw/model'),
+ include_directories('nthw/ntnic_meter'),
include_directories('nthw/flow_filter'),
include_directories('nthw/flow_api'),
include_directories('nim/'),
@@ -92,6 +93,7 @@ sources = files(
'nthw/flow_filter/flow_nthw_tx_cpy.c',
'nthw/flow_filter/flow_nthw_tx_ins.c',
'nthw/flow_filter/flow_nthw_tx_rpl.c',
+ 'nthw/ntnic_meter/ntnic_meter.c',
'nthw/model/nthw_fpga_model.c',
'nthw/nthw_platform.c',
'nthw/nthw_rac.c',
diff --git a/drivers/net/ntnic/nthw/ntnic_meter/ntnic_meter.c
b/drivers/net/ntnic/nthw/ntnic_meter/ntnic_meter.c
new file mode 100644
index 0000000000..e4e8fe0c7d
--- /dev/null
+++ b/drivers/net/ntnic/nthw/ntnic_meter/ntnic_meter.c
@@ -0,0 +1,483 @@
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2023 Napatech A/S
+ */
+
+#include <stdint.h>
+
+#include <rte_common.h>
+#include <rte_meter.h>
+#include <rte_mtr.h>
+#include <rte_mtr_driver.h>
+#include <rte_malloc.h>
+
+#include "ntos_drv.h"
+#include "ntlog.h"
+#include "nt_util.h"
+#include "ntos_system.h"
+#include "ntnic_mod_reg.h"
+
+static inline uint8_t get_caller_id(uint16_t port)
+{
+ return MAX_VDPA_PORTS + (uint8_t)(port & 0x7f) + 1;
+}
+
+struct qos_integer_fractional {
+ uint32_t integer;
+ uint32_t fractional; /* 1/1024 */
+};
+
+/*
+ * Inline FLM metering
+ */
+
+static int eth_mtr_capabilities_get_inline(struct rte_eth_dev *eth_dev,
+ struct rte_mtr_capabilities *cap,
+ struct rte_mtr_error *error)
+{
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG(ERR, NTHW, "profile_inline module uninitialized");
+ return -1;
+ }
+
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+
+ uint8_t caller_id = get_caller_id(eth_dev->data->port_id);
+
+ if (!profile_inline_ops->flow_mtr_supported(internals->flw_dev)) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+ "Ethernet device does not support metering");
+ }
+
+ memset(cap, 0x0, sizeof(struct rte_mtr_capabilities));
+
+ /* MBR records use 28-bit integers */
+ cap->n_max =
profile_inline_ops->flow_mtr_meters_supported(internals->flw_dev,
+ caller_id);
+ cap->n_shared_max = cap->n_max;
+
+ cap->identical = 0;
+ cap->shared_identical = 0;
+
+ cap->shared_n_flows_per_mtr_max = UINT32_MAX;
+
+ /* Limited by number of MBR record ids per FLM learn record */
+ cap->chaining_n_mtrs_per_flow_max = 4;
+
+ cap->chaining_use_prev_mtr_color_supported = 0;
+ cap->chaining_use_prev_mtr_color_enforced = 0;
+
+ cap->meter_rate_max = (uint64_t)(0xfff << 0xf) * 1099;
+
+ cap->stats_mask = RTE_MTR_STATS_N_PKTS_GREEN |
RTE_MTR_STATS_N_BYTES_GREEN;
+
+ /* Only color-blind mode is supported */
+ cap->color_aware_srtcm_rfc2697_supported = 0;
+ cap->color_aware_trtcm_rfc2698_supported = 0;
+ cap->color_aware_trtcm_rfc4115_supported = 0;
+
+ /* Focused on RFC2698 for now */
+ cap->meter_srtcm_rfc2697_n_max = 0;
+ cap->meter_trtcm_rfc2698_n_max = cap->n_max;
+ cap->meter_trtcm_rfc4115_n_max = 0;
+
+ cap->meter_policy_n_max =
profile_inline_ops->flow_mtr_meter_policy_n_max();
+
+ /* Byte mode is supported */
+ cap->srtcm_rfc2697_byte_mode_supported = 0;
+ cap->trtcm_rfc2698_byte_mode_supported = 1;
+ cap->trtcm_rfc4115_byte_mode_supported = 0;
+
+ /* Packet mode not supported */
+ cap->srtcm_rfc2697_packet_mode_supported = 0;
+ cap->trtcm_rfc2698_packet_mode_supported = 0;
+ cap->trtcm_rfc4115_packet_mode_supported = 0;
+
+ return 0;
+}
+
+static int eth_mtr_meter_profile_add_inline(struct rte_eth_dev *eth_dev,
+ uint32_t meter_profile_id,
+ struct rte_mtr_meter_profile *profile,
+ struct rte_mtr_error *error __rte_unused)
+{
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG(ERR, NTHW, "profile_inline module uninitialized");
+ return -1;
+ }
+
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+
+ if (meter_profile_id >=
profile_inline_ops->flow_mtr_meter_policy_n_max())
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, NULL,
+ "Profile id out of range");
+
+ if (profile->packet_mode != 0) {
+ return -rte_mtr_error_set(error, EINVAL,
+ RTE_MTR_ERROR_TYPE_METER_PROFILE_PACKET_MODE,
NULL,
+ "Profile packet mode not supported");
+ }
+
+ if (profile->alg == RTE_MTR_SRTCM_RFC2697) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,
+ "RFC 2697 not supported");
+ }
+
+ if (profile->alg == RTE_MTR_TRTCM_RFC4115) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,
+ "RFC 4115 not supported");
+ }
+
+ if (profile->trtcm_rfc2698.cir != profile->trtcm_rfc2698.pir ||
+ profile->trtcm_rfc2698.cbs != profile->trtcm_rfc2698.pbs) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,
+ "Profile committed and peak rates must be
equal");
+ }
+
+ int res = profile_inline_ops->flow_mtr_set_profile(internals->flw_dev,
meter_profile_id,
+ profile->trtcm_rfc2698.cir,
+ profile->trtcm_rfc2698.cbs, 0, 0);
+
+ if (res) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_PROFILE, NULL,
+ "Profile could not be added.");
+ }
+
+ return 0;
+}
+
+static int eth_mtr_meter_profile_delete_inline(struct rte_eth_dev *eth_dev,
+ uint32_t meter_profile_id,
+ struct rte_mtr_error *error __rte_unused)
+{
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG(ERR, NTHW, "profile_inline module uninitialized");
+ return -1;
+ }
+
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+
+ if (meter_profile_id >=
profile_inline_ops->flow_mtr_meter_policy_n_max())
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, NULL,
+ "Profile id out of range");
+
+ profile_inline_ops->flow_mtr_set_profile(internals->flw_dev,
meter_profile_id, 0, 0, 0, 0);
+
+ return 0;
+}
+
+static int eth_mtr_meter_policy_add_inline(struct rte_eth_dev *eth_dev,
+ uint32_t policy_id,
+ struct rte_mtr_meter_policy_params *policy,
+ struct rte_mtr_error *error)
+{
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG(ERR, NTHW, "profile_inline module uninitialized");
+ return -1;
+ }
+
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+
+ if (policy_id >= profile_inline_ops->flow_mtr_meter_policy_n_max())
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_POLICY_ID, NULL,
+ "Policy id out of range");
+
+ const struct rte_flow_action *actions =
policy->actions[RTE_COLOR_GREEN];
+ int green_action_supported = (actions[0].type ==
RTE_FLOW_ACTION_TYPE_END) ||
+ (actions[0].type == RTE_FLOW_ACTION_TYPE_VOID &&
+ actions[1].type == RTE_FLOW_ACTION_TYPE_END) ||
+ (actions[0].type == RTE_FLOW_ACTION_TYPE_PASSTHRU &&
+ actions[1].type == RTE_FLOW_ACTION_TYPE_END);
+
+ actions = policy->actions[RTE_COLOR_YELLOW];
+ int yellow_action_supported = actions[0].type ==
RTE_FLOW_ACTION_TYPE_DROP &&
+ actions[1].type == RTE_FLOW_ACTION_TYPE_END;
+
+ actions = policy->actions[RTE_COLOR_RED];
+ int red_action_supported = actions[0].type == RTE_FLOW_ACTION_TYPE_DROP
&&
+ actions[1].type == RTE_FLOW_ACTION_TYPE_END;
+
+ if (green_action_supported == 0 || yellow_action_supported == 0 ||
+ red_action_supported == 0) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_POLICY, NULL,
+ "Unsupported meter policy actions");
+ }
+
+ if (profile_inline_ops->flow_mtr_set_policy(internals->flw_dev,
policy_id, 1)) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_POLICY, NULL,
+ "Policy could not be added");
+ }
+
+ return 0;
+}
+
+static int eth_mtr_meter_policy_delete_inline(struct rte_eth_dev *eth_dev
__rte_unused,
+ uint32_t policy_id,
+ struct rte_mtr_error *error __rte_unused)
+{
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG(ERR, NTHW, "profile_inline module uninitialized");
+ return -1;
+ }
+
+ if (policy_id >= profile_inline_ops->flow_mtr_meter_policy_n_max())
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_POLICY_ID, NULL,
+ "Policy id out of range");
+
+ return 0;
+}
+
+static int eth_mtr_create_inline(struct rte_eth_dev *eth_dev,
+ uint32_t mtr_id,
+ struct rte_mtr_params *params,
+ int shared,
+ struct rte_mtr_error *error)
+{
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG(ERR, NTHW, "profile_inline module uninitialized");
+ return -1;
+ }
+
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+
+ uint8_t caller_id = get_caller_id(eth_dev->data->port_id);
+
+ if (params->use_prev_mtr_color != 0 || params->dscp_table != NULL) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
+ "Only color blind mode is supported");
+ }
+
+ uint64_t allowed_stats_mask = RTE_MTR_STATS_N_PKTS_GREEN |
RTE_MTR_STATS_N_BYTES_GREEN;
+
+ if ((params->stats_mask & ~allowed_stats_mask) != 0) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
+ "Requested color stats not supported");
+ }
+
+ if (params->meter_enable == 0) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
+ "Disabled meters not supported");
+ }
+
+ if (shared == 0) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
+ "Only shared mtrs are supported");
+ }
+
+ if (params->meter_profile_id >=
profile_inline_ops->flow_mtr_meter_policy_n_max())
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_PROFILE_ID, NULL,
+ "Profile id out of range");
+
+ if (params->meter_policy_id >=
profile_inline_ops->flow_mtr_meter_policy_n_max())
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_POLICY_ID, NULL,
+ "Policy id out of range");
+
+ if (mtr_id >=
+
profile_inline_ops->flow_mtr_meters_supported(internals->flw_dev, caller_id)) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
+ "MTR id is out of range");
+ }
+
+ int res = profile_inline_ops->flow_mtr_create_meter(internals->flw_dev,
+ caller_id,
+ mtr_id,
+ params->meter_profile_id,
+ params->meter_policy_id,
+ params->stats_mask);
+
+ if (res) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+ "Failed to offload to hardware");
+ }
+
+ return 0;
+}
+
+static int eth_mtr_destroy_inline(struct rte_eth_dev *eth_dev,
+ uint32_t mtr_id,
+ struct rte_mtr_error *error __rte_unused)
+{
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG(ERR, NTHW, "profile_inline module uninitialized");
+ return -1;
+ }
+
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+
+ uint8_t caller_id = get_caller_id(eth_dev->data->port_id);
+
+ if (mtr_id >=
+
profile_inline_ops->flow_mtr_meters_supported(internals->flw_dev, caller_id)) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
+ "MTR id is out of range");
+ }
+
+ if (profile_inline_ops->flow_mtr_destroy_meter(internals->flw_dev,
caller_id, mtr_id)) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+ "Failed to offload to hardware");
+ }
+
+ return 0;
+}
+
+static int eth_mtr_stats_adjust_inline(struct rte_eth_dev *eth_dev,
+ uint32_t mtr_id,
+ uint64_t adjust_value,
+ struct rte_mtr_error *error)
+{
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG(ERR, NTHW, "profile_inline module uninitialized");
+ return -1;
+ }
+
+ const uint64_t adjust_bit = 1ULL << 63;
+ const uint64_t probe_bit = 1ULL << 62;
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+ uint8_t caller_id = get_caller_id(eth_dev->data->port_id);
+
+ if (mtr_id >=
+
profile_inline_ops->flow_mtr_meters_supported(internals->flw_dev, caller_id)) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
+ "MTR id is out of range");
+ }
+
+ if (adjust_value & adjust_bit) {
+ adjust_value &= adjust_bit - 1;
+
+ if (adjust_value > (uint64_t)UINT32_MAX) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_MTR_PARAMS,
+ NULL, "Adjust value is out of range");
+ }
+
+ if
(profile_inline_ops->flm_mtr_adjust_stats(internals->flw_dev, caller_id, mtr_id,
+ (uint32_t)adjust_value)) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Failed to adjust offloaded MTR");
+ }
+
+ return 0;
+ }
+
+ if (adjust_value & probe_bit) {
+ if (mtr_id >=
+
profile_inline_ops->flow_mtr_meters_supported(internals->flw_dev,
+ caller_id)) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_MTR_PARAMS,
+ NULL, "MTR id is out of range");
+ }
+
+ if
(profile_inline_ops->flow_mtr_probe_meter(internals->flw_dev, caller_id,
+ mtr_id)) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Failed to offload to hardware");
+ }
+
+ return 0;
+ }
+
+ return -rte_mtr_error_set(error, EINVAL, RTE_MTR_ERROR_TYPE_MTR_PARAMS,
NULL,
+ "Use of meter stats update requires bit 63 or bit 62 of
\"stats_mask\" must be 1.");
+}
+
+static int eth_mtr_stats_read_inline(struct rte_eth_dev *eth_dev,
+ uint32_t mtr_id,
+ struct rte_mtr_stats *stats,
+ uint64_t *stats_mask,
+ int clear,
+ struct rte_mtr_error *error)
+{
+ const struct profile_inline_ops *profile_inline_ops =
get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL) {
+ NT_LOG(ERR, NTHW, "profile_inline module uninitialized");
+ return -1;
+ }
+
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+
+ uint8_t caller_id = get_caller_id(eth_dev->data->port_id);
+
+ if (mtr_id >=
+
profile_inline_ops->flow_mtr_meters_supported(internals->flw_dev, caller_id)) {
+ return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_MTR_PARAMS, NULL,
+ "MTR id is out of range");
+ }
+
+ memset(stats, 0x0, sizeof(struct rte_mtr_stats));
+ profile_inline_ops->flm_mtr_read_stats(internals->flw_dev, caller_id,
mtr_id, stats_mask,
+ &stats->n_pkts[RTE_COLOR_GREEN],
+ &stats->n_bytes[RTE_COLOR_GREEN], clear);
+
+ return 0;
+}
+
+/*
+ * Ops setup
+ */
+
+static const struct rte_mtr_ops mtr_ops_inline = {
+ .capabilities_get = eth_mtr_capabilities_get_inline,
+ .meter_profile_add = eth_mtr_meter_profile_add_inline,
+ .meter_profile_delete = eth_mtr_meter_profile_delete_inline,
+ .create = eth_mtr_create_inline,
+ .destroy = eth_mtr_destroy_inline,
+ .meter_policy_add = eth_mtr_meter_policy_add_inline,
+ .meter_policy_delete = eth_mtr_meter_policy_delete_inline,
+ .stats_update = eth_mtr_stats_adjust_inline,
+ .stats_read = eth_mtr_stats_read_inline,
+};
+
+static int eth_mtr_ops_get(struct rte_eth_dev *eth_dev, void *ops)
+{
+ struct pmd_internals *internals = (struct pmd_internals
*)eth_dev->data->dev_private;
+ ntdrv_4ga_t *p_nt_drv = &internals->p_drv->ntdrv;
+ enum fpga_info_profile profile =
p_nt_drv->adapter_info.fpga_info.profile;
+
+ switch (profile) {
+ case FPGA_INFO_PROFILE_INLINE:
+ *(const struct rte_mtr_ops **)ops = &mtr_ops_inline;
+ break;
+
+ case FPGA_INFO_PROFILE_UNKNOWN:
+
+ /* fallthrough */
+ case FPGA_INFO_PROFILE_CAPTURE:
+
+ /* fallthrough */
+ default:
+ NT_LOG(ERR, NTHW, "" PCIIDENT_PRINT_STR ": fpga profile not
supported",
+ PCIIDENT_TO_DOMAIN(p_nt_drv->pciident),
+ PCIIDENT_TO_BUSNR(p_nt_drv->pciident),
+ PCIIDENT_TO_DEVNR(p_nt_drv->pciident),
+ PCIIDENT_TO_FUNCNR(p_nt_drv->pciident));
+ return -1;
+ }
+
+ return 0;
+}
+
+static struct meter_ops_s meter_ops = {
+ .eth_mtr_ops_get = eth_mtr_ops_get,
+};
+
+void meter_init(void)
+{
+ NT_LOG(DBG, NTNIC, "Meter ops initialized");
+ register_meter_ops(&meter_ops);
+}
diff --git a/drivers/net/ntnic/ntnic_ethdev.c b/drivers/net/ntnic/ntnic_ethdev.c
index eca67dbd62..e53882b343 100644
--- a/drivers/net/ntnic/ntnic_ethdev.c
+++ b/drivers/net/ntnic/ntnic_ethdev.c
@@ -1684,7 +1684,7 @@ static int rss_hash_conf_get(struct rte_eth_dev *eth_dev,
struct rte_eth_rss_con
return 0;
}
-static const struct eth_dev_ops nthw_eth_dev_ops = {
+static struct eth_dev_ops nthw_eth_dev_ops = {
.dev_configure = eth_dev_configure,
.dev_start = eth_dev_start,
.dev_stop = eth_dev_stop,
@@ -1707,6 +1707,7 @@ static const struct eth_dev_ops nthw_eth_dev_ops = {
.mac_addr_add = eth_mac_addr_add,
.mac_addr_set = eth_mac_addr_set,
.set_mc_addr_list = eth_set_mc_addr_list,
+ .mtr_ops_get = NULL,
.flow_ops_get = dev_flow_ops_get,
.xstats_get = eth_xstats_get,
.xstats_get_names = eth_xstats_get_names,
@@ -2170,6 +2171,14 @@ nthw_pci_dev_init(struct rte_pci_device *pci_dev)
return -1;
}
+ const struct meter_ops_s *meter_ops = get_meter_ops();
+
+ if (meter_ops != NULL)
+ nthw_eth_dev_ops.mtr_ops_get = meter_ops->eth_mtr_ops_get;
+
+ else
+ NT_LOG(DBG, NTNIC, "Meter module is not initialized");
+
/* Initialize the queue system */
if (err == 0) {
sg_ops = get_sg_ops();
diff --git a/drivers/net/ntnic/ntnic_mod_reg.c
b/drivers/net/ntnic/ntnic_mod_reg.c
index 6737d18a6f..10aa778a57 100644
--- a/drivers/net/ntnic/ntnic_mod_reg.c
+++ b/drivers/net/ntnic/ntnic_mod_reg.c
@@ -19,6 +19,27 @@ const struct sg_ops_s *get_sg_ops(void)
return sg_ops;
}
+/*
+ *
+ */
+static struct meter_ops_s *meter_ops;
+
+void register_meter_ops(struct meter_ops_s *ops)
+{
+ meter_ops = ops;
+}
+
+const struct meter_ops_s *get_meter_ops(void)
+{
+ if (meter_ops == NULL)
+ meter_init();
+
+ return meter_ops;
+}
+
+/*
+ *
+ */
static const struct ntnic_filter_ops *ntnic_filter_ops;
void register_ntnic_filter_ops(const struct ntnic_filter_ops *ops)
diff --git a/drivers/net/ntnic/ntnic_mod_reg.h
b/drivers/net/ntnic/ntnic_mod_reg.h
index 1e9dcd549f..3fbbee6490 100644
--- a/drivers/net/ntnic/ntnic_mod_reg.h
+++ b/drivers/net/ntnic/ntnic_mod_reg.h
@@ -115,6 +115,18 @@ void register_sg_ops(struct sg_ops_s *ops);
const struct sg_ops_s *get_sg_ops(void);
void sg_init(void);
+/* Meter ops section */
+struct meter_ops_s {
+ int (*eth_mtr_ops_get)(struct rte_eth_dev *eth_dev, void *ops);
+};
+
+void register_meter_ops(struct meter_ops_s *ops);
+const struct meter_ops_s *get_meter_ops(void);
+void meter_init(void);
+
+/*
+ *
+ */
struct ntnic_filter_ops {
int (*poll_statistics)(struct pmd_internals *internals);
};
--
2.45.0
