Re: [dpdk-dev] [PATCH] crypto/dpaa2_sec: update license and copyright for hw and mc files

[Thomas Monjalon]

21/04/2017 12:56, akhil.go...@nxp.com:
> From: Akhil Goyal 
> 
> license and copyright for hw and mc files are made consistent
> as per the other dpaa2 dual licensed files.
> 
> Signed-off-by: Akhil Goyal 

Applied, thanks

[dpdk-dev] [PATCH 01/11] net/qede: fix default MAC address handling

[Rasesh Mody]

From: Harish Patil 

- In qede_mac_addr_set(), in order to configure default MAC address we
first delete the existing MAC address before trying to add new one. During
init time, there is no MAC filter to begin with, so trying to remove a
non-existing MAC address causes a firmware exception. This can be prevented
by internally calling qede_mac_addr_add() which has the checks in place to
delete a MAC address only if it was added before.

- Remove setting of the default MAC address from within
qede_dev_configure() since rte_eth_dev_start() calls mac_addr_set() anyway.

Fixes: 2ea6f76aff40 ("qede: add core driver")
Cc: sta...@dpdk.org

Signed-off-by: Harish Patil 
---
 drivers/net/qede/qede_ethdev.c |   30 +-
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index fbad2a6..b31a7df 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -551,8 +551,6 @@ static void qede_set_cmn_tunn_param(struct 
ecore_tunnel_info *p_tunn,
 {
struct qede_dev *qdev = QEDE_INIT_QDEV(eth_dev);
struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
-   struct ecore_filter_ucast ucast;
-   int rc;
 
if (IS_VF(edev) && !ecore_vf_check_mac(ECORE_LEADING_HWFN(edev),
   mac_addr->addr_bytes)) {
@@ -562,29 +560,7 @@ static void qede_set_cmn_tunn_param(struct 
ecore_tunnel_info *p_tunn,
return;
}
 
-   /* First remove the primary mac */
-   qede_set_ucast_cmn_params(&ucast);
-   ucast.opcode = ECORE_FILTER_REMOVE;
-   ucast.type = ECORE_FILTER_MAC;
-   ether_addr_copy(&qdev->primary_mac,
-   (struct ether_addr *)&ucast.mac);
-   rc = ecore_filter_ucast_cmd(edev, &ucast, ECORE_SPQ_MODE_CB, NULL);
-   if (rc != 0) {
-   DP_ERR(edev, "Unable to remove current macaddr"
-" Reverting to previous default mac\n");
-   ether_addr_copy(&qdev->primary_mac,
-   ð_dev->data->mac_addrs[0]);
-   return;
-   }
-
-   /* Add new MAC */
-   ucast.opcode = ECORE_FILTER_ADD;
-   ether_addr_copy(mac_addr, (struct ether_addr *)&ucast.mac);
-   rc = ecore_filter_ucast_cmd(edev, &ucast, ECORE_SPQ_MODE_CB, NULL);
-   if (rc != 0)
-   DP_ERR(edev, "Unable to add new default mac\n");
-   else
-   ether_addr_copy(mac_addr, &qdev->primary_mac);
+   qede_mac_addr_add(eth_dev, mac_addr, 0, 0);
 }
 
 static void qede_config_accept_any_vlan(struct qede_dev *qdev, bool action)
@@ -925,10 +901,6 @@ static int qede_dev_configure(struct rte_eth_dev *eth_dev)
 
SLIST_INIT(&qdev->vlan_list_head);
 
-   /* Add primary mac for PF */
-   if (IS_PF(edev))
-   qede_mac_addr_set(eth_dev, &qdev->primary_mac);
-
/* Enable VLAN offloads by default */
qede_vlan_offload_set(eth_dev, ETH_VLAN_STRIP_MASK  |
   ETH_VLAN_FILTER_MASK |
-- 
1.7.10.3

[dpdk-dev] [PATCH 02/11] net/qede: fix reset of fastpath rings after port stop

[Rasesh Mody]

From: Harish Patil 

Perform reset of the fastpath RX/TX rings after stopping device port and
not while starting the ports.

Fixes: cfe28a988565 ("net/qede: support unequal number of Rx/Tx queues")
Cc: sta...@dpdk.org

Signed-off-by: Harish Patil 
---
 drivers/net/qede/qede_rxtx.c |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index c6add0f..7623a01 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -1712,10 +1712,6 @@ int qede_dev_start(struct rte_eth_dev *eth_dev)
/* Bring-up the link */
qede_dev_set_link_state(eth_dev, true);
 
-   /* Reset ring */
-   if (qede_reset_fp_rings(qdev))
-   return -ENOMEM;
-
/* Start/resume traffic */
qdev->ops->fastpath_start(edev);
 
@@ -1835,6 +1831,7 @@ static int qede_stop_queues(struct qede_dev *qdev)
}
}
}
+   qede_reset_fp_rings(qdev);
 
return 0;
 }
-- 
1.7.10.3

[dpdk-dev] [PATCH 03/11] net/qede: fix LRO handling issue

[Rasesh Mody]

From: Harish Patil 

- Add a common routine to handle ETH_RX_CQE_TYPE_TPA_CONT and
ETH_RX_CQE_TYPE_TPA_END.
- Remove enum qede_agg_state since there is no need to maintain
aggregation state.
- Modify the segment chaining logic by tracking head and tail
TPA segments of each aggregation.
- Add more debug and comments.
- Mark the packet as PKT_RX_LRO.

Fixes: 29540be7efce ("net/qede: support LRO/TSO offloads")

Signed-off-by: Harish Patil 
---
 drivers/net/qede/qede_rxtx.c |  135 +++---
 drivers/net/qede/qede_rxtx.h |   11 +---
 2 files changed, 64 insertions(+), 82 deletions(-)

diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index 7623a01..ec045b0 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -514,14 +514,17 @@ void qede_dealloc_fp_resc(struct rte_eth_dev *eth_dev)
/* Enable LRO in split mode */
sge_tpa_params->tpa_ipv4_en_flg = enable;
sge_tpa_params->tpa_ipv6_en_flg = enable;
-   sge_tpa_params->tpa_ipv4_tunn_en_flg = enable;
-   sge_tpa_params->tpa_ipv6_tunn_en_flg = enable;
+   sge_tpa_params->tpa_ipv4_tunn_en_flg = false;
+   sge_tpa_params->tpa_ipv6_tunn_en_flg = false;
/* set if tpa enable changes */
sge_tpa_params->update_tpa_en_flg = 1;
/* set if tpa parameters should be handled */
sge_tpa_params->update_tpa_param_flg = enable;
 
sge_tpa_params->max_buffers_per_cqe = 20;
+   /* Enable TPA in split mode. In this mode each TPA segment
+* starts on the new BD, so there is one BD per segment.
+*/
sge_tpa_params->tpa_pkt_split_flg = 1;
sge_tpa_params->tpa_hdr_data_split_flg = 0;
sge_tpa_params->tpa_gro_consistent_flg = 0;
@@ -793,91 +796,71 @@ static inline uint32_t qede_rx_cqe_to_pkt_type(uint16_t 
flags)
 }
 
 static inline void
-qede_rx_process_tpa_cont_cqe(struct qede_dev *qdev,
-struct qede_rx_queue *rxq,
-struct eth_fast_path_rx_tpa_cont_cqe *cqe)
+qede_rx_process_tpa_cmn_cont_end_cqe(struct qede_dev *qdev,
+struct qede_rx_queue *rxq,
+uint8_t agg_index, uint16_t len)
 {
struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
struct qede_agg_info *tpa_info;
-   struct rte_mbuf *temp_frag; /* Pointer to mbuf chain head */
-   struct rte_mbuf *curr_frag;
-   uint8_t list_count = 0;
+   struct rte_mbuf *curr_frag; /* Pointer to currently filled TPA seg */
uint16_t cons_idx;
-   uint8_t i;
-
-   PMD_RX_LOG(INFO, rxq, "TPA cont[%02x] - len_list [%04x %04x]\n",
-  cqe->tpa_agg_index, rte_le_to_cpu_16(cqe->len_list[0]),
-  rte_le_to_cpu_16(cqe->len_list[1]));
 
-   tpa_info = &rxq->tpa_info[cqe->tpa_agg_index];
-   temp_frag = tpa_info->mbuf;
-   assert(temp_frag);
-
-   for (i = 0; cqe->len_list[i]; i++) {
+   /* Under certain conditions it is possible that FW may not consume
+* additional or new BD. So decision to consume the BD must be made
+* based on len_list[0].
+*/
+   if (rte_le_to_cpu_16(len)) {
+   tpa_info = &rxq->tpa_info[agg_index];
cons_idx = rxq->sw_rx_cons & NUM_RX_BDS(rxq);
curr_frag = rxq->sw_rx_ring[cons_idx].mbuf;
+   assert(curr_frag);
+   curr_frag->nb_segs = 1;
+   curr_frag->pkt_len = rte_le_to_cpu_16(len);
+   curr_frag->data_len = curr_frag->pkt_len;
+   tpa_info->tpa_tail->next = curr_frag;
+   tpa_info->tpa_tail = curr_frag;
qede_rx_bd_ring_consume(rxq);
-   curr_frag->data_len = rte_le_to_cpu_16(cqe->len_list[i]);
-   temp_frag->next = curr_frag;
-   temp_frag = curr_frag;
-   list_count++;
-   }
-
-   /* Allocate RX mbuf on the RX BD ring for those many consumed  */
-   for (i = 0 ; i < list_count ; i++) {
if (unlikely(qede_alloc_rx_buffer(rxq) != 0)) {
-   DP_ERR(edev, "Failed to allocate mbuf for LRO cont\n");
-   tpa_info->state = QEDE_AGG_STATE_ERROR;
+   PMD_RX_LOG(ERR, rxq, "mbuf allocation fails\n");
+   
rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++;
+   rxq->rx_alloc_errors++;
}
}
 }
 
 static inline void
+qede_rx_process_tpa_cont_cqe(struct qede_dev *qdev,
+struct qede_rx_queue *rxq,
+struct eth_fast_path_rx_tpa_cont_cqe *cqe)
+{
+   PMD_RX_LOG(INFO, rxq, "TPA cont[%d] - len [%d]\n",
+  cqe->tpa_agg_index, rte_le_to_cpu_16(cqe->len_list[0]));
+   /* only len_list[0] will have value */
+   qede_rx_process_tpa_cmn_cont_end_cqe(qdev, rxq, cqe->tpa_agg_index,
+   

[dpdk-dev] [PATCH 04/11] net/qede: fix coverity detected defects

[Rasesh Mody]

From: Harish Patil 

This defect is a functional issue where the RX CQE pointer remains
uninitialized in the LRO code path which can cause null pointer exception
while accessing VLAN or RSS hash value from CQE.

Fixes: 29540be7efce ("net/qede: support LRO/TSO offloads")
Coverity issue: 143474

Signed-off-by: Harish Patil 
---
 drivers/net/qede/qede_rxtx.c |   32 +++-
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index ec045b0..b180c0b 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -991,6 +991,7 @@ static inline uint32_t 
qede_rx_cqe_to_tunn_pkt_type(uint16_t flags)
uint8_t bitfield_val;
uint8_t offset, tpa_agg_idx, flags;
struct qede_agg_info *tpa_info;
+   uint32_t rss_hash;
 
hw_comp_cons = rte_le_to_cpu_16(*rxq->hw_cons_ptr);
sw_comp_cons = ecore_chain_get_cons_idx(&rxq->rx_comp_ring);
@@ -1005,6 +1006,7 @@ static inline uint32_t 
qede_rx_cqe_to_tunn_pkt_type(uint16_t flags)
packet_type = RTE_PTYPE_UNKNOWN;
vlan_tci = 0;
tpa_start_flg = false;
+   rss_hash = 0;
 
/* Get the CQE from the completion ring */
cqe =
@@ -1068,6 +1070,10 @@ static inline uint32_t 
qede_rx_cqe_to_tunn_pkt_type(uint16_t flags)
offset = fp_cqe->placement_offset;
len = rte_le_to_cpu_16(fp_cqe->len_on_first_bd);
pkt_len = rte_le_to_cpu_16(fp_cqe->pkt_len);
+   vlan_tci = rte_le_to_cpu_16(fp_cqe->vlan_tag);
+   rss_hash = rte_le_to_cpu_32(fp_cqe->rss_hash);
+   htype = (uint8_t)GET_FIELD(bitfield_val,
+   ETH_FAST_PATH_RX_REG_CQE_RSS_HASH_TYPE);
} else {
parse_flag =
rte_le_to_cpu_16(cqe_start_tpa->pars_flags.flags);
@@ -1075,6 +1081,10 @@ static inline uint32_t 
qede_rx_cqe_to_tunn_pkt_type(uint16_t flags)
offset = cqe_start_tpa->placement_offset;
/* seg_len = len_on_first_bd */
len = rte_le_to_cpu_16(cqe_start_tpa->len_on_first_bd);
+   vlan_tci = rte_le_to_cpu_16(cqe_start_tpa->vlan_tag);
+   htype = (uint8_t)GET_FIELD(bitfield_val,
+   ETH_FAST_PATH_RX_TPA_START_CQE_RSS_HASH_TYPE);
+   rss_hash = rte_le_to_cpu_32(cqe_start_tpa->rss_hash);
}
if (qede_tunn_exist(parse_flag)) {
PMD_RX_LOG(INFO, rxq, "Rx tunneled packet\n");
@@ -1121,24 +1131,18 @@ static inline uint32_t 
qede_rx_cqe_to_tunn_pkt_type(uint16_t flags)
}
 
if (CQE_HAS_VLAN(parse_flag)) {
-   vlan_tci = rte_le_to_cpu_16(fp_cqe->vlan_tag);
ol_flags |= PKT_RX_VLAN_PKT;
+   rx_mb->vlan_tci = vlan_tci;
}
-
if (CQE_HAS_OUTER_VLAN(parse_flag)) {
-   vlan_tci = rte_le_to_cpu_16(fp_cqe->vlan_tag);
ol_flags |= PKT_RX_QINQ_PKT;
+   rx_mb->vlan_tci = vlan_tci;
rx_mb->vlan_tci_outer = 0;
}
-
/* RSS Hash */
-   htype = (uint8_t)GET_FIELD(bitfield_val,
-   ETH_FAST_PATH_RX_REG_CQE_RSS_HASH_TYPE);
-   if (qdev->rss_enable && htype) {
+   if (qdev->rss_enable) {
ol_flags |= PKT_RX_RSS_HASH;
-   rx_mb->hash.rss = rte_le_to_cpu_32(fp_cqe->rss_hash);
-   PMD_RX_LOG(INFO, rxq, "Hash result 0x%x\n",
-  rx_mb->hash.rss);
+   rx_mb->hash.rss = rss_hash;
}
 
if (unlikely(qede_alloc_rx_buffer(rxq) != 0)) {
@@ -1185,10 +1189,12 @@ static inline uint32_t 
qede_rx_cqe_to_tunn_pkt_type(uint16_t flags)
rx_mb->port = rxq->port_id;
rx_mb->ol_flags = ol_flags;
rx_mb->data_len = len;
-   rx_mb->vlan_tci = vlan_tci;
rx_mb->packet_type = packet_type;
-   PMD_RX_LOG(INFO, rxq, "pkt_type %04x len %04x flags %04lx\n",
-  packet_type, len, (unsigned long)ol_flags);
+   PMD_RX_LOG(INFO, rxq,
+  "pkt_type 0x%04x len %u hash_type %d hash_val 0x%x"
+  " ol_flags 0x%04lx\n",
+  packet_type, len, htype, rx_mb->hash.rss,
+  (unsigned long)ol_flags);
if (!tpa_start_flg) {
rx_mb->nb_segs = fp_cqe->bd_num;
rx_mb->pkt_len = pkt_len;
-- 
1.7.10.3

[dpdk-dev] [PATCH 05/11] net/qede: use new stripped VLAN mbuf flags

[Rasesh Mody]

From: Harish Patil 

Use new mbuf flags PKT_RX_VLAN_STRIPPED and PKT_RX_QINQ_STRIPPED
introduced by the patch:
commit b37b528d957c ("mbuf: add new Rx flags for stripped VLAN")

Signed-off-by: Harish Patil 
---
 drivers/net/qede/qede_ethdev.c |1 +
 drivers/net/qede/qede_ethdev.h |1 +
 drivers/net/qede/qede_rxtx.c   |   10 --
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c
index b31a7df..fdb6bb1 100644
--- a/drivers/net/qede/qede_ethdev.c
+++ b/drivers/net/qede/qede_ethdev.c
@@ -604,6 +604,7 @@ static int qede_vlan_stripping(struct rte_eth_dev *eth_dev, 
bool set_stripping)
DP_ERR(edev, "Update V-PORT failed %d\n", rc);
return rc;
}
+   qdev->vlan_strip_flg = set_stripping;
 
return 0;
 }
diff --git a/drivers/net/qede/qede_ethdev.h b/drivers/net/qede/qede_ethdev.h
index f5549c2..6d5e616 100644
--- a/drivers/net/qede/qede_ethdev.h
+++ b/drivers/net/qede/qede_ethdev.h
@@ -211,6 +211,7 @@ struct qede_dev {
uint16_t num_tunn_filters;
uint16_t vxlan_filter_type;
struct qede_fdir_info fdir_info;
+   bool vlan_strip_flg;
char drv_ver[QEDE_PMD_DRV_VER_STR_SIZE];
 };
 
diff --git a/drivers/net/qede/qede_rxtx.c b/drivers/net/qede/qede_rxtx.c
index b180c0b..191d8af 100644
--- a/drivers/net/qede/qede_rxtx.c
+++ b/drivers/net/qede/qede_rxtx.c
@@ -1132,11 +1132,17 @@ static inline uint32_t 
qede_rx_cqe_to_tunn_pkt_type(uint16_t flags)
 
if (CQE_HAS_VLAN(parse_flag)) {
ol_flags |= PKT_RX_VLAN_PKT;
-   rx_mb->vlan_tci = vlan_tci;
+   if (qdev->vlan_strip_flg) {
+   ol_flags |= PKT_RX_VLAN_STRIPPED;
+   rx_mb->vlan_tci = vlan_tci;
+   }
}
if (CQE_HAS_OUTER_VLAN(parse_flag)) {
ol_flags |= PKT_RX_QINQ_PKT;
-   rx_mb->vlan_tci = vlan_tci;
+   if (qdev->vlan_strip_flg) {
+   rx_mb->vlan_tci = vlan_tci;
+   ol_flags |= PKT_RX_QINQ_STRIPPED;
+   }
rx_mb->vlan_tci_outer = 0;
}
/* RSS Hash */
-- 
1.7.10.3

[dpdk-dev] [PATCH 09/11] net/qede/base: fix macro ecore mfw set field

[Rasesh Mody]

Fix ECORE_MFW_SET_FIELD macro

Coverity issue: 1423907
Coverity issue: 1423908
Fixes: 0b6bf70d7ee3 ("net/qede/base: support previous driver unload")

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore.h  |2 +-
 drivers/net/qede/base/mcp_public.h |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index 31470b6..63cbc38 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -104,7 +104,7 @@ enum ecore_nvm_cmd {
 
 #define ECORE_MFW_SET_FIELD(name, field, value)
\
 do {   \
-   (name) &= ~((field ## _MASK) << (field ## _SHIFT)); \
+   (name) &= ~(field ## _MASK);\
(name) |= (((value) << (field ## _SHIFT)) & (field ## _MASK));  \
 } while (0)
 
diff --git a/drivers/net/qede/base/mcp_public.h 
b/drivers/net/qede/base/mcp_public.h
index 8d65390..fcf9847 100644
--- a/drivers/net/qede/base/mcp_public.h
+++ b/drivers/net/qede/base/mcp_public.h
@@ -1056,16 +1056,16 @@ struct load_req_stc {
 #define LOAD_REQ_ROLE_MASK 0x00FF
 #define LOAD_REQ_ROLE_SHIFT0
 #define LOAD_REQ_LOCK_TO_MASK  0xFF00
-#define LOAD_REQ_LOCK_TO_SHIFT 0 /* @DPDK */
+#define LOAD_REQ_LOCK_TO_SHIFT 8
 #define LOAD_REQ_LOCK_TO_DEFAULT   0
 #define LOAD_REQ_LOCK_TO_NONE  255
 #define LOAD_REQ_FORCE_MASK0x000F
-#define LOAD_REQ_FORCE_SHIFT   0 /* @DPDK */
+#define LOAD_REQ_FORCE_SHIFT   16
 #define LOAD_REQ_FORCE_NONE0
 #define LOAD_REQ_FORCE_PF  1
 #define LOAD_REQ_FORCE_ALL 2
 #define LOAD_REQ_FLAGS0_MASK   0x00F0
-#define LOAD_REQ_FLAGS0_SHIFT  0 /* @DPDK */
+#define LOAD_REQ_FLAGS0_SHIFT  20
 #define LOAD_REQ_FLAGS0_AVOID_RESET(0x1 << 0)
 };
 
-- 
1.7.10.3

[dpdk-dev] [PATCH 07/11] net/qede: fix FW version string display for SRIOV

[Rasesh Mody]

In SRIOV testing, print adapter info shows firmware version used by PF,
this patch provides fix to populate correct firmware version used by VF.

Fixes: 86a2265e59d7 ("qede: add SRIOV support")
Cc: sta...@dpdk.org

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/qede_main.c |   13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/net/qede/qede_main.c b/drivers/net/qede/qede_main.c
index 307b33a..d7847d1 100644
--- a/drivers/net/qede/qede_main.c
+++ b/drivers/net/qede/qede_main.c
@@ -359,11 +359,12 @@ static int qed_slowpath_start(struct ecore_dev *edev,
rte_memcpy(&dev_info->hw_mac, &edev->hwfns[0].hw_info.hw_mac_addr,
   ETHER_ADDR_LEN);
 
+   dev_info->fw_major = FW_MAJOR_VERSION;
+   dev_info->fw_minor = FW_MINOR_VERSION;
+   dev_info->fw_rev = FW_REVISION_VERSION;
+   dev_info->fw_eng = FW_ENGINEERING_VERSION;
+
if (IS_PF(edev)) {
-   dev_info->fw_major = FW_MAJOR_VERSION;
-   dev_info->fw_minor = FW_MINOR_VERSION;
-   dev_info->fw_rev = FW_REVISION_VERSION;
-   dev_info->fw_eng = FW_ENGINEERING_VERSION;
dev_info->mf_mode = edev->mf_mode;
dev_info->tx_switching = false;
 
@@ -384,10 +385,6 @@ static int qed_slowpath_start(struct ecore_dev *edev,
ecore_ptt_release(ECORE_LEADING_HWFN(edev), ptt);
}
} else {
-   ecore_vf_get_fw_version(&edev->hwfns[0], &dev_info->fw_major,
-   &dev_info->fw_minor, &dev_info->fw_rev,
-   &dev_info->fw_eng);
-
ecore_mcp_get_mfw_ver(ECORE_LEADING_HWFN(edev), ptt,
  &dev_info->mfw_rev, NULL);
}
-- 
1.7.10.3

[dpdk-dev] [PATCH 08/11] net/qede/base: fix coverity issues

[Rasesh Mody]

Remove unused code to address coverity issues and
address a code flow issue.

Coverity issue: 1379468
Coverity issue: 1379521
Coverity issue: 1379522
Coverity issue: 1379523
Coverity issue: 1423918
Fixes: 86a2265e59d7 ("qede: add SRIOV support")
Fixes: ec94dbc57362 ("qede: add base driver")
Fixes: 2ea6f76aff40 ("qede: add core driver")
Fixes: 29540be7efce ("net/qede: support LRO/TSO offloads")
Cc: sta...@dpdk.org

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/ecore_cxt.c |   90 -
 drivers/net/qede/base/ecore_cxt.h |4 --
 drivers/net/qede/base/ecore_cxt_api.h |   11 
 drivers/net/qede/base/ecore_iov_api.h |   11 
 drivers/net/qede/base/ecore_sriov.c   |   24 -
 drivers/net/qede/qede_main.c  |   10 +++-
 drivers/net/qede/qede_rxtx.c  |1 -
 7 files changed, 8 insertions(+), 143 deletions(-)

diff --git a/drivers/net/qede/base/ecore_cxt.c 
b/drivers/net/qede/base/ecore_cxt.c
index 80ad102..688118b 100644
--- a/drivers/net/qede/base/ecore_cxt.c
+++ b/drivers/net/qede/base/ecore_cxt.c
@@ -2014,47 +2014,6 @@ enum _ecore_status_t ecore_cxt_set_pf_params(struct 
ecore_hwfn *p_hwfn)
return ECORE_SUCCESS;
 }
 
-enum _ecore_status_t ecore_cxt_get_tid_mem_info(struct ecore_hwfn *p_hwfn,
-   struct ecore_tid_mem *p_info)
-{
-   struct ecore_cxt_mngr *p_mngr = p_hwfn->p_cxt_mngr;
-   u32 proto, seg, total_lines, i, shadow_line;
-   struct ecore_ilt_client_cfg *p_cli;
-   struct ecore_ilt_cli_blk *p_fl_seg;
-   struct ecore_tid_seg *p_seg_info;
-
-   /* Verify the personality */
-   switch (p_hwfn->hw_info.personality) {
-   default:
-   return ECORE_INVAL;
-   }
-
-   p_cli = &p_mngr->clients[ILT_CLI_CDUT];
-   if (!p_cli->active)
-   return ECORE_INVAL;
-
-   p_seg_info = &p_mngr->conn_cfg[proto].tid_seg[seg];
-   if (!p_seg_info->has_fl_mem)
-   return ECORE_INVAL;
-
-   p_fl_seg = &p_cli->pf_blks[CDUT_FL_SEG_BLK(seg, PF)];
-   total_lines = DIV_ROUND_UP(p_fl_seg->total_size,
-  p_fl_seg->real_size_in_page);
-
-   for (i = 0; i < total_lines; i++) {
-   shadow_line = i + p_fl_seg->start_line -
-   p_hwfn->p_cxt_mngr->pf_start_line;
-   p_info->blocks[i] = p_mngr->ilt_shadow[shadow_line].p_virt;
-   }
-   p_info->waste = ILT_PAGE_IN_BYTES(p_cli->p_size.val) -
-   p_fl_seg->real_size_in_page;
-   p_info->tid_size = p_mngr->task_type_size[p_seg_info->type];
-   p_info->num_tids_per_block = p_fl_seg->real_size_in_page /
-   p_info->tid_size;
-
-   return ECORE_SUCCESS;
-}
-
 /* This function is very RoCE oriented, if another protocol in the future
  * will want this feature we'll need to modify the function to be more generic
  */
@@ -2292,52 +2251,3 @@ enum _ecore_status_t ecore_cxt_free_proto_ilt(struct 
ecore_hwfn *p_hwfn,
 
return rc;
 }
-
-enum _ecore_status_t ecore_cxt_get_task_ctx(struct ecore_hwfn *p_hwfn,
-   u32 tid,
-   u8 ctx_type, void **pp_task_ctx)
-{
-   struct ecore_cxt_mngr *p_mngr = p_hwfn->p_cxt_mngr;
-   struct ecore_ilt_client_cfg *p_cli;
-   struct ecore_ilt_cli_blk *p_seg;
-   struct ecore_tid_seg *p_seg_info;
-   u32 proto, seg;
-   u32 total_lines;
-   u32 tid_size, ilt_idx;
-   u32 num_tids_per_block;
-
-   /* Verify the personality */
-   switch (p_hwfn->hw_info.personality) {
-   default:
-   return ECORE_INVAL;
-   }
-
-   p_cli = &p_mngr->clients[ILT_CLI_CDUT];
-   if (!p_cli->active)
-   return ECORE_INVAL;
-
-   p_seg_info = &p_mngr->conn_cfg[proto].tid_seg[seg];
-
-   if (ctx_type == ECORE_CTX_WORKING_MEM) {
-   p_seg = &p_cli->pf_blks[CDUT_SEG_BLK(seg)];
-   } else if (ctx_type == ECORE_CTX_FL_MEM) {
-   if (!p_seg_info->has_fl_mem)
-   return ECORE_INVAL;
-   p_seg = &p_cli->pf_blks[CDUT_FL_SEG_BLK(seg, PF)];
-   } else {
-   return ECORE_INVAL;
-   }
-   total_lines = DIV_ROUND_UP(p_seg->total_size, p_seg->real_size_in_page);
-   tid_size = p_mngr->task_type_size[p_seg_info->type];
-   num_tids_per_block = p_seg->real_size_in_page / tid_size;
-
-   if (total_lines < tid / num_tids_per_block)
-   return ECORE_INVAL;
-
-   ilt_idx = tid / num_tids_per_block + p_seg->start_line -
-   p_mngr->pf_start_line;
-   *pp_task_ctx = (u8 *)p_mngr->ilt_shadow[ilt_idx].p_virt +
-   (tid % num_tids_per_block) * tid_size;
-
-   return ECORE_SUCCESS;
-}
diff --git a/drivers/net/qede/base/ecore_cxt.h 
b/drivers/net/qede/base/ecore_cxt.h
index e678118..6ff823a 100644
--- a/drivers/net/qede/base/ecore_cxt.h
+++ b/drivers/net/qede/base/ecore_cxt.h
@@ -197,9 +

[dpdk-dev] [PATCH 06/11] net/qede: remove IPV4/IPV6 as valid ntuple flows

[Rasesh Mody]

From: Harish Patil 

Firmware supports ntuple configuration which is always based on 4-tuples.
So remove RTE_ETH_FLOW_FRAG_IPV4 and RTE_ETH_FLOW_FRAG_IPV6 as valid flows.
Also merge the two switch statements into one.

Fixes: 622075356e8f ("net/qede: support ntuple and flow director filter")

Signed-off-by: Harish Patil 
---
 drivers/net/qede/qede_fdir.c |   93 +++---
 1 file changed, 41 insertions(+), 52 deletions(-)

diff --git a/drivers/net/qede/qede_fdir.c b/drivers/net/qede/qede_fdir.c
index f0dc73a..18fb8d6 100644
--- a/drivers/net/qede/qede_fdir.c
+++ b/drivers/net/qede/qede_fdir.c
@@ -31,10 +31,8 @@
 #endif
 
 #define QEDE_VALID_FLOW(flow_type) \
-   ((flow_type) == RTE_ETH_FLOW_FRAG_IPV4  || \
-   (flow_type) == RTE_ETH_FLOW_NONFRAG_IPV4_TCP|| \
+   ((flow_type) == RTE_ETH_FLOW_NONFRAG_IPV4_TCP   || \
(flow_type) == RTE_ETH_FLOW_NONFRAG_IPV4_UDP|| \
-   (flow_type) == RTE_ETH_FLOW_FRAG_IPV6   || \
(flow_type) == RTE_ETH_FLOW_NONFRAG_IPV6_TCP|| \
(flow_type) == RTE_ETH_FLOW_NONFRAG_IPV6_UDP)
 
@@ -274,10 +272,8 @@ void qede_fdir_dealloc_resc(struct rte_eth_dev *eth_dev)
uint8_t size, dst = 0;
uint16_t len;
static const uint8_t next_proto[] = {
-   [RTE_ETH_FLOW_FRAG_IPV4] = IPPROTO_IP,
[RTE_ETH_FLOW_NONFRAG_IPV4_TCP] = IPPROTO_TCP,
[RTE_ETH_FLOW_NONFRAG_IPV4_UDP] = IPPROTO_UDP,
-   [RTE_ETH_FLOW_FRAG_IPV6] = IPPROTO_NONE,
[RTE_ETH_FLOW_NONFRAG_IPV6_TCP] = IPPROTO_TCP,
[RTE_ETH_FLOW_NONFRAG_IPV6_UDP] = IPPROTO_UDP,
};
@@ -300,11 +296,10 @@ void qede_fdir_dealloc_resc(struct rte_eth_dev *eth_dev)
raw_pkt += sizeof(uint16_t);
len += sizeof(uint16_t);
 
-   /* fill the common ip header */
switch (input->flow_type) {
case RTE_ETH_FLOW_NONFRAG_IPV4_TCP:
case RTE_ETH_FLOW_NONFRAG_IPV4_UDP:
-   case RTE_ETH_FLOW_FRAG_IPV4:
+   /* fill the common ip header */
ip = (struct ipv4_hdr *)raw_pkt;
*ether_type = rte_cpu_to_be_16(ETHER_TYPE_IPv4);
ip->version_ihl = QEDE_FDIR_IP_DEFAULT_VERSION_IHL;
@@ -320,10 +315,31 @@ void qede_fdir_dealloc_resc(struct rte_eth_dev *eth_dev)
ip->src_addr = input->flow.ip4_flow.src_ip;
len += sizeof(struct ipv4_hdr);
params->ipv4 = true;
+
+   raw_pkt = (uint8_t *)buff;
+   /* UDP */
+   if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV4_UDP) {
+   udp = (struct udp_hdr *)(raw_pkt + len);
+   udp->dst_port = input->flow.udp4_flow.dst_port;
+   udp->src_port = input->flow.udp4_flow.src_port;
+   udp->dgram_len = sizeof(struct udp_hdr);
+   len += sizeof(struct udp_hdr);
+   /* adjust ip total_length */
+   ip->total_length += sizeof(struct udp_hdr);
+   params->udp = true;
+   } else { /* TCP */
+   tcp = (struct tcp_hdr *)(raw_pkt + len);
+   tcp->src_port = input->flow.tcp4_flow.src_port;
+   tcp->dst_port = input->flow.tcp4_flow.dst_port;
+   tcp->data_off = QEDE_FDIR_TCP_DEFAULT_DATAOFF;
+   len += sizeof(struct tcp_hdr);
+   /* adjust ip total_length */
+   ip->total_length += sizeof(struct tcp_hdr);
+   params->tcp = true;
+   }
break;
case RTE_ETH_FLOW_NONFRAG_IPV6_TCP:
case RTE_ETH_FLOW_NONFRAG_IPV6_UDP:
-   case RTE_ETH_FLOW_FRAG_IPV6:
ip6 = (struct ipv6_hdr *)raw_pkt;
*ether_type = rte_cpu_to_be_16(ETHER_TYPE_IPv6);
ip6->proto = input->flow.ipv6_flow.proto ?
@@ -334,6 +350,23 @@ void qede_fdir_dealloc_resc(struct rte_eth_dev *eth_dev)
rte_memcpy(&ip6->dst_addr, &input->flow.ipv6_flow.src_ip,
   IPV6_ADDR_LEN);
len += sizeof(struct ipv6_hdr);
+
+   raw_pkt = (uint8_t *)buff;
+   /* UDP */
+   if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_UDP) {
+   udp = (struct udp_hdr *)(raw_pkt + len);
+   udp->src_port = input->flow.udp6_flow.dst_port;
+   udp->dst_port = input->flow.udp6_flow.src_port;
+   len += sizeof(struct udp_hdr);
+   params->udp = true;
+   } else { /* TCP */
+   tcp = (struct tcp_hdr *)(raw_pkt + len);
+   tcp->src_port = input->flow.tcp4_flow.src_port;
+   tcp->dst_port = input->flow.tcp4_flow.dst_port;
+   tcp->data_off = QEDE_FDIR_TCP_DEFAULT_DATAOF

[dpdk-dev] [PATCH 10/11] net/qede/base: fix find zero bit macro

[Rasesh Mody]

Use appropriate operater for if condition

Coverity issue: 1379399
Coverity issue: 1379404
Fixes: ec94dbc57362 ("qede: add base driver")
Cc: sta...@dpdk.org

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/base/bcm_osal.c |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/qede/base/bcm_osal.c b/drivers/net/qede/base/bcm_osal.c
index 28be958..3f895cd 100644
--- a/drivers/net/qede/base/bcm_osal.c
+++ b/drivers/net/qede/base/bcm_osal.c
@@ -98,9 +98,7 @@ inline u32 qede_find_first_zero_bit(unsigned long *addr, u32 
limit)
u32 nwords = 0;
OSAL_BUILD_BUG_ON(!limit);
nwords = (limit - 1) / OSAL_BITS_PER_UL + 1;
-   for (i = 0; i < nwords; i++)
-   if (~(addr[i] != 0))
-   break;
+   for (i = 0; i < nwords && ~(addr[i]) == 0; i++);
return (i == nwords) ? limit : i * OSAL_BITS_PER_UL + qede_ffz(addr[i]);
 }
 
-- 
1.7.10.3

[dpdk-dev] [PATCH 11/11] net/qede: fix to limit CFLAGS to base files

[Rasesh Mody]

From: Rasesh Mody 

Changes included in this fix
 - limit CFLAGS to base files
 - fix to remove/mark unused members
 - add checks for debug config option
 - make qede_set_mtu() and qede_udp_dst_port_del() static and others
   non-static as appropriate
 - move local APIs qede_vlan_offload_set() and qede_rx_cqe_to_pkt_type()
 - initialize variables as required

Fixes: ec94dbc57362 ("qede: add base driver")
Cc: sta...@dpdk.org

Signed-off-by: Rasesh Mody 
---
 drivers/net/qede/Makefile |   32 -
 drivers/net/qede/base/ecore.h |4 +-
 drivers/net/qede/base/ecore_int_api.h |4 +-
 drivers/net/qede/qede_ethdev.c|  120 ++---
 drivers/net/qede/qede_ethdev.h|   32 -
 drivers/net/qede/qede_fdir.c  |   13 +---
 drivers/net/qede/qede_if.h|4 ++
 drivers/net/qede/qede_main.c  |8 +--
 drivers/net/qede/qede_rxtx.c  |  118 +---
 9 files changed, 171 insertions(+), 164 deletions(-)

diff --git a/drivers/net/qede/Makefile b/drivers/net/qede/Makefile
index da7968f..8acef00 100644
--- a/drivers/net/qede/Makefile
+++ b/drivers/net/qede/Makefile
@@ -76,25 +76,27 @@ endif
 #
 #
 BASE_DRIVER_OBJS=$(patsubst %.c,%.o,$(notdir $(wildcard $(SRCDIR)/base/*.c)))
-$(foreach obj, $(BASE_DRIVER_OBJS), $(eval CFLAGS+=$(CFLAGS_BASE_DRIVER)))
+$(foreach obj, $(BASE_DRIVER_OBJS), $(eval 
CFLAGS_$(obj)+=$(CFLAGS_BASE_DRIVER)))
+
+VPATH += $(SRCDIR)/base
 
 #
 # all source are stored in SRCS-y
 #
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_dev.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_hw.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_cxt.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_l2.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_sp_commands.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_init_fw_funcs.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_spq.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_init_ops.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_mcp.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_int.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_dcbx.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/bcm_osal.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_sriov.c
-SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += base/ecore_vf.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_dev.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_hw.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_cxt.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_l2.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_sp_commands.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_init_fw_funcs.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_spq.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_init_ops.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_mcp.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_int.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_dcbx.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += bcm_osal.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_sriov.c
+SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += ecore_vf.c
 SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_ethdev.c
 SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_eth_if.c
 SRCS-$(CONFIG_RTE_LIBRTE_QEDE_PMD) += qede_main.c
diff --git a/drivers/net/qede/base/ecore.h b/drivers/net/qede/base/ecore.h
index 63cbc38..80b11a4 100644
--- a/drivers/net/qede/base/ecore.h
+++ b/drivers/net/qede/base/ecore.h
@@ -808,8 +808,8 @@ struct ecore_dev {
  *
  * @return OSAL_INLINE u8
  */
-static OSAL_INLINE u8 ecore_concrete_to_sw_fid(struct ecore_dev *p_dev,
- u32 concrete_fid)
+static OSAL_INLINE u8
+ecore_concrete_to_sw_fid(__rte_unused struct ecore_dev *p_dev, u32 
concrete_fid)
 {
u8 vfid = GET_FIELD(concrete_fid, PXP_CONCRETE_FID_VFID);
u8 pfid = GET_FIELD(concrete_fid, PXP_CONCRETE_FID_PFID);
diff --git a/drivers/net/qede/base/ecore_int_api.h 
b/drivers/net/qede/base/ecore_int_api.h
index fdfcba8..799fbe8 100644
--- a/drivers/net/qede/base/ecore_int_api.h
+++ b/drivers/net/qede/base/ecore_int_api.h
@@ -114,7 +114,7 @@ static OSAL_INLINE void __internal_ram_wr(struct ecore_hwfn 
*p_hwfn,
  void OSAL_IOMEM *addr,
  int size, u32 *data)
 #else
-static OSAL_INLINE void __internal_ram_wr(void *p_hwfn,
+static OSAL_INLINE void __internal_ram_wr(__rte_unused void *p_hwfn,
  void OSAL_IOMEM *addr,
  int size, u32 *data)
 #endif
@@ -130,7 +130,7 @@ static OSAL_INLINE void __internal_ram_wr_relaxed(struct 
ecore_hwfn *p_hwfn,
  void OSAL_IOMEM * addr,
  int size, u32 *data)
 #else
-static OSAL_INLINE void __internal_ram_wr_relaxed(void *p_hwfn,
+static OSAL_INLINE void __internal_ram_wr_relaxed(__rte_unused void *p_hwfn,
  

Re: [dpdk-dev] [RFC PATCH 1/2] ethdev: add function to adjust number of descriptors

[Andrew Rybchenko]

Hi,

On 04/24/2017 06:13 PM, Thomas Monjalon wrote:

Hi,

02/03/2017 14:05, Andrew Rybchenko:

From: Roman Zhukov 

Check that numbers of Rx and Tx descriptors satisfy descriptors limits
from the Ethernet device information, otherwise adjust them to boundaries.

Signed-off-by: Roman Zhukov 
Signed-off-by: Andrew Rybchenko 

I think this helper is OK.
We could add it in 17.08.


Thanks, we'll prepare patch series which updates alll example 
applications to use the helper.


Andrew.


Is there any comment from PMD maintainers?

[...]

+static void
+rte_eth_dev_adjust_nb_desc(uint16_t *nb_desc,
+  const struct rte_eth_desc_lim *desc_lim)
+{
+   if (desc_lim->nb_align != 0)
+   *nb_desc = RTE_ALIGN_CEIL(*nb_desc, desc_lim->nb_align);
+
+   if (desc_lim->nb_max != 0)
+   *nb_desc = RTE_MIN(*nb_desc, desc_lim->nb_max);
+
+   *nb_desc = RTE_MAX(*nb_desc, desc_lim->nb_min);
+}
+
+int
+rte_eth_dev_adjust_nb_rx_tx_desc(uint8_t port_id,
+uint16_t *nb_rx_desc,
+uint16_t *nb_tx_desc)
+{
+   struct rte_eth_dev *dev;
+   struct rte_eth_dev_info dev_info;
+
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+
+   dev = &rte_eth_devices[port_id];
+   RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->dev_infos_get, -ENOTSUP);
+
+   rte_eth_dev_info_get(port_id, &dev_info);
+
+   if (nb_rx_desc != NULL)
+   rte_eth_dev_adjust_nb_desc(nb_rx_desc, &dev_info.rx_desc_lim);
+
+   if (nb_tx_desc != NULL)
+   rte_eth_dev_adjust_nb_desc(nb_tx_desc, &dev_info.tx_desc_lim);
+
+   return 0;
+}

[...]

+/**
+ * Check that numbers of Rx and Tx descriptors satisfy descriptors limits from
+ * the ethernet device information, otherwise adjust them to boundaries.
+ *
+ * @param port_id
+ *   The port identifier of the Ethernet device.
+ * @param nb_rx_desc
+ *   A pointer to a uint16_t where the number of receive
+ *   descriptors stored.
+ * @param nb_tx_desc
+ *   A pointer to a uint16_t where the number of transmit
+ *   descriptors stored.
+ * @return
+ *   - (0) if successful.
+ *   - (-ENOTSUP, -ENODEV or -EINVAL) on failure.
+ */
+int rte_eth_dev_adjust_nb_rx_tx_desc(uint8_t port_id,
+uint16_t *nb_rx_desc,
+uint16_t *nb_tx_desc);
+

[dpdk-dev] [PATCH] net/mlx5: fix ipv6 flow pattern item

[Nelio Laranjeiro]

Only masked bits must be set in Verbs specification for a rule to be valid.

Fixes: 2097d0d1e2cc ("net/mlx5: support basic flow items and actions")

Signed-off-by: Nelio Laranjeiro 
Acked-by: Adrien Mazarguil 
---
 drivers/net/mlx5/mlx5_flow.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 1784e64..cd3e5da 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -778,6 +778,7 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item,
struct mlx5_flow *flow = (struct mlx5_flow *)data;
struct ibv_exp_flow_spec_ipv6_ext *ipv6;
unsigned int ipv6_size = sizeof(struct ibv_exp_flow_spec_ipv6_ext);
+   unsigned int i;
 
++flow->ibv_attr->num_of_specs;
flow->ibv_attr->priority = 1;
@@ -803,6 +804,11 @@ mlx5_flow_create_ipv6(const struct rte_flow_item *item,
ipv6->mask.flow_label = mask->hdr.vtc_flow;
ipv6->mask.next_hdr = mask->hdr.proto;
ipv6->mask.hop_limit = mask->hdr.hop_limits;
+   /* Remove unwanted bits from values. */
+   for (i = 0; i < RTE_DIM(ipv6->val.src_ip); ++i) {
+   ipv6->val.src_ip[i] &= ipv6->mask.src_ip[i];
+   ipv6->val.dst_ip[i] &= ipv6->mask.dst_ip[i];
+   }
ipv6->val.flow_label &= ipv6->mask.flow_label;
ipv6->val.next_hdr &= ipv6->mask.next_hdr;
ipv6->val.hop_limit &= ipv6->mask.hop_limit;
-- 
2.1.4

[dpdk-dev] [PATCH v2 00/13] Fixes for exported headers

[Adrien Mazarguil]

This series addresses the remaining issues seen by check-includes.sh in
exported headers. Most of them may cause compilation errors in user
applications:

- Dependencies on missing includes.
- Non-standard C/C++ constructs usage without associated safeties.
- Missing C++ awareness blocks.

It also addresses the incomplete implementation of E-Tag and NVGRE flow API
pattern items.

Changes in v2:

- Fixed (still) incomplete E-tag and NVGRE flow API documentation.
- Renamed E-Tag item parameter "ecid_b" to "grp_ecid_b" in testpmd, to
  reflect that both fields are set at once.
- Fixed remaining compilation issue with RTE_LIBRTE_EVENTDEV_DEBUG.
- Fixed avp include to avoid kernel module compilation issue pointed out
  by Allain.

Adrien Mazarguil (13):
  crypto/scheduler: fix missing includes
  eventdev: fix errors with strict compilation flags
  latency: fix missing includes in exported header
  net: fix missing include in exported header
  vhost: fix errors with strict compilation flags
  mbuf: fix missing includes in exported header
  net/avp: fix errors in exported headers
  bitrate: fix errors in exported header
  efd: fix missing include in exported header
  metrics: fix errors in exported header
  ethdev: fix C++ errors in flow API
  ethdev: fix C++ errors in flow API (MPLS, GRE)
  ethdev: fix incomplete items in flow API

 app/test-pmd/cmdline_flow.c | 46 ++
 devtools/check-includes.sh  |  4 +-
 doc/guides/prog_guide/rte_flow.rst  | 26 ++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  8 +++
 .../crypto/scheduler/rte_cryptodev_scheduler.h  |  1 +
 .../rte_cryptodev_scheduler_operations.h|  1 +
 drivers/net/avp/rte_avp_common.h| 17 ++-
 drivers/net/avp/rte_avp_fifo.h  | 12 +
 lib/librte_bitratestats/rte_bitrate.h   | 10 
 lib/librte_efd/rte_efd.h|  2 +
 lib/librte_ether/rte_flow.h | 51 
 lib/librte_eventdev/rte_eventdev.h  |  3 +-
 lib/librte_eventdev/rte_eventdev_pmd.h  | 24 -
 lib/librte_latencystats/rte_latencystats.h  |  2 +
 lib/librte_mbuf/rte_mbuf_ptype.h|  3 ++
 lib/librte_metrics/rte_metrics.h| 10 
 lib/librte_net/rte_net_crc.h|  2 +
 lib/librte_vhost/rte_vhost.h| 16 --
 18 files changed, 217 insertions(+), 21 deletions(-)

-- 
2.1.4

[dpdk-dev] [PATCH v2 01/13] crypto/scheduler: fix missing includes

[Adrien Mazarguil]

This commit addresses the following compilation errors:

 In file included from build/include/rte_cryptodev_scheduler.h:37:0,
  from /tmp/check-includes.sh.5355.c:1:
 build/include/rte_cryptodev_scheduler_operations.h:43:30: error: unknown
type name 'uint8_t' struct rte_cryptodev *dev, uint8_t slave_id);
 [...]

Fixes: 097ab0bac017 ("crypto/scheduler: add API")

Cc: Fan Zhang 
Signed-off-by: Adrien Mazarguil 
---
 drivers/crypto/scheduler/rte_cryptodev_scheduler.h| 1 +
 drivers/crypto/scheduler/rte_cryptodev_scheduler_operations.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler.h 
b/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
index 7a34d0a..2ba6e47 100644
--- a/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
+++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler.h
@@ -46,6 +46,7 @@
  * operation: round robin, packet-size based, and fail-over.
  */
 
+#include 
 #include "rte_cryptodev_scheduler_operations.h"
 
 #ifdef __cplusplus
diff --git a/drivers/crypto/scheduler/rte_cryptodev_scheduler_operations.h 
b/drivers/crypto/scheduler/rte_cryptodev_scheduler_operations.h
index 42fe9e6..719165c 100644
--- a/drivers/crypto/scheduler/rte_cryptodev_scheduler_operations.h
+++ b/drivers/crypto/scheduler/rte_cryptodev_scheduler_operations.h
@@ -34,6 +34,7 @@
 #ifndef _RTE_CRYPTO_SCHEDULER_OPERATIONS_H
 #define _RTE_CRYPTO_SCHEDULER_OPERATIONS_H
 
+#include 
 
 #ifdef __cplusplus
 extern "C" {
-- 
2.1.4

[dpdk-dev] [PATCH v2 02/13] eventdev: fix errors with strict compilation flags

[Adrien Mazarguil]

Exported headers must allow compilation with the strictest flags. This
commit addresses the following errors:

 In file included from build/include/rte_eventdev_pmd.h:55:0,
  from /tmp/check-includes.sh.25816.c:1:
 build/include/rte_eventdev.h:908:8: error: struct has no named members
[-Werror=pedantic]
 [...]
 In file included from /tmp/check-includes.sh.25816.c:1:0:
 build/include/rte_eventdev_pmd.h:65:35: error: ISO C does not permit named
variadic macros [-Werror=variadic-macros]
 [...]

Also enabling RTE_LIBRTE_EVENTDEV_DEBUG causes redefinitions:

 In file included from /tmp/check-includes.sh.18921.c:27:0:
build/include/rte_eventdev_pmd.h:58:0: error: "RTE_PMD_DEBUG_TRACE"
redefined [-Werror]
 [...]

Rely on the rte_ethdev.h version instead.

Fixes: 71f238432865 ("eventdev: introduce event driven programming model")
Fixes: 4f0804bbdfb9 ("eventdev: implement the northbound APIs")

Cc: Jerin Jacob 
Signed-off-by: Adrien Mazarguil 
---
 lib/librte_eventdev/rte_eventdev.h |  3 +--
 lib/librte_eventdev/rte_eventdev_pmd.h | 24 ++--
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/lib/librte_eventdev/rte_eventdev.h 
b/lib/librte_eventdev/rte_eventdev.h
index b8ed6ef..20e7293 100644
--- a/lib/librte_eventdev/rte_eventdev.h
+++ b/lib/librte_eventdev/rte_eventdev.h
@@ -905,9 +905,9 @@ rte_event_dev_close(uint8_t dev_id);
  * The generic *rte_event* structure to hold the event attributes
  * for dequeue and enqueue operation
  */
+RTE_STD_C11
 struct rte_event {
/** WORD0 */
-   RTE_STD_C11
union {
uint64_t event;
/** Event attributes for dequeue or enqueue operation */
@@ -967,7 +967,6 @@ struct rte_event {
};
};
/** WORD1 */
-   RTE_STD_C11
union {
uint64_t u64;
/**< Opaque 64-bit value */
diff --git a/lib/librte_eventdev/rte_eventdev_pmd.h 
b/lib/librte_eventdev/rte_eventdev_pmd.h
index a73dc91..a090fa4 100644
--- a/lib/librte_eventdev/rte_eventdev_pmd.h
+++ b/lib/librte_eventdev/rte_eventdev_pmd.h
@@ -51,27 +51,23 @@ extern "C" {
 #include 
 #include 
 #include 
+#include 
 
 #include "rte_eventdev.h"
 
-#ifdef RTE_LIBRTE_EVENTDEV_DEBUG
-#define RTE_PMD_DEBUG_TRACE(...) \
-   rte_pmd_debug_trace(__func__, __VA_ARGS__)
-#else
-#define RTE_PMD_DEBUG_TRACE(...)
-#endif
-
 /* Logging Macros */
-#define RTE_EDEV_LOG_ERR(fmt, args...) \
-   RTE_LOG(ERR, EVENTDEV, "%s() line %u: " fmt "\n",  \
-   __func__, __LINE__, ## args)
+#define RTE_EDEV_LOG_ERR(...) \
+   RTE_LOG(ERR, EVENTDEV, \
+   RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
+   __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,)))
 
 #ifdef RTE_LIBRTE_EVENTDEV_DEBUG
-#define RTE_EDEV_LOG_DEBUG(fmt, args...) \
-   RTE_LOG(DEBUG, EVENTDEV, "%s() line %u: " fmt "\n",  \
-   __func__, __LINE__, ## args)
+#define RTE_EDEV_LOG_DEBUG(...) \
+   RTE_LOG(DEBUG, EVENTDEV, \
+   RTE_FMT("%s() line %u: " RTE_FMT_HEAD(__VA_ARGS__,) "\n", \
+   __func__, __LINE__, RTE_FMT_TAIL(__VA_ARGS__,)))
 #else
-#define RTE_EDEV_LOG_DEBUG(fmt, args...) (void)0
+#define RTE_EDEV_LOG_DEBUG(...) (void)0
 #endif
 
 /* Macros to check for valid device */
-- 
2.1.4

[dpdk-dev] [PATCH v2 03/13] latency: fix missing includes in exported header

[Adrien Mazarguil]

This commit addresses the following errors:

 In file included from build/include/rte_latencystats.h:43:0,
  from /tmp/check-includes.sh.6580.c:1:
 build/include/rte_metrics.h:91:2: error: unknown type name 'uint16_t'
 [...]
 In file included from /tmp/check-includes.sh.6580.c:1:0:
 build/include/rte_latencystats.h:66:19: error: expected declaration
specifiers or '...' before '*' token
 [...]

Fixes: 5cd3cac9ed22 ("latency: added new library for latency stats")

Cc: Reshma Pattan 
Signed-off-by: Adrien Mazarguil 
---
 lib/librte_latencystats/rte_latencystats.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_latencystats/rte_latencystats.h 
b/lib/librte_latencystats/rte_latencystats.h
index 6efeaf4..d85cf3a 100644
--- a/lib/librte_latencystats/rte_latencystats.h
+++ b/lib/librte_latencystats/rte_latencystats.h
@@ -40,7 +40,9 @@
  * library to provide application and flow based latency stats.
  */
 
+#include 
 #include 
+#include 
 
 #ifdef __cplusplus
 extern "C" {
-- 
2.1.4

[dpdk-dev] [PATCH v2 04/13] net: fix missing include in exported header

[Adrien Mazarguil]

This commit addresses the following errors:

 In file included from /tmp/check-includes.sh.18889.c:1:0:
 build/include/rte_net_crc.h:86:1: error: unknown type name 'uint32_t'
 [...]

Fixes: 986ff526fb84 ("net: add CRC computation API")

Cc: Jasvinder Singh 
Signed-off-by: Adrien Mazarguil 
---
 lib/librte_net/rte_net_crc.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_net/rte_net_crc.h b/lib/librte_net/rte_net_crc.h
index 76fd129..d22286c 100644
--- a/lib/librte_net/rte_net_crc.h
+++ b/lib/librte_net/rte_net_crc.h
@@ -34,6 +34,8 @@
 #ifndef _RTE_NET_CRC_H_
 #define _RTE_NET_CRC_H_
 
+#include 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
-- 
2.1.4

[dpdk-dev] [PATCH v2 05/13] vhost: fix errors with strict compilation flags

[Adrien Mazarguil]

Exported headers must allow compilation with the strictest flags. This
commit addresses the following errors:

 In file included from /tmp/check-includes.sh.20132.c:1:0:
 build/include/rte_vhost.h:73:30: error: ISO C forbids zero-size array
'regions' [-Werror=pedantic]
 [...]

Also:

- Add C++ awareness to rte_vhost.h for consistency with rte_eth_vhost.h.
- Move Linux includes into C++ block to prevent linking issues with
  exported symbols.
- Update check-includes.sh following the removal of rte_virtio_net.h.

Finally, update check-includes.sh to ignore rte_vhost.h and rte_eth_vhost.h
from now on since the Linux headers they depend on are not clean enough:

 In file included from /usr/include/linux/vhost.h:17:0,
  from build/include/rte_vhost.h:43,
  from build/include/rte_eth_vhost.h:44,
  from /tmp/check-includes.sh.20132.c:1:
 /usr/include/linux/virtio_ring.h: In function 'vring_init':
 /usr/include/linux/virtio_ring.h:146:16: error: pointer of type 'void *'
used in arithmetic [-Werror=pointer-arith]
 [...]
 In file included from build/include/rte_vhost.h:43:0,
  from build/include/rte_eth_vhost.h:44,
  from /tmp/check-includes.sh.20132.c:1:
 /usr/include/linux/vhost.h: At top level:
 /usr/include/linux/vhost.h:73:3: error: ISO C99 doesn't support unnamed
structs/unions [-Werror=pedantic]
 [...]

Fixes: eb32247457fe ("vhost: export guest memory regions")
Fixes: a798beb47c8e ("vhost: rename header file")

Signed-off-by: Adrien Mazarguil 
Acked-by: Yuanhan Liu 
---
 devtools/check-includes.sh   |  4 +++-
 lib/librte_vhost/rte_vhost.h | 16 +---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/devtools/check-includes.sh b/devtools/check-includes.sh
index d65adc6..c4ec73f 100755
--- a/devtools/check-includes.sh
+++ b/devtools/check-includes.sh
@@ -109,10 +109,12 @@ include_dir=${1:-build/include}
'rte_byteorder_64.h' \
'generic/*' \
'exec-env/*' \
+   'rte_vhost.h' \
+   'rte_eth_vhost.h' \
 }
 : ${IGNORE_CXX= \
+   'rte_vhost.h' \
'rte_eth_vhost.h' \
-   'rte_virtio_net.h' \
 }
 
 temp_cc=/tmp/${0##*/}.$$.c
diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
index 7a586e4..605e47c 100644
--- a/lib/librte_vhost/rte_vhost.h
+++ b/lib/librte_vhost/rte_vhost.h
@@ -40,13 +40,19 @@
  */
 
 #include 
-#include 
-#include 
 #include 
 
 #include 
 #include 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* These are not C++-aware. */
+#include 
+#include 
+
 #define RTE_VHOST_USER_CLIENT  (1ULL << 0)
 #define RTE_VHOST_USER_NO_RECONNECT(1ULL << 1)
 #define RTE_VHOST_USER_DEQUEUE_ZERO_COPY   (1ULL << 2)
@@ -70,7 +76,7 @@ struct rte_vhost_mem_region {
  */
 struct rte_vhost_memory {
uint32_t nregions;
-   struct rte_vhost_mem_region regions[0];
+   struct rte_vhost_mem_region regions[];
 };
 
 struct rte_vhost_vring {
@@ -426,4 +432,8 @@ int rte_vhost_get_mem_table(int vid, struct 
rte_vhost_memory **mem);
 int rte_vhost_get_vhost_vring(int vid, uint16_t vring_idx,
  struct rte_vhost_vring *vring);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_VHOST_H_ */
-- 
2.1.4

[dpdk-dev] [PATCH v2 08/13] bitrate: fix errors in exported header

[Adrien Mazarguil]

This commit addresses the following error:

 In file included from /tmp/check-includes.sh.28023.c:1:0:
 build/include/rte_bitrate.h:82:2: error: unknown type name 'uint8_t'
 [...]

It also adds C++ awareness to rte_bitrate.h.

Fixes: 2ad7ba9a6567 ("bitrate: add bitrate statistics library")

Cc: Remy Horton 
Signed-off-by: Adrien Mazarguil 
---
 lib/librte_bitratestats/rte_bitrate.h | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/lib/librte_bitratestats/rte_bitrate.h 
b/lib/librte_bitratestats/rte_bitrate.h
index b9f11bd..15fc270 100644
--- a/lib/librte_bitratestats/rte_bitrate.h
+++ b/lib/librte_bitratestats/rte_bitrate.h
@@ -34,6 +34,12 @@
 #ifndef _RTE_BITRATE_H_
 #define _RTE_BITRATE_H_
 
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  *  Bitrate statistics data structure.
  *  This data structure is intentionally opaque.
@@ -81,4 +87,8 @@ int rte_stats_bitrate_reg(struct rte_stats_bitrates 
*bitrate_data);
 int rte_stats_bitrate_calc(struct rte_stats_bitrates *bitrate_data,
uint8_t port_id);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_BITRATE_H_ */
-- 
2.1.4

[dpdk-dev] [PATCH v2 07/13] net/avp: fix errors in exported headers

[Adrien Mazarguil]

This commit addresses several errors related to missing includes such as:

 In file included from /tmp/check-includes.sh.15315.c:1:0:
 build/include/rte_avp_fifo.h:77:22: error: 'struct rte_avp_fifo' declared
inside parameter list [-Werror]
 [...]
 build/include/rte_avp_fifo.h: In function 'avp_fifo_init':
 build/include/rte_avp_fifo.h:81:3: error: implicit declaration of function
'rte_panic' [-Werror=implicit-function-declaration]
 [...]
 build/include/rte_avp_fifo.h:83:6: error: dereferencing pointer to
incomplete type
 [...]
 build/include/rte_avp_fifo.h:109:2: error: implicit declaration of
function 'rte_wmb' [-Werror=implicit-function-declaration]
 [...]
 In file included from /tmp/check-includes.sh.15315.c:1:0:
 build/include/rte_avp_common.h:104:2: error: unknown type name 'uint64_t'
 [...]
 build/include/rte_avp_common.h:386:15: error: 'ETHER_ADDR_LEN' undeclared
here (not in a function)
 [...]

It addresses errors with strict compilation flags:

 In file included from /tmp/check-includes.sh.15315.c:1:0:
 build/include/rte_avp_common.h:122:3: error: ISO C99 doesn't support
unnamed structs/unions [-Werror=pedantic]
 [...]
 build/include/rte_avp_common.h:136:17: error: ISO C forbids zero-size
array 'buffer' [-Werror=pedantic]
 [...]

And also adds C++ awareness to both header files.

Fixes: 8e680655e205 ("net/avp: add public header files")

Cc: Allain Legacy 
Signed-off-by: Adrien Mazarguil 
---
 drivers/net/avp/rte_avp_common.h | 17 -
 drivers/net/avp/rte_avp_fifo.h   | 12 
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/drivers/net/avp/rte_avp_common.h b/drivers/net/avp/rte_avp_common.h
index 31d763e..05093ad 100644
--- a/drivers/net/avp/rte_avp_common.h
+++ b/drivers/net/avp/rte_avp_common.h
@@ -57,8 +57,18 @@
 #ifndef _RTE_AVP_COMMON_H_
 #define _RTE_AVP_COMMON_H_
 
+#include 
 #ifdef __KERNEL__
 #include 
+#else
+#include 
+#include 
+#include 
+#include 
+#endif
+
+#ifdef __cplusplus
+extern "C" {
 #endif
 
 /**
@@ -115,6 +125,7 @@ struct rte_avp_device_config {
  */
 struct rte_avp_request {
uint32_t req_id; /**< Request id */
+   RTE_STD_C11
union {
uint32_t new_mtu; /**< New MTU */
uint8_t if_up;  /**< 1: interface up, 0: interface down */
@@ -133,7 +144,7 @@ struct rte_avp_fifo {
volatile unsigned int read; /**< Next position to be read */
unsigned int len; /**< Circular buffer length */
unsigned int elem_size; /**< Pointer size - for 32/64 bit OS */
-   void *volatile buffer[0]; /**< The buffer contains mbuf pointers */
+   void *volatile buffer[]; /**< The buffer contains mbuf pointers */
 };
 
 
@@ -413,4 +424,8 @@ struct rte_avp_device_info {
 #define RTE_AVP_IOCTL_RELEASE _IOWR(0, 3, struct rte_avp_device_info)
 #define RTE_AVP_IOCTL_QUERY   _IOWR(0, 4, struct rte_avp_device_config)
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_AVP_COMMON_H_ */
diff --git a/drivers/net/avp/rte_avp_fifo.h b/drivers/net/avp/rte_avp_fifo.h
index 8262e4f..a0a37eb 100644
--- a/drivers/net/avp/rte_avp_fifo.h
+++ b/drivers/net/avp/rte_avp_fifo.h
@@ -57,6 +57,12 @@
 #ifndef _RTE_AVP_FIFO_H_
 #define _RTE_AVP_FIFO_H_
 
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef __KERNEL__
 /* Write memory barrier for kernel compiles */
 #define AVP_WMB() smp_wmb()
@@ -70,6 +76,8 @@
 #endif
 
 #ifndef __KERNEL__
+#include 
+
 /**
  * Initializes the avp fifo structure
  */
@@ -154,4 +162,8 @@ avp_fifo_free_count(struct rte_avp_fifo *fifo)
return (fifo->read - fifo->write - 1) & (fifo->len - 1);
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_AVP_FIFO_H_ */
-- 
2.1.4

[dpdk-dev] [PATCH v2 06/13] mbuf: fix missing includes in exported header

[Adrien Mazarguil]

This commit addresses the following errors:

 In file included from /tmp/check-includes.sh.681.c:1:0:
 build/include/rte_mbuf_ptype.h:587:35: error: unknown type name 'uint32_t'
 [...]
 build/include/rte_mbuf_ptype.h:662:51: error: unknown type name 'size_t'
 [...]

Fixes: 288541c8ff9e ("mbuf: add functions to dump packet type")

Cc: sta...@dpdk.org
Cc: Olivier Matz 
Signed-off-by: Adrien Mazarguil 
---
 lib/librte_mbuf/rte_mbuf_ptype.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/librte_mbuf/rte_mbuf_ptype.h b/lib/librte_mbuf/rte_mbuf_ptype.h
index ff6de9d..a3269c4 100644
--- a/lib/librte_mbuf/rte_mbuf_ptype.h
+++ b/lib/librte_mbuf/rte_mbuf_ptype.h
@@ -91,6 +91,9 @@
  * RTE_PTYPE_INNER_L4_UDP.
  */
 
+#include 
+#include 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
-- 
2.1.4

[dpdk-dev] [PATCH v2 09/13] efd: fix missing include in exported header

[Adrien Mazarguil]

This commit addresses the following compilation errors:

 In file included from /tmp/check-includes.sh.8373.c:1:0:
 build/include/rte_efd.h:133:9: error: unknown type name 'uint8_t'
 [...]

Fixes: 56b6ef874f80 ("efd: new Elastic Flow Distributor library")

Cc: sta...@dpdk.org
Cc: Byron Marohn 
Cc: Pablo de Lara Guarch 
Signed-off-by: Adrien Mazarguil 
---
 lib/librte_efd/rte_efd.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_efd/rte_efd.h b/lib/librte_efd/rte_efd.h
index 6d31e18..1596863 100644
--- a/lib/librte_efd/rte_efd.h
+++ b/lib/librte_efd/rte_efd.h
@@ -40,6 +40,8 @@
  * RTE EFD Table
  */
 
+#include 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
-- 
2.1.4

[dpdk-dev] [PATCH v2 10/13] metrics: fix errors in exported header

[Adrien Mazarguil]

This commit addresses the following compilation errors:

 In file included from /tmp/check-includes.sh.21060.c:1:0:
 build/include/rte_metrics.h:91:2: error: unknown type name 'uint16_t'
 [...]

It also adds C++ awareness to rte_metrics.h.

Fixes: 349950ddb9c5 ("metrics: add information metrics library")

Cc: Remy Horton 
Signed-off-by: Adrien Mazarguil 
---
 lib/librte_metrics/rte_metrics.h | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/lib/librte_metrics/rte_metrics.h b/lib/librte_metrics/rte_metrics.h
index fd0154f..0fa3104 100644
--- a/lib/librte_metrics/rte_metrics.h
+++ b/lib/librte_metrics/rte_metrics.h
@@ -52,6 +52,12 @@
 #ifndef _RTE_METRICS_H_
 #define _RTE_METRICS_H_
 
+#include 
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** Maximum length of metric name (including null-terminator) */
 #define RTE_METRICS_MAX_NAME_LEN 64
 
@@ -237,4 +243,8 @@ int rte_metrics_update_values(
const uint64_t *values,
uint32_t count);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
-- 
2.1.4

[dpdk-dev] [PATCH v2 11/13] ethdev: fix C++ errors in flow API

[Adrien Mazarguil]

This commit addresses the following compilation errors:

 In file included from build/include/rte_flow_driver.h:50:0,
  from /tmp/check-includes.sh.1397.cc:1:
 build/include/rte_flow.h:428:2: error: expected primary-expression before
'.' token
 [...]
 build/include/rte_flow.h:469:1: sorry, unimplemented: non-trivial
designated initializers not supported
 [...]

C++ does not support the C99-style designated initializers used in this
file for the default item masks. While the resulting symbols are primarily
useful to PMDs (written in C), they are exposed as part of the public API
for documentation purposes and to assist application writers.

Considering that:

- using pre-C99 initialization style for compatibility with C++ would
  render them difficult to understand (all struct members must be
  initialized)
- using both initialization styles would be needlessly verbose
- not exposing them at all would defeat their purpose
- applications do not normally need these symbols at run time

This commit hides these symbols from C++ applications. Specific C++
initializers will be added later if necessary.

Fixes: 6de5c0f1302c ("ethdev: define default item masks in flow API")

Cc: sta...@dpdk.org
Signed-off-by: Adrien Mazarguil 
---
 lib/librte_ether/rte_flow.h | 26 ++
 1 file changed, 26 insertions(+)

diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h
index 7749491..bc7bc45 100644
--- a/lib/librte_ether/rte_flow.h
+++ b/lib/librte_ether/rte_flow.h
@@ -314,9 +314,11 @@ struct rte_flow_item_any {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_ANY. */
+#ifndef __cplusplus
 static const struct rte_flow_item_any rte_flow_item_any_mask = {
.num = 0x,
 };
+#endif
 
 /**
  * RTE_FLOW_ITEM_TYPE_VF
@@ -341,9 +343,11 @@ struct rte_flow_item_vf {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_VF. */
+#ifndef __cplusplus
 static const struct rte_flow_item_vf rte_flow_item_vf_mask = {
.id = 0x,
 };
+#endif
 
 /**
  * RTE_FLOW_ITEM_TYPE_PORT
@@ -370,9 +374,11 @@ struct rte_flow_item_port {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_PORT. */
+#ifndef __cplusplus
 static const struct rte_flow_item_port rte_flow_item_port_mask = {
.index = 0x,
 };
+#endif
 
 /**
  * RTE_FLOW_ITEM_TYPE_RAW
@@ -403,6 +409,7 @@ struct rte_flow_item_raw {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_RAW. */
+#ifndef __cplusplus
 static const struct rte_flow_item_raw rte_flow_item_raw_mask = {
.relative = 1,
.search = 1,
@@ -411,6 +418,7 @@ static const struct rte_flow_item_raw 
rte_flow_item_raw_mask = {
.limit = 0x,
.length = 0x,
 };
+#endif
 
 /**
  * RTE_FLOW_ITEM_TYPE_ETH
@@ -424,11 +432,13 @@ struct rte_flow_item_eth {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */
+#ifndef __cplusplus
 static const struct rte_flow_item_eth rte_flow_item_eth_mask = {
.dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
.src.addr_bytes = "\xff\xff\xff\xff\xff\xff",
.type = 0x,
 };
+#endif
 
 /**
  * RTE_FLOW_ITEM_TYPE_VLAN
@@ -444,10 +454,12 @@ struct rte_flow_item_vlan {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_VLAN. */
+#ifndef __cplusplus
 static const struct rte_flow_item_vlan rte_flow_item_vlan_mask = {
.tpid = 0x,
.tci = 0x,
 };
+#endif
 
 /**
  * RTE_FLOW_ITEM_TYPE_IPV4
@@ -461,12 +473,14 @@ struct rte_flow_item_ipv4 {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_IPV4. */
+#ifndef __cplusplus
 static const struct rte_flow_item_ipv4 rte_flow_item_ipv4_mask = {
.hdr = {
.src_addr = 0x,
.dst_addr = 0x,
},
 };
+#endif
 
 /**
  * RTE_FLOW_ITEM_TYPE_IPV6.
@@ -480,6 +494,7 @@ struct rte_flow_item_ipv6 {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_IPV6. */
+#ifndef __cplusplus
 static const struct rte_flow_item_ipv6 rte_flow_item_ipv6_mask = {
.hdr = {
.src_addr =
@@ -490,6 +505,7 @@ static const struct rte_flow_item_ipv6 
rte_flow_item_ipv6_mask = {
"\xff\xff\xff\xff\xff\xff\xff\xff",
},
 };
+#endif
 
 /**
  * RTE_FLOW_ITEM_TYPE_ICMP.
@@ -501,12 +517,14 @@ struct rte_flow_item_icmp {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_ICMP. */
+#ifndef __cplusplus
 static const struct rte_flow_item_icmp rte_flow_item_icmp_mask = {
.hdr = {
.icmp_type = 0xff,
.icmp_code = 0xff,
},
 };
+#endif
 
 /**
  * RTE_FLOW_ITEM_TYPE_UDP.
@@ -518,12 +536,14 @@ struct rte_flow_item_udp {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_UDP. */
+#ifndef __cplusplus
 static const struct rte_flow_item_udp rte_flow_item_udp_mask = {
.hdr = {
.src_port = 0x,
.dst_port = 0x,
},
 };
+#endif
 
 /**
  * RTE_FLOW_ITEM_TYPE_TCP.
@@ -535,12 +555,14 @@ struct rte_flow_item_tcp {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_TCP. */
+#ifndef __cplusplus
 sta

[dpdk-dev] [PATCH v2 12/13] ethdev: fix C++ errors in flow API (MPLS, GRE)

[Adrien Mazarguil]

This commit addresses the following compilation errors:

 In file included from build/include/rte_flow_driver.h:50:0,
  from /tmp/check-includes.sh.1397.cc:1:
 build/include/rte_flow.h:631:1: error: C99 designator 'label_tc_s' outside
aggregate initializer
 [...]
 build/include/rte_flow.h:631:1: error: initializer-string for array of
chars is too long [-fpermissive]
 [...]
 build/include/rte_flow.h:650:1: sorry, unimplemented: non-trivial
designated initializers not supported
 [...]

C++ does not support the C99-style designated initializers used in this
file for the default item masks. While the resulting symbols are primarily
useful to PMDs (written in C), they are exposed as part of the public API
for documentation purposes and to assist application writers.

Considering that:

- using pre-C99 initialization style for compatibility with C++ would
  render them difficult to understand (all struct members must be
  initialized)
- using both initialization styles would be needlessly verbose
- not exposing them at all would defeat their purpose
- applications do not normally need these symbols at run time

This commit hides these symbols from C++ applications. Specific C++
initializers will be added later if necessary.

Fixes: 7cd048321d1d ("ethdev: add MPLS and GRE flow API items")

Signed-off-by: Adrien Mazarguil 
Acked-by: Beilei Xing 
---
 lib/librte_ether/rte_flow.h | 4 
 1 file changed, 4 insertions(+)

diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h
index bc7bc45..abd4c6a 100644
--- a/lib/librte_ether/rte_flow.h
+++ b/lib/librte_ether/rte_flow.h
@@ -652,9 +652,11 @@ struct rte_flow_item_mpls {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_MPLS. */
+#ifndef __cplusplus
 static const struct rte_flow_item_mpls rte_flow_item_mpls_mask = {
.label_tc_s = "\xff\xff\xf0",
 };
+#endif
 
 /**
  * RTE_FLOW_ITEM_TYPE_GRE.
@@ -671,9 +673,11 @@ struct rte_flow_item_gre {
 };
 
 /** Default mask for RTE_FLOW_ITEM_TYPE_GRE. */
+#ifndef __cplusplus
 static const struct rte_flow_item_gre rte_flow_item_gre_mask = {
.protocol = 0x,
 };
+#endif
 
 /**
  * Matching pattern item definition.
-- 
2.1.4

[dpdk-dev] [PATCH v2 13/13] ethdev: fix incomplete items in flow API

[Adrien Mazarguil]

E-Tag and NVGRE pattern items have been added hastily without updating
documentation nor testpmd.

This commit also adds default masks for these items based on the ixgbe
implementation.

Fixes: 99e7003831c3 ("net/ixgbe: parse L2 tunnel filter")

Cc: sta...@dpdk.org
Cc: Wei Zhao 
Cc: Wenzhuo Lu 
Signed-off-by: Adrien Mazarguil 
---
 app/test-pmd/cmdline_flow.c | 46 
 doc/guides/prog_guide/rte_flow.rst  | 26 ++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  8 +
 lib/librte_ether/rte_flow.h | 21 +++
 4 files changed, 101 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 4e99f0f..0a40005 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -159,6 +159,10 @@ enum index {
ITEM_SCTP_CKSUM,
ITEM_VXLAN,
ITEM_VXLAN_VNI,
+   ITEM_E_TAG,
+   ITEM_E_TAG_GRP_ECID_B,
+   ITEM_NVGRE,
+   ITEM_NVGRE_TNI,
ITEM_MPLS,
ITEM_MPLS_LABEL,
ITEM_GRE,
@@ -436,6 +440,8 @@ static const enum index next_item[] = {
ITEM_TCP,
ITEM_SCTP,
ITEM_VXLAN,
+   ITEM_E_TAG,
+   ITEM_NVGRE,
ITEM_MPLS,
ITEM_GRE,
ZERO,
@@ -544,6 +550,18 @@ static const enum index item_vxlan[] = {
ZERO,
 };
 
+static const enum index item_e_tag[] = {
+   ITEM_E_TAG_GRP_ECID_B,
+   ITEM_NEXT,
+   ZERO,
+};
+
+static const enum index item_nvgre[] = {
+   ITEM_NVGRE_TNI,
+   ITEM_NEXT,
+   ZERO,
+};
+
 static const enum index item_mpls[] = {
ITEM_MPLS_LABEL,
ITEM_NEXT,
@@ -1297,6 +1315,34 @@ static const struct token token_list[] = {
.next = NEXT(item_vxlan, NEXT_ENTRY(UNSIGNED), item_param),
.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_vxlan, vni)),
},
+   [ITEM_E_TAG] = {
+   .name = "e_tag",
+   .help = "match E-Tag header",
+   .priv = PRIV_ITEM(E_TAG, sizeof(struct rte_flow_item_e_tag)),
+   .next = NEXT(item_e_tag),
+   .call = parse_vc,
+   },
+   [ITEM_E_TAG_GRP_ECID_B] = {
+   .name = "grp_ecid_b",
+   .help = "GRP and E-CID base",
+   .next = NEXT(item_e_tag, NEXT_ENTRY(UNSIGNED), item_param),
+   .args = ARGS(ARGS_ENTRY_MASK_HTON(struct rte_flow_item_e_tag,
+ rsvd_grp_ecid_b,
+ "\x3f\xff")),
+   },
+   [ITEM_NVGRE] = {
+   .name = "nvgre",
+   .help = "match NVGRE header",
+   .priv = PRIV_ITEM(NVGRE, sizeof(struct rte_flow_item_nvgre)),
+   .next = NEXT(item_nvgre),
+   .call = parse_vc,
+   },
+   [ITEM_NVGRE_TNI] = {
+   .name = "tni",
+   .help = "virtual subnet ID",
+   .next = NEXT(item_nvgre, NEXT_ENTRY(UNSIGNED), item_param),
+   .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_nvgre, tni)),
+   },
[ITEM_MPLS] = {
.name = "mpls",
.help = "match MPLS header",
diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index 9bca9ec..b587ba9 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -863,6 +863,32 @@ Matches a VXLAN header (RFC 7348).
 - ``rsvd1``: reserved, normally 0x00.
 - Default ``mask`` matches VNI only.
 
+Item: ``E_TAG``
+^^^
+
+Matches an IEEE 802.1BR E-Tag header.
+
+- ``tpid``: tag protocol identifier (0x893F)
+- ``epcp_edei_in_ecid_b``: E-Tag control information (E-TCI), E-PCP (3b),
+  E-DEI (1b), ingress E-CID base (12b).
+- ``rsvd_grp_ecid_b``: reserved (2b), GRP (2b), E-CID base (12b).
+- ``in_ecid_e``: ingress E-CID ext.
+- ``ecid_e``: E-CID ext.
+- Default ``mask`` simultaneously matches GRP and E-CID base.
+
+Item: ``NVGRE``
+^^^
+
+Matches a NVGRE header (RFC 7637).
+
+- ``c_k_s_rsvd0_ver``: checksum (1b), undefined (1b), key bit (1b),
+  sequence number (1b), reserved 0 (9b), version (3b). This field must have
+  value 0x2000 according to RFC 7637.
+- ``protocol``: protocol type (0x6558).
+- ``tni``: virtual subnet ID.
+- ``flow_id``: flow ID.
+- Default ``mask`` matches TNI only.
+
 Item: ``MPLS``
 ^^
 
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst 
b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index ddd1d92..1aea101 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -2537,6 +2537,14 @@ This section lists supported pattern items and their 
attributes, if any.
 
   - ``vni {unsigned}``: VXLAN identifier.
 
+- ``e_tag``: match IEEE 802.1BR E-Tag header.
+
+  - ``grp_ecid_b {unsigned}``: GRP and E-CID base.
+
+- ``nvgre``: match NVGRE header.
+
+  - ``tni {unsigned}``: virtual subnet ID.
+
 - ``mpls``: match MPLS header

Re: [dpdk-dev] [PATCH] usertools: use /sys/devices/system/cpu for CPU layout script

[Thomas Monjalon]

Hi,

31/03/2017 14:21, Andriy Berestovskyy:
> Some platforms do not have core/socket info in /proc/cpuinfo.
> 
> Signed-off-by: Andriy Berestovskyy 
> ---
>  usertools/cpu_layout.py | 53 
> +
>  1 file changed, 23 insertions(+), 30 deletions(-)

Applied, thanks for improving this script.

Do you think it is really a good idea to keep and maintain this script
in DPDK? It was intentionnally not exported in "make install".
I think it is a bit out of scope, and I wonder which alternatives
do we have? I know hwloc/lstopo, but there are probably others.

Re: [dpdk-dev] [PATCH v2] app/testpmd: check port is stopped for QinQ setup

[Wu, Jingjing]

> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Bernard Iremonger
> Sent: Monday, April 24, 2017 6:25 PM
> To: dev@dpdk.org
> Cc: Xing, Beilei ; Zhang, Qi ;
> Iremonger, Bernard ; sta...@dpdk.org
> Subject: [dpdk-dev] [PATCH v2] app/testpmd: check port is stopped for QinQ
> setup
> 
> Check port is stopped before configuring it for QinQ, with the "vlan set qinq 
> on
> " command.
> 
> The above command sets the hw_vlan_extend flag.
> When the port is started it calls the
> i40e_rx_vec_dev_conf_condition_check_default function to decide whether or
> not to select the vector mode driver depending on the state of the
> hw_vlan_extend flag.
> 
The command vlan set qinq on  is an common command, but not only
For i40e. I think it's better to doc it somewhere instead of changing the 
default
Behavior of this command.

Re: [dpdk-dev] [PATCH v2 1/5] ethdev: introduce device removal event

[Gaëtan Rivet]

Hi Ferruh,

On Fri, Apr 21, 2017 at 03:59:24PM +0100, Ferruh Yigit wrote:

On 4/18/2017 1:17 PM, Gaetan Rivet wrote:

This new API allows reacting to a device removal.
A device removal is the sudden disappearance of a device from its
bus.

PMDs implementing support for this notification guarantee that the removal
of the underlying device does not incur a risk to the application.

In particular, Rx/Tx bursts and all other functions can still be called
(albeit likely returning errors) without triggering a crash, irrespective
of an application handling this event.

Signed-off-by: Gaetan Rivet 
Signed-off-by: Elad Persiko 


<...>


diff --git a/doc/guides/nics/features/default.ini 
b/doc/guides/nics/features/default.ini
index b1b9114..cafc6c7 100644
--- a/doc/guides/nics/features/default.ini
+++ b/doc/guides/nics/features/default.ini
@@ -10,6 +10,7 @@
 Speed capabilities   =
 Link status  =
 Link status event=
+Removal event=
 Queue status event   =
 Rx interrupt =
 Free Tx mbuf on demand =


This release a few NIC features added, and it is hard to follow them if
you are particularly looking for these features.

So do you think does it make sense to put those new PMD features into
release notes to make it more visible?



Yes it seems like a good idea to announce this evolution. I will
send the relevant patch for this soon.


Thanks,
ferruh


--
Gaëtan Rivet
6WIND

Re: [dpdk-dev] [PATCH v2 4/5] app/testpmd: request link status interrupt

[Gaëtan Rivet]

On Fri, Apr 21, 2017 at 03:55:43PM +0100, Ferruh Yigit wrote:

On 4/18/2017 1:17 PM, Gaetan Rivet wrote:

For drivers supporting the LSC event, enable it.
This allows to test LSC event support.

Add the --no-lsc-interrupt parameter to explicitly disable the link status
change interrupt.

Signed-off-by: Gaetan Rivet 
---
 app/test-pmd/parameters.c |  4 
 app/test-pmd/testpmd.c| 13 +
 app/test-pmd/testpmd.h|  1 +
 3 files changed, 18 insertions(+)


Hi Gaetan,

This patch adds new option to testpmd, can you please update testpmd
documentation to document new option?

Same is valid for next patch (no-rmv-interrupt option)



Sure, I will send a patch for this.

Should I send a new version of my previous series or a single
patch fixing the documentation for both options as a standalone?


Thanks,
ferruh



--
Gaëtan Rivet
6WIND

Re: [dpdk-dev] [PATCH 0/7] dpdk-devbind.py refactor

[Thomas Monjalon]

22/03/2017 15:11, Jerin Jacob:
> This patchset refactor the dpdk-devbind.py script to
> 
> 1) Optimize the bind and status operation delay(It is noticeable
> when the system has fairly large number of PCIe device. For instance,
> OCTEONTX system has around 170 PCIe devices and it takes around
> 19 seconds to bind devices. With this patch it is reduced to less
> than one seconds)
> 
> Patch 3 and 4 address this optimization
> 
> 2) There is a lot of common code in NIC and crypto device
> to get the device info, display status.
> 
> Patch 1 and 2 create a common code to add new devices
> without duplicating the code
> 
> 3) This patch creates the framework to define the DPDK PCI functional
> device by specifying the pci attributes like Vendor ID, Device ID,
> Sub Vendor ID, Sub Device ID and Class.This enables a flexible way to
> add DPDK function devices based on PCI attributes.
> 
> Crypto devices can belong to Encryption class(0x10) or Processor
> class(0x0b) based on the vendor preference.
> 
> Using this framework, The above disparity can be encoded in the following
> format
> 
> encryption_class = [{'Class': '10', 'Vendor': None,
>  'Device': None, 'SVendor': None, 'SDevice': None}]
> 
> intel_processor_class = [{'Class': '0b', 'Vendor': '8086', 'Device': None,
> 'SVendor': None, 'SDevice': None}]
> 
> crypto_devices = [encryption_class, intel_processor_class]
> 
> 4) Add eventdev, mempool PCI devices support
> 
> Guduri Prathyusha (7):
>   usertools: refactor the get NIC and crypto details
>   usertools: refactor the show status function
>   usertools: optimize lspci invocation
>   usertools: use optimized driver override scheme to bind
>   usertools: define DPDK PCI functional device
>   usertools: add eventdev PCI functional device
>   usertools: add mempool PCI functional device

Applied, thanks

Re: [dpdk-dev] [PATCH v2 4/5] app/testpmd: request link status interrupt

[Ferruh Yigit]

On 4/25/2017 10:07 AM, Gaëtan Rivet wrote:
> On Fri, Apr 21, 2017 at 03:55:43PM +0100, Ferruh Yigit wrote:
>> On 4/18/2017 1:17 PM, Gaetan Rivet wrote:
>>> For drivers supporting the LSC event, enable it.
>>> This allows to test LSC event support.
>>>
>>> Add the --no-lsc-interrupt parameter to explicitly disable the link status
>>> change interrupt.
>>>
>>> Signed-off-by: Gaetan Rivet 
>>> ---
>>>  app/test-pmd/parameters.c |  4 
>>>  app/test-pmd/testpmd.c| 13 +
>>>  app/test-pmd/testpmd.h|  1 +
>>>  3 files changed, 18 insertions(+)
>>
>> Hi Gaetan,
>>
>> This patch adds new option to testpmd, can you please update testpmd
>> documentation to document new option?
>>
>> Same is valid for next patch (no-rmv-interrupt option)
>>
> 
> Sure, I will send a patch for this.
> 
> Should I send a new version of my previous series or a single
> patch fixing the documentation for both options as a standalone?

Single patch to fix documentation will be do it.

Thanks,
ferruh

Re: [dpdk-dev] [PATCH 1/2] app/testpmd: load cmdline commands from file at startup

[Wu, Jingjing]

> -Original Message-
> From: Allain Legacy [mailto:allain.leg...@windriver.com]
> Sent: Saturday, April 1, 2017 3:13 AM
> To: Wu, Jingjing 
> Cc: dev@dpdk.org
> Subject: [PATCH 1/2] app/testpmd: load cmdline commands from file at startup
> 
> Adds support to testpmd to load a set of cmdline CLI commands at startup.
> This can be helpful when needing to cut-n-paste many commands each time
> testpmd is restarted.  This option will work in both interactive and non-
> interactive modes.
> 
>./testpmd -n4 -c3 ... -- --cmdline-file=/home/ubuntu/somefile.txt
> 
> Signed-off-by: Allain Legacy 

Looks useful, thanks

Acked-by: Jingjing Wu 

Re: [dpdk-dev] [PATCH 2/2] app/testpmd: load cmdline commands from file at runtime

[Wu, Jingjing]

> -Original Message-
> From: Allain Legacy [mailto:allain.leg...@windriver.com]
> Sent: Saturday, April 1, 2017 3:13 AM
> To: Wu, Jingjing 
> Cc: dev@dpdk.org
> Subject: [PATCH 2/2] app/testpmd: load cmdline commands from file at
> runtime
> 
> Adds support to testpmd to load a set of cmdline CLI commands at runtime.
> This can be helpful when needing to cut-n-paste many commands where cut-n-
> paste may not be practical.
> 
>testpmd> load /home/ubuntu/somefile.txt
> 
> Signed-off-by: Allain Legacy 

Acked-by: Jingjing Wu 

Re: [dpdk-dev] [PATCH] devtools: add git log checks for vsi, lsc, crc

[Thomas Monjalon]

17/04/2017 15:13, Ferruh Yigit:
> Signed-off-by: Ferruh Yigit 

Applied, thanks

Re: [dpdk-dev] [PATCH v2 06/13] mbuf: fix missing includes in exported header

[Olivier Matz]

On Tue, 25 Apr 2017 10:30:00 +0200, Adrien Mazarguil 
 wrote:
> This commit addresses the following errors:
> 
>  In file included from /tmp/check-includes.sh.681.c:1:0:
>  build/include/rte_mbuf_ptype.h:587:35: error: unknown type name 'uint32_t'
>  [...]
>  build/include/rte_mbuf_ptype.h:662:51: error: unknown type name 'size_t'
>  [...]
> 
> Fixes: 288541c8ff9e ("mbuf: add functions to dump packet type")
> 
> Cc: sta...@dpdk.org
> Cc: Olivier Matz 
> Signed-off-by: Adrien Mazarguil 

Acked-by: Olivier Matz 

Re: [dpdk-dev] [PATCH v2 00/13] Fixes for exported headers

[Ferruh Yigit]

On 4/25/2017 9:29 AM, Adrien Mazarguil wrote:
> This series addresses the remaining issues seen by check-includes.sh in
> exported headers. Most of them may cause compilation errors in user
> applications:
> 
> - Dependencies on missing includes.
> - Non-standard C/C++ constructs usage without associated safeties.
> - Missing C++ awareness blocks.
> 
> It also addresses the incomplete implementation of E-Tag and NVGRE flow API
> pattern items.
> 
> Changes in v2:
> 
> - Fixed (still) incomplete E-tag and NVGRE flow API documentation.

Hi Adrien,

Thanks for fixing this.

> - Renamed E-Tag item parameter "ecid_b" to "grp_ecid_b" in testpmd, to
>   reflect that both fields are set at once.
> - Fixed remaining compilation issue with RTE_LIBRTE_EVENTDEV_DEBUG.
> - Fixed avp include to avoid kernel module compilation issue pointed out
>   by Allain.

Re: [dpdk-dev] [PATCH] net/i40e: fix array bounds

[Ferruh Yigit]

On 4/25/2017 6:01 AM, Jingjing Wu wrote:
> Fix array bounds when set default ptype mapping.
> 
> Fixes: 62e94f7f66fb ("net/i40e: configure packet type mapping")
> Signed-off-by: Jingjing Wu 

Applied to dpdk-next-net/master, thanks.

[dpdk-dev] [PATCH 1/3] doc: fix missing backquotes

[Gaetan Rivet]

Fixes: ea85e7d711b6 ("ethdev: retrieve xstats by ID")

Signed-off-by: Gaetan Rivet 
---
 doc/guides/rel_notes/release_17_05.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/rel_notes/release_17_05.rst 
b/doc/guides/rel_notes/release_17_05.rst
index ad20e86..eb5b30f 100644
--- a/doc/guides/rel_notes/release_17_05.rst
+++ b/doc/guides/rel_notes/release_17_05.rst
@@ -454,7 +454,7 @@ API Changes
 
   * Changed set of input parameters for ``rte_eth_xstats_get`` and 
``rte_eth_xstats_get_names`` functions.
 
-  * Added new functions ``rte_eth_xstats_get_all`` and 
``rte_eth_xstats_get_names_all to provide backward compatibility for
+  * Added new functions ``rte_eth_xstats_get_all`` and 
``rte_eth_xstats_get_names_all`` to provide backward compatibility for
 ``rte_eth_xstats_get`` and ``rte_eth_xstats_get_names``
 
   * Added new function ``rte_eth_xstats_get_id_by_name``
-- 
2.1.4

[dpdk-dev] [PATCH 3/3] doc: add lsc and rmv interrupt to testpmd user guide

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 doc/guides/testpmd_app_ug/run_app.rst | 8 
 1 file changed, 8 insertions(+)

diff --git a/doc/guides/testpmd_app_ug/run_app.rst 
b/doc/guides/testpmd_app_ug/run_app.rst
index df5a0ee..a72c7e3 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -465,3 +465,11 @@ The commandline options are:
 *   ``--disable-link-check``
 
 Disable check on link status when starting/stopping ports.
+
+*  ``--no-lsc-interrupt``
+
+   Disable LSC interrupts for all ports, even those supporting it.
+
+*  ``--no-rmv-interrupt``
+
+  Disable RMV interrupts for all ports, even those supporting it.
-- 
2.1.4

[dpdk-dev] [PATCH 2/3] doc: add device removal event to release note

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 doc/guides/rel_notes/release_17_05.rst | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/guides/rel_notes/release_17_05.rst 
b/doc/guides/rel_notes/release_17_05.rst
index eb5b30f..293d3fd 100644
--- a/doc/guides/rel_notes/release_17_05.rst
+++ b/doc/guides/rel_notes/release_17_05.rst
@@ -298,6 +298,11 @@ New Features
 
   * DES DOCSIS BPI algorithm.
 
+* **Added Device Removal Interrupt.**
+
+  * Added a new ethdev event ``RTE_ETH_DEV_INTR_RMV`` to signify the sudden 
removal of a device. This
+event can be advertized by PCI drivers and enabled accordingly.
+
 
 Resolved Issues
 ---
@@ -459,7 +464,6 @@ API Changes
 
   * Added new function ``rte_eth_xstats_get_id_by_name``
 
-
 ABI Changes
 ---
 
-- 
2.1.4

[dpdk-dev] [PATCH v2 1/4] doc: fix missing backquotes

[Gaetan Rivet]

Fixes: ea85e7d711b6 ("ethdev: retrieve xstats by ID")

Signed-off-by: Gaetan Rivet 
---
 doc/guides/rel_notes/release_17_05.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/guides/rel_notes/release_17_05.rst 
b/doc/guides/rel_notes/release_17_05.rst
index ad20e86..eb5b30f 100644
--- a/doc/guides/rel_notes/release_17_05.rst
+++ b/doc/guides/rel_notes/release_17_05.rst
@@ -454,7 +454,7 @@ API Changes
 
   * Changed set of input parameters for ``rte_eth_xstats_get`` and 
``rte_eth_xstats_get_names`` functions.
 
-  * Added new functions ``rte_eth_xstats_get_all`` and 
``rte_eth_xstats_get_names_all to provide backward compatibility for
+  * Added new functions ``rte_eth_xstats_get_all`` and 
``rte_eth_xstats_get_names_all`` to provide backward compatibility for
 ``rte_eth_xstats_get`` and ``rte_eth_xstats_get_names``
 
   * Added new function ``rte_eth_xstats_get_id_by_name``
-- 
2.1.4

[dpdk-dev] [PATCH v2 2/4] doc: add device removal event to release note

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 doc/guides/rel_notes/release_17_05.rst | 5 +
 1 file changed, 5 insertions(+)

diff --git a/doc/guides/rel_notes/release_17_05.rst 
b/doc/guides/rel_notes/release_17_05.rst
index eb5b30f..602ef8e 100644
--- a/doc/guides/rel_notes/release_17_05.rst
+++ b/doc/guides/rel_notes/release_17_05.rst
@@ -298,6 +298,11 @@ New Features
 
   * DES DOCSIS BPI algorithm.
 
+* **Added Device Removal Interrupt.**
+
+  * Added a new ethdev event ``RTE_ETH_DEV_INTR_RMV`` to signify the sudden 
removal of a device. This
+event can be advertized by PCI drivers and enabled accordingly.
+
 
 Resolved Issues
 ---
-- 
2.1.4

[dpdk-dev] [PATCH v2 3/4] doc: add LSC and RMV interrupt to testpmd user guide

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 doc/guides/testpmd_app_ug/run_app.rst | 8 
 1 file changed, 8 insertions(+)

diff --git a/doc/guides/testpmd_app_ug/run_app.rst 
b/doc/guides/testpmd_app_ug/run_app.rst
index df5a0ee..a72c7e3 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -465,3 +465,11 @@ The commandline options are:
 *   ``--disable-link-check``
 
 Disable check on link status when starting/stopping ports.
+
+*  ``--no-lsc-interrupt``
+
+   Disable LSC interrupts for all ports, even those supporting it.
+
+*  ``--no-rmv-interrupt``
+
+  Disable RMV interrupts for all ports, even those supporting it.
-- 
2.1.4

[dpdk-dev] [PATCH v2 4/4] devtools: add git log checks for rmv

[Gaetan Rivet]

Signed-off-by: Gaetan Rivet 
---
 devtools/check-git-log.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh
index 8449d4f..f081ff5 100755
--- a/devtools/check-git-log.sh
+++ b/devtools/check-git-log.sh
@@ -132,6 +132,7 @@ bad=$(echo "$headlines" | grep -E --color=always \
-e ':.*\' \
-e ':.*\' \
-e ':.*\' \
+   -e ':.*\' \
-e ':.*\' \
-e ':.*\' \
-e ':.*\<[Vv]lan\>' \
-- 
2.1.4

Re: [dpdk-dev] [PATCH] usertools: use /sys/devices/system/cpu for CPU layout script

[Andriy Berestovskyy]

Hi,

On 25.04.2017 10:48, Thomas Monjalon wrote:

Do you think it is really a good idea to keep and maintain this script
in DPDK? It was intentionnally not exported in "make install".
I think it is a bit out of scope, and I wonder which alternatives
do we have? I know hwloc/lstopo, but there are probably others.


hwloc does not work on my target, but you are right, there are a variety 
of tools for that. For example, I prefer numactl (option -H) because it 
also allows to do many useful things, like bind CPUs to one node and 
memory allocations to another.


At the moment the script is just like the lscpu, which is preinstalled 
on Ubuntu and mentioned in the documentation alongside with the cpu_layout.


We could try to make the script more useful, for example, show which NIC 
is on which NUMA node. Still, it will be just a subset of functionality 
of tools like hwloc...



Regards,
Andriy

Re: [dpdk-dev] [PATCH] net/mlx5: fix ipv6 flow pattern item

[Ferruh Yigit]

On 4/25/2017 9:27 AM, Nelio Laranjeiro wrote:
> Only masked bits must be set in Verbs specification for a rule to be valid.
> 
> Fixes: 2097d0d1e2cc ("net/mlx5: support basic flow items and actions")
> 
> Signed-off-by: Nelio Laranjeiro 
> Acked-by: Adrien Mazarguil 

Applied to dpdk-next-net/master, thanks.

Re: [dpdk-dev] [PATCH v2] net/i40e: mbuf alloc failed counter not incremented

[Zhang, Helin]

> -Original Message-
> From: Yigit, Ferruh
> Sent: Monday, April 24, 2017 1:47 PM
> To: Legacy, Allain (Wind River); Zhang, Helin; Wu, Jingjing
> Cc: dev@dpdk.org; Peters, Matt (Wind River)
> Subject: Re: [dpdk-dev] [PATCH v2] net/i40e: mbuf alloc failed counter not
> incremented
Actually it is a fix, right? I think you need to start the title with 'fix'?
Then don't miss the 'Fix' line, as required.
> 
> On 4/22/2017 12:13 AM, Allain Legacy wrote:
> > From: Matt Peters 
> >
> > When an mbuf alloc fails during the mempool get operation for the i40e
> > bulk alloc receive function, the rx_mbuf_alloc_failed counter is not
> > incremented to record the error.
> >
> > This fix ensures consistency with the other i40e receive procedures
> > and other net drivers.
> >
> > Signed-off-by: Matt Peters 
> > Signed-off-by: Allain Legacy 
> > ---
> >  drivers/net/i40e/i40e_rxtx.c | 27 ---
> >  1 file changed, 24 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/i40e/i40e_rxtx.c
> > b/drivers/net/i40e/i40e_rxtx.c index e5471b143..4131902a9 100644
> > --- a/drivers/net/i40e/i40e_rxtx.c
> > +++ b/drivers/net/i40e/i40e_rxtx.c
> > @@ -610,6 +610,7 @@ static inline uint16_t  rx_recv_pkts(void
> > *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)  {
> > struct i40e_rx_queue *rxq = (struct i40e_rx_queue *)rx_queue;
> > +   struct rte_eth_dev *dev;
> > uint16_t nb_rx = 0;
> >
> > if (!nb_pkts)
> > @@ -630,6 +631,11 @@ rx_recv_pkts(void *rx_queue, struct rte_mbuf
> **rx_pkts, uint16_t nb_pkts)
> > PMD_RX_LOG(DEBUG, "Rx mbuf alloc failed for "
> >"port_id=%u, queue_id=%u",
> >rxq->port_id, rxq->queue_id);
> > +
> > +   dev = &rte_eth_devices[rxq->port_id];
> 
> The question is mostly to the driver maintainer, instead of using global 
> variable,
> would it be better to use rxq->vsi->adapter->eth_dev to access rte_eth_device
> struct?
Yes, I agree with Ferruh. I40E_VSI_TO_ETH_DEV(rxq->vsi) can be used here.
> 
> > +   dev->data->rx_mbuf_alloc_failed +=
> > +   rxq->rx_free_thresh;
> > +
> > rxq->rx_nb_avail = 0;
> > rxq->rx_tail = (uint16_t)(rxq->rx_tail - nb_rx);
> > for (i = 0, j = rxq->rx_tail; i < nb_rx; i++, j++) @@ 
> > -691,6
> > +697,7 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
> uint16_t nb_pkts)
> > union i40e_rx_desc rxd;
> > struct i40e_rx_entry *sw_ring;
> > struct i40e_rx_entry *rxe;
> > +   struct rte_eth_dev *dev;
> > struct rte_mbuf *rxm;
> > struct rte_mbuf *nmb;
> > uint16_t nb_rx;
> > @@ -721,10 +728,16 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf
> **rx_pkts, uint16_t nb_pkts)
> > break;
> >
> > nmb = rte_mbuf_raw_alloc(rxq->mp);
> > -   if (unlikely(!nmb))
> > +   if (unlikely(!nmb)) {
> > +   PMD_RX_LOG(DEBUG, "RX mbuf alloc failed
> port_id=%u "
> > +  "queue_id=%u", (unsigned int)rxq->port_id,
> > +  (unsigned int)rxq->queue_id);
> 
> Do we really want debug print here?
> When you think the speeds we are dealing with, if mbuf alloc starts failing we
> may hit this lines millions per second, which may make app unusable?
> 
> > +   dev = &rte_eth_devices[rxq->port_id];
> > +   dev->data->rx_mbuf_alloc_failed++;
> > break;
> > -   rxd = *rxdp;
> > +   }
> >
> > +   rxd = *rxdp;
> > nb_hold++;
> > rxe = &sw_ring[rx_id];
> > rx_id++;
> > @@ -816,6 +829,7 @@ i40e_recv_scattered_pkts(void *rx_queue,
> > struct rte_mbuf *nmb, *rxm;
> > uint16_t rx_id = rxq->rx_tail;
> > uint16_t nb_rx = 0, nb_hold = 0, rx_packet_len;
> > +   struct rte_eth_dev *dev;
> > uint32_t rx_status;
> > uint64_t qword1;
> > uint64_t dma_addr;
> > @@ -833,8 +847,15 @@ i40e_recv_scattered_pkts(void *rx_queue,
> > break;
> >
> > nmb = rte_mbuf_raw_alloc(rxq->mp);
> > -   if (unlikely(!nmb))
> > +   if (unlikely(!nmb)) {
> > +   PMD_RX_LOG(DEBUG, "RX mbuf alloc failed
> port_id=%u "
> > +  "queue_id=%u", (unsigned int)rxq->port_id,
> > +  (unsigned int)rxq->queue_id);
> > +   dev = &rte_eth_devices[rxq->port_id];
> > +   dev->data->rx_mbuf_alloc_failed++;
> > break;
> > +   }
> > +
> > rxd = *rxdp;
> > nb_hold++;
> > rxe = &sw_ring[rx_id];
> >

Re: [dpdk-dev] [PATCH] usertools: use /sys/devices/system/cpu for CPU layout script

[Thomas Monjalon]

25/04/2017 12:19, Andriy Berestovskyy:
> Hi,
> 
> On 25.04.2017 10:48, Thomas Monjalon wrote:
> > Do you think it is really a good idea to keep and maintain this script
> > in DPDK? It was intentionnally not exported in "make install".
> > I think it is a bit out of scope, and I wonder which alternatives
> > do we have? I know hwloc/lstopo, but there are probably others.
> 
> hwloc does not work on my target, but you are right, there are a variety 
> of tools for that. For example, I prefer numactl (option -H) because it 
> also allows to do many useful things, like bind CPUs to one node and 
> memory allocations to another.
> 
> At the moment the script is just like the lscpu, which is preinstalled 
> on Ubuntu and mentioned in the documentation alongside with the cpu_layout.
> 
> We could try to make the script more useful, for example, show which NIC 
> is on which NUMA node. Still, it will be just a subset of functionality 
> of tools like hwloc...

Yes.
The other idea would be to properly document existing tools
and remove this one.

Opinions?

Re: [dpdk-dev] [dpdk-stable] [PATCH v2 11/13] ethdev: fix C++ errors in flow API

[Shahaf Shuler]

Tuesday, April 25, 2017 11:30 AM, Adrien Mazarguil:
> This commit addresses the following compilation errors:
> 
>  In file included from build/include/rte_flow_driver.h:50:0,
>   from /tmp/check-includes.sh.1397.cc:1:
>  build/include/rte_flow.h:428:2: error: expected primary-expression before
> '.' token
>  [...]
>  build/include/rte_flow.h:469:1: sorry, unimplemented: non-trivial
> designated initializers not supported  [...]
> 
> C++ does not support the C99-style designated initializers used in this
> file for the default item masks. While the resulting symbols are primarily
> useful to PMDs (written in C), they are exposed as part of the public API for
> documentation purposes and to assist application writers.
> 
> Considering that:
> 
> - using pre-C99 initialization style for compatibility with C++ would
>   render them difficult to understand (all struct members must be
>   initialized)
> - using both initialization styles would be needlessly verbose
> - not exposing them at all would defeat their purpose
> - applications do not normally need these symbols at run time
> 
> This commit hides these symbols from C++ applications. Specific C++
> initializers will be added later if necessary.
> 
> Fixes: 6de5c0f1302c ("ethdev: define default item masks in flow API")
> 
> Cc: sta...@dpdk.org
> Signed-off-by: Adrien Mazarguil 
Acked-by: Shahaf Shuler 

> ---
>  lib/librte_ether/rte_flow.h | 26 ++
>  1 file changed, 26 insertions(+)
> 
> diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h index
> 7749491..bc7bc45 100644
> --- a/lib/librte_ether/rte_flow.h
> +++ b/lib/librte_ether/rte_flow.h
> @@ -314,9 +314,11 @@ struct rte_flow_item_any {  };
> 
>  /** Default mask for RTE_FLOW_ITEM_TYPE_ANY. */
> +#ifndef __cplusplus
>  static const struct rte_flow_item_any rte_flow_item_any_mask = {
>   .num = 0x,
>  };
> +#endif
> 
>  /**
>   * RTE_FLOW_ITEM_TYPE_VF
> @@ -341,9 +343,11 @@ struct rte_flow_item_vf {  };
> 
>  /** Default mask for RTE_FLOW_ITEM_TYPE_VF. */
> +#ifndef __cplusplus
>  static const struct rte_flow_item_vf rte_flow_item_vf_mask = {
>   .id = 0x,
>  };
> +#endif
> 
>  /**
>   * RTE_FLOW_ITEM_TYPE_PORT
> @@ -370,9 +374,11 @@ struct rte_flow_item_port {  };
> 
>  /** Default mask for RTE_FLOW_ITEM_TYPE_PORT. */
> +#ifndef __cplusplus
>  static const struct rte_flow_item_port rte_flow_item_port_mask = {
>   .index = 0x,
>  };
> +#endif
> 
>  /**
>   * RTE_FLOW_ITEM_TYPE_RAW
> @@ -403,6 +409,7 @@ struct rte_flow_item_raw {  };
> 
>  /** Default mask for RTE_FLOW_ITEM_TYPE_RAW. */
> +#ifndef __cplusplus
>  static const struct rte_flow_item_raw rte_flow_item_raw_mask = {
>   .relative = 1,
>   .search = 1,
> @@ -411,6 +418,7 @@ static const struct rte_flow_item_raw
> rte_flow_item_raw_mask = {
>   .limit = 0x,
>   .length = 0x,
>  };
> +#endif
> 
>  /**
>   * RTE_FLOW_ITEM_TYPE_ETH
> @@ -424,11 +432,13 @@ struct rte_flow_item_eth {  };
> 
>  /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */
> +#ifndef __cplusplus
>  static const struct rte_flow_item_eth rte_flow_item_eth_mask = {
>   .dst.addr_bytes = "\xff\xff\xff\xff\xff\xff",
>   .src.addr_bytes = "\xff\xff\xff\xff\xff\xff",
>   .type = 0x,
>  };
> +#endif
> 
>  /**
>   * RTE_FLOW_ITEM_TYPE_VLAN
> @@ -444,10 +454,12 @@ struct rte_flow_item_vlan {  };
> 
>  /** Default mask for RTE_FLOW_ITEM_TYPE_VLAN. */
> +#ifndef __cplusplus
>  static const struct rte_flow_item_vlan rte_flow_item_vlan_mask = {
>   .tpid = 0x,
>   .tci = 0x,
>  };
> +#endif
> 
>  /**
>   * RTE_FLOW_ITEM_TYPE_IPV4
> @@ -461,12 +473,14 @@ struct rte_flow_item_ipv4 {  };
> 
>  /** Default mask for RTE_FLOW_ITEM_TYPE_IPV4. */
> +#ifndef __cplusplus
>  static const struct rte_flow_item_ipv4 rte_flow_item_ipv4_mask = {
>   .hdr = {
>   .src_addr = 0x,
>   .dst_addr = 0x,
>   },
>  };
> +#endif
> 
>  /**
>   * RTE_FLOW_ITEM_TYPE_IPV6.
> @@ -480,6 +494,7 @@ struct rte_flow_item_ipv6 {  };
> 
>  /** Default mask for RTE_FLOW_ITEM_TYPE_IPV6. */
> +#ifndef __cplusplus
>  static const struct rte_flow_item_ipv6 rte_flow_item_ipv6_mask = {
>   .hdr = {
>   .src_addr =
> @@ -490,6 +505,7 @@ static const struct rte_flow_item_ipv6
> rte_flow_item_ipv6_mask = {
>   "\xff\xff\xff\xff\xff\xff\xff\xff",
>   },
>  };
> +#endif
> 
>  /**
>   * RTE_FLOW_ITEM_TYPE_ICMP.
> @@ -501,12 +517,14 @@ struct rte_flow_item_icmp {  };
> 
>  /** Default mask for RTE_FLOW_ITEM_TYPE_ICMP. */
> +#ifndef __cplusplus
>  static const struct rte_flow_item_icmp rte_flow_item_icmp_mask = {
>   .hdr = {
>   .icmp_type = 0xff,
>   .icmp_code = 0xff,
>   },
>  };
> +#endif
> 
>  /**
>   * RTE_FLOW_ITEM_TYPE_UDP.
> @@ -518,12 +536,14 @@ struct rte_flow_item_udp {  };
> 
>  /** Default mask for RTE_FLOW_ITEM_TYPE_UDP. */
> +#ifndef __cplusplus
>  static c

Re: [dpdk-dev] [PATCH v2 12/13] ethdev: fix C++ errors in flow API (MPLS, GRE)

[Shahaf Shuler]

Tuesday, April 25, 2017 11:30 AM, Adrien Mazarguil:
> This commit addresses the following compilation errors:
> 
>  In file included from build/include/rte_flow_driver.h:50:0,
>   from /tmp/check-includes.sh.1397.cc:1:
>  build/include/rte_flow.h:631:1: error: C99 designator 'label_tc_s' outside
> aggregate initializer
>  [...]
>  build/include/rte_flow.h:631:1: error: initializer-string for array of
> chars is too long [-fpermissive]
>  [...]
>  build/include/rte_flow.h:650:1: sorry, unimplemented: non-trivial
> designated initializers not supported  [...]
> 
> C++ does not support the C99-style designated initializers used in this
> file for the default item masks. While the resulting symbols are primarily
> useful to PMDs (written in C), they are exposed as part of the public API for
> documentation purposes and to assist application writers.
> 
> Considering that:
> 
> - using pre-C99 initialization style for compatibility with C++ would
>   render them difficult to understand (all struct members must be
>   initialized)
> - using both initialization styles would be needlessly verbose
> - not exposing them at all would defeat their purpose
> - applications do not normally need these symbols at run time
> 
> This commit hides these symbols from C++ applications. Specific C++
> initializers will be added later if necessary.
> 
> Fixes: 7cd048321d1d ("ethdev: add MPLS and GRE flow API items")
> 
> Signed-off-by: Adrien Mazarguil 
> Acked-by: Beilei Xing 
Acked-by: Shahaf Shuler 
> ---
>  lib/librte_ether/rte_flow.h | 4 
>  1 file changed, 4 insertions(+)
> 
> diff --git a/lib/librte_ether/rte_flow.h b/lib/librte_ether/rte_flow.h index
> bc7bc45..abd4c6a 100644
> --- a/lib/librte_ether/rte_flow.h
> +++ b/lib/librte_ether/rte_flow.h
> @@ -652,9 +652,11 @@ struct rte_flow_item_mpls {  };
> 
>  /** Default mask for RTE_FLOW_ITEM_TYPE_MPLS. */
> +#ifndef __cplusplus
>  static const struct rte_flow_item_mpls rte_flow_item_mpls_mask = {
>   .label_tc_s = "\xff\xff\xf0",
>  };
> +#endif
> 
>  /**
>   * RTE_FLOW_ITEM_TYPE_GRE.
> @@ -671,9 +673,11 @@ struct rte_flow_item_gre {  };
> 
>  /** Default mask for RTE_FLOW_ITEM_TYPE_GRE. */
> +#ifndef __cplusplus
>  static const struct rte_flow_item_gre rte_flow_item_gre_mask = {
>   .protocol = 0x,
>  };
> +#endif
> 
>  /**
>   * Matching pattern item definition.
> --
> 2.1.4

[dpdk-dev] [PATCH] doc: update mlx4 and mlx5 release notes

[Shahaf Shuler]

Update release notes for 17.05.

Signed-off-by: Shahaf Shuler 
---
 doc/guides/rel_notes/release_17_05.rst | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/guides/rel_notes/release_17_05.rst 
b/doc/guides/rel_notes/release_17_05.rst
index ad20e8608..7d1c77983 100644
--- a/doc/guides/rel_notes/release_17_05.rst
+++ b/doc/guides/rel_notes/release_17_05.rst
@@ -136,15 +136,21 @@ New Features
   * QinQ is not supported in Vector Mode on the i40e PMD.
   * Vector Mode must be disabled when using the QinQ Cloud Filter.
 
-* **Added TSO support for tunneled and non-tunneled packets on mlx5 driver.**
+* **Update mlx5 PMD.**
 
-  Added support for Hardware TSO for tunneled and non-tunneled packets.
-  Tunneling protocols supported are GRE and VXLAN.
+  * Support ether type in flow item.
+  * Extend IPv6 flow item with Vtc flow, Protocol and Hop limit.
+  * Support flag flow action.
+  * Support RSS action flow rule.
+  * Support TSO for tunneled and non-tunneled packets.
+  * Support Hardware checksum offloads for tunneled packets.
+  * Support user space Rx interrupt event.
+  * Enhanced multi-packet send function for ConnectX-5.
 
-* **Added support for Rx interrupts on mlx5 driver.**
+* **Update mlx4 PMD.**
 
-  Rx queues can be armed with an interrupt which will trigger on the
-  next packet arrival.
+  * Support for basic flow items and actions.
+  * Support device removal event.
 
 * **Updated the sfc_efx driver.**
 
-- 
2.12.0

[dpdk-dev] [PATCH v3] net/i40e: mbuf alloc failed counter not incremented

[Allain Legacy]

From: Matt Peters 

When an mbuf alloc fails during the mempool get operation for the
i40e bulk alloc receive function, the rx_mbuf_alloc_failed counter
is not incremented to record the error.

This fix ensures consistency with the other i40e receive procedures and
other net drivers.

Signed-off-by: Matt Peters 
Signed-off-by: Allain Legacy 
---
 drivers/net/i40e/i40e_rxtx.c | 23 +--
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index e5471b143..74055bb04 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -610,6 +610,7 @@ static inline uint16_t
 rx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 {
struct i40e_rx_queue *rxq = (struct i40e_rx_queue *)rx_queue;
+   struct rte_eth_dev *dev;
uint16_t nb_rx = 0;
 
if (!nb_pkts)
@@ -627,9 +628,10 @@ rx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, 
uint16_t nb_pkts)
if (i40e_rx_alloc_bufs(rxq) != 0) {
uint16_t i, j;
 
-   PMD_RX_LOG(DEBUG, "Rx mbuf alloc failed for "
-  "port_id=%u, queue_id=%u",
-  rxq->port_id, rxq->queue_id);
+   dev = I40E_VSI_TO_ETH_DEV(rxq->vsi);
+   dev->data->rx_mbuf_alloc_failed +=
+   rxq->rx_free_thresh;
+
rxq->rx_nb_avail = 0;
rxq->rx_tail = (uint16_t)(rxq->rx_tail - nb_rx);
for (i = 0, j = rxq->rx_tail; i < nb_rx; i++, j++)
@@ -691,6 +693,7 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, 
uint16_t nb_pkts)
union i40e_rx_desc rxd;
struct i40e_rx_entry *sw_ring;
struct i40e_rx_entry *rxe;
+   struct rte_eth_dev *dev;
struct rte_mbuf *rxm;
struct rte_mbuf *nmb;
uint16_t nb_rx;
@@ -721,10 +724,13 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, 
uint16_t nb_pkts)
break;
 
nmb = rte_mbuf_raw_alloc(rxq->mp);
-   if (unlikely(!nmb))
+   if (unlikely(!nmb)) {
+   dev = I40E_VSI_TO_ETH_DEV(rxq->vsi);
+   dev->data->rx_mbuf_alloc_failed++;
break;
-   rxd = *rxdp;
+   }
 
+   rxd = *rxdp;
nb_hold++;
rxe = &sw_ring[rx_id];
rx_id++;
@@ -816,6 +822,7 @@ i40e_recv_scattered_pkts(void *rx_queue,
struct rte_mbuf *nmb, *rxm;
uint16_t rx_id = rxq->rx_tail;
uint16_t nb_rx = 0, nb_hold = 0, rx_packet_len;
+   struct rte_eth_dev *dev;
uint32_t rx_status;
uint64_t qword1;
uint64_t dma_addr;
@@ -833,8 +840,12 @@ i40e_recv_scattered_pkts(void *rx_queue,
break;
 
nmb = rte_mbuf_raw_alloc(rxq->mp);
-   if (unlikely(!nmb))
+   if (unlikely(!nmb)) {
+   dev = I40E_VSI_TO_ETH_DEV(rxq->vsi);
+   dev->data->rx_mbuf_alloc_failed++;
break;
+   }
+
rxd = *rxdp;
nb_hold++;
rxe = &sw_ring[rx_id];
-- 
2.12.1

Re: [dpdk-dev] [PATCH v2 07/13] net/avp: fix errors in exported headers

[Legacy, Allain]

> -Original Message-
> From: Adrien Mazarguil [mailto:adrien.mazarg...@6wind.com]
> Sent: Tuesday, April 25, 2017 4:30 AM
<...>
> 
> +#include 
>  #ifdef __KERNEL__
>  #include 
> +#else
> +#include 
> +#include 
> +#include 
> +#include 
> +#endif

I compiled this in our environment and found a couple of additional issues.  I 
apologize... I should have done that on the first pass.   It should actually 
look like this to handle both userspace and kernel compiles:

#ifdef __KERNEL__
#include 
#define RTE_STD_C11
#else
#include 
#include 
#include 
#include 
#include 
#endif

1) stdint.h needs to be moved in to the #else, and 
2) RTE_STD_C11 needs to be included in the #ifdef __KERNEL__.


<..>
> diff --git a/drivers/net/avp/rte_avp_fifo.h b/drivers/net/avp/rte_avp_fifo.h
> index 8262e4f..a0a37eb 100644
> --- a/drivers/net/avp/rte_avp_fifo.h
> +++ b/drivers/net/avp/rte_avp_fifo.h
> @@ -57,6 +57,12 @@
>  #ifndef _RTE_AVP_FIFO_H_
>  #define _RTE_AVP_FIFO_H_
> 
> +#include 

Would you mind changing the brackets (<>) to quotes ("") since this is a local 
include file?  

#include "rte_avp_common.h"

Re: [dpdk-dev] [PATCH v2 07/13] net/avp: fix errors in exported headers

[Adrien Mazarguil]

On Tue, Apr 25, 2017 at 12:31:56PM +, Legacy, Allain wrote:
> > -Original Message-
> > From: Adrien Mazarguil [mailto:adrien.mazarg...@6wind.com]
> > Sent: Tuesday, April 25, 2017 4:30 AM
> <...>
> > 
> > +#include 
> >  #ifdef __KERNEL__
> >  #include 
> > +#else
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#endif
> 
> I compiled this in our environment and found a couple of additional issues.  
> I apologize... I should have done that on the first pass.   It should 
> actually look like this to handle both userspace and kernel compiles:
> 
>   #ifdef __KERNEL__
>   #include 
>   #define RTE_STD_C11
>   #else
>   #include 
>   #include 
>   #include 
>   #include 
>   #include 
>   #endif
> 
> 1) stdint.h needs to be moved in to the #else, and 

OK, will update.

> 2) RTE_STD_C11 needs to be included in the #ifdef __KERNEL__.

Missed that one, however I suggest either:

 #ifndef __KERNEL__ around RTE_STD_C11

or using __extension__ directly. Which do you prefer?

By the way, is the kernel module that depends on rte_avp_common.h available
somewhere to validate compilation against it?

> <..>
> > diff --git a/drivers/net/avp/rte_avp_fifo.h b/drivers/net/avp/rte_avp_fifo.h
> > index 8262e4f..a0a37eb 100644
> > --- a/drivers/net/avp/rte_avp_fifo.h
> > +++ b/drivers/net/avp/rte_avp_fifo.h
> > @@ -57,6 +57,12 @@
> >  #ifndef _RTE_AVP_FIFO_H_
> >  #define _RTE_AVP_FIFO_H_
> > 
> > +#include 
> 
> Would you mind changing the brackets (<>) to quotes ("") since this is a 
> local include file?  
> 
>   #include "rte_avp_common.h"

I will update it.

-- 
Adrien Mazarguil
6WIND

Re: [dpdk-dev] [PATCH v2 07/13] net/avp: fix errors in exported headers

[Legacy, Allain]

> -Original Message-
> From: Adrien Mazarguil [mailto:adrien.mazarg...@6wind.com]
> Sent: Tuesday, April 25, 2017 8:50 AM
<...>
> > 2) RTE_STD_C11 needs to be included in the #ifdef __KERNEL__.
> 
> Missed that one, however I suggest either:
> 
>  #ifndef __KERNEL__ around RTE_STD_C11
> 
> or using __extension__ directly. Which do you prefer?

I would prefer if it was done as it is done in rte_kni_common.h to provide 
consistency with other similar files.  Like this:

#ifdef __KERNEL__
#include 
#define RTE_STD_C11
#else
#include 
#endif

...but if you disagree then I prefer the #ifndef __KERNEL__ option.


> 
> By the way, is the kernel module that depends on rte_avp_common.h
> available somewhere to validate compilation against it?

There is an older version of the module available on github, but it has not 
been updated since the AVP driver has been included in the DPDK.   Since the 
AVP directory and files were significantly changed in order to meet the 
requirements of the DPDK it won't be much use to you.Until we can update it 
please make sure both Matt Peters and I are CC'd on the patch requests and 
we'll confirm compilation as quickly as possible.


> > Would you mind changing the brackets (<>) to quotes ("") since this is a
> local include file?
> >
> > #include "rte_avp_common.h"
> 
> I will update it.


Thank you.

Re: [dpdk-dev] [PATCH 2/3] app/testpmd: enabled control for packet timestamps

[Wu, Jingjing]

> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Oleg Kuporosov
> Sent: Thursday, October 13, 2016 10:35 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH 2/3] app/testpmd: enabled control for packet
> timestamps
> 
> Implemented two methods of control
> 
> - by --enable-timestamps CL testpmd application we can enable timestamping
>   for all ports;
> - in interactive mode port config  timestamps on|off is able to
>   configure timestamping per specific port.
> 
> The control doesn't interact with IEEE1588 PTP implementation there as it is
> under macro compilation but can be extended in the future.
> 
> This feature is required for debugging/testing purposes for real time HW 
> packet
> timestamping.

We have ieee1588fwd.c to demo the timesync enable/disable, can we reuse
The fwd engine instead of defining new commands?

Thanks
Jingjing

[dpdk-dev] [PATCH] lib/cryptodev: fix API aad comments

[Arek Kusztal]

Fix comments concerning aad sizes in Cryptodev API.

Fixes: d11b0f30df88 ("cryptodev: introduce API and framework for crypto 
devices")

Signed-off-by: Arek Kusztal 
---
 lib/librte_cryptodev/rte_crypto_sym.h | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/librte_cryptodev/rte_crypto_sym.h 
b/lib/librte_cryptodev/rte_crypto_sym.h
index 508f4ee..eb7b530 100644
--- a/lib/librte_cryptodev/rte_crypto_sym.h
+++ b/lib/librte_cryptodev/rte_crypto_sym.h
@@ -319,8 +319,8 @@ struct rte_crypto_auth_xform {
 
uint32_t add_auth_data_length;
/**< The length of the additional authenticated data (AAD) in bytes.
-* The maximum permitted value is 240 bytes, unless otherwise specified
-* below.
+* The maximum permitted value is 65535 (2^16 - 1) bytes, unless
+* otherwise specified below.
 *
 * This field must be specified when the hash algorithm is one of the
 * following:
@@ -612,7 +612,7 @@ struct rte_crypto_sym_op {
 * set up for the session in the @ref
 * rte_crypto_auth_xform structure as part of the @ref
 * rte_cryptodev_sym_session_create function call.
-* This length must not exceed 240 bytes.
+* This length must not exceed 65535 (2^16-1) bytes.
 *
 * Specifically for CCM (@ref RTE_CRYPTO_AUTH_AES_CCM),
 * the caller should setup this field as follows:
@@ -645,7 +645,9 @@ struct rte_crypto_sym_op {
 * operation, this field is used to pass plaintext.
 */
phys_addr_t phys_addr;  /**< physical address */
-   uint16_t length;/**< Length of digest */
+   uint16_t length;
+   /**< Length of additional authenticated data (AAD)
+* in bytes */
} aad;
/**< Additional authentication parameters */
} auth;
-- 
2.1.0

[dpdk-dev] [PATCH] doc: add limitation of aad size to qat rst file

[Arek Kusztal]

Add limitation of additional authenticated data (AAD) in
Intel QuickAssist Technology driver rst file

Fixes: 1703e94ac5ce ("qat: add driver for QuickAssist devices")

Signed-off-by: Arek Kusztal 
---
 doc/guides/cryptodevs/qat.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
index 39f0322..21b56fc 100644
--- a/doc/guides/cryptodevs/qat.rst
+++ b/doc/guides/cryptodevs/qat.rst
@@ -88,6 +88,7 @@ Limitations
 * SNOW 3G (UIA2) and KASUMI (F9) supported only if hash length, hash offset 
fields are byte-aligned.
 * No BSD support as BSD QAT kernel driver not available.
 * ZUC EEA3/EIA3 is not supported by dh895xcc devices
+* Maximum additional authenticated data (AAD) for GCM is 240 bytes long.
 
 
 Installation
-- 
2.1.0

[dpdk-dev] [PATCH] crypto/openssl: fix aad capabilities for AES-GCM

[Arek Kusztal]

Fix aad capabilities for AES-GCM authtentication, aad is changed from
range 8-12 to 0-65535

Fixes: 8a9867a635c0 ("crypto/openssl: rename libcrypto to openssl")

Signed-off-by: Arek Kusztal 
---
 drivers/crypto/openssl/rte_openssl_pmd_ops.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c 
b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
index 25d1a4b..7cb21f8 100644
--- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c
+++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c
@@ -350,9 +350,9 @@ static const struct rte_cryptodev_capabilities 
openssl_pmd_capabilities[] = {
.increment = 0
},
.aad_size = {
-   .min = 8,
-   .max = 12,
-   .increment = 4
+   .min = 0,
+   .max = 65535,
+   .increment = 1
}
}, }
}, }
-- 
2.1.0

[dpdk-dev] [PATCH] crypto/qat: fix aad capabilities for AES-GCM

[Arek Kusztal]

Fix aad capabilities for AES-GCM authtentication, aad is changed
from range 8-12 to 0-240

Fixes: 1703e94ac5ce ("qat: add driver for QuickAssist devices")

Signed-off-by: Arek Kusztal 
---
 drivers/crypto/qat/qat_crypto_capabilities.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/qat/qat_crypto_capabilities.h 
b/drivers/crypto/qat/qat_crypto_capabilities.h
index fbd0c12..1294f24 100644
--- a/drivers/crypto/qat/qat_crypto_capabilities.h
+++ b/drivers/crypto/qat/qat_crypto_capabilities.h
@@ -200,9 +200,9 @@
.increment = 4  \
},  \
.aad_size = {   \
-   .min = 8,   \
-   .max = 12,  \
-   .increment = 4  \
+   .min = 0,   \
+   .max = 240, \
+   .increment = 1  \
}   \
}, }\
}, }\
-- 
2.1.0

Re: [dpdk-dev] [PATCH v2 07/13] net/avp: fix errors in exported headers

[Adrien Mazarguil]

On Tue, Apr 25, 2017 at 01:00:46PM +, Legacy, Allain wrote:
> > -Original Message-
> > From: Adrien Mazarguil [mailto:adrien.mazarg...@6wind.com]
> > Sent: Tuesday, April 25, 2017 8:50 AM
> <...>
> > > 2) RTE_STD_C11 needs to be included in the #ifdef __KERNEL__.
> > 
> > Missed that one, however I suggest either:
> > 
> >  #ifndef __KERNEL__ around RTE_STD_C11
> > 
> > or using __extension__ directly. Which do you prefer?
> 
> I would prefer if it was done as it is done in rte_kni_common.h to provide 
> consistency with other similar files.  Like this:
> 
>   #ifdef __KERNEL__
>   #include 
>   #define RTE_STD_C11
>   #else
>   #include 
>   #endif
> 
> ...but if you disagree then I prefer the #ifndef __KERNEL__ option.

You're right in fact, I did not remember that was the method used for
KNI. Let's keep your suggestion.

> > 
> > By the way, is the kernel module that depends on rte_avp_common.h
> > available somewhere to validate compilation against it?
> 
> There is an older version of the module available on github, but it has not 
> been updated since the AVP driver has been included in the DPDK.   Since the 
> AVP directory and files were significantly changed in order to meet the 
> requirements of the DPDK it won't be much use to you.Until we can update 
> it please make sure both Matt Peters and I are CC'd on the patch requests and 
> we'll confirm compilation as quickly as possible.
> 
> 
> > > Would you mind changing the brackets (<>) to quotes ("") since this is a
> > local include file?
> > >
> > >   #include "rte_avp_common.h"
> > 
> > I will update it.
> 
> 
> Thank you.

Can I add your acked-by line directly assuming all the above is done as
described?

-- 
Adrien Mazarguil
6WIND

Re: [dpdk-dev] [PATCH v2 07/13] net/avp: fix errors in exported headers

[Legacy, Allain]

> -Original Message-
> From: Adrien Mazarguil [mailto:adrien.mazarg...@6wind.com]
> Sent: Tuesday, April 25, 2017 10:49 AM
<...>
> > Thank you.
> 
> Can I add your acked-by line directly assuming all the above is done as
> described?

Yes.

Re: [dpdk-dev] [PATCH v2 02/13] eventdev: fix errors with strict compilation flags

[De Lara Guarch, Pablo]

Hi Adrien,

> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Adrien Mazarguil
> Sent: Tuesday, April 25, 2017 9:30 AM
> To: dev@dpdk.org
> Cc: Jerin Jacob
> Subject: [dpdk-dev] [PATCH v2 02/13] eventdev: fix errors with strict
> compilation flags
> 
> Exported headers must allow compilation with the strictest flags. This
> commit addresses the following errors:
> 
>  In file included from build/include/rte_eventdev_pmd.h:55:0,
>   from /tmp/check-includes.sh.25816.c:1:
>  build/include/rte_eventdev.h:908:8: error: struct has no named members
> [-Werror=pedantic]
>  [...]
>  In file included from /tmp/check-includes.sh.25816.c:1:0:
>  build/include/rte_eventdev_pmd.h:65:35: error: ISO C does not permit
> named
> variadic macros [-Werror=variadic-macros]
>  [...]
> 
> Also enabling RTE_LIBRTE_EVENTDEV_DEBUG causes redefinitions:
> 
>  In file included from /tmp/check-includes.sh.18921.c:27:0:
> build/include/rte_eventdev_pmd.h:58:0: error:
> "RTE_PMD_DEBUG_TRACE"
> redefined [-Werror]
>  [...]
> 
> Rely on the rte_ethdev.h version instead.
> 
> Fixes: 71f238432865 ("eventdev: introduce event driven programming
> model")
> Fixes: 4f0804bbdfb9 ("eventdev: implement the northbound APIs")
> 
> Cc: Jerin Jacob 
> Signed-off-by: Adrien Mazarguil 

I am seeing the following error due to this patch:
In file included from 
/root/tmp/dpdk-17.05-rc2/lib/librte_eventdev/rte_eventdev.c:62:0:
/root/tmp/dpdk-17.05-rc2/lib/librte_eventdev/rte_eventdev_pmd.h:54:24: fatal 
error: rte_ethdev.h: No such file or directory
 #include 

It only happens when I compile with "-j", so it looks like dependencies have to 
be fixed?

Thanks,
Pablo

[dpdk-dev] [PATCH] examples/l2fwd-crypto: fix wrong array index

[Pablo de Lara]

Fixes: c0f87eb5252b ("cryptodev: change burst API to be crypto op oriented")
Cc: sta...@dpdk.org

Signed-off-by: Pablo de Lara 
---
 examples/l2fwd-crypto/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index d7db55d..9492193 100644
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -788,7 +788,7 @@ l2fwd_main_loop(struct l2fwd_crypto_options *options)
ops_burst, nb_rx) !=
nb_rx) {
for (j = 0; j < nb_rx; j++)
-   rte_pktmbuf_free(pkts_burst[i]);
+   rte_pktmbuf_free(pkts_burst[j]);
 
nb_rx = 0;
}
-- 
2.7.4

Re: [dpdk-dev] [PATCH v2 01/13] crypto/scheduler: fix missing includes

[Zhang, Roy Fan]

> -Original Message-
> From: Adrien Mazarguil [mailto:adrien.mazarg...@6wind.com]
> Sent: Tuesday, April 25, 2017 9:30 AM
> To: dev@dpdk.org
> Cc: Zhang, Roy Fan 
> Subject: [PATCH v2 01/13] crypto/scheduler: fix missing includes
> 
> This commit addresses the following compilation errors:
> 
>  In file included from build/include/rte_cryptodev_scheduler.h:37:0,
>   from /tmp/check-includes.sh.5355.c:1:
>  build/include/rte_cryptodev_scheduler_operations.h:43:30: error: unknown
> type name 'uint8_t' struct rte_cryptodev *dev, uint8_t slave_id);  [...]
> 
> Fixes: 097ab0bac017 ("crypto/scheduler: add API")

Acked-by: Fan Zhang 

Thanks for the patch, Adrien.

Re: [dpdk-dev] [PATCH v2] app/testpmd: check port is stopped for QinQ setup

[Iremonger, Bernard]

Hi  Jingjing,

> -Original Message-
> From: Wu, Jingjing
> Sent: Tuesday, April 25, 2017 9:55 AM
> To: Iremonger, Bernard ; dev@dpdk.org
> Cc: Xing, Beilei ; Zhang, Qi ;
> Iremonger, Bernard ; sta...@dpdk.org
> Subject: RE: [dpdk-dev] [PATCH v2] app/testpmd: check port is stopped for
> QinQ setup
> 
> 
> 
> > -Original Message-
> > From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Bernard
> Iremonger
> > Sent: Monday, April 24, 2017 6:25 PM
> > To: dev@dpdk.org
> > Cc: Xing, Beilei ; Zhang, Qi
> > ; Iremonger, Bernard
> > ; sta...@dpdk.org
> > Subject: [dpdk-dev] [PATCH v2] app/testpmd: check port is stopped for
> > QinQ setup
> >
> > Check port is stopped before configuring it for QinQ, with the "vlan
> > set qinq on " command.
> >
> > The above command sets the hw_vlan_extend flag.
> > When the port is started it calls the
> > i40e_rx_vec_dev_conf_condition_check_default function to decide
> > whether or not to select the vector mode driver depending on the state
> > of the hw_vlan_extend flag.
> >
> The command vlan set qinq on  is an common command, but not
> only For i40e. I think it's better to doc it somewhere instead of changing the
> default Behavior of this command.

There is a doc patch in flight:
http://dpdk.org/dev/patchwork/patch/23704/

Is this enough or should I send a v3 of this patch for the i40e PMD only?

Regards,

Bernard.

Re: [dpdk-dev] [PATCH] lib/cryptodev: fix API aad comments

[Trahe, Fiona]

> -Original Message-
> From: Kusztal, ArkadiuszX
> Sent: Tuesday, April 25, 2017 3:34 PM
> To: dev@dpdk.org
> Cc: Trahe, Fiona ; De Lara Guarch, Pablo
> ; Griffin, John ;
> Jain, Deepak K ; Doherty, Declan
> ; Kusztal, ArkadiuszX
> 
> Subject: [PATCH] lib/cryptodev: fix API aad comments
> 
> Fix comments concerning aad sizes in Cryptodev API.
> 
> Fixes: d11b0f30df88 ("cryptodev: introduce API and framework for crypto
> devices")
> 
> Signed-off-by: Arek Kusztal 
Acked-by: Fiona Trahe 

Re: [dpdk-dev] [PATCH] doc: add limitation of aad size to qat rst file

[Trahe, Fiona]

> -Original Message-
> From: Kusztal, ArkadiuszX
> Sent: Tuesday, April 25, 2017 3:40 PM
> To: dev@dpdk.org
> Cc: Trahe, Fiona ; De Lara Guarch, Pablo
> ; Griffin, John ;
> Jain, Deepak K ; Kusztal, ArkadiuszX
> 
> Subject: [PATCH] doc: add limitation of aad size to qat rst file
> 
> Add limitation of additional authenticated data (AAD) in
> Intel QuickAssist Technology driver rst file
> 
> Fixes: 1703e94ac5ce ("qat: add driver for QuickAssist devices")
> 
> Signed-off-by: Arek Kusztal 
Acked-by: Fiona Trahe 

Re: [dpdk-dev] [PATCH] crypto/qat: fix aad capabilities for AES-GCM

[Trahe, Fiona]

> -Original Message-
> From: Kusztal, ArkadiuszX
> Sent: Tuesday, April 25, 2017 3:41 PM
> To: dev@dpdk.org
> Cc: Trahe, Fiona ; De Lara Guarch, Pablo
> ; Griffin, John ;
> Jain, Deepak K ; Kusztal, ArkadiuszX
> 
> Subject: [PATCH] crypto/qat: fix aad capabilities for AES-GCM
> 
> Fix aad capabilities for AES-GCM authtentication, aad is changed
> from range 8-12 to 0-240
> 
> Fixes: 1703e94ac5ce ("qat: add driver for QuickAssist devices")
> 
> Signed-off-by: Arek Kusztal 
Acked-by: Fiona Trahe 

[dpdk-dev] [PATCH] mk: use extra cflags when linking apps with the compiler

[Gage Eads]

From: John Jacques 

When using the compiler to link applications, include EXTRA_CFLAGS. This
is needed, for example, when cross-compiling, to pass --sysroot.
GCC cross-compilers built with Yocto don't use the --with-sysroot option,
making it necessary to pass --sysroot command-line option.

Signed-off-by: John Jacques 
Signed-off-by: Gage Eads 
---
 mk/rte.app.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index b5215c0..bcaf1b3 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -235,7 +235,7 @@ build: _postbuild
 exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1
 
 ifeq ($(LINK_USING_CC),1)
-O_TO_EXE = $(CC) -o $@ $(CFLAGS) $(OBJS-y) $(call linkerprefix, \
+O_TO_EXE = $(CC) -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $(OBJS-y) $(call 
linkerprefix, \
$(LDLIBS) $(LDFLAGS) $(LDFLAGS_$(@)) $(EXTRA_LDFLAGS) \
$(MAPFLAGS))
 else
-- 
2.7.4

Re: [dpdk-dev] [PATCH v2 04/13] net: fix missing include in exported header

[Singh, Jasvinder]

-Original Message-
From: Adrien Mazarguil [mailto:adrien.mazarg...@6wind.com] 
Sent: Tuesday, April 25, 2017 9:30 AM
To: dev@dpdk.org
Cc: Singh, Jasvinder 
Subject: [PATCH v2 04/13] net: fix missing include in exported header

This commit addresses the following errors:

 In file included from /tmp/check-includes.sh.18889.c:1:0:
 build/include/rte_net_crc.h:86:1: error: unknown type name 'uint32_t'
 [...]

Fixes: 986ff526fb84 ("net: add CRC computation API")

Cc: Jasvinder Singh 
Signed-off-by: Adrien Mazarguil 


Acked-by: Jasvinder Singh 

Thanks.

Re: [dpdk-dev] [PATCH 2/3] app/testpmd: enabled control for packet timestamps

[Thomas Monjalon]

Hi,

25/04/2017 16:02, Wu, Jingjing:
> From: Oleg Kuporosov
> > Implemented two methods of control
> > 
> > - by --enable-timestamps CL testpmd application we can enable timestamping
> >   for all ports;
> > - in interactive mode port config  timestamps on|off is able to
> >   configure timestamping per specific port.
> > 
> > The control doesn't interact with IEEE1588 PTP implementation there as it is
> > under macro compilation but can be extended in the future.
> > 
> > This feature is required for debugging/testing purposes for real time HW 
> > packet
> > timestamping.
> 
> We have ieee1588fwd.c to demo the timesync enable/disable, can we reuse
> The fwd engine instead of defining new commands?

Yes for IEEE1588 feature, we should use app/test-pmd/ieee1588fwd.c.

There is more to say about this feature.

The main goal of this patchset was to add a timestamp in the mbuf.
It has been done by another patchset in 17.05.
Do we know how to test this timestamp in testpmd?

About IEEE1588 feature, why is there a config option?
CONFIG_RTE_LIBRTE_IEEE1588
A feature should never be disabled at compile time.
There is also a runtime enablement with rte_eth_timesync_enable().

I think we need some discussions here.
Thanks

[dpdk-dev] [PATCH] lib/cryptodev: fix API digest length comments

[Fiona Trahe]

Fix misleading comments clarifying setting of digest length.

Fixes: d11b0f30df88 ("cryptodev: introduce API and framework for crypto 
devices")

Cc: sta...@dpdk.org
Signed-off-by: Fiona Trahe 
---
 lib/librte_cryptodev/rte_crypto_sym.h | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/librte_cryptodev/rte_crypto_sym.h 
b/lib/librte_cryptodev/rte_crypto_sym.h
index eb7b530..12f1583 100644
--- a/lib/librte_cryptodev/rte_crypto_sym.h
+++ b/lib/librte_cryptodev/rte_crypto_sym.h
@@ -310,11 +310,10 @@ struct rte_crypto_auth_xform {
 * this specifies the length of the digest to be compared for the
 * session.
 *
+* It is the caller's responsibility to ensure that the
+* digest length is compliant with the hash algorithm being used.
 * If the value is less than the maximum length allowed by the hash,
-* the result shall be truncated.  If the value is greater than the
-* maximum length allowed by the hash then an error will be generated
-* by *rte_cryptodev_sym_session_create* or by the
-* *rte_cryptodev_sym_enqueue_burst* if using session-less APIs.
+* the result shall be truncated.
 */
 
uint32_t add_auth_data_length;
@@ -597,7 +596,9 @@ struct rte_crypto_sym_op {
phys_addr_t phys_addr;
/**< Physical address of digest */
uint16_t length;
-   /**< Length of digest */
+   /**< Length of digest. This must be the same value as
+* @ref rte_crypto_auth_xform.digest_length.
+*/
} digest; /**< Digest parameters */
 
struct {
-- 
2.5.0

[dpdk-dev] [PATCH] ip_frag: free mbufs on reassembly table destroy

[Allain Legacy]

From: Dahir Osman 

The rte_ip_frag_table_destroy procedure simply releases the memory for the
table without freeing the packet buffers that may be referenced in the hash
table for in-flight or incomplete packet reassembly operations.  To prevent
leaked mbufs go through the list of fragments and free each one
individually.

Reported-by: Matt Peters 
Signed-off-by: Allain Legacy 
---
 lib/librte_ip_frag/ip_frag_common.h   | 20 
 lib/librte_ip_frag/rte_ip_frag.h  |  7 ++-
 lib/librte_ip_frag/rte_ip_frag_common.c   | 12 
 lib/librte_ip_frag/rte_ipfrag_version.map |  7 +++
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/lib/librte_ip_frag/ip_frag_common.h 
b/lib/librte_ip_frag/ip_frag_common.h
index 835e4f93f..9f5619651 100644
--- a/lib/librte_ip_frag/ip_frag_common.h
+++ b/lib/librte_ip_frag/ip_frag_common.h
@@ -130,6 +130,26 @@ ip_frag_free(struct ip_frag_pkt *fp, struct 
rte_ip_frag_death_row *dr)
dr->cnt = k;
 }
 
+/* delete fragment's mbufs immediately instead of using death row */
+static inline void
+ip_frag_free_immediate(struct ip_frag_pkt *fp)
+{
+   uint32_t i;
+
+   for (i = 0; i < fp->last_idx; i++) {
+   if (fp->frags[i].mb != NULL) {
+   IP_FRAG_LOG(DEBUG, "%s:%d\n"
+   "mbuf: %p, tms: %" PRIu64", key: <%" PRIx64 ", 
%#x>\n",
+   __func__, __LINE__, fp->frags[i].mb, fp->start,
+   fp->key.src_dst[0], fp->key.id);
+   rte_pktmbuf_free(fp->frags[i].mb);
+   fp->frags[i].mb = NULL;
+   }
+   }
+
+   fp->last_idx = 0;
+}
+
 /* if key is empty, mark key as in use */
 static inline void
 ip_frag_inuse(struct rte_ip_frag_tbl *tbl, const struct  ip_frag_pkt *fp)
diff --git a/lib/librte_ip_frag/rte_ip_frag.h b/lib/librte_ip_frag/rte_ip_frag.h
index 6708906d3..ff16f4c52 100644
--- a/lib/librte_ip_frag/rte_ip_frag.h
+++ b/lib/librte_ip_frag/rte_ip_frag.h
@@ -180,11 +180,8 @@ struct rte_ip_frag_tbl * rte_ip_frag_table_create(uint32_t 
bucket_num,
  * @param tbl
  *   Fragmentation table to free.
  */
-static inline void
-rte_ip_frag_table_destroy(struct rte_ip_frag_tbl *tbl)
-{
-   rte_free(tbl);
-}
+void
+rte_ip_frag_table_destroy(struct rte_ip_frag_tbl *tbl);
 
 /**
  * This function implements the fragmentation of IPv6 packets.
diff --git a/lib/librte_ip_frag/rte_ip_frag_common.c 
b/lib/librte_ip_frag/rte_ip_frag_common.c
index 6176ff4e0..70964101c 100644
--- a/lib/librte_ip_frag/rte_ip_frag_common.c
+++ b/lib/librte_ip_frag/rte_ip_frag_common.c
@@ -109,6 +109,18 @@ rte_ip_frag_table_create(uint32_t bucket_num, uint32_t 
bucket_entries,
return tbl;
 }
 
+/* delete fragmentation table */
+void
+rte_ip_frag_table_destroy(struct rte_ip_frag_tbl *tbl)
+{
+   uint32_t i;
+
+   for (i = 0; i < tbl->nb_entries; i++)
+   ip_frag_free_immediate(&tbl->pkt[i]);
+
+   rte_free(tbl);
+}
+
 /* dump frag table statistics to file */
 void
 rte_ip_frag_table_statistics_dump(FILE *f, const struct rte_ip_frag_tbl *tbl)
diff --git a/lib/librte_ip_frag/rte_ipfrag_version.map 
b/lib/librte_ip_frag/rte_ipfrag_version.map
index 354fa0822..29e2cfea5 100644
--- a/lib/librte_ip_frag/rte_ipfrag_version.map
+++ b/lib/librte_ip_frag/rte_ipfrag_version.map
@@ -11,3 +11,10 @@ DPDK_2.0 {
 
local: *;
 };
+
+DPDK_17.05 {
+global:
+
+rte_ip_frag_table_destroy;
+
+} DPDK_2.0;
-- 
2.12.1

Re: [dpdk-dev] [PATCH v3] net/i40e: mbuf alloc failed counter not incremented

[Zhang, Helin]

> -Original Message-
> From: Allain Legacy [mailto:allain.leg...@windriver.com]
> Sent: Tuesday, April 25, 2017 8:29 PM
> To: Zhang, Helin; Wu, Jingjing
> Cc: dev@dpdk.org; Peters, Matt (Wind River)
> Subject: [PATCH v3] net/i40e: mbuf alloc failed counter not incremented
> 
> From: Matt Peters 
> 
> When an mbuf alloc fails during the mempool get operation for the i40e bulk
> alloc receive function, the rx_mbuf_alloc_failed counter is not incremented to
> record the error.
> 
> This fix ensures consistency with the other i40e receive procedures and other
> net drivers.
> 
> Signed-off-by: Matt Peters 
> Signed-off-by: Allain Legacy 
Acked-by: Helin Zhang 

> ---
>  drivers/net/i40e/i40e_rxtx.c | 23 +--
>  1 file changed, 17 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index
> e5471b143..74055bb04 100644
> --- a/drivers/net/i40e/i40e_rxtx.c
> +++ b/drivers/net/i40e/i40e_rxtx.c
> @@ -610,6 +610,7 @@ static inline uint16_t  rx_recv_pkts(void *rx_queue,
> struct rte_mbuf **rx_pkts, uint16_t nb_pkts)  {
>   struct i40e_rx_queue *rxq = (struct i40e_rx_queue *)rx_queue;
> + struct rte_eth_dev *dev;
>   uint16_t nb_rx = 0;
> 
>   if (!nb_pkts)
> @@ -627,9 +628,10 @@ rx_recv_pkts(void *rx_queue, struct rte_mbuf
> **rx_pkts, uint16_t nb_pkts)
>   if (i40e_rx_alloc_bufs(rxq) != 0) {
>   uint16_t i, j;
> 
> - PMD_RX_LOG(DEBUG, "Rx mbuf alloc failed for "
> -"port_id=%u, queue_id=%u",
> -rxq->port_id, rxq->queue_id);
> + dev = I40E_VSI_TO_ETH_DEV(rxq->vsi);
> + dev->data->rx_mbuf_alloc_failed +=
> + rxq->rx_free_thresh;
> +
>   rxq->rx_nb_avail = 0;
>   rxq->rx_tail = (uint16_t)(rxq->rx_tail - nb_rx);
>   for (i = 0, j = rxq->rx_tail; i < nb_rx; i++, j++) @@ 
> -691,6
> +693,7 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
> uint16_t nb_pkts)
>   union i40e_rx_desc rxd;
>   struct i40e_rx_entry *sw_ring;
>   struct i40e_rx_entry *rxe;
> + struct rte_eth_dev *dev;
>   struct rte_mbuf *rxm;
>   struct rte_mbuf *nmb;
>   uint16_t nb_rx;
> @@ -721,10 +724,13 @@ i40e_recv_pkts(void *rx_queue, struct rte_mbuf
> **rx_pkts, uint16_t nb_pkts)
>   break;
> 
>   nmb = rte_mbuf_raw_alloc(rxq->mp);
> - if (unlikely(!nmb))
> + if (unlikely(!nmb)) {
> + dev = I40E_VSI_TO_ETH_DEV(rxq->vsi);
> + dev->data->rx_mbuf_alloc_failed++;
>   break;
> - rxd = *rxdp;
> + }
> 
> + rxd = *rxdp;
>   nb_hold++;
>   rxe = &sw_ring[rx_id];
>   rx_id++;
> @@ -816,6 +822,7 @@ i40e_recv_scattered_pkts(void *rx_queue,
>   struct rte_mbuf *nmb, *rxm;
>   uint16_t rx_id = rxq->rx_tail;
>   uint16_t nb_rx = 0, nb_hold = 0, rx_packet_len;
> + struct rte_eth_dev *dev;
>   uint32_t rx_status;
>   uint64_t qword1;
>   uint64_t dma_addr;
> @@ -833,8 +840,12 @@ i40e_recv_scattered_pkts(void *rx_queue,
>   break;
> 
>   nmb = rte_mbuf_raw_alloc(rxq->mp);
> - if (unlikely(!nmb))
> + if (unlikely(!nmb)) {
> + dev = I40E_VSI_TO_ETH_DEV(rxq->vsi);
> + dev->data->rx_mbuf_alloc_failed++;
>   break;
> + }
> +
>   rxd = *rxdp;
>   nb_hold++;
>   rxe = &sw_ring[rx_id];
> --
> 2.12.1

[dpdk-dev] [PATCH v1] doc: Merge l3fwd and l3fwd-acl documentation files

[Ravi Kerur]

Merge relevant contents of l3fwd and l3fwd-acl documentation.
Modify l3fwd document with ACL specific information.
Remove l3fwd-acl documentation file.

Signed-off-by: Ravi Kerur 
---
 doc/guides/sample_app_ug/img/ipv4_hash_rule.svg| 158 +
 doc/guides/sample_app_ug/img/ipv4_lpm_rule.svg | 139 
 doc/guides/sample_app_ug/index.rst |   1 -
 doc/guides/sample_app_ug/l3_forward.rst| 326 -
 .../sample_app_ug/l3_forward_access_ctrl.rst   | 385 -
 5 files changed, 614 insertions(+), 395 deletions(-)
 create mode 100644 doc/guides/sample_app_ug/img/ipv4_hash_rule.svg
 create mode 100644 doc/guides/sample_app_ug/img/ipv4_lpm_rule.svg
 delete mode 100644 doc/guides/sample_app_ug/l3_forward_access_ctrl.rst

diff --git a/doc/guides/sample_app_ug/img/ipv4_hash_rule.svg 
b/doc/guides/sample_app_ug/img/ipv4_hash_rule.svg
new file mode 100644
index 000..89d563f
--- /dev/null
+++ b/doc/guides/sample_app_ug/img/ipv4_hash_rule.svg
@@ -0,0 +1,158 @@
+
+
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="819"
+   height="460"
+   viewBox="0 0 819 460"
+   sodipodi:docname="ipv4_hash_rule.svg">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+  
+
+  
+  
+  
+  
+
diff --git a/doc/guides/sample_app_ug/img/ipv4_lpm_rule.svg 
b/doc/guides/sample_app_ug/img/ipv4_lpm_rule.svg
new file mode 100644
index 000..dcb63b6
--- /dev/null
+++ b/doc/guides/sample_app_ug/img/ipv4_lpm_rule.svg
@@ -0,0 +1,139 @@
+
+
+
+http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="819"
+   height="460"
+   viewBox="0 0 819 460"
+   sodipodi:docname="ipv4_lpm_rule.svg">
+  
+
+  
+image/svg+xml
+http://purl.org/dc/dcmitype/StillImage"; />
+
+  
+
+  
+  
+  
+  
+
diff --git a/doc/guides/sample_app_ug/index.rst 
b/doc/guides/sample_app_ug/index.rst
index 02611ef..62cafb0 100644
--- a/doc/guides/sample_app_ug/index.rst
+++ b/doc/guides/sample_app_ug/index.rst
@@ -53,7 +53,6 @@ Sample Applications User Guides
 l2_forward_cat
 l3_forward
 l3_forward_power_man
-l3_forward_access_ctrl
 l3_forward_virtual
 link_status_intr
 load_balancer
diff --git a/doc/guides/sample_app_ug/l3_forward.rst 
b/doc/guides/sample_app_ug/l3_forward.rst
index 6a6b8fb..69063bd 100644
--- a/doc/guides/sample_app_ug/l3_forward.rst
+++ b/doc/guides/sample_app_ug/l3_forward.rst
@@ -1,5 +1,5 @@
 ..  BSD LICENSE
-Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+Copyright(c) 2010-2017 Intel Corporation. All rights reserved.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -31,12 +31,18 @@
 L3 Forwarding Sample Application
 
 
-The L3 Forwarding application is a simple example of packet processing using 
the DPDK.
-The application performs L3 forwarding.
+The L3 Forwarding with Hash, LPM or Access Control application is a simple 
example of packet processing using the DPDK.
+The application performs L3 forwarding when Hash or LPM is used.
+The application performs a security check on received packets when Access 
Control is used.
+Packets that are in the Access Control List (ACL), which is loaded during 
initialization, are dropped.
+Others are forwarded to the correct port.
 
 Overview
 
 
+Hash and LPM
+
+
 The application demonstrates the use of the hash and LPM libraries in the DPDK 
to implement packet forwarding.
 The initialization and run-time paths are very similar to those of the 
:doc:`l2_forward_real_virtual`.
 The main difference from the L2 Forwarding sample application is that the 
forwarding decision
@@ -49,15 +55,263 @@ The hash object is used in correlation with a flow table 
to map each input packe
 The hash lookup key is represented by a DiffServ 5-tuple composed of the 
following fields read from the input packet:
 Source IP Address, Destination IP Address, Protocol, Source Port and 
Destination Port.
 The ID of the output interface for the input packe

[dpdk-dev] [PATCH] bnxt: Add new device ids

[Ajit Khaparde]

Add support for new device ids.

Signed-off-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt_ethdev.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 5dc3ff0..7805221 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -60,6 +60,8 @@ static const char bnxt_version[] =
 
 #define PCI_VENDOR_ID_BROADCOM 0x14E4
 
+#define BROADCOM_DEV_ID_STRATUS_NIC 0x1614
+#define BROADCOM_DEV_ID_57414_VF 0x16c1
 #define BROADCOM_DEV_ID_57301 0x16c8
 #define BROADCOM_DEV_ID_57302 0x16c9
 #define BROADCOM_DEV_ID_57304_PF 0x16ca
@@ -94,6 +96,8 @@ static const char bnxt_version[] =
 #define BROADCOM_DEV_ID_57416_MF 0x16ee
 
 static const struct rte_pci_id bnxt_pci_id_map[] = {
+   { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_STRATUS_NIC) },
+   { RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57414_VF) },
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57301) },
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57302) },
{ RTE_PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, BROADCOM_DEV_ID_57304_PF) },
-- 
2.10.1 (Apple Git-78)

Re: [dpdk-dev] [PATCH v6 0/5] Extended xstats API in ethdev library to allow grouping of stats

[Roger B Melton]

On 4/24/17 11:49 AM, Mcnamara, John wrote:

-Original Message-
From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Thomas Monjalon
Sent: Monday, April 24, 2017 1:41 PM
To: Kozak, KubaX 
Cc: dev@dpdk.org; Olivier Matz ; Van Haaren, Harry
; Jain, Deepak K ;
Piasecki, JacekX 
Subject: Re: [dpdk-dev] [PATCH v6 0/5] Extended xstats API in ethdev
library to allow grouping of stats

24/04/2017 14:32, Olivier Matz:

Hi,


...

So, I wonder if it wouldn't be more simple to keep the old API intact
(it would avoid unannounced breakage). The new feature can be
implemented in an additional API:

  rte_eth_xstats_get_by_id(uint8_t port_id, const uint64_t *ids,
uint64_t *values, unsigned int size)
rte_eth_xstats_get_names_by_id(uint8_t port_id, const uint64_t *ids,
struct rte_eth_xstat_name *xstats_names, unsigned int size)

Or:

  rte_eth_xstats_get_by_id(uint8_t port_id, const uint64_t *ids,
struct rte_eth_xstat *values, unsigned int size)
rte_eth_xstats_get_names_by_id(uint8_t port_id, const uint64_t *ids,
struct rte_eth_xstat_name *xstats_names, unsigned int size)

  (which would allow to deprecate the old API, but I'm not sure
   we need to)


Can we fix that for 17.05?

...

Back to the issues, please try to fix it quickly or we should revert it
for 17.05-rc3.

Hi,

We'll submit a patch to change the APIs for rte_eth_xstats_get() and
rte_eth_xstats_get_names() back to their previous signature, without
symbol versions, and add the APIs suggested by Olivier.

We'll work on that as soon as possible.

John
.


Hi folks,

I adapted our application to the API changes presented in 17.05-rc2 and 
encountered problem that I don't think was pointed out in Olivier's list 
of issues.


In our application we call rte_eth_stats_get() with NULL pointers to 
determine the number of xstats.  We use the returned count  to 
pre-allocate buffers for the name strings and xstats values and then 
invoke rte_eth_xstats_get_names() and rte_eth_xstats_get() with pointers 
to appropriately sized buffers and the number of entries available in 
those buffers.


Things appeared to work fine until I requested stats for a net_ixgbe_vf 
port. In that case the initial call to rte_eth_xstats_get() did not 
account for the xstats extensions from the ixgbevf PMD.  Long story 
short, my buffers were undersized and bad things happened.


John,

If you intend to restore the previous API signature but retain the -rc2 
internal implementation, may I suggest that both APIs use the same 
internal function to determine stats count.  Otherwise the potential for 
disagreement between the APIs will remain.


Also while on this topic, IMO the above demonstrates that we really need 
an API to query the xstats count rather than relying on 
rte_eth_xstats_get() or rte_eth_xstats_get_names() with 0'd out arguments.


Regards,
Roger

Re: [dpdk-dev] [PATCH] net/virtio-user: fix recognize physical devices

[Yuanhan Liu]

On Fri, Apr 21, 2017 at 02:28:09AM +, Jianfeng Tan wrote:
> Segfault happens when using virtio-user after commit 7f0a669e7b04
> ("ethdev: add allocation helper for virtual drivers").
> 
> It's due to we use ethdev->device to recognize physical devices,
> but after above commit, this field is also filled for virtual
> devices. Then we obtain the wrong pci_dev pointer and accessing
> its field when copying pci info results in segfault.
> 
> To fix it, we use hw->virtio_user_dev to differentiate physical
> devices from virtual devices.
> 
> Fixes: 6a7c0dfcdf40 ("net/virtio: do not depend on PCI device of ethdev")
> 
> Signed-off-by: Jianfeng Tan 

Acked-by: Yuanhan Liu 

--yliu

[dpdk-dev] custom align for mempool elements

[Gregory Etelson]

Signed-off-by: Gregory Etelson 
---
 lib/librte_mempool/rte_mempool.c | 27 ---
 lib/librte_mempool/rte_mempool.h |  1 +
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index f65310f..c780df3 100644
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -382,7 +382,7 @@ rte_mempool_populate_phys(struct rte_mempool *mp, char 
*vaddr,
if (mp->flags & MEMPOOL_F_NO_CACHE_ALIGN)
off = RTE_PTR_ALIGN_CEIL(vaddr, 8) - vaddr;
else
-   off = RTE_PTR_ALIGN_CEIL(vaddr, RTE_CACHE_LINE_SIZE) - vaddr;
+   off = RTE_PTR_ALIGN_CEIL(vaddr, mp->elt_align) - vaddr;
 
while (off + total_elt_sz <= len && mp->populated_size < mp->size) {
off += mp->header_size;
@@ -392,6 +392,7 @@ rte_mempool_populate_phys(struct rte_mempool *mp, char 
*vaddr,
else
mempool_add_elem(mp, (char *)vaddr + off, paddr + off);
off += mp->elt_size + mp->trailer_size;
+   off = RTE_ALIGN_CEIL(off, mp->elt_align);
i++;
}
 
@@ -508,6 +509,20 @@ rte_mempool_populate_virt(struct rte_mempool *mp, char 
*addr,
return ret;
 }
 
+static uint32_t
+mempool_default_elt_aligment(void)
+{
+   uint32_t align;
+   if (rte_xen_dom0_supported()) {
+  align = RTE_PGSIZE_2M;;
+   } else if (rte_eal_has_hugepages()) {
+  align = RTE_CACHE_LINE_SIZE;
+   } else {
+  align = getpagesize();
+   }
+   return align;
+}
+
 /* Default function to populate the mempool: allocate memory in memzones,
  * and populate them. Return the number of objects added, or a negative
  * value on error.
@@ -518,7 +533,7 @@ rte_mempool_populate_default(struct rte_mempool *mp)
int mz_flags = RTE_MEMZONE_1GB|RTE_MEMZONE_SIZE_HINT_ONLY;
char mz_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *mz;
-   size_t size, total_elt_sz, align, pg_sz, pg_shift;
+   size_t size, total_elt_sz, pg_sz, pg_shift;
phys_addr_t paddr;
unsigned mz_id, n;
int ret;
@@ -530,15 +545,12 @@ rte_mempool_populate_default(struct rte_mempool *mp)
if (rte_xen_dom0_supported()) {
pg_sz = RTE_PGSIZE_2M;
pg_shift = rte_bsf32(pg_sz);
-   align = pg_sz;
} else if (rte_eal_has_hugepages()) {
pg_shift = 0; /* not needed, zone is physically contiguous */
pg_sz = 0;
-   align = RTE_CACHE_LINE_SIZE;
} else {
pg_sz = getpagesize();
pg_shift = rte_bsf32(pg_sz);
-   align = pg_sz;
}
 
total_elt_sz = mp->header_size + mp->elt_size + mp->trailer_size;
@@ -553,11 +565,11 @@ rte_mempool_populate_default(struct rte_mempool *mp)
}
 
mz = rte_memzone_reserve_aligned(mz_name, size,
-   mp->socket_id, mz_flags, align);
+   mp->socket_id, mz_flags, mp->elt_align);
/* not enough memory, retry with the biggest zone we have */
if (mz == NULL)
mz = rte_memzone_reserve_aligned(mz_name, 0,
-   mp->socket_id, mz_flags, align);
+   mp->socket_id, mz_flags, mp->elt_align);
if (mz == NULL) {
ret = -rte_errno;
goto fail;
@@ -827,6 +839,7 @@ rte_mempool_create_empty(const char *name, unsigned n, 
unsigned elt_size,
/* Size of default caches, zero means disabled. */
mp->cache_size = cache_size;
mp->private_data_size = private_data_size;
+   mp->elt_align = mempool_default_elt_aligment();
STAILQ_INIT(&mp->elt_list);
STAILQ_INIT(&mp->mem_list);
 
diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index 48bc8ea..6631973 100644
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -245,6 +245,7 @@ struct rte_mempool {
 * this mempool.
 */
int32_t ops_index;
+   uint32_t elt_align;
 
struct rte_mempool_cache *local_cache; /**< Per-lcore local cache */
 
-- 
2.9.3

[dpdk-dev] [PATCH 3/3] net/virtio: fix link status always being down

[Jianfeng Tan]

The virtio port link status will always be DOWN:

The commit aa9f06061765 ("net/virtio: fix link status always being up")
introduces a flag to help checking the status. If this flag is not set,
status will be always down. However, in dev start, this flag is set
after link status update, then we miss the chance to change the status
to UP in dev start.

To fix this bug, we simply move the link status update after the flag
setting so that the status can be correctly updated.

Fixes: aa9f06061765 ("net/virtio: fix link status always being up")
Cc: sta...@dpdk.org

Signed-off-by: Jianfeng Tan 
---
 drivers/net/virtio/virtio_ethdev.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c 
b/drivers/net/virtio/virtio_ethdev.c
index e79748e..cd87c0e 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1742,9 +1742,6 @@ virtio_dev_start(struct rte_eth_dev *dev)
}
}
 
-   /* Initialize Link state */
-   virtio_dev_link_update(dev, 0);
-
/*Notify the backend
 *Otherwise the tap backend might already stop its queue due to 
fullness.
 *vhost backend will have no chance to be waked up
@@ -1773,8 +1770,12 @@ virtio_dev_start(struct rte_eth_dev *dev)
txvq = dev->data->tx_queues[i];
VIRTQUEUE_DUMP(txvq->vq);
}
+
hw->started = 1;
 
+   /* Initialize Link state */
+   virtio_dev_link_update(dev, 0);
+
return 0;
 }
 
-- 
2.7.4

[dpdk-dev] [PATCH 1/3] net/virtio: fix wrong MSI-X for modern devices

[Jianfeng Tan]

The field, use_msix, in struct virtio_hw is not updated for modern
device, and is always zero. And now we depend on the status feature
and MSI-X to report LSC support (which is also not a correct
behavior). As a result, LSC is always disabled for modern devices.

Te fix this, we just recognize MSI-X capability when going through
capability list, and update the info in virtio.

Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0")
Cc: sta...@dpdk.org

Signed-off-by: Jianfeng Tan 
---
 drivers/net/virtio/virtio_pci.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index b767c03..ecad46e 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -50,6 +50,7 @@
  */
 #define PCI_CAPABILITY_LIST0x34
 #define PCI_CAP_ID_VNDR0x09
+#define PCI_CAP_ID_MSIX0x11
 
 /*
  * The remaining space is defined by each driver as the per-driver
@@ -650,6 +651,9 @@ virtio_read_caps(struct rte_pci_device *dev, struct 
virtio_hw *hw)
break;
}
 
+   if (cap.cap_vndr == PCI_CAP_ID_MSIX)
+   hw->use_msix = 1;
+
if (cap.cap_vndr != PCI_CAP_ID_VNDR) {
PMD_INIT_LOG(DEBUG,
"[%2x] skipping non VNDR cap id: %02x",
-- 
2.7.4

[dpdk-dev] [PATCH 0/3] Some fixes on virtio LSC

[Jianfeng Tan]

Patch 1: fix wrong MSI-X for modern devices so that LSC is always not
 available.
Patch 2: clean up LSC setting.
Patch 3: fix link status always being down.

Signed-off-by: Jianfeng Tan 

Jianfeng Tan (3):
  net/virtio: fix wrong MSI-X for modern devices
  net/virtio: clean up LSC setting
  net/virtio: fix link status always being down

 drivers/net/virtio/virtio_ethdev.c | 14 +-
 drivers/net/virtio/virtio_pci.c| 52 +-
 drivers/net/virtio/virtio_pci.h|  3 +--
 3 files changed, 13 insertions(+), 56 deletions(-)

-- 
2.7.4

[dpdk-dev] [PATCH 2/3] net/virtio: clean up LSC setting

[Jianfeng Tan]

Clean up LSC setting:
  - LSC flag is set in several places, but only the last one takes
effect; so we just keep the last one.
  - As we already change to use capability list to detect MSI-X, remove
the redundant MSI-X detection in legacy devices.

Signed-off-by: Jianfeng Tan 
---
 drivers/net/virtio/virtio_ethdev.c |  7 ++
 drivers/net/virtio/virtio_pci.c| 48 ++
 drivers/net/virtio/virtio_pci.h|  3 +--
 3 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c 
b/drivers/net/virtio/virtio_ethdev.c
index e6c57b3..e79748e 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1353,6 +1353,7 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t 
req_features)
rte_eth_copy_pci_info(eth_dev, pci_dev);
}
 
+   eth_dev->data->dev_flags = RTE_ETH_DEV_DETACHABLE;
/* If host does not support both status and MSI-X then disable LSC */
if (vtpci_with_feature(hw, VIRTIO_NET_F_STATUS) && hw->use_msix)
eth_dev->data->dev_flags |= RTE_ETH_DEV_INTR_LSC;
@@ -1521,7 +1522,6 @@ int
 eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
 {
struct virtio_hw *hw = eth_dev->data->dev_private;
-   uint32_t dev_flags = RTE_ETH_DEV_DETACHABLE;
int ret;
 
RTE_BUILD_BUG_ON(RTE_PKTMBUF_HEADROOM < sizeof(struct 
virtio_net_hdr_mrg_rxbuf));
@@ -1561,14 +1561,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
 * virtio_user_eth_dev_alloc() before eth_virtio_dev_init() is called.
 */
if (!hw->virtio_user_dev) {
-   ret = vtpci_init(RTE_DEV_TO_PCI(eth_dev->device), hw,
-&dev_flags);
+   ret = vtpci_init(RTE_DEV_TO_PCI(eth_dev->device), hw);
if (ret)
return ret;
}
 
-   eth_dev->data->dev_flags = dev_flags;
-
/* reset device and negotiate default features */
ret = virtio_init_device(eth_dev, VIRTIO_PMD_DEFAULT_GUEST_FEATURES);
if (ret < 0)
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index ecad46e..1df26a6 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -279,47 +279,6 @@ legacy_notify_queue(struct virtio_hw *hw, struct virtqueue 
*vq)
 VIRTIO_PCI_QUEUE_NOTIFY);
 }
 
-#ifdef RTE_EXEC_ENV_LINUXAPP
-static int
-legacy_virtio_has_msix(const struct rte_pci_addr *loc)
-{
-   DIR *d;
-   char dirname[PATH_MAX];
-
-   snprintf(dirname, sizeof(dirname),
-"%s/" PCI_PRI_FMT "/msi_irqs", pci_get_sysfs_path(),
-loc->domain, loc->bus, loc->devid, loc->function);
-
-   d = opendir(dirname);
-   if (d)
-   closedir(d);
-
-   return d != NULL;
-}
-#else
-static int
-legacy_virtio_has_msix(const struct rte_pci_addr *loc __rte_unused)
-{
-   /* nic_uio does not enable interrupts, return 0 (false). */
-   return 0;
-}
-#endif
-
-static int
-legacy_virtio_resource_init(struct rte_pci_device *pci_dev,
-   struct virtio_hw *hw, uint32_t *dev_flags)
-{
-   if (rte_eal_pci_ioport_map(pci_dev, 0, VTPCI_IO(hw)) < 0)
-   return -1;
-
-   if (pci_dev->intr_handle.type != RTE_INTR_HANDLE_UNKNOWN)
-   *dev_flags |= RTE_ETH_DEV_INTR_LSC;
-   else
-   *dev_flags &= ~RTE_ETH_DEV_INTR_LSC;
-
-   return 0;
-}
-
 const struct virtio_pci_ops legacy_ops = {
.read_dev_cfg   = legacy_read_dev_config,
.write_dev_cfg  = legacy_write_dev_config,
@@ -712,8 +671,7 @@ virtio_read_caps(struct rte_pci_device *dev, struct 
virtio_hw *hw)
  * Return 0 on success.
  */
 int
-vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw,
-  uint32_t *dev_flags)
+vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw)
 {
/*
 * Try if we can succeed reading virtio pci caps, which exists
@@ -724,12 +682,11 @@ vtpci_init(struct rte_pci_device *dev, struct virtio_hw 
*hw,
PMD_INIT_LOG(INFO, "modern virtio pci detected.");
virtio_hw_internal[hw->port_id].vtpci_ops = &modern_ops;
hw->modern = 1;
-   *dev_flags |= RTE_ETH_DEV_INTR_LSC;
return 0;
}
 
PMD_INIT_LOG(INFO, "trying with legacy virtio pci.");
-   if (legacy_virtio_resource_init(dev, hw, dev_flags) < 0) {
+   if (rte_eal_pci_ioport_map(dev, 0, VTPCI_IO(hw)) < 0) {
if (dev->kdrv == RTE_KDRV_UNKNOWN &&
(!dev->device.devargs ||
 dev->device.devargs->type !=
@@ -742,7 +699,6 @@ vtpci_init(struct rte_pci_device *dev, struct virtio_hw *hw,
}
 
virtio_hw_internal[hw->port_id].vtpci_ops = &legacy_ops;
-   hw->use_msix = legacy_virtio_has_msix(&dev->addr);
hw->modern   = 0;
 
return 0;
diff --

[dpdk-dev] Too much print of testpmd

[Lu, Wenzhuo]

Hi Gaetan,
When using DPDK PF + DPDK VF, there's too much print like,
Port 0: VF Mbox event

Port 0: VF Mbox event

Port 0: VF Mbox event

Port 0: VF Mbox event

Port 0: VF Mbox event

Port 0: VF Mbox event

Port 0: VF Mbox event

Port 0: VF Mbox event

Port 0: VF Mbox event

Make it a little hard to type a CLI.
I think it's introduced by this commit,
commit 76ad4a2d82d4d72c3a7ed4675d77268b5fae3cc9
Author: Gaetan Rivet 
Date:   Tue Apr 18 14:17:40 2017 +0200

app/testpmd: add generic event handler

This is a rather simple handler that prints a message with the name of
the current event. It can be used to check PMD callback registration and
triggers.

Seems it's not good to print every event directly. If it's necessary, is it 
better to redirect the output to a log file?
Thanks.


Best regards
Wenzhuo Lu

Re: [dpdk-dev] [PATCH 2/3] net/virtio: clean up LSC setting

[Yuanhan Liu]

On Wed, Apr 26, 2017 at 04:52:50AM +, Jianfeng Tan wrote:
> Clean up LSC setting:

Firstly, this patch does two things. There should be two patches.

>   - LSC flag is set in several places, but only the last one takes
> effect; so we just keep the last one.
>   - As we already change to use capability list to detect MSI-X, remove
> the redundant MSI-X detection in legacy devices.

However, there is no capability list for legacy device.

--yliu

Re: [dpdk-dev] [PATCH 2/3] net/virtio: clean up LSC setting

[Tan, Jianfeng]

> -Original Message-
> From: Yuanhan Liu [mailto:yuanhan@linux.intel.com]
> Sent: Wednesday, April 26, 2017 1:33 PM
> To: Tan, Jianfeng
> Cc: dev@dpdk.org; maxime.coque...@redhat.com; tho...@monjalon.net
> Subject: Re: [PATCH 2/3] net/virtio: clean up LSC setting
> 
> On Wed, Apr 26, 2017 at 04:52:50AM +, Jianfeng Tan wrote:
> > Clean up LSC setting:
> 
> Firstly, this patch does two things. There should be two patches.

I just merged them into one to adapt to the name of "clean up" :-)

> 
> >   - LSC flag is set in several places, but only the last one takes
> > effect; so we just keep the last one.
> >   - As we already change to use capability list to detect MSI-X, remove
> > the redundant MSI-X detection in legacy devices.
> 
> However, there is no capability list for legacy device.

When I try legacy device on QEMU (disable-modern=true), I did detect MSI-X 
capability. So does virtio spec mean legacy devices do not have vendor-specific 
capability list?

Thanks,
Jianfeng

Re: [dpdk-dev] [PATCH 2/3] net/virtio: clean up LSC setting

[Yuanhan Liu]

On Wed, Apr 26, 2017 at 05:44:05AM +, Tan, Jianfeng wrote:
> 
> 
> > -Original Message-
> > From: Yuanhan Liu [mailto:yuanhan@linux.intel.com]
> > Sent: Wednesday, April 26, 2017 1:33 PM
> > To: Tan, Jianfeng
> > Cc: dev@dpdk.org; maxime.coque...@redhat.com; tho...@monjalon.net
> > Subject: Re: [PATCH 2/3] net/virtio: clean up LSC setting
> > 
> > On Wed, Apr 26, 2017 at 04:52:50AM +, Jianfeng Tan wrote:
> > > Clean up LSC setting:
> > 
> > Firstly, this patch does two things. There should be two patches.
> 
> I just merged them into one to adapt to the name of "clean up" :-)

I then could merge all bug fix patches into one and name it "fix buges"?
No, please don't do that. It hurts review.

> > 
> > >   - LSC flag is set in several places, but only the last one takes
> > > effect; so we just keep the last one.
> > >   - As we already change to use capability list to detect MSI-X, remove
> > > the redundant MSI-X detection in legacy devices.
> > 
> > However, there is no capability list for legacy device.
> 
> When I try legacy device on QEMU (disable-modern=true), I did detect MSI-X 
> capability. So does virtio spec mean legacy devices do not have 
> vendor-specific capability list?

Oh, right. I mixed that up.

--yliu

[dpdk-dev] [PATCH] doc: enic SR-IOV configurations

[John Daley]

Document SR-IOV passthrough setup and limitations
for enic PMD.

Signed-off-by: John Daley 
---
 doc/guides/nics/enic.rst | 94 
 1 file changed, 94 insertions(+)

diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst
index c535b589c..8f8ae1f9c 100644
--- a/doc/guides/nics/enic.rst
+++ b/doc/guides/nics/enic.rst
@@ -140,6 +140,83 @@ Masking of these feilds for partial match is also 
supported.
 Without advanced filter support, the flow director is limited to IPv4
 perfect filtering of the 5-tuple with no masking of fields supported.
 
+SR-IOV mode utilization
+---
+
+UCS blade servers configured with dynamic vNIC connection policies in UCS
+manager are capable of supporting assigned devices on virtual machines (VMs)
+through a KVM hypervisor. Assigned devices, also known as 'passthrough'
+devices, are SR-IOV virtual functions (VFs) on the host which are exposed
+to VM instances.
+
+The Cisco Virtual Machine Fabric Extender (VM-FEX) gives the VM a dedicated
+interface on the Fabric Interconnect (FI). Layer 2 switching is done at
+the FI. This may eliminate the requirement for software switching on the
+host to route intra-host VM traffic.
+
+Please refer to `Creating a Dynamic vNIC Connection Policy
+`_
+for information on configuring SR-IOV Adapter policies using UCS manager.
+
+Once the policies are in place and the host OS is reboot, VFs should be visible
+on the host, E.g.:
+
+.. code-block:: c
+
+ # lspci | grep Cisco | grep Ethernet
+ 0d:00.0 Ethernet controller: Cisco Systems Inc VIC Ethernet NIC (rev a2)
+ 0d:00.1 Ethernet controller: Cisco Systems Inc VIC SR-IOV VF (rev a2)
+ 0d:00.2 Ethernet controller: Cisco Systems Inc VIC SR-IOV VF (rev a2)
+ 0d:00.3 Ethernet controller: Cisco Systems Inc VIC SR-IOV VF (rev a2)
+ 0d:00.4 Ethernet controller: Cisco Systems Inc VIC SR-IOV VF (rev a2)
+ 0d:00.5 Ethernet controller: Cisco Systems Inc VIC SR-IOV VF (rev a2)
+ 0d:00.6 Ethernet controller: Cisco Systems Inc VIC SR-IOV VF (rev a2)
+ 0d:00.7 Ethernet controller: Cisco Systems Inc VIC SR-IOV VF (rev a2)
+
+Enable Intel IOMMU on the host and install KVM and libvirt. A VM instance 
should
+be created with an assigned device. When using libvirt, this configuration can
+be done within the domain (i.e. VM) config file. For example this entry maps
+host VF 0d:00:01 into the VM.
+
+.. code-block:: c
+
+
+  
+  
+
+  
+
+This configuration method is explained in more detail
+`here `_.
+Alternatively, the configuration can be done in a separate file using the
+``network`` keyword. This method is described here:
+`https://libvirt.org/formatnetwork.html 
`_
+
+When the VM instance is started, the enic KVM driver will bind the host VF to
+vfio, complete provisioning on the FI and bring up the link.
+
+.. note::
+
+It is not possible to use a VF directly from the host because it is not
+fully provisioned until the hypervisor brings up the VM that it is assigned
+to.
+
+In the VM instance, the VF will now be visible. E.g., here the VF 00:04.0 is
+seen on the VM instance and should be available for binding to a DPDK.
+
+.. code-block:: c
+
+ # lspci | grep Ether
+ 00:04.0 Ethernet controller: Cisco Systems Inc VIC SR-IOV VF (rev a2)
+
+Follow the normal DPDK install proceedure, binding the VF to either ``igb_uio``
+or ``vfio`` in non-IOMMU mode.
+
+Please see :ref:`Limitations ` for limitations in
+the use of SR-IOV.
+
+.. _enic_limitations:
+
 Limitations
 ---
 
@@ -169,6 +246,23 @@ Limitations
 - Flow director features are not supported on generation 1 Cisco VIC adapters
   (M81KR and P81E)
 
+- **SR-IOV**
+
+  - KVM hypervisor support only. VMware has not been tested.
+  - Requires VM-FEX, and so is only available on UCS managed servers connected
+to Fabric Interrconnects. It is not on standalone C-Series servers.
+  - VF devices are not usable directly from the host. They can  only be used
+as assigned devices on VM instances.
+  - Currently, unbind of the enic kernel mode driver 'enic' on the VM instance
+may hang. As a workaround, enic.ko should blacklisted or removed from the
+boot process.
+  - pci_generic cannot be used as the uio module in the VM. igb_uio or
+vfio in non-IOMMU mode can be used.
+  - The number of RQs in UCSM dynamic vNIC configurations must be at least 2.
+  - The number of SR-IOV devices is limited to 256. Components on target system
+might limit this number to fewer than 256.
+
+
 How to build the suite?
 ---
 The build instructions for the DPDK suite should b

Re: [dpdk-dev] [PATCH 2/3] net/virtio: clean up LSC setting

[Tan, Jianfeng]

> -Original Message-
> From: Yuanhan Liu [mailto:yuanhan@linux.intel.com]
> Sent: Wednesday, April 26, 2017 1:52 PM
> To: Tan, Jianfeng
> Cc: dev@dpdk.org; maxime.coque...@redhat.com; tho...@monjalon.net;
> Michael S. Tsirkin
> Subject: Re: [PATCH 2/3] net/virtio: clean up LSC setting
> 
> On Wed, Apr 26, 2017 at 05:44:05AM +, Tan, Jianfeng wrote:
> >
> >
> > > -Original Message-
> > > From: Yuanhan Liu [mailto:yuanhan@linux.intel.com]
> > > Sent: Wednesday, April 26, 2017 1:33 PM
> > > To: Tan, Jianfeng
> > > Cc: dev@dpdk.org; maxime.coque...@redhat.com;
> tho...@monjalon.net
> > > Subject: Re: [PATCH 2/3] net/virtio: clean up LSC setting
> > >
> > > On Wed, Apr 26, 2017 at 04:52:50AM +, Jianfeng Tan wrote:
> > > > Clean up LSC setting:
> > >
> > > Firstly, this patch does two things. There should be two patches.
> >
> > I just merged them into one to adapt to the name of "clean up" :-)
> 
> I then could merge all bug fix patches into one and name it "fix buges"?
> No, please don't do that. It hurts review.

OK, will fix this in next version.

Thanks,
Jianfeng

[dpdk-dev] dpdk-devbind can't be used misc with kernel tools

[Tu, LijuanX A]

Hi Guduri,

I am a tester from intel dpdk team. I get a issues on usertools/dpdk-devbind.py

With the usertools/dpdk-devbind.py , I can't bind driver as expect.

I use the "dpdk-devbind.py" bind pci to igb_uio, then I using kernel tools  
bind pci  to ixgbe,
I can bind pci to igb_uio successfully ,but it  bind back to ixgbe failed..

Bind pci to igb_uio and then  bind to ixgbe ,both use "dpdk-devbind.py", it 
works well.

Could you . have a look at this as soon as possible ,it block the daily 
regression test.
Thank you very much.


There are my test env and steps:

dpdk commit eba33e87ad37626604be7186e746751f99691084
Components: usertools/dpdk-devbind.py
kernel: 4.8.6-300.fc25.x86_64
driver: ixgbe
version: 5.0.4
firmware-version: 0x61bf0001
Expect: we can use dpdk-devbind.py to bind or unbind PCI-device, we also can 
use kernel tools to bind or unbind PCI-device, such as :
steps:
# ./dpdk-devbind.py --bind=igb_uio :05:00.0
status:
:05:00.0 '82599ES 10-Gigabit SFI/SFP+ Network Connection 10fb' drv=igb_uio 
unused=

# echo "8086 10fd" >/sys/bus/pci/drivers/ixgbe/new_id
# echo ":05:00.0" >/sys/bus/pci/devices/\:05\:00.0/driver/unbind
# echo ":05:00.0" >/sys/bus/pci/drivers/ixgbe/
# echo ":05:00.0" >/sys/bus/pci/drivers/ixgbe/bind
-bash: echo: write error: No such device
status
:05:00.0 '82599ES 10-Gigabit SFI/SFP+ Network Connection' 
unused=ixgbe,igb_uio
Result:
It can't bind to ixgbe, expect it can bind to ixgbe.
I think the related commit are ::
commit 2fc3502935700243d9a6d903166e6fd11e429843
Author: Guduri Prathyusha 
Date:   Wed Mar 22 19:41:29 2017 +0530
usertools: use optimized driver override scheme to bind

commit c3ce205d5729867bd1c4c4429a80e01a528d5905
Author: Guduri Prathyusha 
Date:   Wed Mar 22 19:41:28 2017 +0530
usertools: optimize lspci invocation

[dpdk-dev] [PATCH] examples/l3fwd-power: fix zero rxq handling

[Jingjing Wu]

If the number of rx queues is zero, it is meaningless to enable
rx interrupt. This patch fixes it.

Fixes: aee3bc79cc34 ("examples/l3fwd-power: enable one-shot Rx interrupt and 
polling switch")
Cc: sta...@dpdk.org
Signed-off-by: Jingjing Wu 
---
 examples/l3fwd-power/main.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index ec40a17..cea36dd 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -1654,6 +1654,7 @@ main(int argc, char **argv)
uint32_t n_tx_queue, nb_lcores;
uint32_t dev_rxq_num, dev_txq_num;
uint8_t portid, nb_rx_queue, queue, socketid;
+   uint16_t org_rxq_intr = port_conf.intr_conf.rxq;
 
/* catch SIGINT and restore cpufreq governor to ondemand */
signal(SIGINT, signal_exit_now);
@@ -1714,8 +1715,13 @@ main(int argc, char **argv)
n_tx_queue = dev_txq_num;
printf("Creating queues: nb_rxq=%d nb_txq=%u... ",
nb_rx_queue, (unsigned)n_tx_queue );
+   /* If number of Rx queue is 0, no need to enable Rx interrupt */
+   if (nb_rx_queue == 0)
+   port_conf.intr_conf.rxq = 0;
ret = rte_eth_dev_configure(portid, nb_rx_queue,
(uint16_t)n_tx_queue, &port_conf);
+   /* Revert to orignal value */
+   port_conf.intr_conf.rxq = org_rxq_intr;
if (ret < 0)
rte_exit(EXIT_FAILURE, "Cannot configure device: "
"err=%d, port=%d\n", ret, portid);
-- 
2.4.11