Re: [dpdk-dev] [PATCH v4 01/11] ethdev: add extensions attributes to IPv6 item

[Dekel Peled]

Thanks, PSB.

> -Original Message-
> From: Ajit Khaparde 
> Sent: Thursday, October 8, 2020 6:14 AM
> To: Dekel Peled 
> Cc: Ori Kam ; NBU-Contact-Thomas Monjalon
> ; Ferruh Yigit ; Andrew
> Rybchenko ; Ananyev, Konstantin
> ; Olivier Matz ;
> Wenzhuo Lu ; Beilei Xing ;
> Iremonger, Bernard ; Matan Azrad
> ; Shahaf Shuler ; Slava
> Ovsiienko ; dpdk-dev 
> Subject: Re: [dpdk-dev] [PATCH v4 01/11] ethdev: add extensions attributes
> to IPv6 item
> 
> On Wed, Oct 7, 2020 at 3:55 AM Dekel Peled  wrote:
> >
> > Using the current implementation of DPDK, an application cannot match on
> > IPv6 packets, based on the existing extension headers, in a simple way.
> >
> > Field 'Next Header' in IPv6 header indicates type of the first extension
> > header only. Following extension headers can't be identified by
> > inspecting the IPv6 header.
> > As a result, the existence or absence of specific extension headers
> > can't be used for packet matching.
> >
> > For example, fragmented IPv6 packets contain a dedicated extension
> header
> > (which is implemented in a later patch of this series).
> > Non-fragmented packets don't contain the fragment extension header.
> > For an application to match on non-fragmented IPv6 packets, the current
> > implementation doesn't provide a suitable solution.
> > Matching on the Next Header field is not sufficient, since additional
> > extension headers might be present in the same packet.
> > To match on fragmented IPv6 packets, the same difficulty exists.
> >
> > This patch implements the update as detailed in RFC [1].
> > A set of additional values will be added to IPv6 header struct.
> > These values will indicate the existence of every defined extension
> > header type, providing simple means for identification of existing
> > extensions in the packet header.
> > Continuing the above example, fragmented packets can be identified using
> > the specific value indicating existence of fragment extension header.
> > To match on non-fragmented IPv6 packets, need to use frag_ext_exist 0.
> Suggest:
> "To match on non-fragmented IPv6 packets, applications should set
> frag_ext_exist 0."
> 
> > To match on fragmented IPv6 packets, need to use frag_ext_exist 1.
> Suggest:
> To match on fragmented IPv6 packets, applications should set
> frag_ext_exist to 1.

In the git log I abbreviated a little.
In the actual documentation rst file I wrote it clearly.

> 
> 
> > To match on any IPv6 packets, the frag_ext_exist field should
> > not be specified for match.
> >
> > [1] https://mails.dpdk.org/archives/dev/2020-August/177257.html
> >
> > Signed-off-by: Dekel Peled 
> > Acked-by: Ori Kam 
> > ---
> >  doc/guides/prog_guide/rte_flow.rst | 22 +++---
> >  lib/librte_ethdev/rte_flow.h   | 25 +++--
> >  2 files changed, 42 insertions(+), 5 deletions(-)
> >
> > diff --git a/doc/guides/prog_guide/rte_flow.rst
> b/doc/guides/prog_guide/rte_flow.rst
> > index 119b128..ae090db 100644
> > --- a/doc/guides/prog_guide/rte_flow.rst
> > +++ b/doc/guides/prog_guide/rte_flow.rst
> > @@ -946,11 +946,27 @@ Item: ``IPV6``
> >
> >  Matches an IPv6 header.
> >
> > -Note: IPv6 options are handled by dedicated pattern items, see `Item:
> > -IPV6_EXT`_.
> > +Dedicated flags indicate existence of specific extension headers.
> > +Every type of extension header can use a dedicated pattern item, or
> > +the generic `Item: IPV6_EXT`_.
> > +To match on packets containing a specific extension header, an application
> > +should match on the dedicated flag set to 1.
> > +To match on packets not containing a specific extension header, an
> application
> > +should match on the dedicated flag clear to 0.
> > +In case application doesn't care about the existence of a specific
> extension
> > +header, it should not specify the dedicated flag for matching.
> >
> >  - ``hdr``: IPv6 header definition (``rte_ip.h``).
> > -- Default ``mask`` matches source and destination addresses only.
> > +- ``hop_ext_exist``: Hop-by-Hop Options extension header exists.
> > +- ``rout_ext_exist``: Routing extension header exists.
> > +- ``frag_ext_exist``: Fragment extension header exists.
> > +- ``auth_ext_exist``: Authentication extension header exists.
> > +- ``esp_ext_exist``: Encapsulation Security Payload extension header
> exists.
> > +- ``dest_ext_exist``: Destination Options extension header exists.
> > +- ``mobil_ext_exist``: Mobility extension header exists.
> > +- ``hip_ext_exist``: Host Identity Protocol extension header exists.
> > +- ``shim6_ext_exist``: Shim6 Protocol extension header exists.
> > +- Default ``mask`` matches ``hdr`` source and destination addresses only.
> >
> >  Item: ``ICMP``
> >  ^^
> > diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
> > index da8bfa5..5b5bed2 100644
> > --- a/lib/librte_ethdev/rte_flow.h
> > +++ b/lib/librte_ethdev/rte_flow.h
> > @@ -792,11 +792,32 @@ struct rte_flow_item_ipv4 {
> >   *
> >   * Matches an IPv6 header.

Re: [dpdk-dev] [PATCH v2 4/5] vhost: add packed ring vectorized dequeue

[Liu, Yong]

> -Original Message-
> From: Maxime Coquelin 
> Sent: Tuesday, October 6, 2020 10:59 PM
> To: Liu, Yong ; Xia, Chenbo ;
> Wang, Zhihong 
> Cc: dev@dpdk.org
> Subject: Re: [PATCH v2 4/5] vhost: add packed ring vectorized dequeue
> 
> 
> 
> On 9/21/20 8:48 AM, Marvin Liu wrote:
> > Optimize vhost packed ring dequeue path with SIMD instructions. Four
> > descriptors status check and writeback are batched handled with AVX512
> > instructions. Address translation operations are also accelerated by
> > AVX512 instructions.
> >
> > If platform or compiler not support vectorization, will fallback to
> > default path.
> >
> > Signed-off-by: Marvin Liu 
> >
> > diff --git a/lib/librte_vhost/meson.build b/lib/librte_vhost/meson.build
> > index cc9aa65c67..c1481802d7 100644
> > --- a/lib/librte_vhost/meson.build
> > +++ b/lib/librte_vhost/meson.build
> > @@ -8,6 +8,22 @@ endif
> >  if has_libnuma == 1
> > dpdk_conf.set10('RTE_LIBRTE_VHOST_NUMA', true)
> >  endif
> > +
> > +if arch_subdir == 'x86'
> > +if not machine_args.contains('-mno-avx512f')
> > +if cc.has_argument('-mavx512f') and cc.has_argument('-
> mavx512vl') and cc.has_argument('-mavx512bw')
> > +cflags += ['-DCC_AVX512_SUPPORT']
> > +vhost_avx512_lib = 
> > static_library('vhost_avx512_lib',
> > +  'vhost_vec_avx.c',
> > +  dependencies: 
> > [static_rte_eal,
> static_rte_mempool,
> > +  static_rte_mbuf, 
> > static_rte_ethdev,
> static_rte_net],
> > +  include_directories: 
> > includes,
> > +  c_args: [cflags, 
> > '-mavx512f', '-mavx512bw', '-
> mavx512vl'])
> > +objs += 
> > vhost_avx512_lib.extract_objects('vhost_vec_avx.c')
> > +endif
> > +endif
> > +endif
> 
> Not a Meson expert, but wonder how I can disable CC_AVX512_SUPPORT.
> I checked the DPDK doc, but I could not find how to pass -mno-avx512f to
> the machine_args.

Hi Maxime,
By now mno-avx512f flag will be set only if binutils check script found issue 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90028.
So avx512 code will be built-in if compiler support that. There's alternative 
way is that introduce one new option in meson build. 

Thanks,
Marvin

> 
> > +
> >  if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
> > cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
> >  elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
> > diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
> > index 4a81f18f01..fc7daf2145 100644
> > --- a/lib/librte_vhost/vhost.h
> > +++ b/lib/librte_vhost/vhost.h
> > @@ -1124,4 +1124,12 @@ virtio_dev_pktmbuf_alloc(struct virtio_net
> *dev, struct rte_mempool *mp,
> > return NULL;
> >  }
> >
> > +int
> > +vhost_reserve_avail_batch_packed_avx(struct virtio_net *dev,
> > +struct vhost_virtqueue *vq,
> > +struct rte_mempool *mbuf_pool,
> > +struct rte_mbuf **pkts,
> > +uint16_t avail_idx,
> > +uintptr_t *desc_addrs,
> > +uint16_t *ids);
> >  #endif /* _VHOST_NET_CDEV_H_ */
> > diff --git a/lib/librte_vhost/vhost_vec_avx.c
> b/lib/librte_vhost/vhost_vec_avx.c
> > new file mode 100644
> > index 00..dc5322d002
> > --- /dev/null
> > +++ b/lib/librte_vhost/vhost_vec_avx.c
> 
> For consistency it should be prefixed with virtio_net, not vhost.
> 
> > @@ -0,0 +1,181 @@
> > +/* SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright(c) 2010-2016 Intel Corporation
> > + */
> > +#include 
> > +
> > +#include "vhost.h"
> > +
> > +#define BYTE_SIZE 8
> > +/* reference count offset in mbuf rearm data */
> > +#define REFCNT_BITS_OFFSET ((offsetof(struct rte_mbuf, refcnt) - \
> > +   offsetof(struct rte_mbuf, rearm_data)) * BYTE_SIZE)
> > +/* segment number offset in mbuf rearm data */
> > +#define SEG_NUM_BITS_OFFSET ((offsetof(struct rte_mbuf, nb_segs) - \
> > +   offsetof(struct rte_mbuf, rearm_data)) * BYTE_SIZE)
> > +
> > +/* default rearm data */
> > +#define DEFAULT_REARM_DATA (1ULL << SEG_NUM_BITS_OFFSET | \
> > +   1ULL << REFCNT_BITS_OFFSET)
> > +
> > +#define DESC_FLAGS_SHORT_OFFSET (offsetof(struct vring_packed_desc,
> flags) / \
> > +   sizeof(uint16_t))
> > +
> > +#define DESC_FLAGS_SHORT_SIZE (sizeof(struct vring_packed_desc) / \
> > +   sizeof(uint16_t))
> > +#define BATCH_FLAGS_MASK (1 << DESC_FLAGS_SHORT_OFFSET | \
> > +   1 << (DESC_FLAGS_SHORT_OFFSET + DESC_FLAGS_SHORT_SIZE) | \
> > +   1 << (DESC_FLAGS_SHORT_OFFSET + DESC_FLAGS_SHORT_SIZE * 2)  |
> \
> > +   1 << (DESC_FLAGS_SHORT_OFFSET + DESC_FLAGS_SHORT_SIZE * 3))
> > +
> > +#define FLAGS_BITS_OFFSET ((offsetof(struct vring_packed_desc, flags) - \

Re: [dpdk-dev] [PATCH v2 5/5] vhost: add packed ring vectorized enqueue

[Liu, Yong]

> -Original Message-
> From: Maxime Coquelin 
> Sent: Tuesday, October 6, 2020 11:00 PM
> To: Liu, Yong ; Xia, Chenbo ;
> Wang, Zhihong 
> Cc: dev@dpdk.org
> Subject: Re: [PATCH v2 5/5] vhost: add packed ring vectorized enqueue
> 
> 
> 
> On 9/21/20 8:48 AM, Marvin Liu wrote:
> > Optimize vhost packed ring enqueue path with SIMD instructions. Four
> > descriptors status and length are batched handled with AVX512
> > instructions. Address translation operations are also accelerated
> > by AVX512 instructions.
> >
> > Signed-off-by: Marvin Liu 
> >
> > diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
> > index fc7daf2145..b78b2c5c1b 100644
> > --- a/lib/librte_vhost/vhost.h
> > +++ b/lib/librte_vhost/vhost.h
> > @@ -1132,4 +1132,10 @@ vhost_reserve_avail_batch_packed_avx(struct
> virtio_net *dev,
> >  uint16_t avail_idx,
> >  uintptr_t *desc_addrs,
> >  uint16_t *ids);
> > +
> > +int
> > +virtio_dev_rx_batch_packed_avx(struct virtio_net *dev,
> > +  struct vhost_virtqueue *vq,
> > +  struct rte_mbuf **pkts);
> > +
> >  #endif /* _VHOST_NET_CDEV_H_ */
> > diff --git a/lib/librte_vhost/vhost_vec_avx.c
> b/lib/librte_vhost/vhost_vec_avx.c
> > index dc5322d002..7d2250ed86 100644
> > --- a/lib/librte_vhost/vhost_vec_avx.c
> > +++ b/lib/librte_vhost/vhost_vec_avx.c
> > @@ -35,9 +35,15 @@
> >  #define PACKED_AVAIL_FLAG ((0ULL | VRING_DESC_F_AVAIL) <<
> FLAGS_BITS_OFFSET)
> >  #define PACKED_AVAIL_FLAG_WRAP ((0ULL | VRING_DESC_F_USED) << \
> > FLAGS_BITS_OFFSET)
> > +#define PACKED_WRITE_AVAIL_FLAG (PACKED_AVAIL_FLAG | \
> > +   ((0ULL | VRING_DESC_F_WRITE) << FLAGS_BITS_OFFSET))
> > +#define PACKED_WRITE_AVAIL_FLAG_WRAP
> (PACKED_AVAIL_FLAG_WRAP | \
> > +   ((0ULL | VRING_DESC_F_WRITE) << FLAGS_BITS_OFFSET))
> >
> >  #define DESC_FLAGS_POS 0xaa
> >  #define MBUF_LENS_POS 0x
> > +#define DESC_LENS_POS 0x
> > +#define DESC_LENS_FLAGS_POS 0xB0B0B0B0
> >
> >  int
> >  vhost_reserve_avail_batch_packed_avx(struct virtio_net *dev,
> > @@ -179,3 +185,154 @@ vhost_reserve_avail_batch_packed_avx(struct
> virtio_net *dev,
> >
> > return -1;
> >  }
> > +
> > +int
> > +virtio_dev_rx_batch_packed_avx(struct virtio_net *dev,
> > +  struct vhost_virtqueue *vq,
> > +  struct rte_mbuf **pkts)
> > +{
> > +   struct vring_packed_desc *descs = vq->desc_packed;
> > +   uint16_t avail_idx = vq->last_avail_idx;
> > +   uint64_t desc_addrs[PACKED_BATCH_SIZE];
> > +   uint32_t buf_offset = dev->vhost_hlen;
> > +   uint32_t desc_status;
> > +   uint64_t lens[PACKED_BATCH_SIZE];
> > +   uint16_t i;
> > +   void *desc_addr;
> > +   uint8_t cmp_low, cmp_high, cmp_result;
> > +
> > +   if (unlikely(avail_idx & PACKED_BATCH_MASK))
> > +   return -1;
> 
> Same comment as for patch 4. Packed ring size may not be a pow2.
> 
Thanks, will fix in next version.

> > +   /* check refcnt and nb_segs */
> > +   __m256i mbuf_ref = _mm256_set1_epi64x(DEFAULT_REARM_DATA);
> > +
> > +   /* load four mbufs rearm data */
> > +   __m256i mbufs = _mm256_set_epi64x(
> > +   *pkts[3]->rearm_data,
> > +   *pkts[2]->rearm_data,
> > +   *pkts[1]->rearm_data,
> > +   *pkts[0]->rearm_data);
> > +
> > +   uint16_t cmp = _mm256_cmpneq_epu16_mask(mbufs, mbuf_ref);
> > +   if (cmp & MBUF_LENS_POS)
> > +   return -1;
> > +
> > +   /* check desc status */
> > +   desc_addr = &vq->desc_packed[avail_idx];
> > +   __m512i desc_vec = _mm512_loadu_si512(desc_addr);
> > +
> > +   __m512i avail_flag_vec;
> > +   __m512i used_flag_vec;
> > +   if (vq->avail_wrap_counter) {
> > +#if defined(RTE_ARCH_I686)
> 
> Is supporting AVX512 on i686 really useful/necessary?
> 
It is useless for function point of view.  Here is for successful compilation 
if enabled i686 build. 

> > +   avail_flag_vec =
> _mm512_set4_epi64(PACKED_WRITE_AVAIL_FLAG,
> > +   0x0, PACKED_WRITE_AVAIL_FLAG,
> 0x0);
> > +   used_flag_vec = _mm512_set4_epi64(PACKED_FLAGS_MASK,
> 0x0,
> > +   PACKED_FLAGS_MASK, 0x0);
> > +#else
> > +   avail_flag_vec =
> _mm512_maskz_set1_epi64(DESC_FLAGS_POS,
> > +   PACKED_WRITE_AVAIL_FLAG);
> > +   used_flag_vec =
> _mm512_maskz_set1_epi64(DESC_FLAGS_POS,
> > +   PACKED_FLAGS_MASK);
> > +#endif
> > +   } else {
> > +#if defined(RTE_ARCH_I686)
> > +   avail_flag_vec = _mm512_set4_epi64(
> > +   PACKED_WRITE_AVAIL_FLAG_WRAP,
> 0x0,
> > +   PACKED_WRITE_AVAIL_FLAG, 0x0);
> > +   used_flag_vec = _mm512_set4_epi64(0x0, 0x0, 0x0, 0x0);
> > +#else
> > +   avail_flag_vec =
> _mm512_maskz_set1_epi64(DESC_FLAGS_POS,
> > +   

Re: [dpdk-dev] [PATCH v5] eal: add cache-line demote support

[David Marchand]

On Thu, Oct 1, 2020 at 2:30 AM Omkar Maslekar  wrote:
>
> rte_cldemote is similar to a prefetch hint - in reverse. cldemote(addr)
> enables software to hint to hardware that line is likely to be shared.
> Useful in core-to-core communications where cache-line is likely to be
> shared. ARM and PPC implementation is provided with NOP and can be added
> if any equivalent instructions could be used for implementation on those
> architectures.
>
> Signed-off-by: Omkar Maslekar 
> Acked-by: Bruce Richardson 

I find this "rte_cldemote" name too close to the Intel instruction,
but I can see no complaint from other arch maintainers, so I guess
everyone is happy with it.
In any case, this is a new API, so it should be marked experimental.

As for unit tests, not sure there is much to do, maybe rename
test_prefetch.c and call this new API too, wdyt?

-- 
David Marchand

Re: [dpdk-dev] [PATCH v1] net/iavf: fix flow flush after PF reset

[Zhang, Qi Z]

> -Original Message-
> From: Guo, Jia 
> Sent: Wednesday, September 30, 2020 1:44 PM
> To: Wu, Jingjing ; Zhang, Qi Z ;
> Xing, Beilei 
> Cc: dev@dpdk.org; Guo, Jia 
> Subject: [PATCH v1] net/iavf: fix flow flush after PF reset
> 
> When VF begin reset after PF reset, VF will be uninitialized at first and 
> then be
> initialized, during the time any invalid cmd such as flow flush should not be 
> sent
> to PF until the uninitialization is finished.
> 
> Fixes: 1eab95fe2e36 ("net/iavf: fix command after PF reset")

as cc stable is required for the patch to fix.
so cc stable is also required for this patch.

> Signed-off-by: Jeff Guo 

Acked-by: Qi Zhang 

Applied to dpdk-next-net-intel.

Thanks
Qi

Re: [dpdk-dev] [PATCH v4 01/11] ethdev: add extensions attributes to IPv6 item

[Ajit Khaparde]

On Wed, Oct 7, 2020 at 3:55 AM Dekel Peled  wrote:
>
> Using the current implementation of DPDK, an application cannot match on
> IPv6 packets, based on the existing extension headers, in a simple way.
>
> Field 'Next Header' in IPv6 header indicates type of the first extension
> header only. Following extension headers can't be identified by
> inspecting the IPv6 header.
> As a result, the existence or absence of specific extension headers
> can't be used for packet matching.
>
> For example, fragmented IPv6 packets contain a dedicated extension header
> (which is implemented in a later patch of this series).
> Non-fragmented packets don't contain the fragment extension header.
> For an application to match on non-fragmented IPv6 packets, the current
> implementation doesn't provide a suitable solution.
> Matching on the Next Header field is not sufficient, since additional
> extension headers might be present in the same packet.
> To match on fragmented IPv6 packets, the same difficulty exists.
>
> This patch implements the update as detailed in RFC [1].
> A set of additional values will be added to IPv6 header struct.
> These values will indicate the existence of every defined extension
> header type, providing simple means for identification of existing
> extensions in the packet header.
> Continuing the above example, fragmented packets can be identified using
> the specific value indicating existence of fragment extension header.
> To match on non-fragmented IPv6 packets, need to use frag_ext_exist 0.
Suggest:
"To match on non-fragmented IPv6 packets, applications should set
frag_ext_exist 0."

> To match on fragmented IPv6 packets, need to use frag_ext_exist 1.
Suggest:
To match on fragmented IPv6 packets, applications should set
frag_ext_exist to 1.


> To match on any IPv6 packets, the frag_ext_exist field should
> not be specified for match.
>
> [1] https://mails.dpdk.org/archives/dev/2020-August/177257.html
>
> Signed-off-by: Dekel Peled 
> Acked-by: Ori Kam 
> ---
>  doc/guides/prog_guide/rte_flow.rst | 22 +++---
>  lib/librte_ethdev/rte_flow.h   | 25 +++--
>  2 files changed, 42 insertions(+), 5 deletions(-)
>
> diff --git a/doc/guides/prog_guide/rte_flow.rst 
> b/doc/guides/prog_guide/rte_flow.rst
> index 119b128..ae090db 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -946,11 +946,27 @@ Item: ``IPV6``
>
>  Matches an IPv6 header.
>
> -Note: IPv6 options are handled by dedicated pattern items, see `Item:
> -IPV6_EXT`_.
> +Dedicated flags indicate existence of specific extension headers.
> +Every type of extension header can use a dedicated pattern item, or
> +the generic `Item: IPV6_EXT`_.
> +To match on packets containing a specific extension header, an application
> +should match on the dedicated flag set to 1.
> +To match on packets not containing a specific extension header, an 
> application
> +should match on the dedicated flag clear to 0.
> +In case application doesn't care about the existence of a specific extension
> +header, it should not specify the dedicated flag for matching.
>
>  - ``hdr``: IPv6 header definition (``rte_ip.h``).
> -- Default ``mask`` matches source and destination addresses only.
> +- ``hop_ext_exist``: Hop-by-Hop Options extension header exists.
> +- ``rout_ext_exist``: Routing extension header exists.
> +- ``frag_ext_exist``: Fragment extension header exists.
> +- ``auth_ext_exist``: Authentication extension header exists.
> +- ``esp_ext_exist``: Encapsulation Security Payload extension header exists.
> +- ``dest_ext_exist``: Destination Options extension header exists.
> +- ``mobil_ext_exist``: Mobility extension header exists.
> +- ``hip_ext_exist``: Host Identity Protocol extension header exists.
> +- ``shim6_ext_exist``: Shim6 Protocol extension header exists.
> +- Default ``mask`` matches ``hdr`` source and destination addresses only.
>
>  Item: ``ICMP``
>  ^^
> diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
> index da8bfa5..5b5bed2 100644
> --- a/lib/librte_ethdev/rte_flow.h
> +++ b/lib/librte_ethdev/rte_flow.h
> @@ -792,11 +792,32 @@ struct rte_flow_item_ipv4 {
>   *
>   * Matches an IPv6 header.
>   *
> - * Note: IPv6 options are handled by dedicated pattern items, see
> - * RTE_FLOW_ITEM_TYPE_IPV6_EXT.
> + * Dedicated flags indicate existence of specific extension headers.
> + * Every type of extension header can use a dedicated pattern item, or
> + * the generic item RTE_FLOW_ITEM_TYPE_IPV6_EXT.
>   */
>  struct rte_flow_item_ipv6 {
> struct rte_ipv6_hdr hdr; /**< IPv6 header definition. */
> +   uint32_t hop_ext_exist:1;
> +   /**< Hop-by-Hop Options extension header exists. */
> +   uint32_t rout_ext_exist:1;
> +   /**< Routing extension header exists. */
> +   uint32_t frag_ext_exist:1;
> +   /**< Fragment extension header exists. */
> +   uint32_t auth_ext_exist:1;
> +   /**< Authe

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

[Gujjar, Abhinandan S]

acked-by: abhinandan.guj...@intel.com

> -Original Message-
> From: Ankur Dwivedi 
> Sent: Wednesday, October 7, 2020 10:56 AM
> To: dev@dpdk.org
> Cc: Gujjar, Abhinandan S ; jer...@marvell.com;
> ano...@marvell.com; Ankur Dwivedi 
> Subject: [PATCH v3 1/3] test/event_crypto_adapter: return error with
> unsupported mode
> 
> The capability of a hardware 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 | 33 +++-
>  1 file changed, 23 insertions(+), 10 deletions(-)
> 
> diff --git a/app/test/test_event_crypto_adapter.c
> b/app/test/test_event_crypto_adapter.c
> index 8d42462d8..3c64742b3 100644
> --- a/app/test/test_event_crypto_adapter.c
> +++ b/app/test/test_event_crypto_adapter.c
> @@ -750,15 +750,30 @@ 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");
> +
> + /* Skip mode and capability mismatch check for SW eventdev */
> + if (!(cap &
> RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW) &&
> + !(cap &
> RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD) &&
> + !(cap &
> RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND))
> + goto adapter_create;
> +
> + 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;
> +
> +adapter_create:
>   /* 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 +828,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;
>   }
> @@ -847,10 +864,8 @@ test_crypto_adapter_conf_op_forward_mode(void)
>   enum rte_event_crypto_adapter_mode mode;
> 
>   mode = RTE_EVENT_CRYPTO_ADAPTER_OP_FORWARD;
> - TEST_ASSERT_SUCCESS(test_crypto_adapter_conf(mode),
> - "Failed to config crypto adapter");
> 
> - return TEST_SUCCESS;
> + return test_crypto_adapter_conf(mode);
>  }
> 
>  static int
> @@ -859,10 +874,8 @@ test_crypto_adapter_conf_op_new_mode(void)
>   enum rte_event_crypto_adapter_mode mode;
> 
>   mode = RTE_EVENT_CRYPTO_ADAPTER_OP_NEW;
> - TEST_ASSERT_SUCCESS(test_crypto_adapter_conf(mode),
> - "Failed to config crypto adapter");
> 
> - return TEST_SUCCESS;
> + return test_crypto_adapter_conf(mode);
>  }
> 
> 
> --
> 2.28.0

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

[Gujjar, Abhinandan S]

acked-by: abhinandan.guj...@intel.com

> -Original Message-
> From: Ankur Dwivedi 
> Sent: Wednesday, October 7, 2020 10:56 AM
> To: dev@dpdk.org
> Cc: Gujjar, Abhinandan S ; jer...@marvell.com;
> ano...@marvell.com; Ankur Dwivedi 
> Subject: [PATCH v3 3/3] test/event_crypto_adapter: free resources during exit
> 
> 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 | 22 ++
>  1 file changed, 22 insertions(+)
> 
> diff --git a/app/test/test_event_crypto_adapter.c
> b/app/test/test_event_crypto_adapter.c
> index 87a67139d..d6fbbfdde 100644
> --- a/app/test/test_event_crypto_adapter.c
> +++ b/app/test/test_event_crypto_adapter.c
> @@ -899,6 +899,27 @@ testsuite_setup(void)
>   return TEST_SUCCESS;
>  }
> 
> +static void
> +crypto_adapter_teardown(void)
> +{
> + int ret;
> +
> + ret = rte_event_crypto_adapter_stop(TEST_ADAPTER_ID);
> + if (ret < 0)
> + RTE_LOG(ERR, USER1, "Failed to stop adapter!");
> +
> + 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!");
> +
> + ret = rte_event_crypto_adapter_free(TEST_ADAPTER_ID);
> + if (ret < 0)
> + RTE_LOG(ERR, USER1, "Failed to free adapter!");
> +
> + crypto_adapter_setup_done = 0;
> +}
> +
>  static void
>  crypto_teardown(void)
>  {
> @@ -941,6 +962,7 @@ eventdev_teardown(void)  static void
>  testsuite_teardown(void)
>  {
> + crypto_adapter_teardown();
>   crypto_teardown();
>   eventdev_teardown();
>  }
> --
> 2.28.0

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

[Gujjar, Abhinandan S]

acked-by: abhinandan.guj...@intel.com

> -Original Message-
> From: Ankur Dwivedi 
> Sent: Wednesday, October 7, 2020 10:56 AM
> To: dev@dpdk.org
> Cc: Gujjar, Abhinandan S ; jer...@marvell.com;
> ano...@marvell.com; Ankur Dwivedi 
> Subject: [PATCH v3 2/3] test/event_crypto_adapter: fix function arguments
> 
> 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 | 20 ++--
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/app/test/test_event_crypto_adapter.c
> b/app/test/test_event_crypto_adapter.c
> index 3c64742b3..87a67139d 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) { @@ -296,7
> +296,7 @@ test_sessionless_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) && @@ -
> 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

Re: [dpdk-dev] [PATCH v12 0/5] eal: add WC store functions

[David Marchand]

On Wed, Sep 23, 2020 at 4:23 PM Radu Nicolau  wrote:
>
> Implement 2 new functions that will enable write combining
> stores depending on architecture. The functions are provided
> as a generic stub and a x86 specific implementation.
>
> The reason to implement these functions is to improve performance
> by reducing the overhead associated with regular mmio writes when
> updating the hardware queue tails and doorbells.

For the record, on which CPU/platform was this tested and how much of
an improvement did you get with this?

I did not see review/ack tokens from other arch maintainers, but since
it has been on the ml for a while, I guess I can proceed as is.


>
> With this patch set the I40E, ICE, IXGBE and QAT PMDs are updated to
> use the write combining store functions with other PMDs to follow.

This series will go through the main repo: copying Ferruh and Akhil for info.


-- 
David Marchand

Re: [dpdk-dev] [PATCH v5 1/2] ethdev: add flow shared action API

[Andrey Vesnovaty]

Hi, Ajit.

All spelling & rephrases will be fixed in next couple of hours & v7 will be 
sent. 
PSB response on shared action configuration documentation.
Please respond ASAP since RC1 window about to close very soon.

Thanks,
Andrey

> -Original Message-
> From: Ajit Khaparde 
> Sent: Thursday, October 8, 2020 12:23 AM
> To: Andrey Vesnovaty 
> Cc: dpdk-dev ; j...@marvell.com; Jerin Jacob
> ; NBU-Contact-Thomas Monjalon
> ; Ferruh Yigit ; Stephen
> Hemminger ; Bruce Richardson
> ; Ori Kam ; Slava Ovsiienko
> ; andrey.vesnov...@gmail.com; Ray Kinsella
> ; Neil Horman ; Samik Gupta
> ; Andrew Rybchenko
> 
> Subject: Re: [PATCH v5 1/2] ethdev: add flow shared action API
> 
> Please see inline..
> 
> On Wed, Oct 7, 2020 at 5:56 AM Andrey Vesnovaty 
> wrote:
> >
> > This commit introduces extension of DPDK flow action API enabling
> > sharing of single rte_flow_action in multiple flows. The API intended for
> > PMDs, where multiple HW offloaded flows can reuse the same HW
> > essence/object representing flow action and modification of such an
> > essence/object affects all the rules using it.
> >
> > Motivation and example
> > ===
> > Adding or removing one or more queues to RSS used by multiple flow rules
> > imposes per rule toll for current DPDK flow API; the scenario requires
> > for each flow sharing cloned RSS action:
> > - call `rte_flow_destroy()`
> > - call `rte_flow_create()` with modified RSS action
> >
> 
> [snip]
> > Shared action create/use/destroy
> > ===
> > Shared action may be reused by some or none flow rules at any given
> > moment, i.e. shared action reside outside of the context of any flow.
> s/reside/resides
> 
> [snip]
> > testpmd
> > ===
> > In order to utilize introduced API testpmd cli may implement following
> > extension
> > create/update/destroy/query shared action accordingly
> >
> > flow shared_action (port) create {action_id (id)} (action) / end
> Same comment as in testpmd patch. Please add the ability to specify
> and parse direction.
> 
> > flow shared_action (port) update (id) (action) / end
> > flow shared_action (port) destroy action_id (id) {action_id (id) [...]}
> > flow shared_action (port) query (id)
> >
> > testpmd example
> > ===
> >
> > configure rss to queues 1 & 2
> >
> > > flow shared_action 0 create action_id 100 rss queues 1 2 end / end
> >
> > create flow rule utilizing shared action
> >
> > > flow create 0 ingress \
> > pattern eth dst is 0c:42:a1:15:fd:ac / ipv6 / tcp / end \
> >   actions shared 100 / end
> >
> > add 2 more queues
> >
> > > flow shared_action 0 modify 100 rss queues 1 2 3 4 end / end
> >
> > example
> > ===
> >
> > struct rte_flow_action actions[2];
> > struct rte_flow_action action;
> > /* skipped: initialize action */
> > struct rte_flow_shared_action *handle = rte_flow_shared_action_create(
> > port_id, &action, &error);
> > actions[0].type = RTE_FLOW_ACTION_TYPE_SHARED;
> > actions[0].conf = handle;
> direction?
> 
> > actions[1].type = RTE_FLOW_ACTION_TYPE_END;
> > /* skipped: init attr0 & pattern0 args */
> [snip]
> 
> > diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
> > index da8bfa5489..383d516fbd 100644
> > --- a/lib/librte_ethdev/rte_flow.h
> > +++ b/lib/librte_ethdev/rte_flow.h
> > @@ -1714,7 +1714,8 @@ enum rte_flow_action_type {
> > /**
> >  * Enables counters for this flow rule.
> >  *
> > -* These counters can be retrieved and reset through 
> > rte_flow_query(),
> > +* These counters can be retrieved and reset through 
> > rte_flow_query() or
> > +* rte_flow_shared_action_query() if the action provided via handle,
> >  * see struct rte_flow_query_count.
> >  *
> >  * See struct rte_flow_action_count.
> > @@ -2132,6 +2133,14 @@ enum rte_flow_action_type {
> >  * see enum RTE_ETH_EVENT_FLOW_AGED
> >  */
> > RTE_FLOW_ACTION_TYPE_AGE,
> > +
> > +   /**
> > +* Describe action shared a cross multiple flow rules.
> s/a cross/across
> 
> > +*
> > +* Allow multiple rules reference the same action by handle (see
> > +* struct rte_flow_shared_action).
> > +*/
> > +   RTE_FLOW_ACTION_TYPE_SHARED,
> >  };
> >
> >  /**
> > @@ -2693,6 +2702,20 @@ struct rte_flow_action_set_dscp {
> > uint8_t dscp;
> >  };
> >
> > +
> > +/**
> > + * RTE_FLOW_ACTION_TYPE_SHARED
> > + *
> > + * Opaque type returned after successfully creating a shared action.
> > + *
> > + * This handle can be used to manage and query the related action:
> > + * - share it a cross multiple flow rules
> s/a cross/across
> 
> > + * - update action configuration
> > + * - query action data
> > + * - destroy action
> > + */
> > +struct rte_flow_shared_action;
> > +
> >  /* Mbuf dynamic field offset for metadata. */
> >  extern int32_t rte_flow_dynf_metadata_offs;
> >
> > @@ -3357,6 +3380,144 @@ int
> >  rte_flow_get_aged_flows(uint16_t port_id, void **c

Re: [dpdk-dev] [PATCH v5 00/15] fix distributor synchronization issues

[David Marchand]

On Thu, Oct 8, 2020 at 7:24 AM Lukasz Wojciechowski
 wrote:
>
> During review and verification of the patch created by Sarosh Arif:
> "test_distributor: prevent memory leakages from the pool" I found out
> that running distributor unit tests multiple times in a row causes fails.
> So I investigated all the issues I found.
>
> There are few synchronization issues that might cause deadlocks
> or corrupted data. They are fixed with this set of patches for both tests
> and librte_distributor library.
>
> ---
> v5:
> * implement missing functionality in burst mode - worker shutdown
> * fix shutdown test to always shutdown busy worker
> * use atomic stores instead of barrier in tests clear_packet_count()
> * reorder patches
> * new patch 7: fix call to return_pkt in single mode
> * new patch 11: replacing delays with spinlock on atomics in tests
> * new patch 12: fix scalar matching algorithm
> * new patch 13: new test with marking and checking every packet
> * new patch 14: flush also in flight packets
> * new patch 15: fix clearing returns buffer
> * minor fixes in other patches

Thanks for working on it, Lukasz.
David, Honnappa, review please.


-- 
David Marchand

Re: [dpdk-dev] [PATCH 1/1] eal: increase TRACE CTF SIZE to recommended size

[David Marchand]

On Mon, Oct 5, 2020 at 10:16 PM Timothy McDaniel
 wrote:
>
> Increase TRACE_CTF_FIELD_SIZE to 448, the recommended size.
> Fixes "CTF field is too long" error when running with trace enabled.
>
> Signed-off-by: Timothy McDaniel 

Applied with added acks from Jerin and Sunil, thanks.


-- 
David Marchand

Re: [dpdk-dev] [PATCH v2] eal: add new prefetch write variants

[David Marchand]

On Mon, Sep 14, 2020 at 5:09 PM Harry van Haaren
 wrote:
>
> This commit adds a new rte_prefetch0_write() variants, suggesting to the
> compiler to use a prefetch instruction with intention to write. As a
> compiler builtin, the compiler can choose based on compilation target
> what the best implementation for this instruction is.
>
> Signed-off-by: Harry van Haaren 

No review, copying arch maintainers.


-- 
David Marchand

Re: [dpdk-dev] [PATCH v2 1/1] librte_eal: rte_intr_callback_unregister_sync() - wrapper around rte_intr_callback_unregister().

[David Marchand]

On Mon, Aug 17, 2020 at 4:09 PM Renata Saiakhova
 wrote:
>
> Avoid race with unregister interrupt hanlder if interrupt
> source has some active callbacks at the moment, use wrapper
> around rte_intr_callback_unregister() to check for -EAGAIN
> return value and to loop until rte_intr_callback_unregister()
> succeeds.
>
> Signed-off-by: Renata Saiakhova 

Review please.


-- 
David Marchand

Re: [dpdk-dev] [PATCH v2] eal: simplify exit functions

[David Marchand]

On Mon, Sep 28, 2020 at 2:01 AM Thomas Monjalon  wrote:
>
> The option RTE_EAL_ALWAYS_PANIC_ON_ERROR was off by default,
> and not customizable with meson. It is completely removed.
>
> The function rte_dump_registers is a trace of the bare metal support
> era, and was not supported in userland. It is completely removed.
>
> Signed-off-by: Thomas Monjalon 
> Acked-by: Ray Kinsella 
> ---
> The deprecation notice for this removal has been missed.
> I assume it would not hurt anybody to remove this useless function
> from DPDK 20.11. Asking the Technical Board for confirmation.
> ---
>  app/test/test_debug.c|  3 ---
>  doc/guides/howto/debug_troubleshoot.rst  |  2 +-
>  doc/guides/rel_notes/release_20_11.rst   |  2 ++
>  lib/librte_eal/common/eal_common_debug.c | 17 +
>  lib/librte_eal/include/rte_debug.h   |  7 ---
>  lib/librte_eal/rte_eal_version.map   |  1 -
>  6 files changed, 4 insertions(+), 28 deletions(-)
>
> diff --git a/app/test/test_debug.c b/app/test/test_debug.c
> index 25eab97e2a..834a7386f5 100644
> --- a/app/test/test_debug.c
> +++ b/app/test/test_debug.c
> @@ -66,13 +66,11 @@ test_exit_val(int exit_val)
> }
> wait(&status);
> printf("Child process status: %d\n", status);
> -#ifndef RTE_EAL_ALWAYS_PANIC_ON_ERROR
> if(!WIFEXITED(status) || WEXITSTATUS(status) != (uint8_t)exit_val){
> printf("Child process terminated with incorrect status 
> (expected = %d)!\n",
> exit_val);
> return -1;
> }
> -#endif
> return 0;
>  }
>
> @@ -113,7 +111,6 @@ static int
>  test_debug(void)
>  {
> rte_dump_stack();
> -   rte_dump_registers();
> if (test_panic() < 0)
> return -1;
> if (test_exit() < 0)
> diff --git a/doc/guides/howto/debug_troubleshoot.rst 
> b/doc/guides/howto/debug_troubleshoot.rst
> index 5a46f5fba3..50bd32a8ef 100644
> --- a/doc/guides/howto/debug_troubleshoot.rst
> +++ b/doc/guides/howto/debug_troubleshoot.rst
> @@ -314,7 +314,7 @@ Custom worker function :numref:`dtg_distributor_worker`.
> * For high-performance execution logic ensure running it on correct NUMA
>   and non-master core.
>
> -   * Analyze run logic with ``rte_dump_stack``, ``rte_dump_registers`` and
> +   * Analyze run logic with ``rte_dump_stack`` and
>   ``rte_memdump`` for more insights.
>
> * Make use of objdump to ensure opcode is matching to the desired state.
> diff --git a/doc/guides/rel_notes/release_20_11.rst 
> b/doc/guides/rel_notes/release_20_11.rst
> index f377ab8e87..c0b83e9554 100644
> --- a/doc/guides/rel_notes/release_20_11.rst
> +++ b/doc/guides/rel_notes/release_20_11.rst
> @@ -184,6 +184,8 @@ ABI Changes
> Also, make sure to start the actual text at the margin.
> ===
>
> +* eal: Removed the not implemented function ``rte_dump_registers()``.
> +
>  * ``ethdev`` changes
>
>* Following device operation function pointers moved
> diff --git a/lib/librte_eal/common/eal_common_debug.c 
> b/lib/librte_eal/common/eal_common_debug.c
> index 722468754d..15418e957f 100644
> --- a/lib/librte_eal/common/eal_common_debug.c
> +++ b/lib/librte_eal/common/eal_common_debug.c
> @@ -7,14 +7,6 @@
>  #include 
>  #include 
>
> -/* not implemented */
> -void
> -rte_dump_registers(void)
> -{
> -   return;
> -}
> -
> -/* call abort(), it will generate a coredump if enabled */
>  void
>  __rte_panic(const char *funcname, const char *format, ...)
>  {
> @@ -25,8 +17,7 @@ __rte_panic(const char *funcname, const char *format, ...)
> rte_vlog(RTE_LOG_CRIT, RTE_LOGTYPE_EAL, format, ap);
> va_end(ap);
> rte_dump_stack();
> -   rte_dump_registers();
> -   abort();
> +   abort(); /* generate a coredump if enabled */
>  }
>
>  /*
> @@ -46,14 +37,8 @@ rte_exit(int exit_code, const char *format, ...)
> rte_vlog(RTE_LOG_CRIT, RTE_LOGTYPE_EAL, format, ap);
> va_end(ap);
>
> -#ifndef RTE_EAL_ALWAYS_PANIC_ON_ERROR
> if (rte_eal_cleanup() != 0)
> RTE_LOG(CRIT, EAL,
> "EAL could not release all resources\n");
> exit(exit_code);
> -#else
> -   rte_dump_stack();
> -   rte_dump_registers();
> -   abort();
> -#endif
>  }
> diff --git a/lib/librte_eal/include/rte_debug.h 
> b/lib/librte_eal/include/rte_debug.h
> index 50052c5a90..c4bc71ce28 100644
> --- a/lib/librte_eal/include/rte_debug.h
> +++ b/lib/librte_eal/include/rte_debug.h
> @@ -26,13 +26,6 @@ extern "C" {
>   */
>  void rte_dump_stack(void);
>
> -/**
> - * Dump the registers of the calling core to the console.
> - *
> - * Note: Not implemented in a userapp environment; use gdb instead.
> - */
> -void rte_dump_registers(void);
> -
>  /**
>   * Provide notification of a critical non-recoverable error and terminate
>   * execution abnormally.
> diff --git a/lib/librte_eal/rte_eal_version.map 
> b/

Re: [dpdk-dev] [PATCH v5 03/15] distributor: do not use oldpkt when not needed

[David Hunt]

Hi Lukasz,

On 8/10/2020 6:23 AM, Lukasz Wojciechowski wrote:

rte_distributor_request_pkt and rte_distributor_get_pkt dereferenced
oldpkt parameter when in RTE_DIST_ALG_SINGLE even if number
of returned buffers from worker to distributor was 0.

This patch passes NULL to the legacy API when number of returned
buffers is 0. This allows passing NULL as oldpkt parameter.

Distributor tests are also updated passing NULL as oldpkt and
0 as number of returned packets, where packets are not returned.

Fixes: 775003ad2f96 ("distributor: add new burst-capable library")
Cc: david.h...@intel.com
Cc: sta...@dpdk.org

Signed-off-by: Lukasz Wojciechowski 
---



Good edge-case catch, thanks.

Acked-by: David Hunt 

[dpdk-dev] [PATCH v2 1/1] cryptodev: remove v20 ABI compatibility

[Adam Dybkowski]

This reverts commit a0f0de06d457753c94688d551a6e8659b4d4e041 as the
rte_cryptodev_info_get function versioning was a temporary solution
to maintain ABI compatibility for ChaCha20-Poly1305 and is not
needed in 20.11.

Fixes: a0f0de06d457 ("cryptodev: fix ABI compatibility for ChaCha20-Poly1305")

Signed-off-by: Adam Dybkowski 
Reviewed-by: Arek Kusztal 
Acked-by: Arek Kusztal 
---
 lib/librte_cryptodev/meson.build  |   1 -
 lib/librte_cryptodev/rte_cryptodev.c  | 150 +-
 lib/librte_cryptodev/rte_cryptodev.h  |  34 +---
 .../rte_cryptodev_version.map |   6 -
 4 files changed, 5 insertions(+), 186 deletions(-)

diff --git a/lib/librte_cryptodev/meson.build b/lib/librte_cryptodev/meson.build
index df1144058..c4c6b3b6a 100644
--- a/lib/librte_cryptodev/meson.build
+++ b/lib/librte_cryptodev/meson.build
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2019 Intel Corporation
 
-use_function_versioning = true
 sources = files('rte_cryptodev.c', 'rte_cryptodev_pmd.c', 
'cryptodev_trace_points.c')
 headers = files('rte_cryptodev.h',
'rte_cryptodev_pmd.h',
diff --git a/lib/librte_cryptodev/rte_cryptodev.c 
b/lib/librte_cryptodev/rte_cryptodev.c
index 1dd795bcb..cda160f61 100644
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -36,8 +36,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 
 #include "rte_crypto.h"
 #include "rte_cryptodev.h"
@@ -59,15 +57,6 @@ static struct rte_cryptodev_global cryptodev_globals = {
 /* spinlock for crypto device callbacks */
 static rte_spinlock_t rte_cryptodev_cb_lock = RTE_SPINLOCK_INITIALIZER;
 
-static const struct rte_cryptodev_capabilities
-   cryptodev_undefined_capabilities[] = {
-   RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
-};
-
-static struct rte_cryptodev_capabilities
-   *capability_copy[RTE_CRYPTO_MAX_DEVS];
-static uint8_t is_capability_checked[RTE_CRYPTO_MAX_DEVS];
-
 /**
  * The user application callback description.
  *
@@ -291,43 +280,8 @@ rte_crypto_auth_operation_strings[] = {
[RTE_CRYPTO_AUTH_OP_GENERATE]   = "generate"
 };
 
-const struct rte_cryptodev_symmetric_capability __vsym *
-rte_cryptodev_sym_capability_get_v20(uint8_t dev_id,
-   const struct rte_cryptodev_sym_capability_idx *idx)
-{
-   const struct rte_cryptodev_capabilities *capability;
-   struct rte_cryptodev_info dev_info;
-   int i = 0;
-
-   rte_cryptodev_info_get_v20(dev_id, &dev_info);
-
-   while ((capability = &dev_info.capabilities[i++])->op !=
-   RTE_CRYPTO_OP_TYPE_UNDEFINED) {
-   if (capability->op != RTE_CRYPTO_OP_TYPE_SYMMETRIC)
-   continue;
-
-   if (capability->sym.xform_type != idx->type)
-   continue;
-
-   if (idx->type == RTE_CRYPTO_SYM_XFORM_AUTH &&
-   capability->sym.auth.algo == idx->algo.auth)
-   return &capability->sym;
-
-   if (idx->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
-   capability->sym.cipher.algo == idx->algo.cipher)
-   return &capability->sym;
-
-   if (idx->type == RTE_CRYPTO_SYM_XFORM_AEAD &&
-   capability->sym.aead.algo == idx->algo.aead)
-   return &capability->sym;
-   }
-
-   return NULL;
-}
-VERSION_SYMBOL(rte_cryptodev_sym_capability_get, _v20, 20.0);
-
-const struct rte_cryptodev_symmetric_capability __vsym *
-rte_cryptodev_sym_capability_get_v21(uint8_t dev_id,
+const struct rte_cryptodev_symmetric_capability *
+rte_cryptodev_sym_capability_get(uint8_t dev_id,
const struct rte_cryptodev_sym_capability_idx *idx)
 {
const struct rte_cryptodev_capabilities *capability;
@@ -359,11 +313,6 @@ rte_cryptodev_sym_capability_get_v21(uint8_t dev_id,
 
return NULL;
 }
-MAP_STATIC_SYMBOL(const struct rte_cryptodev_symmetric_capability *
-   rte_cryptodev_sym_capability_get(uint8_t dev_id,
-   const struct rte_cryptodev_sym_capability_idx *idx),
-   rte_cryptodev_sym_capability_get_v21);
-BIND_DEFAULT_SYMBOL(rte_cryptodev_sym_capability_get, _v21, 21);
 
 static int
 param_range_check(uint16_t size, const struct rte_crypto_param_range *range)
@@ -1085,12 +1034,6 @@ rte_cryptodev_close(uint8_t dev_id)
retval = (*dev->dev_ops->dev_close)(dev);
rte_cryptodev_trace_close(dev_id, retval);
 
-   if (capability_copy[dev_id]) {
-   free(capability_copy[dev_id]);
-   capability_copy[dev_id] = NULL;
-   }
-   is_capability_checked[dev_id] = 0;
-
if (retval < 0)
return retval;
 
@@ -1233,89 +1176,8 @@ rte_cryptodev_stats_reset(uint8_t dev_id)
(*dev->dev_ops->stats_reset)(dev);
 }
 
-static void
-get_v20_capabilities(uint8_t dev_id, struct rte_cryptod

[dpdk-dev] [PATCH v2 0/1] cryptodev: remove v20 ABI compatibility

[Adam Dybkowski]

This reverts commit cryptodev: fix ABI compatibility for ChaCha20-Poly1305 as 
the
rte_cryptodev_info_get function versioning was a temporary solution
to maintain ABI compatibility for ChaCha20-Poly1305 and is not
needed in 20.11.

Adam Dybkowski (1):
  cryptodev: remove v20 ABI compatibility

--
v2:
* minor styling issues corrected (removed empty lines)

--
 lib/librte_cryptodev/meson.build  |   1 -
 lib/librte_cryptodev/rte_cryptodev.c  | 150 +-
 lib/librte_cryptodev/rte_cryptodev.h  |  34 +---
 .../rte_cryptodev_version.map |   6 -
 4 files changed, 5 insertions(+), 186 deletions(-)

-- 
2.25.1

Re: [dpdk-dev] [PATCH v4 02/10] eal: add power management intrinsics

[Thomas Monjalon]

> Add two new power management intrinsics, and provide an implementation
> in eal/x86 based on UMONITOR/UMWAIT instructions. The instructions
> are implemented as raw byte opcodes because there is not yet widespread
> compiler support for these instructions.
> 
> The power management instructions provide an architecture-specific
> function to either wait until a specified TSC timestamp is reached, or
> optionally wait until either a TSC timestamp is reached or a memory
> location is written to. The monitor function also provides an optional
> comparison, to avoid sleeping when the expected write has already
> happened, and no more writes are expected.
> 
> For more details, Please reference Intel SDM Volume 2.

I really would like to see feedbacks from other arch maintainers.
Unfortunately they were not Cc'ed.

Also please mark the new functions as experimental.

Re: [dpdk-dev] [PATCH v2] eal: add new prefetch write variants

[Van Haaren, Harry]

> -Original Message-
> From: David Marchand 
> Sent: Thursday, October 8, 2020 8:43 AM
> To: Van Haaren, Harry ; Richardson, Bruce
> ; Ananyev, Konstantin
> ; Jerin Jacob Kollanukkaran 
> ;
> Ruifeng Wang (Arm Technology China) ; Jan Viktorin
> ; David Christensen ;
> Honnappa Nagarahalli 
> Cc: dev ; Pavan Nikhilesh 
> Subject: Re: [dpdk-dev] [PATCH v2] eal: add new prefetch write variants
> 
> On Mon, Sep 14, 2020 at 5:09 PM Harry van Haaren
>  wrote:
> >
> > This commit adds a new rte_prefetch0_write() variants, suggesting to the
> > compiler to use a prefetch instruction with intention to write. As a
> > compiler builtin, the compiler can choose based on compilation target
> > what the best implementation for this instruction is.
> >
> > Signed-off-by: Harry van Haaren 
> 
> No review, copying arch maintainers.
> 
> --
> David Marchand

Hey All,

Actually Pavan provided some feedback to add prefetch1 and prefetch2 variants:
https://mails.dpdk.org/archives/dev/2020-September/thread.html#180501

I can push a v3 with those changes later today, will CC folks here.

Thanks, -Harry

Re: [dpdk-dev] [PATCH v2] eal: add new prefetch write variants

[Van Haaren, Harry]

> -Original Message-
> From: Van Haaren, Harry
> Sent: Thursday, October 8, 2020 9:34 AM
> To: David Marchand ; Richardson, Bruce
> ; Ananyev, Konstantin
> ; Jerin Jacob Kollanukkaran 
> ;
> Ruifeng Wang (Arm Technology China) ; Jan Viktorin
> ; David Christensen ;
> Honnappa Nagarahalli 
> Cc: dev ; Pavan Nikhilesh 
> Subject: RE: [dpdk-dev] [PATCH v2] eal: add new prefetch write variants
> 
> > -Original Message-
> > From: David Marchand 
> > Sent: Thursday, October 8, 2020 8:43 AM
> > To: Van Haaren, Harry ; Richardson, Bruce
> > ; Ananyev, Konstantin
> > ; Jerin Jacob Kollanukkaran
> ;
> > Ruifeng Wang (Arm Technology China) ; Jan Viktorin
> > ; David Christensen ;
> > Honnappa Nagarahalli 
> > Cc: dev ; Pavan Nikhilesh 
> > Subject: Re: [dpdk-dev] [PATCH v2] eal: add new prefetch write variants
> >
> > On Mon, Sep 14, 2020 at 5:09 PM Harry van Haaren
> >  wrote:
> > >
> > > This commit adds a new rte_prefetch0_write() variants, suggesting to the
> > > compiler to use a prefetch instruction with intention to write. As a
> > > compiler builtin, the compiler can choose based on compilation target
> > > what the best implementation for this instruction is.
> > >
> > > Signed-off-by: Harry van Haaren 
> >
> > No review, copying arch maintainers.
> >
> > --
> > David Marchand
> 
> Hey All,
> 
> Actually Pavan provided some feedback to add prefetch1 and prefetch2 variants:
> https://mails.dpdk.org/archives/dev/2020-September/thread.html#180501
> 
> I can push a v3 with those changes later today, will CC folks here.
> 
> Thanks, -Harry

... apologies - David you're right - the v2 on list already has those changes: 
http://patches.dpdk.org/patch/77632/ reviews welcome!

Re: [dpdk-dev] [PATCH v5 1/3] app/testpmd: add GENEVE parsing

[Ophir Munk]

> -Original Message-
> From: Ferruh Yigit 
> Sent: Wednesday, October 7, 2020 7:25 PM
> To: Ophir Munk ; dev@dpdk.org; Wenzhuo Lu
<...>
> Only when user set via "--geneve-port=N", it is the port for testpmd to parse
> (same for 'geneve_udp_port' global variable), but when user give command
> "port config N add geneve X" it is to configure the NIC to offload the 
> parsing.
> This is too confusing, user can't know (or remember) this without checking
> the source code.
> 
> Can we rename the command and variable to highlight that it is for testpmd
> to parse, I think that will be enough, instead of trying to merge them, which
> is hard as you described above.
> 
> What do you think for "--testpmd-geneve-port=N" parameter and
> 'testpmd_geneve_udp_port' variable name?

I am suggesting two options:
1. "--geneve-port-identifier=N" and "geneve_udp_port_identifier" as variable 
name.
2. "--geneve-parsed-port=N" and "geneve_udp_port" as variable name.
Can you select one of them?

> We can also update the documentation to say this is only the port testpmd
> uses for parsing, HW may be configured to use another port.
> 

Will update documentation.

<...>
> > Done in v6. I added other missing tunnel protocols (in alphabetical order)
> such as "gtp". Since it is more than geneve I added it to the 3rd (cleanup)
> commit.
> >
> 
> Would you mind adding the 'geneve' with the patch adding 'geneve' support
> (1/3), and add the other missing ones in the patch 3/3 ?

Will update accordingly

Re: [dpdk-dev] [PATCH v4 02/10] eal: add power management intrinsics

[Jerin Jacob]

On Thu, Oct 8, 2020 at 2:04 PM Thomas Monjalon  wrote:
>
> > Add two new power management intrinsics, and provide an implementation
> > in eal/x86 based on UMONITOR/UMWAIT instructions. The instructions
> > are implemented as raw byte opcodes because there is not yet widespread
> > compiler support for these instructions.
> >
> > The power management instructions provide an architecture-specific
> > function to either wait until a specified TSC timestamp is reached, or
> > optionally wait until either a TSC timestamp is reached or a memory
> > location is written to. The monitor function also provides an optional
> > comparison, to avoid sleeping when the expected write has already
> > happened, and no more writes are expected.
> >
> > For more details, Please reference Intel SDM Volume 2.
>
> I really would like to see feedbacks from other arch maintainers.
> Unfortunately they were not Cc'ed.

Shared the feedback from the arm64 perspective here. Yet to get a reply on this.
http://mails.dpdk.org/archives/dev/2020-September/181646.html

> Also please mark the new functions as experimental.
>
>

Re: [dpdk-dev] [PATCH v4 03/10] ethdev: add simple power management API

[Thomas Monjalon]

> +/**
> + * Retrieve the wake up address from specific queue
> + *
> + * @param port_id
> + *   The port identifier of the Ethernet device.
> + * @param queue_id
> + *   The Tx queue on the Ethernet device for which information
> + *   will be retrieved.
> + * @param wake_addr
> + *   The pointer point to the address which is used for monitoring.
> + * @param expected
> + *   The pointer point to value to be expected when descriptor is set.
> + * @param mask
> + *   The pointer point to comparison bitmask for the expected value.
> + *
> + * @return
> + *   - 0: Success.
> + *   -EINVAL: Failed to get wake address.
> + */
> +__rte_experimental
> +int rte_eth_get_wake_addr(uint16_t port_id, uint16_t queue_id,
> + volatile void **wake_addr,
> + uint64_t *expected, uint64_t *mask);

It looks to be a very low-level API.
Can't we do something more "ready-to-use" at ethdev level?

Cc'in the relevant maintainers...
Note: sorry this comment come late but ethdev maintainers were not Cc.
Reminder: having no feedback is not a good sign, you should request comments.

Re: [dpdk-dev] [PATCH 2/3] examples/fips_validation: ignore \r in input files

[Zhang, Roy Fan]

Hi Olivier,

Anood and us had the similar discussion.

Can we change the sample application to parse version data instead,
and for the version specific code changes we will wrap them by a
branch to compare the parsed version and the expected version? 
(we probably should have done that long time ago).

I drafted a code change to parse the version data, see if you think it
is ok?

diff --git a/examples/fips_validation/fips_validation.c 
b/examples/fips_validation/fips_validation.c
index 9bdf257b8..9b6518c92 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -98,7 +98,7 @@ fips_test_parse_header(void)
uint32_t i;
char *tmp;
int ret;
-   int algo_parsed = 0;
+   int algo_parsed = 0, version_parsed = 0;
time_t t = time(NULL);
struct tm *tm_now = localtime(&t);
 
@@ -107,6 +107,27 @@ fips_test_parse_header(void)
return ret;
 
for (i = 0; i < info.nb_vec_lines; i++) {
+   /* parse the version info */
+   tmp = strstr(info.vec[i], "CAVS ");
+   if (tmp != NULL) {
+   if (version_parsed != 0) {
+   RTE_LOG(ERR, USER1,
+   "Multiple version data\n");
+   return -1;
+   }
+
+   tmp = tmp + sizeof("CAVS ");
+
+   if (strlen(tmp) >= MAX_VER_STRING_SIZE) {
+   RTE_LOG(ERR, USER1, "Version (%s) too long\n",
+   tmp);
+   return -1;
+   }
+
+   strlcpy(info.version, tmp, MAX_VER_STRING_SIZE);
+   version_parsed = 1;
+   }
+
if (!algo_parsed) {
if (strstr(info.vec[i], "AESVS")) {
algo_parsed = 1;
diff --git a/examples/fips_validation/fips_validation.h 
b/examples/fips_validation/fips_validation.h
index 75fa555fa..b8c60c55f 100644
--- a/examples/fips_validation/fips_validation.h
+++ b/examples/fips_validation/fips_validation.h
@@ -15,6 +15,9 @@
 #define MAX_BUF_SIZE   2048
 #define MAX_STRING_SIZE64
 #define MAX_DIGEST_SIZE64
+#define MAX_VER_STRING_SIZE8
+
+#define FIPS_DEF_VERSION   "21.0"
 
 #define POSITIVE_TEST  0
 #define NEGATIVE_TEST  -1
@@ -155,6 +158,7 @@ struct sha_interim_data {
 };
 
 struct fips_test_interim_info {
+   char version[MAX_VER_STRING_SIZE];
FILE *fp_rd;
FILE *fp_wr;
enum file_types file_type;


Regards,
Fan

> -Original Message-
> From: Olivier Matz 
> Sent: Tuesday, October 6, 2020 11:09 AM
> To: Zhang, Roy Fan 
> Cc: dev@dpdk.org; Kovacevic, Marko ; Akhil
> Goyal ; Kusztal, ArkadiuszX
> ; sta...@dpdk.org; Anoob Joseph
> 
> Subject: Re: [PATCH 2/3] examples/fips_validation: ignore \r in input files
> 
> Hi Fan,
> 
> On Tue, Oct 06, 2020 at 08:47:10AM +, Zhang, Roy Fan wrote:
> > Hi Olivier,
> >
> > > -Original Message-
> > > From: Olivier Matz 
> > > Sent: Tuesday, October 6, 2020 8:42 AM
> > > To: dev@dpdk.org
> > > Cc: Kovacevic, Marko ; Akhil Goyal
> > > ; Zhang, Roy Fan ;
> Kusztal,
> > > ArkadiuszX ; sta...@dpdk.org
> > > Subject: [PATCH 2/3] examples/fips_validation: ignore \r in input files
> > >
> > > Some test vectors contain '\r' before '\n' (see link). Ignore them.
> > >
> > > Link: https://www.openssl.org/docs/fips/testvectors-linux-2007-10-
> 10.tar.gz
> > > Fixes: 3d0fad56b74a ("examples/fips_validation: add crypto FIPS
> application")
> > > Cc: sta...@dpdk.org
> > >
> > > Signed-off-by: Olivier Matz 
> > > ---
> > >  examples/fips_validation/fips_validation.c | 2 ++
> > >  1 file changed, 2 insertions(+)
> > >
> > > diff --git a/examples/fips_validation/fips_validation.c
> > > b/examples/fips_validation/fips_validation.c
> > > index 13f763c9aa..858f581ba3 100644
> > > --- a/examples/fips_validation/fips_validation.c
> > > +++ b/examples/fips_validation/fips_validation.c
> > > @@ -33,6 +33,8 @@ get_file_line(void)
> > >
> > >   if (loc >= MAX_LINE_CHAR - 1)
> > >   return -ENOMEM;
> > > + if (c == '\r')
> > > + continue;
> > >   if (c == '\n')
> > >   break;
> > >   line[loc++] = c;
> > > --
> >
> >
> > The patch looks ok but the test file link you provided in the patch is CAVS
> > 5.3.
> >
> > As mentioned in
> > https://doc.dpdk.org/guides/sample_app_ug/fips_validation.html, the
> supported
> > CAVS supported version is 21.0 (not latest one by newer than 5.3). In CAVS
> > 21.0 test files there is no '\r' before '\n' (I suppose this is for Windows
> > right).
> 
> Thank you for your feedback.
> 
> I'm ok to drop this patch from the patchset if you feel it's useless, or
> I can update the commit log with the information you

[dpdk-dev] [PATCH v2 0/6] introduce support for hairpin between two ports

[Bing Zhao]

The patches contain the following changes:
1. new APIs to bind and unbind hairpin ports in manual binding mode.
2. new API to get the hairpin peer ports list.
3. new internal APIs for PMD to pass the queue information and
   configure the queue pair.
4. new attribute members in the hairpin queue configuraiton structure
   to specify the binding mode and enable explicit TX flow mode.
5. Testpmd support to configure the hairpin modes for two ports
   hairpin verification.
6. documents update.

---
v2:
1. add documents update
2. remove all peer ports logic from rte API
3. conf structure optimizing
4. new API to get the peer ports and testpmd change to support
   hot-plug / unplug case
---

Bing Zhao (6):
  ethdev: add hairpin bind and unbind APIs
  ethdev: add new attributes to hairpin config
  ethdev: add API to get hairpin peer ports list
  ethdev: add APIs for hairpin queue operation
  app/testpmd: change hairpin queues setup
  doc: update for two ports hairpin mode

 app/test-pmd/parameters.c|  15 +++
 app/test-pmd/testpmd.c   | 125 -
 app/test-pmd/testpmd.h   |   2 +
 doc/guides/prog_guide/rte_flow.rst   |   3 +
 doc/guides/rel_notes/release_20_11.rst   |   8 ++
 doc/guides/testpmd_app_ug/run_app.rst|   8 ++
 lib/librte_ethdev/rte_ethdev.c   | 133 +-
 lib/librte_ethdev/rte_ethdev.h   |  83 +-
 lib/librte_ethdev/rte_ethdev_driver.h| 184 +++
 lib/librte_ethdev/rte_ethdev_version.map |   6 +
 10 files changed, 558 insertions(+), 9 deletions(-)

-- 
1.8.3.1

[dpdk-dev] [PATCH v2 1/6] ethdev: add hairpin bind and unbind APIs

[Bing Zhao]

In single port hairpin mode, all the hairpin TX and RX queues belong
to the same device. After the queues are set up properly, there is
no other dependency between the TX queue and its RX peer queue. The
binding process that connected the TX and RX queues together from
hardware level will be done automatically during the device start
procedure. Everything required is configured and initialized already
for the binding process.

But in two ports hairpin mode, there will be some cross-dependences
between two different ports. Usually, the ports will be initialized
serially by the main thread but not in parallel. The earlier port
will not be able to enable the bind if the following peer port is
not yet configured with HW resources. What's more, if one port is
detached / attached dynamically, it would introduce more trouble
for the hairpin binding.

To overcome these, new APIs for binding and unbinding are added.
During startup, only the hairpin TX and RX peer queues will be set
up. Nothing will be done when starting the device if the queues are
without auto-bind attribute. Only after the required ports pair
started, the `rte_eth_hairpin_bind()` API can be called to bind the
all TX queues of the egress port to the RX queues of the peer port.
Then the connection between the egress and ingress ports pair will
be established.

The `rte_eth_hairpin_unbind()` API could be used to disconnect the
egress and the peer ingress ports. This should only be called before
the device is closed if needed. When doing the clean up, all the
egress and ingress pairs related to a single port should be taken
into consideration, especially in the hot unplug case.

Signed-off-by: Bing Zhao 
---
v2: remove the all peer ports logic from rte API
---
 lib/librte_ethdev/rte_ethdev.c   | 46 
 lib/librte_ethdev/rte_ethdev.h   | 51 +++
 lib/librte_ethdev/rte_ethdev_driver.h| 52 
 lib/librte_ethdev/rte_ethdev_version.map |  2 ++
 4 files changed, 151 insertions(+)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 0f56541..85a19bd 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -2162,6 +2162,52 @@ struct rte_eth_dev *
return eth_err(port_id, ret);
 }
 
+int
+rte_eth_hairpin_bind(uint16_t tx_port, uint16_t rx_port)
+{
+   struct rte_eth_dev *dev;
+   int ret;
+
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(tx_port, -EINVAL);
+   dev = &rte_eth_devices[tx_port];
+   if (!dev->data->dev_started) {
+   RTE_ETHDEV_LOG(ERR, "TX port %d is not started", tx_port);
+   return -EBUSY;
+   }
+
+   RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->hairpin_bind, -ENOTSUP);
+   ret = (*dev->dev_ops->hairpin_bind)(dev, rx_port);
+   if (ret)
+   RTE_ETHDEV_LOG(ERR, "Failed to bind hairpin TX %d "
+  "to RX %d (%d - all ports)", tx_port,
+  rx_port, RTE_MAX_ETHPORTS);
+
+   return ret;
+}
+
+int
+rte_eth_hairpin_unbind(uint16_t tx_port, uint16_t rx_port)
+{
+   struct rte_eth_dev *dev;
+   int ret;
+
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(tx_port, -EINVAL);
+   dev = &rte_eth_devices[tx_port];
+   if (!dev->data->dev_started) {
+   RTE_ETHDEV_LOG(ERR, "TX port %d is already stopped", tx_port);
+   return -EBUSY;
+   }
+
+   RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->hairpin_unbind, -ENOTSUP);
+   ret = (*dev->dev_ops->hairpin_unbind)(dev, rx_port);
+   if (ret)
+   RTE_ETHDEV_LOG(ERR, "Failed to unbind hairpin "
+  "TX %d from RX %d (%d - all ports)", tx_port,
+  rx_port, RTE_MAX_ETHPORTS);
+
+   return ret;
+}
+
 void
 rte_eth_tx_buffer_drop_callback(struct rte_mbuf **pkts, uint16_t unsent,
void *userdata __rte_unused)
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index d2bf74f..6206643 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -2128,6 +2128,57 @@ int rte_eth_tx_queue_setup(uint16_t port_id, uint16_t 
tx_queue_id,
 const struct rte_eth_hairpin_conf *conf);
 
 /**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ *
+ * Bind all hairpin TX queues of one port to the RX queues of the peer port.
+ * It is only allowed to call this API after all hairpin queues are configured
+ * properly and the devices of TX and peer RX are in started state.
+ *
+ * @param tx_port
+ *   The TX port identifier of the Ethernet device.
+ * @param rx_port
+ *   The peer RX port identifier of the Ethernet device.
+ *   RTE_MAX_ETHPORTS is allowed for the traversal of all devices.
+ *   RX port ID could have the same value with TX port ID.
+ *
+ * @return
+ *   - (0) if successful.
+ *   - (-EINVAL) if bad parameter.
+ *   - (-EBUSY) if 

[dpdk-dev] [PATCH v2 2/6] ethdev: add new attributes to hairpin config

[Bing Zhao]

To support two ports hairpin mode and keep the backward compatibility
for the application, two new attribute members of hairpin queue
configuration structure are added.

`tx_explicit` means if the application itself will insert the TX part
flow rules. If not set, PMD will insert the rules implicitly.
`manual_bind` means if the hairpin TX queue and peer RX queue will be
bound automatically during device start stage.

Different TX and RX queue pairs could have different values, but it
is highly recommended that all paired queues between one egress and
its peer ingress ports have the same values, in order not to bring
any chaos to the system. The actual support of these attribute
parameters will be checked and decided by the PMD drivers.

In a single port hairpin, if both are zero without any setting, the
behavior will remain the same as before. It means no bind API needs
to be called and no TX flow rules need to be inserted manually by
the application.

Signed-off-by: Bing Zhao 
---
v2: optimize the structure and remove unused macros
---
 lib/librte_ethdev/rte_ethdev.c | 8 
 lib/librte_ethdev/rte_ethdev.h | 5 -
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 85a19bd..a4adeff 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -1954,13 +1954,13 @@ struct rte_eth_dev *
}
if (conf->peer_count > cap.max_rx_2_tx) {
RTE_ETHDEV_LOG(ERR,
-   "Invalid value for number of peers for Rx queue(=%hu), 
should be: <= %hu",
+   "Invalid value for number of peers for Rx queue(=%u), 
should be: <= %hu",
conf->peer_count, cap.max_rx_2_tx);
return -EINVAL;
}
if (conf->peer_count == 0) {
RTE_ETHDEV_LOG(ERR,
-   "Invalid value for number of peers for Rx queue(=%hu), 
should be: > 0",
+   "Invalid value for number of peers for Rx queue(=%u), 
should be: > 0",
conf->peer_count);
return -EINVAL;
}
@@ -2125,13 +2125,13 @@ struct rte_eth_dev *
}
if (conf->peer_count > cap.max_tx_2_rx) {
RTE_ETHDEV_LOG(ERR,
-   "Invalid value for number of peers for Tx queue(=%hu), 
should be: <= %hu",
+   "Invalid value for number of peers for Tx queue(=%u), 
should be: <= %hu",
conf->peer_count, cap.max_tx_2_rx);
return -EINVAL;
}
if (conf->peer_count == 0) {
RTE_ETHDEV_LOG(ERR,
-   "Invalid value for number of peers for Tx queue(=%hu), 
should be: > 0",
+   "Invalid value for number of peers for Tx queue(=%u), 
should be: > 0",
conf->peer_count);
return -EINVAL;
}
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index 6206643..94a981c 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -1045,7 +1045,10 @@ struct rte_eth_hairpin_peer {
  * A structure used to configure hairpin binding.
  */
 struct rte_eth_hairpin_conf {
-   uint16_t peer_count; /**< The number of peers. */
+   uint32_t peer_count:16; /**< The number of peers. */
+   uint32_t tx_explicit:1; /**< Explicit TX flow rule mode. */
+   uint32_t manual_bind:1; /**< Manually bind hairpin queues. */
+   uint32_t reserved:14; /**< Reserved bits. */
struct rte_eth_hairpin_peer peers[RTE_ETH_MAX_HAIRPIN_PEERS];
 };
 
-- 
1.8.3.1

[dpdk-dev] [PATCH v2 3/6] ethdev: add API to get hairpin peer ports list

[Bing Zhao]

After hairpin queues are configured, in general, the application will
maintain the ports topology and even the queues configuration for
hairpin. But sometimes it will not.

If there is no hot-plug, it is easy to bind and unbind hairpin among
all the ports. The application can just connect or disconnect the
hairpin egress ports to / from all the probed ingress ports. Then
all the connections could be handled properly.

But with hot-plug / hot-unplug, one port could be probed and removed
dynamically. With two ports hairpin, all the connections from and to
this port should be handled after start(bind) or before stop(unbind).
It is necessary to know the hairpin topology with this port.

This API will return the ports list with the actual peer ports number
after configuration. Either peer RX or TX ports will be gotten with
this function call.

Signed-off-by: Bing Zhao 
---
 lib/librte_ethdev/rte_ethdev.c   | 24 
 lib/librte_ethdev/rte_ethdev.h   | 27 +++
 lib/librte_ethdev/rte_ethdev_driver.h| 30 ++
 lib/librte_ethdev/rte_ethdev_version.map |  1 +
 4 files changed, 82 insertions(+)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index a4adeff..ea7892a 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -2208,6 +2208,30 @@ struct rte_eth_dev *
return ret;
 }
 
+int
+rte_eth_hairpin_get_peer_ports(uint16_t cur_port, uint16_t *peer_ports,
+  bool direction)
+{
+   struct rte_eth_dev *dev;
+   int ret;
+
+   if (!peer_ports)
+   return -EINVAL;
+
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(cur_port, -EINVAL);
+   dev = &rte_eth_devices[cur_port];
+   RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->hairpin_get_peer_ports,
+   -ENOTSUP);
+
+   ret = (*dev->dev_ops->hairpin_get_peer_ports)(dev, peer_ports,
+ direction);
+   if (ret < 0)
+   RTE_ETHDEV_LOG(ERR, "Failed to get %d hairpin peer %s ports",
+  cur_port, direction ? "RX" : "TX");
+
+   return ret;
+}
+
 void
 rte_eth_tx_buffer_drop_callback(struct rte_mbuf **pkts, uint16_t unsent,
void *userdata __rte_unused)
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index 94a981c..6680de2 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -2134,6 +2134,33 @@ int rte_eth_tx_queue_setup(uint16_t port_id, uint16_t 
tx_queue_id,
  * @warning
  * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
  *
+ * Get all the hairpin peer RX / TX ports of the current port.
+ * The caller should ensure that the array is large enough to save the ports
+ * list.
+ *
+ * @param cur_port
+ *   The current port identifier of the Ethernet device.
+ * @param peer_ports
+ *   Pointer to the array to save the peer ports list *
+ * @param direction
+ *   Current port to peer port direction
+ *   true - current used as TX to get all peer RX ports.
+ *   false - current used as RX to get all peer TX ports.
+ *
+ * @return
+ *   - (0 or positive) actual peer ports number.
+ *   - (-EINVAL) if bad parameter.
+ *   - (-ENOTSUP) if hardware doesn't support.
+ *   - Others detailed errors from PMD drivers.
+ */
+__rte_experimental
+int rte_eth_hairpin_get_peer_ports(uint16_t cur_port, uint16_t *peer_ports,
+  bool direction);
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change, or be removed, without prior notice
+ *
  * Bind all hairpin TX queues of one port to the RX queues of the peer port.
  * It is only allowed to call this API after all hairpin queues are configured
  * properly and the devices of TX and peer RX are in started state.
diff --git a/lib/librte_ethdev/rte_ethdev_driver.h 
b/lib/librte_ethdev/rte_ethdev_driver.h
index f8eb879..ecca9d6 100644
--- a/lib/librte_ethdev/rte_ethdev_driver.h
+++ b/lib/librte_ethdev/rte_ethdev_driver.h
@@ -576,6 +576,34 @@ typedef int (*eth_tx_hairpin_queue_setup_t)
 
 /**
  * @internal
+ * Get all hairpin TX/RX peer ports of the current device, if any.
+ *
+ * @param dev
+ *   ethdev handle of port.
+ * @param peer_ports
+ *   array to save the ports list.
+ * @param direction
+ *   value to decide the current to peer direction
+ *   true - used as TX to get all peer RX ports.
+ *   false - used as RX to get all peer TX ports.
+ *
+ * @return
+ *   Negative errno value on error, 0 or positive on success.
+ *
+ * @retval 0
+ *   Success, no peer ports.
+ * @retval >0
+ *   Actual number of the peer ports.
+ * @retval -ENOTSUP
+ *   Get peer ports API is not supported.
+ * @retval -EINVAL
+ *   One of the parameters is invalid.
+ */
+typedef int (*hairpin_get_peer_ports_t)(struct rte_eth_dev *dev,
+   uint16_t *peer_ports, bool direction);
+
+/*

[dpdk-dev] [PATCH v2 6/6] doc: update for two ports hairpin mode

[Bing Zhao]

In the release notes, 2 ports hairpin mode feature is added.

In rte flow part, one suggestion is added to mention that metadata
could be used to connect the hairpin RX and TX flows if the hairpin
is working in explicit TX flow rule mode.

In the testpmd command line, the new parameter to set hairpin working
mode is described.

Signed-off-by: Bing Zhao 
---
 doc/guides/prog_guide/rte_flow.rst | 3 +++
 doc/guides/rel_notes/release_20_11.rst | 8 
 doc/guides/testpmd_app_ug/run_app.rst  | 8 
 3 files changed, 19 insertions(+)

diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index 119b128..bb54d67 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -2592,6 +2592,9 @@ set, unpredictable value will be seen depending on driver 
implementation. For
 loopback/hairpin packet, metadata set on Rx/Tx may or may not be propagated to
 the other path depending on HW capability.
 
+In hairpin case with TX explicit flow mode, metadata could (not mandatory) be
+used to connect the RX and TX flows if it can be propagated from RX to TX path.
+
 .. _table_rte_flow_action_set_meta:
 
 .. table:: SET_META
diff --git a/doc/guides/rel_notes/release_20_11.rst 
b/doc/guides/rel_notes/release_20_11.rst
index 0b2a370..05ceea0 100644
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -109,6 +109,10 @@ New Features
   * Extern objects and functions can be plugged into the pipeline.
   * Transaction-oriented table updates.
 
+* **Updated the ethdev library to support hairpin between two ports.**
+
+  New APIs are introduced to support binding / unbinding 2 ports hairpin.
+  Hairpin TX part flow rules can be inserted explicitly.
 
 Removed Items
 -
@@ -240,6 +244,10 @@ ABI Changes
 
   * ``ethdev`` internal functions are marked with ``__rte_internal`` tag.
 
+  * ``struct rte_eth_hairpin_conf`` has two new members:
+
+* ``uint32_t tx_explicit:1;``
+* ``uint32_t manual_bind:1;``
 
 Known Issues
 
diff --git a/doc/guides/testpmd_app_ug/run_app.rst 
b/doc/guides/testpmd_app_ug/run_app.rst
index e2539f6..4e627c4 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -497,3 +497,11 @@ The command line options are:
 *   ``--record-burst-stats``
 
 Enable display of RX and TX burst stats.
+
+*   ``--hairpin-mode=0xXX``
+
+Set the hairpin port mode with bitmask, only valid when hairpin queues 
number is set.
+bit 4 - explicit TX flow rule
+bit 1 - two hairpin ports paired
+bit 0 - two hairpin ports loop
+The default value is 0. Hairpin will use single port mode and implicit TX 
flow mode.
-- 
1.8.3.1

[dpdk-dev] [PATCH v2 4/6] ethdev: add APIs for hairpin queue operation

[Bing Zhao]

Every hairpin queue pair should be configured properly and the
connection between TX and RX queues should be established, before
hairpin function works. In single port hairpin mode, the queues of
each pair belong to the same device. It is easy to get the hardware
and software information of each queue and configure the hairpin
connection with such information. In two ports hairpin mode, it is
not easy or inappropriate to access one queue's information from
another device.

Since hairpin is configured per queue pair, three new APIs are
introduced and they are internal for the PMD using.

The peer update API helps to pass one queue's information to the
peer queue and get the peer's information back for the next step.
The peer bind API configures the current queue with the peer's
information. For each hairpin queue pair, this API may need to be
called twice to configure the TX, RX queues separately.
The peer unbind API resets the current queue configuration and state
to disconnect it from the peer queue. Also, it may need to be called
twice to disconnect TX, RX queues from each other.

Some parameter of the above APIs might not be mandatory, and it
depends on the PMD implementation.

The structure of `rte_hairpin_peer_info` is only a declaration and
the actual members will be defined in each PMD when being used.

Signed-off-by: Bing Zhao 
---
 lib/librte_ethdev/rte_ethdev.c   |  55 +
 lib/librte_ethdev/rte_ethdev_driver.h| 102 +++
 lib/librte_ethdev/rte_ethdev_version.map |   3 +
 3 files changed, 160 insertions(+)

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index ea7892a..4a77497 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -5459,6 +5459,61 @@ enum rte_eth_switch_domain_state {
return 0;
 }
 
+int
+rte_eth_hairpin_queue_peer_update(uint16_t peer_port, uint16_t peer_queue,
+ struct rte_hairpin_peer_info *cur_info,
+ struct rte_hairpin_peer_info *peer_info,
+ bool direction)
+{
+   struct rte_eth_dev *dev;
+
+   /* Current queue information is not mandatory. */
+   if (peer_info == NULL)
+   return -EINVAL;
+
+   /* No need to check the validity again. */
+   dev = &rte_eth_devices[peer_port];
+   RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->hairpin_queue_peer_update,
+   -ENOTSUP);
+
+   return (*dev->dev_ops->hairpin_queue_peer_update)(dev, peer_queue,
+   cur_info, peer_info, direction);
+}
+
+int
+rte_eth_hairpin_queue_peer_bind(uint16_t cur_port, uint16_t cur_queue,
+   struct rte_hairpin_peer_info *peer_info,
+   bool direction)
+{
+   struct rte_eth_dev *dev;
+
+   if (peer_info == NULL)
+   return -EINVAL;
+
+   /* No need to check the validity again. */
+   dev = &rte_eth_devices[cur_port];
+   RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->hairpin_queue_peer_bind,
+   -ENOTSUP);
+
+   return (*dev->dev_ops->hairpin_queue_peer_bind)(dev, cur_queue,
+   peer_info, direction);
+}
+
+int
+rte_eth_hairpin_queue_peer_unbind(uint16_t cur_port, uint16_t cur_queue,
+ bool direction)
+{
+   struct rte_eth_dev *dev;
+
+   /* No need to check the validity again. */
+   dev = &rte_eth_devices[cur_port];
+   RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->hairpin_queue_peer_unbind,
+   -ENOTSUP);
+
+   return (*dev->dev_ops->hairpin_queue_peer_unbind)(dev, cur_queue,
+ direction);
+}
+
 RTE_LOG_REGISTER(rte_eth_dev_logtype, lib.ethdev, INFO);
 
 RTE_INIT(ethdev_init_telemetry)
diff --git a/lib/librte_ethdev/rte_ethdev_driver.h 
b/lib/librte_ethdev/rte_ethdev_driver.h
index ecca9d6..713b82d 100644
--- a/lib/librte_ethdev/rte_ethdev_driver.h
+++ b/lib/librte_ethdev/rte_ethdev_driver.h
@@ -21,6 +21,9 @@
 extern "C" {
 #endif
 
+/**< @internal Declaration of the hairpin peer queue information structure. */
+struct rte_hairpin_peer_info;
+
 /*
  * Definitions of all functions exported by an Ethernet driver through the
  * generic structure of type *eth_dev_ops* supplied in the *rte_eth_dev*
@@ -650,6 +653,21 @@ typedef int (*eth_hairpin_bind_t)(struct rte_eth_dev *dev,
 typedef int (*eth_hairpin_unbind_t)(struct rte_eth_dev *dev,
  uint16_t rx_port);
 
+typedef int (*eth_hairpin_queue_peer_update_t)
+   (struct rte_eth_dev *dev, uint16_t peer_queue,
+struct rte_hairpin_peer_info *current_info,
+struct rte_hairpin_peer_info *peer_info, bool direction);
+/**< @internal Update and fetch peer queue information. */
+
+typedef int (*eth_hairpin_queue_peer_bind_t)

[dpdk-dev] [PATCH v2 5/6] app/testpmd: change hairpin queues setup

[Bing Zhao]

A new parameter `hairpin-mode` is introduced to the testpmd command
line. Bitmask value is used to provide more flexible configuration.
This parameter should be used when `hairpinq` is specified in the
command line.

Bit 0 in the LSB indicates the hairpin will use the loop mode. The
previous port RX queue will be connected to the current port TX
queue.
Bit 1 in the LSB indicates the hairpin will use pair port mode. The
even index port will be paired with the next odd index port. If the
total number of probed port is odd, then the last one will be paired
to itself.
If this byte is zero, then each port will be paired to itself.
Bit 0 takes a higher priority in the checking.

Bit 4 in the second bytes indicate if the hairpin will use explicit
TX flow mode.

e.g. in the command line, "--hairpinq=2 --hairpin-mode=0x11"

If not set, default value zero will be used and the behavior will
try to get align with the previous single port mode. If the ports
belong to different vendors' NICs, it is suggested to use the `self`
hairpin mode only.

Since hairpin configures the hardware resources, the port mask of
packets forwarding engine will not be used here.

Signed-off-by: Bing Zhao 
---
v2: move the hairpin bind/unbind into start/stop to support hot-plug
and hot-unplug
---
 app/test-pmd/parameters.c |  15 ++
 app/test-pmd/testpmd.c| 125 --
 app/test-pmd/testpmd.h|   2 +
 3 files changed, 138 insertions(+), 4 deletions(-)

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 1ead595..991029d 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -221,6 +221,9 @@
   "enabled\n");
printf("  --record-core-cycles: enable measurement of CPU cycles.\n");
printf("  --record-burst-stats: enable display of RX and TX bursts.\n");
+   printf("  --hairpin-mode=0xXX: bitmask set the hairpin port mode.\n "
+  "0x10 - explicit tx rule, 0x02 - hairpin ports paired\n"
+  "0x01 - hairpin ports loop, 0x00 - hairpin port self\n");
 }
 
 #ifdef RTE_LIBRTE_CMDLINE
@@ -644,6 +647,7 @@
{ "rxd",1, 0, 0 },
{ "txd",1, 0, 0 },
{ "hairpinq",   1, 0, 0 },
+   { "hairpin-mode",   1, 0, 0 },
{ "burst",  1, 0, 0 },
{ "mbcache",1, 0, 0 },
{ "txpt",   1, 0, 0 },
@@ -,6 +1115,17 @@
rte_exit(EXIT_FAILURE, "Either rx or tx queues 
should "
"be non-zero\n");
}
+   if (!strcmp(lgopts[opt_idx].name, "hairpin-mode")) {
+   char *end = NULL;
+   unsigned int n;
+
+   errno = 0;
+   n = strtoul(optarg, &end, 0);
+   if (errno != 0 || end == optarg)
+   rte_exit(EXIT_FAILURE, "hairpin mode 
invalid\n");
+   else
+   hairpin_mode = (uint16_t)n;
+   }
if (!strcmp(lgopts[opt_idx].name, "burst")) {
n = atoi(optarg);
if (n == 0) {
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index ccba71c..344de83 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -367,6 +367,9 @@ struct fwd_engine * fwd_engines[] = {
 /* Clear ptypes on port initialization. */
 uint8_t clear_ptypes = true;
 
+/* Hairpin ports configuration mode. */
+uint16_t hairpin_mode;
+
 /* Pretty printing of ethdev events */
 static const char * const eth_event_desc[] = {
[RTE_ETH_EVENT_UNKNOWN] = "unknown",
@@ -2345,7 +2348,7 @@ struct extmem_param {
 
 /* Configure the Rx and Tx hairpin queues for the selected port. */
 static int
-setup_hairpin_queues(portid_t pi)
+setup_hairpin_queues(portid_t pi, portid_t p_pi, uint16_t cnt_pi)
 {
queueid_t qi;
struct rte_eth_hairpin_conf hairpin_conf = {
@@ -2354,10 +2357,49 @@ struct extmem_param {
int i;
int diag;
struct rte_port *port = &ports[pi];
+   uint16_t peer_rx_port = pi;
+   uint16_t peer_tx_port = pi;
+   uint32_t manual = 1;
+   uint32_t tx_exp = hairpin_mode & 0x10;
+
+   if (!(hairpin_mode & 0xf)) {
+   peer_rx_port = pi;
+   peer_tx_port = pi;
+   manual = 0;
+   } else if (hairpin_mode & 0x1) {
+   peer_tx_port = rte_eth_find_next_owned_by(pi + 1,
+  RTE_ETH_DEV_NO_OWNER);
+   if (peer_tx_port >= RTE_MAX_ETHPORTS)
+   peer_tx_port = rte_eth_find_next_owned_

Re: [dpdk-dev] [PATCH 1/3 v2] ethdev: add rx offload to drop error packets

[Nipun Gupta]

> -Original Message-
> From: Jerin Jacob 
> Sent: Tuesday, October 6, 2020 6:44 PM
> To: Nipun Gupta 
> Cc: Stephen Hemminger ; dpdk-dev
> ; Thomas Monjalon ; Ferruh Yigit
> ; Andrew Rybchenko ;
> Hemant Agrawal ; Sachin Saxena
> ; Rohit Raj 
> Subject: Re: [dpdk-dev] [PATCH 1/3 v2] ethdev: add rx offload to drop error
> packets
> 
> On Tue, Oct 6, 2020 at 6:40 PM Nipun Gupta  wrote:
> >
> >
> >
> > > -Original Message-
> > > From: Jerin Jacob 
> > > Sent: Tuesday, October 6, 2020 5:31 PM
> > > To: Nipun Gupta 
> > > Cc: Stephen Hemminger ; dpdk-dev
> > > ; Thomas Monjalon ; Ferruh Yigit
> > > ; Andrew Rybchenko
> ;
> > > Hemant Agrawal ; Sachin Saxena
> > > ; Rohit Raj 
> > > Subject: Re: [dpdk-dev] [PATCH 1/3 v2] ethdev: add rx offload to drop 
> > > error
> > > packets
> > >
> > > On Tue, Oct 6, 2020 at 4:07 PM Nipun Gupta  wrote:
> > > >
> > > >
> > > >
> > > > > -Original Message-
> > > > > From: Jerin Jacob 
> > > > > Sent: Monday, October 5, 2020 9:40 PM
> > > > > To: Stephen Hemminger 
> > > > > Cc: Nipun Gupta ; dpdk-dev ;
> > > Thomas
> > > > > Monjalon ; Ferruh Yigit
> ;
> > > > > Andrew Rybchenko ; Hemant Agrawal
> > > > > ; Sachin Saxena ;
> > > Rohit
> > > > > Raj 
> > > > > Subject: Re: [dpdk-dev] [PATCH 1/3 v2] ethdev: add rx offload to drop
> error
> > > > > packets
> > > > >
> > > > > On Mon, Oct 5, 2020 at 9:05 PM Stephen Hemminger
> > > > >  wrote:
> > > > > >
> > > > > > On Mon,  5 Oct 2020 12:45:04 +0530
> > > > > > nipun.gu...@nxp.com wrote:
> > > > > >
> > > > > > > From: Nipun Gupta 
> > > > > > >
> > > > > > > This change adds a RX offload capability, which once enabled,
> > > > > > > hardware will drop the packets in case there of any error in
> > > > > > > the packet such as L3 checksum error or L4 checksum.
> > > > >
> > > > > IMO, Providing additional support up to the level to choose the errors
> > > > > to drops give more control to the application. Meaning,
> > > > > L1 errors such as FCS error
> > > > > L2 errors ..
> > > > > L3 errors such checksum
> > > > > i.e ethdev spec need to have  error level supported by PMD and the
> > > > > application can set the layers interested to drop.
> > > >
> > > > Agree, but 'DEV_RX_OFFLOAD_ERR_PKT_DROP' shall also be there to drop
> all
> > > the
> > > > error packets? Maybe we can rename it to
> > > DEV_RX_OFFLOAD_ALL_ERR_PKT_DROP.
> > >
> > > IMHO,  we introduce such shortcut for a single flag for all err drop
> > > then we can not change the scheme
> > > without an API/ABI break.
> >
> > Are the following offloads fine:
> > DEV_RX_OFFLOAD_L1_FCS_ERR_PKT_DROP
> > DEV_RX_OFFLOAD_L3_CSUM_ERR_PKT_DROP
> > DEV_RX_OFFLOAD_L4_CSUM_ERR_PKT_DROP
> > DEV_RX_OFFLOAD_ALL_ERR_PKT_DROP
> >
> > Please let me know in case I need to add any other too.
> 
> I think, single offload flags and some config/capability structure to
> define the additional
> layer selection would be good, instead of adding a lot of new offload flags.


+/**
+ * A structure used to enable/disable error packet drop on Rx.
+ */
+struct rte_rx_err_pkt_drop_conf {
+   /** enable/disable all RX error packet drop.
+* 0 (default) - disable, 1 enable
+*/
+   uint32_t all:1;
+};
+
 /**
  * A structure used to configure an Ethernet port.
  * Depending upon the RX multi-queue mode, extra advanced
@@ -1236,6 +1246,8 @@ struct rte_eth_conf {
uint32_t dcb_capability_en;
struct rte_fdir_conf fdir_conf; /**< FDIR configuration. DEPRECATED */
struct rte_intr_conf intr_conf; /**< Interrupt mode configuration. */
+   struct rte_rx_err_pkt_drop_conf err_pkt_drop_conf;
+   /**< RX error packet drop configuration. */

Is this the kind of changes you are talking about?

Also, more changes will be there in 'struct rte_eth_dev_info' structure, 
defining
additional separate capability something like 'uint64_t 
rx_err_drop_offload_capa'.

Regards,
Nipun

> 
> 
> > Ill send a v3.
> >
> > Thanks,
> > Nipun
> >
> > >
> > > >
> > > > Currently we have not planned to add separate knobs for separate error 
> > > > in
> > > > the driver, maybe we can define them separately, or we need have them in
> > > > this series itself?
> > >
> > > I think, ethdev API can have the capability on what are levels it
> > > supported, in your
> > > driver case, you can express the same.
> > >
> > >
> > > >
> > > > >
> > > > > > >
> > > > > > > Signed-off-by: Nipun Gupta 
> > > > > > > Signed-off-by: Rohit Raj 
> > > > > > > ---
> > > > > > > These patches are based over series:
> > > > > > >
> > > > >
> > >
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fpatchwo
> > > > >
> > >
> rk.dpdk.org%2Fpatch%2F78630%2F&data=02%7C01%7Cnipun.gupta%40nx
> > > > >
> > >
> p.com%7C90b516fd465c48945e7008d869492b3e%7C686ea1d3bc2b4c6fa92cd9
> > > > >
> > >
> 9c5c301635%7C0%7C0%7C637375110263097933&sdata=RBQswMBsfpM6
> > > > > nyKur%2FaHvOMvNK7RU%2BRyhHt%2FXBsP1OM%3D&reserved=0
> > > > > > >
> > > > > > > Chang

Re: [dpdk-dev] [PATCH v2] eal: add new prefetch write variants

[Jerin Jacob]

On Mon, Sep 14, 2020 at 8:39 PM Harry van Haaren
 wrote:
>
> This commit adds a new rte_prefetch0_write() variants, suggesting to the
> compiler to use a prefetch instruction with intention to write. As a
> compiler builtin, the compiler can choose based on compilation target
> what the best implementation for this instruction is.
>
> Signed-off-by: Harry van Haaren 
>
> ---
>
> v2:
> - Add L1, L2, and L3 variants as ARM64 uarch supports them (Pavan)
>
> The integer constants passed to the builtin are not available as
> a #define value, and doing #defines just for this write variant
> does not seems a nice solution to me... particularly for those using
> IDEs where any #define value is auto-hinted for code-completion.
> ---
>  lib/librte_eal/include/generic/rte_prefetch.h | 49 +++
>  1 file changed, 49 insertions(+)
>
> diff --git a/lib/librte_eal/include/generic/rte_prefetch.h 
> b/lib/librte_eal/include/generic/rte_prefetch.h
> index 6e47bdfbad..3dfca77a74 100644
> --- a/lib/librte_eal/include/generic/rte_prefetch.h
> +++ b/lib/librte_eal/include/generic/rte_prefetch.h
> @@ -51,4 +51,53 @@ static inline void rte_prefetch2(const volatile void *p);
>   */
>  static inline void rte_prefetch_non_temporal(const volatile void *p);
>
> +/**
> + * Prefetch a cache line into all cache levels, with intention to write. This
> + * prefetch variant hints to the CPU that the program is expecting to write 
> to
> + * the cache line being prefetched.
> + *
> + * @param p Address to prefetch
> + */
> +static inline void rte_prefetch0_write(const void *p)

Typically DPDK coding standards is to have

static inline void
rte_prefetch0_write(const void *p)

vs
static inline void rte_prefetch0_write(const void *p)

Either way:

Reviewed-by: Jerin Jacob 


> +{
> +   /* 1 indicates intention to write, 3 sets target cache level to L1. 
> See
> +* GCC docs where these integer constants are described in more 
> detail:
> +*  https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html
> +*/
> +   __builtin_prefetch(p, 1, 3);
> +}
> +
> +/**
> + * Prefetch a cache line into all cache levels, except the 0th, with 
> intention
> + * to write. This prefetch variant hints to the CPU that the program is
> + * expecting to write to the cache line being prefetched.
> + *
> + * @param p Address to prefetch
> + */
> +static inline void rte_prefetch1_write(const void *p)
> +{
> +   /* 1 indicates intention to write, 2 sets target cache level to L2. 
> See
> +* GCC docs where these integer constants are described in more 
> detail:
> +*  https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html
> +*/
> +   __builtin_prefetch(p, 1, 2);
> +}
> +
> +/**
> + * Prefetch a cache line into all cache levels, except the 0th and 1st, with
> + * intention to write. This prefetch variant hints to the CPU that the 
> program
> + * is expecting to write to the cache line being prefetched.
> + *
> + * @param p Address to prefetch
> + */
> +static inline void rte_prefetch2_write(const void *p)
> +{
> +   /* 1 indicates intention to write, 1 sets target cache level to L3. 
> See
> +* GCC docs where these integer constants are described in more 
> detail:
> +*  https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html
> +*/
> +   __builtin_prefetch(p, 1, 1);
> +}
> +
> +
>  #endif /* _RTE_PREFETCH_H_ */
> --
> 2.17.1
>

Re: [dpdk-dev] [PATCH 1/3 v2] ethdev: add rx offload to drop error packets

[Jerin Jacob]

On Thu, Oct 8, 2020 at 2:23 PM Nipun Gupta  wrote:
>
>
>
> > -Original Message-
> > From: Jerin Jacob 
> > Sent: Tuesday, October 6, 2020 6:44 PM
> > To: Nipun Gupta 
> > Cc: Stephen Hemminger ; dpdk-dev
> > ; Thomas Monjalon ; Ferruh Yigit
> > ; Andrew Rybchenko ;
> > Hemant Agrawal ; Sachin Saxena
> > ; Rohit Raj 
> > Subject: Re: [dpdk-dev] [PATCH 1/3 v2] ethdev: add rx offload to drop error
> > packets
> >
> > On Tue, Oct 6, 2020 at 6:40 PM Nipun Gupta  wrote:
> > >
> > >
> > >
> > > > -Original Message-
> > > > From: Jerin Jacob 
> > > > Sent: Tuesday, October 6, 2020 5:31 PM
> > > > To: Nipun Gupta 
> > > > Cc: Stephen Hemminger ; dpdk-dev
> > > > ; Thomas Monjalon ; Ferruh Yigit
> > > > ; Andrew Rybchenko
> > ;
> > > > Hemant Agrawal ; Sachin Saxena
> > > > ; Rohit Raj 
> > > > Subject: Re: [dpdk-dev] [PATCH 1/3 v2] ethdev: add rx offload to drop 
> > > > error
> > > > packets
> > > >
> > > > On Tue, Oct 6, 2020 at 4:07 PM Nipun Gupta  wrote:
> > > > >
> > > > >
> > > > >
> > > > > > -Original Message-
> > > > > > From: Jerin Jacob 
> > > > > > Sent: Monday, October 5, 2020 9:40 PM
> > > > > > To: Stephen Hemminger 
> > > > > > Cc: Nipun Gupta ; dpdk-dev ;
> > > > Thomas
> > > > > > Monjalon ; Ferruh Yigit
> > ;
> > > > > > Andrew Rybchenko ; Hemant Agrawal
> > > > > > ; Sachin Saxena ;
> > > > Rohit
> > > > > > Raj 
> > > > > > Subject: Re: [dpdk-dev] [PATCH 1/3 v2] ethdev: add rx offload to 
> > > > > > drop
> > error
> > > > > > packets
> > > > > >
> > > > > > On Mon, Oct 5, 2020 at 9:05 PM Stephen Hemminger
> > > > > >  wrote:
> > > > > > >
> > > > > > > On Mon,  5 Oct 2020 12:45:04 +0530
> > > > > > > nipun.gu...@nxp.com wrote:
> > > > > > >
> > > > > > > > From: Nipun Gupta 
> > > > > > > >
> > > > > > > > This change adds a RX offload capability, which once enabled,
> > > > > > > > hardware will drop the packets in case there of any error in
> > > > > > > > the packet such as L3 checksum error or L4 checksum.
> > > > > >
> > > > > > IMO, Providing additional support up to the level to choose the 
> > > > > > errors
> > > > > > to drops give more control to the application. Meaning,
> > > > > > L1 errors such as FCS error
> > > > > > L2 errors ..
> > > > > > L3 errors such checksum
> > > > > > i.e ethdev spec need to have  error level supported by PMD and the
> > > > > > application can set the layers interested to drop.
> > > > >
> > > > > Agree, but 'DEV_RX_OFFLOAD_ERR_PKT_DROP' shall also be there to drop
> > all
> > > > the
> > > > > error packets? Maybe we can rename it to
> > > > DEV_RX_OFFLOAD_ALL_ERR_PKT_DROP.
> > > >
> > > > IMHO,  we introduce such shortcut for a single flag for all err drop
> > > > then we can not change the scheme
> > > > without an API/ABI break.
> > >
> > > Are the following offloads fine:
> > > DEV_RX_OFFLOAD_L1_FCS_ERR_PKT_DROP
> > > DEV_RX_OFFLOAD_L3_CSUM_ERR_PKT_DROP
> > > DEV_RX_OFFLOAD_L4_CSUM_ERR_PKT_DROP
> > > DEV_RX_OFFLOAD_ALL_ERR_PKT_DROP
> > >
> > > Please let me know in case I need to add any other too.
> >
> > I think, single offload flags and some config/capability structure to
> > define the additional
> > layer selection would be good, instead of adding a lot of new offload flags.
>
>
> +/**
> + * A structure used to enable/disable error packet drop on Rx.
> + */
> +struct rte_rx_err_pkt_drop_conf {
> +   /** enable/disable all RX error packet drop.
> +* 0 (default) - disable, 1 enable
> +*/
> +   uint32_t all:1;
> +};
> +
>  /**
>   * A structure used to configure an Ethernet port.
>   * Depending upon the RX multi-queue mode, extra advanced
> @@ -1236,6 +1246,8 @@ struct rte_eth_conf {
> uint32_t dcb_capability_en;
> struct rte_fdir_conf fdir_conf; /**< FDIR configuration. DEPRECATED */
> struct rte_intr_conf intr_conf; /**< Interrupt mode configuration. */
> +   struct rte_rx_err_pkt_drop_conf err_pkt_drop_conf;
> +   /**< RX error packet drop configuration. */
>
> Is this the kind of changes you are talking about?


Yes.

>
> Also, more changes will be there in 'struct rte_eth_dev_info' structure, 
> defining
> additional separate capability something like 'uint64_t 
> rx_err_drop_offload_capa'.
>
> Regards,
> Nipun
>
> >
> >
> > > Ill send a v3.
> > >
> > > Thanks,
> > > Nipun
> > >
> > > >
> > > > >
> > > > > Currently we have not planned to add separate knobs for separate 
> > > > > error in
> > > > > the driver, maybe we can define them separately, or we need have them 
> > > > > in
> > > > > this series itself?
> > > >
> > > > I think, ethdev API can have the capability on what are levels it
> > > > supported, in your
> > > > driver case, you can express the same.
> > > >
> > > >
> > > > >
> > > > > >
> > > > > > > >
> > > > > > > > Signed-off-by: Nipun Gupta 
> > > > > > > > Signed-off-by: Rohit Raj 
> > > > > > > > ---
> > > > > > > > These patches are based over series:
> > > > > > > >
> > > > > >
> > > >
> > https://eur01.s

Re: [dpdk-dev] [PATCH 2/7] security: modify PDCP xform to support SDAP

[Akhil Goyal]

Hi David,
> Hi Akhil
> 
> 
> > @@ -693,6 +693,23 @@ PDCP related configuration parameters are defined
> > in ``rte_security_pdcp_xform``
> >  uint32_t hfn;
> >  /** HFN Threshold for key renegotiation */
> >  uint32_t hfn_threshold;
> > +/** HFN can be given as a per packet value also.
> > + * As we do not have IV in case of PDCP, and HFN is
> > + * used to generate IV. IV field can be used to get the
> > + * per packet HFN while enq/deq.
> > + * If hfn_ovrd field is set, user is expected to set the
> > + * per packet HFN in place of IV. PMDs will extract the HFN
> > + * and perform operations accordingly.
> > + */
> > + uint8_t hfn_ovrd;
> > + /** In case of 5G NR, a new protocol(SDAP) header may be set
> > +  * inside PDCP payload which should be authenticated but not
> > +  * encrypted. Hence, driver should be notified if SDAP is
> > +  * enabled or not, so that SDAP header is not encrypted.
> > +  */
> > + uint8_t sdap_enabled;
> > + /** Reserved for future */
> > + uint16_t reserved;
> >  };
> 
> [DC] Should we consider removing the API code out of the security
> documentation?
> It's a direct copy of the API code itself, and just means 2 files need to be 
> updated
> for every API change.
> And as with 'hfn_ovrd', sometimes it's forgotten.
> From maintainability point of view, it might be better just remove it.

Yes we can remove it. I will remove it in a separate patch.


> 
> >
> >  DOCSIS related configuration parameters are defined in
> > ``rte_security_docsis_xform`` diff --git 
> > a/lib/librte_security/rte_security.h
> > b/lib/librte_security/rte_security.h
> > index 16839e539..48b377b20 100644
> > --- a/lib/librte_security/rte_security.h
> > +++ b/lib/librte_security/rte_security.h
> > @@ -1,5 +1,5 @@
> >  /* SPDX-License-Identifier: BSD-3-Clause
> > - * Copyright 2017,2019 NXP
> > + * Copyright 2017,2019-2020 NXP
> >   * Copyright(c) 2017-2020 Intel Corporation.
> >   */
> >
> > @@ -290,7 +290,15 @@ struct rte_security_pdcp_xform {
> >  * per packet HFN in place of IV. PMDs will extract the HFN
> >  * and perform operations accordingly.
> >  */
> > -   uint32_t hfn_ovrd;
> > +   uint8_t hfn_ovrd;
> > +   /** In case of 5G NR, a new protocol(SDAP) header may be set
> 
> [DC] Very minor thing... add space between 'protocol' and '(SDAP)' in the
> comment block.

Sure. Will add it.
> 
Adding Techboard for request for approval of the change in the xform structure 
to
Add sdap support.


> And same comment for the documentation if you choose to keep the API code
> blocks there too.
> 
> > +* inside PDCP payload which should be authenticated but not
> > +* encrypted. Hence, driver should be notified if SDAP is
> > +* enabled or not, so that SDAP header is not encrypted.
> > +*/
> > +   uint8_t sdap_enabled;
> > +   /** Reserved for future */
> > +   uint16_t reserved;
> >  };
> >
> >  /** DOCSIS direction */
> > --
> > 2.17.1

Re: [dpdk-dev] [PATCH v5] eal: add cache-line demote support

[Bruce Richardson]

On Thu, Oct 08, 2020 at 09:09:52AM +0200, David Marchand wrote:
> On Thu, Oct 1, 2020 at 2:30 AM Omkar Maslekar  
> wrote:
> >
> > rte_cldemote is similar to a prefetch hint - in reverse. cldemote(addr)
> > enables software to hint to hardware that line is likely to be shared.
> > Useful in core-to-core communications where cache-line is likely to be
> > shared. ARM and PPC implementation is provided with NOP and can be added
> > if any equivalent instructions could be used for implementation on those
> > architectures.
> >
> > Signed-off-by: Omkar Maslekar 
> > Acked-by: Bruce Richardson 
> 
> I find this "rte_cldemote" name too close to the Intel instruction,
> but I can see no complaint from other arch maintainers, so I guess
> everyone is happy with it.

It is very close, alright - though the name too does fairly well convey the
likely actual done by the instruction.. Is there a suggestion for a better,
more generic name.

> In any case, this is a new API, so it should be marked experimental.
> 
Agreed.

> As for unit tests, not sure there is much to do, maybe rename
> test_prefetch.c and call this new API too, wdyt?
> 
I'm not sure how much value this would provide, but it can be done.

Re: [dpdk-dev] [PATCH v2 1/6] ethdev: add hairpin bind and unbind APIs

[Ori Kam]

Hi Bing

> -Original Message-
> From: Bing Zhao 
> Sent: Thursday, October 8, 2020 11:52 AM
> Subject: [PATCH v2 1/6] ethdev: add hairpin bind and unbind APIs
> 
> In single port hairpin mode, all the hairpin TX and RX queues belong
> to the same device. After the queues are set up properly, there is
> no other dependency between the TX queue and its RX peer queue. The
> binding process that connected the TX and RX queues together from
> hardware level will be done automatically during the device start
> procedure. Everything required is configured and initialized already
> for the binding process.
> 
> But in two ports hairpin mode, there will be some cross-dependences
> between two different ports. Usually, the ports will be initialized
> serially by the main thread but not in parallel. The earlier port
> will not be able to enable the bind if the following peer port is
> not yet configured with HW resources. What's more, if one port is
> detached / attached dynamically, it would introduce more trouble
> for the hairpin binding.
> 
> To overcome these, new APIs for binding and unbinding are added.
> During startup, only the hairpin TX and RX peer queues will be set
> up. Nothing will be done when starting the device if the queues are
> without auto-bind attribute. Only after the required ports pair
> started, the `rte_eth_hairpin_bind()` API can be called to bind the
> all TX queues of the egress port to the RX queues of the peer port.
> Then the connection between the egress and ingress ports pair will
> be established.
> 
> The `rte_eth_hairpin_unbind()` API could be used to disconnect the
> egress and the peer ingress ports. This should only be called before
> the device is closed if needed. When doing the clean up, all the
> egress and ingress pairs related to a single port should be taken
> into consideration, especially in the hot unplug case.
> 
> Signed-off-by: Bing Zhao 
> ---
> v2: remove the all peer ports logic from rte API
> ---

Acked-by: Ori Kam 
Thanks,
Ori

Re: [dpdk-dev] [PATCH] ethdev: fix xstat name of basic stats per queue

[Bruce Richardson]

On Wed, Oct 07, 2020 at 11:48:48PM +0200, Thomas Monjalon wrote:
> As described in doc/guides/prog_guide/poll_mode_drv.rst,
> the naming scheme for the xstats is parts separated with underscore:
>   * direction
>   * detail 1
>   * detail 2
>   * detail n
>   * unit
> where detail 1 can be "q" followed with a queue number.
> It means the name of the stats per queue should be rx_qN_* or tx_qN_*.
> 
> The second underscore was missing so far.
> Fixing the basic xstat names may be considered an API change,
> that's why it should not be backported.
> 
> While fixing this mistake, some examples of the naming scheme
> are given as part of the API documentation of rte_eth_xstat_name.
> More proposals about standardizing statistics:
>   http://fast.dpdk.org/events/slides/DPDK-2019-09-Ethernet_Statistics.pdf
> 
> Fixes: bd6aa172cf35 ("ethdev: fetch extended statistics with integer ids")
> 
> Signed-off-by: Thomas Monjalon 
> ---
>  doc/guides/rel_notes/release_20_11.rst | 8 +++-
>  lib/librte_ethdev/rte_ethdev.c | 4 ++--
>  lib/librte_ethdev/rte_ethdev.h | 7 +++
>  3 files changed, 16 insertions(+), 3 deletions(-)
> 
> diff --git a/doc/guides/rel_notes/release_20_11.rst 
> b/doc/guides/rel_notes/release_20_11.rst
> index cdf20404c9..d0d77c5d3d 100644
> --- a/doc/guides/rel_notes/release_20_11.rst
> +++ b/doc/guides/rel_notes/release_20_11.rst
> @@ -200,7 +200,13 @@ API Changes
>  
>  * ethdev: ``rte_eth_rx_descriptor_done()`` API has been deprecated.
>  
> -* Renamed internal ethdev APIs:

Technically not related to this patch, but I think it's ok to slip it in
here. :-)

> +* ethdev: Renamed basic statistics per queue. An underscore is inserted
> +  between the queue number and the rest of the xstat name:
> +
> +  * ``rx_qN*`` -> ``rx_qN_*``
> +  * ``tx_qN*`` -> ``tx_qN_*``
> +
> +* ethdev: Renamed internal APIs:
>  
>* ``_rte_eth_dev_callback_process()`` -> ``rte_eth_dev_callback_process()``
>* ``_rte_eth_dev_reset`` -> ``rte_eth_dev_internal_reset()``
> diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
> index 48d1333b17..286c1b5966 100644
> --- a/lib/librte_ethdev/rte_ethdev.c
> +++ b/lib/librte_ethdev/rte_ethdev.c
> @@ -2549,7 +2549,7 @@ rte_eth_basic_stats_get_names(struct rte_eth_dev *dev,
>   for (idx = 0; idx < RTE_NB_RXQ_STATS; idx++) {
>   snprintf(xstats_names[cnt_used_entries].name,
>   sizeof(xstats_names[0].name),
> - "rx_q%u%s",
> + "rx_q%u_%s",
>   id_queue, rte_rxq_stats_strings[idx].name);
>   cnt_used_entries++;
>   }
> @@ -2560,7 +2560,7 @@ rte_eth_basic_stats_get_names(struct rte_eth_dev *dev,
>   for (idx = 0; idx < RTE_NB_TXQ_STATS; idx++) {
>   snprintf(xstats_names[cnt_used_entries].name,
>   sizeof(xstats_names[0].name),
> - "tx_q%u%s",
> + "tx_q%u_%s",
>   id_queue, rte_txq_stats_strings[idx].name);
>   cnt_used_entries++;
>   }
> diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
> index d2bf74f128..86434c9cae 100644
> --- a/lib/librte_ethdev/rte_ethdev.h
> +++ b/lib/librte_ethdev/rte_ethdev.h
> @@ -1507,6 +1507,13 @@ struct rte_eth_xstat {
>   * An array of this structure is returned by rte_eth_xstats_get_names().
>   * It lists the names of extended statistics for a PMD. The *rte_eth_xstat*
>   * structure references these names by their array index.
> + *
> + * The xstats should follow a common naming scheme.
> + * Some names are standardized in rte_stats_strings.
> + * Examples:
> + * - rx_missed_errors
> + * - tx_q3_bytes
> + * - tx_size_128_to_255_packets
>   */
>  struct rte_eth_xstat_name {
>   char name[RTE_ETH_XSTATS_NAME_SIZE]; /**< The statistic name. */
> -- 
> 2.28.0
> 

Reviewed-by: Bruce Richardson 

Re: [dpdk-dev] [PATCH] ethdev: fix xstat name of basic stats per queue

[Kevin Traynor]

On 07/10/2020 22:48, Thomas Monjalon wrote:
> As described in doc/guides/prog_guide/poll_mode_drv.rst,
> the naming scheme for the xstats is parts separated with underscore:
>   * direction
>   * detail 1
>   * detail 2
>   * detail n
>   * unit
> where detail 1 can be "q" followed with a queue number.
> It means the name of the stats per queue should be rx_qN_* or tx_qN_*.
> 
> The second underscore was missing so far.
> Fixing the basic xstat names may be considered an API change,
> that's why it should not be backported.
> 
> While fixing this mistake, some examples of the naming scheme
> are given as part of the API documentation of rte_eth_xstat_name.
> More proposals about standardizing statistics:
>   http://fast.dpdk.org/events/slides/DPDK-2019-09-Ethernet_Statistics.pdf
> 
> Fixes: bd6aa172cf35 ("ethdev: fetch extended statistics with integer ids")
> 
> Signed-off-by: Thomas Monjalon 
> ---

Acked-by: Kevin Traynor 


>  doc/guides/rel_notes/release_20_11.rst | 8 +++-
>  lib/librte_ethdev/rte_ethdev.c | 4 ++--
>  lib/librte_ethdev/rte_ethdev.h | 7 +++
>  3 files changed, 16 insertions(+), 3 deletions(-)
> 
> diff --git a/doc/guides/rel_notes/release_20_11.rst 
> b/doc/guides/rel_notes/release_20_11.rst
> index cdf20404c9..d0d77c5d3d 100644
> --- a/doc/guides/rel_notes/release_20_11.rst
> +++ b/doc/guides/rel_notes/release_20_11.rst
> @@ -200,7 +200,13 @@ API Changes
>  
>  * ethdev: ``rte_eth_rx_descriptor_done()`` API has been deprecated.
>  
> -* Renamed internal ethdev APIs:
> +* ethdev: Renamed basic statistics per queue. An underscore is inserted
> +  between the queue number and the rest of the xstat name:
> +
> +  * ``rx_qN*`` -> ``rx_qN_*``
> +  * ``tx_qN*`` -> ``tx_qN_*``
> +
> +* ethdev: Renamed internal APIs:
>  
>* ``_rte_eth_dev_callback_process()`` -> ``rte_eth_dev_callback_process()``
>* ``_rte_eth_dev_reset`` -> ``rte_eth_dev_internal_reset()``
> diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
> index 48d1333b17..286c1b5966 100644
> --- a/lib/librte_ethdev/rte_ethdev.c
> +++ b/lib/librte_ethdev/rte_ethdev.c
> @@ -2549,7 +2549,7 @@ rte_eth_basic_stats_get_names(struct rte_eth_dev *dev,
>   for (idx = 0; idx < RTE_NB_RXQ_STATS; idx++) {
>   snprintf(xstats_names[cnt_used_entries].name,
>   sizeof(xstats_names[0].name),
> - "rx_q%u%s",
> + "rx_q%u_%s",
>   id_queue, rte_rxq_stats_strings[idx].name);
>   cnt_used_entries++;
>   }
> @@ -2560,7 +2560,7 @@ rte_eth_basic_stats_get_names(struct rte_eth_dev *dev,
>   for (idx = 0; idx < RTE_NB_TXQ_STATS; idx++) {
>   snprintf(xstats_names[cnt_used_entries].name,
>   sizeof(xstats_names[0].name),
> - "tx_q%u%s",
> + "tx_q%u_%s",
>   id_queue, rte_txq_stats_strings[idx].name);
>   cnt_used_entries++;
>   }
> diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
> index d2bf74f128..86434c9cae 100644
> --- a/lib/librte_ethdev/rte_ethdev.h
> +++ b/lib/librte_ethdev/rte_ethdev.h
> @@ -1507,6 +1507,13 @@ struct rte_eth_xstat {
>   * An array of this structure is returned by rte_eth_xstats_get_names().
>   * It lists the names of extended statistics for a PMD. The *rte_eth_xstat*
>   * structure references these names by their array index.
> + *
> + * The xstats should follow a common naming scheme.
> + * Some names are standardized in rte_stats_strings.
> + * Examples:
> + * - rx_missed_errors
> + * - tx_q3_bytes
> + * - tx_size_128_to_255_packets
>   */
>  struct rte_eth_xstat_name {
>   char name[RTE_ETH_XSTATS_NAME_SIZE]; /**< The statistic name. */
> 

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

[Jerin Jacob]

On Tue, Sep 8, 2020 at 2:48 PM Ankur Dwivedi  wrote:
>
> 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 

Hi Ankur,

Please fix git-log.sh error[1] the following in this series and send
the version.

Headline too long:
test/event_crypto_adapter: return error with unsupported mode
Wrong tag:
acked-by: abhinandan.guj...@intel.com
acked-by: abhinandan.guj...@intel.com
acked-by: abhinandan.guj...@intel.com
Missing 'Fixes' tag:
test/event_crypto_adapter: fix function arguments

[1]
./devtools/check-git-log.sh -n 3
./devtools/checkpatches.sh -n 3


> ---
>  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
>

Re: [dpdk-dev] [PATCH 2/3] examples/fips_validation: ignore \r in input files

[Olivier Matz]

Hi,

On Thu, Oct 08, 2020 at 08:50:25AM +, Zhang, Roy Fan wrote:
> Hi Olivier,
> 
> Anood and us had the similar discussion.
> 
> Can we change the sample application to parse version data instead,
> and for the version specific code changes we will wrap them by a
> branch to compare the parsed version and the expected version? 
> (we probably should have done that long time ago).
> 
> I drafted a code change to parse the version data, see if you think it
> is ok?

Thank you for your feedback.

The code that gets the version looks good to me (I just have a
small comment, see below). However I'm not sure what to do with it.

Do you mean we should return an error if the version is incorrect? Or
should we only skip '\r' for old versions? FIPS_DEF_VERSION is not used
in your patch. In that case, I think it is a bit overkill. Do you think
it is a problem to always drop '\r'?

If you think we should not support files containing '\r', I'm fine
with it, I can drop this particular patch.


> 
> diff --git a/examples/fips_validation/fips_validation.c 
> b/examples/fips_validation/fips_validation.c
> index 9bdf257b8..9b6518c92 100644
> --- a/examples/fips_validation/fips_validation.c
> +++ b/examples/fips_validation/fips_validation.c
> @@ -98,7 +98,7 @@ fips_test_parse_header(void)
>   uint32_t i;
>   char *tmp;
>   int ret;
> - int algo_parsed = 0;
> + int algo_parsed = 0, version_parsed = 0;
>   time_t t = time(NULL);
>   struct tm *tm_now = localtime(&t);
>  
> @@ -107,6 +107,27 @@ fips_test_parse_header(void)
>   return ret;
>  
>   for (i = 0; i < info.nb_vec_lines; i++) {
> + /* parse the version info */
> + tmp = strstr(info.vec[i], "CAVS ");
> + if (tmp != NULL) {
> + if (version_parsed != 0) {
> + RTE_LOG(ERR, USER1,
> + "Multiple version data\n");
> + return -1;
> + }
> +
> + tmp = tmp + sizeof("CAVS ");

I think it should be strlen(), because sizeof() will contain
the '\0'. Or it could be sizeof() - 1.

> +
> + if (strlen(tmp) >= MAX_VER_STRING_SIZE) {
> + RTE_LOG(ERR, USER1, "Version (%s) too long\n",
> + tmp);
> + return -1;
> + }
> +
> + strlcpy(info.version, tmp, MAX_VER_STRING_SIZE);
> + version_parsed = 1;
> + }
> +
>   if (!algo_parsed) {
>   if (strstr(info.vec[i], "AESVS")) {
>   algo_parsed = 1;
> diff --git a/examples/fips_validation/fips_validation.h 
> b/examples/fips_validation/fips_validation.h
> index 75fa555fa..b8c60c55f 100644
> --- a/examples/fips_validation/fips_validation.h
> +++ b/examples/fips_validation/fips_validation.h
> @@ -15,6 +15,9 @@
>  #define MAX_BUF_SIZE 2048
>  #define MAX_STRING_SIZE  64
>  #define MAX_DIGEST_SIZE  64
> +#define MAX_VER_STRING_SIZE  8
> +
> +#define FIPS_DEF_VERSION "21.0"
>  
>  #define POSITIVE_TEST0
>  #define NEGATIVE_TEST-1
> @@ -155,6 +158,7 @@ struct sha_interim_data {
>  };
>  
>  struct fips_test_interim_info {
> + char version[MAX_VER_STRING_SIZE];
>   FILE *fp_rd;
>   FILE *fp_wr;
>   enum file_types file_type;
> 
> 
> Regards,
> Fan
> 
> > -Original Message-
> > From: Olivier Matz 
> > Sent: Tuesday, October 6, 2020 11:09 AM
> > To: Zhang, Roy Fan 
> > Cc: dev@dpdk.org; Kovacevic, Marko ; Akhil
> > Goyal ; Kusztal, ArkadiuszX
> > ; sta...@dpdk.org; Anoob Joseph
> > 
> > Subject: Re: [PATCH 2/3] examples/fips_validation: ignore \r in input files
> > 
> > Hi Fan,
> > 
> > On Tue, Oct 06, 2020 at 08:47:10AM +, Zhang, Roy Fan wrote:
> > > Hi Olivier,
> > >
> > > > -Original Message-
> > > > From: Olivier Matz 
> > > > Sent: Tuesday, October 6, 2020 8:42 AM
> > > > To: dev@dpdk.org
> > > > Cc: Kovacevic, Marko ; Akhil Goyal
> > > > ; Zhang, Roy Fan ;
> > Kusztal,
> > > > ArkadiuszX ; sta...@dpdk.org
> > > > Subject: [PATCH 2/3] examples/fips_validation: ignore \r in input files
> > > >
> > > > Some test vectors contain '\r' before '\n' (see link). Ignore them.
> > > >
> > > > Link: https://www.openssl.org/docs/fips/testvectors-linux-2007-10-
> > 10.tar.gz
> > > > Fixes: 3d0fad56b74a ("examples/fips_validation: add crypto FIPS
> > application")
> > > > Cc: sta...@dpdk.org
> > > >
> > > > Signed-off-by: Olivier Matz 
> > > > ---
> > > >  examples/fips_validation/fips_validation.c | 2 ++
> > > >  1 file changed, 2 insertions(+)
> > > >
> > > > diff --git a/examples/fips_validation/fips_validation.c
> > > > b/examples/fips_validation/fips_validation.c
> > > > index 13f763c9aa..858f581ba3 100644
> > > > --- a/examples/fips_validation/fips_validation.c
> > > > +++ b/exampl

Re: [dpdk-dev] [PATCH v2 2/6] ethdev: add new attributes to hairpin config

[Ori Kam]

Hi Bing,

> -Original Message-
> From: Bing Zhao 
> Sent: Thursday, October 8, 2020 11:52 AM
> Subject: [PATCH v2 2/6] ethdev: add new attributes to hairpin config
> 
> To support two ports hairpin mode and keep the backward compatibility
> for the application, two new attribute members of hairpin queue
> configuration structure are added.
> 
> `tx_explicit` means if the application itself will insert the TX part
> flow rules. If not set, PMD will insert the rules implicitly.
> `manual_bind` means if the hairpin TX queue and peer RX queue will be
> bound automatically during device start stage.
> 
> Different TX and RX queue pairs could have different values, but it
> is highly recommended that all paired queues between one egress and
> its peer ingress ports have the same values, in order not to bring
> any chaos to the system. The actual support of these attribute
> parameters will be checked and decided by the PMD drivers.
> 
> In a single port hairpin, if both are zero without any setting, the
> behavior will remain the same as before. It means no bind API needs
> to be called and no TX flow rules need to be inserted manually by
> the application.
> 
> Signed-off-by: Bing Zhao 
> ---
> v2: optimize the structure and remove unused macros
> ---
>  lib/librte_ethdev/rte_ethdev.c | 8 
>  lib/librte_ethdev/rte_ethdev.h | 5 -
>  2 files changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
> index 85a19bd..a4adeff 100644
> --- a/lib/librte_ethdev/rte_ethdev.c
> +++ b/lib/librte_ethdev/rte_ethdev.c
> @@ -1954,13 +1954,13 @@ struct rte_eth_dev *
>   }
>   if (conf->peer_count > cap.max_rx_2_tx) {
>   RTE_ETHDEV_LOG(ERR,
> - "Invalid value for number of peers for Rx queue(=%hu),
> should be: <= %hu",
> + "Invalid value for number of peers for Rx queue(=%u),
> should be: <= %hu",
>   conf->peer_count, cap.max_rx_2_tx);
>   return -EINVAL;
>   }
>   if (conf->peer_count == 0) {
>   RTE_ETHDEV_LOG(ERR,
> - "Invalid value for number of peers for Rx queue(=%hu),
> should be: > 0",
> + "Invalid value for number of peers for Rx queue(=%u),
> should be: > 0",
>   conf->peer_count);
>   return -EINVAL;
>   }
> @@ -2125,13 +2125,13 @@ struct rte_eth_dev *
>   }
>   if (conf->peer_count > cap.max_tx_2_rx) {
>   RTE_ETHDEV_LOG(ERR,
> - "Invalid value for number of peers for Tx queue(=%hu),
> should be: <= %hu",
> + "Invalid value for number of peers for Tx queue(=%u),
> should be: <= %hu",
>   conf->peer_count, cap.max_tx_2_rx);
>   return -EINVAL;
>   }
>   if (conf->peer_count == 0) {
>   RTE_ETHDEV_LOG(ERR,
> - "Invalid value for number of peers for Tx queue(=%hu),
> should be: > 0",
> + "Invalid value for number of peers for Tx queue(=%u),
> should be: > 0",
>   conf->peer_count);
>   return -EINVAL;
>   }
> diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
> index 6206643..94a981c 100644
> --- a/lib/librte_ethdev/rte_ethdev.h
> +++ b/lib/librte_ethdev/rte_ethdev.h
> @@ -1045,7 +1045,10 @@ struct rte_eth_hairpin_peer {
>   * A structure used to configure hairpin binding.
>   */
>  struct rte_eth_hairpin_conf {
> - uint16_t peer_count; /**< The number of peers. */
> + uint32_t peer_count:16; /**< The number of peers. */
> + uint32_t tx_explicit:1; /**< Explicit TX flow rule mode. */
> + uint32_t manual_bind:1; /**< Manually bind hairpin queues. */
> + uint32_t reserved:14; /**< Reserved bits. */
>   struct rte_eth_hairpin_peer peers[RTE_ETH_MAX_HAIRPIN_PEERS];
>  };
> 
> --
> 1.8.3.1

Acked-by: Ori Kam 
Thanks,
Ori

Re: [dpdk-dev] [PATCH v3 01/18] eal: add max SIMD bitwidth

[Power, Ciara]

Hi Olivier,


>-Original Message-
>From: Olivier Matz 
>Sent: Wednesday 7 October 2020 12:18
>To: Power, Ciara 
>Cc: dev@dpdk.org; Ray Kinsella ; Neil Horman
>; Richardson, Bruce 
>Subject: Re: [dpdk-dev] [PATCH v3 01/18] eal: add max SIMD bitwidth
>
>Hi Ciara,
>
>On Wed, Oct 07, 2020 at 10:47:34AM +, Power, Ciara wrote:
>> Hi Olivier,
>>
>> Thanks for reviewing, some comments below.
>>
>>
>> >-Original Message-
>> >From: Olivier Matz 
>> >Sent: Tuesday 6 October 2020 10:32
>> >To: Power, Ciara 
>> >Cc: dev@dpdk.org; Ray Kinsella ; Neil Horman
>> >
>> >Subject: Re: [dpdk-dev] [PATCH v3 01/18] eal: add max SIMD bitwidth
>> >
>> >Hi Ciara,
>> >
>> >Please find some comments below.
>> >
>> >On Wed, Sep 30, 2020 at 02:03:57PM +0100, Ciara Power wrote:
>> >> This patch adds a max SIMD bitwidth EAL configuration. The API
>> >> allows for an app to set this value. It can also be set using EAL
>> >> argument --force-max-simd-bitwidth, which will lock the value and
>> >> override any modifications made by the app.
>> >>
>> >> Signed-off-by: Ciara Power 
>> >>
>> >> ---
>> >> v3:
>> >>   - Added enum value to essentially disable using max SIMD to choose
>> >> paths, intended for use by ARM SVE.
>> >>   - Fixed parsing bitwidth argument to return an error for values
>> >> greater than uint16_t.
>> >> v2: Added to Doxygen comment for API.
>> >> ---
>>
>> 
>>
>> >>
>> >> +uint16_t
>> >> +rte_get_max_simd_bitwidth(void)
>> >> +{
>> >> + const struct internal_config *internal_conf =
>> >> + eal_get_internal_configuration();
>> >> + return internal_conf->max_simd_bitwidth.bitwidth;
>> >> +}
>> >
>> >Should the return value be enum rte_max_simd_t?
>> >If not, do we really need the enum definition?
>> >
>>
>> I kept the return value and param value below as uint16_t to allow for
>> arbitrary values, and will allow it be more flexible for future additions as
>new enums won't need to be added.
>> For the set function below, this is used when a user passes the EAL
>> command line flag, which passes an integer value rather than an enum one.
>> The enums are useful when checking the max_simd_bitwidth in
>> drivers/libs, for example using "RTE_MAX_256_SIMD" instead of "256" in
>the condition checks.
>>
>> >> +
>> >> +int
>> >> +rte_set_max_simd_bitwidth(uint16_t bitwidth) {
>> >> + struct internal_config *internal_conf =
>> >> + eal_get_internal_configuration();
>> >> + if (internal_conf->max_simd_bitwidth.locked) {
>> >> + RTE_LOG(NOTICE, EAL, "Cannot set max SIMD bitwidth - user
>> >runtime override enabled");
>> >> + return -EPERM;
>> >> + }
>> >> +
>> >> + if (bitwidth != RTE_MAX_SIMD_DISABLE && (bitwidth <
>> >RTE_NO_SIMD ||
>> >> + !rte_is_power_of_2(bitwidth))) {
>> >> + RTE_LOG(ERR, EAL, "Invalid bitwidth value!\n");
>> >> + return -EINVAL;
>> >> + }
>> >> + internal_conf->max_simd_bitwidth.bitwidth = bitwidth;
>> >> + return 0;
>> >> +}
>> >
>> >Same question, should the parameter be enum rte_max_simd_t?
>> >
>>
>> 
>>
>> >> +enum rte_max_simd_t {
>> >> + RTE_NO_SIMD = 64,
>> >> + RTE_MAX_128_SIMD = 128,
>> >> + RTE_MAX_256_SIMD = 256,
>> >> + RTE_MAX_512_SIMD = 512,
>> >> + RTE_MAX_SIMD_DISABLE = UINT16_MAX, };
>> >
>> >What is the difference between RTE_NO_SIMD and
>RTE_MAX_SIMD_DISABLE?
>>
>> RTE_NO_SIMD has value 64 to limit paths to scalar only.
>> RTE_MAX_SIMD_DISABLE sets the highest value possible, so essentially
>> disables the limit affecting which vector paths are taken.
>> This disable option was added to allow for ARM SVE which will be later
>> added, Discussed with Honnappa on a previous version:
>> https://patchwork.dpdk.org/patch/76097/
>
>Ok, so RTE_MAX_SIMD_DISABLE means "disable the max limit", right?
>
>I feel the name is a bit confusing. What about something like this:
>
>enum rte_simd {
>   RTE_SIMD_DISABLED = 0,
>   RTE_SIMD_128 = 128,
>   RTE_SIMD_256 = 256,
>   RTE_SIMD_512 = 512,
>   RTE_SIMD_MAX = UINT16_MAX,
>};
>
>

Sure, I can rename these. Although will implement with RTE_SIMD_DISABLED=64 to 
allow for scalar path only.

>>
>> >The default value in internal_config is 0, so in my understanding
>> >rte_get_max_simd_bitwidth() will return 0 if
>> >--force-max-simd-bitwidth is not passed. Is it expected?
>> >
>> >Maybe I'm missing something, but I don't understand why the value in
>> >internal_config is not set to the maximum supported SIMD bitwidth by
>> >default, and optionally overriden by the command line argument, or by
>> >the API.
>> >
>>
>> The default value for max_simd_bitwidth is set depending on the
>> architecture, 256 for x86/ppc, and UINT16_MAX for ARM. So for example
>the default on x86 allows for AVX2 and under.
>> The defaults can be seen in patch 2:
>> https://patchwork.dpdk.org/patch/79339/
>
>Ok, I was expecting to have a runtime check for this. For instance, on intel
>architecture, it is not known at compilation, it depends on the target which
>can support up to 

Re: [dpdk-dev] [PATCH 1/2] app/test: uninit vdevs in event eth Rx adapter autotest

[Jerin Jacob]

On Wed, Oct 7, 2020 at 3:43 PM Rao, Nikhil  wrote:
>
>
>
> > -Original Message-
> > From: Jayatheerthan, Jay 
> > Sent: Saturday, October 3, 2020 2:36 PM
> > To: jer...@marvell.com; tho...@monjalon.net; Rao, Nikhil
> > 
> > Cc: dev@dpdk.org; sta...@dpdk.org; Jayatheerthan, Jay
> > 
> > Subject: [PATCH 1/2] app/test: uninit vdevs in event eth Rx adapter autotest
> >
> > From: "Jay Jayatheerthan" 
> >
> > adapter_multi_eth_add_del() does vdev init but doesn't uninit them.
> > This causes issues when running event_eth_rx_adapter_autotest multiple
> > times.
> >
> > The fix does vdev uninit before exiting the test.
> >
> > Signed-off-by: Jay Jayatheerthan 
> > ---
> >  app/test/test_event_eth_rx_adapter.c | 14 +-
> >  1 file changed, 13 insertions(+), 1 deletion(-)
> >
> > diff --git a/app/test/test_event_eth_rx_adapter.c
> > b/app/test/test_event_eth_rx_adapter.c
> > index dd3bce71b..71c946164 100644
> > --- a/app/test/test_event_eth_rx_adapter.c
> > +++ b/app/test/test_event_eth_rx_adapter.c
> > @@ -464,7 +464,7 @@ adapter_multi_eth_add_del(void)
> >   int err;
> >   struct rte_event ev;
> >
> > - uint16_t port_index, drv_id = 0;
> > + uint16_t port_index, port_index_base, drv_id = 0;
> >   char driver_name[50];
> >
> >   struct rte_event_eth_rx_adapter_queue_conf queue_config; @@ -
> > 484,6 +484,7 @@ adapter_multi_eth_add_del(void)
> >
> >   /* add the max port for rx_adapter */
> >   port_index = rte_eth_dev_count_total();
> > + port_index_base = port_index;
> >   for (; port_index < RTE_MAX_ETHPORTS; port_index += 1) {
> >   snprintf(driver_name, sizeof(driver_name), "%s%u",
> > "net_null",
> >   drv_id);
> > @@ -513,6 +514,17 @@ adapter_multi_eth_add_del(void)
> >   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
> >   }
> >
> > + /* delete vdev ports */
> > + for (drv_id = 0, port_index = port_index_base;
> > +  port_index < RTE_MAX_ETHPORTS;
> > +  drv_id += 1, port_index += 1) {
> > + snprintf(driver_name, sizeof(driver_name), "%s%u",
> > "net_null",
> > + drv_id);
> > + err = rte_vdev_uninit(driver_name);
> > + TEST_ASSERT(err == 0, "Failed driver %s got %d",
> > + driver_name, err);
> > + }
> > +
> >   return TEST_SUCCESS;
> >  }
> >
> > --
> > 2.17.1
> Reviewed-by: Nikhil Rao 


Series applied to dpdk-next-eventdev/main. Thanks.

Re: [dpdk-dev] [PATCH v3 1/1] vfio: modify spapr iommu support to use static window sizing

[Burakov, Anatoly]

On 07-Oct-20 6:44 PM, David Christensen wrote:



On 9/17/20 4:13 AM, Burakov, Anatoly wrote:

On 10-Aug-20 10:07 PM, David Christensen wrote:

The SPAPR IOMMU requires that a DMA window size be defined before memory
can be mapped for DMA. Current code dynamically modifies the DMA window
size in response to every new memory allocation which is potentially
dangerous because all existing mappings need to be unmapped/remapped in
order to resize the DMA window, leaving hardware holding IOVA addresses
that are temporarily unmapped.  The new SPAPR code statically assigns
the DMA window size on first use, using the largest physical memory
memory address when IOVA=PA and the highest existing memseg virtual
address when IOVA=VA.

Signed-off-by: David Christensen 
---





+struct spapr_size_walk_param {
+    uint64_t max_va;
+    uint64_t page_sz;
+    int external;
+};
+
+/*
+ * In order to set the DMA window size required for the SPAPR IOMMU
+ * we need to walk the existing virtual memory allocations as well as
+ * find the hugepage size used.
+ */
  static int
-vfio_spapr_unmap_walk(const struct rte_memseg_list *msl,
-    const struct rte_memseg *ms, void *arg)
+vfio_spapr_size_walk(const struct rte_memseg_list *msl, void *arg)
  {
-    int *vfio_container_fd = arg;
+    struct spapr_size_walk_param *param = arg;
+    uint64_t max = (uint64_t) msl->base_va + (uint64_t) msl->len;
-    /* skip external memory that isn't a heap */
-    if (msl->external && !msl->heap)
-    return 0;
+    if (msl->external) {
+    param->external++;
+    if (!msl->heap)
+    return 0;
+    }


It would be nice to have some comments in the code explaining what 
we're skipping and why.


Reviewing this again, my inclination is to skip ALL external memory, 
which by definition would seem to be outside of IOMMU control, so the 
code would read:


    if (msl->external) {
    param->external++;
    return 0;
    }


The external memory can still be mapped for DMA with rte_dev_dma_map() 
API. The heap memory is meant to be mapped automatically by DPDK, while 
the non-heap memory (created with rte_extmem_register() API) is meant to 
be managed by the user and will be mapped using the user_mem_map 
functions in this file.




Not sure why existing code such as vfio_spapr_map_walk() distinguishes 
between heap and non-heap in this situation.  Are there instances in x86 
where it would matter?


Also, seems that you're using param->external as bool? This is a 
non-public API so using stdbool is not an issue here, perhaps replace 
it with bool param->has_external?


Why do you think the distinction is necessary?



It's not *necessary*, i just don't like the ancient C style where ints 
are used as booleans :D Not a serious issue though, your choice.



Dave



--
Thanks,
Anatoly

[dpdk-dev] [DPDK_KMODS v4] linux/igb_uio: add Makefile to build the kernel module

[Hariprasad Govindharajan]

With DPDK 20.11 release, the igb_uio module is no more part of DPDK.
There are use cases where this module is required, for example while
testing the virtual ports in OvS, the virtual ports are bound to
igb_uio module inside a VM. So, this patch provides a Makefile
which can be used to build this module and use as needed.

Before building this module, the user is expected to build the
DPDK using meson build system and make sure that the required
libraries are installed in the path /usr/local

Signed-off-by: Hariprasad Govindharajan 
---
This patch will be part of dpdk-kmods repo
https://git.dpdk.org/dpdk-kmods/
---
v4:
Corrected the indentation
v3:
Edited the commit message and corrected the mistakes in the variable
definition
v2:
Added more information to the commit message
---
 linux/igb_uio/Makefile | 8 
 1 file changed, 8 insertions(+)
 create mode 100644 linux/igb_uio/Makefile

diff --git a/linux/igb_uio/Makefile b/linux/igb_uio/Makefile
new file mode 100644
index 000..45dbe42
--- /dev/null
+++ b/linux/igb_uio/Makefile
@@ -0,0 +1,8 @@
+DPDK_HEADERS ?= /usr/local/include
+RTE_KERNELDIR ?= /lib/modules/`uname -r`/build
+
+all:
+   make EXTRA_CFLAGS="-I $(DPDK_HEADERS)" -C $(RTE_KERNELDIR)/ M=$(PWD)
+
+clean:
+   make -C $(RTE_KERNELDIR)/ M=$(PWD) clean
-- 
2.7.4

Re: [dpdk-dev] [PATCH v2 3/6] ethdev: add API to get hairpin peer ports list

[Ori Kam]

Hi Bing,

PSB,
Best,
Ori
> -Original Message-
> From: Bing Zhao 
> Sent: Thursday, October 8, 2020 11:52 AM
> Subject: [PATCH v2 3/6] ethdev: add API to get hairpin peer ports list
> 
> After hairpin queues are configured, in general, the application will
> maintain the ports topology and even the queues configuration for
> hairpin. But sometimes it will not.
> 
> If there is no hot-plug, it is easy to bind and unbind hairpin among
> all the ports. The application can just connect or disconnect the
> hairpin egress ports to / from all the probed ingress ports. Then
> all the connections could be handled properly.
> 
> But with hot-plug / hot-unplug, one port could be probed and removed
> dynamically. With two ports hairpin, all the connections from and to
> this port should be handled after start(bind) or before stop(unbind).
> It is necessary to know the hairpin topology with this port.
> 
> This API will return the ports list with the actual peer ports number
> after configuration. Either peer RX or TX ports will be gotten with
> this function call.
> 
> Signed-off-by: Bing Zhao 
> ---
>  lib/librte_ethdev/rte_ethdev.c   | 24 
>  lib/librte_ethdev/rte_ethdev.h   | 27 +++
>  lib/librte_ethdev/rte_ethdev_driver.h| 30
> ++
>  lib/librte_ethdev/rte_ethdev_version.map |  1 +
>  4 files changed, 82 insertions(+)
> 
> diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
> index a4adeff..ea7892a 100644
> --- a/lib/librte_ethdev/rte_ethdev.c
> +++ b/lib/librte_ethdev/rte_ethdev.c
> @@ -2208,6 +2208,30 @@ struct rte_eth_dev *
>   return ret;
>  }
> 
> +int
> +rte_eth_hairpin_get_peer_ports(uint16_t cur_port, uint16_t *peer_ports,
> +bool direction)
> +{
> + struct rte_eth_dev *dev;
> + int ret;
> +
> + if (!peer_ports)
> + return -EINVAL;
> +
> + RTE_ETH_VALID_PORTID_OR_ERR_RET(cur_port, -EINVAL);
> + dev = &rte_eth_devices[cur_port];
> + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops-
> >hairpin_get_peer_ports,
> + -ENOTSUP);
> +
> + ret = (*dev->dev_ops->hairpin_get_peer_ports)(dev, peer_ports,
> +   direction);
> + if (ret < 0)
> + RTE_ETHDEV_LOG(ERR, "Failed to get %d hairpin peer %s
> ports",
> +cur_port, direction ? "RX" : "TX");
> +
> + return ret;
> +}
> +
>  void
>  rte_eth_tx_buffer_drop_callback(struct rte_mbuf **pkts, uint16_t unsent,
>   void *userdata __rte_unused)
> diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
> index 94a981c..6680de2 100644
> --- a/lib/librte_ethdev/rte_ethdev.h
> +++ b/lib/librte_ethdev/rte_ethdev.h
> @@ -2134,6 +2134,33 @@ int rte_eth_tx_queue_setup(uint16_t port_id,
> uint16_t tx_queue_id,
>   * @warning
>   * @b EXPERIMENTAL: this API may change, or be removed, without prior
> notice
>   *
> + * Get all the hairpin peer RX / TX ports of the current port.
> + * The caller should ensure that the array is large enough to save the ports
> + * list.
> + *
> + * @param cur_port
> + *   The current port identifier of the Ethernet device.
> + * @param peer_ports
> + *   Pointer to the array to save the peer ports list *
> + * @param direction
> + *   Current port to peer port direction
> + *   true - current used as TX to get all peer RX ports.
> + *   false - current used as RX to get all peer TX ports.
> + *
> + * @return
> + *   - (0 or positive) actual peer ports number.
> + *   - (-EINVAL) if bad parameter.
> + *   - (-ENOTSUP) if hardware doesn't support.
> + *   - Others detailed errors from PMD drivers.
> + */
> +__rte_experimental
> +int rte_eth_hairpin_get_peer_ports(uint16_t cur_port, uint16_t *peer_ports,
> +bool direction);
> +

I think direction should be changed to int, or change the name to ingress, also
I think we should add the peer_ports array size, so in case the application
didn't allocate enough space it will simply end in error.

> +/**
> + * @warning
> + * @b EXPERIMENTAL: this API may change, or be removed, without prior
> notice
> + *
>   * Bind all hairpin TX queues of one port to the RX queues of the peer port.
>   * It is only allowed to call this API after all hairpin queues are 
> configured
>   * properly and the devices of TX and peer RX are in started state.
> diff --git a/lib/librte_ethdev/rte_ethdev_driver.h
> b/lib/librte_ethdev/rte_ethdev_driver.h
> index f8eb879..ecca9d6 100644
> --- a/lib/librte_ethdev/rte_ethdev_driver.h
> +++ b/lib/librte_ethdev/rte_ethdev_driver.h
> @@ -576,6 +576,34 @@ typedef int (*eth_tx_hairpin_queue_setup_t)
> 
>  /**
>   * @internal
> + * Get all hairpin TX/RX peer ports of the current device, if any.
> + *
> + * @param dev
> + *   ethdev handle of port.
> + * @param peer_ports
> + *   array to save the ports list.
> + * @param direction

Re: [dpdk-dev] [PATCH v4 02/10] eal: add power management intrinsics

[Thomas Monjalon]

08/10/2020 10:44, Jerin Jacob:
> On Thu, Oct 8, 2020 at 2:04 PM Thomas Monjalon  wrote:
> >
> > > Add two new power management intrinsics, and provide an implementation
> > > in eal/x86 based on UMONITOR/UMWAIT instructions. The instructions
> > > are implemented as raw byte opcodes because there is not yet widespread
> > > compiler support for these instructions.
> > >
> > > The power management instructions provide an architecture-specific
> > > function to either wait until a specified TSC timestamp is reached, or
> > > optionally wait until either a TSC timestamp is reached or a memory
> > > location is written to. The monitor function also provides an optional
> > > comparison, to avoid sleeping when the expected write has already
> > > happened, and no more writes are expected.
> > >
> > > For more details, Please reference Intel SDM Volume 2.
> >
> > I really would like to see feedbacks from other arch maintainers.
> > Unfortunately they were not Cc'ed.
> 
> Shared the feedback from the arm64 perspective here. Yet to get a reply on 
> this.
> http://mails.dpdk.org/archives/dev/2020-September/181646.html

This comment was sent on September 18.
Later this v4 was sent without replying to the comments.
This is blocking the series.
I am considering this feature as low priority.

> > Also please mark the new functions as experimental.

[dpdk-dev] [PATCH] net/af_xdp: Don't allow umem sharing for xsks with same netdev, qid

[Ciara Loftus]

Supporting this would require locks, which would impact the performance of
the more typical cases - xsks with different qids and netdevs.

Signed-off-by: Ciara Loftus 
Fixes: 74b46340e2d4 ("net/af_xdp: support shared UMEM")
---
 drivers/net/af_xdp/rte_eth_af_xdp.c | 44 +++--
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c 
b/drivers/net/af_xdp/rte_eth_af_xdp.c
index eaf2c9c873..9e0e5c254a 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -634,16 +634,35 @@ find_internal_resource(struct pmd_internals *port_int)
return list;
 }
 
+/* Check if the netdev,qid context already exists */
+static inline bool
+ctx_exists(struct pkt_rx_queue *rxq, const char *ifname,
+   struct pkt_rx_queue *list_rxq, const char *list_ifname)
+{
+   bool exists = false;
+
+   if (rxq->xsk_queue_idx == list_rxq->xsk_queue_idx &&
+   !strncmp(ifname, list_ifname, IFNAMSIZ)) {
+   AF_XDP_LOG(ERR, "ctx %s,%i already exists, cannot share umem\n",
+   ifname, rxq->xsk_queue_idx);
+   exists = true;
+   }
+
+   return exists;
+}
+
 /* Get a pointer to an existing UMEM which overlays the rxq's mb_pool */
-static inline struct xsk_umem_info *
-get_shared_umem(struct pkt_rx_queue *rxq) {
+static inline int
+get_shared_umem(struct pkt_rx_queue *rxq, const char *ifname,
+   struct xsk_umem_info **umem)
+{
struct internal_list *list;
struct pmd_internals *internals;
-   int i = 0;
+   int i = 0, ret = 0;
struct rte_mempool *mb_pool = rxq->mb_pool;
 
if (mb_pool == NULL)
-   return NULL;
+   return ret;
 
pthread_mutex_lock(&internal_list_lock);
 
@@ -655,20 +674,25 @@ get_shared_umem(struct pkt_rx_queue *rxq) {
if (rxq == list_rxq)
continue;
if (mb_pool == internals->rx_queues[i].mb_pool) {
+   if (ctx_exists(rxq, ifname, list_rxq,
+   internals->if_name)) {
+   ret = -1;
+   goto out;
+   }
if (__atomic_load_n(
&internals->rx_queues[i].umem->refcnt,
__ATOMIC_ACQUIRE)) {
-   pthread_mutex_unlock(
-   &internal_list_lock);
-   return internals->rx_queues[i].umem;
+   *umem = internals->rx_queues[i].umem;
+   goto out;
}
}
}
}
 
+out:
pthread_mutex_unlock(&internal_list_lock);
 
-   return NULL;
+   return ret;
 }
 
 static int
@@ -913,7 +937,9 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals 
*internals,
uint64_t umem_size, align = 0;
 
if (internals->shared_umem) {
-   umem = get_shared_umem(rxq);
+   if (get_shared_umem(rxq, internals->if_name, &umem) < 0)
+   return NULL;
+
if (umem != NULL &&
__atomic_load_n(&umem->refcnt, __ATOMIC_ACQUIRE) <
umem->max_xsks) {
-- 
2.17.1

Re: [dpdk-dev] [DPDK_KMODS v4] linux/igb_uio: add Makefile to build the kernel module

[Burakov, Anatoly]

On 08-Oct-20 10:40 AM, Hariprasad Govindharajan wrote:

With DPDK 20.11 release, the igb_uio module is no more part of DPDK.
There are use cases where this module is required, for example while
testing the virtual ports in OvS, the virtual ports are bound to
igb_uio module inside a VM. So, this patch provides a Makefile
which can be used to build this module and use as needed.

Before building this module, the user is expected to build the
DPDK using meson build system and make sure that the required
libraries are installed in the path /usr/local

Signed-off-by: Hariprasad Govindharajan 
---


Reviewed-by: Ferruh Yigit 
Acked-by: Anatoly Burakov 

--
Thanks,
Anatoly

Re: [dpdk-dev] [PATCH v2 4/6] ethdev: add APIs for hairpin queue operation

[Ori Kam]

Hi Bing,

> -Original Message-
> From: Bing Zhao 
> Sent: Thursday, October 8, 2020 11:52 AM
> Subject: [PATCH v2 4/6] ethdev: add APIs for hairpin queue operation
> 
> Every hairpin queue pair should be configured properly and the
> connection between TX and RX queues should be established, before
> hairpin function works. In single port hairpin mode, the queues of
> each pair belong to the same device. It is easy to get the hardware
> and software information of each queue and configure the hairpin
> connection with such information. In two ports hairpin mode, it is
> not easy or inappropriate to access one queue's information from
> another device.
> 
> Since hairpin is configured per queue pair, three new APIs are
> introduced and they are internal for the PMD using.
> 
> The peer update API helps to pass one queue's information to the
> peer queue and get the peer's information back for the next step.
> The peer bind API configures the current queue with the peer's
> information. For each hairpin queue pair, this API may need to be
> called twice to configure the TX, RX queues separately.
> The peer unbind API resets the current queue configuration and state
> to disconnect it from the peer queue. Also, it may need to be called
> twice to disconnect TX, RX queues from each other.
> 
> Some parameter of the above APIs might not be mandatory, and it
> depends on the PMD implementation.
> 
> The structure of `rte_hairpin_peer_info` is only a declaration and
> the actual members will be defined in each PMD when being used.
> 
> Signed-off-by: Bing Zhao 
> ---


Acked-by: Ori Kam 
Thanks,
Ori

Re: [dpdk-dev] [PATCH v2 5/6] app/testpmd: change hairpin queues setup

[Ori Kam]

Hi Bing

> -Original Message-
> From: Bing Zhao 
> Sent: Thursday, October 8, 2020 11:52 AM
> Subject: [PATCH v2 5/6] app/testpmd: change hairpin queues setup
> 
> A new parameter `hairpin-mode` is introduced to the testpmd command
> line. Bitmask value is used to provide more flexible configuration.
> This parameter should be used when `hairpinq` is specified in the
> command line.
> 
> Bit 0 in the LSB indicates the hairpin will use the loop mode. The
> previous port RX queue will be connected to the current port TX
> queue.
> Bit 1 in the LSB indicates the hairpin will use pair port mode. The
> even index port will be paired with the next odd index port. If the
> total number of probed port is odd, then the last one will be paired
> to itself.
> If this byte is zero, then each port will be paired to itself.
> Bit 0 takes a higher priority in the checking.
> 
> Bit 4 in the second bytes indicate if the hairpin will use explicit
> TX flow mode.
> 
> e.g. in the command line, "--hairpinq=2 --hairpin-mode=0x11"
> 
> If not set, default value zero will be used and the behavior will
> try to get align with the previous single port mode. If the ports
> belong to different vendors' NICs, it is suggested to use the `self`
> hairpin mode only.
> 
> Since hairpin configures the hardware resources, the port mask of
> packets forwarding engine will not be used here.
> 
> Signed-off-by: Bing Zhao 
> ---
> v2: move the hairpin bind/unbind into start/stop to support hot-plug
> and hot-unplug
> ---

Acked-by: Ori Kam 
Thanks,
Ori

Re: [dpdk-dev] [PATCH v2 6/6] doc: update for two ports hairpin mode

[Ori Kam]

Hi Bing,

> -Original Message-
> From: Bing Zhao 
> Sent: Thursday, October 8, 2020 11:52 AM
> Subject: [PATCH v2 6/6] doc: update for two ports hairpin mode
> 
> In the release notes, 2 ports hairpin mode feature is added.
> 
> In rte flow part, one suggestion is added to mention that metadata
> could be used to connect the hairpin RX and TX flows if the hairpin
> is working in explicit TX flow rule mode.
> 
> In the testpmd command line, the new parameter to set hairpin working
> mode is described.
> 
> Signed-off-by: Bing Zhao 
> ---
>  doc/guides/prog_guide/rte_flow.rst | 3 +++
>  doc/guides/rel_notes/release_20_11.rst | 8 
>  doc/guides/testpmd_app_ug/run_app.rst  | 8 
>  3 files changed, 19 insertions(+)
> 
> diff --git a/doc/guides/prog_guide/rte_flow.rst
> b/doc/guides/prog_guide/rte_flow.rst
> index 119b128..bb54d67 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -2592,6 +2592,9 @@ set, unpredictable value will be seen depending on
> driver implementation. For
>  loopback/hairpin packet, metadata set on Rx/Tx may or may not be
> propagated to
>  the other path depending on HW capability.
> 
> +In hairpin case with TX explicit flow mode, metadata could (not mandatory) be
> +used to connect the RX and TX flows if it can be propagated from RX to TX
> path.
> +
>  .. _table_rte_flow_action_set_meta:
> 
>  .. table:: SET_META
> diff --git a/doc/guides/rel_notes/release_20_11.rst
> b/doc/guides/rel_notes/release_20_11.rst
> index 0b2a370..05ceea0 100644
> --- a/doc/guides/rel_notes/release_20_11.rst
> +++ b/doc/guides/rel_notes/release_20_11.rst
> @@ -109,6 +109,10 @@ New Features
>* Extern objects and functions can be plugged into the pipeline.
>* Transaction-oriented table updates.
> 
> +* **Updated the ethdev library to support hairpin between two ports.**
> +
> +  New APIs are introduced to support binding / unbinding 2 ports hairpin.
> +  Hairpin TX part flow rules can be inserted explicitly.
> 
>  Removed Items
>  -
> @@ -240,6 +244,10 @@ ABI Changes
> 
>* ``ethdev`` internal functions are marked with ``__rte_internal`` tag.
> 
> +  * ``struct rte_eth_hairpin_conf`` has two new members:
> +
> +* ``uint32_t tx_explicit:1;``
> +* ``uint32_t manual_bind:1;``
> 
>  Known Issues
>  
> diff --git a/doc/guides/testpmd_app_ug/run_app.rst
> b/doc/guides/testpmd_app_ug/run_app.rst
> index e2539f6..4e627c4 100644
> --- a/doc/guides/testpmd_app_ug/run_app.rst
> +++ b/doc/guides/testpmd_app_ug/run_app.rst
> @@ -497,3 +497,11 @@ The command line options are:
>  *   ``--record-burst-stats``
> 
>  Enable display of RX and TX burst stats.
> +
> +*   ``--hairpin-mode=0xXX``
> +
> +Set the hairpin port mode with bitmask, only valid when hairpin queues
> number is set.
> +bit 4 - explicit TX flow rule
> +bit 1 - two hairpin ports paired
> +bit 0 - two hairpin ports loop
> +The default value is 0. Hairpin will use single port mode and implicit 
> TX flow
> mode.
> --
> 1.8.3.1

Acked-by: Ori Kam 
Thanks,
Ori

[dpdk-dev] [PATCH v6 00/25] raw/ioat: enhancements and new hardware support

[Bruce Richardson]

This patchset adds some small enhancements, some rework and also support
for new hardware to the ioat rawdev driver. Most rework and enhancements
are largely self-explanatory from the individual patches.

The new hardware support is for the Intel(R) DSA accelerator which will be
present in future Intel processors. A description of this new hardware is
covered in [1]. Functions specific to the new hardware use the "idxd"
prefix, for consistency with the kernel driver.

[1] https://01.org/blogs/2019/introducing-intel-data-streaming-accelerator

---
V6:
 * Add explicit __rte_experimental tag on all functions.
   [Previously header just had note saying all contents are experimental]

V5:
 * Rebased to latest main branch.

V4:
 * Fixed compile with FreeBSD clang
 * Improved autotests for fill operation

V3:
 * More doc updates including release note updates throughout the set
 * Added in fill operation
 * Added in fix for missing close operation
 * Added in fix for doc building to ensure ioat is in in the index

V2:
 * Included documentation additions in the set
 * Split off the rawdev unit test changes to a separate patchset for easier
   review
 * General code improvements and cleanups 


Bruce Richardson (19):
  doc/api: add ioat driver to index
  raw/ioat: enable use from C++ code
  raw/ioat: include extra info in error messages
  raw/ioat: split header for readability
  raw/ioat: rename functions to be operation-agnostic
  raw/ioat: add separate API for fence call
  raw/ioat: make the HW register spec private
  raw/ioat: add skeleton for VFIO/UIO based DSA device
  raw/ioat: include example configuration script
  raw/ioat: create rawdev instances on idxd PCI probe
  raw/ioat: add datapath data structures for idxd devices
  raw/ioat: add configure function for idxd devices
  raw/ioat: add start and stop functions for idxd devices
  raw/ioat: add data path for idxd devices
  raw/ioat: add info function for idxd devices
  raw/ioat: create separate statistics structure
  raw/ioat: move xstats functions to common file
  raw/ioat: add xstats tracking for idxd devices
  raw/ioat: clean up use of common test function

Cheng Jiang (1):
  raw/ioat: add a flag to control copying handle parameters

Kevin Laatz (5):
  raw/ioat: fix missing close function
  usertools/dpdk-devbind.py: add support for DSA HW
  raw/ioat: add vdev probe for DSA/idxd devices
  raw/ioat: create rawdev instances for idxd vdevs
  raw/ioat: add fill operation

 doc/api/doxy-api-index.md |   1 +
 doc/api/doxy-api.conf.in  |   1 +
 doc/guides/rawdevs/ioat.rst   | 163 +++--
 doc/guides/rel_notes/release_20_11.rst|  23 +
 doc/guides/sample_app_ug/ioat.rst |   8 +-
 drivers/raw/ioat/dpdk_idxd_cfg.py |  79 +++
 drivers/raw/ioat/idxd_pci.c   | 345 ++
 drivers/raw/ioat/idxd_vdev.c  | 233 +++
 drivers/raw/ioat/ioat_common.c| 244 +++
 drivers/raw/ioat/ioat_private.h   |  82 +++
 drivers/raw/ioat/ioat_rawdev.c|  92 +--
 drivers/raw/ioat/ioat_rawdev_test.c   | 130 +++-
 .../raw/ioat/{rte_ioat_spec.h => ioat_spec.h} |  90 ++-
 drivers/raw/ioat/meson.build  |  15 +-
 drivers/raw/ioat/rte_ioat_rawdev.h| 226 +++
 drivers/raw/ioat/rte_ioat_rawdev_fns.h| 595 ++
 examples/ioat/ioatfwd.c   |  16 +-
 lib/librte_eal/include/rte_common.h   |   1 +
 usertools/dpdk-devbind.py |   6 +-
 19 files changed, 1996 insertions(+), 354 deletions(-)
 create mode 100755 drivers/raw/ioat/dpdk_idxd_cfg.py
 create mode 100644 drivers/raw/ioat/idxd_pci.c
 create mode 100644 drivers/raw/ioat/idxd_vdev.c
 create mode 100644 drivers/raw/ioat/ioat_common.c
 create mode 100644 drivers/raw/ioat/ioat_private.h
 rename drivers/raw/ioat/{rte_ioat_spec.h => ioat_spec.h} (74%)
 create mode 100644 drivers/raw/ioat/rte_ioat_rawdev_fns.h

-- 
2.25.1

Re: [dpdk-dev] [PATCH v12 0/5] eal: add WC store functions

[Nicolau, Radu]

On 10/8/2020 8:28 AM, David Marchand wrote:

On Wed, Sep 23, 2020 at 4:23 PM Radu Nicolau  wrote:

Implement 2 new functions that will enable write combining
stores depending on architecture. The functions are provided
as a generic stub and a x86 specific implementation.

The reason to implement these functions is to improve performance
by reducing the overhead associated with regular mmio writes when
updating the hardware queue tails and doorbells.

For the record, on which CPU/platform was this tested and how much of
an improvement did you get with this?


The improvement varies a lot with the particular usecase and the PMD, so 
it's difficult to state a number, but there were cases with performance 
improvements going well into the double digits, with very small bursts 
applications seeing the most benefits. Tests were done on a Snow Ridge 
platform.





I did not see review/ack tokens from other arch maintainers, but since
it has been on the ml for a while, I guess I can proceed as is.



With this patch set the I40E, ICE, IXGBE and QAT PMDs are updated to
use the write combining store functions with other PMDs to follow.

This series will go through the main repo: copying Ferruh and Akhil for info.

[dpdk-dev] [PATCH v6 01/25] doc/api: add ioat driver to index

[Bruce Richardson]

Add the ioat driver to the doxygen documentation.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 doc/api/doxy-api-index.md | 1 +
 doc/api/doxy-api.conf.in  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index 037c77579..a9c12d1a2 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -44,6 +44,7 @@ The public API headers are grouped by topics:
   [ixgbe]  (@ref rte_pmd_ixgbe.h),
   [i40e]   (@ref rte_pmd_i40e.h),
   [ice](@ref rte_pmd_ice.h),
+  [ioat]   (@ref rte_ioat_rawdev.h),
   [bnxt]   (@ref rte_pmd_bnxt.h),
   [dpaa]   (@ref rte_pmd_dpaa.h),
   [dpaa2]  (@ref rte_pmd_dpaa2.h),
diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in
index ddef755c2..e37f8c2e8 100644
--- a/doc/api/doxy-api.conf.in
+++ b/doc/api/doxy-api.conf.in
@@ -18,6 +18,7 @@ INPUT   = @TOPDIR@/doc/api/doxy-api-index.md \
   @TOPDIR@/drivers/net/softnic \
   @TOPDIR@/drivers/raw/dpaa2_cmdif \
   @TOPDIR@/drivers/raw/dpaa2_qdma \
+  @TOPDIR@/drivers/raw/ioat \
   @TOPDIR@/lib/librte_eal/include \
   @TOPDIR@/lib/librte_eal/include/generic \
   @TOPDIR@/lib/librte_acl \
-- 
2.25.1

[dpdk-dev] [PATCH v6 03/25] raw/ioat: enable use from C++ code

[Bruce Richardson]

To allow the header file to be used from C++ code we need to ensure all
typecasts are explicit, and include an 'extern "C"' guard.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/rte_ioat_rawdev.h | 23 +--
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/drivers/raw/ioat/rte_ioat_rawdev.h 
b/drivers/raw/ioat/rte_ioat_rawdev.h
index f765a6557..3d8419271 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev.h
@@ -5,6 +5,10 @@
 #ifndef _RTE_IOAT_RAWDEV_H_
 #define _RTE_IOAT_RAWDEV_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @file rte_ioat_rawdev.h
  *
@@ -100,7 +104,8 @@ rte_ioat_enqueue_copy(int dev_id, phys_addr_t src, 
phys_addr_t dst,
unsigned int length, uintptr_t src_hdl, uintptr_t dst_hdl,
int fence)
 {
-   struct rte_ioat_rawdev *ioat = rte_rawdevs[dev_id].dev_private;
+   struct rte_ioat_rawdev *ioat =
+   (struct rte_ioat_rawdev 
*)rte_rawdevs[dev_id].dev_private;
unsigned short read = ioat->next_read;
unsigned short write = ioat->next_write;
unsigned short mask = ioat->ring_size - 1;
@@ -141,7 +146,8 @@ rte_ioat_enqueue_copy(int dev_id, phys_addr_t src, 
phys_addr_t dst,
 static inline void
 rte_ioat_do_copies(int dev_id)
 {
-   struct rte_ioat_rawdev *ioat = rte_rawdevs[dev_id].dev_private;
+   struct rte_ioat_rawdev *ioat =
+   (struct rte_ioat_rawdev 
*)rte_rawdevs[dev_id].dev_private;
ioat->desc_ring[(ioat->next_write - 1) & (ioat->ring_size - 1)].u
.control.completion_update = 1;
rte_compiler_barrier();
@@ -190,7 +196,8 @@ static inline int
 rte_ioat_completed_copies(int dev_id, uint8_t max_copies,
uintptr_t *src_hdls, uintptr_t *dst_hdls)
 {
-   struct rte_ioat_rawdev *ioat = rte_rawdevs[dev_id].dev_private;
+   struct rte_ioat_rawdev *ioat =
+   (struct rte_ioat_rawdev 
*)rte_rawdevs[dev_id].dev_private;
unsigned short mask = (ioat->ring_size - 1);
unsigned short read = ioat->next_read;
unsigned short end_read, count;
@@ -212,13 +219,13 @@ rte_ioat_completed_copies(int dev_id, uint8_t max_copies,
__m128i hdls0 = _mm_load_si128(&ioat->hdls[read & mask]);
__m128i hdls1 = _mm_load_si128(&ioat->hdls[(read + 1) & mask]);
 
-   _mm_storeu_si128((void *)&src_hdls[i],
+   _mm_storeu_si128((__m128i *)&src_hdls[i],
_mm_unpacklo_epi64(hdls0, hdls1));
-   _mm_storeu_si128((void *)&dst_hdls[i],
+   _mm_storeu_si128((__m128i *)&dst_hdls[i],
_mm_unpackhi_epi64(hdls0, hdls1));
}
for (; i < count; i++, read++) {
-   uintptr_t *hdls = (void *)&ioat->hdls[read & mask];
+   uintptr_t *hdls = (uintptr_t *)&ioat->hdls[read & mask];
src_hdls[i] = hdls[0];
dst_hdls[i] = hdls[1];
}
@@ -228,4 +235,8 @@ rte_ioat_completed_copies(int dev_id, uint8_t max_copies,
return count;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_IOAT_RAWDEV_H_ */
-- 
2.25.1

[dpdk-dev] [PATCH v6 02/25] raw/ioat: fix missing close function

[Bruce Richardson]

From: Kevin Laatz 

When rte_rawdev_pmd_release() is called, rte_rawdev_close() looks for a
dev_close function for the device causing a segmentation fault when no
close() function is implemented for a driver.

This patch resolves the issue by adding a stub function ioat_dev_close().

Fixes: f687e842e328 ("raw/ioat: introduce IOAT driver")
Cc: sta...@dpdk.org

Reported-by: Sunil Pai G 
Signed-off-by: Kevin Laatz 
Reviewed-by: Bruce Richardson 
Acked-by: Sunil Pai G 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/ioat_rawdev.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
index 7f1a15436..0732b059f 100644
--- a/drivers/raw/ioat/ioat_rawdev.c
+++ b/drivers/raw/ioat/ioat_rawdev.c
@@ -203,6 +203,12 @@ ioat_xstats_reset(struct rte_rawdev *dev, const uint32_t 
*ids, uint32_t nb_ids)
return 0;
 }
 
+static int
+ioat_dev_close(struct rte_rawdev *dev __rte_unused)
+{
+   return 0;
+}
+
 extern int ioat_rawdev_test(uint16_t dev_id);
 
 static int
@@ -212,6 +218,7 @@ ioat_rawdev_create(const char *name, struct rte_pci_device 
*dev)
.dev_configure = ioat_dev_configure,
.dev_start = ioat_dev_start,
.dev_stop = ioat_dev_stop,
+   .dev_close = ioat_dev_close,
.dev_info_get = ioat_dev_info_get,
.xstats_get = ioat_xstats_get,
.xstats_get_names = ioat_xstats_get_names,
-- 
2.25.1

[dpdk-dev] [PATCH v6 04/25] raw/ioat: include extra info in error messages

[Bruce Richardson]

In case of any failures, include the function name and the line number of
the error message in the message, to make tracking down the failure easier.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/ioat_rawdev_test.c | 53 +++--
 1 file changed, 35 insertions(+), 18 deletions(-)

diff --git a/drivers/raw/ioat/ioat_rawdev_test.c 
b/drivers/raw/ioat/ioat_rawdev_test.c
index e5b50ae9f..77f96bba3 100644
--- a/drivers/raw/ioat/ioat_rawdev_test.c
+++ b/drivers/raw/ioat/ioat_rawdev_test.c
@@ -16,6 +16,23 @@ int ioat_rawdev_test(uint16_t dev_id); /* pre-define to keep 
compiler happy */
 static struct rte_mempool *pool;
 static unsigned short expected_ring_size[MAX_SUPPORTED_RAWDEVS];
 
+#define PRINT_ERR(...) print_err(__func__, __LINE__, __VA_ARGS__)
+
+static inline int
+__rte_format_printf(3, 4)
+print_err(const char *func, int lineno, const char *format, ...)
+{
+   va_list ap;
+   int ret;
+
+   ret = fprintf(stderr, "In %s:%d - ", func, lineno);
+   va_start(ap, format);
+   ret += vfprintf(stderr, format, ap);
+   va_end(ap);
+
+   return ret;
+}
+
 static int
 test_enqueue_copies(int dev_id)
 {
@@ -45,7 +62,7 @@ test_enqueue_copies(int dev_id)
(uintptr_t)src,
(uintptr_t)dst,
0 /* no fence */) != 1) {
-   printf("Error with rte_ioat_enqueue_copy\n");
+   PRINT_ERR("Error with rte_ioat_enqueue_copy\n");
return -1;
}
rte_ioat_do_copies(dev_id);
@@ -53,18 +70,18 @@ test_enqueue_copies(int dev_id)
 
if (rte_ioat_completed_copies(dev_id, 1, (void *)&completed[0],
(void *)&completed[1]) != 1) {
-   printf("Error with rte_ioat_completed_copies\n");
+   PRINT_ERR("Error with rte_ioat_completed_copies\n");
return -1;
}
if (completed[0] != src || completed[1] != dst) {
-   printf("Error with completions: got (%p, %p), not 
(%p,%p)\n",
+   PRINT_ERR("Error with completions: got (%p, %p), not 
(%p,%p)\n",
completed[0], completed[1], src, dst);
return -1;
}
 
for (i = 0; i < length; i++)
if (dst_data[i] != src_data[i]) {
-   printf("Data mismatch at char %u\n", i);
+   PRINT_ERR("Data mismatch at char %u\n", i);
return -1;
}
rte_pktmbuf_free(src);
@@ -97,7 +114,7 @@ test_enqueue_copies(int dev_id)
(uintptr_t)srcs[i],
(uintptr_t)dsts[i],
0 /* nofence */) != 1) {
-   printf("Error with rte_ioat_enqueue_copy for 
buffer %u\n",
+   PRINT_ERR("Error with rte_ioat_enqueue_copy for 
buffer %u\n",
i);
return -1;
}
@@ -107,18 +124,18 @@ test_enqueue_copies(int dev_id)
 
if (rte_ioat_completed_copies(dev_id, 64, (void *)completed_src,
(void *)completed_dst) != RTE_DIM(srcs)) {
-   printf("Error with rte_ioat_completed_copies\n");
+   PRINT_ERR("Error with rte_ioat_completed_copies\n");
return -1;
}
for (i = 0; i < RTE_DIM(srcs); i++) {
char *src_data, *dst_data;
 
if (completed_src[i] != srcs[i]) {
-   printf("Error with source pointer %u\n", i);
+   PRINT_ERR("Error with source pointer %u\n", i);
return -1;
}
if (completed_dst[i] != dsts[i]) {
-   printf("Error with dest pointer %u\n", i);
+   PRINT_ERR("Error with dest pointer %u\n", i);
return -1;
}
 
@@ -126,7 +143,7 @@ test_enqueue_copies(int dev_id)
dst_data = rte_pktmbuf_mtod(dsts[i], char *);
for (j = 0; j < length; j++)
if (src_data[j] != dst_data[j]) {
-   printf("Error with copy of packet %u, 
byte %u\n",
+   PRINT_ERR("Error with copy of packet 
%u, byte %u\n",
i, j);
return -1;

[dpdk-dev] [PATCH v6 06/25] raw/ioat: split header for readability

[Bruce Richardson]

Rather than having a single long complicated header file for general use we
can split things so that there is one header with all the publicly needed
information - data structs and function prototypes - while the rest of the
internal details are put separately. This makes it easier to read,
understand and use the APIs.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/meson.build   |   1 +
 drivers/raw/ioat/rte_ioat_rawdev.h | 147 +-
 drivers/raw/ioat/rte_ioat_rawdev_fns.h | 168 +
 3 files changed, 175 insertions(+), 141 deletions(-)
 create mode 100644 drivers/raw/ioat/rte_ioat_rawdev_fns.h

diff --git a/drivers/raw/ioat/meson.build b/drivers/raw/ioat/meson.build
index 0878418ae..f66e9b605 100644
--- a/drivers/raw/ioat/meson.build
+++ b/drivers/raw/ioat/meson.build
@@ -8,4 +8,5 @@ sources = files('ioat_rawdev.c',
 deps += ['rawdev', 'bus_pci', 'mbuf']
 
 install_headers('rte_ioat_rawdev.h',
+   'rte_ioat_rawdev_fns.h',
'rte_ioat_spec.h')
diff --git a/drivers/raw/ioat/rte_ioat_rawdev.h 
b/drivers/raw/ioat/rte_ioat_rawdev.h
index 28ce95cc9..7067b352f 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev.h
@@ -18,12 +18,7 @@ extern "C" {
  * @b EXPERIMENTAL: these structures and APIs may change without prior notice
  */
 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include "rte_ioat_spec.h"
+#include 
 
 /** Name of the device driver */
 #define IOAT_PMD_RAWDEV_NAME rawdev_ioat
@@ -42,38 +37,6 @@ struct rte_ioat_rawdev_config {
bool hdls_disable;/**< if set, ignore user-supplied handle params */
 };
 
-/**
- * @internal
- * Structure representing a device instance
- */
-struct rte_ioat_rawdev {
-   struct rte_rawdev *rawdev;
-   const struct rte_memzone *mz;
-   const struct rte_memzone *desc_mz;
-
-   volatile struct rte_ioat_registers *regs;
-   phys_addr_t status_addr;
-   phys_addr_t ring_addr;
-
-   unsigned short ring_size;
-   struct rte_ioat_generic_hw_desc *desc_ring;
-   bool hdls_disable;
-   __m128i *hdls; /* completion handles for returning to user */
-
-
-   unsigned short next_read;
-   unsigned short next_write;
-
-   /* some statistics for tracking, if added/changed update xstats fns*/
-   uint64_t enqueue_failed __rte_cache_aligned;
-   uint64_t enqueued;
-   uint64_t started;
-   uint64_t completed;
-
-   /* to report completions, the device will write status back here */
-   volatile uint64_t status __rte_cache_aligned;
-};
-
 /**
  * Enqueue a copy operation onto the ioat device
  *
@@ -108,39 +71,7 @@ struct rte_ioat_rawdev {
 static inline int
 rte_ioat_enqueue_copy(int dev_id, phys_addr_t src, phys_addr_t dst,
unsigned int length, uintptr_t src_hdl, uintptr_t dst_hdl,
-   int fence)
-{
-   struct rte_ioat_rawdev *ioat =
-   (struct rte_ioat_rawdev 
*)rte_rawdevs[dev_id].dev_private;
-   unsigned short read = ioat->next_read;
-   unsigned short write = ioat->next_write;
-   unsigned short mask = ioat->ring_size - 1;
-   unsigned short space = mask + read - write;
-   struct rte_ioat_generic_hw_desc *desc;
-
-   if (space == 0) {
-   ioat->enqueue_failed++;
-   return 0;
-   }
-
-   ioat->next_write = write + 1;
-   write &= mask;
-
-   desc = &ioat->desc_ring[write];
-   desc->size = length;
-   /* set descriptor write-back every 16th descriptor */
-   desc->u.control_raw = (uint32_t)((!!fence << 4) | (!(write & 0xF)) << 
3);
-   desc->src_addr = src;
-   desc->dest_addr = dst;
-   if (!ioat->hdls_disable)
-   ioat->hdls[write] = _mm_set_epi64x((int64_t)dst_hdl,
-   (int64_t)src_hdl);
-
-   rte_prefetch0(&ioat->desc_ring[ioat->next_write & mask]);
-
-   ioat->enqueued++;
-   return 1;
-}
+   int fence);
 
 /**
  * Trigger hardware to begin performing enqueued copy operations
@@ -152,32 +83,7 @@ rte_ioat_enqueue_copy(int dev_id, phys_addr_t src, 
phys_addr_t dst,
  *   The rawdev device id of the ioat instance
  */
 static inline void
-rte_ioat_do_copies(int dev_id)
-{
-   struct rte_ioat_rawdev *ioat =
-   (struct rte_ioat_rawdev 
*)rte_rawdevs[dev_id].dev_private;
-   ioat->desc_ring[(ioat->next_write - 1) & (ioat->ring_size - 1)].u
-   .control.completion_update = 1;
-   rte_compiler_barrier();
-   ioat->regs->dmacount = ioat->next_write;
-   ioat->started = ioat->enqueued;
-}
-
-/**
- * @internal
- * Returns the index of the last completed operation.
- */
-static inline int
-rte_ioat_get_last_completed(struct rte_ioat_rawdev *ioat, int *error)
-{
-   uint64_t status = ioat->status;
-
-   /* lower 3 bits indicate "transfer status" : active,

[dpdk-dev] [PATCH v6 05/25] raw/ioat: add a flag to control copying handle parameters

[Bruce Richardson]

From: Cheng Jiang 

Add a flag which controls whether rte_ioat_enqueue_copy and
rte_ioat_completed_copies function should process handle parameters. Not
doing so can improve the performance when handle parameters are not
necessary.

Signed-off-by: Cheng Jiang 
Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 doc/guides/rawdevs/ioat.rst|  3 ++
 doc/guides/rel_notes/release_20_11.rst |  6 
 drivers/raw/ioat/ioat_rawdev.c |  2 ++
 drivers/raw/ioat/rte_ioat_rawdev.h | 45 +++---
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst
index c46460ff4..af00d77fb 100644
--- a/doc/guides/rawdevs/ioat.rst
+++ b/doc/guides/rawdevs/ioat.rst
@@ -129,6 +129,9 @@ output, the ``dev_private`` structure element cannot be 
NULL, and must
 point to a valid ``rte_ioat_rawdev_config`` structure, containing the ring
 size to be used by the device. The ring size must be a power of two,
 between 64 and 4096.
+If it is not needed, the tracking by the driver of user-provided completion
+handles may be disabled by setting the ``hdls_disable`` flag in
+the configuration structure also.
 
 The following code shows how the device is configured in
 ``test_ioat_rawdev.c``:
diff --git a/doc/guides/rel_notes/release_20_11.rst 
b/doc/guides/rel_notes/release_20_11.rst
index cdf20404c..1e73c26d4 100644
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -116,6 +116,12 @@ New Features
   * Extern objects and functions can be plugged into the pipeline.
   * Transaction-oriented table updates.
 
+* **Updated ioat rawdev driver**
+
+  The ioat rawdev driver has been updated and enhanced. Changes include:
+
+  * Added a per-device configuration flag to disable management of 
user-provided completion handles
+
 
 Removed Items
 -
diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
index 0732b059f..ea9f51ffc 100644
--- a/drivers/raw/ioat/ioat_rawdev.c
+++ b/drivers/raw/ioat/ioat_rawdev.c
@@ -58,6 +58,7 @@ ioat_dev_configure(const struct rte_rawdev *dev, 
rte_rawdev_obj_t config,
return -EINVAL;
 
ioat->ring_size = params->ring_size;
+   ioat->hdls_disable = params->hdls_disable;
if (ioat->desc_ring != NULL) {
rte_memzone_free(ioat->desc_mz);
ioat->desc_ring = NULL;
@@ -122,6 +123,7 @@ ioat_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t 
dev_info,
return -EINVAL;
 
cfg->ring_size = ioat->ring_size;
+   cfg->hdls_disable = ioat->hdls_disable;
return 0;
 }
 
diff --git a/drivers/raw/ioat/rte_ioat_rawdev.h 
b/drivers/raw/ioat/rte_ioat_rawdev.h
index 3d8419271..28ce95cc9 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev.h
@@ -38,7 +38,8 @@ extern "C" {
  * an ioat rawdev instance.
  */
 struct rte_ioat_rawdev_config {
-   unsigned short ring_size;
+   unsigned short ring_size; /**< size of job submission descriptor ring */
+   bool hdls_disable;/**< if set, ignore user-supplied handle params */
 };
 
 /**
@@ -56,6 +57,7 @@ struct rte_ioat_rawdev {
 
unsigned short ring_size;
struct rte_ioat_generic_hw_desc *desc_ring;
+   bool hdls_disable;
__m128i *hdls; /* completion handles for returning to user */
 
 
@@ -88,10 +90,14 @@ struct rte_ioat_rawdev {
  *   The length of the data to be copied
  * @param src_hdl
  *   An opaque handle for the source data, to be returned when this operation
- *   has been completed and the user polls for the completion details
+ *   has been completed and the user polls for the completion details.
+ *   NOTE: If hdls_disable configuration option for the device is set, this
+ *   parameter is ignored.
  * @param dst_hdl
  *   An opaque handle for the destination data, to be returned when this
- *   operation has been completed and the user polls for the completion details
+ *   operation has been completed and the user polls for the completion 
details.
+ *   NOTE: If hdls_disable configuration option for the device is set, this
+ *   parameter is ignored.
  * @param fence
  *   A flag parameter indicating that hardware should not begin to perform any
  *   subsequently enqueued copy operations until after this operation has
@@ -126,8 +132,10 @@ rte_ioat_enqueue_copy(int dev_id, phys_addr_t src, 
phys_addr_t dst,
desc->u.control_raw = (uint32_t)((!!fence << 4) | (!(write & 0xF)) << 
3);
desc->src_addr = src;
desc->dest_addr = dst;
+   if (!ioat->hdls_disable)
+   ioat->hdls[write] = _mm_set_epi64x((int64_t)dst_hdl,
+   (int64_t)src_hdl);
 
-   ioat->hdls[write] = _mm_set_epi64x((int64_t)dst_hdl, (int64_t)src_hdl);
rte_prefetch0(&ioat->desc_ring[ioat->next_write & mask]);
 
ioat->enqueued++;
@@ -174,19 +182,29 @@ rt

[dpdk-dev] [PATCH v6 07/25] raw/ioat: rename functions to be operation-agnostic

[Bruce Richardson]

Since the hardware supported by the ioat driver is capable of operations
other than just copies, we can rename the doorbell and completion-return
functions to not have "copies" in their names. These functions are not
copy-specific, and so would apply for other operations which may be added
later to the driver.

Also add a suitable warning using deprecation attribute for any code using
the old functions names.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 doc/guides/rawdevs/ioat.rst| 16 
 doc/guides/rel_notes/release_20_11.rst |  9 +
 doc/guides/sample_app_ug/ioat.rst  |  8 
 drivers/raw/ioat/ioat_rawdev_test.c| 12 ++--
 drivers/raw/ioat/rte_ioat_rawdev.h | 17 ++---
 drivers/raw/ioat/rte_ioat_rawdev_fns.h | 20 
 examples/ioat/ioatfwd.c|  4 ++--
 lib/librte_eal/include/rte_common.h|  1 +
 8 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst
index af00d77fb..3db5f5d09 100644
--- a/doc/guides/rawdevs/ioat.rst
+++ b/doc/guides/rawdevs/ioat.rst
@@ -157,9 +157,9 @@ Performing Data Copies
 ~~~
 
 To perform data copies using IOAT rawdev devices, the functions
-``rte_ioat_enqueue_copy()`` and ``rte_ioat_do_copies()`` should be used.
+``rte_ioat_enqueue_copy()`` and ``rte_ioat_perform_ops()`` should be used.
 Once copies have been completed, the completion will be reported back when
-the application calls ``rte_ioat_completed_copies()``.
+the application calls ``rte_ioat_completed_ops()``.
 
 The ``rte_ioat_enqueue_copy()`` function enqueues a single copy to the
 device ring for copying at a later point. The parameters to that function
@@ -172,11 +172,11 @@ pointers if packet data is being copied.
 
 While the ``rte_ioat_enqueue_copy()`` function enqueues a copy operation on
 the device ring, the copy will not actually be performed until after the
-application calls the ``rte_ioat_do_copies()`` function. This function
+application calls the ``rte_ioat_perform_ops()`` function. This function
 informs the device hardware of the elements enqueued on the ring, and the
 device will begin to process them. It is expected that, for efficiency
 reasons, a burst of operations will be enqueued to the device via multiple
-enqueue calls between calls to the ``rte_ioat_do_copies()`` function.
+enqueue calls between calls to the ``rte_ioat_perform_ops()`` function.
 
 The following code from ``test_ioat_rawdev.c`` demonstrates how to enqueue
 a burst of copies to the device and start the hardware processing of them:
@@ -210,10 +210,10 @@ a burst of copies to the device and start the hardware 
processing of them:
 return -1;
 }
 }
-rte_ioat_do_copies(dev_id);
+rte_ioat_perform_ops(dev_id);
 
 To retrieve information about completed copies, the API
-``rte_ioat_completed_copies()`` should be used. This API will return to the
+``rte_ioat_completed_ops()`` should be used. This API will return to the
 application a set of completion handles passed in when the relevant copies
 were enqueued.
 
@@ -223,9 +223,9 @@ is correct before freeing the data buffers using the 
returned handles:
 
 .. code-block:: C
 
-if (rte_ioat_completed_copies(dev_id, 64, (void *)completed_src,
+if (rte_ioat_completed_ops(dev_id, 64, (void *)completed_src,
 (void *)completed_dst) != RTE_DIM(srcs)) {
-printf("Error with rte_ioat_completed_copies\n");
+printf("Error with rte_ioat_completed_ops\n");
 return -1;
 }
 for (i = 0; i < RTE_DIM(srcs); i++) {
diff --git a/doc/guides/rel_notes/release_20_11.rst 
b/doc/guides/rel_notes/release_20_11.rst
index 1e73c26d4..e7d038f31 100644
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -121,6 +121,11 @@ New Features
   The ioat rawdev driver has been updated and enhanced. Changes include:
 
   * Added a per-device configuration flag to disable management of 
user-provided completion handles
+  * Renamed the ``rte_ioat_do_copies()`` API to ``rte_ioat_perform_ops()``,
+and renamed the ``rte_ioat_completed_copies()`` API to 
``rte_ioat_completed_ops()``
+to better reflect the APIs' purposes, and remove the implication that
+they are limited to copy operations only.
+[Note: The old API is still provided but marked as deprecated in the code]
 
 
 Removed Items
@@ -234,6 +239,10 @@ API Changes
 
 * bpf: ``RTE_BPF_XTYPE_NUM`` has been dropped from ``rte_bpf_xtype``.
 
+* raw/ioat: As noted above, the ``rte_ioat_do_copies()`` and
+  ``rte_ioat_completed_copies()`` functions have been renamed to
+  ``rte_ioat_perform_ops()`` and ``rte_ioat_completed_ops()`` respectively.
+
 
 ABI Changes
 ---
diff --git a/doc/guides/sample_app_ug/ioat.rst 
b/doc/guides/samp

[dpdk-dev] [PATCH v6 09/25] raw/ioat: make the HW register spec private

[Bruce Richardson]

Only a few definitions from the hardware spec are actually used in the
driver runtime, so we can copy over those few and make the rest of the spec
a private header in the driver.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/ioat_rawdev.c|  3 ++
 .../raw/ioat/{rte_ioat_spec.h => ioat_spec.h} | 26 ---
 drivers/raw/ioat/meson.build  |  3 +-
 drivers/raw/ioat/rte_ioat_rawdev_fns.h| 43 +--
 4 files changed, 44 insertions(+), 31 deletions(-)
 rename drivers/raw/ioat/{rte_ioat_spec.h => ioat_spec.h} (91%)

diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
index ea9f51ffc..aa59b731f 100644
--- a/drivers/raw/ioat/ioat_rawdev.c
+++ b/drivers/raw/ioat/ioat_rawdev.c
@@ -4,10 +4,12 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
 #include "rte_ioat_rawdev.h"
+#include "ioat_spec.h"
 
 static struct rte_pci_driver ioat_pmd_drv;
 
@@ -268,6 +270,7 @@ ioat_rawdev_create(const char *name, struct rte_pci_device 
*dev)
ioat->rawdev = rawdev;
ioat->mz = mz;
ioat->regs = dev->mem_resource[0].addr;
+   ioat->doorbell = &ioat->regs->dmacount;
ioat->ring_size = 0;
ioat->desc_ring = NULL;
ioat->status_addr = ioat->mz->iova +
diff --git a/drivers/raw/ioat/rte_ioat_spec.h b/drivers/raw/ioat/ioat_spec.h
similarity index 91%
rename from drivers/raw/ioat/rte_ioat_spec.h
rename to drivers/raw/ioat/ioat_spec.h
index c6e7929b2..9645e16d4 100644
--- a/drivers/raw/ioat/rte_ioat_spec.h
+++ b/drivers/raw/ioat/ioat_spec.h
@@ -86,32 +86,6 @@ struct rte_ioat_registers {
 
 #define RTE_IOAT_CHANCMP_ALIGN 8   /* CHANCMP address must 
be 64-bit aligned */
 
-struct rte_ioat_generic_hw_desc {
-   uint32_t size;
-   union {
-   uint32_t control_raw;
-   struct {
-   uint32_t int_enable: 1;
-   uint32_t src_snoop_disable: 1;
-   uint32_t dest_snoop_disable: 1;
-   uint32_t completion_update: 1;
-   uint32_t fence: 1;
-   uint32_t reserved2: 1;
-   uint32_t src_page_break: 1;
-   uint32_t dest_page_break: 1;
-   uint32_t bundle: 1;
-   uint32_t dest_dca: 1;
-   uint32_t hint: 1;
-   uint32_t reserved: 13;
-   uint32_t op: 8;
-   } control;
-   } u;
-   uint64_t src_addr;
-   uint64_t dest_addr;
-   uint64_t next;
-   uint64_t op_specific[4];
-};
-
 struct rte_ioat_dma_hw_desc {
uint32_t size;
union {
diff --git a/drivers/raw/ioat/meson.build b/drivers/raw/ioat/meson.build
index f66e9b605..06636f8a9 100644
--- a/drivers/raw/ioat/meson.build
+++ b/drivers/raw/ioat/meson.build
@@ -8,5 +8,4 @@ sources = files('ioat_rawdev.c',
 deps += ['rawdev', 'bus_pci', 'mbuf']
 
 install_headers('rte_ioat_rawdev.h',
-   'rte_ioat_rawdev_fns.h',
-   'rte_ioat_spec.h')
+   'rte_ioat_rawdev_fns.h')
diff --git a/drivers/raw/ioat/rte_ioat_rawdev_fns.h 
b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
index 466721a23..c6e0b9a58 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev_fns.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
@@ -8,7 +8,36 @@
 #include 
 #include 
 #include 
-#include "rte_ioat_spec.h"
+
+/**
+ * @internal
+ * Structure representing a device descriptor
+ */
+struct rte_ioat_generic_hw_desc {
+   uint32_t size;
+   union {
+   uint32_t control_raw;
+   struct {
+   uint32_t int_enable: 1;
+   uint32_t src_snoop_disable: 1;
+   uint32_t dest_snoop_disable: 1;
+   uint32_t completion_update: 1;
+   uint32_t fence: 1;
+   uint32_t reserved2: 1;
+   uint32_t src_page_break: 1;
+   uint32_t dest_page_break: 1;
+   uint32_t bundle: 1;
+   uint32_t dest_dca: 1;
+   uint32_t hint: 1;
+   uint32_t reserved: 13;
+   uint32_t op: 8;
+   } control;
+   } u;
+   uint64_t src_addr;
+   uint64_t dest_addr;
+   uint64_t next;
+   uint64_t op_specific[4];
+};
 
 /**
  * @internal
@@ -19,7 +48,7 @@ struct rte_ioat_rawdev {
const struct rte_memzone *mz;
const struct rte_memzone *desc_mz;
 
-   volatile struct rte_ioat_registers *regs;
+   volatile uint16_t *doorbell;
phys_addr_t status_addr;
phys_addr_t ring_addr;
 
@@ -40,8 +69,16 @@ struct rte_ioat_rawdev {
 
/* to report completions, the device will write status back here */
volatile uint64_t status __rte_cache_aligned;
+
+   /* pointer to the register bar 

[dpdk-dev] [PATCH v6 08/25] raw/ioat: add separate API for fence call

[Bruce Richardson]

Rather than having the fence signalled via a flag on a descriptor - which
requires reading the docs to find out whether the flag needs to go on the
last descriptor before, or the first descriptor after the fence - we can
instead add a separate fence API call. This becomes unambiguous to use,
since the fence call explicitly comes between two other enqueue calls. It
also allows more freedom of implementation in the driver code.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 doc/guides/rawdevs/ioat.rst|  3 +--
 doc/guides/rel_notes/release_20_11.rst |  4 
 drivers/raw/ioat/ioat_rawdev_test.c|  6 ++
 drivers/raw/ioat/rte_ioat_rawdev.h | 27 --
 drivers/raw/ioat/rte_ioat_rawdev_fns.h | 22 ++---
 examples/ioat/ioatfwd.c| 12 
 6 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst
index 3db5f5d09..71bca0b28 100644
--- a/doc/guides/rawdevs/ioat.rst
+++ b/doc/guides/rawdevs/ioat.rst
@@ -203,8 +203,7 @@ a burst of copies to the device and start the hardware 
processing of them:
 dsts[i]->buf_iova + dsts[i]->data_off,
 length,
 (uintptr_t)srcs[i],
-(uintptr_t)dsts[i],
-0 /* nofence */) != 1) {
+(uintptr_t)dsts[i]) != 1) {
 printf("Error with rte_ioat_enqueue_copy for buffer 
%u\n",
 i);
 return -1;
diff --git a/doc/guides/rel_notes/release_20_11.rst 
b/doc/guides/rel_notes/release_20_11.rst
index e7d038f31..25ede96d9 100644
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -126,6 +126,10 @@ New Features
 to better reflect the APIs' purposes, and remove the implication that
 they are limited to copy operations only.
 [Note: The old API is still provided but marked as deprecated in the code]
+  * Added a new API ``rte_ioat_fence()`` to add a fence between operations.
+This API replaces the ``fence`` flag parameter in the 
``rte_ioat_enqueue_copies()`` function,
+and is clearer as there is no ambiguity as to whether the flag should be
+set on the last operation before the fence or the first operation after it.
 
 
 Removed Items
diff --git a/drivers/raw/ioat/ioat_rawdev_test.c 
b/drivers/raw/ioat/ioat_rawdev_test.c
index 439b46c03..8b665cc9a 100644
--- a/drivers/raw/ioat/ioat_rawdev_test.c
+++ b/drivers/raw/ioat/ioat_rawdev_test.c
@@ -60,8 +60,7 @@ test_enqueue_copies(int dev_id)
dst->buf_iova + dst->data_off,
length,
(uintptr_t)src,
-   (uintptr_t)dst,
-   0 /* no fence */) != 1) {
+   (uintptr_t)dst) != 1) {
PRINT_ERR("Error with rte_ioat_enqueue_copy\n");
return -1;
}
@@ -112,8 +111,7 @@ test_enqueue_copies(int dev_id)
dsts[i]->buf_iova + dsts[i]->data_off,
length,
(uintptr_t)srcs[i],
-   (uintptr_t)dsts[i],
-   0 /* nofence */) != 1) {
+   (uintptr_t)dsts[i]) != 1) {
PRINT_ERR("Error with rte_ioat_enqueue_copy for 
buffer %u\n",
i);
return -1;
diff --git a/drivers/raw/ioat/rte_ioat_rawdev.h 
b/drivers/raw/ioat/rte_ioat_rawdev.h
index ae6393951..21a929012 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev.h
@@ -61,18 +61,33 @@ struct rte_ioat_rawdev_config {
  *   operation has been completed and the user polls for the completion 
details.
  *   NOTE: If hdls_disable configuration option for the device is set, this
  *   parameter is ignored.
- * @param fence
- *   A flag parameter indicating that hardware should not begin to perform any
- *   subsequently enqueued copy operations until after this operation has
- *   completed
  * @return
  *   Number of operations enqueued, either 0 or 1
  */
 static inline int
 __rte_experimental
 rte_ioat_enqueue_copy(int dev_id, phys_addr_t src, phys_addr_t dst,
-   unsigned int length, uintptr_t src_hdl, uintptr_t dst_hdl,
-   int fence);
+   unsigned int length, uintptr_t src_hdl, uintptr_t dst_hdl);
+
+/**
+ * Add a fence to force ordering between operations
+ *
+ * This adds a fence to a sequence of operations to enforce ordering, such that
+ * all operations enqueued before the fence must b

[dpdk-dev] [PATCH v6 10/25] usertools/dpdk-devbind.py: add support for DSA HW

[Bruce Richardson]

From: Kevin Laatz 

Intel Data Streaming Accelerator (Intel DSA) is a high-performance data
copy and transformation accelerator which will be integrated in future
Intel processors [1].

Add DSA device support to dpdk-devbind.py script.

[1] https://01.org/blogs/2019/introducing-intel-data-streaming-accelerator

Signed-off-by: Bruce Richardson 
Signed-off-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 doc/guides/rel_notes/release_20_11.rst | 2 ++
 usertools/dpdk-devbind.py  | 6 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/guides/rel_notes/release_20_11.rst 
b/doc/guides/rel_notes/release_20_11.rst
index 25ede96d9..e48e6ea75 100644
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -120,6 +120,8 @@ New Features
 
   The ioat rawdev driver has been updated and enhanced. Changes include:
 
+  * Added support for Intel\ |reg| Data Streaming Accelerator hardware.
+For more information, see 
https://01.org/blogs/2019/introducing-intel-data-streaming-accelerator
   * Added a per-device configuration flag to disable management of 
user-provided completion handles
   * Renamed the ``rte_ioat_do_copies()`` API to ``rte_ioat_perform_ops()``,
 and renamed the ``rte_ioat_completed_copies()`` API to 
``rte_ioat_completed_ops()``
diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
index d149bac13..1d1113a08 100755
--- a/usertools/dpdk-devbind.py
+++ b/usertools/dpdk-devbind.py
@@ -48,6 +48,8 @@
   'SVendor': None, 'SDevice': None}
 intel_ioat_icx = {'Class': '08', 'Vendor': '8086', 'Device': '0b00',
   'SVendor': None, 'SDevice': None}
+intel_idxd_spr = {'Class': '08', 'Vendor': '8086', 'Device': '0b25',
+  'SVendor': None, 'SDevice': None}
 intel_ntb_skx = {'Class': '06', 'Vendor': '8086', 'Device': '201c',
   'SVendor': None, 'SDevice': None}
 intel_ntb_icx = {'Class': '06', 'Vendor': '8086', 'Device': '347e',
@@ -59,7 +61,9 @@
 eventdev_devices = [cavium_sso, cavium_tim, octeontx2_sso]
 mempool_devices = [cavium_fpa, octeontx2_npa]
 compress_devices = [cavium_zip]
-misc_devices = [intel_ioat_bdw, intel_ioat_skx, intel_ioat_icx, intel_ntb_skx, 
intel_ntb_icx, octeontx2_dma]
+misc_devices = [intel_ioat_bdw, intel_ioat_skx, intel_ioat_icx, intel_idxd_spr,
+intel_ntb_skx, intel_ntb_icx,
+octeontx2_dma]
 
 # global dict ethernet devices present. Dictionary indexed by PCI address.
 # Each device within this is itself a dictionary of device properties
-- 
2.25.1

[dpdk-dev] [PATCH v6 12/25] raw/ioat: add vdev probe for DSA/idxd devices

[Bruce Richardson]

From: Kevin Laatz 

The Intel DSA devices can be exposed to userspace via kernel driver, so can
be used without having to bind them to vfio/uio. Therefore we add support
for using those kernel-configured devices as vdevs, taking as parameter the
individual HW work queue to be used by the vdev.

Signed-off-by: Kevin Laatz 
Signed-off-by: Bruce Richardson 
Acked-by: Radu Nicolau 
---
 doc/guides/rawdevs/ioat.rst  |  68 +--
 drivers/raw/ioat/idxd_vdev.c | 123 +++
 drivers/raw/ioat/meson.build |   6 +-
 3 files changed, 192 insertions(+), 5 deletions(-)
 create mode 100644 drivers/raw/ioat/idxd_vdev.c

diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst
index b898f98d5..5b8d27980 100644
--- a/doc/guides/rawdevs/ioat.rst
+++ b/doc/guides/rawdevs/ioat.rst
@@ -37,9 +37,62 @@ No additional compilation steps are necessary.
 Device Setup
 -
 
+Depending on support provided by the PMD, HW devices can either use the kernel 
configured driver
+or be bound to a user-space IO driver for use.
+For example, Intel\ |reg| DSA devices can use the IDXD kernel driver or 
DPDK-supported drivers,
+such as ``vfio-pci``.
+
+Intel\ |reg| DSA devices using idxd kernel driver
+~~
+
+To use a Intel\ |reg| DSA device bound to the IDXD kernel driver, the device 
must first be configured.
+The `accel-config `_ utility library can 
be used for configuration.
+
+.. note::
+The device configuration can also be done by directly interacting with 
the sysfs nodes.
+
+There are some mandatory configuration steps before being able to use a device 
with an application.
+The internal engines, which do the copies or other operations,
+and the work-queues, which are used by applications to assign work to the 
device,
+need to be assigned to groups, and the various other configuration options,
+such as priority or queue depth, need to be set for each queue.
+
+To assign an engine to a group::
+
+$ accel-config config-engine dsa0/engine0.0 --group-id=0
+$ accel-config config-engine dsa0/engine0.1 --group-id=1
+
+To assign work queues to groups for passing descriptors to the engines a 
similar accel-config command can be used.
+However, the work queues also need to be configured depending on the use-case.
+Some configuration options include:
+
+* mode (Dedicated/Shared): Indicates whether a WQ may accept jobs from 
multiple queues simultaneously.
+* priority: WQ priority between 1 and 15. Larger value means higher priority.
+* wq-size: the size of the WQ. Sum of all WQ sizes must be less that the 
total-size defined by the device.
+* type: WQ type (kernel/mdev/user). Determines how the device is presented.
+* name: identifier given to the WQ.
+
+Example configuration for a work queue::
+
+$ accel-config config-wq dsa0/wq0.0 --group-id=0 \
+   --mode=dedicated --priority=10 --wq-size=8 \
+   --type=user --name=app1
+
+Once the devices have been configured, they need to be enabled::
+
+$ accel-config enable-device dsa0
+$ accel-config enable-wq dsa0/wq0.0
+
+Check the device configuration::
+
+$ accel-config list
+
+Devices using VFIO/UIO drivers
+~~~
+
 The HW devices to be used will need to be bound to a user-space IO driver for 
use.
 The ``dpdk-devbind.py`` script can be used to view the state of the devices
-and to bind them to a suitable DPDK-supported kernel driver, such as 
``vfio-pci``.
+and to bind them to a suitable DPDK-supported driver, such as ``vfio-pci``.
 For example::
 
$ dpdk-devbind.py -b vfio-pci 00:04.0 00:04.1
@@ -47,9 +100,16 @@ For example::
 Device Probing and Initialization
 ~~
 
-Once bound to a suitable kernel device driver, the HW devices will be found
-as part of the PCI scan done at application initialization time. No vdev
-parameters need to be passed to create or initialize the device.
+For devices bound to a suitable DPDK-supported VFIO/UIO driver, the HW devices 
will
+be found as part of the device scan done at application initialization time 
without
+the need to pass parameters to the application.
+
+If the device is bound to the IDXD kernel driver (and previously configured 
with sysfs),
+then a specific work queue needs to be passed to the application via a vdev 
parameter.
+This vdev parameter take the driver name and work queue name as parameters.
+For example, to use work queue 0 on Intel\ |reg| DSA instance 0::
+
+$ dpdk-test --no-pci --vdev=rawdev_idxd,wq=0.0
 
 Once probed successfully, the device will appear as a ``rawdev``, that is a
 "raw device type" inside DPDK, and can be accessed using APIs from the
diff --git a/drivers/raw/ioat/idxd_vdev.c b/drivers/raw/ioat/idxd_vdev.c
new file mode 100644
index 0..0509fc084
--- /dev/null
+++ b/drivers/raw/ioat/idxd_vdev.c
@@ -0,0 +1,123 @@
+/* SPDX-Li

[dpdk-dev] [PATCH v6 11/25] raw/ioat: add skeleton for VFIO/UIO based DSA device

[Bruce Richardson]

Add in the basic probe/remove skeleton code for DSA devices which are bound
directly to vfio or uio driver. The kernel module for supporting these uses
the "idxd" name, so that name is used as function and file prefix to avoid
conflict with existing "ioat" prefixed functions.

Since we are adding new files to the driver and there will be common
definitions shared between the various files, we create a new internal
header file ioat_private.h to hold common macros and function prototypes.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 doc/guides/rawdevs/ioat.rst | 69 ++---
 drivers/raw/ioat/idxd_pci.c | 56 ++
 drivers/raw/ioat/ioat_private.h | 27 +
 drivers/raw/ioat/ioat_rawdev.c  |  9 +
 drivers/raw/ioat/meson.build|  6 ++-
 5 files changed, 108 insertions(+), 59 deletions(-)
 create mode 100644 drivers/raw/ioat/idxd_pci.c
 create mode 100644 drivers/raw/ioat/ioat_private.h

diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst
index 71bca0b28..b898f98d5 100644
--- a/doc/guides/rawdevs/ioat.rst
+++ b/doc/guides/rawdevs/ioat.rst
@@ -3,10 +3,12 @@
 
 .. include:: 
 
-IOAT Rawdev Driver for Intel\ |reg| QuickData Technology
-==
+IOAT Rawdev Driver
+===
 
 The ``ioat`` rawdev driver provides a poll-mode driver (PMD) for Intel\ |reg|
+Data Streaming Accelerator `(Intel DSA)
+`_ and 
for Intel\ |reg|
 QuickData Technology, part of Intel\ |reg| I/O Acceleration Technology
 `(Intel I/OAT)
 
`_.
@@ -17,61 +19,30 @@ be done by software, freeing up CPU cycles for other tasks.
 Hardware Requirements
 --
 
-On Linux, the presence of an Intel\ |reg| QuickData Technology hardware can
-be detected by checking the output of the ``lspci`` command, where the
-hardware will be often listed as "Crystal Beach DMA" or "CBDMA". For
-example, on a system with Intel\ |reg| Xeon\ |reg| CPU E5-2699 v4 @2.20GHz,
-lspci shows:
-
-.. code-block:: console
-
-  # lspci | grep DMA
-  00:04.0 System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 
v4/Xeon D Crystal Beach DMA Channel 0 (rev 01)
-  00:04.1 System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 
v4/Xeon D Crystal Beach DMA Channel 1 (rev 01)
-  00:04.2 System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 
v4/Xeon D Crystal Beach DMA Channel 2 (rev 01)
-  00:04.3 System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 
v4/Xeon D Crystal Beach DMA Channel 3 (rev 01)
-  00:04.4 System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 
v4/Xeon D Crystal Beach DMA Channel 4 (rev 01)
-  00:04.5 System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 
v4/Xeon D Crystal Beach DMA Channel 5 (rev 01)
-  00:04.6 System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 
v4/Xeon D Crystal Beach DMA Channel 6 (rev 01)
-  00:04.7 System peripheral: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 
v4/Xeon D Crystal Beach DMA Channel 7 (rev 01)
-
-On a system with Intel\ |reg| Xeon\ |reg| Gold 6154 CPU @ 3.00GHz, lspci
-shows:
-
-.. code-block:: console
-
-  # lspci | grep DMA
-  00:04.0 System peripheral: Intel Corporation Sky Lake-E CBDMA Registers (rev 
04)
-  00:04.1 System peripheral: Intel Corporation Sky Lake-E CBDMA Registers (rev 
04)
-  00:04.2 System peripheral: Intel Corporation Sky Lake-E CBDMA Registers (rev 
04)
-  00:04.3 System peripheral: Intel Corporation Sky Lake-E CBDMA Registers (rev 
04)
-  00:04.4 System peripheral: Intel Corporation Sky Lake-E CBDMA Registers (rev 
04)
-  00:04.5 System peripheral: Intel Corporation Sky Lake-E CBDMA Registers (rev 
04)
-  00:04.6 System peripheral: Intel Corporation Sky Lake-E CBDMA Registers (rev 
04)
-  00:04.7 System peripheral: Intel Corporation Sky Lake-E CBDMA Registers (rev 
04)
-
+The ``dpdk-devbind.py`` script, included with DPDK,
+can be used to show the presence of supported hardware.
+Running ``dpdk-devbind.py --status-dev misc`` will show all the miscellaneous,
+or rawdev-based devices on the system.
+For Intel\ |reg| QuickData Technology devices, the hardware will be often 
listed as "Crystal Beach DMA",
+or "CBDMA".
+For Intel\ |reg| DSA devices, they are currently (at time of writing) 
appearing as devices with type "0b25",
+due to the absence of pci-id database entries for them at this point.
 
 Compilation
 
 
-For builds done with ``make``, the driver compilation is enabled by the
-``CONFIG_RTE_LIBRTE_PMD_IOAT_RAWDEV`` build configuration option. This is
-enabled by default in builds for x86 platforms, and disabled in other
-configurations.
-
-For builds using ``meson`` and ``ninja``, the driver will be built when the
-target platform is x8

[dpdk-dev] [PATCH v6 14/25] raw/ioat: create rawdev instances on idxd PCI probe

[Bruce Richardson]

When a matching device is found via PCI probe create a rawdev instance for
each queue on the hardware. Use empty self-test function for these devices
so that the overall rawdev_autotest does not report failures.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/idxd_pci.c| 237 -
 drivers/raw/ioat/ioat_common.c |  68 +++
 drivers/raw/ioat/ioat_private.h|  33 
 drivers/raw/ioat/ioat_rawdev_test.c|   7 +
 drivers/raw/ioat/ioat_spec.h   |  64 +++
 drivers/raw/ioat/meson.build   |   1 +
 drivers/raw/ioat/rte_ioat_rawdev_fns.h |  35 +++-
 7 files changed, 442 insertions(+), 3 deletions(-)
 create mode 100644 drivers/raw/ioat/ioat_common.c

diff --git a/drivers/raw/ioat/idxd_pci.c b/drivers/raw/ioat/idxd_pci.c
index 1a30e9c31..c3fec56d5 100644
--- a/drivers/raw/ioat/idxd_pci.c
+++ b/drivers/raw/ioat/idxd_pci.c
@@ -3,8 +3,10 @@
  */
 
 #include 
+#include 
 
 #include "ioat_private.h"
+#include "ioat_spec.h"
 
 #define IDXD_VENDOR_ID 0x8086
 #define IDXD_DEVICE_ID_SPR 0x0B25
@@ -16,17 +18,246 @@ const struct rte_pci_id pci_id_idxd_map[] = {
{ .vendor_id = 0, /* sentinel */ },
 };
 
+static inline int
+idxd_pci_dev_command(struct idxd_rawdev *idxd, enum rte_idxd_cmds command)
+{
+   uint8_t err_code;
+   uint16_t qid = idxd->qid;
+   int i = 0;
+
+   if (command >= idxd_disable_wq && command <= idxd_reset_wq)
+   qid = (1 << qid);
+   rte_spinlock_lock(&idxd->u.pci->lk);
+   idxd->u.pci->regs->cmd = (command << IDXD_CMD_SHIFT) | qid;
+
+   do {
+   rte_pause();
+   err_code = idxd->u.pci->regs->cmdstatus;
+   if (++i >= 1000) {
+   IOAT_PMD_ERR("Timeout waiting for command response from 
HW");
+   rte_spinlock_unlock(&idxd->u.pci->lk);
+   return err_code;
+   }
+   } while (idxd->u.pci->regs->cmdstatus & CMDSTATUS_ACTIVE_MASK);
+   rte_spinlock_unlock(&idxd->u.pci->lk);
+
+   return err_code & CMDSTATUS_ERR_MASK;
+}
+
+static int
+idxd_is_wq_enabled(struct idxd_rawdev *idxd)
+{
+   uint32_t state = idxd->u.pci->wq_regs[idxd->qid].wqcfg[WQ_STATE_IDX];
+   return ((state >> WQ_STATE_SHIFT) & WQ_STATE_MASK) == 0x1;
+}
+
+static const struct rte_rawdev_ops idxd_pci_ops = {
+   .dev_close = idxd_rawdev_close,
+   .dev_selftest = idxd_rawdev_test,
+};
+
+/* each portal uses 4 x 4k pages */
+#define IDXD_PORTAL_SIZE (4096 * 4)
+
+static int
+init_pci_device(struct rte_pci_device *dev, struct idxd_rawdev *idxd)
+{
+   struct idxd_pci_common *pci;
+   uint8_t nb_groups, nb_engines, nb_wqs;
+   uint16_t grp_offset, wq_offset; /* how far into bar0 the regs are */
+   uint16_t wq_size, total_wq_size;
+   uint8_t lg2_max_batch, lg2_max_copy_size;
+   unsigned int i, err_code;
+
+   pci = malloc(sizeof(*pci));
+   if (pci == NULL) {
+   IOAT_PMD_ERR("%s: Can't allocate memory", __func__);
+   goto err;
+   }
+   rte_spinlock_init(&pci->lk);
+
+   /* assign the bar registers, and then configure device */
+   pci->regs = dev->mem_resource[0].addr;
+   grp_offset = (uint16_t)pci->regs->offsets[0];
+   pci->grp_regs = RTE_PTR_ADD(pci->regs, grp_offset * 0x100);
+   wq_offset = (uint16_t)(pci->regs->offsets[0] >> 16);
+   pci->wq_regs = RTE_PTR_ADD(pci->regs, wq_offset * 0x100);
+   pci->portals = dev->mem_resource[2].addr;
+
+   /* sanity check device status */
+   if (pci->regs->gensts & GENSTS_DEV_STATE_MASK) {
+   /* need function-level-reset (FLR) or is enabled */
+   IOAT_PMD_ERR("Device status is not disabled, cannot init");
+   goto err;
+   }
+   if (pci->regs->cmdstatus & CMDSTATUS_ACTIVE_MASK) {
+   /* command in progress */
+   IOAT_PMD_ERR("Device has a command in progress, cannot init");
+   goto err;
+   }
+
+   /* read basic info about the hardware for use when configuring */
+   nb_groups = (uint8_t)pci->regs->grpcap;
+   nb_engines = (uint8_t)pci->regs->engcap;
+   nb_wqs = (uint8_t)(pci->regs->wqcap >> 16);
+   total_wq_size = (uint16_t)pci->regs->wqcap;
+   lg2_max_copy_size = (uint8_t)(pci->regs->gencap >> 16) & 0x1F;
+   lg2_max_batch = (uint8_t)(pci->regs->gencap >> 21) & 0x0F;
+
+   IOAT_PMD_DEBUG("nb_groups = %u, nb_engines = %u, nb_wqs = %u",
+   nb_groups, nb_engines, nb_wqs);
+
+   /* zero out any old config */
+   for (i = 0; i < nb_groups; i++) {
+   pci->grp_regs[i].grpengcfg = 0;
+   pci->grp_regs[i].grpwqcfg[0] = 0;
+   }
+   for (i = 0; i < nb_wqs; i++)
+   pci->wq_regs[i].wqcfg[0] = 0;
+
+   /* put each engine into a separate group to avoid reordering */
+   if (

[dpdk-dev] [PATCH v6 13/25] raw/ioat: include example configuration script

[Bruce Richardson]

Devices managed by the idxd kernel driver must be configured for DPDK use
before it can be used by the ioat driver. This example script serves both
as a quick way to get the driver set up with a simple configuration, and as
the basis for users to modify it and create their own configuration
scripts.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 doc/guides/rawdevs/ioat.rst   |  2 +
 drivers/raw/ioat/dpdk_idxd_cfg.py | 79 +++
 2 files changed, 81 insertions(+)
 create mode 100755 drivers/raw/ioat/dpdk_idxd_cfg.py

diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst
index 5b8d27980..7c2a2d457 100644
--- a/doc/guides/rawdevs/ioat.rst
+++ b/doc/guides/rawdevs/ioat.rst
@@ -50,6 +50,8 @@ The `accel-config `_ 
utility library can b
 
 .. note::
 The device configuration can also be done by directly interacting with 
the sysfs nodes.
+An example of how this may be done can be seen in the script 
``dpdk_idxd_cfg.py``
+included in the driver source directory.
 
 There are some mandatory configuration steps before being able to use a device 
with an application.
 The internal engines, which do the copies or other operations,
diff --git a/drivers/raw/ioat/dpdk_idxd_cfg.py 
b/drivers/raw/ioat/dpdk_idxd_cfg.py
new file mode 100755
index 0..bce4bb5bd
--- /dev/null
+++ b/drivers/raw/ioat/dpdk_idxd_cfg.py
@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2020 Intel Corporation
+
+"""
+Configure an entire Intel DSA instance, using idxd kernel driver, for DPDK use
+"""
+
+import sys
+import argparse
+import os
+import os.path
+
+
+class SysfsDir:
+"Used to read/write paths in a sysfs directory"
+def __init__(self, path):
+self.path = path
+
+def read_int(self, filename):
+"Return a value from sysfs file"
+with open(os.path.join(self.path, filename)) as f:
+return int(f.readline())
+
+def write_values(self, values):
+"write dictionary, where key is filename and value is value to write"
+for filename, contents in values.items():
+with open(os.path.join(self.path, filename), "w") as f:
+f.write(str(contents))
+
+
+def configure_dsa(dsa_id, queues):
+"Configure the DSA instance with appropriate number of queues"
+dsa_dir = SysfsDir(f"/sys/bus/dsa/devices/dsa{dsa_id}")
+drv_dir = SysfsDir("/sys/bus/dsa/drivers/dsa")
+
+max_groups = dsa_dir.read_int("max_groups")
+max_engines = dsa_dir.read_int("max_engines")
+max_queues = dsa_dir.read_int("max_work_queues")
+max_tokens = dsa_dir.read_int("max_tokens")
+
+# we want one engine per group
+nb_groups = min(max_engines, max_groups)
+for grp in range(nb_groups):
+dsa_dir.write_values({f"engine{dsa_id}.{grp}/group_id": grp})
+
+nb_queues = min(queues, max_queues)
+if queues > nb_queues:
+print(f"Setting number of queues to max supported value: {max_queues}")
+
+# configure each queue
+for q in range(nb_queues):
+wq_dir = SysfsDir(os.path.join(dsa_dir.path, f"wq{dsa_id}.{q}"))
+wq_dir.write_values({"group_id": q % nb_groups,
+ "type": "user",
+ "mode": "dedicated",
+ "name": f"dpdk_wq{dsa_id}.{q}",
+ "priority": 1,
+ "size": int(max_tokens / nb_queues)})
+
+# enable device and then queues
+drv_dir.write_values({"bind": f"dsa{dsa_id}"})
+for q in range(nb_queues):
+drv_dir.write_values({"bind": f"wq{dsa_id}.{q}"})
+
+
+def main(args):
+"Main function, does arg parsing and calls config function"
+arg_p = argparse.ArgumentParser(
+description="Configure whole DSA device instance for DPDK use")
+arg_p.add_argument('dsa_id', type=int, help="DSA instance number")
+arg_p.add_argument('-q', metavar='queues', type=int, default=255,
+   help="Number of queues to set up")
+parsed_args = arg_p.parse_args(args[1:])
+configure_dsa(parsed_args.dsa_id, parsed_args.q)
+
+
+if __name__ == "__main__":
+main(sys.argv)
-- 
2.25.1

[dpdk-dev] [PATCH v6 15/25] raw/ioat: create rawdev instances for idxd vdevs

[Bruce Richardson]

From: Kevin Laatz 

For each vdev (DSA work queue) instance, create a rawdev instance.

Signed-off-by: Kevin Laatz 
Signed-off-by: Bruce Richardson 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/idxd_vdev.c| 106 +++-
 drivers/raw/ioat/ioat_private.h |   4 ++
 2 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/drivers/raw/ioat/idxd_vdev.c b/drivers/raw/ioat/idxd_vdev.c
index 0509fc084..e61c26c1b 100644
--- a/drivers/raw/ioat/idxd_vdev.c
+++ b/drivers/raw/ioat/idxd_vdev.c
@@ -2,6 +2,12 @@
  * Copyright(c) 2020 Intel Corporation
  */
 
+#include 
+#include 
+#include 
+#include 
+
+#include 
 #include 
 #include 
 #include 
@@ -24,6 +30,36 @@ struct idxd_vdev_args {
uint8_t wq_id;
 };
 
+static const struct rte_rawdev_ops idxd_vdev_ops = {
+   .dev_close = idxd_rawdev_close,
+   .dev_selftest = idxd_rawdev_test,
+};
+
+static void *
+idxd_vdev_mmap_wq(struct idxd_vdev_args *args)
+{
+   void *addr;
+   char path[PATH_MAX];
+   int fd;
+
+   snprintf(path, sizeof(path), "/dev/dsa/wq%u.%u",
+   args->device_id, args->wq_id);
+   fd = open(path, O_RDWR);
+   if (fd < 0) {
+   IOAT_PMD_ERR("Failed to open device path");
+   return NULL;
+   }
+
+   addr = mmap(NULL, 0x1000, PROT_WRITE, MAP_SHARED, fd, 0);
+   close(fd);
+   if (addr == MAP_FAILED) {
+   IOAT_PMD_ERR("Failed to mmap device");
+   return NULL;
+   }
+
+   return addr;
+}
+
 static int
 idxd_rawdev_parse_wq(const char *key __rte_unused, const char *value,
  void *extra_args)
@@ -70,10 +106,32 @@ idxd_vdev_parse_params(struct rte_kvargs *kvlist, struct 
idxd_vdev_args *args)
return -EINVAL;
 }
 
+static int
+idxd_vdev_get_max_batches(struct idxd_vdev_args *args)
+{
+   char sysfs_path[PATH_MAX];
+   FILE *f;
+   int ret;
+
+   snprintf(sysfs_path, sizeof(sysfs_path),
+   "/sys/bus/dsa/devices/wq%u.%u/size",
+   args->device_id, args->wq_id);
+   f = fopen(sysfs_path, "r");
+   if (f == NULL)
+   return -1;
+
+   if (fscanf(f, "%d", &ret) != 1)
+   ret = -1;
+
+   fclose(f);
+   return ret;
+}
+
 static int
 idxd_rawdev_probe_vdev(struct rte_vdev_device *vdev)
 {
struct rte_kvargs *kvlist;
+   struct idxd_rawdev idxd = {{0}}; /* double {} to avoid error on BSD12 */
struct idxd_vdev_args vdev_args;
const char *name;
int ret = 0;
@@ -96,13 +154,32 @@ idxd_rawdev_probe_vdev(struct rte_vdev_device *vdev)
return -EINVAL;
}
 
+   idxd.qid = vdev_args.wq_id;
+   idxd.u.vdev.dsa_id = vdev_args.device_id;
+   idxd.max_batches = idxd_vdev_get_max_batches(&vdev_args);
+
+   idxd.public.portal = idxd_vdev_mmap_wq(&vdev_args);
+   if (idxd.public.portal == NULL) {
+   IOAT_PMD_ERR("WQ mmap failed");
+   return -ENOENT;
+   }
+
+   ret = idxd_rawdev_create(name, &vdev->device, &idxd, &idxd_vdev_ops);
+   if (ret) {
+   IOAT_PMD_ERR("Failed to create rawdev %s", name);
+   return ret;
+   }
+
return 0;
 }
 
 static int
 idxd_rawdev_remove_vdev(struct rte_vdev_device *vdev)
 {
+   struct idxd_rawdev *idxd;
const char *name;
+   struct rte_rawdev *rdev;
+   int ret = 0;
 
name = rte_vdev_device_name(vdev);
if (name == NULL)
@@ -110,7 +187,34 @@ idxd_rawdev_remove_vdev(struct rte_vdev_device *vdev)
 
IOAT_PMD_INFO("Remove DSA vdev %p", name);
 
-   return 0;
+   rdev = rte_rawdev_pmd_get_named_dev(name);
+   if (!rdev) {
+   IOAT_PMD_ERR("Invalid device name (%s)", name);
+   return -EINVAL;
+   }
+
+   idxd = rdev->dev_private;
+
+   /* free context and memory */
+   if (rdev->dev_private != NULL) {
+   IOAT_PMD_DEBUG("Freeing device driver memory");
+   rdev->dev_private = NULL;
+
+   if (munmap(idxd->public.portal, 0x1000) < 0) {
+   IOAT_PMD_ERR("Error unmapping portal");
+   ret = -errno;
+   }
+
+   rte_free(idxd->public.batch_ring);
+   rte_free(idxd->public.hdl_ring);
+
+   rte_memzone_free(idxd->mz);
+   }
+
+   if (rte_rawdev_pmd_release(rdev))
+   IOAT_PMD_ERR("Device cleanup failed");
+
+   return ret;
 }
 
 struct rte_vdev_driver idxd_rawdev_drv_vdev = {
diff --git a/drivers/raw/ioat/ioat_private.h b/drivers/raw/ioat/ioat_private.h
index 53f00a9f3..6f7bdb499 100644
--- a/drivers/raw/ioat/ioat_private.h
+++ b/drivers/raw/ioat/ioat_private.h
@@ -45,6 +45,10 @@ struct idxd_rawdev {
uint16_t max_batches;
 
union {
+   struct {
+   unsigned int dsa_id;
+   } vdev;
+
struct idxd_p

[dpdk-dev] [PATCH v6 17/25] raw/ioat: add configure function for idxd devices

[Bruce Richardson]

Add configure function for idxd devices, taking the same parameters as the
existing configure function for ioat. The ring_size parameter is used to
compute the maximum number of bursts to be supported by the driver, given
that the hardware works on individual bursts of descriptors at a time.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/idxd_pci.c|  1 +
 drivers/raw/ioat/idxd_vdev.c   |  1 +
 drivers/raw/ioat/ioat_common.c | 64 ++
 drivers/raw/ioat/ioat_private.h|  3 ++
 drivers/raw/ioat/rte_ioat_rawdev_fns.h |  1 +
 5 files changed, 70 insertions(+)

diff --git a/drivers/raw/ioat/idxd_pci.c b/drivers/raw/ioat/idxd_pci.c
index 9bee92766..b173c5ae3 100644
--- a/drivers/raw/ioat/idxd_pci.c
+++ b/drivers/raw/ioat/idxd_pci.c
@@ -55,6 +55,7 @@ static const struct rte_rawdev_ops idxd_pci_ops = {
.dev_close = idxd_rawdev_close,
.dev_selftest = idxd_rawdev_test,
.dump = idxd_dev_dump,
+   .dev_configure = idxd_dev_configure,
 };
 
 /* each portal uses 4 x 4k pages */
diff --git a/drivers/raw/ioat/idxd_vdev.c b/drivers/raw/ioat/idxd_vdev.c
index ba78eee90..3dad1473b 100644
--- a/drivers/raw/ioat/idxd_vdev.c
+++ b/drivers/raw/ioat/idxd_vdev.c
@@ -34,6 +34,7 @@ static const struct rte_rawdev_ops idxd_vdev_ops = {
.dev_close = idxd_rawdev_close,
.dev_selftest = idxd_rawdev_test,
.dump = idxd_dev_dump,
+   .dev_configure = idxd_dev_configure,
 };
 
 static void *
diff --git a/drivers/raw/ioat/ioat_common.c b/drivers/raw/ioat/ioat_common.c
index 672241351..5173c331c 100644
--- a/drivers/raw/ioat/ioat_common.c
+++ b/drivers/raw/ioat/ioat_common.c
@@ -44,6 +44,70 @@ idxd_dev_dump(struct rte_rawdev *dev, FILE *f)
return 0;
 }
 
+int
+idxd_dev_configure(const struct rte_rawdev *dev,
+   rte_rawdev_obj_t config, size_t config_size)
+{
+   struct idxd_rawdev *idxd = dev->dev_private;
+   struct rte_idxd_rawdev *rte_idxd = &idxd->public;
+   struct rte_ioat_rawdev_config *cfg = config;
+   uint16_t max_desc = cfg->ring_size;
+   uint16_t max_batches = max_desc / BATCH_SIZE;
+   uint16_t i;
+
+   if (config_size != sizeof(*cfg))
+   return -EINVAL;
+
+   if (dev->started) {
+   IOAT_PMD_ERR("%s: Error, device is started.", __func__);
+   return -EAGAIN;
+   }
+
+   rte_idxd->hdls_disable = cfg->hdls_disable;
+
+   /* limit the batches to what can be stored in hardware */
+   if (max_batches > idxd->max_batches) {
+   IOAT_PMD_DEBUG("Ring size of %u is too large for this device, 
need to limit to %u batches of %u",
+   max_desc, idxd->max_batches, BATCH_SIZE);
+   max_batches = idxd->max_batches;
+   max_desc = max_batches * BATCH_SIZE;
+   }
+   if (!rte_is_power_of_2(max_desc))
+   max_desc = rte_align32pow2(max_desc);
+   IOAT_PMD_DEBUG("Rawdev %u using %u descriptors in %u batches",
+   dev->dev_id, max_desc, max_batches);
+
+   /* in case we are reconfiguring a device, free any existing memory */
+   rte_free(rte_idxd->batch_ring);
+   rte_free(rte_idxd->hdl_ring);
+
+   rte_idxd->batch_ring = rte_zmalloc(NULL,
+   sizeof(*rte_idxd->batch_ring) * max_batches, 0);
+   if (rte_idxd->batch_ring == NULL)
+   return -ENOMEM;
+
+   rte_idxd->hdl_ring = rte_zmalloc(NULL,
+   sizeof(*rte_idxd->hdl_ring) * max_desc, 0);
+   if (rte_idxd->hdl_ring == NULL) {
+   rte_free(rte_idxd->batch_ring);
+   rte_idxd->batch_ring = NULL;
+   return -ENOMEM;
+   }
+   rte_idxd->batch_ring_sz = max_batches;
+   rte_idxd->hdl_ring_sz = max_desc;
+
+   for (i = 0; i < rte_idxd->batch_ring_sz; i++) {
+   struct rte_idxd_desc_batch *b = &rte_idxd->batch_ring[i];
+   b->batch_desc.completion = rte_mem_virt2iova(&b->comp);
+   b->batch_desc.desc_addr = rte_mem_virt2iova(&b->null_desc);
+   b->batch_desc.op_flags = (idxd_op_batch << IDXD_CMD_OP_SHIFT) |
+   IDXD_FLAG_COMPLETION_ADDR_VALID |
+   IDXD_FLAG_REQUEST_COMPLETION;
+   }
+
+   return 0;
+}
+
 int
 idxd_rawdev_create(const char *name, struct rte_device *dev,
   const struct idxd_rawdev *base_idxd,
diff --git a/drivers/raw/ioat/ioat_private.h b/drivers/raw/ioat/ioat_private.h
index f521c85a1..aba70d8d7 100644
--- a/drivers/raw/ioat/ioat_private.h
+++ b/drivers/raw/ioat/ioat_private.h
@@ -59,6 +59,9 @@ extern int idxd_rawdev_create(const char *name, struct 
rte_device *dev,
 
 extern int idxd_rawdev_close(struct rte_rawdev *dev);
 
+extern int idxd_dev_configure(const struct rte_rawdev *dev,
+   

[dpdk-dev] [PATCH v6 16/25] raw/ioat: add datapath data structures for idxd devices

[Bruce Richardson]

Add in the relevant data structures for the data path for DSA devices. Also
include a device dump function to output the status of each device.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/idxd_pci.c|  1 +
 drivers/raw/ioat/idxd_vdev.c   |  1 +
 drivers/raw/ioat/ioat_common.c | 34 +++
 drivers/raw/ioat/ioat_private.h|  2 +
 drivers/raw/ioat/ioat_rawdev_test.c|  3 +-
 drivers/raw/ioat/rte_ioat_rawdev_fns.h | 80 ++
 6 files changed, 120 insertions(+), 1 deletion(-)

diff --git a/drivers/raw/ioat/idxd_pci.c b/drivers/raw/ioat/idxd_pci.c
index c3fec56d5..9bee92766 100644
--- a/drivers/raw/ioat/idxd_pci.c
+++ b/drivers/raw/ioat/idxd_pci.c
@@ -54,6 +54,7 @@ idxd_is_wq_enabled(struct idxd_rawdev *idxd)
 static const struct rte_rawdev_ops idxd_pci_ops = {
.dev_close = idxd_rawdev_close,
.dev_selftest = idxd_rawdev_test,
+   .dump = idxd_dev_dump,
 };
 
 /* each portal uses 4 x 4k pages */
diff --git a/drivers/raw/ioat/idxd_vdev.c b/drivers/raw/ioat/idxd_vdev.c
index e61c26c1b..ba78eee90 100644
--- a/drivers/raw/ioat/idxd_vdev.c
+++ b/drivers/raw/ioat/idxd_vdev.c
@@ -33,6 +33,7 @@ struct idxd_vdev_args {
 static const struct rte_rawdev_ops idxd_vdev_ops = {
.dev_close = idxd_rawdev_close,
.dev_selftest = idxd_rawdev_test,
+   .dump = idxd_dev_dump,
 };
 
 static void *
diff --git a/drivers/raw/ioat/ioat_common.c b/drivers/raw/ioat/ioat_common.c
index c3aa015ed..672241351 100644
--- a/drivers/raw/ioat/ioat_common.c
+++ b/drivers/raw/ioat/ioat_common.c
@@ -14,6 +14,36 @@ idxd_rawdev_close(struct rte_rawdev *dev __rte_unused)
return 0;
 }
 
+int
+idxd_dev_dump(struct rte_rawdev *dev, FILE *f)
+{
+   struct idxd_rawdev *idxd = dev->dev_private;
+   struct rte_idxd_rawdev *rte_idxd = &idxd->public;
+   int i;
+
+   fprintf(f, "Raw Device #%d\n", dev->dev_id);
+   fprintf(f, "Driver: %s\n\n", dev->driver_name);
+
+   fprintf(f, "Portal: %p\n", rte_idxd->portal);
+   fprintf(f, "Batch Ring size: %u\n", rte_idxd->batch_ring_sz);
+   fprintf(f, "Comp Handle Ring size: %u\n\n", rte_idxd->hdl_ring_sz);
+
+   fprintf(f, "Next batch: %u\n", rte_idxd->next_batch);
+   fprintf(f, "Next batch to be completed: %u\n", 
rte_idxd->next_completed);
+   for (i = 0; i < rte_idxd->batch_ring_sz; i++) {
+   struct rte_idxd_desc_batch *b = &rte_idxd->batch_ring[i];
+   fprintf(f, "Batch %u @%p: submitted=%u, op_count=%u, 
hdl_end=%u\n",
+   i, b, b->submitted, b->op_count, b->hdl_end);
+   }
+
+   fprintf(f, "\n");
+   fprintf(f, "Next free hdl: %u\n", rte_idxd->next_free_hdl);
+   fprintf(f, "Last completed hdl: %u\n", rte_idxd->last_completed_hdl);
+   fprintf(f, "Next returned hdl: %u\n", rte_idxd->next_ret_hdl);
+
+   return 0;
+}
+
 int
 idxd_rawdev_create(const char *name, struct rte_device *dev,
   const struct idxd_rawdev *base_idxd,
@@ -25,6 +55,10 @@ idxd_rawdev_create(const char *name, struct rte_device *dev,
char mz_name[RTE_MEMZONE_NAMESIZE];
int ret = 0;
 
+   RTE_BUILD_BUG_ON(sizeof(struct rte_idxd_hw_desc) != 64);
+   RTE_BUILD_BUG_ON(offsetof(struct rte_idxd_hw_desc, size) != 32);
+   RTE_BUILD_BUG_ON(sizeof(struct rte_idxd_completion) != 32);
+
if (!name) {
IOAT_PMD_ERR("Invalid name of the device!");
ret = -EINVAL;
diff --git a/drivers/raw/ioat/ioat_private.h b/drivers/raw/ioat/ioat_private.h
index 6f7bdb499..f521c85a1 100644
--- a/drivers/raw/ioat/ioat_private.h
+++ b/drivers/raw/ioat/ioat_private.h
@@ -61,4 +61,6 @@ extern int idxd_rawdev_close(struct rte_rawdev *dev);
 
 extern int idxd_rawdev_test(uint16_t dev_id);
 
+extern int idxd_dev_dump(struct rte_rawdev *dev, FILE *f);
+
 #endif /* _IOAT_PRIVATE_H_ */
diff --git a/drivers/raw/ioat/ioat_rawdev_test.c 
b/drivers/raw/ioat/ioat_rawdev_test.c
index 87a65b7ae..ceeac92ef 100644
--- a/drivers/raw/ioat/ioat_rawdev_test.c
+++ b/drivers/raw/ioat/ioat_rawdev_test.c
@@ -270,7 +270,8 @@ ioat_rawdev_test(uint16_t dev_id)
 }
 
 int
-idxd_rawdev_test(uint16_t dev_id __rte_unused)
+idxd_rawdev_test(uint16_t dev_id)
 {
+   rte_rawdev_dump(dev_id, stdout);
return 0;
 }
diff --git a/drivers/raw/ioat/rte_ioat_rawdev_fns.h 
b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
index fa2eb5334..178c432dd 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev_fns.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
@@ -90,6 +90,86 @@ struct rte_ioat_rawdev {
 #define RTE_IOAT_CHANSTS_HALTED0x3
 #define RTE_IOAT_CHANSTS_ARMED 0x4
 
+/*
+ * Defines used in the data path for interacting with hardware.
+ */
+#define IDXD_CMD_OP_SHIFT 24
+enum rte_idxd_ops {
+   idxd_op_nop = 0,
+   idxd_op_batch,
+   idxd_op_drain,
+   idxd_o

[dpdk-dev] [PATCH v6 18/25] raw/ioat: add start and stop functions for idxd devices

[Bruce Richardson]

Add the start and stop functions for DSA hardware devices using the
vfio/uio kernel drivers. For vdevs using the idxd kernel driver, the device
must be started using sysfs before the device node appears for vdev use -
making start/stop functions in the driver unnecessary.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/idxd_pci.c | 50 +
 1 file changed, 50 insertions(+)

diff --git a/drivers/raw/ioat/idxd_pci.c b/drivers/raw/ioat/idxd_pci.c
index b173c5ae3..6b5c47392 100644
--- a/drivers/raw/ioat/idxd_pci.c
+++ b/drivers/raw/ioat/idxd_pci.c
@@ -51,11 +51,61 @@ idxd_is_wq_enabled(struct idxd_rawdev *idxd)
return ((state >> WQ_STATE_SHIFT) & WQ_STATE_MASK) == 0x1;
 }
 
+static void
+idxd_pci_dev_stop(struct rte_rawdev *dev)
+{
+   struct idxd_rawdev *idxd = dev->dev_private;
+   uint8_t err_code;
+
+   if (!idxd_is_wq_enabled(idxd)) {
+   IOAT_PMD_ERR("Work queue %d already disabled", idxd->qid);
+   return;
+   }
+
+   err_code = idxd_pci_dev_command(idxd, idxd_disable_wq);
+   if (err_code || idxd_is_wq_enabled(idxd)) {
+   IOAT_PMD_ERR("Failed disabling work queue %d, error code: %#x",
+   idxd->qid, err_code);
+   return;
+   }
+   IOAT_PMD_DEBUG("Work queue %d disabled OK", idxd->qid);
+}
+
+static int
+idxd_pci_dev_start(struct rte_rawdev *dev)
+{
+   struct idxd_rawdev *idxd = dev->dev_private;
+   uint8_t err_code;
+
+   if (idxd_is_wq_enabled(idxd)) {
+   IOAT_PMD_WARN("WQ %d already enabled", idxd->qid);
+   return 0;
+   }
+
+   if (idxd->public.batch_ring == NULL) {
+   IOAT_PMD_ERR("WQ %d has not been fully configured", idxd->qid);
+   return -EINVAL;
+   }
+
+   err_code = idxd_pci_dev_command(idxd, idxd_enable_wq);
+   if (err_code || !idxd_is_wq_enabled(idxd)) {
+   IOAT_PMD_ERR("Failed enabling work queue %d, error code: %#x",
+   idxd->qid, err_code);
+   return err_code == 0 ? -1 : err_code;
+   }
+
+   IOAT_PMD_DEBUG("Work queue %d enabled OK", idxd->qid);
+
+   return 0;
+}
+
 static const struct rte_rawdev_ops idxd_pci_ops = {
.dev_close = idxd_rawdev_close,
.dev_selftest = idxd_rawdev_test,
.dump = idxd_dev_dump,
.dev_configure = idxd_dev_configure,
+   .dev_start = idxd_pci_dev_start,
+   .dev_stop = idxd_pci_dev_stop,
 };
 
 /* each portal uses 4 x 4k pages */
-- 
2.25.1

[dpdk-dev] [PATCH v6 20/25] raw/ioat: add info function for idxd devices

[Bruce Richardson]

Add the info get function for DSA devices, returning just the ring size
info about the device, same as is returned for existing IOAT/CBDMA devices.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/idxd_pci.c |  1 +
 drivers/raw/ioat/idxd_vdev.c|  1 +
 drivers/raw/ioat/ioat_common.c  | 18 ++
 drivers/raw/ioat/ioat_private.h |  3 +++
 4 files changed, 23 insertions(+)

diff --git a/drivers/raw/ioat/idxd_pci.c b/drivers/raw/ioat/idxd_pci.c
index 6b5c47392..bf5edcfdd 100644
--- a/drivers/raw/ioat/idxd_pci.c
+++ b/drivers/raw/ioat/idxd_pci.c
@@ -106,6 +106,7 @@ static const struct rte_rawdev_ops idxd_pci_ops = {
.dev_configure = idxd_dev_configure,
.dev_start = idxd_pci_dev_start,
.dev_stop = idxd_pci_dev_stop,
+   .dev_info_get = idxd_dev_info_get,
 };
 
 /* each portal uses 4 x 4k pages */
diff --git a/drivers/raw/ioat/idxd_vdev.c b/drivers/raw/ioat/idxd_vdev.c
index 3dad1473b..c75ac4317 100644
--- a/drivers/raw/ioat/idxd_vdev.c
+++ b/drivers/raw/ioat/idxd_vdev.c
@@ -35,6 +35,7 @@ static const struct rte_rawdev_ops idxd_vdev_ops = {
.dev_selftest = idxd_rawdev_test,
.dump = idxd_dev_dump,
.dev_configure = idxd_dev_configure,
+   .dev_info_get = idxd_dev_info_get,
 };
 
 static void *
diff --git a/drivers/raw/ioat/ioat_common.c b/drivers/raw/ioat/ioat_common.c
index 6a4e2979f..b5cea2fda 100644
--- a/drivers/raw/ioat/ioat_common.c
+++ b/drivers/raw/ioat/ioat_common.c
@@ -44,6 +44,24 @@ idxd_dev_dump(struct rte_rawdev *dev, FILE *f)
return 0;
 }
 
+int
+idxd_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,
+   size_t info_size)
+{
+   struct rte_ioat_rawdev_config *cfg = dev_info;
+   struct idxd_rawdev *idxd = dev->dev_private;
+   struct rte_idxd_rawdev *rte_idxd = &idxd->public;
+
+   if (info_size != sizeof(*cfg))
+   return -EINVAL;
+
+   if (cfg != NULL) {
+   cfg->ring_size = rte_idxd->hdl_ring_sz;
+   cfg->hdls_disable = rte_idxd->hdls_disable;
+   }
+   return 0;
+}
+
 int
 idxd_dev_configure(const struct rte_rawdev *dev,
rte_rawdev_obj_t config, size_t config_size)
diff --git a/drivers/raw/ioat/ioat_private.h b/drivers/raw/ioat/ioat_private.h
index aba70d8d7..0f80d60bf 100644
--- a/drivers/raw/ioat/ioat_private.h
+++ b/drivers/raw/ioat/ioat_private.h
@@ -62,6 +62,9 @@ extern int idxd_rawdev_close(struct rte_rawdev *dev);
 extern int idxd_dev_configure(const struct rte_rawdev *dev,
rte_rawdev_obj_t config, size_t config_size);
 
+extern int idxd_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,
+   size_t info_size);
+
 extern int idxd_rawdev_test(uint16_t dev_id);
 
 extern int idxd_dev_dump(struct rte_rawdev *dev, FILE *f);
-- 
2.25.1

[dpdk-dev] [PATCH v6 21/25] raw/ioat: create separate statistics structure

[Bruce Richardson]

Rather than having the xstats as fields inside the main driver structure,
create a separate structure type for them.

As part of the change, when updating the stats functions referring to the
stats by the old path, we can simplify them to use the id to directly index
into the stats structure, making the code shorter and simpler.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/ioat_rawdev.c | 40 +++---
 drivers/raw/ioat/rte_ioat_rawdev_fns.h | 30 ---
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
index 0097be87e..4ea913fff 100644
--- a/drivers/raw/ioat/ioat_rawdev.c
+++ b/drivers/raw/ioat/ioat_rawdev.c
@@ -132,16 +132,14 @@ ioat_xstats_get(const struct rte_rawdev *dev, const 
unsigned int ids[],
uint64_t values[], unsigned int n)
 {
const struct rte_ioat_rawdev *ioat = dev->dev_private;
+   const uint64_t *stats = (const void *)&ioat->xstats;
unsigned int i;
 
for (i = 0; i < n; i++) {
-   switch (ids[i]) {
-   case 0: values[i] = ioat->enqueue_failed; break;
-   case 1: values[i] = ioat->enqueued; break;
-   case 2: values[i] = ioat->started; break;
-   case 3: values[i] = ioat->completed; break;
-   default: values[i] = 0; break;
-   }
+   if (ids[i] < sizeof(ioat->xstats)/sizeof(*stats))
+   values[i] = stats[ids[i]];
+   else
+   values[i] = 0;
}
return n;
 }
@@ -167,35 +165,17 @@ static int
 ioat_xstats_reset(struct rte_rawdev *dev, const uint32_t *ids, uint32_t nb_ids)
 {
struct rte_ioat_rawdev *ioat = dev->dev_private;
+   uint64_t *stats = (void *)&ioat->xstats;
unsigned int i;
 
if (!ids) {
-   ioat->enqueue_failed = 0;
-   ioat->enqueued = 0;
-   ioat->started = 0;
-   ioat->completed = 0;
+   memset(&ioat->xstats, 0, sizeof(ioat->xstats));
return 0;
}
 
-   for (i = 0; i < nb_ids; i++) {
-   switch (ids[i]) {
-   case 0:
-   ioat->enqueue_failed = 0;
-   break;
-   case 1:
-   ioat->enqueued = 0;
-   break;
-   case 2:
-   ioat->started = 0;
-   break;
-   case 3:
-   ioat->completed = 0;
-   break;
-   default:
-   IOAT_PMD_WARN("Invalid xstat id - cannot reset value");
-   break;
-   }
-   }
+   for (i = 0; i < nb_ids; i++)
+   if (ids[i] < sizeof(ioat->xstats)/sizeof(*stats))
+   stats[ids[i]] = 0;
 
return 0;
 }
diff --git a/drivers/raw/ioat/rte_ioat_rawdev_fns.h 
b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
index 36ba876ea..89bfc8d21 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev_fns.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
@@ -49,17 +49,31 @@ enum rte_ioat_dev_type {
RTE_IDXD_DEV,
 };
 
+/**
+ * @internal
+ * some statistics for tracking, if added/changed update xstats fns
+ */
+struct rte_ioat_xstats {
+   uint64_t enqueue_failed;
+   uint64_t enqueued;
+   uint64_t started;
+   uint64_t completed;
+};
+
 /**
  * @internal
  * Structure representing an IOAT device instance
  */
 struct rte_ioat_rawdev {
+   /* common fields at the top - match those in rte_idxd_rawdev */
enum rte_ioat_dev_type type;
+   struct rte_ioat_xstats xstats;
+
struct rte_rawdev *rawdev;
const struct rte_memzone *mz;
const struct rte_memzone *desc_mz;
 
-   volatile uint16_t *doorbell;
+   volatile uint16_t *doorbell __rte_cache_aligned;
phys_addr_t status_addr;
phys_addr_t ring_addr;
 
@@ -72,12 +86,6 @@ struct rte_ioat_rawdev {
unsigned short next_read;
unsigned short next_write;
 
-   /* some statistics for tracking, if added/changed update xstats fns*/
-   uint64_t enqueue_failed __rte_cache_aligned;
-   uint64_t enqueued;
-   uint64_t started;
-   uint64_t completed;
-
/* to report completions, the device will write status back here */
volatile uint64_t status __rte_cache_aligned;
 
@@ -209,7 +217,7 @@ __ioat_enqueue_copy(int dev_id, phys_addr_t src, 
phys_addr_t dst,
struct rte_ioat_generic_hw_desc *desc;
 
if (space == 0) {
-   ioat->enqueue_failed++;
+   ioat->xstats.enqueue_failed++;
return 0;
}
 
@@ -228,7 +236,7 @@ __ioat_enqueue_copy(int dev_id, phys_addr_t src, 
phys_addr_t dst,
(int64_t)src_hdl);
rte_prefetch0(&ioat->desc_ring[io

[dpdk-dev] [PATCH v6 19/25] raw/ioat: add data path for idxd devices

[Bruce Richardson]

Add support for doing copies using DSA hardware. This is implemented by
just switching on the device type field at the start of the inline
functions. Since there is no hardware which will have both device types
present this branch will always be predictable after the first call,
meaning it has little to no perf penalty.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/ioat_common.c |   1 +
 drivers/raw/ioat/ioat_rawdev.c |   1 +
 drivers/raw/ioat/rte_ioat_rawdev_fns.h | 201 +++--
 3 files changed, 192 insertions(+), 11 deletions(-)

diff --git a/drivers/raw/ioat/ioat_common.c b/drivers/raw/ioat/ioat_common.c
index 5173c331c..6a4e2979f 100644
--- a/drivers/raw/ioat/ioat_common.c
+++ b/drivers/raw/ioat/ioat_common.c
@@ -153,6 +153,7 @@ idxd_rawdev_create(const char *name, struct rte_device *dev,
 
idxd = rawdev->dev_private;
*idxd = *base_idxd; /* copy over the main fields already passed in */
+   idxd->public.type = RTE_IDXD_DEV;
idxd->rawdev = rawdev;
idxd->mz = mz;
 
diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
index 1fe32278d..0097be87e 100644
--- a/drivers/raw/ioat/ioat_rawdev.c
+++ b/drivers/raw/ioat/ioat_rawdev.c
@@ -260,6 +260,7 @@ ioat_rawdev_create(const char *name, struct rte_pci_device 
*dev)
rawdev->driver_name = dev->device.driver->name;
 
ioat = rawdev->dev_private;
+   ioat->type = RTE_IOAT_DEV;
ioat->rawdev = rawdev;
ioat->mz = mz;
ioat->regs = dev->mem_resource[0].addr;
diff --git a/drivers/raw/ioat/rte_ioat_rawdev_fns.h 
b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
index e9cdce016..36ba876ea 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev_fns.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
@@ -196,8 +196,8 @@ struct rte_idxd_rawdev {
 /*
  * Enqueue a copy operation onto the ioat device
  */
-static inline int
-rte_ioat_enqueue_copy(int dev_id, phys_addr_t src, phys_addr_t dst,
+static __rte_always_inline int
+__ioat_enqueue_copy(int dev_id, phys_addr_t src, phys_addr_t dst,
unsigned int length, uintptr_t src_hdl, uintptr_t dst_hdl)
 {
struct rte_ioat_rawdev *ioat =
@@ -233,8 +233,8 @@ rte_ioat_enqueue_copy(int dev_id, phys_addr_t src, 
phys_addr_t dst,
 }
 
 /* add fence to last written descriptor */
-static inline int
-rte_ioat_fence(int dev_id)
+static __rte_always_inline int
+__ioat_fence(int dev_id)
 {
struct rte_ioat_rawdev *ioat =
(struct rte_ioat_rawdev 
*)rte_rawdevs[dev_id].dev_private;
@@ -252,8 +252,8 @@ rte_ioat_fence(int dev_id)
 /*
  * Trigger hardware to begin performing enqueued operations
  */
-static inline void
-rte_ioat_perform_ops(int dev_id)
+static __rte_always_inline void
+__ioat_perform_ops(int dev_id)
 {
struct rte_ioat_rawdev *ioat =
(struct rte_ioat_rawdev 
*)rte_rawdevs[dev_id].dev_private;
@@ -268,8 +268,8 @@ rte_ioat_perform_ops(int dev_id)
  * @internal
  * Returns the index of the last completed operation.
  */
-static inline int
-rte_ioat_get_last_completed(struct rte_ioat_rawdev *ioat, int *error)
+static __rte_always_inline int
+__ioat_get_last_completed(struct rte_ioat_rawdev *ioat, int *error)
 {
uint64_t status = ioat->status;
 
@@ -283,8 +283,8 @@ rte_ioat_get_last_completed(struct rte_ioat_rawdev *ioat, 
int *error)
 /*
  * Returns details of operations that have been completed
  */
-static inline int
-rte_ioat_completed_ops(int dev_id, uint8_t max_copies,
+static __rte_always_inline int
+__ioat_completed_ops(int dev_id, uint8_t max_copies,
uintptr_t *src_hdls, uintptr_t *dst_hdls)
 {
struct rte_ioat_rawdev *ioat =
@@ -295,7 +295,7 @@ rte_ioat_completed_ops(int dev_id, uint8_t max_copies,
int error;
int i = 0;
 
-   end_read = (rte_ioat_get_last_completed(ioat, &error) + 1) & mask;
+   end_read = (__ioat_get_last_completed(ioat, &error) + 1) & mask;
count = (end_read - (read & mask)) & mask;
 
if (error) {
@@ -332,6 +332,185 @@ rte_ioat_completed_ops(int dev_id, uint8_t max_copies,
return count;
 }
 
+static __rte_always_inline int
+__idxd_write_desc(int dev_id, const struct rte_idxd_hw_desc *desc,
+   const struct rte_idxd_user_hdl *hdl)
+{
+   struct rte_idxd_rawdev *idxd =
+   (struct rte_idxd_rawdev 
*)rte_rawdevs[dev_id].dev_private;
+   struct rte_idxd_desc_batch *b = &idxd->batch_ring[idxd->next_batch];
+
+   /* check for room in the handle ring */
+   if (((idxd->next_free_hdl + 1) & (idxd->hdl_ring_sz - 1)) == 
idxd->next_ret_hdl)
+   goto failed;
+
+   /* check for space in current batch */
+   if (b->op_count >= BATCH_SIZE)
+   goto failed;
+
+   /* check that we can actually use the current batch */
+   if (b->submitted)
+   goto failed;
+
+   /* write the descriptor */
+

[dpdk-dev] [PATCH v6 22/25] raw/ioat: move xstats functions to common file

[Bruce Richardson]

The xstats functions can be used by all ioat devices so move them from the
ioat_rawdev.c file to ioat_common.c, and add the function prototypes to the
internal header file.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/ioat_common.c  | 59 +
 drivers/raw/ioat/ioat_private.h | 10 ++
 drivers/raw/ioat/ioat_rawdev.c  | 58 
 3 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/drivers/raw/ioat/ioat_common.c b/drivers/raw/ioat/ioat_common.c
index b5cea2fda..142e171bc 100644
--- a/drivers/raw/ioat/ioat_common.c
+++ b/drivers/raw/ioat/ioat_common.c
@@ -5,9 +5,68 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "ioat_private.h"
 
+static const char * const xstat_names[] = {
+   "failed_enqueues", "successful_enqueues",
+   "copies_started", "copies_completed"
+};
+
+int
+ioat_xstats_get(const struct rte_rawdev *dev, const unsigned int ids[],
+   uint64_t values[], unsigned int n)
+{
+   const struct rte_ioat_rawdev *ioat = dev->dev_private;
+   const uint64_t *stats = (const void *)&ioat->xstats;
+   unsigned int i;
+
+   for (i = 0; i < n; i++) {
+   if (ids[i] > sizeof(ioat->xstats)/sizeof(*stats))
+   values[i] = 0;
+   else
+   values[i] = stats[ids[i]];
+   }
+   return n;
+}
+
+int
+ioat_xstats_get_names(const struct rte_rawdev *dev,
+   struct rte_rawdev_xstats_name *names,
+   unsigned int size)
+{
+   unsigned int i;
+
+   RTE_SET_USED(dev);
+   if (size < RTE_DIM(xstat_names))
+   return RTE_DIM(xstat_names);
+
+   for (i = 0; i < RTE_DIM(xstat_names); i++)
+   strlcpy(names[i].name, xstat_names[i], sizeof(names[i]));
+
+   return RTE_DIM(xstat_names);
+}
+
+int
+ioat_xstats_reset(struct rte_rawdev *dev, const uint32_t *ids, uint32_t nb_ids)
+{
+   struct rte_ioat_rawdev *ioat = dev->dev_private;
+   uint64_t *stats = (void *)&ioat->xstats;
+   unsigned int i;
+
+   if (!ids) {
+   memset(&ioat->xstats, 0, sizeof(ioat->xstats));
+   return 0;
+   }
+
+   for (i = 0; i < nb_ids; i++)
+   if (ids[i] < sizeof(ioat->xstats)/sizeof(*stats))
+   stats[ids[i]] = 0;
+
+   return 0;
+}
+
 int
 idxd_rawdev_close(struct rte_rawdev *dev __rte_unused)
 {
diff --git a/drivers/raw/ioat/ioat_private.h b/drivers/raw/ioat/ioat_private.h
index 0f80d60bf..ab9a3e6cc 100644
--- a/drivers/raw/ioat/ioat_private.h
+++ b/drivers/raw/ioat/ioat_private.h
@@ -53,6 +53,16 @@ struct idxd_rawdev {
} u;
 };
 
+int ioat_xstats_get(const struct rte_rawdev *dev, const unsigned int ids[],
+   uint64_t values[], unsigned int n);
+
+int ioat_xstats_get_names(const struct rte_rawdev *dev,
+   struct rte_rawdev_xstats_name *names,
+   unsigned int size);
+
+int ioat_xstats_reset(struct rte_rawdev *dev, const uint32_t *ids,
+   uint32_t nb_ids);
+
 extern int idxd_rawdev_create(const char *name, struct rte_device *dev,
   const struct idxd_rawdev *idxd,
   const struct rte_rawdev_ops *ops);
diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
index 4ea913fff..dd2543c80 100644
--- a/drivers/raw/ioat/ioat_rawdev.c
+++ b/drivers/raw/ioat/ioat_rawdev.c
@@ -122,64 +122,6 @@ ioat_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t 
dev_info,
return 0;
 }
 
-static const char * const xstat_names[] = {
-   "failed_enqueues", "successful_enqueues",
-   "copies_started", "copies_completed"
-};
-
-static int
-ioat_xstats_get(const struct rte_rawdev *dev, const unsigned int ids[],
-   uint64_t values[], unsigned int n)
-{
-   const struct rte_ioat_rawdev *ioat = dev->dev_private;
-   const uint64_t *stats = (const void *)&ioat->xstats;
-   unsigned int i;
-
-   for (i = 0; i < n; i++) {
-   if (ids[i] < sizeof(ioat->xstats)/sizeof(*stats))
-   values[i] = stats[ids[i]];
-   else
-   values[i] = 0;
-   }
-   return n;
-}
-
-static int
-ioat_xstats_get_names(const struct rte_rawdev *dev,
-   struct rte_rawdev_xstats_name *names,
-   unsigned int size)
-{
-   unsigned int i;
-
-   RTE_SET_USED(dev);
-   if (size < RTE_DIM(xstat_names))
-   return RTE_DIM(xstat_names);
-
-   for (i = 0; i < RTE_DIM(xstat_names); i++)
-   strlcpy(names[i].name, xstat_names[i], sizeof(names[i]));
-
-   return RTE_DIM(xstat_names);
-}
-
-static int
-ioat_xstats_reset(struct rte_rawdev *dev, const uint32_t *ids, uint32_t nb_ids)
-{
-   struct rte_ioat_rawdev *ioat = dev->dev_private;
-   uint64_t *stats = (void *)&ioat->xstats;
-   unsig

[dpdk-dev] [PATCH v6 23/25] raw/ioat: add xstats tracking for idxd devices

[Bruce Richardson]

Add update of the relevant stats for the data path functions and point the
overall device struct xstats function pointers to the existing ioat
functions.

At this point, all necessary hooks for supporting the existing unit tests
are in place so call them for each device.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/idxd_pci.c| 3 +++
 drivers/raw/ioat/idxd_vdev.c   | 3 +++
 drivers/raw/ioat/ioat_rawdev_test.c| 2 +-
 drivers/raw/ioat/rte_ioat_rawdev_fns.h | 6 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/raw/ioat/idxd_pci.c b/drivers/raw/ioat/idxd_pci.c
index bf5edcfdd..9113f8c8e 100644
--- a/drivers/raw/ioat/idxd_pci.c
+++ b/drivers/raw/ioat/idxd_pci.c
@@ -107,6 +107,9 @@ static const struct rte_rawdev_ops idxd_pci_ops = {
.dev_start = idxd_pci_dev_start,
.dev_stop = idxd_pci_dev_stop,
.dev_info_get = idxd_dev_info_get,
+   .xstats_get = ioat_xstats_get,
+   .xstats_get_names = ioat_xstats_get_names,
+   .xstats_reset = ioat_xstats_reset,
 };
 
 /* each portal uses 4 x 4k pages */
diff --git a/drivers/raw/ioat/idxd_vdev.c b/drivers/raw/ioat/idxd_vdev.c
index c75ac4317..38218cc1e 100644
--- a/drivers/raw/ioat/idxd_vdev.c
+++ b/drivers/raw/ioat/idxd_vdev.c
@@ -36,6 +36,9 @@ static const struct rte_rawdev_ops idxd_vdev_ops = {
.dump = idxd_dev_dump,
.dev_configure = idxd_dev_configure,
.dev_info_get = idxd_dev_info_get,
+   .xstats_get = ioat_xstats_get,
+   .xstats_get_names = ioat_xstats_get_names,
+   .xstats_reset = ioat_xstats_reset,
 };
 
 static void *
diff --git a/drivers/raw/ioat/ioat_rawdev_test.c 
b/drivers/raw/ioat/ioat_rawdev_test.c
index ceeac92ef..a84be56c4 100644
--- a/drivers/raw/ioat/ioat_rawdev_test.c
+++ b/drivers/raw/ioat/ioat_rawdev_test.c
@@ -273,5 +273,5 @@ int
 idxd_rawdev_test(uint16_t dev_id)
 {
rte_rawdev_dump(dev_id, stdout);
-   return 0;
+   return ioat_rawdev_test(dev_id);
 }
diff --git a/drivers/raw/ioat/rte_ioat_rawdev_fns.h 
b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
index 89bfc8d21..d0045d8a4 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev_fns.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
@@ -184,6 +184,8 @@ struct rte_idxd_user_hdl {
  */
 struct rte_idxd_rawdev {
enum rte_ioat_dev_type type;
+   struct rte_ioat_xstats xstats;
+
void *portal; /* address to write the batch descriptor */
 
/* counters to track the batches and the individual op handles */
@@ -369,9 +371,11 @@ __idxd_write_desc(int dev_id, const struct 
rte_idxd_hw_desc *desc,
if (++idxd->next_free_hdl == idxd->hdl_ring_sz)
idxd->next_free_hdl = 0;
 
+   idxd->xstats.enqueued++;
return 1;
 
 failed:
+   idxd->xstats.enqueue_failed++;
rte_errno = ENOSPC;
return 0;
 }
@@ -429,6 +433,7 @@ __idxd_perform_ops(int dev_id)
 
if (++idxd->next_batch == idxd->batch_ring_sz)
idxd->next_batch = 0;
+   idxd->xstats.started = idxd->xstats.enqueued;
 }
 
 static __rte_always_inline int
@@ -466,6 +471,7 @@ __idxd_completed_ops(int dev_id, uint8_t max_ops,
 
idxd->next_ret_hdl = h_idx;
 
+   idxd->xstats.completed += n;
return n;
 }
 
-- 
2.25.1

[dpdk-dev] [PATCH v6 24/25] raw/ioat: clean up use of common test function

[Bruce Richardson]

Now that all devices can pass the same set of unit tests, eliminate the
temporary idxd_rawdev_test function and move the prototype for
ioat_rawdev_test to the proper internal header file, to be used by all
device instances.

Signed-off-by: Bruce Richardson 
Reviewed-by: Kevin Laatz 
Acked-by: Radu Nicolau 
---
 drivers/raw/ioat/idxd_pci.c | 2 +-
 drivers/raw/ioat/idxd_vdev.c| 2 +-
 drivers/raw/ioat/ioat_private.h | 4 ++--
 drivers/raw/ioat/ioat_rawdev.c  | 2 --
 drivers/raw/ioat/ioat_rawdev_test.c | 7 ---
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/drivers/raw/ioat/idxd_pci.c b/drivers/raw/ioat/idxd_pci.c
index 9113f8c8e..165a9ea7f 100644
--- a/drivers/raw/ioat/idxd_pci.c
+++ b/drivers/raw/ioat/idxd_pci.c
@@ -101,7 +101,7 @@ idxd_pci_dev_start(struct rte_rawdev *dev)
 
 static const struct rte_rawdev_ops idxd_pci_ops = {
.dev_close = idxd_rawdev_close,
-   .dev_selftest = idxd_rawdev_test,
+   .dev_selftest = ioat_rawdev_test,
.dump = idxd_dev_dump,
.dev_configure = idxd_dev_configure,
.dev_start = idxd_pci_dev_start,
diff --git a/drivers/raw/ioat/idxd_vdev.c b/drivers/raw/ioat/idxd_vdev.c
index 38218cc1e..50d47d05c 100644
--- a/drivers/raw/ioat/idxd_vdev.c
+++ b/drivers/raw/ioat/idxd_vdev.c
@@ -32,7 +32,7 @@ struct idxd_vdev_args {
 
 static const struct rte_rawdev_ops idxd_vdev_ops = {
.dev_close = idxd_rawdev_close,
-   .dev_selftest = idxd_rawdev_test,
+   .dev_selftest = ioat_rawdev_test,
.dump = idxd_dev_dump,
.dev_configure = idxd_dev_configure,
.dev_info_get = idxd_dev_info_get,
diff --git a/drivers/raw/ioat/ioat_private.h b/drivers/raw/ioat/ioat_private.h
index ab9a3e6cc..a74bc0422 100644
--- a/drivers/raw/ioat/ioat_private.h
+++ b/drivers/raw/ioat/ioat_private.h
@@ -63,6 +63,8 @@ int ioat_xstats_get_names(const struct rte_rawdev *dev,
 int ioat_xstats_reset(struct rte_rawdev *dev, const uint32_t *ids,
uint32_t nb_ids);
 
+extern int ioat_rawdev_test(uint16_t dev_id);
+
 extern int idxd_rawdev_create(const char *name, struct rte_device *dev,
   const struct idxd_rawdev *idxd,
   const struct rte_rawdev_ops *ops);
@@ -75,8 +77,6 @@ extern int idxd_dev_configure(const struct rte_rawdev *dev,
 extern int idxd_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t dev_info,
size_t info_size);
 
-extern int idxd_rawdev_test(uint16_t dev_id);
-
 extern int idxd_dev_dump(struct rte_rawdev *dev, FILE *f);
 
 #endif /* _IOAT_PRIVATE_H_ */
diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
index dd2543c80..2c88b4369 100644
--- a/drivers/raw/ioat/ioat_rawdev.c
+++ b/drivers/raw/ioat/ioat_rawdev.c
@@ -128,8 +128,6 @@ ioat_dev_close(struct rte_rawdev *dev __rte_unused)
return 0;
 }
 
-extern int ioat_rawdev_test(uint16_t dev_id);
-
 static int
 ioat_rawdev_create(const char *name, struct rte_pci_device *dev)
 {
diff --git a/drivers/raw/ioat/ioat_rawdev_test.c 
b/drivers/raw/ioat/ioat_rawdev_test.c
index a84be56c4..60d189b62 100644
--- a/drivers/raw/ioat/ioat_rawdev_test.c
+++ b/drivers/raw/ioat/ioat_rawdev_test.c
@@ -268,10 +268,3 @@ ioat_rawdev_test(uint16_t dev_id)
free(ids);
return -1;
 }
-
-int
-idxd_rawdev_test(uint16_t dev_id)
-{
-   rte_rawdev_dump(dev_id, stdout);
-   return ioat_rawdev_test(dev_id);
-}
-- 
2.25.1

[dpdk-dev] [PATCH v6 25/25] raw/ioat: add fill operation

[Bruce Richardson]

From: Kevin Laatz 

Add fill operation enqueue support for IOAT and IDXD. The fill enqueue is
similar to the copy enqueue, but takes a 'pattern' rather than a source
address to transfer to the destination address. This patch also includes an
additional test case for the new operation type.

Signed-off-by: Kevin Laatz 
Signed-off-by: Bruce Richardson 
Acked-by: Radu Nicolau 
---
 doc/guides/rawdevs/ioat.rst| 10 
 doc/guides/rel_notes/release_20_11.rst |  2 +
 drivers/raw/ioat/ioat_rawdev_test.c| 62 
 drivers/raw/ioat/rte_ioat_rawdev.h | 27 +++
 drivers/raw/ioat/rte_ioat_rawdev_fns.h | 65 --
 5 files changed, 161 insertions(+), 5 deletions(-)

diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst
index 7c2a2d457..250cfc48a 100644
--- a/doc/guides/rawdevs/ioat.rst
+++ b/doc/guides/rawdevs/ioat.rst
@@ -285,6 +285,16 @@ is correct before freeing the data buffers using the 
returned handles:
 }
 
 
+Filling an Area of Memory
+~~
+
+The IOAT driver also has support for the ``fill`` operation, where an area
+of memory is overwritten, or filled, with a short pattern of data.
+Fill operations can be performed in much the same was as copy operations
+described above, just using the ``rte_ioat_enqueue_fill()`` function rather
+than the ``rte_ioat_enqueue_copy()`` function.
+
+
 Querying Device Statistics
 ~~~
 
diff --git a/doc/guides/rel_notes/release_20_11.rst 
b/doc/guides/rel_notes/release_20_11.rst
index e48e6ea75..943ec83fd 100644
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -122,6 +122,8 @@ New Features
 
   * Added support for Intel\ |reg| Data Streaming Accelerator hardware.
 For more information, see 
https://01.org/blogs/2019/introducing-intel-data-streaming-accelerator
+  * Added support for the fill operation via the API 
``rte_ioat_enqueue_fill()``,
+where the hardware fills an area of memory with a repeating pattern.
   * Added a per-device configuration flag to disable management of 
user-provided completion handles
   * Renamed the ``rte_ioat_do_copies()`` API to ``rte_ioat_perform_ops()``,
 and renamed the ``rte_ioat_completed_copies()`` API to 
``rte_ioat_completed_ops()``
diff --git a/drivers/raw/ioat/ioat_rawdev_test.c 
b/drivers/raw/ioat/ioat_rawdev_test.c
index 60d189b62..101f24a67 100644
--- a/drivers/raw/ioat/ioat_rawdev_test.c
+++ b/drivers/raw/ioat/ioat_rawdev_test.c
@@ -155,6 +155,52 @@ test_enqueue_copies(int dev_id)
return 0;
 }
 
+static int
+test_enqueue_fill(int dev_id)
+{
+   const unsigned int length[] = {8, 64, 1024, 50, 100, 89};
+   struct rte_mbuf *dst = rte_pktmbuf_alloc(pool);
+   char *dst_data = rte_pktmbuf_mtod(dst, char *);
+   struct rte_mbuf *completed[2] = {0};
+   uint64_t pattern = 0xfedcba9876543210;
+   unsigned int i, j;
+
+   for (i = 0; i < RTE_DIM(length); i++) {
+   /* reset dst_data */
+   memset(dst_data, 0, length[i]);
+
+   /* perform the fill operation */
+   if (rte_ioat_enqueue_fill(dev_id, pattern,
+   dst->buf_iova + dst->data_off, length[i],
+   (uintptr_t)dst) != 1) {
+   PRINT_ERR("Error with rte_ioat_enqueue_fill\n");
+   return -1;
+   }
+
+   rte_ioat_perform_ops(dev_id);
+   usleep(100);
+
+   if (rte_ioat_completed_ops(dev_id, 1, (void *)&completed[0],
+   (void *)&completed[1]) != 1) {
+   PRINT_ERR("Error with completed ops\n");
+   return -1;
+   }
+   /* check the result */
+   for (j = 0; j < length[i]; j++) {
+   char pat_byte = ((char *)&pattern)[j % 8];
+   if (dst_data[j] != pat_byte) {
+   PRINT_ERR("Error with fill operation (length = 
%u): got (%x), not (%x)\n",
+   length[i], dst_data[j],
+   pat_byte);
+   return -1;
+   }
+   }
+   }
+
+   rte_pktmbuf_free(dst);
+   return 0;
+}
+
 int
 ioat_rawdev_test(uint16_t dev_id)
 {
@@ -234,6 +280,7 @@ ioat_rawdev_test(uint16_t dev_id)
}
 
/* run the test cases */
+   printf("Running Copy Tests\n");
for (i = 0; i < 100; i++) {
unsigned int j;
 
@@ -247,6 +294,21 @@ ioat_rawdev_test(uint16_t dev_id)
}
printf("\n");
 
+   /* test enqueue fill operation */
+   printf("Running Fill Tests\n");
+   for (i = 0; i < 100; i++) {
+   unsigned int j;
+
+   if (test_enqueue_fill(dev_id) != 0)
+   goto err;
+
+   rte_rawdev_xst

[dpdk-dev] [PATCH V16 0/3] add FEC support

[Min Hu (Connor)]

This series add FEC support for ethdev.

Min Hu (Connor) (3):
  ethdev: introduce FEC API
  net/hns3: support FEC
  app/testpmd: add FEC command

 app/test-pmd/cmdline.c  | 232 ++
 app/test-pmd/config.c   |  91 +++
 app/test-pmd/testpmd.h  |   2 +
 doc/guides/rel_notes/release_20_11.rst  |  10 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  22 ++
 drivers/net/hns3/hns3_cmd.h |  19 +-
 drivers/net/hns3/hns3_ethdev.c  | 356 
 drivers/net/hns3/hns3_ethdev.h  |   1 +
 lib/librte_ethdev/rte_ethdev.c  |  44 
 lib/librte_ethdev/rte_ethdev.h  | 105 
 lib/librte_ethdev/rte_ethdev_driver.h   |  88 +++
 lib/librte_ethdev/rte_ethdev_version.map|   3 +
 12 files changed, 972 insertions(+), 1 deletion(-)

-- 
2.7.4

[dpdk-dev] [PATCH V16 3/3] app/testpmd: add FEC command

[Min Hu (Connor)]

This commit adds testpmd capability to query and config FEC
function of device. This includes:
- show FEC capabilities, example:
testpmd> show port 0 fec capabilities
- show FEC mode, example:
testpmd> show port 0 fec_mode
- config FEC mode, example:
testpmd> set port  fec_mode auto|off|rs|baser

where:

auto|off|rs|baser are four kinds of FEC mode which dev
support according to MAC link speed.

Signed-off-by: Min Hu (Connor) 
Reviewed-by: Wei Hu (Xavier) 
Reviewed-by: Chengwen Feng 
Reviewed-by: Chengchang Tang 
---
v15->v16:
add fec command help info.

---
v12->v13:
change fec get capa interface.

---
v10->v11:
change mode to capa bitmask.

---
v8->v9:
added acked-by.

---
v6->v7:
used RTE_DIM(fec_mode_name) instead of RTE_ETH_FEC_NUM

---
v5->v6:
fixed code styles according to DPDK coding style.
added _eth prefix.

---
v4->v5:
Add RTE_ prefix for public FEC mode enum.

---
v3->v4:
adjust the display format of FEC mode

---
v2->v3:
adjust the display format of FEC capability.

---
 app/test-pmd/cmdline.c  | 232 
 app/test-pmd/config.c   |  91 +++
 app/test-pmd/testpmd.h  |   2 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  22 +++
 4 files changed, 347 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 5f93409..476560c 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -245,6 +245,12 @@ static void cmd_help_long_parsed(void *parsed_result,
 
"show port (port_id) macs|mcast_macs"
"   Display list of mac addresses added to 
port.\n\n"
+
+   "show port (port_id) fec capabilities"
+   "   Show fec capabilities of a port.\n\n"
+
+   "show port (port_id) fec_mode"
+   "   Show fec mode of a port.\n\n"
);
}
 
@@ -748,6 +754,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"show port (port_id) queue-region\n"
"show all queue region related configuration 
info\n\n"
 
+   "set port (port_id) fec_mode auto|off|rs|baser\n"
+   "set fec mode for a specific port\n\n"
+
, list_pkt_forwarding_modes()
);
}
@@ -19161,6 +19170,226 @@ cmdline_parse_inst_t cmd_show_tx_metadata = {
},
 };
 
+/* *** show fec capability per port configuration *** */
+struct cmd_show_fec_capability_result {
+   cmdline_fixed_string_t cmd_show;
+   cmdline_fixed_string_t cmd_port;
+   cmdline_fixed_string_t cmd_fec;
+   cmdline_fixed_string_t cmd_keyword;
+   portid_t cmd_pid;
+};
+
+static void
+cmd_show_fec_capability_parsed(void *parsed_result,
+   __rte_unused struct cmdline *cl,
+   __rte_unused void *data)
+{
+#define FEC_CAP_NUM 2
+   struct cmd_show_fec_capability_result *res = parsed_result;
+   struct rte_eth_fec_capa speed_fec_capa[FEC_CAP_NUM];
+   unsigned int num = FEC_CAP_NUM;
+   unsigned int ret_num;
+   int ret;
+
+   if (!rte_eth_dev_is_valid_port(res->cmd_pid)) {
+   printf("Invalid port id %u\n", res->cmd_pid);
+   return;
+   }
+
+   ret = rte_eth_fec_get_capability(res->cmd_pid, speed_fec_capa, num);
+   if (ret == -ENOTSUP) {
+   printf("Function not implemented\n");
+   return;
+   } else if (ret < 0) {
+   printf("Get FEC capability failed\n");
+   return;
+   }
+
+   ret_num = (unsigned int)ret;
+   show_fec_capability(ret_num, speed_fec_capa);
+}
+
+cmdline_parse_token_string_t cmd_show_fec_capability_show =
+   TOKEN_STRING_INITIALIZER(struct cmd_show_fec_capability_result,
+   cmd_show, "show");
+cmdline_parse_token_string_t cmd_show_fec_capability_port =
+   TOKEN_STRING_INITIALIZER(struct cmd_show_fec_capability_result,
+   cmd_port, "port");
+cmdline_parse_token_num_t cmd_show_fec_capability_pid =
+   TOKEN_NUM_INITIALIZER(struct cmd_show_fec_capability_result,
+   cmd_pid, UINT16);
+cmdline_parse_token_string_t cmd_show_fec_capability_fec =
+   TOKEN_STRING_INITIALIZER(struct cmd_show_fec_capability_result,
+   cmd_fec, "fec");
+cmdline_parse_token_string_t cmd_show_fec_capability_keyword =
+   TOKEN_STRING_INITIALIZER(struct cmd_show_fec_capability_result,
+   cmd_keyword, "capabilities");
+
+cmdline_parse_inst_t cmd_show_capability = {
+   .f = cmd_show_fec_capability_parsed,
+   .data = NULL,
+   .help_str = "show port  fec capabilities",
+   .tokens = {
+   (void *)&cmd_show_fec_capability_show,
+   (void *)&cmd_show_fec_capability_port,
+   (void *)&cmd_show_fec_ca

[dpdk-dev] [PATCH V16 2/3] net/hns3: support FEC

[Min Hu (Connor)]

Forward error correction (FEC) is a bit error correction mode.
It adds error correction information to data packets at the
transmit end, and uses the error correction information to correct
the bit errors generated during data packet transmission at the
receive end. This improves signal quality but also brings a delay
to signals. This function can be enabled or disabled as required.

This patch adds FEC support for ethdev.Introduce ethdev
operations which support query and config FEC information in
hardware.

Signed-off-by: Min Hu (Connor) 
Reviewed-by: Wei Hu (Xavier) 
Reviewed-by: Chengwen Feng 
Reviewed-by: Chengchang Tang 
---
v13->v14:
change mode to fec_capa.

---
v12->v13:
change fec get capa interface.

---
v11->v12:
fix coding warning.

v10->v11:
allow to report capabilities per link speed.
specify what should be reported if link is down
when get FEC.
change mode to capa bitmask.

---
v9->v10:
use RTE_ETH_FEC_MODE_CAPA_MASK(x) which is just defined.

---
v7->v8:
FEC mode order defined in hns3 hardware is inconsistend with
that defined in the ethdev library. So the sequence needs
to be converted.

---
v5->v6:
fixed code styles according to DPDK coding style.
added _eth prefix.

---
v4->v5:
Data type for fec_cap is changed from uint8_t
to uint32_t for possible future expansion.

---
v2->v3:
adjust the return value of function.

---
 doc/guides/rel_notes/release_20_11.rst |   5 +
 drivers/net/hns3/hns3_cmd.h|  19 +-
 drivers/net/hns3/hns3_ethdev.c | 356 +
 drivers/net/hns3/hns3_ethdev.h |   1 +
 4 files changed, 380 insertions(+), 1 deletion(-)

diff --git a/doc/guides/rel_notes/release_20_11.rst 
b/doc/guides/rel_notes/release_20_11.rst
index 1f04bd5..eec6930 100644
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -83,6 +83,11 @@ New Features
   Added the FEC API which provides functions for query FEC capabilities and
   current FEC mode from device. Also, API for configuring FEC mode is also 
provided.
 
+* **Added hns3 FEC PMD, for supporting query and config FEC mode.**
+
+  Added the FEC PMD which provides functions for query FEC capabilities and
+  current FEC mode from device. Also, PMD for configuring FEC mode is also 
provided.
+
 
 Removed Items
 -
diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
index 87d6053..a1e9604 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -100,6 +100,7 @@ enum hns3_opcode_type {
HNS3_OPC_QUERY_LINK_STATUS  = 0x0307,
HNS3_OPC_CONFIG_MAX_FRM_SIZE= 0x0308,
HNS3_OPC_CONFIG_SPEED_DUP   = 0x0309,
+   HNS3_OPC_CONFIG_FEC_MODE= 0x031A,
 
/* PFC/Pause commands */
HNS3_OPC_CFG_MAC_PAUSE_EN   = 0x0701,
@@ -684,9 +685,25 @@ struct hns3_config_auto_neg_cmd {
uint8_t   rsv[20];
 };
 
+#define HNS3_MAC_CFG_FEC_AUTO_EN_B 0
+#define HNS3_MAC_CFG_FEC_MODE_S1
+#define HNS3_MAC_CFG_FEC_MODE_MGENMASK(3, 1)
+#define HNS3_MAC_FEC_OFF   0
+#define HNS3_MAC_FEC_BASER 1
+#define HNS3_MAC_FEC_RS2
+
 struct hns3_sfp_speed_cmd {
uint32_t  sfp_speed;
-   uint32_t  rsv[5];
+   uint8_t   query_type; /* 0: sfp speed, 1: active fec */
+   uint8_t   active_fec; /* current FEC mode */
+   uint16_t  rsv1;
+   uint32_t  rsv2[4];
+};
+
+/* Configure FEC mode, opcode:0x031A */
+struct hns3_config_fec_cmd {
+   uint8_t fec_mode;
+   uint8_t rsv[23];
 };
 
 #define HNS3_MAC_MGR_MASK_VLAN_B   BIT(0)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 73d5042..2fa1aea 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -63,6 +63,11 @@
 #define HNS3_RESET_WAIT_MS 100
 #define HNS3_RESET_WAIT_CNT200
 
+/* FEC mode order defined in HNS3 hardware */
+#define HNS3_HW_FEC_MODE_NOFEC  0
+#define HNS3_HW_FEC_MODE_BASER  1
+#define HNS3_HW_FEC_MODE_RS 2
+
 enum hns3_evt_cause {
HNS3_VECTOR0_EVENT_RST,
HNS3_VECTOR0_EVENT_MBX,
@@ -70,6 +75,34 @@ enum hns3_evt_cause {
HNS3_VECTOR0_EVENT_OTHER,
 };
 
+static const struct rte_eth_fec_capa speed_fec_capa_tbl[] = {
+   { ETH_SPEED_NUM_10G, RTE_ETH_FEC_MODE_CAPA_MASK(NOFEC) |
+RTE_ETH_FEC_MODE_CAPA_MASK(AUTO) |
+RTE_ETH_FEC_MODE_CAPA_MASK(BASER) },
+
+   { ETH_SPEED_NUM_25G, RTE_ETH_FEC_MODE_CAPA_MASK(NOFEC) |
+RTE_ETH_FEC_MODE_CAPA_MASK(AUTO) |
+RTE_ETH_FEC_MODE_CAPA_MASK(BASER) |
+RTE_ETH_FEC_MODE_CAPA_MASK(RS) },
+
+   { ETH_SPEED_NUM_40G, RTE_ETH_FEC_MODE_CAPA_MASK(NOFEC) |
+RTE_ETH_FEC_MODE_CAPA_MASK(AUTO) |
+RTE_ETH_FEC_MODE_CAPA_MASK(BASER) },
+
+   { ETH_SPEED_NUM_50G, RTE_ETH_FEC_MODE_CAPA_MASK(NOF

Re: [dpdk-dev] [PATCH v3 01/18] eal: add max SIMD bitwidth

[Olivier Matz]

Hi Ciara,

On Thu, Oct 08, 2020 at 09:25:42AM +, Power, Ciara wrote:
> Hi Olivier,
> 
> 
> >-Original Message-
> >From: Olivier Matz 
> >Sent: Wednesday 7 October 2020 12:18
> >To: Power, Ciara 
> >Cc: dev@dpdk.org; Ray Kinsella ; Neil Horman
> >; Richardson, Bruce 
> >Subject: Re: [dpdk-dev] [PATCH v3 01/18] eal: add max SIMD bitwidth
> >
> >Hi Ciara,
> >
> >On Wed, Oct 07, 2020 at 10:47:34AM +, Power, Ciara wrote:
> >> Hi Olivier,
> >>
> >> Thanks for reviewing, some comments below.
> >>
> >>
> >> >-Original Message-
> >> >From: Olivier Matz 
> >> >Sent: Tuesday 6 October 2020 10:32
> >> >To: Power, Ciara 
> >> >Cc: dev@dpdk.org; Ray Kinsella ; Neil Horman
> >> >
> >> >Subject: Re: [dpdk-dev] [PATCH v3 01/18] eal: add max SIMD bitwidth
> >> >
> >> >Hi Ciara,
> >> >
> >> >Please find some comments below.
> >> >
> >> >On Wed, Sep 30, 2020 at 02:03:57PM +0100, Ciara Power wrote:
> >> >> This patch adds a max SIMD bitwidth EAL configuration. The API
> >> >> allows for an app to set this value. It can also be set using EAL
> >> >> argument --force-max-simd-bitwidth, which will lock the value and
> >> >> override any modifications made by the app.
> >> >>
> >> >> Signed-off-by: Ciara Power 
> >> >>
> >> >> ---
> >> >> v3:
> >> >>   - Added enum value to essentially disable using max SIMD to choose
> >> >> paths, intended for use by ARM SVE.
> >> >>   - Fixed parsing bitwidth argument to return an error for values
> >> >> greater than uint16_t.
> >> >> v2: Added to Doxygen comment for API.
> >> >> ---
> >>
> >> 
> >>
> >> >>
> >> >> +uint16_t
> >> >> +rte_get_max_simd_bitwidth(void)
> >> >> +{
> >> >> +   const struct internal_config *internal_conf =
> >> >> +   eal_get_internal_configuration();
> >> >> +   return internal_conf->max_simd_bitwidth.bitwidth;
> >> >> +}
> >> >
> >> >Should the return value be enum rte_max_simd_t?
> >> >If not, do we really need the enum definition?
> >> >
> >>
> >> I kept the return value and param value below as uint16_t to allow for
> >> arbitrary values, and will allow it be more flexible for future additions 
> >> as
> >new enums won't need to be added.
> >> For the set function below, this is used when a user passes the EAL
> >> command line flag, which passes an integer value rather than an enum one.
> >> The enums are useful when checking the max_simd_bitwidth in
> >> drivers/libs, for example using "RTE_MAX_256_SIMD" instead of "256" in
> >the condition checks.
> >>
> >> >> +
> >> >> +int
> >> >> +rte_set_max_simd_bitwidth(uint16_t bitwidth) {
> >> >> +   struct internal_config *internal_conf =
> >> >> +   eal_get_internal_configuration();
> >> >> +   if (internal_conf->max_simd_bitwidth.locked) {
> >> >> +   RTE_LOG(NOTICE, EAL, "Cannot set max SIMD bitwidth - 
> >> >> user
> >> >runtime override enabled");
> >> >> +   return -EPERM;
> >> >> +   }
> >> >> +
> >> >> +   if (bitwidth != RTE_MAX_SIMD_DISABLE && (bitwidth <
> >> >RTE_NO_SIMD ||
> >> >> +   !rte_is_power_of_2(bitwidth))) {
> >> >> +   RTE_LOG(ERR, EAL, "Invalid bitwidth value!\n");
> >> >> +   return -EINVAL;
> >> >> +   }
> >> >> +   internal_conf->max_simd_bitwidth.bitwidth = bitwidth;
> >> >> +   return 0;
> >> >> +}
> >> >
> >> >Same question, should the parameter be enum rte_max_simd_t?
> >> >
> >>
> >> 
> >>
> >> >> +enum rte_max_simd_t {
> >> >> +   RTE_NO_SIMD = 64,
> >> >> +   RTE_MAX_128_SIMD = 128,
> >> >> +   RTE_MAX_256_SIMD = 256,
> >> >> +   RTE_MAX_512_SIMD = 512,
> >> >> +   RTE_MAX_SIMD_DISABLE = UINT16_MAX, };
> >> >
> >> >What is the difference between RTE_NO_SIMD and
> >RTE_MAX_SIMD_DISABLE?
> >>
> >> RTE_NO_SIMD has value 64 to limit paths to scalar only.
> >> RTE_MAX_SIMD_DISABLE sets the highest value possible, so essentially
> >> disables the limit affecting which vector paths are taken.
> >> This disable option was added to allow for ARM SVE which will be later
> >> added, Discussed with Honnappa on a previous version:
> >> https://patchwork.dpdk.org/patch/76097/
> >
> >Ok, so RTE_MAX_SIMD_DISABLE means "disable the max limit", right?
> >
> >I feel the name is a bit confusing. What about something like this:
> >
> >enum rte_simd {
> > RTE_SIMD_DISABLED = 0,
> > RTE_SIMD_128 = 128,
> > RTE_SIMD_256 = 256,
> > RTE_SIMD_512 = 512,
> > RTE_SIMD_MAX = UINT16_MAX,
> >};
> >
> >
> 
> Sure, I can rename these. Although will implement with RTE_SIMD_DISABLED=64 
> to allow for scalar path only.

Out of curiosity, why 64? I thought 0 was a good value for "disabled".

> >>
> >> >The default value in internal_config is 0, so in my understanding
> >> >rte_get_max_simd_bitwidth() will return 0 if
> >> >--force-max-simd-bitwidth is not passed. Is it expected?
> >> >
> >> >Maybe I'm missing something, but I don't understand why the value in
> >> >internal_config is not set to the maximum supported SIMD bi

[dpdk-dev] [PATCH V16 1/3] ethdev: introduce FEC API

[Min Hu (Connor)]

This patch adds Forward error correction(FEC) support for ethdev.
Introduce APIs which support query and config FEC information in
hardware.

Signed-off-by: Min Hu (Connor) 
Reviewed-by: Wei Hu (Xavier) 
Reviewed-by: Chengwen Feng 
Reviewed-by: Chengchang Tang 
Acked-by: Andrew Rybchenko 
Reviewed-by: Ajit Khaparde 
---
v14->v15:
change mode to fec_capa in fec set API.

---
v13->v14:
change mode to fec_capa.
fix comment about API.

---
v12->v13:
change fec get capa API.
fix comment styles.

---
v10->v11:
allow to report capabilities per link speed.
specify what should be reported if link is down
when get FEC.
change mode to capa bitmask.

---
v9->v10:
add macro RTE_ETH_FEC_MODE_CAPA_MASK(x) to indicate
different FEC mode capa.

---
v8->v9:
added reviewed-by and acked-by.

---
v7->v8:
put AUTO just after NOFEC in rte_fec_mode definition.

---
v6->v7:
deleted RTE_ETH_FEC_NUM to prevent ABI breakage.
add new macro to indicate translation from fec mode
to capa.

---
v5->v6:
modified release notes.
deleted check duplicated for FEC API
fixed code styles according to DPDK coding style.
added _eth prefix.

---
v4->v5:
Modifies FEC capa definitions using macros.
Add RTE_ prefix for public FEC mode enum.
add release notes about FEC for dpdk20_11.

---
v2->v3:
add function return value "-ENOTSUP" for API.

---
 doc/guides/rel_notes/release_20_11.rst   |   5 ++
 lib/librte_ethdev/rte_ethdev.c   |  44 +
 lib/librte_ethdev/rte_ethdev.h   | 105 +++
 lib/librte_ethdev/rte_ethdev_driver.h|  88 ++
 lib/librte_ethdev/rte_ethdev_version.map |   3 +
 5 files changed, 245 insertions(+)

diff --git a/doc/guides/rel_notes/release_20_11.rst 
b/doc/guides/rel_notes/release_20_11.rst
index c6642f5..1f04bd5 100644
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -78,6 +78,11 @@ New Features
 ``--portmask=N``
 where N represents the hexadecimal bitmask of ports used.
 
+* **Added the FEC API, for a generic FEC query and config.**
+
+  Added the FEC API which provides functions for query FEC capabilities and
+  current FEC mode from device. Also, API for configuring FEC mode is also 
provided.
+
 
 Removed Items
 -
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index dfe5c1b..ca596c1 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -3679,6 +3679,50 @@ rte_eth_led_off(uint16_t port_id)
return eth_err(port_id, (*dev->dev_ops->dev_led_off)(dev));
 }
 
+int
+rte_eth_fec_get_capability(uint16_t port_id,
+  struct rte_eth_fec_capa *speed_fec_capa,
+  unsigned int num)
+{
+   struct rte_eth_dev *dev;
+   int ret;
+
+   if (speed_fec_capa == NULL && num > 0)
+   return -EINVAL;
+
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+   dev = &rte_eth_devices[port_id];
+   RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fec_get_capability, -ENOTSUP);
+   ret = (*dev->dev_ops->fec_get_capability)(dev, speed_fec_capa, num);
+
+   return ret;
+}
+
+int
+rte_eth_fec_get(uint16_t port_id, uint32_t *fec_capa)
+{
+   struct rte_eth_dev *dev;
+
+   if (fec_capa == NULL)
+   return -EINVAL;
+
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+   dev = &rte_eth_devices[port_id];
+   RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fec_get, -ENOTSUP);
+   return eth_err(port_id, (*dev->dev_ops->fec_get)(dev, fec_capa));
+}
+
+int
+rte_eth_fec_set(uint16_t port_id, uint32_t fec_capa)
+{
+   struct rte_eth_dev *dev;
+
+   RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+   dev = &rte_eth_devices[port_id];
+   RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->fec_set, -ENOTSUP);
+   return eth_err(port_id, (*dev->dev_ops->fec_set)(dev, fec_capa));
+}
+
 /*
  * Returns index into MAC address array of addr. Use 00:00:00:00:00:00 to find
  * an empty spot.
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index 645a186..7938202 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -1544,6 +1544,29 @@ struct rte_eth_dcb_info {
struct rte_eth_dcb_tc_queue_mapping tc_queue;
 };
 
+/**
+ * This enum indicates the possible Forward Error Correction (FEC) modes
+ * of an ethdev port.
+ */
+enum rte_eth_fec_mode {
+   RTE_ETH_FEC_NOFEC = 0,  /**< FEC is off */
+   RTE_ETH_FEC_AUTO,   /**< FEC autonegotiation modes */
+   RTE_ETH_FEC_BASER,  /**< FEC using common algorithm */
+   RTE_ETH_FEC_RS, /**< FEC using RS algorithm */
+};
+
+/* Translate from FEC mode to FEC capa */
+#define RTE_ETH_FEC_MODE_TO_CAPA(x)(1U << (x))
+
+/* This macro indicates FEC capa mask */
+#define RTE_ETH_FEC_MODE_CAPA_MASK(x)  (1U << (RTE_ETH_FEC_ ## x))
+
+/* A structure used to get capabilities per link speed */
+struct rte_eth_fec_ca

Re: [dpdk-dev] [PATCH V15 3/3] app/testpmd: add FEC command

[Min Hu (Connor)]

Hi, Ferruh,
I have sent patches of new version named V16. Please check it
out, thanks.

在 2020/10/8 7:38, humin (Q) 写道:

HI，Ferry,

      thank you very much. this is good news to me. I promise the new 
version will be sent in these two days.


       thanks again.

--
胡敏 Hu Min
Mobile: +86-13528728164 
Email: humi...@huawei.com 

*发件人：*Ferruh Yigit 
*收件人：*humin (Q) ;dev 
*抄 送：*konstantin.ananyev ;thomas 
;arybchenko ;Linuxarm 


*时 间：*2020-10-07 17:30:09
*主 题：*Re: [PATCH V15 3/3] app/testpmd: add FEC command

On 10/7/2020 1:15 AM, humin (Q) wrote:

HI，Ferruh,

       how about only considering the first patch:ethdev:add fec API. If this 
patch looks great to you, I wish it could be merged into 20.11.


        To that patch, app/testpmd add fec command, I will fix it later.


Hi Connor,

Better to get them together if possible, -rc1 has been postponed to 
October 16,

can this additional week help to get a new version?




        thanks.

--
胡敏 Hu Min
Mobile: +86-13528728164 
Email: humi...@huawei.com 

*发件人：*Ferruh Yigit 
*收件人：*humin (Q) ;dev 
*抄 送：*konstantin.ananyev ;thomas 
;arybchenko ;Linuxarm 


*时 间：*2020-10-01 00:53:37
*主 题：*Re: [PATCH V15 3/3] app/testpmd: add FEC command

On 9/29/2020 2:03 AM, Min Hu (Connor) wrote:

This commit adds testpmd capability to query and config FEC
function of device. This includes:
- show FEC capabilities, example:
    testpmd> show port 0 fec capabilities
- show FEC mode, example:
    testpmd> show port 0 fec_mode
- config FEC mode, example:
    testpmd> set port  0 



I guess it is:
set port  fec_mode 


    where:

    auto|off|rs|baser are four kinds of FEC mode which dev
    support according to MAC link speed.

Signed-off-by: Min Hu (Connor) 
Reviewed-by: Wei Hu (Xavier) 
Reviewed-by: Chengwen Feng 
Reviewed-by: Chengchang Tang 
---
v12->v13:
change fec get capa interface.

---
v10->v11:
change mode to capa bitmask.

---
v8->v9:
added acked-by.

---
v6->v7:
used RTE_DIM(fec_mode_name) instead of RTE_ETH_FEC_NUM

---
v5->v6:
fixed code styles according to DPDK coding style.
added _eth prefix.

---
v4->v5:
Add RTE_ prefix for public FEC mode enum.

---
v3->v4:
adjust the display format of FEC mode

---
v2->v3:
adjust the display format of FEC capability.

---
   app/test-pmd/cmdline.c | 223 
+
   app/test-pmd/config.c  |  91 
   app/test-pmd/testpmd.h |   2 +
   3 files changed, 316 insertions(+)


Can you please update the testpmd documenatation for the new commands?

Also can add the new command to the --help output? ('cmd_help_long_parsed()')

<...>


+cmdline_parse_inst_t cmd_set_fec_mode = {
+ .f = cmd_set_port_fec_mode_parsed,
+ .data = NULL,
+ .help_str = "set port  fec_mode ",


Can you please update the help string as:
"set port  fec_mode auto|off|rs|baser"

'<>' is to define the variable name, like in '' you expect numbers like
0,1,2 .. but 'auto|off|rs|baser' are keywords, not variables.



___
Linuxarm mailing list
linux...@huawei.com
http://hulk.huawei.com/mailman/listinfo/linuxarm

Re: [dpdk-dev] [PATCH v4] doc: add stack mempool guide

[David Marchand]

On Wed, Oct 7, 2020 at 4:41 PM Olivier Matz  wrote:
>
> On Wed, Oct 07, 2020 at 09:18:32AM -0500, Gage Eads wrote:
> > This guide describes the two stack modes, their tradeoffs, and (via a
> > reference to the mempool guide) how to enable them.
> >
> > Signed-off-by: Gage Eads 
>
> Reviewed-by: Olivier Matz 

Applied, thanks.


-- 
David Marchand

Re: [dpdk-dev] [PATCH 2/3] examples/fips_validation: ignore \r in input files

[Zhang, Roy Fan]

Hi Olivier,

Sorry I didn't state myself clear in the first place.

My intention is '\r' check, or any future CAVS version specific change to the
application should be wrapped into a branch that is checked with parsed
version number. With this way the original application's behavior should
remain the same.

The reason for that is we are having an issue right now that the validation
team is struggling with the limited test vectors and inconsistency formatting
between different FIPS CAVS versions. For example we still have FIPS TDES test
failing today due to the different test file versions.
https://bugs.dpdk.org/show_bug.cgi?id=512 

The solution is certainly far from pretty but should help to share the
maintenance effort amongst the contributors.

The "FIPS_DEF_VERSION" can be removed of course.

Regards,
Fan

> -Original Message-
> From: Olivier Matz 
> Sent: Thursday, October 8, 2020 10:22 AM
> To: Zhang, Roy Fan 
> Cc: dev@dpdk.org; Kovacevic, Marko ; Akhil
> Goyal ; Kusztal, ArkadiuszX
> ; sta...@dpdk.org; Anoob Joseph
> 
> Subject: Re: [PATCH 2/3] examples/fips_validation: ignore \r in input files
> 
> Hi,
> 
> On Thu, Oct 08, 2020 at 08:50:25AM +, Zhang, Roy Fan wrote:
> > Hi Olivier,
> >
> > Anood and us had the similar discussion.
> >
> > Can we change the sample application to parse version data instead,
> > and for the version specific code changes we will wrap them by a
> > branch to compare the parsed version and the expected version?
> > (we probably should have done that long time ago).
> >
> > I drafted a code change to parse the version data, see if you think it
> > is ok?
> 
> Thank you for your feedback.
> 
> The code that gets the version looks good to me (I just have a
> small comment, see below). However I'm not sure what to do with it.
> 
> Do you mean we should return an error if the version is incorrect? Or
> should we only skip '\r' for old versions? FIPS_DEF_VERSION is not used
> in your patch. In that case, I think it is a bit overkill. Do you think
> it is a problem to always drop '\r'?
> 
> If you think we should not support files containing '\r', I'm fine
> with it, I can drop this particular patch.
> 
> 
> >
> > diff --git a/examples/fips_validation/fips_validation.c
> b/examples/fips_validation/fips_validation.c
> > index 9bdf257b8..9b6518c92 100644
> > --- a/examples/fips_validation/fips_validation.c
> > +++ b/examples/fips_validation/fips_validation.c
> > @@ -98,7 +98,7 @@ fips_test_parse_header(void)
> > uint32_t i;
> > char *tmp;
> > int ret;
> > -   int algo_parsed = 0;
> > +   int algo_parsed = 0, version_parsed = 0;
> > time_t t = time(NULL);
> > struct tm *tm_now = localtime(&t);
> >
> > @@ -107,6 +107,27 @@ fips_test_parse_header(void)
> > return ret;
> >
> > for (i = 0; i < info.nb_vec_lines; i++) {
> > +   /* parse the version info */
> > +   tmp = strstr(info.vec[i], "CAVS ");
> > +   if (tmp != NULL) {
> > +   if (version_parsed != 0) {
> > +   RTE_LOG(ERR, USER1,
> > +   "Multiple version data\n");
> > +   return -1;
> > +   }
> > +
> > +   tmp = tmp + sizeof("CAVS ");
> 
> I think it should be strlen(), because sizeof() will contain
> the '\0'. Or it could be sizeof() - 1.
> 
> > +
> > +   if (strlen(tmp) >= MAX_VER_STRING_SIZE) {
> > +   RTE_LOG(ERR, USER1, "Version (%s) too
> long\n",
> > +   tmp);
> > +   return -1;
> > +   }
> > +
> > +   strlcpy(info.version, tmp, MAX_VER_STRING_SIZE);
> > +   version_parsed = 1;
> > +   }
> > +
> > if (!algo_parsed) {
> > if (strstr(info.vec[i], "AESVS")) {
> > algo_parsed = 1;
> > diff --git a/examples/fips_validation/fips_validation.h
> b/examples/fips_validation/fips_validation.h
> > index 75fa555fa..b8c60c55f 100644
> > --- a/examples/fips_validation/fips_validation.h
> > +++ b/examples/fips_validation/fips_validation.h
> > @@ -15,6 +15,9 @@
> >  #define MAX_BUF_SIZE   2048
> >  #define MAX_STRING_SIZE64
> >  #define MAX_DIGEST_SIZE64
> > +#define MAX_VER_STRING_SIZE8
> > +
> > +#define FIPS_DEF_VERSION   "21.0"
> >
> >  #define POSITIVE_TEST  0
> >  #define NEGATIVE_TEST  -1
> > @@ -155,6 +158,7 @@ struct sha_interim_data {
> >  };
> >
> >  struct fips_test_interim_info {
> > +   char version[MAX_VER_STRING_SIZE];
> > FILE *fp_rd;
> > FILE *fp_wr;
> > enum file_types file_type;
> >
> >
> > Regards,
> > Fan
> >
> > > -Original Message-
> > > From: Olivier Matz 
> > > Sent: Tuesday, October 6, 2020 11:09 AM
> > > To: Zhang, Roy Fan 
> > > Cc: dev@dpdk.org; Kovacevic, Marko ;
> Akhil
> > > Goyal ; Kusztal, ArkadiuszX
> >

Re: [dpdk-dev] [PATCH 1/1] timer: add limitation note for sync stop and reset

[David Marchand]

On Thu, Sep 10, 2020 at 3:23 AM Honnappa Nagarahalli
 wrote:
> > If a timer's callback function calls rte_timer_reset_sync() or
> > rte_timer_stop_sync() on another timer that is in the RUNNING state and
> > owned by the current lcore, the *_sync() calls will loop indefinitely.
> >
> > Relatedly, if a timer's callback function calls *_sync() on another timer 
> > that is
> > in the RUNNING state and is owned by a different lcore, but a timer callback
> > function runs on that different lcore and calls
> > *_sync() on a timer that is in the RUNNING state and owned by the current
> > lcore, the two lcores will loop indefinitely.
> >
> > Add a note in the rte_timer_stop_sync and rte_timer_reset_sync
> > documentation that indicates that these APIs should not be used inside
> > timer callback functions in order to avoid the hangs described above, and
> > suggests an alternative.
> >
> > Bugzilla ID: 491
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Erik Gabriel Carrillo 
> Reviewed-by: Honnappa Nagarahalli 

Applied, thanks.

Since we go with documenting a limitation, should we mark the original
patches [1] and [2] as rejected instead of deferred?

1: https://patches.dpdk.org/patch/75156/
2: https://patches.dpdk.org/patch/73683/


-- 
David Marchand

Re: [dpdk-dev] [PATCH] ethdev: fix xstat name of basic stats per queue

[Asaf Penso]

>-Original Message-
>From: dev  On Behalf Of Kevin Traynor
>Sent: Thursday, October 8, 2020 12:10 PM
>To: NBU-Contact-Thomas Monjalon ; dev@dpdk.org
>Cc: ferruh.yi...@intel.com; arybche...@solarflare.com
>Subject: Re: [dpdk-dev] [PATCH] ethdev: fix xstat name of basic stats per
>queue
>
>On 07/10/2020 22:48, Thomas Monjalon wrote:
>> As described in doc/guides/prog_guide/poll_mode_drv.rst,
>> the naming scheme for the xstats is parts separated with underscore:
>>  * direction
>>  * detail 1
>>  * detail 2
>>  * detail n
>>  * unit
>> where detail 1 can be "q" followed with a queue number.
>> It means the name of the stats per queue should be rx_qN_* or tx_qN_*.
>>
>> The second underscore was missing so far.
>> Fixing the basic xstat names may be considered an API change, that's
>> why it should not be backported.
>>
>> While fixing this mistake, some examples of the naming scheme are
>> given as part of the API documentation of rte_eth_xstat_name.
>> More proposals about standardizing statistics:
>>
>> https://nam11.safelinks.protection.outlook.com/?url=http%3A%2F%2Ffast.
>> dpdk.org%2Fevents%2Fslides%2FDPDK-2019-09-
>Ethernet_Statistics.pdf&
>>
>data=02%7C01%7Casafp%40nvidia.com%7C4a551495aff7412fa65108d86b6a22
>2f%7
>>
>C43083d15727340c1b7db39efd9ccc17a%7C0%7C1%7C637377450869384533&a
>mp;sda
>>
>ta=1Nn2If%2BgHcSc4hZS8FtLTBD5eyEyZeDZZP4u0%2FON5lU%3D&reserv
>ed=0
>>
>> Fixes: bd6aa172cf35 ("ethdev: fetch extended statistics with integer
>> ids")
>>
>> Signed-off-by: Thomas Monjalon 
>> ---
>
>Acked-by: Kevin Traynor 
>
>
>>  doc/guides/rel_notes/release_20_11.rst | 8 +++-
>>  lib/librte_ethdev/rte_ethdev.c | 4 ++--
>>  lib/librte_ethdev/rte_ethdev.h | 7 +++
>>  3 files changed, 16 insertions(+), 3 deletions(-)
>>
>> diff --git a/doc/guides/rel_notes/release_20_11.rst
>> b/doc/guides/rel_notes/release_20_11.rst
>> index cdf20404c9..d0d77c5d3d 100644
>> --- a/doc/guides/rel_notes/release_20_11.rst
>> +++ b/doc/guides/rel_notes/release_20_11.rst
>> @@ -200,7 +200,13 @@ API Changes
>>
>>  * ethdev: ``rte_eth_rx_descriptor_done()`` API has been deprecated.
>>
>> -* Renamed internal ethdev APIs:
>> +* ethdev: Renamed basic statistics per queue. An underscore is
>> +inserted
>> +  between the queue number and the rest of the xstat name:
>> +
>> +  * ``rx_qN*`` -> ``rx_qN_*``
>> +  * ``tx_qN*`` -> ``tx_qN_*``
>> +
>> +* ethdev: Renamed internal APIs:
>>
>>* ``_rte_eth_dev_callback_process()`` ->
>``rte_eth_dev_callback_process()``
>>* ``_rte_eth_dev_reset`` -> ``rte_eth_dev_internal_reset()`` diff
>> --git a/lib/librte_ethdev/rte_ethdev.c
>> b/lib/librte_ethdev/rte_ethdev.c index 48d1333b17..286c1b5966 100644
>> --- a/lib/librte_ethdev/rte_ethdev.c
>> +++ b/lib/librte_ethdev/rte_ethdev.c
>> @@ -2549,7 +2549,7 @@ rte_eth_basic_stats_get_names(struct
>rte_eth_dev *dev,
>>  for (idx = 0; idx < RTE_NB_RXQ_STATS; idx++) {
>>  snprintf(xstats_names[cnt_used_entries].name,
>>  sizeof(xstats_names[0].name),
>> -"rx_q%u%s",
>> +"rx_q%u_%s",
>>  id_queue, rte_rxq_stats_strings[idx].name);
>>  cnt_used_entries++;
>>  }
>> @@ -2560,7 +2560,7 @@ rte_eth_basic_stats_get_names(struct
>rte_eth_dev *dev,
>>  for (idx = 0; idx < RTE_NB_TXQ_STATS; idx++) {
>>  snprintf(xstats_names[cnt_used_entries].name,
>>  sizeof(xstats_names[0].name),
>> -"tx_q%u%s",
>> +"tx_q%u_%s",
>>  id_queue, rte_txq_stats_strings[idx].name);
>>  cnt_used_entries++;
>>  }
>> diff --git a/lib/librte_ethdev/rte_ethdev.h
>> b/lib/librte_ethdev/rte_ethdev.h index d2bf74f128..86434c9cae 100644
>> --- a/lib/librte_ethdev/rte_ethdev.h
>> +++ b/lib/librte_ethdev/rte_ethdev.h
>> @@ -1507,6 +1507,13 @@ struct rte_eth_xstat {
>>   * An array of this structure is returned by rte_eth_xstats_get_names().
>>   * It lists the names of extended statistics for a PMD. The *rte_eth_xstat*
>>   * structure references these names by their array index.
>> + *
>> + * The xstats should follow a common naming scheme.
>> + * Some names are standardized in rte_stats_strings.
>> + * Examples:
>> + * - rx_missed_errors
>> + * - tx_q3_bytes
>> + * - tx_size_128_to_255_packets
>>   */
>>  struct rte_eth_xstat_name {
>>  char name[RTE_ETH_XSTATS_NAME_SIZE]; /**< The statistic name.
>*/
>>
Thanks, Thomas, for taking care of such changes 😊
Looks like hns3 pmd should be updated as well, since it uses the same format.

[dpdk-dev] [PATCH v4 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.

v4:
* In the "event/octeontx2: add crypto adapter datapath" patch,
  replaced rte_cio_wmb with rte_io_wmb, to resolve compilation
  error.

v3:
* In the "event/octeontx2: add crypto adapter framework" patch,
  the following changes were made:
  - Moved the crypto adapter files from crypto/octeontx2 to
event/octeontx2 directory.
  - Reused the security flag for crypto adapter implementation.

* In the "event/octeontx2: add crypto adapter datapath" patch,
  the following changes were made:
  - In otx2_ssogws_get_work() and otx2_ssogws_dual_get_work(),
the crypto adapter function is called if offload flag has
security enabled. This is an additional check apart from
checking event type.

v2:
* In the "event/octeontx2: add crypto adapter datapath" patch, right
  shifting the req pointer by 3 bits before submit during enqueue.
  Because of this the right shift during dequeue is not required.

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  |  1 +
 .../octeontx2/otx2_cryptodev_hw_access.h  | 12 +++
 .../crypto/octeontx2/otx2_cryptodev_mbox.h|  2 +
 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  | 10 ++
 drivers/event/octeontx2/meson.build   |  4 +-
 drivers/event/octeontx2/otx2_evdev.c  |  4 +
 drivers/event/octeontx2/otx2_evdev.h  | 11 +++
 .../event/octeontx2/otx2_evdev_crypto_adptr.c | 81 
 .../octeontx2/otx2_evdev_crypto_adptr_dp.h| 75 +++
 drivers/event/octeontx2/otx2_worker.h | 28 --
 drivers/event/octeontx2/otx2_worker_dual.h| 44 +
 15 files changed, 365 insertions(+), 85 deletions(-)
 create mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h
 create mode 100644 drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
 create mode 100644 drivers/event/octeontx2/otx2_evdev_crypto_adptr_dp.h

-- 
2.28.0

[dpdk-dev] [PATCH v4 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  |  1 +
 .../octeontx2/otx2_cryptodev_hw_access.h  | 12 +++
 .../crypto/octeontx2/otx2_cryptodev_mbox.h|  2 +
 drivers/crypto/octeontx2/otx2_cryptodev_qp.h  |  7 ++
 .../rte_pmd_octeontx2_crypto_version.map  |  9 +++
 drivers/event/octeontx2/meson.build   |  4 +-
 drivers/event/octeontx2/otx2_evdev.c  |  4 +
 drivers/event/octeontx2/otx2_evdev.h  | 11 +++
 .../event/octeontx2/otx2_evdev_crypto_adptr.c | 81 +++
 9 files changed, 130 insertions(+), 1 deletion(-)
 create mode 100644 drivers/event/octeontx2/otx2_evdev_crypto_adptr.c

diff --git a/drivers/crypto/octeontx2/meson.build 
b/drivers/crypto/octeontx2/meson.build
index 148ec184a..41114a5c3 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'
 
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_hw_access.h 
b/drivers/crypto/octeontx2/otx2_cryptodev_hw_access.h
index 43db6a642..a435818e0 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_hw_access.h
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_hw_access.h
@@ -42,6 +42,7 @@
 #define OTX2_CPT_LF_NQ(a)  (0x400ull | (uint64_t)(a) << 3)
 
 #define OTX2_CPT_AF_LF_CTL(a)  (0x27000ull | (uint64_t)(a) << 3)
+#define OTX2_CPT_AF_LF_CTL2(a) (0x29000ull | (uint64_t)(a) << 3)
 
 #define OTX2_CPT_LF_BAR2(vf, q_id) \
((vf)->otx2_dev.bar2 + \
@@ -110,6 +111,17 @@ union otx2_cpt_af_lf_ctl {
} s;
 };
 
+union otx2_cpt_af_lf_ctl2 {
+   uint64_t u;
+   struct {
+   uint64_t exe_no_swap : 1;
+   uint64_t exe_ldwb: 1;
+   uint64_t reserved_2_31   : 30;
+   uint64_t sso_pf_func : 16;
+   uint64_t nix_pf_func : 16;
+   } s;
+};
+
 union otx2_cpt_lf_q_grp_ptr {
uint64_t u;
struct {
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_mbox.h 
b/drivers/crypto/octeontx2/otx2_cryptodev_mbox.h
index 4bc057774..05efb4049 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_mbox.h
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_mbox.h
@@ -21,9 +21,11 @@ int otx2_cpt_queues_detach(const struct rte_cryptodev *dev);
 
 int otx2_cpt_msix_offsets_get(const struct rte_cryptodev *dev);
 
+__rte_internal
 int otx2_cpt_af_reg_read(const struct rte_cryptodev *dev, uint64_t reg,
 uint64_t *val);
 
+__rte_internal
 int otx2_cpt_af_reg_write(const struct rte_cryptodev *dev, uint64_t reg,
  uint64_t val);
 
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_qp.h 
b/drivers/crypto/octeontx2/otx2_cryptodev_qp.h
index 9d48da45f..96ff4eb41 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_qp.h
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_qp.h
@@ -6,6 +6,7 @@
 #define _OTX2_CRYPTODEV_QP_H_
 
 #include 
+#include 
 #include 
 #include 
 
@@ -30,6 +31,12 @@ struct otx2_cpt_qp {
/**< Metabuf info required to support operations on the queue pair */
rte_iova_t iq_dma_addr;
/**< Instruction queue address */
+   struct rte_event ev;
+   /**< Event information required for binding cryptodev queue to
+* eventdev queue. Used by crypto adapter.
+*/
+   uint8_t ca_enable;
+   /**< Set when queue pair is added to crypto adapter */
 };
 
 #endif /* _OTX2_CRYPTODEV_QP_H_ */
diff --git a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map 
b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
index 4a76d1d52..95ebda255 100644
--- a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
+++ b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
@@ -1,3 +1,12 @@
 DPDK_21 {
local: *;
 };
+
+INTERNAL {
+   global:
+
+   otx2_cpt_af_reg_read;
+   otx2_cpt_af_reg_write;
+
+   local: *;
+};
diff --git a/drivers/event/octeontx2/meson.build 
b/drivers/event/octeontx2/meson.build
index 0ade51cec..6dde86fc7 100644
--- a/drivers/event/octeontx2/meson.build
+++ b/drivers/event/octeontx2/meson.build
@@ -6,6 +6,7 @@ sources = files('otx2_worker.c',
'otx2_worker_dual.c',
'otx2_evdev.c',
'otx2_evdev_adptr.c',
+   'otx2_evdev_crypto_adptr.c',
'otx2_evdev_irq.c',
'otx2_evdev_selftest.c',
'otx2_tim_evdev.c',
@@ -24,6 +25,7 @@ foreach flag: extra_flags
endif
 endforeach
 
-deps += ['bus_pci', 'common_octeontx2', 'mempool_octeontx2', 'pmd_octeontx2']
+deps += ['bus_pci', 'common_octeontx2', 'mempool_octeontx2', 'pmd_octeontx2', 
'pmd_octeontx2_crypto']
 
 include

[dpdk-dev] [PATCH v4 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 d38365a33..027fd0d47 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,
@@ -919,52 +902,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 v4 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_cryptodev_ops.c | 47 
 .../rte_pmd_octeontx2_crypto_version.map  |  1 +
 .../octeontx2/otx2_evdev_crypto_adptr_dp.h| 75 +++
 drivers/event/octeontx2/otx2_worker.h | 28 ---
 drivers/event/octeontx2/otx2_worker_dual.h| 44 ++-
 6 files changed, 168 insertions(+), 28 deletions(-)
 create mode 100644 drivers/event/octeontx2/otx2_evdev_crypto_adptr_dp.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_cryptodev_ops.c 
b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
index 027fd0d47..9125369d3 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 >> 3;
+   req->qp = qp;
+
+   do {
+   /* Copy CPT command to LMTLINE */
+   memcpy(lmtline, &inst, sizeof(inst));
+
+   /*
+* Make sure compiler does not reorder memcpy and ldeor.
+* LMTST transactions are always flushed from the write
+* buffer immediately, a DMB is not required to push out
+* LMTSTs.
+*/
+   rte_io_wmb();
+   lmt_status = otx2_lmt_submit(qp->lf_nq_reg);
+   } while (lmt_status == 0);
+
+}
+
 static __rte_always_inline int32_t __rte_hot
 otx2_cpt_enqueue_req(const struct otx2_cpt_qp *qp,
 struct pending_queue *pend_q,
@@ -426,6 +468,11 @@ otx2_cpt_enqueue_req(const struct otx2_cpt_qp *qp,
union cpt_inst_s inst;
uint64_t lmt_status;
 
+   if (qp->ca_enable) {
+   otx2_ca_enqueue_req(qp, req, lmtline);
+   return 0;
+   }
+
if (unlikely(pend_q->pending_count >= OTX2_CPT_DEFAULT_CMD_QLEN))
return -EAGAIN;
 
diff --git a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map 
b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
index 95ebda255..02684781b 100644
--- a/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
+++ b/drivers/crypto/octeontx2/rte_pmd_octeontx2_crypto_version.map
@@ -5,6 +5,7 @@ DPDK_21 {
 INTERNAL {
global:
 
+   otx2_cryptodev_driver_id;
otx2_cpt_af_reg_read;
otx2_cpt_af_reg_write;
 
diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr_dp.h 
b/drivers/event/octeontx2/otx2_evdev_crypto_adptr_dp.h
new file mode 100644
index 0..70b63933e
--- /dev/null
+++ b/drivers/event/octeontx2/otx2_evdev_crypto_adptr_dp.h
@@ -0,0 +1,75 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (C) 2020 Marvell International Ltd.
+ */
+
+#ifndef _OTX2_EVDEV_CRYPTO_ADPTR_DP_H_
+#define _OTX2_EVDEV_CRYPTO_ADPTR_DP_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],
+   

Re: [dpdk-dev] [PATCH 2/4] raw/dpaa2: fix build with gcc 11

[David Marchand]

On Thu, Oct 8, 2020 at 11:08 AM Nipun Gupta  wrote:
>
> Hi David,
>
> https://patchwork.dpdk.org/patch/76983/ - this patch have same changes?
> Please check and let me know what shall be done.

Ok, I'll mark Ferruh patch as rejected.
Thank you.

-- 
David Marchand

Re: [dpdk-dev] [PATCH 3/4] app/testpmd: fix build with gcc 11

[David Marchand]

On Mon, Sep 21, 2020 at 3:39 PM Ferruh Yigit  wrote:
>
> Error observed with gcc 11 under development
> gcc (GCC) 11.0.0 20200920 (experimental)
>
> ../app/test-pmd/config.c:1777:61:
> warning: argument 3 of type ‘const uint32_t[n]’
> {aka ‘const unsigned int[n]’} declared as a variable length
> array [-Wvla-parameter]
>  1777 | port_flow_list(portid_t port_id, uint32_t n,
> const uint32_t group[n])
>   | ~~~^~~~
> In file included from ../app/test-pmd/config.c:53:
> ../app/test-pmd/testpmd.h:764:67:
> note: previously declared as a pointer ‘const uint32_t *’
> {aka ‘const unsigned int *’}
>   764 | void port_flow_list(portid_t port_id, uint32_t n,
> const uint32_t *group);
>   | ^
>

Fixes: 938a184a1870 ("app/testpmd: implement basic support for flow API")
Cc: sta...@dpdk.org

> Signed-off-by: Ferruh Yigit 
Reviewed-by: David Marchand 
Reviewed-by: Phil Yang 
Reviewed-by: Asaf Penso 

Applied, thanks.


-- 
David Marchand

Re: [dpdk-dev] [PATCH 4/4] pmdinfogen: fix build with gcc 11

[David Marchand]

On Thu, Sep 24, 2020 at 11:32 AM David Marchand
 wrote:
> On Mon, Sep 21, 2020 at 3:39 PM Ferruh Yigit  wrote:
> >
> > Error observed with gcc 11 under development
> > gcc (GCC) 11.0.0 20200920 (experimental)
> >
> > build error:
> > In file included from ../buildtools/pmdinfogen/pmdinfogen.c:17:
> > ../buildtools/pmdinfogen/pmdinfogen.c: In function ‘parse_elf’:
> > ../buildtools/pmdinfogen/pmdinfogen.h:78:1:
> > warning: this ‘else’ clause does not guard...
> > [-Wmisleading-indentation]
> >78 | else \
> >   | ^~~~
> > ../buildtools/pmdinfogen/pmdinfogen.h:83:35:
> > note: in expansion of macro ‘CONVERT_NATIVE’
> >83 | #define TO_NATIVE(fend, width, x) CONVERT_NATIVE(fend, width, x)
> >   |   ^~
> > ../buildtools/pmdinfogen/pmdinfogen.c:152:28:
> > note: in expansion of macro ‘TO_NATIVE’
> >   152 | hdr->e_type  = TO_NATIVE(endian, 16, hdr->e_type);
> >   |^
> > ../buildtools/pmdinfogen/pmdinfogen.h:80:9:
> > note: ...this statement, but the latter is misleadingly indented
> > as if it were guarded by the ‘else’
> >80 | ___x; \
> >   | ^~~~
> >
>
>
> Fixes: 98b0fdb0ffc6 ("pmdinfogen: add buildtools and pmdinfogen utility")
> Cc: sta...@dpdk.org
>
> > Signed-off-by: Ferruh Yigit 
> Reviewed-by: David Marchand 

Applied, thanks.


-- 
David Marchand

Re: [dpdk-dev] [PATCH v3 00/14] acl: introduce AVX512 classify methods

[David Marchand]

On Tue, Oct 6, 2020 at 6:13 PM Ananyev, Konstantin
 wrote:
> > > v2 -> v3:
> > >   Fix checkpatch warnings
> > >   Split AVX512 algorithm into two and deduplicate common code
> >
> > Patch 7 still references a RTE_MACHINE_CPUFLAG flag.
> > Can you rework now that those flags have been dropped?
> >
>
> Should be fixed in v4:
> https://patches.dpdk.org/project/dpdk/list/?series=12721

Thanks.


>
> One more thing to mention - this series has a dependency on Vladimir's patch:
> https://patches.dpdk.org/patch/79310/ ("eal/x86: introduce AVX 512-bit type"),
> so CI/travis would still report an error.

Yes, I am looking at this patch and I think I will take it alone so
that we remove the dependency between those series.


-- 
David Marchand