[dpdk-dev] [PATCH] test: fix division by zero

[Min Hu (Connor)]

Variable i is used as a denominator which may be zero, and
this may result in segmentation fault.

This patch fixed it.

Fixes: 948bc3d6d095 ("test: add reciprocal based division")
Cc: sta...@dpdk.org

Signed-off-by: Min Hu (Connor) 
---
 app/test/test_reciprocal_division_perf.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/test/test_reciprocal_division_perf.c 
b/app/test/test_reciprocal_division_perf.c
index a7be8aa..2647308 100644
--- a/app/test/test_reciprocal_division_perf.c
+++ b/app/test/test_reciprocal_division_perf.c
@@ -143,7 +143,7 @@ test_reciprocal_division_perf(void)
"result %"PRIu64"",
nresult_u64, rresult_u64);
result = 1;
-   break;
+   goto err;
}
}
 
@@ -182,7 +182,7 @@ test_reciprocal_division_perf(void)
dividend_u64, divisor_u64,
nresult_u64, rresult_u64);
result = 1;
-   break;
+   goto err;
}
}
printf("64bit Division results:\n");
@@ -195,6 +195,7 @@ test_reciprocal_division_perf(void)
printf("Cycles per division(reciprocal) : %3.2f\n",
((double)tot_cyc_r)/i);
 
+err:
return result;
 }
 
-- 
2.7.4

[dpdk-dev] [PATCH] app/testeventdev: fix buffer overflow

[Min Hu (Connor)]

Tainted and unvalidated integer 'idx' used as an index, which may
lead to buffer overflow.

This patch fixed it.

Fixes: 89e5eb118017 ("app/testeventdev: add string parsing helpers")
Cc: sta...@dpdk.org

Signed-off-by: Min Hu (Connor) 
---
 app/test-eventdev/evt_options.c | 4 ++--
 app/test-eventdev/parser.c  | 6 --
 app/test-eventdev/parser.h  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/test-eventdev/evt_options.c b/app/test-eventdev/evt_options.c
index 0d55405..061b63e 100644
--- a/app/test-eventdev/evt_options.c
+++ b/app/test-eventdev/evt_options.c
@@ -221,7 +221,7 @@ evt_parse_plcores(struct evt_options *opt, const char 
*corelist)
 {
int ret;
 
-   ret = parse_lcores_list(opt->plcores, corelist);
+   ret = parse_lcores_list(opt->plcores, RTE_MAX_LCORE, corelist);
if (ret == -E2BIG)
evt_err("duplicate lcores in plcores");
 
@@ -233,7 +233,7 @@ evt_parse_work_lcores(struct evt_options *opt, const char 
*corelist)
 {
int ret;
 
-   ret = parse_lcores_list(opt->wlcores, corelist);
+   ret = parse_lcores_list(opt->wlcores, RTE_MAX_LCORE, corelist);
if (ret == -E2BIG)
evt_err("duplicate lcores in wlcores");
 
diff --git a/app/test-eventdev/parser.c b/app/test-eventdev/parser.c
index 24f1855..7a973cb 100644
--- a/app/test-eventdev/parser.c
+++ b/app/test-eventdev/parser.c
@@ -310,7 +310,7 @@ parse_hex_string(char *src, uint8_t *dst, uint32_t *size)
 }
 
 int
-parse_lcores_list(bool lcores[], const char *corelist)
+parse_lcores_list(bool lcores[], int lcores_num, const char *corelist)
 {
int i, idx = 0;
int min, max;
@@ -332,6 +332,8 @@ parse_lcores_list(bool lcores[], const char *corelist)
if (*corelist == '\0')
return -1;
idx = strtoul(corelist, &end, 10);
+   if (idx < 0 || idx > lcores_num)
+   return -1;
 
if (end == NULL)
return -1;
@@ -343,7 +345,7 @@ parse_lcores_list(bool lcores[], const char *corelist)
max = idx;
if (min == RTE_MAX_LCORE)
min = idx;
-   for (idx = min; idx <= max; idx++) {
+   for (idx = min; idx < max; idx++) {
if (lcores[idx] == 1)
return -E2BIG;
lcores[idx] = 1;
diff --git a/app/test-eventdev/parser.h b/app/test-eventdev/parser.h
index 673ff22..696b40a 100644
--- a/app/test-eventdev/parser.h
+++ b/app/test-eventdev/parser.h
@@ -46,5 +46,5 @@ int parse_hex_string(char *src, uint8_t *dst, uint32_t *size);
 
 int parse_tokenize_string(char *string, char *tokens[], uint32_t *n_tokens);
 
-int parse_lcores_list(bool lcores[], const char *corelist);
+int parse_lcores_list(bool lcores[], int lcores_num, const char *corelist);
 #endif
-- 
2.7.4

[dpdk-dev] [PATCH] app/crypto-perf: fix dereference of null return

[Min Hu (Connor)]

Return value of a function 'rte_zmalloc' is dereferenced without
checking, and it may call segmentation fault.

This patch fixed it.

Fixes: f8be1786b1b8 ("app/crypto-perf: introduce performance test application")
Cc: sta...@dpdk.org

Signed-off-by: Min Hu (Connor) 
---
 app/test-crypto-perf/cperf_options_parsing.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/app/test-crypto-perf/cperf_options_parsing.c 
b/app/test-crypto-perf/cperf_options_parsing.c
index 40b6dfb..5b2f7c3 100644
--- a/app/test-crypto-perf/cperf_options_parsing.c
+++ b/app/test-crypto-perf/cperf_options_parsing.c
@@ -506,6 +506,12 @@ parse_test_name(struct cperf_options *opts,
 {
char *test_name = (char *) rte_zmalloc(NULL,
sizeof(char) * (strlen(arg) + 3), 0);
+   if (test_name == NULL) {
+   RTE_LOG(ERR, USER1, "Failed to rte zmalloc with size: %lu\n",
+   strlen(arg) + 3);
+   return -1;
+   }
+
snprintf(test_name, strlen(arg) + 3, "[%s]", arg);
opts->test_name = test_name;
 
-- 
2.7.4

[dpdk-dev] [PATCH] app/bbdev: fix wrong variable

[Min Hu (Connor)]

This patch corrected misused variable.

Fixes: d819c08327f3 ("app/bbdev: update for 5GNR")
Cc: sta...@dpdk.org

Signed-off-by: Min Hu (Connor) 
---
 app/test-bbdev/test_bbdev_perf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 45b85b9..b8bf512 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -372,14 +372,14 @@ check_dev_cap(const struct rte_bbdev_info *dev_info)
if (nb_harq_inputs > cap->num_buffers_hard_out) {
printf(
"Too many HARQ inputs defined: %u, max: 
%u\n",
-   nb_hard_outputs,
+   nb_harq_inputs,
cap->num_buffers_hard_out);
return TEST_FAILED;
}
if (nb_harq_outputs > cap->num_buffers_hard_out) {
printf(
"Too many HARQ outputs defined: %u, 
max: %u\n",
-   nb_hard_outputs,
+   nb_harq_outputs,
cap->num_buffers_hard_out);
return TEST_FAILED;
}
-- 
2.7.4

[dpdk-dev] [PATCH v2 1/2] net/ice: refactor input set fields for switch filter

[Yuying Zhang]

Input set has been divided into inner and outer part to distinguish
different fields. However, the parse method of switch filter doesn't
match this update. Refactor switch filter to distingush inner and outer
input set in the same way as other filters.

Signed-off-by: Yuying Zhang 
---
 drivers/net/ice/ice_switch_filter.c | 782 
 1 file changed, 341 insertions(+), 441 deletions(-)

diff --git a/drivers/net/ice/ice_switch_filter.c 
b/drivers/net/ice/ice_switch_filter.c
index 0493e4dee2..c9d2ec7410 100644
--- a/drivers/net/ice/ice_switch_filter.c
+++ b/drivers/net/ice/ice_switch_filter.c
@@ -35,8 +35,7 @@
 #define ICE_SW_INSET_ETHER ( \
ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE)
 #define ICE_SW_INSET_MAC_VLAN ( \
-   ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE | \
-   ICE_INSET_VLAN_INNER)
+   ICE_SW_INSET_ETHER | ICE_INSET_VLAN_INNER)
 #define ICE_SW_INSET_MAC_QINQ  ( \
ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_VLAN_INNER | \
ICE_INSET_VLAN_OUTER)
@@ -68,38 +67,38 @@
ICE_INSET_IPV6_HOP_LIMIT | ICE_INSET_IPV6_TC | \
ICE_INSET_UDP_DST_PORT | ICE_INSET_UDP_SRC_PORT)
 #define ICE_SW_INSET_DIST_NVGRE_IPV4 ( \
-   ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
-   ICE_INSET_TUN_DMAC | ICE_INSET_TUN_NVGRE_TNI | ICE_INSET_IPV4_DST)
+   ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_DMAC | \
+   ICE_INSET_TUN_NVGRE_TNI)
 #define ICE_SW_INSET_DIST_VXLAN_IPV4 ( \
-   ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
-   ICE_INSET_TUN_DMAC | ICE_INSET_TUN_VXLAN_VNI | ICE_INSET_IPV4_DST)
+   ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_DMAC | \
+   ICE_INSET_TUN_VXLAN_VNI)
 #define ICE_SW_INSET_DIST_NVGRE_IPV4_TCP ( \
-   ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
-   ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT | \
-   ICE_INSET_TUN_DMAC | ICE_INSET_TUN_NVGRE_TNI | ICE_INSET_IPV4_DST)
+   ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \
+   ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT | \
+   ICE_INSET_DMAC | ICE_INSET_TUN_NVGRE_TNI)
 #define ICE_SW_INSET_DIST_NVGRE_IPV4_UDP ( \
-   ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
-   ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT | \
-   ICE_INSET_TUN_DMAC | ICE_INSET_TUN_NVGRE_TNI | ICE_INSET_IPV4_DST)
+   ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \
+   ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT | \
+   ICE_INSET_DMAC | ICE_INSET_TUN_NVGRE_TNI)
 #define ICE_SW_INSET_DIST_VXLAN_IPV4_TCP ( \
-   ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
-   ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT | \
-   ICE_INSET_TUN_DMAC | ICE_INSET_TUN_VXLAN_VNI | ICE_INSET_IPV4_DST)
+   ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \
+   ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT | \
+   ICE_INSET_DMAC | ICE_INSET_TUN_VXLAN_VNI)
 #define ICE_SW_INSET_DIST_VXLAN_IPV4_UDP ( \
-   ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
-   ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT | \
-   ICE_INSET_TUN_DMAC | ICE_INSET_TUN_VXLAN_VNI | ICE_INSET_IPV4_DST)
+   ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \
+   ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT | \
+   ICE_INSET_DMAC | ICE_INSET_TUN_VXLAN_VNI)
 #define ICE_SW_INSET_PERM_TUNNEL_IPV4 ( \
-   ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
-   ICE_INSET_TUN_IPV4_PROTO | ICE_INSET_TUN_IPV4_TOS)
+   ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \
+   ICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_TOS)
 #define ICE_SW_INSET_PERM_TUNNEL_IPV4_TCP ( \
-   ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
-   ICE_INSET_TUN_TCP_SRC_PORT | ICE_INSET_TUN_TCP_DST_PORT | \
-   ICE_INSET_TUN_IPV4_TOS)
+   ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \
+   ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT | \
+   ICE_INSET_IPV4_TOS)
 #define ICE_SW_INSET_PERM_TUNNEL_IPV4_UDP ( \
-   ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST | \
-   ICE_INSET_TUN_UDP_SRC_PORT | ICE_INSET_TUN_UDP_DST_PORT | \
-   ICE_INSET_TUN_IPV4_TOS)
+   ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \
+   ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT | \
+   ICE_INSET_IPV4_TOS)
 #define ICE_SW_INSET_MAC_PPPOE  ( \
ICE_INSET_VLAN_OUTER | ICE_INSET_VLAN_INNER | \
ICE_INSET_DMAC | ICE_INSET_ETHERTYPE | ICE_INSET_PPPOE_SESSION)
@@ -141,74 +140,26 @@
ICE_SW_INSET_MAC_IPV4 | ICE_INSET_GTPU_TEID)
 #define ICE_SW_INSET_MAC_IPV6_GTPU ( \
ICE_SW_INSET_MAC_IPV6 | ICE_INSET_GTPU_TEID)
-#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 ( \
-   ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \
-   ICE_INSET_TUN_IPV4_SRC | ICE_INSET_TUN_IPV4_DST)
-#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4 ( \
-   ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | ICE_INSET_GTPU_QFI)
-#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV6 ( \
-   ICE_INSE

[dpdk-dev] [PATCH v2 2/2] net/ice: clean redundant macro definition of filters

[Yuying Zhang]

The input set has been divided into two parts to distinguish
inner and outer field. ICE_INSET_TUN_* is the same as non tunnel
macro definition. Clean redundant ICE_INSET_TUN_* codes.

Signed-off-by: Yuying Zhang 
---
 drivers/net/ice/ice_fdir_filter.c   | 22 +--
 drivers/net/ice/ice_generic_flow.h  | 61 ++---
 drivers/net/ice/ice_switch_filter.c | 16 
 3 files changed, 22 insertions(+), 77 deletions(-)

diff --git a/drivers/net/ice/ice_fdir_filter.c 
b/drivers/net/ice/ice_fdir_filter.c
index 3b8ea32b1a..ad2dc40815 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -72,7 +72,7 @@
 
 #define ICE_FDIR_INSET_ETH_IPV4_VXLAN (\
ICE_FDIR_INSET_ETH | ICE_FDIR_INSET_ETH_IPV4 | \
-   ICE_INSET_TUN_VXLAN_VNI)
+   ICE_INSET_VXLAN_VNI)
 
 #define ICE_FDIR_INSET_IPV4_GTPU (\
ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_GTPU_TEID)
@@ -893,17 +893,17 @@ ice_fdir_input_set_parse(uint64_t inset, enum 
ice_flow_field *field)
{ICE_INSET_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
{ICE_INSET_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
{ICE_INSET_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
-   {ICE_INSET_TUN_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA},
-   {ICE_INSET_TUN_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA},
-   {ICE_INSET_TUN_TCP_SRC_PORT, ICE_FLOW_FIELD_IDX_TCP_SRC_PORT},
-   {ICE_INSET_TUN_TCP_DST_PORT, ICE_FLOW_FIELD_IDX_TCP_DST_PORT},
-   {ICE_INSET_TUN_UDP_SRC_PORT, ICE_FLOW_FIELD_IDX_UDP_SRC_PORT},
-   {ICE_INSET_TUN_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
-   {ICE_INSET_TUN_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
-   {ICE_INSET_TUN_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
+   {ICE_INSET_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA},
+   {ICE_INSET_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA},
+   {ICE_INSET_TCP_SRC_PORT, ICE_FLOW_FIELD_IDX_TCP_SRC_PORT},
+   {ICE_INSET_TCP_DST_PORT, ICE_FLOW_FIELD_IDX_TCP_DST_PORT},
+   {ICE_INSET_UDP_SRC_PORT, ICE_FLOW_FIELD_IDX_UDP_SRC_PORT},
+   {ICE_INSET_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
+   {ICE_INSET_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
+   {ICE_INSET_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
{ICE_INSET_GTPU_TEID, ICE_FLOW_FIELD_IDX_GTPU_IP_TEID},
{ICE_INSET_GTPU_QFI, ICE_FLOW_FIELD_IDX_GTPU_EH_QFI},
-   {ICE_INSET_TUN_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI},
+   {ICE_INSET_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI},
};
 
for (i = 0, j = 0; i < RTE_DIM(ice_inset_map); i++) {
@@ -1916,7 +1916,7 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter 
*ad,
}
 
if (vxlan_mask->hdr.vx_vni)
-   *input_set |= ICE_INSET_TUN_VXLAN_VNI;
+   *input_set |= ICE_INSET_VXLAN_VNI;
 
filter->input.vxlan_data.vni = vxlan_spec->hdr.vx_vni;
 
diff --git a/drivers/net/ice/ice_generic_flow.h 
b/drivers/net/ice/ice_generic_flow.h
index a4d0b6671d..b7634b9662 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -92,64 +92,9 @@
 
 /* tunnel */
 
-#define ICE_INSET_TUN_SMAC \
-   (ICE_PROT_MAC | ICE_SMAC)
-#define ICE_INSET_TUN_DMAC \
-   (ICE_PROT_MAC | ICE_DMAC)
-
-#define ICE_INSET_TUN_IPV4_SRC \
-   (ICE_PROT_IPV4 | ICE_IP_SRC)
-#define ICE_INSET_TUN_IPV4_DST \
-   (ICE_PROT_IPV4 | ICE_IP_DST)
-#define ICE_INSET_TUN_IPV4_TTL \
-   (ICE_PROT_IPV4 | ICE_IP_TTL)
-#define ICE_INSET_TUN_IPV4_PROTO \
-   (ICE_PROT_IPV4 | ICE_IP_PROTO)
-#define ICE_INSET_TUN_IPV4_TOS \
-   (ICE_PROT_IPV4 | ICE_IP_TOS)
-#define ICE_INSET_TUN_IPV6_SRC \
-   (ICE_PROT_IPV6 | ICE_IP_SRC)
-#define ICE_INSET_TUN_IPV6_DST \
-   (ICE_PROT_IPV6 | ICE_IP_DST)
-#define ICE_INSET_TUN_IPV6_HOP_LIMIT \
-   (ICE_PROT_IPV6 | ICE_IP_TTL)
-#define ICE_INSET_TUN_IPV6_NEXT_HDR \
-   (ICE_PROT_IPV6 | ICE_IP_PROTO)
-#define ICE_INSET_TUN_IPV6_TC \
-   (ICE_PROT_IPV6 | ICE_IP_TOS)
-
-#define ICE_INSET_TUN_TCP_SRC_PORT \
-   (ICE_PROT_TCP | ICE_SPORT)
-#define ICE_INSET_TUN_TCP_DST_PORT \
-   (ICE_PROT_TCP | ICE_DPORT)
-#define ICE_INSET_TUN_UDP_SRC_PORT \
-   (ICE_PROT_UDP | ICE_SPORT)
-#define ICE_INSET_TUN_UDP_DST_PORT \
-   (ICE_PROT_UDP | ICE_DPORT)
-#define ICE_INSET_TUN_SCTP_SRC_PORT \
-   (ICE_PROT_SCTP | ICE_SPORT)
-#define ICE_INSET_TUN_SCTP_DST_PORT \
-   (ICE_PROT_SCTP | ICE_DPORT)
-#define ICE_INSET_TUN_ICMP4_SRC_PORT \
-   (ICE_PROT_ICMP4 | ICE_SPORT)
-#define ICE_INSET_TUN_ICMP4_DST_PORT \
-   (ICE_PROT_ICMP4 | ICE_DPORT)
-#define ICE_INSET_TUN_ICMP6_SRC_PORT \
-   (ICE_PROT_ICMP6 | ICE_SPORT)
-#define ICE_INSET_TU

[dpdk-dev] [PATCH v1 1/2] common/iavf: add header types for PPPoL2TPv2oUDP

[Ting Xu]

Added two virtchnl protocol header types for L2TPv2 and PPP to support
the RSS hash for PPPoL2TPv2oUDP.

Signed-off-by: Ting Xu 
---
 drivers/common/iavf/virtchnl.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h
index e3eb767d66..139569787f 100644
--- a/drivers/common/iavf/virtchnl.h
+++ b/drivers/common/iavf/virtchnl.h
@@ -1432,6 +1432,8 @@ enum virtchnl_proto_hdr_type {
VIRTCHNL_PROTO_HDR_PFCP,
VIRTCHNL_PROTO_HDR_GTPC,
VIRTCHNL_PROTO_HDR_ECPRI,
+   VIRTCHNL_PROTO_HDR_L2TPV2,
+   VIRTCHNL_PROTO_HDR_PPP,
 };
 
 /* Protocol header field within a protocol header. */
-- 
2.17.1

[dpdk-dev] [PATCH v1 2/2] common/iavf: fix wrong order of protocol header types

[Ting Xu]

The new virtchnl protocol header types for IPv4 and IPv6 fragment are
not added in order, which will break ABI. Move them to the end of the
list.

Signed-off-by: Ting Xu 
Fixes: e6a42fd9158b ("common/iavf: add protocol header for IP fragment")
Cc: sta...@dpdk.org
---
 drivers/common/iavf/virtchnl.h | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h
index 139569787f..64c9aa8889 100644
--- a/drivers/common/iavf/virtchnl.h
+++ b/drivers/common/iavf/virtchnl.h
@@ -1415,9 +1415,7 @@ enum virtchnl_proto_hdr_type {
VIRTCHNL_PROTO_HDR_S_VLAN,
VIRTCHNL_PROTO_HDR_C_VLAN,
VIRTCHNL_PROTO_HDR_IPV4,
-   VIRTCHNL_PROTO_HDR_IPV4_FRAG,
VIRTCHNL_PROTO_HDR_IPV6,
-   VIRTCHNL_PROTO_HDR_IPV6_EH_FRAG,
VIRTCHNL_PROTO_HDR_TCP,
VIRTCHNL_PROTO_HDR_UDP,
VIRTCHNL_PROTO_HDR_SCTP,
@@ -1434,6 +1432,8 @@ enum virtchnl_proto_hdr_type {
VIRTCHNL_PROTO_HDR_ECPRI,
VIRTCHNL_PROTO_HDR_L2TPV2,
VIRTCHNL_PROTO_HDR_PPP,
+   VIRTCHNL_PROTO_HDR_IPV4_FRAG,
+   VIRTCHNL_PROTO_HDR_IPV6_EH_FRAG,
 };
 
 /* Protocol header field within a protocol header. */
@@ -1456,8 +1456,6 @@ enum virtchnl_proto_hdr_field {
VIRTCHNL_PROTO_HDR_IPV4_DSCP,
VIRTCHNL_PROTO_HDR_IPV4_TTL,
VIRTCHNL_PROTO_HDR_IPV4_PROT,
-   VIRTCHNL_PROTO_HDR_IPV4_FRAG_PKID =
-   PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_IPV4_FRAG),
/* IPV6 */
VIRTCHNL_PROTO_HDR_IPV6_SRC =
PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_IPV6),
@@ -1478,9 +1476,6 @@ enum virtchnl_proto_hdr_field {
VIRTCHNL_PROTO_HDR_IPV6_PREFIX64_DST,
VIRTCHNL_PROTO_HDR_IPV6_PREFIX96_SRC,
VIRTCHNL_PROTO_HDR_IPV6_PREFIX96_DST,
-   /* IPv6 Extension Header Fragment */
-   VIRTCHNL_PROTO_HDR_IPV6_EH_FRAG_PKID =
-   PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_IPV6_EH_FRAG),
/* TCP */
VIRTCHNL_PROTO_HDR_TCP_SRC_PORT =
PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_TCP),
@@ -1523,6 +1518,12 @@ enum virtchnl_proto_hdr_field {
VIRTCHNL_PROTO_HDR_ECPRI_MSG_TYPE =
PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_ECPRI),
VIRTCHNL_PROTO_HDR_ECPRI_PC_RTC_ID,
+   /* IPv4 Dummy Fragment */
+   VIRTCHNL_PROTO_HDR_IPV4_FRAG_PKID =
+   PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_IPV4_FRAG),
+   /* IPv6 Extension Fragment */
+   VIRTCHNL_PROTO_HDR_IPV6_EH_FRAG_PKID =
+   PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_IPV6_EH_FRAG),
 };
 
 struct virtchnl_proto_hdr {
-- 
2.17.1

[dpdk-dev] [PATCH] mbuf: check mbuf dyn shared memory validity

[Min Hu (Connor)]

From: Chengwen Feng 

Because mbuf dyn shared memory was allocated runtime, so it's
necessary to check validity when dump mbuf dyn info.

Also this patch adds an error logging when init shared memory fail.

Fixes: 4958ca3a443a ("mbuf: support dynamic fields and flags")
Cc: sta...@dpdk.org

Signed-off-by: Chengwen Feng 
Signed-off-by: Min Hu (Connor) 
---
 lib/mbuf/rte_mbuf_dyn.c | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c
index 7d5e942..ca46eb2 100644
--- a/lib/mbuf/rte_mbuf_dyn.c
+++ b/lib/mbuf/rte_mbuf_dyn.c
@@ -115,8 +115,10 @@ init_shared_mem(void)
} else {
mz = rte_memzone_lookup(RTE_MBUF_DYN_MZNAME);
}
-   if (mz == NULL)
+   if (mz == NULL) {
+   RTE_LOG(ERR, MBUF, "Failed to get mbuf dyn shared memory\n");
return -1;
+   }
 
shm = mz->addr;
 
@@ -525,7 +527,11 @@ void rte_mbuf_dyn_dump(FILE *out)
size_t i;
 
rte_mcfg_tailq_write_lock();
-   init_shared_mem();
+   if (init_shared_mem() < 0) {
+   rte_mcfg_tailq_write_unlock();
+   return;
+   }
+
fprintf(out, "Reserved fields:\n");
mbuf_dynfield_list = RTE_TAILQ_CAST(
mbuf_dynfield_tailq.head, mbuf_dynfield_list);
-- 
2.7.4

[dpdk-dev] [PATCH] kni: check code of allmulticast mode switch

[Min Hu (Connor)]

From: Chengwen Feng 

Some drivers may return errcode when switch allmulticast mode, so it's
necessary to check the return code.

Fixes: b34801d1aa2e ("kni: support allmulticast mode set")
Cc: sta...@dpdk.org

Signed-off-by: Chengwen Feng 
Signed-off-by: Min Hu (Connor) 
---
 lib/kni/rte_kni.c | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/kni/rte_kni.c b/lib/kni/rte_kni.c
index 9dae6a8..aa9b5b7 100644
--- a/lib/kni/rte_kni.c
+++ b/lib/kni/rte_kni.c
@@ -514,6 +514,8 @@ kni_config_promiscusity(uint16_t port_id, uint8_t to_on)
 static int
 kni_config_allmulticast(uint16_t port_id, uint8_t to_on)
 {
+   int ret;
+
if (!rte_eth_dev_is_valid_port(port_id)) {
RTE_LOG(ERR, KNI, "Invalid port id %d\n", port_id);
return -EINVAL;
@@ -523,11 +525,16 @@ kni_config_allmulticast(uint16_t port_id, uint8_t to_on)
port_id, to_on);
 
if (to_on)
-   rte_eth_allmulticast_enable(port_id);
+   ret = rte_eth_allmulticast_enable(port_id);
else
-   rte_eth_allmulticast_disable(port_id);
+   ret = rte_eth_allmulticast_disable(port_id);
+   if (ret != 0)
+   RTE_LOG(ERR, KNI,
+   "Failed to %s allmulticast mode for port %u: %s\n",
+   to_on ? "enable" : "disable", port_id,
+   rte_strerror(-ret));
 
-   return 0;
+   return ret;
 }
 
 int
-- 
2.7.4

Re: [dpdk-dev] [dpdk-stable] [PATCH v5 3/3] kni: fix kernel deadlock when using mlx devices

[Igor Ryzhov]

This patch changes the behavior for KNI interface shutdown.
Previously we would receive a real response from the driver, now we
always receive success.
I think this should be reflected in the docs/release notes.

Igor

On Wed, Apr 21, 2021 at 2:07 AM Thomas Monjalon  wrote:

> 12/04/2021 16:35, Elad Nachman:
> > Hi,
> >
> > The new patch is fine by me.
> >
> > Tested several dozens restarts of our proprietary application without
> > apparent problem.
>
> Series applied, thanks.
>
>
>

Re: [dpdk-dev] [dpdk-stable] [PATCH 2/2] app/testpmd: fix tunnel offload private items location

[Ferruh Yigit]

On 4/19/2021 2:02 PM, Gregory Etelson wrote:

Flow rules used in tunnel offload model require application to query
PMD for private flow elements and explicitly add these elements to
flow rule.


Hi Gregory,

What is "private flow element"?

And can you please detail what is fixed with this patch, what was not working 
and now working?



Tunnel offload model does not restrict private elements location in
a flow rule.
The patch places tunnel offload private PMD flow elements between
general RTE flow elements in a rule.

Fixes: 1b9f274623b8 ("app/testpmd: add commands for tunnel offload")

Cc: sta...@dpdk.org

Signed-off-by: Gregory Etelson 
Acked-by: Viacheslav Ovsiienko 
---
  app/test-pmd/config.c | 14 --
  1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index ef0b9784d..da5e843fd 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1663,7 +1663,7 @@ port_flow_tunnel_offload_cmd_prep(portid_t port_id,
 aptr->type != RTE_FLOW_ACTION_TYPE_END;
 aptr++, num_actions++);
pft->actions = malloc(
-   (num_actions +  pft->num_pmd_actions) *
+   (num_actions +  pft->num_pmd_actions + 1) *
sizeof(actions[0]));
if (!pft->actions) {
rte_flow_tunnel_action_decap_release(
@@ -1671,9 +1671,10 @@ port_flow_tunnel_offload_cmd_prep(portid_t port_id,
pft->num_pmd_actions, &error);
return NULL;
}
-   rte_memcpy(pft->actions, pft->pmd_actions,
+   pft->actions[0].type = RTE_FLOW_ACTION_TYPE_VOID;
+   rte_memcpy(pft->actions + 1, pft->pmd_actions,
   pft->num_pmd_actions * sizeof(actions[0]));
-   rte_memcpy(pft->actions + pft->num_pmd_actions, actions,
+   rte_memcpy(pft->actions + pft->num_pmd_actions + 1, actions,
   num_actions * sizeof(actions[0]));
}
if (tunnel_ops->items) {
@@ -1691,7 +1692,7 @@ port_flow_tunnel_offload_cmd_prep(portid_t port_id,
for (iptr = pattern, num_items = 1;
 iptr->type != RTE_FLOW_ITEM_TYPE_END;
 iptr++, num_items++);
-   pft->items = malloc((num_items + pft->num_pmd_items) *
+   pft->items = malloc((num_items + pft->num_pmd_items + 1) *
sizeof(pattern[0]));
if (!pft->items) {
rte_flow_tunnel_item_release(
@@ -1699,9 +1700,10 @@ port_flow_tunnel_offload_cmd_prep(portid_t port_id,
pft->num_pmd_items, &error);
return NULL;
}
-   rte_memcpy(pft->items, pft->pmd_items,
+   pft->items[0].type = RTE_FLOW_ITEM_TYPE_VOID;
+   rte_memcpy(pft->items + 1, pft->pmd_items,
   pft->num_pmd_items * sizeof(pattern[0]));
-   rte_memcpy(pft->items + pft->num_pmd_items, pattern,
+   rte_memcpy(pft->items + pft->num_pmd_items + 1, pattern,
   num_items * sizeof(pattern[0]));
}
  

Re: [dpdk-dev] [PATCH v5] net/iavf: fix hash configuration on i40e VF

[Chen, LingliX]

> -Original Message-
> From: dev  On Behalf Of Alvin Zhang
> Sent: Thursday, April 22, 2021 1:08 PM
> To: Wu, Jingjing ; Xing, Beilei 
> Cc: dev@dpdk.org; Zhang, AlvinX ; sta...@dpdk.org
> Subject: [dpdk-dev] [PATCH v5] net/iavf: fix hash configuration on i40e VF
> 
Tested-by: Yan Xia 

Re: [dpdk-dev] [PATCH] examples/vm_power_manager: remove vm channel number check

[David Hunt]

On 21/4/2021 11:45 AM, Reshma Pattan wrote:

VM channel number should not be validated against the
host vm_power_manager coremask core indexes, as VM
cores need not to be same as host cores.
So remove this check, to allow all the vm channels
to be added successfully.

Fixes: b49c677a0d24 ("examples/vm_power: respect core mask")
Cc: david.h...@intel.com
Cc: sta...@dpdk.org

Signed-off-by: Reshma Pattan 
---
  examples/vm_power_manager/channel_manager.c | 6 --
  1 file changed, 6 deletions(-)

diff --git a/examples/vm_power_manager/channel_manager.c 
b/examples/vm_power_manager/channel_manager.c
index 458e37167..fe9156785 100644
--- a/examples/vm_power_manager/channel_manager.c
+++ b/examples/vm_power_manager/channel_manager.c
@@ -454,9 +454,6 @@ add_all_channels(const char *vm_name)
CHANNEL_MGR_SOCKET_PATH, dir->d_name);
continue;
}
-   if (rte_lcore_index(channel_num) == -1)
-   continue;
-
/* if channel has not been added previously */
if (channel_exists(vm_info, channel_num))
continue;
@@ -514,9 +511,6 @@ add_channels(const char *vm_name, unsigned *channel_list,
}
  
  	for (i = 0; i < len_channel_list; i++) {

-   if (rte_lcore_index(i) == -1)
-   continue;
-
if (channel_list[i] >= RTE_MAX_LCORE) {
RTE_LOG(INFO, CHANNEL_MANAGER, "Channel(%u) is out of range 
"
"0...%d\n", 
channel_list[i],



Thanks, Reshma.

The rte_lcore_index() call was incorrectly comparing virtual core_id 
against the list of physical core_ids.


Reviewed-by: David Hunt 

Re: [dpdk-dev] [dpdk-stable] [PATCH v5 3/3] kni: fix kernel deadlock when using mlx devices

[Ferruh Yigit]

On 4/23/2021 9:41 AM, Igor Ryzhov wrote:

This patch changes the behavior for KNI interface shutdown.
Previously we would receive a real response from the driver, now we 
always receive success.

I think this should be reflected in the docs/release notes.



Hi Igor,

Make sense, I can add it.

Meanwhile do you think has a benefit to make shutdown behavior configurable? 
Async/Sync shutdown based on module param?



Igor

On Wed, Apr 21, 2021 at 2:07 AM Thomas Monjalon > wrote:


12/04/2021 16:35, Elad Nachman:
 > Hi,
 >
 > The new patch is fine by me.
 >
 > Tested several dozens restarts of our proprietary application without
 > apparent problem.

Series applied, thanks.

Re: [dpdk-dev] [PATCH 2/2] graph: fix dereferencing null pointer

[Jerin Jacob]

On Thu, Apr 22, 2021 at 5:22 PM Min Hu (Connor)  wrote:
>
> From: HongBo Zheng 
>
> In function 'stats_mem_init', pointer 'stats' should
> be confirmed not null before memset it.
>
> Fixes: af1ae8b6a32c ("graph: implement stats")
> Cc: sta...@dpdk.org
>
> Signed-off-by: HongBo Zheng 
> Signed-off-by: Min Hu (Connor) 
> ---
>  lib/librte_graph/graph_stats.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/librte_graph/graph_stats.c b/lib/librte_graph/graph_stats.c

The directory name is changed in upstream. Please rebase.

Acked-by: Jerin Jacob 




> index f698bb3..bdc8652 100644
> --- a/lib/librte_graph/graph_stats.c
> +++ b/lib/librte_graph/graph_stats.c
> @@ -119,8 +119,8 @@ stats_mem_init(struct cluster *cluster,
> cluster_node_size = RTE_ALIGN(cluster_node_size, RTE_CACHE_LINE_SIZE);
>
> stats = realloc(NULL, sz);
> -   memset(stats, 0, sz);
> if (stats) {
> +   memset(stats, 0, sz);
> stats->fn = fn;
> stats->cluster_node_size = cluster_node_size;
> stats->max_nodes = 0;
> --
> 2.7.4
>

Re: [dpdk-dev] [EXT] [PATCH] app/testeventdev: fix buffer overflow

[Pavan Nikhilesh Bhagavatula]

>Tainted and unvalidated integer 'idx' used as an index, which may
>lead to buffer overflow.
>
>This patch fixed it.
>
>Fixes: 89e5eb118017 ("app/testeventdev: add string parsing helpers")
>Cc: sta...@dpdk.org
>
>Signed-off-by: Min Hu (Connor) 

Acked-by: Pavan Nikhilesh 

>---
> app/test-eventdev/evt_options.c | 4 ++--
> app/test-eventdev/parser.c  | 6 --
> app/test-eventdev/parser.h  | 2 +-
> 3 files changed, 7 insertions(+), 5 deletions(-)
>
>diff --git a/app/test-eventdev/evt_options.c b/app/test-
>eventdev/evt_options.c
>index 0d55405..061b63e 100644
>--- a/app/test-eventdev/evt_options.c
>+++ b/app/test-eventdev/evt_options.c
>@@ -221,7 +221,7 @@ evt_parse_plcores(struct evt_options *opt,
>const char *corelist)
> {
>   int ret;
>
>-  ret = parse_lcores_list(opt->plcores, corelist);
>+  ret = parse_lcores_list(opt->plcores, RTE_MAX_LCORE,
>corelist);
>   if (ret == -E2BIG)
>   evt_err("duplicate lcores in plcores");
>
>@@ -233,7 +233,7 @@ evt_parse_work_lcores(struct evt_options
>*opt, const char *corelist)
> {
>   int ret;
>
>-  ret = parse_lcores_list(opt->wlcores, corelist);
>+  ret = parse_lcores_list(opt->wlcores, RTE_MAX_LCORE,
>corelist);
>   if (ret == -E2BIG)
>   evt_err("duplicate lcores in wlcores");
>
>diff --git a/app/test-eventdev/parser.c b/app/test-eventdev/parser.c
>index 24f1855..7a973cb 100644
>--- a/app/test-eventdev/parser.c
>+++ b/app/test-eventdev/parser.c
>@@ -310,7 +310,7 @@ parse_hex_string(char *src, uint8_t *dst,
>uint32_t *size)
> }
>
> int
>-parse_lcores_list(bool lcores[], const char *corelist)
>+parse_lcores_list(bool lcores[], int lcores_num, const char *corelist)
> {
>   int i, idx = 0;
>   int min, max;
>@@ -332,6 +332,8 @@ parse_lcores_list(bool lcores[], const char
>*corelist)
>   if (*corelist == '\0')
>   return -1;
>   idx = strtoul(corelist, &end, 10);
>+  if (idx < 0 || idx > lcores_num)
>+  return -1;
>
>   if (end == NULL)
>   return -1;
>@@ -343,7 +345,7 @@ parse_lcores_list(bool lcores[], const char
>*corelist)
>   max = idx;
>   if (min == RTE_MAX_LCORE)
>   min = idx;
>-  for (idx = min; idx <= max; idx++) {
>+  for (idx = min; idx < max; idx++) {
>   if (lcores[idx] == 1)
>   return -E2BIG;
>   lcores[idx] = 1;
>diff --git a/app/test-eventdev/parser.h b/app/test-eventdev/parser.h
>index 673ff22..696b40a 100644
>--- a/app/test-eventdev/parser.h
>+++ b/app/test-eventdev/parser.h
>@@ -46,5 +46,5 @@ int parse_hex_string(char *src, uint8_t *dst,
>uint32_t *size);
>
> int parse_tokenize_string(char *string, char *tokens[], uint32_t
>*n_tokens);
>
>-int parse_lcores_list(bool lcores[], const char *corelist);
>+int parse_lcores_list(bool lcores[], int lcores_num, const char
>*corelist);
> #endif
>--
>2.7.4

[dpdk-dev] [PATCH 2/2] doc: fix runtime config options

[Min Hu (Connor)]

This patch added examples for runtime config options, to help user
how to use this.

Fixes: a124f9e9591b ("net/hns3: add runtime config to select IO burst function")
Fixes: 70791213242e ("net/hns3: support masking device capability")

Signed-off-by: Min Hu (Connor) 
---
 doc/guides/nics/hns3.rst | 9 +
 1 file changed, 9 insertions(+)

diff --git a/doc/guides/nics/hns3.rst b/doc/guides/nics/hns3.rst
index 52d6718..d51d9b1 100644
--- a/doc/guides/nics/hns3.rst
+++ b/doc/guides/nics/hns3.rst
@@ -67,6 +67,9 @@ Runtime Config Options
   be first checked, if meets, use the ``vec``. Then, ``simple``, at last
   ``common``.
 
+  For example::
+  -a :7d:00.0,rx_func_hint=simple
+
 - ``tx_func_hint`` (default ``none``)
 
   Used to select Tx burst function, supported value are ``vec``, ``sve``,
@@ -84,6 +87,9 @@ Runtime Config Options
   be first checked, if meets, use the ``vec``. Then, ``simple``, at last
   ``common``.
 
+  For example::
+  -a :7d:00.0,tx_func_hint=common
+
 - ``dev_caps_mask`` (default ``0``)
 
   Used to mask the capability which queried from firmware.
@@ -93,6 +99,9 @@ Runtime Config Options
   masked off, then the capability will be 0xFFF0.
   Its main purpose is to debug and avoid problems.
 
+  For example::
+  -a :7d:00.0,dev_caps_mask=0xF
+
 Driver compilation and testing
 --
 
-- 
2.7.4

[dpdk-dev] [PATCH 1/2] net/hns3: fix wrong word of comments

[Min Hu (Connor)]

This patch fixed wrong word in comments.

Fixes: f53a793bb7c2 ("net/hns3: add more hardware error types")
Fixes: d51867db65c1 ("net/hns3: add initialization")
Fixes: 411d23b9eafb ("net/hns3: support VLAN")
Fixes: 5f8845f4ba8f ("net/hns3: process MAC interrupt")
Cc: sta...@dpdk.org

Signed-off-by: Min Hu (Connor) 
---
 drivers/net/hns3/hns3_ethdev.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 60267e1..16ee4ac 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -280,7 +280,7 @@ hns3_handle_mac_tnl(struct hns3_hw *hw)
uint32_t status;
int ret;
 
-   /* query and clear mac tnl interruptions */
+   /* query and clear mac tnl interrupt */
hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_QUERY_MAC_TNL_INT, true);
ret = hns3_cmd_send(hw, &desc, 1);
if (ret) {
@@ -462,7 +462,7 @@ hns3_vlan_filter_configure(struct hns3_adapter *hns, 
uint16_t vlan_id, int on)
 * When port base vlan enabled, we use port base vlan as the vlan
 * filter condition. In this case, we don't update vlan filter table
 * when user add new vlan or remove exist vlan, just update the
-* vlan list. The vlan id in vlan list will be writen in vlan filter
+* vlan list. The vlan id in vlan list will be written in vlan filter
 * table until port base vlan disabled
 */
if (hw->port_base_vlan_cfg.state == HNS3_PORT_BASE_VLAN_DISABLE) {
@@ -3983,8 +3983,8 @@ hns3_rx_buffer_calc(struct hns3_hw *hw, struct 
hns3_pkt_buf_alloc *buf_alloc)
 * For different application scenes, the enabled port number, TC number
 * and no_drop TC number are different. In order to obtain the better
 * performance, software could allocate the buffer size and configure
-* the waterline by tring to decrease the private buffer size according
-* to the order, namely, waterline of valided tc, pfc disabled tc, pfc
+* the waterline by trying to decrease the private buffer size according
+* to the order, namely, waterline of valid tc, pfc disabled tc, pfc
 * enabled tc.
 */
if (hns3_rx_buf_calc_all(hw, false, buf_alloc))
@@ -5045,7 +5045,7 @@ hns3_config_all_msix_error(struct hns3_hw *hw, bool 
enable)
 * and belong to a different type from the MSI-x errors processed
 * by the network driver.
 *
-* Network driver should open the new error report on initialition
+* Network driver should open the new error report on initialization.
 */
val = hns3_read_dev(hw, HNS3_VECTOR0_OTER_EN_REG);
hns3_set_bit(val, HNS3_VECTOR0_ALL_MSIX_ERR_B, enable ? 1 : 0);
-- 
2.7.4

[dpdk-dev] [PATCH 0/2] bugfix for hns3 PMD

[Min Hu (Connor)]

This patch set contains two bugfixes for hns3 PMD.

Min Hu (Connor) (2):
  net/hns3: fix wrong word of comments
  doc: fix runtime config options

 doc/guides/nics/hns3.rst   |  9 +
 drivers/net/hns3/hns3_ethdev.c | 10 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

-- 
2.7.4

Re: [dpdk-dev] [PATCH 2/2] net/tap: fix tap interrupt vector array size

[Min Hu (Connor)]

在 2021/4/22 23:20, Stephen Hemminger 写道:

On Thu, 22 Apr 2021 19:27:14 +0800
"Min Hu (Connor)"  wrote:


diff --git a/drivers/net/tap/tap_intr.c b/drivers/net/tap/tap_intr.c
index 5cf4f17..1cacc15 100644
--- a/drivers/net/tap/tap_intr.c
+++ b/drivers/net/tap/tap_intr.c
@@ -59,7 +59,7 @@ tap_rx_intr_vec_install(struct rte_eth_dev *dev)
  
  	if (!dev->data->dev_conf.intr_conf.rxq)

return 0;
-   intr_handle->intr_vec = malloc(sizeof(intr_handle->intr_vec[rxqs_n]));
+   intr_handle->intr_vec = malloc(sizeof(int) * rxqs_n);


Maybe calloc() here would be good idea?


Hi, Stephen,
No need to use calloc, because members of
 'intr_handle->intr_vec' array will be set new
value.

[dpdk-dev] [PATCH 2/2] net/bonding: support configuring Tx offloading for bonding

[Chengchang Tang]

Currently, the TX offloading of the bonding device will not take effect by
using dev_configure. Because the related configuration will not be
delivered to the slave devices in this way.

The Tx offloading capability of the bonding device is the intersection of
the capability of all slave devices. Based on this, the following functions
are added to the bonding driver:
1. If a Tx offloading is within the capability of the bonding device (i.e.
all the slave devices support this Tx offloading), the enabling status of
the offloading of all slave devices depends on the configuration of the
bonding device.

2. For the Tx offloading that is not within the Tx offloading capability
of the bonding device, the enabling status of the offloading on the slave
devices is irrelevant to the bonding device configuration. And it depends
on the original configuration of the slave devices.

Signed-off-by: Chengchang Tang 
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 13 +
 1 file changed, 13 insertions(+)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c 
b/drivers/net/bonding/rte_eth_bond_pmd.c
index 84af348..9922657 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1712,6 +1712,8 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
struct rte_flow_error flow_error;

struct bond_dev_private *internals = bonded_eth_dev->data->dev_private;
+   uint64_t tx_offload_cap = internals->tx_offload_capa;
+   uint64_t tx_offload;

/* Stop slave */
errval = rte_eth_dev_stop(slave_eth_dev->data->port_id);
@@ -1759,6 +1761,17 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
slave_eth_dev->data->dev_conf.rxmode.offloads &=
~DEV_RX_OFFLOAD_JUMBO_FRAME;

+   while (tx_offload_cap != 0) {
+   tx_offload = 1ULL << __builtin_ctzll(tx_offload_cap);
+   if (bonded_eth_dev->data->dev_conf.txmode.offloads & tx_offload)
+   slave_eth_dev->data->dev_conf.txmode.offloads |=
+   tx_offload;
+   else
+   slave_eth_dev->data->dev_conf.txmode.offloads &=
+   ~tx_offload;
+   tx_offload_cap &= ~tx_offload;
+   }
+
nb_rx_queues = bonded_eth_dev->data->nb_rx_queues;
nb_tx_queues = bonded_eth_dev->data->nb_tx_queues;

--
2.7.4

[dpdk-dev] [PATCH 1/2] net/bonding: support Tx prepare for bonding

[Chengchang Tang]

To use the HW offloads capability (e.g. checksum and TSO) in the Tx
direction, the upper-layer users need to call rte_eth_dev_prepare to do
some adjustment to the packets before sending them (e.g. processing
pseudo headers when Tx checksum offoad enabled). But, the tx_prepare
callback of the bond driver is not implemented. Therefore, related
offloads can not be used unless the upper layer users process the packet
properly in their own application. But it is bad for the
transplantability.

However, it is difficult to design the tx_prepare callback for bonding
driver. Because when a bonded device sends packets, the bonded device
allocates the packets to different slave devices based on the real-time
link status and bonding mode. That is, it is very difficult for the
bonding device to determine which slave device's prepare function should
be invoked. In addition, if the link status changes after the packets are
prepared, the packets may fail to be sent because packets allocation may
change.

So, in this patch, the tx_prepare callback of bonding driver is not
implemented. Instead, the rte_eth_dev_tx_prepare() will be called for
all the fast path packet in mode 0, 1, 2, 4, 5, 6. In this way, all
tx_offloads can be processed correctly for all NIC devices in these modes.
If tx_prepare is not required in some cases, then slave PMDs tx_prepare
pointer should be NULL and rte_eth_tx_prepare() will be just a NOOP.
In these cases, the impact on performance will be very limited. It is
the responsibility of the slave PMDs to decide when the real tx_prepare
needs to be used. The information from dev_config/queue_setup is
sufficient for them to make these decisions.

Note:
The rte_eth_tx_prepare is not added to bond mode 3(Broadcast). This is
because in broadcast mode, a packet needs to be sent by all slave ports.
Different PMDs process the packets differently in tx_prepare. As a result,
the sent packet may be incorrect.

Signed-off-by: Chengchang Tang 
---
 drivers/net/bonding/rte_eth_bond.h |  1 -
 drivers/net/bonding/rte_eth_bond_pmd.c | 28 
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond.h 
b/drivers/net/bonding/rte_eth_bond.h
index 874aa91..1e6cc6d 100644
--- a/drivers/net/bonding/rte_eth_bond.h
+++ b/drivers/net/bonding/rte_eth_bond.h
@@ -343,7 +343,6 @@ rte_eth_bond_link_up_prop_delay_set(uint16_t bonded_port_id,
 int
 rte_eth_bond_link_up_prop_delay_get(uint16_t bonded_port_id);

-
 #ifdef __cplusplus
 }
 #endif
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c 
b/drivers/net/bonding/rte_eth_bond_pmd.c
index 2e9cea5..84af348 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -606,8 +606,14 @@ bond_ethdev_tx_burst_round_robin(void *queue, struct 
rte_mbuf **bufs,
/* Send packet burst on each slave device */
for (i = 0; i < num_of_slaves; i++) {
if (slave_nb_pkts[i] > 0) {
+   int nb_prep_pkts;
+
+   nb_prep_pkts = rte_eth_tx_prepare(slaves[i],
+   bd_tx_q->queue_id, slave_bufs[i],
+   slave_nb_pkts[i]);
+
num_tx_slave = rte_eth_tx_burst(slaves[i], 
bd_tx_q->queue_id,
-   slave_bufs[i], slave_nb_pkts[i]);
+   slave_bufs[i], nb_prep_pkts);

/* if tx burst fails move packets to end of bufs */
if (unlikely(num_tx_slave < slave_nb_pkts[i])) {
@@ -632,6 +638,7 @@ bond_ethdev_tx_burst_active_backup(void *queue,
 {
struct bond_dev_private *internals;
struct bond_tx_queue *bd_tx_q;
+   int nb_prep_pkts;

bd_tx_q = (struct bond_tx_queue *)queue;
internals = bd_tx_q->dev_private;
@@ -639,8 +646,11 @@ bond_ethdev_tx_burst_active_backup(void *queue,
if (internals->active_slave_count < 1)
return 0;

+   nb_prep_pkts = rte_eth_tx_prepare(internals->current_primary_port,
+   bd_tx_q->queue_id, bufs, nb_pkts);
+
return rte_eth_tx_burst(internals->current_primary_port, 
bd_tx_q->queue_id,
-   bufs, nb_pkts);
+   bufs, nb_prep_pkts);
 }

 static inline uint16_t
@@ -939,6 +949,8 @@ bond_ethdev_tx_burst_tlb(void *queue, struct rte_mbuf 
**bufs, uint16_t nb_pkts)
}

for (i = 0; i < num_of_slaves; i++) {
+   int nb_prep_pkts;
+
rte_eth_macaddr_get(slaves[i], &active_slave_addr);
for (j = num_tx_total; j < nb_pkts; j++) {
if (j + 3 < nb_pkts)
@@ -955,9 +967,12 @@ bond_ethdev_tx_burst_tlb(void *queue, struct rte_mbuf 
**bufs, uint16_t nb_pkts)
 #endif
}

-   num_tx_total += rte_eth_tx_burst(slaves[i], bd_tx_q->queue_id,
+   nb_prep_pkts = rte_eth_tx_prepare(slaves[i], 

[dpdk-dev] [PATCH 0/2] add Tx prepare support for bonding device

[Chengchang Tang]

This patch set add Tx prepare for bonding device.

Currently, the bonding driver has not implemented the callback of
rte_eth_tx_prepare function. Therefore, the TX prepare function of the
slave devices will never be invoked. When hardware offloading such as
CKSUM and TSO are enabled for some drivers, tx_prepare needs to be used
to adjust packets (for example, set correct pseudo packet headers).
Otherwise, related offloading fails and even packets are sent
incorrectly. Due to this limitation, the bonded device cannot use these
HW offloading in the Tx direction.

Because packet sending algorithms are numerous and complex in bond PMD,
it is hard to design the callback for rte_eth_tx_prepare. In this
patchset, the tx_prepare callback of bonding PMD is not implemented.
Instead, rte_eth_tx_prepare has been called in tx_burst callback. In
this way, all tx_offloads can be processed correctly for all NIC devices.
It is the responsibility of the slave PMDs to decide when the real
tx_prepare needs to be used. If tx_prepare is not required in some cases,
then slave PMDs tx_prepare pointer should be NULL and rte_eth_tx_prepare()
will be just a NOOP. That is, the effectiveness and security of tx_prepare
and its impact on performance depend on the design of slave PMDs.

And configuring Tx offloading for bonding is also added in this patchset.
This solves the problem that we need to configure slave devices one by one
when configuring Tx offloading.

Chengchang Tang (2):
  net/bonding: support Tx prepare for bonding
  net/bonding: support configuring Tx offloading for bonding

 drivers/net/bonding/rte_eth_bond.h |  1 -
 drivers/net/bonding/rte_eth_bond_pmd.c | 41 ++
 2 files changed, 37 insertions(+), 5 deletions(-)

--
2.7.4

[dpdk-dev] [PATCH] net/hns3: disable the MAC status report interrupt

[Min Hu (Connor)]

From: HongBo Zheng 

Disable the MAC status report interrupt which hns3 driver not concern
currently.

Fixes: 5f8845f4ba8f ("net/hns3: process MAC interrupt")
Cc: sta...@dpdk.org

Signed-off-by: HongBo Zheng 
Signed-off-by: Min Hu (Connor) 
---
 drivers/net/hns3/hns3_ethdev.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 60267e1..16341ea 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -4892,8 +4892,6 @@ hns3_update_link_status(struct hns3_hw *hw)
if (state != hw->mac.link_status) {
hw->mac.link_status = state;
hns3_warn(hw, "Link status change to %s!", state ? "up" : 
"down");
-   hns3_config_mac_tnl_int(hw,
-   state == ETH_LINK_UP ? true : false);
return true;
}
 
-- 
2.7.4

Re: [dpdk-dev] [PATCH] net/kni: check rte kni init result

[Ferruh Yigit]

On 4/21/2021 3:14 AM, Min Hu (Connor) wrote:

From: Chengwen Feng 

This patch adds checking for rte_kni_init() result.

Fixes: 75e2bc54c018 ("net/kni: add KNI PMD")
Cc: sta...@dpdk.org

Signed-off-by: Chengwen Feng 
Signed-off-by: Min Hu (Connor) 


Acked-by: Ferruh Yigit 

Re: [dpdk-dev] [PATCH v3 2/2] lib/mempool: distinguish debug counters from cache and pool

[Kinsella, Ray]

On 21/04/2021 17:29, Olivier Matz wrote:
> Hi Dharmik,
> 
> Please see some comments below.
> 
> On Mon, Apr 19, 2021 at 07:08:00PM -0500, Dharmik Thakkar wrote:
>> From: Joyce Kong 
>>
>> If cache is enabled, objects will be retrieved/put from/to cache,
>> subsequently from/to the common pool. Now the debug stats calculate
>> the objects retrieved/put from/to cache and pool together, it is
>> better to distinguish them.
>>
>> Signed-off-by: Joyce Kong 
>> Signed-off-by: Dharmik Thakkar 
>> Reviewed-by: Ruifeng Wang 
>> Reviewed-by: Honnappa Nagarahalli 
>> ---
>>  lib/librte_mempool/rte_mempool.c | 24 
>>  lib/librte_mempool/rte_mempool.h | 47 ++--
>>  2 files changed, 57 insertions(+), 14 deletions(-)
>>
>> diff --git a/lib/librte_mempool/rte_mempool.c 
>> b/lib/librte_mempool/rte_mempool.c
>> index afb1239c8d48..339f14455624 100644
>> --- a/lib/librte_mempool/rte_mempool.c
>> +++ b/lib/librte_mempool/rte_mempool.c
>> @@ -1244,6 +1244,18 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
>>  for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
>>  sum.put_bulk += mp->stats[lcore_id].put_bulk;
>>  sum.put_objs += mp->stats[lcore_id].put_objs;
>> +sum.put_common_pool_bulk +=
>> +mp->stats[lcore_id].put_common_pool_bulk;
>> +sum.put_common_pool_objs +=
>> +mp->stats[lcore_id].put_common_pool_objs;
>> +sum.put_cache_bulk += mp->stats[lcore_id].put_cache_bulk;
>> +sum.put_cache_objs += mp->stats[lcore_id].put_cache_objs;
>> +sum.get_common_pool_bulk +=
>> +mp->stats[lcore_id].get_common_pool_bulk;
>> +sum.get_common_pool_objs +=
>> +mp->stats[lcore_id].get_common_pool_objs;
>> +sum.get_cache_bulk += mp->stats[lcore_id].get_cache_bulk;
>> +sum.get_cache_objs += mp->stats[lcore_id].get_cache_objs;
>>  sum.get_success_bulk += mp->stats[lcore_id].get_success_bulk;
>>  sum.get_success_objs += mp->stats[lcore_id].get_success_objs;
>>  sum.get_fail_bulk += mp->stats[lcore_id].get_fail_bulk;
>> @@ -1254,6 +1266,18 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
>>  fprintf(f, "  stats:\n");
>>  fprintf(f, "put_bulk=%"PRIu64"\n", sum.put_bulk);
>>  fprintf(f, "put_objs=%"PRIu64"\n", sum.put_objs);
>> +fprintf(f, "put_common_pool_bulk=%"PRIu64"\n",
>> +sum.put_common_pool_bulk);
>> +fprintf(f, "put_common_pool_objs=%"PRIu64"\n",
>> +sum.put_common_pool_objs);
>> +fprintf(f, "put_cache_bulk=%"PRIu64"\n", sum.put_cache_bulk);
>> +fprintf(f, "put_cache_objs=%"PRIu64"\n", sum.put_cache_objs);
>> +fprintf(f, "get_common_pool_bulk=%"PRIu64"\n",
>> +sum.get_common_pool_bulk);
>> +fprintf(f, "get_common_pool_objs=%"PRIu64"\n",
>> +sum.get_common_pool_objs);
>> +fprintf(f, "get_cache_bulk=%"PRIu64"\n", sum.get_cache_bulk);
>> +fprintf(f, "get_cache_objs=%"PRIu64"\n", sum.get_cache_objs);
>>  fprintf(f, "get_success_bulk=%"PRIu64"\n", sum.get_success_bulk);
>>  fprintf(f, "get_success_objs=%"PRIu64"\n", sum.get_success_objs);
>>  fprintf(f, "get_fail_bulk=%"PRIu64"\n", sum.get_fail_bulk);
>> diff --git a/lib/librte_mempool/rte_mempool.h 
>> b/lib/librte_mempool/rte_mempool.h
>> index 848a19226149..0959f8a3f367 100644
>> --- a/lib/librte_mempool/rte_mempool.h
>> +++ b/lib/librte_mempool/rte_mempool.h
>> @@ -66,12 +66,20 @@ extern "C" {
>>   * A structure that stores the mempool statistics (per-lcore).
>>   */
>>  struct rte_mempool_debug_stats {
>> -uint64_t put_bulk; /**< Number of puts. */
>> -uint64_t put_objs; /**< Number of objects successfully put. */
>> -uint64_t get_success_bulk; /**< Successful allocation number. */
>> -uint64_t get_success_objs; /**< Objects successfully allocated. */
>> -uint64_t get_fail_bulk;/**< Failed allocation number. */
>> -uint64_t get_fail_objs;/**< Objects that failed to be allocated. */
>> +uint64_t put_bulk;/**< Number of puts. */
>> +uint64_t put_objs;/**< Number of objects successfully 
>> put. */
>> +uint64_t put_common_pool_bulk;/**< Number of bulks enqueued in 
>> common pool. */
>> +uint64_t put_common_pool_objs;/**< Number of objects enqueued in 
>> common pool. */
>> +uint64_t put_cache_bulk;  /**< Number of bulks enqueued in 
>> cache. */
>> +uint64_t put_cache_objs;  /**< Number of objects enqueued in 
>> cache. */
>> +uint64_t get_common_pool_bulk;/**< Number of bulks dequeued from 
>> common pool. */
>> +uint64_t get_common_pool_objs;/**< Number of objects dequeued

Re: [dpdk-dev] [PATCH v2 1/3] bus/pci: enable PCI master in command register

[Kinsella, Ray]

On 22/04/2021 02:18, Haiyue Wang wrote:
> This adds the support to set 'Bus Master Enable' bit in the PCI command
> register.
> 
> Signed-off-by: Haiyue Wang 
> Tested-by: Qi Zhang 
> ---
>  drivers/bus/pci/pci_common.c  | 20 
>  drivers/bus/pci/rte_bus_pci.h | 12 
>  drivers/bus/pci/version.map   |  1 +
>  lib/pci/rte_pci.h |  4 
>  4 files changed, 37 insertions(+)
> 
> diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
> index ee7f96635..b631cb9c7 100644
> --- a/drivers/bus/pci/pci_common.c
> +++ b/drivers/bus/pci/pci_common.c
> @@ -746,6 +746,26 @@ rte_pci_find_ext_capability(struct rte_pci_device *dev, 
> uint32_t cap)
>   return 0;
>  }
>  
> +int
> +rte_pci_enable_bus_master(struct rte_pci_device *dev)
> +{
> + uint16_t cmd;
> +
> + if (rte_pci_read_config(dev, &cmd, sizeof(cmd), RTE_PCI_COMMAND) < 0) {
> + RTE_LOG(ERR, EAL, "error in reading PCI command register\n");
> + return -1;
> + }
> +
> + cmd |= RTE_PCI_COMMAND_MASTER;
> +
> + if (rte_pci_write_config(dev, &cmd, sizeof(cmd), RTE_PCI_COMMAND) < 0) {
> + RTE_LOG(ERR, EAL, "error in writing PCI command register\n");
> + return -1;
> + }
> +
> + return 0;
> +}
> +
>  struct rte_pci_bus rte_pci_bus = {
>   .bus = {
>   .scan = rte_pci_scan,
> diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
> index 64886b473..83caf477b 100644
> --- a/drivers/bus/pci/rte_bus_pci.h
> +++ b/drivers/bus/pci/rte_bus_pci.h
> @@ -249,6 +249,18 @@ void rte_pci_dump(FILE *f);
>  __rte_experimental
>  off_t rte_pci_find_ext_capability(struct rte_pci_device *dev, uint32_t cap);
>  
> +/**
> + * Enables Bus Master for device's PCI command register.
> + *
> + *  @param dev
> + *A pointer to rte_pci_device structure.
> + *
> + *  @return
> + *  0 on success, -1 on error in PCI config space read/write.
> + */
> +__rte_experimental
> +int rte_pci_enable_bus_master(struct rte_pci_device *dev);
> +
>  /**
>   * Register a PCI driver.
>   *
> diff --git a/drivers/bus/pci/version.map b/drivers/bus/pci/version.map
> index f33ed0abd..b271e48a8 100644
> --- a/drivers/bus/pci/version.map
> +++ b/drivers/bus/pci/version.map
> @@ -20,5 +20,6 @@ DPDK_21 {
>  EXPERIMENTAL {
>   global:
>  

Please annotate when the symbol was added.

> + rte_pci_enable_bus_master;
>   rte_pci_find_ext_capability;
>  };
> diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
> index a8f8e404a..1f33d687f 100644
> --- a/lib/pci/rte_pci.h
> +++ b/lib/pci/rte_pci.h
> @@ -32,6 +32,10 @@ extern "C" {
>  
>  #define RTE_PCI_VENDOR_ID0x00/* 16 bits */
>  #define RTE_PCI_DEVICE_ID0x02/* 16 bits */
> +#define RTE_PCI_COMMAND  0x04/* 16 bits */
> +
> +/* PCI Command Register */
> +#define RTE_PCI_COMMAND_MASTER   0x4 /* Bus Master Enable */
>  
>  /* PCI Express capability registers */
>  #define RTE_PCI_EXP_DEVCTL   8   /* Device Control */
> 

Re: [dpdk-dev] [PATCH] doc: announce modification in eventdev structure

[Kinsella, Ray]

On 15/04/2021 10:08, gak...@marvell.com wrote:
> From: Akhil Goyal 
> 
> A new field ``ca_enqueue`` is added in ``rte_eventdev``
> in the end to maintain ABI. It needs to be moved above
> in the structure to align with other enqueue callbacks.
> 
> Signed-off-by: Akhil Goyal 
> ---
>  doc/guides/rel_notes/deprecation.rst | 4 
>  1 file changed, 4 insertions(+)
> 
> diff --git a/doc/guides/rel_notes/deprecation.rst 
> b/doc/guides/rel_notes/deprecation.rst
> index 2afc84c39..a973de4a9 100644
> --- a/doc/guides/rel_notes/deprecation.rst
> +++ b/doc/guides/rel_notes/deprecation.rst
> @@ -127,6 +127,10 @@ Deprecation Notices
>values to the function ``rte_event_eth_rx_adapter_queue_add`` using
>the structure ``rte_event_eth_rx_adapter_queue_add``.
>  
> +* eventdev: The function pointer ``ca_enqueue`` in structure ``rte_eventdev``
> +  will be moved after ``txa_enqueue`` so that all enqueue/dequeue
> +  function pointers are adjacent to each other.
> +
>  * sched: To allow more traffic classes, flexible mapping of pipe queues to
>traffic classes, and subport level configuration of pipes and queues
>changes will be made to macros, data structures and API functions defined
> 

I admire the disipline - but since you are not actually removing ca_enqueue,
just moving it in memory when the new ABI is declared in anycase, this is not 
required.

Thanks,

Ray K

[dpdk-dev] [PATCH 1/2] lib/sched: fix return value judgment

[Min Hu (Connor)]

From: Huisong Li 

This patch fixes return value judgment when allocate memory to store the
subport profile, and releases memory of 'rte_sched_port' if code fails to
apply for this memory.

Fixes: 0ea4c6afcaf1 ("sched: add subport profile table")
Cc: sta...@dpdk.org

Signed-off-by: Huisong Li 
Signed-off-by: Min Hu (Connor) 
---
 lib/sched/rte_sched.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c
index cd87e68..df0ab5c 100644
--- a/lib/sched/rte_sched.c
+++ b/lib/sched/rte_sched.c
@@ -961,9 +961,9 @@ rte_sched_port_config(struct rte_sched_port_params *params)
/* Allocate memory to store the subport profile */
port->subport_profiles  = rte_zmalloc_socket("subport_profile", size2,
RTE_CACHE_LINE_SIZE, params->socket);
-   if (port == NULL) {
+   if (port->subport_profiles == NULL) {
RTE_LOG(ERR, SCHED, "%s: Memory allocation fails\n", __func__);
-
+   rte_free(port);
return NULL;
}
 
-- 
2.7.4

[dpdk-dev] [PATCH 2/2] lib/sched: optimize exception handling code

[Min Hu (Connor)]

From: Huisong Li 

Currently, rte_sched_free_memory() is called multiple times by the
exception handling code in rte_sched_subport_config() and
rte_sched_pipe_config().

This patch optimizes them into a unified outlet to free memory.

Fixes: ac6fcb841b0f ("sched: update subport rate dynamically")
Fixes: 34a90f86657c ("sched: modify pipe functions for config flexibility")
Fixes: ce7c4fd7c2ac ("sched: add pipe config to subport level")
Cc: sta...@dpdk.org

Signed-off-by: Huisong Li 
Signed-off-by: Min Hu (Connor) 
---
 lib/sched/rte_sched.c | 56 +++
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c
index df0ab5c..a858f61 100644
--- a/lib/sched/rte_sched.c
+++ b/lib/sched/rte_sched.c
@@ -1090,6 +1090,7 @@ rte_sched_subport_config(struct rte_sched_port *port,
uint32_t n_subport_pipe_queues, i;
uint32_t size0, size1, bmp_mem_size;
int status;
+   int ret;
 
/* Check user parameters */
if (port == NULL) {
@@ -1101,17 +1102,16 @@ rte_sched_subport_config(struct rte_sched_port *port,
if (subport_id >= port->n_subports_per_port) {
RTE_LOG(ERR, SCHED,
"%s: Incorrect value for subport id\n", __func__);
-
-   rte_sched_free_memory(port, n_subports);
-   return -EINVAL;
+   ret = -EINVAL;
+   goto out;
}
 
if (subport_profile_id >= port->n_max_subport_profiles) {
RTE_LOG(ERR, SCHED, "%s: "
"Number of subport profile exceeds the max limit\n",
__func__);
-   rte_sched_free_memory(port, n_subports);
-   return -EINVAL;
+   ret = -EINVAL;
+   goto out;
}
 
/** Memory is allocated only on first invocation of the api for a
@@ -1127,9 +1127,8 @@ rte_sched_subport_config(struct rte_sched_port *port,
RTE_LOG(NOTICE, SCHED,
"%s: Port scheduler params check failed (%d)\n",
__func__, status);
-
-   rte_sched_free_memory(port, n_subports);
-   return -EINVAL;
+   ret = -EINVAL;
+   goto out;
}
 
/* Determine the amount of memory to allocate */
@@ -1143,9 +1142,8 @@ rte_sched_subport_config(struct rte_sched_port *port,
if (s == NULL) {
RTE_LOG(ERR, SCHED,
"%s: Memory allocation fails\n", __func__);
-
-   rte_sched_free_memory(port, n_subports);
-   return -ENOMEM;
+   ret = -ENOMEM;
+   goto out;
}
 
n_subports++;
@@ -1185,12 +1183,11 @@ rte_sched_subport_config(struct rte_sched_port *port,
params->red_params[i][j].min_th,
params->red_params[i][j].max_th,
params->red_params[i][j].maxp_inv) != 0) {
-   rte_sched_free_memory(port, n_subports);
-
RTE_LOG(NOTICE, SCHED,
"%s: RED configuration init fails\n",
__func__);
-   return -EINVAL;
+   ret = -EINVAL;
+   goto out;
}
}
}
@@ -1238,9 +1235,8 @@ rte_sched_subport_config(struct rte_sched_port *port,
if (s->bmp == NULL) {
RTE_LOG(ERR, SCHED,
"%s: Subport bitmap init error\n", __func__);
-
-   rte_sched_free_memory(port, n_subports);
-   return -EINVAL;
+   ret = -EINVAL;
+   goto out;
}
 
for (i = 0; i < RTE_SCHED_PORT_N_GRINDERS; i++)
@@ -1285,6 +1281,11 @@ rte_sched_subport_config(struct rte_sched_port *port,
rte_sched_port_log_subport_profile(port, subport_profile_id);
 
return 0;
+
+out:
+   rte_sched_free_memory(port, n_subports);
+
+   return ret;
 }
 
 int
@@ -1299,6 +1300,7 @@ rte_sched_pipe_config(struct rte_sched_port *port,
struct rte_sched_pipe_profile *params;
uint32_t n_subports = subport_id + 1;
uint32_t deactivate, profile, i;
+   int ret;
 
/* Check user parameters */
profile = (uint32_t) pipe_profile;
@@ -1313,26 +1315,23 @@ rte_sched_pipe_config(struct rte_sched_port *port,
if (subport_id >= port->n_subports_per_port) {
RTE_LOG(ERR, SCHED,
"%s: Incorrect value for parameter su

[dpdk-dev] [PATCH 0/2] bugfix for sched

[Min Hu (Connor)]

This patch set contains two bugfixes for sched.

Huisong Li (2):
  lib/sched: fix return value judgment
  lib/sched: optimize exception handling code

 lib/sched/rte_sched.c | 60 +++
 1 file changed, 32 insertions(+), 28 deletions(-)

-- 
2.7.4

[dpdk-dev] [PATCH v1 1/1] power: do not skip saving original acpi governor

[Anatoly Burakov]

Currently, when we set the acpi governor to "userspace", we check if
it is already set to this value, and if it is, we skip setting it.

However, we never save this value anywhere, so that next time we come
back and request the governor to be set to its original value, the
original value is empty.

Fix it by saving the original pstate governor first. While we're at it,
replace `strlcpy` with `rte_strscpy`.

Fixes: 445c6528b55f ("power: common interface for guest and host")
Cc: david.h...@intel.com

Signed-off-by: Anatoly Burakov 
---
 lib/power/power_acpi_cpufreq.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/power/power_acpi_cpufreq.c b/lib/power/power_acpi_cpufreq.c
index 84a9d75207..d028a9947f 100644
--- a/lib/power/power_acpi_cpufreq.c
+++ b/lib/power/power_acpi_cpufreq.c
@@ -152,6 +152,9 @@ power_set_governor_userspace(struct rte_power_info *pi)
/* Strip off terminating '\n' */
strtok(buf, "\n");
 
+   /* Save the original governor */
+   rte_strscpy(pi->governor_ori, buf, sizeof(pi->governor_ori));
+
/* Check if current governor is userspace */
if (strncmp(buf, POWER_GOVERNOR_USERSPACE,
sizeof(POWER_GOVERNOR_USERSPACE)) == 0) {
@@ -160,8 +163,6 @@ power_set_governor_userspace(struct rte_power_info *pi)
"already userspace\n", pi->lcore_id);
goto out;
}
-   /* Save the original governor */
-   strlcpy(pi->governor_ori, buf, sizeof(pi->governor_ori));
 
/* Write 'userspace' to the governor */
val = fseek(f, 0, SEEK_SET);
-- 
2.25.1

[dpdk-dev] [21.08 PATCH v4 1/2] power: don't use rte prefix in internal code

[Anatoly Burakov]

Currently, ACPI code uses rte_power_info as the struct name, which
gives the appearance that this is an externally visible API. Fix to
use internal namespace.

Signed-off-by: Anatoly Burakov 
---
 lib/power/power_acpi_cpufreq.c | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/power/power_acpi_cpufreq.c b/lib/power/power_acpi_cpufreq.c
index d028a9947f..1b8c69cc8b 100644
--- a/lib/power/power_acpi_cpufreq.c
+++ b/lib/power/power_acpi_cpufreq.c
@@ -78,7 +78,7 @@ enum power_state {
 /**
  * Power info per lcore.
  */
-struct rte_power_info {
+struct acpi_power_info {
unsigned int lcore_id;   /**< Logical core id */
uint32_t freqs[RTE_MAX_LCORE_FREQS]; /**< Frequency array */
uint32_t nb_freqs;   /**< number of available freqs */
@@ -90,14 +90,14 @@ struct rte_power_info {
uint16_t turbo_enable;   /**< Turbo Boost enable/disable */
 } __rte_cache_aligned;
 
-static struct rte_power_info lcore_power_info[RTE_MAX_LCORE];
+static struct acpi_power_info lcore_power_info[RTE_MAX_LCORE];
 
 /**
  * It is to set specific freq for specific logical core, according to the index
  * of supported frequencies.
  */
 static int
-set_freq_internal(struct rte_power_info *pi, uint32_t idx)
+set_freq_internal(struct acpi_power_info *pi, uint32_t idx)
 {
if (idx >= RTE_MAX_LCORE_FREQS || idx >= pi->nb_freqs) {
RTE_LOG(ERR, POWER, "Invalid frequency index %u, which "
@@ -133,7 +133,7 @@ set_freq_internal(struct rte_power_info *pi, uint32_t idx)
  * governor will be saved for rolling back.
  */
 static int
-power_set_governor_userspace(struct rte_power_info *pi)
+power_set_governor_userspace(struct acpi_power_info *pi)
 {
FILE *f;
int ret = -1;
@@ -189,7 +189,7 @@ power_set_governor_userspace(struct rte_power_info *pi)
  * sys file.
  */
 static int
-power_get_available_freqs(struct rte_power_info *pi)
+power_get_available_freqs(struct acpi_power_info *pi)
 {
FILE *f;
int ret = -1, i, count;
@@ -259,7 +259,7 @@ power_get_available_freqs(struct rte_power_info *pi)
  * It is to fopen the sys file for the future setting the lcore frequency.
  */
 static int
-power_init_for_setting_freq(struct rte_power_info *pi)
+power_init_for_setting_freq(struct acpi_power_info *pi)
 {
FILE *f;
char fullpath[PATH_MAX];
@@ -299,7 +299,7 @@ power_acpi_cpufreq_check_supported(void)
 int
 power_acpi_cpufreq_init(unsigned int lcore_id)
 {
-   struct rte_power_info *pi;
+   struct acpi_power_info *pi;
uint32_t exp_state;
 
if (lcore_id >= RTE_MAX_LCORE) {
@@ -374,7 +374,7 @@ power_acpi_cpufreq_init(unsigned int lcore_id)
  * needed by writing the sys file.
  */
 static int
-power_set_governor_original(struct rte_power_info *pi)
+power_set_governor_original(struct acpi_power_info *pi)
 {
FILE *f;
int ret = -1;
@@ -420,7 +420,7 @@ power_set_governor_original(struct rte_power_info *pi)
 int
 power_acpi_cpufreq_exit(unsigned int lcore_id)
 {
-   struct rte_power_info *pi;
+   struct acpi_power_info *pi;
uint32_t exp_state;
 
if (lcore_id >= RTE_MAX_LCORE) {
@@ -475,7 +475,7 @@ power_acpi_cpufreq_exit(unsigned int lcore_id)
 uint32_t
 power_acpi_cpufreq_freqs(unsigned int lcore_id, uint32_t *freqs, uint32_t num)
 {
-   struct rte_power_info *pi;
+   struct acpi_power_info *pi;
 
if (lcore_id >= RTE_MAX_LCORE) {
RTE_LOG(ERR, POWER, "Invalid lcore ID\n");
@@ -522,7 +522,7 @@ power_acpi_cpufreq_set_freq(unsigned int lcore_id, uint32_t 
index)
 int
 power_acpi_cpufreq_freq_down(unsigned int lcore_id)
 {
-   struct rte_power_info *pi;
+   struct acpi_power_info *pi;
 
if (lcore_id >= RTE_MAX_LCORE) {
RTE_LOG(ERR, POWER, "Invalid lcore ID\n");
@@ -540,7 +540,7 @@ power_acpi_cpufreq_freq_down(unsigned int lcore_id)
 int
 power_acpi_cpufreq_freq_up(unsigned int lcore_id)
 {
-   struct rte_power_info *pi;
+   struct acpi_power_info *pi;
 
if (lcore_id >= RTE_MAX_LCORE) {
RTE_LOG(ERR, POWER, "Invalid lcore ID\n");
@@ -581,7 +581,7 @@ power_acpi_cpufreq_freq_max(unsigned int lcore_id)
 int
 power_acpi_cpufreq_freq_min(unsigned int lcore_id)
 {
-   struct rte_power_info *pi;
+   struct acpi_power_info *pi;
 
if (lcore_id >= RTE_MAX_LCORE) {
RTE_LOG(ERR, POWER, "Invalid lcore ID\n");
@@ -598,7 +598,7 @@ power_acpi_cpufreq_freq_min(unsigned int lcore_id)
 int
 power_acpi_turbo_status(unsigned int lcore_id)
 {
-   struct rte_power_info *pi;
+   struct acpi_power_info *pi;
 
if (lcore_id >= RTE_MAX_LCORE) {
RTE_LOG(ERR, POWER, "Invalid lcore ID\n");
@@ -614,7 +614,7 @@ power_acpi_turbo_status(unsigned int lcore_id)
 int
 power_acpi_enable_turbo(unsigned int lcore_id)
 {
-   struct rte_power_info *pi;
+   struct acpi_power_info *pi;
 
i

[dpdk-dev] [21.08 PATCH v4 2/2] power: refactor pstate and acpi code

[Anatoly Burakov]

Currently, ACPI and PSTATE modes have lots of code duplication,
confusing logic, and a bunch of other issues that can, and have, led to
various bugs and resource leaks.

This commit factors out the common parts of sysfs reading/writing for
ACPI and PSTATE drivers.

Signed-off-by: Anatoly Burakov 
---
 lib/power/meson.build|   7 +
 lib/power/power_acpi_cpufreq.c   | 178 +++--
 lib/power/power_common.c | 133 +
 lib/power/power_common.h |  46 +
 lib/power/power_pstate_cpufreq.c | 332 ---
 5 files changed, 293 insertions(+), 403 deletions(-)

diff --git a/lib/power/meson.build b/lib/power/meson.build
index a2cc9fe2ef..85324d48d2 100644
--- a/lib/power/meson.build
+++ b/lib/power/meson.build
@@ -5,6 +5,13 @@ if not is_linux
 build = false
 reason = 'only supported on Linux'
 endif
+
+# we do some snprintf magic so silence format-nonliteral
+flag_nonliteral = '-Wno-format-nonliteral'
+if cc.has_argument(flag_nonliteral)
+   cflags += flag_nonliteral
+endif
+
 sources = files(
 'guest_channel.c',
 'power_acpi_cpufreq.c',
diff --git a/lib/power/power_acpi_cpufreq.c b/lib/power/power_acpi_cpufreq.c
index 1b8c69cc8b..97f1d302c9 100644
--- a/lib/power/power_acpi_cpufreq.c
+++ b/lib/power/power_acpi_cpufreq.c
@@ -19,41 +19,10 @@
 #include "power_acpi_cpufreq.h"
 #include "power_common.h"
 
-#ifdef RTE_LIBRTE_POWER_DEBUG
-#define POWER_DEBUG_TRACE(fmt, args...) do { \
-   RTE_LOG(ERR, POWER, "%s: " fmt, __func__, ## args); \
-} while (0)
-#else
-#define POWER_DEBUG_TRACE(fmt, args...)
-#endif
-
-#define FOPEN_OR_ERR_RET(f, retval) do { \
-   if ((f) == NULL) { \
-   RTE_LOG(ERR, POWER, "File not opened\n"); \
-   return retval; \
-   } \
-} while (0)
-
-#define FOPS_OR_NULL_GOTO(ret, label) do { \
-   if ((ret) == NULL) { \
-   RTE_LOG(ERR, POWER, "fgets returns nothing\n"); \
-   goto label; \
-   } \
-} while (0)
-
-#define FOPS_OR_ERR_GOTO(ret, label) do { \
-   if ((ret) < 0) { \
-   RTE_LOG(ERR, POWER, "File operations failed\n"); \
-   goto label; \
-   } \
-} while (0)
-
 #define STR_SIZE 1024
 #define POWER_CONVERT_TO_DECIMAL 10
 
 #define POWER_GOVERNOR_USERSPACE "userspace"
-#define POWER_SYSFILE_GOVERNOR   \
-   "/sys/devices/system/cpu/cpu%u/cpufreq/scaling_governor"
 #define POWER_SYSFILE_AVAIL_FREQ \

"/sys/devices/system/cpu/cpu%u/cpufreq/scaling_available_frequencies"
 #define POWER_SYSFILE_SETSPEED   \
@@ -135,53 +104,18 @@ set_freq_internal(struct acpi_power_info *pi, uint32_t 
idx)
 static int
 power_set_governor_userspace(struct acpi_power_info *pi)
 {
-   FILE *f;
-   int ret = -1;
-   char buf[BUFSIZ];
-   char fullpath[PATH_MAX];
-   char *s;
-   int val;
-
-   snprintf(fullpath, sizeof(fullpath), POWER_SYSFILE_GOVERNOR,
-   pi->lcore_id);
-   f = fopen(fullpath, "rw+");
-   FOPEN_OR_ERR_RET(f, ret);
-
-   s = fgets(buf, sizeof(buf), f);
-   FOPS_OR_NULL_GOTO(s, out);
-   /* Strip off terminating '\n' */
-   strtok(buf, "\n");
-
-   /* Save the original governor */
-   rte_strscpy(pi->governor_ori, buf, sizeof(pi->governor_ori));
-
-   /* Check if current governor is userspace */
-   if (strncmp(buf, POWER_GOVERNOR_USERSPACE,
-   sizeof(POWER_GOVERNOR_USERSPACE)) == 0) {
-   ret = 0;
-   POWER_DEBUG_TRACE("Power management governor of lcore %u is "
-   "already userspace\n", pi->lcore_id);
-   goto out;
-   }
-
-   /* Write 'userspace' to the governor */
-   val = fseek(f, 0, SEEK_SET);
-   FOPS_OR_ERR_GOTO(val, out);
-
-   val = fputs(POWER_GOVERNOR_USERSPACE, f);
-   FOPS_OR_ERR_GOTO(val, out);
-
-   /* We need to flush to see if the fputs succeeds */
-   val = fflush(f);
-   FOPS_OR_ERR_GOTO(val, out);
-
-   ret = 0;
-   RTE_LOG(INFO, POWER, "Power management governor of lcore %u has been "
-   "set to user space successfully\n", pi->lcore_id);
-out:
-   fclose(f);
-
-   return ret;
+   return power_set_governor(pi->lcore_id, POWER_GOVERNOR_USERSPACE,
+   pi->governor_ori, sizeof(pi->governor_ori));
+}
+
+/**
+ * It is to check the governor and then set the original governor back if
+ * needed by writing the sys file.
+ */
+static int
+power_set_governor_original(struct acpi_power_info *pi)
+{
+   return power_set_governor(pi->lcore_id, pi->governor_ori, NULL, 0);
 }
 
 /**
@@ -195,22 +129,14 @@ power_get_available_freqs(struct acpi_power_info *pi)
int ret = -1, i, count;
char *p;
char buf[BUFSIZ];
-   char fullpath[PATH_MAX];
char *freqs[RTE_MAX_LCO

Re: [dpdk-dev] [PATCH v5 0/5] eal: enable global device syntax by default

[Kinsella, Ray]

On 14/04/2021 20:49, Thomas Monjalon wrote:
> 13/04/2021 05:14, Xueming Li:
>> Xueming Li (5):
>>   devargs: unify scratch buffer storage
>>   devargs: fix memory leak on parsing error
>>   kvargs: add get by key function
>>   bus: add device arguments name parsing API
>>   devargs: parse global device syntax
> 
> The patch 4 adds a new callback in rte_bus.
> I thought about it during the whole day and I don't see any good way
> to merge it without breaking the ABI compatibility.
> 
> Only first 3 patches are applied for now, thanks.
> 

I took a look, I don't immediately see the concern.

The new entry is at the end of the memory structure.
The call back is internal and hidden behind the symbol rte_devargs_layers_parse.

So will only be trigger by a rte_devargs_layers_parse of the same version of 
DPDK that introduce the new callback.

Should be fine?

Re: [dpdk-dev] [PATCH V4] ethdev: add queue state when retrieve queue information

[Kinsella, Ray]

On 16/04/2021 10:57, Thomas Monjalon wrote:
> 16/04/2021 11:41, Ferruh Yigit:
>> On 4/16/2021 9:58 AM, Thomas Monjalon wrote:
>>> 16/04/2021 10:46, Lijun Ou:
 Currently, upper-layer application could get queue state only
 through pointers such as dev->data->tx_queue_state[queue_id],
 this is not the recommended way to access it. So this patch
 add get queue state when call rte_eth_rx_queue_info_get and
 rte_eth_tx_queue_info_get API.

 Note: After add queue_state field, the 'struct rte_eth_rxq_info' size
 remains 128B, and the 'struct rte_eth_txq_info' size remains 64B, so
 it could be ABI compatible.
>>> [...]
 --- a/doc/guides/rel_notes/release_21_05.rst
 +++ b/doc/guides/rel_notes/release_21_05.rst
 @@ -251,6 +251,12 @@ ABI Changes
 function was already marked as internal in the API documentation for 
 it,
 and was not for use by external applications.
   
 +* Added new field ``queue_state`` to ``rte_eth_rxq_info`` structure
 +  to provide indicated rxq queue state.
 +
 +* Added new field ``queue_state`` to ``rte_eth_txq_info`` structure
 +  to provide indicated txq queue state.
>>>
>>> Not sure we should add a note here for additions which
>>> do not break ABI compatibility.
>>> It may be confusing.
>>>
>>
>> Hi Thomas,
>>
>> What do about adding the documentation to "API Changes" section?
>> Since 'rte_eth_rx_queue_info_get()'/'rte_eth_tx_queue_info_get()' can get 
>> 'queue_state' now, which may taken as API change.
> 
> That's an addition.
> The users have nothing to change in their existing code,
> so I think we don't need a note in API or ABI change.
> The only required note would be in the "New Features".

Well it definitely isn't an ABI change, however it still is an API addition.
I don't know, if additions qualify as changes.

Ray K
 

Re: [dpdk-dev] [PATCH V5] ethdev: add queue state when retrieve queue information

[Kinsella, Ray]

On 17/04/2021 04:09, Lijun Ou wrote:
> Currently, upper-layer application could get queue state only
> through pointers such as dev->data->tx_queue_state[queue_id],
> this is not the recommended way to access it. So this patch
> add get queue state when call rte_eth_rx_queue_info_get and
> rte_eth_tx_queue_info_get API.
> 
> Note: After add queue_state field, the 'struct rte_eth_rxq_info' size
> remains 128B, and the 'struct rte_eth_txq_info' size remains 64B, so
> it could be ABI compatible.
> 
> Signed-off-by: Chengwen Feng 
> Signed-off-by: Lijun Ou 
> Acked-by: Konstantin Ananyev 
> ---
> V4->V5:
> - Add acked-by
> - add a note to the "New features" section to annouce the new feature.
> 
> V3->V4:
> - update libabigail.abignore for removing the CI warnings
> 
> V2->V3:
> - rewrite the commit log and delete the part Note
> - rewrite tht comments for queue state
> - move the queue_state definition locations
> 
> V1->V2:
> - move queue state defines to public file
> ---
>  doc/guides/rel_notes/release_21_05.rst | 6 ++
>  lib/librte_ethdev/ethdev_driver.h  | 7 ---
>  lib/librte_ethdev/rte_ethdev.c | 3 +++
>  lib/librte_ethdev/rte_ethdev.h | 9 +
>  4 files changed, 18 insertions(+), 7 deletions(-)
> 
> diff --git a/doc/guides/rel_notes/release_21_05.rst 
> b/doc/guides/rel_notes/release_21_05.rst
> index 58272e1..1ab3681 100644
> --- a/doc/guides/rel_notes/release_21_05.rst
> +++ b/doc/guides/rel_notes/release_21_05.rst
> @@ -81,6 +81,12 @@ New Features
>representor=[[c#]pf#]sf# sf[0,2-1023] /* 1023 SFs. 
> */
>representor=[c#]pf#  c2pf[0,1]/* 2 PFs on controller 2.
> */
>  
> +* **Enhanced function for getting rxq/txq info ABI.**
> +  * Added new field ``queue_state`` to ``rte_eth_rxq_info`` structure to
> +provide indicated rxq queue state.
> +  * Added new field ``queue_state`` to ``rte_eth_txq_info`` structure to
> +provide indicated txq queue state.
> +
>  * **Added support for meter PPS profile.**
>  
>Currently meter algorithms only supports bytes per second(BPS).
> diff --git a/lib/librte_ethdev/ethdev_driver.h 
> b/lib/librte_ethdev/ethdev_driver.h
> index 113129d..40e474a 100644
> --- a/lib/librte_ethdev/ethdev_driver.h
> +++ b/lib/librte_ethdev/ethdev_driver.h
> @@ -952,13 +952,6 @@ struct eth_dev_ops {
>  };
>  
>  /**
> - * RX/TX queue states
> - */
> -#define RTE_ETH_QUEUE_STATE_STOPPED 0
> -#define RTE_ETH_QUEUE_STATE_STARTED 1
> -#define RTE_ETH_QUEUE_STATE_HAIRPIN 2
> -
> -/**
>   * @internal
>   * Check if the selected Rx queue is hairpin queue.
>   *
> diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
> index c73d263..d5adf4f 100644
> --- a/lib/librte_ethdev/rte_ethdev.c
> +++ b/lib/librte_ethdev/rte_ethdev.c
> @@ -5038,6 +5038,8 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t 
> queue_id,
>  
>   memset(qinfo, 0, sizeof(*qinfo));
>   dev->dev_ops->rxq_info_get(dev, queue_id, qinfo);
> + qinfo->queue_state = dev->data->rx_queue_state[queue_id];
> +
>   return 0;
>  }
>  
> @@ -5078,6 +5080,7 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t 
> queue_id,
>  
>   memset(qinfo, 0, sizeof(*qinfo));
>   dev->dev_ops->txq_info_get(dev, queue_id, qinfo);
> + qinfo->queue_state = dev->data->tx_queue_state[queue_id];
>  
>   return 0;
>  }
> diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
> index 3b773b6..a0d01d2 100644
> --- a/lib/librte_ethdev/rte_ethdev.h
> +++ b/lib/librte_ethdev/rte_ethdev.h
> @@ -1588,6 +1588,13 @@ struct rte_eth_dev_info {
>  };
>  
>  /**
> + * RX/TX queue states
> + */
> +#define RTE_ETH_QUEUE_STATE_STOPPED 0
> +#define RTE_ETH_QUEUE_STATE_STARTED 1
> +#define RTE_ETH_QUEUE_STATE_HAIRPIN 2
> +
> +/**
>   * Ethernet device RX queue information structure.
>   * Used to retrieve information about configured queue.
>   */
> @@ -1595,6 +1602,7 @@ struct rte_eth_rxq_info {
>   struct rte_mempool *mp; /**< mempool used by that queue. */
>   struct rte_eth_rxconf conf; /**< queue config parameters. */
>   uint8_t scattered_rx;   /**< scattered packets RX supported. */
> + uint8_t queue_state;/**< one of RTE_ETH_QUEUE_STATE_*. */

Are we sure this is a false positive? - it is being added mid-structure on the 
rx-side at least.
Shouldn't this be appended to the end - unless it is being sneaked into padding 
between fields. 

>   uint16_t nb_desc;   /**< configured number of RXDs. */
>   uint16_t rx_buf_size;   /**< hardware receive buffer size. */
>  } __rte_cache_min_aligned;
> @@ -1606,6 +1614,7 @@ struct rte_eth_rxq_info {
>  struct rte_eth_txq_info {
>   struct rte_eth_txconf conf; /**< queue config parameters. */
>   uint16_t nb_desc;   /**< configured number of TXDs. */
> + uint8_t queue_state;/**< one of RTE_ETH_QUEUE_STATE_*. */
>  } __rte_cache_min_aligned;
>  
>  /* Generic Burst mode flag de

Re: [dpdk-dev] [PATCH V5] ethdev: add queue state when retrieve queue information

[Ananyev, Konstantin]

> -Original Message-
> From: dev  On Behalf Of Kinsella, Ray
> Sent: Friday, April 23, 2021 12:17 PM
> To: Lijun Ou ; tho...@monjalon.net; Yigit, Ferruh 
> 
> Cc: dev@dpdk.org; linux...@openeuler.org
> Subject: Re: [dpdk-dev] [PATCH V5] ethdev: add queue state when retrieve 
> queue information
> 
> 
> 
> On 17/04/2021 04:09, Lijun Ou wrote:
> > Currently, upper-layer application could get queue state only
> > through pointers such as dev->data->tx_queue_state[queue_id],
> > this is not the recommended way to access it. So this patch
> > add get queue state when call rte_eth_rx_queue_info_get and
> > rte_eth_tx_queue_info_get API.
> >
> > Note: After add queue_state field, the 'struct rte_eth_rxq_info' size
> > remains 128B, and the 'struct rte_eth_txq_info' size remains 64B, so
> > it could be ABI compatible.
> >
> > Signed-off-by: Chengwen Feng 
> > Signed-off-by: Lijun Ou 
> > Acked-by: Konstantin Ananyev 
> > ---
> > V4->V5:
> > - Add acked-by
> > - add a note to the "New features" section to annouce the new feature.
> >
> > V3->V4:
> > - update libabigail.abignore for removing the CI warnings
> >
> > V2->V3:
> > - rewrite the commit log and delete the part Note
> > - rewrite tht comments for queue state
> > - move the queue_state definition locations
> >
> > V1->V2:
> > - move queue state defines to public file
> > ---
> >  doc/guides/rel_notes/release_21_05.rst | 6 ++
> >  lib/librte_ethdev/ethdev_driver.h  | 7 ---
> >  lib/librte_ethdev/rte_ethdev.c | 3 +++
> >  lib/librte_ethdev/rte_ethdev.h | 9 +
> >  4 files changed, 18 insertions(+), 7 deletions(-)
> >
> > diff --git a/doc/guides/rel_notes/release_21_05.rst 
> > b/doc/guides/rel_notes/release_21_05.rst
> > index 58272e1..1ab3681 100644
> > --- a/doc/guides/rel_notes/release_21_05.rst
> > +++ b/doc/guides/rel_notes/release_21_05.rst
> > @@ -81,6 +81,12 @@ New Features
> >representor=[[c#]pf#]sf# sf[0,2-1023] /* 1023 SFs.   
> >   */
> >representor=[c#]pf#  c2pf[0,1]/* 2 PFs on controller 2.  
> >   */
> >
> > +* **Enhanced function for getting rxq/txq info ABI.**
> > +  * Added new field ``queue_state`` to ``rte_eth_rxq_info`` structure to
> > +provide indicated rxq queue state.
> > +  * Added new field ``queue_state`` to ``rte_eth_txq_info`` structure to
> > +provide indicated txq queue state.
> > +
> >  * **Added support for meter PPS profile.**
> >
> >Currently meter algorithms only supports bytes per second(BPS).
> > diff --git a/lib/librte_ethdev/ethdev_driver.h 
> > b/lib/librte_ethdev/ethdev_driver.h
> > index 113129d..40e474a 100644
> > --- a/lib/librte_ethdev/ethdev_driver.h
> > +++ b/lib/librte_ethdev/ethdev_driver.h
> > @@ -952,13 +952,6 @@ struct eth_dev_ops {
> >  };
> >
> >  /**
> > - * RX/TX queue states
> > - */
> > -#define RTE_ETH_QUEUE_STATE_STOPPED 0
> > -#define RTE_ETH_QUEUE_STATE_STARTED 1
> > -#define RTE_ETH_QUEUE_STATE_HAIRPIN 2
> > -
> > -/**
> >   * @internal
> >   * Check if the selected Rx queue is hairpin queue.
> >   *
> > diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
> > index c73d263..d5adf4f 100644
> > --- a/lib/librte_ethdev/rte_ethdev.c
> > +++ b/lib/librte_ethdev/rte_ethdev.c
> > @@ -5038,6 +5038,8 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t 
> > queue_id,
> >
> > memset(qinfo, 0, sizeof(*qinfo));
> > dev->dev_ops->rxq_info_get(dev, queue_id, qinfo);
> > +   qinfo->queue_state = dev->data->rx_queue_state[queue_id];
> > +
> > return 0;
> >  }
> >
> > @@ -5078,6 +5080,7 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t 
> > queue_id,
> >
> > memset(qinfo, 0, sizeof(*qinfo));
> > dev->dev_ops->txq_info_get(dev, queue_id, qinfo);
> > +   qinfo->queue_state = dev->data->tx_queue_state[queue_id];
> >
> > return 0;
> >  }
> > diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
> > index 3b773b6..a0d01d2 100644
> > --- a/lib/librte_ethdev/rte_ethdev.h
> > +++ b/lib/librte_ethdev/rte_ethdev.h
> > @@ -1588,6 +1588,13 @@ struct rte_eth_dev_info {
> >  };
> >
> >  /**
> > + * RX/TX queue states
> > + */
> > +#define RTE_ETH_QUEUE_STATE_STOPPED 0
> > +#define RTE_ETH_QUEUE_STATE_STARTED 1
> > +#define RTE_ETH_QUEUE_STATE_HAIRPIN 2
> > +
> > +/**
> >   * Ethernet device RX queue information structure.
> >   * Used to retrieve information about configured queue.
> >   */
> > @@ -1595,6 +1602,7 @@ struct rte_eth_rxq_info {
> > struct rte_mempool *mp; /**< mempool used by that queue. */
> > struct rte_eth_rxconf conf; /**< queue config parameters. */
> > uint8_t scattered_rx;   /**< scattered packets RX supported. */
> > +   uint8_t queue_state;/**< one of RTE_ETH_QUEUE_STATE_*. */
> 
> Are we sure this is a false positive? - it is being added mid-structure on 
> the rx-side at least.
> Shouldn't this be appended to the end - unless it is being sneaked into 
> padding between fields.

I believe there w

Re: [dpdk-dev] [PATCH v1 1/1] power: add support for cppc cpufreq

[Burakov, Anatoly]

On 22-Apr-21 11:02 AM, Richael Zhuang wrote:




-Original Message-
From: Burakov, Anatoly 
Sent: Thursday, April 22, 2021 6:00 PM
To: Richael Zhuang ; dev@dpdk.org
Cc: nd ; David Hunt 
Subject: Re: [dpdk-dev] [PATCH v1 1/1] power: add support for cppc cpufreq

On 22-Apr-21 10:29 AM, Richael Zhuang wrote:




-Original Message-
From: Burakov, Anatoly 
Sent: Thursday, April 22, 2021 5:06 PM
To: Richael Zhuang ; dev@dpdk.org
Cc: nd ; David Hunt 
Subject: Re: [dpdk-dev] [PATCH v1 1/1] power: add support for cppc
cpufreq

On 22-Apr-21 7:15 AM, Richael Zhuang wrote:

Currently in DPDK only acpi_cpufreq and pstate_cpufreq drivers are
supported, which are both not available on arm64 platforms. Add
support for cppc_cpufreq driver which works on most arm64 platforms.

Signed-off-by: Richael Zhuang 
---


Just a general note: this looks like a copy-paste of pstate code.
Which is perfectly fine, except that we can do better than copying
some faults of the pstate code to other drivers. I've submitted a
patch [1] attempting to fix some of the pressing issues and code
duplication in pstate driver, but i'm sure with a fresh driver, you
can do even better :)

[1]
http://patches.dpdk.org/project/dpdk/patch/20210402092701.258316-1-
anatoly.bura...@intel.com/

--
Thanks,
Anatoly


For CPPC is defined in acpi v5.0+ spec,  I reused most code in acpi_cpufreq

to get a quick workable version on our platform with only cppc driver. I have
verified  its basic functions. If you find some problems please help to point
out thus I can rework it. Thanks .


Best Regards,
Richael



Well, pstate code was copied from ACPI so it does share the same flaws:

- Lots of code duplication (e.g. snprintf for filename, fopen sequences,
etc.)
- Confusing and bug-prone error handling (e.g. return macros in the middle
of a function)
- Mixing power management logic and gory details of string handling

Good examples of the above are in your `power_check_turbo()` function -
lots of string handling code interspersed with file opens, and actual logic of
power management.

Please see the patch i linked earlier [1] to understand what kind of changes
i'm suggesting. Perhaps you could do even better :)

[1]
http://patches.dpdk.org/project/dpdk/patch/20210402092701.258316-1-
anatoly.bura...@intel.com/

--
Thanks,
Anatoly

Thanks. I'll rework it to make it look better.

Best Regards,
Richael



Hi,

FYI i've updated my refactor patch [1] so that you could base your work 
off it and not have to do most of it yourself. Feel free to take over 
the patchset if you like!


[1] 
http://patches.dpdk.org/project/dpdk/patch/83b1e89d14834251d4d7e72fcc19d82dfb52686d.1619175790.git.anatoly.bura...@intel.com/

--
Thanks,
Anatoly

Re: [dpdk-dev] [PATCH v5 0/5] eal: enable global device syntax by default

[Gaëtan Rivet]

On Fri, Apr 23, 2021, at 13:06, Kinsella, Ray wrote:
> 
> 
> On 14/04/2021 20:49, Thomas Monjalon wrote:
> > 13/04/2021 05:14, Xueming Li:
> >> Xueming Li (5):
> >>   devargs: unify scratch buffer storage
> >>   devargs: fix memory leak on parsing error
> >>   kvargs: add get by key function
> >>   bus: add device arguments name parsing API
> >>   devargs: parse global device syntax
> > 
> > The patch 4 adds a new callback in rte_bus.
> > I thought about it during the whole day and I don't see any good way
> > to merge it without breaking the ABI compatibility.
> > 
> > Only first 3 patches are applied for now, thanks.
> > 
> 
> I took a look, I don't immediately see the concern.
> 
> The new entry is at the end of the memory structure.
> The call back is internal and hidden behind the symbol 
> rte_devargs_layers_parse.
> 
> So will only be trigger by a rte_devargs_layers_parse of the same 
> version of DPDK that introduce the new callback.
> 
> Should be fine?
> 

It might have been an issue IMO with a structure exposed as an array, i.e. 
rte_eth_devices[].
But I thought this kind of ABI break was the kind that would be accepted 
between two LTS.

The only potential risk is in using a new version librte_eal.so with an older 
librte_bus_xxx.so
But I think it is fair to expect installations to be internally consistent.

Maybe we could have a runtime warning when loading mismatched versions
(if there isn't one already) -- each librte_*.so could have an internal version 
stamp and alignment could
be checked through a constructor in each lib?

-- 
Gaetan Rivet

Re: [dpdk-dev] [RFC] net/ionic: update MTU calculations

[Ferruh Yigit]

On 12/15/2020 12:26 PM, Ferruh Yigit wrote:

On 12/10/2020 2:46 AM, Andrew Boyer wrote:

This RFC is in response to the threads about testpmd mtu settings
and the deprecation of max-rx-pkt-len.

It took us a while to figure out what we were supposed to be doing
in this part of the API. It is not clear if max_rx_pkt_len should be
an input to or an output from the PMD.


'max_rx_pkt_len' is input to the PMD, but it needs to be in sync with MTU value, 
that is why PMDs update this value when MTU is updated to keep the sync.




The code below represents what we believe should happen today, and also
happens to pass the DTS tests which were failing prior to this change
(checksum and jumbo_frame at least).



Hi Andrew,

I am updating the status of the patch as "change requested", what is the status 
of this patch, will there be a new version?

Is DTS still failing?

Please see a few comments below if there will be new version.

<...>


diff --git a/drivers/net/ionic/ionic_ethdev.c b/drivers/net/ionic/ionic_ethdev.c
index 925da3e29..7000de3f9 100644
--- a/drivers/net/ionic/ionic_ethdev.c
+++ b/drivers/net/ionic/ionic_ethdev.c
@@ -357,25 +357,19 @@ ionic_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t 
mtu)

  int err;
  IONIC_PRINT_CALL();
+    IONIC_PRINT(INFO, "Setting mtu %u\n", mtu);
-    /*
- * Note: mtu check against IONIC_MIN_MTU, IONIC_MAX_MTU
- * is done by the the API.
- */
-
-    /*
- * Max frame size is MTU + Ethernet header + VLAN + QinQ
- * (plus ETHER_CRC_LEN if the adapter is able to keep CRC)
- */
-    max_frame_size = mtu + RTE_ETHER_HDR_LEN + 4 + 4;
-
-    if (eth_dev->data->dev_conf.rxmode.max_rx_pkt_len < max_frame_size)
-    return -EINVAL;


The max frame size calculation depends on what HW support, but if VLAN header is 
supported above calculation and check is correct.




Removing above check seems correct thing to do, instead should check against 
'dev_info.max_mtu' which is already done in ethdev layer, so nothing needed here.



-
+    /* Note: mtu check against min/max is done by the API */
  err = ionic_lif_change_mtu(lif, mtu);
  if (err)
  return err;
+    /* Update max frame size */
+    max_frame_size = mtu + RTE_ETHER_HDR_LEN;


I guess you are removing the CRC because your HW strips the CRC in the Rx 
buffer, but this limit is not for Rx buffer, it is for the frame size HW 
accepts, and since recevied frame will have the CRC it should be included into 
the calculation.



+    eth_dev->data->dev_conf.rxmode.max_rx_pkt_len = max_frame_size;
+


Although 'rxmode.max_rx_pkt_len' is input to driver, it is related with MTU, 
which is also input from application in this function, so OK to update 
'rxmode.max_rx_pkt_len' here.



+    ionic_lif_set_rx_buf_size(lif);
+


This seems to keep the local copy of 'rxmode.max_rx_pkt_len' and use local copy 
instead, is this just refactoring or is there any other reason for local copy?

[dpdk-dev] [PATCH v3 0/3] fix PF reset causes VF memory request failure

[Haiyue Wang]

By triggerring the VF reset from PF reset,

echo 1 > /sys/bus/pci/devices/PF-BDF/reset

the PCI bus master bit will cleared on VF, so the VF needs to enable
this bit before restart.

This patch set adds the API to enable PCI bus master.

v3: added the missed annotate symbol add time
v2: rebase to new librte directory path.

Haiyue Wang (3):
  bus/pci: enable PCI master in command register
  net/iavf: enable PCI bus master after reset
  net/i40e: enable PCI bus master after reset

 drivers/bus/pci/pci_common.c  | 20 
 drivers/bus/pci/rte_bus_pci.h | 12 
 drivers/bus/pci/version.map   |  3 +++
 drivers/net/i40e/i40e_ethdev_vf.c |  7 ++-
 drivers/net/iavf/iavf_ethdev.c|  3 +++
 lib/pci/rte_pci.h |  4 
 6 files changed, 48 insertions(+), 1 deletion(-)

-- 
2.31.1

[dpdk-dev] [PATCH v3 3/3] net/i40e: enable PCI bus master after reset

[Haiyue Wang]

The VF reset can be triggerred by the PF reset event, in this case, the
PCI bus master will be cleared, then the VF is not allowed to issue any
Memory or I/O Requests.

So after the reset event is detected, always enable the PCI bus master.

And align the VF reset event handling in device close module as the AVF
driver does.

Signed-off-by: Haiyue Wang 
Tested-by: Qi Zhang 
---
 drivers/net/i40e/i40e_ethdev_vf.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c 
b/drivers/net/i40e/i40e_ethdev_vf.c
index 3c258ba7c..4f1d04eb2 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1212,7 +1212,6 @@ i40evf_check_vf_reset_done(struct rte_eth_dev *dev)
if (i >= MAX_RESET_WAIT_CNT)
return -1;
 
-   vf->vf_reset = false;
vf->pend_msg &= ~PFMSG_RESET_IMPENDING;
 
return 0;
@@ -1391,6 +1390,7 @@ i40evf_handle_pf_event(struct rte_eth_dev *dev, uint8_t 
*msg,
switch (pf_msg->event) {
case VIRTCHNL_EVENT_RESET_IMPENDING:
PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_RESET_IMPENDING event");
+   vf->vf_reset = true;
rte_eth_dev_callback_process(dev,
RTE_ETH_EVENT_INTR_RESET, NULL);
break;
@@ -2487,6 +2487,11 @@ i40evf_dev_close(struct rte_eth_dev *dev)
i40e_shutdown_adminq(hw);
i40evf_disable_irq0(hw);
 
+   if (vf->vf_reset)
+   rte_pci_enable_bus_master(RTE_ETH_DEV_TO_PCI(dev));
+
+   vf->vf_reset = false;
+
rte_free(vf->vf_res);
vf->vf_res = NULL;
rte_free(vf->aq_resp);
-- 
2.31.1

[dpdk-dev] [PATCH v3 2/3] net/iavf: enable PCI bus master after reset

[Haiyue Wang]

The VF reset can be triggerred by the PF reset event, in this case, the
PCI bus master will be cleared, then the VF is not allowed to issue any
Memory or I/O Requests.

So after the reset event is detected, always enable the PCI bus master.

Signed-off-by: Haiyue Wang 
Tested-by: Qi Zhang 
---
 drivers/net/iavf/iavf_ethdev.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index d523a0618..8c924d21b 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -2255,6 +2255,9 @@ iavf_dev_close(struct rte_eth_dev *dev)
rte_free(vf->aq_resp);
vf->aq_resp = NULL;
 
+   if (vf->vf_reset)
+   rte_pci_enable_bus_master(pci_dev);
+
vf->vf_reset = false;
 
return ret;
-- 
2.31.1

[dpdk-dev] [PATCH v3 1/3] bus/pci: enable PCI master in command register

[Haiyue Wang]

This adds the support to set 'Bus Master Enable' bit in the PCI command
register.

Signed-off-by: Haiyue Wang 
Tested-by: Qi Zhang 
---
 drivers/bus/pci/pci_common.c  | 20 
 drivers/bus/pci/rte_bus_pci.h | 12 
 drivers/bus/pci/version.map   |  3 +++
 lib/pci/rte_pci.h |  4 
 4 files changed, 39 insertions(+)

diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index ee7f96635..b631cb9c7 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -746,6 +746,26 @@ rte_pci_find_ext_capability(struct rte_pci_device *dev, 
uint32_t cap)
return 0;
 }
 
+int
+rte_pci_enable_bus_master(struct rte_pci_device *dev)
+{
+   uint16_t cmd;
+
+   if (rte_pci_read_config(dev, &cmd, sizeof(cmd), RTE_PCI_COMMAND) < 0) {
+   RTE_LOG(ERR, EAL, "error in reading PCI command register\n");
+   return -1;
+   }
+
+   cmd |= RTE_PCI_COMMAND_MASTER;
+
+   if (rte_pci_write_config(dev, &cmd, sizeof(cmd), RTE_PCI_COMMAND) < 0) {
+   RTE_LOG(ERR, EAL, "error in writing PCI command register\n");
+   return -1;
+   }
+
+   return 0;
+}
+
 struct rte_pci_bus rte_pci_bus = {
.bus = {
.scan = rte_pci_scan,
diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
index 64886b473..83caf477b 100644
--- a/drivers/bus/pci/rte_bus_pci.h
+++ b/drivers/bus/pci/rte_bus_pci.h
@@ -249,6 +249,18 @@ void rte_pci_dump(FILE *f);
 __rte_experimental
 off_t rte_pci_find_ext_capability(struct rte_pci_device *dev, uint32_t cap);
 
+/**
+ * Enables Bus Master for device's PCI command register.
+ *
+ *  @param dev
+ *A pointer to rte_pci_device structure.
+ *
+ *  @return
+ *  0 on success, -1 on error in PCI config space read/write.
+ */
+__rte_experimental
+int rte_pci_enable_bus_master(struct rte_pci_device *dev);
+
 /**
  * Register a PCI driver.
  *
diff --git a/drivers/bus/pci/version.map b/drivers/bus/pci/version.map
index f33ed0abd..9dbec12a0 100644
--- a/drivers/bus/pci/version.map
+++ b/drivers/bus/pci/version.map
@@ -21,4 +21,7 @@ EXPERIMENTAL {
global:
 
rte_pci_find_ext_capability;
+
+   # added in 21.05
+   rte_pci_enable_bus_master;
 };
diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
index a8f8e404a..1f33d687f 100644
--- a/lib/pci/rte_pci.h
+++ b/lib/pci/rte_pci.h
@@ -32,6 +32,10 @@ extern "C" {
 
 #define RTE_PCI_VENDOR_ID  0x00/* 16 bits */
 #define RTE_PCI_DEVICE_ID  0x02/* 16 bits */
+#define RTE_PCI_COMMAND0x04/* 16 bits */
+
+/* PCI Command Register */
+#define RTE_PCI_COMMAND_MASTER 0x4 /* Bus Master Enable */
 
 /* PCI Express capability registers */
 #define RTE_PCI_EXP_DEVCTL 8   /* Device Control */
-- 
2.31.1

Re: [dpdk-dev] [PATCH v2 1/3] bus/pci: enable PCI master in command register

[Wang, Haiyue]

> -Original Message-
> From: Kinsella, Ray 
> Sent: Friday, April 23, 2021 18:44
> To: Wang, Haiyue ; dev@dpdk.org
> Cc: Zhang, Qi Z ; Wang, Liang-min 
> ; Neil Horman
> ; Gaetan Rivet 
> Subject: Re: [PATCH v2 1/3] bus/pci: enable PCI master in command register
> 
> 
> 
> On 22/04/2021 02:18, Haiyue Wang wrote:
> > This adds the support to set 'Bus Master Enable' bit in the PCI command
> > register.
> >
> > Signed-off-by: Haiyue Wang 
> > Tested-by: Qi Zhang 
> > ---
> >  drivers/bus/pci/pci_common.c  | 20 
> >  drivers/bus/pci/rte_bus_pci.h | 12 
> >  drivers/bus/pci/version.map   |  1 +
> >  lib/pci/rte_pci.h |  4 
> >  4 files changed, 37 insertions(+)
> >


> >   *
> > diff --git a/drivers/bus/pci/version.map b/drivers/bus/pci/version.map
> > index f33ed0abd..b271e48a8 100644
> > --- a/drivers/bus/pci/version.map
> > +++ b/drivers/bus/pci/version.map
> > @@ -20,5 +20,6 @@ DPDK_21 {
> >  EXPERIMENTAL {
> > global:
> >
> 
> Please annotate when the symbol was added.
> 

Fixed in v3.

> >

[dpdk-dev] [PATCH] net/virtio: fix kernel set memory table for multi-queue devices

[Thierry Herbelot]

Restore the original code, where VHOST_SET_MEM_TABLE is applied to
all vhostfds of the device.

Fixes: 539d910c9c768 ("net/virtio: add virtio-user memory tables ops")
Cc: sta...@dpdk.org

Signed-off-by: Thierry Herbelot 
---
 drivers/net/virtio/virtio_user/vhost_kernel.c | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c 
b/drivers/net/virtio/virtio_user/vhost_kernel.c
index 58e66bb7b4ae..ad46f10a9300 100644
--- a/drivers/net/virtio/virtio_user/vhost_kernel.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
@@ -206,6 +206,7 @@ add_memseg_list(const struct rte_memseg_list *msl, void 
*arg)
 static int
 vhost_kernel_set_memory_table(struct virtio_user_dev *dev)
 {
+   uint32_t i;
struct vhost_kernel_data *data = dev->backend_data;
struct vhost_memory_kernel *vm;
int ret;
@@ -227,9 +228,14 @@ vhost_kernel_set_memory_table(struct virtio_user_dev *dev)
if (ret < 0)
goto err_free;
 
-   ret = vhost_kernel_ioctl(data->vhostfds[0], VHOST_SET_MEM_TABLE, vm);
-   if (ret < 0)
-   goto err_free;
+   for (i = 0; i < dev->max_queue_pairs; ++i) {
+   if (data->vhostfds[i] < 0)
+   continue;
+
+   ret = vhost_kernel_ioctl(data->vhostfds[i], 
VHOST_SET_MEM_TABLE, vm);
+   if (ret < 0)
+   goto err_free;
+   }
 
free(vm);
 
-- 
2.29.2

Re: [dpdk-dev] [PATCH v5] net/iavf: fix hash configuration on i40e VF

[Zhang, Qi Z]

> -Original Message-
> From: dev  On Behalf Of Alvin Zhang
> Sent: Thursday, April 22, 2021 1:08 PM
> To: Wu, Jingjing ; Xing, Beilei 
> Cc: dev@dpdk.org; Zhang, AlvinX ; sta...@dpdk.org
> Subject: [dpdk-dev] [PATCH v5] net/iavf: fix hash configuration on i40e VF
> 
> In i40evf PMD, the VF directly accesses the hash enable registers to enable or
> disable hashing on ingress packets. When binding i40e VF to iavf, because the
> PF doesn't support VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF capability. Therefore,
> the VF hashing cannot be enabled.
> 
> This patch adds support of hash configuration for i40e VF by sending
> VIRTCHNL_OP_SET_RSS_HENA message to the PF after checking that the PF
> does not support VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF capability.
> 
> Fixes: c678299594a8 ("net/iavf: fix default RSS configuration")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Alvin Zhang 

Acked-by: Qi Zhang 

Applied to dpdk-next-net-intel.

Thanks
Qi

Re: [dpdk-dev] [PATCH v3 1/3] bus/pci: enable PCI master in command register

[Kinsella, Ray]

On 23/04/2021 12:39, Haiyue Wang wrote:
> This adds the support to set 'Bus Master Enable' bit in the PCI command
> register.
> 
> Signed-off-by: Haiyue Wang 
> Tested-by: Qi Zhang 
> ---
>  drivers/bus/pci/pci_common.c  | 20 
>  drivers/bus/pci/rte_bus_pci.h | 12 
>  drivers/bus/pci/version.map   |  3 +++
>  lib/pci/rte_pci.h |  4 
>  4 files changed, 39 insertions(+)
> 
> diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
> index ee7f96635..b631cb9c7 100644
> --- a/drivers/bus/pci/pci_common.c
> +++ b/drivers/bus/pci/pci_common.c
> @@ -746,6 +746,26 @@ rte_pci_find_ext_capability(struct rte_pci_device *dev, 
> uint32_t cap)
>   return 0;
>  }
>  
> +int
> +rte_pci_enable_bus_master(struct rte_pci_device *dev)
> +{
> + uint16_t cmd;
> +
> + if (rte_pci_read_config(dev, &cmd, sizeof(cmd), RTE_PCI_COMMAND) < 0) {
> + RTE_LOG(ERR, EAL, "error in reading PCI command register\n");
> + return -1;
> + }
> +
> + cmd |= RTE_PCI_COMMAND_MASTER;
> +
> + if (rte_pci_write_config(dev, &cmd, sizeof(cmd), RTE_PCI_COMMAND) < 0) {
> + RTE_LOG(ERR, EAL, "error in writing PCI command register\n");
> + return -1;
> + }
> +
> + return 0;
> +}
> +
>  struct rte_pci_bus rte_pci_bus = {
>   .bus = {
>   .scan = rte_pci_scan,
> diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
> index 64886b473..83caf477b 100644
> --- a/drivers/bus/pci/rte_bus_pci.h
> +++ b/drivers/bus/pci/rte_bus_pci.h
> @@ -249,6 +249,18 @@ void rte_pci_dump(FILE *f);
>  __rte_experimental
>  off_t rte_pci_find_ext_capability(struct rte_pci_device *dev, uint32_t cap);
>  
> +/**
> + * Enables Bus Master for device's PCI command register.
> + *
> + *  @param dev
> + *A pointer to rte_pci_device structure.
> + *
> + *  @return
> + *  0 on success, -1 on error in PCI config space read/write.
> + */
> +__rte_experimental
> +int rte_pci_enable_bus_master(struct rte_pci_device *dev);
> +
>  /**
>   * Register a PCI driver.
>   *
> diff --git a/drivers/bus/pci/version.map b/drivers/bus/pci/version.map
> index f33ed0abd..9dbec12a0 100644
> --- a/drivers/bus/pci/version.map
> +++ b/drivers/bus/pci/version.map
> @@ -21,4 +21,7 @@ EXPERIMENTAL {
>   global:
>  
>   rte_pci_find_ext_capability;
> +
> + # added in 21.05
> + rte_pci_enable_bus_master;
>  };
> diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
> index a8f8e404a..1f33d687f 100644
> --- a/lib/pci/rte_pci.h
> +++ b/lib/pci/rte_pci.h
> @@ -32,6 +32,10 @@ extern "C" {
>  
>  #define RTE_PCI_VENDOR_ID0x00/* 16 bits */
>  #define RTE_PCI_DEVICE_ID0x02/* 16 bits */
> +#define RTE_PCI_COMMAND  0x04/* 16 bits */
> +
> +/* PCI Command Register */
> +#define RTE_PCI_COMMAND_MASTER   0x4 /* Bus Master Enable */
>  
>  /* PCI Express capability registers */
>  #define RTE_PCI_EXP_DEVCTL   8   /* Device Control */
> 

Acked-by: Ray Kinsella 

Re: [dpdk-dev] [PATCH v5 0/5] eal: enable global device syntax by default

[Kinsella, Ray]

On 23/04/2021 12:39, Gaëtan Rivet wrote:
> On Fri, Apr 23, 2021, at 13:06, Kinsella, Ray wrote:
>>
>>
>> On 14/04/2021 20:49, Thomas Monjalon wrote:
>>> 13/04/2021 05:14, Xueming Li:
 Xueming Li (5):
   devargs: unify scratch buffer storage
   devargs: fix memory leak on parsing error
   kvargs: add get by key function
   bus: add device arguments name parsing API
   devargs: parse global device syntax
>>>
>>> The patch 4 adds a new callback in rte_bus.
>>> I thought about it during the whole day and I don't see any good way
>>> to merge it without breaking the ABI compatibility.
>>>
>>> Only first 3 patches are applied for now, thanks.
>>>
>>
>> I took a look, I don't immediately see the concern.
>>
>> The new entry is at the end of the memory structure.
>> The call back is internal and hidden behind the symbol 
>> rte_devargs_layers_parse.
>>
>> So will only be trigger by a rte_devargs_layers_parse of the same 
>> version of DPDK that introduce the new callback.
>>
>> Should be fine?
>>
> 
> It might have been an issue IMO with a structure exposed as an array, i.e. 
> rte_eth_devices[].
> But I thought this kind of ABI break was the kind that would be accepted 
> between two LTS.

Very much depends on how it is done. 
New fields are ok in some circumstances, at first glance I thought one is ok. 
 
> The only potential risk is in using a new version librte_eal.so with an older 
> librte_bus_xxx.so

We don't account for or consider that, that would be an irrational environmnet. 

> But I think it is fair to expect installations to be internally consistent.
> 
> Maybe we could have a runtime warning when loading mismatched versions

Nope - that would be insanely complex. 

> (if there isn't one already) -- each librte_*.so could have an internal 
> version stamp and alignment could
> be checked through a constructor in each lib?
> 

Re: [dpdk-dev] [dpdk-stable] [PATCH v5 3/3] kni: fix kernel deadlock when using mlx devices

[Igor Ryzhov]

Hi Ferruh,

Thanks. I think it would be great to make this configurable, and maybe even
make shutdown synchronous by default to preserve the old behavior.

I would be grateful if you could spend time on the work and I am ready to
review it.

Igor

On Fri, Apr 23, 2021 at 11:59 AM Ferruh Yigit 
wrote:

> On 4/23/2021 9:41 AM, Igor Ryzhov wrote:
> > This patch changes the behavior for KNI interface shutdown.
> > Previously we would receive a real response from the driver, now we
> > always receive success.
> > I think this should be reflected in the docs/release notes.
> >
>
> Hi Igor,
>
> Make sense, I can add it.
>
> Meanwhile do you think has a benefit to make shutdown behavior
> configurable?
> Async/Sync shutdown based on module param?
>
> > Igor
> >
> > On Wed, Apr 21, 2021 at 2:07 AM Thomas Monjalon  > > wrote:
> >
> > 12/04/2021 16:35, Elad Nachman:
> >  > Hi,
> >  >
> >  > The new patch is fine by me.
> >  >
> >  > Tested several dozens restarts of our proprietary application
> without
> >  > apparent problem.
> >
> > Series applied, thanks.
> >
> >
>
>

Re: [dpdk-dev] [dpdk-stable] [PATCH v5 3/3] kni: fix kernel deadlock when using mlx devices

[Igor Ryzhov]

Sorry I remembered the problem with the deadlock.

We can't just make the shutdown command synchronous, because
we can't release the rtnl_lock anyway. So regardless of the process
mode (sync/async), we have to preserve the lock when processing
the shutdown. It looks like two different settings...

On Fri, Apr 23, 2021 at 3:43 PM Igor Ryzhov  wrote:

> Hi Ferruh,
>
> Thanks. I think it would be great to make this configurable, and maybe even
> make shutdown synchronous by default to preserve the old behavior.
>
> I would be grateful if you could spend time on the work and I am ready to
> review it.
>
> Igor
>
> On Fri, Apr 23, 2021 at 11:59 AM Ferruh Yigit 
> wrote:
>
>> On 4/23/2021 9:41 AM, Igor Ryzhov wrote:
>> > This patch changes the behavior for KNI interface shutdown.
>> > Previously we would receive a real response from the driver, now we
>> > always receive success.
>> > I think this should be reflected in the docs/release notes.
>> >
>>
>> Hi Igor,
>>
>> Make sense, I can add it.
>>
>> Meanwhile do you think has a benefit to make shutdown behavior
>> configurable?
>> Async/Sync shutdown based on module param?
>>
>> > Igor
>> >
>> > On Wed, Apr 21, 2021 at 2:07 AM Thomas Monjalon > > > wrote:
>> >
>> > 12/04/2021 16:35, Elad Nachman:
>> >  > Hi,
>> >  >
>> >  > The new patch is fine by me.
>> >  >
>> >  > Tested several dozens restarts of our proprietary application
>> without
>> >  > apparent problem.
>> >
>> > Series applied, thanks.
>> >
>> >
>>
>>

[dpdk-dev] [PATCH] acl: fix build with gcc 11

[Konstantin Ananyev]

gcc 11 with '-O2' complains about some variables being used without
being initialized:

In file included from ../lib/librte_acl/acl_run_avx512x8.h:201,
 from ../lib/librte_acl/acl_run_avx512.c:110:
In function ‘start_flow_avx512x8’,
inlined from ‘search_trie_avx512x8.constprop’ at 
../lib/librte_acl/acl_run_avx512_common.h:317:2:
../lib/librte_acl/acl_run_avx512_common.h:210:13: warning: ‘pdata’ is used 
uninitialized [-Wuninitialized]
In file included from ../lib/librte_acl/acl_run_avx512x8.h:201,
 from ../lib/librte_acl/acl_run_avx512.c:110:
../lib/librte_acl/acl_run_avx512_common.h: In function 
‘search_trie_avx512x8.constprop’:
../lib/librte_acl/acl_run_avx512_common.h:314:32: note: ‘pdata’ declared here
In file included from ../lib/librte_acl/acl_run_avx512x8.h:201,
 from ../lib/librte_acl/acl_run_avx512.c:110:


Indeed, these variables are not explicitly initialized,
but this is done intentionally.
We rely on constant mask value that we pass to start_flow*() functions
as a parameter Note that gcc 11 with '-O3' and gcc 9/10 with both
'-O2' and '-O3' doesn't produce this warning, same as clang.
Which makes me think that they are able to successfully propagate
this constant mask value though the code.
Also even gcc 11 with '-O2' produces a warning, it is able to generate
an output binary with properly propagated constant values.
Anyway, to support clean build with gcc-11 this patch adds
explicit initialization for these variables.
I checked the output binary: with '-O3' both clang and gcc 10/11
generate no extra code for it.
Also performance test didn't reveal any regressions.

Bugzilla ID: 673
Fixes: b64c2295f7fc ("acl: add 256-bit AVX512 classify method")
Fixes: 45da22e42ec3 ("acl: add 512-bit AVX512 classify method")
Cc: sta...@dpdk.org

Reported-by: Ali Alnubani 
Signed-off-by: Konstantin Ananyev 
---
 lib/acl/acl_run_avx512_common.h | 24 
 1 file changed, 24 insertions(+)

diff --git a/lib/acl/acl_run_avx512_common.h b/lib/acl/acl_run_avx512_common.h
index fafaf591e..fbad74d45 100644
--- a/lib/acl/acl_run_avx512_common.h
+++ b/lib/acl/acl_run_avx512_common.h
@@ -303,6 +303,28 @@ _F_(match_check_process)(struct acl_flow_avx512 *flow, 
uint32_t fm[2],
}
 }
 
+static inline void
+_F_(reset_flow_vars)(_T_simd di[2], _T_simd idx[2], _T_simd pdata[4],
+   _T_simd tr_lo[2], _T_simd tr_hi[2])
+{
+   di[0] = _M_SI_(setzero)();
+   di[1] = _M_SI_(setzero)();
+
+   idx[0] = _M_SI_(setzero)();
+   idx[1] = _M_SI_(setzero)();
+
+   pdata[0] = _M_SI_(setzero)();
+   pdata[1] = _M_SI_(setzero)();
+   pdata[2] = _M_SI_(setzero)();
+   pdata[3] = _M_SI_(setzero)();
+
+   tr_lo[0] = _M_SI_(setzero)();
+   tr_lo[1] = _M_SI_(setzero)();
+
+   tr_hi[0] = _M_SI_(setzero)();
+   tr_hi[1] = _M_SI_(setzero)();
+}
+
 /*
  * Perform search for up to (2 * _N_) flows in parallel.
  * Use two sets of metadata, each serves _N_ flows max.
@@ -313,6 +335,8 @@ _F_(search_trie)(struct acl_flow_avx512 *flow)
uint32_t fm[2];
_T_simd di[2], idx[2], in[2], pdata[4], tr_lo[2], tr_hi[2];
 
+   _F_(reset_flow_vars)(di, idx, pdata, tr_lo, tr_hi);
+
/* first 1B load */
_F_(start_flow)(flow, _SIMD_MASK_BIT_, _SIMD_MASK_MAX_,
&pdata[0], &idx[0], &di[0]);
-- 
2.26.3

Re: [dpdk-dev] [PATCH] net/virtio: fix kernel set memory table for multi-queue devices

[Maxime Coquelin]

On 4/23/21 2:25 PM, Thierry Herbelot wrote:
> Restore the original code, where VHOST_SET_MEM_TABLE is applied to
> all vhostfds of the device.
> 
> Fixes: 539d910c9c768 ("net/virtio: add virtio-user memory tables ops")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Thierry Herbelot 
> ---
>  drivers/net/virtio/virtio_user/vhost_kernel.c | 12 +---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 

Reviewed-by: Maxime Coquelin 

Thanks,
Maxime

Re: [dpdk-dev] [PATCH V5] ethdev: add queue state when retrieve queue information

[Kinsella, Ray]

On 23/04/2021 12:26, Ananyev, Konstantin wrote:
> 
> 
>> -Original Message-
>> From: dev  On Behalf Of Kinsella, Ray
>> Sent: Friday, April 23, 2021 12:17 PM
>> To: Lijun Ou ; tho...@monjalon.net; Yigit, Ferruh 
>> 
>> Cc: dev@dpdk.org; linux...@openeuler.org
>> Subject: Re: [dpdk-dev] [PATCH V5] ethdev: add queue state when retrieve 
>> queue information
>>
>>
>>
>> On 17/04/2021 04:09, Lijun Ou wrote:
>>> Currently, upper-layer application could get queue state only
>>> through pointers such as dev->data->tx_queue_state[queue_id],
>>> this is not the recommended way to access it. So this patch
>>> add get queue state when call rte_eth_rx_queue_info_get and
>>> rte_eth_tx_queue_info_get API.
>>>
>>> Note: After add queue_state field, the 'struct rte_eth_rxq_info' size
>>> remains 128B, and the 'struct rte_eth_txq_info' size remains 64B, so
>>> it could be ABI compatible.
>>>
>>> Signed-off-by: Chengwen Feng 
>>> Signed-off-by: Lijun Ou 
>>> Acked-by: Konstantin Ananyev 
>>> ---
>>> V4->V5:
>>> - Add acked-by
>>> - add a note to the "New features" section to annouce the new feature.
>>>
>>> V3->V4:
>>> - update libabigail.abignore for removing the CI warnings
>>>
>>> V2->V3:
>>> - rewrite the commit log and delete the part Note
>>> - rewrite tht comments for queue state
>>> - move the queue_state definition locations
>>>
>>> V1->V2:
>>> - move queue state defines to public file
>>> ---
>>>  doc/guides/rel_notes/release_21_05.rst | 6 ++
>>>  lib/librte_ethdev/ethdev_driver.h  | 7 ---
>>>  lib/librte_ethdev/rte_ethdev.c | 3 +++
>>>  lib/librte_ethdev/rte_ethdev.h | 9 +
>>>  4 files changed, 18 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/doc/guides/rel_notes/release_21_05.rst 
>>> b/doc/guides/rel_notes/release_21_05.rst
>>> index 58272e1..1ab3681 100644
>>> --- a/doc/guides/rel_notes/release_21_05.rst
>>> +++ b/doc/guides/rel_notes/release_21_05.rst
>>> @@ -81,6 +81,12 @@ New Features
>>>representor=[[c#]pf#]sf# sf[0,2-1023] /* 1023 SFs.   
>>>   */
>>>representor=[c#]pf#  c2pf[0,1]/* 2 PFs on controller 2.  
>>>   */
>>>
>>> +* **Enhanced function for getting rxq/txq info ABI.**
>>> +  * Added new field ``queue_state`` to ``rte_eth_rxq_info`` structure to
>>> +provide indicated rxq queue state.
>>> +  * Added new field ``queue_state`` to ``rte_eth_txq_info`` structure to
>>> +provide indicated txq queue state.
>>> +
>>>  * **Added support for meter PPS profile.**
>>>
>>>Currently meter algorithms only supports bytes per second(BPS).
>>> diff --git a/lib/librte_ethdev/ethdev_driver.h 
>>> b/lib/librte_ethdev/ethdev_driver.h
>>> index 113129d..40e474a 100644
>>> --- a/lib/librte_ethdev/ethdev_driver.h
>>> +++ b/lib/librte_ethdev/ethdev_driver.h
>>> @@ -952,13 +952,6 @@ struct eth_dev_ops {
>>>  };
>>>
>>>  /**
>>> - * RX/TX queue states
>>> - */
>>> -#define RTE_ETH_QUEUE_STATE_STOPPED 0
>>> -#define RTE_ETH_QUEUE_STATE_STARTED 1
>>> -#define RTE_ETH_QUEUE_STATE_HAIRPIN 2
>>> -
>>> -/**
>>>   * @internal
>>>   * Check if the selected Rx queue is hairpin queue.
>>>   *
>>> diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
>>> index c73d263..d5adf4f 100644
>>> --- a/lib/librte_ethdev/rte_ethdev.c
>>> +++ b/lib/librte_ethdev/rte_ethdev.c
>>> @@ -5038,6 +5038,8 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t 
>>> queue_id,
>>>
>>> memset(qinfo, 0, sizeof(*qinfo));
>>> dev->dev_ops->rxq_info_get(dev, queue_id, qinfo);
>>> +   qinfo->queue_state = dev->data->rx_queue_state[queue_id];
>>> +
>>> return 0;
>>>  }
>>>
>>> @@ -5078,6 +5080,7 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t 
>>> queue_id,
>>>
>>> memset(qinfo, 0, sizeof(*qinfo));
>>> dev->dev_ops->txq_info_get(dev, queue_id, qinfo);
>>> +   qinfo->queue_state = dev->data->tx_queue_state[queue_id];
>>>
>>> return 0;
>>>  }
>>> diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
>>> index 3b773b6..a0d01d2 100644
>>> --- a/lib/librte_ethdev/rte_ethdev.h
>>> +++ b/lib/librte_ethdev/rte_ethdev.h
>>> @@ -1588,6 +1588,13 @@ struct rte_eth_dev_info {
>>>  };
>>>
>>>  /**
>>> + * RX/TX queue states
>>> + */
>>> +#define RTE_ETH_QUEUE_STATE_STOPPED 0
>>> +#define RTE_ETH_QUEUE_STATE_STARTED 1
>>> +#define RTE_ETH_QUEUE_STATE_HAIRPIN 2
>>> +
>>> +/**
>>>   * Ethernet device RX queue information structure.
>>>   * Used to retrieve information about configured queue.
>>>   */
>>> @@ -1595,6 +1602,7 @@ struct rte_eth_rxq_info {
>>> struct rte_mempool *mp; /**< mempool used by that queue. */
>>> struct rte_eth_rxconf conf; /**< queue config parameters. */
>>> uint8_t scattered_rx;   /**< scattered packets RX supported. */
>>> +   uint8_t queue_state;/**< one of RTE_ETH_QUEUE_STATE_*. */
>>
>> Are we sure this is a false positive? - it is being added mid-structure on 
>> the rx-side at least.
>> Shouldn't this be appended to the end - unless it 

[dpdk-dev] [PATCH v2] app/testpmd: fix segment number check

[Ferruh Yigit]

From: Viacheslav Ovsiienko 

The --txpkts command line parameter was silently ignored due to
application was unable to check the Tx queue ring sizes for non
configured ports [1].

The "set txpkts " was also rejected if there
was some stopped or /unconfigured port.

This provides the following:

  - If fails to get ring size from the port, this can be because port is
not initialized yet, ignore the check and just be sure segment size
won't cause an out of bound access. The port descriptor check will
be done during Tx setup.

  - The capability to send single packet is supposed to be very basic
and always supported, the setting segment number to 1 is always
allowed, no check performed

  - At the moment of Tx queue setup the descriptor number is checked
against configured segment number

Bugzilla ID: 584
Fixes: 8dae835d88b7 ("app/testpmd: remove restriction on Tx segments set")
Cc: sta...@dpdk.org

Signed-off-by: Viacheslav Ovsiienko 
Signed-off-by: Ferruh Yigit 
---
Cc: Andrew Boyer 

v2:
* Become more flexible for the '--txpkts' command line, if not able to
  get the descriptor size from port, ignore the check.

  ('nb_txd' check was proposed before, this will require '--txd'
  parameter, but also enforces a specific order on the parameters,
  instead going with the option to flex the checks for parameter.)
---
 app/test-pmd/cmdline.c |  4 
 app/test-pmd/config.c  | 32 
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 12efbc0cab46..7feba8337781 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -2910,6 +2910,10 @@ cmd_setup_rxtx_queue_parsed(
if (!numa_support || socket_id == NUMA_NO_CONFIG)
socket_id = port->socket_id;
 
+   if (port->nb_tx_desc[res->qid] < tx_pkt_nb_segs) {
+   printf("Failed to setup TX queue: not enough 
descriptors\n");
+   return;
+   }
ret = rte_eth_tx_queue_setup(res->portid,
 res->qid,
 port->nb_tx_desc[res->qid],
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index e189062efde8..a4445a73bfa5 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -3697,13 +3697,15 @@ nb_segs_is_invalid(unsigned int nb_segs)
RTE_ETH_FOREACH_DEV(port_id) {
for (queue_id = 0; queue_id < nb_txq; queue_id++) {
ret = get_tx_ring_size(port_id, queue_id, &ring_size);
-
-   if (ret)
-   return true;
-
+   if (ret) {
+   /* Port may not be initialized yet, can't say
+* the port is invalid in this stage.
+*/
+   continue;
+   }
if (ring_size < nb_segs) {
-   printf("nb segments per TX packets=%u >= "
-  "TX queue(%u) ring_size=%u - ignored\n",
+   printf("nb segments per TX packets=%u >= TX "
+  "queue(%u) ring_size=%u - txpkts 
ignored\n",
   nb_segs, queue_id, ring_size);
return true;
}
@@ -3719,12 +3721,26 @@ set_tx_pkt_segments(unsigned int *seg_lengths, unsigned 
int nb_segs)
uint16_t tx_pkt_len;
unsigned int i;
 
-   if (nb_segs_is_invalid(nb_segs))
+   /*
+* For single segment settings failed check is ignored.
+* It is a very basic capability to send the single segment
+* packets, suppose it is always supported.
+*/
+   if (nb_segs > 1 && nb_segs_is_invalid(nb_segs)) {
+   printf("Tx segment size(%u) is not supported - txpkts 
ignored\n",
+   nb_segs);
return;
+   }
+
+   if (nb_segs > RTE_MAX_SEGS_PER_PKT) {
+   printf("Tx segment size(%u) is bigger than max number of 
segment(%u)\n",
+   nb_segs, RTE_MAX_SEGS_PER_PKT);
+   return;
+   }
 
/*
 * Check that each segment length is greater or equal than
-* the mbuf data sise.
+* the mbuf data size.
 * Check also that the total packet length is greater or equal than the
 * size of an empty UDP/IP packet (sizeof(struct rte_ether_hdr) +
 * 20 + 8).
-- 
2.30.2

Re: [dpdk-dev] [dpdk-stable] [PATCH] doc: fix nfp multiport syntax

[Ferruh Yigit]

On 3/1/2021 1:45 PM, Ferruh Yigit wrote:

On 2/25/2021 11:46 AM, Heinrich Kuhn wrote:

From: "Chaoyong.He" 

1. Fixup the suffix of the PCI ID to be consistent with the code.
2. Add specification of using MAC address to identify port.

Fixes: 979f2bae0 ("doc: improve multiport PF in nfp guide")
Cc: sta...@dpdk.org

Signed-off-by: Chaoyong.He 
Signed-off-by: Heinrich Kuhn 
---
  doc/guides/nics/nfp.rst | 14 +-
  1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst
index fef99973b..2b170539d 100644
--- a/doc/guides/nics/nfp.rst
+++ b/doc/guides/nics/nfp.rst
@@ -117,15 +117,19 @@ although once they are created, DPDK apps should be able 
to use them as normal

  PCI ports.
  NFP ports belonging to same PF can be seen inside PMD initialization with a
-suffix added to the PCI ID: :xx:yy.z_port_n. For example, a PF with PCI ID
+suffix added to the PCI ID: :xx:yy.z_portn. For example, a PF with PCI ID
  :03:00.0 and four ports is seen by the PMD code as:
 .. code-block:: console
-  :03:00.0_port_0
-  :03:00.0_port_1
-  :03:00.0_port_2
-  :03:00.0_port_3
+  :03:00.0_port0
+  :03:00.0_port1
+  :03:00.0_port2
+  :03:00.0_port3
+


+1 to fix.


+Some dpdk applications can choose to use the MAC address to identify ports,
+OVS-DPDK is one such example, please refer to:
+https://docs.openvswitch.org/en/latest/howto/dpdk/


This is not PMD specific information, not sure to have here,
also not sure to have an external link here, basically for the maintenance 
concerns, should we document this usage withing DPDK in a wider than a PMD scope?




Ping.

Will there be a new version?
If not I can just get the fix part (s/port_n/portn).

[dpdk-dev] [PATCH v3 0/7] test: refactor crypto unit test framework

[Ciara Power]

The current crypto unit test framework is not granular enough to
accurately track unit test results. This is caused by one testcase
in a suite actually running multiple testcases, but only returning
one result.
 
The approach taken in this patchset allows a test suite have a
list of sub-testsuites, and/or a list of testcases as previously used.
The unit test suite runner can then recursively iterate and run the
sub-testsuites, until it reaches a suite with testcases,
and it then runs each testcase as it had done previously.
In the case of a testsuite with both testcases and sub-testsuites,
the testcases are executed first before iterating through the
sub-testsuites.
 
By allowing this further breakdown into sub-testsuites,
a refactor of the crypto unit tests solves the issue of inaccurate
reporting, as sub-testsuites can be used in place of the testcases
that had multiple testcases hidden on a sub level.
The blockcipher tests previously had these hidden testcases,
but are now sub-testsuites that are dynamically created and added to a
parent test suite, allowing for each testcase status to be reported
directly to the runner.
The cryptodev test suite is broken down into smaller suites that are
used as sub-testsuites, which allows for more flexibility choosing which
sub-testsuites should run for the current device.
The introduction of sub-testsuites also allows for more precise
setup/teardown functions, that can check the capabilities required to
run its testcases.
 
For example, when running the cryptodev_aesni_mb_autotest, 
the parent Cryptodev Test Suite is executed.
Various sub-testsuites are added to the parent test suite, such as
the static suites of testcases that were once in the cryptodev_testsuite,
and blockcipher suites.
The unit test runner can then run the Cryptodev parent test suite,
which in turn will run the sub-testsuites.

The user is now required to create vdevs via EAL commandline args,
this is no longer done within the test app for crypto autotests.

Documentation will need to be added at a later stage,
adding to the test document that isn't yet merged. [1]

[1] 
https://patchwork.dpdk.org/project/dpdk/patch/20210309155757.615536-1-acon...@redhat.com/


v3:
  - Added support for a testsuite having both a list of testcases,
and a list of sub-testsuites.
  - Replaced PMD based parent testsuites with a cryptodev testsuite
used by all autotests, with the exception of scheduler autotest.
  - Setup functions were added for all sub-testsuites, within which
required capability support is checked.
  - The setup functions no longer create vdevs if needed,
this must be done by the user when running the test.
  - Patch added to standardise return values for skipped testcases.
v2:
  - Added macro in place of testcase/testsuite loops.
  - Added more detail in the summary output.
  - Moved testcase counts to the testsuite structure.
  - Flattened testsuite structure to remove union.
  - Added patch for fix of blockcipher test return value.
  - Squashed release note into last patch.


Ciara Power (7):
  app/test: refactor of unit test suite runner
  test: introduce parent testsuite format
  test/crypto: refactor to use sub-testsuites
  test/crypto: replace unsupported with skipped
  test/crypto: move testsuite params to header file
  test/crypto: fix return value on test skipped
  test/crypto: dynamically build blockcipher suite

 app/test/test.c|  176 +-
 app/test/test.h|   23 +-
 app/test/test_cryptodev.c  | 2324 ++--
 app/test/test_cryptodev.h  |   32 +
 app/test/test_cryptodev_asym.c |  111 +-
 app/test/test_cryptodev_blockcipher.c  |  423 -
 app/test/test_cryptodev_blockcipher.h  |   12 +-
 app/test/test_ipsec.c  |   32 +-
 doc/guides/rel_notes/release_21_05.rst |5 +
 9 files changed, 2000 insertions(+), 1138 deletions(-)

-- 
2.25.1

[dpdk-dev] [PATCH v3 1/7] app/test: refactor of unit test suite runner

[Ciara Power]

Some small changes were made to the unit test suite runner for
readability and to enable reuse of some of the function in a later patch.

On test suite setup skip/fail, the loop to count testcases as
skipped/failed has been moved to another function.
This will allow for recursion in a later patch when nested sub-testsuites
are used.

The unit test suite runner accessed the list of testcases in the suite
structure every time the testcase was used. This is now replaced by a
testcase variable which improves readability.

A macro has been introduced for readability, instead of using open
coded loops.

Rather than keep local variable status counts for testcases,
these are added to the test suite structure.

The summary output now prints the suite name, this will be useful later
when multiple nested sub-testsuites are being run.

Signed-off-by: Ciara Power 
Acked-by: Aaron Conole 

---
v3:
  - Fixed index used when counting testcases on setup fail.
v2:
  - Added macro to loop testcases in suite.
  - Testcase counts added to the test suite structure.
---
 app/test/test.c | 103 +---
 app/test/test.h |   6 +++
 2 files changed, 69 insertions(+), 40 deletions(-)

diff --git a/app/test/test.c b/app/test/test.c
index 94352a95d5..2fb99d0855 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -36,6 +36,11 @@ extern cmdline_parse_ctx_t main_ctx[];
 
 #define RTE_LOGTYPE_APP RTE_LOGTYPE_USER1
 
+#define FOR_EACH_SUITE_TESTCASE(iter, suite, case) \
+   for (iter = 0, case = suite->unit_test_cases[0];\
+   suite->unit_test_cases[iter].testcase;  \
+   iter++, case = suite->unit_test_cases[iter])
+
 const char *prgname; /* to be set to argv[0] */
 
 static const char *recursive_call; /* used in linux for MP and other tests */
@@ -234,14 +239,41 @@ main(int argc, char **argv)
return ret;
 }
 
+static void
+unit_test_suite_count_tcs_on_setup_fail(struct unit_test_suite *suite,
+   int test_success)
+{
+   struct unit_test_case tc;
+   int i;
+
+   FOR_EACH_SUITE_TESTCASE(i, suite, tc) {
+   suite->total++;
+   if (!tc.enabled || test_success == TEST_SKIPPED)
+   suite->skipped++;
+   else
+   suite->failed++;
+   }
+}
+
+static void
+unit_test_suite_reset_counts(struct unit_test_suite *suite)
+{
+   suite->total = 0;
+   suite->executed = 0;
+   suite->succeeded = 0;
+   suite->skipped = 0;
+   suite->failed = 0;
+   suite->unsupported = 0;
+}
 
 int
 unit_test_suite_runner(struct unit_test_suite *suite)
 {
int test_success;
-   unsigned int total = 0, executed = 0, skipped = 0;
-   unsigned int succeeded = 0, failed = 0, unsupported = 0;
const char *status;
+   struct unit_test_case tc;
+
+   unit_test_suite_reset_counts(suite);
 
if (suite->suite_name) {
printf(" + 
--- +\n");
@@ -255,55 +287,48 @@ unit_test_suite_runner(struct unit_test_suite *suite)
 * setup did not pass, so count all enabled tests and
 * mark them as failed/skipped
 */
-   while (suite->unit_test_cases[total].testcase) {
-   if (!suite->unit_test_cases[total].enabled ||
-   test_success == TEST_SKIPPED)
-   skipped++;
-   else
-   failed++;
-   total++;
-   }
+   unit_test_suite_count_tcs_on_setup_fail(suite,
+   test_success);
goto suite_summary;
}
}
 
printf(" + --- 
+\n");
 
-   while (suite->unit_test_cases[total].testcase) {
-   if (!suite->unit_test_cases[total].enabled) {
-   skipped++;
-   total++;
+   FOR_EACH_SUITE_TESTCASE(suite->total, suite, tc) {
+   if (!tc.enabled) {
+   suite->skipped++;
continue;
} else {
-   executed++;
+   suite->executed++;
}
 
/* run test case setup */
-   if (suite->unit_test_cases[total].setup)
-   test_success = suite->unit_test_cases[total].setup();
+   if (tc.setup)
+   test_success = tc.setup();
else
test_success = TEST_SUCCESS;
 
if (test_success == TEST_SUCCESS) {
/* run the test case */
-   test_success = suite->unit_test_cases[t

[dpdk-dev] [PATCH v3 2/7] test: introduce parent testsuite format

[Ciara Power]

The current structure for unit testing only allows for running a
test suite with nested test cases. This means all test cases for an
autotest must be in one suite, which is not ideal.
For example, in some cases we may want to run multiple lists of test
cases that each require different setup, so should be in separate suites.

The unit test suite struct is modified to hold a pointer to a list of
sub-testsuite pointers, along with the list of testcases as before.

Signed-off-by: Ciara Power 

---
v3:
  - Added condition check to macro that loops sub-testsuites.
  - Changed execution to allow for mixture of sub-testsuites and
testcases, by removing the if/else condition.
  - Moved testcase execution above sub-testsuite execution,
to improve output readability.
v2:
  - Added macro to loop sub-testsuites.
  - Added sub-testsuite summary detail.
---
 app/test/test.c | 70 ++---
 app/test/test.h |  1 +
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/app/test/test.c b/app/test/test.c
index 2fb99d0855..ac0a66392a 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -41,6 +41,12 @@ extern cmdline_parse_ctx_t main_ctx[];
suite->unit_test_cases[iter].testcase;  \
iter++, case = suite->unit_test_cases[iter])
 
+#define FOR_EACH_SUITE_TESTSUITE(iter, suite, sub_ts)  \
+   for (iter = 0, sub_ts = suite->unit_test_suites ?   \
+   suite->unit_test_suites[0]:NULL; sub_ts &&  \
+   suite->unit_test_suites[iter]->suite_name != NULL;  \
+   iter++, sub_ts = suite->unit_test_suites[iter])
+
 const char *prgname; /* to be set to argv[0] */
 
 static const char *recursive_call; /* used in linux for MP and other tests */
@@ -241,11 +247,26 @@ main(int argc, char **argv)
 
 static void
 unit_test_suite_count_tcs_on_setup_fail(struct unit_test_suite *suite,
-   int test_success)
+   int test_success, unsigned int *sub_ts_failed,
+   unsigned int *sub_ts_skipped, unsigned int *sub_ts_total)
 {
struct unit_test_case tc;
+   struct unit_test_suite *ts;
int i;
 
+   FOR_EACH_SUITE_TESTSUITE(i, suite, ts) {
+   unit_test_suite_count_tcs_on_setup_fail(
+   ts, test_success, sub_ts_failed,
+   sub_ts_skipped, sub_ts_total);
+   suite->total += ts->total;
+   suite->failed += ts->failed;
+   suite->skipped += ts->skipped;
+   if (ts->failed)
+   (*sub_ts_failed)++;
+   else
+   (*sub_ts_skipped)++;
+   (*sub_ts_total)++;
+   }
FOR_EACH_SUITE_TESTCASE(i, suite, tc) {
suite->total++;
if (!tc.enabled || test_success == TEST_SKIPPED)
@@ -258,6 +279,11 @@ unit_test_suite_count_tcs_on_setup_fail(struct 
unit_test_suite *suite,
 static void
 unit_test_suite_reset_counts(struct unit_test_suite *suite)
 {
+   struct unit_test_suite *ts;
+   int i;
+
+   FOR_EACH_SUITE_TESTSUITE(i, suite, ts)
+   unit_test_suite_reset_counts(ts);
suite->total = 0;
suite->executed = 0;
suite->succeeded = 0;
@@ -269,9 +295,12 @@ unit_test_suite_reset_counts(struct unit_test_suite *suite)
 int
 unit_test_suite_runner(struct unit_test_suite *suite)
 {
-   int test_success;
+   int test_success, i, ret;
const char *status;
struct unit_test_case tc;
+   struct unit_test_suite *ts;
+   unsigned int sub_ts_succeeded = 0, sub_ts_failed = 0;
+   unsigned int sub_ts_skipped = 0, sub_ts_total = 0;
 
unit_test_suite_reset_counts(suite);
 
@@ -288,7 +317,8 @@ unit_test_suite_runner(struct unit_test_suite *suite)
 * mark them as failed/skipped
 */
unit_test_suite_count_tcs_on_setup_fail(suite,
-   test_success);
+   test_success, &sub_ts_failed,
+   &sub_ts_skipped, &sub_ts_total);
goto suite_summary;
}
}
@@ -342,6 +372,23 @@ unit_test_suite_runner(struct unit_test_suite *suite)
printf(" + TestCase [%2d] : %s %s\n", suite->total,
tc.name, status);
}
+   FOR_EACH_SUITE_TESTSUITE(i, suite, ts) {
+   ret = unit_test_suite_runner(ts);
+   if (ret == TEST_SUCCESS)
+   sub_ts_succeeded++;
+   else if (ret == TEST_SKIPPED)
+   sub_ts_skipped++;
+   else
+   sub_ts_failed++;
+   sub_ts_total++;
+
+   suite->total += ts->total;
+   suite->succeeded += ts->succeeded;
+   suite->failed += ts->failed;
+

[dpdk-dev] [PATCH v3 3/7] test/crypto: refactor to use sub-testsuites

[Ciara Power]

The existing implementation runs a giant cryptodev testsuite for most
autotests, which in turns runs one setup function regardless of device.

This is now broken down into multiple testsuites,
that are used as sub-testsuites. Each autotest runs a general crypto
parent test suite, to which the sub-testsuites are added.

For example, the AESNI_MB test runs "Cryptodev Unit Test Suite",
which has a setup function only to configure testsuite params.
Creation of vdevs in the setup function is no longer supported,
it is expected the user does this when running the app.
This autotest previously just ran the cryptodev_testsuite,
but now has the smaller sub-testsuites added to the parent suite instead.
The same test cases are being run as before.

The scheduler autotest creates its own parent testsuite with nested
sub-testsuites, rather than using the cryptodev testsuite mentioned above.
This is due to it being more complex in execution,
by requiring setting different modes before running tests.
The scheduler autotest no longer requires the extra test cases to
attach/set mode/detach when running the blockcipher test cases for
each mode. The attach/set mode/detach functionality is now tested in a
sub-testsuite. When running the sub-testsuites for each mode,
the attach/set mode/detach happens in the setup and teardown functions
for that sub-testsuite.

Signed-off-by: Ciara Power 

---
v3:
  - Added NULL testcase to each testsuite that has only sub-testsuites,
and no other testcases.
  - Autotests now run one general crypto testsuite, rather than have
PMD based parent testsuites.
  - Sub-testsuites now have setup functions which verify the
capabilities needed for the testcases in that suite are supported.
  - Vdevs are no longer created in the setup functions,
this must be done by the user when running the test.
v2:
  - Modified sub-testsuites to be added as pointers.
  - Made necessary changes resulting from v2 changes in previous patches.
---
 app/test/test_cryptodev.c | 1797 +++--
 app/test/test_cryptodev.h |   12 +
 2 files changed, 1147 insertions(+), 662 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 32e64e2dd1..4fe30ddb21 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -112,6 +112,10 @@ struct crypto_unittest_params {
 #define ALIGN_POW2_ROUNDUP(num, align) \
(((num) + (align) - 1) & ~((align) - 1))
 
+#define ADD_STATIC_TESTSUITE(index, parent_ts, child_ts, num_child_ts) \
+   for (j = 0; j < num_child_ts; index++, j++) \
+   parent_ts.unit_test_suites[index] = child_ts[j]
+
 /*
  * Forward declarations.
  */
@@ -490,7 +494,6 @@ testsuite_setup(void)
struct crypto_testsuite_params *ts_params = &testsuite_params;
struct rte_cryptodev_info info;
uint32_t i = 0, nb_devs, dev_id;
-   int ret;
uint16_t qp_id;
 
memset(ts_params, 0, sizeof(*ts_params));
@@ -536,223 +539,18 @@ testsuite_setup(void)
return TEST_FAILED;
}
 
-   /* Create an AESNI MB device if required */
-   if (gbl_driver_id == rte_cryptodev_driver_id_get(
-   RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD))) {
-   nb_devs = rte_cryptodev_device_count_by_driver(
-   rte_cryptodev_driver_id_get(
-   RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)));
-   if (nb_devs < 1) {
-   ret = rte_vdev_init(
-   RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD), NULL);
-
-   TEST_ASSERT(ret == 0,
-   "Failed to create instance of"
-   " pmd : %s",
-   RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
-   }
-   }
-
-   /* Create an AESNI GCM device if required */
-   if (gbl_driver_id == rte_cryptodev_driver_id_get(
-   RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD))) {
-   nb_devs = rte_cryptodev_device_count_by_driver(
-   rte_cryptodev_driver_id_get(
-   RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD)));
-   if (nb_devs < 1) {
-   TEST_ASSERT_SUCCESS(rte_vdev_init(
-   RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD), NULL),
-   "Failed to create instance of"
-   " pmd : %s",
-   RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD));
-   }
-   }
-
-   /* Create a SNOW 3G device if required */
-   if (gbl_driver_id == rte_cryptodev_driver_id_get(
-   RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD))) {
-   nb_devs = rte_cryptodev_device_count_by_driver(
-   rte_cryptodev_driver_id_get(
-   RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD)));
- 

[dpdk-dev] [PATCH v3 4/7] test/crypto: replace unsupported with skipped

[Ciara Power]

Testcases were previously using -ENOTSUP and TEST_SKIPPED return
statuses interchangeably. Both resulted in the testcase not being run.

These return statuses are now standardised to TEST_SKIPPED.

Signed-off-by: Ciara Power 
---
 app/test/test_cryptodev.c  | 464 -
 app/test/test_cryptodev_asym.c |  18 +-
 2 files changed, 241 insertions(+), 241 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 4fe30ddb21..2c9477680e 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -2060,12 +2060,12 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA1_HMAC;
if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
&cap_idx) == NULL)
-   return -ENOTSUP;
+   return TEST_SKIPPED;
cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
&cap_idx) == NULL)
-   return -ENOTSUP;
+   return TEST_SKIPPED;
 
/* Generate test mbuf data and space for digest */
ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
@@ -2593,7 +2593,7 @@ create_wireless_algo_cipher_auth_session(uint8_t dev_id,
&ut_params->cipher_xform,
ts_params->session_priv_mpool);
if (status == -ENOTSUP)
-   return status;
+   return TEST_SKIPPED;
 
TEST_ASSERT_EQUAL(status, 0, "session init failed");
return 0;
@@ -2656,7 +2656,7 @@ create_wireless_cipher_auth_session(uint8_t dev_id,
&ut_params->cipher_xform,
ts_params->session_priv_mpool);
if (status == -ENOTSUP)
-   return status;
+   return TEST_SKIPPED;
 
TEST_ASSERT_EQUAL(status, 0, "session init failed");
TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
@@ -2732,7 +2732,7 @@ create_wireless_algo_auth_cipher_session(uint8_t dev_id,
ts_params->session_priv_mpool);
 
if (status == -ENOTSUP)
-   return status;
+   return TEST_SKIPPED;
 
TEST_ASSERT_EQUAL(status, 0, "session init failed");
 
@@ -3076,17 +3076,17 @@ test_snow3g_authentication(const struct 
snow3g_hash_test_data *tdata)
if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
((tdata->validAuthLenInBits.len % 8) != 0)) {
printf("Device doesn't support NON-Byte Aligned Data.\n");
-   return -ENOTSUP;
+   return TEST_SKIPPED;
}
 
if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
(!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
printf("Device doesn't support RAW data-path APIs.\n");
-   return -ENOTSUP;
+   return TEST_SKIPPED;
}
 
if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
-   return -ENOTSUP;
+   return TEST_SKIPPED;
 
/* Verify the capabilities */
struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -3094,7 +3094,7 @@ test_snow3g_authentication(const struct 
snow3g_hash_test_data *tdata)
cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
&cap_idx) == NULL)
-   return -ENOTSUP;
+   return TEST_SKIPPED;
 
/* Create SNOW 3G session */
retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
@@ -3167,17 +3167,17 @@ test_snow3g_authentication_verify(const struct 
snow3g_hash_test_data *tdata)
if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
((tdata->validAuthLenInBits.len % 8) != 0)) {
printf("Device doesn't support NON-Byte Aligned Data.\n");
-   return -ENOTSUP;
+   return TEST_SKIPPED;
}
 
if ((global_api_test_type == CRYPTODEV_RAW_API_TEST) &&
(!(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP))) {
printf("Device doesn't support RAW data-path APIs.\n");
-   return -ENOTSUP;
+   return TEST_SKIPPED;
}
 
if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
-   return -ENOTSUP;
+   return TEST_SKIPPED;
 
/* Verify the capabilities */
struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -3185,7 +3185,7 @@ test_snow3g_authentication_verify(const struct 
snow3g_hash_test_data *tdata)
cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
&cap_idx) == NULL)
-   return -ENOTSUP;
+   r

[dpdk-dev] [PATCH v3 5/7] test/crypto: move testsuite params to header file

[Ciara Power]

The testsuite params struct and ut functions are now in the cryptodev
test header file. This will allow them be used outside of the
cryptodev_test.c file. They will be used in a subsequent patch by the
blockcipher test.

As a result of this change, slight renaming changes were necessary
for ipsec and asym tests, to avoid a clash in names.

Signed-off-by: Ciara Power 
---
 app/test/test_cryptodev.c  | 18 ++-
 app/test/test_cryptodev.h  | 20 
 app/test/test_cryptodev_asym.c | 93 ++
 app/test/test_ipsec.c  | 32 ++--
 4 files changed, 89 insertions(+), 74 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 2c9477680e..67adfedd72 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -72,19 +72,6 @@ static enum rte_security_session_action_type gbl_action_type 
=
 
 enum cryptodev_api_test_type global_api_test_type = CRYPTODEV_API_TEST;
 
-struct crypto_testsuite_params {
-   struct rte_mempool *mbuf_pool;
-   struct rte_mempool *large_mbuf_pool;
-   struct rte_mempool *op_mpool;
-   struct rte_mempool *session_mpool;
-   struct rte_mempool *session_priv_mpool;
-   struct rte_cryptodev_config conf;
-   struct rte_cryptodev_qp_conf qp_conf;
-
-   uint8_t valid_devs[RTE_CRYPTO_MAX_DEVS];
-   uint8_t valid_dev_count;
-};
-
 struct crypto_unittest_params {
struct rte_crypto_sym_xform cipher_xform;
struct rte_crypto_sym_xform auth_xform;
@@ -486,6 +473,7 @@ process_crypto_request(uint8_t dev_id, struct rte_crypto_op 
*op)
 }
 
 static struct crypto_testsuite_params testsuite_params = { NULL };
+struct crypto_testsuite_params *p_testsuite_params = &testsuite_params;
 static struct crypto_unittest_params unittest_params;
 
 static int
@@ -1313,7 +1301,7 @@ dev_configure_and_start(uint64_t ff_disable)
return TEST_SUCCESS;
 }
 
-static int
+int
 ut_setup(void)
 {
/* Configure and start the device with security feature disabled */
@@ -1327,7 +1315,7 @@ ut_setup_security(void)
return dev_configure_and_start(0);
 }
 
-static void
+void
 ut_teardown(void)
 {
struct crypto_testsuite_params *ts_params = &testsuite_params;
diff --git a/app/test/test_cryptodev.h b/app/test/test_cryptodev.h
index 5c41e36f44..f81f8e372f 100644
--- a/app/test/test_cryptodev.h
+++ b/app/test/test_cryptodev.h
@@ -79,6 +79,20 @@ enum cryptodev_api_test_type {
 
 extern enum cryptodev_api_test_type global_api_test_type;
 
+extern struct crypto_testsuite_params *p_testsuite_params;
+struct crypto_testsuite_params {
+   struct rte_mempool *mbuf_pool;
+   struct rte_mempool *large_mbuf_pool;
+   struct rte_mempool *op_mpool;
+   struct rte_mempool *session_mpool;
+   struct rte_mempool *session_priv_mpool;
+   struct rte_cryptodev_config conf;
+   struct rte_cryptodev_qp_conf qp_conf;
+
+   uint8_t valid_devs[RTE_CRYPTO_MAX_DEVS];
+   uint8_t valid_dev_count;
+};
+
 /**
  * Write (spread) data from buffer to mbuf data
  *
@@ -234,4 +248,10 @@ int
 check_aead_capabilities_supported(const enum rte_crypto_aead_algorithm *aeads,
uint16_t num_aeads);
 
+int
+ut_setup(void);
+
+void
+ut_teardown(void);
+
 #endif /* TEST_CRYPTODEV_H_ */
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index e935f38ca9..b36eec9abf 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -35,7 +35,7 @@
 #define TEST_VECTOR_SIZE 256
 
 static int gbl_driver_id;
-struct crypto_testsuite_params {
+struct crypto_testsuite_params_asym {
struct rte_mempool *op_mpool;
struct rte_mempool *session_mpool;
struct rte_cryptodev_config conf;
@@ -63,12 +63,12 @@ static struct test_cases_array test_vector = {0, { NULL } };
 
 static uint32_t test_index;
 
-static struct crypto_testsuite_params testsuite_params = { NULL };
+static struct crypto_testsuite_params_asym testsuite_params = { NULL };
 
 static int
 queue_ops_rsa_sign_verify(struct rte_cryptodev_asym_session *sess)
 {
-   struct crypto_testsuite_params *ts_params = &testsuite_params;
+   struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
struct rte_mempool *op_mpool = ts_params->op_mpool;
uint8_t dev_id = ts_params->valid_devs[0];
struct rte_crypto_op *op, *result_op;
@@ -159,7 +159,7 @@ queue_ops_rsa_sign_verify(struct rte_cryptodev_asym_session 
*sess)
 static int
 queue_ops_rsa_enc_dec(struct rte_cryptodev_asym_session *sess)
 {
-   struct crypto_testsuite_params *ts_params = &testsuite_params;
+   struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
struct rte_mempool *op_mpool = ts_params->op_mpool;
uint8_t dev_id = ts_params->valid_devs[0];
struct rte_crypto_op *op, *result_op;
@@ -300,7 +300,7 @@ test_cryptodev_asym_ver(struct rte_crypto_op *op,
 }
 
 static int
-test_cryptodev_asym_op(struct crypto_tests

[dpdk-dev] [PATCH v3 6/7] test/crypto: fix return value on test skipped

[Ciara Power]

The blockcipher testcase return value TEST_SUCCESS was incorrect for
one conditional check, it should have been TEST_SKIPPED similar to the
other condition checks in this function when the testcase is skipped.

Fixes: 4868f6591c6f ("test/crypto: add cases for raw datapath API")
Cc: roy.fan.zh...@intel.com
Cc: sta...@dpdk.org

Signed-off-by: Ciara Power 
Acked-by: Akhil Goyal 
---
 app/test/test_cryptodev_blockcipher.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test/test_cryptodev_blockcipher.c 
b/app/test/test_cryptodev_blockcipher.c
index b99d2ce50a..411968837f 100644
--- a/app/test/test_cryptodev_blockcipher.c
+++ b/app/test/test_cryptodev_blockcipher.c
@@ -170,7 +170,7 @@ test_blockcipher_one_case(const struct 
blockcipher_test_case *t,
printf("Raw Data Path APIs do not support OOP, "
"Test Skipped.\n");
snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN, "SKIPPED");
-   status = TEST_SUCCESS;
+   status = TEST_SKIPPED;
goto error_exit;
}
}
-- 
2.25.1

[dpdk-dev] [PATCH v3 7/7] test/crypto: dynamically build blockcipher suite

[Ciara Power]

In the existing implementation, the blockcipher test cases are being run
and reported as one test case per type, even though multiple test cases
are hidden in each. For example, "test_AES_chain_all" runs 46 test cases.
Each blockcipher type should have a testsuite instead.

The blockcipher testsuite is dynamically built, depending on the
blockcipher type chosen. The testcase struct is modified to allow
running a testcase with data, which is used for data required when
running each blockcipher testcase.

The blockcipher testsuites are added dynamically to parent testsuites
as sub-testsuites where needed.

Signed-off-by: Ciara Power 

---
v3:
  - Modified release note to reflect allowing both nested testsuites
and testcases.
  - Blockcipher testsuites now only need to be added to the cryptodev
parent testsuite, and various scheduler sub-testsuites.
  - Setup functions are added for each blockcipher testsuite,
and capabilities are checked in them.
v2:
  - Squashed release note patch into this patch.
  - Modified the build blockcipher suite function to use the testcases
flexible array, and return a testsuite pointer.
---
 app/test/test.c|  11 +-
 app/test/test.h|  16 +-
 app/test/test_cryptodev.c  | 161 +++---
 app/test/test_cryptodev_blockcipher.c  | 421 ++---
 app/test/test_cryptodev_blockcipher.h  |  12 +-
 doc/guides/rel_notes/release_21_05.rst |   5 +
 6 files changed, 447 insertions(+), 179 deletions(-)

diff --git a/app/test/test.c b/app/test/test.c
index ac0a66392a..173d202e47 100644
--- a/app/test/test.c
+++ b/app/test/test.c
@@ -38,7 +38,8 @@ extern cmdline_parse_ctx_t main_ctx[];
 
 #define FOR_EACH_SUITE_TESTCASE(iter, suite, case) \
for (iter = 0, case = suite->unit_test_cases[0];\
-   suite->unit_test_cases[iter].testcase;  \
+   suite->unit_test_cases[iter].testcase ||\
+   suite->unit_test_cases[iter].testcase_with_data;\
iter++, case = suite->unit_test_cases[iter])
 
 #define FOR_EACH_SUITE_TESTSUITE(iter, suite, sub_ts)  \
@@ -341,7 +342,13 @@ unit_test_suite_runner(struct unit_test_suite *suite)
 
if (test_success == TEST_SUCCESS) {
/* run the test case */
-   test_success = tc.testcase();
+   if (tc.testcase)
+   test_success = tc.testcase();
+   else if (tc.testcase_with_data)
+   test_success = tc.testcase_with_data(tc.data);
+   else
+   test_success = -ENOTSUP;
+
if (test_success == TEST_SUCCESS)
suite->succeeded++;
else if (test_success == TEST_SKIPPED)
diff --git a/app/test/test.h b/app/test/test.h
index f277df7c9d..c3b2a877ec 100644
--- a/app/test/test.h
+++ b/app/test/test.h
@@ -108,24 +108,28 @@ struct unit_test_case {
int (*setup)(void);
void (*teardown)(void);
int (*testcase)(void);
+   int (*testcase_with_data)(const void *data);
const char *name;
unsigned enabled;
+   const void *data;
 };
 
-#define TEST_CASE(fn) { NULL, NULL, fn, #fn, 1 }
+#define TEST_CASE(fn) { NULL, NULL, fn, NULL, #fn, 1, NULL }
 
-#define TEST_CASE_NAMED(name, fn) { NULL, NULL, fn, name, 1 }
+#define TEST_CASE_NAMED(name, fn) { NULL, NULL, fn, NULL, name, 1, NULL }
 
 #define TEST_CASE_ST(setup, teardown, testcase) \
-   { setup, teardown, testcase, #testcase, 1 }
+   { setup, teardown, testcase, NULL, #testcase, 1, NULL }
 
+#define TEST_CASE_WITH_DATA(setup, teardown, testcase, data) \
+   { setup, teardown, NULL, testcase, #testcase, 1, data }
 
-#define TEST_CASE_DISABLED(fn) { NULL, NULL, fn, #fn, 0 }
+#define TEST_CASE_DISABLED(fn) { NULL, NULL, fn, NULL, #fn, 0, NULL }
 
 #define TEST_CASE_ST_DISABLED(setup, teardown, testcase) \
-   { setup, teardown, testcase, #testcase, 0 }
+   { setup, teardown, testcase, NULL, #testcase, 0, NULL }
 
-#define TEST_CASES_END() { NULL, NULL, NULL, NULL, 0 }
+#define TEST_CASES_END() { NULL, NULL, NULL, NULL, NULL, 0, NULL }
 
 static inline void
 debug_hexdump(FILE *file, const char *title, const void *buf, size_t len)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 67adfedd72..f35171ad02 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -103,6 +103,15 @@ struct crypto_unittest_params {
for (j = 0; j < num_child_ts; index++, j++) \
parent_ts.unit_test_suites[index] = child_ts[j]
 
+#define ADD_BLOCKCIPHER_TESTSUITE(index, parent_ts, blk_types, num_blk_types)  
\
+   for (j = 0; j < num_blk_types; index++, j++)  

[dpdk-dev] [PATCH v2] doc: fix formatting in testpmd user guide

[Ferruh Yigit]

From: Ajit Khaparde 

Fix formatting in testpmd user guide for hairpin operation.

Fixes: 01817b10d27c ("app/testpmd: change hairpin queues setup")
Cc:sta...@dpdk.org

Signed-off-by: Ajit Khaparde 
---
Cc: Bing Zhao 
Cc: Ori Kam 

v2:
* Fix only list formatting
---
 doc/guides/testpmd_app_ug/run_app.rst | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/guides/testpmd_app_ug/run_app.rst 
b/doc/guides/testpmd_app_ug/run_app.rst
index d0621658ae64..eb4831835322 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -538,8 +538,10 @@ The command line options are:
 
 *   ``--hairpin-mode=0xXX``
 
-Set the hairpin port mode with bitmask, only valid when hairpin queues 
number is set.
-bit 4 - explicit Tx flow rule
-bit 1 - two hairpin ports paired
-bit 0 - two hairpin ports loop
+Set the hairpin port mode with bitmask, only valid when hairpin queues 
number is set::
+
+   bit 4 - explicit Tx flow rule
+   bit 1 - two hairpin ports paired
+   bit 0 - two hairpin ports loop
+
 The default value is 0. Hairpin will use single port mode and implicit Tx 
flow mode.
-- 
2.30.2

Re: [dpdk-dev] [PATCH v3 2/7] test: introduce parent testsuite format

[Aaron Conole]

Ciara Power  writes:

> The current structure for unit testing only allows for running a
> test suite with nested test cases. This means all test cases for an
> autotest must be in one suite, which is not ideal.
> For example, in some cases we may want to run multiple lists of test
> cases that each require different setup, so should be in separate suites.
>
> The unit test suite struct is modified to hold a pointer to a list of
> sub-testsuite pointers, along with the list of testcases as before.
>
> Signed-off-by: Ciara Power 
>
> ---

LGTM

Reviewed-by: Aaron Conole 

Re: [dpdk-dev] [PATCH] app/bbdev: fix wrong variable

[Chautru, Nicolas]

> -Original Message-
> From: Min Hu (Connor) 
> Sent: Friday, April 23, 2021 12:43 AM
> 
> This patch corrected misused variable.
> 
> Fixes: d819c08327f3 ("app/bbdev: update for 5GNR")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Min Hu (Connor) 

Thanks

Acked-by: Nicolas Chautru 

> ---
>  app/test-bbdev/test_bbdev_perf.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-
> bbdev/test_bbdev_perf.c
> index 45b85b9..b8bf512 100644
> --- a/app/test-bbdev/test_bbdev_perf.c
> +++ b/app/test-bbdev/test_bbdev_perf.c
> @@ -372,14 +372,14 @@ check_dev_cap(const struct rte_bbdev_info
> *dev_info)
>   if (nb_harq_inputs > cap->num_buffers_hard_out) {
>   printf(
>   "Too many HARQ inputs defined: %u,
> max: %u\n",
> - nb_hard_outputs,
> + nb_harq_inputs,
>   cap->num_buffers_hard_out);
>   return TEST_FAILED;
>   }
>   if (nb_harq_outputs > cap->num_buffers_hard_out)
> {
>   printf(
>   "Too many HARQ outputs defined:
> %u, max: %u\n",
> - nb_hard_outputs,
> + nb_harq_outputs,
>   cap->num_buffers_hard_out);
>   return TEST_FAILED;
>   }
> --
> 2.7.4

Re: [dpdk-dev] [PATCH v4 2/2] lib/mempool: distinguish debug counters from cache and pool

[Dharmik Thakkar]

+Honnappa

> On Apr 22, 2021, at 8:29 PM, Dharmik Thakkar  wrote:
> 
> From: Joyce Kong 
> 
> If cache is enabled, objects will be retrieved/put from/to cache,
> subsequently from/to the common pool. Now the debug stats calculate
> the objects retrieved/put from/to cache and pool together, it is
> better to distinguish them.
> 
> Signed-off-by: Joyce Kong 
> Signed-off-by: Dharmik Thakkar 
> Reviewed-by: Ruifeng Wang 
> Reviewed-by: Honnappa Nagarahalli 
> ---
> lib/mempool/rte_mempool.c | 16 +++
> lib/mempool/rte_mempool.h | 43 ++-
> 2 files changed, 45 insertions(+), 14 deletions(-)
> 
> diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c
> index afb1239c8d48..e9343c2a7f6b 100644
> --- a/lib/mempool/rte_mempool.c
> +++ b/lib/mempool/rte_mempool.c
> @@ -1244,6 +1244,14 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
>   for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
>   sum.put_bulk += mp->stats[lcore_id].put_bulk;
>   sum.put_objs += mp->stats[lcore_id].put_objs;
> + sum.put_common_pool_bulk +=
> + mp->stats[lcore_id].put_common_pool_bulk;
> + sum.put_common_pool_objs +=
> + mp->stats[lcore_id].put_common_pool_objs;
> + sum.get_common_pool_bulk +=
> + mp->stats[lcore_id].get_common_pool_bulk;
> + sum.get_common_pool_objs +=
> + mp->stats[lcore_id].get_common_pool_objs;
>   sum.get_success_bulk += mp->stats[lcore_id].get_success_bulk;
>   sum.get_success_objs += mp->stats[lcore_id].get_success_objs;
>   sum.get_fail_bulk += mp->stats[lcore_id].get_fail_bulk;
> @@ -1254,6 +1262,14 @@ rte_mempool_dump(FILE *f, struct rte_mempool *mp)
>   fprintf(f, "  stats:\n");
>   fprintf(f, "put_bulk=%"PRIu64"\n", sum.put_bulk);
>   fprintf(f, "put_objs=%"PRIu64"\n", sum.put_objs);
> + fprintf(f, "put_common_pool_bulk=%"PRIu64"\n",
> + sum.put_common_pool_bulk);
> + fprintf(f, "put_common_pool_objs=%"PRIu64"\n",
> + sum.put_common_pool_objs);
> + fprintf(f, "get_common_pool_bulk=%"PRIu64"\n",
> + sum.get_common_pool_bulk);
> + fprintf(f, "get_common_pool_objs=%"PRIu64"\n",
> + sum.get_common_pool_objs);
>   fprintf(f, "get_success_bulk=%"PRIu64"\n", sum.get_success_bulk);
>   fprintf(f, "get_success_objs=%"PRIu64"\n", sum.get_success_objs);
>   fprintf(f, "get_fail_bulk=%"PRIu64"\n", sum.get_fail_bulk);
> diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
> index 848a19226149..4343b287dc4e 100644
> --- a/lib/mempool/rte_mempool.h
> +++ b/lib/mempool/rte_mempool.h
> @@ -64,14 +64,21 @@ extern "C" {
> #ifdef RTE_LIBRTE_MEMPOOL_DEBUG
> /**
>  * A structure that stores the mempool statistics (per-lcore).
> + * Note: Cache stats (put_cache_bulk/objs, get_cache_bulk/objs) are not
> + * captured since they can be calculated from other stats.
> + * For example: put_cache_objs = put_objs - put_common_pool_objs.
>  */
> struct rte_mempool_debug_stats {
> - uint64_t put_bulk; /**< Number of puts. */
> - uint64_t put_objs; /**< Number of objects successfully put. */
> - uint64_t get_success_bulk; /**< Successful allocation number. */
> - uint64_t get_success_objs; /**< Objects successfully allocated. */
> - uint64_t get_fail_bulk;/**< Failed allocation number. */
> - uint64_t get_fail_objs;/**< Objects that failed to be allocated. */
> + uint64_t put_bulk;/**< Number of puts. */
> + uint64_t put_objs;/**< Number of objects successfully 
> put. */
> + uint64_t put_common_pool_bulk;/**< Number of bulks enqueued in 
> common pool. */
> + uint64_t put_common_pool_objs;/**< Number of objects enqueued in 
> common pool. */
> + uint64_t get_common_pool_bulk;/**< Number of bulks dequeued from 
> common pool. */
> + uint64_t get_common_pool_objs;/**< Number of objects dequeued from 
> common pool. */
> + uint64_t get_success_bulk;/**< Successful allocation number. */
> + uint64_t get_success_objs;/**< Objects successfully allocated. 
> */
> + uint64_t get_fail_bulk;   /**< Failed allocation number. */
> + uint64_t get_fail_objs;   /**< Objects that failed to be 
> allocated. */
>   /** Successful allocation number of contiguous blocks. */
>   uint64_t get_success_blks;
>   /** Failed allocation number of contiguous blocks. */
> @@ -699,10 +706,18 @@ rte_mempool_ops_dequeue_bulk(struct rte_mempool *mp,
>   void **obj_table, unsigned n)
> {
>   struct rte_mempool_ops *ops;
> + int ret;
> 
>   rte_mempool_trace_op

[dpdk-dev] [PATCH] net/bnxt: use bnxt_ prefix on global function

[Stephen Hemminger]

When statically linked the function prandom_bytes is exposed
and might conflict with something in application. All driver
functions should use same prefix.

Fixes: 9738793f28ec ("net/bnxt: add VNIC functions and structs")
Signed-off-by: Stephen Hemminger 
---
 drivers/net/bnxt/bnxt_flow.c | 4 ++--
 drivers/net/bnxt/bnxt_vnic.c | 4 ++--
 drivers/net/bnxt/bnxt_vnic.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index e3906b47791b..844bf1520f50 100644
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -1404,8 +1404,8 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,
/* If hash key has not been specified,
 * use random hash key.
 */
-   prandom_bytes(vnic->rss_hash_key,
- HW_HASH_KEY_SIZE);
+   bnxt_prandom_bytes(vnic->rss_hash_key,
+  HW_HASH_KEY_SIZE);
} else {
if (rss->key_len > HW_HASH_KEY_SIZE)
memcpy(vnic->rss_hash_key,
diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c
index 14ad33b4e86c..de5c14566deb 100644
--- a/drivers/net/bnxt/bnxt_vnic.c
+++ b/drivers/net/bnxt/bnxt_vnic.c
@@ -16,7 +16,7 @@
  * VNIC Functions
  */
 
-void prandom_bytes(void *dest_ptr, size_t len)
+void bnxt_prandom_bytes(void *dest_ptr, size_t len)
 {
char *dest = (char *)dest_ptr;
uint64_t rb;
@@ -172,7 +172,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp)
HW_HASH_KEY_SIZE);
vnic->mc_list_dma_addr = vnic->rss_hash_key_dma_addr +
HW_HASH_KEY_SIZE;
-   prandom_bytes(vnic->rss_hash_key, HW_HASH_KEY_SIZE);
+   bnxt_prandom_bytes(vnic->rss_hash_key, HW_HASH_KEY_SIZE);
}
 
return 0;
diff --git a/drivers/net/bnxt/bnxt_vnic.h b/drivers/net/bnxt/bnxt_vnic.h
index 00a664c8b839..37b452f28170 100644
--- a/drivers/net/bnxt/bnxt_vnic.h
+++ b/drivers/net/bnxt/bnxt_vnic.h
@@ -68,7 +68,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp);
 void bnxt_free_vnic_mem(struct bnxt *bp);
 int bnxt_alloc_vnic_mem(struct bnxt *bp);
 int bnxt_vnic_grp_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic);
-void prandom_bytes(void *dest_ptr, size_t len);
+void bnxt_prandom_bytes(void *dest_ptr, size_t len);
 uint16_t bnxt_rte_to_hwrm_hash_types(uint64_t rte_type);
 int bnxt_rte_to_hwrm_hash_level(struct bnxt *bp, uint64_t hash_f, uint32_t 
lvl);
 uint64_t bnxt_hwrm_to_rte_rss_level(struct bnxt *bp, uint32_t mode);
-- 
2.30.2

Re: [dpdk-dev] L3fwd mode in testpmd

[Honnappa Nagarahalli]

> > > > > > > > On Thu, Mar 11, 2021 at 12:01 AM Honnappa Nagarahalli
> > > > > > > >  wrote:
> > > > > > > > >
> > > > > > > > > Hello,
> > > > > > > > > Performance of L3fwd example application is one
> > > > > > > > > of the key
> > > > > > > > benchmarks in DPDK. However, the application does not have
> > > > > > > > many debugging statistics to understand the performance
> > > > > > > > issues. We have added L3fwd as another mode/stream to
> > > > > > > > testpmd which provides
> > > > > > enough
> > > > > > > > statistics at various levels. This has allowed us to debug
> > > > > > > > the performance issues effectively.
> > > > > > > > >
> > > > > > > > > There is more work to be done to get it to upstreamable
> > > > > > > > > state. I am
> > > > > > > > wondering if such a patch is helpful for others and if the
> > > > > > > > community would be interested in taking a look. Please let
> > > > > > > > me know
> > > > > what you think.
> > > > > > > >
> > > > > > > > We are using app/proc-info/ to attach and analyze the
> performance.
> > > > > > > > That helps to analyze the unmodified application. I think,
> > > > > > > > if something is missing in proc-info app, in my opinion it
> > > > > > > > is better to enhance proc-info so that it can help other
> > > > > > > > third-party
> > > applications.
> > > > > > > >
> > > > > > > > Just my 2c.
> > > > > > > Thanks Jerin. We will explore that.
> > > > > >
> > > > > > I agree it is dangerous to rely too much on testpmd for everything.
> > > > > > Please tell us what in testpmd could be useful out of it.
> > > > > >
> > > > > Things that are very helpful in testpmd are: 1) HW statistics
> > > > > from the NIC 2) Forwarding stats 3) Burst stats (indication of
> > > > > headroom
> > > > > availability) 4) Easy to set parameters like RX and TX queue
> > > > > depths (among others) without having to recompile.
> > > >
> > > > [Kathleen Capella]
> > > > Thank you for the suggestion of app/proc-info. I've tried it out
> > > > with l3fwd and see that it does have the HW stats from the NIC and
> > > > the forwarding
> > > stats.
> > > > However, it does not have the burst stats testpmd offers, nor the
> > >
> > > One option to see such  level of debugging would be to have
> > > - Create a memzone in the primary process
> > > - Application under test can update the stats in memzone based on
> > > the code flow
> > > - proc-info can read the counters updated by application under test
> > > using the memzone object got through rte_memzone_lookup()
> > Agreed. Currently, using app/proc-info does not provide this ability. We
> cannot add this capability to app/proc-info as these stats would be specific 
> to
> L3fwd application.
> 
> I meant creating generic counter-read/write infra via memzone to not make it
> as l3fwd specific.
Currently, app/proc-info is able to print the stats as they are standardized 
via the API. But for statistics that are generated in the application, they are 
very specific to that application. For ex: burst stats in testpmd are very 
specific to it and another application might implement the same in a very 
different manner.

In needs to be something like the app/proc-info just needs to be a dumb 
displaying utility and the application has to do all the heavy lifting of 
copying the exact display strings to the memory.

> > >
> > > Another approach will be using rte_trace()[1] for debugging/tracing
> > > by adding tracepoints in l3fwd for such events.
> > > It has a timestamp and the trace format is opensource trace
> > > format(CTF(Common trace format)), so that we can use post posting
> > > tools to analyze.
> > > [1]
> > > https://doc.dpdk.org/guides/prog_guide/trace_lib.html
> > This is good for analyzing an incident. I think it is an overhead for
> development purposes.
> 
> Consider if one wants to add burst stats, one can add stats increment under
> RTE_TRACE_POINT_FP, it will be emitted whenever code flow through that
> path. Set of events of can be viewed in trace viewer[1]. Would that be
> enough?
> Adding traces to l3fwd can be upstreamed as it is useful for others for
> debugging.
> 
> [1]
> https://github.com/jerinjacobk/share/blob/master/dpdk_trace.JPG
This needs post processing of the trace info to derive the information, is it 
correct? For ex: for burst stats, there will be several traces generated 
collecting the number of packets returned by rte_eth_rx_burst which needs to be 
post processed.
Also, adding traces is equivalent to adding statistics in L3fwd.

> > >
> > > > ability to easily change parameters without having to recompile,
> > > > which helps reduce debugging time significantly.
We will not be able to fix this above issue.

Re: [dpdk-dev] [PATCH v2] build: fix symlink of drivers for Windows

[Narcisa Ana Maria Vasile]

On Sat, Apr 10, 2021 at 09:01:43AM +0100, Nick Connolly wrote:
> The symlink-drivers-solibs.sh script was disabled as part of 'install'
> for Windows because there is no support for shell scripts. However,
> this means that driver related DLLs are not present in the installed
> 'libdir' directory. Add a python script to perform the install and use
> it for Windows if the version of meson supports using an external
> program with add_install_script (>= 0.55.0).
> 
> On Windows, symbolic links are somewhat problematic since the
> SeCreateSymbolicLinkPrivilege is required to be able to create them.
> In addition, different cross-compilation environments handle symbolic
> links differently, e.g. WSL, Msys2, Cygwin. Rather than trying to
> distinguish these scenarios, the python script will perform a file copy
> for any Windows specific names.
> 
> On Windows, the shared library outputs have different names depending
> upon which toolset has been used to build them. The script currently
> handles Clang and GCC.
> 
> On Linux the functionality is unchanged, but could be replaced with the
> python script once the required minimum version of meson is >= 0.55.0.
> 
> Fixes: 5c7d86948764 ("build: fix install on Windows")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Nick Connolly 
> ---
>  buildtools/symlink-drivers-solibs.py | 49 
>  config/meson.build   |  4 +++
>  2 files changed, 53 insertions(+)
>  create mode 100644 buildtools/symlink-drivers-solibs.py
> 
> diff --git a/buildtools/symlink-drivers-solibs.py 
> b/buildtools/symlink-drivers-solibs.py

Tested-by: Narcisa Vasile 
Acked-by: Narcisa Vasile 

Note that it needs rebasing.

Re: [dpdk-dev] [PATCH v1 1/2] common/iavf: add header types for PPPoL2TPv2oUDP

[Zhang, Qi Z]

> -Original Message-
> From: Xu, Ting 
> Sent: Friday, April 23, 2021 4:07 PM
> To: dev@dpdk.org
> Cc: Xing, Beilei ; Wu, Jingjing 
> ;
> Zhang, Qi Z ; Xu, Ting 
> Subject: [PATCH v1 1/2] common/iavf: add header types for PPPoL2TPv2oUDP
> 
> Added two virtchnl protocol header types for L2TPv2 and PPP to support the
> RSS hash for PPPoL2TPv2oUDP.
> 
> Signed-off-by: Ting Xu 

Acked-by: Qi Zhang 

Applied to dpdk-next-net-intel.

Thanks
Qi

[dpdk-dev] [PATCH 0/4] common/iavf: update virtchnl

[Qi Zhang]

Couple code refine and bug fix

Qi Zhang (4):
  common/iavf: fix duplicate defined offload bit
  common/iavf: add enumeration for the rxdid format
  common/iavf: refine comment in virtchnl
  common/iavf: use BIT() macro for offload/cap bits

 drivers/common/iavf/virtchnl.h | 183 -
 1 file changed, 132 insertions(+), 51 deletions(-)

-- 
2.26.2

[dpdk-dev] [PATCH 1/4] common/iavf: fix duplicate defined offload bit

[Qi Zhang]

The value of offload VIRTCHNL_VF_OFFLOAD_CRC bit already existed as
VIRTCHNL_VF_CAP_ADV_LINK_SPEED. Fix this now by changing the value of
VIRTCHNL_VF_OFFLOAD_CRC to a currently unused value.

Also, move the define for VIRTCHNL_VF_CAP_ADV_LINK_SPEED in the correct
place to line up with the other bit values and add a comment for its
purpose. Hopefully this will prevent from defining duplicate bits moving
forward.

Fixes: e244eeafcecb ("net/iavf/base: update virtual channel")
Cc: sta...@dpdk.org

Signed-off-by: Brett Creeley 
Signed-off-by: Qi Zhang 
---
 drivers/common/iavf/virtchnl.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h
index 139569787f..c68128f773 100644
--- a/drivers/common/iavf/virtchnl.h
+++ b/drivers/common/iavf/virtchnl.h
@@ -372,9 +372,11 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);
 #define VIRTCHNL_VF_OFFLOAD_RSS_REG0x0010
 #define VIRTCHNL_VF_OFFLOAD_WB_ON_ITR  0x0020
 #define VIRTCHNL_VF_OFFLOAD_REQ_QUEUES 0x0040
-#define VIRTCHNL_VF_OFFLOAD_CRC0x0080
+/* used to negotiate communicating link speeds in Mbps */
+#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED 0x0080
/* 0X0100 is reserved */
 #define VIRTCHNL_VF_LARGE_NUM_QPAIRS   0x0200
+#define VIRTCHNL_VF_OFFLOAD_CRC0x0400
 #define VIRTCHNL_VF_OFFLOAD_VLAN_V20x8000
 #define VIRTCHNL_VF_OFFLOAD_VLAN   0x0001
 #define VIRTCHNL_VF_OFFLOAD_RX_POLLING 0x0002
@@ -393,8 +395,6 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);
 #define VIRTCHNL_VF_CAP_DCF0X4000
/* 0X8000 is reserved */
 
-/* Define below the capability flags that are not offloads */
-#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED 0x0080
 #define VF_BASE_MODE_OFFLOADS (VIRTCHNL_VF_OFFLOAD_L2 | \
   VIRTCHNL_VF_OFFLOAD_VLAN | \
   VIRTCHNL_VF_OFFLOAD_RSS_PF)
-- 
2.26.2

[dpdk-dev] [PATCH 2/4] common/iavf: add enumeration for the rxdid format

[Qi Zhang]

Support for allowing VFs to negotiate the descriptor format was added
previously.

This support requires that the VF specify which descriptor format to use
when requesting Rx queues. The VF is supposed to request the set of
supported formats via the new VIRTCHNL_OP_GET_SUPPORTED_RXDIDS, and then
set one of the supported formats in the rxdid field of the
virtchnl_rxq_info structure.

The virtchnl.h header does not provide an enumeration of the format
values. The existing implementations in the PF directly use the values
from the DDP package.

Make the formats explicit by defining an enumeration of the RXDIDs.
Provide an enumeration for the values as well as the bit positions as
returned by the supported_rxdids data from the
VIRTCHNL_OP_GET_SUPPORTED_RXDIDS.

Signed-off-by: Jacob Keller 
Signed-off-by: Qi Zhang 
---
 drivers/common/iavf/virtchnl.h | 55 +-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h
index c68128f773..d794f11c01 100644
--- a/drivers/common/iavf/virtchnl.h
+++ b/drivers/common/iavf/virtchnl.h
@@ -432,6 +432,54 @@ struct virtchnl_txq_info {
 
 VIRTCHNL_CHECK_STRUCT_LEN(24, virtchnl_txq_info);
 
+/* RX descriptor IDs (range from 0 to 63) */
+enum virtchnl_rx_desc_ids {
+   VIRTCHNL_RXDID_0_16B_BASE   = 0,
+   /* 32B_BASE and FLEX_SPLITQ share desc ids as default descriptors
+* because they can be differentiated based on queue model; e.g. single
+* queue model can only use 32B_BASE and split queue model can only use
+* FLEX_SPLITQ.  Having these as 1 allows them to be used as default
+* descriptors without negotiation.
+*/
+   VIRTCHNL_RXDID_1_32B_BASE   = 1,
+   VIRTCHNL_RXDID_1_FLEX_SPLITQ= 1,
+   VIRTCHNL_RXDID_2_FLEX_SQ_NIC= 2,
+   VIRTCHNL_RXDID_3_FLEX_SQ_SW = 3,
+   VIRTCHNL_RXDID_4_FLEX_SQ_NIC_VEB= 4,
+   VIRTCHNL_RXDID_5_FLEX_SQ_NIC_ACL= 5,
+   VIRTCHNL_RXDID_6_FLEX_SQ_NIC_2  = 6,
+   VIRTCHNL_RXDID_7_HW_RSVD= 7,
+   /* 9 through 15 are reserved */
+   VIRTCHNL_RXDID_16_COMMS_GENERIC = 16,
+   VIRTCHNL_RXDID_17_COMMS_AUX_VLAN= 17,
+   VIRTCHNL_RXDID_18_COMMS_AUX_IPV4= 18,
+   VIRTCHNL_RXDID_19_COMMS_AUX_IPV6= 19,
+   VIRTCHNL_RXDID_20_COMMS_AUX_FLOW= 20,
+   VIRTCHNL_RXDID_21_COMMS_AUX_TCP = 21,
+   /* 22 through 63 are reserved */
+};
+
+/* RX descriptor ID bitmasks */
+enum virtchnl_rx_desc_id_bitmasks {
+   VIRTCHNL_RXDID_0_16B_BASE_M = 
BIT(VIRTCHNL_RXDID_0_16B_BASE),
+   VIRTCHNL_RXDID_1_32B_BASE_M = 
BIT(VIRTCHNL_RXDID_1_32B_BASE),
+   VIRTCHNL_RXDID_1_FLEX_SPLITQ_M  = 
BIT(VIRTCHNL_RXDID_1_FLEX_SPLITQ),
+   VIRTCHNL_RXDID_2_FLEX_SQ_NIC_M  = 
BIT(VIRTCHNL_RXDID_2_FLEX_SQ_NIC),
+   VIRTCHNL_RXDID_3_FLEX_SQ_SW_M   = 
BIT(VIRTCHNL_RXDID_3_FLEX_SQ_SW),
+   VIRTCHNL_RXDID_4_FLEX_SQ_NIC_VEB_M  = 
BIT(VIRTCHNL_RXDID_4_FLEX_SQ_NIC_VEB),
+   VIRTCHNL_RXDID_5_FLEX_SQ_NIC_ACL_M  = 
BIT(VIRTCHNL_RXDID_5_FLEX_SQ_NIC_ACL),
+   VIRTCHNL_RXDID_6_FLEX_SQ_NIC_2_M= 
BIT(VIRTCHNL_RXDID_6_FLEX_SQ_NIC_2),
+   VIRTCHNL_RXDID_7_HW_RSVD_M  = BIT(VIRTCHNL_RXDID_7_HW_RSVD),
+   /* 9 through 15 are reserved */
+   VIRTCHNL_RXDID_16_COMMS_GENERIC_M   = 
BIT(VIRTCHNL_RXDID_16_COMMS_GENERIC),
+   VIRTCHNL_RXDID_17_COMMS_AUX_VLAN_M  = 
BIT(VIRTCHNL_RXDID_17_COMMS_AUX_VLAN),
+   VIRTCHNL_RXDID_18_COMMS_AUX_IPV4_M  = 
BIT(VIRTCHNL_RXDID_18_COMMS_AUX_IPV4),
+   VIRTCHNL_RXDID_19_COMMS_AUX_IPV6_M  = 
BIT(VIRTCHNL_RXDID_19_COMMS_AUX_IPV6),
+   VIRTCHNL_RXDID_20_COMMS_AUX_FLOW_M  = 
BIT(VIRTCHNL_RXDID_20_COMMS_AUX_FLOW),
+   VIRTCHNL_RXDID_21_COMMS_AUX_TCP_M   = 
BIT(VIRTCHNL_RXDID_21_COMMS_AUX_TCP),
+   /* 22 through 63 are reserved */
+};
+
 /* VIRTCHNL_OP_CONFIG_RX_QUEUE
  * VF sends this message to set up parameters for one RX queue.
  * External data buffer contains one instance of virtchnl_rxq_info.
@@ -454,7 +502,11 @@ struct virtchnl_rxq_info {
u32 databuffer_size;
u32 max_pkt_size;
u8 crc_disable;
-   /* only used when VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC is supported */
+   /* see enum virtchnl_rx_desc_ids;
+* only used when VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC is supported. Note
+* that when the offload is not supported, the descriptor format aligns
+* with VIRTCHNL_RXDID_1_32B_BASE.
+*/
u8 rxdid;
u8 pad1[2];
u64 dma_ring_addr;
@@ -1294,6 +1346,7 @@ struct virtchnl_dcf_vlan_offload {
 VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_dcf_vlan_offload);
 
 struct virtchnl_supported_rxdids {
+   /* see enum virtchnl_rx_desc_id_bitmasks */
u64 supported_rxdids;
 };
 
-- 
2.26.2

[dpdk-dev] [PATCH 3/4] common/iavf: refine comment in virtchnl

[Qi Zhang]

General clean up for comment in virtchnl.

Signed-off-by: Sridhar Samudrala 
Signed-off-by: Joshua Hay 
Signed-off-by: Qi Zhang 
---
 drivers/common/iavf/virtchnl.h | 69 --
 1 file changed, 49 insertions(+), 20 deletions(-)

diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h
index d794f11c01..0772c28527 100644
--- a/drivers/common/iavf/virtchnl.h
+++ b/drivers/common/iavf/virtchnl.h
@@ -6,8 +6,9 @@
 #define _VIRTCHNL_H_
 
 /* Description:
- * This header file describes the VF-PF communication protocol used
- * by the drivers for all devices starting from our 40G product line
+ * This header file describes the Virtual Function (VF) - Physical Function
+ * (PF) communication protocol used by the drivers for all devices starting
+ * from our 40G product line
  *
  * Admin queue buffer usage:
  * desc->opcode is always aqc_opc_send_msg_to_pf
@@ -21,8 +22,8 @@
  * have a maximum of sixteen queues for all of its VSIs.
  *
  * The PF is required to return a status code in v_retval for all messages
- * except RESET_VF, which does not require any response. The return value
- * is of status_code type, defined in the shared type.h.
+ * except RESET_VF, which does not require any response. The returned value
+ * is of virtchnl_status_code type, defined in the shared type.h.
  *
  * In general, VF driver initialization should roughly follow the order of
  * these opcodes. The VF driver must first validate the API version of the
@@ -287,8 +288,12 @@ static inline const char *virtchnl_op_str(enum 
virtchnl_ops v_opcode)
 
 struct virtchnl_msg {
u8 pad[8];   /* AQ flags/opcode/len/retval fields */
-   enum virtchnl_ops v_opcode; /* avoid confusion with desc->opcode */
-   enum virtchnl_status_code v_retval;  /* ditto for desc->retval */
+
+   /* avoid confusion with desc->opcode */
+   enum virtchnl_ops v_opcode;
+
+   /* ditto for desc->retval */
+   enum virtchnl_status_code v_retval;
u32 vfid;/* used by PF when sending to VF */
 };
 
@@ -354,7 +359,9 @@ enum virtchnl_vsi_type {
 struct virtchnl_vsi_resource {
u16 vsi_id;
u16 num_queue_pairs;
-   enum virtchnl_vsi_type vsi_type;
+
+   /* see enum virtchnl_vsi_type */
+   s32 vsi_type;
u16 qset_handle;
u8 default_mac_addr[VIRTCHNL_ETH_LENGTH_OF_ADDRESS];
 };
@@ -510,7 +517,9 @@ struct virtchnl_rxq_info {
u8 rxdid;
u8 pad1[2];
u64 dma_ring_addr;
-   enum virtchnl_rx_hsplit rx_split_pos; /* deprecated with AVF 1.0 */
+
+   /* see enum virtchnl_rx_hsplit; deprecated with AVF 1.0 */
+   s32 rx_split_pos;
u32 pad2;
 };
 
@@ -1265,8 +1274,12 @@ enum virtchnl_flow_type {
 struct virtchnl_filter {
union   virtchnl_flow_spec data;
union   virtchnl_flow_spec mask;
-   enumvirtchnl_flow_type flow_type;
-   enumvirtchnl_action action;
+
+   /* see enum virtchnl_flow_type */
+   s32 flow_type;
+
+   /* see enum virtchnl_action */
+   s32 action;
u32 action_meta;
u8  field_flags;
 };
@@ -1371,7 +1384,8 @@ enum virtchnl_event_codes {
 #define PF_EVENT_SEVERITY_CERTAIN_DOOM 255
 
 struct virtchnl_pf_event {
-   enum virtchnl_event_codes event;
+   /* see enum virtchnl_event_codes */
+   s32 event;
union {
/* If the PF driver does not support the new speed reporting
 * capabilities then use link_event else use link_event_adv to
@@ -1579,7 +1593,8 @@ enum virtchnl_proto_hdr_field {
 };
 
 struct virtchnl_proto_hdr {
-   enum virtchnl_proto_hdr_type type;
+   /* see enum virtchnl_proto_hdr_type */
+   s32 type;
u32 field_selector; /* a bit mask to select field for header type */
u8 buffer[64];
/**
@@ -1608,7 +1623,9 @@ VIRTCHNL_CHECK_STRUCT_LEN(2312, virtchnl_proto_hdrs);
 
 struct virtchnl_rss_cfg {
struct virtchnl_proto_hdrs proto_hdrs; /* protocol headers */
-   enum virtchnl_rss_algorithm rss_algorithm; /* rss algorithm type */
+
+   /* see enum virtchnl_rss_algorithm; rss algorithm type */
+   s32 rss_algorithm;
u8 reserved[128];  /* reserve for future */
 };
 
@@ -1616,7 +1633,8 @@ VIRTCHNL_CHECK_STRUCT_LEN(2444, virtchnl_rss_cfg);
 
 /* action configuration for FDIR */
 struct virtchnl_filter_action {
-   enum virtchnl_action type;
+   /* see enum virtchnl_action type */
+   s32 type;
union {
/* used for queue and qgroup action */
struct {
@@ -1723,7 +1741,9 @@ struct virtchnl_fdir_add {
u16 validate_only; /* INPUT */
u32 flow_id;   /* OUTPUT */
struct virtchnl_fdir_rule rule_cfg; /* INPUT */
-   enum virtchnl_fdir_prgm_status status; /* OUTPUT */
+
+   /* see enum virtchnl_fdir_prgm_status; OUTPUT */
+   s32 status;
 };
 
 VIRTCHNL_CHECK_STRUCT_L

[dpdk-dev] [PATCH 4/4] common/iavf: use BIT() macro for offload/cap bits

[Qi Zhang]

Currently raw hex values are used to define specific bits for each
offload/capability in virtchnl.h. The can and has led to duplicate
defined bits. Fix this by using the BIT() macro so it's
immediately obvious which bits are used/available.

Signed-off-by: Brett Creeley 
Signed-off-by: Qi Zhang 
---
 drivers/common/iavf/virtchnl.h | 55 +-
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h
index 0772c28527..09d4c86550 100644
--- a/drivers/common/iavf/virtchnl.h
+++ b/drivers/common/iavf/virtchnl.h
@@ -372,35 +372,34 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);
  * VIRTCHNL_VF_OFFLOAD_L2 flag is inclusive of base mode L2 offloads including
  * TX/RX Checksum offloading and TSO for non-tunnelled packets.
  */
-#define VIRTCHNL_VF_OFFLOAD_L2 0x0001
-#define VIRTCHNL_VF_OFFLOAD_IWARP  0x0002
-#define VIRTCHNL_VF_OFFLOAD_RSVD   0x0004
-#define VIRTCHNL_VF_OFFLOAD_RSS_AQ 0x0008
-#define VIRTCHNL_VF_OFFLOAD_RSS_REG0x0010
-#define VIRTCHNL_VF_OFFLOAD_WB_ON_ITR  0x0020
-#define VIRTCHNL_VF_OFFLOAD_REQ_QUEUES 0x0040
+#define VIRTCHNL_VF_OFFLOAD_L2 BIT(0)
+#define VIRTCHNL_VF_OFFLOAD_IWARP  BIT(1)
+#define VIRTCHNL_VF_OFFLOAD_RSVD   BIT(2)
+#define VIRTCHNL_VF_OFFLOAD_RSS_AQ BIT(3)
+#define VIRTCHNL_VF_OFFLOAD_RSS_REGBIT(4)
+#define VIRTCHNL_VF_OFFLOAD_WB_ON_ITR  BIT(5)
+#define VIRTCHNL_VF_OFFLOAD_REQ_QUEUES BIT(6)
 /* used to negotiate communicating link speeds in Mbps */
-#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED 0x0080
-   /* 0X0100 is reserved */
-#define VIRTCHNL_VF_LARGE_NUM_QPAIRS   0x0200
-#define VIRTCHNL_VF_OFFLOAD_CRC0x0400
-#define VIRTCHNL_VF_OFFLOAD_VLAN_V20x8000
-#define VIRTCHNL_VF_OFFLOAD_VLAN   0x0001
-#define VIRTCHNL_VF_OFFLOAD_RX_POLLING 0x0002
-#define VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2  0x0004
-#define VIRTCHNL_VF_OFFLOAD_RSS_PF 0X0008
-#define VIRTCHNL_VF_OFFLOAD_ENCAP  0X0010
-#define VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM 0X0020
-#define VIRTCHNL_VF_OFFLOAD_RX_ENCAP_CSUM  0X0040
-#define VIRTCHNL_VF_OFFLOAD_ADQ0X0080
-#define VIRTCHNL_VF_OFFLOAD_ADQ_V2 0X0100
-#define VIRTCHNL_VF_OFFLOAD_USO0X0200
-#define VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC   0X0400
-#define VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF 0X0800
-#define VIRTCHNL_VF_OFFLOAD_FDIR_PF0X1000
-   /* 0X2000 is reserved */
-#define VIRTCHNL_VF_CAP_DCF0X4000
-   /* 0X8000 is reserved */
+#define VIRTCHNL_VF_CAP_ADV_LINK_SPEED BIT(7)
+   /* BIT(8) is reserved */
+#define VIRTCHNL_VF_LARGE_NUM_QPAIRS   BIT(9)
+#define VIRTCHNL_VF_OFFLOAD_CRCBIT(10)
+#define VIRTCHNL_VF_OFFLOAD_VLAN_V2BIT(15)
+#define VIRTCHNL_VF_OFFLOAD_VLAN   BIT(16)
+#define VIRTCHNL_VF_OFFLOAD_RX_POLLING BIT(17)
+#define VIRTCHNL_VF_OFFLOAD_RSS_PCTYPE_V2  BIT(18)
+#define VIRTCHNL_VF_OFFLOAD_RSS_PF BIT(19)
+#define VIRTCHNL_VF_OFFLOAD_ENCAP  BIT(20)
+#define VIRTCHNL_VF_OFFLOAD_ENCAP_CSUM BIT(21)
+#define VIRTCHNL_VF_OFFLOAD_RX_ENCAP_CSUM  BIT(22)
+#define VIRTCHNL_VF_OFFLOAD_ADQBIT(23)
+#define VIRTCHNL_VF_OFFLOAD_ADQ_V2 BIT(24)
+#define VIRTCHNL_VF_OFFLOAD_USOBIT(25)
+#define VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC   BIT(26)
+#define VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF BIT(27)
+#define VIRTCHNL_VF_OFFLOAD_FDIR_PFBIT(28)
+#define VIRTCHNL_VF_CAP_DCFBIT(30)
+   /* BIT(31) is reserved */
 
 #define VF_BASE_MODE_OFFLOADS (VIRTCHNL_VF_OFFLOAD_L2 | \
   VIRTCHNL_VF_OFFLOAD_VLAN | \
-- 
2.26.2