[dpdk-dev] [PATCH v1 0/2] refactor and clean FDIR

[Zhirun Yan]

main changes:

1. Refactor FDIR configure function.
2. Merge flow seg info for tun/non-tun, distinguish inner/outer input_set.
3. Remove redundant segment info.


Zhirun Yan (2):
  net/ice: refactor FDIR set conf function
  net/ice: merge inner/outer flow seg info for FDIR

 drivers/net/ice/ice_ethdev.h  |  1 +
 drivers/net/ice/ice_fdir_filter.c | 99 ++-
 2 files changed, 58 insertions(+), 42 deletions(-)

-- 
2.25.1

[dpdk-dev] [PATCH v1 2/2] net/ice: merge inner/outer flow seg info for FDIR

[Zhirun Yan]

For tunnel and non-tunnel packets, it can share the same seg_tun info.
seg_tun[1] can be used for supporting inner fields with tunnel flow rule
or for non-tunnel packets, seg_tun[0] only used for tunnel outer part.
Add outer_input_set to distinguish inner/outer input set. So we can
identify different fields in outer or inner part.

Signed-off-by: Zhirun Yan 
---
 drivers/net/ice/ice_ethdev.h  |  1 +
 drivers/net/ice/ice_fdir_filter.c | 65 +--
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index 393dfeab1..6bc6dfbfb 100644
--- a/drivers/net/ice/ice_ethdev.h
+++ b/drivers/net/ice/ice_ethdev.h
@@ -285,6 +285,7 @@ struct ice_fdir_filter_conf {
struct rte_flow_action_count act_count;
 
uint64_t input_set;
+   uint64_t outer_input_set; /* only for tunnel packets outer fields */
 };
 
 #define ICE_MAX_FDIR_FILTER_NUM(1024 * 16)
diff --git a/drivers/net/ice/ice_fdir_filter.c 
b/drivers/net/ice/ice_fdir_filter.c
index 593dfd0e2..24fbcdd60 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -1047,51 +1047,59 @@ ice_fdir_input_set_hdrs(enum ice_fltr_ptype flow, 
struct ice_flow_seg_info *seg,
 
 static int
 ice_fdir_input_set_conf(struct ice_pf *pf, enum ice_fltr_ptype flow,
-   uint64_t input_set, enum ice_fdir_tunnel_type ttype)
+   uint64_t inner_input_set, uint64_t outer_input_set,
+   enum ice_fdir_tunnel_type ttype)
 {
struct ice_flow_seg_info *seg;
struct ice_flow_seg_info *seg_tun = NULL;
enum ice_flow_field field[ICE_FLOW_FIELD_IDX_MAX];
+   uint64_t input_set;
bool is_tunnel;
-   int i, ret;
+   int k, i, ret = 0;
 
-   if (!input_set)
+   if (!(inner_input_set | outer_input_set))
return -EINVAL;
 
-   seg = (struct ice_flow_seg_info *)
-   ice_malloc(hw, sizeof(*seg));
-   if (!seg) {
+   seg_tun = (struct ice_flow_seg_info *)
+   ice_malloc(hw, sizeof(*seg_tun) * ICE_FD_HW_SEG_MAX);
+   if (!seg_tun) {
PMD_DRV_LOG(ERR, "No memory can be allocated");
return -ENOMEM;
}
 
-   for (i = 0; i < ICE_FLOW_FIELD_IDX_MAX; i++)
-   field[i] = ICE_FLOW_FIELD_IDX_MAX;
+   /* use seg_tun[1] to record tunnel inner part or non-tunnel */
+   for (k = ICE_FD_HW_SEG_TUN; k >= 0; k--) {
+   seg = &seg_tun[k];
+   if (k == ICE_FD_HW_SEG_TUN) {
+   if (inner_input_set == 0)
+   continue;
+   input_set = inner_input_set;
+   } else {
+   if (outer_input_set == 0)
+   break;
+   input_set = outer_input_set;
+   }
+
+   for (i = 0; i < ICE_FLOW_FIELD_IDX_MAX; i++)
+   field[i] = ICE_FLOW_FIELD_IDX_MAX;
 
-   ice_fdir_input_set_parse(input_set, field);
+   ice_fdir_input_set_parse(input_set, field);
 
-   ice_fdir_input_set_hdrs(flow, seg, ttype);
+   ice_fdir_input_set_hdrs(flow, seg, ttype);
 
-   for (i = 0; field[i] != ICE_FLOW_FIELD_IDX_MAX; i++) {
-   ice_flow_set_fld(seg, field[i],
-ICE_FLOW_FLD_OFF_INVAL,
-ICE_FLOW_FLD_OFF_INVAL,
-ICE_FLOW_FLD_OFF_INVAL, false);
+   for (i = 0; field[i] != ICE_FLOW_FIELD_IDX_MAX; i++) {
+   ice_flow_set_fld(seg, field[i],
+ICE_FLOW_FLD_OFF_INVAL,
+ICE_FLOW_FLD_OFF_INVAL,
+ICE_FLOW_FLD_OFF_INVAL, false);
+   }
}
 
is_tunnel = ice_fdir_is_tunnel_profile(ttype);
if (!is_tunnel) {
ret = ice_fdir_hw_tbl_conf(pf, pf->main_vsi, pf->fdir.fdir_vsi,
-  seg, flow, false);
+  seg_tun + 1, flow, false);
} else {
-   seg_tun = (struct ice_flow_seg_info *)
-   ice_malloc(hw, sizeof(*seg) * ICE_FD_HW_SEG_MAX);
-   if (!seg_tun) {
-   PMD_DRV_LOG(ERR, "No memory can be allocated");
-   rte_free(seg);
-   return -ENOMEM;
-   }
-   rte_memcpy(&seg_tun[1], seg, sizeof(*seg));
ret = ice_fdir_hw_tbl_conf(pf, pf->main_vsi, pf->fdir.fdir_vsi,
   seg_tun, flow, true);
}
@@ -1099,9 +1107,7 @@ ice_fdir_input_set_conf(struct ice_pf *pf, enum 
ice_fltr_ptype flow,
if (!ret) {
return ret;
} else if (ret < 0) {
-   rte_free(seg);
- 

[dpdk-dev] [PATCH v1 1/2] net/ice: refactor FDIR set conf function

[Zhirun Yan]

The original set conf function in FDIR was very long. Refactor to
increase readability to make it clearer and allow for more convenient
further changes.

No functional change here.

Signed-off-by: Zhirun Yan 
---
 drivers/net/ice/ice_fdir_filter.c | 54 ++-
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/drivers/net/ice/ice_fdir_filter.c 
b/drivers/net/ice/ice_fdir_filter.c
index 88c9bb03d..593dfd0e2 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -964,30 +964,10 @@ ice_fdir_input_set_parse(uint64_t inset, enum 
ice_flow_field *field)
}
 }
 
-static int
-ice_fdir_input_set_conf(struct ice_pf *pf, enum ice_fltr_ptype flow,
-   uint64_t input_set, enum ice_fdir_tunnel_type ttype)
+static void
+ice_fdir_input_set_hdrs(enum ice_fltr_ptype flow, struct ice_flow_seg_info 
*seg,
+   enum ice_fdir_tunnel_type ttype)
 {
-   struct ice_flow_seg_info *seg;
-   struct ice_flow_seg_info *seg_tun = NULL;
-   enum ice_flow_field field[ICE_FLOW_FIELD_IDX_MAX];
-   bool is_tunnel;
-   int i, ret;
-
-   if (!input_set)
-   return -EINVAL;
-
-   seg = (struct ice_flow_seg_info *)
-   ice_malloc(hw, sizeof(*seg));
-   if (!seg) {
-   PMD_DRV_LOG(ERR, "No memory can be allocated");
-   return -ENOMEM;
-   }
-
-   for (i = 0; i < ICE_FLOW_FIELD_IDX_MAX; i++)
-   field[i] = ICE_FLOW_FIELD_IDX_MAX;
-   ice_fdir_input_set_parse(input_set, field);
-
switch (flow) {
case ICE_FLTR_PTYPE_NONF_IPV4_UDP:
ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_UDP |
@@ -1063,6 +1043,34 @@ ice_fdir_input_set_conf(struct ice_pf *pf, enum 
ice_fltr_ptype flow,
PMD_DRV_LOG(ERR, "not supported filter type.");
break;
}
+}
+
+static int
+ice_fdir_input_set_conf(struct ice_pf *pf, enum ice_fltr_ptype flow,
+   uint64_t input_set, enum ice_fdir_tunnel_type ttype)
+{
+   struct ice_flow_seg_info *seg;
+   struct ice_flow_seg_info *seg_tun = NULL;
+   enum ice_flow_field field[ICE_FLOW_FIELD_IDX_MAX];
+   bool is_tunnel;
+   int i, ret;
+
+   if (!input_set)
+   return -EINVAL;
+
+   seg = (struct ice_flow_seg_info *)
+   ice_malloc(hw, sizeof(*seg));
+   if (!seg) {
+   PMD_DRV_LOG(ERR, "No memory can be allocated");
+   return -ENOMEM;
+   }
+
+   for (i = 0; i < ICE_FLOW_FIELD_IDX_MAX; i++)
+   field[i] = ICE_FLOW_FIELD_IDX_MAX;
+
+   ice_fdir_input_set_parse(input_set, field);
+
+   ice_fdir_input_set_hdrs(flow, seg, ttype);
 
for (i = 0; field[i] != ICE_FLOW_FIELD_IDX_MAX; i++) {
ice_flow_set_fld(seg, field[i],
-- 
2.25.1

Re: [dpdk-dev] [PATCH v2 2/5] net/ice: add flow director enabled switch value

[Yang, Qiming]

> -Original Message-
> From: Jiang, JunyuX 
> Sent: Monday, September 7, 2020 17:17
> To: dev@dpdk.org
> Cc: Zhang, Qi Z ; Yang, Qiming
> ; Sun, GuinanX 
> Subject: [PATCH v2 2/5] net/ice: add flow director enabled switch value
> 
> From: Guinan Sun 
> 
> The commit adds fdir_enabled flag into ice_adapter structure to identify if
> fdir id is active. Rx data path can be benefit if fdir id parsing is not 
> needed,

Don't use abbreviation and check your grammar.

> especially in vector path.
> 
> Signed-off-by: Guinan Sun 
> ---
>  drivers/net/ice/ice_ethdev.h  |  2 ++
>  drivers/net/ice/ice_fdir_filter.c |  9 -
>  drivers/net/ice/ice_rxtx.h| 30 ++
>  3 files changed, 40 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
> index 393dfeab1..df0d65d8d 100644
> --- a/drivers/net/ice/ice_ethdev.h
> +++ b/drivers/net/ice/ice_ethdev.h
> @@ -285,6 +285,7 @@ struct ice_fdir_filter_conf {
>   struct rte_flow_action_count act_count;
> 
>   uint64_t input_set;
> + uint32_t mark_flag;
>  };
> 
>  #define ICE_MAX_FDIR_FILTER_NUM  (1024 * 16)
> @@ -464,6 +465,7 @@ struct ice_adapter {
>   bool is_safe_mode;
>   struct ice_devargs devargs;
>   enum ice_pkg_type active_pkg_type; /* loaded ddp package type */
> + uint16_t fdir_ref_cnt;
>  };
> 
>  struct ice_vsi_vlan_pvid_info {
> diff --git a/drivers/net/ice/ice_fdir_filter.c 
> b/drivers/net/ice/ice_fdir_filter.c
> index 745d7291a..e496c4d0a 100644
> --- a/drivers/net/ice/ice_fdir_filter.c
> +++ b/drivers/net/ice/ice_fdir_filter.c
> @@ -1329,6 +1329,9 @@ ice_fdir_create_filter(struct ice_adapter *ad,
>   goto free_counter;
>   }
> 
> + if (filter->mark_flag == 1)
> + ice_fdir_rx_proc_enable(ad, 1);
> +
>   rte_memcpy(entry, filter, sizeof(*entry));
>   ret = ice_fdir_entry_insert(pf, entry, &key);
>   if (ret) {
> @@ -1401,6 +1404,10 @@ ice_fdir_destroy_filter(struct ice_adapter *ad,
>   }
> 
>   ice_fdir_cnt_update(pf, filter->input.flow_type, is_tun, false);
> +
> + if (filter->mark_flag == 1)
> + ice_fdir_rx_proc_enable(ad, 0);
> +
>   flow->rule = NULL;
> 
>   rte_free(filter);
> @@ -1573,7 +1580,7 @@ ice_fdir_parse_action(struct ice_adapter *ad,
>   break;
>   case RTE_FLOW_ACTION_TYPE_MARK:
>   mark_num++;
> -
> + filter->mark_flag = 1;
>   mark_spec = actions->conf;
>   filter->input.fltr_id = mark_spec->id;
>   filter->input.fdid_prio =
> ICE_FXD_FLTR_QW1_FDID_PRI_ONE; diff --git a/drivers/net/ice/ice_rxtx.h
> b/drivers/net/ice/ice_rxtx.h index e21ba152d..69d6e0b8b 100644
> --- a/drivers/net/ice/ice_rxtx.h
> +++ b/drivers/net/ice/ice_rxtx.h
> @@ -70,6 +70,7 @@ struct ice_rx_queue {
> 
>   uint8_t port_id; /* device port ID */
>   uint8_t crc_len; /* 0 if CRC stripped, 4 otherwise */
> + uint8_t fdir_enabled; /* 0 if FDIR disabled, 1 when enabled */
>   uint16_t queue_id; /* RX queue index */
>   uint16_t reg_idx; /* RX queue register index */
>   uint8_t drop_en; /* if not 0, set register bit */ @@ -245,4 +246,33
> @@ uint16_t ice_xmit_pkts_vec_avx2(void *tx_queue, struct rte_mbuf
> **tx_pkts,  int ice_fdir_programming(struct ice_pf *pf, struct ice_fltr_desc
> *fdir_desc);  int ice_tx_done_cleanup(void *txq, uint32_t free_cnt);
> 
> +#define FDIR_PROC_ENABLE_PER_QUEUE(ad, on) do { \
> + int i; \
> + for (i = 0; i < (ad)->eth_dev->data->nb_rx_queues; i++) { \
> + struct ice_rx_queue *rxq = (ad)->eth_dev->data-
> >rx_queues[i]; \
> + if (!rxq) \
> + continue; \
> + rxq->fdir_enabled = on; \
> + } \
> + PMD_DRV_LOG(DEBUG, "FDIR processing on RX set to %d", on); \ }
> while
> +(0)
> +
> +/* Enable/disable flow director Rx processing in data path. */ static

Wha't do you mean ' flow director Rx processing '?

> +inline void ice_fdir_rx_proc_enable(struct ice_adapter *ad, bool on) {
> + if (on) {
> + /* enable flow director processing */
> + FDIR_PROC_ENABLE_PER_QUEUE(ad, on);
> + ad->fdir_ref_cnt++;
> + } else {
> + if (ad->fdir_ref_cnt >= 1) {
> + ad->fdir_ref_cnt--;
> +
> + if (ad->fdir_ref_cnt == 0)
> + FDIR_PROC_ENABLE_PER_QUEUE(ad, on);
> + }
> + }
> +}
> +
>  #endif /* _ICE_RXTX_H_ */
> --
> 2.17.1

Re: [dpdk-dev] [PATCH v3 5/6] net/iavf: fix multiple interrupts for VF

[Xu, Ting]

Hi, Steve,

I am also coding on this part for large VF recently, and see that you sent a 
fix patch, and I have some questions not quite clear, which are shown below in 
inline.

Thanks!

Best Regards,
Xu Ting

> -Original Message-
> From: dev  On Behalf Of SteveX Yang
> Sent: Friday, September 4, 2020 3:29 PM
> To: dev@dpdk.org
> Cc: Yang, Qiming ; Wu, Jingjing
> ; Xing, Beilei ; Yang, SteveX
> 
> Subject: [dpdk-dev] [PATCH v3 5/6] net/iavf: fix multiple interrupts for VF
> 
> Interrupt mapping should be 1:n queue(s).This patch fixes the logic of
> interrupt bind by code reconstruction.
> 
> Fixes: 69dd4c3d0898 ("net/avf: enable queue and device")
> 
> Signed-off-by: SteveX Yang 
> ---
>  drivers/net/iavf/iavf_vchnl.c | 56 ---
>  1 file changed, 45 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c 
> index
> 33acea54a..614ea7e79 100644
> --- a/drivers/net/iavf/iavf_vchnl.c
> +++ b/drivers/net/iavf/iavf_vchnl.c
> @@ -18,6 +18,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
> 
>  #include "iavf.h"
>  #include "iavf_rxtx.h"
> @@ -686,20 +687,53 @@ int
>  iavf_config_irq_map(struct iavf_adapter *adapter)  {
>   struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
> + struct iavf_cmd_info args;
> + uint8_t *cmd_buffer = NULL;
>   struct virtchnl_irq_map_info *map_info;
>   struct virtchnl_vector_map *vecmap;
> - struct iavf_cmd_info args;
> - int len, i, err;
> + struct rte_eth_dev *dev = adapter->eth_dev;
> + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
> + struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
> + uint32_t vec, cmd_buffer_size, max_vectors, nb_msix, msix_base, i;
> + uint16_t rxq_map[vf->vf_res->max_vectors];
> + int err;
> 
> - len = sizeof(struct virtchnl_irq_map_info) +
> -   sizeof(struct virtchnl_vector_map) * vf->nb_msix;
> + memset(rxq_map, 0, sizeof(rxq_map));
> + if (dev->data->dev_conf.intr_conf.rxq &&
> + rte_intr_allow_others(intr_handle)) {
> + msix_base = IAVF_RX_VEC_START;
> + max_vectors = vf->vf_res->max_vectors - 1;
> + nb_msix = RTE_MIN(max_vectors, intr_handle->nb_efd);
> +
> + vec = msix_base;
> + for (i = 0; i < dev->data->nb_rx_queues; i++) {
> + rxq_map[vec] |= 1 << i;
> + intr_handle->intr_vec[i] = vec++;
> + if (vec >= vf->vf_res->max_vectors)
> + vec = msix_base;
> + }
> + } else {
> + msix_base = IAVF_MISC_VEC_ID;
> + nb_msix = 1;
> 
> - map_info = rte_zmalloc("map_info", len, 0);
> - if (!map_info)
> - return -ENOMEM;
> + for (i = 0; i < dev->data->nb_rx_queues; i++) {
> + rxq_map[msix_base] |= 1 << i;
> + if (rte_intr_dp_is_en(intr_handle))
> + intr_handle->intr_vec[i] = msix_base;
> + }
> + }
> 

This part to configure parameters like nb_msix, msix_base and rxq_map, is 
already done in the upper level function iavf_config_rx_queues_irqs, why shall 
we do it again here? Or is it OK to change in that function directly if 
necessary?

> - map_info->num_vectors = vf->nb_msix;
> - for (i = 0; i < vf->nb_msix; i++) {
> + cmd_buffer_size = sizeof(struct virtchnl_irq_map_info) +
> +   sizeof(struct virtchnl_vector_map) * nb_msix;
> + cmd_buffer = rte_zmalloc("iavf", cmd_buffer_size, 0);
> + if (!cmd_buffer) {
> + PMD_DRV_LOG(ERR, "Failed to allocate memory");
> + return IAVF_ERR_NO_MEMORY;
> + }
> +
> + map_info = (struct virtchnl_irq_map_info *)cmd_buffer;
> + map_info->num_vectors = nb_msix;
> + for (i = 0; i < nb_msix; i++) {
>   vecmap = &map_info->vecmap[i];
>   vecmap->vsi_id = vf->vsi_res->vsi_id;
>   vecmap->rxitr_idx = IAVF_ITR_INDEX_DEFAULT; @@ -709,8

Here is a line of code "vecmap->rxq_map = vf->rxq_map[vf->msix_base + i];" not 
displayed. I noticed that this is not changed. That means we still use the 
bitmap configured in iavf_config_rx_queues_irqs, not the new one here (although 
they may be the same)
But it seems that the new rxq_map is not used. Do I miss something? Thank!

> +743,8 @@ iavf_config_irq_map(struct iavf_adapter *adapter)
>   }
> 
>   args.ops = VIRTCHNL_OP_CONFIG_IRQ_MAP;
> - args.in_args = (u8 *)map_info;
> - args.in_args_size = len;
> + args.in_args = (u8 *)cmd_buffer;
> + args.in_args_size = cmd_buffer_size;
>   args.out_buffer = vf->aq_resp;
>   args.out_size = IAVF_AQ_BUF_SZ;
>   err = iavf_execute_vf_cmd(adapter, &args);
> --
> 2.17.1

Re: [dpdk-dev] [PATCH v2 3/5] net/ice: support flow mark in AVX path

[Yang, Qiming]

> -Original Message-
> From: Jiang, JunyuX 
> Sent: Monday, September 7, 2020 17:17
> To: dev@dpdk.org
> Cc: Zhang, Qi Z ; Yang, Qiming
> ; Sun, GuinanX 
> Subject: [PATCH v2 3/5] net/ice: support flow mark in AVX path
> 
> From: Guinan Sun 
> 
> Support Flow Director mark ID parsing from Flex Rx descriptor in AVX path.
Same comments.

> 
> Signed-off-by: Guinan Sun 
> ---
>  drivers/net/ice/ice_rxtx_vec_avx2.c | 64
> -
>  1 file changed, 63 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ice/ice_rxtx_vec_avx2.c
> b/drivers/net/ice/ice_rxtx_vec_avx2.c
> index 07d129e3f..70e4b76db 100644
> --- a/drivers/net/ice/ice_rxtx_vec_avx2.c
> +++ b/drivers/net/ice/ice_rxtx_vec_avx2.c
> @@ -132,6 +132,25 @@ ice_rxq_rearm(struct ice_rx_queue *rxq)
>   ICE_PCI_REG_WRITE(rxq->qrx_tail, rx_id);  }
> 
> +static inline __m256i
> +ice_flex_rxd_to_fdir_flags_vec_avx2(const __m256i fdir_id0_7) { #define
> +FDID_MIS_MAGIC 0x
> + RTE_BUILD_BUG_ON(PKT_RX_FDIR != (1 << 2));
> + RTE_BUILD_BUG_ON(PKT_RX_FDIR_ID != (1 << 13));
> + const __m256i pkt_fdir_bit = _mm256_set1_epi32(PKT_RX_FDIR |
> + PKT_RX_FDIR_ID);
> + /* desc->flow_id field == 0x means fdir mismatch */
> + const __m256i fdir_mis_mask =
> _mm256_set1_epi32(FDID_MIS_MAGIC);
> + __m256i fdir_mask = _mm256_cmpeq_epi32(fdir_id0_7,
> + fdir_mis_mask);
> + /* this XOR op results to bit-reverse the fdir_mask */
> + fdir_mask = _mm256_xor_si256(fdir_mask, fdir_mis_mask);
> + const __m256i fdir_flags = _mm256_and_si256(fdir_mask,
> pkt_fdir_bit);
> +
> + return fdir_flags;
> +}
> +
>  static inline uint16_t
>  _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct rte_mbuf
> **rx_pkts,
>   uint16_t nb_pkts, uint8_t *split_packet) @@ -459,9
> +478,51 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue *rxq, struct
> rte_mbuf **rx_pkts,
>   rss_vlan_flag_bits);
> 
>   /* merge flags */
> - const __m256i mbuf_flags = _mm256_or_si256(l3_l4_flags,
> + __m256i mbuf_flags = _mm256_or_si256(l3_l4_flags,
>   rss_vlan_flags);
> 
> + if (rxq->fdir_enabled) {
> + const __m256i fdir_id4_7 =
> + _mm256_unpackhi_epi32(raw_desc6_7,
> raw_desc4_5);
> +
> + const __m256i fdir_id0_3 =
> + _mm256_unpackhi_epi32(raw_desc2_3,
> raw_desc0_1);
> +
> + const __m256i fdir_id0_7 =
> + _mm256_unpackhi_epi64(fdir_id4_7,
> fdir_id0_3);
> +
> + const __m256i fdir_flags =
> +
>   ice_flex_rxd_to_fdir_flags_vec_avx2(fdir_id0_7);
> +
> + /* merge with fdir_flags */
> + mbuf_flags = _mm256_or_si256(mbuf_flags,
> fdir_flags);
> +
> + /* write to mbuf: have to use scalar store here */
> + rx_pkts[i + 0]->hash.fdir.hi =
> + _mm256_extract_epi32(fdir_id0_7, 3);
> +
> + rx_pkts[i + 1]->hash.fdir.hi =
> + _mm256_extract_epi32(fdir_id0_7, 7);
> +
> + rx_pkts[i + 2]->hash.fdir.hi =
> + _mm256_extract_epi32(fdir_id0_7, 2);
> +
> + rx_pkts[i + 3]->hash.fdir.hi =
> + _mm256_extract_epi32(fdir_id0_7, 6);
> +
> + rx_pkts[i + 4]->hash.fdir.hi =
> + _mm256_extract_epi32(fdir_id0_7, 1);
> +
> + rx_pkts[i + 5]->hash.fdir.hi =
> + _mm256_extract_epi32(fdir_id0_7, 5);
> +
> + rx_pkts[i + 6]->hash.fdir.hi =
> + _mm256_extract_epi32(fdir_id0_7, 0);
> +
> + rx_pkts[i + 7]->hash.fdir.hi =
> + _mm256_extract_epi32(fdir_id0_7, 4);
> + } /* if() on fdir_enabled */
> +
>  #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
>   /**
>* needs to load 2nd 16B of each desc for RSS hash parsing,
> @@ -551,6 +612,7 @@ _ice_recv_raw_pkts_vec_avx2(struct ice_rx_queue
> *rxq, struct rte_mbuf **rx_pkts,
>   mb0_1 = _mm256_or_si256(mb0_1, rss_hash0_1);
>   } /* if() on RSS hash parsing */
>  #endif
> +
>   /**
>* At this point, we have the 8 sets of flags in the low 16-bits
>* of each 32-bit value in vlan0.
> --
> 2.17.1

Re: [dpdk-dev] [PATCH v2 5/5] net/ice: remove devargs flow-mark-support

[Yang, Qiming]

> -Original Message-
> From: Jiang, JunyuX 
> Sent: Monday, September 7, 2020 17:17
> To: dev@dpdk.org
> Cc: Zhang, Qi Z ; Yang, Qiming
> ; Sun, GuinanX 
> Subject: [PATCH v2 5/5] net/ice: remove devargs flow-mark-support
> 
> From: Guinan Sun 
> 
> Remove devargs "flow-mark-support".

Please rework the commit log. Mention the reason why you need to delete it and 
what't the new way to configure flow mark?

> 
> Signed-off-by: Guinan Sun 
> ---
>  doc/guides/nics/ice.rst   | 12 
>  drivers/net/ice/ice_ethdev.c  | 10 +-
>  drivers/net/ice/ice_ethdev.h  |  1 -
>  drivers/net/ice/ice_rxtx_vec_common.h |  6 --
>  4 files changed, 1 insertion(+), 28 deletions(-)
> 
> diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index
> 9a9f4a6bb..64b1b13a6 100644
> --- a/doc/guides/nics/ice.rst
> +++ b/doc/guides/nics/ice.rst
> @@ -75,18 +75,6 @@ Runtime Config Options
> 
>  -w 80:00.0,pipeline-mode-support=1
> 
> -- ``Flow Mark Support`` (default ``0``)
> -
> -  This is a hint to the driver to select the data path that supports flow 
> mark
> extraction
> -  by default.
> -  NOTE: This is an experimental devarg, it will be removed when any of
> below conditions
> -  is ready.
> -  1) all data paths support flow mark (currently vPMD does not)
> -  2) a new offload like RTE_DEV_RX_OFFLOAD_FLOW_MARK be introduced
> as a standard way to hint.
> -  Example::
> -
> --w 80:00.0,flow-mark-support=1
> -
>  - ``Protocol extraction for per queue``
> 
>Configure the RX queues to do protocol extraction into mbuf for protocol
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
> index 8d435e889..cb6882f70 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -23,13 +23,11 @@
>  /* devargs */
>  #define ICE_SAFE_MODE_SUPPORT_ARG "safe-mode-support"
>  #define ICE_PIPELINE_MODE_SUPPORT_ARG  "pipeline-mode-support"
> -#define ICE_FLOW_MARK_SUPPORT_ARG"flow-mark-support"
>  #define ICE_PROTO_XTR_ARG "proto_xtr"
> 
>  static const char * const ice_valid_args[] = {
>   ICE_SAFE_MODE_SUPPORT_ARG,
>   ICE_PIPELINE_MODE_SUPPORT_ARG,
> - ICE_FLOW_MARK_SUPPORT_ARG,
>   ICE_PROTO_XTR_ARG,
>   NULL
>  };
> @@ -1985,11 +1983,6 @@ static int ice_parse_devargs(struct rte_eth_dev
> *dev)
>   if (ret)
>   goto bail;
> 
> - ret = rte_kvargs_process(kvlist, ICE_FLOW_MARK_SUPPORT_ARG,
> -  &parse_bool, &ad-
> >devargs.flow_mark_support);
> - if (ret)
> - goto bail;
> -
>  bail:
>   rte_kvargs_free(kvlist);
>   return ret;
> @@ -5131,8 +5124,7 @@ RTE_PMD_REGISTER_KMOD_DEP(net_ice, "*
> igb_uio | uio_pci_generic | vfio-pci");
> RTE_PMD_REGISTER_PARAM_STRING(net_ice,
> ICE_PROTO_XTR_ARG
> "=[queue:]"
> ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>"
> -   ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>"
> -   ICE_FLOW_MARK_SUPPORT_ARG "=<0|1>");
> +   ICE_PIPELINE_MODE_SUPPORT_ARG "=<0|1>");
> 
>  RTE_LOG_REGISTER(ice_logtype_init, pmd.net.ice.init, NOTICE);
> RTE_LOG_REGISTER(ice_logtype_driver, pmd.net.ice.driver, NOTICE); diff --
> git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index
> df0d65d8d..d441350e0 100644
> --- a/drivers/net/ice/ice_ethdev.h
> +++ b/drivers/net/ice/ice_ethdev.h
> @@ -444,7 +444,6 @@ struct ice_devargs {
>   int safe_mode_support;
>   uint8_t proto_xtr_dflt;
>   int pipe_mode_support;
> - int flow_mark_support;
>   uint8_t proto_xtr[ICE_MAX_QUEUE_NUM];
>  };
> 
> diff --git a/drivers/net/ice/ice_rxtx_vec_common.h
> b/drivers/net/ice/ice_rxtx_vec_common.h
> index 46e3be98a..e2019c8d6 100644
> --- a/drivers/net/ice/ice_rxtx_vec_common.h
> +++ b/drivers/net/ice/ice_rxtx_vec_common.h
> @@ -270,12 +270,6 @@ ice_rx_vec_dev_check_default(struct rte_eth_dev
> *dev)  {
>   int i;
>   struct ice_rx_queue *rxq;
> - struct ice_adapter *ad =
> - ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
> -
> - /* vPMD does not support flow mark. */
> - if (ad->devargs.flow_mark_support)
> - return -1;
> 
>   for (i = 0; i < dev->data->nb_rx_queues; i++) {
>   rxq = dev->data->rx_queues[i];
> --
> 2.17.1

Re: [dpdk-dev] [PATCH 4/9] net/i40e/base: fix missing function header arguments

[Yang, Qiming]

> -Original Message-
> From: Sun, GuinanX 
> Sent: Saturday, September 5, 2020 10:50
> To: dev@dpdk.org
> Cc: Xing, Beilei ; Zhang, Qi Z ;
> Yang, Qiming ; Sun, GuinanX
> ; sta...@dpdk.org; Brandeburg, Jesse
> 
> Subject: [PATCH 4/9] net/i40e/base: fix missing function header arguments
> 
> Fix them by adding the argument descriptions.
> 
> Fixes: 0d9d27bb8684 ("i40e/base: prepare local LLDP MIB in TLV")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Jesse Brandeburg 
> Signed-off-by: Guinan Sun 
> ---
>  drivers/net/i40e/base/i40e_dcb.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/i40e/base/i40e_dcb.c
> b/drivers/net/i40e/base/i40e_dcb.c
> index a07c61e67..388af3d64 100644
> --- a/drivers/net/i40e/base/i40e_dcb.c
> +++ b/drivers/net/i40e/base/i40e_dcb.c
> @@ -1267,7 +1267,8 @@ enum i40e_status_code
> i40e_set_dcb_config(struct i40e_hw *hw)
> 
>  /**
>   * i40e_dcb_config_to_lldp - Convert Dcbconfig to MIB format
> - * @hw: pointer to the hw struct
> + * @lldpmib: pointer to mib to be output
> + * @miblen: pointer to u16 for length of lldpmib

Only parameter description change? No function change?

>   * @dcbcfg: store for LLDPDU data
>   *
>   * send DCB configuration to FW
> --
> 2.17.1

Re: [dpdk-dev] [PATCH v4 3/3] eal/windows: librte_net build on Windows

[Ophir Munk]

Please add IPPROTO_ICMP and IPPROTO_ICMPV6 definitions:

#define IPPROTO_IP 0
+#define IPPROTO_ICMP 1 /* Internet Ctrl Message Protocol */
 #define IPPROTO_HOPOPTS 0
@@ -17,6 +18,7 @@
#define IPPROTO_AH 51  /* IP6 Auth Header */
+#define IPPROTO_ICMPV6 58  /* Internet Ctrl Message Protocol V6 */
 #define IPPROTO_NONE 59/* IPv6 no next header */

> -Original Message-
> From: dev  On Behalf Of Fady Bader
> Sent: Thursday, July 23, 2020 10:08 AM
> To: dev@dpdk.org
> Cc: Thomas Monjalon ; Tasnim Bashar
> ; Tal Shnaiderman ;
> Yohad Tor ; dmitry.kozl...@gmail.com;
> harini.ramakrish...@microsoft.com; ocard...@microsoft.com;
> pallavi.ka...@intel.com; ranjit.me...@intel.com;
> olivier.m...@6wind.com
> Subject: [dpdk-dev] [PATCH v4 3/3] eal/windows: librte_net build on
> Windows
> 
> librte_net wasn't compiling under Windows.
> To solve this, needed header files were added.
> 
> Signed-off-by: Fady Bader 
> ---
>  lib/librte_eal/windows/include/netinet/in.h | 23
> +++  lib/librte_eal/windows/include/netinet/ip.h |
> 10 ++
>  lib/librte_net/rte_ether.c  |  4 
>  lib/meson.build |  2 +-
>  4 files changed, 38 insertions(+), 1 deletion(-)  create mode 100644
> lib/librte_eal/windows/include/netinet/in.h
>  create mode 100644 lib/librte_eal/windows/include/netinet/ip.h
> 
> diff --git a/lib/librte_eal/windows/include/netinet/in.h
> b/lib/librte_eal/windows/include/netinet/in.h
> new file mode 100644
> index 00..2be25c8bea
> --- /dev/null
> +++ b/lib/librte_eal/windows/include/netinet/in.h
> @@ -0,0 +1,23 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright 2020 Mellanox Technologies, Ltd  */
> +
> +#ifndef _IN_H_
> +#define _IN_H_
> +
> +#define IPPROTO_IP 0   /* Dummy for IP */
> +#define IPPROTO_HOPOPTS 0  /* IPv6 Hop-by-Hop options */
> +#define IPPROTO_IPIP 4 /* IPIP tunnels (for compatibility) */
> +#define IPPROTO_TCP 6  /* Transmission Control Protocol */
> +#define IPPROTO_UDP 17 /* User Datagram Protocol */
> +#define IPPROTO_IPV6 41/* IPv6 header */
> +#define IPPROTO_ROUTING 43 /* IPv6 routing header */
> +#define IPPROTO_FRAGMENT 44/* IPv6 fragmentation header */
> +#define IPPROTO_GRE 47 /* General Routing Encap */
> +#define IPPROTO_ESP 50 /* IPsec Encap Sec. Payload */
> +#define IPPROTO_AH 51  /* IPsec Auth Header */
> +#define IPPROTO_NONE 59/* IPv6 no next header */
> +#define IPPROTO_DSTOPTS 60 /* IPv6 destination option */
> +#define IPPROTO_SCTP 132   /* Stream Control Transmission Protocol
> */
> +
> +#endif
> diff --git a/lib/librte_eal/windows/include/netinet/ip.h
> b/lib/librte_eal/windows/include/netinet/ip.h
> new file mode 100644
> index 00..2126498797
> --- /dev/null
> +++ b/lib/librte_eal/windows/include/netinet/ip.h
> @@ -0,0 +1,10 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright 2020 Mellanox Technologies, Ltd  */
> +
> +#ifndef _IP_H_
> +#define _IP_H_
> +
> +#define IPVERSION 4
> +
> +#endif
> diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c index
> ced65ed9f3..6055ae1463 100644
> --- a/lib/librte_net/rte_ether.c
> +++ b/lib/librte_net/rte_ether.c
> @@ -10,12 +10,16 @@
>  void
>  rte_eth_random_addr(uint8_t *addr)
>  {
> +#ifdef RTE_EXEC_ENV_WINDOWS
> + RTE_SET_USED(addr); /* random is not supported yet */ #else
>   uint64_t rand = rte_rand();
>   uint8_t *p = (uint8_t *)&rand;
> 
>   rte_memcpy(addr, p, RTE_ETHER_ADDR_LEN);
>   addr[0] &= (uint8_t)~RTE_ETHER_GROUP_ADDR;  /* clear
> multicast bit */
>   addr[0] |= RTE_ETHER_LOCAL_ADMIN_ADDR;  /* set local
> assignment bit */
> +#endif
>  }
> 
>  void
> diff --git a/lib/meson.build b/lib/meson.build index 3852c01564..6bbaf242a9
> 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -40,7 +40,7 @@ if is_windows
>   'kvargs',
>   'eal',
>   'ring',
> - 'mempool', 'mbuf', 'pci',
> + 'mempool', 'mbuf', 'pci', 'net',
>   ] # only supported libraries for windows  endif
> 
> --
> 2.16.1.windows.4

Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK

[Bruce Richardson]

On Tue, Sep 08, 2020 at 12:06:40AM +0200, Thomas Monjalon wrote:
> The first 13 commits of this series are pushed to the main branch,
> making the make-based build an old story.
> 
> The last 18 commits (devtools, app and doc) are pending
> for more reviews, especially because the doc rework is
> still in progress. This is a big change which requires
> to be split but must be completed soon.
> *All*, please make the documentation update your highest priority.
> I will be reluctant to merge some driver changes if the related doc
> is not updated.
> 
Thanks for the apply of the code patches, I think it will make all our
subsequent patch submissions a bit cleaner.

In terms of docs, I believe the Linux and FreeBSD GSG guides to be ready
for merge, or if not 100% they are at least good enough IMHO to be applied
now and have some minor tweaks in subsequent patches later. While I'm sure
the Linux GSG could do with more major rework, that should be separate from
the doc updates in this patch.

/Bruce

Re: [dpdk-dev] [PATCH v5] usertools: add huge page setup script

[Bruce Richardson]

On Mon, Sep 07, 2020 at 10:20:13AM -0700, Stephen Hemminger wrote:
> On Mon, 7 Sep 2020 09:58:27 +0100
> Bruce Richardson  wrote:
> 
> > On Mon, Sep 07, 2020 at 09:54:29AM +0100, Ferruh Yigit wrote:
> > > On 9/6/2020 4:42 AM, Stephen Hemminger wrote:  
> > > > This is an improved version of the setup of huge pages
> > > > bases on earlier DPDK setup. Differences are:
> > > >* it autodetects NUMA vs non NUMA
> > > >* it allows setting different page sizes
> > > >  recent kernels support multiple sizes.
> > > >* it accepts a parameter in bytes (not pages).
> > > > 
> > > > If necessary the steps of clearing old settings and mounting/umounting
> > > > can be done individually.
> > > > 
> > > > Signed-off-by: Stephen Hemminger   
> > > 
> > > <...>
> > >   
> > > > @@ -1,4 +1,9 @@
> > > >  # SPDX-License-Identifier: BSD-3-Clause
> > > >  # Copyright(c) 2017 Intel Corporation
> > > >  
> > > > -install_data(['dpdk-devbind.py', 'dpdk-pmdinfo.py', 
> > > > 'dpdk-telemetry.py'], install_dir: 'bin')
> > > > +install_data([
> > > > +   'dpdk-devbind.py',
> > > > +   'dpdk-pmdinfo.py',
> > > > +   'dpdk-telemetry.py',
> > > > +   'hugepage_setup.py'
> > > > +],install_dir: 'bin')
> > > >   
> > > 
> > > Should script name has 'dpdk-' prefix as others do?  
> > 
> > +1 to that.
> 
> Ok but - in the name violates Python lint naming for modules.
> The standard is underscore.

We don't really need 100% lint cleanliness for all our scripts, 95% is
surely enough. However, if you feel strongly, then I suggest we prefix all
our python scripts with "dpdk_", rather than "dpdk-".

Re: [dpdk-dev] [PATCH] kernel: remove igb_uio

[Bruce Richardson]

On Tue, Sep 08, 2020 at 02:14:02AM +0200, Thomas Monjalon wrote:
> On Tue Sep 8, 2020 at 2:50 AM CEST, Thomas Monjalon wrote:
> > As decided in the Technical Board in November 2019,
> > the kernel module igb_uio is moved to the dpdk-kmods repository
> > in the /linux/igb_uio/ directory.
> 
> The code is moved with its git history in
>   http://git.dpdk.org/dpdk-kmods/
> 
> The move process started with these commands:
>   cd dpdk
>   dir=igb_uio
>   path1=lib/librte_eal/linuxapp/$dir
>   path2=kernel/linux/$dir
>   git format-patch -o $dir 0c9a540ed2.. -- $path1 $path2
>   find $dir -type f -exec sed -i "s,$path1\|$path2,linux/$dir," '{}' \;
>   cd ../dpdk-kmods
>   git am ../dpdk/$dir/*
>   git filter-branch --force
>   --index-filter "git rm --cached --ignore-unmatch 
> linux/$dir/Makefile"
>   --prune-empty --tag-name-filter cat -- --all
> 
> Makefile and meson.build files were not imported at all.
> Some other commits were skipped (virtio, vmxnet3 and Xen dom0 support),
> because they were not very useful and reverted later in the history.
> Anyway the original history is available forever in dpdk.git.
> 
> Currently it cannot compile because the file rte_pci_dev_feature_defs.h
> is missing, defining enum rte_intr_mode. An option is to import this file.
> 
> It would be nice to add a README file in the new igb_uio directory.
> Volunteers welcome :)

In terms of building the module, one option which I think is worth
considering is to try and use meson subject/wrap support to download and
build this module as part of the main DPDK build, as now, when enable_kmods
option is set. With a wrap file in DPDK it can automatically pull down and
build the code as part of a main project build. I assume that integration
into main DPDK build is still something worth having? The only thing I
don't like about using a wrap file is that it has to be placed in a folder
called "subproject" at the top level of the DPDK project.

Thoughts,
/Bruce

Re: [dpdk-dev] [PATCH] testpmd: add speed capability in device info

[Sarosh Arif]

delay_us_sleep_autotest is failing on this patch. To replicate it, I
ran the same test on my system and it did not fail. Can this test be
re-run?

On Fri, Sep 4, 2020 at 11:23 AM Sarosh Arif  wrote:
>
> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
> index 30bee3324..8824ad174 100644
> --- a/app/test-pmd/config.c
> +++ b/app/test-pmd/config.c
> @@ -518,6 +518,7 @@ device_infos_display(const char *identifier)
> struct rte_device *dev;
> struct rte_devargs da;
> portid_t port_id;
> +   struct rte_eth_dev_info dev_info;
> char devstr[128];
>
> memset(&da, 0, sizeof(da));
> @@ -569,6 +570,90 @@ device_infos_display(const char *identifier)
>   &mac_addr);
> rte_eth_dev_get_name_by_port(port_id, name);
> printf("\n\tDevice name: %s", name);
> +   rte_eth_dev_info_get(port_id, &dev_info);
> +   switch (dev_info.speed_capa) {
> +   case ETH_LINK_SPEED_AUTONEG:
> +   printf("\n\tDevice speed capability: 
> %s",
> +   "Autonegotiate (all 
> speeds)");
> +   break;
> +   case ETH_LINK_SPEED_FIXED:
> +   printf("\n\tDevice speed capability: 
> %s",
> +   "Disable 
> autonegotiate (fixed speed)");
> +   break;
> +   case ETH_LINK_SPEED_10M_HD ...
> +   ETH_LINK_SPEED_10M-1:
> +   printf("\n\tDevice speed capability: 
> %s",
> +   "10 Mbps 
> half-duplex");
> +   break;
> +   case ETH_LINK_SPEED_10M ...
> +   ETH_LINK_SPEED_100M_HD-1:
> +   printf("\n\tDevice speed capability: 
> %s",
> +   "10 Mbps 
> full-duplex");
> +   break;
> +   case ETH_LINK_SPEED_100M_HD ...
> +   ETH_LINK_SPEED_100M-1:
> +   printf("\n\tDevice speed capability: 
> %s",
> +   "100 Mbps 
> half-duplex");
> +   break;
> +   case ETH_LINK_SPEED_100M ...
> +   ETH_LINK_SPEED_1G-1:
> +   printf("\n\tDevice speed capability: 
> %s",
> +   "100 Mbps 
> full-duplex");
> +   break;
> +   case ETH_LINK_SPEED_1G ...
> +   ETH_LINK_SPEED_2_5G-1:
> +   printf("\n\tDevice speed capability: 
> %s",
> +   "1 Gbps");
> +   break;
> +   case ETH_LINK_SPEED_2_5G ...
> +   ETH_LINK_SPEED_5G-1:
> +   printf("\n\tDevice speed capability: 
> %s",
> +   "2.5 Gbps");
> +   break;
> +   case ETH_LINK_SPEED_5G ...
> +   ETH_LINK_SPEED_10G-1:
> +   printf("\n\tDevice speed capability: 
> %s",
> +   "5 Gbps");
> +   break;
> +   case ETH_LINK_SPEED_10G ...
> +   ETH_LINK_SPEED_20G-1:
> +   printf("\n\tDevice speed capability: 
> %s",
> +   "10 Gbps");
> +   break;
> +   case ETH_LINK_SPEED_20G ...
> +   ETH_LINK_SPEED_25G-1:
> +   printf("\n\tDevice speed capability: 
> %s",
> +   "20 Gbps");
> +   break;
> +   case ETH_LINK_SPEED_25G ...
> +   ETH_LINK_SPEED_50G-1:
> +   printf("\n\tDevice speed capability: 
> %s"

[dpdk-dev] [dpdk-dev v9 0/4] cryptodev: add data-path service APIs

[Fan Zhang]

Direct crypto data-path service are a set of APIs that especially provided for
the external libraries/applications who want to take advantage of the rich
features provided by cryptodev, but not necessarily depend on cryptodev
operations, mempools, or mbufs in the their data-path implementations.

The direct crypto data-path service has the following advantages:
- Supports raw data pointer and physical addresses as input.
- Do not require specific data structure allocated from heap, such as
  cryptodev operation.
- Enqueue in a burst or single operation. The service allow enqueuing in
  a burst similar to ``rte_cryptodev_enqueue_burst`` operation, or only
  enqueue one job at a time but maintaining necessary context data locally for
  next single job enqueue operation. The latter method is especially helpful
  when the user application's crypto operations are clustered into a burst.
  Allowing enqueue one operation at a time helps reducing one additional loop
  and also reduced the cache misses during the double "looping" situation.
- Customerizable dequeue count. Instead of dequeue maximum possible operations
  as same as ``rte_cryptodev_dequeue_burst`` operation, the service allows the
  user to provide a callback function to decide how many operations to be
  dequeued. This is especially helpful when the expected dequeue count is
  hidden inside the opaque data stored during enqueue. The user can provide
  the callback function to parse the opaque data structure.
- Abandon enqueue and dequeue anytime. One of the drawbacks of
  ``rte_cryptodev_enqueue_burst`` and ``rte_cryptodev_dequeue_burst``
  operations are: once an operation is enqueued/dequeued there is no way to
  undo the operation. The service make the operation abandon possible by
  creating a local copy of the queue operation data in the service context
  data. The data will be written back to driver maintained operation data
  when enqueue or dequeue done function is called.

The cryptodev data-path service uses

Cryptodev PMDs who supports this feature will have
``RTE_CRYPTODEV_FF_SYM_HW_DIRECT_API`` feature flag presented. To use this
feature the function ``rte_cryptodev_get_dp_service_ctx_data_size`` should
be called to get the data path service context data size. The user should
creates a local buffer at least this size long and initialize it using
``rte_cryptodev_dp_configure_service`` function call.

The ``rte_cryptodev_dp_configure_service`` function call initialize or
updates the ``struct rte_crypto_dp_service_ctx`` buffer, in which contains the
driver specific queue pair data pointer and service context buffer, and a
set of function pointers to enqueue and dequeue different algorithms'
operations. The ``rte_cryptodev_dp_configure_service`` should be called when:

- Before enqueuing or dequeuing starts (set ``is_update`` parameter to 0).
- When different cryptodev session, security session, or session-less xform
  is used (set ``is_update`` parameter to 1).

Two different enqueue functions are provided.

- ``rte_cryptodev_dp_sym_submit_vec``: submit a burst of operations stored in
  the ``rte_crypto_sym_vec`` structure.
- ``rte_cryptodev_dp_submit_single_job``: submit single operation.

Either enqueue functions will not command the crypto device to start processing
until ``rte_cryptodev_dp_submit_done`` function is called. Before then the user
shall expect the driver only stores the necessory context data in the
``rte_crypto_dp_service_ctx`` buffer for the next enqueue operation. If the user
wants to abandon the submitted operations, simply call
``rte_cryptodev_dp_configure_service`` function instead with the parameter
``is_update`` set to 0. The driver will recover the service context data to
the previous state.

To dequeue the operations the user also have two operations:

- ``rte_cryptodev_dp_sym_dequeue``: fully customizable deuqueue operation. The
  user needs to provide the callback function for the driver to get the
  dequeue count and perform post processing such as write the status field.
- ``rte_cryptodev_dp_sym_dequeue_single_job``: dequeue single job.

Same as enqueue, the function ``rte_cryptodev_dp_dequeue_done`` is used to
merge user's local service context data with the driver's queue operation
data. Also to abandon the dequeue operation (still keep the operations in the
queue), the user shall avoid ``rte_cryptodev_dp_dequeue_done`` function call
but calling ``rte_cryptodev_dp_configure_service`` function with the parameter
``is_update`` set to 0.

There are a few limitations to the data path service:

* Only support in-place operations.
* APIs are NOT thread-safe.
* CANNOT mix the direct API's enqueue with rte_cryptodev_enqueue_burst, or
  vice versa.

v9:
- Changed return types of submit_done() and dequeue_done() APIs.
- Added release note update. 

v8:
- Updated following by comments.
- Fixed a few bugs.
- Fixed ARM build error.
- Updated the unit test covering all tests.

v7:
- Fixed a few typos.
- Fixed length calc

[dpdk-dev] [dpdk-dev v9 1/4] cryptodev: add crypto data-path service APIs

[Fan Zhang]

This patch adds data-path service APIs for enqueue and dequeue
operations to cryptodev. The APIs support flexible user-define
enqueue and dequeue behaviors and operation mode.

Signed-off-by: Fan Zhang 
Signed-off-by: Piotr Bronowski 
---
 lib/librte_cryptodev/rte_crypto.h |   9 +
 lib/librte_cryptodev/rte_crypto_sym.h |  49 ++-
 lib/librte_cryptodev/rte_cryptodev.c  |  98 +
 lib/librte_cryptodev/rte_cryptodev.h  | 335 +-
 lib/librte_cryptodev/rte_cryptodev_pmd.h  |  48 ++-
 .../rte_cryptodev_version.map |  10 +
 6 files changed, 540 insertions(+), 9 deletions(-)

diff --git a/lib/librte_cryptodev/rte_crypto.h 
b/lib/librte_cryptodev/rte_crypto.h
index fd5ef3a87..f009be9af 100644
--- a/lib/librte_cryptodev/rte_crypto.h
+++ b/lib/librte_cryptodev/rte_crypto.h
@@ -438,6 +438,15 @@ rte_crypto_op_attach_asym_session(struct rte_crypto_op *op,
return 0;
 }
 
+/** Crypto data-path service types */
+enum rte_crypto_dp_service {
+   RTE_CRYPTO_DP_SYM_CIPHER_ONLY = 0,
+   RTE_CRYPTO_DP_SYM_AUTH_ONLY,
+   RTE_CRYPTO_DP_SYM_CHAIN,
+   RTE_CRYPTO_DP_SYM_AEAD,
+   RTE_CRYPTO_DP_N_SERVICE
+};
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/librte_cryptodev/rte_crypto_sym.h 
b/lib/librte_cryptodev/rte_crypto_sym.h
index f29c98051..376412e94 100644
--- a/lib/librte_cryptodev/rte_crypto_sym.h
+++ b/lib/librte_cryptodev/rte_crypto_sym.h
@@ -50,6 +50,30 @@ struct rte_crypto_sgl {
uint32_t num;
 };
 
+/**
+ * Symmetri Crypto Addtional Data other than src and destination data.
+ * Supposed to be used to pass IV/digest/aad data buffers with lengths
+ * defined when creating crypto session.
+ */
+union rte_crypto_sym_additional_data {
+   struct {
+   void *cipher_iv_ptr;
+   rte_iova_t cipher_iv_iova;
+   void *auth_iv_ptr;
+   rte_iova_t auth_iv_iova;
+   void *digest_ptr;
+   rte_iova_t digest_iova;
+   } cipher_auth;
+   struct {
+   void *iv_ptr;
+   rte_iova_t iv_iova;
+   void *digest_ptr;
+   rte_iova_t digest_iova;
+   void *aad_ptr;
+   rte_iova_t aad_iova;
+   } aead;
+};
+
 /**
  * Synchronous operation descriptor.
  * Supposed to be used with CPU crypto API call.
@@ -57,12 +81,25 @@ struct rte_crypto_sgl {
 struct rte_crypto_sym_vec {
/** array of SGL vectors */
struct rte_crypto_sgl *sgl;
-   /** array of pointers to IV */
-   void **iv;
-   /** array of pointers to AAD */
-   void **aad;
-   /** array of pointers to digest */
-   void **digest;
+
+   union {
+
+   /* Supposed to be used with CPU crypto API call. */
+   struct {
+   /** array of pointers to IV */
+   void **iv;
+   /** array of pointers to AAD */
+   void **aad;
+   /** array of pointers to digest */
+   void **digest;
+   };
+
+   /* Supposed to be used with rte_cryptodev_dp_sym_submit_vec()
+* call.
+*/
+   union rte_crypto_sym_additional_data *additional_data;
+   };
+
/**
 * array of statuses for each operation:
 *  - 0 on success
diff --git a/lib/librte_cryptodev/rte_cryptodev.c 
b/lib/librte_cryptodev/rte_cryptodev.c
index 1dd795bcb..4f59cf800 100644
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -1914,6 +1914,104 @@ rte_cryptodev_sym_cpu_crypto_process(uint8_t dev_id,
return dev->dev_ops->sym_cpu_process(dev, sess, ofs, vec);
 }
 
+int
+rte_cryptodev_dp_get_service_ctx_data_size(uint8_t dev_id)
+{
+   struct rte_cryptodev *dev;
+   int32_t size = sizeof(struct rte_crypto_dp_service_ctx);
+   int32_t priv_size;
+
+   if (!rte_cryptodev_pmd_is_valid_dev(dev_id))
+   return -1;
+
+   dev = rte_cryptodev_pmd_get_dev(dev_id);
+
+   if (*dev->dev_ops->get_drv_ctx_size == NULL ||
+   !(dev->feature_flags & RTE_CRYPTODEV_FF_DATA_PATH_SERVICE)) {
+   return -1;
+   }
+
+   priv_size = (*dev->dev_ops->get_drv_ctx_size)(dev);
+   if (priv_size < 0)
+   return -1;
+
+   return RTE_ALIGN_CEIL((size + priv_size), 8);
+}
+
+int
+rte_cryptodev_dp_configure_service(uint8_t dev_id, uint16_t qp_id,
+   enum rte_crypto_dp_service service_type,
+   enum rte_crypto_op_sess_type sess_type,
+   union rte_cryptodev_session_ctx session_ctx,
+   struct rte_crypto_dp_service_ctx *ctx, uint8_t is_update)
+{
+   struct rte_cryptodev *dev;
+
+   if (!rte_cryptodev_get_qp_status(dev_id, qp_id))
+   return -1;
+
+   dev = rte_cryptodev_pmd_get_dev(dev_id);
+   if (!(dev->feature_flags & RTE_CRYPTODEV_FF_DATA_PATH_SERVICE)
+   || 

[dpdk-dev] [dpdk-dev v9 4/4] doc: add cryptodev service APIs guide

[Fan Zhang]

This patch updates programmer's guide to demonstrate the usage
and limitations of cryptodev symmetric crypto data-path service
APIs.

Signed-off-by: Fan Zhang 
---
 doc/guides/prog_guide/cryptodev_lib.rst | 90 +
 doc/guides/rel_notes/release_20_11.rst  |  7 ++
 2 files changed, 97 insertions(+)

diff --git a/doc/guides/prog_guide/cryptodev_lib.rst 
b/doc/guides/prog_guide/cryptodev_lib.rst
index c14f750fa..1321e4c5d 100644
--- a/doc/guides/prog_guide/cryptodev_lib.rst
+++ b/doc/guides/prog_guide/cryptodev_lib.rst
@@ -631,6 +631,96 @@ a call argument. Status different than zero must be 
treated as error.
 For more details, e.g. how to convert an mbuf to an SGL, please refer to an
 example usage in the IPsec library implementation.
 
+Cryptodev Direct Data-path Service API
+~~
+
+Direct crypto data-path service are a set of APIs that especially provided for
+the external libraries/applications who want to take advantage of the rich
+features provided by cryptodev, but not necessarily depend on cryptodev
+operations, mempools, or mbufs in the their data-path implementations.
+
+The direct crypto data-path service has the following advantages:
+- Supports raw data pointer and physical addresses as input.
+- Do not require specific data structure allocated from heap, such as
+  cryptodev operation.
+- Enqueue in a burst or single operation. The service allow enqueuing in
+  a burst similar to ``rte_cryptodev_enqueue_burst`` operation, or only
+  enqueue one job at a time but maintaining necessary context data locally for
+  next single job enqueue operation. The latter method is especially helpful
+  when the user application's crypto operations are clustered into a burst.
+  Allowing enqueue one operation at a time helps reducing one additional loop
+  and also reduced the cache misses during the double "looping" situation.
+- Customerizable dequeue count. Instead of dequeue maximum possible operations
+  as same as ``rte_cryptodev_dequeue_burst`` operation, the service allows the
+  user to provide a callback function to decide how many operations to be
+  dequeued. This is especially helpful when the expected dequeue count is
+  hidden inside the opaque data stored during enqueue. The user can provide
+  the callback function to parse the opaque data structure.
+- Abandon enqueue and dequeue anytime. One of the drawbacks of
+  ``rte_cryptodev_enqueue_burst`` and ``rte_cryptodev_dequeue_burst``
+  operations are: once an operation is enqueued/dequeued there is no way to
+  undo the operation. The service make the operation abandon possible by
+  creating a local copy of the queue operation data in the service context
+  data. The data will be written back to driver maintained operation data
+  when enqueue or dequeue done function is called.
+
+The cryptodev data-path service uses
+
+Cryptodev PMDs who supports this feature will have
+``RTE_CRYPTODEV_FF_SYM_HW_DIRECT_API`` feature flag presented. To use this
+feature the function ``rte_cryptodev_get_dp_service_ctx_data_size`` should
+be called to get the data path service context data size. The user should
+creates a local buffer at least this size long and initialize it using
+``rte_cryptodev_dp_configure_service`` function call.
+
+The ``rte_cryptodev_dp_configure_service`` function call initialize or
+updates the ``struct rte_crypto_dp_service_ctx`` buffer, in which contains the
+driver specific queue pair data pointer and service context buffer, and a
+set of function pointers to enqueue and dequeue different algorithms'
+operations. The ``rte_cryptodev_dp_configure_service`` should be called when:
+
+- Before enqueuing or dequeuing starts (set ``is_update`` parameter to 0).
+- When different cryptodev session, security session, or session-less xform
+  is used (set ``is_update`` parameter to 1).
+
+Two different enqueue functions are provided.
+
+- ``rte_cryptodev_dp_sym_submit_vec``: submit a burst of operations stored in
+  the ``rte_crypto_sym_vec`` structure.
+- ``rte_cryptodev_dp_submit_single_job``: submit single operation.
+
+Either enqueue functions will not command the crypto device to start processing
+until ``rte_cryptodev_dp_submit_done`` function is called. Before then the user
+shall expect the driver only stores the necessory context data in the
+``rte_crypto_dp_service_ctx`` buffer for the next enqueue operation. If the 
user
+wants to abandon the submitted operations, simply call
+``rte_cryptodev_dp_configure_service`` function instead with the parameter
+``is_update`` set to 0. The driver will recover the service context data to
+the previous state.
+
+To dequeue the operations the user also have two operations:
+
+- ``rte_cryptodev_dp_sym_dequeue``: fully customizable deuqueue operation. The
+  user needs to provide the callback function for the driver to get the
+  dequeue count and perform post processing such as write the status field.
+- ``rte_cryptodev_dp_sym_dequeue_sing

[dpdk-dev] [dpdk-dev v9 3/4] test/crypto: add unit-test for cryptodev direct APIs

[Fan Zhang]

This patch adds the QAT test to use cryptodev symmetric crypto
direct APIs.

Signed-off-by: Fan Zhang 
---
 app/test/test_cryptodev.c | 461 +++---
 app/test/test_cryptodev.h |   7 +
 app/test/test_cryptodev_blockcipher.c |  51 ++-
 3 files changed, 456 insertions(+), 63 deletions(-)

diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 70bf6fe2c..13f642e0e 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -49,6 +49,8 @@
 #define VDEV_ARGS_SIZE 100
 #define MAX_NB_SESSIONS 4
 
+#define MAX_DRV_SERVICE_CTX_SIZE 256
+
 #define IN_PLACE 0
 #define OUT_OF_PLACE 1
 
@@ -57,6 +59,8 @@ static int gbl_driver_id;
 static enum rte_security_session_action_type gbl_action_type =
RTE_SECURITY_ACTION_TYPE_NONE;
 
+int cryptodev_dp_test;
+
 struct crypto_testsuite_params {
struct rte_mempool *mbuf_pool;
struct rte_mempool *large_mbuf_pool;
@@ -147,6 +151,182 @@ ceil_byte_length(uint32_t num_bits)
return (num_bits >> 3);
 }
 
+void
+process_sym_hw_api_op(uint8_t dev_id, uint16_t qp_id, struct rte_crypto_op *op,
+   uint8_t is_cipher, uint8_t is_auth, uint8_t len_in_bits,
+   uint8_t cipher_iv_len)
+{
+   int32_t n;
+   struct rte_crypto_sym_op *sop;
+   struct rte_crypto_op *ret_op = NULL;
+   struct rte_crypto_vec data_vec[UINT8_MAX];
+   union rte_crypto_sym_additional_data a_data;
+   union rte_crypto_sym_ofs ofs;
+   int32_t status;
+   uint32_t max_len;
+   union rte_cryptodev_session_ctx sess;
+   enum rte_crypto_dp_service service_type;
+   uint32_t count = 0;
+   uint8_t service_data[MAX_DRV_SERVICE_CTX_SIZE] = {0};
+   struct rte_crypto_dp_service_ctx *ctx = (void *)service_data;
+   uint32_t cipher_offset = 0, cipher_len = 0, auth_offset = 0,
+   auth_len = 0;
+   int ctx_service_size;
+
+   sop = op->sym;
+
+   sess.crypto_sess = sop->session;
+
+   if (is_cipher && is_auth) {
+   service_type = RTE_CRYPTO_DP_SYM_CHAIN;
+   cipher_offset = sop->cipher.data.offset;
+   cipher_len = sop->cipher.data.length;
+   auth_offset = sop->auth.data.offset;
+   auth_len = sop->auth.data.length;
+   max_len = RTE_MAX(cipher_offset + cipher_len,
+   auth_offset + auth_len);
+   } else if (is_cipher) {
+   service_type = RTE_CRYPTO_DP_SYM_CIPHER_ONLY;
+   cipher_offset = sop->cipher.data.offset;
+   cipher_len = sop->cipher.data.length;
+   max_len = cipher_len + cipher_offset;
+   } else if (is_auth) {
+   service_type = RTE_CRYPTO_DP_SYM_AUTH_ONLY;
+   auth_offset = sop->auth.data.offset;
+   auth_len = sop->auth.data.length;
+   max_len = auth_len + auth_offset;
+   } else { /* aead */
+   service_type = RTE_CRYPTO_DP_SYM_AEAD;
+   cipher_offset = sop->aead.data.offset;
+   cipher_len = sop->aead.data.length;
+   max_len = cipher_len + cipher_offset;
+   }
+
+   if (len_in_bits) {
+   max_len = max_len >> 3;
+   cipher_offset = cipher_offset >> 3;
+   auth_offset = auth_offset >> 3;
+   cipher_len = cipher_len >> 3;
+   auth_len = auth_len >> 3;
+   }
+
+   ctx_service_size = rte_cryptodev_dp_get_service_ctx_data_size(dev_id);
+   assert(ctx_service_size <= MAX_DRV_SERVICE_CTX_SIZE &&
+   ctx_service_size > 0);
+
+   if (rte_cryptodev_dp_configure_service(dev_id, qp_id, service_type,
+   RTE_CRYPTO_OP_WITH_SESSION, sess, ctx, 0) < 0) {
+   op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+   return;
+   }
+
+   /* test update service */
+   if (rte_cryptodev_dp_configure_service(dev_id, qp_id, service_type,
+   RTE_CRYPTO_OP_WITH_SESSION, sess, ctx, 1) < 0) {
+   op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+   return;
+   }
+
+   n = rte_crypto_mbuf_to_vec(sop->m_src, 0, max_len,
+   data_vec, RTE_DIM(data_vec));
+   if (n < 0 || n > sop->m_src->nb_segs) {
+   op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+   return;
+   }
+
+   ofs.raw = 0;
+
+   switch (service_type) {
+   case RTE_CRYPTO_DP_SYM_AEAD:
+   ofs.ofs.cipher.head = cipher_offset;
+   ofs.ofs.cipher.tail = max_len - cipher_offset - cipher_len;
+   a_data.aead.iv_ptr = rte_crypto_op_ctod_offset(op, void *,
+   IV_OFFSET);
+   a_data.aead.iv_iova = rte_crypto_op_ctophys_offset(op,
+   IV_OFFSET);
+   a_data.aead.aad_ptr = (void *)sop->aead.aad.data;
+   a_data.aead.aad_iova = sop->aead.aad.ph

[dpdk-dev] [dpdk-dev v9 2/4] crypto/qat: add crypto data-path service API support

[Fan Zhang]

This patch updates QAT PMD to add crypto service API support.

Signed-off-by: Fan Zhang 
---
 drivers/common/qat/Makefile|   1 +
 drivers/crypto/qat/meson.build |   1 +
 drivers/crypto/qat/qat_sym.h   |  13 +
 drivers/crypto/qat/qat_sym_hw_dp.c | 947 +
 drivers/crypto/qat/qat_sym_pmd.c   |   9 +-
 5 files changed, 969 insertions(+), 2 deletions(-)
 create mode 100644 drivers/crypto/qat/qat_sym_hw_dp.c

diff --git a/drivers/common/qat/Makefile b/drivers/common/qat/Makefile
index 85d420709..1b71bbbab 100644
--- a/drivers/common/qat/Makefile
+++ b/drivers/common/qat/Makefile
@@ -42,6 +42,7 @@ endif
SRCS-y += qat_sym.c
SRCS-y += qat_sym_session.c
SRCS-y += qat_sym_pmd.c
+   SRCS-y += qat_sym_hw_dp.c
build_qat = yes
 endif
 endif
diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build
index a225f374a..bc90ec44c 100644
--- a/drivers/crypto/qat/meson.build
+++ b/drivers/crypto/qat/meson.build
@@ -15,6 +15,7 @@ if dep.found()
qat_sources += files('qat_sym_pmd.c',
 'qat_sym.c',
 'qat_sym_session.c',
+'qat_sym_hw_dp.c',
 'qat_asym_pmd.c',
 'qat_asym.c')
qat_ext_deps += dep
diff --git a/drivers/crypto/qat/qat_sym.h b/drivers/crypto/qat/qat_sym.h
index 1a9748849..ea2db0ca0 100644
--- a/drivers/crypto/qat/qat_sym.h
+++ b/drivers/crypto/qat/qat_sym.h
@@ -264,6 +264,18 @@ qat_sym_process_response(void **op, uint8_t *resp)
}
*op = (void *)rx_op;
 }
+
+int
+qat_sym_dp_configure_service_ctx(struct rte_cryptodev *dev, uint16_t qp_id,
+   enum rte_crypto_dp_service service_type,
+   enum rte_crypto_op_sess_type sess_type,
+   union rte_cryptodev_session_ctx session_ctx,
+   struct rte_crypto_dp_service_ctx *service_ctx,
+   uint8_t is_update);
+
+int
+qat_sym_get_service_ctx_size(struct rte_cryptodev *dev);
+
 #else
 
 static inline void
@@ -276,5 +288,6 @@ static inline void
 qat_sym_process_response(void **op __rte_unused, uint8_t *resp __rte_unused)
 {
 }
+
 #endif
 #endif /* _QAT_SYM_H_ */
diff --git a/drivers/crypto/qat/qat_sym_hw_dp.c 
b/drivers/crypto/qat/qat_sym_hw_dp.c
new file mode 100644
index 0..bc0dde9c5
--- /dev/null
+++ b/drivers/crypto/qat/qat_sym_hw_dp.c
@@ -0,0 +1,947 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Intel Corporation
+ */
+
+#include 
+
+#include "adf_transport_access_macros.h"
+#include "icp_qat_fw.h"
+#include "icp_qat_fw_la.h"
+
+#include "qat_sym.h"
+#include "qat_sym_pmd.h"
+#include "qat_sym_session.h"
+#include "qat_qp.h"
+
+struct qat_sym_dp_service_ctx {
+   struct qat_sym_session *session;
+   uint32_t tail;
+   uint32_t head;
+   uint16_t cached_enqueue;
+   uint16_t cached_dequeue;
+   enum rte_crypto_dp_service last_service_type;
+};
+
+static __rte_always_inline int32_t
+qat_sym_dp_get_data(struct qat_qp *qp, struct icp_qat_fw_la_bulk_req *req,
+   struct rte_crypto_vec *data, uint16_t n_data_vecs)
+{
+   struct qat_queue *tx_queue;
+   struct qat_sym_op_cookie *cookie;
+   struct qat_sgl *list;
+   uint32_t i;
+   uint32_t total_len;
+
+   if (likely(n_data_vecs == 1)) {
+   req->comn_mid.src_data_addr = req->comn_mid.dest_data_addr =
+   data[0].iova;
+   req->comn_mid.src_length = req->comn_mid.dst_length =
+   data[0].len;
+   return data[0].len;
+   }
+
+   if (n_data_vecs == 0 || n_data_vecs > QAT_SYM_SGL_MAX_NUMBER)
+   return -1;
+
+   total_len = 0;
+   tx_queue = &qp->tx_q;
+
+   ICP_QAT_FW_COMN_PTR_TYPE_SET(req->comn_hdr.comn_req_flags,
+   QAT_COMN_PTR_TYPE_SGL);
+   cookie = qp->op_cookies[tx_queue->tail >> tx_queue->trailz];
+   list = (struct qat_sgl *)&cookie->qat_sgl_src;
+
+   for (i = 0; i < n_data_vecs; i++) {
+   list->buffers[i].len = data[i].len;
+   list->buffers[i].resrvd = 0;
+   list->buffers[i].addr = data[i].iova;
+   if (total_len + data[i].len > UINT32_MAX) {
+   QAT_DP_LOG(ERR, "Message too long");
+   return -1;
+   }
+   total_len += data[i].len;
+   }
+
+   list->num_bufs = i;
+   req->comn_mid.src_data_addr = req->comn_mid.dest_data_addr =
+   cookie->qat_sgl_src_phys_addr;
+   req->comn_mid.src_length = req->comn_mid.dst_length = 0;
+   return total_len;
+}
+
+static __rte_always_inline void
+set_cipher_iv(struct icp_qat_fw_la_cipher_req_params *cipher_param,
+   union rte_crypto_sym_additional_data *a_data, uint32_t iv_len,
+   struct icp_qat_fw_la_bulk_req *qat_req)
+{
+   /* copy IV into request if it fits */
+   if (iv_len <= sizeof(cipher_param->u

Re: [dpdk-dev] [PATCH] net/ice/base: fix wrong outer ipv6 ptype table

[Zhang, Qi Z]

> -Original Message-
> From: Guo, Jia 
> Sent: Tuesday, September 8, 2020 11:59 AM
> To: Zhang, Qi Z ; Yang, Qiming
> 
> Cc: Xu, Ting ; dev@dpdk.org; Zhang, Qi Z
> ; sta...@dpdk.org
> Subject: RE: [dpdk-dev] [PATCH] net/ice/base: fix wrong outer ipv6 ptype table
> 
> 
> > -Original Message-
> > From: dev  On Behalf Of Qi Zhang
> > Sent: Sunday, September 6, 2020 9:02 PM
> > To: Yang, Qiming 
> > Cc: Xu, Ting ; dev@dpdk.org; Zhang, Qi Z
> > ; sta...@dpdk.org
> > Subject: [dpdk-dev] [PATCH] net/ice/base: fix wrong outer ipv6 ptype
> > table
> >
> > ptype 264, 265, 266, 267, 275 is should not be set in
> ice_ptypes_ipv6_ofos_all.
> >
> 
> A tiny comment, "is" should be deleted, right? 

yes
> And I think ptype name is more
> readable than number when interpret the reason, you choose.
> After that patch is ok.

These ptypes are reserved, they have no name.

> 
> Acked-by: Jeff Guo 

Applied to dpdk-next-net-intel after correct the commit log.

Thanks
Qi

Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK

[Thomas Monjalon]

08/09/2020 10:16, Bruce Richardson:
> On Tue, Sep 08, 2020 at 12:06:40AM +0200, Thomas Monjalon wrote:
> > The first 13 commits of this series are pushed to the main branch,
> > making the make-based build an old story.
> > 
> > The last 18 commits (devtools, app and doc) are pending
> > for more reviews, especially because the doc rework is
> > still in progress. This is a big change which requires
> > to be split but must be completed soon.
> > *All*, please make the documentation update your highest priority.
> > I will be reluctant to merge some driver changes if the related doc
> > is not updated.
> > 
> Thanks for the apply of the code patches, I think it will make all our
> subsequent patch submissions a bit cleaner.
> 
> In terms of docs, I believe the Linux and FreeBSD GSG guides to be ready
> for merge, or if not 100% they are at least good enough IMHO to be applied
> now and have some minor tweaks in subsequent patches later. While I'm sure
> the Linux GSG could do with more major rework, that should be separate from
> the doc updates in this patch.

Of course I am not expecting any major rework in these patches,
but I don't want to apply clean-up half done,
which can drop some relevant informations or introduce mistakes.

I will review the Linux and FreeBSD user guides first, as you suggest.

Re: [dpdk-dev] [PATCH 3/3] config: added build config file for AMD EPYC platform

[David Marchand]

Hello Aman,

On Mon, Sep 7, 2020 at 9:33 PM Aman Kumar  wrote:
>
> add build config specific to AMD EPYC platform
>
> Signed-off-by: Aman Kumar 

Make support has just been dropped from the main branch.
You will have to rework this series so that this feature is
handled/configured with meson or, even better, resolved at runtime.


> ---
>  config/defconfig_x86_64-amdEPYC-linux-gcc | 18 ++
>  1 file changed, 18 insertions(+)
>  create mode 100644 config/defconfig_x86_64-amdEPYC-linux-gcc
>
> diff --git a/config/defconfig_x86_64-amdEPYC-linux-gcc 
> b/config/defconfig_x86_64-amdEPYC-linux-gcc
> new file mode 100644
> index 0..8c1aa34e2
> --- /dev/null
> +++ b/config/defconfig_x86_64-amdEPYC-linux-gcc
> @@ -0,0 +1,18 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2010-2014 Intel Corporation
> +
> +#include "common_linux"
> +
> +CONFIG_RTE_MACHINE="native"
> +
> +CONFIG_RTE_ARCH="x86_64"
> +CONFIG_RTE_ARCH_X86_64=y
> +CONFIG_RTE_ARCH_X86=y
> +CONFIG_RTE_ARCH_64=y
> +
> +CONFIG_RTE_TOOLCHAIN="gcc"
> +CONFIG_RTE_TOOLCHAIN_GCC=y
> +CONFIG_RTE_MAX_LCORE=256
> +CONFIG_RTE_LIBRTE_MLX5_PMD=n
> +CONFIG_RTE_LIBRTE_MLX5_NTLOAD_TSTORE_ALIGN_COPY=n
> +CONFIG_RTE_LIBRTE_MLX5_NT_STORE=n
> --
> 2.25.1
>
>
> --
>
>
>
> _Disclaimer: _(c) 2020 VVDN Technologies Pvt. Ltd. This e-mail contains
> PRIVILEGED AND CONFIDENTIAL INFORMATION intended solely for the use of the
> addressee(s). If you are not the intended recipient, please notify the
> sender by e-mail and delete the original message. Further, you are not to
> copy, disclose, or distribute this e-mail or its contents to any other
> person and any such actions are unlawful._

Please, get this footer removed for future contributions.

Thanks.

-- 
David Marchand

[dpdk-dev] [PATCH 01/14] net/sfc: include header with debug helpers directly

[Andrew Rybchenko]

Avoid build failures on further restructuring.

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/net/sfc/sfc.c  | 1 +
 drivers/net/sfc/sfc.h  | 1 +
 drivers/net/sfc/sfc_dp_tx.h| 1 +
 drivers/net/sfc/sfc_ef10.h | 2 ++
 drivers/net/sfc/sfc_ef10_essb_rx.c | 1 +
 drivers/net/sfc/sfc_ef10_rx.c  | 1 +
 drivers/net/sfc/sfc_ef10_rx_ev.h   | 2 ++
 drivers/net/sfc/sfc_ef10_tx.c  | 1 +
 drivers/net/sfc/sfc_filter.c   | 1 +
 drivers/net/sfc/sfc_flow.c | 1 +
 drivers/net/sfc/sfc_mcdi.c | 1 +
 drivers/net/sfc/sfc_port.c | 1 +
 12 files changed, 14 insertions(+)

diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c
index c19d81cc88..03ea5dc128 100644
--- a/drivers/net/sfc/sfc.c
+++ b/drivers/net/sfc/sfc.c
@@ -16,6 +16,7 @@
 #include "efx.h"
 
 #include "sfc.h"
+#include "sfc_debug.h"
 #include "sfc_log.h"
 #include "sfc_ev.h"
 #include "sfc_rx.h"
diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index cf95ebaf90..cdff9be3ec 100644
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -21,6 +21,7 @@
 
 #include "efx.h"
 
+#include "sfc_debug.h"
 #include "sfc_filter.h"
 
 #ifdef __cplusplus
diff --git a/drivers/net/sfc/sfc_dp_tx.h b/drivers/net/sfc/sfc_dp_tx.h
index dcad4fe585..77ae166885 100644
--- a/drivers/net/sfc/sfc_dp_tx.h
+++ b/drivers/net/sfc/sfc_dp_tx.h
@@ -12,6 +12,7 @@
 
 #include 
 
+#include "sfc_debug.h"
 #include "sfc_dp.h"
 #include "sfc_debug.h"
 #include "sfc_tso.h"
diff --git a/drivers/net/sfc/sfc_ef10.h b/drivers/net/sfc/sfc_ef10.h
index f138e8d9b0..07c322f7a6 100644
--- a/drivers/net/sfc/sfc_ef10.h
+++ b/drivers/net/sfc/sfc_ef10.h
@@ -10,6 +10,8 @@
 #ifndef _SFC_EF10_H
 #define _SFC_EF10_H
 
+#include "sfc_debug.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/drivers/net/sfc/sfc_ef10_essb_rx.c 
b/drivers/net/sfc/sfc_ef10_essb_rx.c
index 13b2b824e3..8238cc830d 100644
--- a/drivers/net/sfc/sfc_ef10_essb_rx.c
+++ b/drivers/net/sfc/sfc_ef10_essb_rx.c
@@ -18,6 +18,7 @@
 #include "efx_types.h"
 #include "efx_regs_ef10.h"
 
+#include "sfc_debug.h"
 #include "sfc_tweak.h"
 #include "sfc_dp_rx.h"
 #include "sfc_kvargs.h"
diff --git a/drivers/net/sfc/sfc_ef10_rx.c b/drivers/net/sfc/sfc_ef10_rx.c
index 42e205e1bd..8c6ebaa2fa 100644
--- a/drivers/net/sfc/sfc_ef10_rx.c
+++ b/drivers/net/sfc/sfc_ef10_rx.c
@@ -21,6 +21,7 @@
 #include "efx_regs.h"
 #include "efx_regs_ef10.h"
 
+#include "sfc_debug.h"
 #include "sfc_tweak.h"
 #include "sfc_dp_rx.h"
 #include "sfc_kvargs.h"
diff --git a/drivers/net/sfc/sfc_ef10_rx_ev.h b/drivers/net/sfc/sfc_ef10_rx_ev.h
index a9896eae56..d15d24f4c1 100644
--- a/drivers/net/sfc/sfc_ef10_rx_ev.h
+++ b/drivers/net/sfc/sfc_ef10_rx_ev.h
@@ -16,6 +16,8 @@
 #include "efx_regs.h"
 #include "efx_regs_ef10.h"
 
+#include "sfc_debug.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/drivers/net/sfc/sfc_ef10_tx.c b/drivers/net/sfc/sfc_ef10_tx.c
index b91c8068b1..4d7da427cb 100644
--- a/drivers/net/sfc/sfc_ef10_tx.c
+++ b/drivers/net/sfc/sfc_ef10_tx.c
@@ -19,6 +19,7 @@
 #include "efx_regs.h"
 #include "efx_regs_ef10.h"
 
+#include "sfc_debug.h"
 #include "sfc_dp_tx.h"
 #include "sfc_tweak.h"
 #include "sfc_kvargs.h"
diff --git a/drivers/net/sfc/sfc_filter.c b/drivers/net/sfc/sfc_filter.c
index 7f4f7c47a5..05a9799230 100644
--- a/drivers/net/sfc/sfc_filter.c
+++ b/drivers/net/sfc/sfc_filter.c
@@ -12,6 +12,7 @@
 #include "efx.h"
 
 #include "sfc.h"
+#include "sfc_debug.h"
 #include "sfc_log.h"
 
 boolean_t
diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c
index c8e6fb8bce..1a3c0d618b 100644
--- a/drivers/net/sfc/sfc_flow.c
+++ b/drivers/net/sfc/sfc_flow.c
@@ -18,6 +18,7 @@
 #include "efx.h"
 
 #include "sfc.h"
+#include "sfc_debug.h"
 #include "sfc_rx.h"
 #include "sfc_filter.h"
 #include "sfc_flow.h"
diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index 872e4e76b1..ec62ba95ff 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -14,6 +14,7 @@
 #include "efx_regs_mcdi.h"
 
 #include "sfc.h"
+#include "sfc_debug.h"
 #include "sfc_log.h"
 #include "sfc_ev.h"
 
diff --git a/drivers/net/sfc/sfc_port.c b/drivers/net/sfc/sfc_port.c
index 32a0894a55..4de13267d5 100644
--- a/drivers/net/sfc/sfc_port.c
+++ b/drivers/net/sfc/sfc_port.c
@@ -10,6 +10,7 @@
 #include "efx.h"
 
 #include "sfc.h"
+#include "sfc_debug.h"
 #include "sfc_log.h"
 #include "sfc_kvargs.h"
 
-- 
2.17.1

[dpdk-dev] [PATCH 01/14] net/iavf: downgrade error log

[Andrew Rybchenko]

From: Steve Yang 

When receiving the unsupported AQ messages, it's taken as an
error. It's not appropriate and triggers too much unnecessary print.

Fixes: 22b123a36d07 ("net/avf: initialize PMD")
Cc: sta...@dpdk.org

Signed-off-by: Steve Yang 
Acked-by: Beilei Xing 
Signed-off-by: Andrew Rybchenko 
---
 drivers/net/iavf/iavf_vchnl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index ff2ac3c367..34c31a153a 100644
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -269,7 +269,7 @@ iavf_handle_virtchnl_msg(struct rte_eth_dev *dev)
}
break;
default:
-   PMD_DRV_LOG(ERR, "Request %u is not supported yet",
+   PMD_DRV_LOG(DEBUG, "Request %u is not supported yet",
aq_opc);
break;
}
-- 
2.17.1

[dpdk-dev] [PATCH 12/14] net/sfc: add MCDI callback to poll management event queue

[Andrew Rybchenko]

Management event queue polling is required in the case of
MCDI proxy authentication (client driver code).

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/net/sfc/sfc_mcdi.c | 14 --
 drivers/net/sfc/sfc_mcdi.h |  3 +++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index 73dbd8194b..fa9160f6d3 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -70,7 +70,7 @@ sfc_efx_mcdi_proxy_event_available(struct sfc_adapter *sa)
 
mcdi->proxy_handle = 0;
mcdi->proxy_result = ETIMEDOUT;
-   sfc_ev_mgmt_qpoll(sa);
+   mcdi->ops->mgmt_evq_poll(mcdi->ops_cookie);
if (mcdi->proxy_result != ETIMEDOUT)
return B_TRUE;
 
@@ -286,7 +286,7 @@ sfc_efx_mcdi_init(struct sfc_adapter *sa, struct 
sfc_efx_mcdi *mcdi,
int rc;
 
if (ops->dma_alloc == NULL || ops->dma_free == NULL ||
-   ops->sched_restart == NULL)
+   ops->sched_restart == NULL || ops->mgmt_evq_poll == NULL)
return EINVAL;
 
SFC_ASSERT(mcdi->state == SFC_EFX_MCDI_UNINITIALIZED);
@@ -382,10 +382,20 @@ sfc_mcdi_sched_restart(void *cookie)
sfc_schedule_restart(sa);
 }
 
+static sfc_efx_mcdi_mgmt_evq_poll_cb sfc_mcdi_mgmt_evq_poll;
+static void
+sfc_mcdi_mgmt_evq_poll(void *cookie)
+{
+   struct sfc_adapter *sa = cookie;
+
+   sfc_ev_mgmt_qpoll(sa);
+}
+
 static const struct sfc_efx_mcdi_ops sfc_mcdi_ops = {
.dma_alloc  = sfc_mcdi_dma_alloc,
.dma_free   = sfc_mcdi_dma_free,
.sched_restart  = sfc_mcdi_sched_restart,
+   .mgmt_evq_poll  = sfc_mcdi_mgmt_evq_poll,
 };
 
 int
diff --git a/drivers/net/sfc/sfc_mcdi.h b/drivers/net/sfc/sfc_mcdi.h
index 8f9b1991be..e3a637aeb7 100644
--- a/drivers/net/sfc/sfc_mcdi.h
+++ b/drivers/net/sfc/sfc_mcdi.h
@@ -39,10 +39,13 @@ typedef void (sfc_efx_mcdi_dma_free_cb)(void *cookie, 
efsys_mem_t *esmp);
 
 typedef void (sfc_efx_mcdi_sched_restart_cb)(void *cookie);
 
+typedef void (sfc_efx_mcdi_mgmt_evq_poll_cb)(void *cookie);
+
 struct sfc_efx_mcdi_ops {
sfc_efx_mcdi_dma_alloc_cb   *dma_alloc;
sfc_efx_mcdi_dma_free_cb*dma_free;
sfc_efx_mcdi_sched_restart_cb   *sched_restart;
+   sfc_efx_mcdi_mgmt_evq_poll_cb   *mgmt_evq_poll;
 };
 
 struct sfc_efx_mcdi {
-- 
2.17.1

[dpdk-dev] [PATCH 00/14] net/sfc: factor out common driver library

[Andrew Rybchenko]

Network and vDPA drivers share libefx. So, libefx should be moved
to common drivers.

DPDK adaptation of the MCDI interface may be shared as well.

The new common driver name is sfc_efx since it a new home of
libefx base driver. sfc_ prefix is used to make it clear that
it is related to net/sfc (and vdpa/sfc in the future).

In theory, right now all exported libefx functions should be marked
as internal, but it requires corresponding markup in base driver
which sources should have no DPDK specifics since shared by many
drivers. So, it is unclear what to do and how to solve it.

The patch series makes these functions a part of DPDK_21 ABI to
pass build checks. checkpatches.sh does not like it.

Cc: Thomas Monjalon 
Cc: David Marchand 
Cc: Ferruh Yigit 

Andrew Rybchenko (14):
  net/sfc: include header with debug helpers directly
  net/sfc: introduce common driver library
  net/sfc: add dedicated header file with MCDI interface
  net/sfc: move MCDI helper interface to dedicated namespace
  net/sfc: make MCDI logging helper macros local
  net/sfc: start to make MCDI helpers interface shareable
  net/sfc: use own logging helper macros
  net/sfc: avoid usage of NIC pointer from adapter context
  net/sfc: avoid panic in the case of MCDI timeout
  net/sfc: add MCDI callbacks to allocate/free DMA memory
  net/sfc: add MCDI callback to schedule restart
  net/sfc: add MCDI callback to poll management event queue
  net/sfc: use MCDI control structure as libefx ops context
  net/sfc: move MCDI helpers to common driver

 MAINTAINERS   |   1 +
 drivers/common/Makefile   |   4 +
 drivers/common/meson.build|   2 +-
 drivers/common/sfc_efx/Makefile   | 112 ++
 .../{net/sfc => common/sfc_efx}/base/README   |   0
 .../sfc => common/sfc_efx}/base/ef10_ev.c |   0
 .../sfc => common/sfc_efx}/base/ef10_evb.c|   0
 .../sfc => common/sfc_efx}/base/ef10_filter.c |   0
 .../sfc_efx}/base/ef10_firmware_ids.h |   0
 .../sfc => common/sfc_efx}/base/ef10_image.c  |   0
 .../sfc => common/sfc_efx}/base/ef10_impl.h   |   0
 .../sfc => common/sfc_efx}/base/ef10_intr.c   |   0
 .../sfc => common/sfc_efx}/base/ef10_mac.c|   0
 .../sfc => common/sfc_efx}/base/ef10_mcdi.c   |   0
 .../sfc => common/sfc_efx}/base/ef10_nic.c|   0
 .../sfc => common/sfc_efx}/base/ef10_nvram.c  |   0
 .../sfc => common/sfc_efx}/base/ef10_phy.c|   0
 .../sfc => common/sfc_efx}/base/ef10_proxy.c  |   0
 .../sfc => common/sfc_efx}/base/ef10_rx.c |   0
 .../sfc_efx}/base/ef10_signed_image_layout.h  |   0
 .../sfc_efx}/base/ef10_tlv_layout.h   |   0
 .../sfc => common/sfc_efx}/base/ef10_tx.c |   0
 .../sfc => common/sfc_efx}/base/ef10_vpd.c|   0
 .../{net/sfc => common/sfc_efx}/base/efx.h|   0
 .../sfc => common/sfc_efx}/base/efx_annote.h  |   0
 .../sfc => common/sfc_efx}/base/efx_bootcfg.c |   0
 .../sfc => common/sfc_efx}/base/efx_check.h   |   0
 .../sfc => common/sfc_efx}/base/efx_crc32.c   |   0
 .../{net/sfc => common/sfc_efx}/base/efx_ev.c |   0
 .../sfc => common/sfc_efx}/base/efx_evb.c |   0
 .../sfc => common/sfc_efx}/base/efx_filter.c  |   0
 .../sfc => common/sfc_efx}/base/efx_hash.c|   0
 .../sfc => common/sfc_efx}/base/efx_impl.h|   0
 .../sfc => common/sfc_efx}/base/efx_intr.c|   0
 .../sfc => common/sfc_efx}/base/efx_lic.c |   0
 .../sfc => common/sfc_efx}/base/efx_mac.c |   0
 .../sfc => common/sfc_efx}/base/efx_mcdi.c|   0
 .../sfc => common/sfc_efx}/base/efx_mcdi.h|   0
 .../sfc => common/sfc_efx}/base/efx_mon.c |   0
 .../sfc => common/sfc_efx}/base/efx_nic.c |   0
 .../sfc => common/sfc_efx}/base/efx_nvram.c   |   0
 .../sfc => common/sfc_efx}/base/efx_phy.c |   0
 .../sfc => common/sfc_efx}/base/efx_phy_ids.h |   0
 .../sfc => common/sfc_efx}/base/efx_port.c|   0
 .../sfc => common/sfc_efx}/base/efx_proxy.c   |   0
 .../sfc => common/sfc_efx}/base/efx_regs.h|   0
 .../sfc_efx}/base/efx_regs_ef10.h |   0
 .../sfc_efx}/base/efx_regs_mcdi.h |   0
 .../sfc_efx}/base/efx_regs_mcdi_aoe.h |   0
 .../sfc_efx}/base/efx_regs_mcdi_strs.h|   0
 .../sfc_efx}/base/efx_regs_pci.h  |   0
 .../{net/sfc => common/sfc_efx}/base/efx_rx.c |   0
 .../sfc => common/sfc_efx}/base/efx_sram.c|   0
 .../sfc => common/sfc_efx}/base/efx_tunnel.c  |   0
 .../{net/sfc => common/sfc_efx}/base/efx_tx.c |   0
 .../sfc => common/sfc_efx}/base/efx_types.h   |   0
 .../sfc => common/sfc_efx}/base/efx_vpd.c |   0
 .../sfc => common/sfc_efx}/base/hunt_impl.h   |   0
 .../sfc => common/sfc_efx}/base/hunt_nic.c|   0
 .../sfc => common/sfc_efx}/base/mcdi_mon.c|   0
 .../sfc => common/sfc_efx}/base/mcdi_mon.h|   0
 .../sfc_efx}/base/medford2_impl.h |   0
 .../sfc_efx}/base/medford2_nic.c  |   0
 .../sfc_efx}/base/medford_impl.h  |   0
 .../sfc => common/sfc_efx}/base/medford_nic.c |   0
 .../sf

[dpdk-dev] [PATCH 05/14] net/sfc: make MCDI logging helper macros local

[Andrew Rybchenko]

Prepare to move MCDI helpers to drivers/common.

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/net/sfc/sfc_log.h  | 11 ---
 drivers/net/sfc/sfc_mcdi.c | 21 -
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/net/sfc/sfc_log.h b/drivers/net/sfc/sfc_log.h
index 5383091c76..4bf44b1f15 100644
--- a/drivers/net/sfc/sfc_log.h
+++ b/drivers/net/sfc/sfc_log.h
@@ -28,9 +28,6 @@ extern uint32_t sfc_logtype_driver;
 /** Device MCDI log type name prefix */
 #define SFC_LOGTYPE_MCDI_STR   SFC_LOGTYPE_PREFIX "mcdi"
 
-/** Level value used by MCDI log statements */
-#define SFC_LOG_LEVEL_MCDI RTE_LOG_INFO
-
 /* Log PMD message, automatically add prefix and \n */
 #define SFC_LOG(sas, level, type, ...) \
do {\
@@ -92,13 +89,5 @@ extern uint32_t sfc_logtype_driver;
RTE_FMT_TAIL(__VA_ARGS__ ,)));  \
} while (0)
 
-#define sfc_log_mcdi(sa, ...) \
-   do {\
-   const struct sfc_adapter *_sa = (sa);   \
-   \
-   SFC_LOG(_sa->priv.shared, SFC_LOG_LEVEL_MCDI,   \
-   _sa->mcdi.logtype, __VA_ARGS__);\
-   } while (0)
-
 
 #endif /* _SFC_LOG_H_ */
diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index c97a33d558..c716caabdf 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -23,6 +23,17 @@
 #define SFC_EFX_MCDI_POLL_INTERVAL_MAX_US  (US_PER_S / 10) /* 100ms */
 #define SFC_EFX_MCDI_WATCHDOG_INTERVAL_US  (10 * US_PER_S) /* 10s */
 
+/** Level value used by MCDI log statements */
+#define SFC_EFX_LOG_LEVEL_MCDI RTE_LOG_INFO
+
+#define sfc_efx_log_mcdi(sa, ...) \
+   do {\
+   const struct sfc_adapter *_sa = (sa);   \
+   \
+   SFC_LOG(_sa->priv.shared, SFC_EFX_LOG_LEVEL_MCDI,   \
+   _sa->mcdi.logtype, __VA_ARGS__);\
+   } while (0)
+
 static void
 sfc_efx_mcdi_timeout(struct sfc_adapter *sa)
 {
@@ -178,7 +189,7 @@ sfc_efx_mcdi_do_log(const struct sfc_adapter *sa,
 * at the end which is required by netlogdecode.
 */
buffer[position] = '\0';
-   sfc_log_mcdi(sa, "%s \\", buffer);
+   sfc_efx_log_mcdi(sa, "%s \\", buffer);
/* Preserve prefix for the next log message */
position = pfxsize;
}
@@ -207,11 +218,11 @@ sfc_efx_mcdi_logger(void *arg, efx_log_msg_t type,
 *
 * To avoid wasting time, the actual level is examined in advance.
 */
-   if (rte_log_get_level(sa->mcdi.logtype) < (int)SFC_LOG_LEVEL_MCDI)
+   if (rte_log_get_level(sa->mcdi.logtype) < (int)SFC_EFX_LOG_LEVEL_MCDI)
return;
 
-   /* The format including prefix added by sfc_log_mcdi() is the format
-* consumed by the Solarflare netlogdecode tool.
+   /* The format including prefix added by sfc_efx_log_mcdi() is the
+* format consumed by the Solarflare netlogdecode tool.
 */
pfxsize = snprintf(buffer, sizeof(buffer), "MCDI RPC %s:",
   type == EFX_LOG_MCDI_REQUEST ? "REQ" :
@@ -222,7 +233,7 @@ sfc_efx_mcdi_logger(void *arg, efx_log_msg_t type,
pfxsize, start);
if (start != pfxsize) {
buffer[start] = '\0';
-   sfc_log_mcdi(sa, "%s", buffer);
+   sfc_efx_log_mcdi(sa, "%s", buffer);
}
 }
 
-- 
2.17.1

[dpdk-dev] [PATCH 13/14] net/sfc: use MCDI control structure as libefx ops context

[Andrew Rybchenko]

Now MCDI helpers interface is independent from network driver and
may be moved into common driver.

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/net/sfc/sfc_mcdi.c | 47 +++---
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index fa9160f6d3..ff2bc14c5d 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -52,10 +52,8 @@
sfc_efx_mcdi_log(mcdi, SFC_EFX_LOG_LEVEL_MCDI, __VA_ARGS__)
 
 static void
-sfc_efx_mcdi_timeout(struct sfc_adapter *sa)
+sfc_efx_mcdi_timeout(struct sfc_efx_mcdi *mcdi)
 {
-   struct sfc_efx_mcdi *mcdi = &sa->mcdi;
-
sfc_efx_mcdi_warn(mcdi, "MC TIMEOUT");
 
mcdi->state = SFC_EFX_MCDI_DEAD;
@@ -64,10 +62,8 @@ sfc_efx_mcdi_timeout(struct sfc_adapter *sa)
 }
 
 static inline boolean_t
-sfc_efx_mcdi_proxy_event_available(struct sfc_adapter *sa)
+sfc_efx_mcdi_proxy_event_available(struct sfc_efx_mcdi *mcdi)
 {
-   struct sfc_efx_mcdi *mcdi = &sa->mcdi;
-
mcdi->proxy_handle = 0;
mcdi->proxy_result = ETIMEDOUT;
mcdi->ops->mgmt_evq_poll(mcdi->ops_cookie);
@@ -78,9 +74,8 @@ sfc_efx_mcdi_proxy_event_available(struct sfc_adapter *sa)
 }
 
 static void
-sfc_efx_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)
+sfc_efx_mcdi_poll(struct sfc_efx_mcdi *mcdi, boolean_t proxy)
 {
-   struct sfc_efx_mcdi *mcdi = &sa->mcdi;
efx_nic_t *enp;
unsigned int delay_total;
unsigned int delay_us;
@@ -93,8 +88,9 @@ sfc_efx_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)
do {
boolean_t poll_completed;
 
-   poll_completed = (proxy) ? 
sfc_efx_mcdi_proxy_event_available(sa) :
-  efx_mcdi_request_poll(enp);
+   poll_completed = (proxy) ?
+   sfc_efx_mcdi_proxy_event_available(mcdi) :
+   efx_mcdi_request_poll(enp);
if (poll_completed)
return;
 
@@ -102,7 +98,7 @@ sfc_efx_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)
if (!proxy) {
aborted = efx_mcdi_request_abort(enp);
SFC_ASSERT(aborted);
-   sfc_efx_mcdi_timeout(sa);
+   sfc_efx_mcdi_timeout(mcdi);
}
 
return;
@@ -125,8 +121,7 @@ sfc_efx_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)
 static void
 sfc_efx_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)
 {
-   struct sfc_adapter *sa = (struct sfc_adapter *)arg;
-   struct sfc_efx_mcdi *mcdi = &sa->mcdi;
+   struct sfc_efx_mcdi *mcdi = (struct sfc_efx_mcdi *)arg;
uint32_t proxy_handle;
 
if (mcdi->state == SFC_EFX_MCDI_DEAD) {
@@ -139,7 +134,7 @@ sfc_efx_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)
SFC_ASSERT(mcdi->state == SFC_EFX_MCDI_INITIALIZED);
 
efx_mcdi_request_start(mcdi->nic, emrp, B_FALSE);
-   sfc_efx_mcdi_poll(sa, B_FALSE);
+   sfc_efx_mcdi_poll(mcdi, B_FALSE);
 
if (efx_mcdi_get_proxy_handle(mcdi->nic, emrp, &proxy_handle) == 0) {
/*
@@ -148,7 +143,7 @@ sfc_efx_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)
 * a non-zero proxy handle (should be the same as
 * the value obtained above) and operation status
 */
-   sfc_efx_mcdi_poll(sa, B_TRUE);
+   sfc_efx_mcdi_poll(mcdi, B_TRUE);
 
if ((mcdi->proxy_handle != 0) &&
(mcdi->proxy_handle != proxy_handle)) {
@@ -160,7 +155,7 @@ sfc_efx_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)
 * request and poll for an ordinary MCDI response
 */
efx_mcdi_request_start(mcdi->nic, emrp, B_FALSE);
-   sfc_efx_mcdi_poll(sa, B_FALSE);
+   sfc_efx_mcdi_poll(mcdi, B_FALSE);
} else {
emrp->emr_rc = mcdi->proxy_result;
sfc_efx_mcdi_err(mcdi,
@@ -175,10 +170,9 @@ sfc_efx_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)
 static void
 sfc_efx_mcdi_ev_cpl(void *arg)
 {
-   struct sfc_adapter *sa = (struct sfc_adapter *)arg;
-   struct sfc_efx_mcdi *mcdi __rte_unused;
+   struct sfc_efx_mcdi *mcdi = (struct sfc_efx_mcdi *)arg;
 
-   mcdi = &sa->mcdi;
+   RTE_SET_USED(mcdi);
SFC_ASSERT(mcdi->state == SFC_EFX_MCDI_INITIALIZED);
 
/* MCDI is polled, completions are not expected */
@@ -188,8 +182,7 @@ sfc_efx_mcdi_ev_cpl(void *arg)
 static void
 sfc_efx_mcdi_exception(void *arg, efx_mcdi_exception_t eme)
 {
-   struct sfc_adapter *sa = (struct sfc_adapter *)arg;
-   struct sfc_efx_mcdi *mcdi  = &sa->mcdi;
+   struct sfc_efx_mcdi *mcdi = (struct sfc_efx_mcdi *)arg;
 
sfc_ef

[dpdk-dev] [PATCH 07/14] net/sfc: use own logging helper macros

[Andrew Rybchenko]

Network driver logging macros depends on sfc_adapter which is
specific to the driver and cannot be used in common code.

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/net/sfc/sfc.h|  2 +
 drivers/net/sfc/sfc_ethdev.c | 13 ++
 drivers/net/sfc/sfc_log.h| 12 ++---
 drivers/net/sfc/sfc_mcdi.c   | 86 +++-
 drivers/net/sfc/sfc_mcdi.h   |  1 +
 5 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index b3ac752334..b20fecb4f8 100644
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -22,6 +22,7 @@
 #include "efx.h"
 
 #include "sfc_debug.h"
+#include "sfc_log.h"
 #include "sfc_filter.h"
 #include "sfc_mcdi.h"
 
@@ -170,6 +171,7 @@ struct sfc_adapter_shared {
boolean_t   isolated;
uint32_ttunnel_encaps;
 
+   charlog_prefix[SFC_LOG_PREFIX_MAX];
struct rte_pci_addr pci_addr;
uint16_tport_id;
 
diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index acee3e48e4..085f020a4c 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -2136,6 +2136,7 @@ sfc_eth_dev_init(struct rte_eth_dev *dev)
int rc;
const efx_nic_cfg_t *encp;
const struct rte_ether_addr *from;
+   int ret;
 
sfc_register_dp();
 
@@ -2147,6 +2148,18 @@ sfc_eth_dev_init(struct rte_eth_dev *dev)
return -sfc_eth_dev_secondary_init(dev, logtype_main);
 
/* Required for logging */
+   ret = snprintf(sas->log_prefix, sizeof(sas->log_prefix),
+   "PMD: sfc_efx " PCI_PRI_FMT " #%" PRIu16 ": ",
+   pci_dev->addr.domain, pci_dev->addr.bus,
+   pci_dev->addr.devid, pci_dev->addr.function,
+   dev->data->port_id);
+   if (ret < 0 || ret >= (int)sizeof(sas->log_prefix)) {
+   SFC_GENERIC_LOG(ERR,
+   "reserved log prefix is too short for " PCI_PRI_FMT,
+   pci_dev->addr.domain, pci_dev->addr.bus,
+   pci_dev->addr.devid, pci_dev->addr.function);
+   return -EINVAL;
+   }
sas->pci_addr = pci_dev->addr;
sas->port_id = dev->data->port_id;
 
diff --git a/drivers/net/sfc/sfc_log.h b/drivers/net/sfc/sfc_log.h
index 4bf44b1f15..a2d714afb7 100644
--- a/drivers/net/sfc/sfc_log.h
+++ b/drivers/net/sfc/sfc_log.h
@@ -28,20 +28,16 @@ extern uint32_t sfc_logtype_driver;
 /** Device MCDI log type name prefix */
 #define SFC_LOGTYPE_MCDI_STR   SFC_LOGTYPE_PREFIX "mcdi"
 
+#define SFC_LOG_PREFIX_MAX 32
+
 /* Log PMD message, automatically add prefix and \n */
 #define SFC_LOG(sas, level, type, ...) \
do {\
const struct sfc_adapter_shared *_sas = (sas);  \
\
rte_log(level, type,\
-   RTE_FMT("PMD: sfc_efx " \
-   PCI_PRI_FMT " #%" PRIu16\
-   ": " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n",  \
-   _sas->pci_addr.domain,  \
-   _sas->pci_addr.bus, \
-   _sas->pci_addr.devid,   \
-   _sas->pci_addr.function,\
-   _sas->port_id,  \
+   RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n",  \
+   _sas->log_prefix,   \
RTE_FMT_TAIL(__VA_ARGS__,)));   \
} while (0)
 
diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index 35e1f3940d..5f6ad0a4aa 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -23,21 +23,37 @@
 #define SFC_EFX_MCDI_POLL_INTERVAL_MAX_US  (US_PER_S / 10) /* 100ms */
 #define SFC_EFX_MCDI_WATCHDOG_INTERVAL_US  (10 * US_PER_S) /* 10s */
 
-/** Level value used by MCDI log statements */
-#define SFC_EFX_LOG_LEVEL_MCDI RTE_LOG_INFO
-
-#define sfc_efx_log_mcdi(sa, ...) \
+#define sfc_efx_mcdi_log(mcdi, level, ...) \
do {\
-   const struct sfc_adapter *_sa = (sa);   \
+   const struct sfc_efx_mcdi *_mcdi = (mcdi);  \
\
-   SFC_LOG(_sa->priv.shared, SFC_EFX_LOG_LEVEL_MCDI,   \
-   _sa->mcdi.logtype, __VA_ARGS__);\
+   rte_log(level, _mcdi->logtype,   

[dpdk-dev] [PATCH 08/14] net/sfc: avoid usage of NIC pointer from adapter context

[Andrew Rybchenko]

Prepare to avoid usage of the adapter context in common MCDI helpers.

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/net/sfc/sfc_mcdi.c | 19 +++
 drivers/net/sfc/sfc_mcdi.h |  1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index 5f6ad0a4aa..8f446e8bc8 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -75,6 +75,7 @@ sfc_efx_mcdi_proxy_event_available(struct sfc_adapter *sa)
 static void
 sfc_efx_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)
 {
+   struct sfc_efx_mcdi *mcdi = &sa->mcdi;
efx_nic_t *enp;
unsigned int delay_total;
unsigned int delay_us;
@@ -82,7 +83,7 @@ sfc_efx_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)
 
delay_total = 0;
delay_us = SFC_EFX_MCDI_POLL_INTERVAL_MIN_US;
-   enp = sa->nic;
+   enp = mcdi->nic;
 
do {
boolean_t poll_completed;
@@ -127,10 +128,10 @@ sfc_efx_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)
 
SFC_ASSERT(mcdi->state == SFC_EFX_MCDI_INITIALIZED);
 
-   efx_mcdi_request_start(sa->nic, emrp, B_FALSE);
+   efx_mcdi_request_start(mcdi->nic, emrp, B_FALSE);
sfc_efx_mcdi_poll(sa, B_FALSE);
 
-   if (efx_mcdi_get_proxy_handle(sa->nic, emrp, &proxy_handle) == 0) {
+   if (efx_mcdi_get_proxy_handle(mcdi->nic, emrp, &proxy_handle) == 0) {
/*
 * Authorization is required for the MCDI request;
 * wait for an MCDI proxy response event to bring
@@ -148,7 +149,7 @@ sfc_efx_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)
 * Authorization succeeded; re-issue the original
 * request and poll for an ordinary MCDI response
 */
-   efx_mcdi_request_start(sa->nic, emrp, B_FALSE);
+   efx_mcdi_request_start(mcdi->nic, emrp, B_FALSE);
sfc_efx_mcdi_poll(sa, B_FALSE);
} else {
emrp->emr_rc = mcdi->proxy_result;
@@ -267,7 +268,7 @@ sfc_efx_mcdi_ev_proxy_response(void *arg, uint32_t handle, 
efx_rc_t result)
 
 static int
 sfc_efx_mcdi_init(struct sfc_adapter *sa, struct sfc_efx_mcdi *mcdi,
- uint32_t logtype, const char *log_prefix)
+ uint32_t logtype, const char *log_prefix, efx_nic_t *nic)
 {
size_t max_msg_size;
efx_mcdi_transport_t *emtp;
@@ -277,6 +278,8 @@ sfc_efx_mcdi_init(struct sfc_adapter *sa, struct 
sfc_efx_mcdi *mcdi,
 
rte_spinlock_init(&mcdi->lock);
 
+   mcdi->nic = nic;
+
mcdi->state = SFC_EFX_MCDI_INITIALIZED;
 
mcdi->logtype = logtype;
@@ -298,7 +301,7 @@ sfc_efx_mcdi_init(struct sfc_adapter *sa, struct 
sfc_efx_mcdi *mcdi,
emtp->emt_ev_proxy_response = sfc_efx_mcdi_ev_proxy_response;
 
sfc_efx_mcdi_info(mcdi, "init MCDI");
-   rc = efx_mcdi_init(sa->nic, emtp);
+   rc = efx_mcdi_init(mcdi->nic, emtp);
if (rc != 0)
goto fail_mcdi_init;
 
@@ -326,7 +329,7 @@ sfc_efx_mcdi_fini(struct sfc_adapter *sa, struct 
sfc_efx_mcdi *mcdi)
mcdi->state = SFC_EFX_MCDI_UNINITIALIZED;
 
sfc_efx_mcdi_info(mcdi, "fini MCDI");
-   efx_mcdi_fini(sa->nic);
+   efx_mcdi_fini(mcdi->nic);
memset(emtp, 0, sizeof(*emtp));
 
rte_spinlock_unlock(&mcdi->lock);
@@ -346,7 +349,7 @@ sfc_mcdi_init(struct sfc_adapter *sa)
   RTE_LOG_NOTICE);
 
return sfc_efx_mcdi_init(sa, &sa->mcdi, logtype,
-sa->priv.shared->log_prefix);
+sa->priv.shared->log_prefix, sa->nic);
 }
 
 void
diff --git a/drivers/net/sfc/sfc_mcdi.h b/drivers/net/sfc/sfc_mcdi.h
index 0194825bfa..e2105364ad 100644
--- a/drivers/net/sfc/sfc_mcdi.h
+++ b/drivers/net/sfc/sfc_mcdi.h
@@ -33,6 +33,7 @@ enum sfc_efx_mcdi_state {
 
 struct sfc_efx_mcdi {
rte_spinlock_t  lock;
+   efx_nic_t   *nic;
efsys_mem_t mem;
enum sfc_efx_mcdi_state state;
efx_mcdi_transport_ttransport;
-- 
2.17.1

[dpdk-dev] [PATCH 04/14] net/sfc: move MCDI helper interface to dedicated namespace

[Andrew Rybchenko]

MCDI helpers will be moved to common/sfc_efx and it is better
to do dummy renamings first before non-trivial changes.

Existing functionality should be split into common and network
driver specific parts. Prepare to do it.

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/net/sfc/sfc.h  |   5 +-
 drivers/net/sfc/sfc_mcdi.c | 108 +
 drivers/net/sfc/sfc_mcdi.h |  22 +++-
 3 files changed, 73 insertions(+), 62 deletions(-)

diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index a530b12a8e..b3ac752334 100644
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -220,7 +220,7 @@ struct sfc_adapter {
rte_spinlock_t  nic_lock;
rte_atomic32_t  restart_required;
 
-   struct sfc_mcdi mcdi;
+   struct sfc_efx_mcdi mcdi;
struct sfc_intr intr;
struct sfc_port port;
struct sfc_filter   filter;
@@ -366,6 +366,9 @@ void sfc_stop(struct sfc_adapter *sa);
 
 void sfc_schedule_restart(struct sfc_adapter *sa);
 
+int sfc_mcdi_init(struct sfc_adapter *sa);
+void sfc_mcdi_fini(struct sfc_adapter *sa);
+
 int sfc_configure(struct sfc_adapter *sa);
 void sfc_close(struct sfc_adapter *sa);
 
diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index 9a51b3e030..c97a33d558 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -19,12 +19,12 @@
 #include "sfc_log.h"
 #include "sfc_ev.h"
 
-#define SFC_MCDI_POLL_INTERVAL_MIN_US  10  /* 10us in 1us units */
-#define SFC_MCDI_POLL_INTERVAL_MAX_US  (US_PER_S / 10) /* 100ms in 1us units */
-#define SFC_MCDI_WATCHDOG_INTERVAL_US  (10 * US_PER_S) /* 10s in 1us units */
+#define SFC_EFX_MCDI_POLL_INTERVAL_MIN_US  10  /* 10us */
+#define SFC_EFX_MCDI_POLL_INTERVAL_MAX_US  (US_PER_S / 10) /* 100ms */
+#define SFC_EFX_MCDI_WATCHDOG_INTERVAL_US  (10 * US_PER_S) /* 10s */
 
 static void
-sfc_mcdi_timeout(struct sfc_adapter *sa)
+sfc_efx_mcdi_timeout(struct sfc_adapter *sa)
 {
sfc_warn(sa, "MC TIMEOUT");
 
@@ -32,9 +32,9 @@ sfc_mcdi_timeout(struct sfc_adapter *sa)
 }
 
 static inline boolean_t
-sfc_mcdi_proxy_event_available(struct sfc_adapter *sa)
+sfc_efx_mcdi_proxy_event_available(struct sfc_adapter *sa)
 {
-   struct sfc_mcdi *mcdi = &sa->mcdi;
+   struct sfc_efx_mcdi *mcdi = &sa->mcdi;
 
mcdi->proxy_handle = 0;
mcdi->proxy_result = ETIMEDOUT;
@@ -46,7 +46,7 @@ sfc_mcdi_proxy_event_available(struct sfc_adapter *sa)
 }
 
 static void
-sfc_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)
+sfc_efx_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)
 {
efx_nic_t *enp;
unsigned int delay_total;
@@ -54,22 +54,22 @@ sfc_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)
boolean_t aborted __rte_unused;
 
delay_total = 0;
-   delay_us = SFC_MCDI_POLL_INTERVAL_MIN_US;
+   delay_us = SFC_EFX_MCDI_POLL_INTERVAL_MIN_US;
enp = sa->nic;
 
do {
boolean_t poll_completed;
 
-   poll_completed = (proxy) ? sfc_mcdi_proxy_event_available(sa) :
+   poll_completed = (proxy) ? 
sfc_efx_mcdi_proxy_event_available(sa) :
   efx_mcdi_request_poll(enp);
if (poll_completed)
return;
 
-   if (delay_total > SFC_MCDI_WATCHDOG_INTERVAL_US) {
+   if (delay_total > SFC_EFX_MCDI_WATCHDOG_INTERVAL_US) {
if (!proxy) {
aborted = efx_mcdi_request_abort(enp);
SFC_ASSERT(aborted);
-   sfc_mcdi_timeout(sa);
+   sfc_efx_mcdi_timeout(sa);
}
 
return;
@@ -80,27 +80,28 @@ sfc_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)
delay_total += delay_us;
 
/* Exponentially back off the poll frequency */
-   RTE_BUILD_BUG_ON(SFC_MCDI_POLL_INTERVAL_MAX_US > UINT_MAX / 2);
+   RTE_BUILD_BUG_ON(SFC_EFX_MCDI_POLL_INTERVAL_MAX_US >
+UINT_MAX / 2);
delay_us *= 2;
-   if (delay_us > SFC_MCDI_POLL_INTERVAL_MAX_US)
-   delay_us = SFC_MCDI_POLL_INTERVAL_MAX_US;
+   if (delay_us > SFC_EFX_MCDI_POLL_INTERVAL_MAX_US)
+   delay_us = SFC_EFX_MCDI_POLL_INTERVAL_MAX_US;
 
} while (1);
 }
 
 static void
-sfc_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)
+sfc_efx_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)
 {
struct sfc_adapter *sa = (struct sfc_adapter *)arg;
-   struct sfc_mcdi *mcdi = &sa->mcdi;
+   struct sfc_efx_mcdi *mcdi = &sa->mcdi;
uint32_t proxy_handle;
 
rte_spinlock_lock(&mcdi->lock);
 
-   SFC_ASSERT(mcdi->state == SFC_M

[dpdk-dev] [PATCH 0/3] Bug fixes in event crypto adapter test application

[Ankur Dwivedi]

This patch series resolves bugs in the event crypto adapter test
application.

Ankur Dwivedi (3):
  test/event_crypto_adapter: return error with unsupported mode
  test/event_crypto_adapter: fix function arguments
  test/event_crypto_adapter: free resources during exit

 app/test/test_event_crypto_adapter.c | 63 +++-
 1 file changed, 44 insertions(+), 19 deletions(-)

-- 
2.28.0

[dpdk-dev] [PATCH 1/3] test/event_crypto_adapter: return error with unsupported mode

[Ankur Dwivedi]

The capability of a event device should be checked before creating
a event crypto adapter in a particular mode. The test case returns
error if the mode is not supported.

Signed-off-by: Ankur Dwivedi 
---
 app/test/test_event_crypto_adapter.c | 30 ++--
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/test/test_event_crypto_adapter.c 
b/app/test/test_event_crypto_adapter.c
index 8d42462d8..930c2a9bc 100644
--- a/app/test/test_event_crypto_adapter.c
+++ b/app/test/test_event_crypto_adapter.c
@@ -750,15 +750,23 @@ configure_event_crypto_adapter(enum 
rte_event_crypto_adapter_mode mode)
uint32_t cap;
int ret;
 
+   ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
+   TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
+
+   if ((mode == RTE_EVENT_CRYPTO_ADAPTER_OP_FORWARD) &&
+   !(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD))
+   return -ENOTSUP;
+
+   if ((mode == RTE_EVENT_CRYPTO_ADAPTER_OP_NEW) &&
+   !(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW))
+   return -ENOTSUP;
+
/* Create adapter with default port creation callback */
ret = rte_event_crypto_adapter_create(TEST_ADAPTER_ID,
- TEST_CDEV_ID,
+ evdev,
  &conf, mode);
TEST_ASSERT_SUCCESS(ret, "Failed to create event crypto adapter\n");
 
-   ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
-   TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
-
if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) {
ret = rte_event_crypto_adapter_queue_pair_add(TEST_ADAPTER_ID,
TEST_CDEV_ID, TEST_CDEV_QP_ID, &response_info);
@@ -813,6 +821,8 @@ test_crypto_adapter_conf(enum rte_event_crypto_adapter_mode 
mode)
TEST_ASSERT(ret >= 0, "Failed to link queue %d "
"port=%u\n", qid,
params.crypto_event_port_id);
+   } else {
+   return ret;
}
crypto_adapter_setup_done = 1;
}
@@ -845,24 +855,24 @@ static int
 test_crypto_adapter_conf_op_forward_mode(void)
 {
enum rte_event_crypto_adapter_mode mode;
+   int ret;
 
mode = RTE_EVENT_CRYPTO_ADAPTER_OP_FORWARD;
-   TEST_ASSERT_SUCCESS(test_crypto_adapter_conf(mode),
-   "Failed to config crypto adapter");
+   ret = test_crypto_adapter_conf(mode);
 
-   return TEST_SUCCESS;
+   return ret;
 }
 
 static int
 test_crypto_adapter_conf_op_new_mode(void)
 {
enum rte_event_crypto_adapter_mode mode;
+   int ret;
 
mode = RTE_EVENT_CRYPTO_ADAPTER_OP_NEW;
-   TEST_ASSERT_SUCCESS(test_crypto_adapter_conf(mode),
-   "Failed to config crypto adapter");
+   ret = test_crypto_adapter_conf(mode);
 
-   return TEST_SUCCESS;
+   return ret;
 }
 
 
-- 
2.28.0

[dpdk-dev] [PATCH 11/14] net/sfc: add MCDI callback to schedule restart

[Andrew Rybchenko]

MC reboot handling is driver specific.

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/net/sfc/sfc_mcdi.c | 15 +--
 drivers/net/sfc/sfc_mcdi.h |  3 +++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index 5077fcddd6..73dbd8194b 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -195,7 +195,7 @@ sfc_efx_mcdi_exception(void *arg, efx_mcdi_exception_t eme)
(eme == EFX_MCDI_EXCEPTION_MC_REBOOT) ? "REBOOT" :
(eme == EFX_MCDI_EXCEPTION_MC_BADASSERT) ? "BADASSERT" : "UNKNOWN");
 
-   sfc_schedule_restart(sa);
+   mcdi->ops->sched_restart(mcdi->ops_cookie);
 }
 
 #define SFC_MCDI_LOG_BUF_SIZE  128
@@ -285,7 +285,8 @@ sfc_efx_mcdi_init(struct sfc_adapter *sa, struct 
sfc_efx_mcdi *mcdi,
efx_mcdi_transport_t *emtp;
int rc;
 
-   if (ops->dma_alloc == NULL || ops->dma_free == NULL)
+   if (ops->dma_alloc == NULL || ops->dma_free == NULL ||
+   ops->sched_restart == NULL)
return EINVAL;
 
SFC_ASSERT(mcdi->state == SFC_EFX_MCDI_UNINITIALIZED);
@@ -372,9 +373,19 @@ sfc_mcdi_dma_free(void *cookie, efsys_mem_t *esmp)
sfc_dma_free(sa, esmp);
 }
 
+static sfc_efx_mcdi_sched_restart_cb sfc_mcdi_sched_restart;
+static void
+sfc_mcdi_sched_restart(void *cookie)
+{
+   struct sfc_adapter *sa = cookie;
+
+   sfc_schedule_restart(sa);
+}
+
 static const struct sfc_efx_mcdi_ops sfc_mcdi_ops = {
.dma_alloc  = sfc_mcdi_dma_alloc,
.dma_free   = sfc_mcdi_dma_free,
+   .sched_restart  = sfc_mcdi_sched_restart,
 };
 
 int
diff --git a/drivers/net/sfc/sfc_mcdi.h b/drivers/net/sfc/sfc_mcdi.h
index ef24a8bc67..8f9b1991be 100644
--- a/drivers/net/sfc/sfc_mcdi.h
+++ b/drivers/net/sfc/sfc_mcdi.h
@@ -37,9 +37,12 @@ typedef int (sfc_efx_mcdi_dma_alloc_cb)(void *cookie, const 
char *name,
 
 typedef void (sfc_efx_mcdi_dma_free_cb)(void *cookie, efsys_mem_t *esmp);
 
+typedef void (sfc_efx_mcdi_sched_restart_cb)(void *cookie);
+
 struct sfc_efx_mcdi_ops {
sfc_efx_mcdi_dma_alloc_cb   *dma_alloc;
sfc_efx_mcdi_dma_free_cb*dma_free;
+   sfc_efx_mcdi_sched_restart_cb   *sched_restart;
 };
 
 struct sfc_efx_mcdi {
-- 
2.17.1

[dpdk-dev] [PATCH 09/14] net/sfc: avoid panic in the case of MCDI timeout

[Andrew Rybchenko]

Implement dummy MCDI timeout handling which simply rejects
further MCDI requests.

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/net/sfc/sfc_mcdi.c | 15 +--
 drivers/net/sfc/sfc_mcdi.h |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index 8f446e8bc8..928a08c0a2 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -33,6 +33,9 @@
RTE_FMT_TAIL(__VA_ARGS__,)));   \
} while (0)
 
+#define sfc_efx_mcdi_crit(mcdi, ...) \
+   sfc_efx_mcdi_log(mcdi, RTE_LOG_CRIT, __VA_ARGS__)
+
 #define sfc_efx_mcdi_err(mcdi, ...) \
sfc_efx_mcdi_log(mcdi, RTE_LOG_ERR, __VA_ARGS__)
 
@@ -55,7 +58,9 @@ sfc_efx_mcdi_timeout(struct sfc_adapter *sa)
 
sfc_efx_mcdi_warn(mcdi, "MC TIMEOUT");
 
-   sfc_panic(sa, "MCDI timeout handling is not implemented\n");
+   mcdi->state = SFC_EFX_MCDI_DEAD;
+   sfc_efx_mcdi_crit(mcdi,
+   "MCDI timeout handling is not implemented - NIC is unusable");
 }
 
 static inline boolean_t
@@ -124,6 +129,11 @@ sfc_efx_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)
struct sfc_efx_mcdi *mcdi = &sa->mcdi;
uint32_t proxy_handle;
 
+   if (mcdi->state == SFC_EFX_MCDI_DEAD) {
+   emrp->emr_rc = ENOEXEC;
+   return;
+   }
+
rte_spinlock_lock(&mcdi->lock);
 
SFC_ASSERT(mcdi->state == SFC_EFX_MCDI_INITIALIZED);
@@ -325,7 +335,8 @@ sfc_efx_mcdi_fini(struct sfc_adapter *sa, struct 
sfc_efx_mcdi *mcdi)
 
rte_spinlock_lock(&mcdi->lock);
 
-   SFC_ASSERT(mcdi->state == SFC_EFX_MCDI_INITIALIZED);
+   SFC_ASSERT(mcdi->state == SFC_EFX_MCDI_INITIALIZED ||
+  mcdi->state == SFC_EFX_MCDI_DEAD);
mcdi->state = SFC_EFX_MCDI_UNINITIALIZED;
 
sfc_efx_mcdi_info(mcdi, "fini MCDI");
diff --git a/drivers/net/sfc/sfc_mcdi.h b/drivers/net/sfc/sfc_mcdi.h
index e2105364ad..b93b268e32 100644
--- a/drivers/net/sfc/sfc_mcdi.h
+++ b/drivers/net/sfc/sfc_mcdi.h
@@ -27,6 +27,7 @@ enum sfc_efx_mcdi_state {
SFC_EFX_MCDI_INITIALIZED,
SFC_EFX_MCDI_BUSY,
SFC_EFX_MCDI_COMPLETED,
+   SFC_EFX_MCDI_DEAD,
 
SFC_EFX_MCDI_NSTATES
 };
-- 
2.17.1

[dpdk-dev] [PATCH 03/14] net/sfc: add dedicated header file with MCDI interface

[Andrew Rybchenko]

MCDI helpers will be shared by net and vDPA drivers.
Prepare to move it to common/sfc_efx.

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/net/sfc/sfc.h  | 23 +---
 drivers/net/sfc/sfc_mcdi.c |  1 +
 drivers/net/sfc/sfc_mcdi.h | 54 ++
 3 files changed, 56 insertions(+), 22 deletions(-)
 create mode 100644 drivers/net/sfc/sfc_mcdi.h

diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index cdff9be3ec..a530b12a8e 100644
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -23,6 +23,7 @@
 
 #include "sfc_debug.h"
 #include "sfc_filter.h"
+#include "sfc_mcdi.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -86,25 +87,6 @@ enum sfc_dev_filter_mode {
SFC_DEV_FILTER_NMODES
 };
 
-enum sfc_mcdi_state {
-   SFC_MCDI_UNINITIALIZED = 0,
-   SFC_MCDI_INITIALIZED,
-   SFC_MCDI_BUSY,
-   SFC_MCDI_COMPLETED,
-
-   SFC_MCDI_NSTATES
-};
-
-struct sfc_mcdi {
-   rte_spinlock_t  lock;
-   efsys_mem_t mem;
-   enum sfc_mcdi_state state;
-   efx_mcdi_transport_ttransport;
-   uint32_tlogtype;
-   uint32_tproxy_handle;
-   efx_rc_tproxy_result;
-};
-
 struct sfc_intr {
efx_intr_type_t type;
rte_intr_callback_fnhandler;
@@ -384,9 +366,6 @@ void sfc_stop(struct sfc_adapter *sa);
 
 void sfc_schedule_restart(struct sfc_adapter *sa);
 
-int sfc_mcdi_init(struct sfc_adapter *sa);
-void sfc_mcdi_fini(struct sfc_adapter *sa);
-
 int sfc_configure(struct sfc_adapter *sa);
 void sfc_close(struct sfc_adapter *sa);
 
diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index ec62ba95ff..9a51b3e030 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -13,6 +13,7 @@
 #include "efx_mcdi.h"
 #include "efx_regs_mcdi.h"
 
+#include "sfc_mcdi.h"
 #include "sfc.h"
 #include "sfc_debug.h"
 #include "sfc_log.h"
diff --git a/drivers/net/sfc/sfc_mcdi.h b/drivers/net/sfc/sfc_mcdi.h
new file mode 100644
index 00..789a16d8bb
--- /dev/null
+++ b/drivers/net/sfc/sfc_mcdi.h
@@ -0,0 +1,54 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2019-2020 Xilinx, Inc.
+ * Copyright(c) 2016-2019 Solarflare Communications Inc.
+ *
+ * This software was jointly developed between OKTET Labs (under contract
+ * for Solarflare) and Solarflare Communications, Inc.
+ */
+
+#ifndef _SFC_MCDI_H
+#define _SFC_MCDI_H
+
+#include 
+
+#include 
+
+#include "efsys.h"
+#include "efx.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum sfc_mcdi_state {
+   SFC_MCDI_UNINITIALIZED = 0,
+   SFC_MCDI_INITIALIZED,
+   SFC_MCDI_BUSY,
+   SFC_MCDI_COMPLETED,
+
+   SFC_MCDI_NSTATES
+};
+
+struct sfc_mcdi {
+   rte_spinlock_t  lock;
+   efsys_mem_t mem;
+   enum sfc_mcdi_state state;
+   efx_mcdi_transport_ttransport;
+   uint32_tlogtype;
+   uint32_tproxy_handle;
+   efx_rc_tproxy_result;
+};
+
+
+struct sfc_adapter;
+
+int sfc_mcdi_init(struct sfc_adapter *sa);
+void sfc_mcdi_fini(struct sfc_adapter *sa);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* _SFC_MCDI_H */
-- 
2.17.1

[dpdk-dev] [PATCH 06/14] net/sfc: start to make MCDI helpers interface shareable

[Andrew Rybchenko]

sfc_adapter is network driver specific structure which finally
should not be used in shared MCDI helpers interface.

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/net/sfc/sfc_mcdi.c | 13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index c716caabdf..35e1f3940d 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -248,17 +248,14 @@ sfc_efx_mcdi_ev_proxy_response(void *arg, uint32_t 
handle, efx_rc_t result)
 }
 
 static int
-sfc_efx_mcdi_init(struct sfc_adapter *sa)
+sfc_efx_mcdi_init(struct sfc_adapter *sa, struct sfc_efx_mcdi *mcdi)
 {
-   struct sfc_efx_mcdi *mcdi;
size_t max_msg_size;
efx_mcdi_transport_t *emtp;
int rc;
 
sfc_log_init(sa, "entry");
 
-   mcdi = &sa->mcdi;
-
SFC_ASSERT(mcdi->state == SFC_EFX_MCDI_UNINITIALIZED);
 
rte_spinlock_init(&mcdi->lock);
@@ -301,14 +298,12 @@ sfc_efx_mcdi_init(struct sfc_adapter *sa)
 }
 
 static void
-sfc_efx_mcdi_fini(struct sfc_adapter *sa)
+sfc_efx_mcdi_fini(struct sfc_adapter *sa, struct sfc_efx_mcdi *mcdi)
 {
-   struct sfc_efx_mcdi *mcdi;
efx_mcdi_transport_t *emtp;
 
sfc_log_init(sa, "entry");
 
-   mcdi = &sa->mcdi;
emtp = &mcdi->transport;
 
rte_spinlock_lock(&mcdi->lock);
@@ -328,11 +323,11 @@ sfc_efx_mcdi_fini(struct sfc_adapter *sa)
 int
 sfc_mcdi_init(struct sfc_adapter *sa)
 {
-   return sfc_efx_mcdi_init(sa);
+   return sfc_efx_mcdi_init(sa, &sa->mcdi);
 }
 
 void
 sfc_mcdi_fini(struct sfc_adapter *sa)
 {
-   sfc_efx_mcdi_fini(sa);
+   sfc_efx_mcdi_fini(sa, &sa->mcdi);
 }
-- 
2.17.1

[dpdk-dev] [PATCH 02/14] net/sfc: introduce common driver library

[Andrew Rybchenko]

Move libefx (base driver) into common driver.

Prepare to add vDPA driver which will use the common driver as well.

Signed-off-by: Andrew Rybchenko 
---
 MAINTAINERS   |   1 +
 drivers/common/Makefile   |   4 +
 drivers/common/meson.build|   2 +-
 drivers/common/sfc_efx/Makefile   | 111 
 .../{net/sfc => common/sfc_efx}/base/README   |   0
 .../sfc => common/sfc_efx}/base/ef10_ev.c |   0
 .../sfc => common/sfc_efx}/base/ef10_evb.c|   0
 .../sfc => common/sfc_efx}/base/ef10_filter.c |   0
 .../sfc_efx}/base/ef10_firmware_ids.h |   0
 .../sfc => common/sfc_efx}/base/ef10_image.c  |   0
 .../sfc => common/sfc_efx}/base/ef10_impl.h   |   0
 .../sfc => common/sfc_efx}/base/ef10_intr.c   |   0
 .../sfc => common/sfc_efx}/base/ef10_mac.c|   0
 .../sfc => common/sfc_efx}/base/ef10_mcdi.c   |   0
 .../sfc => common/sfc_efx}/base/ef10_nic.c|   0
 .../sfc => common/sfc_efx}/base/ef10_nvram.c  |   0
 .../sfc => common/sfc_efx}/base/ef10_phy.c|   0
 .../sfc => common/sfc_efx}/base/ef10_proxy.c  |   0
 .../sfc => common/sfc_efx}/base/ef10_rx.c |   0
 .../sfc_efx}/base/ef10_signed_image_layout.h  |   0
 .../sfc_efx}/base/ef10_tlv_layout.h   |   0
 .../sfc => common/sfc_efx}/base/ef10_tx.c |   0
 .../sfc => common/sfc_efx}/base/ef10_vpd.c|   0
 .../{net/sfc => common/sfc_efx}/base/efx.h|   0
 .../sfc => common/sfc_efx}/base/efx_annote.h  |   0
 .../sfc => common/sfc_efx}/base/efx_bootcfg.c |   0
 .../sfc => common/sfc_efx}/base/efx_check.h   |   0
 .../sfc => common/sfc_efx}/base/efx_crc32.c   |   0
 .../{net/sfc => common/sfc_efx}/base/efx_ev.c |   0
 .../sfc => common/sfc_efx}/base/efx_evb.c |   0
 .../sfc => common/sfc_efx}/base/efx_filter.c  |   0
 .../sfc => common/sfc_efx}/base/efx_hash.c|   0
 .../sfc => common/sfc_efx}/base/efx_impl.h|   0
 .../sfc => common/sfc_efx}/base/efx_intr.c|   0
 .../sfc => common/sfc_efx}/base/efx_lic.c |   0
 .../sfc => common/sfc_efx}/base/efx_mac.c |   0
 .../sfc => common/sfc_efx}/base/efx_mcdi.c|   0
 .../sfc => common/sfc_efx}/base/efx_mcdi.h|   0
 .../sfc => common/sfc_efx}/base/efx_mon.c |   0
 .../sfc => common/sfc_efx}/base/efx_nic.c |   0
 .../sfc => common/sfc_efx}/base/efx_nvram.c   |   0
 .../sfc => common/sfc_efx}/base/efx_phy.c |   0
 .../sfc => common/sfc_efx}/base/efx_phy_ids.h |   0
 .../sfc => common/sfc_efx}/base/efx_port.c|   0
 .../sfc => common/sfc_efx}/base/efx_proxy.c   |   0
 .../sfc => common/sfc_efx}/base/efx_regs.h|   0
 .../sfc_efx}/base/efx_regs_ef10.h |   0
 .../sfc_efx}/base/efx_regs_mcdi.h |   0
 .../sfc_efx}/base/efx_regs_mcdi_aoe.h |   0
 .../sfc_efx}/base/efx_regs_mcdi_strs.h|   0
 .../sfc_efx}/base/efx_regs_pci.h  |   0
 .../{net/sfc => common/sfc_efx}/base/efx_rx.c |   0
 .../sfc => common/sfc_efx}/base/efx_sram.c|   0
 .../sfc => common/sfc_efx}/base/efx_tunnel.c  |   0
 .../{net/sfc => common/sfc_efx}/base/efx_tx.c |   0
 .../sfc => common/sfc_efx}/base/efx_types.h   |   0
 .../sfc => common/sfc_efx}/base/efx_vpd.c |   0
 .../sfc => common/sfc_efx}/base/hunt_impl.h   |   0
 .../sfc => common/sfc_efx}/base/hunt_nic.c|   0
 .../sfc => common/sfc_efx}/base/mcdi_mon.c|   0
 .../sfc => common/sfc_efx}/base/mcdi_mon.h|   0
 .../sfc_efx}/base/medford2_impl.h |   0
 .../sfc_efx}/base/medford2_nic.c  |   0
 .../sfc_efx}/base/medford_impl.h  |   0
 .../sfc => common/sfc_efx}/base/medford_nic.c |   0
 .../sfc => common/sfc_efx}/base/meson.build   |   0
 .../sfc => common/sfc_efx}/base/siena_flash.h |   0
 .../sfc => common/sfc_efx}/base/siena_impl.h  |   0
 .../sfc => common/sfc_efx}/base/siena_mac.c   |   0
 .../sfc => common/sfc_efx}/base/siena_mcdi.c  |   0
 .../sfc => common/sfc_efx}/base/siena_nic.c   |   0
 .../sfc => common/sfc_efx}/base/siena_nvram.c |   0
 .../sfc => common/sfc_efx}/base/siena_phy.c   |   0
 .../sfc => common/sfc_efx}/base/siena_sram.c  |   0
 .../sfc => common/sfc_efx}/base/siena_vpd.c   |   0
 drivers/{net/sfc => common/sfc_efx}/efsys.h   |  58 -
 drivers/common/sfc_efx/meson.build|  39 ++
 .../sfc_efx/rte_common_sfc_efx_version.map| 122 ++
 drivers/common/sfc_efx/sfc_efx.c  |  23 
 drivers/common/sfc_efx/sfc_efx_debug.h|  29 +
 drivers/common/sfc_efx/sfc_efx_log.h  |  22 
 drivers/net/sfc/Makefile  |  70 +-
 drivers/net/sfc/meson.build   |   6 +-
 mk/rte.app.mk |   1 +
 84 files changed, 386 insertions(+), 102 deletions(-)
 create mode 100644 drivers/common/sfc_efx/Makefile
 rename drivers/{net/sfc => common/sfc_efx}/base/README (100%)
 rename drivers/{net/sfc => common/sfc_efx}/base/ef10_ev.c (100%)
 rename drivers/{net/sfc => common/sfc_efx}/base/ef10_evb.c (100%

[dpdk-dev] [PATCH 10/14] net/sfc: add MCDI callbacks to allocate/free DMA memory

[Andrew Rybchenko]

Net driver should use rte_eth_dma_zone_reserve(), but it is ethdev
specific API which is not available for vDPA.

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/net/sfc/sfc_mcdi.c | 46 +++---
 drivers/net/sfc/sfc_mcdi.h | 12 ++
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c
index 928a08c0a2..5077fcddd6 100644
--- a/drivers/net/sfc/sfc_mcdi.c
+++ b/drivers/net/sfc/sfc_mcdi.c
@@ -278,16 +278,22 @@ sfc_efx_mcdi_ev_proxy_response(void *arg, uint32_t 
handle, efx_rc_t result)
 
 static int
 sfc_efx_mcdi_init(struct sfc_adapter *sa, struct sfc_efx_mcdi *mcdi,
- uint32_t logtype, const char *log_prefix, efx_nic_t *nic)
+ uint32_t logtype, const char *log_prefix, efx_nic_t *nic,
+ const struct sfc_efx_mcdi_ops *ops, void *ops_cookie)
 {
size_t max_msg_size;
efx_mcdi_transport_t *emtp;
int rc;
 
+   if (ops->dma_alloc == NULL || ops->dma_free == NULL)
+   return EINVAL;
+
SFC_ASSERT(mcdi->state == SFC_EFX_MCDI_UNINITIALIZED);
 
rte_spinlock_init(&mcdi->lock);
 
+   mcdi->ops = ops;
+   mcdi->ops_cookie = ops_cookie;
mcdi->nic = nic;
 
mcdi->state = SFC_EFX_MCDI_INITIALIZED;
@@ -296,8 +302,7 @@ sfc_efx_mcdi_init(struct sfc_adapter *sa, struct 
sfc_efx_mcdi *mcdi,
mcdi->log_prefix = log_prefix;
 
max_msg_size = sizeof(uint32_t) + MCDI_CTL_SDU_LEN_MAX_V2;
-   rc = sfc_dma_alloc(sa, "mcdi", 0, max_msg_size, sa->socket_id,
-  &mcdi->mem);
+   rc = ops->dma_alloc(ops_cookie, "mcdi", max_msg_size, &mcdi->mem);
if (rc != 0)
goto fail_dma_alloc;
 
@@ -319,7 +324,7 @@ sfc_efx_mcdi_init(struct sfc_adapter *sa, struct 
sfc_efx_mcdi *mcdi,
 
 fail_mcdi_init:
memset(emtp, 0, sizeof(*emtp));
-   sfc_dma_free(sa, &mcdi->mem);
+   ops->dma_free(ops_cookie, &mcdi->mem);
 
 fail_dma_alloc:
mcdi->state = SFC_EFX_MCDI_UNINITIALIZED;
@@ -327,7 +332,7 @@ sfc_efx_mcdi_init(struct sfc_adapter *sa, struct 
sfc_efx_mcdi *mcdi,
 }
 
 static void
-sfc_efx_mcdi_fini(struct sfc_adapter *sa, struct sfc_efx_mcdi *mcdi)
+sfc_efx_mcdi_fini(struct sfc_efx_mcdi *mcdi)
 {
efx_mcdi_transport_t *emtp;
 
@@ -345,9 +350,33 @@ sfc_efx_mcdi_fini(struct sfc_adapter *sa, struct 
sfc_efx_mcdi *mcdi)
 
rte_spinlock_unlock(&mcdi->lock);
 
-   sfc_dma_free(sa, &mcdi->mem);
+   mcdi->ops->dma_free(mcdi->ops_cookie, &mcdi->mem);
+}
+
+static sfc_efx_mcdi_dma_alloc_cb sfc_mcdi_dma_alloc;
+static int
+sfc_mcdi_dma_alloc(void *cookie, const char *name, size_t len,
+  efsys_mem_t *esmp)
+{
+   const struct sfc_adapter *sa = cookie;
+
+   return sfc_dma_alloc(sa, name, 0, len, sa->socket_id, esmp);
 }
 
+static sfc_efx_mcdi_dma_free_cb sfc_mcdi_dma_free;
+static void
+sfc_mcdi_dma_free(void *cookie, efsys_mem_t *esmp)
+{
+   const struct sfc_adapter *sa = cookie;
+
+   sfc_dma_free(sa, esmp);
+}
+
+static const struct sfc_efx_mcdi_ops sfc_mcdi_ops = {
+   .dma_alloc  = sfc_mcdi_dma_alloc,
+   .dma_free   = sfc_mcdi_dma_free,
+};
+
 int
 sfc_mcdi_init(struct sfc_adapter *sa)
 {
@@ -360,12 +389,13 @@ sfc_mcdi_init(struct sfc_adapter *sa)
   RTE_LOG_NOTICE);
 
return sfc_efx_mcdi_init(sa, &sa->mcdi, logtype,
-sa->priv.shared->log_prefix, sa->nic);
+sa->priv.shared->log_prefix, sa->nic,
+&sfc_mcdi_ops, sa);
 }
 
 void
 sfc_mcdi_fini(struct sfc_adapter *sa)
 {
sfc_log_init(sa, "entry");
-   sfc_efx_mcdi_fini(sa, &sa->mcdi);
+   sfc_efx_mcdi_fini(&sa->mcdi);
 }
diff --git a/drivers/net/sfc/sfc_mcdi.h b/drivers/net/sfc/sfc_mcdi.h
index b93b268e32..ef24a8bc67 100644
--- a/drivers/net/sfc/sfc_mcdi.h
+++ b/drivers/net/sfc/sfc_mcdi.h
@@ -32,8 +32,20 @@ enum sfc_efx_mcdi_state {
SFC_EFX_MCDI_NSTATES
 };
 
+typedef int (sfc_efx_mcdi_dma_alloc_cb)(void *cookie, const char *name,
+ size_t len, efsys_mem_t *esmp);
+
+typedef void (sfc_efx_mcdi_dma_free_cb)(void *cookie, efsys_mem_t *esmp);
+
+struct sfc_efx_mcdi_ops {
+   sfc_efx_mcdi_dma_alloc_cb   *dma_alloc;
+   sfc_efx_mcdi_dma_free_cb*dma_free;
+};
+
 struct sfc_efx_mcdi {
rte_spinlock_t  lock;
+   const struct sfc_efx_mcdi_ops   *ops;
+   void*ops_cookie;
efx_nic_t   *nic;
efsys_mem_t mem;
enum sfc_efx_mcdi_state state;
-- 
2.17.1

[dpdk-dev] [PATCH 3/3] test/event_crypto_adapter: free resources during exit

[Ankur Dwivedi]

The resources held by crypto adapter should be freed when the
test suite exits.

Signed-off-by: Ankur Dwivedi 
---
 app/test/test_event_crypto_adapter.c | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/app/test/test_event_crypto_adapter.c 
b/app/test/test_event_crypto_adapter.c
index 811710219..fe85a61fb 100644
--- a/app/test/test_event_crypto_adapter.c
+++ b/app/test/test_event_crypto_adapter.c
@@ -896,6 +896,20 @@ testsuite_setup(void)
return TEST_SUCCESS;
 }
 
+static void
+crypto_adapter_teardown(void)
+{
+   int ret;
+
+   crypto_adapter_setup_done = 0;
+   ret = rte_event_crypto_adapter_queue_pair_del(TEST_ADAPTER_ID,
+   TEST_CDEV_ID, TEST_CDEV_QP_ID);
+   if (ret < 0)
+   RTE_LOG(ERR, USER1, "Failed to delete queue pair!");
+
+   rte_event_crypto_adapter_free(TEST_ADAPTER_ID);
+}
+
 static void
 crypto_teardown(void)
 {
@@ -938,6 +952,7 @@ eventdev_teardown(void)
 static void
 testsuite_teardown(void)
 {
+   crypto_adapter_teardown();
crypto_teardown();
eventdev_teardown();
 }
-- 
2.28.0

[dpdk-dev] [PATCH 2/3] test/event_crypto_adapter: fix function arguments

[Ankur Dwivedi]

The arguments passed to rte_event_crypto_adapter_caps_get() and
rte_event_crypto_adapter_create() are incorrect.

In the rte_event_crypto_adapter_caps_get(), event device id should
be the first argument and cryptodev id should be the second argument.
In the rte_event_crypto_adapter_create(), the event device id should
be the second argument.

Signed-off-by: Ankur Dwivedi 
---
 app/test/test_event_crypto_adapter.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/test/test_event_crypto_adapter.c 
b/app/test/test_event_crypto_adapter.c
index 930c2a9bc..811710219 100644
--- a/app/test/test_event_crypto_adapter.c
+++ b/app/test/test_event_crypto_adapter.c
@@ -209,8 +209,8 @@ test_op_forward_mode(uint8_t session_less)
&cipher_xform, params.session_priv_mpool);
TEST_ASSERT_SUCCESS(ret, "Failed to init session\n");
 
-   ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID,
-   evdev, &cap);
+   ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID,
+   &cap);
TEST_ASSERT_SUCCESS(ret, "Failed to get adapter 
capabilities\n");
 
if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA) {
@@ -321,7 +321,7 @@ test_session_with_op_forward_mode(void)
uint32_t cap;
int ret;
 
-   ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+   ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
if (!(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) &&
@@ -410,8 +410,8 @@ test_op_new_mode(uint8_t session_less)
params.session_mpool);
TEST_ASSERT_NOT_NULL(sess, "Session creation failed\n");
 
-   ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID,
-   evdev, &cap);
+   ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID,
+   &cap);
TEST_ASSERT_SUCCESS(ret, "Failed to get adapter 
capabilities\n");
 
if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA) {
@@ -460,7 +460,7 @@ test_sessionless_with_op_new_mode(void)
uint32_t cap;
int ret;
 
-   ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+   ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
if (!(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) &&
@@ -486,7 +486,7 @@ test_session_with_op_new_mode(void)
uint32_t cap;
int ret;
 
-   ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+   ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
if (!(cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) &&
@@ -706,7 +706,7 @@ test_crypto_adapter_create(void)
 
/* Create adapter with default port creation callback */
ret = rte_event_crypto_adapter_create(TEST_ADAPTER_ID,
- TEST_CDEV_ID,
+ evdev,
  &conf, 0);
TEST_ASSERT_SUCCESS(ret, "Failed to create event crypto adapter\n");
 
@@ -719,7 +719,7 @@ test_crypto_adapter_qp_add_del(void)
uint32_t cap;
int ret;
 
-   ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap);
+   ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap);
TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n");
 
if (cap & RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND) {
-- 
2.28.0

[dpdk-dev] [PATCH 14/14] net/sfc: move MCDI helpers to common driver

[Andrew Rybchenko]

These helper will be reused by other libefx consumers, e.g. vDPA
driver.

Signed-off-by: Andrew Rybchenko 
Reviewed-by: Andy Moreton 
---
 drivers/common/sfc_efx/Makefile   |   1 +
 drivers/common/sfc_efx/meson.build|   1 +
 .../sfc_efx/rte_common_sfc_efx_version.map|   9 +-
 drivers/common/sfc_efx/sfc_efx_mcdi.c | 343 ++
 .../sfc_efx/sfc_efx_mcdi.h}   |  12 +-
 drivers/net/sfc/sfc.h |   3 +-
 drivers/net/sfc/sfc_mcdi.c| 333 +
 7 files changed, 360 insertions(+), 342 deletions(-)
 create mode 100644 drivers/common/sfc_efx/sfc_efx_mcdi.c
 rename drivers/{net/sfc/sfc_mcdi.h => common/sfc_efx/sfc_efx_mcdi.h} (81%)

diff --git a/drivers/common/sfc_efx/Makefile b/drivers/common/sfc_efx/Makefile
index 0bd6a593e9..bcbb15e789 100644
--- a/drivers/common/sfc_efx/Makefile
+++ b/drivers/common/sfc_efx/Makefile
@@ -58,6 +58,7 @@ EXPORT_MAP := rte_common_sfc_efx_version.map
 #
 
 SRCS-y += sfc_efx.c
+SRCS-y += sfc_efx_mcdi.c
 
 VPATH += $(SRCDIR)/base
 
diff --git a/drivers/common/sfc_efx/meson.build 
b/drivers/common/sfc_efx/meson.build
index 8fab4df792..b7a0763a34 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -34,6 +34,7 @@ objs = [base_objs]
 
 sources = files(
'sfc_efx.c',
+   'sfc_efx_mcdi.c',
 )
 
 includes += include_directories('base')
diff --git a/drivers/common/sfc_efx/rte_common_sfc_efx_version.map 
b/drivers/common/sfc_efx/rte_common_sfc_efx_version.map
index 0c719e8250..8c010c90ac 100644
--- a/drivers/common/sfc_efx/rte_common_sfc_efx_version.map
+++ b/drivers/common/sfc_efx/rte_common_sfc_efx_version.map
@@ -47,13 +47,7 @@ DPDK_21 {
efx_mac_stats_update;
efx_mac_stats_upload;
 
-   efx_mcdi_fini;
-   efx_mcdi_get_proxy_handle;
-   efx_mcdi_init;
efx_mcdi_new_epoch;
-   efx_mcdi_request_abort;
-   efx_mcdi_request_poll;
-   efx_mcdi_request_start;
 
efx_nic_cfg_get;
efx_nic_create;
@@ -118,5 +112,8 @@ DPDK_21 {
efx_tx_qpush;
efx_txq_size;
 
+   sfc_efx_mcdi_init;
+   sfc_efx_mcdi_fini;
+
local: *;
 };
diff --git a/drivers/common/sfc_efx/sfc_efx_mcdi.c 
b/drivers/common/sfc_efx/sfc_efx_mcdi.c
new file mode 100644
index 00..7eb565bbd6
--- /dev/null
+++ b/drivers/common/sfc_efx/sfc_efx_mcdi.c
@@ -0,0 +1,343 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2019-2020 Xilinx, Inc.
+ * Copyright(c) 2016-2019 Solarflare Communications Inc.
+ *
+ * This software was jointly developed between OKTET Labs (under contract
+ * for Solarflare) and Solarflare Communications, Inc.
+ */
+
+#include 
+
+#include "efx.h"
+#include "efx_mcdi.h"
+#include "efx_regs_mcdi.h"
+
+#include "sfc_efx_mcdi.h"
+#include "sfc_efx_debug.h"
+
+#define SFC_EFX_MCDI_POLL_INTERVAL_MIN_US  10  /* 10us */
+#define SFC_EFX_MCDI_POLL_INTERVAL_MAX_US  (US_PER_S / 10) /* 100ms */
+#define SFC_EFX_MCDI_WATCHDOG_INTERVAL_US  (10 * US_PER_S) /* 10s */
+
+#define sfc_efx_mcdi_log(mcdi, level, ...) \
+   do {\
+   const struct sfc_efx_mcdi *_mcdi = (mcdi);  \
+   \
+   rte_log(level, _mcdi->logtype,  \
+   RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n",  \
+   _mcdi->log_prefix,  \
+   RTE_FMT_TAIL(__VA_ARGS__,)));   \
+   } while (0)
+
+#define sfc_efx_mcdi_crit(mcdi, ...) \
+   sfc_efx_mcdi_log(mcdi, RTE_LOG_CRIT, __VA_ARGS__)
+
+#define sfc_efx_mcdi_err(mcdi, ...) \
+   sfc_efx_mcdi_log(mcdi, RTE_LOG_ERR, __VA_ARGS__)
+
+#define sfc_efx_mcdi_warn(mcdi, ...) \
+   sfc_efx_mcdi_log(mcdi, RTE_LOG_WARNING, __VA_ARGS__)
+
+#define sfc_efx_mcdi_info(mcdi, ...) \
+   sfc_efx_mcdi_log(mcdi, RTE_LOG_INFO, __VA_ARGS__)
+
+/** Level value used by MCDI log statements */
+#define SFC_EFX_LOG_LEVEL_MCDI RTE_LOG_INFO
+
+#define sfc_efx_log_mcdi(mcdi, ...) \
+   sfc_efx_mcdi_log(mcdi, SFC_EFX_LOG_LEVEL_MCDI, __VA_ARGS__)
+
+static void
+sfc_efx_mcdi_timeout(struct sfc_efx_mcdi *mcdi)
+{
+   sfc_efx_mcdi_warn(mcdi, "MC TIMEOUT");
+
+   sfc_efx_mcdi_crit(mcdi, "MCDI timeout handling is not implemented");
+   sfc_efx_mcdi_crit(mcdi, "NIC is unusable");
+   mcdi->state = SFC_EFX_MCDI_DEAD;
+}
+
+static inline boolean_t
+sfc_efx_mcdi_proxy_event_available(struct sfc_efx_mcdi *mcdi)
+{
+   mcdi->proxy_handle = 0;
+   mcdi->proxy_result = ETIMEDOUT;
+   mcdi->ops->mgmt_evq_poll(mcdi->ops_cookie);
+   if (mcdi->proxy_result != ETIMEDOUT)
+   return B_TRUE;
+
+   return B_FALSE;
+}
+
+static void
+sfc_efx_mcdi_poll(struct sfc_efx_mcdi *mcdi, boolean_t proxy)
+{
+   efx_nic_t *enp;
+

[dpdk-dev] [PATCH] crypto/octeontx2: fix sessionless code

[Ankur Dwivedi]

A temporary session is created for sessionless crypto operations.
rte_cryptodev_sym_session_create() should be used for creating the
temporary session as it initializes the session structure in the
correct way. Also the session should be set to 0 before freeing it.

Fixes: 17ac2a72191b ("crypto/octeontx2: add enqueue/dequeue ops")

Signed-off-by: Ankur Dwivedi 
---
 drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c 
b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
index 9d51b17dd..ccf566d5f 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
@@ -648,8 +648,8 @@ otx2_cpt_enqueue_sym_sessless(struct otx2_cpt_qp *qp, 
struct rte_crypto_op *op,
int ret;
 
/* Create temporary session */
-
-   if (rte_mempool_get(qp->sess_mp, (void **)&sess))
+   sess = rte_cryptodev_sym_session_create(qp->sess_mp);
+   if (sess == NULL)
return -ENOMEM;
 
ret = sym_session_configure(driver_id, sym_op->xform, sess,
@@ -894,6 +894,9 @@ otx2_cpt_dequeue_post_process(struct otx2_cpt_qp *qp, 
struct rte_crypto_op *cop,
if (unlikely(cop->sess_type == RTE_CRYPTO_OP_SESSIONLESS)) {
sym_session_clear(otx2_cryptodev_driver_id,
  cop->sym->session);
+   memset(cop->sym->session, 0,
+   rte_cryptodev_sym_get_existing_header_session_size(
+   cop->sym->session));
rte_mempool_put(qp->sess_mp, cop->sym->session);
cop->sym->session = NULL;
}
-- 
2.28.0

[dpdk-dev] [PATCH v2] net/sfc/base: fix tunnel configuration failure

[Andrew Rybchenko]

From: Igor Romanov 

Tunnel configuration may fail because of insufficient access rights
on a virtual function. Ignore the failure if a tunnel configuration
with empty UDP ports is requested.

Fixes: 17551f6dffcc ("net/sfc/base: add API to control UDP tunnel ports")
Cc: sta...@dpdk.org

Signed-off-by: Igor Romanov 
Signed-off-by: Andrew Rybchenko 
---
 drivers/net/sfc/base/efx_tunnel.c | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/sfc/base/efx_tunnel.c 
b/drivers/net/sfc/base/efx_tunnel.c
index 3a034412cd..1cc072f0d9 100644
--- a/drivers/net/sfc/base/efx_tunnel.c
+++ b/drivers/net/sfc/base/efx_tunnel.c
@@ -421,7 +421,7 @@ ef10_tunnel_reconfigure(
 {
efx_tunnel_cfg_t *etcp = &enp->en_tunnel_cfg;
efx_rc_t rc;
-   boolean_t resetting;
+   boolean_t resetting = B_FALSE;
efsys_lock_state_t state;
efx_tunnel_cfg_t etc;
 
@@ -446,8 +446,14 @@ ef10_tunnel_reconfigure(
 */
rc = efx_mcdi_set_tunnel_encap_udp_ports(enp, &etc, B_FALSE,
&resetting);
-   if (rc != 0)
-   goto fail2;
+   if (rc != 0) {
+   /*
+* Do not fail if the access is denied when no
+* tunnel encap UDP ports are configured.
+*/
+   if (rc != EACCES || etc.etc_udp_entries_num != 0)
+   goto fail2;
+   }
 
/*
 * Although the caller should be able to handle MC reboot,
-- 
2.17.1

Re: [dpdk-dev] [PATCH 01/14] net/iavf: downgrade error log

[Andrew Rybchenko]

On 9/8/20 12:14 PM, Andrew Rybchenko wrote:
> From: Steve Yang 
>
> When receiving the unsupported AQ messages, it's taken as an
> error. It's not appropriate and triggers too much unnecessary print.
>
> Fixes: 22b123a36d07 ("net/avf: initialize PMD")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Steve Yang 
> Acked-by: Beilei Xing 
> Signed-off-by: Andrew Rybchenko 

I apologize, my bad on patch queue formatting. I've marked it
as rejected in patchwork since it is already in next-net.

Re: [dpdk-dev] [PATCH] kernel: remove igb_uio

[Thomas Monjalon]

08/09/2020 10:25, Bruce Richardson:
> On Tue, Sep 08, 2020 at 02:14:02AM +0200, Thomas Monjalon wrote:
> > On Tue Sep 8, 2020 at 2:50 AM CEST, Thomas Monjalon wrote:
> > > As decided in the Technical Board in November 2019,
> > > the kernel module igb_uio is moved to the dpdk-kmods repository
> > > in the /linux/igb_uio/ directory.
> > 
> > The code is moved with its git history in
> > http://git.dpdk.org/dpdk-kmods/
> > 
> > The move process started with these commands:
> > cd dpdk
> > dir=igb_uio
> > path1=lib/librte_eal/linuxapp/$dir
> > path2=kernel/linux/$dir
> > git format-patch -o $dir 0c9a540ed2.. -- $path1 $path2
> > find $dir -type f -exec sed -i "s,$path1\|$path2,linux/$dir," '{}' \;
> > cd ../dpdk-kmods
> > git am ../dpdk/$dir/*
> > git filter-branch --force
> > --index-filter "git rm --cached --ignore-unmatch 
> > linux/$dir/Makefile"
> > --prune-empty --tag-name-filter cat -- --all
> > 
> > Makefile and meson.build files were not imported at all.
> > Some other commits were skipped (virtio, vmxnet3 and Xen dom0 support),
> > because they were not very useful and reverted later in the history.
> > Anyway the original history is available forever in dpdk.git.
> > 
> > Currently it cannot compile because the file rte_pci_dev_feature_defs.h
> > is missing, defining enum rte_intr_mode. An option is to import this file.
> > 
> > It would be nice to add a README file in the new igb_uio directory.
> > Volunteers welcome :)
> 
> In terms of building the module, one option which I think is worth
> considering is to try and use meson subject/wrap support to download and
> build this module as part of the main DPDK build, as now, when enable_kmods
> option is set. With a wrap file in DPDK it can automatically pull down and
> build the code as part of a main project build. I assume that integration
> into main DPDK build is still something worth having? The only thing I
> don't like about using a wrap file is that it has to be placed in a folder
> called "subproject" at the top level of the DPDK project.

The idea is encouraging the use of VFIO and make igb_uio deprecated.
I think we should not do any effort to ease igb_uio usage inside dpdk.git.
Compiling the kernel module standalone in dpdk-kmods.git looks enough, isn't it?

Re: [dpdk-dev] [RFC v2] ethdev: add VLAN attributes to ETH and VLAN items

[Maxime Leroy]

Hi Dekel,

On Thu, Aug 6, 2020 at 12:40 PM Dekel Peled  wrote:
>
> In existing code the match on tagged/untagged packets is not explicit.
> Recent documentation update [1] describes the different patterns and
> clarifies the intended use of different patterns.
>
> This patch proposes an update to ETH and VLAN items struct, to clearly
> define the required characteristic of a packet, and enable precise
> match criteria.
>
> [1] https://mails.dpdk.org/archives/dev/2020-May/166257.html

First, I still don't understand the initial change [1] done on RTE_FLOW API.
Before this change, it was possible to match any packets with or
without vlan encapsulations.
At least, it's not anymore possible the case with the mlx5 pmd since
this change.

For example, if I want to match any ssh packets whatever if it's
encapsulated with no vlan or N vlan headers:
testpmd> flow create 0 ingress  pattern  eth type spec 0 type mask 0 /
ipv4 / udp dst is 22  / end actions  mark id 2 / queue index 0 / end

By setting the ethernet type mask to 0x0, it means that ethernet type
should be ignored. It means if ethernet type is 0x800 (i.e. ipv4) or
0x8100 (i.e. vlan) or 0x88A8 (qinq), the packet should be matched.

Why is it not anymore supported to create a rule matching any ip
packets (with/without vlan header) ?
How is RFC handling this issue ?

>
> Signed-off-by: Dekel Peled 
> ---
>  lib/librte_ethdev/rte_flow.h | 16 +---
>  1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
> index cf0eccb..0e0b8d4 100644
> --- a/lib/librte_ethdev/rte_flow.h
> +++ b/lib/librte_ethdev/rte_flow.h
> @@ -723,14 +723,18 @@ struct rte_flow_item_raw {
>   * If the @p type field contains a TPID value, then only tagged packets with 
> the
>   * specified TPID will match the pattern.
>   * Otherwise, only untagged packets will match the pattern.
> - * If the @p ETH item is the only item in the pattern, and the @p type field
> - * is not specified, then both tagged and untagged packets will match the
> - * pattern.
> + * The field @p vlan_exist can be used to match specific packet types, 
> instead
> + * of using the @p type field.
> + * This can be used to match any type of tagged packets.
> + * If the @p type and @p vlan_exist fields are not specified, then both 
> tagged
> + * and untagged packets will match the pattern.
>   */
>  struct rte_flow_item_eth {
> struct rte_ether_addr dst; /**< Destination MAC. */
> struct rte_ether_addr src; /**< Source MAC. */
> rte_be16_t type; /**< EtherType or TPID. */
> +   uint32_t vlan_exist:1; /**< At least one VLAN exist in header. */
> +   uint32_t reserved:31; /**< Reserved, must be zero. */
>  };

For vlan_exists=1, it can already be achieved with the following follow:
testpmd>  flow  create 0 ingress  pattern eth type spec 0x8100 type
mask 0x / vlan inner_type is 0x800 mask is 0x / end actions
mark id 2 / queue index 0 / end

For vlan_exists=0, first you can match ipv4 packets without vlan
header like that:
testpmd> flow create 0 ingress  pattern  eth type spec 0x800 type mask
0x / ipv4 / end actions  mark id 2 / queue index
0 / end

For matching ethernet packet without any vlan header, it's not
possible today with RTE_FLOW API.
But instead of adding a new field each structure for next fields, I
think we should introduce an attribute 'NOT' in the rte_flow API.

For example, we could add this flow in test pmd like that:
testpmd>  flow  create 0 ingress  pattern eth /  not vlan / end
actions  mark id 2 / queue index 0 / end

>
>  /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */
> @@ -752,10 +756,16 @@ struct rte_flow_item_eth {
>   * the preceding pattern item.
>   * If a @p VLAN item is present in the pattern, then only tagged packets will
>   * match the pattern.
> + * The field @p more_vlans_exist can be used to match specific packet types,
> + * instead of using the @p inner_type field.
> + * This can be used to match any type of tagged packets.
>   */
>  struct rte_flow_item_vlan {
> rte_be16_t tci; /**< Tag control information. */
> rte_be16_t inner_type; /**< Inner EtherType or TPID. */
> +   uint32_t more_vlans_exist:1;
> +   /**< At least one more VLAN exist in header, following this VLAN. */
> +   uint32_t reserved:31; /**< Reserved, must be zero. */
>  };

This can already be achieved with the following RTE_FLOW flows:
> flow create 0 ingress  pattern  eth  / vlan inner_type spec is 0x0 mask is 
> 0x0 / ipv4  / end actions  mark id 2 / queue index 0 / end

By setting inner_type mask to 0, it means that we don't care about
inner_type, so inner_type can be any value. Thus it can be 0x8100 for
vlan or 0x800 for ipv4. At the end, this rule matches any ipv4 packets
with at least one vlan header.

Having more_vlan_exist in rte_flow_item_vlan is not useful.

Regards,

Maxime Leroy

>
>  /** Default mask for RTE_FLOW_ITEM_TYPE_VLAN. */
> --
> 1.8.3.1
>

Re: [dpdk-dev] [PATCH] kernel: remove igb_uio

[Bruce Richardson]

On Tue, Sep 08, 2020 at 11:27:23AM +0200, Thomas Monjalon wrote:
> 08/09/2020 10:25, Bruce Richardson:
> > On Tue, Sep 08, 2020 at 02:14:02AM +0200, Thomas Monjalon wrote:
> > > On Tue Sep 8, 2020 at 2:50 AM CEST, Thomas Monjalon wrote:
> > > > As decided in the Technical Board in November 2019,
> > > > the kernel module igb_uio is moved to the dpdk-kmods repository
> > > > in the /linux/igb_uio/ directory.
> > > 
> > > The code is moved with its git history in
> > >   http://git.dpdk.org/dpdk-kmods/
> > > 
> > > The move process started with these commands:
> > >   cd dpdk
> > >   dir=igb_uio
> > >   path1=lib/librte_eal/linuxapp/$dir
> > >   path2=kernel/linux/$dir
> > >   git format-patch -o $dir 0c9a540ed2.. -- $path1 $path2
> > >   find $dir -type f -exec sed -i "s,$path1\|$path2,linux/$dir," '{}' \;
> > >   cd ../dpdk-kmods
> > >   git am ../dpdk/$dir/*
> > >   git filter-branch --force
> > >   --index-filter "git rm --cached --ignore-unmatch 
> > > linux/$dir/Makefile"
> > >   --prune-empty --tag-name-filter cat -- --all
> > > 
> > > Makefile and meson.build files were not imported at all.
> > > Some other commits were skipped (virtio, vmxnet3 and Xen dom0 support),
> > > because they were not very useful and reverted later in the history.
> > > Anyway the original history is available forever in dpdk.git.
> > > 
> > > Currently it cannot compile because the file rte_pci_dev_feature_defs.h
> > > is missing, defining enum rte_intr_mode. An option is to import this file.
> > > 
> > > It would be nice to add a README file in the new igb_uio directory.
> > > Volunteers welcome :)
> > 
> > In terms of building the module, one option which I think is worth
> > considering is to try and use meson subject/wrap support to download and
> > build this module as part of the main DPDK build, as now, when enable_kmods
> > option is set. With a wrap file in DPDK it can automatically pull down and
> > build the code as part of a main project build. I assume that integration
> > into main DPDK build is still something worth having? The only thing I
> > don't like about using a wrap file is that it has to be placed in a folder
> > called "subproject" at the top level of the DPDK project.
> 
> The idea is encouraging the use of VFIO and make igb_uio deprecated.
> I think we should not do any effort to ease igb_uio usage inside dpdk.git.
> Compiling the kernel module standalone in dpdk-kmods.git looks enough, isn't 
> it?
> 

Ok, that is fine if that is the objective. I thought the objective was to
move all kernel modules out of the DPDK tree, but if it's only certain
modules, then that is different.

/Bruce

Re: [dpdk-dev] [PATCH] net/hns3: fix out-of-bounds access

[Ferruh Yigit]

On 9/7/2020 3:13 AM, Wei Hu (Xavier) wrote:
> 
> On 2020/9/7 9:46, wangyunjian wrote:
>> From: Yunjian Wang 
>>
>> This patch fixes (out-of-bounds access) coverity issue.
>>
>> Coverity issue: 349932
>> Fixes: 7d7f9f80bbfb ("net/hns3: support MAC address related operations")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: Yunjian Wang 
> Reviewed-by: Wei Hu (Xavier) 
> 

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

Re: [dpdk-dev] [PATCH] kernel: remove igb_uio

[Thomas Monjalon]

08/09/2020 11:34, Bruce Richardson:
> On Tue, Sep 08, 2020 at 11:27:23AM +0200, Thomas Monjalon wrote:
> > 08/09/2020 10:25, Bruce Richardson:
> > > On Tue, Sep 08, 2020 at 02:14:02AM +0200, Thomas Monjalon wrote:
> > > > On Tue Sep 8, 2020 at 2:50 AM CEST, Thomas Monjalon wrote:
> > > > > As decided in the Technical Board in November 2019,
> > > > > the kernel module igb_uio is moved to the dpdk-kmods repository
> > > > > in the /linux/igb_uio/ directory.
> > > > 
> > > > The code is moved with its git history in
> > > > http://git.dpdk.org/dpdk-kmods/
> > > > 
> > > > The move process started with these commands:
> > > > cd dpdk
> > > > dir=igb_uio
> > > > path1=lib/librte_eal/linuxapp/$dir
> > > > path2=kernel/linux/$dir
> > > > git format-patch -o $dir 0c9a540ed2.. -- $path1 $path2
> > > > find $dir -type f -exec sed -i "s,$path1\|$path2,linux/$dir," 
> > > > '{}' \;
> > > > cd ../dpdk-kmods
> > > > git am ../dpdk/$dir/*
> > > > git filter-branch --force
> > > > --index-filter "git rm --cached --ignore-unmatch 
> > > > linux/$dir/Makefile"
> > > > --prune-empty --tag-name-filter cat -- --all
> > > > 
> > > > Makefile and meson.build files were not imported at all.
> > > > Some other commits were skipped (virtio, vmxnet3 and Xen dom0 support),
> > > > because they were not very useful and reverted later in the history.
> > > > Anyway the original history is available forever in dpdk.git.
> > > > 
> > > > Currently it cannot compile because the file rte_pci_dev_feature_defs.h
> > > > is missing, defining enum rte_intr_mode. An option is to import this 
> > > > file.
> > > > 
> > > > It would be nice to add a README file in the new igb_uio directory.
> > > > Volunteers welcome :)
> > > 
> > > In terms of building the module, one option which I think is worth
> > > considering is to try and use meson subject/wrap support to download and
> > > build this module as part of the main DPDK build, as now, when 
> > > enable_kmods
> > > option is set. With a wrap file in DPDK it can automatically pull down and
> > > build the code as part of a main project build. I assume that integration
> > > into main DPDK build is still something worth having? The only thing I
> > > don't like about using a wrap file is that it has to be placed in a folder
> > > called "subproject" at the top level of the DPDK project.
> > 
> > The idea is encouraging the use of VFIO and make igb_uio deprecated.
> > I think we should not do any effort to ease igb_uio usage inside dpdk.git.
> > Compiling the kernel module standalone in dpdk-kmods.git looks enough, 
> > isn't it?
> 
> Ok, that is fine if that is the objective. I thought the objective was to
> move all kernel modules out of the DPDK tree, but if it's only certain
> modules, then that is different.

As we discussed in the Technical Board, the FreeBSD modules are required
for any use and should stay inside dpdk.git.

But the question is open for KNI.
I think KNI should be deprecated as well to encourage using other
methods which are more "upstream" for Linux.

[dpdk-dev] [PATCH v3 3/3] net/iavf: support outer IP hash for GTPU

[alvinx . zhang]

From: Alvin Zhang 

Add headers for GTPU, now outer IP hash can be configured as input
sets for GTPU packet.

Signed-off-by: Alvin Zhang 
---
 drivers/net/iavf/iavf_hash.c | 13 +
 1 file changed, 13 insertions(+)

diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index ddea3dd..8aeb3f83 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -135,6 +135,9 @@ struct iavf_hash_flow_cfg {
 #define proto_hdr_gtpc { \
VIRTCHNL_PROTO_HDR_GTPC, 0, {BUFF_NOUSED} }
 
+#define proto_hdr_gtpu { \
+   VIRTCHNL_PROTO_HDR_GTPU_IP, 0, {BUFF_NOUSED} }
+
 #define TUNNEL_LEVEL_OUTER 0
 #define TUNNEL_LEVEL_INNER 1
 
@@ -267,6 +270,14 @@ struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpc}
 };
 
+struct virtchnl_proto_hdrs outer_ipv4_udp_gtpu_tmplt = {
+   TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp, proto_hdr_gtpu}
+};
+
+struct virtchnl_proto_hdrs outer_ipv6_udp_gtpu_tmplt = {
+   TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpu}
+};
+
 /* rss type super set */
 
 /* IPv4 outer */
@@ -359,6 +370,7 @@ struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
{iavf_pattern_eth_vlan_ipv4_udp,
IAVF_RSS_TYPE_VLAN_IPV4_UDP,&outer_ipv4_udp_tmplt},
{iavf_pattern_eth_vlan_ipv4_tcp,
IAVF_RSS_TYPE_VLAN_IPV4_TCP,&outer_ipv4_tcp_tmplt},
{iavf_pattern_eth_vlan_ipv4_sctp,   
IAVF_RSS_TYPE_VLAN_IPV4_SCTP,   &outer_ipv4_sctp_tmplt},
+   {iavf_pattern_eth_ipv4_gtpu,ETH_RSS_IPV4,   
&outer_ipv4_udp_gtpu_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv4,   
IAVF_RSS_TYPE_GTPU_IPV4,&inner_ipv4_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv4_udp,   
IAVF_RSS_TYPE_GTPU_IPV4_UDP,&inner_ipv4_udp_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv4_tcp,   
IAVF_RSS_TYPE_GTPU_IPV4_TCP,&inner_ipv4_tcp_tmplt},
@@ -386,6 +398,7 @@ struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
{iavf_pattern_eth_vlan_ipv6_udp,
IAVF_RSS_TYPE_VLAN_IPV6_UDP,&outer_ipv6_udp_tmplt},
{iavf_pattern_eth_vlan_ipv6_tcp,
IAVF_RSS_TYPE_VLAN_IPV6_TCP,&outer_ipv6_tcp_tmplt},
{iavf_pattern_eth_vlan_ipv6_sctp,   
IAVF_RSS_TYPE_VLAN_IPV6_SCTP,   &outer_ipv6_sctp_tmplt},
+   {iavf_pattern_eth_ipv6_gtpu,ETH_RSS_IPV6,   
&outer_ipv6_udp_gtpu_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv6,   
IAVF_RSS_TYPE_GTPU_IPV6,&inner_ipv6_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv6_udp,   
IAVF_RSS_TYPE_GTPU_IPV6_UDP,&inner_ipv6_udp_tmplt},
{iavf_pattern_eth_ipv4_gtpu_ipv6_tcp,   
IAVF_RSS_TYPE_GTPU_IPV6_TCP,&inner_ipv6_tcp_tmplt},
-- 
1.8.3.1

[dpdk-dev] [PATCH v3 2/3] net/iavf: support outer IP hash for GTPC

[alvinx . zhang]

From: Alvin Zhang 

Add patterns and headers for GTPC, now outer IP hash can be configured
as input sets for GTPC packet.

Signed-off-by: Alvin Zhang 
---
 drivers/net/iavf/iavf_generic_flow.c | 18 ++
 drivers/net/iavf/iavf_generic_flow.h |  6 ++
 drivers/net/iavf/iavf_hash.c | 15 +++
 3 files changed, 39 insertions(+)

diff --git a/drivers/net/iavf/iavf_generic_flow.c 
b/drivers/net/iavf/iavf_generic_flow.c
index 321a4dc..00e7f15 100644
--- a/drivers/net/iavf/iavf_generic_flow.c
+++ b/drivers/net/iavf/iavf_generic_flow.c
@@ -315,6 +315,15 @@ enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[] 
= {
RTE_FLOW_ITEM_TYPE_END,
 };
 
+/* IPv4 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_GTPC,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* IPV4 GTPU (EH) */
 enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[] = {
RTE_FLOW_ITEM_TYPE_ETH,
@@ -333,6 +342,15 @@ enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[] = {
RTE_FLOW_ITEM_TYPE_END,
 };
 
+/* IPv6 GTPC */
+enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_GTPC,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
 /* IPV6 GTPU (EH) */
 enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[] = {
RTE_FLOW_ITEM_TYPE_ETH,
diff --git a/drivers/net/iavf/iavf_generic_flow.h 
b/drivers/net/iavf/iavf_generic_flow.h
index f365cc3..dbc7294 100644
--- a/drivers/net/iavf/iavf_generic_flow.h
+++ b/drivers/net/iavf/iavf_generic_flow.h
@@ -182,10 +182,16 @@
 extern enum rte_flow_item_type iavf_pattern_eth_vlan_ipv6_icmp6[];
 extern enum rte_flow_item_type iavf_pattern_eth_qinq_ipv6_icmp6[];
 
+/* IPv4 GTPC */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpc[];
+
 /* IPv4 GTPU (EH) */
 extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu[];
 extern enum rte_flow_item_type iavf_pattern_eth_ipv4_gtpu_eh[];
 
+/* IPv4 GTPC */
+extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpc[];
+
 /* IPv6 GTPU (EH) */
 extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu[];
 extern enum rte_flow_item_type iavf_pattern_eth_ipv6_gtpu_eh[];
diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index aab8b14..ddea3dd 100644
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -132,6 +132,9 @@ struct iavf_hash_flow_cfg {
VIRTCHNL_PROTO_HDR_PFCP, \
FIELD_SELECTOR(VIRTCHNL_PROTO_HDR_PFCP_SEID), {BUFF_NOUSED} }
 
+#define proto_hdr_gtpc { \
+   VIRTCHNL_PROTO_HDR_GTPC, 0, {BUFF_NOUSED} }
+
 #define TUNNEL_LEVEL_OUTER 0
 #define TUNNEL_LEVEL_INNER 1
 
@@ -256,6 +259,14 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
TUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv6, proto_hdr_pfcp}
 };
 
+struct virtchnl_proto_hdrs ipv4_udp_gtpc_tmplt = {
+   TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp, proto_hdr_gtpc}
+};
+
+struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {
+   TUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpc}
+};
+
 /* rss type super set */
 
 /* IPv4 outer */
@@ -365,6 +376,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
{iavf_pattern_eth_ipv4_ah,  IAVF_RSS_TYPE_IPV4_AH,  
&ipv4_ah_tmplt},
{iavf_pattern_eth_ipv4_l2tpv3,  
IAVF_RSS_TYPE_IPV4_L2TPV3,  &ipv4_l2tpv3_tmplt},
{iavf_pattern_eth_ipv4_pfcp,
IAVF_RSS_TYPE_IPV4_PFCP,&ipv4_pfcp_tmplt},
+   {iavf_pattern_eth_ipv4_gtpc,ETH_RSS_IPV4,   
&ipv4_udp_gtpc_tmplt},
/* IPv6 */
{iavf_pattern_eth_ipv6, 
IAVF_RSS_TYPE_OUTER_IPV6,   &outer_ipv6_tmplt},
{iavf_pattern_eth_ipv6_udp, 
IAVF_RSS_TYPE_OUTER_IPV6_UDP,   &outer_ipv6_udp_tmplt},
@@ -391,6 +403,7 @@ struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {
{iavf_pattern_eth_ipv6_ah,  IAVF_RSS_TYPE_IPV6_AH,  
&ipv6_ah_tmplt},
{iavf_pattern_eth_ipv6_l2tpv3,  
IAVF_RSS_TYPE_IPV6_L2TPV3,  &ipv6_l2tpv3_tmplt},
{iavf_pattern_eth_ipv6_pfcp,
IAVF_RSS_TYPE_IPV6_PFCP,&ipv6_pfcp_tmplt},
+   {iavf_pattern_eth_ipv6_gtpc,ETH_RSS_IPV6,   
&ipv6_udp_gtpc_tmplt},
 };
 
 struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
@@ -592,6 +605,8 @@ struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {
else if (rss_type & ETH_RSS_L4_DST_ONLY)
VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,

VIRTCHNL_PROTO_HDR_UDP_SRC_PORT);
+   } else {
+   hdr->field_sel

[dpdk-dev] [PATCH v3 1/3] common/iavf: add GTPC support

[alvinx . zhang]

From: Alvin Zhang 

Add GTPC header and its field selector.

Signed-off-by: Alvin Zhang 
---
 drivers/common/iavf/virtchnl.h | 4 
 1 file changed, 4 insertions(+)

diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h
index 79515ee..0042cc0 100644
--- a/drivers/common/iavf/virtchnl.h
+++ b/drivers/common/iavf/virtchnl.h
@@ -852,6 +852,7 @@ enum virtchnl_proto_hdr_type {
VIRTCHNL_PROTO_HDR_ESP,
VIRTCHNL_PROTO_HDR_AH,
VIRTCHNL_PROTO_HDR_PFCP,
+   VIRTCHNL_PROTO_HDR_GTPC,
 };
 
 /* Protocol header field within a protocol header. */
@@ -916,6 +917,9 @@ enum virtchnl_proto_hdr_field {
VIRTCHNL_PROTO_HDR_PFCP_S_FIELD =
PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_PFCP),
VIRTCHNL_PROTO_HDR_PFCP_SEID,
+   /* GTPC */
+   VIRTCHNL_PROTO_HDR_GTPC_TEID =
+   PROTO_HDR_FIELD_START(VIRTCHNL_PROTO_HDR_GTPC),
 };
 
 struct virtchnl_proto_hdr {
-- 
1.8.3.1

Re: [dpdk-dev] [PATCH v8 1/8] net/dpaa: add support for fmlib in dpdk

[Ferruh Yigit]

On 9/4/2020 1:51 PM, Ferruh Yigit wrote:
> On 9/4/2020 9:39 AM, Hemant Agrawal wrote:
>> DPAA platorm MAC interface is known as FMAN i.e. Frame Manager.
>> There are two ways to control it.
>> 1. Statically configure the queues and classification rules before the
>> start of the application using FMC tool.
>> 2. Dynamically configure it within application by making API calls of
>> fmlib.
>>
>> The fmlib or Frame Manager library provides an API on top of the
>> Frame Manager driver ioctl calls, that provides a user space application
>> with a simple way to configure driver parameters and PCD
>> (parse - classify - distribute) rules.
>>
>> This patch integrates the base fmlib so that various queue config, RSS
>> and classification related features can be supported on DPAA platform.
>>
>> Signed-off-by: Sachin Saxena 
>> Signed-off-by: Hemant Agrawal 
> 
> Series applied to dpdk-next-net/main, thanks.
> 

Hi Hemant,

I need to drop the series from next-net, since new files doesn't have the
Makefile support, they are causing build error for Make and affecting CI result
for some new patches.

I will add them back when Make support removed from the main repo.

[dpdk-dev] [PATCH] net/netvsc: replace compiler builtin overflow check

[Ferruh Yigit]

'__builtin_add_overflow' added to gcc in version 5, earlier versions
causing build error, like gcc 4.8.5 in RHEL7.

Replaced compiler builtin check with arithmetic check.

Fixes: cabb3c0f29f1 ("net/netvsc: check for overflow on packet info from host")

Reported-by: Raslan Darawsheh 
Signed-off-by: Ferruh Yigit 
---
 drivers/net/netvsc/hn_rxtx.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
index d8d3f07f56..3e8d3b407d 100644
--- a/drivers/net/netvsc/hn_rxtx.c
+++ b/drivers/net/netvsc/hn_rxtx.c
@@ -666,7 +666,7 @@ static void hn_rndis_rx_data(struct hn_rx_queue *rxq,
 struct hn_rx_bufinfo *rxb,
 void *data, uint32_t dlen)
 {
-   unsigned int data_off, data_len, total_len;
+   unsigned int data_off, data_len;
unsigned int pktinfo_off, pktinfo_len;
const struct rndis_packet_msg *pkt = data;
struct hn_rxinfo info = {
@@ -712,8 +712,8 @@ static void hn_rndis_rx_data(struct hn_rx_queue *rxq,
goto error;
}
 
-   if (__builtin_add_overflow(data_off, data_len, &total_len) ||
-   total_len > pkt->len)
+   /* overflow check */
+   if (data_len > data_len + data_off || data_len + data_off > pkt->len)
goto error;
 
if (unlikely(data_len < RTE_ETHER_HDR_LEN))
-- 
2.25.4

[dpdk-dev] [PATCH 2/3] event/octeontx2: add crypto adapter framework

[Ankur Dwivedi]

The crypto adapter callback functions and associated data structures
are added.

Signed-off-by: Ankur Dwivedi 
---
 drivers/crypto/octeontx2/meson.build  |  4 +-
 .../crypto/octeontx2/otx2_crypto_adapter.c| 77 +++
 .../crypto/octeontx2/otx2_crypto_adapter.h| 21 +
 .../octeontx2/otx2_cryptodev_hw_access.h  | 12 +++
 drivers/crypto/octeontx2/otx2_cryptodev_qp.h  |  7 ++
 .../rte_pmd_octeontx2_crypto_version.map  | 10 +++
 drivers/event/octeontx2/meson.build   |  2 +-
 drivers/event/octeontx2/otx2_evdev.c  |  5 ++
 8 files changed, 136 insertions(+), 2 deletions(-)
 create mode 100644 drivers/crypto/octeontx2/otx2_crypto_adapter.c
 create mode 100644 drivers/crypto/octeontx2/otx2_crypto_adapter.h

diff --git a/drivers/crypto/octeontx2/meson.build 
b/drivers/crypto/octeontx2/meson.build
index 148ec184a..063a553f2 100644
--- a/drivers/crypto/octeontx2/meson.build
+++ b/drivers/crypto/octeontx2/meson.build
@@ -10,6 +10,7 @@ deps += ['bus_pci']
 deps += ['common_cpt']
 deps += ['common_octeontx2']
 deps += ['ethdev']
+deps += ['eventdev']
 deps += ['security']
 name = 'octeontx2_crypto'
 
@@ -18,7 +19,8 @@ sources = files('otx2_cryptodev.c',
'otx2_cryptodev_hw_access.c',
'otx2_cryptodev_mbox.c',
'otx2_cryptodev_ops.c',
-   'otx2_cryptodev_sec.c')
+   'otx2_cryptodev_sec.c',
+   'otx2_crypto_adapter.c')
 
 extra_flags = []
 # This integrated controller runs only on a arm64 machine, remove 32bit 
warnings
diff --git a/drivers/crypto/octeontx2/otx2_crypto_adapter.c 
b/drivers/crypto/octeontx2/otx2_crypto_adapter.c
new file mode 100644
index 0..cfde7ec4f
--- /dev/null
+++ b/drivers/crypto/octeontx2/otx2_crypto_adapter.c
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2020 Marvell International Ltd.
+ */
+
+#include 
+#include 
+
+#include "otx2_cryptodev_hw_access.h"
+#include "otx2_cryptodev_qp.h"
+#include "otx2_cryptodev_mbox.h"
+#include "otx2_crypto_adapter.h"
+
+int
+otx2_ca_caps_get(const struct rte_eventdev *dev,
+   const struct rte_cryptodev *cdev, uint32_t *caps)
+{
+   RTE_SET_USED(dev);
+   RTE_SET_USED(cdev);
+
+   *caps = RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND |
+   RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW;
+
+   return 0;
+}
+
+int
+otx2_ca_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev 
*cdev,
+   int32_t queue_pair_id, const struct rte_event *event)
+{
+   union otx2_cpt_af_lf_ctl2 af_lf_ctl2;
+   struct otx2_cpt_qp *qp;
+   int ret;
+
+   RTE_SET_USED(dev);
+
+   qp = cdev->data->queue_pairs[queue_pair_id];
+
+   qp->ca_enable = 1;
+   rte_memcpy(&qp->ev, event, sizeof(struct rte_event));
+
+   ret = otx2_cpt_af_reg_read(cdev, OTX2_CPT_AF_LF_CTL2(qp->id),
+   &af_lf_ctl2.u);
+   if (ret)
+   return ret;
+
+   af_lf_ctl2.s.sso_pf_func = otx2_sso_pf_func_get();
+   ret = otx2_cpt_af_reg_write(cdev, OTX2_CPT_AF_LF_CTL2(qp->id),
+   af_lf_ctl2.u);
+
+   return ret;
+}
+
+int
+otx2_ca_qp_del(const struct rte_eventdev *dev, const struct rte_cryptodev 
*cdev,
+   int32_t queue_pair_id)
+{
+   union otx2_cpt_af_lf_ctl2 af_lf_ctl2;
+   struct otx2_cpt_qp *qp;
+   int ret;
+
+   RTE_SET_USED(dev);
+
+   qp = cdev->data->queue_pairs[queue_pair_id];
+   qp->ca_enable = 0;
+   memset(&qp->ev, 0, sizeof(struct rte_event));
+
+   ret = otx2_cpt_af_reg_read(cdev, OTX2_CPT_AF_LF_CTL2(qp->id),
+   &af_lf_ctl2.u);
+   if (ret)
+   return ret;
+
+   af_lf_ctl2.s.sso_pf_func = 0;
+   ret = otx2_cpt_af_reg_write(cdev, OTX2_CPT_AF_LF_CTL2(qp->id),
+   af_lf_ctl2.u);
+
+   return ret;
+}
diff --git a/drivers/crypto/octeontx2/otx2_crypto_adapter.h 
b/drivers/crypto/octeontx2/otx2_crypto_adapter.h
new file mode 100644
index 0..c8f02c0af
--- /dev/null
+++ b/drivers/crypto/octeontx2/otx2_crypto_adapter.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2020 Marvell International Ltd.
+ */
+
+#ifndef _OTX2_CRYPTO_ADAPTER_H_
+#define _OTX2_CRYPTO_ADAPTER_H_
+
+__rte_internal
+int otx2_ca_caps_get(const struct rte_eventdev *dev,
+   const struct rte_cryptodev *cdev, uint32_t *caps);
+
+__rte_internal
+int otx2_ca_qp_add(const struct rte_eventdev *dev,
+   const struct rte_cryptodev *cdev, int32_t queue_pair_id,
+   const struct rte_event *event);
+
+__rte_internal
+int otx2_ca_qp_del(const struct rte_eventdev *dev,
+   const struct rte_cryptodev *cdev, int32_t queue_pair_id);
+
+#endif /* _OTX2_CRYPTO_ADAPTER_H_ */
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_hw_access.h 
b/drivers/crypto/octeontx2/otx2_cryptodev_hw_access.h
index 43db6a642..a435818e0 100644
-

[dpdk-dev] [PATCH 1/3] crypto/octeontx2: move functions to helper file

[Ankur Dwivedi]

Some functions are common across cryptodev pmd and the event
crypto adapter. This patch moves them into a helper file.

Signed-off-by: Ankur Dwivedi 
---
 drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 65 +---
 .../octeontx2/otx2_cryptodev_ops_helper.h | 74 +++
 2 files changed, 75 insertions(+), 64 deletions(-)
 create mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h

diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c 
b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
index ccf566d5f..77842b4ad 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
@@ -13,6 +13,7 @@
 #include "otx2_cryptodev_hw_access.h"
 #include "otx2_cryptodev_mbox.h"
 #include "otx2_cryptodev_ops.h"
+#include "otx2_cryptodev_ops_helper.h"
 #include "otx2_ipsec_po_ops.h"
 #include "otx2_mbox.h"
 #include "otx2_sec_idev.h"
@@ -416,24 +417,6 @@ sym_session_configure(int driver_id, struct 
rte_crypto_sym_xform *xform,
return -ENOTSUP;
 }
 
-static void
-sym_session_clear(int driver_id, struct rte_cryptodev_sym_session *sess)
-{
-   void *priv = get_sym_session_private_data(sess, driver_id);
-   struct rte_mempool *pool;
-
-   if (priv == NULL)
-   return;
-
-   memset(priv, 0, cpt_get_session_size());
-
-   pool = rte_mempool_from_obj(priv);
-
-   set_sym_session_private_data(sess, driver_id, NULL);
-
-   rte_mempool_put(pool, priv);
-}
-
 static __rte_always_inline int32_t __rte_hot
 otx2_cpt_enqueue_req(const struct otx2_cpt_qp *qp,
 struct pending_queue *pend_q,
@@ -917,52 +900,6 @@ otx2_cpt_dequeue_post_process(struct otx2_cpt_qp *qp, 
struct rte_crypto_op *cop,
}
 }
 
-static __rte_always_inline uint8_t
-otx2_cpt_compcode_get(struct cpt_request_info *req)
-{
-   volatile struct cpt_res_s_9s *res;
-   uint8_t ret;
-
-   res = (volatile struct cpt_res_s_9s *)req->completion_addr;
-
-   if (unlikely(res->compcode == CPT_9X_COMP_E_NOTDONE)) {
-   if (rte_get_timer_cycles() < req->time_out)
-   return ERR_REQ_PENDING;
-
-   CPT_LOG_DP_ERR("Request timed out");
-   return ERR_REQ_TIMEOUT;
-   }
-
-   if (likely(res->compcode == CPT_9X_COMP_E_GOOD)) {
-   ret = NO_ERR;
-   if (unlikely(res->uc_compcode)) {
-   ret = res->uc_compcode;
-   CPT_LOG_DP_DEBUG("Request failed with microcode error");
-   CPT_LOG_DP_DEBUG("MC completion code 0x%x",
-res->uc_compcode);
-   }
-   } else {
-   CPT_LOG_DP_DEBUG("HW completion code 0x%x", res->compcode);
-
-   ret = res->compcode;
-   switch (res->compcode) {
-   case CPT_9X_COMP_E_INSTERR:
-   CPT_LOG_DP_ERR("Request failed with instruction error");
-   break;
-   case CPT_9X_COMP_E_FAULT:
-   CPT_LOG_DP_ERR("Request failed with DMA fault");
-   break;
-   case CPT_9X_COMP_E_HWERR:
-   CPT_LOG_DP_ERR("Request failed with hardware error");
-   break;
-   default:
-   CPT_LOG_DP_ERR("Request failed with unknown completion 
code");
-   }
-   }
-
-   return ret;
-}
-
 static uint16_t
 otx2_cpt_dequeue_burst(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops)
 {
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h 
b/drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h
new file mode 100644
index 0..764daadea
--- /dev/null
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h
@@ -0,0 +1,74 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2020 Marvell International Ltd.
+ */
+
+#ifndef _OTX2_CRYPTODEV_OPS_HELPER_H_
+#define _OTX2_CRYPTODEV_OPS_HELPER_H_
+
+#include "cpt_pmd_logs.h"
+
+static void
+sym_session_clear(int driver_id, struct rte_cryptodev_sym_session *sess)
+{
+   void *priv = get_sym_session_private_data(sess, driver_id);
+   struct rte_mempool *pool;
+
+   if (priv == NULL)
+   return;
+
+   memset(priv, 0, cpt_get_session_size());
+
+   pool = rte_mempool_from_obj(priv);
+
+   set_sym_session_private_data(sess, driver_id, NULL);
+
+   rte_mempool_put(pool, priv);
+}
+
+static __rte_always_inline uint8_t
+otx2_cpt_compcode_get(struct cpt_request_info *req)
+{
+   volatile struct cpt_res_s_9s *res;
+   uint8_t ret;
+
+   res = (volatile struct cpt_res_s_9s *)req->completion_addr;
+
+   if (unlikely(res->compcode == CPT_9X_COMP_E_NOTDONE)) {
+   if (rte_get_timer_cycles() < req->time_out)
+   return ERR_REQ_PENDING;
+
+   CPT_LOG_DP_ERR("Request timed out");
+   return ERR_REQ_TIMEOUT;
+   }
+
+  

[dpdk-dev] [PATCH 0/3] event/octeontx2: add support for event crypto adapter

[Ankur Dwivedi]

This patch series adds support for event crypto adapter in op new
mode in the OCTEON TX2 event PMD. The functionality has been
verified with event crypto adapter test application. Build with
meson and ninja is supported.

Ankur Dwivedi (3):
  crypto/octeontx2: move functions to helper file
  event/octeontx2: add crypto adapter framework
  event/octeontx2: add crypto adapter datapath

 drivers/common/cpt/cpt_common.h   |  1 +
 drivers/crypto/octeontx2/meson.build  |  4 +-
 drivers/crypto/octeontx2/otx2_ca_helper.h | 75 +++
 .../crypto/octeontx2/otx2_crypto_adapter.c| 77 +++
 .../crypto/octeontx2/otx2_crypto_adapter.h| 21 
 .../octeontx2/otx2_cryptodev_hw_access.h  | 12 +++
 drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 96 ---
 .../octeontx2/otx2_cryptodev_ops_helper.h | 74 ++
 drivers/crypto/octeontx2/otx2_cryptodev_qp.h  |  7 ++
 .../rte_pmd_octeontx2_crypto_version.map  | 11 +++
 drivers/event/octeontx2/meson.build   |  3 +-
 drivers/event/octeontx2/otx2_evdev.c  |  5 +
 drivers/event/octeontx2/otx2_worker.h | 10 +-
 drivers/event/octeontx2/otx2_worker_dual.h| 11 ++-
 14 files changed, 345 insertions(+), 62 deletions(-)
 create mode 100644 drivers/crypto/octeontx2/otx2_ca_helper.h
 create mode 100644 drivers/crypto/octeontx2/otx2_crypto_adapter.c
 create mode 100644 drivers/crypto/octeontx2/otx2_crypto_adapter.h
 create mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h

-- 
2.28.0

[dpdk-dev] [PATCH 3/3] event/octeontx2: add crypto adapter datapath

[Ankur Dwivedi]

In the op new mode of crypto adapter, the completed crypto operation
is submitted to the event device by the OCTEON TX2 crypto PMD.
During event device dequeue the result of crypto operation is checked.

Signed-off-by: Ankur Dwivedi 
---
 drivers/common/cpt/cpt_common.h   |  1 +
 drivers/crypto/octeontx2/otx2_ca_helper.h | 75 +++
 drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 47 
 .../rte_pmd_octeontx2_crypto_version.map  |  1 +
 drivers/event/octeontx2/meson.build   |  1 +
 drivers/event/octeontx2/otx2_worker.h | 10 ++-
 drivers/event/octeontx2/otx2_worker_dual.h| 11 ++-
 7 files changed, 142 insertions(+), 4 deletions(-)
 create mode 100644 drivers/crypto/octeontx2/otx2_ca_helper.h

diff --git a/drivers/common/cpt/cpt_common.h b/drivers/common/cpt/cpt_common.h
index 0141b2aed..1ce28e90b 100644
--- a/drivers/common/cpt/cpt_common.h
+++ b/drivers/common/cpt/cpt_common.h
@@ -72,6 +72,7 @@ struct cpt_request_info {
uint64_t ei3;
} ist;
uint8_t *rptr;
+   const struct otx2_cpt_qp *qp;
 
/** Control path fields */
uint64_t time_out;
diff --git a/drivers/crypto/octeontx2/otx2_ca_helper.h 
b/drivers/crypto/octeontx2/otx2_ca_helper.h
new file mode 100644
index 0..a6c758cf9
--- /dev/null
+++ b/drivers/crypto/octeontx2/otx2_ca_helper.h
@@ -0,0 +1,75 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2020 Marvell International Ltd.
+ */
+
+#ifndef _OTX2_CA_HELPER_H_
+#define _OTX2_CA_HELPER_H_
+
+#include 
+#include 
+#include 
+
+#include "cpt_pmd_logs.h"
+#include "cpt_ucode.h"
+
+#include "otx2_cryptodev.h"
+#include "otx2_cryptodev_hw_access.h"
+#include "otx2_cryptodev_ops_helper.h"
+#include "otx2_cryptodev_qp.h"
+
+static inline void
+otx2_ca_deq_post_process(const struct otx2_cpt_qp *qp,
+struct rte_crypto_op *cop, uintptr_t *rsp,
+uint8_t cc)
+{
+   if (cop->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) {
+   if (likely(cc == NO_ERR)) {
+   /* Verify authentication data if required */
+   if (unlikely(rsp[2]))
+   compl_auth_verify(cop, (uint8_t *)rsp[2],
+rsp[3]);
+   else
+   cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+   } else {
+   if (cc == ERR_GC_ICV_MISCOMPARE)
+   cop->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+   else
+   cop->status = RTE_CRYPTO_OP_STATUS_ERROR;
+   }
+
+   if (unlikely(cop->sess_type == RTE_CRYPTO_OP_SESSIONLESS)) {
+   sym_session_clear(otx2_cryptodev_driver_id,
+ cop->sym->session);
+   memset(cop->sym->session, 0,
+   rte_cryptodev_sym_get_existing_header_session_size(
+   cop->sym->session));
+   rte_mempool_put(qp->sess_mp, cop->sym->session);
+   cop->sym->session = NULL;
+   }
+   }
+
+}
+
+static __rte_always_inline uint64_t
+otx2_handle_crypto_event(uint64_t get_work1)
+{
+   struct cpt_request_info *req;
+   struct rte_crypto_op *cop;
+   uintptr_t *rsp;
+   void *metabuf;
+   uint8_t cc;
+
+   req = (struct cpt_request_info *)(get_work1 >> 3);
+   cc = otx2_cpt_compcode_get(req);
+
+   rsp = req->op;
+   metabuf = (void *)rsp[0];
+   cop = (void *)rsp[1];
+
+   otx2_ca_deq_post_process(req->qp, cop, rsp, cc);
+
+   rte_mempool_put(req->qp->meta_info.pool, metabuf);
+
+   return (uint64_t)(cop);
+}
+#endif /* _OTX2_CA_HELPER_H_ */
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c 
b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
index 77842b4ad..53c118287 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
@@ -417,6 +417,48 @@ sym_session_configure(int driver_id, struct 
rte_crypto_sym_xform *xform,
return -ENOTSUP;
 }
 
+static __rte_always_inline void __rte_hot
+otx2_ca_enqueue_req(const struct otx2_cpt_qp *qp,
+   struct cpt_request_info *req,
+   void *lmtline)
+{
+   union cpt_inst_s inst;
+   uint64_t lmt_status;
+
+   inst.u[0] = 0;
+   inst.s9x.res_addr = req->comp_baddr;
+   inst.u[2] = 0;
+   inst.u[3] = 0;
+
+   inst.s9x.ei0 = req->ist.ei0;
+   inst.s9x.ei1 = req->ist.ei1;
+   inst.s9x.ei2 = req->ist.ei2;
+   inst.s9x.ei3 = req->ist.ei3;
+
+   inst.s9x.qord = 1;
+   inst.s9x.grp = qp->ev.queue_id;
+   inst.s9x.tt = qp->ev.sched_type;
+   inst.s9x.tag = (RTE_EVENT_TYPE_CRYPTODEV << 28) |
+   qp->ev.flow_id;
+   inst.s9x.wq_ptr = (uint64_t)req;
+   req->q

Re: [dpdk-dev] [dpdk-dev v2 1/2] fips_validation: add SGL support

[Zhang, Roy Fan]

Hi Suanming Mou,

Thanks for the review.

> -Original Message-
> From: Suanming Mou 
> Sent: Monday, September 7, 2020 2:32 PM
> To: Zhang, Roy Fan ; dev@dpdk.org
> Cc: akhil.go...@nxp.com; Trahe, Fiona ; Kusztal,
> ArkadiuszX ; Dybkowski, AdamX
> 
> Subject: Re: [dpdk-dev] [dpdk-dev v2 1/2] fips_validation: add SGL support
> 
> Hi,
> 
...
> > @@ -50,8 +55,10 @@ cryptodev_fips_validate_app_int(void)
> >   {
> > struct rte_cryptodev_config conf = {rte_socket_id(), 1, 0};
> > struct rte_cryptodev_qp_conf qp_conf = {128, NULL, NULL};
> > +   struct rte_cryptodev_info dev_info;
> Better to initialize the dev_info here?

[Fan] dev_info is initialized by rte_cryptodev_info_get() after the device is
successfully configured. So at least we can be sure the device ID is a valid
one and the buffer will be properly set by the driver. Plus the
the implementation of rte_cryptodev_info_get() will do a memset to
the dev_info buffer so it is not necessary to be initialized there.

> > uint32_t sess_sz = rte_cryptodev_sym_get_private_session_size(
> > env.dev_id);
> > +   uint32_t nb_mbufs = UINT16_MAX / env.mbuf_data_room + 1;
> > int ret;
> >

Regards,
Fan

Re: [dpdk-dev] [PATCH v4 31/31] doc: remove references to make from contributing guide

[Thomas Monjalon]

On Tue Sep 8, 2020 at 2:07 AM CEST, Thomas Monjalon wrote:
> From: Ciara Power 
> 
> Make is no longer supported for compiling DPDK, references are now
> removed in the documentation.
> 
> Signed-off-by: Ciara Power 
> Signed-off-by: Louise Kilheeney 
> ---
> doc/guides/contributing/design.rst | 127 ++
> doc/guides/contributing/documentation.rst | 31 +-
> 2 files changed, 13 insertions(+), 145 deletions(-)

As reported by David, an update is missing in patches.rst:
devtools/test-build.sh reference should be removed

Re: [dpdk-dev] [PATCH v8 1/8] net/dpaa: add support for fmlib in dpdk

[Thomas Monjalon]

08/09/2020 11:55, Ferruh Yigit:
> On 9/4/2020 1:51 PM, Ferruh Yigit wrote:
> > Series applied to dpdk-next-net/main, thanks.
> 
> Hi Hemant,
> 
> I need to drop the series from next-net, since new files doesn't have the
> Makefile support, they are causing build error for Make and affecting CI 
> result
> for some new patches.
> 
> I will add them back when Make support removed from the main repo.

Make is already removed.

Which CI is broken?
Make should not be tested anymore as requested in this ticket:
https://bugs.dpdk.org/show_bug.cgi?id=534

[dpdk-dev] [v3 PATCH] test_distributor: prevent memory leakages from the pool

[Sarosh Arif]

rte_mempool_get_bulk is used to get bufs/many_bufs from the pool,
but at some locations when test fails the bufs/many_bufs are
not returned back to the pool.
Due to this, multiple executions of distributor_autotest gives the
following error message: Error getting mbufs from pool.
To resolve this issue rte_mempool_put_bulk is used whenever the test
fails and returns.

Signed-off-by: Sarosh Arif 
---
v2:
remove double freeing of mbufs
v3:
resubmit to run the tests again
---
 app/test/test_distributor.c | 5 +
 1 file changed, 5 insertions(+)

diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c
index ba1f81cf8..1a893a7d9 100644
--- a/app/test/test_distributor.c
+++ b/app/test/test_distributor.c
@@ -128,6 +128,7 @@ sanity_test(struct worker_params *wp, struct rte_mempool *p)
printf("Line %d: Error, not all packets flushed. "
"Expected %u, got %u\n",
__LINE__, BURST, total_packet_count());
+   rte_mempool_put_bulk(p, (void *)bufs, BURST);
return -1;
}
 
@@ -153,6 +154,7 @@ sanity_test(struct worker_params *wp, struct rte_mempool *p)
printf("Line %d: Error, not all packets flushed. "
"Expected %u, got %u\n",
__LINE__, BURST, total_packet_count());
+   rte_mempool_put_bulk(p, (void *)bufs, BURST);
return -1;
}
 
@@ -179,6 +181,7 @@ sanity_test(struct worker_params *wp, struct rte_mempool *p)
printf("Line %d: Error, not all packets flushed. "
"Expected %u, got %u\n",
__LINE__, BURST, total_packet_count());
+   rte_mempool_put_bulk(p, (void *)bufs, BURST);
return -1;
}
 
@@ -233,6 +236,7 @@ sanity_test(struct worker_params *wp, struct rte_mempool *p)
if (num_returned != BIG_BATCH) {
printf("line %d: Missing packets, expected %d\n",
__LINE__, num_returned);
+   rte_mempool_put_bulk(p, (void *)many_bufs, BIG_BATCH);
return -1;
}
 
@@ -247,6 +251,7 @@ sanity_test(struct worker_params *wp, struct rte_mempool *p)
 
if (j == BIG_BATCH) {
printf("Error: could not find source packet #%u\n", i);
+   rte_mempool_put_bulk(p, (void *)many_bufs, BIG_BATCH);
return -1;
}
}
-- 
2.25.1

[dpdk-dev] [PATCH v1] event/sw: performance improvements

[Radu Nicolau]

Add minimum burst throughout the scheduler pipeline and a flush counter.
Replace ring API calls with local single threaded implementation
where possible.

Signed-off-by: Radu Nicolau 
---
 drivers/event/sw/sw_evdev.h   | 11 +++-
 drivers/event/sw/sw_evdev_scheduler.c | 83 +++
 2 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/drivers/event/sw/sw_evdev.h b/drivers/event/sw/sw_evdev.h
index 7c77b2495..95e51065f 100644
--- a/drivers/event/sw/sw_evdev.h
+++ b/drivers/event/sw/sw_evdev.h
@@ -29,7 +29,13 @@
 /* report dequeue burst sizes in buckets */
 #define SW_DEQ_STAT_BUCKET_SHIFT 2
 /* how many packets pulled from port by sched */
-#define SCHED_DEQUEUE_BURST_SIZE 32
+#define SCHED_DEQUEUE_BURST_SIZE 64
+
+#define SCHED_MIN_BURST_SIZE 8
+#define SCHED_NO_ENQ_CYCLE_FLUSH 256
+/* set SCHED_DEQUEUE_BURST_SIZE to 64 or 128 when setting this to 1*/
+#define SCHED_REFILL_ONCE_PER_CALL 1
+
 
 #define SW_PORT_HIST_LIST (MAX_SW_PROD_Q_DEPTH) /* size of our history list */
 #define NUM_SAMPLES 64 /* how many data points use for average stats */
@@ -214,6 +220,9 @@ struct sw_evdev {
uint32_t xstats_count_mode_port;
uint32_t xstats_count_mode_queue;
 
+   uint16_t sched_flush_count;
+   uint16_t sched_min_burst;
+
/* Contains all ports - load balanced and directed */
struct sw_port ports[SW_PORTS_MAX] __rte_cache_aligned;
 
diff --git a/drivers/event/sw/sw_evdev_scheduler.c 
b/drivers/event/sw/sw_evdev_scheduler.c
index cff747da8..ca6d1caff 100644
--- a/drivers/event/sw/sw_evdev_scheduler.c
+++ b/drivers/event/sw/sw_evdev_scheduler.c
@@ -26,6 +26,29 @@
 /* use cheap bit mixing, we only need to lose a few bits */
 #define SW_HASH_FLOWID(f) (((f) ^ (f >> 10)) & FLOWID_MASK)
 
+
+/* single object enq and deq for non MT ring */
+static __rte_always_inline void
+sw_nonmt_ring_dequeue(struct rte_ring *r, void **obj)
+{
+   if ((r->prod.tail - r->cons.tail) < 1)
+   return;
+   void **ring = (void **)&r[1];
+   *obj = ring[r->cons.tail & r->mask];
+   r->cons.tail++;
+}
+static __rte_always_inline int
+sw_nonmt_ring_enqueue(struct rte_ring *r, void *obj)
+{
+   if ((r->capacity + r->cons.tail - r->prod.tail) < 1)
+   return 0;
+   void **ring = (void **)&r[1];
+   ring[r->prod.tail & r->mask] = obj;
+   r->prod.tail++;
+   return 1;
+}
+
+
 static inline uint32_t
 sw_schedule_atomic_to_cq(struct sw_evdev *sw, struct sw_qid * const qid,
uint32_t iq_num, unsigned int count)
@@ -146,9 +169,9 @@ sw_schedule_parallel_to_cq(struct sw_evdev *sw, struct 
sw_qid * const qid,
cq_idx = 0;
cq = qid->cq_map[cq_idx++];
 
-   } while (rte_event_ring_free_count(
-   sw->ports[cq].cq_worker_ring) == 0 ||
-   sw->ports[cq].inflights == SW_PORT_HIST_LIST);
+   } while (sw->ports[cq].inflights == SW_PORT_HIST_LIST ||
+   rte_event_ring_free_count(
+   sw->ports[cq].cq_worker_ring) == 0);
 
struct sw_port *p = &sw->ports[cq];
if (sw->cq_ring_space[cq] == 0 ||
@@ -164,7 +187,7 @@ sw_schedule_parallel_to_cq(struct sw_evdev *sw, struct 
sw_qid * const qid,
p->hist_list[head].qid = qid_id;
 
if (keep_order)
-   rte_ring_sc_dequeue(qid->reorder_buffer_freelist,
+   sw_nonmt_ring_dequeue(qid->reorder_buffer_freelist,
(void *)&p->hist_list[head].rob_entry);
 
sw->ports[cq].cq_buf[sw->ports[cq].cq_buf_count++] = *qe;
@@ -229,7 +252,7 @@ sw_schedule_qid_to_cq(struct sw_evdev *sw)
uint32_t pkts_done = 0;
uint32_t count = iq_count(&qid->iq[iq_num]);
 
-   if (count > 0) {
+   if (count >= sw->sched_min_burst) {
if (type == SW_SCHED_TYPE_DIRECT)
pkts_done += sw_schedule_dir_to_cq(sw, qid,
iq_num, count);
@@ -267,7 +290,7 @@ sw_schedule_reorder(struct sw_evdev *sw, int qid_start, int 
qid_end)
 
for (; qid_start < qid_end; qid_start++) {
struct sw_qid *qid = &sw->qids[qid_start];
-   int i, num_entries_in_use;
+   unsigned int i, num_entries_in_use;
 
if (qid->type != RTE_SCHED_TYPE_ORDERED)
continue;
@@ -275,6 +298,9 @@ sw_schedule_reorder(struct sw_evdev *sw, int qid_start, int 
qid_end)
num_entries_in_use = rte_ring_free_count(
qid->reorder_buffer_freelist);
 
+   if (num_entries_in_use < sw->sched_min_burst)
+   num_entries_in_use = 0;
+
for (i = 0; i < num_entries_in_use; i++) {
 

Re: [dpdk-dev] [PATCH] crypto/octeontx2: fix sessionless code

[Anoob Joseph]

> A temporary session is created for sessionless crypto operations.
> rte_cryptodev_sym_session_create() should be used for creating the
> temporary session as it initializes the session structure in the correct way.
> Also the session should be set to 0 before freeing it.
> 
> Fixes: 17ac2a72191b ("crypto/octeontx2: add enqueue/dequeue ops")
> 
> Signed-off-by: Ankur Dwivedi 

Acked-by: Anoob Joseph 

Re: [dpdk-dev] [PATCH] lib/bpf: remove experimental tag

[Ananyev, Konstantin]

> 
> The BPF lib was introduced in 18.05.
> There were no changes in it's public API since 19.11.
> It should be mature enough to remove it's 'experimental' tag.
> 
> Signed-off-by: Conor Walsh 
> ---

Acked-by: Konstantin Ananyev 

> 2.25.1

Re: [dpdk-dev] [PATCH 1/2] net/ice: add dcf port representor infrastructure

[Xing, Beilei]

> -Original Message-
> From: dev  On Behalf Of Qiming Yang
> Sent: Wednesday, September 2, 2020 2:38 PM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z ; Yang, Qiming
> 
> Subject: [dpdk-dev] [PATCH 1/2] net/ice: add dcf port representor
> infrastructure
> 
> Defines data structures and code to init/uninit VF representors during
> pci_probe and pci_remove respectively.
> Most of the dev_ops for the VF representor are just stubs for now and will be
> will be filled out in next patch
> 
> Signed-off-by: Qiming Yang 
> ---
>  drivers/net/ice/Makefile |   1 +
>  drivers/net/ice/ice_dcf_ethdev.c |  66 +-
>  drivers/net/ice/ice_dcf_ethdev.h |  11 +
>  drivers/net/ice/ice_dcf_vf_representor.c | 245 +++
>  4 files changed, 321 insertions(+), 2 deletions(-)  create mode 100644
> drivers/net/ice/ice_dcf_vf_representor.c
> 
> diff --git a/drivers/net/ice/Makefile b/drivers/net/ice/Makefile index
> 34cd4024b..f9eb34a87 100644
> --- a/drivers/net/ice/Makefile
> +++ b/drivers/net/ice/Makefile
> @@ -88,6 +88,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) +=
> ice_generic_flow.c
> 
>  SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf.c
>  SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_ethdev.c
> +SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_vf_representor.c
>  SRCS-$(CONFIG_RTE_LIBRTE_ICE_PMD) += ice_dcf_parent.c
> 

<...>

> +
> +static int
> +ice_dcf_representor_tx_queue_setup(__rte_unused struct rte_eth_dev *dev,
> + __rte_unused uint16_t rx_queue_id,
Should be tx_queue_id which is more readable?

> + __rte_unused uint16_t nb_rx_desc,
Should be nb_tx_desc?

> + __rte_unused unsigned int socket_id,
> + __rte_unused const struct rte_eth_txconf *tx_conf) {
> + return 0;
> +}
> +

<...>

> +
> + /* No data-path, but need stub Rx/Tx functions to avoid crash
> +  * when testing with the likes of testpmd.
> +  */
> + ethdev->rx_pkt_burst = ice_dcf_representor_rx_burst;
> + ethdev->tx_pkt_burst = ice_dcf_representor_tx_burst;
> +
> + ethdev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR;
> + ethdev->data->representor_id = representor->vf_id;
> +
> + struct rte_ether_addr mac_addr;
Why not move this to the beginning of the function?

> +
> + memset(&mac_addr, 0, sizeof(mac_addr));
> + ethdev->data->mac_addrs = &mac_addr;
> +
> + return 0;
> +}
> +
> +int
> +ice_dcf_vf_representor_uninit(struct rte_eth_dev *ethdev) {
> + ethdev->data->mac_addrs = NULL;
> +
> + return 0;
> +}
> +
> --
> 2.17.1

Re: [dpdk-dev] [PATCH] lib/ipsec: remove experimental tag

[Ananyev, Konstantin]

> Since librte_ipsec was first introduced in 19.02 and there were no changes
> in it's public API since 19.11, it should be considered mature enough to
> remove the 'experimental' tag from it.
> 
> Signed-off-by: Conor Walsh 
> ---

Acked-by: Konstantin Ananyev 

> 2.25.1

Re: [dpdk-dev] [PATCH v1 00/18] mlx5 Rx DevX/Verbs separation

[Raslan Darawsheh]

Hi,

> -Original Message-
> From: Michael Baum 
> Sent: Thursday, September 3, 2020 1:14 PM
> To: dev@dpdk.org
> Cc: Matan Azrad ; Raslan Darawsheh
> ; Slava Ovsiienko 
> Subject: [PATCH v1 00/18] mlx5 Rx DevX/Verbs separation
> 
> v1:
> Initial version
> 
> Michael Baum (18):
>   net/mlx5: fix Rx hash queue creation error flow
>   net/mlx5: fix Rx queue state update
>   net/mlx5: fix types differentiation in Rxq create
>   net/mlx5: mitigate Rx queue reference counters
>   net/mlx5: separate Rx queue object creations
>   net/mlx5: separate Rx interrupt handling
>   net/mlx5: share Rx control code
>   net/mlx5: rearrange the creation of RQ and CQ resources
>   net/mlx5: rearrange the creation of WQ and CQ object
>   net/mlx5: separate Rx queue object modification
>   net/mlx5: share Rx queue object modification
>   net/mlx5: separate Rx indirection table object creation
>   net/mlx5: separate Rx hash queue creation
>   net/mlx5: remove indirection table type field
>   net/mlx5: share Rx queue indirection table code
>   net/mlx5: share Rx hash queue code
>   net/mlx5: separate Rx queue drop
>   net/mlx5: share Rx queue drop action code
> 
>  drivers/net/mlx5/Makefile   |1 +
>  drivers/net/mlx5/linux/mlx5_os.c|   10 +
>  drivers/net/mlx5/linux/mlx5_verbs.c |  707 +
>  drivers/net/mlx5/linux/mlx5_verbs.h |4 +
>  drivers/net/mlx5/meson.build|1 +
>  drivers/net/mlx5/mlx5.h |   73 +-
>  drivers/net/mlx5/mlx5_devx.c|  792 +-
>  drivers/net/mlx5/mlx5_flow_dv.c |   20 +-
>  drivers/net/mlx5/mlx5_flow_verbs.c  |   35 +-
>  drivers/net/mlx5/mlx5_rxq.c | 1934 
> ++-
>  drivers/net/mlx5/mlx5_rxtx.h|   84 +-
>  drivers/net/mlx5/mlx5_trigger.c |   67 +-
>  drivers/net/mlx5/mlx5_vlan.c|2 +-
>  13 files changed, 1954 insertions(+), 1776 deletions(-)
> 
> --
> 1.8.3.1

Series applied to next-net-mlx,

Kindest regards,
Raslan Darawsheh

Re: [dpdk-dev] [PATCH 10/11] net/hns3: fix Rx/Tx queue offload capability

[Wei Hu (Xavier)]

Hi, Ferruh Yigit

On 2020/9/4 18:34, Ferruh Yigit wrote:

On 8/25/2020 12:53 PM, Wei Hu (Xavier) wrote:

From: "Wei Hu (Xavier)" 

According to rte_eth_rx_queue_setup and rte_eth_tx_queue_setup API
function, rx_queue_offload_capa and rx_offload_capa, tx_queue_offload_capa
and tx_offload_capa must be mutually exclusive in the '.dev_infos_get' ops
implementation function. Otherwise, rte_eth_rx_queue_setup or
rte_eth_tx_queue_setup will fail, if user uses rx_offload_capa and
tx_offload_capa obtained by calling the rte_eth_dev_info_get API function.

Can you please clarify what is fixed here?

If the PMD doesn't support 'DEV_TX_OFFLOAD_MBUF_FAST_FREE' to be configured per
queue, it makes sense the update the capability reporting to match it.

But having an offload as queue offload shouldn't cause any error on setting it
on port wise (to all queues). I am asking because if you are getting error
'rte_eth_rx_queue_setup()' / 'rte_eth_tx_queue_setup()' the reason can be
something else.
Also what do you mean by "'tx_queue_offload_capa' and 'tx_offload_capa' must be
mutually exclusive"? All queue offloads should be present in the port offload,
because of an offload can be applied to any specific queue, this means it can be
applied to all queues which means it can be applied port wise.


"rx_queue_offload_capa and rx_offload_capa, tx_queue_offload_capa

 and tx_offload_capa must be mutually exclusive" -- It's wrong, we 
misunderstood


the process of rte_eth_rx_queue_setup and rte_eth_tx_queue_setup.

Thanks :-)


We will update the commit log as below:

Currently, offload capabilities are only enabled for all Rx/Tx queues in hns3
PF and VF PMD driver, and offload capability only applied in a Rx/Tx
queue is not supported. So this patch moves 'DEV_TX_OFFLOAD_MBUF_FAST_FREE'
from tx_queue_offload_capa to tx_offload_capa.



Currently, offload capabilities are enabled for all Rx/Tx queues in hns3
PF and VF PMD driver, and offload capability only applied in a Rx/Tx
queue is not supported. This patch fixes Rx/Tx queue offload capability.

Fixes: 1f5ca0b460cd67 ("net/hns3: support some device operations")
Fixes: a5475d61fa34b8 ("net/hns3: support VF")
Cc: sta...@dpdk.org

Signed-off-by: Huisong Li 
Signed-off-by: Wei Hu (Xavier) 
---
  drivers/net/hns3/hns3_ethdev.c| 5 +++--
  drivers/net/hns3/hns3_ethdev_vf.c | 5 +++--
  2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 14e4b9e35..281d8b928 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2459,6 +2459,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct 
rte_eth_dev_info *info)
info->max_mac_addrs = HNS3_UC_MACADDR_NUM;
info->max_mtu = info->max_rx_pktlen - HNS3_ETH_OVERHEAD;
info->max_lro_pkt_size = HNS3_MAX_LRO_SIZE;
+   info->rx_queue_offload_capa = 0;

No need to set 'rx_queue_offload_capa' or 'tx_queue_offload_capa' to zero since
zero is their default value.


Ok, I  will fix it in V2.

Thanks


Regards

Xavier

Re: [dpdk-dev] [PATCH] testpmd: add speed capability in device info

[Ferruh Yigit]

On 9/8/2020 9:36 AM, Sarosh Arif wrote:
> delay_us_sleep_autotest is failing on this patch. To replicate it, I
> ran the same test on my system and it did not fail. Can this test be
> re-run?

cc'ed lab people.
I clicked the 'rebuild' button for the test, but I can't see if it queued or 
not...

> 
> On Fri, Sep 4, 2020 at 11:23 AM Sarosh Arif  wrote:
>>
>> diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
>> index 30bee3324..8824ad174 100644
>> --- a/app/test-pmd/config.c
>> +++ b/app/test-pmd/config.c
>> @@ -518,6 +518,7 @@ device_infos_display(const char *identifier)
>> struct rte_device *dev;
>> struct rte_devargs da;
>> portid_t port_id;
>> +   struct rte_eth_dev_info dev_info;
>> char devstr[128];
>>
>> memset(&da, 0, sizeof(da));
>> @@ -569,6 +570,90 @@ device_infos_display(const char *identifier)
>>   &mac_addr);
>> rte_eth_dev_get_name_by_port(port_id, name);
>> printf("\n\tDevice name: %s", name);
>> +   rte_eth_dev_info_get(port_id, &dev_info);
>> +   switch (dev_info.speed_capa) {
>> +   case ETH_LINK_SPEED_AUTONEG:
>> +   printf("\n\tDevice speed capability: 
>> %s",
>> +   "Autonegotiate (all 
>> speeds)");
>> +   break;
>> +   case ETH_LINK_SPEED_FIXED:
>> +   printf("\n\tDevice speed capability: 
>> %s",
>> +   "Disable 
>> autonegotiate (fixed speed)");
>> +   break;
>> +   case ETH_LINK_SPEED_10M_HD ...
>> +   ETH_LINK_SPEED_10M-1:
>> +   printf("\n\tDevice speed capability: 
>> %s",
>> +   "10 Mbps 
>> half-duplex");
>> +   break;
>> +   case ETH_LINK_SPEED_10M ...
>> +   ETH_LINK_SPEED_100M_HD-1:
>> +   printf("\n\tDevice speed capability: 
>> %s",
>> +   "10 Mbps 
>> full-duplex");
>> +   break;
>> +   case ETH_LINK_SPEED_100M_HD ...
>> +   ETH_LINK_SPEED_100M-1:
>> +   printf("\n\tDevice speed capability: 
>> %s",
>> +   "100 Mbps 
>> half-duplex");
>> +   break;
>> +   case ETH_LINK_SPEED_100M ...
>> +   ETH_LINK_SPEED_1G-1:
>> +   printf("\n\tDevice speed capability: 
>> %s",
>> +   "100 Mbps 
>> full-duplex");
>> +   break;
>> +   case ETH_LINK_SPEED_1G ...
>> +   ETH_LINK_SPEED_2_5G-1:
>> +   printf("\n\tDevice speed capability: 
>> %s",
>> +   "1 Gbps");
>> +   break;
>> +   case ETH_LINK_SPEED_2_5G ...
>> +   ETH_LINK_SPEED_5G-1:
>> +   printf("\n\tDevice speed capability: 
>> %s",
>> +   "2.5 Gbps");
>> +   break;
>> +   case ETH_LINK_SPEED_5G ...
>> +   ETH_LINK_SPEED_10G-1:
>> +   printf("\n\tDevice speed capability: 
>> %s",
>> +   "5 Gbps");
>> +   break;
>> +   case ETH_LINK_SPEED_10G ...
>> +   ETH_LINK_SPEED_20G-1:
>> +   printf("\n\tDevice speed capability: 
>> %s",
>> +   "10 Gbps");
>> +   break;
>> +   case ETH_LINK_SPEED_20G ...
>> +   ETH_LINK_SPEED_25G-1:
>> +   printf("\n\tDevice speed capability: 
>> %s",
>> +   "20 Gbps");
>> + 

Re: [dpdk-dev] [PATCH] net/netvsc: replace compiler builtin overflow check

[Raslan Darawsheh]

Hi,

> -Original Message-
> From: Ferruh Yigit 
> Sent: Tuesday, September 8, 2020 1:07 PM
> To: dev@dpdk.org; Stephen Hemminger ; NBU-
> Contact-kys ; NBU-Contact-haiyangz
> ; NBU-Contact-longli 
> Cc: Ferruh Yigit ; Raslan Darawsheh
> 
> Subject: [PATCH] net/netvsc: replace compiler builtin overflow check
> 
> '__builtin_add_overflow' added to gcc in version 5, earlier versions
> causing build error, like gcc 4.8.5 in RHEL7.
> 
> Replaced compiler builtin check with arithmetic check.
> 
> Fixes: cabb3c0f29f1 ("net/netvsc: check for overflow on packet info from
> host")
> 
> Reported-by: Raslan Darawsheh 
> Signed-off-by: Ferruh Yigit 

Tested-by: Raslan Darawsheh 

> ---
>  drivers/net/netvsc/hn_rxtx.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c
> index d8d3f07f56..3e8d3b407d 100644
> --- a/drivers/net/netvsc/hn_rxtx.c
> +++ b/drivers/net/netvsc/hn_rxtx.c
> @@ -666,7 +666,7 @@ static void hn_rndis_rx_data(struct hn_rx_queue
> *rxq,
>struct hn_rx_bufinfo *rxb,
>void *data, uint32_t dlen)
>  {
> - unsigned int data_off, data_len, total_len;
> + unsigned int data_off, data_len;
>   unsigned int pktinfo_off, pktinfo_len;
>   const struct rndis_packet_msg *pkt = data;
>   struct hn_rxinfo info = {
> @@ -712,8 +712,8 @@ static void hn_rndis_rx_data(struct hn_rx_queue
> *rxq,
>   goto error;
>   }
> 
> - if (__builtin_add_overflow(data_off, data_len, &total_len) ||
> - total_len > pkt->len)
> + /* overflow check */
> + if (data_len > data_len + data_off || data_len + data_off > pkt->len)
>   goto error;
> 
>   if (unlikely(data_len < RTE_ETHER_HDR_LEN))
> --
> 2.25.4

Kindest regards
Raslan Darawsheh

Re: [dpdk-dev] [PATCH] kernel: remove igb_uio

[Ferruh Yigit]

On 9/7/2020 11:50 PM, Thomas Monjalon wrote:
> As decided in the Technical Board in November 2019,
> the kernel module igb_uio is moved to the dpdk-kmods repository
> in the /linux/igb_uio/ directory.
> 
> Minutes of Technical Board meeting:
> https://mails.dpdk.org/archives/dev/2019-November/151763.html
> 
> Signed-off-by: Thomas Monjalon 
> ---
>  MAINTAINERS  |   1 -
>  doc/guides/rel_notes/deprecation.rst |   7 -
>  kernel/linux/igb_uio/Kbuild  |   2 -
>  kernel/linux/igb_uio/compat.h| 154 ---
>  kernel/linux/igb_uio/igb_uio.c   | 660 ---
>  kernel/linux/igb_uio/meson.build |  20 -
>  kernel/linux/meson.build |   2 +-
>  7 files changed, 1 insertion(+), 845 deletions(-)
>  delete mode 100644 kernel/linux/igb_uio/Kbuild
>  delete mode 100644 kernel/linux/igb_uio/compat.h
>  delete mode 100644 kernel/linux/igb_uio/igb_uio.c
>  delete mode 100644 kernel/linux/igb_uio/meson.build
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 3b16d7a4b8..d74bec58e1 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -292,7 +292,6 @@ F: doc/guides/linux_gsg/
>  
>  Linux UIO
>  M: Ferruh Yigit 
> -F: kernel/linux/igb_uio/
>  F: drivers/bus/pci/linux/*uio*
>  

What do you think to have the new git repo information here as
"T: ..."
To help people looking for the module.

And I think at least 'doc/guides/linux_gsg/linux_drivers.rst' should be updated
to document the new home of the kernel module, but there are multiple references
in the documentation to the 'igb_uio', perhaps they should be replaced with
'vfio' too?

Re: [dpdk-dev] [PATCH v8 1/8] net/dpaa: add support for fmlib in dpdk

[Ferruh Yigit]

On 9/8/2020 11:19 AM, Thomas Monjalon wrote:
> 08/09/2020 11:55, Ferruh Yigit:
>> On 9/4/2020 1:51 PM, Ferruh Yigit wrote:
>>> Series applied to dpdk-next-net/main, thanks.
>>
>> Hi Hemant,
>>
>> I need to drop the series from next-net, since new files doesn't have the
>> Makefile support, they are causing build error for Make and affecting CI 
>> result
>> for some new patches.
>>
>> I will add them back when Make support removed from the main repo.
> 
> Make is already removed.

Yes indeed, it is removed this morning, I will rebase the next-net and merge the
patchset on top of it back.

> 
> Which CI is broken?
> Make should not be tested anymore as requested in this ticket:
>   https://bugs.dpdk.org/show_bug.cgi?id=534
> 
> 

I received build error reports, they might be internal.

Re: [dpdk-dev] [PATCH v2 3/7] ethdev: make device operations struct private

[Ferruh Yigit]

On 9/3/2020 10:09 PM, Ferruh Yigit wrote:
> Hiding the 'struct eth_dev_ops' from applications.
> 
> Removing relevant deprecation notice.
> 
> Signed-off-by: Ferruh Yigit 
> Acked-by: Andrew Rybchenko 

Hi Thomas and all,

If there is no objection I am willing to merge this series soon to prevent more
conflicts caused by this moving/renaming work.

Thanks,
ferruh

[dpdk-dev] [RFC] app/testpmd: distinguish ICMP identifier fields in packet

[lizh]

Ability to distinguish ICMP identifier fields in packets.
Dstinguish ICMP sequence number field too.
Already supports ICMP code and type fields in current version.
Existing fields in ICMP header contain the required information.
ICMP header already is supported and no code change in RTE FLOW.
Extend testpmd CLI to include the fields of ident and sequence number.
One example:
flow create 0 ingress pattern eth / ipv4 /
 icmp code is 1 ident is 5 seq is 6 /
 end actions count / queue index 0 / end
The ICMP packet with code 1, identifier 5 and
sequence number 6 will be matched.
It will implement action counter and forward to queue 0.

Signed-off-by: lizh 
---
 app/test-pmd/cmdline_flow.c | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 6263d307ed..6e04d538ea 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -143,6 +143,8 @@ enum index {
ITEM_ICMP,
ITEM_ICMP_TYPE,
ITEM_ICMP_CODE,
+   ITEM_ICMP_IDENT,
+   ITEM_ICMP_SEQ,
ITEM_UDP,
ITEM_UDP_SRC,
ITEM_UDP_DST,
@@ -893,6 +895,8 @@ static const enum index item_ipv6[] = {
 static const enum index item_icmp[] = {
ITEM_ICMP_TYPE,
ITEM_ICMP_CODE,
+   ITEM_ICMP_IDENT,
+   ITEM_ICMP_SEQ,
ITEM_NEXT,
ZERO,
 };
@@ -2193,6 +2197,20 @@ static const struct token token_list[] = {
.args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp,
 hdr.icmp_code)),
},
+   [ITEM_ICMP_IDENT] = {
+   .name = "ident",
+   .help = "ICMP packet identifier",
+   .next = NEXT(item_icmp, NEXT_ENTRY(UNSIGNED), item_param),
+   .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp,
+hdr.icmp_ident)),
+   },
+   [ITEM_ICMP_SEQ] = {
+   .name = "seq",
+   .help = "ICMP packet sequence number",
+   .next = NEXT(item_icmp, NEXT_ENTRY(UNSIGNED), item_param),
+   .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_icmp,
+hdr.icmp_seq_nb)),
+   },
[ITEM_UDP] = {
.name = "udp",
.help = "match UDP header",
-- 
2.21.0

[dpdk-dev] [PATCH v2] net/hns3: fix Rx/Tx queue offload capability

[Wei Hu (Xavier)]

From: "Wei Hu (Xavier)" 

Currently, offload capabilities are only enabled for all Rx/Tx queues
in hns3 PF/VF PMD driver, and offload capability only applied in a Rx/Tx
queue is not supported. So this patch moves 'DEV_TX_OFFLOAD_MBUF_FAST_FREE'
from tx_queue_offload_capa to tx_offload_capa.

Fixes: 1f5ca0b460cd67 ("net/hns3: support some device operations")
Fixes: a5475d61fa34b8 ("net/hns3: support VF")
Cc: sta...@dpdk.org

Signed-off-by: Huisong Li 
Signed-off-by: Wei Hu (Xavier) 
---
v1 -> v2: move DEV_TX_OFFLOAD_MBUF_FAST_FREE from tx_queue_offload
  to tx_offload_capa in .dev_info_get ops implementation
  function.
---
 drivers/net/hns3/hns3_ethdev.c| 3 +--
 drivers/net/hns3/hns3_ethdev_vf.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 0727c6d..7af504e 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2478,7 +2478,6 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct 
rte_eth_dev_info *info)
 DEV_RX_OFFLOAD_JUMBO_FRAME |
 DEV_RX_OFFLOAD_RSS_HASH |
 DEV_RX_OFFLOAD_TCP_LRO);
-   info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE;
info->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
 DEV_TX_OFFLOAD_IPV4_CKSUM |
 DEV_TX_OFFLOAD_TCP_CKSUM |
@@ -2489,7 +2488,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct 
rte_eth_dev_info *info)
 DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
 DEV_TX_OFFLOAD_GRE_TNL_TSO |
 DEV_TX_OFFLOAD_GENEVE_TNL_TSO |
-info->tx_queue_offload_capa |
+DEV_TX_OFFLOAD_MBUF_FAST_FREE |
 hns3_txvlan_cap_get(hw));
 
info->rx_desc_lim = (struct rte_eth_desc_lim) {
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c 
b/drivers/net/hns3/hns3_ethdev_vf.c
index 44e51b5..0be76f6 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -942,7 +942,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct 
rte_eth_dev_info *info)
 DEV_RX_OFFLOAD_JUMBO_FRAME |
 DEV_RX_OFFLOAD_RSS_HASH |
 DEV_RX_OFFLOAD_TCP_LRO);
-   info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE;
info->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
 DEV_TX_OFFLOAD_IPV4_CKSUM |
 DEV_TX_OFFLOAD_TCP_CKSUM |
@@ -953,7 +952,7 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct 
rte_eth_dev_info *info)
 DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
 DEV_TX_OFFLOAD_GRE_TNL_TSO |
 DEV_TX_OFFLOAD_GENEVE_TNL_TSO |
-info->tx_queue_offload_capa |
+DEV_TX_OFFLOAD_MBUF_FAST_FREE |
 hns3_txvlan_cap_get(hw));
 
info->rx_desc_lim = (struct rte_eth_desc_lim) {
-- 
2.9.5

[dpdk-dev] [PATCH 0/2] Add example l3fwd-regex

[guyk]

From: Guy Kaneti 

The L3 Forwarding with Regex application is a simple example of
packet processing using DPDK Regex framework.
The application performs L3 LPM based forwarding while using
Regex framework for pre-filtering decision.

Guy Kaneti (2):
  examples/l3fwd-regex: add regex based l3fwd
  doc: add l3fwd-regex application user guide

 MAINTAINERS   |3 +
 doc/guides/sample_app_ug/index.rst|1 +
 doc/guides/sample_app_ug/intro.rst|4 +
 doc/guides/sample_app_ug/l3_forward_regex.rst |  235 
 examples/l3fwd-regex/l3fwd.h  |  207 +++
 examples/l3fwd-regex/l3fwd_lpm.c  |  461 +++
 examples/l3fwd-regex/l3fwd_lpm.h  |  100 ++
 examples/l3fwd-regex/l3fwd_regex.c|  487 +++
 examples/l3fwd-regex/l3fwd_regex.h|   38 +
 examples/l3fwd-regex/main.c   | 1117 +
 examples/l3fwd-regex/meson.build  |   10 +
 examples/meson.build  |2 +-
 12 files changed, 2664 insertions(+), 1 deletion(-)
 create mode 100644 doc/guides/sample_app_ug/l3_forward_regex.rst
 create mode 100644 examples/l3fwd-regex/l3fwd.h
 create mode 100644 examples/l3fwd-regex/l3fwd_lpm.c
 create mode 100644 examples/l3fwd-regex/l3fwd_lpm.h
 create mode 100644 examples/l3fwd-regex/l3fwd_regex.c
 create mode 100644 examples/l3fwd-regex/l3fwd_regex.h
 create mode 100644 examples/l3fwd-regex/main.c
 create mode 100644 examples/l3fwd-regex/meson.build

-- 
2.28.0

[dpdk-dev] [PATCH 1/2] examples/l3fwd-regex: add regex based l3fwd

[guyk]

From: Guy Kaneti 

Add regex based l3fwd application
inline with normal l3fwd. only LPM is supported.

Signed-off-by: Guy Kaneti 
---
 MAINTAINERS|2 +
 examples/l3fwd-regex/l3fwd.h   |  207 ++
 examples/l3fwd-regex/l3fwd_lpm.c   |  461 
 examples/l3fwd-regex/l3fwd_lpm.h   |  100 +++
 examples/l3fwd-regex/l3fwd_regex.c |  487 
 examples/l3fwd-regex/l3fwd_regex.h |   38 +
 examples/l3fwd-regex/main.c| 1117 
 examples/l3fwd-regex/meson.build   |   10 +
 examples/meson.build   |2 +-
 9 files changed, 2423 insertions(+), 1 deletion(-)
 create mode 100644 examples/l3fwd-regex/l3fwd.h
 create mode 100644 examples/l3fwd-regex/l3fwd_lpm.c
 create mode 100644 examples/l3fwd-regex/l3fwd_lpm.h
 create mode 100644 examples/l3fwd-regex/l3fwd_regex.c
 create mode 100644 examples/l3fwd-regex/l3fwd_regex.h
 create mode 100644 examples/l3fwd-regex/main.c
 create mode 100644 examples/l3fwd-regex/meson.build

diff --git a/MAINTAINERS b/MAINTAINERS
index ed163f5d5..a73845a2d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -451,6 +451,8 @@ F: lib/librte_regexdev/
 F: app/test-regex/
 F: doc/guides/prog_guide/regexdev.rst
 F: doc/guides/regexdevs/features/default.ini
+M: Guy Kaneti 
+F: examples/l3fwd-regex/
 
 Eventdev API
 M: Jerin Jacob 
diff --git a/examples/l3fwd-regex/l3fwd.h b/examples/l3fwd-regex/l3fwd.h
new file mode 100644
index 0..3fb3647bb
--- /dev/null
+++ b/examples/l3fwd-regex/l3fwd.h
@@ -0,0 +1,207 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2016 Intel Corporation
+ * Copyright(C) 2020 Marvell International Ltd.
+ */
+
+#ifndef __L3_FWD_H__
+#define __L3_FWD_H__
+
+#include 
+#include 
+
+#define DO_RFC_1812_CHECKS
+
+#define RTE_LOGTYPE_L3FWD RTE_LOGTYPE_USER1
+
+/*
+ * Configurable number of RX/TX ring descriptors
+ */
+#define RTE_TEST_RX_DESC_DEFAULT 1024
+#define RTE_TEST_TX_DESC_DEFAULT 1024
+
+#define MAX_PKT_BURST 32
+#define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */
+
+#define MEMPOOL_CACHE_SIZE 256
+#define MAX_RX_QUEUE_PER_LCORE 16
+
+/*
+ * Try to avoid TX buffering if we have at least MAX_TX_BURST packets to send.
+ */
+#defineMAX_TX_BURST  (MAX_PKT_BURST / 2)
+
+#define NB_SOCKETS8
+
+/* Configure how many packets ahead to prefetch, when reading packets */
+#define PREFETCH_OFFSET  3
+
+/* Used to mark destination port as 'invalid'. */
+#defineBAD_PORT ((uint16_t)-1)
+
+#define FWDSTEP4
+
+/* replace first 12B of the ethernet header. */
+#defineMASK_ETH 0x3f
+
+struct mbuf_table {
+   uint16_t len;
+   struct rte_mbuf *m_table[MAX_PKT_BURST];
+};
+
+struct lcore_rx_queue {
+   uint16_t port_id;
+   uint8_t queue_id;
+} __rte_cache_aligned;
+
+struct lcore_conf {
+   uint16_t n_rx_queue;
+   struct lcore_rx_queue rx_queue_list[MAX_RX_QUEUE_PER_LCORE];
+   uint8_t regex_dev_id;
+   uint16_t regex_qp_id;
+   uint16_t n_tx_port;
+   uint16_t tx_port_id[RTE_MAX_ETHPORTS];
+   uint16_t tx_queue_id[RTE_MAX_ETHPORTS];
+   struct mbuf_table tx_mbufs[RTE_MAX_ETHPORTS];
+   struct rte_mbuf **pkts_burst;
+   void *ipv4_lookup_struct;
+   void *ipv6_lookup_struct;
+} __rte_cache_aligned;
+
+extern volatile bool force_quit;
+
+/* ethernet addresses of ports */
+extern uint64_t dest_eth_addr[RTE_MAX_ETHPORTS];
+extern struct rte_ether_addr ports_eth_addr[RTE_MAX_ETHPORTS];
+
+/* mask of enabled ports */
+extern uint32_t enabled_port_mask;
+
+/* Used only in exact match mode. */
+extern int ipv6; /**< ipv6 is false by default. */
+extern uint32_t hash_entry_number;
+
+extern xmm_t val_eth[RTE_MAX_ETHPORTS];
+
+extern struct lcore_conf lcore_conf[RTE_MAX_LCORE];
+
+/* Send burst of packets on an output interface */
+static inline int
+send_burst(struct lcore_conf *qconf, uint16_t n, uint16_t port)
+{
+   struct rte_mbuf **m_table;
+   int ret;
+   uint16_t queueid;
+
+   queueid = qconf->tx_queue_id[port];
+   m_table = (struct rte_mbuf **)qconf->tx_mbufs[port].m_table;
+
+   ret = rte_eth_tx_burst(port, queueid, m_table, n);
+   if (unlikely(ret < n)) {
+   do {
+   rte_pktmbuf_free(m_table[ret]);
+   } while (++ret < n);
+   }
+
+   return 0;
+}
+
+/* Enqueue a single packet, and send burst if queue is filled */
+static inline int
+send_single_packet(struct lcore_conf *qconf,
+  struct rte_mbuf *m, uint16_t port)
+{
+   uint16_t len;
+
+   len = qconf->tx_mbufs[port].len;
+   qconf->tx_mbufs[port].m_table[len] = m;
+   len++;
+
+   /* enough pkts to be sent */
+   if (unlikely(len == MAX_PKT_BURST)) {
+   send_burst(qconf, MAX_PKT_BURST, port);
+   len = 0;
+   }
+
+   qconf->tx_mbufs[port].len = len;
+   return 0;
+}
+
+#ifdef DO_RFC_1812_CHECKS
+static inline int
+is_valid_ipv4_pkt(struct rte_ipv4_h

[dpdk-dev] [PATCH 2/2] doc: add l3fwd-regex application user guide

[guyk]

From: Guy Kaneti 

Adding the user guide for l3fwd regex application.

Signed-off-by: Guy Kaneti 
---
 MAINTAINERS   |   1 +
 doc/guides/sample_app_ug/index.rst|   1 +
 doc/guides/sample_app_ug/intro.rst|   4 +
 doc/guides/sample_app_ug/l3_forward_regex.rst | 235 ++
 4 files changed, 241 insertions(+)
 create mode 100644 doc/guides/sample_app_ug/l3_forward_regex.rst

diff --git a/MAINTAINERS b/MAINTAINERS
index a73845a2d..af8a803ea 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -453,6 +453,7 @@ F: doc/guides/prog_guide/regexdev.rst
 F: doc/guides/regexdevs/features/default.ini
 M: Guy Kaneti 
 F: examples/l3fwd-regex/
+F: doc/guides/sample_app_ug/l3_forward_regex.rst
 
 Eventdev API
 M: Jerin Jacob 
diff --git a/doc/guides/sample_app_ug/index.rst 
b/doc/guides/sample_app_ug/index.rst
index affa9c574..dc67580af 100644
--- a/doc/guides/sample_app_ug/index.rst
+++ b/doc/guides/sample_app_ug/index.rst
@@ -32,6 +32,7 @@ Sample Applications User Guides
 l3_forward_graph
 l3_forward_power_man
 l3_forward_access_ctrl
+l3_forward_regex
 link_status_intr
 server_node_efd
 service_cores
diff --git a/doc/guides/sample_app_ug/intro.rst 
b/doc/guides/sample_app_ug/intro.rst
index 8ff223b16..94070933b 100644
--- a/doc/guides/sample_app_ug/intro.rst
+++ b/doc/guides/sample_app_ug/intro.rst
@@ -58,6 +58,10 @@ examples are highlighted below.
   forwarding Graph, or ``l3fwd_graph`` application does forwarding based on 
IPv4
   like a simple router with DPDK Graph framework.
 
+* :doc:`Network Layer 3 forwarding Regex`: The Network Layer3
+  forwarding Regex, or ``l3fwd-regex`` application does forwarding based on 
IPv4
+  like a simple router with DPDK Regex framework.
+
 * :doc:`Hardware packet copying`: The Hardware packet copying,
   or ``ioatfwd`` application demonstrates how to use IOAT rawdev driver for
   copying packets between two threads.
diff --git a/doc/guides/sample_app_ug/l3_forward_regex.rst 
b/doc/guides/sample_app_ug/l3_forward_regex.rst
new file mode 100644
index 0..bb11884a3
--- /dev/null
+++ b/doc/guides/sample_app_ug/l3_forward_regex.rst
@@ -0,0 +1,235 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(C) 2020 Marvell International Ltd.
+
+L3 Forwarding Regex Sample Application
+==
+
+The L3 Forwarding with Regex application is a simple example of packet 
processing using DPDK Regex framework.
+The application performs L3 LPM based forwarding while using Regex framework 
for pre-filtering decision.
+
+Overview
+
+
+The application demonstrates the use of the Regex libraries in DPDK to 
implement packet forwarding.
+The initialization is very similar to those of the :doc:`l3_forward`.
+There is also additional initialization of Regex device and configuration per 
lcore.
+The main difference from the L3 Forwarding sample application is that this 
application introduces
+Regex based pre-filtering decision done before LPM lookup.
+Thus, packet can be dropped or flagged before the forwarding decision.
+
+In the sample application, only IPv4 forwarding is supported as of now.
+
+Compiling the Application
+-
+
+To compile the sample application see :doc:`compiling`.
+
+The application is located in the ``l3fwd-regex`` sub-directory.
+
+Running the Application
+---
+
+The application has a number of command line options similar to l3fwd::
+
+./l3fwd-graph [EAL options] -- -p PORTMASK
+   [-P]
+   --config 
(port,queue,lcore,regex-dev,regex-q)[,(port,queue,lcore,regex-dev,regex-q)]
+   [--regex-rule-db-file FILENAME
+   [--regex-drop]
+   [--eth-dest=X,MM:MM:MM:MM:MM:MM]
+   [--enable-jumbo [--max-pkt-len PKTLEN]]
+   [--no-numa]
+   [--parse-ptype]
+   [--per-port-pool]
+   [--regex-drop]
+   [--regex-debug]
+
+Where,
+
+* ``-p PORTMASK:`` Hexadecimal bitmask of ports to configure
+
+* ``-P:`` Optional, sets all ports to promiscuous mode so that packets are 
accepted regardless of the packet's Ethernet MAC destination address.
+  Without this option, only packets with the Ethernet MAC destination address 
set to the Ethernet address of the port are accepted.
+
+* ``--config 
(port,queue,lcore,regex-dev,regex-q)[,(port,queue,lcore,regex-dev,regex-q)]:`` 
Determines which queues from which ports are mapped
+  to which cores, and which Regex device and queues to use.
+
+* ``--regex-rule-db-file FILENAME:`` prebuilt rule database to configure Regex 
device with.
+
+* ``--eth-dest=X,MM:MM:MM:MM:MM:MM:`` Optional, ethernet destination for port 
X.
+
+* ``--enable-jumb

Re: [dpdk-dev] [RFC] app/testpmd: distinguish ICMP identifier fields in packet

[Thomas Monjalon]

Hi,

lizh  wrote:
> Ability to distinguish ICMP identifier fields in packets.
> Dstinguish ICMP sequence number field too.
> Already supports ICMP code and type fields in current version.
> Existing fields in ICMP header contain the required information.
> ICMP header already is supported and no code change in RTE FLOW.
> Extend testpmd CLI to include the fields of ident and sequence number.
> One example:
> flow create 0 ingress pattern eth / ipv4 /
> 
>  icmp code is 1 ident is 5 seq is 6 /
>  end actions count / queue index 0 / end
> 
> The ICMP packet with code 1, identifier 5 and
> sequence number 6 will be matched.
> It will implement action counter and forward to queue 0.
> 
> Signed-off-by: lizh 

Please configure your git environment so that your full name
is filled. Then redo the Signed-off so that it appears as:
Li Zhang 

As you are new to DPDK, I suggest reading the guidelines for contributing:
https://core.dpdk.org/contribute/#send

Re: [dpdk-dev] [PATCH v4 00/31] remove make support in DPDK

[David Marchand]

On Tue, Sep 8, 2020 at 12:07 AM Thomas Monjalon  wrote:
>
> The first 13 commits of this series are pushed to the main branch,
> making the make-based build an old story.
>

[snip]

>  doc/guides/rawdevs/octeontx2_ep.rst   |8 -
>  doc/guides/rel_notes/deprecation.rst  |7 -
>  doc/guides/sample_app_ug/bbdev_app.rst|   34 +-

[snip]

Patch 11 applied on the main branch dropped the deprecation notice but
we are missing an update in the 20.11 release notes to announce the
removal.
Can this be fixed with the rest of the patches?

Thanks.

-- 
David Marchand

[dpdk-dev] [PATCH] doc: document vfio-pci usage with QAT PMD

[Adam Dybkowski]

This patch marks the old igb-uio driver as unsecure when used
with the QAT PMD and updates all examples to recommend using
vfio-pci instead.
It also mentions security issues with the QAT CPM and provides
information about the new vfio-pci parameter 'disable_denylist'
available in Linux kernels 5.9 and later.

Signed-off-by: Adam Dybkowski 
---
 doc/guides/cryptodevs/qat.rst | 33 ++---
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
index e5d2cf499..bd4743aa7 100644
--- a/doc/guides/cryptodevs/qat.rst
+++ b/doc/guides/cryptodevs/qat.rst
@@ -462,7 +462,7 @@ Check that the VFs are available for use. For example 
``lspci -d:37c9`` should
 list 48 VF devices available for a ``C62x`` device.
 
 To complete the installation follow the instructions in
-`Binding the available VFs to the DPDK UIO driver`_.
+`Binding the available VFs to the vfio-pci driver`_.
 
 .. Note::
 
@@ -534,7 +534,7 @@ Confirm the presence of 48 VF devices - 16 per PF::
 lspci -d:37c9
 
 
-To complete the installation - follow instructions in `Binding the available 
VFs to the DPDK UIO driver`_.
+To complete the installation - follow instructions in `Binding the available 
VFs to the vfio-pci driver`_.
 
 .. Note::
 
@@ -584,10 +584,21 @@ To complete the installation - follow instructions in 
`Binding the available VFs
   sudo yum install kernel-devel-`uname -r`
 
 
-Binding the available VFs to the DPDK UIO driver
+Binding the available VFs to the vfio-pci driver
 
 
-Unbind the VFs from the stock driver so they can be bound to the uio driver.
+Notice:
+
+* Please note that due to security issues, the usage of older DPDK igb-uio
+  driver is not recommended. This document shows how to use the more secure
+  vfio-pci driver.
+* If QAT fails to bind to vfio-pci on Linux kernel 5.9+, please see the
+  QATE-39220 and QATE-7495 issues in
+  `01.org doc 
`_
+  which details the constraint about trusted guests and add 
`disable_denylist=1`
+  to the vfio-pci params to use QAT. See also `this patch description 
`_.
+
+Unbind the VFs from the stock driver so they can be bound to the vfio-pci 
driver.
 
 For an Intel(R) QuickAssist Technology DH895xCC device
 ^^
@@ -635,25 +646,25 @@ VFs are different adjust the unbind command below::
 done; \
 done
 
-Bind to the DPDK uio driver
+Bind to the vfio-pci driver
 ^^^
 
-Install the DPDK igb_uio driver, bind the VF PCI Device id to it and use lspci
-to confirm the VF devices are now in use by igb_uio kernel driver,
+Load the vfio-pci driver, bind the VF PCI Device id to it and use lspci
+to confirm the VF devices are now in use by vfio-pci kernel driver,
 e.g. for the C62x device::
 
 cd to the top-level DPDK directory
 modprobe uio
-insmod ./build/kmod/igb_uio.ko
-echo "8086 37c9" > /sys/bus/pci/drivers/igb_uio/new_id
+modprobe vfio-pci
+echo "8086 37c9" > /sys/bus/pci/drivers/vfio-pci/new_id
 lspci -vvd:37c9
 
 
-Another way to bind the VFs to the DPDK UIO driver is by using the
+Another way to bind the VFs to the vfio-pci driver is by using the
 ``dpdk-devbind.py`` script::
 
 cd to the top-level DPDK directory
-./usertools/dpdk-devbind.py -b igb_uio :03:01.1
+./usertools/dpdk-devbind.py -b vfio-pci :03:01.1
 
 Testing
 ~~~
-- 
2.25.1

Re: [dpdk-dev] [PATCH v5 1/7] ethdev: introduce sample action for rte flow

[Ori Kam]

Hi Ajit,

Sorry for not inline, but for some reason this tread is in html format.
I think that the issue you are rising is a good one, but can be solved using 
the new
context API that we are going to push into 20.11
https://patches.dpdk.org/cover/73555/

this will enable creating the sample action once and reuse it later.

Best,
Ori

From: Ajit Khaparde 
Sent: Friday, September 4, 2020 7:17 AM




On Thu, Aug 27, 2020 at 8:23 AM Jiawei Wang 
mailto:jiaw...@nvidia.com>> wrote:
When using full offload, all traffic will be handled by the HW, and
directed to the requested VF or wire, the control application loses
visibility on the traffic.
So there's a need for an action that will enable the control application
some visibility.

The solution is introduced a new action that will sample the incoming
traffic and send a duplicated traffic with the specified ratio to the
application, while the original packet will continue to the target
destination.

The packets sampled equals is '1/ratio', if the ratio value be set to 1,
means that the packets would be completely mirrored. The sample packet
can be assigned with different set of actions from the original packet.

In order to support the sample packet in rte_flow, new rte_flow action
definition RTE_FLOW_ACTION_TYPE_SAMPLE and structure rte_flow_action_sample
will be introduced.

In use cases where sampling/mirroring is enabled for monitoring security/policy 
breaches
and network connectivity/performance, mirroring copies traffic from mirrored 
sources
and sends it to a collector destination where monitoring applications run.

At any given time, the number of flows to be mirrored could be high, however,
the number of collector destinations is limited because DC operators would 
monitor
the copied traffic using a handful number of monitoring applications.

Therefore it would increase the scalability if we can configure the 
sampling/mirroring in 2 steps
(something similar to meter configuration). In other words, sampling action is 
configured via
one API and the sampling is enabled on a flow via rte_flow_create API.

We could send the proposal in the next couple of days for review.

Thanks
Ajit



Signed-off-by: Jiawei Wang mailto:jiaw...@nvidia.com>>
Acked-by: Ori Kam mailto:or...@nvidia.com>>
Acked-by: Jerin Jacob mailto:jer...@marvell.com>>
Acked-by: Andrew Rybchenko 
mailto:arybche...@solarflare.com>>
---
 doc/guides/prog_guide/rte_flow.rst | 25 +
 doc/guides/rel_notes/release_20_11.rst |  6 ++
 lib/librte_ethdev/rte_flow.c   |  1 +
 lib/librte_ethdev/rte_flow.h   | 30 ++
 4 files changed, 62 insertions(+)

diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index 3e5cd1e..f8f3f51 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -2653,6 +2653,31 @@ timeout passed without any matching on the flow.
| ``context``  | user input flow context |
+--+-+

+Action: ``SAMPLE``
+^^
+
+Adds a sample action to a matched flow.
+
+The matching packets will be duplicated with the specified ``ratio`` and
+applied with own set of actions with a fate action, the packets sampled
+equals is '1/ratio'. All the packets continue to the target destination.
+
+When the ``ratio`` is set to 1 then the packets will be 100% mirrored.
+``actions`` represent the different set of actions for the sampled or mirrored
+packets, and must have a fate action.
+
+.. _table_rte_flow_action_sample:
+
+.. table:: SAMPLE
+
+   +--+-+
+   | Field| Value   |
+   +==+=+
+   | ``ratio``| 32 bits sample ratio value  |
+   +--+-+
+   | ``actions``  | sub-action list for sampling|
+   +--+-+
+
 Negative types
 ~~

diff --git a/doc/guides/rel_notes/release_20_11.rst 
b/doc/guides/rel_notes/release_20_11.rst
index df227a1..7f99563 100644
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -55,6 +55,12 @@ New Features
  Also, make sure to start the actual text at the margin.
  ===

+* **Added flow-based traffic sampling support.**
+
+  Added new action: ``RTE_FLOW_ACTION_TYPE_SAMPLE`` to duplicate the matching
+  packets with specified ratio, and apply with own set of actions with a fate
+  action. When the ratio is set to 1 then the packets will be 100% mirrored.
+

 Removed Items
 -
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index f8fdd68..035671d 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -174,6 +174,7 @@ struct rte_flow_desc_data {
MK_FLOW_ACTION(SET_IPV4_DSCP, sizeof(struct r

Re: [dpdk-dev] [RFC] ethdev: make rte flow API thread safe

[Stephen Hemminger]

On Mon, 7 Sep 2020 02:36:48 +
Suanming Mou  wrote:

> Hi,
> 
> Sorry for my late reply due to the vacation.
> 
> > What is the performance impact of this for currently working applications 
> > that
> > use a single thread to program flow rules.  You are adding a couple of 
> > system
> > calls to what was formerly a totally usermode operation.  
> 

Read the source for glibc and see what pthread_mutex does

> If I understand correctly, in the non-contended single thread case, pthread 
> mutex lock should not go to the kernel space.
> I also wrote a small application with pthread mutex, and strace shows no 
> system call was introduced.
> 
> Another simple testing code below is to check the cycles cost difference in 
> every round between pthread mutex and spin_lock.
> 

Micro benchmarks of locking is hard to see.

Re: [dpdk-dev] [PATCH v3] net: adjust the header length parse size

[Stephen Hemminger]

On Mon,  7 Sep 2020 09:56:50 +0800
Haiyue Wang  wrote:

> Enlarge the L3 and tunnel header length from 8-bit to 16-bit to handle
> the bigger headers. And reorder the fields to avoid creating a structure
> hole.
> 
> Signed-off-by: Haiyue Wang 
> ---
> v2: use bit field to avoid creating a structure hole.
> v3: use basic type and reorder to avoid structure hole.
> ---
>  lib/librte_net/rte_net.h | 8 
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/librte_net/rte_net.h b/lib/librte_net/rte_net.h
> index 94b06d9ee..434435ffa 100644
> --- a/lib/librte_net/rte_net.h
> +++ b/lib/librte_net/rte_net.h
> @@ -20,11 +20,11 @@ extern "C" {
>   */
>  struct rte_net_hdr_lens {
>   uint8_t l2_len;
> - uint8_t l3_len;
> - uint8_t l4_len;
> - uint8_t tunnel_len;
>   uint8_t inner_l2_len;
> - uint8_t inner_l3_len;
> + uint16_t l3_len;
> + uint16_t inner_l3_len;
> + uint16_t tunnel_len;
> + uint8_t l4_len;
>   uint8_t inner_l4_len;
>  };
>  

Acked-by: Stephhen Hemminger 

Re: [dpdk-dev] [PATCH v5] usertools: add huge page setup script

[Stephen Hemminger]

On Tue, 8 Sep 2020 09:18:08 +0100
Bruce Richardson  wrote:

> On Mon, Sep 07, 2020 at 10:20:13AM -0700, Stephen Hemminger wrote:
> > On Mon, 7 Sep 2020 09:58:27 +0100
> > Bruce Richardson  wrote:
> >   
> > > On Mon, Sep 07, 2020 at 09:54:29AM +0100, Ferruh Yigit wrote:  
> > > > On 9/6/2020 4:42 AM, Stephen Hemminger wrote:
> > > > > This is an improved version of the setup of huge pages
> > > > > bases on earlier DPDK setup. Differences are:
> > > > >* it autodetects NUMA vs non NUMA
> > > > >* it allows setting different page sizes
> > > > >  recent kernels support multiple sizes.
> > > > >* it accepts a parameter in bytes (not pages).
> > > > > 
> > > > > If necessary the steps of clearing old settings and mounting/umounting
> > > > > can be done individually.
> > > > > 
> > > > > Signed-off-by: Stephen Hemminger 
> > > > 
> > > > <...>
> > > > 
> > > > > @@ -1,4 +1,9 @@
> > > > >  # SPDX-License-Identifier: BSD-3-Clause
> > > > >  # Copyright(c) 2017 Intel Corporation
> > > > >  
> > > > > -install_data(['dpdk-devbind.py', 'dpdk-pmdinfo.py', 
> > > > > 'dpdk-telemetry.py'], install_dir: 'bin')
> > > > > +install_data([
> > > > > + 'dpdk-devbind.py',
> > > > > + 'dpdk-pmdinfo.py',
> > > > > + 'dpdk-telemetry.py',
> > > > > + 'hugepage_setup.py'
> > > > > +],install_dir: 'bin')
> > > > > 
> > > > 
> > > > Should script name has 'dpdk-' prefix as others do?
> > > 
> > > +1 to that.  
> > 
> > Ok but - in the name violates Python lint naming for modules.
> > The standard is underscore.  
> 
> We don't really need 100% lint cleanliness for all our scripts, 95% is
> surely enough. However, if you feel strongly, then I suggest we prefix all
> our python scripts with "dpdk_", rather than "dpdk-"

Agree.
Just wanted to raise the observation. Maybe add a .pylintrc to usertools to 
suppress this warning.

Re: [dpdk-dev] [RFC] ethdev: make rte flow API thread safe

[Thomas Monjalon]

08/09/2020 16:52, Stephen Hemminger:
> On Mon, 7 Sep 2020 02:36:48 +
> Suanming Mou  wrote:
> > > What is the performance impact of this for currently working applications 
> > > that
> > > use a single thread to program flow rules.  You are adding a couple of 
> > > system
> > > calls to what was formerly a totally usermode operation.  
> 
> Read the source for glibc and see what pthread_mutex does

What would be the best lock for rte_flow?
We have spin lock, ticket lock, MCS lock (and rwlock) in DPDK.


> > If I understand correctly, in the non-contended single thread case, pthread 
> > mutex lock should not go to the kernel space.
> > I also wrote a small application with pthread mutex, and strace shows no 
> > system call was introduced.
> > 
> > Another simple testing code below is to check the cycles cost difference in 
> > every round between pthread mutex and spin_lock.
> 
> Micro benchmarks of locking is hard to see.

[dpdk-dev] [PATCH v6] usertools: add a huge page setup script

[Stephen Hemminger]

This is an improved version of the setup of huge pages
bases on earlier DPDK setup.

Features:
   * can display current hugepage settings.
   * autodetects NUMA vs non NUMA
   * allows setting different page sizes
 recent kernels support multiple sizes.
   * accepts a parameter in bytes (not pages).

Most users will just use --setup argument but if necessary
the steps of clearing old settings and mounting/umounting
can be done individually.

Signed-off-by: Stephen Hemminger 
---
v6 -- rename to dpdk-hugepages

 doc/guides/tools/hugepages.rst |  79 ++
 doc/guides/tools/index.rst |   1 +
 usertools/dpdk-hugepages.py| 270 +
 usertools/meson.build  |   7 +-
 4 files changed, 356 insertions(+), 1 deletion(-)
 create mode 100644 doc/guides/tools/hugepages.rst
 create mode 100755 usertools/dpdk-hugepages.py

diff --git a/doc/guides/tools/hugepages.rst b/doc/guides/tools/hugepages.rst
new file mode 100644
index ..a82b71620011
--- /dev/null
+++ b/doc/guides/tools/hugepages.rst
@@ -0,0 +1,79 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright (c) 2020 Microsoft Corporation
+
+dpdk-hugpages Application
+==
+
+The ``dpdk-hugpages`` tool is a Data Plane Development Kit (DPDK) utility
+that helps in reserving hugepages.
+As well as checking for current settings.
+
+
+Running the Application
+---
+
+The tool has a number of command line options:
+
+.. code-block:: console
+
+
+   dpdk-hugpages [options]
+   
+
+OPTIONS
+---
+
+* ``-h, --help``
+
+Display usage information and quit
+
+* ``-s, --show``
+
+Print the current huge page configuration
+
+* ``-c driver, --clear``
+
+Clear existing huge page reservation
+
+* ``-m, --mount``
+
+Mount the huge page filesystem
+
+* ``-u, --unmount``
+
+Unmount the huge page filesystem
+
+* ``-n NODE, --node=NODE``
+
+   Set NUMA node to reserve pages on
+
+* ``-p SIZE, --pagesize=SIZE``
+
+   Select hugepage size to use.
+   If not specified the default system huge page size is used.
+
+* ``-r SIZE, --reserve=SIZE``
+
+   Reserve huge pages.
+   Size is in bytes with K, M or G suffix.
+
+* ``--setup SIZE``
+
+   Short cut to clear, unmount, reserve and mount.
+
+.. warning::
+
+While any user can run the ``dpdk-hugpages.py`` script to view the
+status of huge pages, modifying the setup requires root privileges.
+
+
+Examples
+
+
+To display current huge page settings::
+
+   dpdk-hugpages.py -s
+
+To a complete setup of with 2 Gigabyte of 1G huge pages::
+
+   dpdk-hugpages.py -p 1G --setup 2G
diff --git a/doc/guides/tools/index.rst b/doc/guides/tools/index.rst
index c721943606f9..93dde4148e90 100644
--- a/doc/guides/tools/index.rst
+++ b/doc/guides/tools/index.rst
@@ -11,6 +11,7 @@ DPDK Tools User Guides
 proc_info
 pdump
 pmdinfo
+hugepages
 devbind
 flow-perf
 testbbdev
diff --git a/usertools/dpdk-hugepages.py b/usertools/dpdk-hugepages.py
new file mode 100755
index ..b3ce2635d27b
--- /dev/null
+++ b/usertools/dpdk-hugepages.py
@@ -0,0 +1,270 @@
+#! /usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2020 Microsoft Corporation
+"""Script to query and setup huge pages for DPDK applications."""
+
+import argparse
+import glob
+import os
+import re
+import sys
+from math import log2
+
+# Standard binary prefix
+BINARY_PREFIX = "KMG"
+
+# systemd mount point for huge pages
+HUGE_MOUNT = "/dev/hugepages"
+
+
+def fmt_memsize(sz_k):
+'''Format memory size in kB into conventional format'''
+if sz_k.isdigit():
+return int(sz_k) / 1024
+logk = int(log2(sz_k) / 10)
+return '{}{}b'.format(int(sz_k / (2**(logk * 10))), BINARY_PREFIX[logk])
+
+
+def get_memsize(arg):
+'''Convert memory size with suffix to kB'''
+match = re.match(r'(\d+)([' + BINARY_PREFIX + r']?)$', arg.upper())
+if match is None:
+sys.exit('{} is not a valid page size'.format(arg))
+num = float(match.group(1))
+suffix = match.group(2)
+if suffix == "":
+return int(num / 1024)
+idx = BINARY_PREFIX.find(suffix)
+return int(num * (2**(idx * 10)))
+
+
+def is_numa():
+'''Test if NUMA is necessary on this system'''
+return os.path.exists('/sys/devices/system/node')
+
+
+def get_hugepages(path):
+'''Read number of reserved pages'''
+with open(path + '/nr_hugepages') as nr_hugpages:
+return int(nr_hugpages.read())
+return 0
+
+
+def set_hugepages(path, pages):
+'''Write the number of reserved huge pages'''
+filename = path + '/nr_hugepages'
+try:
+with open(filename, 'w') as nr_hugpages:
+nr_hugpages.write('{}\n'.format(pages))
+except PermissionError:
+sys.exit('Permission denied: need to be root!')
+except FileNotFoundError:
+filename = os.path.basename(path)
+size = filename[10:]
+

Re: [dpdk-dev] [PATCH] lib/bpf: remove experimental tag

[David Marchand]

On Tue, Sep 1, 2020 at 4:50 PM Conor Walsh  wrote:
>
> The BPF lib was introduced in 18.05.
> There were no changes in it's public API since 19.11.
> It should be mature enough to remove it's 'experimental' tag.

Should RTE_BPF_XTYPE_NUM be dropped?


-- 
David Marchand

Re: [dpdk-dev] [PATCH] net/netvsc: replace compiler builtin overflow check

[Stephen Hemminger]

On Tue,  8 Sep 2020 11:06:42 +0100
Ferruh Yigit  wrote:

> '__builtin_add_overflow' added to gcc in version 5, earlier versions
> causing build error, like gcc 4.8.5 in RHEL7.

Sigh. Ok, but the security folks really like __builtin_add_overflow.

Re: [dpdk-dev] [PATCH] lib/bpf: remove experimental tag

[Ananyev, Konstantin]

> 
> On Tue, Sep 1, 2020 at 4:50 PM Conor Walsh  wrote:
> >
> > The BPF lib was introduced in 18.05.
> > There were no changes in it's public API since 19.11.
> > It should be mature enough to remove it's 'experimental' tag.
> 
> Should RTE_BPF_XTYPE_NUM be dropped?

Good catch, thanks.
Yes I agree, we probably better do it now to avoid ABI problems in future.

Re: [dpdk-dev] [PATCH] doc: document vfio-pci usage with QAT PMD

[Trahe, Fiona]

Hi Adam,

> -Original Message-
> From: Dybkowski, AdamX 
> Sent: Tuesday, September 8, 2020 3:21 PM
> To: dev@dpdk.org; Trahe, Fiona ; akhil.go...@nxp.com; 
> Mcnamara, John
> 
> Cc: Dybkowski, AdamX 
> Subject: [PATCH] doc: document vfio-pci usage with QAT PMD
> 
> This patch marks the old igb-uio driver as unsecure when used
> with the QAT PMD and updates all examples to recommend using
> vfio-pci instead.
> It also mentions security issues with the QAT CPM and provides
> information about the new vfio-pci parameter 'disable_denylist'
> available in Linux kernels 5.9 and later.
> 
> Signed-off-by: Adam Dybkowski 
> ---


//snip///
> +Load the vfio-pci driver, bind the VF PCI Device id to it and use lspci
> +to confirm the VF devices are now in use by vfio-pci kernel driver,
>  e.g. for the C62x device::
> 
>  cd to the top-level DPDK directory
>  modprobe uio
> -insmod ./build/kmod/igb_uio.ko
> -echo "8086 37c9" > /sys/bus/pci/drivers/igb_uio/new_id
> +modprobe vfio-pci
[Fiona] it would be useful to also add a note here - something like
"Use modprobe vfio-pci disable_denylist=1" from kernel 5.9 onwards. See note in 
Section xxx above"

Apart from this 
Acked-by: Fiona Trahe 

Re: [dpdk-dev] [RFC] ethdev: make rte flow API thread safe

[Stephen Hemminger]

On Tue, 08 Sep 2020 17:03:53 +0200
Thomas Monjalon  wrote:

> 08/09/2020 16:52, Stephen Hemminger:
> > On Mon, 7 Sep 2020 02:36:48 +
> > Suanming Mou  wrote:  
> > > > What is the performance impact of this for currently working 
> > > > applications that
> > > > use a single thread to program flow rules.  You are adding a couple of 
> > > > system
> > > > calls to what was formerly a totally usermode operation.
> > 
> > Read the source for glibc and see what pthread_mutex does  
> 
> What would be the best lock for rte_flow?
> We have spin lock, ticket lock, MCS lock (and rwlock) in DPDK.

The tradeoff is between speed, correctness, and simplicity.
The flow case is performance sensitive (for connection per second tests);
but not super critical (ie every packet).
Fastest would be RCU but probably not necessary here.

There would rarely be contention on this (thread safety is new), and there
is no case where reader makes sense. For hardware, programming flow rules
would basic interaction with TCAM (ie fast). For software drivers, typically
making flow rule requires system call to set classifier etc. Holding spin
lock across system calls leads to preemption and other issues.

Would it be possible to push the choice of mutual exclusion down to
the device driver? For fast HW devices they could use spinlock and for
slow SW devices it would be pthread.

[dpdk-dev] [PATCH v2 0/1] doc: document vfio-pci usage with QAT PMD

[Adam Dybkowski]

This patch marks the old igb-uio driver as unsecure when used
with the QAT PMD and updates all examples to recommend using
vfio-pci instead.
It also mentions security issues with the QAT CPM and provides
information about the new vfio-pci parameter 'disable_denylist'
available in Linux kernels 5.9 and later.

v2:
* add example command with disable_denylist option

Adam Dybkowski (1):
  doc: document vfio-pci usage with QAT PMD

 doc/guides/cryptodevs/qat.rst | 36 ---
 1 file changed, 25 insertions(+), 11 deletions(-)

-- 
2.25.1

[dpdk-dev] [PATCH v2 1/1] doc: document vfio-pci usage with QAT PMD

[Adam Dybkowski]

This patch marks the old igb-uio driver as unsecure when used
with the QAT PMD and updates all examples to recommend using
vfio-pci instead.
It also mentions security issues with the QAT CPM and provides
information about the new vfio-pci parameter 'disable_denylist'
available in Linux kernels 5.9 and later.

Signed-off-by: Adam Dybkowski 
Acked-by: Fiona Trahe 
---
 doc/guides/cryptodevs/qat.rst | 36 ---
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
index e5d2cf499..8dd7eb083 100644
--- a/doc/guides/cryptodevs/qat.rst
+++ b/doc/guides/cryptodevs/qat.rst
@@ -462,7 +462,7 @@ Check that the VFs are available for use. For example 
``lspci -d:37c9`` should
 list 48 VF devices available for a ``C62x`` device.
 
 To complete the installation follow the instructions in
-`Binding the available VFs to the DPDK UIO driver`_.
+`Binding the available VFs to the vfio-pci driver`_.
 
 .. Note::
 
@@ -534,7 +534,7 @@ Confirm the presence of 48 VF devices - 16 per PF::
 lspci -d:37c9
 
 
-To complete the installation - follow instructions in `Binding the available 
VFs to the DPDK UIO driver`_.
+To complete the installation - follow instructions in `Binding the available 
VFs to the vfio-pci driver`_.
 
 .. Note::
 
@@ -584,10 +584,21 @@ To complete the installation - follow instructions in 
`Binding the available VFs
   sudo yum install kernel-devel-`uname -r`
 
 
-Binding the available VFs to the DPDK UIO driver
+Binding the available VFs to the vfio-pci driver
 
 
-Unbind the VFs from the stock driver so they can be bound to the uio driver.
+Notice:
+
+* Please note that due to security issues, the usage of older DPDK igb-uio
+  driver is not recommended. This document shows how to use the more secure
+  vfio-pci driver.
+* If QAT fails to bind to vfio-pci on Linux kernel 5.9+, please see the
+  QATE-39220 and QATE-7495 issues in
+  `01.org doc 
`_
+  which details the constraint about trusted guests and add 
`disable_denylist=1`
+  to the vfio-pci params to use QAT. See also `this patch description 
`_.
+
+Unbind the VFs from the stock driver so they can be bound to the vfio-pci 
driver.
 
 For an Intel(R) QuickAssist Technology DH895xCC device
 ^^
@@ -635,25 +646,28 @@ VFs are different adjust the unbind command below::
 done; \
 done
 
-Bind to the DPDK uio driver
+Bind to the vfio-pci driver
 ^^^
 
-Install the DPDK igb_uio driver, bind the VF PCI Device id to it and use lspci
-to confirm the VF devices are now in use by igb_uio kernel driver,
+Load the vfio-pci driver, bind the VF PCI Device id to it and use lspci
+to confirm the VF devices are now in use by vfio-pci kernel driver,
 e.g. for the C62x device::
 
 cd to the top-level DPDK directory
 modprobe uio
-insmod ./build/kmod/igb_uio.ko
-echo "8086 37c9" > /sys/bus/pci/drivers/igb_uio/new_id
+modprobe vfio-pci
+echo "8086 37c9" > /sys/bus/pci/drivers/vfio-pci/new_id
 lspci -vvd:37c9
 
+Use ``modprobe vfio-pci disable_denylist=1`` from kernel 5.9 onwards.
+See note in the section `Binding the available VFs to the vfio-pci driver`_
+above.
 
-Another way to bind the VFs to the DPDK UIO driver is by using the
+Another way to bind the VFs to the vfio-pci driver is by using the
 ``dpdk-devbind.py`` script::
 
 cd to the top-level DPDK directory
-./usertools/dpdk-devbind.py -b igb_uio :03:01.1
+./usertools/dpdk-devbind.py -b vfio-pci :03:01.1
 
 Testing
 ~~~
-- 
2.25.1

[dpdk-dev] [PATCH v7 2/2] net/ark: remove RTE_LIBRTE_ARK_PAD_TX configuration macro

[Ed Czeck]

Replace behavior with RTE_LIBRTE_ARK_MIN_TX_PKTLEN
with a default value of 0.
Update documentation as needed.

Signed-off-by: Ed Czeck 
---
v7:
  -- add ARK_MIN_TX_PKTLEN to conditional expression
to avoid compile warning with icc.
  -- restore CONFIG_RTE_LIBRTE_ARK_PMD doc as requested.
---
 doc/guides/nics/ark.rst | 13 --
 drivers/net/ark/ark_ethdev_tx.c | 43 ++---
 drivers/net/ark/ark_logs.h  |  8 --
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst
index c3ffcbbc2..358e7f624 100644
--- a/doc/guides/nics/ark.rst
+++ b/doc/guides/nics/ark.rst
@@ -129,8 +129,10 @@ Configuration Information
* **CONFIG_RTE_LIBRTE_ARK_PMD** (default y): Enables or disables inclusion
  of the ARK PMD driver in the DPDK compilation.
 
-   * **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y):  When enabled TX
- packets are padded to 60 bytes to support downstream MACS.
+   * **RTE_LIBRTE_ARK_MIN_TX_PKTLEN** (default 0): Sets the minimum
+ packet length for tx packets to the FPGA.  Packets less than this
+ length are padded to meet the requirement. This allows padding to
+ be offloaded or remain in host software.
 
 
 Building DPDK
@@ -144,6 +146,13 @@ By default the ARK PMD library will be built into the DPDK 
library.
 For configuring and using UIO and VFIO frameworks, please also refer :ref:`the
 documentation that comes with DPDK suite `.
 
+To build with a non-zero minimum tx packet length, set the above macro in your
+CFLAGS environment prior to the meson build step. I.e.,
+
+export CFLAGS="-DRTE_LIBRTE_ARK_MIN_TX_PKTLEN=60"
+meson build
+
+
 Supported ARK RTL PCIe Instances
 
 
diff --git a/drivers/net/ark/ark_ethdev_tx.c b/drivers/net/ark/ark_ethdev_tx.c
index 72624deb3..a0e35af88 100644
--- a/drivers/net/ark/ark_ethdev_tx.c
+++ b/drivers/net/ark/ark_ethdev_tx.c
@@ -14,6 +14,11 @@
 #define ARK_TX_META_OFFSET (RTE_PKTMBUF_HEADROOM - ARK_TX_META_SIZE)
 #define ARK_TX_MAX_NOCHAIN (RTE_MBUF_DEFAULT_DATAROOM)
 
+#ifndef RTE_LIBRTE_ARK_MIN_TX_PKTLEN
+#define ARK_MIN_TX_PKTLEN 0
+#else
+#define ARK_MIN_TX_PKTLEN RTE_LIBRTE_ARK_MIN_TX_PKTLEN
+#endif
 
 /* * */
 struct ark_tx_queue {
@@ -91,6 +96,7 @@ eth_ark_xmit_pkts(void *vtxq, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
uint32_t prod_index_limit;
int stat;
uint16_t nb;
+   const uint32_t min_pkt_len = ARK_MIN_TX_PKTLEN;
 
queue = (struct ark_tx_queue *)vtxq;
 
@@ -104,27 +110,26 @@ eth_ark_xmit_pkts(void *vtxq, struct rte_mbuf **tx_pkts, 
uint16_t nb_pkts)
 ++nb) {
mbuf = tx_pkts[nb];
 
-   if (ARK_TX_PAD_TO_60) {
-   if (unlikely(rte_pktmbuf_pkt_len(mbuf) < 60)) {
-   /* this packet even if it is small can be split,
-* be sure to add to the end mbuf
+   if (min_pkt_len &&
+   unlikely(rte_pktmbuf_pkt_len(mbuf) < min_pkt_len)) {
+   /* this packet even if it is small can be split,
+* be sure to add to the end mbuf
+*/
+   uint16_t to_add = min_pkt_len -
+   rte_pktmbuf_pkt_len(mbuf);
+   char *appended =
+   rte_pktmbuf_append(mbuf, to_add);
+
+   if (appended == 0) {
+   /* This packet is in error,
+* we cannot send it so just
+* count it and delete it.
 */
-   uint16_t to_add =
-   60 - rte_pktmbuf_pkt_len(mbuf);
-   char *appended =
-   rte_pktmbuf_append(mbuf, to_add);
-
-   if (appended == 0) {
-   /* This packet is in error,
-* we cannot send it so just
-* count it and delete it.
-*/
-   queue->tx_errors += 1;
-   rte_pktmbuf_free(mbuf);
-   continue;
-   }
-   memset(appended, 0, to_add);
+   queue->tx_errors += 1;
+   rte_pktmbuf_free(mbuf);
+   continue;
}
+   memset(appended, 0, to_add);
}
 
if (unlikely(mbuf->nb_segs != 1)) {
diff --git a/drivers/net/ark/ark_logs.h b/drivers/net/ark/ark_logs.h
index c3d7e7d39.

[dpdk-dev] [PATCH v7 1/2] net/ark: remove compile time log macros in favor of run time log control

[Ed Czeck]

Use ARK_PMD_LOG in place of PMD_DRV_LOG, PMD_DEBUG_LOG, PMD_FUNC_LOG,
PMD_STATS_LOG, PMD_RX_LOG, and PMD_TX_LOG.
Review and adjust log levels and messages as needed.

Signed-off-by: Ed Czeck 
---
 doc/guides/nics/ark.rst | 13 --
 drivers/net/ark/ark_ddm.c   | 12 ++---
 drivers/net/ark/ark_ethdev.c| 77 +++--
 drivers/net/ark/ark_ethdev_rx.c | 46 ++--
 drivers/net/ark/ark_ethdev_tx.c | 10 ++---
 drivers/net/ark/ark_logs.h  | 63 +++
 drivers/net/ark/ark_mpu.c   | 32 --
 drivers/net/ark/ark_pktchkr.c   | 36 +++
 drivers/net/ark/ark_pktdir.c|  2 +-
 drivers/net/ark/ark_pktgen.c| 22 +-
 drivers/net/ark/ark_rqp.c   |  4 +-
 drivers/net/ark/ark_udm.c   | 18 
 12 files changed, 125 insertions(+), 210 deletions(-)

diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst
index 06e8c3374..c3ffcbbc2 100644
--- a/doc/guides/nics/ark.rst
+++ b/doc/guides/nics/ark.rst
@@ -132,19 +132,6 @@ Configuration Information
* **CONFIG_RTE_LIBRTE_ARK_PAD_TX** (default y):  When enabled TX
  packets are padded to 60 bytes to support downstream MACS.
 
-   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_RX** (default n): Enables or disables debug
- logging and internal checking of RX ingress logic within the ARK PMD 
driver.
-
-   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TX** (default n): Enables or disables debug
- logging and internal checking of TX egress logic within the ARK PMD 
driver.
-
-   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_STATS** (default n): Enables or disables 
debug
- logging of detailed packet and performance statistics gathered in
- the PMD and FPGA.
-
-   * **CONFIG_RTE_LIBRTE_ARK_DEBUG_TRACE** (default n): Enables or disables 
debug
- logging of detailed PMD events and status.
-
 
 Building DPDK
 -
diff --git a/drivers/net/ark/ark_ddm.c b/drivers/net/ark/ark_ddm.c
index 57026f8d1..91d1179d8 100644
--- a/drivers/net/ark/ark_ddm.c
+++ b/drivers/net/ark/ark_ddm.c
@@ -13,19 +13,19 @@ ark_ddm_verify(struct ark_ddm_t *ddm)
 {
uint32_t hw_const;
if (sizeof(struct ark_ddm_t) != ARK_DDM_EXPECTED_SIZE) {
-   PMD_DRV_LOG(ERR, "ARK: DDM structure looks incorrect %d vs 
%zd\n",
+   ARK_PMD_LOG(ERR, "DDM structure looks incorrect %d vs %zd\n",
ARK_DDM_EXPECTED_SIZE, sizeof(struct ark_ddm_t));
return -1;
}
 
hw_const = ddm->cfg.const0;
if (hw_const == ARK_DDM_CONST1) {
-   PMD_DRV_LOG(ERR,
+   ARK_PMD_LOG(ERR,
"ARK: DDM module is version 1, "
"PMD expects version 2\n");
return -1;
} else if (hw_const != ARK_DDM_CONST2) {
-   PMD_DRV_LOG(ERR,
+   ARK_PMD_LOG(ERR,
"ARK: DDM module not found as expected 0x%08x\n",
ddm->cfg.const0);
return -1;
@@ -63,7 +63,7 @@ ark_ddm_reset(struct ark_ddm_t *ddm)
status = ark_ddm_stop(ddm, 1);
 
if (status != 0) {
-   PMD_DEBUG_LOG(INFO, "%s  stop failed  doing forced reset\n",
+   ARK_PMD_LOG(NOTICE, "%s  stop failed  doing forced reset\n",
  __func__);
ddm->cfg.command = 4;
usleep(10);
@@ -87,7 +87,7 @@ ark_ddm_stats_reset(struct ark_ddm_t *ddm)
 void
 ark_ddm_dump(struct ark_ddm_t *ddm, const char *msg)
 {
-   PMD_FUNC_LOG(DEBUG, "%s Stopped: %d\n", msg,
+   ARK_PMD_LOG(DEBUG, "%s Stopped: %d\n", msg,
 ark_ddm_is_stopped(ddm)
 );
 }
@@ -97,7 +97,7 @@ ark_ddm_dump_stats(struct ark_ddm_t *ddm, const char *msg)
 {
struct ark_ddm_stats_t *stats = &ddm->stats;
 
-   PMD_STATS_LOG(INFO, "DDM Stats: %s"
+   ARK_PMD_LOG(INFO, "DDM Stats: %s"
  ARK_SU64 ARK_SU64 ARK_SU64
  "\n", msg,
  "Bytes:", stats->tx_byte_count,
diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index b32ccd867..646427d0c 100644
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -164,26 +164,26 @@ check_for_ext(struct ark_adapter *ark)
const char *dllpath = getenv("ARK_EXT_PATH");
 
if (dllpath == NULL) {
-   PMD_DEBUG_LOG(DEBUG, "ARK EXT NO dll path specified\n");
+   ARK_PMD_LOG(DEBUG, "EXT NO dll path specified\n");
return 0;
}
-   PMD_DRV_LOG(INFO, "ARK EXT found dll path at %s\n", dllpath);
+   ARK_PMD_LOG(NOTICE, "EXT found dll path at %s\n", dllpath);
 
/* Open and load the .so */
ark->d_handle = dlopen(dllpath, RTLD_LOCAL | RTLD_LAZY);
if (ark->d_handle == NULL) {
-   PMD_DRV_LOG(ERR, "Could not load user extension %s\n",
+   ARK_PMD_LOG(ERR, "Could not load user extension %s\n"

Re: [dpdk-dev] [PATCH v2 0/1] doc: document vfio-pci usage with QAT PMD

[Mcnamara, John]

> -Original Message-
> From: Dybkowski, AdamX 
> Sent: Tuesday, September 8, 2020 5:20 PM
> To: dev@dpdk.org; Trahe, Fiona ;
> akhil.go...@nxp.com; Mcnamara, John 
> Cc: Dybkowski, AdamX 
> Subject: [PATCH v2 0/1] doc: document vfio-pci usage with QAT PMD
> 
>...
> 
>  doc/guides/cryptodevs/qat.rst | 36 ---
>  1 file changed, 25 insertions(+), 11 deletions(-)


Acked-by: John McNamara 

[dpdk-dev] [PATCH] timer: remove experimental tag for some APIs

[Erik Gabriel Carrillo]

Some new APIs were added to the timer library in the 19.05 release, and
there have been no changes to their interfaces since then. These
functions can be considered stable enough to remove their 'experimental'
tag.

Signed-off-by: Erik Gabriel Carrillo 
---
 lib/librte_timer/rte_timer.h   | 32 
 lib/librte_timer/rte_timer_version.map | 16 
 2 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/lib/librte_timer/rte_timer.h b/lib/librte_timer/rte_timer.h
index c6b3d45..7af8378 100644
--- a/lib/librte_timer/rte_timer.h
+++ b/lib/librte_timer/rte_timer.h
@@ -133,9 +133,6 @@ struct rte_timer
 #endif
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * Allocate a timer data instance in shared memory to track a set of pending
  * timer lists.
  *
@@ -147,13 +144,9 @@ struct rte_timer
  *   - 0: Success
  *   - -ENOSPC: maximum number of timer data instances already allocated
  */
-__rte_experimental
 int rte_timer_data_alloc(uint32_t *id_ptr);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * Deallocate a timer data instance.
  *
  * @param id
@@ -163,7 +156,6 @@ int rte_timer_data_alloc(uint32_t *id_ptr);
  *   - 0: Success
  *   - -EINVAL: invalid timer data instance identifier
  */
-__rte_experimental
 int rte_timer_data_dealloc(uint32_t id);
 
 /**
@@ -183,12 +175,8 @@ int rte_timer_data_dealloc(uint32_t id);
 int rte_timer_subsystem_init(void);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * Free timer subsystem resources.
  */
-__rte_experimental
 void rte_timer_subsystem_finalize(void);
 
 /**
@@ -376,9 +364,6 @@ int rte_timer_manage(void);
 int rte_timer_dump_stats(FILE *f);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * This function is the same as rte_timer_reset(), except that it allows a
  * caller to specify the rte_timer_data instance containing the list to which
  * the timer should be added.
@@ -413,16 +398,12 @@ int rte_timer_dump_stats(FILE *f);
  *   - (-1): Timer is in the RUNNING or CONFIG state.
  *   - -EINVAL: invalid timer_data_id
  */
-__rte_experimental
 int
 rte_timer_alt_reset(uint32_t timer_data_id, struct rte_timer *tim,
uint64_t ticks, enum rte_timer_type type,
unsigned int tim_lcore, rte_timer_cb_t fct, void *arg);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * This function is the same as rte_timer_stop(), except that it allows a
  * caller to specify the rte_timer_data instance containing the list from which
  * this timer should be removed.
@@ -439,7 +420,6 @@ rte_timer_alt_reset(uint32_t timer_data_id, struct 
rte_timer *tim,
  *   - (-1): The timer is in the RUNNING or CONFIG state.
  *   - -EINVAL: invalid timer_data_id
  */
-__rte_experimental
 int
 rte_timer_alt_stop(uint32_t timer_data_id, struct rte_timer *tim);
 
@@ -449,9 +429,6 @@ rte_timer_alt_stop(uint32_t timer_data_id, struct rte_timer 
*tim);
 typedef void (*rte_timer_alt_manage_cb_t)(struct rte_timer *tim);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * Manage a set of timer lists and execute the specified callback function for
  * all expired timers. This function is similar to rte_timer_manage(), except
  * that it allows a caller to specify the timer_data instance that should
@@ -476,7 +453,6 @@ typedef void (*rte_timer_alt_manage_cb_t)(struct rte_timer 
*tim);
  *   - 0: success
  *   - -EINVAL: invalid timer_data_id
  */
-__rte_experimental
 int
 rte_timer_alt_manage(uint32_t timer_data_id, unsigned int *poll_lcores,
 int n_poll_lcores, rte_timer_alt_manage_cb_t f);
@@ -487,9 +463,6 @@ rte_timer_alt_manage(uint32_t timer_data_id, unsigned int 
*poll_lcores,
 typedef void (*rte_timer_stop_all_cb_t)(struct rte_timer *tim, void *arg);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * Walk the pending timer lists for the specified lcore IDs, and for each timer
  * that is encountered, stop it and call the specified callback function to
  * process it further.
@@ -509,15 +482,11 @@ typedef void (*rte_timer_stop_all_cb_t)(struct rte_timer 
*tim, void *arg);
  *   - 0: success
  *   - EINVAL: invalid timer_data_id
  */
-__rte_experimental
 int
 rte_timer_stop_all(uint32_t timer_data_id, unsigned int *walk_lcores,
   int nb_walk_lcores, rte_timer_stop_all_cb_t f, void *f_arg);
 
 /**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
  * This function is the same as rte_timer_dump_stats(), except that it allows
  * the caller to specify the rte_timer_data instance that should be used.
  *
@@ -532,7 +501,6 @@ rte_timer_stop_all(uint32_t timer_data_id, unsigned int 
*walk_lcores,
  *   - 0: success
  *   - -EINVAL: invalid timer_data_id
  */
-__rte_experimental
 int
 

[dpdk-dev] [PATCH v2 0/4] Tunnel Offload API

[Gregory Etelson]

Tunnel Offload API provides hardware independent, unified model
to offload tunneled traffic. Key model elements are:
 - apply matches to both outer and inner packet headers
   during entire offload procedure;
 - restore outer header of partially offloaded packet;
 - model is implemented as a set of helper functions.

Eli Britstein (1):
  ethdev: tunnel offload model

Gregory Etelson (3):
  ethdev: allow negative values in flow rule types
  net/mlx5: implement tunnel offload API
  app/testpmd: support tunnel offload API

 app/test-pmd/cmdline_flow.c  | 102 -
 app/test-pmd/config.c| 147 +++-
 app/test-pmd/testpmd.c   |   5 +-
 app/test-pmd/testpmd.h   |  27 +-
 app/test-pmd/util.c  |  30 +-
 doc/guides/prog_guide/rte_flow.rst   | 105 ++
 drivers/net/mlx5/linux/mlx5_os.c |  14 +
 drivers/net/mlx5/mlx5.c  |   6 +
 drivers/net/mlx5/mlx5.h  |   4 +
 drivers/net/mlx5/mlx5_flow.c | 453 +++
 drivers/net/mlx5/mlx5_flow.h |  49 +++
 drivers/net/mlx5/mlx5_flow_dv.c  |  71 +++-
 lib/librte_ethdev/rte_ethdev_version.map |   5 +
 lib/librte_ethdev/rte_flow.c | 142 ++-
 lib/librte_ethdev/rte_flow.h | 195 ++
 lib/librte_ethdev/rte_flow_driver.h  |  32 ++
 16 files changed, 1370 insertions(+), 17 deletions(-)

-- 
2.25.1