[dpdk-dev] [PATCH v1] net/ice/base: clean code of finding GTPU dummy pkt

[Yuying Zhang]

Four gtpu tunnel types are used twice to find gtpu dummy packets
(ipv4_gtpu_ipv4/ipv6, ipv6_gtpu_ipv4/ipv6). Clean redundant code.

Signed-off-by: Yuying Zhang 
---
 drivers/net/ice/base/ice_switch.c | 28 
 1 file changed, 28 deletions(-)

diff --git a/drivers/net/ice/base/ice_switch.c 
b/drivers/net/ice/base/ice_switch.c
index 2a9bea4261..0ca68b8496 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -8186,34 +8186,6 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, 
u16 lkups_cnt,
return;
}
 
-   /* Support GTP tunnel + L3 */
-   if (tun_type == ICE_SW_TUN_IPV4_GTPU_IPV4 ||
-   tun_type == ICE_SW_TUN_GTP_IPV4) {
-   *pkt = dummy_ipv4_gtpu_ipv4_packet;
-   *pkt_len = sizeof(dummy_ipv4_gtpu_ipv4_packet);
-   *offsets = dummy_ipv4_gtpu_ipv4_packet_offsets;
-   return;
-   }
-   if (tun_type == ICE_SW_TUN_IPV4_GTPU_IPV6 ||
-   tun_type == ICE_SW_TUN_GTP_IPV6) {
-   *pkt = dummy_ipv4_gtpu_ipv6_packet;
-   *pkt_len = sizeof(dummy_ipv4_gtpu_ipv6_packet);
-   *offsets = dummy_ipv4_gtpu_ipv6_packet_offsets;
-   return;
-   }
-   if (tun_type == ICE_SW_TUN_IPV6_GTPU_IPV4) {
-   *pkt = dummy_ipv6_gtpu_ipv4_packet;
-   *pkt_len = sizeof(dummy_ipv6_gtpu_ipv4_packet);
-   *offsets = dummy_ipv6_gtpu_ipv4_packet_offsets;
-   return;
-   }
-   if (tun_type == ICE_SW_TUN_IPV6_GTPU_IPV6) {
-   *pkt = dummy_ipv6_gtpu_ipv6_packet;
-   *pkt_len = sizeof(dummy_ipv6_gtpu_ipv6_packet);
-   *offsets = dummy_ipv6_gtpu_ipv6_packet_offsets;
-   return;
-   }
-
if (tun_type == ICE_ALL_TUNNELS) {
*pkt = dummy_gre_udp_packet;
*pkt_len = sizeof(dummy_gre_udp_packet);
-- 
2.25.1

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

[Xing, Beilei]

> -Original Message-
> From: Zhang, Qi Z 
> Sent: Saturday, April 24, 2021 2:04 PM
> To: Xing, Beilei 
> Cc: Wang, Haiyue ; dev@dpdk.org; Zhang, Qi Z
> 
> Subject: [PATCH 0/4] common/iavf: update virtchnl
> 
> Couple code refine and bug fix
> 
> Qi Zhang (4):
>   common/iavf: fix duplicate defined offload bit
>   common/iavf: add enumeration for the rxdid format
>   common/iavf: refine comment in virtchnl
>   common/iavf: use BIT() macro for offload/cap bits
> 
>  drivers/common/iavf/virtchnl.h | 183 -
>  1 file changed, 132 insertions(+), 51 deletions(-)
> 
> --
> 2.26.2

Acked-by: Beilei Xing 

Re: [dpdk-dev] [PATCH v2 1/2] net/mlx5: fix tunnel offload private items location

[Ferruh Yigit]

On 4/25/2021 6:07 PM, Thomas Monjalon wrote:

Dim 25 avr 2021, à 19:01, Gregory Etelson a écrit :

Hello Thomas,
  

Dim 25 avr 2021, à 17:57, Gregory Etelson a écrit :

Tunnel offload API requires application to query PMD for specific flow
items and actions. Application uses these PMD specific elements to
build flow rules according to the tunnel offload model.
The model does not restrict private elements location in a flow rule,
but the current MLX5 PMD implementation expects that tunnel offload
rule will begin with PMD specific elements.
The patch removes that placement limitation in MLX5 PMD.

Cc: sta...@dpdk.org

Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload")


Cc: stable must be just after the Fixes line.

There is a testpmd patch in the same series, is it OK to be merged in mlx
tree?


The tunnel offload model can be complicated.
The testpmd patch that comes with this one emphasizes how application
can construct a flow rule without placement restrictions.
I think that both patches should be merged.


That's not the question.
One patch should be merged in mlx tree, while the other one should target 
next-net.
In such a situation, quite often we split in different series.
For this case, it's up to Raslan and Ferruh to agree on how to proceed.



I am OK to get both to next-net, as long as driver patch is Ack'ed.

It seems there is a relation between driver and testpmd patch, but I am trying 
to figure out how tightly they are coupled, which may be sign of something wrong.

Re: [dpdk-dev] [PATCH] vdpa/mlx5: improve portability of thread naming

[Matan Azrad]

From: Thomas Monjalon
> The function pthread_setname_np is non-portable, so it may be unavailable in
> old glibc or other systems.
> The function rte_thread_setname is workarounding portability issues.
> 
> Signed-off-by: Thomas Monjalon 
Acked-by: Matan Azrad 

Thanks!

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

[Zhang, Qi Z]

> -Original Message-
> From: Zhang, Yuying 
> Sent: Monday, April 26, 2021 1:38 PM
> To: dev@dpdk.org; Zhang, Qi Z ; Wang, Haiyue
> 
> Cc: Yan, Zhirun ; Guo, Junfeng
> ; Zhang, Yuying 
> Subject: [PATCH v4 1/2] net/ice: clean redundant macro definition of filters
> 
> The input set has been divided into two parts to distinguish inner and outer
> field. ICE_INSET_TUN_* is the same as non tunnel macro definition. Clean
> redundant ICE_INSET_TUN_* codes.
> 
> Signed-off-by: Yuying Zhang 

Acked-by: Qi Zhang 

Applied to dpdk-next-net-intel.

Thanks
Qi

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

[Zhang, Qi Z]

> -Original Message-
> From: Zhang, Yuying 
> Sent: Monday, April 26, 2021 1:38 PM
> To: dev@dpdk.org; Zhang, Qi Z ; Wang, Haiyue
> 
> Cc: Yan, Zhirun ; Guo, Junfeng
> ; Zhang, Yuying 
> Subject: [PATCH v4 2/2] net/ice: refactor input set fields for switch filter
> 
> Input set has been divided into inner and outer part to distinguish
> different fields. However, the parse method of switch filter doesn't
> match this update. Refactor switch filter to distingush inner and outer
> input set in the same way as other filters.
> 
> Signed-off-by: Yuying Zhang 

Acked-by: Qi Zhang 

Applied to dpdk-next-net-intel.

Thanks
Qi

[dpdk-dev] [PATCH] examples/l2fwd-crypto: support cipher multiple data-unit

[Matan Azrad]

Patch [1] added a new API to support multiple data-units in cipher
operations.

Add a support for this API:
- Add a new command-line argument to provide the data-unit length.
- Set the length in the cipher xform.
- Validate device capabilities for this feature.
- Pad the AES-XTS operation length to be aligned to the defined data-unit.

[1]: commit d014dddb2d69 ("cryptodev: support multiple cipher data-units")

Signed-off-by: Matan Azrad 
---
 .../sample_app_ug/l2_forward_crypto.rst   |  7 ++-
 examples/l2fwd-crypto/main.c  | 61 +++
 2 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/doc/guides/sample_app_ug/l2_forward_crypto.rst 
b/doc/guides/sample_app_ug/l2_forward_crypto.rst
index e2c0f9f1ec..cc772aaec4 100644
--- a/doc/guides/sample_app_ug/l2_forward_crypto.rst
+++ b/doc/guides/sample_app_ug/l2_forward_crypto.rst
@@ -41,8 +41,9 @@ The application requires a number of command line options:
 
 .//examples/dpdk-l2fwd-crypto [EAL options] -- [-p PORTMASK] 
[-q NQ] [-s] [-T PERIOD] /
 [--cdev_type HW/SW/ANY] [--chain 
HASH_CIPHER/CIPHER_HASH/CIPHER_ONLY/HASH_ONLY/AEAD] /
-[--cipher_algo ALGO] [--cipher_op ENCRYPT/DECRYPT] [--cipher_key KEY] /
-[--cipher_key_random_size SIZE] [--cipher_iv IV] [--cipher_iv_random_size 
SIZE] /
+[--cipher_algo ALGO] [--cipher_op ENCRYPT/DECRYPT] [--cipher_dataunit_len 
SIZE] /
+[--cipher_key KEY] [--cipher_key_random_size SIZE] [--cipher_iv IV] /
+[--cipher_iv_random_size SIZE] /
 [--auth_algo ALGO] [--auth_op GENERATE/VERIFY] [--auth_key KEY] /
 [--auth_key_random_size SIZE] [--auth_iv IV] [--auth_iv_random_size SIZE] /
 [--aead_algo ALGO] [--aead_op ENCRYPT/DECRYPT] [--aead_key KEY] /
@@ -81,6 +82,8 @@ where,
 
 (default is ENCRYPT)
 
+*   cipher_dataunit_len: set the length of the cipher data-unit.
+
 *   cipher_key: set the ciphering key to be used. Bytes has to be separated 
with ":"
 
 *   cipher_key_random_size: set the size of the ciphering key,
diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c
index 4f51616492..22bd47061b 100644
--- a/examples/l2fwd-crypto/main.c
+++ b/examples/l2fwd-crypto/main.c
@@ -182,6 +182,8 @@ struct l2fwd_crypto_params {
unsigned digest_length;
unsigned block_size;
 
+   uint16_t cipher_dataunit_len;
+
struct l2fwd_iv cipher_iv;
struct l2fwd_iv auth_iv;
struct l2fwd_iv aead_iv;
@@ -434,6 +436,12 @@ l2fwd_simple_crypto_enqueue(struct rte_mbuf *m,
pad_len = cparams->block_size -
(data_len % cparams->block_size);
break;
+   case RTE_CRYPTO_CIPHER_AES_XTS:
+   if (cparams->cipher_dataunit_len != 0 &&
+   (data_len % cparams->cipher_dataunit_len))
+   pad_len = cparams->cipher_dataunit_len -
+   (data_len % 
cparams->cipher_dataunit_len);
+   break;
default:
pad_len = 0;
}
@@ -827,6 +835,8 @@ l2fwd_main_loop(struct l2fwd_crypto_options *options)

port_cparams[i].cipher_iv.length);
 
port_cparams[i].cipher_algo = 
options->cipher_xform.cipher.algo;
+   port_cparams[i].cipher_dataunit_len =
+   options->cipher_xform.cipher.dataunit_len;
/* Set IV parameters */
options->cipher_xform.cipher.iv.offset = IV_OFFSET;
options->cipher_xform.cipher.iv.length =
@@ -989,6 +999,7 @@ l2fwd_crypto_usage(const char *prgname)
"  --cipher_key_random_size SIZE: size of cipher key when 
generated randomly\n"
"  --cipher_iv IV (bytes separated with \":\")\n"
"  --cipher_iv_random_size SIZE: size of cipher IV when 
generated randomly\n"
+   "  --cipher_dataunit_len SIZE: length of the algorithm 
data-unit\n"
 
"  --auth_algo ALGO\n"
"  --auth_op GENERATE / VERIFY\n"
@@ -1215,6 +1226,7 @@ l2fwd_crypto_parse_args_long_options(struct 
l2fwd_crypto_options *options,
struct option *lgopts, int option_index)
 {
int retval;
+   int val;
 
if (strcmp(lgopts[option_index].name, "cdev_type") == 0) {
retval = parse_cryptodev_type(&options->type, optarg);
@@ -1245,6 +1257,16 @@ l2fwd_crypto_parse_args_long_options(struct 
l2fwd_crypto_options *options,
return -1;
}
 
+   else if (strcmp(lgopts[option_index].name, "cipher_dataunit_len") == 0) 
{
+   retval = parse_size(&val, optarg);
+   if (retval == 0 && val >= 0 && val <= UINT16_MAX) {
+   options->cipher_xform.cipher.dataunit_len =
+  

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

[Zhang, Qi Z]

> -Original Message-
> From: Xing, Beilei 
> Sent: Monday, April 26, 2021 3:47 PM
> To: Zhang, Qi Z 
> Cc: Wang, Haiyue ; dev@dpdk.org
> Subject: RE: [PATCH 0/4] common/iavf: update virtchnl
> 
> 
> 
> > -Original Message-
> > From: Zhang, Qi Z 
> > Sent: Saturday, April 24, 2021 2:04 PM
> > To: Xing, Beilei 
> > Cc: Wang, Haiyue ; dev@dpdk.org; Zhang, Qi Z
> > 
> > Subject: [PATCH 0/4] common/iavf: update virtchnl
> >
> > Couple code refine and bug fix
> >
> > Qi Zhang (4):
> >   common/iavf: fix duplicate defined offload bit
> >   common/iavf: add enumeration for the rxdid format
> >   common/iavf: refine comment in virtchnl
> >   common/iavf: use BIT() macro for offload/cap bits
> >
> >  drivers/common/iavf/virtchnl.h | 183
> > -
> >  1 file changed, 132 insertions(+), 51 deletions(-)
> >
> > --
> > 2.26.2
> 
> Acked-by: Beilei Xing 
> 

Applied to dpdk-next-net-intel.

Thanks
Qi

Re: [dpdk-dev] [dpdk-stable] [PATCH] examples/vhost: fix potential overflow in args process

[David Marchand]

On Mon, Apr 19, 2021 at 7:59 AM Cheng Jiang  wrote:
>
> Add args length check to fix potential overflow issue.
>
> Coverity issue: 363741
> Fixes: 965b06f0358 ("examples/vhost: enhance getopt_long usage")
> Cc: sta...@dpdk.org

No need for Cc: stable since this issue only affects the current release.

>
> Signed-off-by: Cheng Jiang 

It should indeed fix the coverity report but this limit does not make sense.
Could you make dma_type point at either optarg (it should be fine as
we only read this string)?

Something like (untested):

diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index 2ca7d98c58..158e5e9a8a 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -55,9 +55,6 @@

 #define INVALID_PORT_ID 0xFF

-/* Maximum long option length for option parsing. */
-#define MAX_LONG_OPT_SZ 64
-
 /* mask of enabled ports */
 static uint32_t enabled_port_mask = 0;

@@ -97,7 +94,7 @@ static int builtin_net_driver;

 static int async_vhost_driver;

-static char dma_type[MAX_LONG_OPT_SZ];
+static char *dma_type;

 /* Specify timeout (in useconds) between retries on RX. */
 static uint32_t burst_rx_delay_time = BURST_RX_WAIT_US;
@@ -201,7 +198,7 @@ struct vhost_bufftable *vhost_txbuff[RTE_MAX_LCORE
* MAX_VHOST_DEVICE];
 static inline int
 open_dma(const char *value)
 {
-   if (strncmp(dma_type, "ioat", 4) == 0)
+   if (dma_type != NULL && strncmp(dma_type, "ioat", 4) == 0)
return open_ioat(value);

return -1;
@@ -669,7 +666,7 @@ us_vhost_parse_args(int argc, char **argv)
break;

case OPT_DMA_TYPE_NUM:
-   strcpy(dma_type, optarg);
+   dma_type = optarg;
break;

case OPT_DMAS_NUM:
@@ -1472,7 +1469,7 @@ new_device(int vid)
struct rte_vhost_async_features f;
struct rte_vhost_async_channel_ops channel_ops;

-   if (strncmp(dma_type, "ioat", 4) == 0) {
+   if (dma_type != NULL && strncmp(dma_type, "ioat", 4) == 0) {
channel_ops.transfer_data = ioat_transfer_data_cb;
channel_ops.check_completed_copies =
ioat_check_completed_copies_cb;



-- 
David Marchand

Re: [dpdk-dev] [PATCH] vdpa/mlx5: improve portability of thread naming

[fengchengwen]

On 2021/4/22 1:59, Thomas Monjalon wrote:
> The function pthread_setname_np is non-portable,
> so it may be unavailable in old glibc or other systems.
> The function rte_thread_setname is workarounding portability issues.
> 
> Signed-off-by: Thomas Monjalon 

Reviewed-by: Chengwen Feng 

Re: [dpdk-dev] [PATCH] net/iavf: fix performance drop

[Zhang, Qi Z]

> -Original Message-
> From: dev  On Behalf Of Wenzhuo Lu
> Sent: Monday, April 26, 2021 1:30 PM
> To: dev@dpdk.org
> Cc: Lu, Wenzhuo 
> Subject: [dpdk-dev] [PATCH] net/iavf: fix performance drop
> 
> AVX2 and SSE don't have the offload path.
> Not necessary doing any check. Or the scalar path will be chosen.
> 
> Fixes: eff56a7b9f97 ("net/iavf: add offload path for Rx AVX512")
> 
> Signed-off-by: Wenzhuo Lu 
> ---
>  drivers/net/iavf/iavf_rxtx.c | 12 +---
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index
> 3f3cf63..0ba19dbf 100644
> --- a/drivers/net/iavf/iavf_rxtx.c
> +++ b/drivers/net/iavf/iavf_rxtx.c
> @@ -2401,13 +2401,11 @@
>   check_ret = iavf_rx_vec_dev_check(dev);
>   if (check_ret >= 0 &&
>   rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {
> - if (check_ret == IAVF_VECTOR_PATH) {
> - use_sse = true;
> - if ((rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1 ||
> -  rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1)
> &&
> - rte_vect_get_max_simd_bitwidth() >=
> RTE_VECT_SIMD_256)
> - use_avx2 = true;
> - }
> + use_sse = true;
> + if ((rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1 ||
> +  rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1) &&
> + rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256)
> + use_avx2 = true;


Not sure if the right path will be selected when avx512 is not true, 
(CC_AVX512_SUPPORT is disable) while check_ret is IAVF_VECTOR_OFFLOAD_PATH?

Currently we have 

if (!use_sse && !use_avx2 && !use_avx512)
goto normal;

Should we also add below check?

if (!use_avx512 && check_ret == IAVF_VECTOR_OFFLOAD_PATH)
   goto normal;

> 
>  #ifdef CC_AVX512_SUPPORT
>   if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1 &&
> --
> 1.9.3

[dpdk-dev] [Bug 238] [tree-wide] enhance getopt_long usage

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=238

David Marchand (david.march...@redhat.com) changed:

   What|Removed |Added

 Status|RESOLVED|CONFIRMED
 Resolution|FIXED   |---

-- 
You are receiving this mail because:
You are the assignee for the bug.

Re: [dpdk-dev] [PATCH v1] net/ice/base: fix inner L4 offset for gptu dummy packet

[Zhang, Qi Z]

> -Original Message-
> From: Zhang, Yuying 
> Sent: Monday, April 26, 2021 2:02 PM
> To: dev@dpdk.org; Zhang, Qi Z 
> Cc: Zhang, Yuying ; sta...@dpdk.org
> Subject: [PATCH v1] net/ice/base: fix inner L4 offset for gptu dummy packet
> 
> Fix inner L4 offset of ipv6_gtpu_ipv6_tcp/udp dummy packet.
> 
> Fixes: bd4d9a89dbc1 ("net/ice/base: add GTP filtering via advanced switch
> filter")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Yuying Zhang 

Acked-by: Qi Zhang 

Applied to dpdk-next-net-intel.

Thanks
Qi

Re: [dpdk-dev] L3fwd mode in testpmd

[Jerin Jacob]

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

Yes.

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

Or You can have an additional variable to acculate it.

> Also, adding traces is equivalent to adding statistics in L3fwd.

Yes.

If the sole purpose only stats then it is better to add status in
l3fwd without performance impact. I thought some thing els

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

[Ferruh Yigit]

On 4/23/2021 5:18 PM, Ferruh Yigit wrote:

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

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

From: "Chaoyong.He" 

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

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

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

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

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


+1 to fix.


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


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




Ping.

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


Partially, for the fix part,
Applied to dpdk-next-net/main, thanks.

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

[Kinsella, Ray]

On 25/04/2021 17:42, Thomas Monjalon wrote:
> Kinsella, Ray:
>> On 16/04/2021 10:57, Thomas Monjalon wrote:
>>> 16/04/2021 11:41, Ferruh Yigit:
 On 4/16/2021 9:58 AM, Thomas Monjalon wrote:
> 16/04/2021 10:46, Lijun Ou:
>> Currently, upper-layer application could get queue state only
>> through pointers such as dev->data->tx_queue_state[queue_id],
>> this is not the recommended way to access it. So this patch
>> add get queue state when call rte_eth_rx_queue_info_get and
>> rte_eth_tx_queue_info_get API.
>>
>> Note: After add queue_state field, the 'struct rte_eth_rxq_info' size
>> remains 128B, and the 'struct rte_eth_txq_info' size remains 64B, so
>> it could be ABI compatible.
> [...]
>> --- a/doc/guides/rel_notes/release_21_05.rst
>> +++ b/doc/guides/rel_notes/release_21_05.rst
>> @@ -251,6 +251,12 @@ ABI Changes
>> function was already marked as internal in the API documentation for 
>> it,
>> and was not for use by external applications.
>>   
>> +* Added new field ``queue_state`` to ``rte_eth_rxq_info`` structure
>> +  to provide indicated rxq queue state.
>> +
>> +* Added new field ``queue_state`` to ``rte_eth_txq_info`` structure
>> +  to provide indicated txq queue state.
>
> Not sure we should add a note here for additions which
> do not break ABI compatibility.
> It may be confusing.
>

 Hi Thomas,

 What do about adding the documentation to "API Changes" section?
 Since 'rte_eth_rx_queue_info_get()'/'rte_eth_tx_queue_info_get()' can get 
 'queue_state' now, which may taken as API change.
>>>
>>> That's an addition.
>>> The users have nothing to change in their existing code,
>>> so I think we don't need a note in API or ABI change.
>>> The only required note would be in the "New Features".
>>
>> Well it definitely isn't an ABI change, however it still is an API addition.
>> I don't know, if additions qualify as changes.
> 
> Additions are already notified in the section "New Features" in general.
> The purpose of the API section in the release notes is for app developers
> to be warned of changes requiring attention in their maintenance.
> 

Understood - thanks.

Ray K

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

[Ferruh Yigit]

On 4/26/2021 10:46 AM, Ferruh Yigit wrote:

On 4/23/2021 5:18 PM, Ferruh Yigit wrote:

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

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

From: "Chaoyong.He" 

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

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

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

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

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


+1 to fix.


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


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




Ping.

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


Partially, for the fix part,
Applied to dpdk-next-net/main, thanks.



Hi Thomas, David, Akhil, Jerin, Maxime, Qi, Raslan, Ajit,

For the doc patches, the subsystem prefix 'doc:' is too wide, what do you think 
to extend it to include the component, like for this patch:

"doc/nics/nfp: fix multiport syntax"

[dpdk-dev] [PATCH v2 01/12] raw/ioat: add unit tests for completion batching

[Bruce Richardson]

Add in additional unit tests to verify that we can get completion reports
of multiple batches in a single completed_ops() call. Also verify we can
get smaller number of completions if that is requested too.

Signed-off-by: Bruce Richardson 
---
 drivers/raw/ioat/ioat_rawdev_test.c | 199 +++-
 1 file changed, 137 insertions(+), 62 deletions(-)

diff --git a/drivers/raw/ioat/ioat_rawdev_test.c 
b/drivers/raw/ioat/ioat_rawdev_test.c
index 101f24a677..a5064d739d 100644
--- a/drivers/raw/ioat/ioat_rawdev_test.c
+++ b/drivers/raw/ioat/ioat_rawdev_test.c
@@ -11,6 +11,7 @@
 
 #define MAX_SUPPORTED_RAWDEVS 64
 #define TEST_SKIPPED 77
+#define COPY_LEN 1024
 
 int ioat_rawdev_test(uint16_t dev_id); /* pre-define to keep compiler happy */
 
@@ -34,32 +35,114 @@ print_err(const char *func, int lineno, const char 
*format, ...)
return ret;
 }
 
+static int
+do_multi_copies(int dev_id, int split_batches, int split_completions)
+{
+   struct rte_mbuf *srcs[32], *dsts[32];
+   struct rte_mbuf *completed_src[64];
+   struct rte_mbuf *completed_dst[64];
+   unsigned int i, j;
+
+   for (i = 0; i < RTE_DIM(srcs); i++) {
+   char *src_data;
+
+   if (split_batches && i == RTE_DIM(srcs) / 2)
+   rte_ioat_perform_ops(dev_id);
+
+   srcs[i] = rte_pktmbuf_alloc(pool);
+   dsts[i] = rte_pktmbuf_alloc(pool);
+   src_data = rte_pktmbuf_mtod(srcs[i], char *);
+
+   for (j = 0; j < COPY_LEN; j++)
+   src_data[j] = rand() & 0xFF;
+
+   if (rte_ioat_enqueue_copy(dev_id,
+   srcs[i]->buf_iova + srcs[i]->data_off,
+   dsts[i]->buf_iova + dsts[i]->data_off,
+   COPY_LEN,
+   (uintptr_t)srcs[i],
+   (uintptr_t)dsts[i]) != 1) {
+   PRINT_ERR("Error with rte_ioat_enqueue_copy for buffer 
%u\n",
+   i);
+   return -1;
+   }
+   }
+   rte_ioat_perform_ops(dev_id);
+   usleep(100);
+
+   if (split_completions) {
+   /* gather completions in two halves */
+   uint16_t half_len = RTE_DIM(srcs) / 2;
+   if (rte_ioat_completed_ops(dev_id, half_len, (void 
*)completed_src,
+   (void *)completed_dst) != half_len) {
+   PRINT_ERR("Error with rte_ioat_completed_ops - first 
half request\n");
+   rte_rawdev_dump(dev_id, stdout);
+   return -1;
+   }
+   if (rte_ioat_completed_ops(dev_id, half_len, (void 
*)&completed_src[half_len],
+   (void *)&completed_dst[half_len]) != half_len) {
+   PRINT_ERR("Error with rte_ioat_completed_ops - second 
half request\n");
+   rte_rawdev_dump(dev_id, stdout);
+   return -1;
+   }
+   } else {
+   /* gather all completions in one go */
+   if (rte_ioat_completed_ops(dev_id, 64, (void *)completed_src,
+   (void *)completed_dst) != RTE_DIM(srcs)) {
+   PRINT_ERR("Error with rte_ioat_completed_ops\n");
+   rte_rawdev_dump(dev_id, stdout);
+   return -1;
+   }
+   }
+   for (i = 0; i < RTE_DIM(srcs); i++) {
+   char *src_data, *dst_data;
+
+   if (completed_src[i] != srcs[i]) {
+   PRINT_ERR("Error with source pointer %u\n", i);
+   return -1;
+   }
+   if (completed_dst[i] != dsts[i]) {
+   PRINT_ERR("Error with dest pointer %u\n", i);
+   return -1;
+   }
+
+   src_data = rte_pktmbuf_mtod(srcs[i], char *);
+   dst_data = rte_pktmbuf_mtod(dsts[i], char *);
+   for (j = 0; j < COPY_LEN; j++)
+   if (src_data[j] != dst_data[j]) {
+   PRINT_ERR("Error with copy of packet %u, byte 
%u\n",
+   i, j);
+   return -1;
+   }
+   rte_pktmbuf_free(srcs[i]);
+   rte_pktmbuf_free(dsts[i]);
+   }
+   return 0;
+}
+
 static int
 test_enqueue_copies(int dev_id)
 {
-   const unsigned int length = 1024;
unsigned int i;
 
+   /* test doing a single copy */
do {
struct rte_mbuf *src, *dst;
char *src_data, *dst_data;
struct rte_mbuf *completed[2] = {0};
 
-   /* test doing a single copy */
src = rte_pktmbuf_alloc(pool);
dst = rte_pktmbuf_alloc(pool);
-   src->data_len = src->pkt_len = le

[dpdk-dev] [PATCH v2 00/12] ioat driver updates

[Bruce Richardson]

This set contains a series of updates to the ioat driver, described in each of
the individual patchsets.

Bruce Richardson (10):
  raw/ioat: add unit tests for completion batching
  raw/ioat: support limiting queues for idxd PCI device
  raw/ioat: add component prefix to log messages
  raw/ioat: add explicit padding to descriptor struct
  raw/ioat: fix script for configuring small number of queues
  raw/ioat: make workqueue name configurable in script
  raw/ioat: add bus driver for device scanning automatically
  raw/ioat: move idxd functions to separate file
  raw/ioat: rework SW ring layout
  raw/ioat: report status of completed jobs

Kevin Laatz (2):
  raw/ioat: allow perform operations function to return error
  raw/ioat: add API to query remaining ring space

 doc/guides/rawdevs/ioat.rst|  31 +-
 doc/guides/rel_notes/release_21_05.rst |   5 +
 drivers/raw/ioat/dpdk_idxd_cfg.py  |  19 +-
 drivers/raw/ioat/idxd_bus.c| 359 +++
 drivers/raw/ioat/idxd_pci.c|  33 +-
 drivers/raw/ioat/idxd_vdev.c   | 231 --
 drivers/raw/ioat/ioat_common.c | 106 +++--
 drivers/raw/ioat/ioat_private.h|   2 +-
 drivers/raw/ioat/ioat_rawdev_test.c| 602 ++---
 drivers/raw/ioat/meson.build   |   5 +-
 drivers/raw/ioat/rte_idxd_rawdev_fns.h | 376 +++
 drivers/raw/ioat/rte_ioat_rawdev.h |  57 ++-
 drivers/raw/ioat/rte_ioat_rawdev_fns.h | 339 +++---
 examples/ioat/ioatfwd.c|  14 +-
 examples/vhost/ioat.c  |   2 +-
 15 files changed, 1514 insertions(+), 667 deletions(-)
 create mode 100644 drivers/raw/ioat/idxd_bus.c
 delete mode 100644 drivers/raw/ioat/idxd_vdev.c
 create mode 100644 drivers/raw/ioat/rte_idxd_rawdev_fns.h

--
2.30.2

[dpdk-dev] [PATCH v2 03/12] raw/ioat: add component prefix to log messages

[Bruce Richardson]

Add the driver prefix "IOAT" to log messages for the driver.

Signed-off-by: Bruce Richardson 
---
 drivers/raw/ioat/ioat_private.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/raw/ioat/ioat_private.h b/drivers/raw/ioat/ioat_private.h
index 6c423811ec..f032d5fe3d 100644
--- a/drivers/raw/ioat/ioat_private.h
+++ b/drivers/raw/ioat/ioat_private.h
@@ -21,7 +21,7 @@
 extern int ioat_pmd_logtype;
 
 #define IOAT_PMD_LOG(level, fmt, args...) rte_log(RTE_LOG_ ## level, \
-   ioat_pmd_logtype, "%s(): " fmt "\n", __func__, ##args)
+   ioat_pmd_logtype, "IOAT: %s(): " fmt "\n", __func__, ##args)
 
 #define IOAT_PMD_DEBUG(fmt, args...)  IOAT_PMD_LOG(DEBUG, fmt, ## args)
 #define IOAT_PMD_INFO(fmt, args...)   IOAT_PMD_LOG(INFO, fmt, ## args)
-- 
2.30.2

[dpdk-dev] [PATCH v2 02/12] raw/ioat: support limiting queues for idxd PCI device

[Bruce Richardson]

When using a full device instance via vfio, allow the user to specify a
maximum number of queues to configure rather than always using the max
number of supported queues.

Signed-off-by: Bruce Richardson 
---
 doc/guides/rawdevs/ioat.rst |  8 
 drivers/raw/ioat/idxd_pci.c | 28 ++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst
index 250cfc48a6..60438cc3bc 100644
--- a/doc/guides/rawdevs/ioat.rst
+++ b/doc/guides/rawdevs/ioat.rst
@@ -106,6 +106,14 @@ For devices bound to a suitable DPDK-supported VFIO/UIO 
driver, the HW devices w
 be found as part of the device scan done at application initialization time 
without
 the need to pass parameters to the application.
 
+For Intel\ |reg| DSA devices, DPDK will automatically configure the device 
with the
+maximum number of workqueues available on it, partitioning all resources 
equally
+among the queues.
+If fewer workqueues are required, then the ``max_queues`` parameter may be 
passed to
+the device driver on the EAL commandline, via the ``allowlist`` or ``-a`` flag 
e.g.::
+
+   $ dpdk-test -a ,max_queues=4
+
 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.
diff --git a/drivers/raw/ioat/idxd_pci.c b/drivers/raw/ioat/idxd_pci.c
index 01623f33f6..b48e565b4c 100644
--- a/drivers/raw/ioat/idxd_pci.c
+++ b/drivers/raw/ioat/idxd_pci.c
@@ -4,6 +4,7 @@
 
 #include 
 #include 
+#include 
 
 #include "ioat_private.h"
 #include "ioat_spec.h"
@@ -123,7 +124,8 @@ static const struct rte_rawdev_ops idxd_pci_ops = {
 #define IDXD_PORTAL_SIZE (4096 * 4)
 
 static int
-init_pci_device(struct rte_pci_device *dev, struct idxd_rawdev *idxd)
+init_pci_device(struct rte_pci_device *dev, struct idxd_rawdev *idxd,
+   unsigned int max_queues)
 {
struct idxd_pci_common *pci;
uint8_t nb_groups, nb_engines, nb_wqs;
@@ -179,6 +181,16 @@ init_pci_device(struct rte_pci_device *dev, struct 
idxd_rawdev *idxd)
for (i = 0; i < nb_wqs; i++)
idxd_get_wq_cfg(pci, i)[0] = 0;
 
+   /* limit queues if necessary */
+   if (max_queues != 0 && nb_wqs > max_queues) {
+   nb_wqs = max_queues;
+   if (nb_engines > max_queues)
+   nb_engines = max_queues;
+   if (nb_groups > max_queues)
+   nb_engines = max_queues;
+   IOAT_PMD_DEBUG("Limiting queues to %u", nb_wqs);
+   }
+
/* put each engine into a separate group to avoid reordering */
if (nb_groups > nb_engines)
nb_groups = nb_engines;
@@ -242,12 +254,23 @@ idxd_rawdev_probe_pci(struct rte_pci_driver *drv, struct 
rte_pci_device *dev)
uint8_t nb_wqs;
int qid, ret = 0;
char name[PCI_PRI_STR_SIZE];
+   unsigned int max_queues = 0;
 
rte_pci_device_name(&dev->addr, name, sizeof(name));
IOAT_PMD_INFO("Init %s on NUMA node %d", name, dev->device.numa_node);
dev->device.driver = &drv->driver;
 
-   ret = init_pci_device(dev, &idxd);
+   if (dev->device.devargs && dev->device.devargs->args[0] != '\0') {
+   /* if the number of devargs grows beyond just 1, use rte_kvargs 
*/
+   if (sscanf(dev->device.devargs->args,
+   "max_queues=%u", &max_queues) != 1) {
+   IOAT_PMD_ERR("Invalid device parameter: '%s'",
+   dev->device.devargs->args);
+   return -1;
+   }
+   }
+
+   ret = init_pci_device(dev, &idxd, max_queues);
if (ret < 0) {
IOAT_PMD_ERR("Error initializing PCI hardware");
return ret;
@@ -353,3 +376,4 @@ RTE_PMD_REGISTER_PCI(IDXD_PMD_RAWDEV_NAME_PCI, 
idxd_pmd_drv_pci);
 RTE_PMD_REGISTER_PCI_TABLE(IDXD_PMD_RAWDEV_NAME_PCI, pci_id_idxd_map);
 RTE_PMD_REGISTER_KMOD_DEP(IDXD_PMD_RAWDEV_NAME_PCI,
  "* igb_uio | uio_pci_generic | vfio-pci");
+RTE_PMD_REGISTER_PARAM_STRING(rawdev_idxd_pci, "max_queues=0");
-- 
2.30.2

[dpdk-dev] [PATCH v2 04/12] raw/ioat: add explicit padding to descriptor struct

[Bruce Richardson]

Add an explicit padding field to the end of the descriptor structure so
that when the batch descriptor is defined on the stack for perform-ops, the
unused space is all zeroed appropriately.

Signed-off-by: Bruce Richardson 
---
 drivers/raw/ioat/rte_ioat_rawdev_fns.h | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/raw/ioat/rte_ioat_rawdev_fns.h 
b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
index c2c4601ca7..e96edc9053 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev_fns.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
@@ -140,7 +140,10 @@ struct rte_idxd_hw_desc {
 
uint32_t size;/* length of data for op, or batch size */
 
-   /* 28 bytes of padding here */
+   uint16_t intr_handle; /* completion interrupt handle */
+
+   /* remaining 26 bytes are reserved */
+   uint16_t __reserved[13];
 } __rte_aligned(64);
 
 /**
-- 
2.30.2

[dpdk-dev] [PATCH v2 05/12] raw/ioat: fix script for configuring small number of queues

[Bruce Richardson]

The dpdk_idxd_cfg.py script included with the driver for convenience did
not work properly where the number of queues to be configured was
less than the number of groups or engines. This was because there would
be configured groups/engines not assigned to queues. Fix this by
limiting the engine and group counts to be no bigger than the number of
queues.

Fixes: 01863b9d2354 ("raw/ioat: include example configuration script")
Cc: sta...@dpdk.org

Signed-off-by: Bruce Richardson 
---
 drivers/raw/ioat/dpdk_idxd_cfg.py | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/raw/ioat/dpdk_idxd_cfg.py 
b/drivers/raw/ioat/dpdk_idxd_cfg.py
index bce4bb5bd4..56e44063e4 100755
--- a/drivers/raw/ioat/dpdk_idxd_cfg.py
+++ b/drivers/raw/ioat/dpdk_idxd_cfg.py
@@ -39,15 +39,15 @@ def configure_dsa(dsa_id, queues):
 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}")
 
+# we want one engine per group, and no more engines than queues
+nb_groups = min(max_engines, max_groups, nb_queues)
+for grp in range(nb_groups):
+dsa_dir.write_values({f"engine{dsa_id}.{grp}/group_id": grp})
+
 # configure each queue
 for q in range(nb_queues):
 wq_dir = SysfsDir(os.path.join(dsa_dir.path, f"wq{dsa_id}.{q}"))
-- 
2.30.2

[dpdk-dev] [PATCH v2 06/12] raw/ioat: make workqueue name configurable in script

[Bruce Richardson]

Add a "--name-prefix" parameter to the quick configuration script for
DSA. This allows the queues configured on a DSA instance to be made
available to only one DPDK process in a setup with multiple DPDK process
instances.

Signed-off-by: Bruce Richardson 
---
 drivers/raw/ioat/dpdk_idxd_cfg.py | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/raw/ioat/dpdk_idxd_cfg.py 
b/drivers/raw/ioat/dpdk_idxd_cfg.py
index 56e44063e4..ff06d9e240 100755
--- a/drivers/raw/ioat/dpdk_idxd_cfg.py
+++ b/drivers/raw/ioat/dpdk_idxd_cfg.py
@@ -29,7 +29,7 @@ def write_values(self, values):
 f.write(str(contents))
 
 
-def configure_dsa(dsa_id, queues):
+def configure_dsa(dsa_id, queues, prefix):
 "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")
@@ -54,7 +54,7 @@ def configure_dsa(dsa_id, queues):
 wq_dir.write_values({"group_id": q % nb_groups,
  "type": "user",
  "mode": "dedicated",
- "name": f"dpdk_wq{dsa_id}.{q}",
+ "name": f"{prefix}_wq{dsa_id}.{q}",
  "priority": 1,
  "size": int(max_tokens / nb_queues)})
 
@@ -71,8 +71,11 @@ def main(args):
 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")
+arg_p.add_argument('--name-prefix', metavar='prefix', dest='prefix',
+   default="dpdk",
+   help="Prefix for workqueue name to mark for DPDK use 
[default: 'dpdk']")
 parsed_args = arg_p.parse_args(args[1:])
-configure_dsa(parsed_args.dsa_id, parsed_args.q)
+configure_dsa(parsed_args.dsa_id, parsed_args.q, parsed_args.prefix)
 
 
 if __name__ == "__main__":
-- 
2.30.2

[dpdk-dev] [PATCH v2 07/12] raw/ioat: allow perform operations function to return error

[Bruce Richardson]

From: Kevin Laatz 

Change the return type for the rte_ioat_perform_ops() function from void to
int to allow the possibility of returning an error code in future, should
it be necessary.

Signed-off-by: Kevin Laatz 
---
 drivers/raw/ioat/rte_ioat_rawdev.h |  4 +++-
 drivers/raw/ioat/rte_ioat_rawdev_fns.h | 11 +++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/raw/ioat/rte_ioat_rawdev.h 
b/drivers/raw/ioat/rte_ioat_rawdev.h
index f9e8425a7f..e5a22a0799 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev.h
@@ -124,8 +124,10 @@ rte_ioat_fence(int dev_id);
  *
  * @param dev_id
  *   The rawdev device id of the ioat instance
+ * @return
+ *   0 on success. Non-zero return on error.
  */
-static inline void
+static inline int
 __rte_experimental
 rte_ioat_perform_ops(int dev_id);
 
diff --git a/drivers/raw/ioat/rte_ioat_rawdev_fns.h 
b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
index e96edc9053..477c1b7b41 100644
--- a/drivers/raw/ioat/rte_ioat_rawdev_fns.h
+++ b/drivers/raw/ioat/rte_ioat_rawdev_fns.h
@@ -291,7 +291,7 @@ __ioat_fence(int dev_id)
 /*
  * Trigger hardware to begin performing enqueued operations
  */
-static __rte_always_inline void
+static __rte_always_inline int
 __ioat_perform_ops(int dev_id)
 {
struct rte_ioat_rawdev *ioat =
@@ -301,6 +301,8 @@ __ioat_perform_ops(int dev_id)
rte_compiler_barrier();
*ioat->doorbell = ioat->next_write;
ioat->xstats.started = ioat->xstats.enqueued;
+
+   return 0;
 }
 
 /**
@@ -462,7 +464,7 @@ __idxd_movdir64b(volatile void *dst, const void *src)
: "a" (dst), "d" (src));
 }
 
-static __rte_always_inline void
+static __rte_always_inline int
 __idxd_perform_ops(int dev_id)
 {
struct rte_idxd_rawdev *idxd =
@@ -470,7 +472,7 @@ __idxd_perform_ops(int dev_id)
struct rte_idxd_desc_batch *b = &idxd->batch_ring[idxd->next_batch];
 
if (b->submitted || b->op_count == 0)
-   return;
+   return 0;
b->hdl_end = idxd->next_free_hdl;
b->comp.status = 0;
b->submitted = 1;
@@ -480,6 +482,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;
+   return 0;
 }
 
 static __rte_always_inline int
@@ -558,7 +561,7 @@ rte_ioat_fence(int dev_id)
return __ioat_fence(dev_id);
 }
 
-static inline void
+static inline int
 rte_ioat_perform_ops(int dev_id)
 {
enum rte_ioat_dev_type *type =
-- 
2.30.2

[dpdk-dev] [PATCH v2 08/12] raw/ioat: add bus driver for device scanning automatically

[Bruce Richardson]

Rather than using a vdev with args, DPDK can scan and initialize the
devices automatically using a bus-type driver. This bus does not need to
worry about registering device drivers, rather it can initialize the
devices directly on probe.

The device instances (queues) to use are detected from /dev with the
additional info about them got from /sys.

Signed-off-by: Bruce Richardson 
---
 doc/guides/rawdevs/ioat.rst  |  23 ++-
 drivers/raw/ioat/idxd_bus.c  | 359 +++
 drivers/raw/ioat/idxd_vdev.c | 231 --
 drivers/raw/ioat/meson.build |   4 +-
 4 files changed, 374 insertions(+), 243 deletions(-)
 create mode 100644 drivers/raw/ioat/idxd_bus.c
 delete mode 100644 drivers/raw/ioat/idxd_vdev.c

diff --git a/doc/guides/rawdevs/ioat.rst b/doc/guides/rawdevs/ioat.rst
index 60438cc3bc..2ad13db294 100644
--- a/doc/guides/rawdevs/ioat.rst
+++ b/doc/guides/rawdevs/ioat.rst
@@ -78,7 +78,7 @@ 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
+   --type=user --name=dpdk_app1
 
 Once the devices have been configured, they need to be enabled::
 
@@ -114,15 +114,18 @@ the device driver on the EAL commandline, via the 
``allowlist`` or ``-a`` flag e
 
$ dpdk-test -a ,max_queues=4
 
-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
+For devices bound to the IDXD kernel driver,
+the DPDK ioat driver will automatically perform a scan for available 
workqueues to use.
+Any workqueues found listed in ``/dev/dsa`` on the system will be checked in 
``/sys``,
+and any which have ``dpdk_`` prefix in their name will be automatically probed 
by the
+driver to make them available to the application.
+Alternatively, to support use by multiple DPDK processes simultaneously,
+the value used as the DPDK ``--file-prefix`` parameter may be used as a 
workqueue name prefix,
+instead of ``dpdk_``,
+allowing each DPDK application instance to only use a subset of configured 
queues.
+
+Once probed successfully, irrespective of kernel driver, the device will 
appear as a ``rawdev``,
+that is a "raw device type" inside DPDK, and can be accessed using APIs from 
the
 ``rte_rawdev`` library.
 
 Using IOAT Rawdev Devices
diff --git a/drivers/raw/ioat/idxd_bus.c b/drivers/raw/ioat/idxd_bus.c
new file mode 100644
index 00..1f11a0d6ca
--- /dev/null
+++ b/drivers/raw/ioat/idxd_bus.c
@@ -0,0 +1,359 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Intel Corporation
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include "ioat_private.h"
+
+/* default value for DSA paths, but allow override in environment for testing 
*/
+#define DSA_DEV_PATH "/dev/dsa"
+#define DSA_SYSFS_PATH "/sys/bus/dsa/devices"
+
+/** unique identifier for a DSA device/WQ instance */
+struct dsa_wq_addr {
+   uint16_t device_id;
+   uint16_t wq_id;
+};
+
+/** a DSA device instance */
+struct rte_dsa_device {
+   struct rte_device device;   /**< Inherit core device */
+   TAILQ_ENTRY(rte_dsa_device) next;   /**< next dev in list */
+
+   char wq_name[32];   /**< the workqueue name/number e.g. 
wq0.1 */
+   struct dsa_wq_addr addr;/**< Identifies the specific WQ */
+};
+
+/* forward prototypes */
+struct dsa_bus;
+static int dsa_scan(void);
+static int dsa_probe(void);
+static struct rte_device *dsa_find_device(const struct rte_device *start,
+   rte_dev_cmp_t cmp,  const void *data);
+static enum rte_iova_mode dsa_get_iommu_class(void);
+static int dsa_addr_parse(const char *name, void *addr);
+
+/** List of devices */
+TAILQ_HEAD(dsa_device_list, rte_dsa_device);
+
+/**
+ * Structure describing the DSA bus
+ */
+struct dsa_bus {
+   struct rte_bus bus;   /**< Inherit the generic class */
+   struct rte_driver driver; /**< Driver struct for devices to 
point to */
+   struct dsa_device_list device_list;  /**< List of PCI devices */
+};
+
+struct dsa_bus dsa_bus = {
+   .bus = {
+   .scan = dsa_scan,
+   .probe = dsa_probe,
+   .find_device = dsa_find_device,
+   .get_iommu_class = dsa_get_iommu_class,
+   .parse = dsa_addr_parse,
+   },
+   .driver = {
+   .name = "rawdev_idxd"
+   },
+   .device_list = TAILQ_HEAD_I

[dpdk-dev] [PATCH v2 09/12] raw/ioat: move idxd functions to separate file

[Bruce Richardson]

Split the rte_ioat_rawdev_fns.h file into two separate headers, so that the
data structures for the original ioat devices and the newer idxd ones can
be kept separate from each other. This makes code management and rework
easier.

Signed-off-by: Bruce Richardson 
---
 drivers/raw/ioat/meson.build   |   1 +
 drivers/raw/ioat/rte_idxd_rawdev_fns.h | 275 ++
 drivers/raw/ioat/rte_ioat_rawdev_fns.h | 310 ++---
 3 files changed, 299 insertions(+), 287 deletions(-)
 create mode 100644 drivers/raw/ioat/rte_idxd_rawdev_fns.h

diff --git a/drivers/raw/ioat/meson.build b/drivers/raw/ioat/meson.build
index 6382a826e7..0e81cb5951 100644
--- a/drivers/raw/ioat/meson.build
+++ b/drivers/raw/ioat/meson.build
@@ -13,5 +13,6 @@ sources = files(
 deps += ['bus_pci', 'mbuf', 'rawdev']
 headers = files(
 'rte_ioat_rawdev.h',
+'rte_idxd_rawdev_fns.h',
 'rte_ioat_rawdev_fns.h',
 )
diff --git a/drivers/raw/ioat/rte_idxd_rawdev_fns.h 
b/drivers/raw/ioat/rte_idxd_rawdev_fns.h
new file mode 100644
index 00..c2a12ebef0
--- /dev/null
+++ b/drivers/raw/ioat/rte_idxd_rawdev_fns.h
@@ -0,0 +1,275 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2021 Intel Corporation
+ */
+#ifndef _RTE_IDXD_RAWDEV_FNS_H_
+#define _RTE_IDXD_RAWDEV_FNS_H_
+
+#include 
+
+/*
+ * 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_op_memmove,
+   idxd_op_fill
+};
+
+#define IDXD_FLAG_FENCE (1 << 0)
+#define IDXD_FLAG_COMPLETION_ADDR_VALID (1 << 2)
+#define IDXD_FLAG_REQUEST_COMPLETION(1 << 3)
+#define IDXD_FLAG_CACHE_CONTROL (1 << 8)
+
+#define IOAT_COMP_UPDATE_SHIFT 3
+#define IOAT_CMD_OP_SHIFT  24
+enum rte_ioat_ops {
+   ioat_op_copy = 0,   /* Standard DMA Operation */
+   ioat_op_fill/* Block Fill */
+};
+
+/**
+ * Hardware descriptor used by DSA hardware, for both bursts and
+ * for individual operations.
+ */
+struct rte_idxd_hw_desc {
+   uint32_t pasid;
+   uint32_t op_flags;
+   rte_iova_t completion;
+
+   RTE_STD_C11
+   union {
+   rte_iova_t src;  /* source address for copy ops etc. */
+   rte_iova_t desc_addr; /* descriptor pointer for batch */
+   };
+   rte_iova_t dst;
+
+   uint32_t size;/* length of data for op, or batch size */
+
+   uint16_t intr_handle; /* completion interrupt handle */
+
+   /* remaining 26 bytes are reserved */
+   uint16_t __reserved[13];
+} __rte_aligned(64);
+
+/**
+ * Completion record structure written back by DSA
+ */
+struct rte_idxd_completion {
+   uint8_t status;
+   uint8_t result;
+   /* 16-bits pad here */
+   uint32_t completed_size; /* data length, or descriptors for batch */
+
+   rte_iova_t fault_address;
+   uint32_t invalid_flags;
+} __rte_aligned(32);
+
+#define BATCH_SIZE 64
+
+/**
+ * Structure used inside the driver for building up and submitting
+ * a batch of operations to the DSA hardware.
+ */
+struct rte_idxd_desc_batch {
+   struct rte_idxd_completion comp; /* the completion record for batch */
+
+   uint16_t submitted;
+   uint16_t op_count;
+   uint16_t hdl_end;
+
+   struct rte_idxd_hw_desc batch_desc;
+
+   /* batches must always have 2 descriptors, so put a null at the start */
+   struct rte_idxd_hw_desc null_desc;
+   struct rte_idxd_hw_desc ops[BATCH_SIZE];
+};
+
+/**
+ * structure used to save the "handles" provided by the user to be
+ * returned to the user on job completion.
+ */
+struct rte_idxd_user_hdl {
+   uint64_t src;
+   uint64_t dst;
+};
+
+/**
+ * @internal
+ * Structure representing an IDXD device instance
+ */
+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 */
+   uint16_t batch_ring_sz;  /* size of batch ring */
+   uint16_t hdl_ring_sz;/* size of the user hdl ring */
+
+   uint16_t next_batch; /* where we write descriptor ops */
+   uint16_t next_completed; /* batch where we read completions */
+   uint16_t next_ret_hdl;   /* the next user hdl to return */
+   uint16_t last_completed_hdl; /* the last user hdl that has completed */
+   uint16_t next_free_hdl;  /* where the handle for next op will go */
+   uint16_t hdls_disable;   /* disable tracking completion handles */
+
+   struct rte_idxd_user_hdl *hdl_ring;
+   struct rte_idxd_desc_batch *batch_ring;
+};
+
+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_ra

[dpdk-dev] [PATCH v2 10/12] raw/ioat: rework SW ring layout

[Bruce Richardson]

The ring management in the idxd part of the driver is more complex than
it needs to be, tracking individual batches in a ring and having null
descriptors as padding to avoid having single-operation batches. This can
be simplified by using a regular ring-based layout, with additional
overflow at the end to ensure that the one does not need to wrap within a
batch.

Signed-off-by: Bruce Richardson 
---
 drivers/raw/ioat/idxd_pci.c|   5 +-
 drivers/raw/ioat/ioat_common.c |  99 +--
 drivers/raw/ioat/ioat_rawdev_test.c|   1 +
 drivers/raw/ioat/rte_idxd_rawdev_fns.h | 233 +
 4 files changed, 179 insertions(+), 159 deletions(-)

diff --git a/drivers/raw/ioat/idxd_pci.c b/drivers/raw/ioat/idxd_pci.c
index b48e565b4c..13515dbc6c 100644
--- a/drivers/raw/ioat/idxd_pci.c
+++ b/drivers/raw/ioat/idxd_pci.c
@@ -90,7 +90,7 @@ idxd_pci_dev_start(struct rte_rawdev *dev)
return 0;
}
 
-   if (idxd->public.batch_ring == NULL) {
+   if (idxd->public.desc_ring == NULL) {
IOAT_PMD_ERR("WQ %d has not been fully configured", idxd->qid);
return -EINVAL;
}
@@ -337,7 +337,8 @@ idxd_rawdev_destroy(const char *name)
/* free device memory */
IOAT_PMD_DEBUG("Freeing device driver memory");
rdev->dev_private = NULL;
-   rte_free(idxd->public.batch_ring);
+   rte_free(idxd->public.batch_idx_ring);
+   rte_free(idxd->public.desc_ring);
rte_free(idxd->public.hdl_ring);
rte_memzone_free(idxd->mz);
 
diff --git a/drivers/raw/ioat/ioat_common.c b/drivers/raw/ioat/ioat_common.c
index d055c36a2a..fcb30572e6 100644
--- a/drivers/raw/ioat/ioat_common.c
+++ b/drivers/raw/ioat/ioat_common.c
@@ -84,21 +84,21 @@ idxd_dev_dump(struct rte_rawdev *dev, FILE *f)
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);
+   fprintf(f, "Config: {ring_size: %u, hdls_disable: %u}\n\n",
+   rte_idxd->cfg.ring_size, rte_idxd->cfg.hdls_disable);
+
+   fprintf(f, "max batches: %u\n", rte_idxd->max_batches);
+   fprintf(f, "batch idx read: %u\n", rte_idxd->batch_idx_read);
+   fprintf(f, "batch idx write: %u\n", rte_idxd->batch_idx_write);
+   fprintf(f, "batch idxes:");
+   for (i = 0; i < rte_idxd->max_batches + 1; i++)
+   fprintf(f, "%u ", rte_idxd->batch_idx_ring[i]);
+   fprintf(f, "\n\n");
+
+   fprintf(f, "hdls read: %u\n", rte_idxd->max_batches);
+   fprintf(f, "hdls avail: %u\n", rte_idxd->hdls_avail);
+   fprintf(f, "batch start: %u\n", rte_idxd->batch_start);
+   fprintf(f, "batch size: %u\n", rte_idxd->batch_size);
 
return 0;
 }
@@ -114,10 +114,8 @@ idxd_dev_info_get(struct rte_rawdev *dev, rte_rawdev_obj_t 
dev_info,
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;
-   }
+   if (cfg != NULL)
+   *cfg = rte_idxd->cfg;
return 0;
 }
 
@@ -129,8 +127,6 @@ idxd_dev_configure(const struct rte_rawdev *dev,
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;
@@ -140,47 +136,34 @@ idxd_dev_configure(const struct rte_rawdev *dev,
return -EAGAIN;
}
 
-   rte_idxd->hdls_disable = cfg->hdls_disable;
+   rte_idxd->cfg = *cfg;
 
-   /* 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_powe

[dpdk-dev] [PATCH v2 11/12] raw/ioat: add API to query remaining ring space

[Bruce Richardson]

From: Kevin Laatz 

Add a new API to query remaining descriptor ring capacity. This API is
useful, for example, when an application needs to enqueue a fragmented
packet and wants to ensure that all segments of the packet will be enqueued
together.

Signed-off-by: Kevin Laatz 
Signed-off-by: Bruce Richardson 
---
 drivers/raw/ioat/ioat_rawdev_test.c| 138 -
 drivers/raw/ioat/rte_idxd_rawdev_fns.h |  22 
 drivers/raw/ioat/rte_ioat_rawdev_fns.h |  24 +
 3 files changed, 183 insertions(+), 1 deletion(-)

diff --git a/drivers/raw/ioat/ioat_rawdev_test.c 
b/drivers/raw/ioat/ioat_rawdev_test.c
index 51eebe152f..5f75c6ff69 100644
--- a/drivers/raw/ioat/ioat_rawdev_test.c
+++ b/drivers/raw/ioat/ioat_rawdev_test.c
@@ -277,6 +277,138 @@ test_enqueue_fill(int dev_id)
return 0;
 }
 
+static inline void
+reset_ring_ptrs(int dev_id)
+{
+   enum rte_ioat_dev_type *type =
+   (enum rte_ioat_dev_type *)rte_rawdevs[dev_id].dev_private;
+
+   if (*type == RTE_IDXD_DEV) {
+   struct rte_idxd_rawdev *idxd =
+   (struct rte_idxd_rawdev 
*)rte_rawdevs[dev_id].dev_private;
+
+   idxd->batch_start = 0;
+   idxd->hdls_read = 0;
+   } else {
+   struct rte_ioat_rawdev *ioat =
+   (struct rte_ioat_rawdev 
*)rte_rawdevs[dev_id].dev_private;
+
+   ioat->next_read = 0;
+   ioat->next_write = 0;
+   }
+}
+
+static int
+test_burst_capacity(int dev_id)
+{
+#define BURST_SIZE 64
+   struct rte_mbuf *src, *dst;
+   unsigned int bursts_enqueued = 0;
+   unsigned int i;
+   unsigned int length = 1024;
+   uintptr_t completions[BURST_SIZE];
+
+   /* Ring pointer reset needed for checking test results */
+   reset_ring_ptrs(dev_id);
+
+   const unsigned int ring_space = rte_ioat_burst_capacity(dev_id);
+   const unsigned int expected_bursts = (ring_space)/BURST_SIZE;
+   src = rte_pktmbuf_alloc(pool);
+   dst = rte_pktmbuf_alloc(pool);
+
+   /* Enqueue burst until they won't fit */
+   while (rte_ioat_burst_capacity(dev_id) >= BURST_SIZE) {
+   for (i = 0; i < BURST_SIZE; i++) {
+
+   if (rte_ioat_enqueue_copy(dev_id, rte_pktmbuf_iova(src),
+   rte_pktmbuf_iova(dst), length, 0, 0) != 
1) {
+   PRINT_ERR("Error with rte_ioat_enqueue_copy\n");
+   return -1;
+   }
+   }
+   bursts_enqueued++;
+   if ((i & 1) == 1) /* hit doorbell every second burst */
+   rte_ioat_perform_ops(dev_id);
+   }
+   rte_ioat_perform_ops(dev_id);
+
+   /* check the number of bursts enqueued was as expected */
+   if (bursts_enqueued != expected_bursts) {
+   PRINT_ERR("Capacity test failed, enqueued %u not %u bursts\n",
+   bursts_enqueued, expected_bursts);
+   return -1;
+   }
+
+   /* check the space is now as expected */
+   if (rte_ioat_burst_capacity(dev_id) != ring_space - bursts_enqueued * 
BURST_SIZE) {
+   printf("Capacity error. Expected %u free slots, got %u\n",
+   ring_space - bursts_enqueued * BURST_SIZE,
+   rte_ioat_burst_capacity(dev_id));
+   return -1;
+   }
+
+   /* do cleanup before next tests */
+   usleep(100);
+   for (i = 0; i < bursts_enqueued; i++) {
+   if (rte_ioat_completed_ops(dev_id, BURST_SIZE, completions,
+   completions) != BURST_SIZE) {
+   PRINT_ERR("error with completions\n");
+   return -1;
+   }
+   }
+
+   /* Since we reset the ring pointers before the previous test, and we 
enqueued
+* the max amount of bursts, enqueuing one more burst will enable us to 
test
+* the wrap around handling in rte_ioat_burst_capacity().
+*/
+
+   /* Verify the descriptor ring is empty before we test */
+   if (rte_ioat_burst_capacity(dev_id) != ring_space) {
+   PRINT_ERR("Error, ring should be empty\n");
+   return -1;
+   }
+
+   /* Enqueue one burst of mbufs & verify the expected space is taken */
+   for (i = 0; i < BURST_SIZE; i++) {
+   if (rte_ioat_enqueue_copy(dev_id, rte_pktmbuf_iova(src),
+   rte_pktmbuf_iova(dst), length, 0, 0) != 1) {
+   PRINT_ERR("Error with rte_ioat_enqueue_copy\n");
+   return -1;
+   }
+   }
+
+   /* Perform the copy before checking the capacity again so that the write
+* pointer in the descriptor ring is wrapped/masked
+*/
+   rte_ioat_perform_ops(dev_id);
+   usleep(100);
+
+   /* This check will confirm

[dpdk-dev] [PATCH v2 12/12] raw/ioat: report status of completed jobs

[Bruce Richardson]

Add improved error handling to rte_ioat_completed_ops(). This patch adds
new parameters to the function to enable the user to track the completion
status of each individual operation in a batch. With this addition, the
function can help the user to determine firstly, how many operations may
have failed or been skipped and then secondly, which specific operations
did not complete successfully.

Signed-off-by: Kevin Laatz 
Signed-off-by: Bruce Richardson 
---
 doc/guides/rel_notes/release_21_05.rst |   5 +
 drivers/raw/ioat/ioat_common.c |   9 +
 drivers/raw/ioat/ioat_rawdev_test.c| 300 +++--
 drivers/raw/ioat/rte_idxd_rawdev_fns.h | 146 
 drivers/raw/ioat/rte_ioat_rawdev.h |  53 -
 drivers/raw/ioat/rte_ioat_rawdev_fns.h |  15 +-
 examples/ioat/ioatfwd.c|  14 +-
 examples/vhost/ioat.c  |   2 +-
 8 files changed, 464 insertions(+), 80 deletions(-)

diff --git a/doc/guides/rel_notes/release_21_05.rst 
b/doc/guides/rel_notes/release_21_05.rst
index b3224dc332..7f29f5789f 100644
--- a/doc/guides/rel_notes/release_21_05.rst
+++ b/doc/guides/rel_notes/release_21_05.rst
@@ -329,6 +329,11 @@ API Changes
   ``policer_action_recolor_supported`` and ``policer_action_drop_supported``
   have been removed.
 
+* raw/ioat: The experimental function ``rte_ioat_completed_ops()`` now
+  supports two additional parameters, ``status`` and ``num_unsuccessful``,
+  to allow the reporting of errors from hardware when performing copy
+  operations.
+
 
 ABI Changes
 ---
diff --git a/drivers/raw/ioat/ioat_common.c b/drivers/raw/ioat/ioat_common.c
index fcb30572e6..d01c1ee367 100644
--- a/drivers/raw/ioat/ioat_common.c
+++ b/drivers/raw/ioat/ioat_common.c
@@ -162,6 +162,15 @@ idxd_dev_configure(const struct rte_rawdev *dev,
rte_idxd->desc_ring = NULL;
return -ENOMEM;
}
+   rte_idxd->hdl_ring_flags = rte_zmalloc(NULL,
+   sizeof(*rte_idxd->hdl_ring_flags) * max_desc, 0);
+   if (rte_idxd->hdl_ring_flags == NULL) {
+   rte_free(rte_idxd->desc_ring);
+   rte_free(rte_idxd->hdl_ring);
+   rte_idxd->desc_ring = NULL;
+   rte_idxd->hdl_ring = NULL;
+   return -ENOMEM;
+   }
rte_idxd->hdls_read = rte_idxd->batch_start = 0;
rte_idxd->batch_size = 0;
 
diff --git a/drivers/raw/ioat/ioat_rawdev_test.c 
b/drivers/raw/ioat/ioat_rawdev_test.c
index 5f75c6ff69..d987b560d2 100644
--- a/drivers/raw/ioat/ioat_rawdev_test.c
+++ b/drivers/raw/ioat/ioat_rawdev_test.c
@@ -73,13 +73,15 @@ do_multi_copies(int dev_id, int split_batches, int 
split_completions)
if (split_completions) {
/* gather completions in two halves */
uint16_t half_len = RTE_DIM(srcs) / 2;
-   if (rte_ioat_completed_ops(dev_id, half_len, (void 
*)completed_src,
+   if (rte_ioat_completed_ops(dev_id, half_len, NULL, NULL,
+   (void *)completed_src,
(void *)completed_dst) != half_len) {
PRINT_ERR("Error with rte_ioat_completed_ops - first 
half request\n");
rte_rawdev_dump(dev_id, stdout);
return -1;
}
-   if (rte_ioat_completed_ops(dev_id, half_len, (void 
*)&completed_src[half_len],
+   if (rte_ioat_completed_ops(dev_id, half_len, NULL, NULL,
+   (void *)&completed_src[half_len],
(void *)&completed_dst[half_len]) != half_len) {
PRINT_ERR("Error with rte_ioat_completed_ops - second 
half request\n");
rte_rawdev_dump(dev_id, stdout);
@@ -87,7 +89,8 @@ do_multi_copies(int dev_id, int split_batches, int 
split_completions)
}
} else {
/* gather all completions in one go */
-   if (rte_ioat_completed_ops(dev_id, 64, (void *)completed_src,
+   if (rte_ioat_completed_ops(dev_id, RTE_DIM(completed_src), 
NULL, NULL,
+   (void *)completed_src,
(void *)completed_dst) != RTE_DIM(srcs)) {
PRINT_ERR("Error with rte_ioat_completed_ops\n");
rte_rawdev_dump(dev_id, stdout);
@@ -151,7 +154,7 @@ test_enqueue_copies(int dev_id)
rte_ioat_perform_ops(dev_id);
usleep(10);
 
-   if (rte_ioat_completed_ops(dev_id, 1, (void *)&completed[0],
+   if (rte_ioat_completed_ops(dev_id, 1, NULL, NULL, (void 
*)&completed[0],
(void *)&completed[1]) != 1) {
PRINT_ERR("Error with rte_ioat_completed_ops\n");
return -1;
@@ -170,6 +173,13 @@ test_enqueue_copies(int dev_id)
}
rte_pktmbuf_free(src);
 

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

[Nick Connolly]

The symlink-drivers-solibs.sh script was disabled as part of 'install'
for Windows because there is no support for shell scripts. However,
this means that driver related DLLs are not present in the installed
'libdir' directory. Add a python script to perform the install and use
it for Windows if the version of meson supports using an external
program with add_install_script (>= 0.55.0).

On Windows, symbolic links are somewhat problematic since the
SeCreateSymbolicLinkPrivilege is required to be able to create them.
In addition, different cross-compilation environments handle symbolic
links differently, e.g. WSL, Msys2, Cygwin. Rather than trying to
distinguish these scenarios, the python script will perform a file copy
for any Windows specific names.

On Windows, the shared library outputs have different names depending
upon which toolset has been used to build them. The script currently
handles Clang and GCC.

On Linux the functionality is unchanged, but could be replaced with the
python script once the required minimum version of meson is >= 0.55.0.

Fixes: 5c7d86948764 ("build: fix install on Windows")
Cc: sta...@dpdk.org

Signed-off-by: Nick Connolly 
Tested-by: Narcisa Vasile 
Acked-by: Narcisa Vasile 
---
v3:
* rebase

v2:
* 0.55.0 is required to use external program with add_install_script

 buildtools/symlink-drivers-solibs.py | 49 
 config/meson.build   |  4 +++
 2 files changed, 53 insertions(+)
 create mode 100644 buildtools/symlink-drivers-solibs.py

diff --git a/buildtools/symlink-drivers-solibs.py 
b/buildtools/symlink-drivers-solibs.py
new file mode 100644
index 0..5627ddd9d
--- /dev/null
+++ b/buildtools/symlink-drivers-solibs.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+import os
+import sys
+import glob
+import shutil
+
+# post-install script for meson/ninja builds to symlink the PMDs stored in
+# $libdir/dpdk/pmds-*/ to $libdir. This is needed as some PMDs depend on
+# others, e.g. PCI device PMDs depending on the PCI bus driver.
+
+# parameters to script are paths relative to install prefix:
+# 1. directory for installed regular libs e.g. lib64
+# 2. subdirectory of libdir where the pmds are
+# 3. directory for installed regular binaries e.g. bin
+
+os.chdir(os.environ['MESON_INSTALL_DESTDIR_PREFIX'])
+
+lib_dir = sys.argv[1]
+pmd_subdir = sys.argv[2]
+bin_dir = sys.argv[3]
+pmd_dir = os.path.join(lib_dir, pmd_subdir)
+
+# copy Windows PMDs to avoid any issues with symlinks since the
+# build could be a cross-compilation under WSL, Msys or Cygnus.
+# the filenames are dependent upon the specific toolchain in use.
+
+def copy_pmd_files(pattern, to_dir):
+   for file in glob.glob(os.path.join(pmd_dir, pattern)):
+   to = os.path.join(to_dir, os.path.basename(file))
+   shutil.copy2(file, to)
+   print(to + ' -> ' + file)
+
+copy_pmd_files('*rte_*.dll', bin_dir)
+copy_pmd_files('*rte_*.pdb', bin_dir)
+copy_pmd_files('*rte_*.lib', lib_dir)
+copy_pmd_files('*rte_*.dll.a', lib_dir)
+
+# symlink shared objects
+
+os.chdir(lib_dir)
+for file in glob.glob(os.path.join(pmd_subdir, 'librte_*.so*')):
+   to = os.path.basename(file)
+   if os.path.exists(to):
+   os.remove(to)
+   os.symlink(file, to)
+   print(to + ' -> ' + file)
diff --git a/config/meson.build b/config/meson.build
index 017bb2efb..9e04c4c76 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -59,6 +59,10 @@ eal_pmd_path = join_paths(get_option('prefix'), 
driver_install_path)
 if not is_windows
 meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
 get_option('libdir'), pmd_subdir_opt)
+elif meson.version().version_compare('>=0.55.0')
+# 0.55.0 is required to use external program with add_install_script
+meson.add_install_script(py3, '../buildtools/symlink-drivers-solibs.py',
+get_option('libdir'), pmd_subdir_opt, get_option('bindir'))
 endif
 
 # init disable/enable driver lists that will be populated in different places
-- 
2.25.1

[dpdk-dev] [PATCH 2/2] net/bnxt: fix Rx FIFO pending bit

[Somnath Kotur]

Fix to clear the Rx FIFO while reading the timestamp.
If the Rx FIFO has pending bit set, keep reading to clear it
and return the last valid timestamp instead of unconditionally
returning an error.

Fixes: b11cceb83a34 ("net/bnxt: support timesync")
Cc: sta...@dpdk.org

Signed-off-by: Somnath Kotur 
Reviewed-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt.h|  1 +
 drivers/net/bnxt/bnxt_ethdev.c | 38 ++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index dfdfa9f7a0..8f3ae41911 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -306,6 +306,7 @@ struct rte_flow {
struct bnxt_vnic_info   *vnic;
 };
 
+#define BNXT_PTP_RX_PND_CNT10
 #define BNXT_PTP_FLAGS_PATH_TX 0x0
 #define BNXT_PTP_FLAGS_PATH_RX 0x1
 #define BNXT_PTP_FLAGS_CURRENT_TIME0x2
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index f5d2dc8590..eb81bf3991 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -3388,6 +3388,38 @@ static int bnxt_get_tx_ts(struct bnxt *bp, uint64_t *ts)
return 0;
 }
 
+static int bnxt_clr_rx_ts(struct bnxt *bp, uint64_t *last_ts)
+{
+   struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;
+   struct bnxt_pf_info *pf = bp->pf;
+   uint16_t port_id;
+   int i = 0;
+   uint32_t fifo;
+
+   if (!ptp || (bp->flags & BNXT_FLAG_CHIP_P5))
+   return -EINVAL;
+
+   port_id = pf->port_id;
+   fifo = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 +
+   ptp->rx_mapped_regs[BNXT_PTP_RX_FIFO]));
+   while ((fifo & BNXT_PTP_RX_FIFO_PENDING) && (i < BNXT_PTP_RX_PND_CNT)) {
+   rte_write32(1 << port_id, (uint8_t *)bp->bar0 +
+   ptp->rx_mapped_regs[BNXT_PTP_RX_FIFO_ADV]);
+   fifo = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 +
+   ptp->rx_mapped_regs[BNXT_PTP_RX_FIFO]));
+   *last_ts = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 +
+   ptp->rx_mapped_regs[BNXT_PTP_RX_TS_L]));
+   *last_ts |= (uint64_t)rte_le_to_cpu_32(rte_read32((uint8_t 
*)bp->bar0 +
+   ptp->rx_mapped_regs[BNXT_PTP_RX_TS_H])) 
<< 32;
+   i++;
+   }
+
+   if (i >= BNXT_PTP_RX_PND_CNT)
+   return -EBUSY;
+
+   return 0;
+}
+
 static int bnxt_get_rx_ts(struct bnxt *bp, uint64_t *ts)
 {
struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;
@@ -3406,10 +3438,8 @@ static int bnxt_get_rx_ts(struct bnxt *bp, uint64_t *ts)
 
fifo = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 +
   ptp->rx_mapped_regs[BNXT_PTP_RX_FIFO]));
-   if (fifo & BNXT_PTP_RX_FIFO_PENDING) {
-/* bnxt_clr_rx_ts(bp);   TBD  */
-   return -EBUSY;
-   }
+   if (fifo & BNXT_PTP_RX_FIFO_PENDING)
+   return bnxt_clr_rx_ts(bp, ts);
 
*ts = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 +
ptp->rx_mapped_regs[BNXT_PTP_RX_TS_L]));
-- 
2.28.0.497.g54e85e7

[dpdk-dev] [PATCH 1/2] net/bnxt: refactor multi queue Rx configuration

[Somnath Kotur]

Eliminate separate codepath/handling for single queue
as the multiqueue code path takes care of it as well.
The only difference being the end_grp_id being 1
now instead of 0 for single queue, but that does not matter
for single queue and does not alter any functionality.

Fixes: 6133f207970c ("net/bnxt: add Rx queue create/destroy")

Signed-off-by: Somnath Kotur 
Reviewed-by: Ajit Khaparde 
---
 drivers/net/bnxt/bnxt_rxq.c | 30 --
 1 file changed, 30 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index 2b0d3d4ac7..45e0c3d01c 100644
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -40,35 +40,6 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
 
bp->nr_vnics = 0;
 
-   /* Single queue mode */
-   if (bp->rx_cp_nr_rings < 2) {
-   vnic = &bp->vnic_info[0];
-   if (!vnic) {
-   PMD_DRV_LOG(ERR, "VNIC alloc failed\n");
-   rc = -ENOMEM;
-   goto err_out;
-   }
-   vnic->flags |= BNXT_VNIC_INFO_BCAST;
-   bp->nr_vnics++;
-
-   rxq = bp->eth_dev->data->rx_queues[0];
-   rxq->vnic = vnic;
-
-   vnic->func_default = true;
-   vnic->start_grp_id = 0;
-   vnic->end_grp_id = vnic->start_grp_id;
-   filter = bnxt_alloc_filter(bp);
-   if (!filter) {
-   PMD_DRV_LOG(ERR, "L2 filter alloc failed\n");
-   rc = -ENOMEM;
-   goto err_out;
-   }
-   filter->mac_index = 0;
-   filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_OUTERMOST;
-   STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
-   goto out;
-   }
-
/* Multi-queue mode */
if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_VMDQ_DCB_RSS) {
/* VMDq ONLY, VMDq+RSS, VMDq+DCB, VMDq+DCB+RSS */
@@ -163,7 +134,6 @@ int bnxt_mq_rx_configure(struct bnxt *bp)
end_grp_id += nb_q_per_grp;
}
 
-out:
bp->rx_num_qs_per_vnic = nb_q_per_grp;
 
if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
-- 
2.28.0.497.g54e85e7

Re: [dpdk-dev] [PATCH v1 2/2] event/octeontx2: configure crypto adapter xaq pool

[Pavan Nikhilesh Bhagavatula]

>-Original Message-
>From: Shijith Thotton 
>Sent: Friday, April 16, 2021 12:40 AM
>To: dev@dpdk.org
>Cc: Shijith Thotton ; Jerin Jacob Kollanukkaran
>; Akhil Goyal ; Anoob
>Joseph ; Ankur Dwivedi
>; Pavan Nikhilesh Bhagavatula
>
>Subject: [PATCH v1 2/2] event/octeontx2: configure crypto adapter xaq
>pool
>
>Configure xaq pool based on number of in-use crypto queues to avoid
>CPT
>add work failure due to xaq buffer run out. This patch configures
>OTX2_CPT_DEFAULT_CMD_QLEN number of xae entries per queue
>pair.
>
>Fixes: 29768f78d5a7 ("event/octeontx2: add crypto adapter
>framework")
>
>Signed-off-by: Shijith Thotton 
>---
> drivers/event/octeontx2/otx2_evdev_adptr.c| 2 +-
> drivers/event/octeontx2/otx2_evdev_crypto_adptr.c | 8 
> 2 files changed, 9 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/event/octeontx2/otx2_evdev_adptr.c
>b/drivers/event/octeontx2/otx2_evdev_adptr.c
>index d69f269df..d85c3665c 100644
>--- a/drivers/event/octeontx2/otx2_evdev_adptr.c
>+++ b/drivers/event/octeontx2/otx2_evdev_adptr.c
>@@ -1,5 +1,5 @@
> /* SPDX-License-Identifier: BSD-3-Clause
>- * Copyright(C) 2019 Marvell International Ltd.
>+ * Copyright(C) 2019-2021 Marvell.
>  */
>
> #include "otx2_evdev.h"
>diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
>b/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
>index 3a96b2e34..79a6d5577 100644
>--- a/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
>+++ b/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
>@@ -88,6 +88,14 @@ otx2_ca_qp_add(const struct rte_eventdev
>*dev, const struct rte_cryptodev *cdev,
>   sso_evdev->rx_offloads |= NIX_RX_OFFLOAD_SECURITY_F;
>   sso_fastpath_fns_set((struct rte_eventdev *)(uintptr_t)dev);
>
>+  /* Update crypto adapter xae count */
>+  if (queue_pair_id == -1)
>+  sso_evdev->adptr_xae_cnt =
>+  vf->nb_queues *
>OTX2_CPT_DEFAULT_CMD_QLEN;

This should be sso_evdev->adaptr_xae_cnt += (vf->nb_queues * 
OTX2_CPT_DEFAULT_CMD_QLEN);

>+  else
>+  sso_evdev->adptr_xae_cnt +=
>OTX2_CPT_DEFAULT_CMD_QLEN;
>+  sso_xae_reconfigure((struct rte_eventdev *)(uintptr_t)dev);
>+
>   return 0;
> }
>
>--
>2.25.1

With above changes
Acked-by: Pavan Nikhilesh 

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

[Ferruh Yigit]

On 4/23/2021 11:17 AM, Ferruh Yigit wrote:

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

From: Chengwen Feng 

This patch adds checking for rte_kni_init() result.

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

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


Acked-by: Ferruh Yigit 


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

Re: [dpdk-dev] [PATCH] net/txgbe: fix memset type error

[Ferruh Yigit]

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

From: HongBo Zheng 

Fix memset type error in function txgbe_parse_rss_filter
while clear rss_conf buffer.

Fixes: 7a6d87fb8398 ("net/txgbe: parse RSS filter")
Cc: sta...@dpdk.org

Signed-off-by: HongBo Zheng 
Signed-off-by: Min Hu (Connor) 


Reviewed-by: Ferruh Yigit 

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

Re: [dpdk-dev] [PATCH] net/txgbe: fix param misusage when set rte flow error

[Ferruh Yigit]

On 4/21/2021 7:31 AM, Min Hu (Connor) wrote:

From: Chengwen Feng 

This patch fixes parameter misusage when set rte flow action error.

Fixes: b7eeecb17556 ("net/txgbe: parse n-tuple filter")
Cc: sta...@dpdk.org

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


Reviewed-by: Ferruh Yigit 

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

[dpdk-dev] [PATCH v2 1/2] devtools: script to check meson indentation of lists

[Bruce Richardson]

This is a script to fix up minor formatting issues in meson files.
It scans for, and can optionally fix, indentation issues and missing
trailing commas in the lists in meson.build files. It also detects,
and can fix, multi-line lists where more than one entry appears on a
line.

Signed-off-by: Bruce Richardson 
---
 devtools/dpdk_meson_check.py | 125 +++
 1 file changed, 125 insertions(+)
 create mode 100755 devtools/dpdk_meson_check.py

diff --git a/devtools/dpdk_meson_check.py b/devtools/dpdk_meson_check.py
new file mode 100755
index 0..29f788796
--- /dev/null
+++ b/devtools/dpdk_meson_check.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+
+'''
+A Python script to run some checks on meson.build files in DPDK
+'''
+
+import sys
+import os
+from os.path import relpath, join
+from argparse import ArgumentParser
+
+VERBOSE = False
+
+
+def scan_dir(path):
+'''return meson.build files found in path'''
+for root, dirs, files in os.walk(path):
+if 'meson.build' in files:
+yield(relpath(join(root, 'meson.build')))
+
+
+def split_code_comments(line):
+'splits a line into a code part and a comment part, returns (code, 
comment) tuple'
+if line.lstrip().startswith('#'):
+return ('', line)
+elif '#' in line and '#include' not in line:  # catch 99% of cases, not 
100%
+idx = line.index('#')
+while (line[idx - 1].isspace()):
+idx -= 1
+return line[:idx], line[idx:]
+else:
+return (line, '')
+
+
+def setline(contents, index, value):
+'sets the contents[index] to value. Returns the line, along with code and 
comments part'
+line = contents[index] = value
+code, comments = split_code_comments(line)
+return line, code, comments
+
+
+def check_indentation(filename, contents):
+'''check that a list or files() is correctly indented'''
+infiles = False
+inlist = False
+edit_count = 0
+for lineno, line in enumerate(contents):
+code, comments = split_code_comments(line)
+if not code.strip():
+continue
+if code.endswith('files('):
+if infiles:
+raise(f'Error parsing {filename}:{lineno}, got "files(" when 
already parsing files list')
+if inlist:
+print(f'Error parsing {filename}:{lineno}, got "files(" when 
already parsing array list')
+infiles = True
+indent_count = len(code) - len(code.lstrip(' '))
+indent = ' ' * (indent_count + 8)  # double indent required
+elif code.endswith('= ['):
+if infiles:
+raise(f'Error parsing {filename}:{lineno}, got start of array 
when already parsing files list')
+if inlist:
+print(f'Error parsing {filename}:{lineno}, got start of array 
when already parsing array list')
+inlist = True
+indent_count = len(code) - len(code.lstrip(' '))
+indent = ' ' * (indent_count + 8)  # double indent required
+elif infiles and (code.endswith(')') or code.strip().startswith(')')):
+infiles = False
+continue
+elif inlist and (code.endswith(']') or code.strip().startswith(']')):
+inlist = False
+continue
+elif inlist or infiles:
+# skip further subarrays or lists
+if '[' in code or ']' in code:
+continue
+if not code.startswith(indent) or code[len(indent)] == ' ':
+print(f'Error: Incorrect indent at {filename}:{lineno + 1}')
+line, code, comments = setline(contents, lineno, indent + 
line.strip())
+edit_count += 1
+if not code.endswith(','):
+print(f'Error: Missing trailing "," in list at 
{filename}:{lineno + 1}')
+line, code, comments = setline(contents, lineno, code + ',' + 
comments)
+edit_count += 1
+if len(code.split(',')) > 2:  # only one comma per line
+print(f'Error: multiple entries per line in list at 
{filename}:{lineno +1}')
+entries = [e.strip() for e in code.split(',') if e.strip()]
+line, code, comments = setline(contents, lineno,
+   indent + (',\n' + 
indent).join(entries) +
+   ',' + comments)
+edit_count += 1
+return edit_count
+
+
+def process_file(filename, fix):
+'''run checks on file "filename"'''
+if VERBOSE:
+print(f'Processing {filename}')
+with open(filename) as f:
+contents = [ln.rstrip() for ln in f.readlines()]
+
+if check_indentation(filename, contents) > 0 and fix:
+print(f"Fixing {filename}")
+with open(filename, 'w') as f:
+f.writelines([f'{ln}\n' for ln in c

[dpdk-dev] [PATCH v2 2/2] build: style fixup on meson files

[Bruce Richardson]

Running "./devtools/dpdk_meson_check.py --fix" on the DPDK repo fixes a
number of issues with whitespace and formatting of files:

* indentation of lists
* missing trailing commas on final list element
* multiple list entries per line when list is not all single-line

Signed-off-by: Bruce Richardson 
---
 app/test-eventdev/meson.build |  2 +-
 config/x86/meson.build| 24 +--
 drivers/bus/fslmc/meson.build |  2 +-
 drivers/common/mlx5/meson.build   |  2 +-
 drivers/common/sfc_efx/base/meson.build   |  2 +-
 drivers/common/sfc_efx/meson.build|  4 ++--
 drivers/compress/mlx5/meson.build |  2 +-
 drivers/crypto/bcmfs/meson.build  |  2 +-
 drivers/crypto/nitrox/meson.build |  2 +-
 drivers/crypto/qat/meson.build|  2 +-
 drivers/net/e1000/base/meson.build|  2 +-
 drivers/net/fm10k/base/meson.build|  2 +-
 drivers/net/i40e/base/meson.build |  2 +-
 drivers/net/ixgbe/base/meson.build|  2 +-
 drivers/net/octeontx/base/meson.build |  2 +-
 drivers/net/sfc/meson.build   |  4 ++--
 drivers/net/thunderx/base/meson.build |  2 +-
 drivers/raw/skeleton/meson.build  |  2 +-
 examples/l3fwd/meson.build| 14 +--
 .../client_server_mp/mp_client/meson.build|  2 +-
 .../client_server_mp/mp_server/meson.build|  4 +++-
 examples/multi_process/hotplug_mp/meson.build |  3 ++-
 examples/multi_process/simple_mp/meson.build  |  3 ++-
 .../multi_process/symmetric_mp/meson.build|  2 +-
 lib/mbuf/meson.build  |  2 +-
 lib/meson.build   |  6 ++---
 lib/power/meson.build |  2 +-
 lib/table/meson.build |  2 +-
 28 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/app/test-eventdev/meson.build b/app/test-eventdev/meson.build
index 04117dbe4..45c3ff456 100644
--- a/app/test-eventdev/meson.build
+++ b/app/test-eventdev/meson.build
@@ -14,6 +14,6 @@ sources = files(
 'test_perf_queue.c',
 'test_pipeline_atq.c',
 'test_pipeline_common.c',
-'test_pipeline_queue.c'
+'test_pipeline_queue.c',
 )
 deps += 'eventdev'
diff --git a/config/x86/meson.build b/config/x86/meson.build
index 34b116481..b9348c44d 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -22,18 +22,18 @@ foreach f:base_flags
 endforeach
 
 optional_flags = [
-'AES',
-'AVX',
-'AVX2',
-'AVX512BW',
-'AVX512CD',
-'AVX512DQ',
-'AVX512F',
-'AVX512VL',
-'PCLMUL',
-'RDRND',
-'RDSEED',
-'VPCLMULQDQ',
+'AES',
+'AVX',
+'AVX2',
+'AVX512BW',
+'AVX512CD',
+'AVX512DQ',
+'AVX512F',
+'AVX512VL',
+'PCLMUL',
+'RDRND',
+'RDSEED',
+'VPCLMULQDQ',
 ]
 foreach f:optional_flags
 if cc.get_define('__@0@__'.format(f), args: machine_args) == '1'
diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build
index e99218ca7..54be76f51 100644
--- a/drivers/bus/fslmc/meson.build
+++ b/drivers/bus/fslmc/meson.build
@@ -21,7 +21,7 @@ sources = files(
 'portal/dpaa2_hw_dpci.c',
 'portal/dpaa2_hw_dpio.c',
 'qbman/qbman_portal.c',
-'qbman/qbman_debug.c'
+'qbman/qbman_debug.c',
 )
 
 includes += include_directories('mc', 'qbman/include', 'portal')
diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
index b5585d2cc..e78b4f47b 100644
--- a/drivers/common/mlx5/meson.build
+++ b/drivers/common/mlx5/meson.build
@@ -23,7 +23,7 @@ cflags_options = [
 '-Wno-strict-prototypes',
 '-D_BSD_SOURCE',
 '-D_DEFAULT_SOURCE',
-'-D_XOPEN_SOURCE=600'
+'-D_XOPEN_SOURCE=600',
 ]
 foreach option:cflags_options
 if cc.has_argument(option)
diff --git a/drivers/common/sfc_efx/base/meson.build 
b/drivers/common/sfc_efx/base/meson.build
index 313e53d77..9fba47b1c 100644
--- a/drivers/common/sfc_efx/base/meson.build
+++ b/drivers/common/sfc_efx/base/meson.build
@@ -70,7 +70,7 @@ extra_flags = [
 '-Wno-unused-parameter',
 '-Wno-unused-variable',
 '-Wno-empty-body',
-'-Wno-unused-but-set-variable'
+'-Wno-unused-but-set-variable',
 ]
 
 c_args = cflags
diff --git a/drivers/common/sfc_efx/meson.build 
b/drivers/common/sfc_efx/meson.build
index d87ba396b..f42ccf609 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -19,13 +19,13 @@ extra_flags = []
 
 # Enable more warnings
 extra_flags += [
-'-Wdisabled-optimization'
+'-Wdisabled-optimization',
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
 '-Waggregate-return',
-'-Wbad-function-cast'
+'-Wbad-function-cast',
 ]
 
 foreach flag: extra_flags
diff --git a/drivers

Re: [dpdk-dev] [PATCH 4/4] examples/l3fwd: make data struct to be memory efficient

[Walsh, Conor]

> >> There are some holes in data struct lcore_conf. The holes are
> >> due to alignment requirement.
> >>
> >> For struct lcore_rx_queue, there is no need to make every element
> >> of this type to be cache line aligned, because the data is not
> >> shared between cores.
> >>
> >> Member len of struct mbuf_table can be moved out. So data can be
> >> packed and there will be no need to load an extra cache line when
> >> mbuf table is empty.
> >>
> >> The change showed slight performance improvement on N1SDP platform.
> >>
> >> Suggested-by: Honnappa Nagarahalli 
> >>
> >> Signed-off-by: Ruifeng Wang 
> > This change alone is OK in the octeontx2 platform.(No difference in
> performance)
> > combining with 3/4 shows some regression. Probably is due to prefetch
> > or 128B cache line tuning specifics.
> 
> We checked it on Layerscape LS2088A platform. No difference for 1-2 core
> case. However observing ~2% regression for 4-8 cores.
> 
> Regards,
> 
> Hemant
> 

Hi Ruifeng,

l3fwd will no longer build with this patch as you have changed a struct used by 
the FIB lookup method.
This patch will need to be updated to also update the FIB lookup method as you 
have done with EM and LPM.

Thanks,
Conor.

Re: [dpdk-dev] [PATCH] drivers: fix indentation in build files

[Bruce Richardson]

On Thu, Apr 22, 2021 at 11:20:19AM +0200, Thomas Monjalon wrote:
> 22/04/2021 10:39, Bruce Richardson:
> > On Thu, Apr 22, 2021 at 12:03:57AM +0200, Thomas Monjalon wrote:
> > > A couple of mistakes slipped in the mass change.
> > > 
> > > More mistakes could happen, especially when rebasing pending patches, so
> > > we need an automatic check.
> > >
> > I have a partially-done script from when I was doing the original
> > reindenting work, which I'll clean up a little and send on shortly.
> > 
> > It only checks indent of lists and I'm extending it to check for trailing
> > commas, but it may serve as a basis for further checks. On the plus side,
> > it does automatic fixing of those issues though. Running it will probably
> > show up more minor misses, so I'd suggest holding off on this patch until
> > then.
> 
> OK, I've sent this patch just for remembering.
> I am happy to leave it to you for a v2 :)
> Feel free to change the author of course.
> 
> Note: I've found tabs with this simple grep:
>   git grep ' ' '**/meson.build'
> The tab is inserted with ^V-tab.
> 
I've included fixes for these issues in V2 set of the python script to
check for them.

http://patches.dpdk.org/project/dpdk/patch/20210426105403.226004-2-bruce.richard...@intel.com/

Re: [dpdk-dev] [PATCH] app/testpmd: fix division by zero bug

[Ferruh Yigit]

On 4/21/2021 12:38 PM, Min Hu (Connor) wrote:

Variable total, which may be zero and result in segmentation fault.

This patch fixed it.

Fixes: 9b1249d9ff69 ("app/testpmd: support dumping socket memory")
Cc: sta...@dpdk.org

Signed-off-by: Min Hu (Connor) 
---
  app/test-pmd/cmdline.c | 3 +++
  1 file changed, 3 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 08da2b1..cde0a00 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -9631,6 +9631,9 @@ dump_socket_mem(FILE *f)
socket_stats.alloc_count,
socket_stats.free_count);
}
+
+   if (total == 0)
+   return;
fprintf(f,
"Total   : size(M) total: %.6lf alloc: %.6lf(%.3lf%%) free: %.6lf 
\tcount alloc: %-4u free: %u\n",
(double)total / (1024 * 1024), (double)alloc / (1024 * 1024),



Hi Connor,

Not sure if the value can be zero on practice, but if the issue is found via 
static analyzer tool, instead of return from function without any output what 
about following instead:


 -   (double)alloc * 100 / (double)total,
 +   total ? ((double)alloc * 100 / (double)total) : 0,

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

[Li, Xiaoyun]

Hi

> -Original Message-
> From: Yigit, Ferruh 
> Sent: Saturday, April 24, 2021 00:10
> To: Viacheslav Ovsiienko ; Li, Xiaoyun
> ; Wei Hu (Xavier) ;
> Chengchang Tang 
> Cc: Yigit, Ferruh ; dev@dpdk.org; sta...@dpdk.org;
> Andrew Boyer 
> Subject: [PATCH v2] app/testpmd: fix segment number check
> 
> From: Viacheslav Ovsiienko 
> 
> The --txpkts command line parameter was silently ignored due to application
> was unable to check the Tx queue ring sizes for non configured ports [1].

Remove this [1] or mark the following items as [1] [2] [3].

> 
> The "set txpkts " was also rejected if there was some stopped or
> /unconfigured port.
> 
> This provides the following:
> 
>   - If fails to get ring size from the port, this can be because port is
> not initialized yet, ignore the check and just be sure segment size
> won't cause an out of bound access. The port descriptor check will
> be done during Tx setup.
> 
>   - The capability to send single packet is supposed to be very basic
> and always supported, the setting segment number to 1 is always
> allowed, no check performed
> 
>   - At the moment of Tx queue setup the descriptor number is checked
> against configured segment number
> 
> Bugzilla ID: 584
> Fixes: 8dae835d88b7 ("app/testpmd: remove restriction on Tx segments set")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Viacheslav Ovsiienko 
> Signed-off-by: Ferruh Yigit 
> ---
> Cc: Andrew Boyer 
> 
> v2:
> * Become more flexible for the '--txpkts' command line, if not able to
>   get the descriptor size from port, ignore the check.
> 
>   ('nb_txd' check was proposed before, this will require '--txd'
>   parameter, but also enforces a specific order on the parameters,
>   instead going with the option to flex the checks for parameter.)
> ---
>  app/test-pmd/cmdline.c |  4 
>  app/test-pmd/config.c  | 32 
>  2 files changed, 28 insertions(+), 8 deletions(-)

Except the one comment above for commit log,
Acked-by: Xiaoyun Li 

[dpdk-dev] [Bug 689] RTE bus list not populated causing EAL: failed to parse device "XX:XX.X" on CentOS 7

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=689

Bug ID: 689
   Summary: RTE bus list not populated causing EAL: failed to
parse device "XX:XX.X" on CentOS 7
   Product: DPDK
   Version: 20.11
  Hardware: x86
OS: Linux
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: core
  Assignee: dev@dpdk.org
  Reporter: szymon.mikul...@nokia.com
  Target Milestone: ---

On our CI setup we build DPDK on CentOS 7
There are no problems with compilation, we are able to compile it and our
application. However when starting EAL: (rte_eal_init())


"./app -l 2-5 --file-prefix 04:00.0 -a 04:00.0
EAL: Detected 24 lcore(s)
EAL: Detected 2 NUMA nodes
EAL: Detected static linkage of DPDK
EAL: failed to parse device "04:00.0"
EAL: Unable to parse device '04:00.0'
Cant init EAL"


I've traced it back to PCI bus list being empty, none of the buses are
registered for some reason. I am not sure how the buses are supposed to be
registered with all the macro RTE_INIT_PRIO magic happening so I stopped there.

The output from meson doesn't seem to be any different on the CentOS machine to
more modern systems where everything works as expected

Do you have any idea what might be happening and how to continue debugging?

I've found that testpmd works ./dpdk-testpmd -l 2-5 --file-prefix 04:00.0 -a
04:00.0

-- 
You are receiving this mail because:
You are the assignee for the bug.

[dpdk-dev] [PATCH v2] app/testpmd: fix division by zero bug

[Min Hu (Connor)]

Variable total, which may be zero and result in segmentation fault.

This patch fixed it.

Fixes: 9b1249d9ff69 ("app/testpmd: support dumping socket memory")
Cc: sta...@dpdk.org

Signed-off-by: Min Hu (Connor) 
---
 app/test-pmd/cmdline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 12efbc0..51d789e 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -9727,7 +9727,7 @@ dump_socket_mem(FILE *f)
fprintf(f,
"Total   : size(M) total: %.6lf alloc: %.6lf(%.3lf%%) free: 
%.6lf \tcount alloc: %-4u free: %u\n",
(double)total / (1024 * 1024), (double)alloc / (1024 * 1024),
-   (double)alloc * 100 / (double)total,
+   total ? ((double)alloc * 100 / (double)total) : 0,
(double)free / (1024 * 1024),
n_alloc, n_free);
if (last_allocs)
-- 
2.7.4

Re: [dpdk-dev] [PATCH] app/testpmd: fix division by zero bug

[Min Hu (Connor)]

在 2021/4/21 19:38, Min Hu (Connor) 写道:

Variable total, which may be zero and result in segmentation fault.

This patch fixed it.

Fixes: 9b1249d9ff69 ("app/testpmd: support dumping socket memory")
Cc: sta...@dpdk.org

Signed-off-by: Min Hu (Connor) 
---
  app/test-pmd/cmdline.c | 3 +++
  1 file changed, 3 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 08da2b1..cde0a00 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -9631,6 +9631,9 @@ dump_socket_mem(FILE *f)
socket_stats.alloc_count,
socket_stats.free_count);
}
+
+   if (total == 0)
+   return;
fprintf(f,
"Total   : size(M) total: %.6lf alloc: %.6lf(%.3lf%%) free: %.6lf 
\tcount alloc: %-4u free: %u\n",
(double)total / (1024 * 1024), (double)alloc / (1024 * 1024),


Agreed, fixed in v2, thanks.

Re: [dpdk-dev] [dpdk-stable] [PATCH] drivers/net: fix FW version get

[Ferruh Yigit]

On 4/23/2021 3:19 AM, Jiawen Wu wrote:
> On April 22, 2021 12:21 AM, Ferruh Yigit wrote:
>> Fixes a few different things:
>> * Remove 'fw_version' NULL checks, it is allowed if the 'fw_size' is
>>   zero, 'fw_version' being NULL but 'fw_size' not zero condition checked
>>   in ethdev layer
>> * Be sure required buffer size is returned if provided one is not big
>>   enough, instead of returning success (0)
>> * Document in doxygen comment the '-EINVAL' is a valid return type
>> * Take into account that 'snprintf' can return negative value
>> * Cast length to 'size_t' to compare it with 'fw_size'
>>
>> Fixes: bb42aa9ffe4e ("net/atlantic: configure device start/stop")
>> Fixes: ff70acdf4299 ("net/axgbe: support reading FW version")
>> Fixes: e2652b0a20a0 ("net/bnxt: support get FW version")
>> Fixes: cf0fab1d2ca5 ("net/dpaa: support firmware version get API")
>> Fixes: 748eccb97cdc ("net/dpaa2: add support for firmware version 
>> get")
>> Fixes: b883c0644a24 ("net/e1000: add firmware version get")
>> Fixes: 293430677e9c ("net/enic: add handler to return firmware 
>> version")
>> Fixes: 1f5ca0b460cd ("net/hns3: support some device operations")
>> Fixes: bd5b86732bc7 ("net/hns3: modify format for firmware version")
>> Fixes: ed0dfdd0e976 ("net/i40e: add firmware version get")
>> Fixes: e31cb9a36298 ("net/ice: support FW version getting")
>> Fixes: 4f09bc55ac3d ("net/igc: implement device base operations")
>> Fixes: eec10fb0ce6b ("net/ionic: support FW version")
>> Fixes: 8b0b56574269 ("net/ixgbe: add firmware version get")
>> Fixes: 4d9f5b8adc02 ("net/octeontx2: add FW version get operation")
>> Fixes: f97b56f9f12e ("net/qede: support FW version query")
>> Fixes: 83fef46a22b2 ("net/sfc: add callback to retrieve FW version")
>> Fixes: bc84ac0fadef ("net/txgbe: support getting FW version")
>> Fixes: 21913471202f ("ethdev: add firmware version get")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: Ferruh Yigit 
> 
> <...>
> 
> 
> For txgbe,
> Acked-by: Jiawen Wu 
> 

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

[dpdk-dev] [PATCH v2 0/2] event/octeontx2: fixes for crypto adapter

[Shijith Thotton]

Fixes for OCTEON TX2 crypto adapter implementation.

v2:
- Fixed adapter xae count updation.

Shijith Thotton (2):
  event/octeontx2: fix crypto adapter queue pair ops
  event/octeontx2: configure crypto adapter xaq pool

 drivers/crypto/octeontx2/otx2_cryptodev_qp.h  |   4 +-
 drivers/event/octeontx2/otx2_evdev_adptr.c|   2 +-
 .../event/octeontx2/otx2_evdev_crypto_adptr.c | 110 +-
 3 files changed, 84 insertions(+), 32 deletions(-)

-- 
2.25.1

[dpdk-dev] [PATCH v2 1/2] event/octeontx2: fix crypto adapter queue pair ops

[Shijith Thotton]

Parameter queue_pair_id of crypto adapter queue pair add/del operation
can be -1 to select all pre configured crypto queue pairs. Added support
for the same in driver. Also added a member in cpt qp structure to
indicate binding state of a queue pair to an event queue.

Fixes: 29768f78d5a7 ("event/octeontx2: add crypto adapter framework")

Signed-off-by: Shijith Thotton 
---
 drivers/crypto/octeontx2/otx2_cryptodev_qp.h  |   4 +-
 .../event/octeontx2/otx2_evdev_crypto_adptr.c | 102 --
 2 files changed, 75 insertions(+), 31 deletions(-)

diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_qp.h 
b/drivers/crypto/octeontx2/otx2_cryptodev_qp.h
index 189fa3db4..95bce3621 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_qp.h
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_qp.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020 Marvell International Ltd.
+ * Copyright (C) 2020-2021 Marvell.
  */
 
 #ifndef _OTX2_CRYPTODEV_QP_H_
@@ -39,6 +39,8 @@ struct otx2_cpt_qp {
 */
uint8_t ca_enable;
/**< Set when queue pair is added to crypto adapter */
+   uint8_t qp_ev_bind;
+   /**< Set when queue pair is bound to event queue */
 };
 
 #endif /* _OTX2_CRYPTODEV_QP_H_ */
diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c 
b/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
index 2c9b347f0..ed600a659 100644
--- a/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
+++ b/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
@@ -1,10 +1,11 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020 Marvell International Ltd.
+ * Copyright (C) 2020-2021 Marvell.
  */
 
 #include 
 #include 
 
+#include "otx2_cryptodev.h"
 #include "otx2_cryptodev_hw_access.h"
 #include "otx2_cryptodev_qp.h"
 #include "otx2_cryptodev_mbox.h"
@@ -24,30 +25,66 @@ otx2_ca_caps_get(const struct rte_eventdev *dev,
return 0;
 }
 
-int
-otx2_ca_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev 
*cdev,
-   int32_t queue_pair_id, const struct rte_event *event)
+static int
+otx2_ca_qp_sso_link(const struct rte_cryptodev *cdev, struct otx2_cpt_qp *qp,
+   uint16_t sso_pf_func)
 {
-   struct otx2_sso_evdev *sso_evdev = sso_pmd_priv(dev);
union otx2_cpt_af_lf_ctl2 af_lf_ctl2;
-   struct otx2_cpt_qp *qp;
int ret;
 
-   qp = cdev->data->queue_pairs[queue_pair_id];
-
-   qp->ca_enable = 1;
-   rte_memcpy(&qp->ev, event, sizeof(struct rte_event));
-
ret = otx2_cpt_af_reg_read(cdev, OTX2_CPT_AF_LF_CTL2(qp->id),
-   qp->blkaddr, &af_lf_ctl2.u);
+  qp->blkaddr, &af_lf_ctl2.u);
if (ret)
return ret;
 
-   af_lf_ctl2.s.sso_pf_func = otx2_sso_pf_func_get();
+   af_lf_ctl2.s.sso_pf_func = sso_pf_func;
ret = otx2_cpt_af_reg_write(cdev, OTX2_CPT_AF_LF_CTL2(qp->id),
-   qp->blkaddr, af_lf_ctl2.u);
-   if (ret)
-   return ret;
+   qp->blkaddr, af_lf_ctl2.u);
+   return ret;
+}
+
+static void
+otx2_ca_qp_init(struct otx2_cpt_qp *qp, const struct rte_event *event)
+{
+   if (event) {
+   qp->qp_ev_bind = 1;
+   rte_memcpy(&qp->ev, event, sizeof(struct rte_event));
+   } else {
+   qp->qp_ev_bind = 0;
+   }
+   qp->ca_enable = 1;
+}
+
+int
+otx2_ca_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev 
*cdev,
+   int32_t queue_pair_id, const struct rte_event *event)
+{
+   struct otx2_sso_evdev *sso_evdev = sso_pmd_priv(dev);
+   struct otx2_cpt_vf *vf = cdev->data->dev_private;
+   uint16_t sso_pf_func = otx2_sso_pf_func_get();
+   struct otx2_cpt_qp *qp;
+   uint8_t qp_id;
+   int ret;
+
+   if (queue_pair_id == -1) {
+   for (qp_id = 0; qp_id < vf->nb_queues; qp_id++) {
+   qp = cdev->data->queue_pairs[qp_id];
+   ret = otx2_ca_qp_sso_link(cdev, qp, sso_pf_func);
+   if (ret) {
+   uint8_t qp_tmp;
+   for (qp_tmp = 0; qp_tmp < qp_id; qp_tmp++)
+   otx2_ca_qp_del(dev, cdev, qp_tmp);
+   return ret;
+   }
+   otx2_ca_qp_init(qp, event);
+   }
+   } else {
+   qp = cdev->data->queue_pairs[queue_pair_id];
+   ret = otx2_ca_qp_sso_link(cdev, qp, sso_pf_func);
+   if (ret)
+   return ret;
+   otx2_ca_qp_init(qp, event);
+   }
 
sso_evdev->rx_offloads |= NIX_RX_OFFLOAD_SECURITY_F;
sso_fastpath_fns_set((struct rte_eventdev *)(uintptr_t)dev);
@@ -59,24 +96,29 @@ int
 otx2_ca_qp_del(const struct rte_eventdev *dev, const struct rte_cryptodev 
*cdev,
int32_t queue_pair_id)
 {
-   union

[dpdk-dev] [PATCH v2 2/2] event/octeontx2: configure crypto adapter xaq pool

[Shijith Thotton]

Configure xaq pool based on number of in-use crypto queues to avoid CPT
add work failure due to xaq buffer run out. This patch configures
OTX2_CPT_DEFAULT_CMD_QLEN number of xae entries per queue pair.

Fixes: 29768f78d5a7 ("event/octeontx2: add crypto adapter framework")

Signed-off-by: Shijith Thotton 
Acked-by: Pavan Nikhilesh 
---
 drivers/event/octeontx2/otx2_evdev_adptr.c| 2 +-
 drivers/event/octeontx2/otx2_evdev_crypto_adptr.c | 8 
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/event/octeontx2/otx2_evdev_adptr.c 
b/drivers/event/octeontx2/otx2_evdev_adptr.c
index d69f269df..d85c3665c 100644
--- a/drivers/event/octeontx2/otx2_evdev_adptr.c
+++ b/drivers/event/octeontx2/otx2_evdev_adptr.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
+ * Copyright(C) 2019-2021 Marvell.
  */
 
 #include "otx2_evdev.h"
diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c 
b/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
index ed600a659..d9a002625 100644
--- a/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
+++ b/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
@@ -89,6 +89,14 @@ otx2_ca_qp_add(const struct rte_eventdev *dev, const struct 
rte_cryptodev *cdev,
sso_evdev->rx_offloads |= NIX_RX_OFFLOAD_SECURITY_F;
sso_fastpath_fns_set((struct rte_eventdev *)(uintptr_t)dev);
 
+   /* Update crypto adapter xae count */
+   if (queue_pair_id == -1)
+   sso_evdev->adptr_xae_cnt +=
+   vf->nb_queues * OTX2_CPT_DEFAULT_CMD_QLEN;
+   else
+   sso_evdev->adptr_xae_cnt += OTX2_CPT_DEFAULT_CMD_QLEN;
+   sso_xae_reconfigure((struct rte_eventdev *)(uintptr_t)dev);
+
return 0;
 }
 
-- 
2.25.1

Re: [dpdk-dev] [PATCH 3/4] net/hns3: fix parse link fails code fail

[Ferruh Yigit]

On 4/22/2021 2:55 AM, Min Hu (Connor) wrote:
> From: Chengwen Feng 
> 
> The link fails code should be parsed using the structure
> hns3_mbx_vf_to_pf_cmd, else it will parse fail.
> 
> Fixes: 109e4dd1bd7a ("net/hns3: get link state change through mailbox")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Chengwen Feng 
> Signed-off-by: Min Hu (Connor) 
> ---
>  drivers/net/hns3/hns3_mbx.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c
> index ba04ac9..0550c9a 100644
> --- a/drivers/net/hns3/hns3_mbx.c
> +++ b/drivers/net/hns3/hns3_mbx.c
> @@ -346,12 +346,13 @@ hns3_link_fail_parse(struct hns3_hw *hw, uint8_t 
> link_fail_code)
>  }
>  
>  static void
> -hns3pf_handle_link_change_event(struct hns3_hw *hw,
> -   struct hns3_mbx_pf_to_vf_cmd *req)
> +hns3pf_handle_link_change_event(struct hns3_hw *hw, void *data)

Why not s/struct hns3_mbx_pf_to_vf_cmd/struct hns3_mbx_vf_to_pf_cmd/ but change
to parameter to "void *", wouldn't it reduce the type check?

>  {
>  #define LINK_STATUS_OFFSET 1
>  #define LINK_FAIL_CODE_OFFSET  2
>  
> + struct hns3_mbx_vf_to_pf_cmd *req = data;
> +
>   if (!req->msg[LINK_STATUS_OFFSET])
>   hns3_link_fail_parse(hw, req->msg[LINK_FAIL_CODE_OFFSET]);
>  
> 

Re: [dpdk-dev] [PATCH 3/4] net/hns3: fix parse link fails code fail

[fengchengwen]

On 2021/4/26 20:26, Ferruh Yigit wrote:
> On 4/22/2021 2:55 AM, Min Hu (Connor) wrote:
>> From: Chengwen Feng 
>>
>> The link fails code should be parsed using the structure
>> hns3_mbx_vf_to_pf_cmd, else it will parse fail.
>>
>> Fixes: 109e4dd1bd7a ("net/hns3: get link state change through mailbox")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: Chengwen Feng 
>> Signed-off-by: Min Hu (Connor) 
>> ---
>>  drivers/net/hns3/hns3_mbx.c | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c
>> index ba04ac9..0550c9a 100644
>> --- a/drivers/net/hns3/hns3_mbx.c
>> +++ b/drivers/net/hns3/hns3_mbx.c
>> @@ -346,12 +346,13 @@ hns3_link_fail_parse(struct hns3_hw *hw, uint8_t 
>> link_fail_code)
>>  }
>>  
>>  static void
>> -hns3pf_handle_link_change_event(struct hns3_hw *hw,
>> -  struct hns3_mbx_pf_to_vf_cmd *req)
>> +hns3pf_handle_link_change_event(struct hns3_hw *hw, void *data)
> 
> Why not s/struct hns3_mbx_pf_to_vf_cmd/struct hns3_mbx_vf_to_pf_cmd/ but 
> change
> to parameter to "void *", wouldn't it reduce the type check?
> 

Only this message needs to be converted using hns3_mbx_vf_to_pf_cmd.
All other messages are processed using hns3_mbx_pf_to_vf_cmd.
So here we simplifying fix it.

Beside we will refactor hns3_mbx module in later version because the
PF and VF process logic is mixed.

thanks

>>  {
>>  #define LINK_STATUS_OFFSET 1
>>  #define LINK_FAIL_CODE_OFFSET  2
>>  
>> +struct hns3_mbx_vf_to_pf_cmd *req = data;
>> +
>>  if (!req->msg[LINK_STATUS_OFFSET])
>>  hns3_link_fail_parse(hw, req->msg[LINK_FAIL_CODE_OFFSET]);
>>  
>>
> 
> 
> .
> 

[dpdk-dev] [PATCH 0/5] net/mlx5: add indirect count action

[Michael Baum]

Add support of indirect action API for count action.

Michael Baum (5):
  net/mlx5: support flow count action handle
  app/testpmd: remove indirect RSS action query
  app/testpmd: support indirect counter action query
  net/mlx5: fix flow age event triggering
  net/mlx5: use aging by counter when counter is existed

 app/test-pmd/config.c  | 152 +++---
 doc/guides/nics/mlx5.rst   |  13 +-
 doc/guides/rel_notes/release_21_05.rst |   1 +
 drivers/net/mlx5/mlx5.c|   8 +-
 drivers/net/mlx5/mlx5.h|   9 +-
 drivers/net/mlx5/mlx5_defs.h   |   2 +-
 drivers/net/mlx5/mlx5_flow.c   |   6 +
 drivers/net/mlx5/mlx5_flow.h   |   3 +-
 drivers/net/mlx5/mlx5_flow_dv.c| 369 ++---
 drivers/net/mlx5/mlx5_flow_verbs.c |   2 +-
 10 files changed, 360 insertions(+), 205 deletions(-)

-- 
1.8.3.1

[dpdk-dev] [PATCH 1/5] net/mlx5: support flow count action handle

[Michael Baum]

Existing API supports counter action to count traffic of a single flow.
The user can share the count action among different flows using the
shared flag and the same counter ID in the count action configuration.

Recent patch [1] introduced the indirect action API.
Using this API, an action can be created as indirect, unattached to any
flow rule.
Multiple flows can then be created using the same indirect action.
The new API also supports query operation of an indirect action.

The new API is more efficient because the driver gets it's own handler
for the count action instead of managing a mapping between the user ID
to the driver handle.

Support create, query and destroy indirect action operations for flow
count action.

Application will use the indirect action query operation to query this
count action.

In the meantime the old sharing mechanism (with the sharing flag)
continues to be supported, and the user can choose the way he wants to
share the counter.
The new indirect action API is only supported in DevX, so sharing
counter action in Verbs can only be done through the old mechanism.

[1] https://mails.dpdk.org/archives/dev/2020-July/174110.html

Signed-off-by: Michael Baum 
Acked-by: Matan Azrad 
---
 doc/guides/nics/mlx5.rst   |  13 +-
 doc/guides/rel_notes/release_21_05.rst |   1 +
 drivers/net/mlx5/mlx5.h|   7 +-
 drivers/net/mlx5/mlx5_defs.h   |   2 +-
 drivers/net/mlx5/mlx5_flow.c   |   6 +
 drivers/net/mlx5/mlx5_flow.h   |   3 +-
 drivers/net/mlx5/mlx5_flow_dv.c| 222 ++---
 drivers/net/mlx5/mlx5_flow_verbs.c |   2 +-
 8 files changed, 175 insertions(+), 81 deletions(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 2bb4f18..b2c357e 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -1692,10 +1692,15 @@ Supported hardware offloads
|   | |   | | rdma-core 33  |
|   | |   | | ConnectX-5|
+---+-+-+
-   | Age   | |  DPDK 20.11   | | DPDK 20.11|
-   |   | |  OFED 5.2 | | OFED 5.2  |
-   |   | |  rdma-core 32 | | rdma-core 32  |
-   |   | |  ConnectX-6 Dx| | ConnectX-6 Dx |
+   | Age   | | DPDK 20.11| | DPDK 20.11|
+   |   | | OFED 5.2  | | OFED 5.2  |
+   |   | | rdma-core 32  | | rdma-core 32  |
+   |   | | ConnectX-6 Dx | | ConnectX-6 Dx |
+   +---+-+-+
+   | Count | | DPDK 21.05| | DPDK 21.05|
+   |   | | OFED 4.6  | | OFED 4.6  |
+   |   | | rdma-core 24  | | rdma-core 23  |
+   |   | | ConnectX-5| | ConnectX-5|
+---+-+-+
 
 Notes for metadata
diff --git a/doc/guides/rel_notes/release_21_05.rst 
b/doc/guides/rel_notes/release_21_05.rst
index b3224dc..740a729 100644
--- a/doc/guides/rel_notes/release_21_05.rst
+++ b/doc/guides/rel_notes/release_21_05.rst
@@ -161,6 +161,7 @@ New Features
   Updated the Mellanox mlx5 driver with new features and improvements, 
including:
 
   * Added support for VXLAN and NVGRE encap as sample actions.
+  * Added support for flow COUNT action handle.
   * Support push VLAN on ingress traffic and pop VLAN on egress traffic in 
E-Switch mode.
   * Added support for ASO (Advanced Steering Operation) meter.
 
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 378b68e..626abb4 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -291,7 +291,7 @@ struct mlx5_drop {
 #define MLX5_MAX_PENDING_QUERIES 4
 #define MLX5_CNT_CONTAINER_RESIZE 64
 #define MLX5_CNT_SHARED_OFFSET 0x8000
-#define IS_SHARED_CNT(cnt) (!!((cnt) & MLX5_CNT_SHARED_OFFSET))
+#define IS_LEGACY_SHARED_CNT(cnt) (!!((cnt) & MLX5_CNT_SHARED_OFFSET))
 #define IS_BATCH_CNT(cnt) (((cnt) & (MLX5_CNT_SHARED_OFFSET - 1)) >= \
   MLX5_CNT_BATCH_OFFSET)
 #define MLX5_CNT_SIZE (sizeof(struct mlx5_flow_counter))
@@ -353,7 +353,10 @@ struct flow_counter_stats {
 
 /* Shared counters information for counters. */
 struct mlx5_flow_counter_shared {
-   uint32_t id; /**< User counter ID. */
+   union {
+   uint32_t refcnt; /* Only for shared action management. */
+   uint32_t id; /* User counter ID for legacy sharing. */
+   };
 };
 
 /* Shared counter configuration. */
diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h
index 6e9c4b9..906aa43 100644
--- a/drivers/net/mlx5/mlx5_defs.h
+++ b/drivers/net/mlx5/mlx5_defs.h
@@ -193,7 +193,7 @@
 #define MLX5_HAIRPIN_JUMBO_LOG_SIZE (14 + 2)
 
 /* Maximum number of indirect actions supported by rte_flow */
-#define MLX5

[dpdk-dev] [PATCH 2/5] app/testpmd: remove indirect RSS action query

[Michael Baum]

The port_action_handle_query function supports query operation for
indirect RSS action.

No driver currently supports this operation, and this support is
unnecessary.

Remove it.

Signed-off-by: Michael Baum 
Acked-by: Matan Azrad 
---
 app/test-pmd/config.c | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index e189062..a9805cc 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1626,7 +1626,6 @@ struct rte_flow_action_handle *
if (!pia)
return -EINVAL;
switch (pia->type) {
-   case RTE_FLOW_ACTION_TYPE_RSS:
case RTE_FLOW_ACTION_TYPE_AGE:
data = &default_data;
break;
@@ -1638,12 +1637,6 @@ struct rte_flow_action_handle *
if (rte_flow_action_handle_query(port_id, pia->handle, data, &error))
ret = port_flow_complain(&error);
switch (pia->type) {
-   case RTE_FLOW_ACTION_TYPE_RSS:
-   if (!ret)
-   printf("Shared RSS action:\n\trefs:%u\n",
-  *((uint32_t *)data));
-   data = NULL;
-   break;
case RTE_FLOW_ACTION_TYPE_AGE:
if (!ret) {
struct rte_flow_query_age *resp = data;
-- 
1.8.3.1

[dpdk-dev] [PATCH 3/5] app/testpmd: support indirect counter action query

[Michael Baum]

Counter action query was implemented as part of flow query, but was not
implemented as part of indirect action query.

This patch adds the required implementation.

Signed-off-by: Michael Baum 
Acked-by: Matan Azrad 
---
 app/test-pmd/config.c | 145 +++---
 1 file changed, 77 insertions(+), 68 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index a9805cc..bedbfcb 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1618,90 +1618,99 @@ struct rte_flow_action_handle *
 {
struct rte_flow_error error;
struct port_indirect_action *pia;
-   uint64_t default_data;
-   void *data = NULL;
-   int ret = 0;
+   union {
+   struct rte_flow_query_count count;
+   struct rte_flow_query_age age;
+   struct rte_flow_action_conntrack ct;
+   } query;
 
pia = action_get_by_id(port_id, id);
if (!pia)
return -EINVAL;
switch (pia->type) {
case RTE_FLOW_ACTION_TYPE_AGE:
-   data = &default_data;
+   case RTE_FLOW_ACTION_TYPE_COUNT:
break;
default:
-   printf("Indirect action %u (type: %d) on port %u doesn't"
-  " support query\n", id, pia->type, port_id);
-   return -1;
+   printf("Indirect action %u (type: %d) on port %u doesn't 
support query\n",
+  id, pia->type, port_id);
+   return -ENOTSUP;
}
-   if (rte_flow_action_handle_query(port_id, pia->handle, data, &error))
-   ret = port_flow_complain(&error);
+   /* Poisoning to make sure PMDs update it in case of error. */
+   memset(&error, 0x55, sizeof(error));
+   memset(&query, 0, sizeof(query));
+   if (rte_flow_action_handle_query(port_id, pia->handle, &query, &error))
+   return port_flow_complain(&error);
switch (pia->type) {
case RTE_FLOW_ACTION_TYPE_AGE:
-   if (!ret) {
-   struct rte_flow_query_age *resp = data;
-
-   printf("AGE:\n"
-  " aged: %u\n"
-  " sec_since_last_hit_valid: %u\n"
-  " sec_since_last_hit: %" PRIu32 "\n",
-  resp->aged,
-  resp->sec_since_last_hit_valid,
-  resp->sec_since_last_hit);
-   }
-   data = NULL;
+   printf("Indirect AGE action:\n"
+  " aged: %u\n"
+  " sec_since_last_hit_valid: %u\n"
+  " sec_since_last_hit: %" PRIu32 "\n",
+  query.age.aged,
+  query.age.sec_since_last_hit_valid,
+  query.age.sec_since_last_hit);
+   break;
+   case RTE_FLOW_ACTION_TYPE_COUNT:
+   printf("Indirect COUNT action:\n"
+  " hits_set: %u\n"
+  " bytes_set: %u\n"
+  " hits: %" PRIu64 "\n"
+  " bytes: %" PRIu64 "\n",
+  query.count.hits_set,
+  query.count.bytes_set,
+  query.count.hits,
+  query.count.bytes);
break;
case RTE_FLOW_ACTION_TYPE_CONNTRACK:
-   if (!ret) {
-   struct rte_flow_action_conntrack *ct = data;
-
-   printf("Conntrack Context:\n"
-  "  Peer: %u, Flow dir: %s, Enable: %u\n"
-  "  Live: %u, SACK: %u, CACK: %u\n"
-  "  Packet dir: %s, Liberal: %u, State: %u\n"
-  "  Factor: %u, Retrans: %u, TCP flags: %u\n"
-  "  Last Seq: %u, Last ACK: %u\n"
-  "  Last Win: %u, Last End: %u\n",
-  ct->peer_port,
-  ct->is_original_dir ? "Original" : "Reply",
-  ct->enable, ct->live_connection,
-  ct->selective_ack, ct->challenge_ack_passed,
-  ct->last_direction ? "Original" : "Reply",
-  ct->liberal_mode, ct->state,
-  ct->max_ack_window, ct->retransmission_limit,
-  ct->last_index, ct->last_seq, ct->last_ack,
-  ct->last_window, ct->last_end);
-   printf("  Original Dir:\n"
-  "scale: %u, fin: %u, ack seen: %u\n"
-  " unacked data: %u\nSent end: %u,"
-  "Reply end: %u, Max win: %u, Max ACK: %u\n",
-  ct->original_dir.scale,
-  ct->original_dir.close_ini

[dpdk-dev] [PATCH 5/5] net/mlx5: use aging by counter when counter is existed

[Michael Baum]

The driver support 2 mechanisms in order to support AGE action:
1. Aging by counter - HW counter will be configured to the flow traffic,
the driver polls the counter values efficiently to detect flow timeout.
2. Aging by ASO flow hit bit - HW ASO flow-hit bit is allocated for the
flow, the driver polls the bit efficiently to detect flow timeout.

ASO bit is only single bit resource while counter is 16 bytes, hence, it
is better to use ASO instead of counter for aging.

When a non-shared COUNT action is also configured to the flow, the
driver can use the same counter also for AGE action and no need to
create more ASO action for it.

The current code always uses ASO when it is supported in the device,
change it to reuse the non-shared counter if it exists in the flow.

Signed-off-by: Michael Baum 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/mlx5_flow_dv.c | 149 +++-
 1 file changed, 102 insertions(+), 47 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 7174e9b..9cd1c45 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -7143,6 +7143,12 @@ struct mlx5_hlist_entry *
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
   NULL,
  "Shared ASO age action is not supported for group 0");
+   if (action_flags & MLX5_FLOW_ACTION_AGE)
+   return rte_flow_error_set
+ (error, EINVAL,
+  RTE_FLOW_ERROR_TYPE_ACTION,
+  NULL,
+  "duplicate age actions set");
action_flags |= MLX5_FLOW_ACTION_AGE;
++actions_n;
break;
@@ -11163,6 +11169,47 @@ struct mlx5_cache_entry *
 }
 
 /**
+ * Prepares DV flow counter with aging configuration.
+ * Gets it by index when exists, creates a new one when doesn't.
+ *
+ * @param[in] dev
+ *   Pointer to rte_eth_dev structure.
+ * @param[in] dev_flow
+ *   Pointer to the mlx5_flow.
+ * @param[in, out] flow
+ *   Pointer to the sub flow.
+ * @param[in] count
+ *   Pointer to the counter action configuration.
+ * @param[in] age
+ *   Pointer to the aging action configuration.
+ * @param[out] error
+ *   Pointer to the error structure.
+ *
+ * @return
+ *   Pointer to the counter, NULL otherwise.
+ */
+static struct mlx5_flow_counter *
+flow_dv_prepare_counter(struct rte_eth_dev *dev,
+   struct mlx5_flow *dev_flow,
+   struct rte_flow *flow,
+   const struct rte_flow_action_count *count,
+   const struct rte_flow_action_age *age,
+   struct rte_flow_error *error)
+{
+   if (!flow->counter) {
+   flow->counter = flow_dv_translate_create_counter(dev, dev_flow,
+count, age);
+   if (!flow->counter) {
+   rte_flow_error_set(error, rte_errno,
+  RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+  "cannot create counter object.");
+   return NULL;
+   }
+   }
+   return flow_dv_counter_get_by_idx(dev, flow->counter, NULL);
+}
+
+/**
  * Fill the flow with DV spec, lock free
  * (mutex should be acquired by caller).
  *
@@ -11215,7 +11262,7 @@ struct mlx5_cache_entry *
} mhdr_dummy;
struct mlx5_flow_dv_modify_hdr_resource *mhdr_res = &mhdr_dummy.res;
const struct rte_flow_action_count *count = NULL;
-   const struct rte_flow_action_age *age = NULL;
+   const struct rte_flow_action_age *non_shared_age = NULL;
union flow_dv_attr flow_attr = { .attr = 0 };
uint32_t tag_be;
union mlx5_flow_tbl_key tbl_key;
@@ -11230,6 +11277,7 @@ struct mlx5_cache_entry *
const struct rte_flow_action_sample *sample = NULL;
struct mlx5_flow_sub_actions_list *sample_act;
uint32_t sample_act_pos = UINT32_MAX;
+   uint32_t age_act_pos = UINT32_MAX;
uint32_t num_of_dest = 0;
int tmp_actions_n = 0;
uint32_t table;
@@ -11452,7 +11500,12 @@ struct mlx5_cache_entry *
age_act = flow_aso_age_get_by_idx(dev, flow->age);
__atomic_fetch_add(&age_act->refcnt, 1,
   __ATOMIC_RELAXED);
-   dev_flow->dv.actions[actions_n++] = age_act->dr_action;
+   age_act_pos = actions_n++;
+   action_flags |= MLX5_FLOW_ACTION_AGE;
+   break;
+   case RTE_FLOW_ACTION_TYPE_AGE:
+   non_shared_age 

[dpdk-dev] [PATCH 4/5] net/mlx5: fix flow age event triggering

[Michael Baum]

A FLOW_AGE event should be invoked when a new aged-out flow is detected
by the PMD after the last user get-aged query calling.
The PMD manages 2 flags for this information and check them in order to
decide if an event should be invoked:
MLX5_AGE_EVENT_NEW - a new aged-out flow was detected. after the last
check.
MLX5_AGE_TRIGGER - get-aged query was called after the last aged-out
flow.
The 2 flags were unset after the event invoking.

When the user calls get-aged query from the event callback, the TRIGGER
flag was set inside the user callback and unset directly after the
callback what may stop the event invoking forever.

Unset the TRIGGER flag before the event invoking in order to allow set
it by the user callback.

Fixes: f935ed4b645a ("net/mlx5: support flow hit action for aging")
Cc: sta...@dpdk.org

Reported-by: David Bouyeure 
Signed-off-by: Michael Baum 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/mlx5.c | 8 +---
 drivers/net/mlx5/mlx5.h | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 19ffa16..10d44c7 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -662,11 +662,13 @@ static LIST_HEAD(, mlx5_dev_ctx_shared) mlx5_dev_ctx_list 
=
age_info = &sh->port[i].age_info;
if (!MLX5_AGE_GET(age_info, MLX5_AGE_EVENT_NEW))
continue;
-   if (MLX5_AGE_GET(age_info, MLX5_AGE_TRIGGER))
+   MLX5_AGE_UNSET(age_info, MLX5_AGE_EVENT_NEW);
+   if (MLX5_AGE_GET(age_info, MLX5_AGE_TRIGGER)) {
+   MLX5_AGE_UNSET(age_info, MLX5_AGE_TRIGGER);
rte_eth_dev_callback_process
(&rte_eth_devices[sh->port[i].devx_ih_port_id],
RTE_ETH_EVENT_FLOW_AGED, NULL);
-   age_info->flags = 0;
+   }
}
 }
 
@@ -675,7 +677,7 @@ static LIST_HEAD(, mlx5_dev_ctx_shared) mlx5_dev_ctx_list =
  *
  * @param[in] sh
  *   Pointer to mlx5_dev_ctx_shared object.
- * @param[in] sh
+ * @param[in] config
  *   Pointer to user dev config.
  */
 static void
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 626abb4..dfa029c 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -563,6 +563,8 @@ struct mlx5_geneve_tlv_option_resource {
 #define MLX5_AGE_TRIGGER   2
 #define MLX5_AGE_SET(age_info, BIT) \
((age_info)->flags |= (1 << (BIT)))
+#define MLX5_AGE_UNSET(age_info, BIT) \
+   ((age_info)->flags &= ~(1 << (BIT)))
 #define MLX5_AGE_GET(age_info, BIT) \
((age_info)->flags & (1 << (BIT)))
 #define GET_PORT_AGE_INFO(priv) \
-- 
1.8.3.1

[dpdk-dev] [PATCH v2] net/mlx5: workaround ASO memory region creation

[Michael Baum]

Due to kernel issue in direct MKEY creation using the DevX API for
physical memory, this patch replaces the ASO MR creation to use Verbs
API.

Fixes: f935ed4b645a ("net/mlx5: support flow hit action for aging")
Cc: sta...@dpdk.org

Signed-off-by: Michael Baum 
Acked-by: Matan Azrad 
---
v2:
The second patch in the series did not work due to a FW issue, this issue does 
not exist in this patch.

drivers/common/mlx5/linux/mlx5_common_verbs.c |  1 -
 drivers/common/mlx5/windows/mlx5_common_os.c  | 23 ---
 drivers/net/mlx5/mlx5.h   | 10 +--
 drivers/net/mlx5/mlx5_flow_aso.c  | 92 +++
 4 files changed, 52 insertions(+), 74 deletions(-)

diff --git a/drivers/common/mlx5/linux/mlx5_common_verbs.c 
b/drivers/common/mlx5/linux/mlx5_common_verbs.c
index 339535d..aa560f0 100644
--- a/drivers/common/mlx5/linux/mlx5_common_verbs.c
+++ b/drivers/common/mlx5/linux/mlx5_common_verbs.c
@@ -37,7 +37,6 @@
 {
struct ibv_mr *ibv_mr;
 
-   memset(pmd_mr, 0, sizeof(*pmd_mr));
ibv_mr = mlx5_glue->reg_mr(pd, addr, length,
   IBV_ACCESS_LOCAL_WRITE |
   (haswell_broadwell_cpu ? 0 :
diff --git a/drivers/common/mlx5/windows/mlx5_common_os.c 
b/drivers/common/mlx5/windows/mlx5_common_os.c
index f2d781a..cebf42d 100644
--- a/drivers/common/mlx5/windows/mlx5_common_os.c
+++ b/drivers/common/mlx5/windows/mlx5_common_os.c
@@ -155,23 +155,22 @@
struct mlx5_devx_mkey_attr mkey_attr;
struct mlx5_pd *mlx5_pd = (struct mlx5_pd *)pd;
struct mlx5_hca_attr attr;
+   struct mlx5_devx_obj *mkey;
+   void *obj;
 
if (!pd || !addr) {
rte_errno = EINVAL;
return -1;
}
-   memset(pmd_mr, 0, sizeof(*pmd_mr));
if (mlx5_devx_cmd_query_hca_attr(mlx5_pd->devx_ctx, &attr))
return -1;
-   pmd_mr->addr = addr;
-   pmd_mr->len = length;
-   pmd_mr->obj = mlx5_os_umem_reg(mlx5_pd->devx_ctx, pmd_mr->addr,
-  pmd_mr->len, IBV_ACCESS_LOCAL_WRITE);
-   if (!pmd_mr->obj)
+   obj = mlx5_os_umem_reg(mlx5_pd->devx_ctx, addr, length,
+  IBV_ACCESS_LOCAL_WRITE);
+   if (!obj)
return -1;
mkey_attr.addr = (uintptr_t)addr;
mkey_attr.size = length;
-   mkey_attr.umem_id = ((struct mlx5_devx_umem *)(pmd_mr->obj))->umem_id;
+   mkey_attr.umem_id = ((struct mlx5_devx_umem *)(obj))->umem_id;
mkey_attr.pd = mlx5_pd->pdn;
mkey_attr.log_entity_size = 0;
mkey_attr.pg_access = 0;
@@ -183,11 +182,15 @@
mkey_attr.relaxed_ordering_write = attr.relaxed_ordering_write;
mkey_attr.relaxed_ordering_read = attr.relaxed_ordering_read;
}
-   pmd_mr->mkey = mlx5_devx_cmd_mkey_create(mlx5_pd->devx_ctx, &mkey_attr);
-   if (!pmd_mr->mkey) {
-   claim_zero(mlx5_os_umem_dereg(pmd_mr->obj));
+   mkey = mlx5_devx_cmd_mkey_create(mlx5_pd->devx_ctx, &mkey_attr);
+   if (!mkey) {
+   claim_zero(mlx5_os_umem_dereg(obj));
return -1;
}
+   pmd_mr->addr = addr;
+   pmd_mr->len = length;
+   pmd_mr->obj = obj;
+   pmd_mr->mkey = mkey;
pmd_mr->lkey = pmd_mr->mkey->id;
return 0;
 }
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 378b68e..a29b8d6 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -483,14 +483,6 @@ struct mlx5_aso_cq {
uint64_t errors;
 };
 
-struct mlx5_aso_devx_mr {
-   void *buf;
-   uint64_t length;
-   struct mlx5dv_devx_umem *umem;
-   struct mlx5_devx_obj *mkey;
-   bool is_indirect;
-};
-
 struct mlx5_aso_sq_elem {
union {
struct {
@@ -507,7 +499,7 @@ struct mlx5_aso_sq {
struct mlx5_aso_cq cq;
struct mlx5_devx_sq sq_obj;
volatile uint64_t *uar_addr;
-   struct mlx5_aso_devx_mr mr;
+   struct mlx5_pmd_mr mr;
uint16_t pi;
uint32_t head;
uint32_t tail;
diff --git a/drivers/net/mlx5/mlx5_flow_aso.c b/drivers/net/mlx5/mlx5_flow_aso.c
index 20cd4fe..d9f8b14 100644
--- a/drivers/net/mlx5/mlx5_flow_aso.c
+++ b/drivers/net/mlx5/mlx5_flow_aso.c
@@ -60,76 +60,56 @@
 /**
  * Free MR resources.
  *
+ * @param[in] sh
+ *   Pointer to shared device context.
  * @param[in] mr
  *   MR to free.
  */
 static void
-mlx5_aso_devx_dereg_mr(struct mlx5_aso_devx_mr *mr)
+mlx5_aso_dereg_mr(struct mlx5_dev_ctx_shared *sh, struct mlx5_pmd_mr *mr)
 {
-   claim_zero(mlx5_devx_cmd_destroy(mr->mkey));
-   if (!mr->is_indirect && mr->umem)
-   claim_zero(mlx5_glue->devx_umem_dereg(mr->umem));
-   mlx5_free(mr->buf);
+   void *addr = mr->addr;
+
+   sh->share_cache.dereg_mr_cb(mr);
+   mlx5_free(addr);
memset(mr, 0, sizeof(*mr));
 }
 
 /**
  * Register Memory Region.
  *
- * @param[in] ctx
- *   Context

Re: [dpdk-dev] [PATCH 3/4] net/hns3: fix parse link fails code fail

[Ferruh Yigit]

On 4/26/2021 1:41 PM, fengchengwen wrote:
> 
> 
> On 2021/4/26 20:26, Ferruh Yigit wrote:
>> On 4/22/2021 2:55 AM, Min Hu (Connor) wrote:
>>> From: Chengwen Feng 
>>>
>>> The link fails code should be parsed using the structure
>>> hns3_mbx_vf_to_pf_cmd, else it will parse fail.
>>>
>>> Fixes: 109e4dd1bd7a ("net/hns3: get link state change through mailbox")
>>> Cc: sta...@dpdk.org
>>>
>>> Signed-off-by: Chengwen Feng 
>>> Signed-off-by: Min Hu (Connor) 
>>> ---
>>>  drivers/net/hns3/hns3_mbx.c | 5 +++--
>>>  1 file changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c
>>> index ba04ac9..0550c9a 100644
>>> --- a/drivers/net/hns3/hns3_mbx.c
>>> +++ b/drivers/net/hns3/hns3_mbx.c
>>> @@ -346,12 +346,13 @@ hns3_link_fail_parse(struct hns3_hw *hw, uint8_t 
>>> link_fail_code)
>>>  }
>>>  
>>>  static void
>>> -hns3pf_handle_link_change_event(struct hns3_hw *hw,
>>> - struct hns3_mbx_pf_to_vf_cmd *req)
>>> +hns3pf_handle_link_change_event(struct hns3_hw *hw, void *data)
>>
>> Why not s/struct hns3_mbx_pf_to_vf_cmd/struct hns3_mbx_vf_to_pf_cmd/ but 
>> change
>> to parameter to "void *", wouldn't it reduce the type check?
>>
> 
> Only this message needs to be converted using hns3_mbx_vf_to_pf_cmd.
> All other messages are processed using hns3_mbx_pf_to_vf_cmd.
> So here we simplifying fix it.
> 

There is a single caller of the function, which send parameter as "struct
hns3_mbx_pf_to_vf_cmd *req", so what is the point of making the parameter as
"void *" and inside the function cast it to "struct hns3_mbx_vf_to_pf_cmd *req =
data;"?
Instead of defining parameter as "struct hns3_mbx_pf_to_vf_cmd *req".

> Beside we will refactor hns3_mbx module in later version because the
> PF and VF process logic is mixed.
> 

OK

> thanks
> 
>>>  {
>>>  #define LINK_STATUS_OFFSET 1
>>>  #define LINK_FAIL_CODE_OFFSET  2
>>>  
>>> +   struct hns3_mbx_vf_to_pf_cmd *req = data;
>>> +
>>> if (!req->msg[LINK_STATUS_OFFSET])
>>> hns3_link_fail_parse(hw, req->msg[LINK_FAIL_CODE_OFFSET]);
>>>  
>>>
>>
>>
>> .
>>
> 

[dpdk-dev] [PATCH v2] log: register with standardized names

[David Marchand]

Let's try to enforce the convention where drivers use a pmd. logtype
with their class reflected in it and libraries use a lib. logtype.

Introduce two new macros:
- RTE_LOG_REGISTER_DEFAULT can be used when a single logtype is
  used in a component. It is associated to the default name provided
  by the build system,
- RTE_LOG_REGISTER_SUFFIX can be used when multiple logtypes are used,
  and then the passed name is appended to the default name,

RTE_LOG_REGISTER is left untouched for existing external users and for
components that do not comply with the convention.

Note: achieved with below commands + reverted change on net/bonding +
edits on crypto/virtio, compress/mlx5 and regex/mlx5

$ git grep -l RTE_LOG_REGISTER drivers/ |
  while read file; do
pattern=${file##drivers/};
class=${pattern%%/*};
pattern=${pattern#$class/};
pattern=pmd.$class.${pattern%%/*};
sed -i -e 's/RTE_LOG_REGISTER(\(.*\), 
'$pattern',/RTE_LOG_REGISTER_DEFAULT(\1,/' $file;
sed -i -e 's/RTE_LOG_REGISTER(\(.*\), 
'$pattern'\.\(.*\),/RTE_LOG_REGISTER_SUFFIX(\1, \2,/' $file;
  done

$ git grep -l RTE_LOG_REGISTER lib/ |
  while read file; do
pattern=${file##lib/};
pattern=lib.${pattern%%/*};
sed -i -e 's/RTE_LOG_REGISTER(\(.*\), 
'$pattern',/RTE_LOG_REGISTER_DEFAULT(\1,/' $file;
sed -i -e 's/RTE_LOG_REGISTER(\(.*\), 
'$pattern'\.\(.*\),/RTE_LOG_REGISTER_SUFFIX(\1, \2,/' $file;
  done

Signed-off-by: David Marchand 
---
Changes since v1:
- moved default logtype generation in the build system,
- rebased,
- reverted net/bonding change,

---
 drivers/common/dpaax/dpaax_iova_table.c   |  2 +-
 drivers/common/iavf/iavf_impl.c   |  2 +-
 drivers/common/mlx5/mlx5_common.c |  2 +-
 drivers/compress/isal/isal_compress_pmd.c |  2 +-
 drivers/compress/mlx5/mlx5_compress.c |  3 +-
 drivers/compress/octeontx/otx_zip_pmd.c   |  2 +-
 drivers/compress/zlib/zlib_pmd.c  |  2 +-
 drivers/crypto/aesni_gcm/aesni_gcm_pmd.c  |  2 +-
 drivers/crypto/aesni_mb/rte_aesni_mb_pmd.c|  2 +-
 drivers/crypto/armv8/rte_armv8_pmd.c  |  2 +-
 drivers/crypto/bcmfs/bcmfs_logs.c |  4 +-
 drivers/crypto/kasumi/rte_kasumi_pmd.c|  2 +-
 drivers/crypto/mvsam/rte_mrvl_pmd.c   |  2 +-
 drivers/crypto/nitrox/nitrox_logs.c   |  2 +-
 drivers/crypto/null/null_crypto_pmd.c |  2 +-
 drivers/crypto/octeontx/otx_cryptodev.c   |  2 +-
 drivers/crypto/octeontx2/otx2_cryptodev.c |  2 +-
 drivers/crypto/openssl/rte_openssl_pmd.c  |  2 +-
 .../scheduler/rte_cryptodev_scheduler.c   |  2 +-
 drivers/crypto/snow3g/rte_snow3g_pmd.c|  2 +-
 drivers/crypto/virtio/virtio_cryptodev.c  | 12 +++---
 drivers/crypto/zuc/rte_zuc_pmd.c  |  2 +-
 drivers/event/dlb2/dlb2.c |  2 +-
 drivers/event/dpaa/dpaa_eventdev.c|  2 +-
 drivers/event/dpaa2/dpaa2_eventdev.c  |  2 +-
 drivers/event/octeontx/ssovf_evdev.c  |  2 +-
 drivers/event/octeontx/timvf_evdev.c  |  2 +-
 drivers/event/opdl/opdl_evdev.c   |  2 +-
 drivers/event/sw/sw_evdev.c   |  2 +-
 drivers/mempool/octeontx/octeontx_fpavf.c |  2 +-
 drivers/meson.build   |  1 +
 drivers/net/af_packet/rte_eth_af_packet.c |  2 +-
 drivers/net/af_xdp/rte_eth_af_xdp.c   |  2 +-
 drivers/net/ark/ark_ethdev.c  |  2 +-
 drivers/net/atlantic/atl_ethdev.c |  4 +-
 drivers/net/avp/avp_ethdev.c  |  2 +-
 drivers/net/axgbe/axgbe_ethdev.c  |  4 +-
 drivers/net/bnx2x/bnx2x_ethdev.c  |  4 +-
 drivers/net/bnxt/bnxt_ethdev.c|  2 +-
 drivers/net/bonding/rte_eth_bond_pmd.c|  3 ++
 drivers/net/cxgbe/cxgbe_ethdev.c  |  4 +-
 drivers/net/dpaa/dpaa_ethdev.c|  2 +-
 drivers/net/dpaa2/dpaa2_ethdev.c  |  2 +-
 drivers/net/e1000/e1000_logs.c|  8 ++--
 drivers/net/ena/ena_ethdev.c  | 12 +++---
 drivers/net/enetc/enetc_ethdev.c  |  2 +-
 drivers/net/enic/enic_ethdev.c|  2 +-
 drivers/net/failsafe/failsafe.c   |  2 +-
 drivers/net/fm10k/fm10k_ethdev.c  |  8 ++--
 drivers/net/hinic/hinic_pmd_ethdev.c  |  2 +-
 drivers/net/hns3/hns3_ethdev.c|  4 +-
 drivers/net/i40e/i40e_ethdev.c|  8 ++--
 drivers/net/iavf/iavf_ethdev.c|  8 ++--
 drivers/net/ice/ice_ethdev.c  |  8 ++--
 drivers/net/igc/igc_logs.c|  4 +-
 drivers/net/ionic/ionic_ethdev.c  |  2 +-
 drivers/net/ipn3ke/ipn3ke_ethdev.c|  2 +-
 drivers/net/ixgbe/ixgbe_ethdev.c  |  8 ++--
 drivers/net/kni/rte_eth_kni.c |  2 +-
 drivers/net/liquidio/lio_ethdev.c |  4 +-
 drivers/net/memif/rte_eth_memif.c |  2 +-
 drivers/net/mlx4/mlx4.c   |  

Re: [dpdk-dev] [PATCH 0/4] bugfix for hns3 PMD

[Ferruh Yigit]

On 4/22/2021 2:55 AM, Min Hu (Connor) wrote:
> This patchset contains four bugfixes for hns3 PMD.
> 
> Chengwen Feng (4):
>   net/hns3: fix error mbx messages prompt errors
>   net/hns3: fix PF miss link status notify message
>   net/hns3: fix parse link fails code fail
>   net/hns3: delete unused macro and struct of mbx module
> 

Except from 3/4,
Series applied to dpdk-next-net/main, thanks.


3/4 can be handled separately.

Re: [dpdk-dev] [PATCH] usertools/devbind: add dlb

[McDaniel, Timothy]

> -Original Message-
> From: Thomas Monjalon 
> Sent: Sunday, April 25, 2021 10:53 AM
> To: McDaniel, Timothy 
> Cc: dev@dpdk.org; Jerin Jacob Kollanukkaran ; Van
> Haaren, Harry ; Ray Kinsella ;
> Neil Horman ; Rao, Nikhil ;
> Carrillo, Erik G ; Gujjar, Abhinandan S
> ; pbhagavat...@marvell.com; Hemant Agrawal
> ; mattias.ronnblom
> ; Mccarthy, Peter
> 
> Subject: Re: [dpdk-dev] [PATCH] usertools/devbind: add dlb
> 
> Timothy McDaniel:
> > --- a/usertools/dpdk-devbind.py
> > +++ b/usertools/dpdk-devbind.py
> > @@ -59,11 +59,13 @@
> >   'SVendor': None, 'SDevice': None}
> >  intel_ntb_icx = {'Class': '06', 'Vendor': '8086', 'Device': '347e',
> >   'SVendor': None, 'SDevice': None}
> > +intel_dlb = {'Class': '0b', 'Vendor': '8086', 'Device': '270b,2710,2714',
> > + 'SVendor': None, 'SDevice': None}
> >
> >  network_devices = [network_class, cavium_pkx, avp_vnic, ifpga_class]
> >  baseband_devices = [acceleration_class]
> >  crypto_devices = [encryption_class, intel_processor_class]
> > -eventdev_devices = [cavium_sso, cavium_tim, octeontx2_sso]
> > +eventdev_devices = [cavium_sso, cavium_tim, octeontx2_sso, intel_dlb]
> 
> Please try to insert new items in alphabetical order.

Thanks for the feedback, Thomas.  I will update and resubmit.

Re: [dpdk-dev] [PATCH] net/bonding: fix kvlist memory leakage

[Ferruh Yigit]

On 4/22/2021 3:05 AM, Min Hu (Connor) wrote:
> From: Chengwen Feng 
> 
> If the bond device was created by vdev mode, the kvlist was not free
> when the bond device removed.
> 
> Fixes: 8d30fe7fa737 ("bonding: support port hotplug")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Chengwen Feng 
> Signed-off-by: Min Hu (Connor) 

Reviewed-by: Ferruh Yigit 

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

Re: [dpdk-dev] [PATCH 2/3] net/kni: fix rewritten return value

[Ferruh Yigit]

On 4/22/2021 4:56 AM, Min Hu (Connor) wrote:
> Return value of function 'eth_kni_dev_stop' passed to 'ret' is
> rewritten later, and this is unreasonable.
> 
> This patch fixes it.
> 
> Fixes: 62024eb82756 ("ethdev: change stop operation callback to return int")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Min Hu (Connor) 
> ---
>  drivers/net/kni/rte_eth_kni.c | 5 +
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
> index 9ce74e5..067584c 100644
> --- a/drivers/net/kni/rte_eth_kni.c
> +++ b/drivers/net/kni/rte_eth_kni.c
> @@ -211,6 +211,11 @@ eth_kni_close(struct rte_eth_dev *eth_dev)
>   return 0;
>  
>   ret = eth_kni_dev_stop(eth_dev);
> + if (ret) {
> + PMD_LOG(WARNING, "Not able to stop kni for %s",
> + eth_dev->data->name);
> + return ret;
> + }
>  

'eth_kni_close()' is called by 'eth_kni_remove()', and returning here without
setting 'eth_dev->data->mac_addrs' to NULL, 'eth_kni_remove()' may crash.

And the close ops is to not use the device anymore, there is not much to do if
stop() fails here. So what do you think to log but not return on the
'eth_kni_dev_stop()' failure?


>   /* mac_addrs must not be freed alone because part of dev_private */
>   eth_dev->data->mac_addrs = NULL;
> 

Re: [dpdk-dev] [PATCH 3/4] net/hns3: fix parse link fails code fail

[fengchengwen]

On 2021/4/26 20:50, Ferruh Yigit wrote:
> On 4/26/2021 1:41 PM, fengchengwen wrote:
>>
>>
>> On 2021/4/26 20:26, Ferruh Yigit wrote:
>>> On 4/22/2021 2:55 AM, Min Hu (Connor) wrote:
 From: Chengwen Feng 

 The link fails code should be parsed using the structure
 hns3_mbx_vf_to_pf_cmd, else it will parse fail.

 Fixes: 109e4dd1bd7a ("net/hns3: get link state change through mailbox")
 Cc: sta...@dpdk.org

 Signed-off-by: Chengwen Feng 
 Signed-off-by: Min Hu (Connor) 
 ---
  drivers/net/hns3/hns3_mbx.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

 diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c
 index ba04ac9..0550c9a 100644
 --- a/drivers/net/hns3/hns3_mbx.c
 +++ b/drivers/net/hns3/hns3_mbx.c
 @@ -346,12 +346,13 @@ hns3_link_fail_parse(struct hns3_hw *hw, uint8_t 
 link_fail_code)
  }
  
  static void
 -hns3pf_handle_link_change_event(struct hns3_hw *hw,
 -struct hns3_mbx_pf_to_vf_cmd *req)
 +hns3pf_handle_link_change_event(struct hns3_hw *hw, void *data)
>>>
>>> Why not s/struct hns3_mbx_pf_to_vf_cmd/struct hns3_mbx_vf_to_pf_cmd/ but 
>>> change
>>> to parameter to "void *", wouldn't it reduce the type check?
>>>
>>
>> Only this message needs to be converted using hns3_mbx_vf_to_pf_cmd.
>> All other messages are processed using hns3_mbx_pf_to_vf_cmd.
>> So here we simplifying fix it.
>>
> 
> There is a single caller of the function, which send parameter as "struct
> hns3_mbx_pf_to_vf_cmd *req", so what is the point of making the parameter as
> "void *" and inside the function cast it to "struct hns3_mbx_vf_to_pf_cmd 
> *req =
> data;"?
> Instead of defining parameter as "struct hns3_mbx_pf_to_vf_cmd *req".
> 

We'll keep the original API interface and add comments in v2, thanks

>> Beside we will refactor hns3_mbx module in later version because the
>> PF and VF process logic is mixed.
>>
> 
> OK
> 
>> thanks
>>
  {
  #define LINK_STATUS_OFFSET 1
  #define LINK_FAIL_CODE_OFFSET  2
  
 +  struct hns3_mbx_vf_to_pf_cmd *req = data;
 +
if (!req->msg[LINK_STATUS_OFFSET])
hns3_link_fail_parse(hw, req->msg[LINK_FAIL_CODE_OFFSET]);
  

>>>
>>>
>>> .
>>>
>>
> 
> 
> .
> 

Re: [dpdk-dev] [PATCH 1/3] kni: fix wrong comments

[Ferruh Yigit]

On 4/22/2021 4:56 AM, Min Hu (Connor) wrote:
> This patch changed 'subsytem' to 'subsystem'.
> 
> Fixes: 0c6bc8ef70ba ("kni: memzone pool for alloc and release")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Min Hu (Connor) 

This is not on the "kni:", which implies the kni library, but the kni unit test,
will fix title while merging.

Reviewed-by: Ferruh Yigit 

Re: [dpdk-dev] [PATCH 3/3] kni: fix unchecked return value

[Ferruh Yigit]

On 4/22/2021 4:56 AM, Min Hu (Connor) wrote:
> Return value 'rte_kni_init' of a function is not checked. If
> it fails, error handling (logging and return) should be done.
> 
> This patch fixed it.
> 
> Fixes: 0c6bc8ef70ba ("kni: memzone pool for alloc and release")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Min Hu (Connor) 

With the patch title update,

Reviewed-by: Ferruh Yigit 

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

[Konstantin Ananyev]

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

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


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

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

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

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

Re: [dpdk-dev] [PATCH 0/3] bugfix for kni

[Ferruh Yigit]

On 4/22/2021 4:56 AM, Min Hu (Connor) wrote:
> This patchset contains three bugfixes for kni.
> 
> Min Hu (Connor) (3):
>   kni: fix wrong comments
>   net/kni: fix rewritten return value
>   kni: fix unchecked return value
> 

Except from 2/3,
Series applied to dpdk-next-net/main, thanks.

Re: [dpdk-dev] [PATCH v2 1/2] devtools: script to check meson indentation of lists

[Burakov, Anatoly]

On 26-Apr-21 11:54 AM, Bruce Richardson wrote:

This is a script to fix up minor formatting issues in meson files.
It scans for, and can optionally fix, indentation issues and missing
trailing commas in the lists in meson.build files. It also detects,
and can fix, multi-line lists where more than one entry appears on a
line.

Signed-off-by: Bruce Richardson 
---





+def split_code_comments(line):
+'splits a line into a code part and a comment part, returns (code, 
comment) tuple'
+if line.lstrip().startswith('#'):
+return ('', line)
+elif '#' in line and '#include' not in line:  # catch 99% of cases, not 100% 
> +idx = line.index('#')
+while (line[idx - 1].isspace()):
+idx -= 1
+return line[:idx], line[idx:]



I think this could be simplified with regex:

# find any occurrences of '#' but only if it's not an '#include'
if not re.search(r'#(?!include)', line)
return line, ''
return line.split('#', maxsplit=1)


+else:
+return (line, '')
+
+
+def setline(contents, index, value):
+'sets the contents[index] to value. Returns the line, along with code and 
comments part'
+line = contents[index] = value
+code, comments = split_code_comments(line)
+return line, code, comments
+
+
+def check_indentation(filename, contents):
+'''check that a list or files() is correctly indented'''
+infiles = False
+inlist = False
+edit_count = 0
+for lineno, line in enumerate(contents):
+code, comments = split_code_comments(line)


Nitpicking, but maybe instead of calling strip() all over the place, 
just count the number of spaces and strip right at the outset? E.g. 
something like:


stripped = code.strip()
line_indent = len(code) - len(stripped)

You can then reason about indent levels by comparing stripped to code 
afterwards, and avoid doing this:



+# skip further subarrays or lists
+if '[' in code or ']' in code:
+continue
+if not code.startswith(indent) or code[len(indent)] == ' ':


Opting to just check the indent size you calculated initially. Unless 
i'm missing something :)


You could also increment edit_count if `calculated indent + stripped` is 
equal to `code`. Seems easier logic than raw string manipulation you're 
going for here...





+def process_file(filename, fix):
+'''run checks on file "filename"'''
+if VERBOSE:
+print(f'Processing {filename}')
+with open(filename) as f:
+contents = [ln.rstrip() for ln in f.readlines()]


So any trailing whitespace gets automatically and silently fixed?


+
+if check_indentation(filename, contents) > 0 and fix:
+print(f"Fixing {filename}")
+with open(filename, 'w') as f:
+f.writelines([f'{ln}\n' for ln in contents])


Something seems suspect here. So, if `fix` is *not* specified, the 
script just opens the file, reads it, and... does nothing else?


--
Thanks,
Anatoly

[dpdk-dev] [PATCH v2] net/hns3: fix parse link fails code fail

[Min Hu (Connor)]

From: Chengwen Feng 

The link fails code should be parsed using the structure
hns3_mbx_vf_to_pf_cmd, else it will parse fail.

Fixes: 109e4dd1bd7a ("net/hns3: get link state change through mailbox")
Cc: sta...@dpdk.org

Signed-off-by: Chengwen Feng 
Signed-off-by: Min Hu (Connor) 
---
v2:
* kept original API interface.
---
 drivers/net/hns3/hns3_mbx.c | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_mbx.c b/drivers/net/hns3/hns3_mbx.c
index eb202dd..755298f 100644
--- a/drivers/net/hns3/hns3_mbx.c
+++ b/drivers/net/hns3/hns3_mbx.c
@@ -346,12 +346,20 @@ hns3_link_fail_parse(struct hns3_hw *hw, uint8_t 
link_fail_code)
 }
 
 static void
+
 hns3pf_handle_link_change_event(struct hns3_hw *hw,
- struct hns3_mbx_pf_to_vf_cmd *req)
+   struct hns3_mbx_pf_to_vf_cmd *cmd)
 {
 #define LINK_STATUS_OFFSET 1
 #define LINK_FAIL_CODE_OFFSET  2
 
+   /*
+* This message is reported by the firmware and is reported in
+* 'struct hns3_mbx_vf_to_pf_cmd' format. Therefore, we should cast
+* the cmd to 'struct hns3_mbx_vf_to_pf_cmd' first.
+*/
+   struct hns3_mbx_vf_to_pf_cmd *req = (struct hns3_mbx_vf_to_pf_cmd *)cmd;
+
if (!req->msg[LINK_STATUS_OFFSET])
hns3_link_fail_parse(hw, req->msg[LINK_FAIL_CODE_OFFSET]);
 
-- 
2.7.4

[dpdk-dev] [PATCH v1 2/2] net/i40e: allow get_monitor_addr for VF driver

[Anatoly Burakov]

When .get_monitor_addr API was introduced, it was implemented in the
i40e driver, but only for the physical function; the virtual function
portion of the driver does not support that API.

Add the missing function pointer to VF device structure.

The i40e driver is not meant to use the VF portion any more, as
currently i40e VF devices are supposed to be managed by iavf drier, but
add this just in case it needs backporting later.

Fixes: a683abf90a22 ("net/i40e: implement power management API")

Signed-off-by: Anatoly Burakov 
---
 drivers/net/i40e/i40e_ethdev_vf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c 
b/drivers/net/i40e/i40e_ethdev_vf.c
index 3c258ba7cf..156ad9ab96 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -216,6 +216,7 @@ static const struct eth_dev_ops i40evf_eth_dev_ops = {
.mtu_set  = i40evf_dev_mtu_set,
.mac_addr_set = i40evf_set_default_mac_addr,
.tx_done_cleanup  = i40e_tx_done_cleanup,
+   .get_monitor_addr = i40e_get_monitor_addr
 };
 
 /*
-- 
2.25.1

[dpdk-dev] [PATCH v1 1/2] net/ixgbe: allow get_monitor_addr for VF driver

[Anatoly Burakov]

When .get_monitor_addr API was introduced, it was implemented in the
ixgbe driver, but only for the physical function; the virtual function
portion of the driver does not support that API.

Add the missing function pointer to VF device structure.

Fixes: 3982b7967bb7 ("net/ixgbe: implement power management API")

Signed-off-by: Anatoly Burakov 
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index ff65145f55..6cca039a11 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -605,6 +605,7 @@ static const struct eth_dev_ops ixgbevf_eth_dev_ops = {
.rss_hash_update  = ixgbe_dev_rss_hash_update,
.rss_hash_conf_get= ixgbe_dev_rss_hash_conf_get,
.tx_done_cleanup  = ixgbe_dev_tx_done_cleanup,
+   .get_monitor_addr = ixgbe_get_monitor_addr,
 };
 
 /* store statistics names and its offset in stats structure */
-- 
2.25.1

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

[Thomas Monjalon]

Lun 26 avr 2021, à 11:48, Ferruh Yigit a écrit :
> Hi Thomas, David, Akhil, Jerin, Maxime, Qi, Raslan, Ajit,
> 
> For the doc patches, the subsystem prefix 'doc:' is too wide, what do you 
> think 
> to extend it to include the component, like for this patch:
> "doc/nics/nfp: fix multiport syntax"

Usually I format like this:
doc: fix multiport syntax in nfp guide

I am not sure about being precise in the doc prefix for 2 reasons:
- the doc hierarchy can be quite complex
- it may give too much importance visually to the doc changes

But if everybody prefer a precise prefix, I am OK to change the habit.

Re: [dpdk-dev] [PATCH v2 1/2] devtools: script to check meson indentation of lists

[Bruce Richardson]

On Mon, Apr 26, 2021 at 02:40:25PM +0100, Burakov, Anatoly wrote:
> On 26-Apr-21 11:54 AM, Bruce Richardson wrote:
> > This is a script to fix up minor formatting issues in meson files.
> > It scans for, and can optionally fix, indentation issues and missing
> > trailing commas in the lists in meson.build files. It also detects,
> > and can fix, multi-line lists where more than one entry appears on a
> > line.
> > 
> > Signed-off-by: Bruce Richardson 
> > ---
> 
> 
> 
> > +def split_code_comments(line):
> > +'splits a line into a code part and a comment part, returns (code, 
> > comment) tuple'
> > +if line.lstrip().startswith('#'):
> > +return ('', line)
> > +elif '#' in line and '#include' not in line:  # catch 99% of cases, 
> > not 100% > +idx = line.index('#')
> > +while (line[idx - 1].isspace()):
> > +idx -= 1
> > +return line[:idx], line[idx:]
> 
> 
> I think this could be simplified with regex:
> 
> # find any occurrences of '#' but only if it's not an '#include'
> if not re.search(r'#(?!include)', line)
> return line, ''
> return line.split('#', maxsplit=1)

Not sure that is simpler, and just splitting on '#' is actually not what we
want either.

Firstly, while r'#(?!include)' is not a massively complex regex, just
checking for "'#' in line and '#include' not in line" is just easier to
read for most mortals.

In terms of the split, I did initially do as you have here and split on
'#', but we don't actually want that, because we want to preserve the
whitespace in the line before the comment too - as part of the comment, not
the code. This is why after finding the '#' we walk backwards to find the
end of the code and find that as the split point. It then saves us worrying
about any strips() breaking any comment alignment the user has explicitly
set up. Not using split also means that we can just merge the strings back
with '+' rather than having to use "'#'.join()".

> 
> > +else:
> > +return (line, '')
> > +
> > +
> > +def setline(contents, index, value):
> > +'sets the contents[index] to value. Returns the line, along with code 
> > and comments part'
> > +line = contents[index] = value
> > +code, comments = split_code_comments(line)
> > +return line, code, comments
> > +
> > +
> > +def check_indentation(filename, contents):
> > +'''check that a list or files() is correctly indented'''
> > +infiles = False
> > +inlist = False
> > +edit_count = 0
> > +for lineno, line in enumerate(contents):
> > +code, comments = split_code_comments(line)
> 
> Nitpicking, but maybe instead of calling strip() all over the place, just
> count the number of spaces and strip right at the outset? E.g. something
> like:
> 
> stripped = code.strip()
> line_indent = len(code) - len(stripped)
> 
> You can then reason about indent levels by comparing stripped to code
> afterwards, and avoid doing this:
> 
> > +# skip further subarrays or lists
> > +if '[' in code or ']' in code:
> > +continue
> > +if not code.startswith(indent) or code[len(indent)] == ' ':
> 
> Opting to just check the indent size you calculated initially. Unless i'm
> missing something :)
> 
> You could also increment edit_count if `calculated indent + stripped` is
> equal to `code`. Seems easier logic than raw string manipulation you're
> going for here...
> 
> 

Interesting. That could be a good approach alright. If I do a V3 (not
guaranteed for this release) I can try taking that idea on board.

> 
> > +def process_file(filename, fix):
> > +'''run checks on file "filename"'''
> > +if VERBOSE:
> > +print(f'Processing {filename}')
> > +with open(filename) as f:
> > +contents = [ln.rstrip() for ln in f.readlines()]
> 
> So any trailing whitespace gets automatically and silently fixed?
> 
Hadn't actually thought of that, but yes, that will happen if --fix is
given and other changes are made to the file. Ideally, that should be fixed
to "non-silently" do so, but I'd view it as low priority since other tools
tend to be good at flagging trailing whitespace issues anyway.

> > +
> > +if check_indentation(filename, contents) > 0 and fix:
> > +print(f"Fixing {filename}")
> > +with open(filename, 'w') as f:
> > +f.writelines([f'{ln}\n' for ln in contents])
> 
> Something seems suspect here. So, if `fix` is *not* specified, the script
> just opens the file, reads it, and... does nothing else?
> 
No, it prints out all the errors without actually fixing them.

Regards,
/Bruce

Re: [dpdk-dev] [PATCH v1 1/2] net/ixgbe: allow get_monitor_addr for VF driver

[David Hunt]

Hi Anatoly,

On 26/4/2021 2:49 PM, Anatoly Burakov wrote:

When .get_monitor_addr API was introduced, it was implemented in the
ixgbe driver, but only for the physical function; the virtual function
portion of the driver does not support that API.

Add the missing function pointer to VF device structure.

Fixes: 3982b7967bb7 ("net/ixgbe: implement power management API")

Signed-off-by: Anatoly Burakov 
---
  drivers/net/ixgbe/ixgbe_ethdev.c | 1 +
  1 file changed, 1 insertion(+)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index ff65145f55..6cca039a11 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -605,6 +605,7 @@ static const struct eth_dev_ops ixgbevf_eth_dev_ops = {
.rss_hash_update  = ixgbe_dev_rss_hash_update,
.rss_hash_conf_get= ixgbe_dev_rss_hash_conf_get,
.tx_done_cleanup  = ixgbe_dev_tx_done_cleanup,
+   .get_monitor_addr = ixgbe_get_monitor_addr,
  };
  
  /* store statistics names and its offset in stats structure */



Thanks for the fix. I ran get_monitor_address() on some ixgbe virtual 
functions here, and can confirm that this patch resolves the issue.


Reviewed-by: David Hunt 

Re: [dpdk-dev] [PATCH 2/2] app/testpmd: fix max queue number when configure Tx offloads

[Ferruh Yigit]

On 4/25/2021 3:08 AM, Li, Xiaoyun wrote:
> 
>> -Original Message-
>> From: Min Hu (Connor) 
>> Sent: Thursday, April 22, 2021 15:04
>> To: dev@dpdk.org
>> Cc: Yigit, Ferruh ; Li, Xiaoyun 
>> 
>> Subject: [PATCH 2/2] app/testpmd: fix max queue number when configure Tx
>> offloads
>>
>> From: Chengchang Tang 
>>
>> When txq offload is configured, max rxq is used as the max queue. This patch
>> fixes it.
>>
>> Fixes: 74453ac9ef67 ("app/testpmd: fix queue offload configuration")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: Chengchang Tang 
>> Signed-off-by: Min Hu (Connor) 
>> ---
>>  app/test-pmd/cmdline.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index
>> f0fa6e8..1cb1027 100644
>> --- a/app/test-pmd/cmdline.c
>> +++ b/app/test-pmd/cmdline.c
>> @@ -4666,7 +4666,7 @@ cmd_config_queue_tx_offloads(struct rte_port *port)
>>  int k;
>>
>>  /* Apply queue tx offloads configuration */
>> -for (k = 0; k < port->dev_info.max_rx_queues; k++)
>> +for (k = 0; k < port->dev_info.max_tx_queues; k++)
>>  port->tx_conf[k].offloads =
>>  port->dev_conf.txmode.offloads;
>>  }
>> --
>> 2.7.4
> 
> Acked-by: Xiaoyun Li 
> 

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

Re: [dpdk-dev] [PATCH v1 2/2] net/i40e: allow get_monitor_addr for VF driver

[David Hunt]

Hi Anatoly,

On 26/4/2021 2:49 PM, Anatoly Burakov wrote:

When .get_monitor_addr API was introduced, it was implemented in the
i40e driver, but only for the physical function; the virtual function
portion of the driver does not support that API.

Add the missing function pointer to VF device structure.

The i40e driver is not meant to use the VF portion any more, as
currently i40e VF devices are supposed to be managed by iavf drier, but
add this just in case it needs backporting later.

Fixes: a683abf90a22 ("net/i40e: implement power management API")

Signed-off-by: Anatoly Burakov 
---
  drivers/net/i40e/i40e_ethdev_vf.c | 1 +
  1 file changed, 1 insertion(+)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c 
b/drivers/net/i40e/i40e_ethdev_vf.c
index 3c258ba7cf..156ad9ab96 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -216,6 +216,7 @@ static const struct eth_dev_ops i40evf_eth_dev_ops = {
.mtu_set  = i40evf_dev_mtu_set,
.mac_addr_set = i40evf_set_default_mac_addr,
.tx_done_cleanup  = i40e_tx_done_cleanup,
+   .get_monitor_addr = i40e_get_monitor_addr
  };
  
  /*



Same issue as the ixgbe, get_monitor_addr op missing for the vf portion 
of the driver. Thanks.


Reviewed-by: David Hunt 

Re: [dpdk-dev] [PATCH v2 1/2] event/octeontx2: fix crypto adapter queue pair ops

[Ankur Dwivedi]

>-Original Message-
>From: Shijith Thotton 
>Sent: Monday, April 26, 2021 5:51 PM
>To: dev@dpdk.org
>Cc: Shijith Thotton ; Jerin Jacob Kollanukkaran
>; Anoob Joseph ; Ankur Dwivedi
>; Pavan Nikhilesh Bhagavatula
>
>Subject: [PATCH v2 1/2] event/octeontx2: fix crypto adapter queue pair ops
>
>Parameter queue_pair_id of crypto adapter queue pair add/del operation can
>be -1 to select all pre configured crypto queue pairs. Added support for the
>same in driver. Also added a member in cpt qp structure to indicate binding
>state of a queue pair to an event queue.
>
>Fixes: 29768f78d5a7 ("event/octeontx2: add crypto adapter framework")
>
>Signed-off-by: Shijith Thotton 
Acked-by: Ankur Dwivedi 
>---
> drivers/crypto/octeontx2/otx2_cryptodev_qp.h  |   4 +-
> .../event/octeontx2/otx2_evdev_crypto_adptr.c | 102 --
> 2 files changed, 75 insertions(+), 31 deletions(-)
>
>diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_qp.h
>b/drivers/crypto/octeontx2/otx2_cryptodev_qp.h
>index 189fa3db4..95bce3621 100644
>--- a/drivers/crypto/octeontx2/otx2_cryptodev_qp.h
>+++ b/drivers/crypto/octeontx2/otx2_cryptodev_qp.h
>@@ -1,5 +1,5 @@
> /* SPDX-License-Identifier: BSD-3-Clause
>- * Copyright (C) 2020 Marvell International Ltd.
>+ * Copyright (C) 2020-2021 Marvell.
>  */
>
> #ifndef _OTX2_CRYPTODEV_QP_H_
>@@ -39,6 +39,8 @@ struct otx2_cpt_qp {
>*/
>   uint8_t ca_enable;
>   /**< Set when queue pair is added to crypto adapter */
>+  uint8_t qp_ev_bind;
>+  /**< Set when queue pair is bound to event queue */
> };
>
> #endif /* _OTX2_CRYPTODEV_QP_H_ */
>diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
>b/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
>index 2c9b347f0..ed600a659 100644
>--- a/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
>+++ b/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
>@@ -1,10 +1,11 @@
> /* SPDX-License-Identifier: BSD-3-Clause
>- * Copyright (C) 2020 Marvell International Ltd.
>+ * Copyright (C) 2020-2021 Marvell.
>  */
>
> #include 
> #include 
>
>+#include "otx2_cryptodev.h"
> #include "otx2_cryptodev_hw_access.h"
> #include "otx2_cryptodev_qp.h"
> #include "otx2_cryptodev_mbox.h"
>@@ -24,30 +25,66 @@ otx2_ca_caps_get(const struct rte_eventdev *dev,
>   return 0;
> }
>
>-int
>-otx2_ca_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev
>*cdev,
>-  int32_t queue_pair_id, const struct rte_event *event)
>+static int
>+otx2_ca_qp_sso_link(const struct rte_cryptodev *cdev, struct otx2_cpt_qp
>*qp,
>+  uint16_t sso_pf_func)
> {
>-  struct otx2_sso_evdev *sso_evdev = sso_pmd_priv(dev);
>   union otx2_cpt_af_lf_ctl2 af_lf_ctl2;
>-  struct otx2_cpt_qp *qp;
>   int ret;
>
>-  qp = cdev->data->queue_pairs[queue_pair_id];
>-
>-  qp->ca_enable = 1;
>-  rte_memcpy(&qp->ev, event, sizeof(struct rte_event));
>-
>   ret = otx2_cpt_af_reg_read(cdev, OTX2_CPT_AF_LF_CTL2(qp->id),
>-  qp->blkaddr, &af_lf_ctl2.u);
>+ qp->blkaddr, &af_lf_ctl2.u);
>   if (ret)
>   return ret;
>
>-  af_lf_ctl2.s.sso_pf_func = otx2_sso_pf_func_get();
>+  af_lf_ctl2.s.sso_pf_func = sso_pf_func;
>   ret = otx2_cpt_af_reg_write(cdev, OTX2_CPT_AF_LF_CTL2(qp->id),
>-  qp->blkaddr, af_lf_ctl2.u);
>-  if (ret)
>-  return ret;
>+  qp->blkaddr, af_lf_ctl2.u);
>+  return ret;
>+}
>+
>+static void
>+otx2_ca_qp_init(struct otx2_cpt_qp *qp, const struct rte_event *event)
>+{
>+  if (event) {
>+  qp->qp_ev_bind = 1;
>+  rte_memcpy(&qp->ev, event, sizeof(struct rte_event));
>+  } else {
>+  qp->qp_ev_bind = 0;
>+  }
>+  qp->ca_enable = 1;
>+}
>+
>+int
>+otx2_ca_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev
>*cdev,
>+  int32_t queue_pair_id, const struct rte_event *event) {
>+  struct otx2_sso_evdev *sso_evdev = sso_pmd_priv(dev);
>+  struct otx2_cpt_vf *vf = cdev->data->dev_private;
>+  uint16_t sso_pf_func = otx2_sso_pf_func_get();
>+  struct otx2_cpt_qp *qp;
>+  uint8_t qp_id;
>+  int ret;
>+
>+  if (queue_pair_id == -1) {
>+  for (qp_id = 0; qp_id < vf->nb_queues; qp_id++) {
>+  qp = cdev->data->queue_pairs[qp_id];
>+  ret = otx2_ca_qp_sso_link(cdev, qp, sso_pf_func);
>+  if (ret) {
>+  uint8_t qp_tmp;
>+  for (qp_tmp = 0; qp_tmp < qp_id; qp_tmp++)
>+  otx2_ca_qp_del(dev, cdev, qp_tmp);
>+  return ret;
>+  }
>+  otx2_ca_qp_init(qp, event);
>+  }
>+  } else {
>+  qp = cdev->data->queue_pairs[queue_pair_id];
>+  ret = otx2_ca_qp_sso_link(cdev, qp, sso_pf_func);
>+  if (r

Re: [dpdk-dev] [PATCH v2 1/2] devtools: script to check meson indentation of lists

[Burakov, Anatoly]

On 26-Apr-21 3:05 PM, Bruce Richardson wrote:

On Mon, Apr 26, 2021 at 02:40:25PM +0100, Burakov, Anatoly wrote:

On 26-Apr-21 11:54 AM, Bruce Richardson wrote:

This is a script to fix up minor formatting issues in meson files.
It scans for, and can optionally fix, indentation issues and missing
trailing commas in the lists in meson.build files. It also detects,
and can fix, multi-line lists where more than one entry appears on a
line.

Signed-off-by: Bruce Richardson 
---





+def split_code_comments(line):
+'splits a line into a code part and a comment part, returns (code, 
comment) tuple'
+if line.lstrip().startswith('#'):
+return ('', line)
+elif '#' in line and '#include' not in line:  # catch 99% of cases, not 100% 
> +idx = line.index('#')
+while (line[idx - 1].isspace()):
+idx -= 1
+return line[:idx], line[idx:]



I think this could be simplified with regex:

# find any occurrences of '#' but only if it's not an '#include'
if not re.search(r'#(?!include)', line)
 return line, ''
return line.split('#', maxsplit=1)


Not sure that is simpler, and just splitting on '#' is actually not what we
want either.

Firstly, while r'#(?!include)' is not a massively complex regex, just
checking for "'#' in line and '#include' not in line" is just easier to
read for most mortals.

In terms of the split, I did initially do as you have here and split on
'#', but we don't actually want that, because we want to preserve the
whitespace in the line before the comment too - as part of the comment, not
the code. This is why after finding the '#' we walk backwards to find the
end of the code and find that as the split point. It then saves us worrying
about any strips() breaking any comment alignment the user has explicitly
set up. Not using split also means that we can just merge the strings back
with '+' rather than having to use "'#'.join()".


Fair enough so!






+else:
+return (line, '')
+
+
+def setline(contents, index, value):
+'sets the contents[index] to value. Returns the line, along with code and 
comments part'
+line = contents[index] = value
+code, comments = split_code_comments(line)
+return line, code, comments
+
+
+def check_indentation(filename, contents):
+'''check that a list or files() is correctly indented'''
+infiles = False
+inlist = False
+edit_count = 0
+for lineno, line in enumerate(contents):
+code, comments = split_code_comments(line)


Nitpicking, but maybe instead of calling strip() all over the place, just
count the number of spaces and strip right at the outset? E.g. something
like:

stripped = code.strip()
line_indent = len(code) - len(stripped)

You can then reason about indent levels by comparing stripped to code
afterwards, and avoid doing this:


+# skip further subarrays or lists
+if '[' in code or ']' in code:
+continue
+if not code.startswith(indent) or code[len(indent)] == ' ':


Opting to just check the indent size you calculated initially. Unless i'm
missing something :)

You could also increment edit_count if `calculated indent + stripped` is
equal to `code`. Seems easier logic than raw string manipulation you're
going for here...




Interesting. That could be a good approach alright. If I do a V3 (not
guaranteed for this release) I can try taking that idea on board.




+def process_file(filename, fix):
+'''run checks on file "filename"'''
+if VERBOSE:
+print(f'Processing {filename}')
+with open(filename) as f:
+contents = [ln.rstrip() for ln in f.readlines()]


So any trailing whitespace gets automatically and silently fixed?


Hadn't actually thought of that, but yes, that will happen if --fix is
given and other changes are made to the file. Ideally, that should be fixed
to "non-silently" do so, but I'd view it as low priority since other tools
tend to be good at flagging trailing whitespace issues anyway.


Yeah, i think there's not a lot of trailing whitespace there in the 
first place, so probably a non issue.





+
+if check_indentation(filename, contents) > 0 and fix:
+print(f"Fixing {filename}")
+with open(filename, 'w') as f:
+f.writelines([f'{ln}\n' for ln in contents])


Something seems suspect here. So, if `fix` is *not* specified, the script
just opens the file, reads it, and... does nothing else?


No, it prints out all the errors without actually fixing them.



Oh, right, check_indentation will run first. Never mind!

In any case,

Reviewed-by: Anatoly Burakov 

--
Thanks,
Anatoly

Re: [dpdk-dev] [PATCH] net/bonding: fix socket id check

[Ferruh Yigit]

On 4/22/2021 8:12 AM, Min Hu (Connor) wrote:
> From: Chengchang Tang 
> 
> The socket ID entered by user is cast to an unsigned integer. However,
> the value may be an illegal negative value, which may cause some
> problems. In this case, an error should be returned.
> 

+1 to fix

> In addition, the socket ID may be an invalid positive number, which is
> also processed in this patch.
> 
> Fixes: 2efb58cbab6e ("bond: new link bonding library")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Chengchang Tang 
> Signed-off-by: Min Hu (Connor) 
> ---
>  drivers/net/bonding/rte_eth_bond_args.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/bonding/rte_eth_bond_args.c 
> b/drivers/net/bonding/rte_eth_bond_args.c
> index 8c5f90d..bcc0fe3 100644
> --- a/drivers/net/bonding/rte_eth_bond_args.c
> +++ b/drivers/net/bonding/rte_eth_bond_args.c
> @@ -207,12 +207,12 @@ bond_ethdev_parse_socket_id_kvarg(const char *key 
> __rte_unused,
>   return -1;
>  
>   errno = 0;
> - socket_id = (uint8_t)strtol(value, &endptr, 10);
> + socket_id = strtol(value, &endptr, 10);

'strtol()' returns 'long int', but implicitly casting it to 'int'. My concern is
if this cause a static analysis tool warning.
What do you think to have 'socket_id' type as 'long int'?

>   if (*endptr != 0 || errno != 0)
>   return -1;
>  
>   /* validate socket id value */
> - if (socket_id >= 0) {
> + if (socket_id >= 0 && socket_id < RTE_MAX_NUMA_NODES) {>
> *(uint8_t *)extra_args = (uint8_t)socket_id;

Here there is an assumption that RTE_MAX_NUMA_NODES will be less than
'UCHAR_MAX', perhaps it can be good to add a check to verify this assumption.

>   return 0;
>   }
> 

Re: [dpdk-dev] [PATCH] bonding: fix overflow check

[Ferruh Yigit]

On 4/22/2021 10:22 AM, Min Hu (Connor) wrote:
> Buffer 'test_params->slave_port_ids' of size 6 accessed may
> overflow, since its index 'i' can have value be is out of range.
> 
> This patch fixed it.
> 
> Fixes: 92073ef961ee ("bond: unit tests")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Min Hu (Connor) 
> ---
>  app/test/test_link_bonding.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
> index 8a5c831..b5a6042 100644
> --- a/app/test/test_link_bonding.c
> +++ b/app/test/test_link_bonding.c
> @@ -2216,7 +2216,8 @@ test_activebackup_rx_burst(void)
>   "failed to get primary slave for bonded port (%d)",
>   test_params->bonded_port_id);
>  
> - for (i = 0; i < test_params->bonded_slave_count; i++) {
> + for (i = 0; i < test_params->bonded_slave_count &&
> + i < TEST_MAX_NUMBER_OF_PORTS; i++) {
>   /* Generate test bursts of packets to transmit */
>   TEST_ASSERT_EQUAL(generate_test_burst(
>   &gen_pkt_burst[0], burst_size, 0, 1, 0, 0, 0),
> 

Hi Connor,

There is nothing wrong with the check you add, but at first place how
'test_params->bonded_slave_count' can become bigger than
'TEST_MAX_NUMBER_OF_PORTS'? Should we fix there, instead of this loop?

Also in same function, there are a few more loops iterate until " <
test_params->bonded_slave_count", so fixing the root case works for them too.

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

[Ali Alnubani]

> -Original Message-
> From: dev  On Behalf Of Konstantin Ananyev
> Sent: Monday, April 26, 2021 4:35 PM
> To: dev@dpdk.org
> Cc: Konstantin Ananyev ; sta...@dpdk.org
> Subject: [dpdk-dev] [PATCH v2] acl: fix build with gcc 11
> 

Thanks Konstantin, I don't see the acl build failures with this patch.
Tested with: meson --werror --buildtype=debugoptimized build && ninja -C build
I see now new build errors in net/tap, test/test_cryptodev, and app/test-pmd. 
I'll open separate issues for these.

Regards,
Ali

Re: [dpdk-dev] [PATCH 1/2] net/tap: fix log loss when state fails to be restored

[Ferruh Yigit]

On 4/22/2021 12:27 PM, Min Hu (Connor) wrote:
> From: Chengchang Tang 
> 
> After restoring the remote states, the return value of ioctl() is not
> checked. Therefore, users cannot know whether the remote state is
> restored successfully.
> 
> This patch add log for restoring failure.
> 
> Fixes: 4810d3af8343 ("net/tap: restore state of remote device when closing")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Chengchang Tang 
> Signed-off-by: Min Hu (Connor) 
> ---
>  drivers/net/tap/rte_eth_tap.c | 6 +-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
> index 68baa18..6007c78 100644
> --- a/drivers/net/tap/rte_eth_tap.c
> +++ b/drivers/net/tap/rte_eth_tap.c
> @@ -1101,6 +1101,7 @@ tap_dev_close(struct rte_eth_dev *dev)
>   struct pmd_internals *internals = dev->data->dev_private;
>   struct pmd_process_private *process_private = dev->process_private;
>   struct rx_queue *rxq;
> + int ret;
>  
>   if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
>   rte_free(dev->process_private);
> @@ -1133,8 +1134,11 @@ tap_dev_close(struct rte_eth_dev *dev)
>  
>   if (internals->remote_if_index) {
>   /* Restore initial remote state */
> - ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
> + ret = ioctl(internals->ioctl_sock, SIOCSIFFLAGS,
>   &internals->remote_initial_flags);
> + if (ret)
> + TAP_LOG(ERR, "restore remote state failed: %d", ret);
> +

'ret' is used only in this scope, can you please move the variable declaration
at the beginning of the this if block?
You can do something like "int ret = ioctl("


>   }
>  
>   rte_mempool_free(internals->gso_ctx_mp);
> 

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

[Kevin Traynor]

On 26/04/2021 16:24, Ali Alnubani wrote:
>> -Original Message-
>> From: dev  On Behalf Of Konstantin Ananyev
>> Sent: Monday, April 26, 2021 4:35 PM
>> To: dev@dpdk.org
>> Cc: Konstantin Ananyev ; sta...@dpdk.org
>> Subject: [dpdk-dev] [PATCH v2] acl: fix build with gcc 11
>>
> 
> Thanks Konstantin, I don't see the acl build failures with this patch.
> Tested with: meson --werror --buildtype=debugoptimized build && ninja -C build
> I see now new build errors in net/tap, test/test_cryptodev, and app/test-pmd. 
> I'll open separate issues for these.
> 

Hi Ali,

There is already a Bz for test_cryptodev:
https://bugs.dpdk.org/show_bug.cgi?id=676

Kevin.

> Regards,
> Ali
> 

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

[Ferruh Yigit]

On 4/22/2021 12:27 PM, Min Hu (Connor) wrote:
> From: Chengchang Tang 
> 
> The size of the current interrupt vector array is fixed to an integer.
> 
> This patch will create an interrupt vector array based on the number
> of rxqs.
> 
> Fixes: 4870a8cdd968 ("net/tap: support Rx interrupt")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Chengchang Tang 
> Signed-off-by: Min Hu (Connor) 

Reviewed-by: Ferruh Yigit 

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

[dpdk-dev] [PATCH v2 1/1] usertools/devbind: add dlb

[Timothy McDaniel]

Add dlb to usertools/dpdk-devbind.py so that it shows up
as an eventdev, and is identified as Intel dlb.

Signed-off-by: Timothy McDaniel 
---
 usertools/dpdk-devbind.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
index 98bd1b7e4..2fe0c6a6a 100755
--- a/usertools/dpdk-devbind.py
+++ b/usertools/dpdk-devbind.py
@@ -46,6 +46,8 @@
 octeontx2_ree = {'Class': '08', 'Vendor': '177d', 'Device': 'a0f4',
  'SVendor': None, 'SDevice': None}
 
+intel_dlb = {'Class': '0b', 'Vendor': '8086', 'Device': '270b,2710,2714',
+ 'SVendor': None, 'SDevice': None}
 intel_ioat_bdw = {'Class': '08', 'Vendor': '8086',
   'Device': 
'6f20,6f21,6f22,6f23,6f24,6f25,6f26,6f27,6f2e,6f2f',
   'SVendor': None, 'SDevice': None}
@@ -63,7 +65,7 @@
 network_devices = [network_class, cavium_pkx, avp_vnic, ifpga_class]
 baseband_devices = [acceleration_class]
 crypto_devices = [encryption_class, intel_processor_class]
-eventdev_devices = [cavium_sso, cavium_tim, octeontx2_sso]
+eventdev_devices = [cavium_sso, cavium_tim, intel_dlb, octeontx2_sso]
 mempool_devices = [cavium_fpa, octeontx2_npa]
 compress_devices = [cavium_zip]
 regex_devices = [octeontx2_ree]
-- 
2.23.0

[dpdk-dev] [Bug 690] tap build failures on Fedora 35 with gcc 11

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=690

Bug ID: 690
   Summary: tap build failures on Fedora 35 with gcc 11
   Product: DPDK
   Version: unspecified
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: ethdev
  Assignee: dev@dpdk.org
  Reporter: alia...@nvidia.com
  Target Milestone: ---

"""
$ meson --werror --buildtype=debugoptimized -Ddisable_drivers=net/ice build &&
ninja -C build
...
...
[1803/2603] Compiling C object
drivers/libtmp_rte_net_tap.a.p/net_tap_tap_flow.c.o
FAILED: drivers/libtmp_rte_net_tap.a.p/net_tap_tap_flow.c.o
ccache cc -Idrivers/libtmp_rte_net_tap.a.p -Idrivers -I../drivers
-Idrivers/net/tap -I../drivers/net/tap -Idrivers/bus/vdev -I../drivers/bus/vdev
-I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include
-Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include
-I../lib/eal/x86/include -Ilib/eal/common -I../lib/eal/common -Ilib/eal
-I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/metrics -I../lib/metrics
-Ilib/telemetry -I../lib/telemetry -Ilib/gso -I../lib/gso -Ilib/ethdev
-I../lib/ethdev -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool
-I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Ilib/hash
-I../lib/hash -Ilib/rcu -I../lib/rcu -fdiagnostics-color=always -pipe
-D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Werror -O2 -g -include rte_config.h
-Wextra -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs
-Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes
-Wundef -Wwrite-strings -Wno-address-of-packed-member -Wno-packed-not-aligned
-Wno-missing-field-initializers -Wno-zero-length-bounds -D_GNU_SOURCE -fPIC
-march=native -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API
-Wno-format-truncation -DTAP_MAX_QUEUES=16 -MD -MQ
drivers/libtmp_rte_net_tap.a.p/net_tap_tap_flow.c.o -MF
drivers/libtmp_rte_net_tap.a.p/net_tap_tap_flow.c.o.d -o
drivers/libtmp_rte_net_tap.a.p/net_tap_tap_flow.c.o -c
../drivers/net/tap/tap_flow.c
In file included from ../drivers/net/tap/tap_flow.c:13:
In function 'rte_jhash_2hashes',
inlined from 'rte_jhash' at ../lib/hash/rte_jhash.h:284:2,
inlined from 'tap_flow_set_handle' at
../drivers/net/tap/tap_flow.c:1306:12,
inlined from 'rss_enable' at ../drivers/net/tap/tap_flow.c:1909:3,
inlined from 'priv_flow_process' at ../drivers/net/tap/tap_flow.c:1228:11:
../lib/hash/rte_jhash.h:238:9: error: 'flow' may be used uninitialized
[-Werror=maybe-uninitialized]
  238 | __rte_jhash_2hashes(key, length, pc, pb, 1);
  | ^~~
../drivers/net/tap/tap_flow.c: In function 'priv_flow_process':
../lib/hash/rte_jhash.h:81:1: note: by argument 1 of type 'const void *' to
'__rte_jhash_2hashes.constprop' declared here
   81 | __rte_jhash_2hashes(const void *key, uint32_t length, uint32_t *pc,
  | ^~~
../drivers/net/tap/tap_flow.c:1028:1: note: 'flow' declared here
 1028 | priv_flow_process(struct pmd_internals *pmd,
  | ^
In file included from ../drivers/net/tap/tap_flow.c:13:
In function 'rte_jhash_2hashes',
inlined from 'rte_jhash' at ../lib/hash/rte_jhash.h:284:2,
inlined from 'tap_flow_set_handle' at
../drivers/net/tap/tap_flow.c:1306:12,
inlined from 'tap_flow_create' at ../drivers/net/tap/tap_flow.c:1393:2:
../lib/hash/rte_jhash.h:238:9: error: 'flow' may be used uninitialized
[-Werror=maybe-uninitialized]
  238 | __rte_jhash_2hashes(key, length, pc, pb, 1);
  | ^~~
../drivers/net/tap/tap_flow.c: In function 'tap_flow_create':
../lib/hash/rte_jhash.h:81:1: note: by argument 1 of type 'const void *' to
'__rte_jhash_2hashes.constprop' declared here
   81 | __rte_jhash_2hashes(const void *key, uint32_t length, uint32_t *pc,
  | ^~~
../drivers/net/tap/tap_flow.c:1354:1: note: 'flow' declared here
 1354 | tap_flow_create(struct rte_eth_dev *dev,
  | ^~~
In file included from ../drivers/net/tap/tap_flow.c:13:
In function 'rte_jhash_2hashes',
inlined from 'rte_jhash' at ../lib/hash/rte_jhash.h:284:2,
inlined from 'tap_flow_set_handle' at
../drivers/net/tap/tap_flow.c:1306:12,
inlined from 'tap_flow_create' at ../drivers/net/tap/tap_flow.c:1432:3:
../lib/hash/rte_jhash.h:238:9: error: 'flow' may be used uninitialized
[-Werror=maybe-uninitialized]
  238 | __rte_jhash_2hashes(key, length, pc, pb, 1);
  | ^~~
../drivers/net/tap/tap_flow.c: In function 'tap_flow_create':
../lib/hash/rte_jhash.h:81:1: note: by argument 1 of type 'const void *' to
'__rte_jhash_2hashes.constprop' declared here
   81 | __rte_jhash_2hashes(const void *key, uint32_t length, uint32_t *pc,
  | ^~~

[dpdk-dev] [Bug 691] test-pmd build failure on Fedora 35 with gcc 11

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=691

Bug ID: 691
   Summary: test-pmd build failure on Fedora 35 with gcc 11
   Product: DPDK
   Version: unspecified
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: testpmd
  Assignee: dev@dpdk.org
  Reporter: alia...@nvidia.com
  Target Milestone: ---

"""
$ meson --werror --buildtype=debugoptimized -Ddisable_drivers=net/ice,net/tap
build && ninja -C build
...
...
[2584/2587] Compiling C object app/dpdk-testpmd.p/test-pmd_config.c.o
FAILED: app/dpdk-testpmd.p/test-pmd_config.c.o
ccache cc -Iapp/dpdk-testpmd.p -Iapp -I../app -Ilib/ethdev -I../lib/ethdev -I.
-I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include
-Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include
-I../lib/eal/x86/include -Ilib/eal/common -I../lib/eal/common -Ilib/eal
-I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/metrics -I../lib/metrics
-Ilib/telemetry -I../lib/telemetry -Ilib/net -I../lib/net -Ilib/mbuf
-I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring
-Ilib/meter -I../lib/meter -Ilib/gro -I../lib/gro -Ilib/gso -I../lib/gso
-Ilib/cmdline -I../lib/cmdline -Idrivers/bus/pci -I../drivers/bus/pci
-I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Ilib/bitratestats
-I../lib/bitratestats -Ilib/pdump -I../lib/pdump -Ilib/latencystats
-I../lib/latencystats -Idrivers/crypto/scheduler -I../drivers/crypto/scheduler
-Ilib/cryptodev -I../lib/cryptodev -Ilib/rcu -I../lib/rcu -Idrivers/bus/vdev
-I../drivers/bus/vdev -Ilib/reorder -I../lib/reorder -Idrivers/net/bonding
-I../drivers/net/bonding -Ilib/sched -I../lib/sched -Ilib/ip_frag
-I../lib/ip_frag -Ilib/hash -I../lib/hash -Idrivers/net/bnxt
-I../drivers/net/bnxt -I../drivers/net/bnxt/tf_ulp
-I../drivers/net/bnxt/tf_core -Idrivers/net/i40e -I../drivers/net/i40e
-Idrivers/net/i40e/base -I../drivers/net/i40e/base -Idrivers/net/ixgbe
-I../drivers/net/ixgbe -Idrivers/net/ixgbe/base -I../drivers/net/ixgbe/base
-Ilib/security -I../lib/security -Idrivers/bus/dpaa -I../drivers/bus/dpaa
-I../drivers/bus/dpaa/include -I../drivers/bus/dpaa/base/qbman
-Idrivers/common/dpaax -I../drivers/common/dpaax
-I../drivers/common/dpaax/caamflib -Ilib/eventdev -I../lib/eventdev -Ilib/timer
-I../lib/timer -Idrivers/mempool/dpaa -I../drivers/mempool/dpaa
-Idrivers/net/dpaa -I../drivers/net/dpaa -Ilib/bpf -I../lib/bpf
-fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch
-Werror -O2 -g -include rte_config.h -Wextra -Wcast-qual -Wdeprecated -Wformat
-Wformat-nonliteral -Wformat-security -Wmissing-declarations
-Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith
-Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings
-Wno-address-of-packed-member -Wno-packed-not-aligned
-Wno-missing-field-initializers -Wno-zero-length-bounds -D_GNU_SOURCE
-march=native -DALLOW_EXPERIMENTAL_API -Wno-deprecated-declarations -MD -MQ
app/dpdk-testpmd.p/test-pmd_config.c.o -MF
app/dpdk-testpmd.p/test-pmd_config.c.o.d -o
app/dpdk-testpmd.p/test-pmd_config.c.o -c ../app/test-pmd/config.c
../app/test-pmd/config.c: In function 'port_action_handle_query':
../app/test-pmd/config.c:1680:51: error: array subscript 'struct
rte_flow_action_conntrack[0]' is partly outside array bounds of 'uint64_t[1]'
{aka 'long unsigned int[1]'} [-Werror=array-bounds]
 1680 |ct->last_window, ct->last_end);
  |   ^~
../app/test-pmd/config.c:1621:18: note: while referencing 'default_data'
 1621 | uint64_t default_data;
  |  ^~~~
../app/test-pmd/config.c:1680:34: error: array subscript 'struct
rte_flow_action_conntrack[0]' is partly outside array bounds of 'uint64_t[1]'
{aka 'long unsigned int[1]'} [-Werror=array-bounds]
 1680 |ct->last_window, ct->last_end);
  |  ^~
../app/test-pmd/config.c:1621:18: note: while referencing 'default_data'
 1621 | uint64_t default_data;
  |  ^~~~
../app/test-pmd/config.c:1679:64: error: array subscript 'struct
rte_flow_action_conntrack[0]' is partly outside array bounds of 'uint64_t[1]'
{aka 'long unsigned int[1]'} [-Werror=array-bounds]
 1679 |ct->last_index, ct->last_seq,
ct->last_ack,
  |^~
../app/test-pmd/config.c:1621:18: note: while referencing 'default_data'
 1621 | uint64_t default_data;
  |  ^~~~
../app/test-pmd/config.c:1679:50: error: array subscript 'struct
rte_flow_action_conntrack[0]' is partly outside array bounds of 'uint64_t[1]'
{aka 'long unsigned int[1]'} [-Werror=array-bounds]
 1679 |ct->last_index, ct->last_seq,
ct->last_ack,
  |   

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

[Ali Alnubani]

> -Original Message-
> From: Kevin Traynor 
> Sent: Monday, April 26, 2021 6:31 PM
> To: Ali Alnubani ; Konstantin Ananyev
> ; dev@dpdk.org
> Cc: sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] acl: fix build with gcc 11
> 
> On 26/04/2021 16:24, Ali Alnubani wrote:
> >> -Original Message-
> >> From: dev  On Behalf Of Konstantin Ananyev
> >> Sent: Monday, April 26, 2021 4:35 PM
> >> To: dev@dpdk.org
> >> Cc: Konstantin Ananyev ;
> >> sta...@dpdk.org
> >> Subject: [dpdk-dev] [PATCH v2] acl: fix build with gcc 11
> >>
> >
> > Thanks Konstantin, I don't see the acl build failures with this patch.
> > Tested with: meson --werror --buildtype=debugoptimized build && ninja
> > -C build I see now new build errors in net/tap, test/test_cryptodev, and
> app/test-pmd. I'll open separate issues for these.
> >
> 
> Hi Ali,
> 
> There is already a Bz for test_cryptodev:
> https://bugs.dpdk.org/show_bug.cgi?id=676
> 

I opened the following 2 issues:
tap build failures on Fedora 35 with gcc 11 
(https://bugs.dpdk.org/show_bug.cgi?id=690)
test-pmd build failure on Fedora 35 with gcc 11 
(https://bugs.dpdk.org/show_bug.cgi?id=691)

Regards,
Ali

Re: [dpdk-dev] [PATCH v2] eal/windows: fix build warnings in MinGW

[Dmitry Kozlyuk]

2021-04-21 19:09 (UTC+0300), Tal Shnaiderman:
> the strncasecmp macro defined in rte_os_shim.h is already
> defined in MinGW-w64, as a result the compiler prints out
> the warning below on function redefinition whenever compiling
> a file including the header in debug mode.
> 
> ..\lib/librte_eal/windows/include/rte_os_shim.h:21:
> warning: "strncasecmp" redefined
> #define strncasecmp(s1, s2, count) _strnicmp(s1, s2, count)
> 
> Fixed by defining the macro only to the clang compiler.
> 
> Fixes: 45d62067c237 ("eal: make OS shims internal")
> 
> Signed-off-by: Tal Shnaiderman 

With librte_eal -> eal fixup,
Acked-by: Dmitry Kozlyuk 

[dpdk-dev] [Bug 692] bnx2x build fail on Fedora 34 with gcc 11

[bugzilla]

https://bugs.dpdk.org/show_bug.cgi?id=692

Bug ID: 692
   Summary: bnx2x build fail on Fedora 34 with gcc 11
   Product: DPDK
   Version: unspecified
  Hardware: All
OS: Linux
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: ethdev
  Assignee: dev@dpdk.org
  Reporter: kevu...@gmail.com
  Target Milestone: ---

[kevin@fedora dpdk]$ cat /etc/redhat-release 
Fedora release 34 (Thirty Four)
[kevin@fedora dpdk]$ uname -a
Linux fedora 5.11.15-300.fc34.x86_64 #1 SMP Fri Apr 16 13:41:48 UTC 2021 x86_64
x86_64 x86_64 GNU/Linux
[kevin@fedora dpdk]$ gcc --version
gcc (GCC) 11.0.1 20210324 (Red Hat 11.0.1-0)


[kevin@fedora dpdk]$ ./devtools/test-meson-builds.sh 
ninja: Entering directory `./build-gcc-static'
[842/2503] Compiling C object
drivers/libtmp_rte_net_bnx2x.a.p/net_bnx2x_bnx2x_rxtx.c.o
FAILED: drivers/libtmp_rte_net_bnx2x.a.p/net_bnx2x_bnx2x_rxtx.c.o 
gcc -Idrivers/libtmp_rte_net_bnx2x.a.p -Idrivers -I../drivers
-Idrivers/net/bnx2x -I../drivers/net/bnx2x -Ilib/ethdev -I../lib/ethdev -I.
-I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include
-Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include
-I../lib/eal/x86/include -Ilib/eal/common -I../lib/eal/common -Ilib/eal
-I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/metrics -I../lib/metrics
-Ilib/telemetry -I../lib/telemetry -Ilib/net -I../lib/net -Ilib/mbuf
-I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring
-Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci
-I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev
-I../drivers/bus/vdev -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64
-Wall -Winvalid-pch -Werror -O2 -g -include rte_config.h -Wextra -Wcast-qual
-Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs
-Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes
-Wundef -Wwrite-strings -Wno-address-of-packed-member -Wno-packed-not-aligned
-Wno-missing-field-initializers -Wno-zero-length-bounds -D_GNU_SOURCE -fPIC
-march=native -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API
-Wno-format-truncation -DZLIB_CONST -MD -MQ
drivers/libtmp_rte_net_bnx2x.a.p/net_bnx2x_bnx2x_rxtx.c.o -MF
drivers/libtmp_rte_net_bnx2x.a.p/net_bnx2x_bnx2x_rxtx.c.o.d -o
drivers/libtmp_rte_net_bnx2x.a.p/net_bnx2x_bnx2x_rxtx.c.o -c
../drivers/net/bnx2x/bnx2x_rxtx.c
In file included from ../drivers/net/bnx2x/bnx2x_rxtx.c:8:
../drivers/net/bnx2x/bnx2x_rxtx.c: In function ‘bnx2x_upd_rx_prod_fast’:
../drivers/net/bnx2x/bnx2x.h:1528:35: error: ‘rx_prods’ is used uninitialized
[-Werror=uninitialized]
 1528 | #define REG_WR32(sc, offset, val) bnx2x_reg_write32(sc, (offset), val)
  |   ^~~~
../drivers/net/bnx2x/bnx2x.h:1531:33: note: in expansion of macro ‘REG_WR32’
 1531 | #define REG_WR(sc, offset, val) REG_WR32(sc, offset, val)
  | ^~~~
../drivers/net/bnx2x/bnx2x_rxtx.c:331:9: note: in expansion of macro ‘REG_WR’
  331 | REG_WR(sc, fp->ustorm_rx_prods_offset, val[0]);
  | ^~
../drivers/net/bnx2x/bnx2x_rxtx.c:324:40: note: ‘rx_prods’ declared here
  324 | struct ustorm_eth_rx_producers rx_prods = { 0 };
  |^~~~
cc1: all warnings being treated as errors
[846/2503] Compiling C object
drivers/libtmp_rte_net_bnx2x.a.p/net_bnx2x_bnx2x.c.o
FAILED: drivers/libtmp_rte_net_bnx2x.a.p/net_bnx2x_bnx2x.c.o 
gcc -Idrivers/libtmp_rte_net_bnx2x.a.p -Idrivers -I../drivers
-Idrivers/net/bnx2x -I../drivers/net/bnx2x -Ilib/ethdev -I../lib/ethdev -I.
-I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include
-Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include
-I../lib/eal/x86/include -Ilib/eal/common -I../lib/eal/common -Ilib/eal
-I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/metrics -I../lib/metrics
-Ilib/telemetry -I../lib/telemetry -Ilib/net -I../lib/net -Ilib/mbuf
-I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring
-Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci
-I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev
-I../drivers/bus/vdev -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64
-Wall -Winvalid-pch -Werror -O2 -g -include rte_config.h -Wextra -Wcast-qual
-Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs
-Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes
-Wundef -Wwrite-strings -Wno-address-of-packed-member -Wno-packed-not-aligned
-Wno-missing-field-initializers -Wno-zero-length-bounds -D_GNU_SOURCE -fPIC
-march=native -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API
-Wno-format-truncation -DZLIB_CONST -MD -MQ
drivers/libtmp_rte_net_bnx2x.a.p/net_bnx2x_bnx2x

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

[Ferruh Yigit]

On 4/23/2021 10:27 AM, Min Hu (Connor) wrote:
> This patch set contains two bugfixes for hns3 PMD.
> 
> Min Hu (Connor) (2):
>   net/hns3: fix wrong word of comments
>   doc: fix runtime config options
> 

Series applied to dpdk-next-net/main, thanks.

[dpdk-dev] [RFC PATCH] test/distributor: fix burst flush on worker quit

[Stanislaw Kardach]

While working on RISC-V port I have encountered a situation where worker
threads get stuck in the rte_distributor_return_pkt() function in the
burst test.
After investigation some of the threads enter this function with
flag RTE_DISTRIB_GET_BUF set in the d->retptr64[0]. At the same time
main thread has already passed rte_distributor_process() so nobody will
clear this flag and hence workers can't return.

What I've noticed is that adding a flush just after the last _process(),
similarly to how quit_workers() function is written in the
test_distributor.c fixes the issue.
Additionally the issue disappears when I remove the rdtsc delay code
inside the rte_distributor_request_pkt().
However I can't get this to reproduce on x86 (even with SIMD forced
off) and with artificial delays, which is why I wonder whether I'm not
actually hiding some other issue.

Looking at the implementation of the distributor, it is based on
__atomic_* builtins and the only platform related bit in the fast-path
is the rte_rdtsc() and rte_pause(). There may be some issues in the
toolchain (I've tried so far with the Ubuntu one - 10.2.0-8ubuntu1).
I should add that all unit tests for distributor are passing so either
there's some coverage corner case or the implementation works on RISC-V.
As for RDTSC I'm using a sleep-stable time counter with 1MHz frequency
and switching to high resolution cycle counter also removes the issue
but that's the same as removing the rdtsc delay as mentioned above.

I'd love to hear from You if this fix makes any sense.

While modifying this test, I've also pulled in a fix from
test_distributor.c which ensures that each thread gets his own wakeup
packet as it's possible that when sending a burst of packets, they won't
be spread over all the workers.

Signed-off-by: Stanislaw Kardach 
Fixes: 7c3287a10535 ("test/distributor: add performance test for burst mode")
Cc: david.h...@intel.com
Cc: l.wojciec...@partner.samsung.com
Cc: David Marchand 
---
 app/test/test_distributor_perf.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/test/test_distributor_perf.c b/app/test/test_distributor_perf.c
index b25f79a34..fdbeae6d2 100644
--- a/app/test/test_distributor_perf.c
+++ b/app/test/test_distributor_perf.c
@@ -188,13 +188,15 @@ quit_workers(struct rte_distributor *d, struct 
rte_mempool *p)
rte_mempool_get_bulk(p, (void *)bufs, num_workers);
 
quit = 1;
-   for (i = 0; i < num_workers; i++)
+   for (i = 0; i < num_workers; i++) {
bufs[i]->hash.usr = i << 1;
-   rte_distributor_process(d, bufs, num_workers);
+   rte_distributor_process(d, &bufs[i], 1);
+   }
 
rte_mempool_put_bulk(p, (void *)bufs, num_workers);
 
rte_distributor_process(d, NULL, 0);
+   rte_distributor_flush(d);
rte_eal_mp_wait_lcore();
quit = 0;
worker_idx = 0;
-- 
2.27.0

Re: [dpdk-dev] [PATCH v4 1/8] bbdev: add network order data capability

[Dave Burley]

Hi Hemant

Can I ask what the usage case is for 
RTE_BBDEV_LDPC_ENC_NETWORK_ORDER/RTE_BBDEV_LDPC_DEC_NETWORK_ORDER ?

Thanks

Dave




From: dev  on behalf of Hemant Agrawal 

Sent: 24 April 2021 11:36
To: dev@dpdk.org ; gak...@marvell.com ; 
nicolas.chau...@intel.com 
Cc: david.march...@redhat.com ; Hemant Agrawal 

Subject: [dpdk-dev] [PATCH v4 1/8] bbdev: add network order data capability

CAUTION: This email originated from outside of the organization. Do not click 
links or open attachments unless you recognize the sender and know the content 
is safe.

This patch intoduces a new capability of the bbdev device
to process the LDPC data in network byte order.

Signed-off-by: Hemant Agrawal 
---
 doc/guides/bbdevs/features/default.ini | 1 +
 doc/guides/prog_guide/bbdev.rst| 6 ++
 lib/bbdev/rte_bbdev_op.h   | 8 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/doc/guides/bbdevs/features/default.ini 
b/doc/guides/bbdevs/features/default.ini
index 5fe267a625..e5da644099 100644
--- a/doc/guides/bbdevs/features/default.ini
+++ b/doc/guides/bbdevs/features/default.ini
@@ -14,3 +14,4 @@ LLR/HARQ Compression   =
 External DDR Access=
 HW Accelerated =
 BBDEV API  =
+Network Order Data =
diff --git a/doc/guides/prog_guide/bbdev.rst b/doc/guides/prog_guide/bbdev.rst
index 6b2bd54e1a..89a86d10fb 100644
--- a/doc/guides/prog_guide/bbdev.rst
+++ b/doc/guides/prog_guide/bbdev.rst
@@ -747,6 +747,9 @@ given below.
 |RTE_BBDEV_LDPC_ENC_CONCATENATION|
 | Set if a device supports concatenation of non byte aligned output  |
 ++
+|RTE_BBDEV_LDPC_ENC_NETWORK_ORDER|
+| Set if a device supports network order data processing |
+++

 The structure passed for each LDPC encode operation is given below,
 with the operation flags forming a bitmask in the ``op_flags`` field.
@@ -942,6 +945,9 @@ given below.
 |RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_LOOPBACK|
 | Set if a device supports loopback access to HARQ internal memory   |
 ++
+|RTE_BBDEV_LDPC_DEC_NETWORK_ORDER|
+| Set if a device supports network order data processing |
+++

 The structure passed for each LDPC decode operation is given below,
 with the operation flags forming a bitmask in the ``op_flags`` field.
diff --git a/lib/bbdev/rte_bbdev_op.h b/lib/bbdev/rte_bbdev_op.h
index f946842727..8fab617768 100644
--- a/lib/bbdev/rte_bbdev_op.h
+++ b/lib/bbdev/rte_bbdev_op.h
@@ -186,7 +186,9 @@ enum rte_bbdev_op_ldpcdec_flag_bitmasks {
 *  for HARQ memory. If not set, it is assumed the filler bits are not
 *  in HARQ memory and handled directly by the LDPC decoder.
 */
-   RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_FILLERS = (1ULL << 18)
+   RTE_BBDEV_LDPC_INTERNAL_HARQ_MEMORY_FILLERS = (1ULL << 18),
+   /** Set if a device supports network order data processing */
+   RTE_BBDEV_LDPC_DEC_NETWORK_ORDER = (1ULL << 19)
 };

 /** Flags for LDPC encoder operation and capability structure */
@@ -206,7 +208,9 @@ enum rte_bbdev_op_ldpcenc_flag_bitmasks {
/** Set if a device supports scatter-gather functionality. */
RTE_BBDEV_LDPC_ENC_SCATTER_GATHER = (1ULL << 6),
/** Set if a device supports concatenation of non byte aligned output */
-   RTE_BBDEV_LDPC_ENC_CONCATENATION = (1ULL << 7)
+   RTE_BBDEV_LDPC_ENC_CONCATENATION = (1ULL << 7),
+   /** Set if a device supports network order data processing */
+   RTE_BBDEV_LDPC_ENC_NETWORK_ORDER = (1ULL << 8)
 };

 /** Flags for the Code Block/Transport block mode  */
--
2.17.1

[dpdk-dev] [PATCH v2 00/33] Marvell CNXK Event device Driver

[pbhagavatula]

From: Pavan Nikhilesh 

This patchset adds support for Marvell CN106XX SoC based on 'common/cnxk'
driver. In future, CN9K a.k.a octeontx2 will also be supported by same
driver when code is ready and 'event/octeontx2' will be deprecated.

v2 Changes:
- Split Rx/Tx adapter into seperate patch set to remove dependency on net/cnxk
- Add missing xStats patch.
- Fix incorrect head wait operation.

Pavan Nikhilesh (16):
  event/cnxk: add build infra and device setup
  event/cnxk: add platform specific device probe
  event/cnxk: add common configuration validation
  event/cnxk: allocate event inflight buffers
  event/cnxk: add devargs to configure getwork mode
  event/cnxk: add SSO HW device operations
  event/cnxk: add SSO GWS fastpath enqueue functions
  event/cnxk: add SSO GWS dequeue fastpath functions
  event/cnxk: add SSO selftest and dump
  event/cnxk: add event port and queue xstats
  event/cnxk: add devargs to disable NPA
  event/cnxk: allow adapters to resize inflights
  event/cnxk: add TIM bucket operations
  event/cnxk: add timer arm routine
  event/cnxk: add timer arm timeout burst
  event/cnxk: add timer cancel function

Shijith Thotton (17):
  event/cnxk: add device capabilities function
  event/cnxk: add platform specific device config
  event/cnxk: add event queue config functions
  event/cnxk: add devargs for inflight buffer count
  event/cnxk: add devargs to control SSO HWGRP QoS
  event/cnxk: add port config functions
  event/cnxk: add event port link and unlink
  event/cnxk: add device start function
  event/cnxk: add device stop and close functions
  event/cnxk: support event timer
  event/cnxk: add timer adapter capabilities
  event/cnxk: create and free timer adapter
  event/cnxk: add timer adapter info function
  event/cnxk: add devargs for chunk size and rings
  event/cnxk: add timer stats get and reset
  event/cnxk: add timer adapter start and stop
  event/cnxk: add devargs to control timer adapters

 MAINTAINERS |6 +
 app/test/test_eventdev.c|   14 +
 doc/guides/eventdevs/cnxk.rst   |  162 ++
 doc/guides/eventdevs/index.rst  |1 +
 drivers/common/cnxk/roc_sso.c   |   63 +
 drivers/common/cnxk/roc_sso.h   |   19 +
 drivers/event/cnxk/cn10k_eventdev.c |  509 ++
 drivers/event/cnxk/cn10k_worker.c   |  115 ++
 drivers/event/cnxk/cn10k_worker.h   |  175 +++
 drivers/event/cnxk/cn9k_eventdev.c  |  578 +++
 drivers/event/cnxk/cn9k_worker.c|  236 +++
 drivers/event/cnxk/cn9k_worker.h|  297 
 drivers/event/cnxk/cnxk_eventdev.c  |  647 
 drivers/event/cnxk/cnxk_eventdev.h  |  253 +++
 drivers/event/cnxk/cnxk_eventdev_adptr.c|   67 +
 drivers/event/cnxk/cnxk_eventdev_selftest.c | 1570 +++
 drivers/event/cnxk/cnxk_eventdev_stats.c|  289 
 drivers/event/cnxk/cnxk_tim_evdev.c |  538 +++
 drivers/event/cnxk/cnxk_tim_evdev.h |  275 
 drivers/event/cnxk/cnxk_tim_worker.c|  191 +++
 drivers/event/cnxk/cnxk_tim_worker.h|  601 +++
 drivers/event/cnxk/cnxk_worker.h|  101 ++
 drivers/event/cnxk/meson.build  |   23 +
 drivers/event/cnxk/version.map  |3 +
 drivers/event/meson.build   |1 +
 25 files changed, 6734 insertions(+)
 create mode 100644 doc/guides/eventdevs/cnxk.rst
 create mode 100644 drivers/event/cnxk/cn10k_eventdev.c
 create mode 100644 drivers/event/cnxk/cn10k_worker.c
 create mode 100644 drivers/event/cnxk/cn10k_worker.h
 create mode 100644 drivers/event/cnxk/cn9k_eventdev.c
 create mode 100644 drivers/event/cnxk/cn9k_worker.c
 create mode 100644 drivers/event/cnxk/cn9k_worker.h
 create mode 100644 drivers/event/cnxk/cnxk_eventdev.c
 create mode 100644 drivers/event/cnxk/cnxk_eventdev.h
 create mode 100644 drivers/event/cnxk/cnxk_eventdev_adptr.c
 create mode 100644 drivers/event/cnxk/cnxk_eventdev_selftest.c
 create mode 100644 drivers/event/cnxk/cnxk_eventdev_stats.c
 create mode 100644 drivers/event/cnxk/cnxk_tim_evdev.c
 create mode 100644 drivers/event/cnxk/cnxk_tim_evdev.h
 create mode 100644 drivers/event/cnxk/cnxk_tim_worker.c
 create mode 100644 drivers/event/cnxk/cnxk_tim_worker.h
 create mode 100644 drivers/event/cnxk/cnxk_worker.h
 create mode 100644 drivers/event/cnxk/meson.build
 create mode 100644 drivers/event/cnxk/version.map

--
2.17.1

[dpdk-dev] [PATCH v2 01/33] event/cnxk: add build infra and device setup

[pbhagavatula]

From: Pavan Nikhilesh 

Add meson build infra structure along with the event device
SSO initialization and teardown functions.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 MAINTAINERS|  6 +++
 doc/guides/eventdevs/cnxk.rst  | 55 
 doc/guides/eventdevs/index.rst |  1 +
 drivers/event/cnxk/cnxk_eventdev.c | 68 ++
 drivers/event/cnxk/cnxk_eventdev.h | 39 +
 drivers/event/cnxk/meson.build | 13 ++
 drivers/event/cnxk/version.map |  3 ++
 drivers/event/meson.build  |  1 +
 8 files changed, 186 insertions(+)
 create mode 100644 doc/guides/eventdevs/cnxk.rst
 create mode 100644 drivers/event/cnxk/cnxk_eventdev.c
 create mode 100644 drivers/event/cnxk/cnxk_eventdev.h
 create mode 100644 drivers/event/cnxk/meson.build
 create mode 100644 drivers/event/cnxk/version.map

diff --git a/MAINTAINERS b/MAINTAINERS
index 44f3d322e..d1ae33d48 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1224,6 +1224,12 @@ M: Jerin Jacob 
 F: drivers/event/octeontx2/
 F: doc/guides/eventdevs/octeontx2.rst
 
+Marvell OCTEON CNXK
+M: Pavan Nikhilesh 
+M: Shijith Thotton 
+F: drivers/event/cnxk/
+F: doc/guides/eventdevs/cnxk.rst
+
 NXP DPAA eventdev
 M: Hemant Agrawal 
 M: Nipun Gupta 
diff --git a/doc/guides/eventdevs/cnxk.rst b/doc/guides/eventdevs/cnxk.rst
new file mode 100644
index 0..e94225bd3
--- /dev/null
+++ b/doc/guides/eventdevs/cnxk.rst
@@ -0,0 +1,55 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2021 Marvell International Ltd.
+
+OCTEON CNXK SSO Eventdev Driver
+==
+
+The SSO PMD (**librte_event_cnxk**) and provides poll mode
+eventdev driver support for the inbuilt event device found in the
+**Marvell OCTEON CNXK** SoC family.
+
+More information about OCTEON CNXK SoC can be found at `Marvell Official 
Website
+`_.
+
+Supported OCTEON CNXK SoCs
+--
+
+- CN9XX
+- CN10XX
+
+Features
+
+
+Features of the OCTEON CNXK SSO PMD are:
+
+- 256 Event queues
+- 26 (dual) and 52 (single) Event ports on CN10XX
+- 52 Event ports on CN9XX
+- HW event scheduler
+- Supports 1M flows per event queue
+- Flow based event pipelining
+- Flow pinning support in flow based event pipelining
+- Queue based event pipelining
+- Supports ATOMIC, ORDERED, PARALLEL schedule types per flow
+- Event scheduling QoS based on event queue priority
+- Open system with configurable amount of outstanding events limited only by
+  DRAM
+- HW accelerated dequeue timeout support to enable power management
+
+Prerequisites and Compilation procedure
+---
+
+   See :doc:`../platform/cnxk` for setup information.
+
+Debugging Options
+-
+
+.. _table_octeon_cnxk_event_debug_options:
+
+.. table:: OCTEON CNXK event device debug options
+
+   +---++---+
+   | # | Component  | EAL log command   |
+   +===++===+
+   | 1 | SSO| --log-level='pmd\.event\.cnxk,8'  |
+   +---++---+
diff --git a/doc/guides/eventdevs/index.rst b/doc/guides/eventdevs/index.rst
index 738788d9e..214302539 100644
--- a/doc/guides/eventdevs/index.rst
+++ b/doc/guides/eventdevs/index.rst
@@ -11,6 +11,7 @@ application through the eventdev API.
 :maxdepth: 2
 :numbered:
 
+cnxk
 dlb2
 dpaa
 dpaa2
diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
new file mode 100644
index 0..b7f9c81bd
--- /dev/null
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -0,0 +1,68 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell International Ltd.
+ */
+
+#include "cnxk_eventdev.h"
+
+int
+cnxk_sso_init(struct rte_eventdev *event_dev)
+{
+   const struct rte_memzone *mz = NULL;
+   struct rte_pci_device *pci_dev;
+   struct cnxk_sso_evdev *dev;
+   int rc;
+
+   mz = rte_memzone_reserve(CNXK_SSO_MZ_NAME, sizeof(uint64_t),
+SOCKET_ID_ANY, 0);
+   if (mz == NULL) {
+   plt_err("Failed to create eventdev memzone");
+   return -ENOMEM;
+   }
+
+   dev = cnxk_sso_pmd_priv(event_dev);
+   pci_dev = container_of(event_dev->dev, struct rte_pci_device, device);
+   dev->sso.pci_dev = pci_dev;
+
+   *(uint64_t *)mz->addr = (uint64_t)dev;
+
+   /* Initialize the base cnxk_dev object */
+   rc = roc_sso_dev_init(&dev->sso);
+   if (rc < 0) {
+   plt_err("Failed to initialize RoC SSO rc=%d", rc);
+   goto error;
+   }
+
+   dev->is_timeout_deq = 0;
+   dev->min_dequeue_timeout_ns = USEC2NSEC(1);
+   dev->max_dequeue_tim

[dpdk-dev] [PATCH v2 02/33] event/cnxk: add device capabilities function

[pbhagavatula]

From: Shijith Thotton 

Add the info_get function to return details on the queues, flow,
prioritization capabilities, etc. which this device has.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cnxk_eventdev.c | 24 
 drivers/event/cnxk/cnxk_eventdev.h |  4 
 2 files changed, 28 insertions(+)

diff --git a/drivers/event/cnxk/cnxk_eventdev.c 
b/drivers/event/cnxk/cnxk_eventdev.c
index b7f9c81bd..ae553fd23 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -4,6 +4,30 @@
 
 #include "cnxk_eventdev.h"
 
+void
+cnxk_sso_info_get(struct cnxk_sso_evdev *dev,
+ struct rte_event_dev_info *dev_info)
+{
+
+   dev_info->min_dequeue_timeout_ns = dev->min_dequeue_timeout_ns;
+   dev_info->max_dequeue_timeout_ns = dev->max_dequeue_timeout_ns;
+   dev_info->max_event_queues = dev->max_event_queues;
+   dev_info->max_event_queue_flows = (1ULL << 20);
+   dev_info->max_event_queue_priority_levels = 8;
+   dev_info->max_event_priority_levels = 1;
+   dev_info->max_event_ports = dev->max_event_ports;
+   dev_info->max_event_port_dequeue_depth = 1;
+   dev_info->max_event_port_enqueue_depth = 1;
+   dev_info->max_num_events = dev->max_num_events;
+   dev_info->event_dev_cap = RTE_EVENT_DEV_CAP_QUEUE_QOS |
+ RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED |
+ RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES |
+ RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK |
+ RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT |
+ RTE_EVENT_DEV_CAP_NONSEQ_MODE |
+ RTE_EVENT_DEV_CAP_CARRY_FLOW_ID;
+}
+
 int
 cnxk_sso_init(struct rte_eventdev *event_dev)
 {
diff --git a/drivers/event/cnxk/cnxk_eventdev.h 
b/drivers/event/cnxk/cnxk_eventdev.h
index 148b327a1..583492948 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -17,6 +17,8 @@
 
 struct cnxk_sso_evdev {
struct roc_sso sso;
+   uint8_t max_event_queues;
+   uint8_t max_event_ports;
uint8_t is_timeout_deq;
uint8_t nb_event_queues;
uint8_t nb_event_ports;
@@ -35,5 +37,7 @@ cnxk_sso_pmd_priv(const struct rte_eventdev *event_dev)
 int cnxk_sso_init(struct rte_eventdev *event_dev);
 int cnxk_sso_fini(struct rte_eventdev *event_dev);
 int cnxk_sso_remove(struct rte_pci_device *pci_dev);
+void cnxk_sso_info_get(struct cnxk_sso_evdev *dev,
+  struct rte_event_dev_info *dev_info);
 
 #endif /* __CNXK_EVENTDEV_H__ */
-- 
2.17.1

[dpdk-dev] [PATCH v2 05/33] event/cnxk: add platform specific device config

[pbhagavatula]

From: Shijith Thotton 

Add platform specific event device configuration that attaches the
requested number of SSO HWS(event ports) and HWGRP(event queues) LFs
to the RVU PF/VF.

Signed-off-by: Shijith Thotton 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cn10k_eventdev.c | 35 +++
 drivers/event/cnxk/cn9k_eventdev.c  | 37 +
 2 files changed, 72 insertions(+)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 34238d3b5..352df88fc 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -16,6 +16,14 @@ cn10k_sso_set_rsrc(void *arg)
  dev->sso.max_hwgrp;
 }
 
+static int
+cn10k_sso_rsrc_init(void *arg, uint8_t hws, uint8_t hwgrp)
+{
+   struct cnxk_sso_evdev *dev = arg;
+
+   return roc_sso_rsrc_init(&dev->sso, hws, hwgrp);
+}
+
 static void
 cn10k_sso_info_get(struct rte_eventdev *event_dev,
   struct rte_event_dev_info *dev_info)
@@ -26,8 +34,35 @@ cn10k_sso_info_get(struct rte_eventdev *event_dev,
cnxk_sso_info_get(dev, dev_info);
 }
 
+static int
+cn10k_sso_dev_configure(const struct rte_eventdev *event_dev)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+   int rc;
+
+   rc = cnxk_sso_dev_validate(event_dev);
+   if (rc < 0) {
+   plt_err("Invalid event device configuration");
+   return -EINVAL;
+   }
+
+   roc_sso_rsrc_fini(&dev->sso);
+
+   rc = cn10k_sso_rsrc_init(dev, dev->nb_event_ports,
+dev->nb_event_queues);
+   if (rc < 0) {
+   plt_err("Failed to initialize SSO resources");
+   return -ENODEV;
+   }
+
+   return rc;
+}
+
 static struct rte_eventdev_ops cn10k_sso_dev_ops = {
.dev_infos_get = cn10k_sso_info_get,
+   .dev_configure = cn10k_sso_dev_configure,
+   .queue_def_conf = cnxk_sso_queue_def_conf,
+   .port_def_conf = cnxk_sso_port_def_conf,
 };
 
 static int
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index 238540828..126388a23 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -22,6 +22,17 @@ cn9k_sso_set_rsrc(void *arg)
  dev->sso.max_hwgrp;
 }
 
+static int
+cn9k_sso_rsrc_init(void *arg, uint8_t hws, uint8_t hwgrp)
+{
+   struct cnxk_sso_evdev *dev = arg;
+
+   if (dev->dual_ws)
+   hws = hws * CN9K_DUAL_WS_NB_WS;
+
+   return roc_sso_rsrc_init(&dev->sso, hws, hwgrp);
+}
+
 static void
 cn9k_sso_info_get(struct rte_eventdev *event_dev,
  struct rte_event_dev_info *dev_info)
@@ -32,8 +43,34 @@ cn9k_sso_info_get(struct rte_eventdev *event_dev,
cnxk_sso_info_get(dev, dev_info);
 }
 
+static int
+cn9k_sso_dev_configure(const struct rte_eventdev *event_dev)
+{
+   struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev);
+   int rc;
+
+   rc = cnxk_sso_dev_validate(event_dev);
+   if (rc < 0) {
+   plt_err("Invalid event device configuration");
+   return -EINVAL;
+   }
+
+   roc_sso_rsrc_fini(&dev->sso);
+
+   rc = cn9k_sso_rsrc_init(dev, dev->nb_event_ports, dev->nb_event_queues);
+   if (rc < 0) {
+   plt_err("Failed to initialize SSO resources");
+   return -ENODEV;
+   }
+
+   return rc;
+}
+
 static struct rte_eventdev_ops cn9k_sso_dev_ops = {
.dev_infos_get = cn9k_sso_info_get,
+   .dev_configure = cn9k_sso_dev_configure,
+   .queue_def_conf = cnxk_sso_queue_def_conf,
+   .port_def_conf = cnxk_sso_port_def_conf,
 };
 
 static int
-- 
2.17.1