Re: [PATCH] Fix RISC-V builds

[David Marchand]

Hello,

On Mon, May 30, 2022 at 4:11 PM Heinrich Schuchardt
 wrote:
>
> Building on RISC-V results in an error
>
> cc: error: ‘-march=native’: ISA string must begin with rv32 or rv64
>
> As GCC does not support -march=native on RISC-V avoid this argument.
>
> Signed-off-by: Heinrich Schuchardt 

I am finalizing the RISC-V merge for -rc1, this fix can be merged
later as we only have cross compilation in GHA with the initial
series.


> ---
>  meson.build | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 507c146..bbf4650 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -17,7 +17,10 @@ pktgen_conf = configuration_data()
>  # set up some global vars for compiler, platform, configuration, etc.
>  cc = meson.get_compiler('c')
>
> -add_project_arguments('-march=native', language: 'c')
> +target = target_machine.cpu_family()
> +if (target != 'riscv64')
> +add_project_arguments('-march=native', language: 'c')
> +endif

Would the below snippet work?

cc.has_argument('-march=native'')
add_project_arguments('-march=native', language: 'c')
endif

>
>  if get_option('enable-avx') and cc.has_argument('-mavx')
>  add_project_arguments('-mavx', language: 'c')
> --
> 2.36.1
>


-- 
David Marchand

Re: [PATCH 1/2] docs/bpf: fix formatting and link

[Thomas Monjalon]

28/05/2022 13:09, Konstantin Ananyev:
> 27/05/2022 14:45, Harry van Haaren пишет:
> > Small improvements to the documentation based on Sphinx HTML doc output.
> > 
> > Signed-off-by: Harry van Haaren 
> 
> Acked-by: Konstantin Ananyev 

Fixes: 14b8f0bbe519 ("doc: add BPF library guide")
Fixes: b901d928361c ("bpf: support packet data load instructions")
Cc: sta...@dpdk.org

Series applied, thanks.

Re: [PATCH 6/6] net/vhost: perform SW checksum in Tx path

[Maxime Coquelin]

Hi Wenwu,

On 6/6/22 11:44, Ma, WenwuX wrote:




-Original Message-
From: Maxime Coquelin 
Sent: 2022年6月2日 17:07
To: Ma, WenwuX ; dev@dpdk.org;
jasow...@redhat.com; Xia, Chenbo ;
david.march...@redhat.com; Matz, Olivier 
Cc: sta...@dpdk.org
Subject: Re: [PATCH 6/6] net/vhost: perform SW checksum in Tx path

Hi Wenwu,

Sorry, I missed your review.

On 5/7/22 05:20, Ma, WenwuX wrote:



-Original Message-
From: Maxime Coquelin 
Sent: 2022年5月5日 18:27
To: dev@dpdk.org; jasow...@redhat.com; Xia, Chenbo
; david.march...@redhat.com;
olivier.m...@6wind.com
Cc: sta...@dpdk.org; Maxime Coquelin 
Subject: [PATCH 6/6] net/vhost: perform SW checksum in Tx path

Virtio specification supports guest checksum offloading for L4, which
is enabled with VIRTIO_NET_F_GUEST_CSUM feature negotiation.

However,

the Vhost PMD does not advertise Tx checksum offload capabilities.

Advertising these offload capabilities at the ethdev level is not
enough, because we could still end-up with the application enabling
these offloads while the guest not negotiating it.

This patch advertizes the Tx checksum offload capabilities, and
introduces a compatibility layer to cover the case
VIRTIO_NET_F_GUEST_CSUM has not been negotiated but the

application

does configure the Tx checksum offloads. This function performs the L4 Tx

checksum in SW for UDP and TCP.

Compared to Rx SW checksum, the Tx SW checksum function needs to
compute the pseudo-header checksum, as we cannot knwo whether it

was

done before.

This patch does not advertize SCTP checksum offloading capability for
now, but it could be handled later if the need arises.


In virtio_enqueue_offload(), if RTE_MBUF_F_TX_IP_CKSUM is set, we will
performs the L3 Tx checksum, why do not we advertise IPV4 checksum

offloading capability?

Will we advertise it later?



Indeed, we have an IPv4 SW checksum fallback in Vhost library.
We could think about adding the capability, but that's not urgent I think. Do
you have a use-case where it is needed?


The GRO/GSO library doesn't re-calculate IPv4 checksums for merged/fragmented 
packets, it will cause iperf in the vm to fail.


Can you please elaborate?

If we don't expose the IPv4 checksum availability, it would be done by
the application using the Vhost PMD, so the result will be the same from
the VM point of view. Am I missing something?

Thanks,
Maxime


Regards,
Maxime

Re: [RFC 8/8] ip_frag: fix gcc-12 warnings

[Konstantin Ananyev]

07/06/2022 18:17, Stephen Hemminger пишет:

The function rte_memcpy can derference past source buffer which
will cause array out of bounds warnings. But there is no good reason
to use rte_memcpy instead of memcpy in this code. Memcpy is just
as fast for these small inputs, and compiler will optimize.



AFAIK, rte_memcpy() will outperform memcpy() when _size_ parameter
is a variable. Unfortunately that's exactly the case here.
So not sure it is a good change, at least without extensive perf testing.
BTW, if rte_memcpy() really access src buffer beyond it's boundaries,
I think that's definitely a bug that needs to be fixed.




Signed-off-by: Stephen Hemminger 
---
  lib/ip_frag/rte_ipv4_fragmentation.c | 7 +++
  1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/ip_frag/rte_ipv4_fragmentation.c 
b/lib/ip_frag/rte_ipv4_fragmentation.c
index a19f6fda6408..27a8ad224dec 100644
--- a/lib/ip_frag/rte_ipv4_fragmentation.c
+++ b/lib/ip_frag/rte_ipv4_fragmentation.c
@@ -5,7 +5,6 @@
  #include 
  #include 
  
-#include 

  #include 
  
  #include "ip_frag_common.h"

@@ -26,7 +25,7 @@ static inline void __fill_ipv4hdr_frag(struct rte_ipv4_hdr 
*dst,
const struct rte_ipv4_hdr *src, uint16_t header_len,
uint16_t len, uint16_t fofs, uint16_t dofs, uint32_t mf)
  {
-   rte_memcpy(dst, src, header_len);
+   memcpy(dst, src, header_len);
fofs = (uint16_t)(fofs + (dofs >> RTE_IPV4_HDR_FO_SHIFT));
fofs = (uint16_t)(fofs | mf << RTE_IPV4_HDR_MF_SHIFT);
dst->fragment_offset = rte_cpu_to_be_16(fofs);
@@ -48,7 +47,7 @@ static inline uint16_t __create_ipopt_frag_hdr(uint8_t *iph,
struct rte_ipv4_hdr *iph_opt = (struct rte_ipv4_hdr *)ipopt_frag_hdr;
  
  	ipopt_len = 0;

-   rte_memcpy(ipopt_frag_hdr, iph, sizeof(struct rte_ipv4_hdr));
+   memcpy(ipopt_frag_hdr, iph, sizeof(struct rte_ipv4_hdr));
ipopt_frag_hdr += sizeof(struct rte_ipv4_hdr);
  
  	uint8_t *p_opt = iph + sizeof(struct rte_ipv4_hdr);

@@ -65,7 +64,7 @@ static inline uint16_t __create_ipopt_frag_hdr(uint8_t *iph,
break;
  
  		if (RTE_IPV4_HDR_OPT_COPIED(*p_opt)) {

-   rte_memcpy(ipopt_frag_hdr + ipopt_len,
+   memcpy(ipopt_frag_hdr + ipopt_len,
p_opt, p_opt[1]);
ipopt_len += p_opt[1];
}

Re: [PATCH 3/6] net/vhost: enable compliant offloading mode

[Maxime Coquelin]

Hi Wenwu,

On 6/7/22 03:19, Ma, WenwuX wrote:

Hi Maxime,


-Original Message-
From: Xia, Chenbo 
Sent: 2022年5月16日 21:40
To: Maxime Coquelin ; dev@dpdk.org;
jasow...@redhat.com; david.march...@redhat.com;
olivier.m...@6wind.com
Cc: sta...@dpdk.org
Subject: RE: [PATCH 3/6] net/vhost: enable compliant offloading mode


-Original Message-
From: Maxime Coquelin 
Sent: Monday, May 16, 2022 9:29 PM
To: Xia, Chenbo ; dev@dpdk.org;
jasow...@redhat.com; david.march...@redhat.com;

olivier.m...@6wind.com

Cc: sta...@dpdk.org
Subject: Re: [PATCH 3/6] net/vhost: enable compliant offloading mode

Hi Chenbo,

On 5/16/22 15:26, Xia, Chenbo wrote:

Hi Maxime,


-Original Message-
From: Maxime Coquelin 
Sent: Thursday, May 5, 2022 6:27 PM
To: dev@dpdk.org; jasow...@redhat.com; Xia, Chenbo

;

david.march...@redhat.com; olivier.m...@6wind.com
Cc: sta...@dpdk.org; Maxime Coquelin 
Subject: [PATCH 3/6] net/vhost: enable compliant offloading mode

This patch enables the compliant offloading flags mode by default,
which prevents the Rx path to set Tx offload flags, which is
illegal. A new legacy-ol-flags devarg is introduced to enable the
legacy behaviour.

Signed-off-by: Maxime Coquelin 
---
   doc/guides/nics/vhost.rst |  6 ++
   drivers/net/vhost/rte_eth_vhost.c | 19 ---
   2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/doc/guides/nics/vhost.rst b/doc/guides/nics/vhost.rst
index ee802ec4a8..d7c0e2ade8 100644
--- a/doc/guides/nics/vhost.rst
+++ b/doc/guides/nics/vhost.rst
@@ -64,6 +64,12 @@ The user can specify below arguments in `--vdev`

option.

   It is used to enable external buffer support in vhost library.
   (Default: 0 (disabled))

+#.  ``legacy-ol-flags``:
+
+It is used to restore legacy behavior for offloading that was not
+compliant with offloading API.
+(Default: 0 (disabled))
+
   Vhost PMD event handling
   

diff --git a/drivers/net/vhost/rte_eth_vhost.c
b/drivers/net/vhost/rte_eth_vhost.c
index 070f0e6dfd..0a2e8d9b29 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -31,9 +31,10 @@ enum {VIRTIO_RXQ, VIRTIO_TXQ,

VIRTIO_QNUM};

   #define ETH_VHOST_CLIENT_ARG "client"
   #define ETH_VHOST_IOMMU_SUPPORT  "iommu-support"
   #define ETH_VHOST_POSTCOPY_SUPPORT   "postcopy-support"
-#define ETH_VHOST_VIRTIO_NET_F_HOST_TSO "tso"
-#define ETH_VHOST_LINEAR_BUF  "linear-buffer"
-#define ETH_VHOST_EXT_BUF  "ext-buffer"
+#define ETH_VHOST_VIRTIO_NET_F_HOST_TSO"tso"
+#define ETH_VHOST_LINEAR_BUF   "linear-buffer"
+#define ETH_VHOST_EXT_BUF  "ext-buffer"
+#define ETH_VHOST_LEGACY_OL_FLAGS  "legacy-ol-flags"
   #define VHOST_MAX_PKT_BURST 32



ETH_VHOST_LEGACY_OL_FLAGS should be added into valid_arguments array.

static const char *valid_arguments[] = {
 ETH_VHOST_IFACE_ARG,
 ETH_VHOST_QUEUES_ARG,
 ETH_VHOST_CLIENT_ARG,
 ETH_VHOST_IOMMU_SUPPORT,
 ETH_VHOST_POSTCOPY_SUPPORT,
 ETH_VHOST_VIRTIO_NET_F_HOST_TSO,
 ETH_VHOST_LINEAR_BUF,
 ETH_VHOST_EXT_BUF,
 NULL
};


Thanks, good catch!
I missed to test this new devarg addition, fixing it for v2.

Maxime

Re: Lgtm scan of DPDK

[Thomas Monjalon]

28/05/2022 01:12, Stephen Hemminger:
> I just discovered that there is another tool similar to Coverity for scanning.
> It gives different results, and might be useful.
> The scans of github open source projects is already done.
> 
> See: https://lgtm.com/projects/g/DPDK/dpdk
> 
> Shows 19 errors, 263 warnings and 111 recommendations.
> 
> Of course, some of these are bogus. For example, tool thinks are scripts are 
> Python 2.

The problem is that we already invest some time in Coverity triage
to mark false positives.
Can you check whether this tool has some false positives?

Re: [dpdk-dev] [PATCH v1] build: ccache support for cross build

[Jerin Jacob]

On Thu, Jun 2, 2022 at 5:30 PM Jerin Jacob  wrote:
>
> On Thu, Jun 2, 2022 at 4:25 PM Thomas Monjalon  wrote:
> >
> > 02/06/2022 11:43, Jerin Jacob:
> > > On Thu, Jun 2, 2022 at 3:11 PM Bruce Richardson
> > >  wrote:
> > > >
> > > > On Thu, Jun 02, 2022 at 02:53:55PM +0530, jer...@marvell.com wrote:
> > > > > From: Jerin Jacob 
> > > > >
> > > > > By default, ccache is not used for cross build[1].
> > > > > Update all cross files to use ccache if it is available
> > > > > in build machine.
> > > > >
> > > > > [1]
> > > > > https://mesonbuild.com/Machine-files.html
> > > > >
> > > > > Signed-off-by: Jerin Jacob 
> > > >
> > > > Does this still work even if ccache is not available? That's not fully
> > >
> > > Yes.
> > >
> > > > clear from the docs, but it seems to be that if an array is passed the
> > > > whole array is used as the command, rather than just one element of the
> > > > array. That would imply that cross-builds now require ccache. Is that
> > > > acceptable?
> > >
> > > I have removed ccache from the build machine still it works.
> >
> > I don't understand why it works without ccache.
>
> Meson is detecting valid compiler prefix. ccache is one of them.
>
> See
> https://github.com/fabio-porcedda/meson/commit/44db495f5ece43645ca3994dc95895c76a828530
> https://github.com/mesonbuild/meson/issues/1392

I hope there are no other review comments to fix it for this patch.
Since it is improving the build time for cross-build. If there is no
objection to this patch, Please merge it.


>
>
>
> >
> > In general, I would prefer we have a mechanism to update the cross file
> > on the fly, depending on the setup.
>
> I believe, It would be a departure from the meson cross-file concept.
>
> > We have this for toolchain prefix name.
> > The prefix depends on where the toochain comes from.
> > In a "normal" build system, we set the prefix with an environment variable,
> > not by writing a file.
> >
> >

[PATCH] vdpa/ifc: fix null pointer dereference

[Andy Pei]

Fix null pointer dereference reported in coverity scan.

Coverity issue: 378882
Fixes: 8162a4a9 ("vdpa/ifc/base: access correct register for blk device")
Signed-off-by: Andy Pei 
---
 drivers/vdpa/ifc/base/ifcvf.c | 9 +
 1 file changed, 9 insertions(+)

diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c
index dd475a7..0a9f71a 100644
--- a/drivers/vdpa/ifc/base/ifcvf.c
+++ b/drivers/vdpa/ifc/base/ifcvf.c
@@ -255,6 +255,10 @@
u32 ring_state;
 
cfg = hw->common_cfg;
+   if (!cfg) {
+   DEBUGOUT("common_cfg in HW is NULL.\n");
+   return;
+   }
 
IFCVF_WRITE_REG16(IFCVF_MSI_NO_VECTOR, &cfg->msix_config);
for (i = 0; i < hw->nr_vring; i++) {
@@ -262,6 +266,11 @@
IFCVF_WRITE_REG16(0, &cfg->queue_enable);
IFCVF_WRITE_REG16(IFCVF_MSI_NO_VECTOR, &cfg->queue_msix_vector);
 
+   if (!hw->lm_cfg) {
+   DEBUGOUT("live migration cfg in HW is NULL.\n");
+   continue;
+   }
+
if (hw->device_type == IFCVF_BLK)
ring_state = *(u32 *)(hw->lm_cfg +
IFCVF_LM_RING_STATE_OFFSET +
-- 
1.8.3.1

RE: [PATCH] vdpa/ifc: fix null pointer dereference

[Wang, Xiao W]

Hi

> -Original Message-
> From: Pei, Andy 
> Sent: Wednesday, June 8, 2022 3:34 PM
> To: dev@dpdk.org
> Cc: Xia, Chenbo ; maxime.coque...@redhat.com;
> Wang, Xiao W ; Xu, Rosen ;
> Xiao, QimaiX 
> Subject: [PATCH] vdpa/ifc: fix null pointer dereference
> 
> Fix null pointer dereference reported in coverity scan.
> 
> Coverity issue: 378882
> Fixes: 8162a4a9 ("vdpa/ifc/base: access correct register for blk device")
> Signed-off-by: Andy Pei 
> ---
>  drivers/vdpa/ifc/base/ifcvf.c | 9 +
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/vdpa/ifc/base/ifcvf.c b/drivers/vdpa/ifc/base/ifcvf.c
> index dd475a7..0a9f71a 100644
> --- a/drivers/vdpa/ifc/base/ifcvf.c
> +++ b/drivers/vdpa/ifc/base/ifcvf.c
> @@ -255,6 +255,10 @@
>   u32 ring_state;
> 
>   cfg = hw->common_cfg;
> + if (!cfg) {
> + DEBUGOUT("common_cfg in HW is NULL.\n");
> + return;
> + }
> 
>   IFCVF_WRITE_REG16(IFCVF_MSI_NO_VECTOR, &cfg->msix_config);
>   for (i = 0; i < hw->nr_vring; i++) {
> @@ -262,6 +266,11 @@
>   IFCVF_WRITE_REG16(0, &cfg->queue_enable);
>   IFCVF_WRITE_REG16(IFCVF_MSI_NO_VECTOR, &cfg-
> >queue_msix_vector);
> 
> + if (!hw->lm_cfg) {
> + DEBUGOUT("live migration cfg in HW is NULL.\n");
> + continue;
> + }
> +
>   if (hw->device_type == IFCVF_BLK)
>   ring_state = *(u32 *)(hw->lm_cfg +
>   IFCVF_LM_RING_STATE_OFFSET +
> --
> 1.8.3.1

Acked-by: Xiao Wang 

BRs,
Xiao

Re: [dpdk-dev] [PATCH v1] build: ccache support for cross build

[Thomas Monjalon]

08/06/2022 10:22, Jerin Jacob:
> On Thu, Jun 2, 2022 at 5:30 PM Jerin Jacob  wrote:
> >
> > On Thu, Jun 2, 2022 at 4:25 PM Thomas Monjalon  wrote:
> > >
> > > 02/06/2022 11:43, Jerin Jacob:
> > > > On Thu, Jun 2, 2022 at 3:11 PM Bruce Richardson
> > > >  wrote:
> > > > >
> > > > > On Thu, Jun 02, 2022 at 02:53:55PM +0530, jer...@marvell.com wrote:
> > > > > > From: Jerin Jacob 
> > > > > >
> > > > > > By default, ccache is not used for cross build[1].
> > > > > > Update all cross files to use ccache if it is available
> > > > > > in build machine.
> > > > > >
> > > > > > [1]
> > > > > > https://mesonbuild.com/Machine-files.html
> > > > > >
> > > > > > Signed-off-by: Jerin Jacob 
> > > > >
> > > > > Does this still work even if ccache is not available? That's not fully
> > > >
> > > > Yes.
> > > >
> > > > > clear from the docs, but it seems to be that if an array is passed the
> > > > > whole array is used as the command, rather than just one element of 
> > > > > the
> > > > > array. That would imply that cross-builds now require ccache. Is that
> > > > > acceptable?
> > > >
> > > > I have removed ccache from the build machine still it works.
> > >
> > > I don't understand why it works without ccache.
> >
> > Meson is detecting valid compiler prefix. ccache is one of them.
> >
> > See
> > https://github.com/fabio-porcedda/meson/commit/44db495f5ece43645ca3994dc95895c76a828530
> > https://github.com/mesonbuild/meson/issues/1392
> 
> I hope there are no other review comments to fix it for this patch.
> Since it is improving the build time for cross-build. If there is no
> objection to this patch, Please merge it.

I've tested it now and I see a big blocker.
This patch is breaking the use of devtools/test-meson-builds.sh
so I cannot merge it as-is, sorry.

RE: Lgtm scan of DPDK

[Mcnamara, John]

> -Original Message-
> From: Thomas Monjalon 
> Sent: Wednesday, June 8, 2022 9:23 AM
> To: Stephen Hemminger 
> Cc: dev@dpdk.org; Mcnamara, John ;
> david.march...@redhat.com
> Subject: Re: Lgtm scan of DPDK
> 
> 28/05/2022 01:12, Stephen Hemminger:
> > I just discovered that there is another tool similar to Coverity for
> scanning.
> > It gives different results, and might be useful.
> > The scans of github open source projects is already done.
> >
> > See: https://lgtm.com/projects/g/DPDK/dpdk
> >
> > Shows 19 errors, 263 warnings and 111 recommendations.
> >
> > Of course, some of these are bogus. For example, tool thinks are scripts
> are Python 2.
> 
> The problem is that we already invest some time in Coverity triage to mark
> false positives.
> Can you check whether this tool has some false positives?

We looked at this tool a few years ago. 

Some of the good points were:

  * It is automatic and runs independently 
  * It did find some genuine issues
  * Issues have the commit ID associated with them so you could assign them to 

One of the main disadvantages was:

  * False positives can only be marked with a comment in the code

Nevertheless it is probably worth folks evaluating the issues in their own 
areas of code and in particular any of the Errors.

John

Re: [PATCH v4 1/7] devtools: add Atomic Rules acronyms for commit checks

[Ferruh Yigit]

On 6/7/2022 10:31 PM, Ed Czeck wrote:


DDM -> Downstream Data Mover
MPU -> Mbuf Prefetch Unit
UDM -> Upstream Data Mover

Signed-off-by: Ed Czeck


Acked-by: Ferruh Yigit 


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

Re: [PATCH v4 0/8] Introduce support for RISC-V architecture

[David Marchand]

On Tue, May 31, 2022 at 4:14 PM Stanislaw Kardach  wrote:
>
> This patchset adds support for building and running DPDK on 64bit RISC-V
> architecture. The initial support targets rv64gc (rv64imafdc) ISA and
> was tested on SiFive Unmatched development board with the Freedom U740
> SoC running Linux (freedom-u-sdk based kernel).
> I have tested this codebase using DPDK unit and perf tests as well as
> test-pmd, l2fwd and l3fwd examples.
> The NIC attached to the DUT was Intel X520-DA2 which uses ixgbe PMD.
> On the UIO side, since U740 does not have an IOMMU, I've used igb_uio,
> uio_pci_generic and vfio-pci noiommu drivers.
>
> Functional verification done using meson tests. fast-tests suite passing with
> the default config.
>
> PMD verification done using a Intel x520-DA2 NIC (ixgbe) and the test-pmd
> application. Packet transfer checked using all UIO drivers available for
> non-IOMMU platforms: uio_pci_generic, vfio-pci noiommu and igb_uio.
>
> The i40e PMD driver is disabled on RISC-V as the rv64gc ISA has no vector
> operations.
>
> RISCV support is currently limited to Linux as the time measurement frequency
> discovery is tied to reading a device-tree node via procfs.
>
> Clang compilation currently not supported due to issues with missing 
> relocation
> relaxation.
>
> Commit 1 introduces EAL and build system support for RISC-V architecture
>as well as documentation updates.
> Commits 2-5 add missing defines and stubs to enable RISC-V operation in
>non-EAL parts.
> Commit 6 adds RISC-V specific cpuflags test.
> Commits 7-8 add RISC-V build testing to test-meson-builds.sh and github CI.

Overall, the series lgtm.
It did not get much reviews, but the porting is straightforward and
clean enough.

I'm waiting for some compilation to finish and I will merge it for 22.07-rc1.


Some comments that will probably require some followup patches for rc2:

- I removed the known issue about --no-huge from the EAL patch.
This seems to be a generic issue that does not block the RISC V port
and can be re-submitted as a separate patch.


- I had some trouble with finding a right toolchain for test-meson-builds.sh.
The mentionned toolchains in the cross build guide don't work for me on FC36.
I managed to cross compile with a Bootlin toolchain, though I had to
adjust the cross compilation file.
I'll probably end up compiling my own toolchain later unless you have
a better idea.

At least the compilation in GHA works.


- The hardcoded pkg-config path in config/riscv/riscv64_linux_gcc does
not seem generic.
It is probably not a big issue, but I'd rather move it to a Ubuntu
specific cross compile meson file.
WDYT?


- I adjusted some coding style in some asm and some indentation and
wording in meson.


- The cross compilation guide mentions using
crossbuild-essential-riscv64 for Ubuntu.
We should switch to it in GHA.
Though after trying myself, there is an issue in the C++ headers check
in GHA for some acl header including rte_vect.h.
Can you have a look?


- There was a patch from Heinrich about native compilation, can you review it?


-- 
David Marchand

Re: [PATCH] dma/idxd: fix return value for pci device commands

[Thomas Monjalon]

07/06/2022 12:56, Walsh, Conor:
> 
> > Subject: [PATCH] dma/idxd: fix return value for pci device commands
> > 
> > When sending a command to an idxd device via pci bar, the response from
> > HW is checked to ensure it was successful. The response was incorrectly
> > being negated before being returned by the function, meaning error codes
> > cannot be checked against the HW specification.
> > 
> > This patch fixes the return values of the function by removing the
> > negation.
> > 
> > Signed-off-by: Kevin Laatz 
> 
> Acked-by: Conor Walsh 

Fixes: 9449330a8458 ("dma/idxd: create dmadev instances on PCI probe")
Fixes: 452c1916b0db ("dma/idxd: fix truncated error code in status check")
Cc: sta...@dpdk.org

Please don't forget above lines in future.

Applied, thanks.

Re: [PATCH] dma/idxd: fix return value for pci device commands

[Kevin Laatz]

On 08/06/2022 09:54, Thomas Monjalon wrote:

07/06/2022 12:56, Walsh, Conor:

Subject: [PATCH] dma/idxd: fix return value for pci device commands

When sending a command to an idxd device via pci bar, the response from
HW is checked to ensure it was successful. The response was incorrectly
being negated before being returned by the function, meaning error codes
cannot be checked against the HW specification.

This patch fixes the return values of the function by removing the
negation.

Signed-off-by: Kevin Laatz 

Acked-by: Conor Walsh 

Fixes: 9449330a8458 ("dma/idxd: create dmadev instances on PCI probe")
Fixes: 452c1916b0db ("dma/idxd: fix truncated error code in status check")
Cc: sta...@dpdk.org

Please don't forget above lines in future.

Applied, thanks.


That was an oversight, thanks for adding!

Re: [PATCH] raw/cnxk_gpio: allow controlling existing GPIO

[Thomas Monjalon]

04/06/2022 16:03, Tomasz Duszynski:
> Controlling existing GPIO should be normally frowned upon because
> we want to avoid situation where multiple contenders modify GPIO
> state simultaneously.
> 
> Still there might be situations where this is actually needed.
> Restarting killed application being an example here.
> 
> So relax current restrictions and respect user needs.
> 
> Signed-off-by: Tomasz Duszynski 

Applied, thanks.

RE: [PATCH 11/12] app/flow-perf: fix build with GCC 12

[Wisam Monther]

Hi David,

> -Original Message-
> From: David Marchand 
> Sent: Wednesday, May 18, 2022 1:17 PM
> To: dev@dpdk.org
> Cc: NBU-Contact-Thomas Monjalon (EXTERNAL) ;
> ferruh.yi...@xilinx.com; sta...@dpdk.org; Wisam Monther
> 
> Subject: [PATCH 11/12] app/flow-perf: fix build with GCC 12
> 
> GCC 12 raises the following warning:
> 
> ../app/test-flow-perf/main.c: In function ‘start_forwarding’:
> ../app/test-flow-perf/main.c:1737:28: error: ‘sprintf’ may write a
> terminating nul past the end of the destination
> [-Werror=format-overflow=]
>  1737 | sprintf(p[i++], "%d", (int)n);
>   |^
> In function ‘pretty_number’,
> inlined from ‘packet_per_second_stats’ at
> ../app/test-flow-perf/main.c:1792:4,
> inlined from ‘start_forwarding’ at
> ../app/test-flow-perf/main.c:1831:3:
> [...]
> 
> We can simplify this code and rely on libc integer formatting via this system
> locales.
> 
> Cc: sta...@dpdk.org
> 
> Signed-off-by: David Marchand 
> ---

I've tested the patch and reviewed it, it's working fine, so thank you for that.
One comment
The initial value of 0 is 000

Example:
CMD: ./dpdk-test-flow-perf -n 4 -a  -- ingress --group=1 --ether --queue 
--rules-count=20 --enable-fwd
  core   tx tx drops   rx
--   
 1  000  000  000

Can you handle this to be single 0 instead of not needed leading zeros? 

BRs,
Wisam Jaddo

Re: [PATCH] mempool/cnxk: avoid batch op free for empty mempools

[Thomas Monjalon]

28/04/2022 11:59, Ashwin Sekhar T K:
> Batch op data is initialized inside mempool alloc. But
> in case of empty mempools, the alloc function is not
> called and hence the initialization of batch op data is
> also not done. So ensure the validity of batch op data
> inside mempool free.
> 
> Signed-off-by: Ashwin Sekhar T K 

Applied, thanks.

Re: [PATCH v4 0/8] Introduce support for RISC-V architecture

[David Marchand]

On Wed, Jun 8, 2022 at 10:41 AM David Marchand
 wrote:
> On Tue, May 31, 2022 at 4:14 PM Stanislaw Kardach  wrote:
> >
> > This patchset adds support for building and running DPDK on 64bit RISC-V
> > architecture. The initial support targets rv64gc (rv64imafdc) ISA and
> > was tested on SiFive Unmatched development board with the Freedom U740
> > SoC running Linux (freedom-u-sdk based kernel).
> > I have tested this codebase using DPDK unit and perf tests as well as
> > test-pmd, l2fwd and l3fwd examples.
> > The NIC attached to the DUT was Intel X520-DA2 which uses ixgbe PMD.
> > On the UIO side, since U740 does not have an IOMMU, I've used igb_uio,
> > uio_pci_generic and vfio-pci noiommu drivers.
> >
> > Functional verification done using meson tests. fast-tests suite passing 
> > with
> > the default config.
> >
> > PMD verification done using a Intel x520-DA2 NIC (ixgbe) and the test-pmd
> > application. Packet transfer checked using all UIO drivers available for
> > non-IOMMU platforms: uio_pci_generic, vfio-pci noiommu and igb_uio.
> >
> > The i40e PMD driver is disabled on RISC-V as the rv64gc ISA has no vector
> > operations.
> >
> > RISCV support is currently limited to Linux as the time measurement 
> > frequency
> > discovery is tied to reading a device-tree node via procfs.
> >
> > Clang compilation currently not supported due to issues with missing 
> > relocation
> > relaxation.
> >
> > Commit 1 introduces EAL and build system support for RISC-V architecture
> >as well as documentation updates.
> > Commits 2-5 add missing defines and stubs to enable RISC-V operation in
> >non-EAL parts.
> > Commit 6 adds RISC-V specific cpuflags test.
> > Commits 7-8 add RISC-V build testing to test-meson-builds.sh and github CI.
>
> Overall, the series lgtm.
> It did not get much reviews, but the porting is straightforward and
> clean enough.
>
> I'm waiting for some compilation to finish and I will merge it for 22.07-rc1.

Welcome to RISC-V in DPDK!

Let's work out the last details in -rc2.
Series applied, thanks.


-- 
David Marchand

[PATCH v3] sched: enable CMAN at runtime

[Marcin Danilewicz]

Added changes to enable CMAN (RED or PIE) at init
from profile configuration file.

By default CMAN code is enable but not in use, when
there is no RED or PIE profile configured.

Signed-off-by: Marcin Danilewicz 
---
Log: v2 change in rte_sched.h to avoid ABI breakage.
 v3 changes from comments
---
 config/rte_config.h  |   3 -
 drivers/net/softnic/rte_eth_softnic_tm.c |  12 --
 examples/ip_pipeline/tmgr.c  |   4 -
 examples/qos_sched/cfg_file.c|  11 +-
 examples/qos_sched/cfg_file.h|   2 -
 examples/qos_sched/init.c|   4 -
 examples/qos_sched/main.h|   2 -
 examples/qos_sched/profile.cfg   | 130 ++---
 examples/qos_sched/profile_pie.cfg   | 142 ++
 examples/qos_sched/profile_red.cfg   | 143 +++
 lib/sched/rte_sched.c|  47 +---
 11 files changed, 359 insertions(+), 141 deletions(-)
 create mode 100644 examples/qos_sched/profile_pie.cfg
 create mode 100644 examples/qos_sched/profile_red.cfg

diff --git a/config/rte_config.h b/config/rte_config.h
index 8eb29c1525..1740a1d053 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -88,9 +88,6 @@
 /* rte_power defines */
 #define RTE_MAX_LCORE_FREQS 64
 
-/* rte_sched defines */
-#undef RTE_SCHED_CMAN
-
 /* rte_graph defines */
 #define RTE_GRAPH_BURST_SIZE 256
 #define RTE_LIBRTE_GRAPH_STATS 1
diff --git a/drivers/net/softnic/rte_eth_softnic_tm.c 
b/drivers/net/softnic/rte_eth_softnic_tm.c
index 6a7766ba1c..3a5fd676e9 100644
--- a/drivers/net/softnic/rte_eth_softnic_tm.c
+++ b/drivers/net/softnic/rte_eth_softnic_tm.c
@@ -420,11 +420,7 @@ pmd_tm_node_type_get(struct rte_eth_dev *dev,
return 0;
 }
 
-#ifdef RTE_SCHED_CMAN
 #define WRED_SUPPORTED 1
-#else
-#define WRED_SUPPORTED 0
-#endif
 
 #define STATS_MASK_DEFAULT \
(RTE_TM_STATS_N_PKTS |  \
@@ -2300,8 +2296,6 @@ tm_tc_wred_profile_get(struct rte_eth_dev *dev, uint32_t 
tc_id)
return NULL;
 }
 
-#ifdef RTE_SCHED_CMAN
-
 static void
 wred_profiles_set(struct rte_eth_dev *dev, uint32_t subport_id)
 {
@@ -2325,12 +2319,6 @@ wred_profiles_set(struct rte_eth_dev *dev, uint32_t 
subport_id)
}
 }
 
-#else
-
-#define wred_profiles_set(dev, subport_id)
-
-#endif
-
 static struct tm_shared_shaper *
 tm_tc_shared_shaper_get(struct rte_eth_dev *dev, struct tm_node *tc_node)
 {
diff --git a/examples/ip_pipeline/tmgr.c b/examples/ip_pipeline/tmgr.c
index b138e885cf..e68e9961be 100644
--- a/examples/ip_pipeline/tmgr.c
+++ b/examples/ip_pipeline/tmgr.c
@@ -17,7 +17,6 @@ static uint32_t n_subport_profiles;
 static struct rte_sched_pipe_params
pipe_profile[TMGR_PIPE_PROFILE_MAX];
 
-#ifdef RTE_SCHED_CMAN
 static struct rte_sched_cman_params cman_params = {
.red_params = {
/* Traffic Class 0 Colors Green / Yellow / Red */
@@ -86,7 +85,6 @@ static struct rte_sched_cman_params cman_params = {
[12][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
},
 };
-#endif /* RTE_SCHED_CMAN */
 
 static uint32_t n_pipe_profiles;
 
@@ -96,9 +94,7 @@ static const struct rte_sched_subport_params 
subport_params_default = {
.pipe_profiles = pipe_profile,
.n_pipe_profiles = 0, /* filled at run time */
.n_max_pipe_profiles = RTE_DIM(pipe_profile),
-#ifdef RTE_SCHED_CMAN
.cman_params = &cman_params,
-#endif /* RTE_SCHED_CMAN */
 };
 
 static struct tmgr_port_list tmgr_port_list;
diff --git a/examples/qos_sched/cfg_file.c b/examples/qos_sched/cfg_file.c
index 450482f07d..3284b4d252 100644
--- a/examples/qos_sched/cfg_file.c
+++ b/examples/qos_sched/cfg_file.c
@@ -229,11 +229,14 @@ cfg_load_subport_profile(struct rte_cfgfile *cfg,
return 0;
 }
 
-#ifdef RTE_SCHED_CMAN
 void set_subport_cman_params(struct rte_sched_subport_params *subport_p,
struct rte_sched_cman_params cman_p)
 {
int j, k;
+
+   if (subport_p->cman_params != NULL)
+   return;
+
subport_p->cman_params->cman_mode = cman_p.cman_mode;
 
for (j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; j++) {
@@ -261,7 +264,6 @@ void set_subport_cman_params(struct 
rte_sched_subport_params *subport_p,
}
}
 }
-#endif
 
 int
 cfg_load_subport(struct rte_cfgfile *cfg, struct rte_sched_subport_params 
*subport_params)
@@ -276,9 +278,7 @@ cfg_load_subport(struct rte_cfgfile *cfg, struct 
rte_sched_subport_params *subpo
memset(active_queues, 0, sizeof(active_queues));
n_active_queues = 0;
 
-#ifdef RTE_SCHED_CMAN
struct rte_sched_cman_params cman_params = {
-   .cman_mode = RTE_SCHED_CMAN_RED,
.red_params = { },
};
 
@@ -387,7 +387,6 @@ cfg_load_subport

Re: [PATCH v5 0/7] introduce per-queue available descriptor threshold and host shaper

[Andrew Rybchenko]

@Matan, @Viacheslav, could you review mlx5 patches of the series,
please.

On 6/7/22 15:59, Spike Du wrote:

available descriptor threshold(ADT for short) is per RX queue attribute, when 
RX queue available descriptors for HW is below ADT, HW sends an event to 
application.
Host shaper can configure shaper rate and avail_thresh-triggered for a host 
port.
The shaper limits the rate of traffic from host port to embedded ARM rx port on 
Nvidia BlueField 2 NIC.
If avail_thresh-triggered is enabled, a 100Mbps shaper is enabled automatically 
when one of the host port's Rx queues receives available descriptor threshold 
event.

These two features can combine to control traffic from host port to wire port 
for BlueField 2 NIC.
The traffic flows from host to embedded ARM, then to the physical port.
The work flow is on the ARM system, configure available descriptor threshold to 
RX queue and enable avail_thresh-triggered flag in host shaper, after receiving 
available descriptor threshold event, delay a while until RX queue is empty , 
then disable the shaper. We recycle this work flow to reduce RX queue drops on 
ARM system.

Add new libethdev API to set available descriptor threshold, add rte event 
RTE_ETH_EVENT_RX_AVAIL_THRESH to handle available descriptor threshold event. 
For host shaper, because it doesn't align to existing DPDK framework and is 
specific to Nvidia NIC, use PMD private API.

For integration with testpmd, put the private cmdline function and available 
descriptor threshold event handler in mlx5 PMD directory by adding a new file 
mlx5_testpmd.c. Follow David Marchand's driver specific commands framework to 
add mlx5 specific commands.


Spike Du (7):
   net/mlx5: add LWM support for Rxq
   common/mlx5: share interrupt management
   ethdev: introduce Rx queue based available descriptor threshold
   net/mlx5: add LWM event handling support
   net/mlx5: support Rx queue based available descriptor threshold
   net/mlx5: add private API to config host port shaper
   app/testpmd: add Host Shaper command

[PATCH v3] gro: bug fix in identifying fragmented packets

[Kumara Parameshwaran]

From: Kumara Parameshwaran 

A packet with RTE_PTYPE_L4_FRAG(0x300) contains both RTE_PTYPE_L4_TCP
(0x100) & RTE_PTYPE_L4_UDP (0x200). A fragmented packet as defined in
rte_mbuf_ptype.h cannot be recognized as other L4 types and hence the
GRO layer should not use IS_IPV4_TCP_PKT or IS_IPV4_UDP_PKT for
RTE_PTYPE_L4_FRAG. Hence, if the packet type is RTE_PTYPE_L4_FRAG the
ip header should be parsed to recognize the appropriate IP type and
invoke the respective gro handler.

Fixes: 1ca5e6740852 ("gro: support UDP/IPv4")
Cc: sta...@dpdk.org

Signed-off-by: Kumara Parameshwaran 
---
v1:
* Introduce IS_IPV4_FRAGMENT macro to check if fragmented packet and 
  if true extract the IP header to identify the protocol type and 
  invoke the appropriate gro handler. This is done for both 
  rte_gro_reassemble and rte_gro_reassemble_burst APIs.
v2,v3:
* Fix extra whitespace and column limit warnings

 lib/gro/rte_gro.c | 43 +--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c
index 6f7dd4d709..7512553183 100644
--- a/lib/gro/rte_gro.c
+++ b/lib/gro/rte_gro.c
@@ -38,6 +38,9 @@ static gro_tbl_pkt_count_fn 
tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = {
((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
(RTE_ETH_IS_TUNNEL_PKT(ptype) == 0))
 
+#define IS_IPV4_FRAGMENT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
+   ((ptype & RTE_PTYPE_L4_FRAG) == RTE_PTYPE_L4_FRAG))
+
 #define IS_IPV4_VXLAN_TCP4_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \
@@ -240,7 +243,28 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
 * The timestamp is ignored, since all packets
 * will be flushed from the tables.
 */
-   if (IS_IPV4_VXLAN_TCP4_PKT(pkts[i]->packet_type) &&
+   if (IS_IPV4_FRAGMENT(pkts[i]->packet_type)) {
+   struct rte_ipv4_hdr ip4h_copy;
+   const struct rte_ipv4_hdr *ip4h = 
rte_pktmbuf_read(pkts[i], pkts[i]->l2_len,
+   sizeof(*ip4h), 
&ip4h_copy);
+   if (ip4h->next_proto_id == IPPROTO_UDP && do_udp4_gro) {
+   ret = gro_udp4_reassemble(pkts[i],
+   &udp_tbl, 0);
+   if (ret > 0)
+   nb_after_gro--;
+   else if (ret < 0)
+   unprocess_pkts[unprocess_num++] = 
pkts[i];
+   } else if (ip4h->next_proto_id == IPPROTO_TCP && 
do_tcp4_gro) {
+   ret = gro_tcp4_reassemble(pkts[i],
+   &tcp_tbl, 0);
+   if (ret > 0)
+   nb_after_gro--;
+   else if (ret < 0)
+   unprocess_pkts[unprocess_num++] = 
pkts[i];
+   } else {
+   unprocess_pkts[unprocess_num++] = pkts[i];
+   }
+   } else if (IS_IPV4_VXLAN_TCP4_PKT(pkts[i]->packet_type) &&
do_vxlan_tcp_gro) {
ret = gro_vxlan_tcp4_reassemble(pkts[i],
&vxlan_tcp_tbl, 0);
@@ -349,7 +373,22 @@ rte_gro_reassemble(struct rte_mbuf **pkts,
current_time = rte_rdtsc();
 
for (i = 0; i < nb_pkts; i++) {
-   if (IS_IPV4_VXLAN_TCP4_PKT(pkts[i]->packet_type) &&
+   if (IS_IPV4_FRAGMENT(pkts[i]->packet_type)) {
+   struct rte_ipv4_hdr ip4h_copy;
+   const struct rte_ipv4_hdr *ip4h = 
rte_pktmbuf_read(pkts[i], pkts[i]->l2_len,
+   sizeof(*ip4h), 
&ip4h_copy);
+   if (ip4h->next_proto_id == IPPROTO_UDP && do_udp4_gro) {
+   if (gro_udp4_reassemble(pkts[i], udp_tbl,
+   current_time) < 0)
+   unprocess_pkts[unprocess_num++] = 
pkts[i];
+   } else if (ip4h->next_proto_id == IPPROTO_TCP && 
do_tcp4_gro) {
+   if (gro_tcp4_reassemble(pkts[i], tcp_tbl,
+   current_time) < 0)
+   unprocess_pkts[unprocess_num++] = 
pkts[i];
+   } else {
+   unprocess_pkts[unprocess_num++] = pkts[i];
+   }
+   } else if (IS_IPV4_VXLAN_TCP4_PKT(pkts[i]->packet_type) &&
do_vxlan_tcp_gro) {
 

Re: [PATCH v4 0/8] Introduce support for RISC-V architecture

[Stanisław Kardach]

On Wed, Jun 8, 2022 at 11:32 AM David Marchand
 wrote:
>
> On Wed, Jun 8, 2022 at 10:41 AM David Marchand
>  wrote:
> > On Tue, May 31, 2022 at 4:14 PM Stanislaw Kardach  wrote:
> > >
> > > This patchset adds support for building and running DPDK on 64bit RISC-V
> > > architecture. The initial support targets rv64gc (rv64imafdc) ISA and
> > > was tested on SiFive Unmatched development board with the Freedom U740
> > > SoC running Linux (freedom-u-sdk based kernel).
> > > I have tested this codebase using DPDK unit and perf tests as well as
> > > test-pmd, l2fwd and l3fwd examples.
> > > The NIC attached to the DUT was Intel X520-DA2 which uses ixgbe PMD.
> > > On the UIO side, since U740 does not have an IOMMU, I've used igb_uio,
> > > uio_pci_generic and vfio-pci noiommu drivers.
> > >
> > > Functional verification done using meson tests. fast-tests suite passing 
> > > with
> > > the default config.
> > >
> > > PMD verification done using a Intel x520-DA2 NIC (ixgbe) and the test-pmd
> > > application. Packet transfer checked using all UIO drivers available for
> > > non-IOMMU platforms: uio_pci_generic, vfio-pci noiommu and igb_uio.
> > >
> > > The i40e PMD driver is disabled on RISC-V as the rv64gc ISA has no vector
> > > operations.
> > >
> > > RISCV support is currently limited to Linux as the time measurement 
> > > frequency
> > > discovery is tied to reading a device-tree node via procfs.
> > >
> > > Clang compilation currently not supported due to issues with missing 
> > > relocation
> > > relaxation.
> > >
> > > Commit 1 introduces EAL and build system support for RISC-V architecture
> > >as well as documentation updates.
> > > Commits 2-5 add missing defines and stubs to enable RISC-V operation in
> > >non-EAL parts.
> > > Commit 6 adds RISC-V specific cpuflags test.
> > > Commits 7-8 add RISC-V build testing to test-meson-builds.sh and github 
> > > CI.
> >
> > Overall, the series lgtm.
> > It did not get much reviews, but the porting is straightforward and
> > clean enough.
> >
> > I'm waiting for some compilation to finish and I will merge it for 
> > 22.07-rc1.
>
> Welcome to RISC-V in DPDK!
>
> Let's work out the last details in -rc2.
> Series applied, thanks.
Awesome, thanks!
>
>
> --
> David Marchand
>

Re: [PATCH v6] examples/l3fwd: merge l3fwd-acl into l3fwd

[Thomas Monjalon]

22/04/2022 11:57, Sean Morrissey:
> l3fwd-acl contains duplicate functions to l3fwd.
> For this reason we merge l3fwd-acl code into l3fwd
> with '--lookup acl' cmdline option to run ACL.
> 
> Signed-off-by: Sean Morrissey 
> Acked-by: Konstantin Ananyev 

With few text improvements, applied, thanks.

Re: [PATCH v4 0/8] Introduce support for RISC-V architecture

[Heinrich Schuchardt]

On 6/8/22 10:41, David Marchand wrote:

On Tue, May 31, 2022 at 4:14 PM Stanislaw Kardach  wrote:


This patchset adds support for building and running DPDK on 64bit RISC-V
architecture. The initial support targets rv64gc (rv64imafdc) ISA and
was tested on SiFive Unmatched development board with the Freedom U740
SoC running Linux (freedom-u-sdk based kernel).
I have tested this codebase using DPDK unit and perf tests as well as
test-pmd, l2fwd and l3fwd examples.
The NIC attached to the DUT was Intel X520-DA2 which uses ixgbe PMD.
On the UIO side, since U740 does not have an IOMMU, I've used igb_uio,
uio_pci_generic and vfio-pci noiommu drivers.

Functional verification done using meson tests. fast-tests suite passing with
the default config.

PMD verification done using a Intel x520-DA2 NIC (ixgbe) and the test-pmd
application. Packet transfer checked using all UIO drivers available for
non-IOMMU platforms: uio_pci_generic, vfio-pci noiommu and igb_uio.

The i40e PMD driver is disabled on RISC-V as the rv64gc ISA has no vector
operations.

RISCV support is currently limited to Linux as the time measurement frequency
discovery is tied to reading a device-tree node via procfs.

Clang compilation currently not supported due to issues with missing relocation
relaxation.

Commit 1 introduces EAL and build system support for RISC-V architecture
as well as documentation updates.
Commits 2-5 add missing defines and stubs to enable RISC-V operation in
non-EAL parts.
Commit 6 adds RISC-V specific cpuflags test.
Commits 7-8 add RISC-V build testing to test-meson-builds.sh and github CI.


Overall, the series lgtm.
It did not get much reviews, but the porting is straightforward and
clean enough.

I'm waiting for some compilation to finish and I will merge it for 22.07-rc1.


Some comments that will probably require some followup patches for rc2:

- I removed the known issue about --no-huge from the EAL patch.
This seems to be a generic issue that does not block the RISC V port
and can be re-submitted as a separate patch.


- I had some trouble with finding a right toolchain for test-meson-builds.sh.
The mentionned toolchains in the cross build guide don't work for me on FC36.
I managed to cross compile with a Bootlin toolchain, though I had to
adjust the cross compilation file.
I'll probably end up compiling my own toolchain later unless you have
a better idea.


Please, consider building natively too. https://wiki.ubuntu.com/RISC-V 
describes setting setting up a virtual machine.




At least the compilation in GHA works.


- The hardcoded pkg-config path in config/riscv/riscv64_linux_gcc does
not seem generic.
It is probably not a big issue, but I'd rather move it to a Ubuntu
specific cross compile meson file.
WDYT?


- I adjusted some coding style in some asm and some indentation and
wording in meson.


- The cross compilation guide mentions using
crossbuild-essential-riscv64 for Ubuntu.
We should switch to it in GHA.
Though after trying myself, there is an issue in the C++ headers check
in GHA for some acl header including rte_vect.h.
Can you have a look?


- There was a patch from Heinrich about native compilation, can you review it?


[PATCH] Fix RISC-V builds
http://mails.dpdk.org/archives/dev/2022-May/242749.html
relates to PktGen.

Best regards

Heinrich

Re: [PATCH] Fix RISC-V builds

[Heinrich Schuchardt]

On 6/8/22 09:23, David Marchand wrote:

Hello,

On Mon, May 30, 2022 at 4:11 PM Heinrich Schuchardt
 wrote:


Building on RISC-V results in an error

 cc: error: ‘-march=native’: ISA string must begin with rv32 or rv64

As GCC does not support -march=native on RISC-V avoid this argument.

Signed-off-by: Heinrich Schuchardt 


I am finalizing the RISC-V merge for -rc1, this fix can be merged
later as we only have cross compilation in GHA with the initial
series.


Keith Wiles  already merged this patch into 
PktGen-DPDK.


@Keith
Maybe CONTRIBUTING.txt in that package should suggest a title prefix for 
PktGen patches to avoid future confusion.


Best regards

Heinrich





---
  meson.build | 5 -
  1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 507c146..bbf4650 100644
--- a/meson.build
+++ b/meson.build
@@ -17,7 +17,10 @@ pktgen_conf = configuration_data()
  # set up some global vars for compiler, platform, configuration, etc.
  cc = meson.get_compiler('c')

-add_project_arguments('-march=native', language: 'c')
+target = target_machine.cpu_family()
+if (target != 'riscv64')
+add_project_arguments('-march=native', language: 'c')
+endif


Would the below snippet work?

cc.has_argument('-march=native'')
 add_project_arguments('-march=native', language: 'c')
endif



  if get_option('enable-avx') and cc.has_argument('-mavx')
  add_project_arguments('-mavx', language: 'c')
--
2.36.1

[PATCH v4] gro: bug fix in identifying fragmented packets

[Kumara Parameshwaran]

From: Kumara Parameshwaran 

A packet with RTE_PTYPE_L4_FRAG(0x300) contains both RTE_PTYPE_L4_TCP
(0x100) & RTE_PTYPE_L4_UDP (0x200). A fragmented packet as defined in
rte_mbuf_ptype.h cannot be recognized as other L4 types and hence the
GRO layer should not use IS_IPV4_TCP_PKT or IS_IPV4_UDP_PKT for
RTE_PTYPE_L4_FRAG. Hence, if the packet type is RTE_PTYPE_L4_FRAG the
ip header should be parsed to recognize the appropriate IP type and
invoke the respective gro handler.

Fixes: 1ca5e6740852 ("gro: support UDP/IPv4")
Cc: sta...@dpdk.org

Signed-off-by: Kumara Parameshwaran 
---
v1:
* Introduce IS_IPV4_FRAGMENT macro to check if fragmented packet and 
  if true extract the IP header to identify the protocol type and 
  invoke the appropriate gro handler. This is done for both 
  rte_gro_reassemble and rte_gro_reassemble_burst APIs.
v2,v3,v4:
* Fix extra whitespace and column limit warnings

 lib/gro/rte_gro.c | 43 +--
 1 file changed, 41 insertions(+), 2 deletions(-)
 lib/gro/rte_gro.c | 43 +--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c
index 6f7dd4d709..83d6e21dbb 100644
--- a/lib/gro/rte_gro.c
+++ b/lib/gro/rte_gro.c
@@ -38,6 +38,9 @@ static gro_tbl_pkt_count_fn 
tbl_pkt_count_fn[RTE_GRO_TYPE_MAX_NUM] = {
((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
(RTE_ETH_IS_TUNNEL_PKT(ptype) == 0))
 
+#define IS_IPV4_FRAGMENT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
+   ((ptype & RTE_PTYPE_L4_FRAG) == RTE_PTYPE_L4_FRAG))
+
 #define IS_IPV4_VXLAN_TCP4_PKT(ptype) (RTE_ETH_IS_IPV4_HDR(ptype) && \
((ptype & RTE_PTYPE_L4_UDP) == RTE_PTYPE_L4_UDP) && \
((ptype & RTE_PTYPE_TUNNEL_VXLAN) == \
@@ -240,7 +243,28 @@ rte_gro_reassemble_burst(struct rte_mbuf **pkts,
 * The timestamp is ignored, since all packets
 * will be flushed from the tables.
 */
-   if (IS_IPV4_VXLAN_TCP4_PKT(pkts[i]->packet_type) &&
+   if (IS_IPV4_FRAGMENT(pkts[i]->packet_type)) {
+   struct rte_ipv4_hdr ip4h_copy;
+   const struct rte_ipv4_hdr *ip4h = 
rte_pktmbuf_read(pkts[i], pkts[i]->l2_len,
+   
sizeof(*ip4h), &ip4h_copy);
+   if (ip4h->next_proto_id == IPPROTO_UDP && do_udp4_gro) {
+   ret = gro_udp4_reassemble(pkts[i],
+   &udp_tbl, 0);
+   if (ret > 0)
+   nb_after_gro--;
+   else if (ret < 0)
+   unprocess_pkts[unprocess_num++] = 
pkts[i];
+   } else if (ip4h->next_proto_id == IPPROTO_TCP && 
do_tcp4_gro) {
+   ret = gro_tcp4_reassemble(pkts[i],
+   &tcp_tbl, 0);
+   if (ret > 0)
+   nb_after_gro--;
+   else if (ret < 0)
+   unprocess_pkts[unprocess_num++] = 
pkts[i];
+   } else {
+   unprocess_pkts[unprocess_num++] = pkts[i];
+   }
+   } else if (IS_IPV4_VXLAN_TCP4_PKT(pkts[i]->packet_type) &&
do_vxlan_tcp_gro) {
ret = gro_vxlan_tcp4_reassemble(pkts[i],
&vxlan_tcp_tbl, 0);
@@ -349,7 +373,22 @@ rte_gro_reassemble(struct rte_mbuf **pkts,
current_time = rte_rdtsc();
 
for (i = 0; i < nb_pkts; i++) {
-   if (IS_IPV4_VXLAN_TCP4_PKT(pkts[i]->packet_type) &&
+   if (IS_IPV4_FRAGMENT(pkts[i]->packet_type)) {
+   struct rte_ipv4_hdr ip4h_copy;
+   const struct rte_ipv4_hdr *ip4h = 
rte_pktmbuf_read(pkts[i], pkts[i]->l2_len,
+   
sizeof(*ip4h), &ip4h_copy);
+   if (ip4h->next_proto_id == IPPROTO_UDP && do_udp4_gro) {
+   if (gro_udp4_reassemble(pkts[i], udp_tbl,
+   current_time) < 0)
+   unprocess_pkts[unprocess_num++] = 
pkts[i];
+   } else if (ip4h->next_proto_id == IPPROTO_TCP && 
do_tcp4_gro) {
+   if (gro_tcp4_reassemble(pkts[i], tcp_tbl,
+   current_time) < 0)
+   unprocess_pkts[unprocess_num++] = 
pkts[i];
+   } else {
+   

Re: [PATCH] Fix RISC-V builds

[David Marchand]

On Wed, Jun 8, 2022 at 11:56 AM Heinrich Schuchardt
 wrote:
>
> On 6/8/22 09:23, David Marchand wrote:
> > Hello,
> >
> > On Mon, May 30, 2022 at 4:11 PM Heinrich Schuchardt
> >  wrote:
> >>
> >> Building on RISC-V results in an error
> >>
> >>  cc: error: ‘-march=native’: ISA string must begin with rv32 or rv64
> >>
> >> As GCC does not support -march=native on RISC-V avoid this argument.
> >>
> >> Signed-off-by: Heinrich Schuchardt 
> >
> > I am finalizing the RISC-V merge for -rc1, this fix can be merged
> > later as we only have cross compilation in GHA with the initial
> > series.
>
> Keith Wiles  already merged this patch into
> PktGen-DPDK.

It was hard to tell, from just this mail...

>
> @Keith
> Maybe CONTRIBUTING.txt in that package should suggest a title prefix for
> PktGen patches to avoid future confusion.

Yes, and I marked the patch as Not applicable in patchwork.


-- 
David Marchand

Re: [PATCH v3 1/4] ethdev: introduce ethdev HW desc dump PI

[Andrew Rybchenko]

Cc various driver maintainers looking for opinion about API discussion
below

On 6/7/22 16:59, Dongdong Liu wrote:

Hi Andrew

Many thanks for your review.

On 2022/6/2 3:53, Andrew Rybchenko wrote:

On 6/1/22 10:49, Min Hu (Connor) wrote:

Added the ethdev HW Rx desc dump API which provides functions for query
HW descriptor from device. HW descriptor info differs in different NICs.
The information demonstrates I/O process which is important for debug.
As the information is different between NICs, the new API is introduced.

Signed-off-by: Min Hu (Connor) 
---
  doc/guides/rel_notes/release_22_07.rst |  7 
  lib/ethdev/ethdev_driver.h | 42 
  lib/ethdev/rte_ethdev.c    | 44 ++
  lib/ethdev/rte_ethdev.h    | 44 ++
  lib/ethdev/version.map |  2 ++
  5 files changed, 139 insertions(+)

diff --git a/doc/guides/rel_notes/release_22_07.rst
b/doc/guides/rel_notes/release_22_07.rst
index 8932a1d478..56c675121a 100644
--- a/doc/guides/rel_notes/release_22_07.rst
+++ b/doc/guides/rel_notes/release_22_07.rst
@@ -137,6 +137,13 @@ New Features
    * ``RTE_EVENT_QUEUE_ATTR_WEIGHT``
    * ``RTE_EVENT_QUEUE_ATTR_AFFINITY``
  +* **Added ethdev HW desc dump API, to dump Rx/Tx HW desc info from
device.**
+
+  Added the ethdev HW Rx desc dump API which provides functions for
query
+  HW descriptor from device. HW descriptor info differs in different
NICs.
+  The information demonstrates I/O process which is important for 
debug.

+  As the information is different between NICs, the new API is
introduced.
+
    Removed Items
  -
diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index 69d9dc21d8..9c1726eb2d 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -1073,6 +1073,42 @@ typedef int
(*eth_ip_reassembly_conf_set_t)(struct rte_eth_dev *dev,
   */
  typedef int (*eth_dev_priv_dump_t)(struct rte_eth_dev *dev, FILE
*file);
  +/**
+ * @internal
+ * Dump ethdev Rx descriptor info to a file.


ethdev is not required in the description above. It is an ethdev
operation type.


Will remove it.


Is there any limitations on caller context? Should be it the same
CPU core (since typically it is the case for per-queue API) which
polls the queue? The answer must be in the API function description.


"[PATCH v3 4/4] app/procinfo: support descriptor dump" shows how to use
the API. It is used for debug, not a dataplane API,  no special
limitations on caller context.


Please, be explicit in the ethdev API documentation.




+ *
+ * @param file
+ *   A pointer to a file for output.
+ * @param dev
+ *   Port (ethdev) handle.
+ * @param queue_id
+ *   The selected queue.
+ * @param desc_id
+ *   The selected descriptor.


Is it an ID in the ring regardless of the current position or
is it offset relative to current position in the ring?
It should be clarified in any case.
I'd say that it should be an offset to be consistent with
descriptor status API.


It is an ID in the ring regardless of the current position.


IMHO, it is inconvenient since typically it is interesting
what happens nearby current position.



It would be useful to be able to dump many descriptor at once.

This can be done by the appliacation.


Yes, that's true, but easy to do in the driver as well. It would
be especially important if ID semantics changes.




+ * @return
+ *   Negative errno value on error, zero on success.
+ */
+typedef int (*eth_rx_hw_desc_dump_t)(FILE *file, const struct
rte_eth_dev *dev,
+ uint16_t queue_id, uint16_t desc_id);
+
+/**
+ * @internal
+ * Dump ethdev Tx descriptor info to a file.
+ *
+ * @param file
+ *   A pointer to a file for output.
+ * @param dev
+ *   Port (ethdev) handle.
+ * @param queue_id
+ *   The selected queue.
+ * @param desc_id
+ *   The selected descriptor.
+ * @return
+ *   Negative errno value on error, zero on success.
+ */
+typedef int (*eth_tx_hw_desc_dump_t)(FILE *file, const struct
rte_eth_dev *dev,
+ uint16_t queue_id, uint16_t desc_id);
+
  /**
   * @internal A structure containing the functions exported by an
Ethernet driver.
   */
@@ -1283,6 +1319,12 @@ struct eth_dev_ops {
    /** Dump private info from device */
  eth_dev_priv_dump_t eth_dev_priv_dump;
+
+    /** Dump ethdev Rx descriptor info */\\


It is an ethdev operations. So, 'ethdev' is not necessary in the
description.

Will fix.



+    eth_rx_hw_desc_dump_t eth_rx_hw_desc_dump;
+
+    /** Dump ethdev Tx descriptor info */
+    eth_tx_hw_desc_dump_t eth_tx_hw_desc_dump;
  };
    /**
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 46c088dc88..bbd8439fa0 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -5876,6 +5876,50 @@ rte_eth_dev_priv_dump(uint16_t port_id, FILE
*file)
  return eth_err(port_id, (*dev->dev_ops->eth_dev_priv_dump)(dev,
file));
  }
  +int
+rte_eth_rx_hw_desc_dump

Re: [PATCH] eal: fix segment fault when exit trace

[Jerin Jacob]

On Tue, Jun 7, 2022 at 5:36 PM Chengwen Feng  wrote:
>
> Bug scenario:
> 1. start testpmd:
> dpdk-testpmd -l 4-6 -a :7d:00.0 --trace=.* -- -i
> 2. quit testpmd and then observed segment fault:
> Bye...
> Segmentation fault (core dumped)
>
> The root cause is that rte_trace_save() and eal_trace_fini() access
> the huge pages which were cleanup by rte_eal_memory_detach().
>
> This patch moves rte_trace_save() and eal_trace_fini() before
> rte_eal_memory_detach() to fix the bug.
>
> Fixes: dfbc61a2f9a6 ("mem: detach memsegs on cleanup")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Chengwen Feng 


Tested-by: Jerin Jacob 


> ---
>  lib/eal/linux/eal.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c
> index 1ef263434a..c6f2056197 100644
> --- a/lib/eal/linux/eal.c
> +++ b/lib/eal/linux/eal.c
> @@ -1266,13 +1266,13 @@ rte_eal_cleanup(void)
> vfio_mp_sync_cleanup();
>  #endif
> rte_mp_channel_cleanup();
> +   rte_trace_save();
> +   eal_trace_fini();
> /* after this point, any DPDK pointers will become dangling */
> rte_eal_memory_detach();
> eal_mp_dev_hotplug_cleanup();
> rte_eal_malloc_heap_cleanup();
> rte_eal_alarm_cleanup();
> -   rte_trace_save();
> -   eal_trace_fini();
> eal_cleanup_config(internal_conf);
> rte_eal_log_cleanup();
> return 0;
> --
> 2.33.0
>

Re: [PATCH] Fix RISC-V builds

[Heinrich Schuchardt]

On 6/8/22 12:01, David Marchand wrote:

On Wed, Jun 8, 2022 at 11:56 AM Heinrich Schuchardt
 wrote:


@Keith
Maybe CONTRIBUTING.txt in that package should suggest a title prefix for
PktGen patches to avoid future confusion.


Yes, and I marked the patch as Not applicable in patchwork.


See https://github.com/pktgen/Pktgen-DPDK/pull/110

Best regards

Heinrich

[PATCH v4 0/2] kni: fix build warnings with Linux 5.17+

[Andrew Rybchenko]

v4:
- restore original patch author
- resend with cover letter to address patchwork recognition as a
  series

v3:
- split single patch into two
- clarify patches summary and description

Ke Zhang (2):
  kni: use dedicated function to set random MAC address
  kni: fix warning about discarding const qualifier

 kernel/linux/kni/compat.h   |  4 
 kernel/linux/kni/kni_misc.c | 13 +
 kernel/linux/kni/kni_net.c  |  4 
 3 files changed, 17 insertions(+), 4 deletions(-)

-- 
2.30.2

[PATCH v4 1/2] kni: use dedicated function to set random MAC address

[Andrew Rybchenko]

From: Ke Zhang 

eth_hw_addr_random() sets address type correctly.

eth_hw_addr_random() is available since Linux v3.4, so
no compat is required.

Also fix the warning:
warning: passing argument 1 of ‘memcpy’ discards ‘const’
qualifier from pointer target type

Variable dev_addr is done const intentionally in Linux v5.17 to
prevent using it directly.

Fixes: ea6b39b5b847 ("kni: remove ethtool support")
Cc: sta...@dpdk.org

Signed-off-by: Ke Zhang 
Signed-off-by: Andrew Rybchenko 
---
 kernel/linux/kni/kni_misc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index 780187d8bf..4f6dd373a3 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -405,8 +405,8 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
if (is_valid_ether_addr(dev_info.mac_addr))
memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN);
else
-   /* Generate random MAC address. */
-   eth_random_addr(net_dev->dev_addr);
+   /* Assign random MAC address. */
+   eth_hw_addr_random(net_dev);
 
if (dev_info.mtu)
net_dev->mtu = dev_info.mtu;
-- 
2.30.2

[PATCH v4 2/2] kni: fix warning about discarding const qualifier

[Andrew Rybchenko]

From: Ke Zhang 

The warning info:
warning: passing argument 1 of ‘memcpy’ discards ‘const’
qualifier from pointer target type

Variable dev_addr is done const intentionally in v5.17 to prevent using
it directly. See kernel series [1] for more information.

[1] https://lore.kernel.org/netdev/YZYAb4X%2FVQFy0iks@shredder/T/

Fixes: ea6b39b5b847 ("kni: remove ethtool support")
Cc: sta...@dpdk.org

Signed-off-by: Ke Zhang 
Signed-off-by: Andrew Rybchenko 
---
 kernel/linux/kni/compat.h   | 4 
 kernel/linux/kni/kni_misc.c | 9 +++--
 kernel/linux/kni/kni_net.c  | 4 
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
index 0db29a4a6f..2c8f346ddf 100644
--- a/kernel/linux/kni/compat.h
+++ b/kernel/linux/kni/compat.h
@@ -145,3 +145,7 @@
 #if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE
 #define HAVE_NETIF_RX_NI
 #endif
+
+#if KERNEL_VERSION(5, 15, 0) <= LINUX_VERSION_CODE
+#define HAVE_ETH_HW_ADDR_SET
+#endif
diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index 4f6dd373a3..0c3a86ee35 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -402,11 +402,16 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
pr_debug("mbuf_size:%u\n", kni->mbuf_size);
 
/* if user has provided a valid mac address */
-   if (is_valid_ether_addr(dev_info.mac_addr))
+   if (is_valid_ether_addr(dev_info.mac_addr)) {
+#ifdef HAVE_ETH_HW_ADDR_SET
+   eth_hw_addr_set(net_dev, dev_info.mac_addr);
+#else
memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN);
-   else
+#endif
+   } else {
/* Assign random MAC address. */
eth_hw_addr_random(net_dev);
+   }
 
if (dev_info.mtu)
net_dev->mtu = dev_info.mtu;
diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index 41805fcabf..6257dcb1a8 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -783,7 +783,11 @@ kni_net_set_mac(struct net_device *netdev, void *p)
return -EADDRNOTAVAIL;
 
memcpy(req.mac_addr, addr->sa_data, netdev->addr_len);
+#ifdef HAVE_ETH_HW_ADDR_SET
+   eth_hw_addr_set(net_dev, addr->sa_data);
+#else
memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+#endif
 
ret = kni_net_process_request(netdev, &req);
 
-- 
2.30.2

[PATCH v5 1/7] eventdev/eth_rx: add adapter instance get API

[Ganapati Kundapura]

Added rte_event_eth_rx_adapter_instance_get() to get
adapter instance id for specified ethernet device id and
rx queue index.

Signed-off-by: Ganapati Kundapura 

diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c 
b/lib/eventdev/rte_event_eth_rx_adapter.c
index bf8741d..d1b4874 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -6,6 +6,7 @@
 #include 
 #endif
 #include 
+#include 
 
 #include 
 #include 
@@ -42,7 +43,10 @@
 /* Sentinel value to detect initialized file handle */
 #define INIT_FD-1
 
-#define RXA_ADAPTER_ARRAY "rte_event_eth_rx_adapter_array"
+#define RX_ADAPTER_DATA_ARRAY "rx_adapter_data_array"
+#define RX_ADAPTER_INSTANCE_ARRAY "rx_adapter_instance_array"
+
+#define INVALID_INSTANCE_ID UINT8_MAX
 
 /*
  * Used to store port and queue ID of interrupting Rx queue
@@ -251,7 +255,12 @@ struct eth_rx_queue_info {
struct rte_event_eth_rx_adapter_stats *stats;
 };
 
+struct event_eth_rxa_inst_info {
+   uint8_t rxa_inst_id;
+};
+
 static struct event_eth_rx_adapter **event_eth_rx_adapter;
+static struct event_eth_rxa_inst_info **event_eth_rxa_inst_info;
 
 /* Enable dynamic timestamp field in mbuf */
 static uint64_t event_eth_rx_timestamp_dynflag;
@@ -1415,15 +1424,13 @@ rxa_service_func(void *args)
return 0;
 }
 
-static int
-rte_event_eth_rx_adapter_init(void)
+static void *
+rxa_memzone_array_get(const char *name, unsigned int elt_size, int nb_elems)
 {
-   const char *name = RXA_ADAPTER_ARRAY;
const struct rte_memzone *mz;
unsigned int sz;
 
-   sz = sizeof(*event_eth_rx_adapter) *
-   RTE_EVENT_ETH_RX_ADAPTER_MAX_INSTANCE;
+   sz = elt_size * nb_elems;
sz = RTE_ALIGN(sz, RTE_CACHE_LINE_SIZE);
 
mz = rte_memzone_lookup(name);
@@ -1431,13 +1438,46 @@ rte_event_eth_rx_adapter_init(void)
mz = rte_memzone_reserve_aligned(name, sz, rte_socket_id(), 0,
 RTE_CACHE_LINE_SIZE);
if (mz == NULL) {
-   RTE_EDEV_LOG_ERR("failed to reserve memzone err = %"
-   PRId32, rte_errno);
-   return -rte_errno;
+   RTE_EDEV_LOG_ERR("failed to reserve memzone"
+" name = %s, err = %"
+PRId32, name, rte_errno);
+   return NULL;
}
}
 
-   event_eth_rx_adapter = mz->addr;
+   return mz->addr;
+}
+
+static int
+rte_event_eth_rx_adapter_init(void)
+{
+   uint8_t i;
+
+   if (event_eth_rx_adapter == NULL) {
+   event_eth_rx_adapter =
+   rxa_memzone_array_get(RX_ADAPTER_DATA_ARRAY,
+ sizeof(*event_eth_rx_adapter),
+ 
RTE_EVENT_ETH_RX_ADAPTER_MAX_INSTANCE);
+   if (event_eth_rx_adapter == NULL)
+   return -ENOMEM;
+
+   for (i = 0; i < RTE_EVENT_ETH_RX_ADAPTER_MAX_INSTANCE; i++)
+   event_eth_rx_adapter[i] = NULL;
+
+   }
+
+   if (event_eth_rxa_inst_info == NULL) {
+   event_eth_rxa_inst_info =
+   rxa_memzone_array_get(RX_ADAPTER_INSTANCE_ARRAY,
+ sizeof(*event_eth_rxa_inst_info),
+ RTE_MAX_ETHPORTS);
+   if (event_eth_rxa_inst_info == NULL)
+   return -ENOMEM;
+
+   for (i = 0; i < RTE_MAX_ETHPORTS; i++)
+   event_eth_rxa_inst_info[i] = NULL;
+   }
+
return 0;
 }
 
@@ -1447,12 +1487,21 @@ rxa_memzone_lookup(void)
const struct rte_memzone *mz;
 
if (event_eth_rx_adapter == NULL) {
-   mz = rte_memzone_lookup(RXA_ADAPTER_ARRAY);
+   mz = rte_memzone_lookup(RX_ADAPTER_DATA_ARRAY);
if (mz == NULL)
return -ENOMEM;
+
event_eth_rx_adapter = mz->addr;
}
 
+   if (event_eth_rxa_inst_info == NULL) {
+   mz = rte_memzone_lookup(RX_ADAPTER_INSTANCE_ARRAY);
+   if (mz == NULL)
+   return -ENOMEM;
+
+   event_eth_rxa_inst_info = mz->addr;
+   }
+
return 0;
 }
 
@@ -1950,6 +1999,7 @@ rxa_sw_del(struct event_eth_rx_adapter *rx_adapter,
int pollq;
int intrq;
int sintrq;
+   uint16_t eth_dev_id = dev_info->dev->data->port_id;
 
 
if (rx_adapter->nb_queues == 0)
@@ -1993,6 +2043,11 @@ rxa_sw_del(struct event_eth_rx_adapter *rx_adapter,
dev_info->rx_queue[rx_queue_id].event_buf = NULL;
dev_info->rx_queue[rx_queue_id].stats = NULL;
}
+
+   /* unset rxa_inst_id for rx_queue_id */
+   if (event_eth_rxa_inst_info[eth_dev_id])
+   event_eth_rxa_in

[PATCH v5 2/7] eventdev/eth_rx: add telemetry callback for instance get

[Ganapati Kundapura]

Added telemetry handler for rte_event_eth_rx_adapter_instance_get()
to retrieve adapter instance id for specified ethernet device id
and rx queue index.

Signed-off-by: Ganapati Kundapura 

diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c 
b/lib/eventdev/rte_event_eth_rx_adapter.c
index d1b4874..3095647 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -3697,6 +3697,68 @@ handle_rxa_queue_stats_reset(const char *cmd 
__rte_unused,
return ret;
 }
 
+static int
+handle_rxa_instance_get(const char *cmd __rte_unused,
+   const char *params,
+   struct rte_tel_data *d)
+{
+   uint8_t instance_id;
+   uint16_t rx_queue_id;
+   int eth_dev_id, ret = -1;
+   char *token, *l_params;
+
+   if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+   return -1;
+
+   l_params = strdup(params);
+   if (l_params == NULL)
+   return -ENOMEM;
+   token = strtok(l_params, ",");
+   RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
+
+   /* Get device ID from parameter string */
+   eth_dev_id = strtoul(token, NULL, 10);
+   RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
+
+   token = strtok(NULL, ",");
+   RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
+
+   /* Get Rx queue ID from parameter string */
+   rx_queue_id = strtoul(token, NULL, 10);
+   if (rx_queue_id >= rte_eth_devices[eth_dev_id].data->nb_rx_queues) {
+   RTE_EDEV_LOG_ERR("Invalid rx queue_id %u", rx_queue_id);
+   ret = -EINVAL;
+   goto error;
+   }
+
+   token = strtok(NULL, "\0");
+   if (token != NULL)
+   RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev"
+" telemetry command, ignoring");
+
+   /* Parsing parameter finished */
+   free(l_params);
+
+   if (rte_event_eth_rx_adapter_instance_get(eth_dev_id,
+ rx_queue_id,
+ &instance_id)) {
+   RTE_EDEV_LOG_ERR("Failed to get RX adapter instance ID "
+" for rx_queue_id = %d", rx_queue_id);
+   return -1;
+   }
+
+   rte_tel_data_start_dict(d);
+   rte_tel_data_add_dict_u64(d, "eth_dev_id", eth_dev_id);
+   rte_tel_data_add_dict_u64(d, "rx_queue_id", rx_queue_id);
+   rte_tel_data_add_dict_u64(d, "rxa_instance_id", instance_id);
+
+   return 0;
+
+error:
+   free(l_params);
+   return ret;
+}
+
 RTE_INIT(rxa_init_telemetry)
 {
rte_telemetry_register_cmd("/eventdev/rxa_stats",
@@ -3718,4 +3780,8 @@ RTE_INIT(rxa_init_telemetry)
rte_telemetry_register_cmd("/eventdev/rxa_queue_stats_reset",
handle_rxa_queue_stats_reset,
"Reset Rx queue stats. Parameter: rxa_id, dev_id, queue_id");
+
+   rte_telemetry_register_cmd("/eventdev/rxa_rxq_instance_get",
+   handle_rxa_instance_get,
+   "Returns Rx adapter instance id. Parameter: dev_id, queue_id");
 }
-- 
2.6.4

[PATCH v5 3/7] test/eth_rx: add test case for instance get API

[Ganapati Kundapura]

Added test case for rte_event_eth_rx_adapter_instance_get()

Signed-off-by: Ganapati Kundapura 

diff --git a/app/test/test_event_eth_rx_adapter.c 
b/app/test/test_event_eth_rx_adapter.c
index e358a70..878004b 100644
--- a/app/test/test_event_eth_rx_adapter.c
+++ b/app/test/test_event_eth_rx_adapter.c
@@ -39,6 +39,7 @@ test_event_eth_rx_intr_adapter_common(void)
 #define TEST_INST_ID   0
 #define TEST_DEV_ID0
 #define TEST_ETHDEV_ID 0
+#define TEST_ETH_QUEUE_ID  0
 
 struct event_eth_rx_adapter_test_params {
struct rte_mempool *mp;
@@ -1001,6 +1002,87 @@ adapter_queue_conf(void)
return TEST_SUCCESS;
 }
 
+static int
+adapter_instance_get(void)
+{
+   int err;
+   uint8_t inst_id;
+   uint16_t eth_dev_id;
+   struct rte_eth_dev_info dev_info;
+   struct rte_event_eth_rx_adapter_queue_conf queue_conf = {0};
+
+   /* Case 1: Test without configuring eth */
+   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Case 2: Test with wrong eth port */
+   eth_dev_id = rte_eth_dev_count_total() + 1;
+   err = rte_event_eth_rx_adapter_instance_get(eth_dev_id,
+   TEST_ETH_QUEUE_ID,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Case 3: Test with wrong rx queue */
+   err = rte_eth_dev_info_get(TEST_ETHDEV_ID, &dev_info);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
+   dev_info.max_rx_queues + 1,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Case 4: Test with right instance, port & rxq */
+   /* Add queue to Rx adapter */
+   queue_conf.ev.queue_id = TEST_ETH_QUEUE_ID;
+   queue_conf.ev.sched_type = RTE_SCHED_TYPE_ATOMIC;
+   queue_conf.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
+
+   err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID,
+&queue_conf);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID,
+   &inst_id);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   /* Add another queue */
+   queue_conf.ev.queue_id = TEST_ETH_QUEUE_ID + 1;
+   err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID + 1,
+&queue_conf);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID + 1,
+   &inst_id);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   /* Case 5: Test with right instance, port & wrong rxq */
+   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID + 2,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Delete queues from the Rx adapter */
+   err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID + 1);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   return TEST_SUCCESS;
+}
+
 static struct unit_test_suite event_eth_rx_tests = {
.suite_name = "rx event eth adapter test suite",
.setup = testsuite_setup,
@@ -1019,6 +1101,8 @@ static struct unit_test_suite event_eth_rx_tests = {
 adapter_queue_event_buf_test),
TEST_CASE_ST(adapter_create_with_params, adapter_free,
 adapter_queue_stats_test),
+   TEST_CASE_ST(adapter_create, adapter_free,
+adapter

[PATCH v5 4/7] eventdev/eth_tx: add instance get API

[Ganapati Kundapura]

Added rte_event_eth_tx_adapter_instance_get() to get the
adapter instance id for specified ethernet device id and
tx queue index.

Signed-off-by: Ganapati Kundapura 

diff --git a/lib/eventdev/rte_event_eth_rx_adapter.h 
b/lib/eventdev/rte_event_eth_rx_adapter.h
index f56938d..45140a6 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.h
+++ b/lib/eventdev/rte_event_eth_rx_adapter.h
@@ -712,10 +712,10 @@ rte_event_eth_rx_adapter_event_port_get(uint8_t id, 
uint8_t *event_port_id);
  *  Port identifier of Ethernet device.
  *
  * @param rx_queue_id
- *  Ethernet device receive queue index
+ *  Ethernet device receive queue index.
  *
  * @param[out] rxa_inst_id
- *  RX adapter instance identifier.
+ *  Pointer to store RX adapter instance identifier.
  *
  * @return
  *  - 0: Success
diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c 
b/lib/eventdev/rte_event_eth_tx_adapter.c
index 1b304f0..d9de6e5 100644
--- a/lib/eventdev/rte_event_eth_tx_adapter.c
+++ b/lib/eventdev/rte_event_eth_tx_adapter.c
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2018 Intel Corporation.
  */
+#include 
+
 #include 
 #include 
 #include 
@@ -17,6 +19,11 @@
 #define TXA_MAX_NB_TX  128
 #define TXA_INVALID_DEV_ID INT32_C(-1)
 #define TXA_INVALID_SERVICE_ID INT64_C(-1)
+#define INVALID_INSTANCE_IDUINT8_MAX
+
+#define TXA_ADAPTER_ARRAY "txa_adapter_array"
+#define TXA_SERVICE_DATA_ARRAY "txa_service_data_array"
+#define TXA_ADAPTER_INSTANCE_ARRAY "txa_adapter_instance_array"
 
 #define txa_evdev(id) (&rte_eventdevs[txa_dev_id_array[(id)]])
 
@@ -140,6 +147,10 @@ struct txa_service_ethdev {
void *queues;
 };
 
+struct event_eth_txa_inst_info {
+   uint8_t txa_inst_id;
+};
+
 /* Array of adapter instances, initialized with event device id
  * when adapter is created
  */
@@ -148,6 +159,9 @@ static int *txa_dev_id_array;
 /* Array of pointers to service implementation data */
 static struct txa_service_data **txa_service_data_array;
 
+/* array of adapter instances to store tx queue specific instance */
+static struct event_eth_txa_inst_info **event_eth_txa_inst_info;
+
 static int32_t txa_service_func(void *args);
 static int txa_service_adapter_create_ext(uint8_t id,
struct rte_eventdev *dev,
@@ -194,12 +208,42 @@ txa_memzone_array_get(const char *name, unsigned int 
elt_size, int nb_elems)
 }
 
 static int
+txa_memzone_lookup(void)
+{
+   const struct rte_memzone *mz;
+
+   if (txa_dev_id_array == NULL) {
+   mz = rte_memzone_lookup(TXA_ADAPTER_ARRAY);
+   if (mz == NULL)
+   return -ENOMEM;
+   txa_dev_id_array = mz->addr;
+   }
+
+   if (txa_service_data_array == NULL) {
+   mz = rte_memzone_lookup(TXA_SERVICE_DATA_ARRAY);
+   if (mz == NULL)
+   return -ENOMEM;
+   txa_service_data_array = mz->addr;
+   }
+
+   if (event_eth_txa_inst_info == NULL) {
+   mz = rte_memzone_lookup(TXA_ADAPTER_INSTANCE_ARRAY);
+   if (mz == NULL)
+   return -ENOMEM;
+   event_eth_txa_inst_info = mz->addr;
+   }
+
+   return 0;
+}
+
+
+static int
 txa_dev_id_array_init(void)
 {
if (txa_dev_id_array == NULL) {
int i;
 
-   txa_dev_id_array = txa_memzone_array_get("txa_adapter_array",
+   txa_dev_id_array = txa_memzone_array_get(TXA_ADAPTER_ARRAY,
sizeof(int),
RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE);
if (txa_dev_id_array == NULL)
@@ -221,15 +265,30 @@ txa_init(void)
 static int
 txa_service_data_init(void)
 {
+   uint8_t i;
+
if (txa_service_data_array == NULL) {
txa_service_data_array =
-   txa_memzone_array_get("txa_service_data_array",
+   txa_memzone_array_get(TXA_SERVICE_DATA_ARRAY,
sizeof(int),
RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE);
if (txa_service_data_array == NULL)
return -ENOMEM;
}
 
+   if (event_eth_txa_inst_info == NULL) {
+   event_eth_txa_inst_info =
+   txa_memzone_array_get(TXA_ADAPTER_INSTANCE_ARRAY,
+ sizeof(*event_eth_txa_inst_info),
+ RTE_MAX_ETHPORTS);
+   if (event_eth_txa_inst_info == NULL)
+   return -ENOMEM;
+   }
+
+   /* Reset the txa instance pointers */
+   for (i = 0; i < RTE_MAX_ETHPORTS; i++)
+   event_eth_txa_inst_info[i] = NULL;
+
return 0;
 }
 
@@ -763,6 +822,7 @@ txa_service_queue_add(uint8_t id,
struct rte_eth_dev_tx_buffer *tb;
struct txa_retry *txa_retry;
int ret = 0;
+   uint16_

[PATCH v5 7/7] doc/eth_tx: update instance get API

[Ganapati Kundapura]

Added rte_event_eth_tx_adapter_instance_get() details.

Signed-off-by: Ganapati Kundapura 

diff --git a/doc/guides/prog_guide/event_ethernet_tx_adapter.rst 
b/doc/guides/prog_guide/event_ethernet_tx_adapter.rst
index f80d226..dc3e6a1 100644
--- a/doc/guides/prog_guide/event_ethernet_tx_adapter.rst
+++ b/doc/guides/prog_guide/event_ethernet_tx_adapter.rst
@@ -165,6 +165,12 @@ in struct ``rte_event_eth_tx_adapter_stats``. The counter 
values are the sum of
 the counts from the eventdev PMD callback if the callback is supported, and
 the counts maintained by the service function, if one exists.
 
+Getting Adapter instance id
+~~~
+
+The  ``rte_event_eth_tx_adapter_instanceget()`` function reports
+tx adapter instance id for a specified ethernet device id and tx queue index.
+
 Tx event vectorization
 ~~
 
-- 
2.6.4

[PATCH v5 6/7] doc/eth_rx: update instance get API

[Ganapati Kundapura]

Added rte_event_eth_rx_adapter_instance_get() details

Signed-off-by: Ganapati Kundapura 

diff --git a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst 
b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
index 3b4ef50..5b9d0cf 100644
--- a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
+++ b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
@@ -177,6 +177,12 @@ used otherwise it returns -EINVAL.
 The ``rte_event_eth_rx_adapter_queue_stats_reset`` function can be used to
 reset queue level stats when queue level event buffer is in use.
 
+Getting Adapter instance id
+~~~
+
+The ``rte_event_eth_rx_adapter_instance_get()`` function reports
+rx adapter instance id for a specified ethernet device id and rx queue index.
+
 Interrupt Based Rx Queues
 ~~
 
-- 
2.6.4

[PATCH v5 5/7] test/eth_tx: add testcase for instance get API

[Ganapati Kundapura]

Added testcase for rte_event_eth_tx_adapter_instance_get()

Signed-off-by: Ganapati Kundapura 

diff --git a/app/test/test_event_eth_tx_adapter.c 
b/app/test/test_event_eth_tx_adapter.c
index 2900532..ebbc622 100644
--- a/app/test/test_event_eth_tx_adapter.c
+++ b/app/test/test_event_eth_tx_adapter.c
@@ -29,6 +29,7 @@ test_event_eth_tx_adapter_common(void)
 #define MAX_NUM_QUEUE  RTE_PMD_RING_MAX_RX_RINGS
 #define TEST_INST_ID   0
 #define TEST_DEV_ID0
+#define TEST_ETH_QUEUE_ID  0
 #define SOCKET00
 #define RING_SIZE  256
 #define ETH_NAME_LEN   32
@@ -639,6 +640,79 @@ tx_adapter_service(void)
 }
 
 static int
+tx_adapter_instance_get(void)
+{
+   int err;
+   uint8_t inst_id;
+   uint16_t eth_dev_id;
+   struct rte_eth_dev_info dev_info;
+
+   /* Case 1: Test without configuring eth */
+   err = rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Case 2: Test with wrong eth port */
+   eth_dev_id = rte_eth_dev_count_total() + 1;
+   err = rte_event_eth_tx_adapter_instance_get(eth_dev_id,
+   TEST_ETH_QUEUE_ID,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Case 3: Test with wrong tx queue */
+   err = rte_eth_dev_info_get(TEST_ETHDEV_ID, &dev_info);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID,
+   dev_info.max_tx_queues + 1,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Case 4: Test with right instance, port & rxq */
+   /* Add queue to tx adapter */
+   err = rte_event_eth_tx_adapter_queue_add(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID,
+   &inst_id);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   /* Add another queue to tx adapter */
+   err = rte_event_eth_tx_adapter_queue_add(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID + 1);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID + 1,
+   &inst_id);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   /* Case 5: Test with right instance, port & wrong rxq */
+   err = rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID + 2,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Delete queues from the Tx adapter */
+   err = rte_event_eth_tx_adapter_queue_del(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_tx_adapter_queue_del(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID + 1);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   return TEST_SUCCESS;
+}
+
+static int
 tx_adapter_dynamic_device(void)
 {
uint16_t port_id = rte_eth_dev_count_avail();
@@ -695,6 +769,8 @@ static struct unit_test_suite event_eth_tx_tests = {
tx_adapter_start_stop),
TEST_CASE_ST(tx_adapter_create, tx_adapter_free,
tx_adapter_service),
+   TEST_CASE_ST(tx_adapter_create, tx_adapter_free,
+   tx_adapter_instance_get),
TEST_CASE_ST(NULL, NULL, tx_adapter_dynamic_device),
TEST_CASES_END() /**< NULL terminate unit test array */
}
-- 
2.6.4

Re: [PATCH v2 06/11] net/hns3: fix coverity codecheck

[Andrew Rybchenko]

Hi Dongdong,

On 6/6/22 10:48, Dongdong Liu wrote:

Hi Andrew

Many thanks for your review.

I will take over Hu Min's current work and continue to do the upstream 
work.


On 2022/6/1 16:32, Andrew Rybchenko wrote:

On 6/1/22 06:52, Min Hu (Connor) wrote:

In bitwise operation, "val" should be an unsigned type. This patch
fixed it.

Fixes: 38b539d96eb6 ("net/hns3: support IEEE 1588 PTP")
Cc: sta...@dpdk.org


Please, let me know coverity ID. No necessity to resend.
I'll add it on applying.


The code warning is checked by our internal code check tool,
does not have the coverity ID.


Hm, the summary says coverity. Could you suggest how to rephrase it.

Thanks,
Andrew.

RE: [PATCH v4] eventdev: add adapter instance get API

[Kundapura, Ganapati]

Hi Harish,

> -Original Message-
> From: Naga Harish K, S V 
> Sent: 08 June 2022 09:57
> To: Kundapura, Ganapati ;
> jerinjac...@gmail.com; dev@dpdk.org; Jayatheerthan, Jay
> 
> Subject: RE: [PATCH v4] eventdev: add adapter instance get API
> 
> Hi Ganapati,
>Some comments inline.
> 
> > -Original Message-
> > From: Ganapati Kundapura 
> > Sent: Tuesday, June 7, 2022 8:43 PM
> > To: jerinjac...@gmail.com; dev@dpdk.org; Jayatheerthan, Jay
> > 
> > Subject: [PATCH v4] eventdev: add adapter instance get API
> >
> > Added rte_event_eth_rx_adapter_instance_get() and
> > rte_event_eth_tx_adapter_instance_get() api's to get the adapter
> > instance id for a specified event port and queue index.
> 
> It is supposed to be ethernet device id, not event port
Addressed in V5
> 
> >
> > Signed-off-by: Ganapati Kundapura 
> > ---
> > v4:
> > * Moved instance array allocation and instance id storage
> >   before adapter's nb_queue updation for handling the
> >   error case  properly
> >
> > v3:
> > * Fixed checkpatch error
> >
> > v2:
> > * Fixed build issues
> > * Added telemetry support for rte_event_eth_rx_adapter_instance_get
> > * arranged functions in alphabetical order in version.map
> >
> > diff --git a/app/test/test_event_eth_rx_adapter.c
> > b/app/test/test_event_eth_rx_adapter.c
> > index e358a70..878004b 100644
> > --- a/app/test/test_event_eth_rx_adapter.c
> > +++ b/app/test/test_event_eth_rx_adapter.c
> > @@ -39,6 +39,7 @@ test_event_eth_rx_intr_adapter_common(void)
> >  #define TEST_INST_ID   0
> >  #define TEST_DEV_ID0
> >  #define TEST_ETHDEV_ID 0
> > +#define TEST_ETH_QUEUE_ID  0
> >
> >  struct event_eth_rx_adapter_test_params {
> > struct rte_mempool *mp;
> > @@ -1001,6 +1002,87 @@ adapter_queue_conf(void)
> > return TEST_SUCCESS;
> >  }
> >
> > +static int
> > +adapter_instance_get(void)
> > +{
> > +   int err;
> > +   uint8_t inst_id;
> > +   uint16_t eth_dev_id;
> > +   struct rte_eth_dev_info dev_info;
> > +   struct rte_event_eth_rx_adapter_queue_conf queue_conf = {0};
> > +
> > +   /* Case 1: Test without configuring eth */
> > +   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
> > +   TEST_ETH_QUEUE_ID,
> > +   &inst_id);
> > +   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
> > +
> > +   /* Case 2: Test with wrong eth port */
> > +   eth_dev_id = rte_eth_dev_count_total() + 1;
> > +   err = rte_event_eth_rx_adapter_instance_get(eth_dev_id,
> > +   TEST_ETH_QUEUE_ID,
> > +   &inst_id);
> > +   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
> > +
> > +   /* Case 3: Test with wrong rx queue */
> > +   err = rte_eth_dev_info_get(TEST_ETHDEV_ID, &dev_info);
> > +   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
> > +
> > +   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
> > +   dev_info.max_rx_queues +
> > 1,
> > +   &inst_id);
> > +   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
> > +
> > +   /* Case 4: Test with right instance, port & rxq */
> > +   /* Add queue to Rx adapter */
> > +   queue_conf.ev.queue_id = TEST_ETH_QUEUE_ID;
> > +   queue_conf.ev.sched_type = RTE_SCHED_TYPE_ATOMIC;
> > +   queue_conf.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
> > +
> > +   err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
> > +TEST_ETHDEV_ID,
> > +TEST_ETH_QUEUE_ID,
> > +&queue_conf);
> > +   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
> > +
> > +   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
> > +   TEST_ETH_QUEUE_ID,
> > +   &inst_id);
> > +   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
> > +
> > +   /* Add another queue */
> > +   queue_conf.ev.queue_id = TEST_ETH_QUEUE_ID + 1;
> > +   err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
> > +TEST_ETHDEV_ID,
> > +TEST_ETH_QUEUE_ID + 1,
> > +&queue_conf);
> > +   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
> > +
> > +   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
> > +   TEST_ETH_QUEUE_ID + 1,
> > +   &inst_id);
> > +   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
> > +
> > +   /* Case 5: Test with right instance, port & wrong rxq */
> > +   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
> > +   TEST_ETH_QUEUE_

RE: [PATCH v3] eventdev: add adapter instance get API

[Kundapura, Ganapati]

Hi Jay,
   Patch is split into 7 patch sets in V5 as suggested.

Thanks,
Ganapati

> -Original Message-
> From: Jayatheerthan, Jay 
> Sent: 07 June 2022 18:49
> To: Kundapura, Ganapati ;
> jerinjac...@gmail.com; dev@dpdk.org
> Subject: RE: [PATCH v3] eventdev: add adapter instance get API
> 
> Hi Ganapati,
> This patch could be split into multiple patches in a patchset to make it 
> easier
> to review.
> 
> One way to split:
> 1. Rx adapter API
> 2. Telemetry changes for Rx adapter
> 3. Test changes for Rx adapter API
> 4. Tx adapter API
> 5. Telemetry changes for Tx adapter ?
> 6. Test changes for Tx adapter API
> 7. Document update.
> 
> -Jay
> 
> 
> > -Original Message-
> > From: Kundapura, Ganapati 
> > Sent: Tuesday, June 7, 2022 1:51 PM
> > To: jerinjac...@gmail.com; dev@dpdk.org; Jayatheerthan, Jay
> > 
> > Subject: [PATCH v3] eventdev: add adapter instance get API
> >
> > Added rte_event_eth_rx_adapter_instance_get() and
> > rte_event_eth_tx_adapter_instance_get() api's to get the adapter
> > instance id for a specified event port and queue index.
> >
> > Signed-off-by: Ganapati Kundapura 
> > ---
> > v3:
> > * Fixed checkpatch error
> >
> > v2:
> > * Fixed build issues
> > * Added telemetry support for rte_event_eth_rx_adapter_instance_get
> > * arranged functions in alphabetical order in version.map
> >
> > diff --git a/app/test/test_event_eth_rx_adapter.c
> > b/app/test/test_event_eth_rx_adapter.c
> > index e358a70..878004b 100644
> > --- a/app/test/test_event_eth_rx_adapter.c
> > +++ b/app/test/test_event_eth_rx_adapter.c
> > @@ -39,6 +39,7 @@ test_event_eth_rx_intr_adapter_common(void)
> >  #define TEST_INST_ID   0
> >  #define TEST_DEV_ID0
> >  #define TEST_ETHDEV_ID 0
> > +#define TEST_ETH_QUEUE_ID  0
> >
> >  struct event_eth_rx_adapter_test_params {
> > struct rte_mempool *mp;
> > @@ -1001,6 +1002,87 @@ adapter_queue_conf(void)
> > return TEST_SUCCESS;
> >  }
> >
> > +static int
> > +adapter_instance_get(void)
> > +{
> > +   int err;
> > +   uint8_t inst_id;
> > +   uint16_t eth_dev_id;
> > +   struct rte_eth_dev_info dev_info;
> > +   struct rte_event_eth_rx_adapter_queue_conf queue_conf = {0};
> > +
> > +   /* Case 1: Test without configuring eth */
> > +   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
> > +   TEST_ETH_QUEUE_ID,
> > +   &inst_id);
> > +   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
> > +
> > +   /* Case 2: Test with wrong eth port */
> > +   eth_dev_id = rte_eth_dev_count_total() + 1;
> > +   err = rte_event_eth_rx_adapter_instance_get(eth_dev_id,
> > +   TEST_ETH_QUEUE_ID,
> > +   &inst_id);
> > +   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
> > +
> > +   /* Case 3: Test with wrong rx queue */
> > +   err = rte_eth_dev_info_get(TEST_ETHDEV_ID, &dev_info);
> > +   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
> > +
> > +   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
> > +   dev_info.max_rx_queues +
> 1,
> > +   &inst_id);
> > +   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
> > +
> > +   /* Case 4: Test with right instance, port & rxq */
> > +   /* Add queue to Rx adapter */
> > +   queue_conf.ev.queue_id = TEST_ETH_QUEUE_ID;
> > +   queue_conf.ev.sched_type = RTE_SCHED_TYPE_ATOMIC;
> > +   queue_conf.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
> > +
> > +   err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
> > +TEST_ETHDEV_ID,
> > +TEST_ETH_QUEUE_ID,
> > +&queue_conf);
> > +   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
> > +
> > +   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
> > +   TEST_ETH_QUEUE_ID,
> > +   &inst_id);
> > +   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
> > +
> > +   /* Add another queue */
> > +   queue_conf.ev.queue_id = TEST_ETH_QUEUE_ID + 1;
> > +   err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
> > +TEST_ETHDEV_ID,
> > +TEST_ETH_QUEUE_ID + 1,
> > +&queue_conf);
> > +   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
> > +
> > +   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
> > +   TEST_ETH_QUEUE_ID + 1,
> > +   &inst_id);
> > +   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
> > +
> > +   /* Case 5: Test with right instance, port & wrong rxq */
> > + 

Re: [PATCH] app/testpmd: fix packets segments allocation

[Andrew Rybchenko]

On 6/2/22 15:59, Raja Zidane wrote:

When --mbuf-size cmdln parameter is specified, the segments to scatter
packets on are allocated sequentially from these extra memory pools
(the mbuf for the first segment is allocated from the first pool, the
second one from the second pool, and so on, if segment number is greater
then pool’s the mbuf for remaining segments will be allocated from the
last valid pool).
A bug in comparing segment index with mbuf index caused wrong mapping
of one of the segments.

Fix the comparison.

Fixes: 2befc67ff679 ("app/testpmd: add extended Rx queue setup")
Cc: sta...@dpdk.org

Signed-off-by: Raja Zidane 
Acked-by: Matan Azrad 


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

RE: [PATCH v3 0/7] ethdev: separate metering and marking from policing

[Dumitrescu, Cristian]

> -Original Message-
> From: Alexander Kozyrev 
> Sent: Wednesday, June 1, 2022 4:44 AM
> To: dev@dpdk.org
> Cc: Dumitrescu, Cristian ;
> jerinjac...@gmail.com; or...@nvidia.com; tho...@monjalon.net;
> ivan.ma...@oktetlabs.ru; andrew.rybche...@oktetlabs.ru;
> ferruh.yi...@xilinx.com; Awal, Mohammad Abdul
> ; Zhang, Qi Z ;
> jer...@marvell.com; ajit.khapa...@broadcom.com; Richardson, Bruce
> 
> Subject: [PATCH v3 0/7] ethdev: separate metering and marking from
> policing
> 
> Extend Metering and Marking support in the Flow API:
> 1. Add METER_COLOR item to match Color Marker set by a Meter.
> 2. Add the ability to set Color Marker via modify_field Flow API.
> 3. Add Meter API to get profile/policy objects.
> 4. Add METER_MARK action to perform Meter color metering and marking.
> Provide greater flexibility in how Metering can be used.
> 
> RFC:
> https://patchwork.dpdk.org/project/dpdk/cover/20220502200439.4100965-
> 1-akozy...@nvidia.com/
> 
> Traditional Meter Usage:
> 
> profile_id = rte_mtr_meter_profile_add(RFC_params);
> policy_id = rte_mtr_meter_policy_add(actions[RED/YELLOW/GREEN]);
> meter_id = rte_mtr_create(profile_id, policy_id);
> rte_flow_create(pattern=5-tuple,actions=METER(meter_id));
> 
> The METER action effectively translates to the following:
> 1. Metering a packet stream.
> 2. Marking packets with an appropriate color.
> 3. Jump to a policy group.
> 4. Match on a color.
> 5. Execute assigned policy actions for the color.
> 
> New Meter Usage Model:
> profile_id = rte_mtr_meter_profile_add(RFC_params);
> *profile_obj_ptr = rte_mtr_meter_profile_get(profile_id);
> rte_flow_create(pattern=5-tuple,
>   actions=METER(profile_obj_ptr),JUMP);
> rte_flow_create(pattern=COLOR, actions=...);
> 
> The METER_MARK action effectively translates to the following:
> 1. Metering a packet stream.
> 2. Marking packets with an appropriate color.
> 
> A user is able to match the color later with the COLOR item.
> In order to do this we add the JUMP action after the METER action.
> 
> 3. Jump to a policy group.
> 4. Match on a color.
> 5. Execute actions for the color.
> 
> Here we decoupled the meter profile usage from the meter policy usage
> for greater flexibility and got rid of any locks related to meter_id lookup.
> 
> Another example of the meter creation to mimic the old model entirely:
> profile_id = rte_mtr_meter_profile_add(RFC_params);
> *profile_obj_ptr = rte_mtr_meter_profile_get(profile_id);
> policy_id = rte_mtr_meter_policy_add(actions[RED/YELLOW/GREEN]);
> *policy_obj_ptr = rte_mtr_meter_policy_get(policy_id);
> rte_flow_create(pattern=5-tuple,
>   actions=METER(profile_obj_ptr,
> policy_obj_ptr));
> 
> In this case, we define the policy actions right away.
> The main advantage is not having to lookup for profile_id/policy_id.
> 
> To free the meter obects we need to do the following:
> rte_flow_destroy(flow_handle);
> rte_mtr_meter_policy_delete(policy_id);
> rte_mtr_meter_profile_delete(profile_id);.
> profile_obj_ptr and policy_obj_ptr are no longer valid after that.
> 
> The meter profile configuration cannot be updated dynamically
> with the current set of patches, but can be supported later on.
> Now you have to destroy flows and profiles and recreate them.
> But rte_mtr_meter_profile_update()/rte_mtr_meter_policy_update()
> can have the corresponding siblings without mtr_id parameters.
> In this case, we can update the config and all the flows using them.
> 
> The meter sharing is done via the indirect action Flow API:
> profile_id = rte_mtr_meter_profile_add(RFC_params);
> *profile_obj_ptr = rte_mtr_meter_prof8ile_get(profile_id);
> handle = rte_flow_action_handle_create(action=METER(profile_obj_ptr,
> NULL));
> flow1 = rte_flow_create(pattern=5-tuple-1, actions=INDIRECT(handle));
> flow2 = rte_flow_create(pattern=5-tuple-2, actions=INDIRECT(handle));
> 
> Once we are done with the flow rules we can free everything.
> rte_flow_destroy(flow1);
> rte_flow_destroy(flow2);
> rte_flow_action_handle_destroy(handle);
> rte_mtr_meter_profile_delete(profile_id);
> 
> Signed-off-by: Alexander Kozyrev 
> 
> Alexander Kozyrev (7):
>   ethdev: add meter color flow matching item
>   ethdev: allow meter color marker modification
>   ethdev: get meter profile/policy objects
>   ethdev: add meter color mark flow action
>   app/testpmd: add meter color flow matching item
>   app/testpmd: allow meter color marker modification
>   app/testpmd: add meter color mark flow action
> 
>  app/test-pmd/cmdline_flow.c   | 213 +-
>  app/test-pmd/config.c |  26 +++
>  app/test-pmd/testpmd.h|   4 +
>  doc/guides/prog_guide/rte_flow.rst|  32 +++
>  .../traffic_metering_and_policing.rst |   7 +
>  doc/guides/rel_notes/release_22_07.rst|   7 +
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst   |   9 +
>  lib/ethdev/rte_flow.c  

[PATCH v2] eal: remove unused arch specific headers for locks

[David Marchand]

MCS lock, PF lock and Ticket lock have no arch specific implementation,
there is no need for the extra redirection in headers.

Signed-off-by: David Marchand 
Acked-by: Stephen Hemminger 
---
Note: this was mentionned during the seqlock patch review, and I spotted
it again, while reviewing the RISC-V port, and I see the same for a next
architecture too. So better clean this up as we don't need the
redirection.

Changes since v1:
- rebased following RISC-V merge,

---
 MAINTAINERS   |  4 ++--
 lib/eal/arm/include/meson.build   |  3 ---
 lib/eal/arm/include/rte_mcslock.h | 22 ---
 lib/eal/arm/include/rte_pflock.h  | 18 ---
 lib/eal/arm/include/rte_ticketlock.h  | 22 ---
 lib/eal/include/meson.build   |  6 ++---
 lib/eal/include/{generic => }/rte_mcslock.h   |  8 +++
 lib/eal/include/{generic => }/rte_pflock.h|  0
 .../include/{generic => }/rte_ticketlock.h|  0
 lib/eal/ppc/include/meson.build   |  3 ---
 lib/eal/ppc/include/rte_mcslock.h | 18 ---
 lib/eal/ppc/include/rte_pflock.h  | 17 --
 lib/eal/ppc/include/rte_ticketlock.h  | 18 ---
 lib/eal/riscv/include/meson.build |  3 ---
 lib/eal/riscv/include/rte_mcslock.h   | 18 ---
 lib/eal/riscv/include/rte_pflock.h| 17 --
 lib/eal/riscv/include/rte_ticketlock.h| 21 --
 lib/eal/x86/include/meson.build   |  3 ---
 lib/eal/x86/include/rte_mcslock.h | 18 ---
 lib/eal/x86/include/rte_pflock.h  | 18 ---
 lib/eal/x86/include/rte_ticketlock.h  | 18 ---
 21 files changed, 13 insertions(+), 242 deletions(-)
 delete mode 100644 lib/eal/arm/include/rte_mcslock.h
 delete mode 100644 lib/eal/arm/include/rte_pflock.h
 delete mode 100644 lib/eal/arm/include/rte_ticketlock.h
 rename lib/eal/include/{generic => }/rte_mcslock.h (98%)
 rename lib/eal/include/{generic => }/rte_pflock.h (100%)
 rename lib/eal/include/{generic => }/rte_ticketlock.h (100%)
 delete mode 100644 lib/eal/ppc/include/rte_mcslock.h
 delete mode 100644 lib/eal/ppc/include/rte_pflock.h
 delete mode 100644 lib/eal/ppc/include/rte_ticketlock.h
 delete mode 100644 lib/eal/riscv/include/rte_mcslock.h
 delete mode 100644 lib/eal/riscv/include/rte_pflock.h
 delete mode 100644 lib/eal/riscv/include/rte_ticketlock.h
 delete mode 100644 lib/eal/x86/include/rte_mcslock.h
 delete mode 100644 lib/eal/x86/include/rte_pflock.h
 delete mode 100644 lib/eal/x86/include/rte_ticketlock.h

diff --git a/MAINTAINERS b/MAINTAINERS
index 372f44523d..4e477401f8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -255,7 +255,7 @@ F: app/test/test_bitmap.c
 
 MCSlock
 M: Honnappa Nagarahalli 
-F: lib/eal/include/generic/rte_mcslock.h
+F: lib/eal/include/rte_mcslock.h
 F: app/test/test_mcslock.c
 
 Sequence Lock
@@ -266,7 +266,7 @@ F: app/test/test_seqlock.c
 
 Ticketlock
 M: Joyce Kong 
-F: lib/eal/include/generic/rte_ticketlock.h
+F: lib/eal/include/rte_ticketlock.h
 F: app/test/test_ticketlock.c
 
 Pseudo-random Number Generation
diff --git a/lib/eal/arm/include/meson.build b/lib/eal/arm/include/meson.build
index 65c3aec35c..657bf58569 100644
--- a/lib/eal/arm/include/meson.build
+++ b/lib/eal/arm/include/meson.build
@@ -14,21 +14,18 @@ arch_headers = files(
 'rte_cycles.h',
 'rte_io_64.h',
 'rte_io.h',
-'rte_mcslock.h',
 'rte_memcpy_32.h',
 'rte_memcpy_64.h',
 'rte_memcpy.h',
 'rte_pause_32.h',
 'rte_pause_64.h',
 'rte_pause.h',
-'rte_pflock.h',
 'rte_power_intrinsics.h',
 'rte_prefetch_32.h',
 'rte_prefetch_64.h',
 'rte_prefetch.h',
 'rte_rwlock.h',
 'rte_spinlock.h',
-'rte_ticketlock.h',
 'rte_vect.h',
 )
 install_headers(arch_headers, subdir: get_option('include_subdir_arch'))
diff --git a/lib/eal/arm/include/rte_mcslock.h 
b/lib/eal/arm/include/rte_mcslock.h
deleted file mode 100644
index 896d678073..00
--- a/lib/eal/arm/include/rte_mcslock.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019 Arm Limited
- */
-
-#ifndef _RTE_MCSLOCK_ARM_H_
-#define _RTE_MCSLOCK_ARM_H_
-
-#ifndef RTE_FORCE_INTRINSICS
-#  error Platform must be built with RTE_FORCE_INTRINSICS
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "generic/rte_mcslock.h"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RTE_MCSLOCK_ARM_H_ */
diff --git a/lib/eal/arm/include/rte_pflock.h b/lib/eal/arm/include/rte_pflock.h
deleted file mode 100644
index bb9934eec4..00
--- a/lib/eal/arm/include/rte_pflock.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2021 Microsoft Corporation
- */
-
-#ifndef _RTE_PFLOCK_ARM_H_
-#define _RTE_PFLOCK_ARM

[PATCH 1/2] common/mlx5: update log format after devx_general_cmd error

[Gregory Etelson]

Application can fetch syndrome value after FW operation failure
starting from Mellanox OFED-5.6.
The patch updates log data issued after devx_general_cmd error.

Signed-off-by: Gregory Etelson 
Acked-by: Matan Azrad 
---
 drivers/common/mlx5/mlx5_devx_cmds.c | 103 ---
 1 file changed, 44 insertions(+), 59 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c 
b/drivers/common/mlx5/mlx5_devx_cmds.c
index c6bdbc12bb..bc06aeccc7 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -13,39 +13,49 @@
 #include "mlx5_common_log.h"
 #include "mlx5_malloc.h"
 
+/* FW writes status value to the OUT buffer at offset 00H */
+#define MLX5_FW_STATUS(o) MLX5_GET(general_obj_out_cmd_hdr, (o), status)
+/* FW writes syndrome value to the OUT buffer at offset 04H */
+#define MLX5_FW_SYNDROME(o) MLX5_GET(general_obj_out_cmd_hdr, (o), syndrome)
+
+#define MLX5_DEVX_ERR_RC(x) ((x) > 0 ? -(x) : ((x) < 0 ? (x) : -1))
+
+static void
+mlx5_devx_err_log(void *out, const char *reason,
+ const char *param, uint32_t value)
+{
+   rte_errno = errno;
+   if (!param)
+   DRV_LOG(ERR, "DevX %s failed errno=%d status=%#x syndrome=%#x",
+   reason, errno, MLX5_FW_STATUS(out),
+   MLX5_FW_SYNDROME(out));
+   else
+   DRV_LOG(ERR, "DevX %s %s=%#X failed errno=%d status=%#x 
syndrome=%#x",
+   reason, param, value, errno, MLX5_FW_STATUS(out),
+   MLX5_FW_SYNDROME(out));
+}
+
 static void *
 mlx5_devx_get_hca_cap(void *ctx, uint32_t *in, uint32_t *out,
  int *err, uint32_t flags)
 {
const size_t size_in = MLX5_ST_SZ_DW(query_hca_cap_in) * sizeof(int);
const size_t size_out = MLX5_ST_SZ_DW(query_hca_cap_out) * sizeof(int);
-   int status, syndrome, rc;
+   int rc;
 
-   if (err)
-   *err = 0;
memset(in, 0, size_in);
memset(out, 0, size_out);
MLX5_SET(query_hca_cap_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_CAP);
MLX5_SET(query_hca_cap_in, in, op_mod, flags);
rc = mlx5_glue->devx_general_cmd(ctx, in, size_in, out, size_out);
-   if (rc) {
-   DRV_LOG(ERR,
-   "Failed to query devx HCA capabilities func %#02x",
-   flags >> 1);
+   if (rc || MLX5_FW_STATUS(out)) {
+   mlx5_devx_err_log(out, "HCA capabilities", "func", flags >> 1);
if (err)
-   *err = rc > 0 ? -rc : rc;
-   return NULL;
-   }
-   status = MLX5_GET(query_hca_cap_out, out, status);
-   syndrome = MLX5_GET(query_hca_cap_out, out, syndrome);
-   if (status) {
-   DRV_LOG(ERR,
-   "Failed to query devx HCA capabilities func %#02x 
status %x, syndrome = %x",
-   flags >> 1, status, syndrome);
-   if (err)
-   *err = -1;
+   *err = MLX5_DEVX_ERR_RC(rc);
return NULL;
}
+   if (err)
+   *err = 0;
return MLX5_ADDR_OF(query_hca_cap_out, out, capability);
 }
 
@@ -74,7 +84,7 @@ mlx5_devx_cmd_register_read(void *ctx, uint16_t reg_id, 
uint32_t arg,
uint32_t in[MLX5_ST_SZ_DW(access_register_in)]   = {0};
uint32_t out[MLX5_ST_SZ_DW(access_register_out) +
 MLX5_ACCESS_REGISTER_DATA_DWORD_MAX] = {0};
-   int status, rc;
+   int rc;
 
MLX5_ASSERT(data && dw_cnt);
MLX5_ASSERT(dw_cnt <= MLX5_ACCESS_REGISTER_DATA_DWORD_MAX);
@@ -91,23 +101,13 @@ mlx5_devx_cmd_register_read(void *ctx, uint16_t reg_id, 
uint32_t arg,
rc = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out,
 MLX5_ST_SZ_BYTES(access_register_out) +
 sizeof(uint32_t) * dw_cnt);
-   if (rc)
-   goto error;
-   status = MLX5_GET(access_register_out, out, status);
-   if (status) {
-   int syndrome = MLX5_GET(access_register_out, out, syndrome);
-
-   DRV_LOG(DEBUG, "Failed to read access NIC register 0x%X, "
-  "status %x, syndrome = %x",
-  reg_id, status, syndrome);
-   return -1;
+   if (rc || MLX5_FW_STATUS(out)) {
+   mlx5_devx_err_log(out, "read access", "NIC register", reg_id);
+   return MLX5_DEVX_ERR_RC(rc);
}
memcpy(data, &out[MLX5_ST_SZ_DW(access_register_out)],
   dw_cnt * sizeof(uint32_t));
return 0;
-error:
-   rc = (rc > 0) ? -rc : rc;
-   return rc;
 }
 
 /**
@@ -134,7 +134,7 @@ mlx5_devx_cmd_register_write(void *ctx, uint16_t reg_id, 
uint32_t arg,
uint32_t in[MLX5_ST_SZ_DW(access_register_in) +
MLX5_ACCESS_REGISTER_DATA_DWORD_MAX] = {0};
uint32_t out[MLX5_ST_SZ_DW(access_registe

[PATCH 2/2] common/mlx5: update log format after devx_obj_create error

[Gregory Etelson]

Application can fetch syndrome value after FW operation failure
starting from Mellanox OFED-5.6.
The patch updates log data after devx_obj_create error.

Signed-off-by: Gregory Etelson 
Acked-by: Matan Azrad 
---
 drivers/common/mlx5/mlx5_devx_cmds.c | 77 ++--
 1 file changed, 26 insertions(+), 51 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c 
b/drivers/common/mlx5/mlx5_devx_cmds.c
index bc06aeccc7..d4220a863b 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -199,8 +199,7 @@ mlx5_devx_cmd_flow_counter_alloc(void *ctx, uint32_t 
bulk_n_128)
dcs->obj = mlx5_glue->devx_obj_create(ctx, in,
  sizeof(in), out, sizeof(out));
if (!dcs->obj) {
-   DRV_LOG(ERR, "Can't allocate counters - error %d", errno);
-   rte_errno = errno;
+   mlx5_devx_err_log(out, "allocate counters", NULL, 0);
mlx5_free(dcs);
return NULL;
}
@@ -378,9 +377,9 @@ mlx5_devx_cmd_mkey_create(void *ctx,
mkey->obj = mlx5_glue->devx_obj_create(ctx, in, in_size_dw * 4, out,
   sizeof(out));
if (!mkey->obj) {
-   DRV_LOG(ERR, "Can't create %sdirect mkey - error %d",
-   klm_num ? "an in" : "a ", errno);
-   rte_errno = errno;
+   mlx5_devx_err_log(out,
+ klm_num ? "create indirect mkey" : "create 
direct key",
+ NULL, 0);
mlx5_free(mkey);
return NULL;
}
@@ -709,9 +708,7 @@ mlx5_devx_cmd_create_flex_parser(void *ctx,
parse_flex_obj->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in),
 out, sizeof(out));
if (!parse_flex_obj->obj) {
-   rte_errno = errno;
-   DRV_LOG(ERR, "Failed to create FLEX PARSE GRAPH object "
-   "by using DevX.");
+   mlx5_devx_err_log(out, "create FLEX PARSE GRAPH", NULL, 0);
mlx5_free(parse_flex_obj);
return NULL;
}
@@ -1283,8 +1280,7 @@ mlx5_devx_cmd_create_rq(void *ctx,
rq->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in),
  out, sizeof(out));
if (!rq->obj) {
-   DRV_LOG(ERR, "Failed to create RQ using DevX");
-   rte_errno = errno;
+   mlx5_devx_err_log(out, "create RQ", NULL, 0);
mlx5_free(rq);
return NULL;
}
@@ -1383,8 +1379,7 @@ mlx5_devx_cmd_create_rmp(void *ctx,
rmp->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in), out,
  sizeof(out));
if (!rmp->obj) {
-   DRV_LOG(ERR, "Failed to create RMP using DevX");
-   rte_errno = errno;
+   mlx5_devx_err_log(out, "create RMP", NULL, 0);
mlx5_free(rmp);
return NULL;
}
@@ -1452,8 +1447,7 @@ mlx5_devx_cmd_create_tir(void *ctx,
tir->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in),
   out, sizeof(out));
if (!tir->obj) {
-   DRV_LOG(ERR, "Failed to create TIR using DevX");
-   rte_errno = errno;
+   mlx5_devx_err_log(out, "create TIR", NULL, 0);
mlx5_free(tir);
return NULL;
}
@@ -1591,8 +1585,7 @@ mlx5_devx_cmd_create_rqt(void *ctx,
rqt->obj = mlx5_glue->devx_obj_create(ctx, in, inlen, out, sizeof(out));
mlx5_free(in);
if (!rqt->obj) {
-   DRV_LOG(ERR, "Failed to create RQT using DevX");
-   rte_errno = errno;
+   mlx5_devx_err_log(out, "create RQT", NULL, 0);
mlx5_free(rqt);
return NULL;
}
@@ -1706,8 +1699,7 @@ mlx5_devx_cmd_create_sq(void *ctx,
sq->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in),
 out, sizeof(out));
if (!sq->obj) {
-   DRV_LOG(ERR, "Failed to create SQ using DevX");
-   rte_errno = errno;
+   mlx5_devx_err_log(out, "create SQ", NULL, 0);
mlx5_free(sq);
return NULL;
}
@@ -1790,8 +1782,7 @@ mlx5_devx_cmd_create_tis(void *ctx,
tis->obj = mlx5_glue->devx_obj_create(ctx, in, sizeof(in),
  out, sizeof(out));
if (!tis->obj) {
-   DRV_LOG(ERR, "Failed to create TIS using DevX");
-   rte_errno = errno;
+   mlx5_devx_err_log(out, "create TIS", NULL, 0);
mlx5_free(tis);
return NULL;
}
@@ -1825,8 +1816,7 @@ mlx5_devx_cmd_create_td(void *ctx)
td->obj = mlx5_glue->devx_obj_create

RE: [PATCH v3] sched: enable CMAN at runtime

[Dumitrescu, Cristian]

> -Original Message-
> From: Danilewicz, MarcinX 
> Sent: Wednesday, June 8, 2022 10:42 AM
> To: dev@dpdk.org; Singh, Jasvinder ;
> Dumitrescu, Cristian 
> Cc: Ajmera, Megha 
> Subject: [PATCH v3] sched: enable CMAN at runtime
> 
> Added changes to enable CMAN (RED or PIE) at init
> from profile configuration file.
> 
> By default CMAN code is enable but not in use, when
> there is no RED or PIE profile configured.
> 
> Signed-off-by: Marcin Danilewicz 
> ---
> Log: v2 change in rte_sched.h to avoid ABI breakage.
>  v3 changes from comments
> ---

Marcin,

Your patch does not apply cleanly on top of DPDK main latest, can you please 
fix.

Regards,
Cristian

Re: [PATCH v3] app/testpmd: fix issue with memory leaks when quit testpmd

[Ferruh Yigit]

On 4/4/2022 4:34 PM, Zhang, Yuying wrote:

Hi Ke,


-Original Message-
From: Zhang, Ke1X 
Sent: Friday, March 25, 2022 4:36 PM
To: Li, Xiaoyun ; Singh, Aman Deep
; Zhang, Yuying ;
dev@dpdk.org
Cc: Zhang, Ke1X 
Subject: [PATCH v3] app/testpmd: fix issue with memory leaks when quit
testpmd

A multicast address pool is allocated for a port when using mcast_addr
testpmd commands.

When closing a port or stopping testpmd, this pool was not freed, resulting in
a leak.This issue has been caught using ASan.

Free this pool when closing the port.

Error info as following:
ERROR: LeakSanitizer: detected memory leaksDirect leak of
192 byte(s)
0 0x7f6a2e0aeffe in __interceptor_realloc
(/lib/x86_64-linux-gnu/libasan.so.5+0x10dffe)
1 0x565361eb340f in mcast_addr_pool_extend
../app/test-pmd/config.c:5162
2 0x565361eb3556 in mcast_addr_pool_append
../app/test-pmd/config.c:5180
3 0x565361eb3aae in mcast_addr_add
../app/test-pmd/config.c:5243

Signed-off-by: Ke Zhang 


Acked-by: Yuying Zhang 



Fixes: 8fff667578a7 ("app/testpmd: new command to add/remove 
multicast MAC addresses")

Cc: sta...@dpdk.org

Acked-by: Ferruh Yigit 

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


<...>


pmd/testpmd.c b/app/test-pmd/testpmd.c index fe2ce19f99..1861a02c2f
100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -3137,6 +3137,7 @@ close_port(portid_t pid)
}

if (is_proc_primary()) {
+   mcast_addr_pool_destroy(pi);
port_flow_flush(pi);
port_flex_item_flush(pi);
rte_eth_dev_close(pi);


'rte_eth_dev_close()' may fail, like if the port is not stopped, in that 
case mcast pool will be freed although port is not closed.
This can be prevented by saving existing mcast poll and restore it if 
close failed, but I think it doesn't worth the complexity it brings, so 
OK to continue as it is.

Re: [PATCH v3 1/1] app/testpmd: support different input color method

[Andrew Rybchenko]

On 6/3/22 16:06, sk...@marvell.com wrote:

From: Sunil Kumar Kori 

To enable input coloring, based on VLAN or DSCP, patch adds
command line interface to configure the following:

  - configuring input coloring using VLAN or DSCP while creating
meter i.e. during rte_mtr_create()

  - Update VLAN input coloring table at runtime.

  - configures protocol priorities.

  - retrieve protocol and priority information

Depends-on: patch-22751 ("ethdev: mtr: support protocol based input color 
selection")

Signed-off-by: Sunil Kumar Kori 
Acked-by: Cristian Dumitrescu 


[snip]


+   if (strcmp(token, "G") == 0 || strcmp(token, "g") == 0)


strcasecmp() will help to make it a bit simpler.
Here and in many similar cases below.

[PATCH v5 0/2] kni: fix build warnings with Linux 5.17+

[Andrew Rybchenko]

v5:
- fix broken build

v4:
- restore original patch author
- resend with cover letter to address patchwork recognition as a
  series

v3:
- split single patch into two
- clarify patches summary and description

Ke Zhang (2):
  kni: use dedicated function to set random MAC address
  kni: fix warning about discarding const qualifier

 kernel/linux/kni/compat.h   |  4 
 kernel/linux/kni/kni_misc.c | 13 +
 kernel/linux/kni/kni_net.c  |  4 
 3 files changed, 17 insertions(+), 4 deletions(-)

-- 
2.30.2

[PATCH v5 1/2] kni: use dedicated function to set random MAC address

[Andrew Rybchenko]

From: Ke Zhang 

eth_hw_addr_random() sets address type correctly.

eth_hw_addr_random() is available since Linux v3.4, so
no compat is required.

Also fix the warning:
warning: passing argument 1 of ‘memcpy’ discards ‘const’
qualifier from pointer target type

Variable dev_addr is done const intentionally in Linux v5.17 to
prevent using it directly.

Fixes: ea6b39b5b847 ("kni: remove ethtool support")
Cc: sta...@dpdk.org

Signed-off-by: Ke Zhang 
Signed-off-by: Andrew Rybchenko 
---
 kernel/linux/kni/kni_misc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index 780187d8bf..4f6dd373a3 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -405,8 +405,8 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
if (is_valid_ether_addr(dev_info.mac_addr))
memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN);
else
-   /* Generate random MAC address. */
-   eth_random_addr(net_dev->dev_addr);
+   /* Assign random MAC address. */
+   eth_hw_addr_random(net_dev);
 
if (dev_info.mtu)
net_dev->mtu = dev_info.mtu;
-- 
2.30.2

[PATCH v5 2/2] kni: fix warning about discarding const qualifier

[Andrew Rybchenko]

From: Ke Zhang 

The warning info:
warning: passing argument 1 of ‘memcpy’ discards ‘const’
qualifier from pointer target type

Variable dev_addr is done const intentionally in v5.17 to prevent using
it directly. See kernel series [1] for more information.

[1] https://lore.kernel.org/netdev/YZYAb4X%2FVQFy0iks@shredder/T/

Fixes: ea6b39b5b847 ("kni: remove ethtool support")
Cc: sta...@dpdk.org

Signed-off-by: Ke Zhang 
Signed-off-by: Andrew Rybchenko 
---
 kernel/linux/kni/compat.h   | 4 
 kernel/linux/kni/kni_misc.c | 9 +++--
 kernel/linux/kni/kni_net.c  | 4 
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
index 0db29a4a6f..2c8f346ddf 100644
--- a/kernel/linux/kni/compat.h
+++ b/kernel/linux/kni/compat.h
@@ -145,3 +145,7 @@
 #if KERNEL_VERSION(5, 18, 0) > LINUX_VERSION_CODE
 #define HAVE_NETIF_RX_NI
 #endif
+
+#if KERNEL_VERSION(5, 15, 0) <= LINUX_VERSION_CODE
+#define HAVE_ETH_HW_ADDR_SET
+#endif
diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index 4f6dd373a3..0c3a86ee35 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -402,11 +402,16 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
pr_debug("mbuf_size:%u\n", kni->mbuf_size);
 
/* if user has provided a valid mac address */
-   if (is_valid_ether_addr(dev_info.mac_addr))
+   if (is_valid_ether_addr(dev_info.mac_addr)) {
+#ifdef HAVE_ETH_HW_ADDR_SET
+   eth_hw_addr_set(net_dev, dev_info.mac_addr);
+#else
memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN);
-   else
+#endif
+   } else {
/* Assign random MAC address. */
eth_hw_addr_random(net_dev);
+   }
 
if (dev_info.mtu)
net_dev->mtu = dev_info.mtu;
diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c
index 41805fcabf..779ee3451a 100644
--- a/kernel/linux/kni/kni_net.c
+++ b/kernel/linux/kni/kni_net.c
@@ -783,7 +783,11 @@ kni_net_set_mac(struct net_device *netdev, void *p)
return -EADDRNOTAVAIL;
 
memcpy(req.mac_addr, addr->sa_data, netdev->addr_len);
+#ifdef HAVE_ETH_HW_ADDR_SET
+   eth_hw_addr_set(netdev, addr->sa_data);
+#else
memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
+#endif
 
ret = kni_net_process_request(netdev, &req);
 
-- 
2.30.2

[PATCH v6 1/7] eventdev/eth_rx: add adapter instance get API

[Ganapati Kundapura]

Added rte_event_eth_rx_adapter_instance_get() to get
adapter instance id for specified ethernet device id and
rx queue index.

Signed-off-by: Ganapati Kundapura 
---
v6:
* rx adapter changes removed from patch4 and moved to patch1

v5:
* patch is split into saperate patches

v4:
* Moved instance array allocation and instance id storage
  before adapter's nb_queue updation for handling the
  error case  properly

v3:
* Fixed checkpatch error

v2:
* Fixed build issues
* Added telemetry support for rte_event_eth_rx_adapter_instance_get
* arranged functions in alphabetical order in version.map

diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c 
b/lib/eventdev/rte_event_eth_rx_adapter.c
index bf8741d..d1b4874 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -6,6 +6,7 @@
 #include 
 #endif
 #include 
+#include 
 
 #include 
 #include 
@@ -42,7 +43,10 @@
 /* Sentinel value to detect initialized file handle */
 #define INIT_FD-1
 
-#define RXA_ADAPTER_ARRAY "rte_event_eth_rx_adapter_array"
+#define RX_ADAPTER_DATA_ARRAY "rx_adapter_data_array"
+#define RX_ADAPTER_INSTANCE_ARRAY "rx_adapter_instance_array"
+
+#define INVALID_INSTANCE_ID UINT8_MAX
 
 /*
  * Used to store port and queue ID of interrupting Rx queue
@@ -251,7 +255,12 @@ struct eth_rx_queue_info {
struct rte_event_eth_rx_adapter_stats *stats;
 };
 
+struct event_eth_rxa_inst_info {
+   uint8_t rxa_inst_id;
+};
+
 static struct event_eth_rx_adapter **event_eth_rx_adapter;
+static struct event_eth_rxa_inst_info **event_eth_rxa_inst_info;
 
 /* Enable dynamic timestamp field in mbuf */
 static uint64_t event_eth_rx_timestamp_dynflag;
@@ -1415,15 +1424,13 @@ rxa_service_func(void *args)
return 0;
 }
 
-static int
-rte_event_eth_rx_adapter_init(void)
+static void *
+rxa_memzone_array_get(const char *name, unsigned int elt_size, int nb_elems)
 {
-   const char *name = RXA_ADAPTER_ARRAY;
const struct rte_memzone *mz;
unsigned int sz;
 
-   sz = sizeof(*event_eth_rx_adapter) *
-   RTE_EVENT_ETH_RX_ADAPTER_MAX_INSTANCE;
+   sz = elt_size * nb_elems;
sz = RTE_ALIGN(sz, RTE_CACHE_LINE_SIZE);
 
mz = rte_memzone_lookup(name);
@@ -1431,13 +1438,46 @@ rte_event_eth_rx_adapter_init(void)
mz = rte_memzone_reserve_aligned(name, sz, rte_socket_id(), 0,
 RTE_CACHE_LINE_SIZE);
if (mz == NULL) {
-   RTE_EDEV_LOG_ERR("failed to reserve memzone err = %"
-   PRId32, rte_errno);
-   return -rte_errno;
+   RTE_EDEV_LOG_ERR("failed to reserve memzone"
+" name = %s, err = %"
+PRId32, name, rte_errno);
+   return NULL;
}
}
 
-   event_eth_rx_adapter = mz->addr;
+   return mz->addr;
+}
+
+static int
+rte_event_eth_rx_adapter_init(void)
+{
+   uint8_t i;
+
+   if (event_eth_rx_adapter == NULL) {
+   event_eth_rx_adapter =
+   rxa_memzone_array_get(RX_ADAPTER_DATA_ARRAY,
+ sizeof(*event_eth_rx_adapter),
+ 
RTE_EVENT_ETH_RX_ADAPTER_MAX_INSTANCE);
+   if (event_eth_rx_adapter == NULL)
+   return -ENOMEM;
+
+   for (i = 0; i < RTE_EVENT_ETH_RX_ADAPTER_MAX_INSTANCE; i++)
+   event_eth_rx_adapter[i] = NULL;
+
+   }
+
+   if (event_eth_rxa_inst_info == NULL) {
+   event_eth_rxa_inst_info =
+   rxa_memzone_array_get(RX_ADAPTER_INSTANCE_ARRAY,
+ sizeof(*event_eth_rxa_inst_info),
+ RTE_MAX_ETHPORTS);
+   if (event_eth_rxa_inst_info == NULL)
+   return -ENOMEM;
+
+   for (i = 0; i < RTE_MAX_ETHPORTS; i++)
+   event_eth_rxa_inst_info[i] = NULL;
+   }
+
return 0;
 }
 
@@ -1447,12 +1487,21 @@ rxa_memzone_lookup(void)
const struct rte_memzone *mz;
 
if (event_eth_rx_adapter == NULL) {
-   mz = rte_memzone_lookup(RXA_ADAPTER_ARRAY);
+   mz = rte_memzone_lookup(RX_ADAPTER_DATA_ARRAY);
if (mz == NULL)
return -ENOMEM;
+
event_eth_rx_adapter = mz->addr;
}
 
+   if (event_eth_rxa_inst_info == NULL) {
+   mz = rte_memzone_lookup(RX_ADAPTER_INSTANCE_ARRAY);
+   if (mz == NULL)
+   return -ENOMEM;
+
+   event_eth_rxa_inst_info = mz->addr;
+   }
+
return 0;
 }
 
@@ -1950,6 +1999,7 @@ rxa_sw_del(struct event_eth_rx_adapter *rx_adapter,
int pollq;
int intrq;
int sintrq;
+   uint1

[PATCH v6 2/7] eventdev/eth_rx: add telemetry callback for instance get

[Ganapati Kundapura]

Added telemetry handler for rte_event_eth_rx_adapter_instance_get()
to retrieve adapter instance id for specified ethernet device id
and rx queue index.

Signed-off-by: Ganapati Kundapura 

diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c 
b/lib/eventdev/rte_event_eth_rx_adapter.c
index d1b4874..3095647 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -3697,6 +3697,68 @@ handle_rxa_queue_stats_reset(const char *cmd 
__rte_unused,
return ret;
 }
 
+static int
+handle_rxa_instance_get(const char *cmd __rte_unused,
+   const char *params,
+   struct rte_tel_data *d)
+{
+   uint8_t instance_id;
+   uint16_t rx_queue_id;
+   int eth_dev_id, ret = -1;
+   char *token, *l_params;
+
+   if (params == NULL || strlen(params) == 0 || !isdigit(*params))
+   return -1;
+
+   l_params = strdup(params);
+   if (l_params == NULL)
+   return -ENOMEM;
+   token = strtok(l_params, ",");
+   RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
+
+   /* Get device ID from parameter string */
+   eth_dev_id = strtoul(token, NULL, 10);
+   RTE_ETH_VALID_PORTID_OR_GOTO_ERR_RET(eth_dev_id, -EINVAL);
+
+   token = strtok(NULL, ",");
+   RTE_EVENT_ETH_RX_ADAPTER_TOKEN_VALID_OR_GOTO_ERR_RET(token, -1);
+
+   /* Get Rx queue ID from parameter string */
+   rx_queue_id = strtoul(token, NULL, 10);
+   if (rx_queue_id >= rte_eth_devices[eth_dev_id].data->nb_rx_queues) {
+   RTE_EDEV_LOG_ERR("Invalid rx queue_id %u", rx_queue_id);
+   ret = -EINVAL;
+   goto error;
+   }
+
+   token = strtok(NULL, "\0");
+   if (token != NULL)
+   RTE_EDEV_LOG_ERR("Extra parameters passed to eventdev"
+" telemetry command, ignoring");
+
+   /* Parsing parameter finished */
+   free(l_params);
+
+   if (rte_event_eth_rx_adapter_instance_get(eth_dev_id,
+ rx_queue_id,
+ &instance_id)) {
+   RTE_EDEV_LOG_ERR("Failed to get RX adapter instance ID "
+" for rx_queue_id = %d", rx_queue_id);
+   return -1;
+   }
+
+   rte_tel_data_start_dict(d);
+   rte_tel_data_add_dict_u64(d, "eth_dev_id", eth_dev_id);
+   rte_tel_data_add_dict_u64(d, "rx_queue_id", rx_queue_id);
+   rte_tel_data_add_dict_u64(d, "rxa_instance_id", instance_id);
+
+   return 0;
+
+error:
+   free(l_params);
+   return ret;
+}
+
 RTE_INIT(rxa_init_telemetry)
 {
rte_telemetry_register_cmd("/eventdev/rxa_stats",
@@ -3718,4 +3780,8 @@ RTE_INIT(rxa_init_telemetry)
rte_telemetry_register_cmd("/eventdev/rxa_queue_stats_reset",
handle_rxa_queue_stats_reset,
"Reset Rx queue stats. Parameter: rxa_id, dev_id, queue_id");
+
+   rte_telemetry_register_cmd("/eventdev/rxa_rxq_instance_get",
+   handle_rxa_instance_get,
+   "Returns Rx adapter instance id. Parameter: dev_id, queue_id");
 }
-- 
2.6.4

[PATCH v6 3/7] test/eth_rx: add test case for instance get API

[Ganapati Kundapura]

Added test case for rte_event_eth_rx_adapter_instance_get()

Signed-off-by: Ganapati Kundapura 

diff --git a/app/test/test_event_eth_rx_adapter.c 
b/app/test/test_event_eth_rx_adapter.c
index e358a70..878004b 100644
--- a/app/test/test_event_eth_rx_adapter.c
+++ b/app/test/test_event_eth_rx_adapter.c
@@ -39,6 +39,7 @@ test_event_eth_rx_intr_adapter_common(void)
 #define TEST_INST_ID   0
 #define TEST_DEV_ID0
 #define TEST_ETHDEV_ID 0
+#define TEST_ETH_QUEUE_ID  0
 
 struct event_eth_rx_adapter_test_params {
struct rte_mempool *mp;
@@ -1001,6 +1002,87 @@ adapter_queue_conf(void)
return TEST_SUCCESS;
 }
 
+static int
+adapter_instance_get(void)
+{
+   int err;
+   uint8_t inst_id;
+   uint16_t eth_dev_id;
+   struct rte_eth_dev_info dev_info;
+   struct rte_event_eth_rx_adapter_queue_conf queue_conf = {0};
+
+   /* Case 1: Test without configuring eth */
+   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Case 2: Test with wrong eth port */
+   eth_dev_id = rte_eth_dev_count_total() + 1;
+   err = rte_event_eth_rx_adapter_instance_get(eth_dev_id,
+   TEST_ETH_QUEUE_ID,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Case 3: Test with wrong rx queue */
+   err = rte_eth_dev_info_get(TEST_ETHDEV_ID, &dev_info);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
+   dev_info.max_rx_queues + 1,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Case 4: Test with right instance, port & rxq */
+   /* Add queue to Rx adapter */
+   queue_conf.ev.queue_id = TEST_ETH_QUEUE_ID;
+   queue_conf.ev.sched_type = RTE_SCHED_TYPE_ATOMIC;
+   queue_conf.ev.priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
+
+   err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID,
+&queue_conf);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID,
+   &inst_id);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   /* Add another queue */
+   queue_conf.ev.queue_id = TEST_ETH_QUEUE_ID + 1;
+   err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID + 1,
+&queue_conf);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID + 1,
+   &inst_id);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   /* Case 5: Test with right instance, port & wrong rxq */
+   err = rte_event_eth_rx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID + 2,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Delete queues from the Rx adapter */
+   err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID + 1);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   return TEST_SUCCESS;
+}
+
 static struct unit_test_suite event_eth_rx_tests = {
.suite_name = "rx event eth adapter test suite",
.setup = testsuite_setup,
@@ -1019,6 +1101,8 @@ static struct unit_test_suite event_eth_rx_tests = {
 adapter_queue_event_buf_test),
TEST_CASE_ST(adapter_create_with_params, adapter_free,
 adapter_queue_stats_test),
+   TEST_CASE_ST(adapter_create, adapter_free,
+adapter

[PATCH v6 4/7] eventdev/eth_tx: add instance get API

[Ganapati Kundapura]

Added rte_event_eth_tx_adapter_instance_get() to get the
adapter instance id for specified ethernet device id and
tx queue index.

Signed-off-by: Ganapati Kundapura 

diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c 
b/lib/eventdev/rte_event_eth_tx_adapter.c
index 1b304f0..d9de6e5 100644
--- a/lib/eventdev/rte_event_eth_tx_adapter.c
+++ b/lib/eventdev/rte_event_eth_tx_adapter.c
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(c) 2018 Intel Corporation.
  */
+#include 
+
 #include 
 #include 
 #include 
@@ -17,6 +19,11 @@
 #define TXA_MAX_NB_TX  128
 #define TXA_INVALID_DEV_ID INT32_C(-1)
 #define TXA_INVALID_SERVICE_ID INT64_C(-1)
+#define INVALID_INSTANCE_IDUINT8_MAX
+
+#define TXA_ADAPTER_ARRAY "txa_adapter_array"
+#define TXA_SERVICE_DATA_ARRAY "txa_service_data_array"
+#define TXA_ADAPTER_INSTANCE_ARRAY "txa_adapter_instance_array"
 
 #define txa_evdev(id) (&rte_eventdevs[txa_dev_id_array[(id)]])
 
@@ -140,6 +147,10 @@ struct txa_service_ethdev {
void *queues;
 };
 
+struct event_eth_txa_inst_info {
+   uint8_t txa_inst_id;
+};
+
 /* Array of adapter instances, initialized with event device id
  * when adapter is created
  */
@@ -148,6 +159,9 @@ static int *txa_dev_id_array;
 /* Array of pointers to service implementation data */
 static struct txa_service_data **txa_service_data_array;
 
+/* array of adapter instances to store tx queue specific instance */
+static struct event_eth_txa_inst_info **event_eth_txa_inst_info;
+
 static int32_t txa_service_func(void *args);
 static int txa_service_adapter_create_ext(uint8_t id,
struct rte_eventdev *dev,
@@ -194,12 +208,42 @@ txa_memzone_array_get(const char *name, unsigned int 
elt_size, int nb_elems)
 }
 
 static int
+txa_memzone_lookup(void)
+{
+   const struct rte_memzone *mz;
+
+   if (txa_dev_id_array == NULL) {
+   mz = rte_memzone_lookup(TXA_ADAPTER_ARRAY);
+   if (mz == NULL)
+   return -ENOMEM;
+   txa_dev_id_array = mz->addr;
+   }
+
+   if (txa_service_data_array == NULL) {
+   mz = rte_memzone_lookup(TXA_SERVICE_DATA_ARRAY);
+   if (mz == NULL)
+   return -ENOMEM;
+   txa_service_data_array = mz->addr;
+   }
+
+   if (event_eth_txa_inst_info == NULL) {
+   mz = rte_memzone_lookup(TXA_ADAPTER_INSTANCE_ARRAY);
+   if (mz == NULL)
+   return -ENOMEM;
+   event_eth_txa_inst_info = mz->addr;
+   }
+
+   return 0;
+}
+
+
+static int
 txa_dev_id_array_init(void)
 {
if (txa_dev_id_array == NULL) {
int i;
 
-   txa_dev_id_array = txa_memzone_array_get("txa_adapter_array",
+   txa_dev_id_array = txa_memzone_array_get(TXA_ADAPTER_ARRAY,
sizeof(int),
RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE);
if (txa_dev_id_array == NULL)
@@ -221,15 +265,30 @@ txa_init(void)
 static int
 txa_service_data_init(void)
 {
+   uint8_t i;
+
if (txa_service_data_array == NULL) {
txa_service_data_array =
-   txa_memzone_array_get("txa_service_data_array",
+   txa_memzone_array_get(TXA_SERVICE_DATA_ARRAY,
sizeof(int),
RTE_EVENT_ETH_TX_ADAPTER_MAX_INSTANCE);
if (txa_service_data_array == NULL)
return -ENOMEM;
}
 
+   if (event_eth_txa_inst_info == NULL) {
+   event_eth_txa_inst_info =
+   txa_memzone_array_get(TXA_ADAPTER_INSTANCE_ARRAY,
+ sizeof(*event_eth_txa_inst_info),
+ RTE_MAX_ETHPORTS);
+   if (event_eth_txa_inst_info == NULL)
+   return -ENOMEM;
+   }
+
+   /* Reset the txa instance pointers */
+   for (i = 0; i < RTE_MAX_ETHPORTS; i++)
+   event_eth_txa_inst_info[i] = NULL;
+
return 0;
 }
 
@@ -763,6 +822,7 @@ txa_service_queue_add(uint8_t id,
struct rte_eth_dev_tx_buffer *tb;
struct txa_retry *txa_retry;
int ret = 0;
+   uint16_t eth_dev_id = eth_dev->data->port_id;
 
txa = txa_service_id_to_data(id);
 
@@ -831,6 +891,31 @@ txa_service_queue_add(uint8_t id,
rte_eth_tx_buffer_set_err_callback(tb,
txa_service_buffer_retry, txa_retry);
 
+   /* Allocate storage to store txa_inst_id for txq */
+   if (event_eth_txa_inst_info[eth_dev_id] == NULL) {
+   uint16_t n, i;
+   struct event_eth_txa_inst_info *i_info;
+
+   n = eth_dev->data->nb_tx_queues;
+
+   i_info = rte_zmalloc_socket("event_eth_txa_inst_info",
+   n * sizeof(ev

[PATCH v6 5/7] test/eth_tx: add testcase for instance get API

[Ganapati Kundapura]

Added testcase for rte_event_eth_tx_adapter_instance_get()

Signed-off-by: Ganapati Kundapura 

diff --git a/app/test/test_event_eth_tx_adapter.c 
b/app/test/test_event_eth_tx_adapter.c
index 2900532..ebbc622 100644
--- a/app/test/test_event_eth_tx_adapter.c
+++ b/app/test/test_event_eth_tx_adapter.c
@@ -29,6 +29,7 @@ test_event_eth_tx_adapter_common(void)
 #define MAX_NUM_QUEUE  RTE_PMD_RING_MAX_RX_RINGS
 #define TEST_INST_ID   0
 #define TEST_DEV_ID0
+#define TEST_ETH_QUEUE_ID  0
 #define SOCKET00
 #define RING_SIZE  256
 #define ETH_NAME_LEN   32
@@ -639,6 +640,79 @@ tx_adapter_service(void)
 }
 
 static int
+tx_adapter_instance_get(void)
+{
+   int err;
+   uint8_t inst_id;
+   uint16_t eth_dev_id;
+   struct rte_eth_dev_info dev_info;
+
+   /* Case 1: Test without configuring eth */
+   err = rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Case 2: Test with wrong eth port */
+   eth_dev_id = rte_eth_dev_count_total() + 1;
+   err = rte_event_eth_tx_adapter_instance_get(eth_dev_id,
+   TEST_ETH_QUEUE_ID,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Case 3: Test with wrong tx queue */
+   err = rte_eth_dev_info_get(TEST_ETHDEV_ID, &dev_info);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID,
+   dev_info.max_tx_queues + 1,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Case 4: Test with right instance, port & rxq */
+   /* Add queue to tx adapter */
+   err = rte_event_eth_tx_adapter_queue_add(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID,
+   &inst_id);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   /* Add another queue to tx adapter */
+   err = rte_event_eth_tx_adapter_queue_add(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID + 1);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID + 1,
+   &inst_id);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   /* Case 5: Test with right instance, port & wrong rxq */
+   err = rte_event_eth_tx_adapter_instance_get(TEST_ETHDEV_ID,
+   TEST_ETH_QUEUE_ID + 2,
+   &inst_id);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   /* Delete queues from the Tx adapter */
+   err = rte_event_eth_tx_adapter_queue_del(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_tx_adapter_queue_del(TEST_INST_ID,
+TEST_ETHDEV_ID,
+TEST_ETH_QUEUE_ID + 1);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   return TEST_SUCCESS;
+}
+
+static int
 tx_adapter_dynamic_device(void)
 {
uint16_t port_id = rte_eth_dev_count_avail();
@@ -695,6 +769,8 @@ static struct unit_test_suite event_eth_tx_tests = {
tx_adapter_start_stop),
TEST_CASE_ST(tx_adapter_create, tx_adapter_free,
tx_adapter_service),
+   TEST_CASE_ST(tx_adapter_create, tx_adapter_free,
+   tx_adapter_instance_get),
TEST_CASE_ST(NULL, NULL, tx_adapter_dynamic_device),
TEST_CASES_END() /**< NULL terminate unit test array */
}
-- 
2.6.4

[PATCH v6 6/7] doc/eth_rx: update instance get API

[Ganapati Kundapura]

Added rte_event_eth_rx_adapter_instance_get() details

Signed-off-by: Ganapati Kundapura 

diff --git a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst 
b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
index 3b4ef50..5b9d0cf 100644
--- a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
+++ b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
@@ -177,6 +177,12 @@ used otherwise it returns -EINVAL.
 The ``rte_event_eth_rx_adapter_queue_stats_reset`` function can be used to
 reset queue level stats when queue level event buffer is in use.
 
+Getting Adapter instance id
+~~~
+
+The ``rte_event_eth_rx_adapter_instance_get()`` function reports
+rx adapter instance id for a specified ethernet device id and rx queue index.
+
 Interrupt Based Rx Queues
 ~~
 
-- 
2.6.4

[PATCH v6 7/7] doc/eth_tx: update instance get API

[Ganapati Kundapura]

Added rte_event_eth_tx_adapter_instance_get() details.

Signed-off-by: Ganapati Kundapura 

diff --git a/doc/guides/prog_guide/event_ethernet_tx_adapter.rst 
b/doc/guides/prog_guide/event_ethernet_tx_adapter.rst
index f80d226..dc3e6a1 100644
--- a/doc/guides/prog_guide/event_ethernet_tx_adapter.rst
+++ b/doc/guides/prog_guide/event_ethernet_tx_adapter.rst
@@ -165,6 +165,12 @@ in struct ``rte_event_eth_tx_adapter_stats``. The counter 
values are the sum of
 the counts from the eventdev PMD callback if the callback is supported, and
 the counts maintained by the service function, if one exists.
 
+Getting Adapter instance id
+~~~
+
+The  ``rte_event_eth_tx_adapter_instanceget()`` function reports
+tx adapter instance id for a specified ethernet device id and tx queue index.
+
 Tx event vectorization
 ~~
 
-- 
2.6.4

Re: [PATCH 11/12] app/flow-perf: fix build with GCC 12

[David Marchand]

On Wed, Jun 8, 2022 at 11:03 AM Wisam Monther  wrote:
>
> Hi David,
>
> > -Original Message-
> > From: David Marchand 
> > Sent: Wednesday, May 18, 2022 1:17 PM
> > To: dev@dpdk.org
> > Cc: NBU-Contact-Thomas Monjalon (EXTERNAL) ;
> > ferruh.yi...@xilinx.com; sta...@dpdk.org; Wisam Monther
> > 
> > Subject: [PATCH 11/12] app/flow-perf: fix build with GCC 12
> >
> > GCC 12 raises the following warning:
> >
> > ../app/test-flow-perf/main.c: In function ‘start_forwarding’:
> > ../app/test-flow-perf/main.c:1737:28: error: ‘sprintf’ may write a
> > terminating nul past the end of the destination
> > [-Werror=format-overflow=]
> >  1737 | sprintf(p[i++], "%d", (int)n);
> >   |^
> > In function ‘pretty_number’,
> > inlined from ‘packet_per_second_stats’ at
> > ../app/test-flow-perf/main.c:1792:4,
> > inlined from ‘start_forwarding’ at
> > ../app/test-flow-perf/main.c:1831:3:
> > [...]
> >
> > We can simplify this code and rely on libc integer formatting via this 
> > system
> > locales.
> >
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: David Marchand 
> > ---
>
> I've tested the patch and reviewed it, it's working fine, so thank you for 
> that.
> One comment
> The initial value of 0 is 000
>
> Example:
> CMD: ./dpdk-test-flow-perf -n 4 -a  -- ingress --group=1 --ether --queue 
> --rules-count=20 --enable-fwd
>   core   tx tx drops   rx
> --   
>  1  000  000  000
>
> Can you handle this to be single 0 instead of not needed leading zeros?

Hum, I don't remember why I added this precision...
This should be just a matter of changing the format from %'16.3s to
%'16s, can you confirm?

-- 
David Marchand

Re: [PATCH v4 0/8] Introduce support for RISC-V architecture

[Stanisław Kardach]

On Wed, Jun 8, 2022 at 10:42 AM David Marchand
 wrote:
>
> On Tue, May 31, 2022 at 4:14 PM Stanislaw Kardach  wrote:
> >
> > This patchset adds support for building and running DPDK on 64bit RISC-V
> > architecture. The initial support targets rv64gc (rv64imafdc) ISA and
> > was tested on SiFive Unmatched development board with the Freedom U740
> > SoC running Linux (freedom-u-sdk based kernel).
> > I have tested this codebase using DPDK unit and perf tests as well as
> > test-pmd, l2fwd and l3fwd examples.
> > The NIC attached to the DUT was Intel X520-DA2 which uses ixgbe PMD.
> > On the UIO side, since U740 does not have an IOMMU, I've used igb_uio,
> > uio_pci_generic and vfio-pci noiommu drivers.
> >
> > Functional verification done using meson tests. fast-tests suite passing 
> > with
> > the default config.
> >
> > PMD verification done using a Intel x520-DA2 NIC (ixgbe) and the test-pmd
> > application. Packet transfer checked using all UIO drivers available for
> > non-IOMMU platforms: uio_pci_generic, vfio-pci noiommu and igb_uio.
> >
> > The i40e PMD driver is disabled on RISC-V as the rv64gc ISA has no vector
> > operations.
> >
> > RISCV support is currently limited to Linux as the time measurement 
> > frequency
> > discovery is tied to reading a device-tree node via procfs.
> >
> > Clang compilation currently not supported due to issues with missing 
> > relocation
> > relaxation.
> >
> > Commit 1 introduces EAL and build system support for RISC-V architecture
> >as well as documentation updates.
> > Commits 2-5 add missing defines and stubs to enable RISC-V operation in
> >non-EAL parts.
> > Commit 6 adds RISC-V specific cpuflags test.
> > Commits 7-8 add RISC-V build testing to test-meson-builds.sh and github CI.
>
> Overall, the series lgtm.
> It did not get much reviews, but the porting is straightforward and
> clean enough.
>
> I'm waiting for some compilation to finish and I will merge it for 22.07-rc1.
>
>
> Some comments that will probably require some followup patches for rc2:
>
> - I removed the known issue about --no-huge from the EAL patch.
> This seems to be a generic issue that does not block the RISC V port
> and can be re-submitted as a separate patch.
If you mean the modified entry in the known_issues, I've added it at
Heinrich's request, although I agree I should have placed it in a
separate patch.
>
>
> - I had some trouble with finding a right toolchain for test-meson-builds.sh.
> The mentionned toolchains in the cross build guide don't work for me on FC36.
> I managed to cross compile with a Bootlin toolchain, though I had to
> adjust the cross compilation file.
> I'll probably end up compiling my own toolchain later unless you have
> a better idea.
I have just checked with fedora/36 docker and it seems that only gcc
and binutils packages are there but stdlib isn't. Hence meson fails at
basic checks because it can't find "stdio.h". So that's a bug to post
to Fedora I believe.
What does work in terms of cross-compiling is using a
riscv-gnu-toolchain tarball + modified cross-file (i.e. from here:
https://github.com/riscv-collab/riscv-gnu-toolchain/releases/tag/2022.06.03).
That most likely won't work for building RPMs but for static
compilations it might be enough.
Or you could use a Ubuntu docker and cross-compile there (though the
same problem as before):
  docker run -v /path/to/dpdk:/opt/dpdk -it ubuntu:jammy /bin/bash
Or a VM as Heinrich suggested.
>
> At least the compilation in GHA works.
That's because I've used Ubuntu as a base, which has a proper
toolchain setup. Also riscv-gnu-toolchain project targets Ubuntu, so
that helps.
>
>
> - The hardcoded pkg-config path in config/riscv/riscv64_linux_gcc does
> not seem generic.
> It is probably not a big issue, but I'd rather move it to a Ubuntu
> specific cross compile meson file.
> WDYT?
I think I'll rename the config file.
In theory, the man file of pkg-config
(https://linux.die.net/man/1/pkg-config) mentions the default
searching path as prefix/lib/pkgconfig. Prefix being
/usr/riscv64-linux-gnu the generic location should be
/usr/riscv64-linux-gnu/lib/pkgconfig but Ubuntu doesn't follow that.
There are no RISC-V cross-libs offering pkg-config neither in Ubuntu
or Fedora so I can't really tell what's the best path to use. Though
that also means we won't hit this issue for some time.
>
>
> - I adjusted some coding style in some asm and some indentation and
> wording in meson.
Thanks!
>
>
> - The cross compilation guide mentions using
> crossbuild-essential-riscv64 for Ubuntu.
> We should switch to it in GHA.
> Though after trying myself, there is an issue in the C++ headers check
> in GHA for some acl header including rte_vect.h.
> Can you have a look?
I'm testing a fix for this. I have not taken C++ type conversion rules
into account.
>
>
> - There was a patch from Heinrich about native compilation, can you review it?
I see it was merged but your question from that thread still stands.
I'm compiling native no

Re: [RFC 1/8] net/ena: fix warnings related to rte_memcpy and gcc-12

[Michał Krawczyk]

wt., 7 cze 2022 o 19:17 Stephen Hemminger 
napisał(a):
>
> Rte_memcpy is not needed for small objects only used on control
> path. Regular memcpy is as fast or faster and there is more
> robust since static analysis etc knows what it does.
>
> In this driver it was redefining all memcpy as rte_memcpy
> which is even worse.

Hi Stephen,

I would like to shed some light on why we're redefining all the memcpy
as rte_memcpy. The ENA HAL is unmodifiable, as it's shared across many
platforms and we cannot simply adjust it for the DPDK. We can use the
ena_plat_dpdk.h to change the ena_com (HAL) definitions, and that's
what we're doing with memcpy. It's being used on the data path for the
Tx, to copy the bounce buffers. Following the recommendations in [1]
plus the results from [2], we wanted to make use of the optimized
memcpy on the ENA's data path as well to reduce the CPU time spent in
the PMD. I'm worried that removing rte_memcpy from the ena_plat_dpdk.h
will result in some performance degradation for the ENA data path.
However I understand your concerns for the control path and I'm ok
with it.

[1] https://doc.dpdk.org/guides/prog_guide/writing_efficient_code.html#memory
[2] 
https://www.intel.com/content/www/us/en/developer/articles/technical/performance-optimization-of-memcpy-in-dpdk.html

Thanks,
Michal

>
> Signed-off-by: Stephen Hemminger 
> ---
>  drivers/net/ena/base/ena_plat_dpdk.h | 10 +-
>  drivers/net/ena/ena_ethdev.c |  8 
>  drivers/net/ena/ena_rss.c|  2 +-
>  3 files changed, 6 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/net/ena/base/ena_plat_dpdk.h 
> b/drivers/net/ena/base/ena_plat_dpdk.h
> index 8f2b3a87c2ab..caea763e3eca 100644
> --- a/drivers/net/ena/base/ena_plat_dpdk.h
> +++ b/drivers/net/ena/base/ena_plat_dpdk.h
> @@ -26,7 +26,6 @@
>  #include 
>
>  #include 
> -#include 
>
>  typedef uint64_t u64;
>  typedef uint32_t u32;
> @@ -67,14 +66,7 @@ typedef uint64_t dma_addr_t;
>  #define ENA_UDELAY(x) rte_delay_us_block(x)
>
>  #define ENA_TOUCH(x) ((void)(x))
> -/* Redefine memcpy with caution: rte_memcpy can be simply aliased to memcpy, 
> so
> - * make the redefinition only if it's safe (and beneficial) to do so.
> - */
> -#if defined(RTE_ARCH_X86) || defined(RTE_ARCH_ARM64_MEMCPY) || \
> -   defined(RTE_ARCH_ARM_NEON_MEMCPY)
> -#undef memcpy
> -#define memcpy rte_memcpy
> -#endif
> +
>  #define wmb rte_wmb
>  #define rmb rte_rmb
>  #define mb rte_mb
> diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
> index 68768cab7077..5f87429606e6 100644
> --- a/drivers/net/ena/ena_ethdev.c
> +++ b/drivers/net/ena/ena_ethdev.c
> @@ -481,7 +481,7 @@ ENA_PROXY_DESC(ena_com_get_dev_basic_stats, 
> ENA_MP_DEV_STATS_GET,
> ENA_TOUCH(rsp);
> ENA_TOUCH(ena_dev);
> if (stats != &adapter->basic_stats)
> -   rte_memcpy(stats, &adapter->basic_stats, sizeof(*stats));
> +   memcpy(stats, &adapter->basic_stats, sizeof(*stats));
>  }),
> struct ena_com_dev *ena_dev, struct ena_admin_basic_stats *stats);
>
> @@ -496,7 +496,7 @@ ENA_PROXY_DESC(ena_com_get_eni_stats, 
> ENA_MP_ENI_STATS_GET,
> ENA_TOUCH(rsp);
> ENA_TOUCH(ena_dev);
> if (stats != (struct ena_admin_eni_stats *)&adapter->eni_stats)
> -   rte_memcpy(stats, &adapter->eni_stats, sizeof(*stats));
> +   memcpy(stats, &adapter->eni_stats, sizeof(*stats));
>  }),
> struct ena_com_dev *ena_dev, struct ena_admin_eni_stats *stats);
>
> @@ -538,8 +538,8 @@ ENA_PROXY_DESC(ena_com_indirect_table_get, 
> ENA_MP_IND_TBL_GET,
> ENA_TOUCH(rsp);
> ENA_TOUCH(ena_dev);
> if (ind_tbl != adapter->indirect_table)
> -   rte_memcpy(ind_tbl, adapter->indirect_table,
> -  sizeof(adapter->indirect_table));
> +   memcpy(ind_tbl, adapter->indirect_table,
> +  sizeof(adapter->indirect_table));
>  }),
> struct ena_com_dev *ena_dev, u32 *ind_tbl);
>
> diff --git a/drivers/net/ena/ena_rss.c b/drivers/net/ena/ena_rss.c
> index b6c4f76e3820..c723d3f5fca1 100644
> --- a/drivers/net/ena/ena_rss.c
> +++ b/drivers/net/ena/ena_rss.c
> @@ -59,7 +59,7 @@ void ena_rss_key_fill(void *key, size_t size)
> key_generated = true;
> }
>
> -   rte_memcpy(key, default_key, size);
> +   memcpy(key, default_key, size);
>  }
>
>  int ena_rss_reta_update(struct rte_eth_dev *dev,
> --
> 2.35.1
>

Re: [dpdk-dev] [PATCH 0/2] fixes for failsafe/tap

[Andrew Rybchenko]

On 6/7/22 09:49, Yunjian Wang wrote:

This series include two fixes patches for failsafe/tap

Yunjian Wang (2):
   net/failsafe: fix freeing after device release
   net/tap: fix use after free on error path

  drivers/net/failsafe/failsafe.c | 2 +-
  drivers/net/tap/rte_eth_tap.c   | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)



Series-reviewed-by: Andrew Rybchenko 

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

[PATCH v2 0/6] Vhost checksum offload improvements

[Maxime Coquelin]

This series aims at improving Vhost checksum offloading
support.

The first patch reverts overwritting MAC address in
testpmd CSUM forward mode. This is required to be able to
test checksum offloading with real traffic. MAC forwarding
mode should be used if the MAC addresses need to be
changed.

Second patch is a Vhost library fix to be compliant with
the Virtio specification, which requires that the
pseudo-header checksum is being set by the device when
offloading the checksum to the guest.

Third patch enables the compliant offloading mode of Vhost
library in Vhost PMD by default, since the legacy mode
violates the mbuf API by setting Tx flags in the receive
path. A new devarg is introduced for application willing
to use the legacy mode.

Fourth patch is just a small cleanup to represent a boolean
value as a boolean.

The two last patches introduces compatibility layers
that performs checksum in SW when the ethdev and Virtio
features are not aligned.

Note that the two last patches are not tagged as fixes
because they rely on the new compliant offload mode of
Vhost library, and so would casue an ABI breakage if
backported.

With this series, it is now possible to perform IO
forwarding between a vhost-user port and a Vitio-user
with kernel backend port even if the guest has negotiated
VIRTIO_NET_F_CSUM.

With csum forward mode, it now works whathever the
offloading configuration set either on Virtio or Ethdev
sides.

Changes in v2:
==
- Add the new devarg to validation array (Wenwu)
- Fix typos in commit messages (Chenbo, checkpatch, Yuying)

Maxime Coquelin (6):
  Revert "app/testpmd: modify mac in csum forwarding"
  vhost: fix missing enqueue pseudo-header calculation
  net/vhost: enable compliant offloading mode
  net/vhost: make VLAN stripping flag a boolean
  net/vhost: perform SW checksum in Rx path
  net/vhost: perform SW checksum in Tx path

 app/test-pmd/csumonly.c|   4 -
 doc/guides/nics/features/vhost.ini |   1 +
 doc/guides/nics/vhost.rst  |   6 ++
 drivers/net/vhost/rte_eth_vhost.c  | 167 -
 lib/vhost/virtio_net.c |  10 ++
 5 files changed, 180 insertions(+), 8 deletions(-)

-- 
2.35.3

[PATCH v2 1/6] Revert "app/testpmd: modify mac in csum forwarding"

[Maxime Coquelin]

This patch reverts commit 10f4620f02e1 ("app/testpmd: modify mac in csum 
forwarding"),
as the checksum forwarding is expected to only perform
checksum and not also overwrites the source and destination
MAC addresses.

Doing so, we can test checksum offloading with real traffic
without breaking broadcast packets.

Fixes: 10f4620f02e1 ("app/testpmd: modify mac in csum forwarding")
Cc: sta...@dpdk.org

Signed-off-by: Maxime Coquelin 
Acked-by: Chenbo Xia 
---
 app/test-pmd/csumonly.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 7df201e047..1a3fd9ce8a 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -916,10 +916,6 @@ pkt_burst_checksum_forward(struct fwd_stream *fs)
 * and inner headers */
 
eth_hdr = rte_pktmbuf_mtod(m, struct rte_ether_hdr *);
-   rte_ether_addr_copy(&peer_eth_addrs[fs->peer_addr],
-   ð_hdr->dst_addr);
-   rte_ether_addr_copy(&ports[fs->tx_port].eth_addr,
-   ð_hdr->src_addr);
parse_ethernet(eth_hdr, &info);
l3_hdr = (char *)eth_hdr + info.l2_len;
 
-- 
2.35.3

[PATCH v2 2/6] vhost: fix missing enqueue pseudo-header calculation

[Maxime Coquelin]

The Virtio specification requires that in case of checksum
offloading, the pseudo-header checksum must be set in the
L4 header.

When received from another Vhost-user port, the packet
checksum might already contain the pseudo-header checksum
but we have no way to know it. So we have no other choice
than doing the pseudo-header checksum systematically.

This patch handles this using the rte_net_intel_cksum_prepare()
helper.

Fixes: 859b480d5afd ("vhost: add guest offload setting")
Cc: sta...@dpdk.org

Signed-off-by: Maxime Coquelin 
Reviewed-by: Chenbo Xia 
---
 lib/vhost/virtio_net.c | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
index 68a26eb17d..ce22e3ac79 100644
--- a/lib/vhost/virtio_net.c
+++ b/lib/vhost/virtio_net.c
@@ -596,6 +596,16 @@ virtio_enqueue_offload(struct rte_mbuf *m_buf, struct 
virtio_net_hdr *net_hdr)
csum_l4 |= RTE_MBUF_F_TX_TCP_CKSUM;
 
if (csum_l4) {
+   /*
+* Pseudo-header checksum must be set as per Virtio spec.
+*
+* Note: We don't propagate rte_net_intel_cksum_prepare()
+* errors, as it would have an impact on performance, and an
+* error would mean the packet is dropped by the guest instead
+* of being dropped here.
+*/
+   rte_net_intel_cksum_prepare(m_buf);
+
net_hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
net_hdr->csum_start = m_buf->l2_len + m_buf->l3_len;
 
-- 
2.35.3

[PATCH v2 3/6] net/vhost: enable compliant offloading mode

[Maxime Coquelin]

This patch enables the compliant offloading flags mode by
default, which prevents the Rx path to set Tx offload flags,
which is illegal. A new legacy-ol-flags devarg is introduced
to enable the legacy behaviour.

Signed-off-by: Maxime Coquelin 
Reviewed-by: Chenbo Xia 
---
 doc/guides/nics/vhost.rst |  6 ++
 drivers/net/vhost/rte_eth_vhost.c | 20 +---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/doc/guides/nics/vhost.rst b/doc/guides/nics/vhost.rst
index ee802ec4a8..d7c0e2ade8 100644
--- a/doc/guides/nics/vhost.rst
+++ b/doc/guides/nics/vhost.rst
@@ -64,6 +64,12 @@ The user can specify below arguments in `--vdev` option.
 It is used to enable external buffer support in vhost library.
 (Default: 0 (disabled))
 
+#.  ``legacy-ol-flags``:
+
+It is used to restore legacy behavior for offloading that was not
+compliant with offloading API.
+(Default: 0 (disabled))
+
 Vhost PMD event handling
 
 
diff --git a/drivers/net/vhost/rte_eth_vhost.c 
b/drivers/net/vhost/rte_eth_vhost.c
index 8dee629fb0..1620e30df8 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -31,9 +31,10 @@ enum {VIRTIO_RXQ, VIRTIO_TXQ, VIRTIO_QNUM};
 #define ETH_VHOST_CLIENT_ARG   "client"
 #define ETH_VHOST_IOMMU_SUPPORT"iommu-support"
 #define ETH_VHOST_POSTCOPY_SUPPORT "postcopy-support"
-#define ETH_VHOST_VIRTIO_NET_F_HOST_TSO "tso"
-#define ETH_VHOST_LINEAR_BUF  "linear-buffer"
-#define ETH_VHOST_EXT_BUF  "ext-buffer"
+#define ETH_VHOST_VIRTIO_NET_F_HOST_TSO"tso"
+#define ETH_VHOST_LINEAR_BUF   "linear-buffer"
+#define ETH_VHOST_EXT_BUF  "ext-buffer"
+#define ETH_VHOST_LEGACY_OL_FLAGS  "legacy-ol-flags"
 #define VHOST_MAX_PKT_BURST 32
 
 static const char *valid_arguments[] = {
@@ -45,6 +46,7 @@ static const char *valid_arguments[] = {
ETH_VHOST_VIRTIO_NET_F_HOST_TSO,
ETH_VHOST_LINEAR_BUF,
ETH_VHOST_EXT_BUF,
+   ETH_VHOST_LEGACY_OL_FLAGS,
NULL
 };
 
@@ -1470,6 +1472,7 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
int tso = 0;
int linear_buf = 0;
int ext_buf = 0;
+   int legacy_ol_flags = 0;
struct rte_eth_dev *eth_dev;
const char *name = rte_vdev_device_name(dev);
 
@@ -1579,6 +1582,17 @@ rte_pmd_vhost_probe(struct rte_vdev_device *dev)
flags |= RTE_VHOST_USER_EXTBUF_SUPPORT;
}
 
+   if (rte_kvargs_count(kvlist, ETH_VHOST_LEGACY_OL_FLAGS) == 1) {
+   ret = rte_kvargs_process(kvlist,
+   ETH_VHOST_LEGACY_OL_FLAGS,
+   &open_int, &legacy_ol_flags);
+   if (ret < 0)
+   goto out_free;
+   }
+
+   if (legacy_ol_flags == 0)
+   flags |= RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS;
+
if (dev->device.numa_node == SOCKET_ID_ANY)
dev->device.numa_node = rte_socket_id();
 
-- 
2.35.3

[PATCH v2 4/6] net/vhost: make VLAN stripping flag a boolean

[Maxime Coquelin]

This trivial patch makes the vlan_strip field of the
pmd_internal struct a boolean, since it is handled as
such.

Signed-off-by: Maxime Coquelin 
Reviewed-by: Chenbo Xia 
---
 drivers/net/vhost/rte_eth_vhost.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/vhost/rte_eth_vhost.c 
b/drivers/net/vhost/rte_eth_vhost.c
index 1620e30df8..e931d59053 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -88,7 +88,7 @@ struct pmd_internal {
uint16_t max_queues;
int vid;
rte_atomic32_t started;
-   uint8_t vlan_strip;
+   bool vlan_strip;
 };
 
 struct internal_list {
-- 
2.35.3

[PATCH v2 5/6] net/vhost: perform SW checksum in Rx path

[Maxime Coquelin]

Virtio specification supports host checksum offloading
for L4, which is enabled with VIRTIO_NET_F_CSUM feature
negotiation. However, the Vhost PMD does not advertise
Rx checksum offload capabilities, so we can end-up with
the VIRTIO_NET_F_CSUM feature being negotiated, implying
the Vhost library returns packets with checksum being
offloaded while the application did not request for it.

Advertising these offload capabilities at the ethdev level
is not enough, because we could still end-up with the
application not enabling these offloads while the guest
still negotiate them.

This patch advertises the Rx checksum offload capabilities,
and introduces a compatibility layer to cover the case
VIRTIO_NET_F_CSUM has been negotiated but the application
does not configure the Rx checksum offloads. This function
performis the L4 Rx checksum in SW for UDP and TCP. Note
that it is not needed to calculate the pseudo-header
checksum, because the Virtio specification requires that
the driver do it.

This patch does not advertise SCTP checksum offloading
capability for now, but it could be handled later if the
need arises.

Reported-by: Jason Wang 
Signed-off-by: Maxime Coquelin 
---
 doc/guides/nics/features/vhost.ini |  1 +
 drivers/net/vhost/rte_eth_vhost.c  | 83 ++
 2 files changed, 84 insertions(+)

diff --git a/doc/guides/nics/features/vhost.ini 
b/doc/guides/nics/features/vhost.ini
index ef81abb439..15f4dfe5e8 100644
--- a/doc/guides/nics/features/vhost.ini
+++ b/doc/guides/nics/features/vhost.ini
@@ -7,6 +7,7 @@
 Link status  = Y
 Free Tx mbuf on demand = Y
 Queue status event   = Y
+L4 checksum offload  = P
 Basic stats  = Y
 Extended stats   = Y
 x86-32   = Y
diff --git a/drivers/net/vhost/rte_eth_vhost.c 
b/drivers/net/vhost/rte_eth_vhost.c
index e931d59053..42f0d52ebc 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -12,6 +12,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -85,10 +86,12 @@ struct pmd_internal {
char *iface_name;
uint64_t flags;
uint64_t disable_flags;
+   uint64_t features;
uint16_t max_queues;
int vid;
rte_atomic32_t started;
bool vlan_strip;
+   bool rx_sw_csum;
 };
 
 struct internal_list {
@@ -275,6 +278,70 @@ vhost_dev_xstats_get(struct rte_eth_dev *dev, struct 
rte_eth_xstat *xstats,
return nstats;
 }
 
+static void
+vhost_dev_csum_configure(struct rte_eth_dev *eth_dev)
+{
+   struct pmd_internal *internal = eth_dev->data->dev_private;
+   const struct rte_eth_rxmode *rxmode = ð_dev->data->dev_conf.rxmode;
+
+   internal->rx_sw_csum = false;
+
+   /* SW checksum is not compatible with legacy mode */
+   if (!(internal->flags & RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS))
+   return;
+
+   if (internal->features & (1ULL << VIRTIO_NET_F_CSUM)) {
+   if (!(rxmode->offloads &
+   (RTE_ETH_RX_OFFLOAD_UDP_CKSUM | 
RTE_ETH_RX_OFFLOAD_TCP_CKSUM))) {
+   VHOST_LOG(NOTICE, "Rx csum will be done in SW, may 
impact performance.");
+   internal->rx_sw_csum = true;
+   }
+   }
+}
+
+static void
+vhost_dev_rx_sw_csum(struct rte_mbuf *mbuf)
+{
+   struct rte_net_hdr_lens hdr_lens;
+   uint32_t ptype, hdr_len;
+   uint16_t csum = 0, csum_offset;
+
+   /* Return early if the L4 checksum was not offloaded */
+   if ((mbuf->ol_flags & RTE_MBUF_F_RX_L4_CKSUM_MASK) != 
RTE_MBUF_F_RX_L4_CKSUM_NONE)
+   return;
+
+   ptype = rte_net_get_ptype(mbuf, &hdr_lens, RTE_PTYPE_ALL_MASK);
+
+   hdr_len = hdr_lens.l2_len + hdr_lens.l3_len;
+
+   switch (ptype & RTE_PTYPE_L4_MASK) {
+   case RTE_PTYPE_L4_TCP:
+   csum_offset = offsetof(struct rte_tcp_hdr, cksum) + hdr_len;
+   break;
+   case RTE_PTYPE_L4_UDP:
+   csum_offset = offsetof(struct rte_udp_hdr, dgram_cksum) + 
hdr_len;
+   break;
+   default:
+   /* Unsupported packet type */
+   return;
+   }
+
+   /* The pseudo-header checksum is already performed, as per Virtio spec 
*/
+   if (rte_raw_cksum_mbuf(mbuf, hdr_len, rte_pktmbuf_pkt_len(mbuf) - 
hdr_len, &csum) < 0)
+   return;
+
+   csum = ~csum;
+   /* See RFC768 */
+   if (unlikely((ptype & RTE_PTYPE_L4_UDP) && csum == 0))
+   csum = 0x;
+
+   if (rte_pktmbuf_data_len(mbuf) >= csum_offset + 1)
+   *rte_pktmbuf_mtod_offset(mbuf, uint16_t *, csum_offset) = csum;
+
+   mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_MASK;
+   mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
+}
+
 static uint16_t
 eth_vhost_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 {
@@ -315,6 +382,9 @@ eth_vhost_rx(void *q, struct rte_mbuf **bufs, uint16_t 
nb_bufs)
if (r->internal->vlan_strip)

[PATCH v2 6/6] net/vhost: perform SW checksum in Tx path

[Maxime Coquelin]

Virtio specification supports guest checksum offloading
for L4, which is enabled with VIRTIO_NET_F_GUEST_CSUM
feature negotiation. However, the Vhost PMD does not
advertise Tx checksum offload capabilities.

Advertising these offload capabilities at the ethdev level
is not enough, because we could still end-up with the
application enabling these offloads while the guest not
negotiating it.

This patch advertises the Tx checksum offload capabilities,
and introduces a compatibility layer to cover the case
VIRTIO_NET_F_GUEST_CSUM has not been negotiated but the
application does configure the Tx checksum offloads. This
function performs the L4 Tx checksum in SW for UDP and TCP.
Compared to Rx SW checksum, the Tx SW checksum function
needs to compute the pseudo-header checksum, as we cannot
know whether it was done before.

This patch does not advertise SCTP checksum offloading
capability for now, but it could be handled later if the
need arises.

Reported-by: Jason Wang 
Signed-off-by: Maxime Coquelin 
---
 drivers/net/vhost/rte_eth_vhost.c | 62 +++
 1 file changed, 62 insertions(+)

diff --git a/drivers/net/vhost/rte_eth_vhost.c 
b/drivers/net/vhost/rte_eth_vhost.c
index 42f0d52ebc..d75d256040 100644
--- a/drivers/net/vhost/rte_eth_vhost.c
+++ b/drivers/net/vhost/rte_eth_vhost.c
@@ -92,6 +92,7 @@ struct pmd_internal {
rte_atomic32_t started;
bool vlan_strip;
bool rx_sw_csum;
+   bool tx_sw_csum;
 };
 
 struct internal_list {
@@ -283,8 +284,10 @@ vhost_dev_csum_configure(struct rte_eth_dev *eth_dev)
 {
struct pmd_internal *internal = eth_dev->data->dev_private;
const struct rte_eth_rxmode *rxmode = ð_dev->data->dev_conf.rxmode;
+   const struct rte_eth_txmode *txmode = ð_dev->data->dev_conf.txmode;
 
internal->rx_sw_csum = false;
+   internal->tx_sw_csum = false;
 
/* SW checksum is not compatible with legacy mode */
if (!(internal->flags & RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS))
@@ -297,6 +300,56 @@ vhost_dev_csum_configure(struct rte_eth_dev *eth_dev)
internal->rx_sw_csum = true;
}
}
+
+   if (!(internal->features & (1ULL << VIRTIO_NET_F_GUEST_CSUM))) {
+   if (txmode->offloads &
+   (RTE_ETH_TX_OFFLOAD_UDP_CKSUM | 
RTE_ETH_TX_OFFLOAD_TCP_CKSUM)) {
+   VHOST_LOG(NOTICE, "Tx csum will be done in SW, may 
impact performance.");
+   internal->tx_sw_csum = true;
+   }
+   }
+}
+
+static void
+vhost_dev_tx_sw_csum(struct rte_mbuf *mbuf)
+{
+   uint32_t hdr_len;
+   uint16_t csum = 0, csum_offset;
+
+   switch (mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK) {
+   case RTE_MBUF_F_TX_L4_NO_CKSUM:
+   return;
+   case RTE_MBUF_F_TX_TCP_CKSUM:
+   csum_offset = offsetof(struct rte_tcp_hdr, cksum);
+   break;
+   case RTE_MBUF_F_TX_UDP_CKSUM:
+   csum_offset = offsetof(struct rte_udp_hdr, dgram_cksum);
+   break;
+   default:
+   /* Unsupported packet type. */
+   return;
+   }
+
+   hdr_len = mbuf->l2_len + mbuf->l3_len;
+   csum_offset += hdr_len;
+
+   /* Prepare the pseudo-header checksum */
+   if (rte_net_intel_cksum_prepare(mbuf) < 0)
+   return;
+
+   if (rte_raw_cksum_mbuf(mbuf, hdr_len, rte_pktmbuf_pkt_len(mbuf) - 
hdr_len, &csum) < 0)
+   return;
+
+   csum = ~csum;
+   /* See RFC768 */
+   if (unlikely((mbuf->packet_type & RTE_PTYPE_L4_UDP) && csum == 0))
+   csum = 0x;
+
+   if (rte_pktmbuf_data_len(mbuf) >= csum_offset + 1)
+   *rte_pktmbuf_mtod_offset(mbuf, uint16_t *, csum_offset) = csum;
+
+   mbuf->ol_flags &= ~RTE_MBUF_F_TX_L4_MASK;
+   mbuf->ol_flags |= RTE_MBUF_F_TX_L4_NO_CKSUM;
 }
 
 static void
@@ -423,6 +476,10 @@ eth_vhost_tx(void *q, struct rte_mbuf **bufs, uint16_t 
nb_bufs)
}
}
 
+   if (r->internal->tx_sw_csum)
+   vhost_dev_tx_sw_csum(m);
+
+
bufs[nb_send] = m;
++nb_send;
}
@@ -1267,6 +1324,11 @@ eth_dev_info(struct rte_eth_dev *dev,
 
dev_info->tx_offload_capa = RTE_ETH_TX_OFFLOAD_MULTI_SEGS |
RTE_ETH_TX_OFFLOAD_VLAN_INSERT;
+   if (internal->flags & RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS) {
+   dev_info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_UDP_CKSUM |
+   RTE_ETH_TX_OFFLOAD_TCP_CKSUM;
+   }
+
dev_info->rx_offload_capa = RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
if (internal->flags & RTE_VHOST_USER_NET_COMPLIANT_OL_FLAGS) {
dev_info->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_UDP_CKSUM |
-- 
2.35.3

Re: [PATCH v5 1/2] kni: use dedicated function to set random MAC address

[Ferruh Yigit]

On 6/8/2022 1:11 PM, Andrew Rybchenko wrote:

From: Ke Zhang 

eth_hw_addr_random() sets address type correctly.

eth_hw_addr_random() is available since Linux v3.4, so
no compat is required.

Also fix the warning:
warning: passing argument 1 of ‘memcpy’ discards ‘const’
qualifier from pointer target type

Variable dev_addr is done const intentionally in Linux v5.17 to
prevent using it directly.

Fixes: ea6b39b5b847 ("kni: remove ethtool support")
Cc: sta...@dpdk.org

Signed-off-by: Ke Zhang 
Signed-off-by: Andrew Rybchenko 


Acked-by: Ferruh Yigit 

Re: [PATCH v5 2/2] kni: fix warning about discarding const qualifier

[Ferruh Yigit]

On 6/8/2022 1:11 PM, Andrew Rybchenko wrote:



From: Ke Zhang 

The warning info:
warning: passing argument 1 of ‘memcpy’ discards ‘const’
qualifier from pointer target type

Variable dev_addr is done const intentionally in v5.17 to prevent using
it directly. See kernel series [1] for more information.

[1] https://lore.kernel.org/netdev/YZYAb4X%2FVQFy0iks@shredder/T/


Can you add Linux kernel commit log, instead of the mail list archive? 
This helps to check the relevant code change in kernel easier, and 
verify in which versions it exists etc..




Fixes: ea6b39b5b847 ("kni: remove ethtool support")
Cc: sta...@dpdk.org

Signed-off-by: Ke Zhang 
Signed-off-by: Andrew Rybchenko 


Acked-by: Ferruh Yigit 

Re: [PATCH v5 2/2] kni: fix warning about discarding const qualifier

[Ferruh Yigit]

On 6/8/2022 1:54 PM, Ferruh Yigit wrote:

On 6/8/2022 1:11 PM, Andrew Rybchenko wrote:



From: Ke Zhang 

The warning info:
warning: passing argument 1 of ‘memcpy’ discards ‘const’
qualifier from pointer target type

Variable dev_addr is done const intentionally in v5.17 to prevent using
it directly. See kernel series [1] for more information.


`dev_addr` is done const in v5.17,
but patch checks >= v5.15 because used helpers introduced in v5.15, 
should this be clarified to not confuse users? No strong opinion from me.




[1] https://lore.kernel.org/netdev/YZYAb4X%2FVQFy0iks@shredder/T/


Can you add Linux kernel commit log, instead of the mail list archive? 
This helps to check the relevant code change in kernel easier, and 
verify in which versions it exists etc..




I think mentioned commit is following
Commit adeef3e32146 ("net: constify netdev->dev_addr")



Fixes: ea6b39b5b847 ("kni: remove ethtool support")
Cc: sta...@dpdk.org

Signed-off-by: Ke Zhang 
Signed-off-by: Andrew Rybchenko 


Acked-by: Ferruh Yigit 

Re: [PATCH v2] eal: remove unused arch specific headers for locks

[Stanisław Kardach]

On Wed, Jun 8, 2022 at 1:57 PM David Marchand  wrote:
>
> MCS lock, PF lock and Ticket lock have no arch specific implementation,
> there is no need for the extra redirection in headers.
>
> Signed-off-by: David Marchand 
> Acked-by: Stephen Hemminger 
> ---
> Note: this was mentionned during the seqlock patch review, and I spotted
> it again, while reviewing the RISC-V port, and I see the same for a next
> architecture too. So better clean this up as we don't need the
> redirection.
>
> Changes since v1:
> - rebased following RISC-V merge,
>
Thanks, this works just fine for RISC-V.

Acked-by: Stanislaw Kardach 

Re: [PATCH v2] eal: remove unused arch specific headers for locks

[Thomas Monjalon]

08/06/2022 15:16, Stanisław Kardach:
> On Wed, Jun 8, 2022 at 1:57 PM David Marchand  
> wrote:
> >
> > MCS lock, PF lock and Ticket lock have no arch specific implementation,
> > there is no need for the extra redirection in headers.
> >
> > Signed-off-by: David Marchand 
> > Acked-by: Stephen Hemminger 
> > ---
> > Note: this was mentionned during the seqlock patch review, and I spotted
> > it again, while reviewing the RISC-V port, and I see the same for a next
> > architecture too. So better clean this up as we don't need the
> > redirection.
> >
> > Changes since v1:
> > - rebased following RISC-V merge,
> >
> Thanks, this works just fine for RISC-V.
> 
> Acked-by: Stanislaw Kardach 

Applied, thanks.

Re: [PATCH 0/4] clean up zero-length arrays

[Stephen Hemminger]

On Thu,  2 Jun 2022 16:08:30 +0100
Bruce Richardson  wrote:

> This patchset adds a coccinelle script to clean-up zero-length
> arrays in structures. The final patches are the result of running
> that script on the DPDK repository.
> 
> Bruce Richardson (4):
>   cocci: add script for zero-length arrays in structs
>   drivers: replace zero-length arrays with undimensioned ones
>   lib: replace zero-length arrays with undimensioned ones
>   app: examples: replace zero-length arrays with undimensioned ones
> 
>  app/test/test_table_tables.c  |  2 +-
>  devtools/cocci/zero_length_array.cocci| 21 +++
>  drivers/bus/dpaa/include/netcfg.h |  4 +--
>  drivers/bus/vmbus/rte_vmbus_reg.h |  4 +--
>  drivers/common/cnxk/roc_se.h  |  2 +-
>  drivers/common/dpaax/caamflib/desc/ipsec.h|  2 +-
>  drivers/common/dpaax/dpaax_iova_table.h   |  2 +-
>  drivers/common/mlx5/mlx5_prm.h| 10 +++
>  drivers/crypto/ipsec_mb/ipsec_mb_private.h|  4 +--
>  drivers/crypto/virtio/virtio_ring.h   |  4 +--
>  drivers/crypto/virtio/virtqueue.h |  2 +-
>  drivers/net/atlantic/hw_atl/hw_atl_utils.h|  2 +-
>  drivers/net/cxgbe/clip_tbl.h  |  2 +-
>  drivers/net/cxgbe/l2t.h   |  2 +-
>  drivers/net/cxgbe/mps_tcam.h  |  2 +-
>  drivers/net/cxgbe/smt.h   |  2 +-
>  drivers/net/enic/base/vnic_devcmd.h   |  2 +-
>  drivers/net/hinic/hinic_pmd_tx.h  |  2 +-
>  drivers/net/mlx5/mlx5_tx.h|  2 +-
>  drivers/net/nfp/nfpcore/nfp_nsp.h |  2 +-
>  drivers/net/virtio/virtio_ring.h  |  4 +--
>  drivers/net/virtio/virtio_user/vhost_kernel.c |  2 +-
>  drivers/net/virtio/virtio_user/vhost_vdpa.c   |  2 +-
>  drivers/net/virtio/virtqueue.h|  2 +-
>  drivers/regex/mlx5/mlx5_rxp.h |  4 +--
>  examples/ip_reassembly/main.c |  2 +-
>  examples/ptpclient/ptpclient.c|  4 +--
>  lib/cryptodev/cryptodev_pmd.h |  2 +-
>  lib/cryptodev/rte_cryptodev.h |  2 +-
>  lib/eventdev/rte_event_timer_adapter.h|  2 +-
>  lib/ip_frag/ip_reassembly.h   |  2 +-
>  lib/ipsec/sa.h|  2 +-
>  lib/rib/rte_rib.c |  2 +-
>  lib/rib/rte_rib6.c|  2 +-
>  lib/table/rte_swx_table_learner.c |  4 +--
>  lib/table/rte_table_hash_key16.c  |  4 +--
>  lib/table/rte_table_hash_key32.c  |  4 +--
>  lib/table/rte_table_hash_key8.c   |  4 +--
>  lib/vhost/rte_vhost.h |  4 +--
>  40 files changed, 101 insertions(+), 54 deletions(-)
>  create mode 100644 devtools/cocci/zero_length_array.cocci
>  create mode 100644 lib/count_comments.py
> 
> --
> 2.34.1
> 

Bruce, looking at this commit, it looks like the underlying cause
of the problem with iavf was it is using array size of one
when flex array should be used:

commit b5b3ea803e4741ad6a46a38d8227c78226d9054d
Author: Kevin Traynor 
Date:   Fri Apr 17 16:43:35 2020 +0100

eal/x86: ignore gcc 10 stringop-overflow warnings

stringop-overflow warns when it sees a possible overflow
in a string operation.

In the rte_memcpy functions different branches are taken
depending on the size. stringop-overflow is raised for the
branches in the function where it sees the static size of the
src could be overflowed.

However, in reality a correct size argument and in some cases
dynamic allocation would ensure that this does not happen.

For example, in the case below for key, the correct path will be
chosen in rte_memcpy_generic at runtime based on the size argument
but as some paths in the function could lead to a cast to 32 bytes
a warning is raised.

In function ‘_mm256_storeu_si256’,
inlined from ‘rte_memcpy_generic’
at ../lib/librte_eal/common/include/arch/x86/rte_memcpy.h:315:2,
inlined from ‘iavf_configure_rss_key’
at ../lib/librte_eal/common/include/arch/x86/rte_memcpy.h:869:10:

/usr/lib/gcc/x86_64-redhat-linux/10/include/avxintrin.h:928:8:
warning: writing 32 bytes into a region of size 1 [-Wstringop-overflow=]
  928 |   *__P = __A;
  |   ~^
In file included
from ../drivers/net/iavf/../../common/iavf/iavf_prototype.h:10,
from ../drivers/net/iavf/iavf.h:9,
from ../drivers/net/iavf/iavf_vchnl.c:22:

../drivers/net/iavf/iavf_vchnl.c:
In function ‘iavf_configure_rss_key’:

../drivers/net/iavf/../../common/iavf/virtchnl.h:508:5:
note: at offset 0 to object ‘key’ with size 1 declared here
  508 |  u8 key[1]; /* RSS hash key, packed bytes */
  | ^~~

Ignore the stringop-overflow warnings for rte_memcpy.h functions.

Bugzilla ID: 394

Re: [RFC 8/8] ip_frag: fix gcc-12 warnings

[Stephen Hemminger]

On Wed, 8 Jun 2022 09:19:20 +0100
Konstantin Ananyev  wrote:

> 07/06/2022 18:17, Stephen Hemminger пишет:
> > The function rte_memcpy can derference past source buffer which
> > will cause array out of bounds warnings. But there is no good reason
> > to use rte_memcpy instead of memcpy in this code. Memcpy is just
> > as fast for these small inputs, and compiler will optimize.  
> 
> 
> AFAIK, rte_memcpy() will outperform memcpy() when _size_ parameter
> is a variable. Unfortunately that's exactly the case here.
> So not sure it is a good change, at least without extensive perf testing.
> BTW, if rte_memcpy() really access src buffer beyond it's boundaries,
> I think that's definitely a bug that needs to be fixed.

Yes and no.
IMHO DPDK should not in the C library business, and glibc etc should be
more optimized if necessary.


The ip_frag warning with rte_memcpy in full is:

[296/3606] Compiling C object lib/libr...a.p/ip_frag_rte_ipv4_fragmentation.c.o
In file included from /usr/lib/gcc/x86_64-linux-gnu/12/include/immintrin.h:43,
 from /usr/lib/gcc/x86_64-linux-gnu/12/include/x86intrin.h:32,
 from ../lib/eal/x86/include/rte_vect.h:31,
 from ../lib/eal/x86/include/rte_memcpy.h:17,
 from ../lib/ip_frag/rte_ipv4_fragmentation.c:8:
In function ‘_mm256_storeu_si256’,
inlined from ‘rte_mov32’ at ../lib/eal/x86/include/rte_memcpy.h:347:2,
inlined from ‘rte_mov128’ at ../lib/eal/x86/include/rte_memcpy.h:369:2,
inlined from ‘rte_memcpy_generic’ at 
../lib/eal/x86/include/rte_memcpy.h:445:4,
inlined from ‘rte_memcpy’ at ../lib/eal/x86/include/rte_memcpy.h:853:10,
inlined from ‘__create_ipopt_frag_hdr’ at 
../lib/ip_frag/rte_ipv4_fragmentation.c:68:4,
inlined from ‘rte_ipv4_fragment_packet’ at 
../lib/ip_frag/rte_ipv4_fragmentation.c:242:16:
/usr/lib/gcc/x86_64-linux-gnu/12/include/avxintrin.h:935:8: warning: array 
subscript ‘__m256i_u[1]’ is partly outside array bounds of ‘uint8_t[60]’ {aka 
‘unsigned char[60]’} [-Warray-bounds]
  935 |   *__P = __A;
  |   ~^
../lib/ip_frag/rte_ipv4_fragmentation.c: In function ‘rte_ipv4_fragment_packet’:
../lib/ip_frag/rte_ipv4_fragmentation.c:122:17: note: at offset [52, 60] into 
object ‘ipopt_frag_hdr’ of size 60
  122 | uint8_t ipopt_frag_hdr[IPV4_HDR_MAX_LEN];
  | ^~
In function ‘_mm256_storeu_si256’,
inlined from ‘rte_mov32’ at ../lib/eal/x86/include/rte_memcpy.h:347:2,
inlined from ‘rte_mov128’ at ../lib/eal/x86/include/rte_memcpy.h:370:2,
inlined from ‘rte_memcpy_generic’ at 
../lib/eal/x86/include/rte_memcpy.h:445:4,
inlined from ‘rte_memcpy’ at ../lib/eal/x86/include/rte_memcpy.h:853:10,
inlined from ‘__create_ipopt_frag_hdr’ at 
../lib/ip_frag/rte_ipv4_fragmentation.c:68:4,
inlined from ‘rte_ipv4_fragment_packet’ at 
../lib/ip_frag/rte_ipv4_fragmentation.c:242:16:
/usr/lib/gcc/x86_64-linux-gnu/12/include/avxintrin.h:935:8: warning: array 
subscript [2, 3] is outside array bounds of ‘uint8_t[60]’ {aka ‘unsigned 
char[60]’} [-Warray-bounds]
  935 |   *__P = __A;
  |   ~^
../lib/ip_frag/rte_ipv4_fragmentation.c: In function ‘rte_ipv4_fragment_packet’:
../lib/ip_frag/rte_ipv4_fragmentation.c:122:17: note: at offset [84, 124] into 
object ‘ipopt_frag_hdr’ of size 60
  122 | uint8_t ipopt_frag_hdr[IPV4_HDR_MAX_LEN];
  | ^~
In function ‘_mm256_storeu_si256’,
inlined from ‘rte_mov32’ at ../lib/eal/x86/include/rte_memcpy.h:347:2,
inlined from ‘rte_mov128’ at ../lib/eal/x86/include/rte_memcpy.h:371:2,
inlined from ‘rte_memcpy_generic’ at 
../lib/eal/x86/include/rte_memcpy.h:445:4,
inlined from ‘rte_memcpy’ at ../lib/eal/x86/include/rte_memcpy.h:853:10,
inlined from ‘__create_ipopt_frag_hdr’ at 
../lib/ip_frag/rte_ipv4_fragmentation.c:68:4,
inlined from ‘rte_ipv4_fragment_packet’ at 
../lib/ip_frag/rte_ipv4_fragmentation.c:242:16:
/usr/lib/gcc/x86_64-linux-gnu/12/include/avxintrin.h:935:8: warning: array 
subscript [3, 4] is outside array bounds of ‘uint8_t[60]’ {aka ‘unsigned 
char[60]’} [-Warray-bounds]
  935 |   *__P = __A;
  |   ~^
../lib/ip_frag/rte_ipv4_fragmentation.c: In function ‘rte_ipv4_fragment_packet’:
../lib/ip_frag/rte_ipv4_fragmentation.c:122:17: note: at offset [116, 156] into 
object ‘ipopt_frag_hdr’ of size 60
  122 | uint8_t ipopt_frag_hdr[IPV4_HDR_MAX_LEN];
  | ^~
In function ‘_mm256_storeu_si256’,
inlined from ‘rte_mov32’ at ../lib/eal/x86/include/rte_memcpy.h:347:2,
inlined from ‘rte_mov64’ at ../lib/eal/x86/include/rte_memcpy.h:358:2,
inlined from ‘rte_memcpy_generic’ at 
../lib/eal/x86/include/rte_memcpy.h:452:4,
inlined from ‘rte_memcpy’ at ../lib/eal/x86/include/rte_memcpy.h:853:10,
inlined from ‘__create_ipopt_frag_hdr’ at 
../lib/ip_frag/rte_ipv4_fragmentation.c:68:4,
inlined from ‘rte_ipv4_fragment_packet’ at 
../lib/ip_frag/rte_ipv4_frag

RE: [PATCH v3] sched: enable CMAN at runtime

[Danilewicz, MarcinX]

Hi Cristian,

Ok, let me check.

BR,
/Marcin

> -Original Message-
> From: Dumitrescu, Cristian 
> Sent: Wednesday, June 8, 2022 1:59 PM
> To: Danilewicz, MarcinX ; dev@dpdk.org;
> Singh, Jasvinder 
> Cc: Ajmera, Megha ; Liu, Yu Y
> 
> Subject: RE: [PATCH v3] sched: enable CMAN at runtime
> 
> 
> 
> > -Original Message-
> > From: Danilewicz, MarcinX 
> > Sent: Wednesday, June 8, 2022 10:42 AM
> > To: dev@dpdk.org; Singh, Jasvinder ;
> > Dumitrescu, Cristian 
> > Cc: Ajmera, Megha 
> > Subject: [PATCH v3] sched: enable CMAN at runtime
> >
> > Added changes to enable CMAN (RED or PIE) at init from profile
> > configuration file.
> >
> > By default CMAN code is enable but not in use, when there is no RED or
> > PIE profile configured.
> >
> > Signed-off-by: Marcin Danilewicz 
> > ---
> > Log: v2 change in rte_sched.h to avoid ABI breakage.
> >  v3 changes from comments
> > ---
> 
> Marcin,
> 
> Your patch does not apply cleanly on top of DPDK main latest, can you please
> fix.
> 
> Regards,
> Cristian

Re: [RFC 1/8] net/ena: fix warnings related to rte_memcpy and gcc-12

[Stephen Hemminger]

On Wed, 8 Jun 2022 14:29:58 +0200
Michał Krawczyk  wrote:

> wt., 7 cze 2022 o 19:17 Stephen Hemminger 
> napisał(a):
> >
> > Rte_memcpy is not needed for small objects only used on control
> > path. Regular memcpy is as fast or faster and there is more
> > robust since static analysis etc knows what it does.
> >
> > In this driver it was redefining all memcpy as rte_memcpy
> > which is even worse.  
> 
> Hi Stephen,
> 
> I would like to shed some light on why we're redefining all the memcpy
> as rte_memcpy. The ENA HAL is unmodifiable, as it's shared across many
> platforms and we cannot simply adjust it for the DPDK. We can use the
> ena_plat_dpdk.h to change the ena_com (HAL) definitions, and that's
> what we're doing with memcpy. It's being used on the data path for the
> Tx, to copy the bounce buffers. Following the recommendations in [1]
> plus the results from [2], we wanted to make use of the optimized
> memcpy on the ENA's data path as well to reduce the CPU time spent in
> the PMD. I'm worried that removing rte_memcpy from the ena_plat_dpdk.h
> will result in some performance degradation for the ENA data path.
> However I understand your concerns for the control path and I'm ok
> with it.
> 
> [1] https://doc.dpdk.org/guides/prog_guide/writing_efficient_code.html#memory
> [2] 
> https://www.intel.com/content/www/us/en/developer/articles/technical/performance-optimization-of-memcpy-in-dpdk.html
> 
> Thanks,
> Michal
> 


I admit to having little sympathy unfixable for base/ style code.
You could have just replaced memcpy() in their with an abstraction layer
like other drivers.

The full gcc-12 warnings are:

913/2989] Compiling C object drivers/libtmp_rte_net_ena.a.p/net_ena_ena_rss.c.o
In file included from /usr/lib/gcc/x86_64-linux-gnu/12/include/immintrin.h:43,
 from /usr/lib/gcc/x86_64-linux-gnu/12/include/x86intrin.h:32,
 from ../lib/eal/x86/include/rte_vect.h:31,
 from ../lib/eal/x86/include/rte_memcpy.h:17,
 from ../lib/mempool/rte_mempool.h:46,
 from ../lib/mbuf/rte_mbuf.h:38,
 from ../lib/net/rte_ether.h:22,
 from ../drivers/net/ena/ena_ethdev.h:10,
 from ../drivers/net/ena/ena_rss.c:6:
In function ‘_mm256_loadu_si256’,
inlined from ‘rte_mov32’ at ../lib/eal/x86/include/rte_memcpy.h:346:9,
inlined from ‘rte_mov128’ at ../lib/eal/x86/include/rte_memcpy.h:369:2,
inlined from ‘rte_memcpy_generic’ at 
../lib/eal/x86/include/rte_memcpy.h:445:4,
inlined from ‘rte_memcpy’ at ../lib/eal/x86/include/rte_memcpy.h:853:10,
inlined from ‘ena_rss_key_fill’ at ../drivers/net/ena/ena_rss.c:62:2:
/usr/lib/gcc/x86_64-linux-gnu/12/include/avxintrin.h:929:10: warning: array 
subscript ‘__m256i_u[1]’ is partly outside array bounds of ‘uint8_t[40]’ {aka 
‘unsigned char[40]’} [-Warray-bounds]
  929 |   return *__P;
  |  ^~~~
../drivers/net/ena/ena_rss.c: In function ‘ena_rss_key_fill’:
../drivers/net/ena/ena_rss.c:51:24: note: at offset 32 into object 
‘default_key’ of size 40
   51 | static uint8_t default_key[ENA_HASH_KEY_SIZE];
  |^~~
In function ‘_mm256_loadu_si256’,
inlined from ‘rte_mov32’ at ../lib/eal/x86/include/rte_memcpy.h:346:9,
inlined from ‘rte_mov128’ at ../lib/eal/x86/include/rte_memcpy.h:370:2,
inlined from ‘rte_memcpy_generic’ at 
../lib/eal/x86/include/rte_memcpy.h:445:4,
inlined from ‘rte_memcpy’ at ../lib/eal/x86/include/rte_memcpy.h:853:10,
inlined from ‘ena_rss_key_fill’ at ../drivers/net/ena/ena_rss.c:62:2:
/usr/lib/gcc/x86_64-linux-gnu/12/include/avxintrin.h:929:10: warning: array 
subscript 2 is outside array bounds of ‘uint8_t[40]’ {aka ‘unsigned char[40]’} 
[-Warray-bounds]
  929 |   return *__P;
  |  ^~~~
../drivers/net/ena/ena_rss.c: In function ‘ena_rss_key_fill’:
../drivers/net/ena/ena_rss.c:51:24: note: at offset 64 into object 
‘default_key’ of size 40
   51 | static uint8_t default_key[ENA_HASH_KEY_SIZE];
  |^~~
In function ‘_mm256_loadu_si256’,
inlined from ‘rte_mov32’ at ../lib/eal/x86/include/rte_memcpy.h:346:9,
inlined from ‘rte_mov128’ at ../lib/eal/x86/include/rte_memcpy.h:371:2,
inlined from ‘rte_memcpy_generic’ at 
../lib/eal/x86/include/rte_memcpy.h:445:4,
inlined from ‘rte_memcpy’ at ../lib/eal/x86/include/rte_memcpy.h:853:10,
inlined from ‘ena_rss_key_fill’ at ../drivers/net/ena/ena_rss.c:62:2:
/usr/lib/gcc/x86_64-linux-gnu/12/include/avxintrin.h:929:10: warning: array 
subscript 3 is outside array bounds of ‘uint8_t[40]’ {aka ‘unsigned char[40]’} 
[-Warray-bounds]
  929 |   return *__P;
  |  ^~~~
../drivers/net/ena/ena_rss.c: In function ‘ena_rss_key_fill’:
../drivers/net/ena/ena_rss.c:51:24: note: at offset 96 into object 
‘default_key’ of size 40
   51 | static uint8_t default_key[ENA_HASH_KEY_SIZE];
  |^~~
In fun

Re: [PATCH v2] build: try to get kernel version from kernel source

[David Marchand]

On Tue, Mar 8, 2022 at 4:55 PM Ferruh Yigit  wrote:
>
> On 3/3/2022 1:15 PM, Ferdinand Thiessen wrote:
> > When building the kernel modules, try to get the kernel
> > version from the kernel sources first. This fixes the
> > kernel modules installation directory if the target kernel
> > version differs from the host kernel version, like for
> > CI build or when packaging for linux distributions.
> >
> > Signed-off-by: Ferdinand Thiessen 
Acked-by: Bruce Richardson 
> Tested-by: Ferruh Yigit 

Applied, thanks.


-- 
David Marchand

[PATCH] devtools: unify cross-compilation tests

[Thomas Monjalon]

Reduce the number of Arm builds from 3 to 1:
only generic armv8 with GCC.
The specific PPC builds on Ubuntu are skipped.

The build directories for PPC and RISC-V
are also renamed for consistency:
- build-arm64-generic-gcc
- build-ppc64-power8-gcc
- build-riscv64-generic-gcc

The cross file is always saved in variable "f" for readability.

Signed-off-by: Thomas Monjalon 
---
 devtools/test-meson-builds.sh | 31 ++-
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index f732dccf6c..2cdc2d813d 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -253,31 +253,20 @@ if check_cc_flags '-m32' ; then
 fi
 
 # x86 MinGW
-build build-x86-mingw $srcdir/config/x86/cross-mingw skipABI \
-   -Dexamples=helloworld
+f=$srcdir/config/x86/cross-mingw
+build build-x86-mingw $f skipABI -Dexamples=helloworld
 
-# generic armv8a with clang as host compiler
+# generic armv8
 f=$srcdir/config/arm/arm64_armv8_linux_gcc
-export CC="clang"
-build build-arm64-host-clang $f ABI $use_shared
-unset CC
-# some gcc/arm configurations
-for f in $srcdir/config/arm/arm64_[bdo]*gcc ; do
-   export CC="$CCACHE gcc"
-   targetdir=build-$(basename $f | tr '_' '-' | cut -d'-' -f-2)
-   build $targetdir $f skipABI $use_shared
-   unset CC
-done
+build build-arm64-generic-gcc $f ABI $use_shared
 
-# ppc configurations
-for f in $srcdir/config/ppc/ppc* ; do
-   targetdir=build-$(basename $f | cut -d'-' -f-2)
-   build $targetdir $f ABI $use_shared
-done
+# IBM POWER
+f=$srcdir/config/ppc/ppc64le-power8-linux-gcc
+build build-ppc64-power8-gcc $f ABI $use_shared
 
-# RISC-V configuration
-build build-riscv64-linux-gcc $srcdir/config/riscv/riscv64_linux_gcc ABI \
-   $use_shared
+# generic RISC-V
+f=$srcdir/config/riscv/riscv64_linux_gcc
+build build-riscv64-generic-gcc $f ABI $use_shared
 
 # Test installation of the x86-generic target, to be used for checking
 # the sample apps build using the pkg-config file for cflags and libs
-- 
2.36.0

[PATCH v6] pcap: support MTU set for linux interafces

[Ido Goshen]

Support rte_eth_dev_set_mtu for pcap ifaces vdevs by
setting the underlying OS network interface's MTU.
Support is for pcap ifaces only and not for pcap files.
Support is for Linux only.

Bugzilla ID: 961
Signed-off-by: Ido Goshen 

---
v6:
Fixes for v5 approach
1. freebsd compilation fix
2. checkpatch warning fix

v5:
Alternative approach
Instead of checking MTU in the pmd set it on the OS interface and
let it do the enforcment.

v4:
1. Add release notes comment
2. Access pmd internals via queue struct
3. eth_mtu_set code convention fixes

v3:
Preserve pcap behavior to support max size packets by default
alternative to v2 in order to limit the code change to pcap only and
avoid abi change.
Enforce mtu only in case rte_eth_dev_set_mtu was explicitly called.

v2:
Preserve pcap behavior to support max size packets by default.
---
 doc/guides/rel_notes/release_22_07.rst |  3 ++
 drivers/net/pcap/pcap_ethdev.c | 42 ++
 drivers/net/pcap/pcap_osdep.h  |  1 +
 drivers/net/pcap/pcap_osdep_freebsd.c  |  7 +
 drivers/net/pcap/pcap_osdep_linux.c| 21 +
 drivers/net/pcap/pcap_osdep_windows.c  |  7 +
 6 files changed, 81 insertions(+)

diff --git a/doc/guides/rel_notes/release_22_07.rst 
b/doc/guides/rel_notes/release_22_07.rst
index 0ed4f92820..b90cfefc55 100644
--- a/doc/guides/rel_notes/release_22_07.rst
+++ b/doc/guides/rel_notes/release_22_07.rst
@@ -95,6 +95,9 @@ New Features
   * Added AH mode support in lookaside protocol (IPsec) for CN9K & CN10K.
   * Added AES-GMAC support in lookaside protocol (IPsec) for CN9K & CN10K.
 
+* **Updated pcap driver.**
+
+ * Added support for MTU on Linux network interfaces
 
 Removed Items
 -
diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c
index ec29fd6bc5..2221c53051 100644
--- a/drivers/net/pcap/pcap_ethdev.c
+++ b/drivers/net/pcap/pcap_ethdev.c
@@ -807,6 +807,47 @@ eth_stats_reset(struct rte_eth_dev *dev)
return 0;
 }
 
+static int
+eth_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+{
+   unsigned int i;
+   struct pmd_internals *internals = dev->data->dev_private;
+   int is_supported = 0;
+   int is_err = 0;
+
+   for (i = 0; i < dev->data->nb_rx_queues; i++) {
+   struct pcap_rx_queue *queue = &internals->rx_queue[i];
+
+   if ((strcmp(queue->type, ETH_PCAP_IFACE_ARG) == 0) ||
+   (strcmp(queue->type, ETH_PCAP_RX_IFACE_ARG) == 
0) ||
+   (strcmp(queue->type, ETH_PCAP_RX_IFACE_IN_ARG) 
== 0)) {
+   is_supported = 1;
+   if (osdep_iface_mtu_set(queue->name, mtu) < 0)
+   is_err = 1;
+   }
+   }
+
+   for (i = 0; i < dev->data->nb_tx_queues; i++) {
+   struct pcap_tx_queue *queue = &internals->tx_queue[i];
+
+   if ((strcmp(queue->type, ETH_PCAP_IFACE_ARG) == 0) ||
+   (strcmp(queue->type, ETH_PCAP_TX_IFACE_ARG) == 
0)) {
+   is_supported = 1;
+   if (osdep_iface_mtu_set(queue->name, mtu) < 0)
+   is_err = 1;
+   }
+   }
+
+   if (!is_supported)
+   return -ENOTSUP;
+
+   if (is_err)
+   return -1;
+
+   PMD_LOG(INFO, "MTU set %s %u\n", dev->device->name, mtu);
+   return 0;
+}
+
 static inline void
 infinite_rx_ring_free(struct rte_ring *pkts)
 {
@@ -1004,6 +1045,7 @@ static const struct eth_dev_ops ops = {
.link_update = eth_link_update,
.stats_get = eth_stats_get,
.stats_reset = eth_stats_reset,
+   .mtu_set = eth_mtu_set,
 };
 
 static int
diff --git a/drivers/net/pcap/pcap_osdep.h b/drivers/net/pcap/pcap_osdep.h
index bf41cba982..ef8be7543c 100644
--- a/drivers/net/pcap/pcap_osdep.h
+++ b/drivers/net/pcap/pcap_osdep.h
@@ -14,5 +14,6 @@ extern int eth_pcap_logtype;
 
 int osdep_iface_index_get(const char *name);
 int osdep_iface_mac_get(const char *name, struct rte_ether_addr *mac);
+int osdep_iface_mtu_set(const char *if_name, uint16_t mtu);
 
 #endif
diff --git a/drivers/net/pcap/pcap_osdep_freebsd.c 
b/drivers/net/pcap/pcap_osdep_freebsd.c
index 20556b3e92..a9961ba3e3 100644
--- a/drivers/net/pcap/pcap_osdep_freebsd.c
+++ b/drivers/net/pcap/pcap_osdep_freebsd.c
@@ -57,3 +57,10 @@ osdep_iface_mac_get(const char *if_name, struct 
rte_ether_addr *mac)
rte_free(buf);
return 0;
 }
+
+int
+osdep_iface_mtu_set(__rte_unused const char *if_name, __rte_unused uint16_t 
mtu)
+{
+   PMD_LOG(ERR, "mtu set not supported on freebsd\n");
+   return -ENOTSUP;
+}
diff --git a/drivers/net/pcap/pcap_osdep_linux.c 
b/drivers/net/pcap/pcap_osdep_linux.c
index 97033f57c5..b0b4a716fe 100644
--- a/drivers/net/pcap/pcap_osdep_linux.c
+++ b/drivers/net/pcap/pcap_osdep_linux.c
@@ -40,3 +40,24 @@ osdep_iface_mac_get(const char *if_name, struct 
rte_ether_addr *mac)
clos

Re: [PATCH v6] pcap: support MTU set for linux interafces

[Stephen Hemminger]

On Wed,  8 Jun 2022 19:04:19 +0300
Ido Goshen  wrote:

> +int
> +osdep_iface_mtu_set(const char *if_name, uint16_t mtu)
> +{
> + struct ifreq ifr;
> + int if_fd = socket(AF_INET, SOCK_DGRAM, 0);
> +
> + if (if_fd == -1)
> + return -1;
> +
> + rte_strscpy(ifr.ifr_name, if_name, sizeof(ifr.ifr_name));
> + ifr.ifr_mtu = mtu;
> + if (ioctl(if_fd, SIOCSIFMTU, &ifr)) {
> + PMD_LOG(ERR, "%s mtu set to %d failed\n", if_name, mtu);
> + close(if_fd);
> + return -1;
> + }
> +
> + close(if_fd);
> + return 0;
> +}

This should work on FreeBSD as well.
FreeBSD has the same ioctl()

Re: [PATCH] devtools: unify cross-compilation tests

[David Marchand]

On Wed, Jun 8, 2022 at 5:50 PM Thomas Monjalon  wrote:
>
> Reduce the number of Arm builds from 3 to 1:
> only generic armv8 with GCC.
> The specific PPC builds on Ubuntu are skipped.
>
> The build directories for PPC and RISC-V
> are also renamed for consistency:
> - build-arm64-generic-gcc
> - build-ppc64-power8-gcc
> - build-riscv64-generic-gcc
>
> The cross file is always saved in variable "f" for readability.
>
> Signed-off-by: Thomas Monjalon 

Thanks, this reduction is something I already had locally (via some
configuration).

I like the renaming, though this change will trigger ABI reference
regeneration for people who do test ABI.

Otherwise the change lgtm.
Acked-by: David Marchand 

-- 
David Marchand

[PATCH v6] ethdev: introduce available Rx descriptors threshold

[Andrew Rybchenko]

From: Spike Du 

A new event RTE_ETH_EVENT_RX_AVAIL_THRESH should be generated by HW
when number of available descriptors in Rx queue goes below the
threshold.

The threshold is defined as a percentage of an Rx queue size with valid
values from 0 to 99 (inclusive). Zero (default) value disables it.

There is no capability reporting for the feature. Application should
simply try to set required threshold value and handle result.

Add testpmd commands to control the threshold:
  set port  rxq  avail_thresh 

Signed-off-by: Spike Du 
Signed-off-by: Andrew Rybchenko 
---
v6:
- try to make descriptor shorter and more useful
- refine terminology to use "available descriptors threshold"
  everywhere (plural "descriptors")
- fix ethdev API documenation
- define negative return values
- define rules to convert percentage to descriptors number
  in drivers
- avoid extra checks in testpmd helper to allow ethdev API
  to do its job
- minor fixes in testpmd variables naming
- fix testpmd help to be human oriented
- update testpmd users guide
- add release notes

 app/test-pmd/cmdline.c  | 72 +
 app/test-pmd/config.c   |  9 +++
 app/test-pmd/testpmd.c  | 16 +
 app/test-pmd/testpmd.h  |  2 +
 doc/guides/rel_notes/release_22_07.rst  |  6 ++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  9 +++
 lib/ethdev/ethdev_driver.h  | 25 +++
 lib/ethdev/rte_ethdev.c | 44 +
 lib/ethdev/rte_ethdev.h | 71 
 lib/ethdev/version.map  |  2 +
 10 files changed, 256 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index fdd0cada3b..3acdd33cd9 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -750,6 +750,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"set port (port_id) fec_mode auto|off|rs|baser\n"
"set fec mode for a specific port\n\n"
 
+   "set port (port_id) rxq (queue_id) avail_thresh 
(0..99)>\n "
+   "set available descriptors threshold for Rx 
queue\n\n"
+
, list_pkt_forwarding_modes()
);
}
@@ -17331,6 +17334,74 @@ static cmdline_parse_inst_t cmd_set_fec_mode = {
},
 };
 
+/* *** set available descriptors threshold for an RxQ of a port *** */
+struct cmd_set_rxq_avail_thresh_result {
+   cmdline_fixed_string_t set;
+   cmdline_fixed_string_t port;
+   uint16_t port_num;
+   cmdline_fixed_string_t rxq;
+   uint16_t rxq_num;
+   cmdline_fixed_string_t avail_thresh;
+   uint8_t avail_thresh_num;
+};
+
+static void cmd_set_rxq_avail_thresh_parsed(void *parsed_result,
+   __rte_unused struct cmdline *cl,
+   __rte_unused void *data)
+{
+   struct cmd_set_rxq_avail_thresh_result *res = parsed_result;
+   int ret = 0;
+
+   if ((strcmp(res->set, "set") == 0) && (strcmp(res->port, "port") == 0)
+   && (strcmp(res->rxq, "rxq") == 0)
+   && (strcmp(res->avail_thresh, "avail_thresh") == 0))
+   ret = set_rxq_avail_thresh(res->port_num, res->rxq_num,
+ res->avail_thresh_num);
+   if (ret < 0)
+   printf("rxq_avail_thresh_cmd error: (%s)\n", strerror(-ret));
+
+}
+
+static cmdline_parse_token_string_t cmd_set_rxq_avail_thresh_set =
+   TOKEN_STRING_INITIALIZER(struct cmd_set_rxq_avail_thresh_result,
+   set, "set");
+static cmdline_parse_token_string_t cmd_set_rxq_avail_thresh_port =
+   TOKEN_STRING_INITIALIZER(struct cmd_set_rxq_avail_thresh_result,
+   port, "port");
+static cmdline_parse_token_num_t cmd_set_rxq_avail_thresh_portnum =
+   TOKEN_NUM_INITIALIZER(struct cmd_set_rxq_avail_thresh_result,
+   port_num, RTE_UINT16);
+static cmdline_parse_token_string_t cmd_set_rxq_avail_thresh_rxq =
+   TOKEN_STRING_INITIALIZER(struct cmd_set_rxq_avail_thresh_result,
+   rxq, "rxq");
+static cmdline_parse_token_num_t cmd_set_rxq_avail_thresh_rxqnum =
+   TOKEN_NUM_INITIALIZER(struct cmd_set_rxq_avail_thresh_result,
+   rxq_num, RTE_UINT16);
+static cmdline_parse_token_string_t cmd_set_rxq_avail_thresh_avail_thresh =
+   TOKEN_STRING_INITIALIZER(struct cmd_set_rxq_avail_thresh_result,
+   avail_thresh, "avail_thresh");
+static cmdline_parse_token_num_t cmd_set_rxq_avail_thresh_avail_threshnum =
+   TOKEN_NUM_INITIALIZER(struct cmd_set_rxq_avail_thresh_result,
+   avail_thresh_num, RTE_UINT8);
+
+static cmdline_parse_inst_t cmd_set_rxq_avail_thresh = {
+   .f = cmd_set_rxq_avail_thresh_parsed,
+   .data = (void *)0,

[dpdk-dev] [PATCH v2] build: ccache support for cross build

[jerinj]

From: Jerin Jacob 

By default, ccache is not used for cross build[1].
Update all cross files to use ccache if it is available
in build machine.

Also, updated devtools/test-meson-builds.sh
script to find the correct DPDK_TARGET due to
change in cross file syntax.

[1]
https://mesonbuild.com/Machine-files.html

Signed-off-by: Jerin Jacob 
---

v2:
- Rebased with master, therefore added update riscv64 cross files
- Fixed DPDK_TARGET detection with devtools/test-meson-builds.sh 
due to cross file synatx update.

 config/arm/arm32_armv8_linux_gcc   | 4 ++--
 config/arm/arm64_armada_linux_gcc  | 4 ++--
 config/arm/arm64_armv8_linux_clang_ubuntu  | 4 ++--
 config/arm/arm64_armv8_linux_gcc   | 4 ++--
 config/arm/arm64_bluefield_linux_gcc   | 4 ++--
 config/arm/arm64_centriq2400_linux_gcc | 4 ++--
 config/arm/arm64_cn10k_linux_gcc   | 4 ++--
 config/arm/arm64_cn9k_linux_gcc| 4 ++--
 config/arm/arm64_dpaa_linux_gcc| 4 ++--
 config/arm/arm64_emag_linux_gcc| 4 ++--
 config/arm/arm64_graviton2_linux_gcc   | 4 ++--
 config/arm/arm64_kunpeng920_linux_gcc  | 4 ++--
 config/arm/arm64_kunpeng930_linux_gcc  | 4 ++--
 config/arm/arm64_n1sdp_linux_gcc   | 4 ++--
 config/arm/arm64_n2_linux_gcc  | 4 ++--
 config/arm/arm64_stingray_linux_gcc| 4 ++--
 config/arm/arm64_thunderx2_linux_gcc   | 4 ++--
 config/arm/arm64_thunderxt83_linux_gcc | 4 ++--
 config/arm/arm64_thunderxt88_linux_gcc | 4 ++--
 config/ppc/ppc64le-power8-linux-gcc| 4 ++--
 config/ppc/ppc64le-power8-linux-gcc-ubuntu | 4 ++--
 config/riscv/riscv64_linux_gcc | 4 ++--
 config/riscv/riscv64_sifive_u740_linux_gcc | 4 ++--
 config/x86/cross-mingw | 4 ++--
 devtools/test-meson-builds.sh  | 3 ++-
 25 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/config/arm/arm32_armv8_linux_gcc b/config/arm/arm32_armv8_linux_gcc
index 89f8a12881..7f2977e49d 100644
--- a/config/arm/arm32_armv8_linux_gcc
+++ b/config/arm/arm32_armv8_linux_gcc
@@ -1,6 +1,6 @@
 [binaries]
-c = 'arm-linux-gnueabihf-gcc'
-cpp = 'arm-linux-gnueabihf-cpp'
+c = ['ccache', 'arm-linux-gnueabihf-gcc']
+cpp = ['ccache', 'arm-linux-gnueabihf-cpp']
 ar = 'arm-linux-gnueabihf-gcc-ar'
 strip = 'arm-linux-gnueabihf-strip'
 pkgconfig = 'arm-linux-gnueabihf-pkg-config'
diff --git a/config/arm/arm64_armada_linux_gcc 
b/config/arm/arm64_armada_linux_gcc
index 301418949b..1566999101 100644
--- a/config/arm/arm64_armada_linux_gcc
+++ b/config/arm/arm64_armada_linux_gcc
@@ -1,6 +1,6 @@
 [binaries]
-c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+c = ['ccache', 'aarch64-linux-gnu-gcc']
+cpp = ['ccache', 'aarch64-linux-gnu-cpp']
 ar = 'aarch64-linux-gnu-ar'
 as = 'aarch64-linux-gnu-as'
 strip = 'aarch64-linux-gnu-strip'
diff --git a/config/arm/arm64_armv8_linux_clang_ubuntu 
b/config/arm/arm64_armv8_linux_clang_ubuntu
index db488d75f4..86ae43937b 100644
--- a/config/arm/arm64_armv8_linux_clang_ubuntu
+++ b/config/arm/arm64_armv8_linux_clang_ubuntu
@@ -1,6 +1,6 @@
 [binaries]
-c = 'clang'
-cpp = 'clang++'
+c = ['ccache', 'clang']
+cpp = ['ccache', 'clang++']
 ar = 'llvm-ar'
 strip = 'llvm-strip'
 llvm-config = 'llvm-config'
diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc
index 5391d35389..048c2d9f29 100644
--- a/config/arm/arm64_armv8_linux_gcc
+++ b/config/arm/arm64_armv8_linux_gcc
@@ -1,6 +1,6 @@
 [binaries]
-c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+c = ['ccache', 'aarch64-linux-gnu-gcc']
+cpp = ['ccache', 'aarch64-linux-gnu-cpp']
 ar = 'aarch64-linux-gnu-gcc-ar'
 strip = 'aarch64-linux-gnu-strip'
 pkgconfig = 'aarch64-linux-gnu-pkg-config'
diff --git a/config/arm/arm64_bluefield_linux_gcc 
b/config/arm/arm64_bluefield_linux_gcc
index 248a9f031a..38df3c198b 100644
--- a/config/arm/arm64_bluefield_linux_gcc
+++ b/config/arm/arm64_bluefield_linux_gcc
@@ -1,6 +1,6 @@
 [binaries]
-c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+c = ['ccache', 'aarch64-linux-gnu-gcc']
+cpp = ['ccache', 'aarch64-linux-gnu-cpp']
 ar = 'aarch64-linux-gnu-gcc-ar'
 strip = 'aarch64-linux-gnu-strip'
 pkgconfig = 'aarch64-linux-gnu-pkg-config'
diff --git a/config/arm/arm64_centriq2400_linux_gcc 
b/config/arm/arm64_centriq2400_linux_gcc
index dfe9110331..0966eef2c5 100644
--- a/config/arm/arm64_centriq2400_linux_gcc
+++ b/config/arm/arm64_centriq2400_linux_gcc
@@ -1,6 +1,6 @@
 [binaries]
-c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+c = ['ccache', 'aarch64-linux-gnu-gcc']
+cpp = ['ccache', 'aarch64-linux-gnu-cpp']
 ar = 'aarch64-linux-gnu-gcc-ar'
 strip = 'aarch64-linux-gnu-strip'
 pkgconfig = 'aarch64-linux-gnu-pkg-config'
diff --git a/config/arm/arm64_cn10k_linux_gcc b/config/arm/arm64_cn10k_linux_gcc
index a3578c03a1..201e0ccd59 100644
--- a/config/arm/arm64_cn10k_linux_gcc
+++ b/config/arm/arm64_cn10k_linux_gcc
@@ -1,6 +1,6 @@
 [binaries]
-c = 'aarch64-linux-gnu-gcc'
-cpp 

Re: [dpdk-dev] [PATCH v1] build: ccache support for cross build

[Jerin Jacob]

On Wed, Jun 8, 2022 at 2:00 PM Thomas Monjalon  wrote:
>
> 08/06/2022 10:22, Jerin Jacob:
> > On Thu, Jun 2, 2022 at 5:30 PM Jerin Jacob  wrote:
> > >
> > > On Thu, Jun 2, 2022 at 4:25 PM Thomas Monjalon  
> > > wrote:
> > > >
> > > > 02/06/2022 11:43, Jerin Jacob:
> > > > > On Thu, Jun 2, 2022 at 3:11 PM Bruce Richardson
> > > > >  wrote:
> > > > > >
> > > > > > On Thu, Jun 02, 2022 at 02:53:55PM +0530, jer...@marvell.com wrote:
> > > > > > > From: Jerin Jacob 
> > > > > > >
> > > > > > > By default, ccache is not used for cross build[1].
> > > > > > > Update all cross files to use ccache if it is available
> > > > > > > in build machine.
> > > > > > >
> > > > > > > [1]
> > > > > > > https://mesonbuild.com/Machine-files.html
> > > > > > >
> > > > > > > Signed-off-by: Jerin Jacob 
> > > > > >
> > > > > > Does this still work even if ccache is not available? That's not 
> > > > > > fully
> > > > >
> > > > > Yes.
> > > > >
> > > > > > clear from the docs, but it seems to be that if an array is passed 
> > > > > > the
> > > > > > whole array is used as the command, rather than just one element of 
> > > > > > the
> > > > > > array. That would imply that cross-builds now require ccache. Is 
> > > > > > that
> > > > > > acceptable?
> > > > >
> > > > > I have removed ccache from the build machine still it works.
> > > >
> > > > I don't understand why it works without ccache.
> > >
> > > Meson is detecting valid compiler prefix. ccache is one of them.
> > >
> > > See
> > > https://github.com/fabio-porcedda/meson/commit/44db495f5ece43645ca3994dc95895c76a828530
> > > https://github.com/mesonbuild/meson/issues/1392
> >
> > I hope there are no other review comments to fix it for this patch.
> > Since it is improving the build time for cross-build. If there is no
> > objection to this patch, Please merge it.
>
> I've tested it now and I see a big blocker.
> This patch is breaking the use of devtools/test-meson-builds.sh
> so I cannot merge it as-is, sorry.

I assume you are referring to fixing the DPDK_TARGET update due to the
cross-file update.
If so, it is fixed in v2 at
http://patches.dpdk.org/project/dpdk/patch/20220608171304.945454-1-jer...@marvell.com/

Thanks
>
>
>

Re: [PATCH] devtools: unify cross-compilation tests

[Thomas Monjalon]

08/06/2022 18:34, David Marchand:
> On Wed, Jun 8, 2022 at 5:50 PM Thomas Monjalon  wrote:
> >
> > Reduce the number of Arm builds from 3 to 1:
> > only generic armv8 with GCC.
> > The specific PPC builds on Ubuntu are skipped.
> >
> > The build directories for PPC and RISC-V
> > are also renamed for consistency:
> > - build-arm64-generic-gcc
> > - build-ppc64-power8-gcc
> > - build-riscv64-generic-gcc
> >
> > The cross file is always saved in variable "f" for readability.
> >
> > Signed-off-by: Thomas Monjalon 
> 
> Thanks, this reduction is something I already had locally (via some
> configuration).
> 
> I like the renaming, though this change will trigger ABI reference
> regeneration for people who do test ABI.
> 
> Otherwise the change lgtm.
> Acked-by: David Marchand 

Applied quickly before -rc1.

Re: [PATCH v6] ethdev: introduce available Rx descriptors threshold

[Thomas Monjalon]

08/06/2022 18:35, Andrew Rybchenko:
> From: Spike Du 
> 
> A new event RTE_ETH_EVENT_RX_AVAIL_THRESH should be generated by HW
> when number of available descriptors in Rx queue goes below the
> threshold.
> 
> The threshold is defined as a percentage of an Rx queue size with valid
> values from 0 to 99 (inclusive). Zero (default) value disables it.
> 
> There is no capability reporting for the feature. Application should
> simply try to set required threshold value and handle result.
> 
> Add testpmd commands to control the threshold:
>   set port  rxq  avail_thresh 
> 
> Signed-off-by: Spike Du 
> Signed-off-by: Andrew Rybchenko 
> ---
> v6:
> - try to make descriptor shorter and more useful
> - refine terminology to use "available descriptors threshold"
>   everywhere (plural "descriptors")
> - fix ethdev API documenation
> - define negative return values
> - define rules to convert percentage to descriptors number
>   in drivers
> - avoid extra checks in testpmd helper to allow ethdev API
>   to do its job
> - minor fixes in testpmd variables naming
> - fix testpmd help to be human oriented
> - update testpmd users guide
> - add release notes

What a (more than) review work, thanks a lot for this v6!

Acked-by: Thomas Monjalon 

With a few minor arrangements,
applied, thanks.

Re: [PATCH v5 0/2] kni: fix build warnings with Linux 5.17+

[Andrew Rybchenko]

On 6/8/22 15:11, Andrew Rybchenko wrote:

v5:
 - fix broken build

v4:
 - restore original patch author
 - resend with cover letter to address patchwork recognition as a
   series

v3:
 - split single patch into two
 - clarify patches summary and description

Ke Zhang (2):
   kni: use dedicated function to set random MAC address
   kni: fix warning about discarding const qualifier

  kernel/linux/kni/compat.h   |  4 
  kernel/linux/kni/kni_misc.c | 13 +
  kernel/linux/kni/kni_net.c  |  4 
  3 files changed, 17 insertions(+), 4 deletions(-)



With review notes from Ferruh processed applied to dpdk-next-net/main.

Re: [PATCH v6] ethdev: introduce available Rx descriptors threshold

[Thomas Monjalon]

08/06/2022 19:22, Thomas Monjalon:
> 08/06/2022 18:35, Andrew Rybchenko:
> > From: Spike Du 
> > 
> > A new event RTE_ETH_EVENT_RX_AVAIL_THRESH should be generated by HW
> > when number of available descriptors in Rx queue goes below the
> > threshold.
> > 
> > The threshold is defined as a percentage of an Rx queue size with valid
> > values from 0 to 99 (inclusive). Zero (default) value disables it.
> > 
> > There is no capability reporting for the feature. Application should
> > simply try to set required threshold value and handle result.
> > 
> > Add testpmd commands to control the threshold:
> >   set port  rxq  avail_thresh 
> > 
> > Signed-off-by: Spike Du 
> > Signed-off-by: Andrew Rybchenko 
> > ---
> > v6:
> > - try to make descriptor shorter and more useful
> > - refine terminology to use "available descriptors threshold"
> >   everywhere (plural "descriptors")
> > - fix ethdev API documenation
> > - define negative return values
> > - define rules to convert percentage to descriptors number
> >   in drivers
> > - avoid extra checks in testpmd helper to allow ethdev API
> >   to do its job
> > - minor fixes in testpmd variables naming
> > - fix testpmd help to be human oriented
> > - update testpmd users guide
> > - add release notes
> 
> What a (more than) review work, thanks a lot for this v6!
> 
> Acked-by: Thomas Monjalon 
> 
> With a few minor arrangements,
> applied, thanks.

PS: some ABI exceptions have to be added as discussed in the thread:

+; Ignore ethdev event enum update
+; because new event cannot be received if not registered
+[suppress_type]
+type_kind = enum
+changed_enumerators = RTE_ETH_EVENT_MAX
+
+; Ignore fields inserted in cacheline boundary of rte_eth_rxq_info
+; because the struct size is unchanged
+[suppress_type]
+name = rte_eth_rxq_info
+has_data_member_inserted_between = {offset_of(rx_buf_size), end}

Re: [dpdk-dev] [PATCH v1] build: ccache support for cross build

[Stanisław Kardach]

On Wed, Jun 8, 2022 at 7:17 PM Jerin Jacob  wrote:
>
> On Wed, Jun 8, 2022 at 2:00 PM Thomas Monjalon  wrote:
> >
> > 08/06/2022 10:22, Jerin Jacob:
> > > On Thu, Jun 2, 2022 at 5:30 PM Jerin Jacob  wrote:
> > > >
> > > > On Thu, Jun 2, 2022 at 4:25 PM Thomas Monjalon  
> > > > wrote:
> > > > >
> > > > > 02/06/2022 11:43, Jerin Jacob:
> > > > > > On Thu, Jun 2, 2022 at 3:11 PM Bruce Richardson
> > > > > >  wrote:
> > > > > > >
> > > > > > > On Thu, Jun 02, 2022 at 02:53:55PM +0530, jer...@marvell.com 
> > > > > > > wrote:
> > > > > > > > From: Jerin Jacob 
> > > > > > > >
> > > > > > > > By default, ccache is not used for cross build[1].
> > > > > > > > Update all cross files to use ccache if it is available
> > > > > > > > in build machine.
> > > > > > > >
> > > > > > > > [1]
> > > > > > > > https://mesonbuild.com/Machine-files.html
> > > > > > > >
> > > > > > > > Signed-off-by: Jerin Jacob 
> > > > > > >
> > > > > > > Does this still work even if ccache is not available? That's not 
> > > > > > > fully
> > > > > >
> > > > > > Yes.
> > > > > >
> > > > > > > clear from the docs, but it seems to be that if an array is 
> > > > > > > passed the
> > > > > > > whole array is used as the command, rather than just one element 
> > > > > > > of the
> > > > > > > array. That would imply that cross-builds now require ccache. Is 
> > > > > > > that
> > > > > > > acceptable?
> > > > > >
> > > > > > I have removed ccache from the build machine still it works.
> > > > >
> > > > > I don't understand why it works without ccache.
> > > >
> > > > Meson is detecting valid compiler prefix. ccache is one of them.
> > > >
> > > > See
> > > > https://github.com/fabio-porcedda/meson/commit/44db495f5ece43645ca3994dc95895c76a828530
> > > > https://github.com/mesonbuild/meson/issues/1392
> > >
> > > I hope there are no other review comments to fix it for this patch.
> > > Since it is improving the build time for cross-build. If there is no
> > > objection to this patch, Please merge it.
> >
> > I've tested it now and I see a big blocker.
> > This patch is breaking the use of devtools/test-meson-builds.sh
> > so I cannot merge it as-is, sorry.
>
> I assume you are referring to fixing the DPDK_TARGET update due to the
> cross-file update.
> If so, it is fixed in v2 at
> http://patches.dpdk.org/project/dpdk/patch/20220608171304.945454-1-jer...@marvell.com/

I've just tested it on a clean Ubuntu 20.04 docker with only RISC-V
toolchain, no ccache and indeed compilation works. Both directly with
meson and via test-meson-builds.sh.
Seems like ccache is parsed in special way by meson as using any other
unknown command just fails meson configuration.
Also setting CC/CXX env variable makes meson bail (even if I use the
cross-file value), so I'm not sure if there is a better way to do it.

Acked-by: Stanislaw Kardach 

Re: [RFC 1/8] net/ena: fix warnings related to rte_memcpy and gcc-12

[Michał Krawczyk]

śr., 8 cze 2022 o 17:32 Stephen Hemminger 
napisał(a):
>
> On Wed, 8 Jun 2022 14:29:58 +0200
> Michał Krawczyk  wrote:
>
> > wt., 7 cze 2022 o 19:17 Stephen Hemminger 
> > napisał(a):
> > >
> > > Rte_memcpy is not needed for small objects only used on control
> > > path. Regular memcpy is as fast or faster and there is more
> > > robust since static analysis etc knows what it does.
> > >
> > > In this driver it was redefining all memcpy as rte_memcpy
> > > which is even worse.
> >
> > Hi Stephen,
> >
> > I would like to shed some light on why we're redefining all the memcpy
> > as rte_memcpy. The ENA HAL is unmodifiable, as it's shared across many
> > platforms and we cannot simply adjust it for the DPDK. We can use the
> > ena_plat_dpdk.h to change the ena_com (HAL) definitions, and that's
> > what we're doing with memcpy. It's being used on the data path for the
> > Tx, to copy the bounce buffers. Following the recommendations in [1]
> > plus the results from [2], we wanted to make use of the optimized
> > memcpy on the ENA's data path as well to reduce the CPU time spent in
> > the PMD. I'm worried that removing rte_memcpy from the ena_plat_dpdk.h
> > will result in some performance degradation for the ENA data path.
> > However I understand your concerns for the control path and I'm ok
> > with it.
> >
> > [1] 
> > https://doc.dpdk.org/guides/prog_guide/writing_efficient_code.html#memory
> > [2] 
> > https://www.intel.com/content/www/us/en/developer/articles/technical/performance-optimization-of-memcpy-in-dpdk.html
> >
> > Thanks,
> > Michal
> >
>
>
> I admit to having little sympathy unfixable for base/ style code.
> You could have just replaced memcpy() in their with an abstraction layer
> like other drivers.
>

We'll probably end up with the solution you're suggesting. For now
let's remove the memcpy redefinition at all to suppress the warnings.

Acked-by: Michal Krawczyk 

Re: [PATCH v5 1/7] net/mlx5: add LWM support for Rxq

[Matan Azrad]

Series-acked-by: Matan Azrad mailto:ma...@nvidia.com>>

קבל ‏Outlook עבור Android‏

From: Spike Du 
Sent: Tuesday, June 7, 2022 3:59:36 PM
To: Matan Azrad ; Slava Ovsiienko ; 
Ori Kam ; NBU-Contact-Thomas Monjalon (EXTERNAL) 

Cc: andrew.rybche...@oktetlabs.ru ; 
step...@networkplumber.org ; 
m...@smartsharesystems.com ; dev@dpdk.org 
; Raslan Darawsheh 
Subject: [PATCH v5 1/7] net/mlx5: add LWM support for Rxq

Add lwm(Limit WaterMark) field to Rxq object which indicates the percentage
of RX queue size used by HW to raise LWM event to the user.
Allow LWM setting in modify_rq command.
Allow the LWM configuration dynamically by adding RDY2RDY state change.

Signed-off-by: Spike Du 
---
 drivers/net/mlx5/mlx5.h  |  1 +
 drivers/net/mlx5/mlx5_devx.c | 13 -
 drivers/net/mlx5/mlx5_devx.h |  1 +
 drivers/net/mlx5/mlx5_rx.h   |  1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index ef755ee..305edff 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1395,6 +1395,7 @@ enum mlx5_rxq_modify_type {
 MLX5_RXQ_MOD_RST2RDY, /* modify state from reset to ready. */
 MLX5_RXQ_MOD_RDY2ERR, /* modify state from ready to error. */
 MLX5_RXQ_MOD_RDY2RST, /* modify state from ready to reset. */
+   MLX5_RXQ_MOD_RDY2RDY, /* modify state from ready to ready. */
 };

 enum mlx5_txq_modify_type {
diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 4b48f94..c918a50 100644
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -62,7 +62,7 @@
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
-static int
+int
 mlx5_devx_modify_rq(struct mlx5_rxq_priv *rxq, uint8_t type)
 {
 struct mlx5_devx_modify_rq_attr rq_attr;
@@ -76,6 +76,11 @@
 case MLX5_RXQ_MOD_RST2RDY:
 rq_attr.rq_state = MLX5_RQC_STATE_RST;
 rq_attr.state = MLX5_RQC_STATE_RDY;
+   if (rxq->lwm) {
+   rq_attr.modify_bitmask |=
+   MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_WQ_LWM;
+   rq_attr.lwm = rxq->lwm;
+   }
 break;
 case MLX5_RXQ_MOD_RDY2ERR:
 rq_attr.rq_state = MLX5_RQC_STATE_RDY;
@@ -85,6 +90,12 @@
 rq_attr.rq_state = MLX5_RQC_STATE_RDY;
 rq_attr.state = MLX5_RQC_STATE_RST;
 break;
+   case MLX5_RXQ_MOD_RDY2RDY:
+   rq_attr.rq_state = MLX5_RQC_STATE_RDY;
+   rq_attr.state = MLX5_RQC_STATE_RDY;
+   rq_attr.modify_bitmask |= 
MLX5_MODIFY_RQ_IN_MODIFY_BITMASK_WQ_LWM;
+   rq_attr.lwm = rxq->lwm;
+   break;
 default:
 break;
 }
diff --git a/drivers/net/mlx5/mlx5_devx.h b/drivers/net/mlx5/mlx5_devx.h
index a95207a..ebd1da4 100644
--- a/drivers/net/mlx5/mlx5_devx.h
+++ b/drivers/net/mlx5/mlx5_devx.h
@@ -11,6 +11,7 @@
 int mlx5_txq_devx_modify(struct mlx5_txq_obj *obj,
  enum mlx5_txq_modify_type type, uint8_t dev_port);
 void mlx5_txq_devx_obj_release(struct mlx5_txq_obj *txq_obj);
+int mlx5_devx_modify_rq(struct mlx5_rxq_priv *rxq, uint8_t type);

 extern struct mlx5_obj_ops devx_obj_ops;

diff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h
index e715ed6..25a5f2c 100644
--- a/drivers/net/mlx5/mlx5_rx.h
+++ b/drivers/net/mlx5/mlx5_rx.h
@@ -175,6 +175,7 @@ struct mlx5_rxq_priv {
 struct mlx5_devx_rq devx_rq;
 struct rte_eth_hairpin_conf hairpin_conf; /* Hairpin configuration. */
 uint32_t hairpin_status; /* Hairpin binding status. */
+   uint32_t lwm:16;
 };

 /* External RX queue descriptor. */
--
1.8.3.1

release candidate 22.07-rc1

[Thomas Monjalon]

A new DPDK release candidate is ready for testing:
https://git.dpdk.org/dpdk/tag/?id=v22.07-rc1

There are 576 new patches in this snapshot,
constituting what the reviewers and maintainers were able to handle.

Release notes:
https://doc.dpdk.org/guides/rel_notes/release_22_07.html

Highlights of 22.07-rc1:
- initial RISC-V support
- sequence lock
- protocol-based metering
- Rx threshold event
- SFP telemetry
- async vhost improvements
- vhost library statistics
- vmxnet3 versions 5 & 6
- ECDH crypto
- DMA device telemetry
- SWX pipeline improvements
- integration as Meson subproject

Please test and report issues on bugs.dpdk.org.

DPDK 22.07-rc2 is expected in two weeks.

Thank you everyone

Re: [RFC 1/8] net/ena: fix warnings related to rte_memcpy and gcc-12

[Stephen Hemminger]

On Wed, 8 Jun 2022 21:18:15 +0200
Michał Krawczyk  wrote:

> śr., 8 cze 2022 o 17:32 Stephen Hemminger 
> napisał(a):
> >
> > On Wed, 8 Jun 2022 14:29:58 +0200
> > Michał Krawczyk  wrote:
> >  
> > > wt., 7 cze 2022 o 19:17 Stephen Hemminger 
> > > napisał(a):  
> > > >
> > > > Rte_memcpy is not needed for small objects only used on control
> > > > path. Regular memcpy is as fast or faster and there is more
> > > > robust since static analysis etc knows what it does.
> > > >
> > > > In this driver it was redefining all memcpy as rte_memcpy
> > > > which is even worse.  
> > >
> > > Hi Stephen,
> > >
> > > I would like to shed some light on why we're redefining all the memcpy
> > > as rte_memcpy. The ENA HAL is unmodifiable, as it's shared across many
> > > platforms and we cannot simply adjust it for the DPDK. We can use the
> > > ena_plat_dpdk.h to change the ena_com (HAL) definitions, and that's
> > > what we're doing with memcpy. It's being used on the data path for the
> > > Tx, to copy the bounce buffers. Following the recommendations in [1]
> > > plus the results from [2], we wanted to make use of the optimized
> > > memcpy on the ENA's data path as well to reduce the CPU time spent in
> > > the PMD. I'm worried that removing rte_memcpy from the ena_plat_dpdk.h
> > > will result in some performance degradation for the ENA data path.
> > > However I understand your concerns for the control path and I'm ok
> > > with it.
> > >
> > > [1] 
> > > https://doc.dpdk.org/guides/prog_guide/writing_efficient_code.html#memory
> > > [2] 
> > > https://www.intel.com/content/www/us/en/developer/articles/technical/performance-optimization-of-memcpy-in-dpdk.html
> > >
> > > Thanks,
> > > Michal
> > >  
> >
> >
> > I admit to having little sympathy unfixable for base/ style code.
> > You could have just replaced memcpy() in their with an abstraction layer
> > like other drivers.
> >  
> 
> We'll probably end up with the solution you're suggesting. For now
> let's remove the memcpy redefinition at all to suppress the warnings.
> 
> Acked-by: Michal Krawczyk 

Lets see if we can fix rte_memcpy() on x86 first.

It seems to me that rte_memcpy() should be an inline that only handles variable
size data, and use __builtin_memcpy() automatically for fixed size values.

RE: [PATCH v1] bbdev: add device status info

[Chautru, Nicolas]

Hi Stephen, 

> -Original Message-
> From: Stephen Hemminger 
> Sent: Tuesday, June 7, 2022 9:43 AM
> To: Maxime Coquelin 
> Cc: Chautru, Nicolas ; dev@dpdk.org;
> gak...@marvell.com; t...@redhat.com; hemant.agra...@nxp.com; Vargas,
> Hernan 
> Subject: Re: [PATCH v1] bbdev: add device status info
> 
> On Tue, 7 Jun 2022 18:20:38 +0200
> Maxime Coquelin  wrote:
> 
> > Hi Nicolas,
> >
> > On 6/7/22 17:44, Chautru, Nicolas wrote:
> > > Hi Maxime,
> > >
> > >> -Original Message-
> > >> From: Maxime Coquelin 
> > >> Sent: Tuesday, June 7, 2022 5:43 AM
> > >> To: Stephen Hemminger ; Chautru,
> > >> Nicolas 
> > >> Cc: dev@dpdk.org; gak...@marvell.com; t...@redhat.com;
> > >> hemant.agra...@nxp.com; Vargas, Hernan
> 
> > >> Subject: Re: [PATCH v1] bbdev: add device status info
> > >>
> > >> Hi Stephen,
> > >>
> > >> On 6/7/22 02:09, Stephen Hemminger wrote:
> > >>> On Mon,  6 Jun 2022 15:50:08 -0700 Nicolas Chautru
> > >>>  wrote:
> > >>>
> >  @@ -298,6 +313,8 @@ struct rte_bbdev_driver_info {
> > const struct rte_bbdev_op_cap *capabilities;
> > /** Device cpu_flag requirements */
> > const enum rte_cpu_flag_t *cpu_flag_reqs;
> >  +  /** Device Status */
> >  +  enum rte_bbdev_device_status device_status;
> > };
> > 
> > >>>
> > >>> This ends up being an ABI breakage, can't change a struct like
> > >>> that until 22.11 release.
> > >>>
> > >>
> > >> Indeed, but Nicolas mentioned in the cover-letter that the patch
> > >> targets v22.11; not this release.
> > >>
> > >> However, a deprecation notice should be sent for v22.07 if it
> > >> hasn't been done yet.
> > >
> > > I have sent this deprecation Maxime:
> > > https://patches.dpdk.org/project/dpdk/patch/1647542252-35727-2-git-s
> > > end-email-nicolas.chau...@intel.com/
> > > Do you believe this needs to be extended to cover more details the
> > > change and including this device status info explicitly? I can
> > > update the verbiage in more details if required
> >
> > Thanks for the pointer, I missed it.
> > Reading the deprecation notice, it is not clear to me it is about the
> > device status info enum.
> >
> > Maybe rewording it a bit to be more specific would help.
> 
> You might want to use one the existing empty padding slots (holes) in that
> structure. It appears to have been laid out haphazardly.
> 

I don't see such one single hole to fill that enum but I can shuffle a bit that 
structure. In that case total size would no longer change but a few offsets 
would differ and padding would be reduced.
Thanks

Nic