@@ -100,6 +100,8 @@ static int nt4ga_stat_init(struct adapter_info_s *p_adapter_info)
p_nt4ga_stat->mn_rx_ports = p_nthw_stat->m_nb_rx_ports;
p_nt4ga_stat->mn_tx_ports = p_nthw_stat->m_nb_tx_ports;
+
+ p_nt4ga_stat->mn_ifr_counters = p_nthw_stat->m_nb_ifr_counters;
}
return 0;
@@ -205,6 +207,9 @@ static int nt4ga_stat_setup(struct adapter_info_s *p_adapter_info)
p_nt4ga_stat->mp_stat_structs_flm->max_lps =
nthw_fpga_get_product_param(p_adapter_info->fpga_info.mp_fpga,
NT_FLM_LOAD_LPS_MAX, 0);
+
+ p_nt4ga_stat->mp_stat_structs_ifr =
+ calloc(1, sizeof(struct ifr_counters) * p_nt4ga_stat->mn_ifr_counters);
}
p_nt4ga_stat->mp_port_load =
@@ -556,6 +561,10 @@ static int nt4ga_stat_collect_cap_v1_stats(struct adapter_info_s *p_adapter_info
flow_filter_ops->flow_get_flm_stats(ndev, (uint64_t *)p_nt4ga_stat->mp_stat_structs_flm,
sizeof(struct flm_counters_v1) / sizeof(uint64_t));
+ /* Update and get IFR stats */
+ flow_filter_ops->flow_get_ifr_stats(ndev, (uint64_t *)p_nt4ga_stat->mp_stat_structs_ifr,
+ p_nt4ga_stat->mn_ifr_counters - 1);
+
/*
* Calculate correct load values:
* rpp = nthw_fpga_get_product_param(p_fpga, NT_RPP_PER_PS, 0);
@@ -230,5 +230,6 @@ int flow_nic_ref_resource(struct flow_nic_dev *ndev, enum res_type_e res_type, i
int flow_nic_deref_resource(struct flow_nic_dev *ndev, enum res_type_e res_type, int index);
int flow_get_flm_stats(struct flow_nic_dev *ndev, uint64_t *data, uint64_t size);
+int flow_get_ifr_stats(struct flow_nic_dev *ndev, uint64_t *data, uint8_t port_count);
#endif
@@ -899,6 +899,7 @@ enum hw_tpe_e {
HW_TPE_IFR_RCP_IPV6_EN,
HW_TPE_IFR_RCP_IPV6_DROP,
HW_TPE_IFR_RCP_MTU,
+ HW_TPE_IFR_COUNTERS_DROP,
HW_TPE_INS_RCP_DYN,
HW_TPE_INS_RCP_OFS,
HW_TPE_INS_RCP_LEN,
@@ -959,6 +960,12 @@ int hw_mod_tpe_ifr_rcp_flush(struct flow_api_backend_s *be, int start_idx, int c
int hw_mod_tpe_ifr_rcp_set(struct flow_api_backend_s *be, enum hw_tpe_e field, int index,
uint32_t value);
+int hw_mod_tpe_ifr_counters_update(struct flow_api_backend_s *be, int start_idx, int count);
+int hw_mod_tpe_ifr_counters_set(struct flow_api_backend_s *be, enum hw_tpe_e field, int index,
+ uint32_t value);
+int hw_mod_tpe_ifr_counters_get(struct flow_api_backend_s *be, enum hw_tpe_e field, int index,
+ uint32_t *value);
+
int hw_mod_tpe_ins_rcp_flush(struct flow_api_backend_s *be, int start_idx, int count);
int hw_mod_tpe_ins_rcp_set(struct flow_api_backend_s *be, enum hw_tpe_e field, int index,
uint32_t value);
@@ -1124,6 +1131,7 @@ struct flow_api_backend_ops {
int (*tpe_rpp_rcp_flush)(void *dev, const struct tpe_func_s *tpe, int index, int cnt);
int (*tpe_rpp_ifr_rcp_flush)(void *dev, const struct tpe_func_s *tpe, int index, int cnt);
int (*tpe_ifr_rcp_flush)(void *dev, const struct tpe_func_s *tpe, int index, int cnt);
+ int (*tpe_ifr_counters_update)(void *dev, const struct tpe_func_s *tpe, int index, int cnt);
int (*tpe_ins_rcp_flush)(void *dev, const struct tpe_func_s *tpe, int index, int cnt);
int (*tpe_rpl_rcp_flush)(void *dev, const struct tpe_func_s *tpe, int index, int cnt);
int (*tpe_rpl_ext_flush)(void *dev, const struct tpe_func_s *tpe, int index, int cnt);
@@ -104,6 +104,10 @@ struct tpe_v2_ifr_v1_rcp_s {
uint32_t mtu;
};
+struct tpe_v2_ifr_v1_counters_s {
+ uint32_t drop;
+};
+
struct hw_mod_tpe_v3_s {
struct tpe_v1_rpp_v0_rcp_s *rpp_rcp;
@@ -121,6 +125,7 @@ struct hw_mod_tpe_v3_s {
struct tpe_v2_rpp_v1_ifr_rcp_s *rpp_ifr_rcp;
struct tpe_v2_ifr_v1_rcp_s *ifr_rcp;
+ struct tpe_v2_ifr_v1_counters_s *ifr_counters;
};
#endif /* _HW_MOD_TPE_V3_H_ */
@@ -46,6 +46,7 @@ struct nthw_stat {
int m_nb_counters;
int m_nb_rpp_per_ps;
+ int m_nb_ifr_counters;
nthw_field_t *mp_fld_dma_ena;
nthw_field_t *mp_fld_cnt_clear;
@@ -204,6 +205,10 @@ struct flm_counters_v1 {
uint64_t max_aps;
};
+struct ifr_counters {
+ uint64_t drop;
+};
+
struct nt4ga_stat_s {
nthw_stat_t *mp_nthw_stat;
nthw_rmc_t *mp_nthw_rmc;
@@ -220,6 +225,8 @@ struct nt4ga_stat_s {
int mn_rx_ports;
int mn_tx_ports;
+ int mn_ifr_counters;
+
struct color_counters *mp_stat_structs_color;
/* For calculating increments between stats polls */
struct color_counters a_stat_structs_color_base[NT_MAX_COLOR_FLOW_STATS];
@@ -236,6 +243,8 @@ struct nt4ga_stat_s {
int flm_stat_ver;
struct flm_counters_v1 *mp_stat_structs_flm;
+ struct ifr_counters *mp_stat_structs_ifr;
+
/* Rx/Tx totals: */
uint64_t n_totals_reset_timestamp; /* timestamp for last totals reset */
@@ -1226,6 +1226,21 @@ int flow_get_flm_stats(struct flow_nic_dev *ndev, uint64_t *data, uint64_t size)
return -1;
}
+int flow_get_ifr_stats(struct flow_nic_dev *ndev, uint64_t *data, uint8_t port_count)
+{
+ const struct profile_inline_ops *profile_inline_ops = get_profile_inline_ops();
+
+ if (profile_inline_ops == NULL)
+ return -1;
+
+ if (ndev->flow_profile == FLOW_ETH_DEV_PROFILE_INLINE) {
+ return profile_inline_ops->flow_get_ifr_stats_profile_inline(ndev, data,
+ port_count);
+ }
+
+ return -1;
+}
+
static const struct flow_filter_ops ops = {
.flow_filter_init = flow_filter_init,
.flow_filter_done = flow_filter_done,
@@ -1242,6 +1257,7 @@ static const struct flow_filter_ops ops = {
.flow_actions_update = flow_actions_update,
.flow_dev_dump = flow_dev_dump,
.flow_get_flm_stats = flow_get_flm_stats,
+ .flow_get_ifr_stats = flow_get_ifr_stats,
.flow_get_aged_flows = flow_get_aged_flows,
/*
@@ -1584,7 +1584,7 @@ static bool tpe_get_present(void *be_dev)
{
struct backend_dev_s *be = (struct backend_dev_s *)be_dev;
return be->p_csu_nthw != NULL && be->p_hfu_nthw != NULL && be->p_rpp_lr_nthw != NULL &&
- be->p_tx_cpy_nthw != NULL && be->p_tx_ins_nthw != NULL &&
+ be->p_ifr_nthw != NULL && be->p_tx_cpy_nthw != NULL && be->p_tx_ins_nthw != NULL &&
be->p_tx_rpl_nthw != NULL;
}
@@ -1717,6 +1717,31 @@ static int tpe_ifr_rcp_flush(void *be_dev, const struct tpe_func_s *ifr, int ind
return res;
}
+static int tpe_ifr_counters_update(void *be_dev, const struct tpe_func_s *ifr, int index, int cnt)
+{
+ int res = 0;
+ int i = 0;
+ struct backend_dev_s *be = (struct backend_dev_s *)be_dev;
+ CHECK_DEBUG_ON(be, ifr, be->p_ifr_nthw);
+
+ if (ifr->ver >= 2) {
+ ifr_nthw_counters_cnt(be->p_ifr_nthw, 1);
+
+ for (i = 0; i < cnt; i++) {
+ ifr_nthw_counters_select(be->p_ifr_nthw, index + i);
+ ifr_nthw_counters_update(be->p_ifr_nthw);
+ ifr_nthw_counters_drop(be->p_ifr_nthw,
+ &ifr->v3.ifr_counters[index + i].drop, 1);
+ }
+
+ } else {
+ res = -1;
+ }
+
+ CHECK_DEBUG_OFF(ifr, be->p_ifr_nthw);
+ return res;
+}
+
static int tpe_ins_rcp_flush(void *be_dev, const struct tpe_func_s *tx_ins, int index, int cnt)
{
struct backend_dev_s *be = (struct backend_dev_s *)be_dev;
@@ -2062,6 +2087,7 @@ const struct flow_api_backend_ops flow_be_iface = {
tpe_rpp_rcp_flush,
tpe_rpp_ifr_rcp_flush,
tpe_ifr_rcp_flush,
+ tpe_ifr_counters_update,
tpe_ins_rcp_flush,
tpe_rpl_rcp_flush,
tpe_rpl_ext_flush,
@@ -69,11 +69,13 @@ int hw_mod_tpe_alloc(struct flow_api_backend_s *be)
switch (_VER_) {
case 3:
- if (!callocate_mod((struct common_func_s *)&be->tpe, 10, &be->tpe.v3.rpp_rcp,
+ if (!callocate_mod((struct common_func_s *)&be->tpe, 11, &be->tpe.v3.rpp_rcp,
be->tpe.nb_rcp_categories, sizeof(struct tpe_v1_rpp_v0_rcp_s),
&be->tpe.v3.rpp_ifr_rcp, be->tpe.nb_ifr_categories,
sizeof(struct tpe_v2_rpp_v1_ifr_rcp_s), &be->tpe.v3.ifr_rcp,
be->tpe.nb_ifr_categories, sizeof(struct tpe_v2_ifr_v1_rcp_s),
+ &be->tpe.v3.ifr_counters, be->tpe.nb_ifr_categories,
+ sizeof(struct tpe_v2_ifr_v1_counters_s),
&be->tpe.v3.ins_rcp, be->tpe.nb_rcp_categories,
sizeof(struct tpe_v1_ins_v1_rcp_s),
@@ -131,6 +133,7 @@ int hw_mod_tpe_reset(struct flow_api_backend_s *be)
err |= hw_mod_tpe_csu_rcp_flush(be, 0, ALL_ENTRIES);
err |= hw_mod_tpe_rpp_ifr_rcp_flush(be, 0, ALL_ENTRIES);
err |= hw_mod_tpe_ifr_rcp_flush(be, 0, ALL_ENTRIES);
+ err |= hw_mod_tpe_ifr_counters_update(be, 0, ALL_ENTRIES);
return err;
}
@@ -358,6 +361,59 @@ int hw_mod_tpe_ifr_rcp_set(struct flow_api_backend_s *be, enum hw_tpe_e field, i
return hw_mod_tpe_ifr_rcp_mod(be, field, index, &value, 0);
}
+/*
+ * IFR_COUNTER
+ */
+
+int hw_mod_tpe_ifr_counters_update(struct flow_api_backend_s *be, int start_idx, int count)
+{
+ if (count == ALL_ENTRIES)
+ count = be->tpe.nb_ifr_categories;
+
+ if ((unsigned int)(start_idx + count) > be->tpe.nb_ifr_categories)
+ return INDEX_TOO_LARGE;
+
+ return be->iface->tpe_ifr_counters_update(be->be_dev, &be->tpe, start_idx, count);
+}
+
+static int hw_mod_tpe_ifr_counters_mod(struct flow_api_backend_s *be, enum hw_tpe_e field,
+ uint32_t index, uint32_t *value, int get)
+{
+ if (index >= be->tpe.nb_ifr_categories)
+ return INDEX_TOO_LARGE;
+
+ switch (_VER_) {
+ case 3:
+ switch (field) {
+ case HW_TPE_IFR_COUNTERS_DROP:
+ GET_SET(be->tpe.v3.ifr_counters[index].drop, value);
+ break;
+
+ default:
+ return UNSUP_FIELD;
+ }
+
+ break;
+
+ default:
+ return UNSUP_VER;
+ }
+
+ return 0;
+}
+
+int hw_mod_tpe_ifr_counters_set(struct flow_api_backend_s *be, enum hw_tpe_e field, int index,
+ uint32_t value)
+{
+ return hw_mod_tpe_ifr_counters_mod(be, field, index, &value, 0);
+}
+
+int hw_mod_tpe_ifr_counters_get(struct flow_api_backend_s *be, enum hw_tpe_e field, int index,
+ uint32_t *value)
+{
+ return hw_mod_tpe_ifr_counters_mod(be, field, index, value, 1);
+}
+
/*
* INS_RCP
*/
@@ -4715,6 +4715,24 @@ int flow_get_flm_stats_profile_inline(struct flow_nic_dev *ndev, uint64_t *data,
return 0;
}
+int flow_get_ifr_stats_profile_inline(struct flow_nic_dev *ndev, uint64_t *data,
+ uint8_t port_count)
+{
+ /* IFR RCP 0 is reserved, port counters start from record 1 */
+ hw_mod_tpe_ifr_counters_update(&ndev->be, 1, port_count);
+ uint8_t i = 0;
+
+ for (i = 0; i < port_count; ++i) {
+ uint8_t ifr_mtu_recipe = convert_port_to_ifr_mtu_recipe(i);
+ uint32_t drop_cnt = 0;
+ hw_mod_tpe_ifr_counters_get(&ndev->be, HW_TPE_IFR_COUNTERS_DROP, ifr_mtu_recipe,
+ &drop_cnt);
+ data[i] = data[i] + drop_cnt;
+ }
+
+ return 0;
+}
+
int flow_set_mtu_inline(struct flow_eth_dev *dev, uint32_t port, uint16_t mtu)
{
if (port >= 255)
@@ -5338,6 +5356,7 @@ static const struct profile_inline_ops ops = {
* Stats
*/
.flow_get_flm_stats_profile_inline = flow_get_flm_stats_profile_inline,
+ .flow_get_ifr_stats_profile_inline = flow_get_ifr_stats_profile_inline,
.flow_info_get_profile_inline = flow_info_get_profile_inline,
.flow_configure_profile_inline = flow_configure_profile_inline,
.flow_pattern_template_create_profile_inline = flow_pattern_template_create_profile_inline,
@@ -72,6 +72,10 @@ int flow_get_aged_flows_profile_inline(struct flow_eth_dev *dev,
int flow_get_flm_stats_profile_inline(struct flow_nic_dev *ndev, uint64_t *data, uint64_t size);
+int flow_get_ifr_stats_profile_inline(struct flow_nic_dev *ndev,
+ uint64_t *data,
+ uint8_t port_count);
+
/*
* RTE flow asynchronous operations functions
*/
@@ -69,6 +69,13 @@ int ifr_nthw_init(struct ifr_nthw *p, nthw_fpga_t *p_fpga, int n_instance)
p->mp_df_buf_data_fifo_dat =
nthw_register_get_field(p->mp_df_buf_data, IFR_DF_BUF_DATA_FIFO_DAT);
+ p->mp_counters_ctrl = nthw_module_get_register(p->m_ifr, IFR_COUNTERS_CTRL);
+ p->mp_counters_addr = nthw_register_get_field(p->mp_counters_ctrl, IFR_COUNTERS_CTRL_ADR);
+ p->mp_counters_cnt = nthw_register_get_field(p->mp_counters_ctrl, IFR_COUNTERS_CTRL_CNT);
+
+ p->mp_counters_data = nthw_module_get_register(p->m_ifr, IFR_COUNTERS_DATA);
+ p->mp_counters_drop = nthw_register_get_field(p->mp_counters_data, IFR_COUNTERS_DATA_DROP);
+
return 0;
}
@@ -121,3 +128,28 @@ void ifr_nthw_rcp_flush(const struct ifr_nthw *p)
nthw_register_flush(p->mp_rcp_ctrl, 1);
nthw_register_flush(p->mp_rcp_data, 1);
}
+
+void ifr_nthw_counters_select(const struct ifr_nthw *p, uint32_t val)
+{
+ assert(p->mp_counters_addr);
+ nthw_field_set_val32(p->mp_counters_addr, val);
+}
+
+void ifr_nthw_counters_cnt(const struct ifr_nthw *p, uint32_t val)
+{
+ assert(p->mp_counters_cnt);
+ nthw_field_set_val32(p->mp_counters_cnt, val);
+}
+
+void ifr_nthw_counters_drop(const struct ifr_nthw *p, uint32_t *val, int get)
+{
+ if (get)
+ *val = nthw_field_get_val32(p->mp_counters_drop);
+}
+
+void ifr_nthw_counters_update(const struct ifr_nthw *p)
+{
+ assert(p->mp_counters_data);
+ nthw_register_flush(p->mp_counters_ctrl, 1);
+ nthw_register_update(p->mp_counters_data);
+}
@@ -33,6 +33,13 @@ struct ifr_nthw {
nthw_register_t *mp_df_buf_data;
nthw_field_t *mp_df_buf_data_fifo_dat;
+
+ nthw_register_t *mp_counters_ctrl;
+ nthw_field_t *mp_counters_addr;
+ nthw_field_t *mp_counters_cnt;
+
+ nthw_register_t *mp_counters_data;
+ nthw_field_t *mp_counters_drop;
};
struct ifr_nthw *ifr_nthw_new(void);
@@ -41,7 +48,7 @@ int ifr_nthw_init(struct ifr_nthw *p, nthw_fpga_t *p_fpga, int n_instance);
int ifr_nthw_setup(struct ifr_nthw *p, int n_idx, int n_idx_cnt);
void ifr_nthw_set_debug_mode(struct ifr_nthw *p, unsigned int n_debug_mode);
-/* IFR */
+/* IFR RCP */
void ifr_nthw_rcp_select(const struct ifr_nthw *p, uint32_t val);
void ifr_nthw_rcp_cnt(const struct ifr_nthw *p, uint32_t val);
void ifr_nthw_rcp_ipv4_en(const struct ifr_nthw *p, uint32_t val);
@@ -51,4 +58,10 @@ void ifr_nthw_rcp_ipv6_drop(const struct ifr_nthw *p, uint32_t val);
void ifr_nthw_rcp_mtu(const struct ifr_nthw *p, uint32_t val);
void ifr_nthw_rcp_flush(const struct ifr_nthw *p);
+/* IFR Counters */
+void ifr_nthw_counters_select(const struct ifr_nthw *p, uint32_t val);
+void ifr_nthw_counters_cnt(const struct ifr_nthw *p, uint32_t val);
+void ifr_nthw_counters_drop(const struct ifr_nthw *p, uint32_t *val, int get);
+void ifr_nthw_counters_update(const struct ifr_nthw *p);
+
#endif /* __FLOW_NTHW_IFR_H__ */
@@ -199,6 +199,8 @@ int nthw_stat_init(nthw_stat_t *p, nthw_fpga_t *p_fpga, int n_instance)
p->m_nb_rpp_per_ps = nthw_fpga_get_product_param(p_fpga, NT_RPP_PER_PS, 0);
+ p->m_nb_ifr_counters = nthw_fpga_get_product_param(p_fpga, NT_TX_MTU_PROFILE_IFR, 0);
+
p->m_nb_tx_ports = nthw_fpga_get_product_param(p_fpga, NT_TX_PORTS, 0);
p->m_rx_port_replicate = nthw_fpga_get_product_param(p_fpga, NT_RX_PORT_REPLICATE, 0);
@@ -362,6 +362,10 @@ struct profile_inline_ops {
uint64_t *data,
uint64_t size);
+ int (*flow_get_ifr_stats_profile_inline)(struct flow_nic_dev *ndev,
+ uint64_t *data,
+ uint8_t port_count);
+
/*
* NT Flow FLM queue API
*/
@@ -459,6 +463,7 @@ struct flow_filter_ops {
struct rte_flow_error *error);
int (*flow_get_flm_stats)(struct flow_nic_dev *ndev, uint64_t *data, uint64_t size);
+ int (*flow_get_ifr_stats)(struct flow_nic_dev *ndev, uint64_t *data, uint8_t port_count);
/*
* Other