[dpdk-dev] [PATCH 1/2] dmadev: hide devices array

[David Marchand]

No need to expose rte_dma_devices out of the dmadev library.
Existing helpers should be enough, and inlines make use of
rte_dma_fp_objs.

Signed-off-by: David Marchand 
---
 app/test/test_dmadev.c  | 5 +++--
 lib/dmadev/rte_dmadev.c | 2 +-
 lib/dmadev/rte_dmadev_pmd.h | 2 --
 lib/dmadev/version.map  | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c
index 1e327bd45f..8b58256afc 100644
--- a/app/test/test_dmadev.c
+++ b/app/test/test_dmadev.c
@@ -747,10 +747,11 @@ test_dmadev_instance(int16_t dev_id)
};
const int vchan = 0;
 
+   rte_dma_info_get(dev_id, &info);
+
printf("\n### Test dmadev instance %u [%s]\n",
-   dev_id, rte_dma_devices[dev_id].data->dev_name);
+   dev_id, info.dev_name);
 
-   rte_dma_info_get(dev_id, &info);
if (info.max_vchans < 1)
ERR_RETURN("Error, no channels available on device id %u\n", 
dev_id);
 
diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
index 182d32aedb..d4b32b2971 100644
--- a/lib/dmadev/rte_dmadev.c
+++ b/lib/dmadev/rte_dmadev.c
@@ -18,7 +18,7 @@
 static int16_t dma_devices_max;
 
 struct rte_dma_fp_object *rte_dma_fp_objs;
-struct rte_dma_dev *rte_dma_devices;
+static struct rte_dma_dev *rte_dma_devices;
 static struct {
/* Hold the dev_max information of the primary process. This field is
 * set by the primary process and is read by the secondary process.
diff --git a/lib/dmadev/rte_dmadev_pmd.h b/lib/dmadev/rte_dmadev_pmd.h
index b97b5bf10b..5316ad5b5f 100644
--- a/lib/dmadev/rte_dmadev_pmd.h
+++ b/lib/dmadev/rte_dmadev_pmd.h
@@ -131,8 +131,6 @@ struct rte_dma_dev {
uint64_t reserved[2]; /**< Reserved for future fields. */
 } __rte_cache_aligned;
 
-extern struct rte_dma_dev *rte_dma_devices;
-
 /**
  * @internal
  * Allocate a new dmadev slot for an DMA device and return the pointer to that
diff --git a/lib/dmadev/version.map b/lib/dmadev/version.map
index ef561acd46..89f7a5b1d3 100644
--- a/lib/dmadev/version.map
+++ b/lib/dmadev/version.map
@@ -30,7 +30,6 @@ EXPERIMENTAL {
 INTERNAL {
global:
 
-   rte_dma_devices;
rte_dma_fp_objs;
rte_dma_pmd_allocate;
rte_dma_pmd_release;
-- 
2.23.0

[dpdk-dev] [PATCH 2/2] dmadev: remove symbol versioning for inline helpers

[David Marchand]

Inline helpers have no global symbols in shared libraries.
There is no reason to ask for versioning (plus this library would not
build on Windows).

Fixes: 91e581e5c924 ("dmadev: add data plane API")
Fixes: ea8cf0f8536d ("dmadev: add burst capacity API")

Signed-off-by: David Marchand 
---
 lib/dmadev/version.map | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/lib/dmadev/version.map b/lib/dmadev/version.map
index 89f7a5b1d3..7031d6b335 100644
--- a/lib/dmadev/version.map
+++ b/lib/dmadev/version.map
@@ -1,17 +1,11 @@
 EXPERIMENTAL {
global:
 
-   rte_dma_burst_capacity;
rte_dma_close;
-   rte_dma_completed;
-   rte_dma_completed_status;
rte_dma_configure;
-   rte_dma_copy;
-   rte_dma_copy_sg;
rte_dma_count_avail;
rte_dma_dev_max;
rte_dma_dump;
-   rte_dma_fill;
rte_dma_get_dev_id_by_name;
rte_dma_info_get;
rte_dma_is_valid;
@@ -20,7 +14,6 @@ EXPERIMENTAL {
rte_dma_stats_get;
rte_dma_stats_reset;
rte_dma_stop;
-   rte_dma_submit;
rte_dma_vchan_setup;
rte_dma_vchan_status;
 
-- 
2.23.0

Re: [dpdk-dev] [PATCH v5] lib/cmdline: release cl when cmdline exit

[Olivier Matz]

On Mon, Oct 18, 2021 at 05:29:35PM +0300, Dmitry Kozlyuk wrote:
> 2021-10-18 21:58 (UTC+0800), zhihongx.p...@intel.com:
> > From: Zhihong Peng 
> > 
> > Malloc cl in the cmdline_stdin_new function, so release in the
> > cmdline_stdin_exit function is logical, so that cl will not be
> > released alone.
> > 
> > Fixes: af75078fece3 ("first public release")
> > Cc: intel.com
> > 
> > Signed-off-by: Zhihong Peng 
> 
> Reviewed-by: Dmitry Kozlyuk 

Acked-by: Olivier Matz 

Re: [dpdk-dev] [PATCH] dmadev: enable build on Windows

[David Marchand]

On Wed, Oct 20, 2021 at 8:32 AM David Marchand
 wrote:
>
> On Tue, Oct 19, 2021 at 2:28 PM Bruce Richardson
>  wrote:
> >
> > The dmadev library was not added to the list of libraries built on
> > Windows, meaning it was skipped in those builds and also that none of
> > the drivers were being considered for build. Adding dmadev to the list
> > fixes this, and also enables the skeleton dmadev driver to be built -
> > all-be-it with a small fix necessary.
> >
> > Signed-off-by: Bruce Richardson 
> > ---
> >
> > This patch has been compile tested using mingw on Linux. Sending it
> > publicly so that I can get CI test reports to check native windows
> > builds.
> > ---
>
> There is a problem with exported symbols.
> Some inlines have been marked for versioning (see
> rte_dma_burst_capacity for example) and must be removed from
> version.map.
>
> Can you have a look?

I sent the patches.
Hope it saves us some time:
https://patchwork.dpdk.org/project/dpdk/patch/20211020065944.19617-2-david.march...@redhat.com/


-- 
David Marchand

Re: [dpdk-dev] [PATCH v3 6/6] mempool: deprecate unused defines

[Olivier Matz]

On Tue, Oct 19, 2021 at 08:40:22PM +0300, Andrew Rybchenko wrote:
> MEMPOOL_PG_NUM_DEFAULT and MEMPOOL_PG_SHIFT_MAX are not used.
> 
> Fixes: fd943c764a63 ("mempool: deprecate xmem functions")
> 
> Signed-off-by: Andrew Rybchenko 

Acked-by: Olivier Matz 

Re: [dpdk-dev] [PATCH v10 04/16] dma/idxd: create dmadev instances on bus probe

[fengchengwen]

On 2021/10/19 22:10, Kevin Laatz wrote:
> When a suitable device is found during the bus scan/probe, create a dmadev
> instance for each HW queue. Internal structures required for device
> creation are also added.
> 

[snip]

>  static void *
>  idxd_bus_mmap_wq(struct rte_dsa_device *dev)
>  {
> @@ -206,6 +218,7 @@ idxd_probe_dsa(struct rte_dsa_device *dev)
>   return -1;
>   idxd.max_batch_size = ret;
>   idxd.qid = dev->addr.wq_id;
> + idxd.u.bus.dsa_id = dev->addr.device_id;
>   idxd.sva_support = 1;
>  
>   idxd.portal = idxd_bus_mmap_wq(dev);
> @@ -214,6 +227,12 @@ idxd_probe_dsa(struct rte_dsa_device *dev)
>   return -ENOENT;
>   }
>  
> + ret = idxd_dmadev_create(dev->wq_name, &dev->device, &idxd, 
> &idxd_bus_ops);
> + if (ret) {
> + IDXD_PMD_ERR("Failed to create rawdev %s", dev->wq_name);

rawdev -> dmadev

> + return ret;
> + }
> +
>   return 0;
>  }
>  
> diff --git a/drivers/dma/idxd/idxd_common.c b/drivers/dma/idxd/idxd_common.c
> index e00ddbe5ef..5abff34292 100644
> --- a/drivers/dma/idxd/idxd_common.c
> +++ b/drivers/dma/idxd/idxd_common.c
> @@ -2,10 +2,71 @@
>   * Copyright 2021 Intel Corporation
>   */
>  
> +#include 
> +#include 
>  #include 
>  
>  #include "idxd_internal.h"
>  
> +#define IDXD_PMD_NAME_STR "dmadev_idxd"
> +
> +int
> +idxd_dmadev_create(const char *name, struct rte_device *dev,
> +const struct idxd_dmadev *base_idxd,
> +const struct rte_dma_dev_ops *ops)
> +{
> + struct idxd_dmadev *idxd = NULL;
> + struct rte_dma_dev *dmadev = NULL;
> + int ret = 0;
> +
> + if (!name) {
> + IDXD_PMD_ERR("Invalid name of the device!");
> + ret = -EINVAL;
> + goto cleanup;
> + }
> +
> + /* Allocate device structure */
> + dmadev = rte_dma_pmd_allocate(name, dev->numa_node, sizeof(struct 
> idxd_dmadev));
> + if (dmadev == NULL) {
> + IDXD_PMD_ERR("Unable to allocate raw device");

raw -> dma

Better check the 'raw' keyword in the patch set.

> + ret = -ENOMEM;
> + goto cleanup;
> + }
> + dmadev->dev_ops = ops;
> + dmadev->device = dev;
> +
> + idxd = dmadev->data->dev_private;
> + *idxd = *base_idxd; /* copy over the main fields already passed in */
> + idxd->dmadev = dmadev;
> +
> + /* allocate batch index ring and completion ring.
> +  * The +1 is because we can never fully use
> +  * the ring, otherwise read == write means both full and empty.
> +  */
> + idxd->batch_comp_ring = rte_zmalloc(NULL, 
> (sizeof(idxd->batch_idx_ring[0]) +
> + sizeof(idxd->batch_comp_ring[0]))   * 
> (idxd->max_batches + 1),
> + sizeof(idxd->batch_comp_ring[0]));

infer the batch_comp_ring will access by hardware, maybe better use 
rte_zmalloc_socket()
because rte_zmalloc will use rte_socket_id() and it may at diff socket when 
call.

> + if (idxd->batch_comp_ring == NULL) {
> + IDXD_PMD_ERR("Unable to reserve memory for batch data\n");
> + ret = -ENOMEM;
> 

[snip]

Re: [dpdk-dev] [PATCH] net/ixgbe: initialize max_rx_pkt_len if rlpml_set_vf fails

[Tudor Cornea]

Hi Ferruh,

I have tested with the dpdk-next-net branch.
It includes the commit 'ethdev: fix max Rx packet length'

Setup:
Hypervisor: VMware ESXi 6.0.0
PF ixgbe Driver: 3.7.13.7 (default PF driver installed with ESXi 6.0 and
6.5)
NIC: Intel 82599
Guest OS : Ubuntu 20.04

It seems that with the recent changes testpmd still can't initialize the
ports.

EAL: Detected CPU lcores: 8
EAL: Detected NUMA nodes: 1
EAL: Detected static linkage of DPDK
EAL: Multi-process socket /var/run/dpdk/rte/mp_socket
EAL: Selected IOVA mode 'PA'
EAL: No available 1048576 kB hugepages reported
EAL: VFIO support initialized
EAL: Probe PCI driver: net_ixgbe_vf (8086:10ed) device: :0b:00.0
(socket 0)
EAL: Probe PCI driver: net_ixgbe_vf (8086:10ed) device: :13:00.0
(socket 0)
TELEMETRY: No legacy callbacks, legacy socket not created
Interactive-mode selected
previous number of forwarding ports 2 - changed to number of configured
ports 1
Error picking flow transfer proxy for port 0: Function not implemented -
ignore
Error picking flow transfer proxy for port 1: Function not implemented -
ignore
testpmd: create a new mbuf pool : n=171456, size=2176, socket=0
testpmd: preferred mempool ops selected: ring_mp_mc

Warning! port-topology=paired and odd forward ports number, the last port
will pair with itself.

Configuring Port 0 (socket 0)
ixgbevf_dev_rx_init(): Set max packet length to 1518 failed.
ixgbevf_dev_start(): Unable to initialize RX hardware (-22)
Fail to start port 0: Invalid argument
Configuring Port 1 (socket 0)
ixgbevf_dev_rx_init(): Set max packet length to 1518 failed.
ixgbevf_dev_start(): Unable to initialize RX hardware (-22)
Fail to start port 1: Invalid argument
Please stop the ports first
Done
Error during enabling promiscuous mode for port 0: Operation not supported
- ignore
Error during enabling promiscuous mode for port 1: Operation not supported
- ignore
testpmd> start tx_first
Not all ports were started

I think failing to set set 'max_rx_pkt_len' after ixgbevf_rlpml_set_vf()
call failed in ixgbevf_dev_set_mtu(), might have been one half of the
problem.
The other one is in ixgbevf_dev_rx_init(). The init function seems to
return prematurely, and not initialize the ports.

With the below patch (on top of net-next branch), I seem to be able to
initialize the ports correctly, and send packets using testpmd.

diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index b263dfe1d5..fdd057c789 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -5676,7 +5676,6 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)
if (ixgbevf_rlpml_set_vf(hw, frame_size) != 0) {
PMD_INIT_LOG(ERR, "Set max packet length to %d failed.",
 frame_size);
-   return -EINVAL;
}

/*

Alvin, would it be acceptable to not return -EINVAL in this case while
still printing an error, so that we can still debug mtu issues on 82599 ?

If I recall correctly, the NIC has issues when the MTU of VFs is bigger
than the MTU of the PFs. On my setup, however the MTUs have default values
(1500).
Should I rebase the patch on top of net-next ?

Thanks,
Tudor

On Wed, 20 Oct 2021 at 06:08, Zhang, AlvinX  wrote:

> > -Original Message-
> > From: Yigit, Ferruh 
> > Sent: Tuesday, October 19, 2021 8:58 PM
> > To: Tudor Cornea ; Zhang, Qi Z
> > 
> > Cc: Zhang, AlvinX ; Wang, Haiyue
> > ; dev@dpdk.org
> > Subject: Re: [dpdk-dev] [PATCH] net/ixgbe: initialize max_rx_pkt_len if
> > rlpml_set_vf fails
> >
> > On 10/15/2021 3:20 PM, Tudor Cornea wrote:
> > > Some of our customers use ESXi 6.0 or 6.5 servers, which could have
> > > older versions of the PF ixgbe driver.
> > > It seems that with a more recent version of the PMD driver, we are not
> > > able to initialize 82599EB ports correctly.
> > > This scenario seems to have worked with DPDK 19.11.
> > >
> > > Would it be possible to print a warning, while still allowing the
> > > driver to initialize the ports ?
>
> There is a scenario that we initialize the port successful, with no any
> error, but we cannot get any packets.
> So keep printing error or warning and still allowing the driver to
> initialize the port may be the best solution.
>
> > >
> > > I was also thinking about the return code of ixgbevf_dev_set_mtu.
> > > Do you think it would be more appropriate to return ENOTSUP or ENOSYS
> > > instead of EINVAL ?
>
> If ixgbevf_dev_set_mtu fails, we have no way to know it because of invalid
> value or not supported?
> ixgbevf_dev_set_mtu returns one the these values: 0 or IXGBE_ERR_MBX
>
> > >
> > > As a user, calling 'rte_eth_dev_mtu_set', I would expect an error like
> > > EINVAL to suggest to me that the mtu value which I provided is
> > > incorrect [1]. The 82599 NIC, however has some particularities related
> > > to mtu, which could cause the operation to fail. I was thinking that
> > > EINVAL might not be most descriptive error.
> > >
> > > [1] https://doc.dpdk.org/a

Re: [dpdk-dev] [PATCH v2] kni: fix build for SLES15-SP3

[Jiang, YuX]

> -Original Message-
> From: dev  On Behalf Of Ferruh Yigit
> Sent: Tuesday, October 19, 2021 6:49 PM
> To: dev@dpdk.org
> Cc: Yigit, Ferruh ; Singh, Aman Deep
> ; sta...@dpdk.org; Christian Ehrhardt
> ; Marco Varlese 
> Subject: [dpdk-dev] [PATCH v2] kni: fix build for SLES15-SP3
> 
> From: Aman Singh 
> 
> As suse version numbering is inconsistent to determine Linux kernel API to
> be used. In this patch we check parameter of 'ndo_tx_timeout'
> API directly from the kernel source. This is done only for suse build.
> 
> Bugzilla ID: 812
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Aman Singh 
> Acked-by: Ferruh Yigit 
Tested-by: Longfeng Liang 

[dpdk-dev] [PATCH 0/2] set txq affinity in round-robin

[Rongwei Liu]

Create multiple TISs (number of PF) and bind TXQ to different TISs.
The TXQ affinity is predictable and unchanged.
Traffic is load-balanced per PMD process.

Rongwei Liu (2):
  common/mlx5: support lag context query
  net/mlx5: set txq affinity in round-robin

 doc/guides/nics/mlx5.rst |  4 ++
 drivers/common/mlx5/mlx5_devx_cmds.c | 40 ++
 drivers/common/mlx5/mlx5_devx_cmds.h | 13 +
 drivers/common/mlx5/mlx5_prm.h   | 45 +++-
 drivers/common/mlx5/version.map  |  1 +
 drivers/net/mlx5/linux/mlx5_os.c |  2 +-
 drivers/net/mlx5/mlx5.c  | 81 +---
 drivers/net/mlx5/mlx5.h  | 10 +++-
 drivers/net/mlx5/mlx5_devx.c | 37 -
 drivers/net/mlx5/mlx5_txpp.c |  4 +-
 10 files changed, 222 insertions(+), 15 deletions(-)

-- 
2.27.0

[dpdk-dev] [PATCH 2/2] net/mlx5: set txq affinity in round-robin

[Rongwei Liu]

Previously, we set txq affinity to 0 and let firmware
to perform round-robin when bonding. Firmware uses a
global counter to assign txq affinity to different
physical ports accord to remainder after division.

There are three dis-advantages:
1. The global counter is shared between kernel and dpdk.
2. After restarting pmd or port, the previous counter value
is reused, so the new affinity is unpredictable.
3. There is no way to get what affinity is set by firmware.

In this update, we will create several TISs up to the
number of bonding ports and bind each TIS to one PF port.

For each port, it will start to pick up TIS using its port
index. Upper layer application can quickly calculate each txq's
affinity without querying.

At DPDK layer, when creating txq with 2 bonding ports, the
affinity is set like:
port 0: 1-->2-->1-->2
port 1: 2-->1-->2-->1
port 2: 1-->2-->1-->2

Note: Only applicable to DevX api.
This affinity subjects to HW hash.

Signed-off-by: Rongwei Liu 
Acked-by: Matan Azrad 
---
 doc/guides/nics/mlx5.rst |  4 ++
 drivers/net/mlx5/linux/mlx5_os.c |  2 +-
 drivers/net/mlx5/mlx5.c  | 81 
 drivers/net/mlx5/mlx5.h  | 10 +++-
 drivers/net/mlx5/mlx5_devx.c | 37 ++-
 drivers/net/mlx5/mlx5_txpp.c |  4 +-
 6 files changed, 124 insertions(+), 14 deletions(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index bae73f42d8..d817caedac 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -464,6 +464,10 @@ Limitations
   - In order to achieve best insertion rate, application should manage the 
flows per lcore.
   - Better to disable memory reclaim by setting ``reclaim_mem_mode`` to 0 to 
accelerate the flow object allocation and release with cache.
 
+- HW hashed bonding
+
+  - TXQ affinity subjects to HW hash once enabled.
+
 Statistics
 --
 
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index a823d26beb..1d7fa7dc6c 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -928,7 +928,6 @@ mlx5_representor_match(struct mlx5_dev_spawn_data *spawn,
return false;
 }
 
-
 /**
  * Spawn an Ethernet device from Verbs information.
  *
@@ -1707,6 +1706,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
 */
MLX5_ASSERT(spawn->ifindex);
priv->if_index = spawn->ifindex;
+   priv->lag_affinity_idx = sh->refcnt - 1;
eth_dev->data->dev_private = priv;
priv->dev_data = eth_dev->data;
eth_dev->data->mac_addrs = priv->mac;
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index e28cc461b9..e049a367f0 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1118,6 +1118,68 @@ mlx5_alloc_rxtx_uars(struct mlx5_dev_ctx_shared *sh,
return err;
 }
 
+/**
+ * Set up multiple TISs with different affinities according to
+ * number of bonding ports
+ *
+ * @param priv
+ * Pointer of shared context.
+ *
+ * @return
+ * Zero on success, -1 otherwise.
+ */
+static int
+mlx5_setup_tis(struct mlx5_dev_ctx_shared *sh)
+{
+   int i;
+   struct mlx5_devx_lag_context lag_ctx = { 0 };
+   struct mlx5_devx_tis_attr tis_attr = { 0 };
+
+   tis_attr.transport_domain = sh->td->id;
+   if (sh->bond.n_port) {
+   if (!mlx5_devx_cmd_query_lag(sh->ctx, &lag_ctx)) {
+   sh->lag.tx_remap_affinity[0] =
+   lag_ctx.tx_remap_affinity_1;
+   sh->lag.tx_remap_affinity[1] =
+   lag_ctx.tx_remap_affinity_2;
+   sh->lag.affinity_mode = lag_ctx.port_select_mode;
+   } else {
+   DRV_LOG(ERR, "Failed to query lag affinity.");
+   return -1;
+   }
+   if (sh->lag.affinity_mode == MLX5_LAG_MODE_TIS) {
+   for (i = 0; i < sh->bond.n_port; i++) {
+   tis_attr.lag_tx_port_affinity =
+   MLX5_IFC_LAG_MAP_TIS_AFFINITY(i,
+   sh->bond.n_port);
+   sh->tis[i] = mlx5_devx_cmd_create_tis(sh->ctx,
+   &tis_attr);
+   if (!sh->tis[i]) {
+   DRV_LOG(ERR, "Failed to TIS %d/%d for 
bonding device"
+   " %s.", i, sh->bond.n_port,
+   sh->ibdev_name);
+   return -1;
+   }
+   }
+   DRV_LOG(DEBUG, "LAG number of ports : %d, affinity_1 & 
2 : pf%d & %d.\n",
+   sh->bond.n_port, lag_ctx.tx_remap_affinity_1,
+   lag_ctx.tx_remap_affinity_2);
+   return 0;
+

Re: [dpdk-dev] [PATCH v1 3/3] test/devargs: add devargs test cases

[Xueming(Steven) Li]

On Tue, 2021-10-19 at 17:07 +0200, Gaëtan Rivet wrote:
> On Tue, Oct 5, 2021, at 17:54, Xueming Li wrote:
> > Initial version to test Global devargs syntax.
> > 
> > Signed-off-by: Xueming Li 
> 
> Hi,
> 
> The test is a very nice addition, absolutely required.
> I have however two remarks on the coverage and the implementation, below.
> 
> > ---
> >  app/test/autotest_data.py |   6 ++
> >  app/test/meson.build  |   2 +
> >  app/test/test_devargs.c   | 147 ++
> >  3 files changed, 155 insertions(+)
> >  create mode 100644 app/test/test_devargs.c
> > 
> > diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py
> > index 302d6374c16..3b841e71918 100644
> > --- a/app/test/autotest_data.py
> > +++ b/app/test/autotest_data.py
> > @@ -785,6 +785,12 @@
> >  "Func":default_autotest,
> >  "Report":  None,
> >  },
> > +{
> > +"Name":"Devargs autotest",
> > +"Command": "devargs_autotest",
> > +"Func":default_autotest,
> > +"Report":  None,
> > +},
> >  #
> >  # Please always make sure that ring_perf is the last test!
> >  #
> > diff --git a/app/test/meson.build b/app/test/meson.build
> > index f144d8b8ed6..de8540f6119 100644
> > --- a/app/test/meson.build
> > +++ b/app/test/meson.build
> > @@ -42,6 +42,7 @@ test_sources = files(
> >  'test_cryptodev_security_pdcp.c',
> >  'test_cycles.c',
> >  'test_debug.c',
> > +'test_devargs.c',
> >  'test_distributor.c',
> >  'test_distributor_perf.c',
> >  'test_eal_flags.c',
> > @@ -201,6 +202,7 @@ fast_tests = [
> >  ['common_autotest', true],
> >  ['cpuflags_autotest', true],
> >  ['debug_autotest', true],
> > +['devargs_autotest', true],
> >  ['eal_flags_c_opt_autotest', false],
> >  ['eal_flags_main_opt_autotest', false],
> >  ['eal_flags_n_opt_autotest', false],
> > diff --git a/app/test/test_devargs.c b/app/test/test_devargs.c
> > new file mode 100644
> > index 000..8a173368347
> > --- /dev/null
> > +++ b/app/test/test_devargs.c
> > @@ -0,0 +1,147 @@
> > +/* SPDX-License-Identifier: BSD-3-Clause
> > + * Copyright (c) 2021 NVIDIA Corporation & Affiliates
> > + */
> > +
> > +#include 
> > +#include 
> > +#include 
> > +
> > +#include 
> > +#include 
> > +#include 
> > +
> > +#include "test.h"
> > +
> > +/* Check layer arguments. */
> > +static int
> > +test_args(const char *devargs, const char *layer, const char *args, 
> > const int n)
> > +{
> > +   struct rte_kvargs *kvlist;
> > +
> > +   if (n == 0) {
> > +   if (args != NULL && strlen(args) > 0) {
> > +   printf("rte_devargs_parse(%s) %s args parsed (not 
> > expected)\n",
> > +  devargs, layer);
> > +   return -1;
> > +   } else {
> > +   return 0;
> > +   }
> > +   }
> > +   if (args == NULL) {
> > +   printf("rte_devargs_parse(%s) %s args not parsed\n",
> > +  devargs, layer);
> > +   return -1;
> > +   }
> > +   kvlist = rte_kvargs_parse(args, NULL);
> > +   if (kvlist == NULL) {
> > +   printf("rte_devargs_parse(%s) %s_str: %s not parsed\n",
> > +  devargs, layer, args);
> > +   return -1;
> > +   }
> > +   if ((int)kvlist->count != n) {
> > +   printf("rte_devargs_parse(%s) %s_str: %s kv number %u, not 
> > %d\n",
> > +  devargs, layer, args, kvlist->count, n);
> > +   return -1;
> > +   }
> > +   return 0;
> > +}
> > +
> > +/* Test several valid cases */
> > +static int
> > +test_valid_devargs(void)
> > +{
> > +   static const struct {
> > +   const char *devargs;
> > +   int bus_kv;
> > +   int class_kv;
> > +   int driver_kv;
> > +   } list[] = {
> > +   /* Global devargs syntax: */
> > +   { "bus=pci", 1, 0, 0 },
> > +   { "class=eth", 0, 1, 0 },
> > +   { "bus=pci,addr=1:2.3/class=eth/driver=abc,k0=v0", 2, 1, 2 },
> > +   { "bus=vdev,name=/dev/file/name/class=eth", 2, 1, 0 },
> > +   /* Legacy devargs syntax: */
> > +   { "1:2.3", 0, 0, 0 },
> > +   { "pci:1:2.3,k0=v0", 0, 0, 1 },
> > +   { "net_virtio_user0,iface=test,path=/dev/vhost-net,queues=1",
> > + 0, 0, 3 },
> 
> I would add here cases to verify that edge-case are properly parsed such as:
> 
> +   { "bus=vdev,name=/class/bus/path/class=eth", 2, 1, 0 },
> [...]
> +   { "net_virtio_user0,iface=test,path=/class/bus/,queues=1",
> + 0, 0, 3 },
> 
> To check the /class or /bus parts cannot throw off the parser (it does not 
> currently).
> 
> Additionally, paths with multiple slashes are correct. Maybe add:
> 
> +   { "bus=vdev,name=///dblslsh/class=eth", 2, 1, 0 },
> 
> as well.
> 
> I tested all those cases without issue, it seems the parser is ok.
> 

[dpdk-dev] [PATCH 1/2] common/mlx5: support lag context query

[Rongwei Liu]

Added a new api mlx5_devx_cmd_query_lag() to query lag
property from firmware including state/affinity/mode etc.

Signed-off-by: Jiawei Wang 
Signed-off-by: Rongwei Liu 
Acked-by: Matan Azrad 
---
 drivers/common/mlx5/mlx5_devx_cmds.c | 40 +
 drivers/common/mlx5/mlx5_devx_cmds.h | 13 
 drivers/common/mlx5/mlx5_prm.h   | 45 +++-
 drivers/common/mlx5/version.map  |  1 +
 4 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c 
b/drivers/common/mlx5/mlx5_devx_cmds.c
index 6538bce57b..fb7c8e986f 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -2800,3 +2800,43 @@ mlx5_devx_cmd_create_crypto_login_obj(void *ctx,
crypto_login_obj->id = MLX5_GET(general_obj_out_cmd_hdr, out, obj_id);
return crypto_login_obj;
 }
+
+/**
+ * Query LAG context.
+ *
+ * @param[in] ctx
+ *   Pointer to ibv_context, returned from mlx5dv_open_device.
+ * @param[out] lag_ctx
+ *   Pointer to struct mlx5_devx_lag_context, to be set by the routine.
+ *
+ * @return
+ *   0 on success, a negative value otherwise.
+ */
+int
+mlx5_devx_cmd_query_lag(void *ctx,
+   struct mlx5_devx_lag_context *lag_ctx)
+{
+   uint32_t in[MLX5_ST_SZ_DW(query_lag_in)] = {0};
+   uint32_t out[MLX5_ST_SZ_DW(query_lag_out)] = {0};
+   void *lctx;
+   int rc;
+
+   MLX5_SET(query_lag_in, in, opcode, MLX5_CMD_OP_QUERY_LAG);
+   rc = mlx5_glue->devx_general_cmd(ctx, in, sizeof(in), out, sizeof(out));
+   if (rc)
+   goto error;
+   lctx = MLX5_ADDR_OF(query_lag_out, out, context);
+   lag_ctx->fdb_selection_mode = MLX5_GET(lag_context, lctx,
+  fdb_selection_mode);
+   lag_ctx->port_select_mode = MLX5_GET(lag_context, lctx,
+  port_select_mode);
+   lag_ctx->lag_state = MLX5_GET(lag_context, lctx, lag_state);
+   lag_ctx->tx_remap_affinity_2 = MLX5_GET(lag_context, lctx,
+   tx_remap_affinity_2);
+   lag_ctx->tx_remap_affinity_1 = MLX5_GET(lag_context, lctx,
+   tx_remap_affinity_1);
+   return 0;
+error:
+   rc = (rc > 0) ? -rc : rc;
+   return rc;
+}
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h 
b/drivers/common/mlx5/mlx5_devx_cmds.h
index 6948cadd37..5e4f3b749e 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -197,6 +197,15 @@ struct mlx5_hca_attr {
uint32_t umr_indirect_mkey_disabled:1;
 };
 
+/* LAG Context. */
+struct mlx5_devx_lag_context {
+   uint32_t fdb_selection_mode:1;
+   uint32_t port_select_mode:3;
+   uint32_t lag_state:3;
+   uint32_t tx_remap_affinity_1:4;
+   uint32_t tx_remap_affinity_2:4;
+};
+
 struct mlx5_devx_wq_attr {
uint32_t wq_type:4;
uint32_t wq_signature:1;
@@ -681,4 +690,8 @@ struct mlx5_devx_obj *
 mlx5_devx_cmd_create_crypto_login_obj(void *ctx,
  struct mlx5_devx_crypto_login_attr *attr);
 
+__rte_internal
+int
+mlx5_devx_cmd_query_lag(void *ctx,
+   struct mlx5_devx_lag_context *lag_ctx);
 #endif /* RTE_PMD_MLX5_DEVX_CMDS_H_ */
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 54e62aa153..eab80eaead 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -1048,6 +1048,7 @@ enum {
MLX5_CMD_OP_DEALLOC_PD = 0x801,
MLX5_CMD_OP_ACCESS_REGISTER = 0x805,
MLX5_CMD_OP_ALLOC_TRANSPORT_DOMAIN = 0x816,
+   MLX5_CMD_OP_QUERY_LAG = 0x842,
MLX5_CMD_OP_CREATE_TIR = 0x900,
MLX5_CMD_OP_MODIFY_TIR = 0x901,
MLX5_CMD_OP_CREATE_SQ = 0X904,
@@ -1507,7 +1508,8 @@ struct mlx5_ifc_cmd_hca_cap_bits {
u8 uar_4k[0x1];
u8 reserved_at_241[0x9];
u8 uar_sz[0x6];
-   u8 reserved_at_250[0x8];
+   u8 port_selection_cap[0x1];
+   u8 reserved_at_251[0x7];
u8 log_pg_sz[0x8];
u8 bf[0x1];
u8 driver_version[0x1];
@@ -1974,6 +1976,14 @@ struct mlx5_ifc_query_nic_vport_context_in_bits {
u8 reserved_at_68[0x18];
 };
 
+/*
+ * lag_tx_port_affinity: 0 auto-selection, 1 PF1, 2 PF2 vice versa.
+ * Each TIS binds to one PF by setting lag_tx_port_affinity (>0).
+ * Once LAG enabled, we create multiple TISs and bind each one to
+ * different PFs, then TIS[i] gets affinity i+1 and goes to PF i+1.
+ */
+#define MLX5_IFC_LAG_MAP_TIS_AFFINITY(index, num) ((num) ? \
+   (index) % (num) + 1 : 0)
 struct mlx5_ifc_tisc_bits {
u8 strict_lag_tx_port_affinity[0x1];
u8 reserved_at_1[0x3];
@@ -2007,6 +2017,39 @@ struct mlx5_ifc_query_tis_in_bits {
u8 reserved_at_60[0x20];
 };
 
+/* port_select_mode definition. */
+enum mlx5_lag_mode_type {
+   MLX5_LAG_MODE_TIS 

Re: [dpdk-dev] [PATCH] net/ixgbe: initialize max_rx_pkt_len if rlpml_set_vf fails

[Wang, Haiyue]

since this is not a plain text mail, have to reply on top. ;-)

By checking the kernel implementation, this fix makes sense, and finally it 
works.

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c#n2015

Just give an error message:

if (ret)
   dev_err(&adapter->pdev->dev,
   "Failed to set MTU at %d\n", netdev->mtu);

BR,
Haiyue

From: Tudor Cornea 
Sent: Wednesday, October 20, 2021 15:13
To: Zhang, AlvinX 
Cc: Yigit, Ferruh ; Zhang, Qi Z ; 
Wang, Haiyue ; dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH] net/ixgbe: initialize max_rx_pkt_len if 
rlpml_set_vf fails

Hi Ferruh,

I have tested with the dpdk-next-net branch.
It includes the commit 'ethdev: fix max Rx packet length'

Setup:
Hypervisor: VMware ESXi 6.0.0
PF ixgbe Driver: 3.7.13.7 (default PF driver installed with ESXi 6.0 and 6.5)
NIC: Intel 82599
Guest OS : Ubuntu 20.04

It seems that with the recent changes testpmd still can't initialize the ports.

EAL: Detected CPU lcores: 8
EAL: Detected NUMA nodes: 1
EAL: Detected static linkage of DPDK
EAL: Multi-process socket /var/run/dpdk/rte/mp_socket
EAL: Selected IOVA mode 'PA'
EAL: No available 1048576 kB hugepages reported
EAL: VFIO support initialized
EAL: Probe PCI driver: net_ixgbe_vf (8086:10ed) device: :0b:00.0 (socket 0)
EAL: Probe PCI driver: net_ixgbe_vf (8086:10ed) device: :13:00.0 (socket 0)
TELEMETRY: No legacy callbacks, legacy socket not created
Interactive-mode selected
previous number of forwarding ports 2 - changed to number of configured ports 1
Error picking flow transfer proxy for port 0: Function not implemented - ignore
Error picking flow transfer proxy for port 1: Function not implemented - ignore
testpmd: create a new mbuf pool : n=171456, size=2176, socket=0
testpmd: preferred mempool ops selected: ring_mp_mc

Warning! port-topology=paired and odd forward ports number, the last port will 
pair with itself.

Configuring Port 0 (socket 0)
ixgbevf_dev_rx_init(): Set max packet length to 1518 failed.
ixgbevf_dev_start(): Unable to initialize RX hardware (-22)
Fail to start port 0: Invalid argument
Configuring Port 1 (socket 0)
ixgbevf_dev_rx_init(): Set max packet length to 1518 failed.
ixgbevf_dev_start(): Unable to initialize RX hardware (-22)
Fail to start port 1: Invalid argument
Please stop the ports first
Done
Error during enabling promiscuous mode for port 0: Operation not supported - 
ignore
Error during enabling promiscuous mode for port 1: Operation not supported - 
ignore
testpmd> start tx_first
Not all ports were started

I think failing to set set 'max_rx_pkt_len' after ixgbevf_rlpml_set_vf() call 
failed in ixgbevf_dev_set_mtu(), might have been one half of the problem.
The other one is in ixgbevf_dev_rx_init(). The init function seems to return 
prematurely, and not initialize the ports.

With the below patch (on top of net-next branch), I seem to be able to 
initialize the ports correctly, and send packets using testpmd.

diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index b263dfe1d5..fdd057c789 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -5676,7 +5676,6 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)
if (ixgbevf_rlpml_set_vf(hw, frame_size) != 0) {
PMD_INIT_LOG(ERR, "Set max packet length to %d failed.",
 frame_size);
-   return -EINVAL;
}

/*

Alvin, would it be acceptable to not return -EINVAL in this case while still 
printing an error, so that we can still debug mtu issues on 82599 ?

If I recall correctly, the NIC has issues when the MTU of VFs is bigger than 
the MTU of the PFs. On my setup, however the MTUs have default values (1500).
Should I rebase the patch on top of net-next ?

Thanks,
Tudor

On Wed, 20 Oct 2021 at 06:08, Zhang, AlvinX 
mailto:alvinx.zh...@intel.com>> wrote:
> -Original Message-
> From: Yigit, Ferruh mailto:ferruh.yi...@intel.com>>
> Sent: Tuesday, October 19, 2021 8:58 PM
> To: Tudor Cornea mailto:tudor.cor...@gmail.com>>; 
> Zhang, Qi Z
> mailto:qi.z.zh...@intel.com>>
> Cc: Zhang, AlvinX mailto:alvinx.zh...@intel.com>>; 
> Wang, Haiyue
> mailto:haiyue.w...@intel.com>>; 
> dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH] net/ixgbe: initialize max_rx_pkt_len if
> rlpml_set_vf fails
>
> On 10/15/2021 3:20 PM, Tudor Cornea wrote:
> > Some of our customers use ESXi 6.0 or 6.5 servers, which could have
> > older versions of the PF ixgbe driver.
> > It seems that with a more recent version of the PMD driver, we are not
> > able to initialize 82599EB ports correctly.
> > This scenario seems to have worked with DPDK 19.11.
> >
> > Would it be possible to print a warning, while still allowing the
> > driver to initialize the ports ?

There is a scenario that we initialize the port successful, with no any error, 
but we cannot get any packets.
So keep 

Re: [dpdk-dev] [PATCH v10 05/16] dma/idxd: create dmadev instances on pci probe

[fengchengwen]

On 2021/10/19 22:10, Kevin Laatz wrote:
> When a suitable device is found during the PCI probe, create a dmadev
> instance for each HW queue. HW definitions required are also included.
> 
> Signed-off-by: Bruce Richardson 
> Signed-off-by: Kevin Laatz 
> Reviewed-by: Conor Walsh 
> ---

[snip]

>  
> +static inline int
> +idxd_pci_dev_command(struct idxd_dmadev *idxd, enum rte_idxd_cmds command)
> +{
> + uint8_t err_code;
> + uint16_t qid = idxd->qid;
> + int i = 0;
> +
> + if (command >= idxd_disable_wq && command <= idxd_reset_wq)
> + qid = (1 << qid);
> + rte_spinlock_lock(&idxd->u.pci->lk);
> + idxd->u.pci->regs->cmd = (command << IDXD_CMD_SHIFT) | qid;
> +
> + do {
> + rte_pause();
> + err_code = idxd->u.pci->regs->cmdstatus;
> + if (++i >= 1000) {
> + IDXD_PMD_ERR("Timeout waiting for command response from 
> HW");
> + rte_spinlock_unlock(&idxd->u.pci->lk);
> + return err_code;
> + }
> + } while (idxd->u.pci->regs->cmdstatus & CMDSTATUS_ACTIVE_MASK);

why not while (err_code & CMDSTATUS_ACTIVE_MASK) ?

the cmdstatus reg may change in load to err_code and while judge,
so suggest always use err_code.

> + rte_spinlock_unlock(&idxd->u.pci->lk);
> +
> + return err_code & CMDSTATUS_ERR_MASK;
> +}
> +
> +static uint32_t *
> +idxd_get_wq_cfg(struct idxd_pci_common *pci, uint8_t wq_idx)
> +{
> + return RTE_PTR_ADD(pci->wq_regs_base,
> + (uintptr_t)wq_idx << (5 + pci->wq_cfg_sz));
> +}
> +
> +static int
> +idxd_is_wq_enabled(struct idxd_dmadev *idxd)
> +{
> + uint32_t state = idxd_get_wq_cfg(idxd->u.pci, idxd->qid)[wq_state_idx];
> + return ((state >> WQ_STATE_SHIFT) & WQ_STATE_MASK) == 0x1;
> +}
> +
> +static int
> +idxd_pci_dev_close(struct rte_dma_dev *dev)
> +{
> + struct idxd_dmadev *idxd = dev->fp_obj->dev_private;
> + uint8_t err_code;
> +
> + /* disable the device */
> + err_code = idxd_pci_dev_command(idxd, idxd_disable_dev);
> + if (err_code) {
> + IDXD_PMD_ERR("Error disabling device: code %#x", err_code);
> + return err_code;
> + }
> + IDXD_PMD_DEBUG("IDXD Device disabled OK");
> +
> + /* free device memory */
> + IDXD_PMD_DEBUG("Freeing device driver memory");
> + rte_free(idxd->batch_idx_ring);
> +
> + return 0;
> +}
> +
> +static const struct rte_dma_dev_ops idxd_pci_ops = {
> + .dev_close = idxd_pci_dev_close,
> +};
> +
> +/* each portal uses 4 x 4k pages */
> +#define IDXD_PORTAL_SIZE (4096 * 4)
> +
> +static int
> +init_pci_device(struct rte_pci_device *dev, struct idxd_dmadev *idxd,
> + unsigned int max_queues)
> +{
> + struct idxd_pci_common *pci;
> + uint8_t nb_groups, nb_engines, nb_wqs;
> + uint16_t grp_offset, wq_offset; /* how far into bar0 the regs are */
> + uint16_t wq_size, total_wq_size;
> + uint8_t lg2_max_batch, lg2_max_copy_size;
> + unsigned int i, err_code;
> +
> + pci = malloc(sizeof(*pci));
> + if (pci == NULL) {
> + IDXD_PMD_ERR("%s: Can't allocate memory", __func__);
> + goto err;
> + }
> + rte_spinlock_init(&pci->lk);
> +
> + /* assign the bar registers, and then configure device */
> + pci->regs = dev->mem_resource[0].addr;
> + grp_offset = (uint16_t)pci->regs->offsets[0];
> + pci->grp_regs = RTE_PTR_ADD(pci->regs, grp_offset * 0x100);
> + wq_offset = (uint16_t)(pci->regs->offsets[0] >> 16);
> + pci->wq_regs_base = RTE_PTR_ADD(pci->regs, wq_offset * 0x100);
> + pci->portals = dev->mem_resource[2].addr;
> + pci->wq_cfg_sz = (pci->regs->wqcap >> 24) & 0x0F;
> +
> + /* sanity check device status */
> + if (pci->regs->gensts & GENSTS_DEV_STATE_MASK) {
> + /* need function-level-reset (FLR) or is enabled */
> + IDXD_PMD_ERR("Device status is not disabled, cannot init");
> + goto err;
> + }
> + if (pci->regs->cmdstatus & CMDSTATUS_ACTIVE_MASK) {
> + /* command in progress */
> + IDXD_PMD_ERR("Device has a command in progress, cannot init");
> + goto err;
> + }
> +
> + /* read basic info about the hardware for use when configuring */
> + nb_groups = (uint8_t)pci->regs->grpcap;
> + nb_engines = (uint8_t)pci->regs->engcap;
> + nb_wqs = (uint8_t)(pci->regs->wqcap >> 16);
> + total_wq_size = (uint16_t)pci->regs->wqcap;
> + lg2_max_copy_size = (uint8_t)(pci->regs->gencap >> 16) & 0x1F;
> + lg2_max_batch = (uint8_t)(pci->regs->gencap >> 21) & 0x0F;
> +
> + IDXD_PMD_DEBUG("nb_groups = %u, nb_engines = %u, nb_wqs = %u",
> + nb_groups, nb_engines, nb_wqs);
> +
> + /* zero out any old config */
> + for (i = 0; i < nb_groups; i++) {
> + pci->grp_regs[i].grpengcfg = 0;
> + pci->grp_regs[i].grpwqcfg[0] = 0;
> + }
> + for (i = 0; i < nb_wqs; i+

Re: [dpdk-dev] [PATCH v2 3/3] test/devargs: add devargs test cases

[David Marchand]

On Wed, Oct 20, 2021 at 9:32 AM Xueming Li  wrote:
>
> Initial version to test Global devargs syntax.
>
> Signed-off-by: Xueming Li 
> ---
>  app/test/autotest_data.py | 803 ++

This file is getting reintroduced by your patch.
We dropped it recently:
https://git.dpdk.org/dpdk/commit/?id=8c745bb62340e7b6a3ad61e5d79dfceebd4c28e4


>  app/test/meson.build  |   2 +
>  app/test/test_devargs.c   | 184 +
>  3 files changed, 989 insertions(+)
>  create mode 100644 app/test/autotest_data.py
>  create mode 100644 app/test/test_devargs.c
>


-- 
David Marchand

Re: [dpdk-dev] [PATCH v2] ethdev: fix one MAC address occupies two index in mac addrs

[Ferruh Yigit]

On 10/20/2021 7:49 AM, lihuisong (C) wrote:

Hi Ferruh

在 2021/10/20 1:45, Ferruh Yigit 写道:

On 10/11/2021 10:28 AM, Min Hu (Connor) wrote:

From: Huisong Li 

The dev->data->mac_addrs[0] will be changed to a new MAC address when
applications modify the default MAC address by
rte_eth_dev_default_mac_addr_set() API. However, If the new default
MAC address has been added as a non-default MAC address by
rte_eth_dev_mac_addr_add() API, the rte_eth_dev_default_mac_addr_set()
API doesn't remove it from dev->data->mac_addrs[]. As a result, one MAC
address occupies two index capacities in dev->data->mac_addrs[].



Hi Connor,

I see the problem, but can you please clarify what is the impact to the end 
user?

If application does as following:
  rte_eth_dev_mac_addr_add(MAC1);
  rte_eth_dev_mac_addr_add(MAC2);
  rte_eth_dev_mac_addr_add(MAC3);
  rte_eth_dev_default_mac_addr_set(MAC2);

The 'dev->data->mac_addrs[]' will have: "MAC2,MAC2,MAC3" which has 'MAC2' 
duplicated.

Will this cause any problem for the application to receive the packets
with 'MAC2' address?
Or is the only problem one extra space used in 'dev->data->mac_addrs[]'
without any other impact to the application?

I think it's just a waste of space.


True, it is a waste. But if there is no other visible user impact, we can
handle the issue with lower priority and clarifying the impact in commit log
helps to others.




This patch adds the logic of removing MAC addresses for this scenario.

Fixes: 854d8ad4ef68 ("ethdev: add default mac address modifier")
Cc: sta...@dpdk.org

Signed-off-by: Huisong Li 
Signed-off-by: Min Hu (Connor) 
---
v2:
* fixed commit log.
---
  lib/ethdev/rte_ethdev.c | 15 +++
  1 file changed, 15 insertions(+)

diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 028907bc4b..7faff17d9a 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -4340,6 +4340,7 @@ int
  rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr 
*addr)
  {
  struct rte_eth_dev *dev;
+    int index;
  int ret;
    RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
@@ -4361,6 +4362,20 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, 
struct rte_ether_addr *addr)
  if (ret < 0)
  return ret;
  +    /*
+ * If the address has been added as a non-default MAC address by
+ * rte_eth_dev_mac_addr_add API, it should be removed from
+ * dev->data->mac_addrs[].
+ */
+    index = eth_dev_get_mac_addr_index(port_id, addr);
+    if (index > 0) {
+    /* remove address in NIC data structure */
+    rte_ether_addr_copy(&null_mac_addr,
+    &dev->data->mac_addrs[index]);
+    /* reset pool bitmap */
+    dev->data->mac_pool_sel[index] = 0;
+    }
+


Here only 'dev->data->mac_addrs[]' array is updated and it assumes
driver removes similar duplication itself, but I am not sure if this is
valid for all drivers.

If driver is not removing the duplicate in the HW configuration, the driver
config and 'dev->data->mac_addrs[]' will diverge, which is not good.

The same MAC address does not occupy two HW entries, which is also a
waste for HW. After all, HW entry resources are also limited.
The PMD should also take this into account.
So, I think, we don't have to think about it here.


I am not sure all PMD take this into account, I briefly checked the ixgbe
code and I am not sure if it handles this.

Also it is possible to think that this responsibility is pushed to the
application, like application should remove a MAC address before setting
it as default MAC...



What about following logic to be sure HW configuration and
'dev->data->mac_addrs[]' is same:

  index = eth_dev_get_mac_addr_index(port_id, addr);
  if (index > 0)
rte_eth_dev_mac_addr_remove(port_id, addr);
  (*dev->dev_ops->mac_addr_set)(dev, addr);

The logic above seems to be good. But if .mac_addr_set() failed to
execute, the addr has been removed from HW and 'dev->data->mac_addrs[]'.
It's not good.



Agree. So may need to get a copy of 'addr' and add it back on failure.

The concern I have to call 'rte_eth_dev_mac_addr_remove()' after
'dev_ops->mac_addr_set()' is, it may result different behavior on
different PMDs.
For the PMDs that clean the redundant MAC address via 'dev_ops->mac_addr_set()'
may try to remove (although it will fail) the new set default MAC address.
That is why first remove the MAC and later add it back as default
seems safer to me.


Hope for your reply.  Thanks.

  /* Update default address in NIC data structure */
  rte_ether_addr_copy(addr, &dev->data->mac_addrs[0]);



.

[dpdk-dev] [PATCH v2 0/9] ethdev: cosmetic fixes

[Andrew Rybchenko]

Sicne rte_eth_dev and rte_eth_dev_data structures are just moved
right now is a good chance to make a cleanup. Moreover ethdev is
or will be shuffled a lot in the release, so do cleanup in all
files.

Maybe at least some fixes from below could be accepted.

Spelling is fixed in log messages as well. Hopefully it isn ot a
problem, but let me know if I'm wrong and I'll avoid it in the
next version.

Since changes are cosmetic no Fixes tags and no backporting to
stable.

Andrew Rybchenko (9):
  ethdev: avoid documentation in next lines
  ethdev: fix Rx/Tx spelling
  ethdev: fix Ethernet spelling
  ethdev: fix DCB and VMDq spelling
  ethdev: fix VLAN spelling including VLAN ID case
  ethdev: fix ID spelling in comments and log messages
  ethdev: remove reserved fields from internal structures
  ethdev: make device and data structures readable
  ethdev: remove full stop after short comments and references

 lib/ethdev/ethdev_driver.h   | 380 -
 lib/ethdev/ethdev_pci.h  |   2 +-
 lib/ethdev/ethdev_private.h  |   2 +-
 lib/ethdev/ethdev_profile.c  |   6 +-
 lib/ethdev/ethdev_vdev.h |   2 +-
 lib/ethdev/rte_class_eth.c   |   2 +-
 lib/ethdev/rte_eth_ctrl.h|   2 +-
 lib/ethdev/rte_ethdev.c  |  66 ++---
 lib/ethdev/rte_ethdev.h  | 518 ++-
 lib/ethdev/rte_ethdev_core.h |  20 +-
 lib/ethdev/rte_flow.h|  48 ++--
 lib/ethdev/rte_mtr_driver.h  |  30 +-
 lib/ethdev/rte_tm.h  |  14 +-
 13 files changed, 558 insertions(+), 534 deletions(-)

-- 
2.30.2

[dpdk-dev] [PATCH v2 1/9] ethdev: avoid documentation in next lines

[Andrew Rybchenko]

Documentation in the next separate line is confusing. If documentation
requires own line it should be before, not after.

Fix a number of incorrect markups on the way.

When corresponding lines are touched by the patch anyway, add
missing full stop to defined types description.

Signed-off-by: Andrew Rybchenko 
---
 lib/ethdev/ethdev_driver.h   | 270 ++-
 lib/ethdev/rte_ethdev.h  | 134 -
 lib/ethdev/rte_ethdev_core.h |  18 ++-
 lib/ethdev/rte_flow.h|  38 ++---
 lib/ethdev/rte_mtr_driver.h  |  30 ++--
 5 files changed, 254 insertions(+), 236 deletions(-)

diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index 0174ba03d7..8800c9c067 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -44,18 +44,17 @@ struct rte_eth_rxtx_callback {
 struct rte_eth_dev {
eth_rx_burst_t rx_pkt_burst; /**< Pointer to PMD receive function. */
eth_tx_burst_t tx_pkt_burst; /**< Pointer to PMD transmit function. */
+   /** Pointer to PMD transmit prepare function. */
eth_tx_prep_t tx_pkt_prepare;
-   /**< Pointer to PMD transmit prepare function. */
+   /** Get the number of used RX descriptors. */
eth_rx_queue_count_t rx_queue_count;
-   /**< Get the number of used RX descriptors. */
+   /** Check the status of a Rx descriptor. */
eth_rx_descriptor_status_t rx_descriptor_status;
-   /**< Check the status of a Rx descriptor. */
+   /** Check the status of a Tx descriptor. */
eth_tx_descriptor_status_t tx_descriptor_status;
-   /**< Check the status of a Tx descriptor. */
 
/**
-* points to device data that is shared between
-* primary and secondary processes.
+* Device data that is shared between primary and secondary processes.
 */
struct rte_eth_dev_data *data;
void *process_private; /**< Pointer to per-process device data. */
@@ -100,64 +99,63 @@ struct rte_eth_dev_data {
 
struct rte_eth_dev_sriov sriov;/**< SRIOV data */
 
+   /** PMD-specific private data. @see rte_eth_dev_release_port(). */
void *dev_private;
-   /**< PMD-specific private data.
-*   @see rte_eth_dev_release_port()
-*/
 
struct rte_eth_link dev_link;   /**< Link-level information & status. */
struct rte_eth_conf dev_conf;   /**< Configuration applied to device. */
uint16_t mtu;   /**< Maximum Transmission Unit. */
+   /** Common RX buffer size handled by all queues. */
uint32_t min_rx_buf_size;
-   /**< Common RX buffer size handled by all queues. */
 
uint64_t rx_mbuf_alloc_failed; /**< RX ring mbuf allocation failures. */
+   /** Device Ethernet link address. @see rte_eth_dev_release_port(). */
struct rte_ether_addr *mac_addrs;
-   /**< Device Ethernet link address.
-*   @see rte_eth_dev_release_port()
-*/
+   /** Bitmap associating MAC addresses to pools. */
uint64_t mac_pool_sel[ETH_NUM_RECEIVE_MAC_ADDR];
-   /**< Bitmap associating MAC addresses to pools. */
+   /**
+* Device Ethernet MAC addresses of hash filtering.
+* @see rte_eth_dev_release_port()
+*/
struct rte_ether_addr *hash_mac_addrs;
-   /**< Device Ethernet MAC addresses of hash filtering.
-*   @see rte_eth_dev_release_port()
-*/
uint16_t port_id;   /**< Device [external] port identifier. */
 
__extension__
-   uint8_t promiscuous   : 1,
-   /**< RX promiscuous mode ON(1) / OFF(0). */
+   uint8_t /** RX promiscuous mode ON(1) / OFF(0). */
+   promiscuous   : 1,
+   /** RX of scattered packets is ON(1) / OFF(0) */
scattered_rx : 1,
-   /**< RX of scattered packets is ON(1) / OFF(0) */
+   /** RX all multicast mode ON(1) / OFF(0). */
all_multicast : 1,
-   /**< RX all multicast mode ON(1) / OFF(0). */
+   /** Device state: STARTED(1) / STOPPED(0). */
dev_started : 1,
-   /**< Device state: STARTED(1) / STOPPED(0). */
+   /** RX LRO is ON(1) / OFF(0) */
lro : 1,
-   /**< RX LRO is ON(1) / OFF(0) */
-   dev_configured : 1;
-   /**< Indicates whether the device is configured.
-*   CONFIGURED(1) / NOT CONFIGURED(0).
+   /**
+* Indicates whether the device is configured.
+* CONFIGURED(1) / NOT CONFIGURED(0).
 */
+   dev_configured : 1;
+   /** Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0). */
uint8_t rx_queue_state[RTE_MAX_QUEUES_PER_PORT]

[dpdk-dev] [PATCH v2 3/9] ethdev: fix Ethernet spelling

[Andrew Rybchenko]

Signed-off-by: Andrew Rybchenko 
---
 lib/ethdev/ethdev_driver.h  |  6 +++---
 lib/ethdev/ethdev_pci.h |  2 +-
 lib/ethdev/ethdev_profile.c |  2 +-
 lib/ethdev/ethdev_vdev.h|  2 +-
 lib/ethdev/rte_ethdev.h | 10 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index 7deb9911bd..fdaf20b3c8 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -33,7 +33,7 @@ struct rte_eth_rxtx_callback {
 
 /**
  * @internal
- * The generic data structure associated with each ethernet device.
+ * The generic data structure associated with each Ethernet device.
  *
  * Pointers to burst-oriented packet receive and transmit functions are
  * located at the beginning of the structure, along with the pointer to
@@ -85,7 +85,7 @@ struct rte_eth_dev_owner;
 
 /**
  * @internal
- * The data part, with no function pointers, associated with each ethernet
+ * The data part, with no function pointers, associated with each Ethernet
  * device. This structure is safe to place in shared memory to be common
  * among different processes in a multi-process configuration.
  */
@@ -1197,7 +1197,7 @@ struct rte_eth_dev *rte_eth_dev_allocated(const char 
*name);
 
 /**
  * @internal
- * Allocates a new ethdev slot for an ethernet device and returns the pointer
+ * Allocates a new ethdev slot for an Ethernet device and returns the pointer
  * to that slot for the driver to use.
  *
  * @param  nameUnique identifier name for each Ethernet device
diff --git a/lib/ethdev/ethdev_pci.h b/lib/ethdev/ethdev_pci.h
index 8edca82ce8..12015b6b87 100644
--- a/lib/ethdev/ethdev_pci.h
+++ b/lib/ethdev/ethdev_pci.h
@@ -59,7 +59,7 @@ eth_dev_pci_specific_init(struct rte_eth_dev *eth_dev, void 
*bus_device) {
 
 /**
  * @internal
- * Allocates a new ethdev slot for an ethernet device and returns the pointer
+ * Allocates a new ethdev slot for an Ethernet device and returns the pointer
  * to that slot for the driver to use.
  *
  * @param dev
diff --git a/lib/ethdev/ethdev_profile.c b/lib/ethdev/ethdev_profile.c
index 0ac9e7cac4..7978f351ac 100644
--- a/lib/ethdev/ethdev_profile.c
+++ b/lib/ethdev/ethdev_profile.c
@@ -24,7 +24,7 @@ profile_hook_rx_burst_cb(
 
 /**
  * Setting profiling Rx callback for a given Ethernet device.
- * This function must be invoked when ethernet device is being configured.
+ * This function must be invoked when Ethernet device is being configured.
  *
  * @param port_id
  *  The port identifier of the Ethernet device.
diff --git a/lib/ethdev/ethdev_vdev.h b/lib/ethdev/ethdev_vdev.h
index 46c75d9e5f..2b49e9665b 100644
--- a/lib/ethdev/ethdev_vdev.h
+++ b/lib/ethdev/ethdev_vdev.h
@@ -13,7 +13,7 @@
 
 /**
  * @internal
- * Allocates a new ethdev slot for an ethernet device and returns the pointer
+ * Allocates a new ethdev slot for an Ethernet device and returns the pointer
  * to that slot for the driver to use.
  *
  * @param dev
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 0fbb436cd1..6ae6d9ba99 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -117,7 +117,7 @@
  * *rte_eth_dev* structure to avoid an extra indirect memory access during
  * their invocation.
  *
- * RTE ethernet device drivers do not use interrupts for transmitting or
+ * RTE Ethernet device drivers do not use interrupts for transmitting or
  * receiving. Instead, Ethernet drivers export Poll-Mode receive and transmit
  * functions to applications.
  * Both receive and transmit functions are packet-burst oriented to minimize
@@ -1316,7 +1316,7 @@ struct rte_eth_conf {
struct rte_eth_txmode txmode; /**< Port Tx configuration. */
uint32_t lpbk_mode; /**< Loopback operation mode. By default the value
 is 0, meaning the loopback mode is disabled.
-Read the datasheet of given ethernet controller
+Read the datasheet of given Ethernet controller
 for details. The possible values of this field
 are defined in implementation of each driver. 
*/
struct {
@@ -3380,7 +3380,7 @@ rte_eth_tx_buffer_init(struct rte_eth_dev_tx_buffer 
*buffer, uint16_t size);
  * Configure a callback for buffered packets which cannot be sent
  *
  * Register a specific callback to be called when an attempt is made to send
- * all packets buffered on an ethernet port, but not all packets can
+ * all packets buffered on an Ethernet port, but not all packets can
  * successfully be sent. The callback registered here will be called only
  * from calls to rte_eth_tx_buffer() and rte_eth_tx_buffer_flush() APIs.
  * The default callback configured for each queue by default just frees the
@@ -4746,7 +4746,7 @@ rte_eth_dev_get_name_by_port(uint16_t port_id, char 
*name);
 
 /**
  * Check that numbers of Rx and Tx descriptors satisfy descriptors limits from
- * the

[dpdk-dev] [PATCH v2 2/9] ethdev: fix Rx/Tx spelling

[Andrew Rybchenko]

Fix it everywhere in ethdev including log messages.

Signed-off-by: Andrew Rybchenko 
---
 lib/ethdev/ethdev_driver.h   |  94 ++--
 lib/ethdev/ethdev_profile.c  |   4 +-
 lib/ethdev/rte_eth_ctrl.h|   2 +-
 lib/ethdev/rte_ethdev.c  |  50 +++
 lib/ethdev/rte_ethdev.h  | 278 +--
 lib/ethdev/rte_ethdev_core.h |   2 +-
 lib/ethdev/rte_tm.h  |  14 +-
 7 files changed, 222 insertions(+), 222 deletions(-)

diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index 8800c9c067..7deb9911bd 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -20,7 +20,7 @@
 /**
  * @internal
  * Structure used to hold information about the callbacks to be called for a
- * queue on RX and TX.
+ * queue on Rx and Tx.
  */
 struct rte_eth_rxtx_callback {
struct rte_eth_rxtx_callback *next;
@@ -46,7 +46,7 @@ struct rte_eth_dev {
eth_tx_burst_t tx_pkt_burst; /**< Pointer to PMD transmit function. */
/** Pointer to PMD transmit prepare function. */
eth_tx_prep_t tx_pkt_prepare;
-   /** Get the number of used RX descriptors. */
+   /** Get the number of used Rx descriptors. */
eth_rx_queue_count_t rx_queue_count;
/** Check the status of a Rx descriptor. */
eth_rx_descriptor_status_t rx_descriptor_status;
@@ -92,10 +92,10 @@ struct rte_eth_dev_owner;
 struct rte_eth_dev_data {
char name[RTE_ETH_NAME_MAX_LEN]; /**< Unique identifier name */
 
-   void **rx_queues; /**< Array of pointers to RX queues. */
-   void **tx_queues; /**< Array of pointers to TX queues. */
-   uint16_t nb_rx_queues; /**< Number of RX queues. */
-   uint16_t nb_tx_queues; /**< Number of TX queues. */
+   void **rx_queues; /**< Array of pointers to Rx queues. */
+   void **tx_queues; /**< Array of pointers to Tx queues. */
+   uint16_t nb_rx_queues; /**< Number of Rx queues. */
+   uint16_t nb_tx_queues; /**< Number of Tx queues. */
 
struct rte_eth_dev_sriov sriov;/**< SRIOV data */
 
@@ -105,10 +105,10 @@ struct rte_eth_dev_data {
struct rte_eth_link dev_link;   /**< Link-level information & status. */
struct rte_eth_conf dev_conf;   /**< Configuration applied to device. */
uint16_t mtu;   /**< Maximum Transmission Unit. */
-   /** Common RX buffer size handled by all queues. */
+   /** Common Rx buffer size handled by all queues. */
uint32_t min_rx_buf_size;
 
-   uint64_t rx_mbuf_alloc_failed; /**< RX ring mbuf allocation failures. */
+   uint64_t rx_mbuf_alloc_failed; /**< Rx ring mbuf allocation failures. */
/** Device Ethernet link address. @see rte_eth_dev_release_port(). */
struct rte_ether_addr *mac_addrs;
/** Bitmap associating MAC addresses to pools. */
@@ -121,15 +121,15 @@ struct rte_eth_dev_data {
uint16_t port_id;   /**< Device [external] port identifier. */
 
__extension__
-   uint8_t /** RX promiscuous mode ON(1) / OFF(0). */
+   uint8_t /** Rx promiscuous mode ON(1) / OFF(0). */
promiscuous   : 1,
-   /** RX of scattered packets is ON(1) / OFF(0) */
+   /** Rx of scattered packets is ON(1) / OFF(0) */
scattered_rx : 1,
-   /** RX all multicast mode ON(1) / OFF(0). */
+   /** Rx all multicast mode ON(1) / OFF(0). */
all_multicast : 1,
/** Device state: STARTED(1) / STOPPED(0). */
dev_started : 1,
-   /** RX LRO is ON(1) / OFF(0) */
+   /** Rx LRO is ON(1) / OFF(0) */
lro : 1,
/**
 * Indicates whether the device is configured.
@@ -410,7 +410,7 @@ typedef int (*eth_xstats_get_names_by_id_t)(struct 
rte_eth_dev *dev,
 
 /**
  * @internal
- * Set a queue statistics mapping for a tx/rx queue of an Ethernet device.
+ * Set a queue statistics mapping for a Tx/Rx queue of an Ethernet device.
  */
 typedef int (*eth_queue_stats_mapping_set_t)(struct rte_eth_dev *dev,
 uint16_t queue_id,
@@ -439,11 +439,11 @@ typedef const uint32_t 
*(*eth_dev_supported_ptypes_get_t)(struct rte_eth_dev *de
 typedef int (*eth_dev_ptypes_set_t)(struct rte_eth_dev *dev,
 uint32_t ptype_mask);
 
-/** @internal Start rx and tx of a queue of an Ethernet device. */
+/** @internal Start Rx and Tx of a queue of an Ethernet device. */
 typedef int (*eth_queue_start_t)(struct rte_eth_dev *dev,
uint16_t queue_id);
 
-/** @internal Stop rx and tx of a queue of an Ethernet device. */
+/** @internal Stop Rx and Tx of a queue of an Ethernet device. */
 typedef int (*eth_queue_stop_t)(struct rte_eth_dev *dev,
uint16_t queue_id);
 
@@ -470,7 +470,7 @@ typedef int (*eth_rx_enable_intr_t)(struct rte_eth_dev *dev,

[dpdk-dev] [PATCH v2 4/9] ethdev: fix DCB and VMDq spelling

[Andrew Rybchenko]

Fix both in one changeset since they share line in a number of cases.

Signed-off-by: Andrew Rybchenko 
---
 lib/ethdev/ethdev_driver.h |  2 +-
 lib/ethdev/rte_ethdev.h| 42 +++---
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index fdaf20b3c8..9d570de3ef 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -661,7 +661,7 @@ typedef int (*eth_tm_ops_get_t)(struct rte_eth_dev *dev, 
void *ops);
 /** @internal Get Traffic Metering and Policing (MTR) operations. */
 typedef int (*eth_mtr_ops_get_t)(struct rte_eth_dev *dev, void *ops);
 
-/** @internal Get dcb information on an Ethernet device. */
+/** @internal Get DCB information on an Ethernet device. */
 typedef int (*eth_get_dcb_info)(struct rte_eth_dev *dev,
 struct rte_eth_dcb_info *dcb_info);
 
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 6ae6d9ba99..d903f51196 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -83,7 +83,7 @@
  * - MTU
  * - flow control settings
  * - receive mode configuration (promiscuous mode, all-multicast mode,
- *   hardware checksum mode, RSS/VMDQ settings etc.)
+ *   hardware checksum mode, RSS/VMDq settings etc.)
  * - VLAN filtering configuration
  * - default MAC address
  * - MAC addresses supplied to MAC address array
@@ -365,7 +365,7 @@ struct rte_eth_thresh {
  *  packets to multiple queues.
  */
 enum rte_eth_rx_mq_mode {
-   /** None of DCB,RSS or VMDQ mode */
+   /** None of DCB, RSS or VMDq mode */
ETH_MQ_RX_NONE = 0,
 
/** For Rx side, only RSS is on */
@@ -375,13 +375,13 @@ enum rte_eth_rx_mq_mode {
/** Both DCB and RSS enable */
ETH_MQ_RX_DCB_RSS = ETH_MQ_RX_RSS_FLAG | ETH_MQ_RX_DCB_FLAG,
 
-   /** Only VMDQ, no RSS nor DCB */
+   /** Only VMDq, no RSS nor DCB */
ETH_MQ_RX_VMDQ_ONLY = ETH_MQ_RX_VMDQ_FLAG,
-   /** RSS mode with VMDQ */
+   /** RSS mode with VMDq */
ETH_MQ_RX_VMDQ_RSS = ETH_MQ_RX_RSS_FLAG | ETH_MQ_RX_VMDQ_FLAG,
-   /** Use VMDQ+DCB to route traffic to queues */
+   /** Use VMDq+DCB to route traffic to queues */
ETH_MQ_RX_VMDQ_DCB = ETH_MQ_RX_VMDQ_FLAG | ETH_MQ_RX_DCB_FLAG,
-   /** Enable both VMDQ and DCB in VMDq */
+   /** Enable both VMDq and DCB in VMDq */
ETH_MQ_RX_VMDQ_DCB_RSS = ETH_MQ_RX_RSS_FLAG | ETH_MQ_RX_DCB_FLAG |
 ETH_MQ_RX_VMDQ_FLAG,
 };
@@ -805,9 +805,9 @@ rte_eth_rss_hf_refine(uint64_t rss_hf)
 #define RTE_RETA_GROUP_SIZE   64
 
 /**@{@name VMDq and DCB maximums */
-#define ETH_VMDQ_MAX_VLAN_FILTERS   64 /**< Maximum nb. of VMDQ vlan filters. 
*/
+#define ETH_VMDQ_MAX_VLAN_FILTERS   64 /**< Maximum nb. of VMDq vlan filters. 
*/
 #define ETH_DCB_NUM_USER_PRIORITIES 8  /**< Maximum nb. of DCB priorities. */
-#define ETH_VMDQ_DCB_NUM_QUEUES 128 /**< Maximum nb. of VMDQ DCB queues. */
+#define ETH_VMDQ_DCB_NUM_QUEUES 128 /**< Maximum nb. of VMDq DCB queues. */
 #define ETH_DCB_NUM_QUEUES  128 /**< Maximum nb. of DCB queues. */
 /**@}*/
 
@@ -869,7 +869,7 @@ enum rte_eth_nb_tcs {
 
 /**
  * This enum indicates the possible number of queue pools
- * in VMDQ configurations.
+ * in VMDq configurations.
  */
 enum rte_eth_nb_pools {
ETH_8_POOLS = 8,/**< 8 VMDq pools. */
@@ -902,7 +902,7 @@ struct rte_eth_vmdq_tx_conf {
 };
 
 /**
- * A structure used to configure the VMDQ+DCB feature
+ * A structure used to configure the VMDq+DCB feature
  * of an Ethernet port.
  *
  * Using this feature, packets are routed to a pool of queues, based
@@ -926,7 +926,7 @@ struct rte_eth_vmdq_dcb_conf {
 };
 
 /**
- * A structure used to configure the VMDQ feature of an Ethernet port when
+ * A structure used to configure the VMDq feature of an Ethernet port when
  * not combined with the DCB feature.
  *
  * Using this feature, packets are routed to a pool of queues. By default,
@@ -1321,19 +1321,19 @@ struct rte_eth_conf {
 are defined in implementation of each driver. 
*/
struct {
struct rte_eth_rss_conf rss_conf; /**< Port RSS configuration */
-   /** Port vmdq+dcb configuration. */
+   /** Port VMDq+DCB configuration. */
struct rte_eth_vmdq_dcb_conf vmdq_dcb_conf;
-   /** Port dcb Rx configuration. */
+   /** Port DCB Rx configuration. */
struct rte_eth_dcb_rx_conf dcb_rx_conf;
-   /** Port vmdq Rx configuration. */
+   /** Port VMDq Rx configuration. */
struct rte_eth_vmdq_rx_conf vmdq_rx_conf;
} rx_adv_conf; /**< Port Rx filtering configuration. */
union {
-   /** Port vmdq+dcb Tx configuration. */
+   /** Port VMDq+DCB Tx configuration. */
struct rte_eth_vmdq_dcb_tx_conf vmdq_dcb

[dpdk-dev] [PATCH v2 5/9] ethdev: fix VLAN spelling including VLAN ID case

[Andrew Rybchenko]

Signed-off-by: Andrew Rybchenko 
---
 lib/ethdev/rte_ethdev.c |  2 +-
 lib/ethdev/rte_ethdev.h | 30 +++---
 lib/ethdev/rte_flow.h   |  6 +++---
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index acb667c112..9d1793e216 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -3707,7 +3707,7 @@ rte_eth_dev_vlan_filter(uint16_t port_id, uint16_t 
vlan_id, int on)
 
if (!(dev->data->dev_conf.rxmode.offloads &
  DEV_RX_OFFLOAD_VLAN_FILTER)) {
-   RTE_ETHDEV_LOG(ERR, "Port %u: vlan-filtering disabled\n",
+   RTE_ETHDEV_LOG(ERR, "Port %u: VLAN-filtering disabled\n",
port_id);
return -ENOSYS;
}
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index d903f51196..2c35caf000 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -444,7 +444,7 @@ enum rte_vlan_type {
 };
 
 /**
- * A structure used to describe a vlan filter.
+ * A structure used to describe a VLAN filter.
  * If the bit corresponding to a VID is set, such VID is on.
  */
 struct rte_vlan_filter_conf {
@@ -805,7 +805,7 @@ rte_eth_rss_hf_refine(uint64_t rss_hf)
 #define RTE_RETA_GROUP_SIZE   64
 
 /**@{@name VMDq and DCB maximums */
-#define ETH_VMDQ_MAX_VLAN_FILTERS   64 /**< Maximum nb. of VMDq vlan filters. 
*/
+#define ETH_VMDQ_MAX_VLAN_FILTERS   64 /**< Maximum nb. of VMDq VLAN filters. 
*/
 #define ETH_DCB_NUM_USER_PRIORITIES 8  /**< Maximum nb. of DCB priorities. */
 #define ETH_VMDQ_DCB_NUM_QUEUES 128 /**< Maximum nb. of VMDq DCB queues. */
 #define ETH_DCB_NUM_QUEUES  128 /**< Maximum nb. of DCB queues. */
@@ -906,11 +906,11 @@ struct rte_eth_vmdq_tx_conf {
  * of an Ethernet port.
  *
  * Using this feature, packets are routed to a pool of queues, based
- * on the vlan id in the vlan tag, and then to a specific queue within
- * that pool, using the user priority vlan tag field.
+ * on the VLAN ID in the VLAN tag, and then to a specific queue within
+ * that pool, using the user priority VLAN tag field.
  *
  * A default pool may be used, if desired, to route all traffic which
- * does not match the vlan filter rules.
+ * does not match the VLAN filter rules.
  */
 struct rte_eth_vmdq_dcb_conf {
enum rte_eth_nb_pools nb_queue_pools; /**< With DCB, 16 or 32 pools */
@@ -918,9 +918,9 @@ struct rte_eth_vmdq_dcb_conf {
uint8_t default_pool; /**< The default pool, if applicable */
uint8_t nb_pool_maps; /**< We can have up to 64 filters/mappings */
struct {
-   uint16_t vlan_id; /**< The vlan id of the received frame */
+   uint16_t vlan_id; /**< The VLAN ID of the received frame */
uint64_t pools;   /**< Bitmask of pools for packet Rx */
-   } pool_map[ETH_VMDQ_MAX_VLAN_FILTERS]; /**< VMDq vlan pool maps. */
+   } pool_map[ETH_VMDQ_MAX_VLAN_FILTERS]; /**< VMDq VLAN pool maps. */
/** Selects a queue in a pool */
uint8_t dcb_tc[ETH_DCB_NUM_USER_PRIORITIES];
 };
@@ -930,8 +930,8 @@ struct rte_eth_vmdq_dcb_conf {
  * not combined with the DCB feature.
  *
  * Using this feature, packets are routed to a pool of queues. By default,
- * the pool selection is based on the MAC address, the vlan id in the
- * vlan tag as specified in the pool_map array.
+ * the pool selection is based on the MAC address, the VLAN ID in the
+ * VLAN tag as specified in the pool_map array.
  * Passing the ETH_VMDQ_ACCEPT_UNTAG in the rx_mode field allows pool
  * selection using only the MAC address. MAC address to pool mapping is done
  * using the rte_eth_dev_mac_addr_add function, with the pool parameter
@@ -941,7 +941,7 @@ struct rte_eth_vmdq_dcb_conf {
  * it is enabled or revert to the first queue of the pool if not.
  *
  * A default pool may be used, if desired, to route all traffic which
- * does not match the vlan filter rules or any pool MAC address.
+ * does not match the VLAN filter rules or any pool MAC address.
  */
 struct rte_eth_vmdq_rx_conf {
enum rte_eth_nb_pools nb_queue_pools; /**< VMDq only mode, 8 or 64 
pools */
@@ -951,9 +951,9 @@ struct rte_eth_vmdq_rx_conf {
uint8_t nb_pool_maps; /**< We can have up to 64 filters/mappings */
uint32_t rx_mode; /**< Flags from ETH_VMDQ_ACCEPT_* */
struct {
-   uint16_t vlan_id; /**< The vlan id of the received frame */
+   uint16_t vlan_id; /**< The VLAN ID of the received frame */
uint64_t pools;   /**< Bitmask of pools for packet Rx */
-   } pool_map[ETH_VMDQ_MAX_VLAN_FILTERS]; /**< VMDq vlan pool maps. */
+   } pool_map[ETH_VMDQ_MAX_VLAN_FILTERS]; /**< VMDq VLAN pool maps. */
 };
 
 /**
@@ -3127,9 +3127,9 @@ int rte_eth_dev_fw_version_get(uint16_t port_id,
  * and RTE_PTYPE_L3_IPV4 are announced, the PMD must return the following
  * packet types for these packets:
  * - Ether/IPv4  -> RTE_PTYPE_

[dpdk-dev] [PATCH v2 6/9] ethdev: fix ID spelling in comments and log messages

[Andrew Rybchenko]

Signed-off-by: Andrew Rybchenko 
---
 lib/ethdev/ethdev_driver.h  |  2 +-
 lib/ethdev/ethdev_private.h |  2 +-
 lib/ethdev/rte_class_eth.c  |  2 +-
 lib/ethdev/rte_ethdev.c | 14 -
 lib/ethdev/rte_ethdev.h | 62 ++---
 lib/ethdev/rte_flow.h   |  4 +--
 6 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index 9d570de3ef..09a9bcbb50 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -1391,7 +1391,7 @@ rte_eth_linkstatus_get(const struct rte_eth_dev *dev,
  *
  * A pool of switch domain identifiers which can be allocated on request. This
  * will enabled devices which support the concept of switch domains to request
- * a switch domain id which is guaranteed to be unique from other devices
+ * a switch domain ID which is guaranteed to be unique from other devices
  * running in the same process.
  *
  * @param domain_id
diff --git a/lib/ethdev/ethdev_private.h b/lib/ethdev/ethdev_private.h
index 5721be7bdc..cc91025e8d 100644
--- a/lib/ethdev/ethdev_private.h
+++ b/lib/ethdev/ethdev_private.h
@@ -10,7 +10,7 @@
 #include "rte_ethdev.h"
 
 /*
- * Convert rte_eth_dev pointer to port id.
+ * Convert rte_eth_dev pointer to port ID.
  * NULL will be translated to RTE_MAX_ETHPORTS.
  */
 uint16_t eth_dev_to_id(const struct rte_eth_dev *dev);
diff --git a/lib/ethdev/rte_class_eth.c b/lib/ethdev/rte_class_eth.c
index eda216ced5..c8e8fc9244 100644
--- a/lib/ethdev/rte_class_eth.c
+++ b/lib/ethdev/rte_class_eth.c
@@ -90,7 +90,7 @@ eth_representor_cmp(const char *key __rte_unused,
np = eth_da.nb_ports > 0 ? eth_da.nb_ports : 1;
nf = eth_da.nb_representor_ports > 0 ? eth_da.nb_representor_ports : 1;
 
-   /* Return 0 if representor id is matching one of the values. */
+   /* Return 0 if representor ID is matching one of the values. */
for (i = 0; i < nc * np * nf; ++i) {
c = i / (np * nf);
p = (i / nf) % np;
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 9d1793e216..02c2034000 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -538,7 +538,7 @@ rte_eth_dev_allocate(const char *name)
 
 /*
  * Attach to a port already registered by the primary process, which
- * makes sure that the same device would have the same port id both
+ * makes sure that the same device would have the same port ID both
  * in the primary and secondary process.
  */
 struct rte_eth_dev *
@@ -668,7 +668,7 @@ eth_dev_owner_set(const uint16_t port_id, const uint64_t 
old_owner_id,
struct rte_eth_dev_owner *port_owner;
 
if (port_id >= RTE_MAX_ETHPORTS || !eth_dev_is_allocated(ethdev)) {
-   RTE_ETHDEV_LOG(ERR, "Port id %"PRIu16" is not allocated\n",
+   RTE_ETHDEV_LOG(ERR, "Port ID %"PRIu16" is not allocated\n",
port_id);
return -ENODEV;
}
@@ -760,7 +760,7 @@ rte_eth_dev_owner_delete(const uint64_t owner_id)
owner_id);
} else {
RTE_ETHDEV_LOG(ERR,
-  "Invalid owner id=%016"PRIx64"\n",
+  "Invalid owner ID=%016"PRIx64"\n",
   owner_id);
ret = -EINVAL;
}
@@ -779,7 +779,7 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct 
rte_eth_dev_owner *owner)
ethdev = &rte_eth_devices[port_id];
 
if (!eth_dev_is_allocated(ethdev)) {
-   RTE_ETHDEV_LOG(ERR, "Port id %"PRIu16" is not allocated\n",
+   RTE_ETHDEV_LOG(ERR, "Port ID %"PRIu16" is not allocated\n",
port_id);
return -ENODEV;
}
@@ -4327,7 +4327,7 @@ rte_eth_dev_mac_addr_add(uint16_t port_id, struct 
rte_ether_addr *addr,
return -EINVAL;
}
if (pool >= ETH_64_POOLS) {
-   RTE_ETHDEV_LOG(ERR, "Pool id must be 0-%d\n", ETH_64_POOLS - 1);
+   RTE_ETHDEV_LOG(ERR, "Pool ID must be 0-%d\n", ETH_64_POOLS - 1);
return -EINVAL;
}
 
@@ -4552,7 +4552,7 @@ int rte_eth_set_queue_rate_limit(uint16_t port_id, 
uint16_t queue_idx,
 
if (queue_idx > dev_info.max_tx_queues) {
RTE_ETHDEV_LOG(ERR,
-   "Set queue rate limit:port %u: invalid queue id=%u\n",
+   "Set queue rate limit:port %u: invalid queue ID=%u\n",
port_id, queue_idx);
return -EINVAL;
}
@@ -6409,7 +6409,7 @@ rte_eth_rx_metadata_negotiate(uint16_t port_id, uint64_t 
*features)
 
if (dev->data->dev_configured != 0) {
RTE_ETHDEV_LOG(ERR,
-   "The port (id=%"PRIu16") is already configured\n",
+   "The port (ID=%"PRIu16") is already configured\n",
port_id);
return -EBUSY;
}
diff --git a/lib/ethdev/

[dpdk-dev] [PATCH v2 8/9] ethdev: make device and data structures readable

[Andrew Rybchenko]

Add empty lines to separate fields commented using different styles.

Signed-off-by: Andrew Rybchenko 
---
 lib/ethdev/ethdev_driver.h | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index 7bfc43a99b..dee6b26a5f 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -44,6 +44,7 @@ struct rte_eth_rxtx_callback {
 struct rte_eth_dev {
eth_rx_burst_t rx_pkt_burst; /**< Pointer to PMD receive function. */
eth_tx_burst_t tx_pkt_burst; /**< Pointer to PMD transmit function. */
+
/** Pointer to PMD transmit prepare function. */
eth_tx_prep_t tx_pkt_prepare;
/** Get the number of used Rx descriptors. */
@@ -61,6 +62,7 @@ struct rte_eth_dev {
const struct eth_dev_ops *dev_ops; /**< Functions exported by PMD */
struct rte_device *device; /**< Backing device */
struct rte_intr_handle *intr_handle; /**< Device interrupt handle */
+
/** User application callbacks for NIC interrupts */
struct rte_eth_dev_cb_list link_intr_cbs;
/**
@@ -73,6 +75,7 @@ struct rte_eth_dev {
 * received packets before passing them to the driver for transmission.
 */
struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];
+
enum rte_eth_dev_state state; /**< Flag indicating the port state */
void *security_ctx; /**< Context for security ops */
 } __rte_cache_aligned;
@@ -102,10 +105,12 @@ struct rte_eth_dev_data {
struct rte_eth_link dev_link;   /**< Link-level information & status. */
struct rte_eth_conf dev_conf;   /**< Configuration applied to device. */
uint16_t mtu;   /**< Maximum Transmission Unit. */
+
/** Common Rx buffer size handled by all queues. */
uint32_t min_rx_buf_size;
 
uint64_t rx_mbuf_alloc_failed; /**< Rx ring mbuf allocation failures. */
+
/** Device Ethernet link address. @see rte_eth_dev_release_port(). */
struct rte_ether_addr *mac_addrs;
/** Bitmap associating MAC addresses to pools. */
@@ -115,6 +120,7 @@ struct rte_eth_dev_data {
 * @see rte_eth_dev_release_port()
 */
struct rte_ether_addr *hash_mac_addrs;
+
uint16_t port_id;   /**< Device [external] port identifier. */
 
__extension__
@@ -133,15 +139,20 @@ struct rte_eth_dev_data {
 * CONFIGURED(1) / NOT CONFIGURED(0).
 */
dev_configured : 1;
+
/** Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0). */
uint8_t rx_queue_state[RTE_MAX_QUEUES_PER_PORT];
/** Queues state: HAIRPIN(2) / STARTED(1) / STOPPED(0). */
uint8_t tx_queue_state[RTE_MAX_QUEUES_PER_PORT];
+
uint32_t dev_flags; /**< Capabilities. */
int numa_node;  /**< NUMA node connection. */
+
/** VLAN filter configuration. */
struct rte_vlan_filter_conf vlan_filter_conf;
+
struct rte_eth_dev_owner owner; /**< The port owner. */
+
/**
 * Switch-specific identifier.
 * Valid if RTE_ETH_DEV_REPRESENTOR in dev_flags.
-- 
2.30.2

[dpdk-dev] [PATCH v2 7/9] ethdev: remove reserved fields from internal structures

[Andrew Rybchenko]

Fixes: 8ea354d92f80 ("ethdev: hide eth dev related structures")

Signed-off-by: Andrew Rybchenko 
---
 lib/ethdev/ethdev_driver.h | 5 -
 1 file changed, 5 deletions(-)

diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index 09a9bcbb50..7bfc43a99b 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -75,9 +75,6 @@ struct rte_eth_dev {
struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];
enum rte_eth_dev_state state; /**< Flag indicating the port state */
void *security_ctx; /**< Context for security ops */
-
-   uint64_t reserved_64s[4]; /**< Reserved for future fields */
-   void *reserved_ptrs[4];   /**< Reserved for future fields */
 } __rte_cache_aligned;
 
 struct rte_eth_dev_sriov;
@@ -158,8 +155,6 @@ struct rte_eth_dev_data {
uint16_t backer_port_id;
 
pthread_mutex_t flow_ops_mutex; /**< rte_flow ops mutex. */
-   uint64_t reserved_64s[4]; /**< Reserved for future fields */
-   void *reserved_ptrs[4];   /**< Reserved for future fields */
 } __rte_cache_aligned;
 
 /**
-- 
2.30.2

[dpdk-dev] [PATCH v2 9/9] ethdev: remove full stop after short comments and references

[Andrew Rybchenko]

Full stop at the end of short comment just make line longer. It
should be either everywhere or nowhere to be consistent.

Signed-off-by: Andrew Rybchenko 
---
 lib/ethdev/ethdev_driver.h | 68 +++---
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index dee6b26a5f..a50ea87ca0 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -42,23 +42,23 @@ struct rte_eth_rxtx_callback {
  * process, while the actual configuration data for the device is shared.
  */
 struct rte_eth_dev {
-   eth_rx_burst_t rx_pkt_burst; /**< Pointer to PMD receive function. */
-   eth_tx_burst_t tx_pkt_burst; /**< Pointer to PMD transmit function. */
+   eth_rx_burst_t rx_pkt_burst; /**< Pointer to PMD receive function */
+   eth_tx_burst_t tx_pkt_burst; /**< Pointer to PMD transmit function */
 
-   /** Pointer to PMD transmit prepare function. */
+   /** Pointer to PMD transmit prepare function */
eth_tx_prep_t tx_pkt_prepare;
-   /** Get the number of used Rx descriptors. */
+   /** Get the number of used Rx descriptors */
eth_rx_queue_count_t rx_queue_count;
-   /** Check the status of a Rx descriptor. */
+   /** Check the status of a Rx descriptor */
eth_rx_descriptor_status_t rx_descriptor_status;
-   /** Check the status of a Tx descriptor. */
+   /** Check the status of a Tx descriptor */
eth_tx_descriptor_status_t tx_descriptor_status;
 
/**
-* Device data that is shared between primary and secondary processes.
+* Device data that is shared between primary and secondary processes
 */
struct rte_eth_dev_data *data;
-   void *process_private; /**< Pointer to per-process device data. */
+   void *process_private; /**< Pointer to per-process device data */
const struct eth_dev_ops *dev_ops; /**< Functions exported by PMD */
struct rte_device *device; /**< Backing device */
struct rte_intr_handle *intr_handle; /**< Device interrupt handle */
@@ -72,7 +72,7 @@ struct rte_eth_dev {
struct rte_eth_rxtx_callback 
*post_rx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];
/**
 * User-supplied functions called from tx_burst to pre-process
-* received packets before passing them to the driver for transmission.
+* received packets before passing them to the driver for transmission
 */
struct rte_eth_rxtx_callback *pre_tx_burst_cbs[RTE_MAX_QUEUES_PER_PORT];
 
@@ -92,28 +92,28 @@ struct rte_eth_dev_owner;
 struct rte_eth_dev_data {
char name[RTE_ETH_NAME_MAX_LEN]; /**< Unique identifier name */
 
-   void **rx_queues; /**< Array of pointers to Rx queues. */
-   void **tx_queues; /**< Array of pointers to Tx queues. */
-   uint16_t nb_rx_queues; /**< Number of Rx queues. */
-   uint16_t nb_tx_queues; /**< Number of Tx queues. */
+   void **rx_queues; /**< Array of pointers to Rx queues */
+   void **tx_queues; /**< Array of pointers to Tx queues */
+   uint16_t nb_rx_queues; /**< Number of Rx queues */
+   uint16_t nb_tx_queues; /**< Number of Tx queues */
 
struct rte_eth_dev_sriov sriov;/**< SRIOV data */
 
-   /** PMD-specific private data. @see rte_eth_dev_release_port(). */
+   /** PMD-specific private data. @see rte_eth_dev_release_port() */
void *dev_private;
 
-   struct rte_eth_link dev_link;   /**< Link-level information & status. */
-   struct rte_eth_conf dev_conf;   /**< Configuration applied to device. */
-   uint16_t mtu;   /**< Maximum Transmission Unit. */
+   struct rte_eth_link dev_link;   /**< Link-level information & status */
+   struct rte_eth_conf dev_conf;   /**< Configuration applied to device */
+   uint16_t mtu;   /**< Maximum Transmission Unit */
 
-   /** Common Rx buffer size handled by all queues. */
+   /** Common Rx buffer size handled by all queues */
uint32_t min_rx_buf_size;
 
-   uint64_t rx_mbuf_alloc_failed; /**< Rx ring mbuf allocation failures. */
+   uint64_t rx_mbuf_alloc_failed; /**< Rx ring mbuf allocation failures */
 
-   /** Device Ethernet link address. @see rte_eth_dev_release_port(). */
+   /** Device Ethernet link address. @see rte_eth_dev_release_port() */
struct rte_ether_addr *mac_addrs;
-   /** Bitmap associating MAC addresses to pools. */
+   /** Bitmap associating MAC addresses to pools */
uint64_t mac_pool_sel[ETH_NUM_RECEIVE_MAC_ADDR];
/**
 * Device Ethernet MAC addresses of hash filtering.
@@ -121,37 +121,37 @@ struct rte_eth_dev_data {
 */
struct rte_ether_addr *hash_mac_addrs;
 
-   uint16_t port_id;   /**< Device [external] port identifier. */
+   uint16_t port_id;   /**< Device [external] port identifier */
 
__extension__

Re: [dpdk-dev] [PATCH 0/5] ethdev: cosmetic fixes for just moved structures

[Andrew Rybchenko]

On 10/20/21 1:20 AM, Thomas Monjalon wrote:
> 20/10/2021 00:05, Ferruh Yigit:
>> On 10/19/2021 7:07 PM, Andrew Rybchenko wrote:
>>> On 10/19/21 2:55 PM, Ferruh Yigit wrote:
 On 10/14/2021 9:36 AM, Andrew Rybchenko wrote:
> Sicne rte_eth_dev and rte_eth_dev_data structures are just moved
> right now is a good chance to make a cleanup.
>
> No strong opinion, but I think it would be useful for the future.
>
> Make be at least some fixes from below could be accepted.
>
> Andrew Rybchenko (5):
>ethdev: avoid documentation in next lines
>ethdev: fix Rx/Tx spelling in just moved structures
>ethdev: remove reserved fields from internal structures
>ethdev: make device and data structures readable
>ethdev: remove full stop after short comments and references
>

 Overall +1 to these changes, I think this release is the opportunity
 to have changes like this.

 But as far as I can see only new moved code updated in 'ethdev_driver.h',
 why not update whole 'ethdev_driver.h'?
>>>
>>> Simply don't want to complicate search by git blame because of cosmetic
>>> changes. No strong opinion, but decided to go this way for now.
>>
>> Normally agree to NOT get cosmetic changes because the reason you mentioned,
>> noise in the git history. But in this release we already shuffled things a 
>> bit,
>> that is why I think it is good opportunity to get these kind of changes.
>>
>> Also there will be some inconsistencies in 'ethdev_driver.h' after your 
>> changes,
>> like 'RX' -> 'Rx' change done in one patch, but half of the file still uses 
>> 'RX'.
>>
>> I also don't have strong opinion, but my preference is either fix all, or 
>> none.
>> Lets get some more comments.
> 
> OK to fix all, given ethdev is already shuffled a lot.
> 

I've made the next step. See v2. Let me know if it is OK, too
much or insufficient.

Re: [dpdk-dev] [PATCH v10 06/16] dma/idxd: add datapath structures

[fengchengwen]

On 2021/10/19 22:10, Kevin Laatz wrote:
> Add data structures required for the data path for IDXD devices.
> 
> Signed-off-by: Bruce Richardson 
> Signed-off-by: Kevin Laatz 
> Reviewed-by: Conor Walsh 
> ---
>  drivers/dma/idxd/idxd_bus.c  |  1 +
>  drivers/dma/idxd/idxd_common.c   | 33 +
>  drivers/dma/idxd/idxd_hw_defs.h  | 41 
>  drivers/dma/idxd/idxd_internal.h |  4 
>  drivers/dma/idxd/idxd_pci.c  |  2 ++
>  5 files changed, 81 insertions(+)

[snip]

> +/**
> + * Hardware descriptor used by DSA hardware, for both bursts and
> + * for individual operations.
> + */
> +struct idxd_hw_desc {
> + uint32_t pasid;
> + uint32_t op_flags;
> + rte_iova_t completion;
> +
> + RTE_STD_C11
> + union {
> + rte_iova_t src;  /* source address for copy ops etc. */
> + rte_iova_t desc_addr; /* descriptor pointer for batch */
> + };
> + rte_iova_t dst;
> +
> + uint32_t size;/* length of data for op, or batch size */
> +
> + uint16_t intr_handle; /* completion interrupt handle */
> +
> + /* remaining 26 bytes are reserved */
> + uint16_t __reserved[13];

The non-reserved take about 30+B, and the struct align 64, so the 
__reserved[13] could delete.

It's a minor problem, so:
Reviewed-by: Chengwen Feng 

> +} __rte_aligned(64);
> +
>  #define IDXD_COMP_STATUS_INCOMPLETE0
>  #define IDXD_COMP_STATUS_SUCCESS   1
>  #define IDXD_COMP_STATUS_INVALID_OPCODE 0x10
> diff --git a/drivers/dma/idxd/idxd_internal.h 
> b/drivers/dma/idxd/idxd_internal.h
> index 8473bf939f..5e253fdfbc 100644
> --- a/drivers/dma/idxd/idxd_internal.h
> +++ b/drivers/dma/idxd/idxd_internal.h
> @@ -40,6 +40,8 @@ struct idxd_pci_common {
>  };

[snip]

[dpdk-dev] [PATCH v13 1/4] enable ASan AddressSanitizer

[zhihongx . peng]

From: Zhihong Peng 

`AddressSanitizer
`_ (ASan)
is a widely-used debugging tool to detect memory access errors.
It helps to detect issues like use-after-free, various kinds of buffer
overruns in C/C++ programs, and other similar errors, as well as
printing out detailed debug information whenever an error is detected.

We can enable ASan by adding below compilation options:
-Dbuildtype=debug -Db_lundef=false -Db_sanitize=address
"-Dbuildtype=debug": This is a non-essential option. When this option
is added, if a memory error occurs, ASan can clearly show where the
code is wrong.
"-Db_lundef=false": When use clang to compile DPDK, this option must
be added.

Signed-off-by: Xueqin Lin 
Signed-off-by: Zhihong Peng 
Acked-by: John McNamara 
---
v7: 1) Split doc and code into two.
2) Modify asan.rst doc
v8: No change.
v9: 1) Add the check of libasan library.
2) Add release notes.
v10:1) Split doc and code into two.
2) Meson supports asan.
v11:Modify the document.
v12:No change.
v13:Modify the document.
---
 config/meson.build | 16 ++
 devtools/words-case.txt|  1 +
 doc/guides/prog_guide/asan.rst | 30 ++
 doc/guides/prog_guide/index.rst|  1 +
 doc/guides/rel_notes/release_21_11.rst |  9 
 5 files changed, 57 insertions(+)
 create mode 100644 doc/guides/prog_guide/asan.rst

diff --git a/config/meson.build b/config/meson.build
index 4cdf589e20..f02b0e9c6d 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -411,6 +411,22 @@ if get_option('b_lto')
 endif
 endif
 
+if get_option('b_sanitize') == 'address' or get_option('b_sanitize') == 
'address,undefined'
+if is_windows
+error('ASan is not supported on windows')
+endif
+
+if cc.get_id() == 'gcc'
+asan_dep = cc.find_library('asan', required: true)
+if (not cc.links('int main(int argc, char *argv[]) { return 0; }',
+dependencies: asan_dep))
+error('broken dependency, "libasan"')
+endif
+add_project_link_arguments('-lasan', language: 'c')
+dpdk_extra_ldflags += '-lasan'
+endif
+endif
+
 if get_option('default_library') == 'both'
 error( '''
  Unsupported value "both" for "default_library" option.
diff --git a/devtools/words-case.txt b/devtools/words-case.txt
index 0bbad48626..ada6910fa0 100644
--- a/devtools/words-case.txt
+++ b/devtools/words-case.txt
@@ -5,6 +5,7 @@ API
 Arm
 armv7
 armv8
+ASan
 BAR
 CRC
 DCB
diff --git a/doc/guides/prog_guide/asan.rst b/doc/guides/prog_guide/asan.rst
new file mode 100644
index 00..6888fc9a87
--- /dev/null
+++ b/doc/guides/prog_guide/asan.rst
@@ -0,0 +1,30 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+   Copyright(c) 2021 Intel Corporation
+
+Running AddressSanitizer
+
+
+`AddressSanitizer
+`_ (ASan)
+is a widely-used debugging tool to detect memory access errors.
+It helps to detect issues like use-after-free, various kinds of buffer
+overruns in C/C++ programs, and other similar errors, as well as
+printing out detailed debug information whenever an error is detected.
+
+AddressSanitizer is a part of LLVM (3.1+) and GCC (4.8+).
+
+Add following meson build commands to enable ASan in the meson build system:
+
+* gcc::
+
+-Dbuildtype=debug -Db_sanitize=address
+
+* clang::
+
+-Dbuildtype=debug -Db_lundef=false -Db_sanitize=address
+
+.. Note::
+
+a) If compile with gcc in centos, libasan needs to be installed separately.
+b) If the program is tested using cmdline, you may need to execute the
+   "stty echo" command when an error occurs.
diff --git a/doc/guides/prog_guide/index.rst b/doc/guides/prog_guide/index.rst
index 89af28dacb..b95c460b19 100644
--- a/doc/guides/prog_guide/index.rst
+++ b/doc/guides/prog_guide/index.rst
@@ -71,4 +71,5 @@ Programmer's Guide
 writing_efficient_code
 lto
 profile_app
+asan
 glossary
diff --git a/doc/guides/rel_notes/release_21_11.rst 
b/doc/guides/rel_notes/release_21_11.rst
index 3362c52a73..10f4275b1b 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -173,6 +173,15 @@ New Features
   * Added tests to verify tunnel header verification in IPsec inbound.
   * Added tests to verify inner checksum.
 
+* **Enable ASan AddressSanitizer.**
+
+  `AddressSanitizer
+  `_ (ASan)
+  is a widely-used debugging tool to detect memory access errors.
+  It helps to detect issues like use-after-free, various kinds of buffer
+  overruns in C/C++ programs, and other similar errors, as well as
+  printing out detailed debug information whenever an error is detected.
+
 
 Removed Items
 -
-- 
2.25.1

[dpdk-dev] [PATCH v13 2/4] DPDK code adapts to ASan

[zhihongx . peng]

From: Zhihong Peng 

DPDK ASan functionality is currently only supported on Linux x86_64.
If want to support on other platforms, need to define ASAN_SHADOW_OFFSET
value according to google ASan document, and configure meson file
(config/meson.build).

Signed-off-by: Xueqin Lin 
Signed-off-by: Zhihong Peng 
Acked-by: Anatoly Burakov 
---
v7: Split doc and code into two.
v8: No change.
v9: Modify the definition of RTE_MALLOC_ASAN.
v10:Modify the definition of RTE_MALLOC_ASAN.
v11:No change.
v12:No change.
v13:Modify the document.
---
 config/meson.build |   4 +
 doc/guides/prog_guide/asan.rst |  58 +-
 lib/eal/common/malloc_elem.c   |  26 -
 lib/eal/common/malloc_elem.h   | 194 -
 lib/eal/common/malloc_heap.c   |  12 ++
 lib/eal/common/rte_malloc.c|   9 +-
 6 files changed, 296 insertions(+), 7 deletions(-)

diff --git a/config/meson.build b/config/meson.build
index f02b0e9c6d..bf751583bd 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -425,6 +425,10 @@ if get_option('b_sanitize') == 'address' or 
get_option('b_sanitize') == 'address
 add_project_link_arguments('-lasan', language: 'c')
 dpdk_extra_ldflags += '-lasan'
 endif
+
+if is_linux and arch_subdir == 'x86'
+   dpdk_conf.set10('RTE_MALLOC_ASAN', true)
+endif
 endif
 
 if get_option('default_library') == 'both'
diff --git a/doc/guides/prog_guide/asan.rst b/doc/guides/prog_guide/asan.rst
index 6888fc9a87..02591ca68a 100644
--- a/doc/guides/prog_guide/asan.rst
+++ b/doc/guides/prog_guide/asan.rst
@@ -13,6 +13,58 @@ printing out detailed debug information whenever an error is 
detected.
 
 AddressSanitizer is a part of LLVM (3.1+) and GCC (4.8+).
 
+DPDK ASan functionality is currently only supported on Linux x86_64.
+If want to support on other platforms, need to define ASAN_SHADOW_OFFSET
+value according to google ASan document, and configure meson file
+(config/meson.build).
+
+Example heap-buffer-overflow error
+--
+
+Add below unit test code in examples/helloworld/main.c::
+
+Add code to helloworld:
+char *p = rte_zmalloc(NULL, 9, 0);
+if (!p) {
+printf("rte_zmalloc error.");
+return -1;
+}
+p[9] = 'a';
+
+Above code will result in heap-buffer-overflow error if ASan is enabled, 
because apply 9 bytes of memory but access the tenth byte, detailed error log 
as below::
+
+==369953==ERROR: AddressSanitizer: heap-buffer-overflow on address 
0x7fb17f465809 at pc 0x5652e6707b84 bp 0x7ffea70eea20 sp 0x7ffea70eea10 WRITE 
of size 1 at 0x7fb17f465809 thread T0
+#0 0x5652e6707b83 in main ../examples/helloworld/main.c:47
+#1 0x7fb94953c0b2 in __libc_start_main 
(/lib/x86_64-linux-gnu/libc.so.6+0x270b2)
+#2 0x5652e67079bd in _start 
(/home/pzh/asan_test/x86_64-native-linuxapp-gcc/examples/dpdk-helloworld+0x8329bd)
+
+Address 0x7fb17f465809 is a wild pointer.
+SUMMARY: AddressSanitizer: heap-buffer-overflow 
../examples/helloworld/main.c:47 in main
+
+Example use-after-free error
+
+
+Add below unit test code in examples/helloworld/main.c::
+
+Add code to helloworld:
+char *p = rte_zmalloc(NULL, 9, 0);
+if (!p) {
+printf("rte_zmalloc error.");
+return -1;
+}
+rte_free(p);
+*p = 'a';
+
+Above code will result in use-after-free error if ASan is enabled, because 
apply 9 bytes of memory but access the first byte after release, detailed error 
log as below::
+
+==417048==ERROR: AddressSanitizer: heap-use-after-free on address 
0x7fc83f465800 at pc 0x564308a39b89 bp 0x7ffc8c85bf50 sp 0x7ffc8c85bf40 WRITE 
of size 1 at 0x7fc83f465800 thread T0
+#0 0x564308a39b88 in main ../examples/helloworld/main.c:48
+#1 0x7fd0079c60b2 in __libc_start_main 
(/lib/x86_64-linux-gnu/libc.so.6+0x270b2)
+#2 0x564308a399bd in _start 
(/home/pzh/asan_test/x86_64-native-linuxapp-gcc/examples/dpdk-helloworld+0x8329bd)
+
+Address 0x7fc83f465800 is a wild pointer.
+SUMMARY: AddressSanitizer: heap-use-after-free 
../examples/helloworld/main.c:48 in main
+
 Add following meson build commands to enable ASan in the meson build system:
 
 * gcc::
@@ -25,6 +77,8 @@ Add following meson build commands to enable ASan in the 
meson build system:
 
 .. Note::
 
-a) If compile with gcc in centos, libasan needs to be installed separately.
-b) If the program is tested using cmdline, you may need to execute the
+a) Some of the features of ASan (for example, 'Display memory application 
location, currently
+   displayed as a wild pointer') are not currently supported by DPDK's 
implementation.
+b) If compile with gcc in centos, libasan needs to be installed separately.
+c) If the program is tested using cmdline, you may need to execute the
"stty echo" command when an error occurs.
diff --git a/lib/eal/common/malloc_elem.c b/lib/eal/common/malloc_elem.c
index c2c9461f1d..bdd20a162e 100644
--- a/lib

[dpdk-dev] [PATCH v13 3/4] code changes to avoid the ASan error

[zhihongx . peng]

From: Zhihong Peng 

Code changes to avoid the following ASan error:
"Control reaches end of non-void function".

Signed-off-by: Xueqin Lin 
Signed-off-by: Zhihong Peng 
Acked-by: Cristian Dumitrescu 
---
v7: no change.
v8: no change.
v9: Modify the submit log.
v10:no change.
v11:no change.
v12:Modify the commit log.
v13:Modify the commit log.
---
 lib/pipeline/rte_swx_pipeline.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
index 1cd09a4b44..0acd6c6752 100644
--- a/lib/pipeline/rte_swx_pipeline.c
+++ b/lib/pipeline/rte_swx_pipeline.c
@@ -4642,7 +4642,7 @@ instr_meter_translate(struct rte_swx_pipeline *p,
return 0;
}
 
-   CHECK(0, EINVAL);
+   return -EINVAL;
 }
 
 static inline void
@@ -5937,7 +5937,7 @@ instr_translate(struct rte_swx_pipeline *p,
  instr,
  data);
 
-   CHECK(0, EINVAL);
+   return -EINVAL;
 }
 
 static struct instruction_data *
-- 
2.25.1

[dpdk-dev] [PATCH v13 4/4] performance-thread: avoid cross compilation fail

[zhihongx . peng]

From: Zhihong Peng 

Code changes to avoid the following ASan error:
"strncpy specified bound XX equals destination size".

Signed-off-by: Xueqin Lin 
Signed-off-by: Zhihong Peng 
Acked-by: Bruce Richardson 
---
v11: Use rte_strlcpy to replace strncpy.
v12: Delete rte_strlcpy's rte_.
v13: Modify the commit log.
---
 examples/performance-thread/common/lthread.c   | 4 ++--
 examples/performance-thread/common/lthread_cond.c  | 6 +++---
 examples/performance-thread/common/lthread_mutex.c | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/performance-thread/common/lthread.c 
b/examples/performance-thread/common/lthread.c
index 98123f34f8..009374a8c3 100644
--- a/examples/performance-thread/common/lthread.c
+++ b/examples/performance-thread/common/lthread.c
@@ -20,6 +20,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
@@ -465,6 +466,5 @@ void lthread_set_funcname(const char *f)
 {
struct lthread *lt = THIS_LTHREAD;
 
-   strncpy(lt->funcname, f, sizeof(lt->funcname));
-   lt->funcname[sizeof(lt->funcname)-1] = 0;
+   strlcpy(lt->funcname, f, sizeof(lt->funcname));
 }
diff --git a/examples/performance-thread/common/lthread_cond.c 
b/examples/performance-thread/common/lthread_cond.c
index cdcc7a7b5a..e7be17089a 100644
--- a/examples/performance-thread/common/lthread_cond.c
+++ b/examples/performance-thread/common/lthread_cond.c
@@ -20,6 +20,7 @@
 
 #include 
 #include 
+#include 
 
 #include "lthread_api.h"
 #include "lthread_diag_api.h"
@@ -57,10 +58,9 @@ lthread_cond_init(char *name, struct lthread_cond **cond,
}
 
if (name == NULL)
-   strncpy(c->name, "no name", sizeof(c->name));
+   strlcpy(c->name, "no name", sizeof(c->name));
else
-   strncpy(c->name, name, sizeof(c->name));
-   c->name[sizeof(c->name)-1] = 0;
+   strlcpy(c->name, name, sizeof(c->name));
 
c->root_sched = THIS_SCHED;
 
diff --git a/examples/performance-thread/common/lthread_mutex.c 
b/examples/performance-thread/common/lthread_mutex.c
index 061fc5c19a..f3ec7c1c60 100644
--- a/examples/performance-thread/common/lthread_mutex.c
+++ b/examples/performance-thread/common/lthread_mutex.c
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "lthread_api.h"
 #include "lthread_int.h"
@@ -52,10 +53,9 @@ lthread_mutex_init(char *name, struct lthread_mutex **mutex,
}
 
if (name == NULL)
-   strncpy(m->name, "no name", sizeof(m->name));
+   strlcpy(m->name, "no name", sizeof(m->name));
else
-   strncpy(m->name, name, sizeof(m->name));
-   m->name[sizeof(m->name)-1] = 0;
+   strlcpy(m->name, name, sizeof(m->name));
 
m->root_sched = THIS_SCHED;
m->owner = NULL;
-- 
2.25.1

Re: [dpdk-dev] [EXT] [PATCH] app/test-eventdev: fix terminal colour after control-c exit

[Jerin Jacob]

On Mon, Oct 18, 2021 at 6:24 PM Pavan Nikhilesh Bhagavatula
 wrote:
>
> >Before this commit, a Control^C exit of the test-eventdev application
> >would print the worker packet percentages, and leave the terminal with
> >a green colour despite the colour reset being issued after the newline.
> >By moving the colour reset command before the \n the issue is fixed.
> >
> >Fixes: 6b1a14a83a06 ("app/eventdev: add packet distribution logs")
> >
> >Signed-off-by: Harry van Haaren 
> >
>
> Acked-by: Pavan Nikhilesh 

Applied to dpdk-next-eventdev/for-main. Thanks.



>
> >---
> >
> >Given this is an aesthetic only fix, I feel its not worth backporting.
> >Cc: pbhagavat...@marvell.com>
> >
> >---
> > app/test-eventdev/test_perf_common.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >diff --git a/app/test-eventdev/test_perf_common.c b/app/test-
> >eventdev/test_perf_common.c
> >index e0d9f05ecd..a1b8dd72ee 100644
> >--- a/app/test-eventdev/test_perf_common.c
> >+++ b/app/test-eventdev/test_perf_common.c
> >@@ -19,7 +19,7 @@ perf_test_result(struct evt_test *test, struct
> >evt_options *opt)
> >   total += t->worker[i].processed_pkts;
> >   for (i = 0; i < t->nb_workers; i++)
> >   printf("Worker %d packets: "CLGRN"%"PRIx64"
> >"CLNRM"percentage:"
> >-  CLGRN" %3.2f\n"CLNRM, i,
> >+  CLGRN" %3.2f"CLNRM"\n", i,
> >   t->worker[i].processed_pkts,
> >   (((double)t-
> >>worker[i].processed_pkts)/total)
> >   * 100);
> >--
> >2.30.2
>

Re: [dpdk-dev] [PATCH v10 2/7] ethdev: new API to resolve device capability name

[Andrew Rybchenko]

On 10/20/21 10:47 AM, Xueming(Steven) Li wrote:
> On Tue, 2021-10-19 at 20:57 +0300, Andrew Rybchenko wrote:
>> On 10/19/21 6:28 PM, Xueming Li wrote:
>>> This patch adds API to return name of device capability.
>>>
>>> Signed-off-by: Xueming Li 
>>
>> [snip]
>>
>>> diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
>>> index bc55f899f72..97217529449 100644
>>> --- a/lib/ethdev/rte_ethdev.c
>>> +++ b/lib/ethdev/rte_ethdev.c
>>> @@ -165,6 +165,20 @@ static const struct {
>>>   
>>>   #undef RTE_TX_OFFLOAD_BIT2STR
>>>   
>>> +#define RTE_ETH_DEV_CAPA_BIT2STR(_name)\
>>> +   { RTE_ETH_DEV_CAPA_##_name, #_name }
>>
>> In fact, such macros make more harm than add value.
>> It complicates grep by capability name. So, it is better
>> to drop the macro and just duplicate few symbols below.
> 
> Will update in next version. Eclipse resolves macros and search into
> expanded macros.
> 
> BTW, do you plan to review other patches today? If so I will hold new
> version a little bit to avoid explode maillist.

Sorry, I have no time to review testpmd patches today.
ethdev part LGTM.

[dpdk-dev] [PATCH v17 0/5] Add PIE support for HQoS library

[Liguzinski, WojciechX]

DPDK sched library is equipped with mechanism that secures it from the 
bufferbloat problem
which is a situation when excess buffers in the network cause high latency and 
latency
variation. Currently, it supports RED for active queue management. However, more
advanced queue management is required to address this problem and provide 
desirable
quality of service to users.

This solution (RFC) proposes usage of new algorithm called "PIE" (Proportional 
Integral
controller Enhanced) that can effectively and directly control queuing latency 
to address
the bufferbloat problem.

The implementation of mentioned functionality includes modification of existing 
and
adding a new set of data structures to the library, adding PIE related APIs.
This affects structures in public API/ABI. That is why deprecation notice is 
going
to be prepared and sent.

Liguzinski, WojciechX (5):
  sched: add PIE based congestion management
  example/qos_sched: add PIE support
  example/ip_pipeline: add PIE support
  doc/guides/prog_guide: added PIE
  app/test: add tests for PIE

 app/test/meson.build |4 +
 app/test/test_pie.c  | 1065 ++
 config/rte_config.h  |1 -
 doc/guides/prog_guide/glossary.rst   |3 +
 doc/guides/prog_guide/qos_framework.rst  |   64 +-
 doc/guides/prog_guide/traffic_management.rst |   13 +-
 drivers/net/softnic/rte_eth_softnic_tm.c |6 +-
 examples/ip_pipeline/tmgr.c  |  142 +--
 examples/qos_sched/app_thread.c  |1 -
 examples/qos_sched/cfg_file.c|  127 ++-
 examples/qos_sched/cfg_file.h|5 +
 examples/qos_sched/init.c|   27 +-
 examples/qos_sched/main.h|3 +
 examples/qos_sched/profile.cfg   |  196 ++--
 lib/sched/meson.build|   10 +-
 lib/sched/rte_pie.c  |   86 ++
 lib/sched/rte_pie.h  |  398 +++
 lib/sched/rte_sched.c|  241 ++--
 lib/sched/rte_sched.h|   63 +-
 lib/sched/version.map|4 +
 20 files changed, 2173 insertions(+), 286 deletions(-)
 create mode 100644 app/test/test_pie.c
 create mode 100644 lib/sched/rte_pie.c
 create mode 100644 lib/sched/rte_pie.h

-- 
2.25.1

Series-acked-by: Cristian Dumitrescu 

[dpdk-dev] [PATCH v17 1/5] sched: add PIE based congestion management

[Liguzinski, WojciechX]

Implement PIE based congestion management based on rfc8033

Signed-off-by: Liguzinski, WojciechX 
--
Changes in V17:
- Corrected paragraph link naming in qos_framework.rst to fix CI builds

Changes in V16:
- Fixed 'title underline too short' error in qos_framework.rst
- Applied __rte_unused macro to parameters in rte_sched_port_pie_dequeue()

---
 drivers/net/softnic/rte_eth_softnic_tm.c |   6 +-
 lib/sched/meson.build|  10 +-
 lib/sched/rte_pie.c  |  82 +
 lib/sched/rte_pie.h  | 393 +++
 lib/sched/rte_sched.c| 241 +-
 lib/sched/rte_sched.h|  63 +++-
 lib/sched/version.map|   4 +
 7 files changed, 703 insertions(+), 96 deletions(-)
 create mode 100644 lib/sched/rte_pie.c
 create mode 100644 lib/sched/rte_pie.h

diff --git a/drivers/net/softnic/rte_eth_softnic_tm.c 
b/drivers/net/softnic/rte_eth_softnic_tm.c
index 90baba15ce..e74092ce7f 100644
--- a/drivers/net/softnic/rte_eth_softnic_tm.c
+++ b/drivers/net/softnic/rte_eth_softnic_tm.c
@@ -420,7 +420,7 @@ pmd_tm_node_type_get(struct rte_eth_dev *dev,
return 0;
 }
 
-#ifdef RTE_SCHED_RED
+#ifdef RTE_SCHED_CMAN
 #define WRED_SUPPORTED 1
 #else
 #define WRED_SUPPORTED 0
@@ -2306,7 +2306,7 @@ tm_tc_wred_profile_get(struct rte_eth_dev *dev, uint32_t 
tc_id)
return NULL;
 }
 
-#ifdef RTE_SCHED_RED
+#ifdef RTE_SCHED_CMAN
 
 static void
 wred_profiles_set(struct rte_eth_dev *dev, uint32_t subport_id)
@@ -2321,7 +2321,7 @@ wred_profiles_set(struct rte_eth_dev *dev, uint32_t 
subport_id)
for (tc_id = 0; tc_id < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; tc_id++)
for (color = RTE_COLOR_GREEN; color < RTE_COLORS; color++) {
struct rte_red_params *dst =
-   &pp->red_params[tc_id][color];
+   &pp->cman_params->red_params[tc_id][color];
struct tm_wred_profile *src_wp =
tm_tc_wred_profile_get(dev, tc_id);
struct rte_tm_red_params *src =
diff --git a/lib/sched/meson.build b/lib/sched/meson.build
index b24f7b8775..e7ae9bcf19 100644
--- a/lib/sched/meson.build
+++ b/lib/sched/meson.build
@@ -1,11 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-sources = files('rte_sched.c', 'rte_red.c', 'rte_approx.c')
-headers = files(
-'rte_approx.h',
-'rte_red.h',
-'rte_sched.h',
-'rte_sched_common.h',
-)
+sources = files('rte_sched.c', 'rte_red.c', 'rte_approx.c', 'rte_pie.c')
+headers = files('rte_sched.h', 'rte_sched_common.h',
+   'rte_red.h', 'rte_approx.h', 'rte_pie.h')
 deps += ['mbuf', 'meter']
diff --git a/lib/sched/rte_pie.c b/lib/sched/rte_pie.c
new file mode 100644
index 00..2fcecb2db4
--- /dev/null
+++ b/lib/sched/rte_pie.c
@@ -0,0 +1,82 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Intel Corporation
+ */
+
+#include 
+
+#include "rte_pie.h"
+#include 
+#include 
+#include 
+
+#ifdef __INTEL_COMPILER
+#pragma warning(disable:2259) /* conversion may lose significant bits */
+#endif
+
+void
+rte_pie_rt_data_init(struct rte_pie *pie)
+{
+   if (pie == NULL) {
+   /* Allocate memory to use the PIE data structure */
+   pie = rte_malloc(NULL, sizeof(struct rte_pie), 0);
+
+   if (pie == NULL)
+   RTE_LOG(ERR, SCHED, "%s: Memory allocation fails\n", 
__func__);
+   }
+
+   pie->active = 0;
+   pie->in_measurement = 0;
+   pie->departed_bytes_count = 0;
+   pie->start_measurement = 0;
+   pie->last_measurement = 0;
+   pie->qlen = 0;
+   pie->avg_dq_time = 0;
+   pie->burst_allowance = 0;
+   pie->qdelay_old = 0;
+   pie->drop_prob = 0;
+   pie->accu_prob = 0;
+}
+
+int
+rte_pie_config_init(struct rte_pie_config *pie_cfg,
+   const uint16_t qdelay_ref,
+   const uint16_t dp_update_interval,
+   const uint16_t max_burst,
+   const uint16_t tailq_th)
+{
+   uint64_t tsc_hz = rte_get_tsc_hz();
+
+   if (pie_cfg == NULL)
+   return -1;
+
+   if (qdelay_ref <= 0) {
+   RTE_LOG(ERR, SCHED,
+   "%s: Incorrect value for qdelay_ref\n", __func__);
+   return -EINVAL;
+   }
+
+   if (dp_update_interval <= 0) {
+   RTE_LOG(ERR, SCHED,
+   "%s: Incorrect value for dp_update_interval\n", 
__func__);
+   return -EINVAL;
+   }
+
+   if (max_burst <= 0) {
+   RTE_LOG(ERR, SCHED,
+   "%s: Incorrect value for max_burst\n", __func__);
+   return -EINVAL;
+   }
+
+   if (tailq_th <= 0) {
+   RTE_LOG(ERR, SCHED,
+   "%s: Incorrect value for 

[dpdk-dev] [PATCH v17 2/5] example/qos_sched: add PIE support

[Liguzinski, WojciechX]

patch add support enable PIE or RED by
parsing config file.

Signed-off-by: Liguzinski, WojciechX 
---
 config/rte_config.h |   1 -
 examples/qos_sched/app_thread.c |   1 -
 examples/qos_sched/cfg_file.c   | 127 +++--
 examples/qos_sched/cfg_file.h   |   5 +
 examples/qos_sched/init.c   |  27 +++--
 examples/qos_sched/main.h   |   3 +
 examples/qos_sched/profile.cfg  | 196 +---
 7 files changed, 250 insertions(+), 110 deletions(-)

diff --git a/config/rte_config.h b/config/rte_config.h
index 590903c07d..48132f27df 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -89,7 +89,6 @@
 #define RTE_MAX_LCORE_FREQS 64
 
 /* rte_sched defines */
-#undef RTE_SCHED_RED
 #undef RTE_SCHED_COLLECT_STATS
 #undef RTE_SCHED_SUBPORT_TC_OV
 #define RTE_SCHED_PORT_N_GRINDERS 8
diff --git a/examples/qos_sched/app_thread.c b/examples/qos_sched/app_thread.c
index dbc878b553..895c0d3592 100644
--- a/examples/qos_sched/app_thread.c
+++ b/examples/qos_sched/app_thread.c
@@ -205,7 +205,6 @@ app_worker_thread(struct thread_conf **confs)
if (likely(nb_pkt)) {
int nb_sent = rte_sched_port_enqueue(conf->sched_port, 
mbufs,
nb_pkt);
-
APP_STATS_ADD(conf->stat.nb_drop, nb_pkt - nb_sent);
APP_STATS_ADD(conf->stat.nb_rx, nb_pkt);
}
diff --git a/examples/qos_sched/cfg_file.c b/examples/qos_sched/cfg_file.c
index cd167bd8e6..450482f07d 100644
--- a/examples/qos_sched/cfg_file.c
+++ b/examples/qos_sched/cfg_file.c
@@ -229,6 +229,40 @@ 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;
+   subport_p->cman_params->cman_mode = cman_p.cman_mode;
+
+   for (j = 0; j < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; j++) {
+   if (subport_p->cman_params->cman_mode ==
+   RTE_SCHED_CMAN_RED) {
+   for (k = 0; k < RTE_COLORS; k++) {
+   subport_p->cman_params->red_params[j][k].min_th 
=
+   cman_p.red_params[j][k].min_th;
+   subport_p->cman_params->red_params[j][k].max_th 
=
+   cman_p.red_params[j][k].max_th;
+   
subport_p->cman_params->red_params[j][k].maxp_inv =
+   cman_p.red_params[j][k].maxp_inv;
+   
subport_p->cman_params->red_params[j][k].wq_log2 =
+   cman_p.red_params[j][k].wq_log2;
+   }
+   } else {
+   subport_p->cman_params->pie_params[j].qdelay_ref =
+   cman_p.pie_params[j].qdelay_ref;
+   
subport_p->cman_params->pie_params[j].dp_update_interval =
+   cman_p.pie_params[j].dp_update_interval;
+   subport_p->cman_params->pie_params[j].max_burst =
+   cman_p.pie_params[j].max_burst;
+   subport_p->cman_params->pie_params[j].tailq_th =
+   cman_p.pie_params[j].tailq_th;
+   }
+   }
+}
+#endif
+
 int
 cfg_load_subport(struct rte_cfgfile *cfg, struct rte_sched_subport_params 
*subport_params)
 {
@@ -242,25 +276,26 @@ 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_RED
-   char sec_name[CFG_NAME_LEN];
-   struct rte_red_params 
red_params[RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE][RTE_COLORS];
+#ifdef RTE_SCHED_CMAN
+   struct rte_sched_cman_params cman_params = {
+   .cman_mode = RTE_SCHED_CMAN_RED,
+   .red_params = { },
+   };
 
-   snprintf(sec_name, sizeof(sec_name), "red");
-
-   if (rte_cfgfile_has_section(cfg, sec_name)) {
+   if (rte_cfgfile_has_section(cfg, "red")) {
+   cman_params.cman_mode = RTE_SCHED_CMAN_RED;
 
for (i = 0; i < RTE_SCHED_TRAFFIC_CLASSES_PER_PIPE; i++) {
char str[32];
 
-   /* Parse WRED min thresholds */
-   snprintf(str, sizeof(str), "tc %d wred min", i);
-   entry = rte_cfgfile_get_entry(cfg, sec_name, str);
+   /* Parse RED min thresholds */
+   snprintf(str, sizeof(str), "tc %d red min", i);
+   entry = rte_cfgfile_get_entry(cfg, "red", str);
if (entry) {
char *next;
/* for each packet colou

[dpdk-dev] [PATCH v17 3/5] example/ip_pipeline: add PIE support

[Liguzinski, WojciechX]

Adding the PIE support for IP Pipeline

Signed-off-by: Liguzinski, WojciechX 
---
 examples/ip_pipeline/tmgr.c | 142 +++-
 1 file changed, 74 insertions(+), 68 deletions(-)

diff --git a/examples/ip_pipeline/tmgr.c b/examples/ip_pipeline/tmgr.c
index e4e364cbc0..b138e885cf 100644
--- a/examples/ip_pipeline/tmgr.c
+++ b/examples/ip_pipeline/tmgr.c
@@ -17,6 +17,77 @@ 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 */
+   [0][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [0][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [0][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+
+   /* Traffic Class 1 - Colors Green / Yellow / Red */
+   [1][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [1][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [1][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+
+   /* Traffic Class 2 - Colors Green / Yellow / Red */
+   [2][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [2][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [2][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+
+   /* Traffic Class 3 - Colors Green / Yellow / Red */
+   [3][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [3][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [3][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+
+   /* Traffic Class 4 - Colors Green / Yellow / Red */
+   [4][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [4][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [4][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+
+   /* Traffic Class 5 - Colors Green / Yellow / Red */
+   [5][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [5][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [5][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+
+   /* Traffic Class 6 - Colors Green / Yellow / Red */
+   [6][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [6][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [6][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+
+   /* Traffic Class 7 - Colors Green / Yellow / Red */
+   [7][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [7][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [7][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+
+   /* Traffic Class 8 - Colors Green / Yellow / Red */
+   [8][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [8][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [8][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+
+   /* Traffic Class 9 - Colors Green / Yellow / Red */
+   [9][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [9][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [9][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+
+   /* Traffic Class 10 - Colors Green / Yellow / Red */
+   [10][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [10][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [10][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+
+   /* Traffic Class 11 - Colors Green / Yellow / Red */
+   [11][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [11][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [11][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+
+   /* Traffic Class 12 - Colors Green / Yellow / Red */
+   [12][0] = {.min_th = 48, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [12][1] = {.min_th = 40, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   [12][2] = {.min_th = 32, .max_th = 64, .maxp_inv = 10, .wq_log2 
= 9},
+   },
+};
+#endif /* RTE_SCHED_CMAN */
+
 static uint32_t n_pipe_profiles;
 
 static const str

[dpdk-dev] [PATCH v17 4/5] doc/guides/prog_guide: added PIE

[Liguzinski, WojciechX]

Added PIE related information to documentation.

Signed-off-by: Liguzinski, WojciechX 
---
 doc/guides/prog_guide/glossary.rst   |  3 +
 doc/guides/prog_guide/qos_framework.rst  | 64 +---
 doc/guides/prog_guide/traffic_management.rst | 13 +++-
 3 files changed, 68 insertions(+), 12 deletions(-)

diff --git a/doc/guides/prog_guide/glossary.rst 
b/doc/guides/prog_guide/glossary.rst
index 7044a7df2a..fb0910ba5b 100644
--- a/doc/guides/prog_guide/glossary.rst
+++ b/doc/guides/prog_guide/glossary.rst
@@ -158,6 +158,9 @@ PCI
 PHY
An abbreviation for the physical layer of the OSI model.
 
+PIE
+   Proportional Integral Controller Enhanced (RFC8033)
+
 pktmbuf
An *mbuf* carrying a network packet.
 
diff --git a/doc/guides/prog_guide/qos_framework.rst 
b/doc/guides/prog_guide/qos_framework.rst
index 3b8a1184b0..7c37b78804 100644
--- a/doc/guides/prog_guide/qos_framework.rst
+++ b/doc/guides/prog_guide/qos_framework.rst
@@ -56,7 +56,8 @@ A functional description of each block is provided in the 
following table.
|   ||  
  |

+---+++
| 7 | Dropper| Congestion management using the Random Early 
Detection (RED) algorithm |
-   |   || (specified by the Sally Floyd - Van Jacobson 
paper) or Weighted RED (WRED).|
+   |   || (specified by the Sally Floyd - Van Jacobson 
paper) or Weighted RED (WRED) |
+   |   || or Proportional Integral Controller Enhanced 
(PIE).|
|   || Drop packets based on the current scheduler 
queue load level and packet|
|   || priority. When congestion is experienced, 
lower priority packets are dropped   |
|   || first.   
  |
@@ -421,7 +422,7 @@ No input packet can be part of more than one pipeline stage 
at a given time.
 The congestion management scheme implemented by the enqueue pipeline described 
above is very basic:
 packets are enqueued until a specific queue becomes full,
 then all the packets destined to the same queue are dropped until packets are 
consumed (by the dequeue operation).
-This can be improved by enabling RED/WRED as part of the enqueue pipeline 
which looks at the queue occupancy and
+This can be improved by enabling RED/WRED or PIE as part of the enqueue 
pipeline which looks at the queue occupancy and
 packet priority in order to yield the enqueue/drop decision for a specific 
packet
 (as opposed to enqueuing all packets / dropping all packets indiscriminately).
 
@@ -1155,13 +1156,13 @@ If the number of queues is small,
 then the performance of the port scheduler for the same level of active 
traffic is expected to be worse than
 the performance of a small set of message passing queues.
 
-.. _Dropper:
+.. _Droppers:
 
-Dropper

+Droppers
+
 
 The purpose of the DPDK dropper is to drop packets arriving at a packet 
scheduler to avoid congestion.
-The dropper supports the Random Early Detection (RED),
+The dropper supports the Proportional Integral Controller Enhanced (PIE), 
Random Early Detection (RED),
 Weighted Random Early Detection (WRED) and tail drop algorithms.
 :numref:`figure_blk_diag_dropper` illustrates how the dropper integrates with 
the scheduler.
 The DPDK currently does not support congestion management
@@ -1174,9 +1175,13 @@ so the dropper provides the only method for congestion 
avoidance.
High-level Block Diagram of the DPDK Dropper
 
 
-The dropper uses the Random Early Detection (RED) congestion avoidance 
algorithm as documented in the reference publication.
-The purpose of the RED algorithm is to monitor a packet queue,
+The dropper uses one of two congestion avoidance algorithms:
+   - the Random Early Detection (RED) as documented in the reference 
publication.
+   - the Proportional Integral Controller Enhanced (PIE) as documented in 
RFC8033 publication.
+
+The purpose of the RED/PIE algorithm is to monitor a packet queue,
 determine the current congestion level in the queue and decide whether an 
arriving packet should be enqueued or dropped.
+
 The RED algorithm uses an Exponential Weighted Moving Average (EWMA) filter to 
compute average queue size which
 gives an indication of the current congestion level in the queue.
 
@@ -1192,7 +1197,7 @@ This occurs when a packet queue has reached maximum 
capacity and cannot store an
 In this situation, all arriving packets are dropped.
 
 The flow through the dropper is illustrated in 
:numref:`figure_flow_tru_droppper`.
-The RED/WRED algorithm is exercised first and tail drop second.
+The RED/WRED/PIE algorithm is exercised first and tail drop

[dpdk-dev] [PATCH v17 5/5] app/test: add tests for PIE

[Liguzinski, WojciechX]

Tests for PIE code added to test application.

Signed-off-by: Liguzinski, WojciechX 
---
 app/test/meson.build |4 +
 app/test/test_pie.c  | 1065 ++
 lib/sched/rte_pie.c  |6 +-
 lib/sched/rte_pie.h  |   17 +-
 4 files changed, 1085 insertions(+), 7 deletions(-)
 create mode 100644 app/test/test_pie.c

diff --git a/app/test/meson.build b/app/test/meson.build
index a16374b7a1..a189b4ebd3 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -114,6 +114,7 @@ test_sources = files(
 'test_reciprocal_division.c',
 'test_reciprocal_division_perf.c',
 'test_red.c',
+'test_pie.c',
 'test_reorder.c',
 'test_rib.c',
 'test_rib6.c',
@@ -245,6 +246,7 @@ fast_tests = [
 ['prefetch_autotest', true],
 ['rcu_qsbr_autotest', true],
 ['red_autotest', true],
+['pie_autotest', true],
 ['rib_autotest', true],
 ['rib6_autotest', true],
 ['ring_autotest', true],
@@ -296,6 +298,7 @@ perf_test_names = [
 'fib_slow_autotest',
 'fib_perf_autotest',
 'red_all',
+'pie_all',
 'barrier_autotest',
 'hash_multiwriter_autotest',
 'timer_racecond_autotest',
@@ -309,6 +312,7 @@ perf_test_names = [
 'fib6_perf_autotest',
 'rcu_qsbr_perf_autotest',
 'red_perf',
+'pie_perf',
 'distributor_perf_autotest',
 'pmd_perf_autotest',
 'stack_perf_autotest',
diff --git a/app/test/test_pie.c b/app/test/test_pie.c
new file mode 100644
index 00..dfa69d1c7e
--- /dev/null
+++ b/app/test/test_pie.c
@@ -0,0 +1,1065 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "test.h"
+
+#include 
+
+#ifdef __INTEL_COMPILER
+#pragma warning(disable:2259)   /* conversion may lose significant bits */
+#pragma warning(disable:181)/* Arg incompatible with format string */
+#endif
+
+/**< structures for testing rte_pie performance and function */
+struct test_rte_pie_config {/**< Test structure for RTE_PIE config */
+   struct rte_pie_config *pconfig; /**< RTE_PIE configuration parameters */
+   uint8_t num_cfg;/**< Number of RTE_PIE configs to test 
*/
+   uint16_t qdelay_ref;/**< Latency Target (milliseconds) */
+   uint16_t *dp_update_interval;   /**< Update interval for drop 
probability
+ * (milliseconds)
+ */
+   uint16_t *max_burst;/**< Max Burst Allowance (milliseconds) 
*/
+   uint16_t tailq_th;  /**< Tailq drop threshold (packet 
counts) */
+};
+
+struct test_queue { /**< Test structure for RTE_PIE Queues */
+   struct rte_pie *pdata_in;   /**< RTE_PIE runtime data input */
+   struct rte_pie *pdata_out;  /**< RTE_PIE runtime data 
output*/
+   uint32_t num_queues;/**< Number of RTE_PIE queues to test */
+   uint32_t *qlen; /**< Queue size */
+   uint32_t q_ramp_up; /**< Num of enqueues to ramp up the 
queue */
+   double drop_tolerance;  /**< Drop tolerance of packets not 
enqueued */
+};
+
+struct test_var {   /**< Test variables used for testing 
RTE_PIE */
+   uint32_t num_iterations;/**< Number of test iterations */
+   uint32_t num_ops;   /**< Number of test operations */
+   uint64_t clk_freq;  /**< CPU clock frequency */
+   uint32_t *dropped;  /**< Test operations dropped */
+   uint32_t *enqueued; /**< Test operations enqueued */
+   uint32_t *dequeued; /**< Test operations dequeued */
+};
+
+struct test_config {/**< Primary test structure for RTE_PIE */
+   const char *ifname; /**< Interface name */
+   const char *msg;/**< Test message for display */
+   const char *htxt;   /**< Header txt display for result 
output */
+   struct test_rte_pie_config *tconfig; /**< Test structure for RTE_PIE 
config */
+   struct test_queue *tqueue;  /**< Test structure for RTE_PIE Queues 
*/
+   struct test_var *tvar;  /**< Test variables used for testing 
RTE_PIE */
+   uint32_t *tlevel;   /**< Queue levels */
+};
+
+enum test_result {
+   FAIL = 0,
+   PASS
+};
+
+/**< Test structure to define tests to run */
+struct tests {
+   struct test_config *testcfg;
+   enum test_result (*testfn)(struct test_config *cfg);
+};
+
+struct rdtsc_prof {
+   uint64_t clk_start;
+   uint64_t clk_min;   /**< min clocks */
+   uint64_t clk_max;   /**< max clocks */
+   uint64_t clk_avgc;  /**< cou

Re: [dpdk-dev] [PATCH v3 2/6] mempool: add namespace prefix to flags

[Andrew Rybchenko]

On 10/19/21 11:03 PM, David Marchand wrote:
> On Tue, Oct 19, 2021 at 7:40 PM Andrew Rybchenko
>  wrote:
>> @@ -752,7 +752,7 @@ 
>> test_mempool_flag_non_io_set_when_no_iova_contig_set(void)
>> ret = rte_mempool_populate_default(mp);
>> RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s",
>> rte_strerror(-ret));
>> -   RTE_TEST_ASSERT(mp->flags & MEMPOOL_F_NON_IO,
>> +   RTE_TEST_ASSERT(mp->flags & RTE_MEMPOOL_F_NON_IO,
>> "NON_IO flag is not set when NO_IOVA_CONTIG is set");
>> ret = TEST_SUCCESS;
>>  exit:
> 
> There is one more flag, hunk fixed adding missing:
> 
> @@ -745,14 +745,14 @@ 
> test_mempool_flag_non_io_set_when_no_iova_contig_set(void)
> 
>  mp = rte_mempool_create_empty("empty", MEMPOOL_SIZE,
>MEMPOOL_ELT_SIZE, 0, 0,
> -  SOCKET_ID_ANY, MEMPOOL_F_NO_IOVA_CONTIG);
> +  SOCKET_ID_ANY, RTE_MEMPOOL_F_NO_IOVA_CONTIG);
>  RTE_TEST_ASSERT_NOT_NULL(mp, "Cannot create mempool: %s",
>   rte_strerror(rte_errno));
>  rte_mempool_set_ops_byname(mp, rte_mbuf_best_mempool_ops(), NULL);
>  ret = rte_mempool_populate_default(mp);
>  RTE_TEST_ASSERT(ret > 0, "Failed to populate mempool: %s",
>  rte_strerror(-ret));
> -RTE_TEST_ASSERT(mp->flags & MEMPOOL_F_NON_IO,
> +RTE_TEST_ASSERT(mp->flags & RTE_MEMPOOL_F_NON_IO,
>  "NON_IO flag is not set when NO_IOVA_CONTIG is set");
>  ret = TEST_SUCCESS;
>  exit:
> 

Thanks, sorry that I've overlooked it on rebase.

Re: [dpdk-dev] [PATCH v3 0/6] mempool: cleanup namespace

[David Marchand]

On Tue, Oct 19, 2021 at 10:09 PM David Marchand
 wrote:
> On Tue, Oct 19, 2021 at 7:40 PM Andrew Rybchenko
>  wrote:
> >
> > Add RTE_ prefix to mempool API including internal. Keep old public API
> > with fallback to new defines. Internal API is just renamed.
> >
> > v3:
> > - fix typo
> > - rebase on top of current main
> > - add prefix to newly added MEMPOOL_F_NON_IO
> > - fix deprecation usage
> > - add Fixes tag the patch which deprecates unused macros
>
> I spotted a little issue diffing with your v3 (see comment on patch
> 2), and fixed your v3 in a local branch of mine.

Series applied with fix on patch 2.
Thanks.


-- 
David Marchand

Re: [dpdk-dev] [PATCH v3 0/6] mempool: cleanup namespace

[Andrew Rybchenko]

On 10/19/21 11:09 PM, David Marchand wrote:
> On Tue, Oct 19, 2021 at 7:40 PM Andrew Rybchenko
>  wrote:
>>
>> Add RTE_ prefix to mempool API including internal. Keep old public API
>> with fallback to new defines. Internal API is just renamed.
>>
>> v3:
>> - fix typo
>> - rebase on top of current main
>> - add prefix to newly added MEMPOOL_F_NON_IO
>> - fix deprecation usage
>> - add Fixes tag the patch which deprecates unused macros
> 
> Thanks for the quick rebase.
> I had rebased v2 before Olivier comments.
> I spotted a little issue diffing with your v3 (see comment on patch
> 2), and fixed your v3 in a local branch of mine.
> It passes my checks.
> 
> I'll wait tomorrow, to see if Olivier wants to send some acks.

Olivier has just added missing Acks. Do you need v4 from me
with patch 2 fixes? Your changes LGTM and I don't mind if you
fix it on apply.

Re: [dpdk-dev] [PATCH] mempool: accept user flags only

[David Marchand]

On Mon, Oct 18, 2021 at 10:36 AM Olivier Matz  wrote:
>
> On Mon, Oct 18, 2021 at 10:26:35AM +0200, David Marchand wrote:
> > As reported by Dmitry, MEMPOOL_F_POOL_CREATED is a flag only manipulated
> > internally.
> > This flag is not supposed to be requested from an application and would
> > probably result in an incorrect behavior if an application did pass it.
> >
> > Other internal flags may be introduced later.
> >
> > Rework the check and export a mask of valid user flags for use in the
> > unit test.
> >
> > Fixes: b240af8b10f9 ("mempool: enforce valid flags at creation")
> >
> > Reported-by: Dmitry Kozlyuk 
> > Signed-off-by: David Marchand 
> Acked-by: Olivier Matz 
Acked-by: Andrew Rybchenko 

Rebased on top of mempool cleanup series, and applied.
Thanks.


-- 
David Marchand

Re: [dpdk-dev] [PATCH v10 07/16] dma/idxd: add configure and info_get functions

[fengchengwen]

Reviewed-by: Chengwen Feng 

On 2021/10/19 22:10, Kevin Laatz wrote:
> Add functions for device configuration. The info_get function is included
> here since it can be useful for checking successful configuration.
> 
> Documentation is also updated to add device configuration usage info.
> 
> Signed-off-by: Bruce Richardson 
> Signed-off-by: Kevin Laatz 
> Reviewed-by: Conor Walsh 
> ---

[snip]

Re: [dpdk-dev] [PATCH v3 0/6] mempool: cleanup namespace

[Andrew Rybchenko]

On 10/20/21 10:52 AM, David Marchand wrote:
> On Tue, Oct 19, 2021 at 10:09 PM David Marchand
>  wrote:
>> On Tue, Oct 19, 2021 at 7:40 PM Andrew Rybchenko
>>  wrote:
>>>
>>> Add RTE_ prefix to mempool API including internal. Keep old public API
>>> with fallback to new defines. Internal API is just renamed.
>>>
>>> v3:
>>> - fix typo
>>> - rebase on top of current main
>>> - add prefix to newly added MEMPOOL_F_NON_IO
>>> - fix deprecation usage
>>> - add Fixes tag the patch which deprecates unused macros
>>
>> I spotted a little issue diffing with your v3 (see comment on patch
>> 2), and fixed your v3 in a local branch of mine.
> 
> Series applied with fix on patch 2.
> Thanks.

Sorry, I've not noticed this reply before my question.
Many thanks that you agreed to accept these patches
that late.

Re: [dpdk-dev] [PATCH v10 08/16] dma/idxd: add start and stop functions for pci devices

[fengchengwen]

On 2021/10/19 22:10, Kevin Laatz wrote:
> Add device start/stop functions for DSA devices bound to vfio. For devices
> bound to the IDXD kernel driver, these are not required since the IDXD
> kernel driver takes care of this.
> 
> Signed-off-by: Bruce Richardson 
> Signed-off-by: Kevin Laatz 
> Reviewed-by: Conor Walsh 
> ---

[snip]

>  
> +static int
> +idxd_pci_dev_stop(struct rte_dma_dev *dev)
> +{
> + struct idxd_dmadev *idxd = dev->fp_obj->dev_private;
> + uint8_t err_code;
> +
> + if (!idxd_is_wq_enabled(idxd)) {
> + IDXD_PMD_ERR("Work queue %d already disabled", idxd->qid);
> + return -EALREADY;

suggest return 0.

> + }
> +
> + err_code = idxd_pci_dev_command(idxd, idxd_disable_wq);
> + if (err_code || idxd_is_wq_enabled(idxd)) {
> + IDXD_PMD_ERR("Failed disabling work queue %d, error code: %#x",
> + idxd->qid, err_code);
> + return err_code == 0 ? -1 : -err_code;
> + }
> + IDXD_PMD_DEBUG("Work queue %d disabled OK", idxd->qid);
> +
> + return 0;
> +}
> +
> +static int
> +idxd_pci_dev_start(struct rte_dma_dev *dev)
> +{
> + struct idxd_dmadev *idxd = dev->fp_obj->dev_private;
> + uint8_t err_code;
> +
> + if (idxd_is_wq_enabled(idxd)) {
> + IDXD_PMD_WARN("WQ %d already enabled", idxd->qid);
> + return 0;
> + }
> +
> + if (idxd->desc_ring == NULL) {
> + IDXD_PMD_ERR("WQ %d has not been fully configured", idxd->qid);
> + return -EINVAL;
> + }
> +
> + err_code = idxd_pci_dev_command(idxd, idxd_enable_wq);
> + if (err_code || !idxd_is_wq_enabled(idxd)) {
> + IDXD_PMD_ERR("Failed enabling work queue %d, error code: %#x",
> + idxd->qid, err_code);
> + return err_code == 0 ? -1 : -err_code;
> + }
> + IDXD_PMD_DEBUG("Work queue %d enabled OK", idxd->qid);
> +
> + return 0;
> +}
> +
>  static int
>  idxd_pci_dev_close(struct rte_dma_dev *dev)
>  {
> @@ -87,6 +136,8 @@ static const struct rte_dma_dev_ops idxd_pci_ops = {
>   .dev_configure = idxd_configure,
>   .vchan_setup = idxd_vchan_setup,
>   .dev_info_get = idxd_info_get,
> + .dev_start = idxd_pci_dev_start,
> + .dev_stop = idxd_pci_dev_stop,
>  };
>  
>  /* each portal uses 4 x 4k pages */
> 

Re: [dpdk-dev] [PATCH v3 0/6] mempool: cleanup namespace

[David Marchand]

On Wed, Oct 20, 2021 at 9:52 AM Andrew Rybchenko
 wrote:
> > Thanks for the quick rebase.
> > I had rebased v2 before Olivier comments.
> > I spotted a little issue diffing with your v3 (see comment on patch
> > 2), and fixed your v3 in a local branch of mine.
> > It passes my checks.
> >
> > I'll wait tomorrow, to see if Olivier wants to send some acks.
>
> Olivier has just added missing Acks. Do you need v4 from me
> with patch 2 fixes? Your changes LGTM and I don't mind if you
> fix it on apply.

I applied Olivier acks.
Patches are pushed if you want to double check, but I think we are good.


Now looking at mbuf offload namespace series... :-)


-- 
David Marchand

Re: [dpdk-dev] [PATCH v10 06/16] dma/idxd: add datapath structures

[Bruce Richardson]

On Wed, Oct 20, 2021 at 03:44:28PM +0800, fengchengwen wrote:
> On 2021/10/19 22:10, Kevin Laatz wrote:
> > Add data structures required for the data path for IDXD devices.
> > 
> > Signed-off-by: Bruce Richardson 
> > Signed-off-by: Kevin Laatz 
> > Reviewed-by: Conor Walsh 
> > ---
> >  drivers/dma/idxd/idxd_bus.c  |  1 +
> >  drivers/dma/idxd/idxd_common.c   | 33 +
> >  drivers/dma/idxd/idxd_hw_defs.h  | 41 
> >  drivers/dma/idxd/idxd_internal.h |  4 
> >  drivers/dma/idxd/idxd_pci.c  |  2 ++
> >  5 files changed, 81 insertions(+)
> 
> [snip]
> 
> > +/**
> > + * Hardware descriptor used by DSA hardware, for both bursts and
> > + * for individual operations.
> > + */
> > +struct idxd_hw_desc {
> > +   uint32_t pasid;
> > +   uint32_t op_flags;
> > +   rte_iova_t completion;
> > +
> > +   RTE_STD_C11
> > +   union {
> > +   rte_iova_t src;  /* source address for copy ops etc. */
> > +   rte_iova_t desc_addr; /* descriptor pointer for batch */
> > +   };
> > +   rte_iova_t dst;
> > +
> > +   uint32_t size;/* length of data for op, or batch size */
> > +
> > +   uint16_t intr_handle; /* completion interrupt handle */
> > +
> > +   /* remaining 26 bytes are reserved */
> > +   uint16_t __reserved[13];
> 
> The non-reserved take about 30+B, and the struct align 64, so the 
> __reserved[13] could delete.
> 
> It's a minor problem, so:
> Reviewed-by: Chengwen Feng 
> 

There are actually cases where that reserved field makes a difference. If
we go to initialize a descriptor as a local variable the compiler is required
to initialize all unspecified fields to 0, which means that if we don't
explicitly put in place those reserved fields those bytes will be
uninitialized. Since the hardware requires all unused fields to be zero, we
need to keep this field in place to simplify the code and save us having to
do extra memsets to zero the unused space.

Re: [dpdk-dev] [PATCH v2 3/3] test/devargs: add devargs test cases

[Xueming(Steven) Li]

On Wed, 2021-10-20 at 09:38 +0200, David Marchand wrote:
> On Wed, Oct 20, 2021 at 9:32 AM Xueming Li  wrote:
> > 
> > Initial version to test Global devargs syntax.
> > 
> > Signed-off-by: Xueming Li 
> > ---
> >  app/test/autotest_data.py | 803 ++
> 
> This file is getting reintroduced by your patch.
> We dropped it recently:
> https://git.dpdk.org/dpdk/commit/?id=8c745bb62340e7b6a3ad61e5d79dfceebd4c28e4

My bad, forgot to remove it :) new version posted.

> 
> 
> >  app/test/meson.build  |   2 +
> >  app/test/test_devargs.c   | 184 +
> >  3 files changed, 989 insertions(+)
> >  create mode 100644 app/test/autotest_data.py
> >  create mode 100644 app/test/test_devargs.c
> > 
> 
> 

[dpdk-dev] [Bug 829] [build]Meson build 'enic' failed on OpenSuse15.2 with GCC 7.5.0

[bugzilla]

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

longfengx.li...@intel.com (longfengx.li...@intel.com) changed:

   What|Removed |Added

 Status|IN_PROGRESS |RESOLVED
 Resolution|--- |FIXED

--- Comment #6 from longfengx.li...@intel.com (longfengx.li...@intel.com) ---
Closed this bug.See the previous note for the reason

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

Re: [dpdk-dev] [PATCH v10 09/16] dma/idxd: add data-path job submission functions

[fengchengwen]

On 2021/10/19 22:10, Kevin Laatz wrote:
> Add data path functions for enqueuing and submitting operations to DSA
> devices.
> 
> Documentation updates are included for dmadev library and IDXD driver docs
> as appropriate.
> 
> Signed-off-by: Bruce Richardson 
> Signed-off-by: Kevin Laatz 
> Reviewed-by: Conor Walsh 
> ---
>  doc/guides/dmadevs/idxd.rst  |   9 +++
>  doc/guides/prog_guide/dmadev.rst |  19 +
>  drivers/dma/idxd/idxd_common.c   | 135 +++
>  drivers/dma/idxd/idxd_internal.h |   5 ++
>  drivers/dma/idxd/meson.build |   1 +
>  5 files changed, 169 insertions(+)
> 
> diff --git a/doc/guides/dmadevs/idxd.rst b/doc/guides/dmadevs/idxd.rst
> index 711890bd9e..d548c4751a 100644
> --- a/doc/guides/dmadevs/idxd.rst
> +++ b/doc/guides/dmadevs/idxd.rst
> @@ -138,3 +138,12 @@ IDXD configuration requirements:
>  
>  Once configured, the device can then be made ready for use by calling the
>  ``rte_dma_start()`` API.
> +
> +Performing Data Copies
> +~~~
> +
> +Refer to the :ref:`Enqueue / Dequeue APIs ` section 
> of the dmadev library
> +documentation for details on operation enqueue and submission API usage.
> +
> +It is expected that, for efficiency reasons, a burst of operations will be 
> enqueued to the
> +device via multiple enqueue calls between calls to the ``rte_dma_submit()`` 
> function.
> diff --git a/doc/guides/prog_guide/dmadev.rst 
> b/doc/guides/prog_guide/dmadev.rst
> index 32f7147862..e853ffda3a 100644
> --- a/doc/guides/prog_guide/dmadev.rst
> +++ b/doc/guides/prog_guide/dmadev.rst
> @@ -67,6 +67,8 @@ can be used to get the device info and supported features.
>  Silent mode is a special device capability which does not require the
>  application to invoke dequeue APIs.
>  
> +.. _dmadev_enqueue_dequeue:
> +
>  
>  Enqueue / Dequeue APIs
>  ~~
> @@ -80,6 +82,23 @@ The ``rte_dma_submit`` API is used to issue doorbell to 
> hardware.
>  Alternatively the ``RTE_DMA_OP_FLAG_SUBMIT`` flag can be passed to the 
> enqueue
>  APIs to also issue the doorbell to hardware.
>  
> +The following code demonstrates how to enqueue a burst of copies to the
> +device and start the hardware processing of them:
> +
> +.. code-block:: C
> +
> +   struct rte_mbuf *srcs[DMA_BURST_SZ], *dsts[DMA_BURST_SZ];
> +   unsigned int i;
> +
> +   for (i = 0; i < RTE_DIM(srcs); i++) {
> +  if (rte_dma_copy(dev_id, vchan, rte_pktmbuf_iova(srcs),
> +rte_pktmbuf_iova(dsts), COPY_LEN, 0) < 0) {

srcs->srcs[i]
dsts->dsts[i]

could add my reviewed-by after fix it, thanks.

> + PRINT_ERR("Error with rte_dma_copy for buffer %u\n", i);
> + return -1;
> +  }
> +   }
> +   rte_dma_submit(dev_id, vchan);
> +
>  There are two dequeue APIs ``rte_dma_completed`` and
>  ``rte_dma_completed_status``, these are used to obtain the results of the
>  enqueue requests. ``rte_dma_completed`` will return the number of 
> successfully
> diff --git a/drivers/dma/idxd/idxd_common.c b/drivers/dma/idxd/idxd_common.c
> index b0c79a2e42..a686ad421c 100644
> --- a/drivers/dma/idxd/idxd_common.c
> +++ b/drivers/dma/idxd/idxd_common.c
> @@ -2,14 +2,145 @@
>   * Copyright 2021 Intel Corporation
>   */
>  

[snip]

Re: [dpdk-dev] [PATCH] build/windows: remove separate list of libs

[Bruce Richardson]

On Wed, Oct 20, 2021 at 08:29:09AM +0200, David Marchand wrote:
> On Tue, Oct 19, 2021 at 6:19 PM Bruce Richardson
>  wrote:
> >
> > Rather than maintaining a separate list of libraries which are to be
> > built on windows, use the standard library list and explicitly add to
> > each library that is not to be built a check for windows and disable
> > the library at that per-lib level. As well as shortening the main
> > lib/meson.build file, this also leads to the build summary at the end of
> > the meson config run correctly listing the libraries which are not to be
> > built.
> >
> > Depends-on: patch-102219
> 
> Not all CI handle dependencies.
> Can you resend those patches as a single series?
> 
> Thanks.
>
Yes, will do. 

Re: [dpdk-dev] [EXT] [PATCH v4 00/14] drivers/crypto: introduce ipsec_mb framework

[Akhil Goyal]

> > > Acked-by: Akhil Goyal 
> > > Patches are rebased over TOT of next-crypto
> > > Release notes are updated
> > > Applied to dpdk-next-crypto
> >
> > I think compilation has not been tested.
> 
> I am not sure why this is failing at your end,
> On my machine, it is getting compiled with intel-ipsec-mb v1.0.
> I am double checking compilation for all the individual patches as well.
> Will inform you once it is completed.
> On TOT of next crypto, I did a quick test touched the pmd_zuc.c and it is
> getting compiled.
> cavium@cavium-DT13:~/up/dpdk-next-crypto$ touch
> drivers/crypto/ipsec_mb/pmd_zuc.c
> cavium@cavium-DT13:~/up/dpdk-next-crypto$ ./devtools/test-meson-
> builds.sh
> ninja: Entering directory `./build-gcc-static'
> [24/24] Linking target app/test/dpdk-test.
> ninja: Entering directory `./build-gcc-shared'
> [8/8] Linking target drivers/librte_crypto_ipsec_mb.so.22.0.
> ninja: Entering directory `./build-clang-static'
> [24/24] Linking target app/test/dpdk-test.
> ninja: Entering directory `./build-clang-shared'
> [8/8] Linking target drivers/librte_crypto_ipsec_mb.so.22.0.
> ninja: Entering directory `./build-x86-generic'
> [9/9] Linking target buildtools/chkincs/chkincs.
> ninja: Entering directory `./build-x86-mingw'
> ninja: no work to do.
> 
> > You need to update intel-ipsec-mb to v1.0.
I have tried compilation of individual patches as well. It works fine for me.
I see that the ipsec_mb is not in content skipped. So my intel-ipsec-mb version 
is 1.0.
Message:
=
Content Skipped
=
libs:
drivers:
common/mvep:missing dependency, "libmusdk"
net/af_xdp: missing dependency, "libbpf"
net/ipn3ke: missing dependency, "libfdt"
net/mvneta: missing dependency, "libmusdk"
net/mvpp2:  missing dependency, "libmusdk"
net/nfb:missing dependency, "libnfb"
net/pcap:   missing dependency, "libpcap"
net/szedata2:   missing dependency, "libsze2"
raw/ifpga:  missing dependency, "libfdt"
crypto/armv8:   missing dependency, "libAArch64crypto"
crypto/mvsam:   missing dependency, "libmusdk"

I did a rebase -i on the commit below these patches and ran test-meson-build.sh
git rebase -i 672c47fc35 --exec=./devtools/test-meson-builds.sh

The compilation is perfect for me.


> > Result:
> >
> > drivers/crypto/ipsec_mb/pmd_zuc.c:176:33: error: ‘hash_keys’ may be
> used
> > uninitialized [-Werror=maybe-uninitialized]/aesni/intel-ipsec-mb/lib/intel-
> > ipsec-mb.h:1444:11: note: in definition of macro
> ‘IMB_ZUC_EIA3_N_BUFFER’
> >  1444 | ((_mgr)->eia3_n_buffer((_key), (_iv), (_in), (_len), (_tag),
> > (_num)))
> >   |   ^~~~
> > drivers/crypto/ipsec_mb/pmd_zuc.c:176:33: note: by argument 1 of type
> > ‘const void * const*’ to ‘void(const void * const*, const void * const*, 
> > const
> > void * const*, const uint32_t *, uint32_t **, const uint32_t)’ {aka
> ‘void(const
> > void * const*, const void * const*, const void * const*, const unsigned int 
> > *,
> > unsigned int **, const unsigned int)’}
> > /aesni/intel-ipsec-mb/lib/intel-ipsec-mb.h:1444:11: note: in definition of
> > macro ‘IMB_ZUC_EIA3_N_BUFFER’
> >  1444 | ((_mgr)->eia3_n_buffer((_key), (_iv), (_in), (_len), (_tag),
> > (_num)))
> >   |   ^~~~
> > drivers/crypto/ipsec_mb/pmd_zuc.c:145:21: note: ‘hash_keys’ declared
> here
> >   145 | const void *hash_keys[ZUC_MAX_BURST];
> >   | ^
> > In file included from
> > ../../dpdk/drivers/crypto/ipsec_mb/ipsec_mb_private.h:8,
> >  from ../../dpdk/drivers/crypto/ipsec_mb/pmd_zuc_priv.h:8,
> >  from ../../dpdk/drivers/crypto/ipsec_mb/pmd_zuc.c:5:
> > drivers/crypto/ipsec_mb/pmd_zuc.c:176:33: error: ‘iv’ may be used
> > uninitialized [-Werror=maybe-uninitialized]
> >   176 | IMB_ZUC_EIA3_N_BUFFER(qp->mb_mgr, (const void
> > **)hash_keys,
> > /aesni/intel-ipsec-mb/lib/intel-ipsec-mb.h:1444:11: note: in definition of
> > macro ‘IMB_ZUC_EIA3_N_BUFFER’
> >  1444 | ((_mgr)->eia3_n_buffer((_key), (_iv), (_in), (_len), (_tag),
> > (_num)))
> >   |   ^~~~
> > drivers/crypto/ipsec_mb/pmd_zuc.c:176:33: note: by argument 2 of type
> > ‘const void * const*’ to ‘void(const void * const*, const void * const*, 
> > const
> > void * const*, const uint32_t *, uint32_t **, const uint32_t)’ {aka
> ‘void(const
> > void * const*, const void * const*, const void * const*, const unsigned int 
> > *,
> > unsigned int **, const unsigned int)’}
> > /aesni/intel-ipsec-mb/lib/intel-ipsec-mb.h:1444:11: note: in definition of
> > macro ‘IMB_ZUC_EIA3_N_BUFFER’
> >  1444 | ((_mgr)->eia3_n_buffer((_key), (_iv), (_in), (_len), (_tag),
> > (_num)))
> >   |   ^~~~
> > drivers/crypto/ipsec_mb/pmd_zuc.c:144:18: note: ‘iv’ declared here
> >   144 | uint8_t *iv[ZUC_MAX_BURST];
> >   |  ^~
> > In file included from
> > ../..

Re: [dpdk-dev] [EXT] [PATCH v3] app/test-eventdev: add burst enqueue support

[Jerin Jacob]

On Mon, Oct 18, 2021 at 6:23 PM Pavan Nikhilesh Bhagavatula
 wrote:
>
> >This commit introduces a new command line option prod_enq_burst_sz
> >to set burst size for eventdev enqueue at producer in perf_queue
> >test. The newly added function perf_producer_burst is called when
> >prod_enq_burst_sz is greater than 1.
> >
> >Signed-off-by: Rashmi Shetty 
> >
>
> LGTM
>
> Acked-by: Pavan Nikhilesh 

Acked-by: Jerin Jacob 
Applied to dpdk-next-eventdev/for-main. Thanks.

>
> >---
> >
> >v3:
> >- Updated testeventdev.rst to document and show new command line
> >option usage (Jerin)
> >- Used memset() to zero stack struct instead of = {NULL}; syntax (Jerin)
> >
> >---
> > app/test-eventdev/evt_common.h   |  1 +
> > app/test-eventdev/evt_main.c |  2 +-
> > app/test-eventdev/evt_options.c  | 14 +
> > app/test-eventdev/evt_options.h  |  1 +
> > app/test-eventdev/test_perf_common.c | 82
> >+++-
> > app/test-eventdev/test_perf_common.h |  1 +
> > doc/guides/tools/testeventdev.rst| 22 +++-
> > 7 files changed, 117 insertions(+), 6 deletions(-)
> >
> >diff --git a/app/test-eventdev/evt_common.h b/app/test-
> >eventdev/evt_common.h
> >index 28afb114b3..f466434459 100644
> >--- a/app/test-eventdev/evt_common.h
> >+++ b/app/test-eventdev/evt_common.h
> >@@ -64,6 +64,7 @@ struct evt_options {
> >   uint32_t nb_flows;
> >   uint32_t tx_first;
> >   uint32_t max_pkt_sz;
> >+  uint32_t prod_enq_burst_sz;
> >   uint32_t deq_tmo_nsec;
> >   uint32_t q_priority:1;
> >   uint32_t fwd_latency:1;
> >diff --git a/app/test-eventdev/evt_main.c b/app/test-
> >eventdev/evt_main.c
> >index a8d304bab3..3534aabca7 100644
> >--- a/app/test-eventdev/evt_main.c
> >+++ b/app/test-eventdev/evt_main.c
> >@@ -95,7 +95,7 @@ main(int argc, char **argv)
> >   /* Parse the command line arguments */
> >   ret = evt_options_parse(&opt, argc, argv);
> >   if (ret) {
> >-  evt_err("parsing on or more user options failed");
> >+  evt_err("parsing one or more user options failed");
> >   goto error;
> >   }
> >
> >diff --git a/app/test-eventdev/evt_options.c b/app/test-
> >eventdev/evt_options.c
> >index b0bcbc6c96..753a7dbd7d 100644
> >--- a/app/test-eventdev/evt_options.c
> >+++ b/app/test-eventdev/evt_options.c
> >@@ -26,6 +26,7 @@ evt_options_default(struct evt_options *opt)
> >   opt->nb_flows = 1024;
> >   opt->socket_id = SOCKET_ID_ANY;
> >   opt->pool_sz = 16 * 1024;
> >+  opt->prod_enq_burst_sz = 1;
> >   opt->wkr_deq_dep = 16;
> >   opt->nb_pkts = (1ULL << 26); /* do ~64M packets */
> >   opt->nb_timers = 1E8;
> >@@ -304,6 +305,16 @@ evt_parse_per_port_pool(struct evt_options
> >*opt, const char *arg __rte_unused)
> >   return 0;
> > }
> >
> >+static int
> >+evt_parse_prod_enq_burst_sz(struct evt_options *opt, const char
> >*arg)
> >+{
> >+  int ret;
> >+
> >+  ret = parser_read_uint32(&(opt->prod_enq_burst_sz), arg);
> >+
> >+  return ret;
> >+}
> >+
> > static void
> > usage(char *program)
> > {
> >@@ -336,6 +347,7 @@ usage(char *program)
> >   "\t--expiry_nsec  : event timer expiry ns.\n"
> >   "\t--mbuf_sz  : packet mbuf size.\n"
> >   "\t--max_pkt_sz   : max packet size.\n"
> >+  "\t--prod_enq_burst_sz : producer enqueue burst
> >size.\n"
> >   "\t--nb_eth_queues: number of ethernet Rx
> >queues.\n"
> >   "\t--enable_vector: enable event vectorization.\n"
> >   "\t--vector_size  : Max vector size.\n"
> >@@ -412,6 +424,7 @@ static struct option lgopts[] = {
> >   { EVT_EXPIRY_NSEC, 1, 0, 0 },
> >   { EVT_MBUF_SZ, 1, 0, 0 },
> >   { EVT_MAX_PKT_SZ,  1, 0, 0 },
> >+  { EVT_PROD_ENQ_BURST_SZ,   1, 0, 0 },
> >   { EVT_NB_ETH_QUEUES,   1, 0, 0 },
> >   { EVT_ENA_VECTOR,  0, 0, 0 },
> >   { EVT_VECTOR_SZ,   1, 0, 0 },
> >@@ -451,6 +464,7 @@ evt_opts_parse_long(int opt_idx, struct
> >evt_options *opt)
> >   { EVT_EXPIRY_NSEC, evt_parse_expiry_nsec},
> >   { EVT_MBUF_SZ, evt_parse_mbuf_sz},
> >   { EVT_MAX_PKT_SZ, evt_parse_max_pkt_sz},
> >+  { EVT_PROD_ENQ_BURST_SZ,
> >evt_parse_prod_enq_burst_sz},
> >   { EVT_NB_ETH_QUEUES, evt_parse_eth_queues},
> >   { EVT_ENA_VECTOR, evt_parse_ena_vector},
> >   { EVT_VECTOR_SZ, evt_parse_vector_size},
> >diff --git a/app/test-eventdev/evt_options.h b/app/test-
> >eventdev/evt_options.h
> >index 6436200b40..413d7092f0 100644
> >--- a/app/test-eventdev/evt_options.h
> >+++ b/app/test-eventdev/evt_options.h
> >@@ -42,6 +42,7 @@
> > #define EVT_EXPIRY_NSEC  ("expiry_nsec")
> > #define EVT_MBUF_SZ  ("mbuf_sz")
> > #define EVT_MAX_PKT_SZ   ("max_pkt_sz")
> >+#define EVT_PROD_ENQ_BURST_SZ("prod_enq_burst_sz")
> > #define EVT_NB_ETH_QUEUES  

[dpdk-dev] [PATCH v4 0/5] add new definitions for wait scheme

[Feifei Wang]

Add new definitions for wait scheme, and apply this new definitions into
lib to replace rte_pause.

v2:
1. use macro to create new wait scheme (Stephen)

v3:
1. delete unnecessary bug fix in bpf (Konstantin)

v4:
1. put size into the macro body (Konstantin)
2. replace assert with BUILD_BUG_ON (Stephen)
3. delete unnecessary compiler barrier for bpf (Konstantin)

Feifei Wang (5):
  eal: add new definitions for wait scheme
  eal: use wait event for read pflock
  eal: use wait event scheme for mcslock
  lib/bpf: use wait event scheme for Rx/Tx iteration
  lib/distributor: use wait event scheme

 lib/bpf/bpf_pkt.c|   9 +-
 lib/distributor/rte_distributor_single.c |  10 +-
 lib/eal/arm/include/rte_pause_64.h   | 126 +--
 lib/eal/include/generic/rte_mcslock.h|   9 +-
 lib/eal/include/generic/rte_pause.h  |  32 ++
 lib/eal/include/generic/rte_pflock.h |   4 +-
 6 files changed, 119 insertions(+), 71 deletions(-)

-- 
2.25.1

[dpdk-dev] [PATCH v4 1/5] eal: add new definitions for wait scheme

[Feifei Wang]

Introduce macros as generic interface for address monitoring.

Signed-off-by: Feifei Wang 
Reviewed-by: Ruifeng Wang 
---
 lib/eal/arm/include/rte_pause_64.h  | 126 
 lib/eal/include/generic/rte_pause.h |  32 +++
 2 files changed, 104 insertions(+), 54 deletions(-)

diff --git a/lib/eal/arm/include/rte_pause_64.h 
b/lib/eal/arm/include/rte_pause_64.h
index e87d10b8cc..23954c2de2 100644
--- a/lib/eal/arm/include/rte_pause_64.h
+++ b/lib/eal/arm/include/rte_pause_64.h
@@ -31,20 +31,12 @@ static inline void rte_pause(void)
 /* Put processor into low power WFE(Wait For Event) state. */
 #define __WFE() { asm volatile("wfe" : : : "memory"); }
 
-static __rte_always_inline void
-rte_wait_until_equal_16(volatile uint16_t *addr, uint16_t expected,
-   int memorder)
-{
-   uint16_t value;
-
-   assert(memorder == __ATOMIC_ACQUIRE || memorder == __ATOMIC_RELAXED);
-
-   /*
-* Atomic exclusive load from addr, it returns the 16-bit content of
-* *addr while making it 'monitored',when it is written by someone
-* else, the 'monitored' state is cleared and a event is generated
-* implicitly to exit WFE.
-*/
+/*
+ * Atomic exclusive load from addr, it returns the 16-bit content of
+ * *addr while making it 'monitored', when it is written by someone
+ * else, the 'monitored' state is cleared and a event is generated
+ * implicitly to exit WFE.
+ */
 #define __LOAD_EXC_16(src, dst, memorder) {   \
if (memorder == __ATOMIC_RELAXED) {   \
asm volatile("ldxrh %w[tmp], [%x[addr]]"  \
@@ -58,6 +50,52 @@ rte_wait_until_equal_16(volatile uint16_t *addr, uint16_t 
expected,
: "memory");  \
} }
 
+/*
+ * Atomic exclusive load from addr, it returns the 32-bit content of
+ * *addr while making it 'monitored', when it is written by someone
+ * else, the 'monitored' state is cleared and a event is generated
+ * implicitly to exit WFE.
+ */
+#define __LOAD_EXC_32(src, dst, memorder) {  \
+   if (memorder == __ATOMIC_RELAXED) {  \
+   asm volatile("ldxr %w[tmp], [%x[addr]]"  \
+   : [tmp] "=&r" (dst)  \
+   : [addr] "r"(src)\
+   : "memory"); \
+   } else { \
+   asm volatile("ldaxr %w[tmp], [%x[addr]]" \
+   : [tmp] "=&r" (dst)  \
+   : [addr] "r"(src)\
+   : "memory"); \
+   } }
+
+/*
+ * Atomic exclusive load from addr, it returns the 64-bit content of
+ * *addr while making it 'monitored', when it is written by someone
+ * else, the 'monitored' state is cleared and a event is generated
+ * implicitly to exit WFE.
+ */
+#define __LOAD_EXC_64(src, dst, memorder) {  \
+   if (memorder == __ATOMIC_RELAXED) {  \
+   asm volatile("ldxr %x[tmp], [%x[addr]]"  \
+   : [tmp] "=&r" (dst)  \
+   : [addr] "r"(src)\
+   : "memory"); \
+   } else { \
+   asm volatile("ldaxr %x[tmp], [%x[addr]]" \
+   : [tmp] "=&r" (dst)  \
+   : [addr] "r"(src)\
+   : "memory"); \
+   } }
+
+static __rte_always_inline void
+rte_wait_until_equal_16(volatile uint16_t *addr, uint16_t expected,
+   int memorder)
+{
+   uint16_t value;
+
+   assert(memorder == __ATOMIC_ACQUIRE || memorder == __ATOMIC_RELAXED);
+
__LOAD_EXC_16(addr, value, memorder)
if (value != expected) {
__SEVL()
@@ -66,7 +104,6 @@ rte_wait_until_equal_16(volatile uint16_t *addr, uint16_t 
expected,
__LOAD_EXC_16(addr, value, memorder)
} while (value != expected);
}
-#undef __LOAD_EXC_16
 }
 
 static __rte_always_inline void
@@ -77,25 +114,6 @@ rte_wait_until_equal_32(volatile uint32_t *addr, uint32_t 
expected,
 
assert(memorder == __ATOMIC_ACQUIRE || memorder == __ATOMIC_RELAXED);
 
-   /*
-* Atomic exclusive load from addr, it returns the 32-bit content of
-* *addr while making it 'monitored',when it is written by someone
-* else, the 'monitored' state is cleared and a event is generated
-* implicitly to exit WFE.
-*/
-#define __LOAD_EXC_32(src, dst, memorder) {  \
-   if (memorder == __ATOMIC_RELAXED) {  \
-   asm volatile("ldxr %w[tmp], [%x[addr]]"  \
-   : [tmp] "=&r" (dst)  \
-   : [addr] "r"(src)\
-   : "mem

[dpdk-dev] [PATCH v4 2/5] eal: use wait event for read pflock

[Feifei Wang]

Instead of polling for read pflock update, use wait event scheme for
this case.

Signed-off-by: Feifei Wang 
Reviewed-by: Ruifeng Wang 
---
 lib/eal/include/generic/rte_pflock.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/eal/include/generic/rte_pflock.h 
b/lib/eal/include/generic/rte_pflock.h
index e57c179ef2..c1c230d131 100644
--- a/lib/eal/include/generic/rte_pflock.h
+++ b/lib/eal/include/generic/rte_pflock.h
@@ -121,9 +121,7 @@ rte_pflock_read_lock(rte_pflock_t *pf)
return;
 
/* Wait for current write phase to complete. */
-   while ((__atomic_load_n(&pf->rd.in, __ATOMIC_ACQUIRE)
-   & RTE_PFLOCK_WBITS) == w)
-   rte_pause();
+   rte_wait_event(&pf->rd.in, RTE_PFLOCK_WBITS, w, ==, __ATOMIC_ACQUIRE, 
16);
 }
 
 /**
-- 
2.25.1

[dpdk-dev] [PATCH v4 3/5] eal: use wait event scheme for mcslock

[Feifei Wang]

Instead of polling for mcslock to be updated, use wait event scheme
for this case.

Signed-off-by: Feifei Wang 
Reviewed-by: Ruifeng Wang 
---
 lib/eal/include/generic/rte_mcslock.h | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/eal/include/generic/rte_mcslock.h 
b/lib/eal/include/generic/rte_mcslock.h
index 34f33c64a5..08137c361b 100644
--- a/lib/eal/include/generic/rte_mcslock.h
+++ b/lib/eal/include/generic/rte_mcslock.h
@@ -116,8 +116,13 @@ rte_mcslock_unlock(rte_mcslock_t **msl, rte_mcslock_t *me)
/* More nodes added to the queue by other CPUs.
 * Wait until the next pointer is set.
 */
-   while (__atomic_load_n(&me->next, __ATOMIC_RELAXED) == NULL)
-   rte_pause();
+#ifdef RTE_ARCH_32
+   rte_wait_event((uint32_t *)&me->next, UINT32_MAX, 0, ==,
+   __ATOMIC_RELAXED, 32);
+#else
+   rte_wait_event((uint64_t *)&me->next, UINT64_MAX, 0, ==,
+   __ATOMIC_RELAXED, 64);
+#endif
}
 
/* Pass lock to next waiter. */
-- 
2.25.1

[dpdk-dev] [PATCH v4 4/5] lib/bpf: use wait event scheme for Rx/Tx iteration

[Feifei Wang]

Instead of polling for cbi->use to be updated, use wait event scheme.

Signed-off-by: Feifei Wang 
Reviewed-by: Ruifeng Wang 
---
 lib/bpf/bpf_pkt.c | 9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/bpf/bpf_pkt.c b/lib/bpf/bpf_pkt.c
index 6e8248f0d6..00a5748061 100644
--- a/lib/bpf/bpf_pkt.c
+++ b/lib/bpf/bpf_pkt.c
@@ -113,7 +113,7 @@ bpf_eth_cbi_unuse(struct bpf_eth_cbi *cbi)
 static void
 bpf_eth_cbi_wait(const struct bpf_eth_cbi *cbi)
 {
-   uint32_t nuse, puse;
+   uint32_t puse;
 
/* make sure all previous loads and stores are completed */
rte_smp_mb();
@@ -122,11 +122,8 @@ bpf_eth_cbi_wait(const struct bpf_eth_cbi *cbi)
 
/* in use, busy wait till current RX/TX iteration is finished */
if ((puse & BPF_ETH_CBI_INUSE) != 0) {
-   do {
-   rte_pause();
-   rte_compiler_barrier();
-   nuse = cbi->use;
-   } while (nuse == puse);
+   rte_wait_event(&cbi->use, UINT32_MAX, puse, ==,
+   __ATOMIC_RELAXED, 32);
}
 }
 
-- 
2.25.1

[dpdk-dev] [PATCH v4 5/5] lib/distributor: use wait event scheme

[Feifei Wang]

Instead of polling for bufptr64 to be updated, use
wait event for this case.

Signed-off-by: Feifei Wang 
Reviewed-by: Ruifeng Wang 
---
 lib/distributor/rte_distributor_single.c | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/distributor/rte_distributor_single.c 
b/lib/distributor/rte_distributor_single.c
index f4725b1d0b..c623bb135d 100644
--- a/lib/distributor/rte_distributor_single.c
+++ b/lib/distributor/rte_distributor_single.c
@@ -33,9 +33,8 @@ rte_distributor_request_pkt_single(struct 
rte_distributor_single *d,
union rte_distributor_buffer_single *buf = &d->bufs[worker_id];
int64_t req = (((int64_t)(uintptr_t)oldpkt) << RTE_DISTRIB_FLAG_BITS)
| RTE_DISTRIB_GET_BUF;
-   while (unlikely(__atomic_load_n(&buf->bufptr64, __ATOMIC_RELAXED)
-   & RTE_DISTRIB_FLAGS_MASK))
-   rte_pause();
+   rte_wait_event(&buf->bufptr64, RTE_DISTRIB_FLAGS_MASK,
+   0, !=, __ATOMIC_RELAXED, 64);
 
/* Sync with distributor on GET_BUF flag. */
__atomic_store_n(&(buf->bufptr64), req, __ATOMIC_RELEASE);
@@ -74,9 +73,8 @@ rte_distributor_return_pkt_single(struct 
rte_distributor_single *d,
union rte_distributor_buffer_single *buf = &d->bufs[worker_id];
uint64_t req = (((int64_t)(uintptr_t)oldpkt) << RTE_DISTRIB_FLAG_BITS)
| RTE_DISTRIB_RETURN_BUF;
-   while (unlikely(__atomic_load_n(&buf->bufptr64, __ATOMIC_RELAXED)
-   & RTE_DISTRIB_FLAGS_MASK))
-   rte_pause();
+   rte_wait_event(&buf->bufptr64, RTE_DISTRIB_FLAGS_MASK,
+   0, !=, __ATOMIC_RELAXED, 64);
 
/* Sync with distributor on RETURN_BUF flag. */
__atomic_store_n(&(buf->bufptr64), req, __ATOMIC_RELEASE);
-- 
2.25.1

Re: [dpdk-dev] [EXT] [PATCH v4 00/14] drivers/crypto: introduce ipsec_mb framework

[Zhang, Roy Fan]

Hi Thomas,

As stated in all cryptodev guides for the PMDs based on intel-ipsec-mb,
the minimum dependent intel-ipsec-mb lib version is bumped to 1.0.

Could you bump the library version and try again?

Regards,
Fan

> -Original Message-
> From: Akhil Goyal 
> Sent: Wednesday, October 20, 2021 5:24 AM
> To: Thomas Monjalon ; Power, Ciara
> ; De Lara Guarch, Pablo
> ; Mcnamara, John
> 
> Cc: dev@dpdk.org; Zhang, Roy Fan ; Bronowski,
> PiotrX ; m...@ashroe.eu;
> david.march...@redhat.com
> Subject: RE: [dpdk-dev] [EXT] [PATCH v4 00/14] drivers/crypto: introduce
> ipsec_mb framework
> 
> > 18/10/2021 17:21, Akhil Goyal:
> > > > This set of patches introduces a new framework, making all common
> > code of
> > > > SW crypto PMD implementations built on top of intel-ipsec-mb library
> > > > sharable. This helps to reduce future effort on the code maintenance
> and
> > > > future updates. It also moves all SW PMD implementation specific
> details
> > > > into single files located in the crypto/ipsec_mb folder.
> > > > A CHACHA20_POLY1305 SW PMD is added based on this framework.
> > > >
> > > > Multi-process support for the PMDs is added for intel-ipsec-mb v1.1.
> > > > The minimum intel-ipsec-mb version required is bumped to 1.0.
> > > >
> > > > ZUC-256 support is added for the aesni_mb PMD, with relevant tests.
> > > >
> > > > v4:
> > >
> > > Acked-by: Akhil Goyal 
> > > Patches are rebased over TOT of next-crypto
> > > Release notes are updated
> > > Applied to dpdk-next-crypto
> >
> > I think compilation has not been tested.
> 
> I am not sure why this is failing at your end,
> On my machine, it is getting compiled with intel-ipsec-mb v1.0.
> I am double checking compilation for all the individual patches as well.
> Will inform you once it is completed.
> On TOT of next crypto, I did a quick test touched the pmd_zuc.c and it is
> getting compiled.
> cavium@cavium-DT13:~/up/dpdk-next-crypto$ touch
> drivers/crypto/ipsec_mb/pmd_zuc.c
> cavium@cavium-DT13:~/up/dpdk-next-crypto$ ./devtools/test-meson-
> builds.sh
> ninja: Entering directory `./build-gcc-static'
> [24/24] Linking target app/test/dpdk-test.
> ninja: Entering directory `./build-gcc-shared'
> [8/8] Linking target drivers/librte_crypto_ipsec_mb.so.22.0.
> ninja: Entering directory `./build-clang-static'
> [24/24] Linking target app/test/dpdk-test.
> ninja: Entering directory `./build-clang-shared'
> [8/8] Linking target drivers/librte_crypto_ipsec_mb.so.22.0.
> ninja: Entering directory `./build-x86-generic'
> [9/9] Linking target buildtools/chkincs/chkincs.
> ninja: Entering directory `./build-x86-mingw'
> ninja: no work to do.
> 
> > You need to update intel-ipsec-mb to v1.0.
> > Result:
> >
> > drivers/crypto/ipsec_mb/pmd_zuc.c:176:33: error: ‘hash_keys’ may be
> used
> > uninitialized [-Werror=maybe-uninitialized]/aesni/intel-ipsec-mb/lib/intel-
> > ipsec-mb.h:1444:11: note: in definition of macro
> ‘IMB_ZUC_EIA3_N_BUFFER’
> >  1444 | ((_mgr)->eia3_n_buffer((_key), (_iv), (_in), (_len), (_tag),
> > (_num)))
> >   |   ^~~~
> > drivers/crypto/ipsec_mb/pmd_zuc.c:176:33: note: by argument 1 of type
> > ‘const void * const*’ to ‘void(const void * const*, const void * const*,
> const
> > void * const*, const uint32_t *, uint32_t **, const uint32_t)’ {aka
> ‘void(const
> > void * const*, const void * const*, const void * const*, const unsigned int 
> > *,
> > unsigned int **, const unsigned int)’}
> > /aesni/intel-ipsec-mb/lib/intel-ipsec-mb.h:1444:11: note: in definition of
> > macro ‘IMB_ZUC_EIA3_N_BUFFER’
> >  1444 | ((_mgr)->eia3_n_buffer((_key), (_iv), (_in), (_len), (_tag),
> > (_num)))
> >   |   ^~~~
> > drivers/crypto/ipsec_mb/pmd_zuc.c:145:21: note: ‘hash_keys’ declared
> here
> >   145 | const void *hash_keys[ZUC_MAX_BURST];
> >   | ^
> > In file included from
> > ../../dpdk/drivers/crypto/ipsec_mb/ipsec_mb_private.h:8,
> >  from ../../dpdk/drivers/crypto/ipsec_mb/pmd_zuc_priv.h:8,
> >  from ../../dpdk/drivers/crypto/ipsec_mb/pmd_zuc.c:5:
> > drivers/crypto/ipsec_mb/pmd_zuc.c:176:33: error: ‘iv’ may be used
> > uninitialized [-Werror=maybe-uninitialized]
> >   176 | IMB_ZUC_EIA3_N_BUFFER(qp->mb_mgr, (const void
> > **)hash_keys,
> > /aesni/intel-ipsec-mb/lib/intel-ipsec-mb.h:1444:11: note: in definition of
> > macro ‘IMB_ZUC_EIA3_N_BUFFER’
> >  1444 | ((_mgr)->eia3_n_buffer((_key), (_iv), (_in), (_len), (_tag),
> > (_num)))
> >   |   ^~~~
> > drivers/crypto/ipsec_mb/pmd_zuc.c:176:33: note: by argument 2 of type
> > ‘const void * const*’ to ‘void(const void * const*, const void * const*,
> const
> > void * const*, const uint32_t *, uint32_t **, const uint32_t)’ {aka
> ‘void(const
> > void * const*, const void * const*, const void * const*, const unsigned int 
> > *,
> > unsigned int **, const unsigned int)’}
> > /aesni/intel-ipsec-mb/lib/intel-ipsec-mb.h:1444:11: note: in definition of
> > macro ‘IMB_

Re: [dpdk-dev] [EXT] Re: [PATCH v4 1/7] malloc: introduce malloc is ready API

[Harman Kalra]

> -Original Message-
> From: Dmitry Kozlyuk 
> Sent: Wednesday, October 20, 2021 3:34 AM
> To: Harman Kalra 
> Cc: dev@dpdk.org; Anatoly Burakov ;
> david.march...@redhat.com; m...@ashroe.eu; tho...@monjalon.net
> Subject: [EXT] Re: [PATCH v4 1/7] malloc: introduce malloc is ready API
> 
> External Email
> 
> --
> 2021-10-20 01:01 (UTC+0300), Dmitry Kozlyuk:
> > 2021-10-20 00:05 (UTC+0530), Harman Kalra:
> > [...]
> > >  static unsigned
> > >  check_hugepage_sz(unsigned flags, uint64_t hugepage_sz)  { @@
> > > -1328,6 +1330,7 @@ rte_eal_malloc_heap_init(void)  {
> > >   struct rte_mem_config *mcfg = rte_eal_get_configuration()-
> >mem_config;
> > >   unsigned int i;
> > > + int ret;
> > >   const struct internal_config *internal_conf =
> > >   eal_get_internal_configuration();
> > >
> > > @@ -1369,5 +1372,16 @@ rte_eal_malloc_heap_init(void)
> > >   return 0;
> >
> > A secondary process exits here...
> >
> > >   /* add all IOVA-contiguous areas to the heap */
> > > - return rte_memseg_contig_walk(malloc_add_seg, NULL);
> > > + ret = rte_memseg_contig_walk(malloc_add_seg, NULL);
> > > +
> > > + if (ret == 0)
> > > + malloc_ready = true;
> >
> > ...and never knows that malloc is ready.
> > But malloc is always ready for a secondary process.
> 
> That is, before returning 0 above for a secondary process malloc_ready
> should be set unconditionally.

Yes, thanks for catching this, I will fix it V5.

Re: [dpdk-dev] [EXT] [PATCH v4 00/14] drivers/crypto: introduce ipsec_mb framework

[Thomas Monjalon]

20/10/2021 10:31, Akhil Goyal:
> > > > Acked-by: Akhil Goyal 
> > > > Patches are rebased over TOT of next-crypto
> > > > Release notes are updated
> > > > Applied to dpdk-next-crypto
> > >
> > > I think compilation has not been tested.
> > 
> > I am not sure why this is failing at your end,
> > On my machine, it is getting compiled with intel-ipsec-mb v1.0.
> > I am double checking compilation for all the individual patches as well.
> > Will inform you once it is completed.
> > On TOT of next crypto, I did a quick test touched the pmd_zuc.c and it is
> > getting compiled.
> > cavium@cavium-DT13:~/up/dpdk-next-crypto$ touch
> > drivers/crypto/ipsec_mb/pmd_zuc.c
> > cavium@cavium-DT13:~/up/dpdk-next-crypto$ ./devtools/test-meson-
> > builds.sh
> > ninja: Entering directory `./build-gcc-static'
> > [24/24] Linking target app/test/dpdk-test.
> > ninja: Entering directory `./build-gcc-shared'
> > [8/8] Linking target drivers/librte_crypto_ipsec_mb.so.22.0.
> > ninja: Entering directory `./build-clang-static'
> > [24/24] Linking target app/test/dpdk-test.
> > ninja: Entering directory `./build-clang-shared'
> > [8/8] Linking target drivers/librte_crypto_ipsec_mb.so.22.0.
> > ninja: Entering directory `./build-x86-generic'
> > [9/9] Linking target buildtools/chkincs/chkincs.
> > ninja: Entering directory `./build-x86-mingw'
> > ninja: no work to do.
> > 
> > > You need to update intel-ipsec-mb to v1.0.
> I have tried compilation of individual patches as well. It works fine for me.
> I see that the ipsec_mb is not in content skipped. So my intel-ipsec-mb 
> version is 1.0.

It may be due to the fact that I play with CFLAGS and don't install the lib.
I will check again for next pull.

Re: [dpdk-dev] [EXT] [PATCH v4 00/14] drivers/crypto: introduce ipsec_mb framework

[Akhil Goyal]

> Hi Thomas,
> 
> As stated in all cryptodev guides for the PMDs based on intel-ipsec-mb,
> the minimum dependent intel-ipsec-mb lib version is bumped to 1.0.
> 
> Could you bump the library version and try again?
> 
Hi Fan,
The version is bumped.
I downloaded from the zip link 
https://github.com/01org/intel-ipsec-mb/archive/v1.0.zip
And Thomas pulled it from git.
And when I downloaded from master of https://github.com/intel/intel-ipsec-mb.

With the zip link it worked fine, but not from git.
I see there are some differences in the code. Could you check?


> Regards,
> Fan
> 
> > -Original Message-
> > From: Akhil Goyal 
> > Sent: Wednesday, October 20, 2021 5:24 AM
> > To: Thomas Monjalon ; Power, Ciara
> > ; De Lara Guarch, Pablo
> > ; Mcnamara, John
> > 
> > Cc: dev@dpdk.org; Zhang, Roy Fan ; Bronowski,
> > PiotrX ; m...@ashroe.eu;
> > david.march...@redhat.com
> > Subject: RE: [dpdk-dev] [EXT] [PATCH v4 00/14] drivers/crypto: introduce
> > ipsec_mb framework
> >
> > > 18/10/2021 17:21, Akhil Goyal:
> > > > > This set of patches introduces a new framework, making all common
> > > code of
> > > > > SW crypto PMD implementations built on top of intel-ipsec-mb library
> > > > > sharable. This helps to reduce future effort on the code maintenance
> > and
> > > > > future updates. It also moves all SW PMD implementation specific
> > details
> > > > > into single files located in the crypto/ipsec_mb folder.
> > > > > A CHACHA20_POLY1305 SW PMD is added based on this framework.
> > > > >
> > > > > Multi-process support for the PMDs is added for intel-ipsec-mb v1.1.
> > > > > The minimum intel-ipsec-mb version required is bumped to 1.0.
> > > > >
> > > > > ZUC-256 support is added for the aesni_mb PMD, with relevant tests.
> > > > >
> > > > > v4:
> > > >
> > > > Acked-by: Akhil Goyal 
> > > > Patches are rebased over TOT of next-crypto
> > > > Release notes are updated
> > > > Applied to dpdk-next-crypto
> > >
> > > I think compilation has not been tested.
> >
> > I am not sure why this is failing at your end,
> > On my machine, it is getting compiled with intel-ipsec-mb v1.0.
> > I am double checking compilation for all the individual patches as well.
> > Will inform you once it is completed.
> > On TOT of next crypto, I did a quick test touched the pmd_zuc.c and it is
> > getting compiled.
> > cavium@cavium-DT13:~/up/dpdk-next-crypto$ touch
> > drivers/crypto/ipsec_mb/pmd_zuc.c
> > cavium@cavium-DT13:~/up/dpdk-next-crypto$ ./devtools/test-meson-
> > builds.sh
> > ninja: Entering directory `./build-gcc-static'
> > [24/24] Linking target app/test/dpdk-test.
> > ninja: Entering directory `./build-gcc-shared'
> > [8/8] Linking target drivers/librte_crypto_ipsec_mb.so.22.0.
> > ninja: Entering directory `./build-clang-static'
> > [24/24] Linking target app/test/dpdk-test.
> > ninja: Entering directory `./build-clang-shared'
> > [8/8] Linking target drivers/librte_crypto_ipsec_mb.so.22.0.
> > ninja: Entering directory `./build-x86-generic'
> > [9/9] Linking target buildtools/chkincs/chkincs.
> > ninja: Entering directory `./build-x86-mingw'
> > ninja: no work to do.
> >
> > > You need to update intel-ipsec-mb to v1.0.
> > > Result:
> > >
> > > drivers/crypto/ipsec_mb/pmd_zuc.c:176:33: error: ‘hash_keys’ may be
> > used
> > > uninitialized [-Werror=maybe-uninitialized]/aesni/intel-ipsec-
> mb/lib/intel-
> > > ipsec-mb.h:1444:11: note: in definition of macro
> > ‘IMB_ZUC_EIA3_N_BUFFER’
> > >  1444 | ((_mgr)->eia3_n_buffer((_key), (_iv), (_in), (_len), 
> > > (_tag),
> > > (_num)))
> > >   |   ^~~~
> > > drivers/crypto/ipsec_mb/pmd_zuc.c:176:33: note: by argument 1 of type
> > > ‘const void * const*’ to ‘void(const void * const*, const void * const*,
> > const
> > > void * const*, const uint32_t *, uint32_t **, const uint32_t)’ {aka
> > ‘void(const
> > > void * const*, const void * const*, const void * const*, const unsigned 
> > > int
> *,
> > > unsigned int **, const unsigned int)’}
> > > /aesni/intel-ipsec-mb/lib/intel-ipsec-mb.h:1444:11: note: in definition of
> > > macro ‘IMB_ZUC_EIA3_N_BUFFER’
> > >  1444 | ((_mgr)->eia3_n_buffer((_key), (_iv), (_in), (_len), 
> > > (_tag),
> > > (_num)))
> > >   |   ^~~~
> > > drivers/crypto/ipsec_mb/pmd_zuc.c:145:21: note: ‘hash_keys’ declared
> > here
> > >   145 | const void *hash_keys[ZUC_MAX_BURST];
> > >   | ^
> > > In file included from
> > > ../../dpdk/drivers/crypto/ipsec_mb/ipsec_mb_private.h:8,
> > >  from ../../dpdk/drivers/crypto/ipsec_mb/pmd_zuc_priv.h:8,
> > >  from ../../dpdk/drivers/crypto/ipsec_mb/pmd_zuc.c:5:
> > > drivers/crypto/ipsec_mb/pmd_zuc.c:176:33: error: ‘iv’ may be used
> > > uninitialized [-Werror=maybe-uninitialized]
> > >   176 | IMB_ZUC_EIA3_N_BUFFER(qp->mb_mgr, (const void
> > > **)hash_keys,
> > > /aesni/intel-ipsec-mb/lib/intel-ipsec-mb.h:1444:11: note: in definition of
> > > macro ‘IMB_ZUC_EIA3_N_BUFFER’
> > >  144

Re: [dpdk-dev] [PATCH v3 3/3] test/devargs: add devargs test cases

[David Marchand]

On Wed, Oct 20, 2021 at 10:22 AM Xueming Li  wrote:
>
> Initial version to test Global devargs syntax.
>
> Signed-off-by: Xueming Li 

10/95 DPDK:fast-tests / devargs_autotest  FAIL 0.17 s (exit
status 255 or signal 127 SIGinvalid)

--- command ---
DPDK_TEST='devargs_autotest'
/home/runner/work/dpdk/dpdk/build/app/test/dpdk-test -l 0-1
--file-prefix=devargs_autotest
--- stdout ---
RTE>>devargs_autotest
== test valid case ==
rte_devargs_parse(net_virtio_user0,iface=test,path=/dev/vhost-net,queues=1)
returned -14 (but should not)
rte_devargs_parse(net_virtio_user0,iface=test,path=/class/bus/,queues=1)
returned -14 (but should not)
Test Failed
RTE>>
--- stderr ---
EAL: Detected CPU lcores: 2
EAL: Detected NUMA nodes: 1
EAL: Detected shared linkage of DPDK
EAL: Multi-process socket /var/run/dpdk/devargs_autotest/mp_socket
EAL: Selected IOVA mode 'PA'
EAL: No available 1048576 kB hugepages reported
EAL: VFIO support initialized
APP: HPET is not enabled, using TSC as default timer
EAL: failed to parse device "net_virtio_user0"
EAL: failed to parse device "net_virtio_user0"
---


-- 
David Marchand

Re: [dpdk-dev] [PATCH v5 14/15] test/crypto: add raw API test for dpaax

[Thomas Monjalon]

17/10/2021 18:16, Hemant Agrawal:
> This patch add support for raw API tests for
> dpaa_sec and dpaa2_sec platforms.

Why do we have tests specific to some drivers?
Is there a plan to remove them?

> +REGISTER_TEST_COMMAND(cryptodev_dpaa2_sec_raw_api_autotest,
> + test_cryptodev_dpaa2_sec_raw_api);
> +REGISTER_TEST_COMMAND(cryptodev_dpaa_sec_raw_api_autotest,
> + test_cryptodev_dpaa_sec_raw_api);
>  REGISTER_TEST_COMMAND(cryptodev_qat_raw_api_autotest,
>   test_cryptodev_qat_raw_api);
>  REGISTER_TEST_COMMAND(cryptodev_qat_autotest, test_cryptodev_qat);

[dpdk-dev] [PATCH] devtools: check prefix for libraries patches

[David Marchand]

The convention in DPDK is to directly use library names as prefix,
without a lib/.

Signed-off-by: David Marchand 
---
 devtools/check-git-log.sh | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh
index 9988bf863d..475f2464ab 100755
--- a/devtools/check-git-log.sh
+++ b/devtools/check-git-log.sh
@@ -89,6 +89,12 @@ bad=$(for commit in $commits ; do
 done | sed 's,^,\t,')
 [ -z "$bad" ] || { printf "Wrong headline prefix:\n$bad\n" && failure=true;}
 
+# check headline prefix for libraries
+bad=$(echo "$headlines" | grep --color=always \
+   -e '^lib/' \
+   | sed 's,^,\t,')
+[ -z "$bad" ] || { printf "Wrong headline prefix:\n$bad\n" && failure=true;}
+
 # check headline label for common typos
 bad=$(echo "$headlines" | grep --color=always \
-e '^example[:/]' \
-- 
2.23.0

Re: [dpdk-dev] [EXT] Re: [PATCH v5 14/15] test/crypto: add raw API test for dpaax

[Akhil Goyal]

> 17/10/2021 18:16, Hemant Agrawal:
> > This patch add support for raw API tests for
> > dpaa_sec and dpaa2_sec platforms.
> 
> Why do we have tests specific to some drivers?
> Is there a plan to remove them?
> 

The testsuites are common and there is no driver specific test.
The test command is different for each of the PMD,
that is why it is registered for each PMD.
For Raw data path APIs, all of the testsuite is run with a global flag set.
Currently only 3 PMDs support raw APIs, we can get rid of this global flag in 
future if more
PMDs start supporting these APIs.

> > +REGISTER_TEST_COMMAND(cryptodev_dpaa2_sec_raw_api_autotest,
> > +   test_cryptodev_dpaa2_sec_raw_api);
> > +REGISTER_TEST_COMMAND(cryptodev_dpaa_sec_raw_api_autotest,
> > +   test_cryptodev_dpaa_sec_raw_api);
> >  REGISTER_TEST_COMMAND(cryptodev_qat_raw_api_autotest,
> > test_cryptodev_qat_raw_api);
> >  REGISTER_TEST_COMMAND(cryptodev_qat_autotest,
> test_cryptodev_qat);
> 
> 

Re: [dpdk-dev] [PATCH v10 11/16] dma/idxd: add operation statistic tracking

[fengchengwen]

On 2021/10/19 22:10, Kevin Laatz wrote:
> Add statistic tracking for DSA devices.
> 
> The dmadev library documentation is also updated to add a generic section
> for using the library's statistics APIs.
> 
> Signed-off-by: Bruce Richardson 
> Signed-off-by: Kevin Laatz 
> Reviewed-by: Conor Walsh 
> Reviewed-by: Chengwen Feng 
> ---
>  doc/guides/prog_guide/dmadev.rst | 11 +++
>  drivers/dma/idxd/idxd_bus.c  |  2 ++
>  drivers/dma/idxd/idxd_common.c   | 27 +++
>  drivers/dma/idxd/idxd_internal.h |  5 +
>  drivers/dma/idxd/idxd_pci.c  |  2 ++
>  5 files changed, 47 insertions(+)
> 
> diff --git a/doc/guides/prog_guide/dmadev.rst 
> b/doc/guides/prog_guide/dmadev.rst
> index e853ffda3a..139eaff299 100644
> --- a/doc/guides/prog_guide/dmadev.rst
> +++ b/doc/guides/prog_guide/dmadev.rst
> @@ -107,3 +107,14 @@ completed operations along with the status of each 
> operation (filled into the
>  ``status`` array passed by user). These two APIs can also return the last
>  completed operation's ``ring_idx`` which could help user track operations 
> within
>  their own application-defined rings.
> +
> +
> +Querying Device Statistics
> +~~~

could remove last ~

anyway,
Reviewed-by: Chengwen Feng 

> +
> +The statistics from a dmadev device can be got via the statistics functions,
> +i.e. ``rte_dma_stats_get()``. The statistics returned for each device 
> instance are:
> +
> +* ``submitted``: The number of operations submitted to the device.
> +* ``completed``: The number of operations which have completed (successful 
> and failed).
> +* ``errors``: The number of operations that completed with error.
> diff --git a/drivers/dma/idxd/idxd_bus.c b/drivers/dma/idxd/idxd_bus.c
> index b2acdac4f9..b52ea02854 100644
> --- a/drivers/dma/idxd/idxd_bus.c
> +++ b/drivers/dma/idxd/idxd_bus.c
> @@ -99,6 +99,8 @@ static const struct rte_dma_dev_ops idxd_bus_ops = {
>   .dev_configure = idxd_configure,
>   .vchan_setup = idxd_vchan_setup,
>   .dev_info_get = idxd_info_get,
> + .stats_get = idxd_stats_get,
> + .stats_reset = idxd_stats_reset,
>  };
>  

[snip]

> 

Re: [dpdk-dev] [EXT] Re: [PATCH v5 14/15] test/crypto: add raw API test for dpaax

[Thomas Monjalon]

20/10/2021 11:15, Akhil Goyal:
> > 17/10/2021 18:16, Hemant Agrawal:
> > > This patch add support for raw API tests for
> > > dpaa_sec and dpaa2_sec platforms.
> > 
> > Why do we have tests specific to some drivers?
> > Is there a plan to remove them?
> > 
> 
> The testsuites are common and there is no driver specific test.
> The test command is different for each of the PMD,
> that is why it is registered for each PMD.
> For Raw data path APIs, all of the testsuite is run with a global flag set.
> Currently only 3 PMDs support raw APIs, we can get rid of this global flag in 
> future if more
> PMDs start supporting these APIs.

No there is something wrong.
It shows that it is not generic enough for any app.
What is missing to make the same calls no matter the driver?
Do we need to add some capability flags?

Re: [dpdk-dev] [PATCH v5] lib/cmdline: release cl when cmdline exit

[Peng, ZhihongX]

> -Original Message-
> From: Peng, ZhihongX 
> Sent: Monday, October 18, 2021 9:59 PM
> To: olivier.m...@6wind.com; dmitry.kozl...@gmail.com
> Cc: dev@dpdk.org; Peng, ZhihongX 
> Subject: [PATCH v5] lib/cmdline: release cl when cmdline exit
> 
> From: Zhihong Peng 
> 
> Malloc cl in the cmdline_stdin_new function, so release in the
> cmdline_stdin_exit function is logical, so that cl will not be released alone.
> 
> Fixes: af75078fece3 ("first public release")
> Cc: intel.com
> 
> Signed-off-by: Zhihong Peng 
> ---
>  app/test/test.c| 1 -
>  app/test/test_cmdline_lib.c| 1 -
>  doc/guides/rel_notes/release_21_11.rst | 3 +++
>  lib/cmdline/cmdline_socket.c   | 1 +
>  4 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/app/test/test.c b/app/test/test.c index 173d202e47..5194131026
> 100644
> --- a/app/test/test.c
> +++ b/app/test/test.c
> @@ -233,7 +233,6 @@ main(int argc, char **argv)
> 
>   cmdline_interact(cl);
>   cmdline_stdin_exit(cl);
> - cmdline_free(cl);
>   }
>  #endif
>   ret = 0;
> diff --git a/app/test/test_cmdline_lib.c b/app/test/test_cmdline_lib.c index
> d5a09b4541..6bcfa6511e 100644
> --- a/app/test/test_cmdline_lib.c
> +++ b/app/test/test_cmdline_lib.c
> @@ -174,7 +174,6 @@ test_cmdline_socket_fns(void)
>   /* void functions */
>   cmdline_stdin_exit(NULL);
> 
> - cmdline_free(cl);
>   return 0;
>  error:
>   printf("Error: function accepted null parameter!\n"); diff --git
> a/doc/guides/rel_notes/release_21_11.rst
> b/doc/guides/rel_notes/release_21_11.rst
> index d5435a64aa..6aa98d1e34 100644
> --- a/doc/guides/rel_notes/release_21_11.rst
> +++ b/doc/guides/rel_notes/release_21_11.rst
> @@ -237,6 +237,9 @@ API Changes
>the crypto/security operation. This field will be used to communicate
>events such as soft expiry with IPsec in lookaside mode.
> 
> +* cmdline: ``cmdline_stdin_exit()`` now frees the ``cmdline`` structure.
> +  Calls to ``cmdline_free()`` after it need to be deleted from applications.
> +
> 
>  ABI Changes
>  ---
> diff --git a/lib/cmdline/cmdline_socket.c b/lib/cmdline/cmdline_socket.c
> index 998e8ade25..ebd5343754 100644
> --- a/lib/cmdline/cmdline_socket.c
> +++ b/lib/cmdline/cmdline_socket.c
> @@ -53,4 +53,5 @@ cmdline_stdin_exit(struct cmdline *cl)
>   return;
> 
>   terminal_restore(cl);
> + cmdline_free(cl);
>  }
> --
> 2.25.1

Tested-by: Zhihong Peng 

Re: [dpdk-dev] [EXT] Re: [PATCH v4 3/7] eal/interrupts: avoid direct access to interrupt handle

[Harman Kalra]

> -Original Message-
> From: Dmitry Kozlyuk 
> Sent: Wednesday, October 20, 2021 2:58 AM
> To: Harman Kalra 
> Cc: dev@dpdk.org; Bruce Richardson ;
> david.march...@redhat.com; m...@ashroe.eu; tho...@monjalon.net
> Subject: [EXT] Re: [PATCH v4 3/7] eal/interrupts: avoid direct access to
> interrupt handle
> 
> External Email
> 
> --
> 2021-10-20 00:05 (UTC+0530), Harman Kalra:
> > Making changes to the interrupt framework to use interrupt handle APIs
> > to get/set any field. Direct access to any of the fields should be
> > avoided to avoid any ABI breakage in future.
> 
> I get and accept the point why EAL also should use the API.
> However, mentioning ABI is still a wrong wording.
> There is no ABI between EAL structures and EAL functions by definition of
> ABI.

Sure, I will reword the commit message without ABI inclusion.

> 
> >
> > Signed-off-by: Harman Kalra 
> > ---
> >  lib/eal/freebsd/eal_interrupts.c |  92 ++
> >  lib/eal/linux/eal_interrupts.c   | 287 +++
> >  2 files changed, 234 insertions(+), 145 deletions(-)
> >
> > diff --git a/lib/eal/freebsd/eal_interrupts.c
> > b/lib/eal/freebsd/eal_interrupts.c
> [...]
> > @@ -135,9 +137,18 @@ rte_intr_callback_register(const struct
> rte_intr_handle *intr_handle,
> > ret = -ENOMEM;
> > goto fail;
> > } else {
> > -   src->intr_handle = *intr_handle;
> > -   TAILQ_INIT(&src->callbacks);
> > -   TAILQ_INSERT_TAIL(&intr_sources, src, next);
> > +   src->intr_handle = rte_intr_instance_alloc();
> > +   if (src->intr_handle == NULL) {
> > +   RTE_LOG(ERR, EAL, "Can not create
> intr instance\n");
> > +   free(callback);
> > +   ret = -ENOMEM;
> 
> goto fail?

I think goto not required, as we not setting wake_thread = 1 here,
API will just return error after unlocking the spinlock and trace.

> 
> > +   } else {
> > +   rte_intr_instance_copy(src-
> >intr_handle,
> > +  intr_handle);
> > +   TAILQ_INIT(&src->callbacks);
> > +   TAILQ_INSERT_TAIL(&intr_sources,
> src,
> > + next);
> > +   }
> > }
> > }
> >
> [...]
> > @@ -213,7 +226,7 @@ rte_intr_callback_unregister_pending(const struct
> rte_intr_handle *intr_handle,
> > struct rte_intr_callback *cb, *next;
> >
> > /* do parameter checking first */
> > -   if (intr_handle == NULL || intr_handle->fd < 0) {
> > +   if (intr_handle == NULL || rte_intr_fd_get(intr_handle) < 0) {
> 
> The handle is checked for NULL inside the accessor, here and in other places:
> grep -R 'intr_handle == NULL ||' lib/eal

Ack, I will remove these NULL checks.

> 
> > RTE_LOG(ERR, EAL,
> > "Unregistering with invalid input parameter\n");
> > return -EINVAL;
> 
> > diff --git a/lib/eal/linux/eal_interrupts.c
> > b/lib/eal/linux/eal_interrupts.c
> [...]

Re: [dpdk-dev] [PATCH] eventdev/rx_adapter: fix wrr buffer overrun issue

[Jerin Jacob]

On Mon, Oct 18, 2021 at 4:39 PM Jayatheerthan, Jay
 wrote:
>
> Acked-by: Jay Jayatheerthan 


Changed the subject to:
eventdev/rx_adapter: fix WRR buffer overrun issue
Cced sta...@dpdk.org

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

>
> > -Original Message-
> > From: Naga Harish K, S V 
> > Sent: Monday, October 18, 2021 1:56 PM
> > To: jer...@marvell.com; Jayatheerthan, Jay 
> > Cc: dev@dpdk.org
> > Subject: [PATCH] eventdev/rx_adapter: fix wrr buffer overrun issue
> >
> > when a poll queue is removed from a rx_adapter instance, the wrr poll
> > array is recomputed. The wrr array length is reduced in this case. The
> > next wrr position to poll is stored in wrr_pos variable of rx_adapter
> > instance. This wrr_pos can become invalid in some cases after wrr is
> > recomputed. Using this variable to get the next queue and device pair
> > may leed to wrr buffer overruns.
> >
> > Resetting the wrr_pos to zero after recomputation of wrr array fixes
> > the buffer overrun issue.
> >
> > Fixes: 9c38b704d280 ("eventdev: add eth Rx adapter implementation")
> >
> > Signed-off-by: Naga Harish K S V 
> > ---
> >  lib/eventdev/rte_event_eth_rx_adapter.c | 5 +
> >  1 file changed, 5 insertions(+)
> >
> > diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c 
> > b/lib/eventdev/rte_event_eth_rx_adapter.c
> > index bd68b8efe1..82a652d305 100644
> > --- a/lib/eventdev/rte_event_eth_rx_adapter.c
> > +++ b/lib/eventdev/rte_event_eth_rx_adapter.c
> > @@ -2773,6 +2773,11 @@ rte_event_eth_rx_adapter_queue_del(uint8_t id, 
> > uint16_t eth_dev_id,
> >   rx_adapter->eth_rx_poll = rx_poll;
> >   rx_adapter->wrr_sched = rx_wrr;
> >   rx_adapter->wrr_len = nb_wrr;
> > + /*
> > +  * reset next poll start position (wrr_pos) to avoid buffer
> > +  * overrun when wrr_len is reduced in case of queue delete
> > +  */
> > + rx_adapter->wrr_pos = 0;
> >   rx_adapter->num_intr_vec += num_intr_vec;
> >
> >   if (dev_info->nb_dev_queues == 0) {
> > --
> > 2.25.1
>

Re: [dpdk-dev] [PATCH v3 08/18] eal: fix typos in comments

[Kinsella, Ray]

On 14/10/2021 22:56, Stephen Hemminger wrote:

Minor spelling errors.

Signed-off-by: Stephen Hemminger 


Acked-by: Ray Kinsella 

Re: [dpdk-dev] [PATCH v5 1/4] mempool: add event callbacks

[Kinsella, Ray]

On 15/10/2021 17:02, Dmitry Kozlyuk wrote:

Data path performance can benefit if the PMD knows which memory it will
need to handle in advance, before the first mbuf is sent to the PMD.
It is impractical, however, to consider all allocated memory for this
purpose. Most often mbuf memory comes from mempools that can come and
go. PMD can enumerate existing mempools on device start, but it also
needs to track creation and destruction of mempools after the forwarding
starts but before an mbuf from the new mempool is sent to the device.

Add an API to register callback for mempool life cycle events:
* rte_mempool_event_callback_register()
* rte_mempool_event_callback_unregister()
Currently tracked events are:
* RTE_MEMPOOL_EVENT_READY (after populating a mempool)
* RTE_MEMPOOL_EVENT_DESTROY (before freeing a mempool)
Provide a unit test for the new API.
The new API is internal, because it is primarily demanded by PMDs that
may need to deal with any mempools and do not control their creation,
while an application, on the other hand, knows which mempools it creates
and doesn't care about internal mempools PMDs might create.

Signed-off-by: Dmitry Kozlyuk 
Acked-by: Matan Azrad 
Reviewed-by: Andrew Rybchenko 
---


Acked-by: Ray Kinsella 

Re: [dpdk-dev] [PATCH v10 12/16] dma/idxd: add vchan status function

[fengchengwen]

On 2021/10/19 22:10, Kevin Laatz wrote:
> When testing dmadev drivers, it is useful to have the HW device in a known
> state. This patch adds the implementation of the function which will wait
> for the device to be idle (all jobs completed) before proceeding.
> 
> Signed-off-by: Kevin Laatz 
> Reviewed-by: Conor Walsh 
> ---
>  drivers/dma/idxd/idxd_bus.c  |  1 +
>  drivers/dma/idxd/idxd_common.c   | 17 +
>  drivers/dma/idxd/idxd_internal.h |  2 ++
>  drivers/dma/idxd/idxd_pci.c  |  1 +
>  4 files changed, 21 insertions(+)
> 
> diff --git a/drivers/dma/idxd/idxd_bus.c b/drivers/dma/idxd/idxd_bus.c
> index b52ea02854..e6caa048a9 100644
> --- a/drivers/dma/idxd/idxd_bus.c
> +++ b/drivers/dma/idxd/idxd_bus.c
> @@ -101,6 +101,7 @@ static const struct rte_dma_dev_ops idxd_bus_ops = {
>   .dev_info_get = idxd_info_get,
>   .stats_get = idxd_stats_get,
>   .stats_reset = idxd_stats_reset,
> + .vchan_status = idxd_vchan_status,
>  };
>  
>  static void *
> diff --git a/drivers/dma/idxd/idxd_common.c b/drivers/dma/idxd/idxd_common.c
> index fd81418b7c..3c8cff15c0 100644
> --- a/drivers/dma/idxd/idxd_common.c
> +++ b/drivers/dma/idxd/idxd_common.c
> @@ -163,6 +163,23 @@ get_comp_status(struct idxd_completion *c)
>   }
>  }
>  
> +int
> +idxd_vchan_status(const struct rte_dma_dev *dev, uint16_t vchan __rte_unused,
> + enum rte_dma_vchan_status *status)
> +{
> + struct idxd_dmadev *idxd = dev->fp_obj->dev_private;
> + uint16_t last_batch_write = idxd->batch_idx_write == 0 ? 
> idxd->max_batches :
> + idxd->batch_idx_write - 1;
> + uint8_t bstatus = (idxd->batch_comp_ring[last_batch_write].status != 0);
> +
> + /* An IDXD device will always be either active or idle.
> +  * RTE_DMA_VCHAN_HALTED_ERROR is therefore not supported by IDXD.
> +  */
> + *status = bstatus ? RTE_DMA_VCHAN_IDLE : RTE_DMA_VCHAN_ACTIVE;

why not use stats.submitted and completed ? or I miss some thing about this API?

does this api must called after rte_dma_submit() ? If not the following seq 
will function fail:
  enqueue multiple copy request
  submit to hardware
  enqueue multiple copy request
  invoke rte_dma_vchan_status to query status  --because the copy requests not 
submit, the last comp will be non-zero, so it will return IDLE.

> +
> + return 0;
> +}
> +
>  static __rte_always_inline int
>  batch_ok(struct idxd_dmadev *idxd, uint16_t max_ops, enum 
> rte_dma_status_code *status)
>  {
> diff --git a/drivers/dma/idxd/idxd_internal.h 
> b/drivers/dma/idxd/idxd_internal.h
> index a85a1fb79e..50acb82d3d 100644
> --- a/drivers/dma/idxd/idxd_internal.h
> +++ b/drivers/dma/idxd/idxd_internal.h
> @@ -102,5 +102,7 @@ uint16_t idxd_completed_status(void *dev_private, 
> uint16_t qid __rte_unused,
>  int idxd_stats_get(const struct rte_dma_dev *dev, uint16_t vchan,
>   struct rte_dma_stats *stats, uint32_t stats_sz);
>  int idxd_stats_reset(struct rte_dma_dev *dev, uint16_t vchan);
> +int idxd_vchan_status(const struct rte_dma_dev *dev, uint16_t vchan,
> + enum rte_dma_vchan_status *status);
>  
>  #endif /* _IDXD_INTERNAL_H_ */
> diff --git a/drivers/dma/idxd/idxd_pci.c b/drivers/dma/idxd/idxd_pci.c
> index 9d7f0531d5..23c10c0fb0 100644
> --- a/drivers/dma/idxd/idxd_pci.c
> +++ b/drivers/dma/idxd/idxd_pci.c
> @@ -140,6 +140,7 @@ static const struct rte_dma_dev_ops idxd_pci_ops = {
>   .stats_reset = idxd_stats_reset,
>   .dev_start = idxd_pci_dev_start,
>   .dev_stop = idxd_pci_dev_stop,
> + .vchan_status = idxd_vchan_status,
>  };
>  
>  /* each portal uses 4 x 4k pages */
> 

Re: [dpdk-dev] [PATCH v5 3/4] common/mlx5: add mempool registration facilities

[Kinsella, Ray]

On 15/10/2021 17:02, Dmitry Kozlyuk wrote:

Add internal API to register mempools, that is, to create memory
regions (MR) for their memory and store them in a separate database.
Implementation deals with multi-process, so that class drivers don't
need to. Each protection domain has its own database. Memory regions
can be shared within a database if they represent a single hugepage
covering one or more mempools entirely.

Add internal API to lookup an MR key for an address that belongs
to a known mempool. It is a responsibility of a class driver
to extract the mempool from an mbuf.

Signed-off-by: Dmitry Kozlyuk 
Acked-by: Matan Azrad 
---


Acked-by: Ray Kinsella 

Re: [dpdk-dev] [PATCH v2 0/9] ethdev: cosmetic fixes

[Ferruh Yigit]

On 10/20/2021 8:42 AM, Andrew Rybchenko wrote:

Sicne rte_eth_dev and rte_eth_dev_data structures are just moved
right now is a good chance to make a cleanup. Moreover ethdev is
or will be shuffled a lot in the release, so do cleanup in all
files.

Maybe at least some fixes from below could be accepted.

Spelling is fixed in log messages as well. Hopefully it isn ot a
problem, but let me know if I'm wrong and I'll avoid it in the
next version.

Since changes are cosmetic no Fixes tags and no backporting to
stable.

Andrew Rybchenko (9):
   ethdev: avoid documentation in next lines
   ethdev: fix Rx/Tx spelling
   ethdev: fix Ethernet spelling
   ethdev: fix DCB and VMDq spelling
   ethdev: fix VLAN spelling including VLAN ID case
   ethdev: fix ID spelling in comments and log messages
   ethdev: remove reserved fields from internal structures
   ethdev: make device and data structures readable
   ethdev: remove full stop after short comments and references



I am OK with changes in principal, will look more detailed later.

Only patch 9/9 also can be extended to whole file, instead of just
moved structures.

Re: [dpdk-dev] [PATCH v2 02/13] common/mlx5: support receive memory pool

[Kinsella, Ray]

On 16/10/2021 10:12, Xueming Li wrote:

Adds DevX supports of PRM shared receive memory pool(RMP) object.
RMP is used to support shared Rx queue. Multiple RQ could share same
RMP. Memory buffers are supplied to RMP.

This patch makes RMP RQ optional, created only if mlx5_devx_rq.rmp
is set.

Signed-off-by: Xueming Li 
---
  drivers/common/mlx5/mlx5_common_devx.c | 296 +
  drivers/common/mlx5/mlx5_common_devx.h |  19 +-
  drivers/common/mlx5/mlx5_devx_cmds.c   |  52 +
  drivers/common/mlx5/mlx5_devx_cmds.h   |  16 ++
  drivers/common/mlx5/mlx5_prm.h |  85 ++-
  drivers/common/mlx5/version.map|   1 +
  drivers/net/mlx5/mlx5_devx.c   |   4 +-
  7 files changed, 425 insertions(+), 48 deletions(-)


Acked-by: Ray Kinsella 

Re: [dpdk-dev] [EXT] Re: [PATCH v5 14/15] test/crypto: add raw API test for dpaax

[Akhil Goyal]

> 
> 20/10/2021 11:15, Akhil Goyal:
> > > 17/10/2021 18:16, Hemant Agrawal:
> > > > This patch add support for raw API tests for
> > > > dpaa_sec and dpaa2_sec platforms.
> > >
> > > Why do we have tests specific to some drivers?
> > > Is there a plan to remove them?
> > >
> >
> > The testsuites are common and there is no driver specific test.
> > The test command is different for each of the PMD,
> > that is why it is registered for each PMD.
> > For Raw data path APIs, all of the testsuite is run with a global flag set.
> > Currently only 3 PMDs support raw APIs, we can get rid of this global flag 
> > in
> future if more
> > PMDs start supporting these APIs.
> 
> No there is something wrong.
> It shows that it is not generic enough for any app.
> What is missing to make the same calls no matter the driver?
> Do we need to add some capability flags?

Capability flags are there for raw data path APIs but the PMD can support both 
APIs.
And we need to test both data paths.
So for this we have a global variable to enable raw data path and we register a 
new
Command for the PMD and enable that global flag while doing that.
The tests, however have the capability flags checks in place but we decide to 
enable 
Raw APIs only when the PMD support that and that global flag is set.
I hope it is clear now.

Re: [dpdk-dev] [PATCH v10 13/16] dma/idxd: add burst capacity API

[fengchengwen]

Reviewed-by: Chengwen Feng 

On 2021/10/19 22:10, Kevin Laatz wrote:
> Add support for the burst capacity API. This API will provide the calling
> application with the remaining capacity of the current burst (limited by
> max HW batch size).
> 
> Signed-off-by: Kevin Laatz 
> Reviewed-by: Conor Walsh 
> Reviewed-by: Bruce Richardson 
> ---
>  drivers/dma/idxd/idxd_common.c   | 21 +
>  drivers/dma/idxd/idxd_internal.h |  1 +
>  drivers/dma/idxd/idxd_pci.c  |  1 +
>  3 files changed, 23 insertions(+)
> 
> diff --git a/drivers/dma/idxd/idxd_common.c b/drivers/dma/idxd/idxd_common.c
> index 3c8cff15c0..ff4647f579 100644
> --- a/drivers/dma/idxd/idxd_common.c
> +++ b/drivers/dma/idxd/idxd_common.c
> @@ -468,6 +468,26 @@ idxd_info_get(const struct rte_dma_dev *dev, struct 
> rte_dma_info *info, uint32_t
>   return 0;
>  }
>  

[snip]

[dpdk-dev] [PATCH v6 0/3] support PPPoL2TPv2oUDP RSS Hash

[Jie Wang]

Support IAVF PPPoL2TPv2oUDP RSS Hash. Required to distribute packets
based on inner IP src+dest address and TCP/UDP src+dest port.

---
v6:
 * update release notes.
 * update lib/net/meson.build.
 * update testpmd_funcs.rst.
 * update doxygen comments in header files.
 * update doc/api/doxy-api-index.md.

v5: update release notes.
v4:
 * update commit log.
 * redefine PPP protocol header.
 * delete l2tpv2_encap.
v3:
 * add testpmd match ppp and l2tpv2 protocol header fields value.
 * add the code of l2tpv2_encap.
 * update the title of ethdev patch and adjust the position of
   the added code.

v2:
 * update the rte_flow.rst and release notes.
 * update l2tpv2 header format.

Jie Wang (3):
  ethdev: support PPP and L2TPV2 procotol
  net/iavf: support PPPoL2TPv2oUDP RSS Hash
  app/testpmd: support L2TPV2 and PPP protocol pattern

 app/test-pmd/cmdline_flow.c | 251 
 doc/api/doxy-api-index.md   |   2 +
 doc/guides/prog_guide/rte_flow.rst  |  25 ++
 doc/guides/rel_notes/release_21_11.rst  |   5 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  28 +++
 drivers/net/iavf/iavf_generic_flow.c| 131 ++
 drivers/net/iavf/iavf_generic_flow.h|  15 ++
 drivers/net/iavf/iavf_hash.c| 108 -
 lib/ethdev/rte_flow.c   |   2 +
 lib/ethdev/rte_flow.h   |  66 +
 lib/net/meson.build |   2 +
 lib/net/rte_l2tpv2.h| 234 ++
 lib/net/rte_ppp.h   |  35 +++
 13 files changed, 902 insertions(+), 2 deletions(-)
 create mode 100644 lib/net/rte_l2tpv2.h
 create mode 100644 lib/net/rte_ppp.h

-- 
2.25.1

[dpdk-dev] [PATCH v6 1/3] ethdev: support PPP and L2TPV2 procotol

[Jie Wang]

Added flow pattern items and header formats of L2TPv2 and PPP.

Signed-off-by: Wenjun Wu 
Signed-off-by: Jie Wang 
---
 doc/api/doxy-api-index.md   |   2 +
 doc/guides/prog_guide/rte_flow.rst  |  25 +++
 doc/guides/rel_notes/release_21_11.rst  |   5 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  28 +++
 lib/ethdev/rte_flow.c   |   2 +
 lib/ethdev/rte_flow.h   |  66 ++
 lib/net/meson.build |   2 +
 lib/net/rte_l2tpv2.h| 234 
 lib/net/rte_ppp.h   |  35 +++
 9 files changed, 399 insertions(+)
 create mode 100644 lib/net/rte_l2tpv2.h
 create mode 100644 lib/net/rte_ppp.h

diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index 1992107a03..43b64d06c1 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -121,6 +121,8 @@ The public API headers are grouped by topics:
   [VXLAN]  (@ref rte_vxlan.h),
   [Geneve] (@ref rte_geneve.h),
   [eCPRI]  (@ref rte_ecpri.h)
+  [L2TPV2] (@ref rte_l2tpv2.h)
+  [PPP](@ref rte_ppp.h)
 
 - **QoS**:
   [metering]   (@ref rte_meter.h),
diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index fa05fe0845..6277c641ef 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1548,6 +1548,31 @@ This item is meant to use the same structure as `Item: 
PORT_REPRESENTOR`_.
 
 See also `Action: REPRESENTED_PORT`_.
 
+Item: ``L2TPV2``
+^^^
+
+Matches a L2TPv2 header.
+
+- ``flags_version``: flags(12b), version(4b).
+- ``length``: total length of the message.
+- ``tunnel_id``: identifier for the control connection.
+- ``session_id``: identifier for a session within a tunnel.
+- ``ns``: sequence number for this date or control message.
+- ``nr``: sequence number expected in the next control message to be received.
+- ``offset_size``: offset of payload data.
+- ``offset_padding``: offset padding, variable length.
+- Default ``mask`` matches flags_version only.
+
+Item: ``PPP``
+^^^
+
+Matches a PPP header.
+
+- ``addr``: ppp address.
+- ``ctrl``: ppp control.
+- ``proto_id``: ppp protocol identifier.
+- Default ``mask`` matches addr, ctrl, proto_id.
+
 Actions
 ~~~
 
diff --git a/doc/guides/rel_notes/release_21_11.rst 
b/doc/guides/rel_notes/release_21_11.rst
index c5f76081e5..9fea43ece7 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -98,6 +98,10 @@ New Features
 
   Added an ethdev API which can help users get device configuration.
 
+* **Added L2TPV2 and PPP protocol support in rte_flow.**
+
+  Added flow pattern items and header formats of L2TPv2 and PPP protocol.
+
 * **Updated AF_XDP PMD.**
 
   * Disabled secondary process support.
@@ -121,6 +125,7 @@ New Features
 
   * Added Intel iavf support on Windows.
   * Added IPv4 and L4 (TCP/UDP/SCTP) checksum hash support in RSS flow.
+  * Added PPPoL2TPv2oUDP RSS hash based on inner IP address and TCP/UDP port.
 
 * **Updated Intel ice driver.**
 
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst 
b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 22ba8f0516..84cccb238d 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -3810,6 +3810,20 @@ This section lists supported pattern items and their 
attributes, if any.
 
   - ``ethdev_port_id {unsigned}``: ethdev port ID
 
+- ``l2tpv2``: match L2TPV2 header.
+
+  - ``length {unsigned}``: L2TPV2 option length.
+  - ``tunnel_id {unsigned}``: L2TPV2 tunnel identifier.
+  - ``session_id {unsigned}``: L2TPV2 session identifier.
+  - ``ns {unsigned}``: L2TPV2 option ns.
+  - ``nr {unsigned}``: L2TPV2 option nr.
+
+- ``ppp``: match PPP header.
+
+  - ``addr {unsigned}``: PPP address.
+  - ``ctrl {unsigned}``: PPP control.
+  - ``proto_id {unsigned}``: PPP protocol identifier.
+
 Actions list
 
 
@@ -5036,6 +5050,20 @@ The meter policy action list: ``green -> green, yellow 
-> yellow, red -> red``.
testpmd> create port meter 0 1 13 1 yes 0x 0 0
testpmd> flow create 0 priority 0 ingress group 1 pattern eth / end actions 
meter mtr_id 1 / end
 
+Sample PPPoL2TPv2oUDP RSS rules
+~~~
+
+PPPoL2TPv2oUDP RSS rules can be created by the following commands::
+
+ testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 / ppp / ipv4
+  / end actions rss types ipv4 end queues end / end
+ testpmd> flow create 0 ingress pattern eth / ipv4 / udp / l2tpv2 / ppp / ipv6
+  / udp / end actions rss types ipv6-udp end queues end / end
+ testpmd> flow create 0 ingress pattern eth / ipv6 / udp / l2tpv2 / ppp / ipv4
+  / tcp / end actions rss types ipv4-tcp end queues end / end
+ testpmd> flow create 0 ingress pattern eth / ipv6 / udp / l2tpv2 / ppp / ipv6
+ 

[dpdk-dev] [PATCH v6 2/3] net/iavf: support PPPoL2TPv2oUDP RSS Hash

[Jie Wang]

Add support for PPP over L2TPv2 over UDP protocol RSS Hash based
on inner IP src/dst address and TCP/UDP src/dst port.

Patterns are listed below:
eth/ipv4(6)/udp/l2tpv2/ppp/ipv4(6)
eth/ipv4(6)/udp/l2tpv2/ppp/ipv4(6)/udp
eth/ipv4(6)/udp/l2tpv2/ppp/ipv4(6)/tcp

Signed-off-by: Wenjun Wu 
Signed-off-by: Jie Wang 
---
 drivers/net/iavf/iavf_generic_flow.c | 131 +++
 drivers/net/iavf/iavf_generic_flow.h |  15 +++
 drivers/net/iavf/iavf_hash.c | 108 +-
 3 files changed, 252 insertions(+), 2 deletions(-)

diff --git a/drivers/net/iavf/iavf_generic_flow.c 
b/drivers/net/iavf/iavf_generic_flow.c
index b86d99e57d..364904fa02 100644
--- a/drivers/net/iavf/iavf_generic_flow.c
+++ b/drivers/net/iavf/iavf_generic_flow.c
@@ -1611,6 +1611,137 @@ enum rte_flow_item_type 
iavf_pattern_eth_ipv6_gre_ipv6_udp[] = {
RTE_FLOW_ITEM_TYPE_END,
 };
 
+/* PPPoL2TPv2oUDP */
+enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv4[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_L2TPV2,
+   RTE_FLOW_ITEM_TYPE_PPP,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv6[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_L2TPV2,
+   RTE_FLOW_ITEM_TYPE_PPP,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv4_udp[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_L2TPV2,
+   RTE_FLOW_ITEM_TYPE_PPP,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv4_tcp[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_L2TPV2,
+   RTE_FLOW_ITEM_TYPE_PPP,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_TCP,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv6_udp[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_L2TPV2,
+   RTE_FLOW_ITEM_TYPE_PPP,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv4_udp_l2tpv2_ppp_ipv6_tcp[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_L2TPV2,
+   RTE_FLOW_ITEM_TYPE_PPP,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_TCP,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv4[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_L2TPV2,
+   RTE_FLOW_ITEM_TYPE_PPP,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_L2TPV2,
+   RTE_FLOW_ITEM_TYPE_PPP,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv4_udp[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_L2TPV2,
+   RTE_FLOW_ITEM_TYPE_PPP,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv4_tcp[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_L2TPV2,
+   RTE_FLOW_ITEM_TYPE_PPP,
+   RTE_FLOW_ITEM_TYPE_IPV4,
+   RTE_FLOW_ITEM_TYPE_TCP,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6_udp[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_L2TPV2,
+   RTE_FLOW_ITEM_TYPE_PPP,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
+enum rte_flow_item_type iavf_pattern_eth_ipv6_udp_l2tpv2_ppp_ipv6_tcp[] = {
+   RTE_FLOW_ITEM_TYPE_ETH,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_UDP,
+   RTE_FLOW_ITEM_TYPE_L2TPV2,
+   RTE_FLOW_ITEM_TYPE_PPP,
+   RTE_FLOW_ITEM_TYPE_IPV6,
+   RTE_FLOW_ITEM_TYPE_TCP,
+   RTE_FLOW_ITEM_TYPE_END,
+};
+
+
+
 typedef struct iavf_flow_engine * (*parse_engine_t)(struct iavf_adapter *ad,
   

[dpdk-dev] [PATCH v6 3/3] app/testpmd: support L2TPV2 and PPP protocol pattern

[Jie Wang]

Add support for test-pmd to parse protocol pattern L2TPv2 and PPP.

Signed-off-by: Wenjun Wu 
Signed-off-by: Jie Wang 
---
 app/test-pmd/cmdline_flow.c | 251 
 1 file changed, 251 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index a90822b660..c1046e3e28 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -310,6 +310,23 @@ enum index {
ITEM_PORT_REPRESENTOR_PORT_ID,
ITEM_REPRESENTED_PORT,
ITEM_REPRESENTED_PORT_ETHDEV_PORT_ID,
+   ITEM_L2TPV2,
+   ITEM_L2TPV2_COMMON,
+   ITEM_L2TPV2_COMMON_TYPE,
+   ITEM_L2TPV2_COMMON_TYPE_DATA_L,
+   ITEM_L2TPV2_COMMON_TYPE_CTRL,
+   ITEM_L2TPV2_MSG_DATA_L_LENGTH,
+   ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID,
+   ITEM_L2TPV2_MSG_DATA_L_SESSION_ID,
+   ITEM_L2TPV2_MSG_CTRL_LENGTH,
+   ITEM_L2TPV2_MSG_CTRL_TUNNEL_ID,
+   ITEM_L2TPV2_MSG_CTRL_SESSION_ID,
+   ITEM_L2TPV2_MSG_CTRL_NS,
+   ITEM_L2TPV2_MSG_CTRL_NR,
+   ITEM_PPP,
+   ITEM_PPP_ADDR,
+   ITEM_PPP_CTRL,
+   ITEM_PPP_PROTO_ID,
 
/* Validate/create actions. */
ACTIONS,
@@ -1018,6 +1035,8 @@ static const enum index next_item[] = {
ITEM_CONNTRACK,
ITEM_PORT_REPRESENTOR,
ITEM_REPRESENTED_PORT,
+   ITEM_L2TPV2,
+   ITEM_PPP,
END_SET,
ZERO,
 };
@@ -1398,6 +1417,31 @@ static const enum index item_represented_port[] = {
ZERO,
 };
 
+static const enum index item_l2tpv2[] = {
+   ITEM_L2TPV2_COMMON,
+   ITEM_NEXT,
+   ZERO,
+};
+
+static const enum index item_l2tpv2_common[] = {
+   ITEM_L2TPV2_COMMON_TYPE,
+   ZERO,
+};
+
+static const enum index item_l2tpv2_common_type[] = {
+   ITEM_L2TPV2_COMMON_TYPE_DATA_L,
+   ITEM_L2TPV2_COMMON_TYPE_CTRL,
+   ZERO,
+};
+
+static const enum index item_ppp[] = {
+   ITEM_PPP_ADDR,
+   ITEM_PPP_CTRL,
+   ITEM_PPP_PROTO_ID,
+   ITEM_NEXT,
+   ZERO,
+};
+
 static const enum index next_action[] = {
ACTION_END,
ACTION_VOID,
@@ -1781,6 +1825,9 @@ static int parse_vc_conf(struct context *, const struct 
token *,
 static int parse_vc_item_ecpri_type(struct context *, const struct token *,
const char *, unsigned int,
void *, unsigned int);
+static int parse_vc_item_l2tpv2_type(struct context *, const struct token *,
+   const char *, unsigned int,
+   void *, unsigned int);
 static int parse_vc_action_meter_color_type(struct context *,
const struct token *,
const char *, unsigned int, void *,
@@ -3682,6 +3729,153 @@ static const struct token token_list[] = {
 item_param),
.args = ARGS(ARGS_ENTRY(struct rte_flow_item_ethdev, port_id)),
},
+   [ITEM_L2TPV2] = {
+   .name = "l2tpv2",
+   .help = "match l2tpv2 header",
+   .priv = PRIV_ITEM(L2TPV2, sizeof(struct rte_flow_item_l2tpv2)),
+   .next = NEXT(item_l2tpv2),
+   .call = parse_vc,
+   },
+   [ITEM_L2TPV2_COMMON] = {
+   .name = "common",
+   .help = "l2tpv2 common header",
+   .next = NEXT(item_l2tpv2_common),
+   },
+   [ITEM_L2TPV2_COMMON_TYPE] = {
+   .name = "type",
+   .help = "type of common header",
+   .next = NEXT(item_l2tpv2_common_type),
+   .args = ARGS(ARG_ENTRY_HTON(struct rte_flow_item_l2tpv2)),
+   },
+   [ITEM_L2TPV2_COMMON_TYPE_DATA_L] = {
+   .name = "data_l",
+   .help = "Type #6: data message with length option",
+   .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_DATA_L_LENGTH,
+   ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID,
+   ITEM_L2TPV2_MSG_DATA_L_SESSION_ID,
+   ITEM_NEXT)),
+   .call = parse_vc_item_l2tpv2_type,
+   },
+   [ITEM_L2TPV2_MSG_DATA_L_LENGTH] = {
+   .name = "length",
+   .help = "message length",
+   .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_DATA_L_LENGTH,
+   ITEM_L2TPV2_COMMON, ITEM_NEXT),
+NEXT_ENTRY(COMMON_UNSIGNED),
+item_param),
+   .args = ARGS(ARGS_ENTRY_HTON(struct rte_flow_item_l2tpv2,
+hdr.type6.length)),
+   },
+   [ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID] = {
+   .name = "tunnel_id",
+   .help = "tunnel identifier",
+   .next = NEXT(NEXT_ENTRY(ITEM_L2TPV2_MSG_DATA_L_TUNNEL_ID,
+   ITEM_L2TPV2_COMMON, ITEM_NEXT),
+NEXT_EN

Re: [dpdk-dev] [PATCH] ip_frag: promote APIs to stable

[Kinsella, Ray]

On 18/10/2021 16:36, Konstantin Ananyev wrote:

Promote rte_frag_table_del_expired_entries() function to stable.
It was around for few years by now without any changes.

Signed-off-by: Konstantin Ananyev 
---
  lib/ip_frag/rte_ip_frag.h | 1 -
  lib/ip_frag/version.map   | 7 +--
  2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/ip_frag/rte_ip_frag.h b/lib/ip_frag/rte_ip_frag.h
index 08555fde6a..d856f87e6c 100644
--- a/lib/ip_frag/rte_ip_frag.h
+++ b/lib/ip_frag/rte_ip_frag.h
@@ -326,7 +326,6 @@ rte_ip_frag_table_statistics_dump(FILE * f, const struct 
rte_ip_frag_tbl *tbl);
   * @param tms
   *   Current timestamp
   */
-__rte_experimental
  void
  rte_frag_table_del_expired_entries(struct rte_ip_frag_tbl *tbl,
struct rte_ip_frag_death_row *dr, uint64_t tms);
diff --git a/lib/ip_frag/version.map b/lib/ip_frag/version.map
index 33f231fb31..990384b536 100644
--- a/lib/ip_frag/version.map
+++ b/lib/ip_frag/version.map
@@ -8,13 +8,8 @@ DPDK_22 {
rte_ipv4_frag_reassemble_packet;
rte_ipv4_fragment_packet;
rte_ipv6_frag_reassemble_packet;
+   rte_frag_table_del_expired_entries;


isn't f before i?


rte_ipv6_fragment_packet;
  
  	local: *;

  };
-
-EXPERIMENTAL {
-   global:
-
-   rte_frag_table_del_expired_entries;
-};



Ray K

Re: [dpdk-dev] [PATCH 2/2] dmadev: remove symbol versioning for inline helpers

[Bruce Richardson]

On Wed, Oct 20, 2021 at 08:59:44AM +0200, David Marchand wrote:
> Inline helpers have no global symbols in shared libraries.
> There is no reason to ask for versioning (plus this library would not
> build on Windows).
> 
> Fixes: 91e581e5c924 ("dmadev: add data plane API")
> Fixes: ea8cf0f8536d ("dmadev: add burst capacity API")
> 
> Signed-off-by: David Marchand 

Acked-by: Bruce Richardson 

Re: [dpdk-dev] [PATCH v3 3/3] test/devargs: add devargs test cases

[Xueming(Steven) Li]

On Wed, 2021-10-20 at 11:08 +0200, David Marchand wrote:
> On Wed, Oct 20, 2021 at 10:22 AM Xueming Li  wrote:
> > 
> > Initial version to test Global devargs syntax.
> > 
> > Signed-off-by: Xueming Li 
> 
> 10/95 DPDK:fast-tests / devargs_autotest  FAIL 0.17 s (exit
> status 255 or signal 127 SIGinvalid)
> 
> --- command ---
> DPDK_TEST='devargs_autotest'
> /home/runner/work/dpdk/dpdk/build/app/test/dpdk-test -l 0-1
> --file-prefix=devargs_autotest
> --- stdout ---
> RTE>>devargs_autotest
> == test valid case ==
> rte_devargs_parse(net_virtio_user0,iface=test,path=/dev/vhost-net,queues=1)
> returned -14 (but should not)
> rte_devargs_parse(net_virtio_user0,iface=test,path=/class/bus/,queues=1)
> returned -14 (but should not)
> Test Failed
> RTE>>
> --- stderr ---
> EAL: Detected CPU lcores: 2
> EAL: Detected NUMA nodes: 1
> EAL: Detected shared linkage of DPDK
> EAL: Multi-process socket /var/run/dpdk/devargs_autotest/mp_socket
> EAL: Selected IOVA mode 'PA'
> EAL: No available 1048576 kB hugepages reported
> EAL: VFIO support initialized
> APP: HPET is not enabled, using TSC as default timer
> EAL: failed to parse device "net_virtio_user0"
> EAL: failed to parse device "net_virtio_user0"

Yes, noticed that, seems virtio driver not enabled. Tried to add
"net_virtio" to test_deps in meson file, but failed with:
../app/test/meson.build:444:4: ERROR: Tried to get unknown variable
"static_rte_net_virtio".

Seems meson scripts only lookup dependency on libs, I'm not good at
meson, any suggestion? 

> ---
> 
> 

Re: [dpdk-dev] [PATCH 1/2] dmadev: hide devices array

[fengchengwen]

On 2021/10/20 14:59, David Marchand wrote:
> No need to expose rte_dma_devices out of the dmadev library.
> Existing helpers should be enough, and inlines make use of
> rte_dma_fp_objs.
> 
> Signed-off-by: David Marchand 
> ---
>  app/test/test_dmadev.c  | 5 +++--
>  lib/dmadev/rte_dmadev.c | 2 +-
>  lib/dmadev/rte_dmadev_pmd.h | 2 --
>  lib/dmadev/version.map  | 1 -
>  4 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c
> index 1e327bd45f..8b58256afc 100644
> --- a/app/test/test_dmadev.c
> +++ b/app/test/test_dmadev.c
> @@ -747,10 +747,11 @@ test_dmadev_instance(int16_t dev_id)
>   };
>   const int vchan = 0;
>  
> + rte_dma_info_get(dev_id, &info);

suggest declare info as: struct rte_dma_stats info = { 0 };
so that the following %s will display NULL if rte_dma_info_get call fail.

anyway,
Reviewed-by: Chengwen Feng 

> +
>   printf("\n### Test dmadev instance %u [%s]\n",
> - dev_id, rte_dma_devices[dev_id].data->dev_name);
> + dev_id, info.dev_name);
>  
> - rte_dma_info_get(dev_id, &info);
>   if (info.max_vchans < 1)
>   ERR_RETURN("Error, no channels available on device id %u\n", 
> dev_id);
>  
> diff --git a/lib/dmadev/rte_dmadev.c b/lib/dmadev/rte_dmadev.c
> index 182d32aedb..d4b32b2971 100644

[snip]

Re: [dpdk-dev] [EXT] Re: [PATCH v4 3/7] eal/interrupts: avoid direct access to interrupt handle

[Dmitry Kozlyuk]

2021-10-20 09:25 (UTC+), Harman Kalra:
> [...]
> > > diff --git a/lib/eal/freebsd/eal_interrupts.c
> > > b/lib/eal/freebsd/eal_interrupts.c  
> > [...]  
> > > @@ -135,9 +137,18 @@ rte_intr_callback_register(const struct  
> > rte_intr_handle *intr_handle,  
> > >   ret = -ENOMEM;
> > >   goto fail;
> > >   } else {
> > > - src->intr_handle = *intr_handle;
> > > - TAILQ_INIT(&src->callbacks);
> > > - TAILQ_INSERT_TAIL(&intr_sources, src, next);
> > > + src->intr_handle = rte_intr_instance_alloc();
> > > + if (src->intr_handle == NULL) {
> > > + RTE_LOG(ERR, EAL, "Can not create  
> > intr instance\n");  
> > > + free(callback);
> > > + ret = -ENOMEM;  
> > 
> > goto fail?  
> 
> I think goto not required, as we not setting wake_thread = 1 here,
> API will just return error after unlocking the spinlock and trace.

Just to emphasize, we're talking about FreeBSD implementation.
There is no "wake_thread" variable there, so "goto fail" is needed.
Your consideration would be valid for similar code in Linux EAL.

Re: [dpdk-dev] [PATCH v10 12/16] dma/idxd: add vchan status function

[Bruce Richardson]

On Wed, Oct 20, 2021 at 05:30:13PM +0800, fengchengwen wrote:
> On 2021/10/19 22:10, Kevin Laatz wrote:
> > When testing dmadev drivers, it is useful to have the HW device in a known
> > state. This patch adds the implementation of the function which will wait
> > for the device to be idle (all jobs completed) before proceeding.
> > 
> > Signed-off-by: Kevin Laatz 
> > Reviewed-by: Conor Walsh 
> > ---
> >  drivers/dma/idxd/idxd_bus.c  |  1 +
> >  drivers/dma/idxd/idxd_common.c   | 17 +
> >  drivers/dma/idxd/idxd_internal.h |  2 ++
> >  drivers/dma/idxd/idxd_pci.c  |  1 +
> >  4 files changed, 21 insertions(+)
> > 
> > diff --git a/drivers/dma/idxd/idxd_bus.c b/drivers/dma/idxd/idxd_bus.c
> > index b52ea02854..e6caa048a9 100644
> > --- a/drivers/dma/idxd/idxd_bus.c
> > +++ b/drivers/dma/idxd/idxd_bus.c
> > @@ -101,6 +101,7 @@ static const struct rte_dma_dev_ops idxd_bus_ops = {
> > .dev_info_get = idxd_info_get,
> > .stats_get = idxd_stats_get,
> > .stats_reset = idxd_stats_reset,
> > +   .vchan_status = idxd_vchan_status,
> >  };
> >  
> >  static void *
> > diff --git a/drivers/dma/idxd/idxd_common.c b/drivers/dma/idxd/idxd_common.c
> > index fd81418b7c..3c8cff15c0 100644
> > --- a/drivers/dma/idxd/idxd_common.c
> > +++ b/drivers/dma/idxd/idxd_common.c
> > @@ -163,6 +163,23 @@ get_comp_status(struct idxd_completion *c)
> > }
> >  }
> >  
> > +int
> > +idxd_vchan_status(const struct rte_dma_dev *dev, uint16_t vchan 
> > __rte_unused,
> > +   enum rte_dma_vchan_status *status)
> > +{
> > +   struct idxd_dmadev *idxd = dev->fp_obj->dev_private;
> > +   uint16_t last_batch_write = idxd->batch_idx_write == 0 ? 
> > idxd->max_batches :
> > +   idxd->batch_idx_write - 1;
> > +   uint8_t bstatus = (idxd->batch_comp_ring[last_batch_write].status != 0);
> > +
> > +   /* An IDXD device will always be either active or idle.
> > +* RTE_DMA_VCHAN_HALTED_ERROR is therefore not supported by IDXD.
> > +*/
> > +   *status = bstatus ? RTE_DMA_VCHAN_IDLE : RTE_DMA_VCHAN_ACTIVE;
> 
> why not use stats.submitted and completed ? or I miss some thing about this 
> API?
> 
> does this api must called after rte_dma_submit() ? If not the following seq 
> will function fail:
>   enqueue multiple copy request
>   submit to hardware
>   enqueue multiple copy request
>   invoke rte_dma_vchan_status to query status  --because the copy requests 
> not submit, the last comp will be non-zero, so it will return IDLE.
>
That is correct. Until the jobs are submitted the device HW is idle as it
is not processing any job. This API is to return the HW state, because that
is the key concern here, whether the HW is in the process of doing DMA or
not, since that is what can cause race conditions. The timing of sending
down jobs to the device is under app control.

Re: [dpdk-dev] [PATCH v6 1/3] ethdev: support PPP and L2TPV2 procotol

[Andrew Rybchenko]

On 10/20/21 12:32 PM, Jie Wang wrote:
> Added flow pattern items and header formats of L2TPv2 and PPP.
> 
> Signed-off-by: Wenjun Wu 
> Signed-off-by: Jie Wang 

Newly added items must be added to
doc/guides/nics/features/default.ini in correct order.

When the item is supported, ini file of the corresponding
driver must be updated.

> ---
>  doc/api/doxy-api-index.md   |   2 +
>  doc/guides/prog_guide/rte_flow.rst  |  25 +++
>  doc/guides/rel_notes/release_21_11.rst  |   5 +
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  28 +++
>  lib/ethdev/rte_flow.c   |   2 +
>  lib/ethdev/rte_flow.h   |  66 ++
>  lib/net/meson.build |   2 +
>  lib/net/rte_l2tpv2.h| 234 
>  lib/net/rte_ppp.h   |  35 +++
>  9 files changed, 399 insertions(+)
>  create mode 100644 lib/net/rte_l2tpv2.h
>  create mode 100644 lib/net/rte_ppp.h
> 
> diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
> index 1992107a03..43b64d06c1 100644
> --- a/doc/api/doxy-api-index.md
> +++ b/doc/api/doxy-api-index.md
> @@ -121,6 +121,8 @@ The public API headers are grouped by topics:
>[VXLAN]  (@ref rte_vxlan.h),
>[Geneve] (@ref rte_geneve.h),
>[eCPRI]  (@ref rte_ecpri.h)
> +  [L2TPV2] (@ref rte_l2tpv2.h)

Is it a canonical spelling? Shouldn't it be L2TPv2?
If you change, it should be changed everywhere in comments.

> +  [PPP](@ref rte_ppp.h)
>  
>  - **QoS**:
>[metering]   (@ref rte_meter.h),
> diff --git a/doc/guides/prog_guide/rte_flow.rst 
> b/doc/guides/prog_guide/rte_flow.rst
> index fa05fe0845..6277c641ef 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -1548,6 +1548,31 @@ This item is meant to use the same structure as `Item: 
> PORT_REPRESENTOR`_.
>  
>  See also `Action: REPRESENTED_PORT`_.
>  
> +Item: ``L2TPV2``
> +^^^
> +
> +Matches a L2TPv2 header.
> +
> +- ``flags_version``: flags(12b), version(4b).
> +- ``length``: total length of the message.
> +- ``tunnel_id``: identifier for the control connection.
> +- ``session_id``: identifier for a session within a tunnel.
> +- ``ns``: sequence number for this date or control message.
> +- ``nr``: sequence number expected in the next control message to be 
> received.
> +- ``offset_size``: offset of payload data.
> +- ``offset_padding``: offset padding, variable length.
> +- Default ``mask`` matches flags_version only.
> +
> +Item: ``PPP``
> +^^^
> +
> +Matches a PPP header.
> +
> +- ``addr``: ppp address.
> +- ``ctrl``: ppp control.
> +- ``proto_id``: ppp protocol identifier.

ppp -> PPP everywhere above

> +- Default ``mask`` matches addr, ctrl, proto_id.
> +
>  Actions
>  ~~~
>  
> diff --git a/doc/guides/rel_notes/release_21_11.rst 
> b/doc/guides/rel_notes/release_21_11.rst
> index c5f76081e5..9fea43ece7 100644
> --- a/doc/guides/rel_notes/release_21_11.rst
> +++ b/doc/guides/rel_notes/release_21_11.rst
> @@ -98,6 +98,10 @@ New Features
>  
>Added an ethdev API which can help users get device configuration.
>  
> +* **Added L2TPV2 and PPP protocol support in rte_flow.**
> +
> +  Added flow pattern items and header formats of L2TPv2 and PPP protocol.
> +
>  * **Updated AF_XDP PMD.**
>  
>* Disabled secondary process support.
> @@ -121,6 +125,7 @@ New Features
>  
>* Added Intel iavf support on Windows.
>* Added IPv4 and L4 (TCP/UDP/SCTP) checksum hash support in RSS flow.
> +  * Added PPPoL2TPv2oUDP RSS hash based on inner IP address and TCP/UDP port.

I think it belongs to the next patch which adds driver support.

>  
>  * **Updated Intel ice driver.**
>  
> diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst 
> b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> index 22ba8f0516..84cccb238d 100644
> --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> @@ -3810,6 +3810,20 @@ This section lists supported pattern items and their 
> attributes, if any.
>  
>- ``ethdev_port_id {unsigned}``: ethdev port ID
>  
> +- ``l2tpv2``: match L2TPV2 header.
> +
> +  - ``length {unsigned}``: L2TPV2 option length.
> +  - ``tunnel_id {unsigned}``: L2TPV2 tunnel identifier.
> +  - ``session_id {unsigned}``: L2TPV2 session identifier.
> +  - ``ns {unsigned}``: L2TPV2 option ns.
> +  - ``nr {unsigned}``: L2TPV2 option nr.
> +
> +- ``ppp``: match PPP header.
> +
> +  - ``addr {unsigned}``: PPP address.
> +  - ``ctrl {unsigned}``: PPP control.
> +  - ``proto_id {unsigned}``: PPP protocol identifier.
> +
>  Actions list
>  
>  
> @@ -5036,6 +5050,20 @@ The meter policy action list: ``green -> green, yellow 
> -> yellow, red -> red``.
> testpmd> create port meter 0 1 13 1 yes 0x 0 0
> testpmd> flow create 0 priority 0 ingress group 1 pattern eth / end 
> actions meter mtr_i

Re: [dpdk-dev] [PATCH 1/2] dmadev: hide devices array

[David Marchand]

On Wed, Oct 20, 2021 at 11:47 AM fengchengwen  wrote:
>
> On 2021/10/20 14:59, David Marchand wrote:
> > No need to expose rte_dma_devices out of the dmadev library.
> > Existing helpers should be enough, and inlines make use of
> > rte_dma_fp_objs.
> >
> > Signed-off-by: David Marchand 
> > ---
> >  app/test/test_dmadev.c  | 5 +++--
> >  lib/dmadev/rte_dmadev.c | 2 +-
> >  lib/dmadev/rte_dmadev_pmd.h | 2 --
> >  lib/dmadev/version.map  | 1 -
> >  4 files changed, 4 insertions(+), 6 deletions(-)
> >
> > diff --git a/app/test/test_dmadev.c b/app/test/test_dmadev.c
> > index 1e327bd45f..8b58256afc 100644
> > --- a/app/test/test_dmadev.c
> > +++ b/app/test/test_dmadev.c
> > @@ -747,10 +747,11 @@ test_dmadev_instance(int16_t dev_id)
> >   };
> >   const int vchan = 0;
> >
> > + rte_dma_info_get(dev_id, &info);
>
> suggest declare info as: struct rte_dma_stats info = { 0 };
> so that the following %s will display NULL if rte_dma_info_get call fail.

The problem is more generic.
Other info fields are used by the test.
If rte_dma_info_get can fail, its return code must be checked.

Worth a followup patch, can you send it?

Thanks.


-- 
David Marchand

Re: [dpdk-dev] [PATCH] port: eventdev port api promoted

[Kinsella, Ray]

On 13/10/2021 13:12, Thomas Monjalon wrote:

+Cc Cristian, the maintainer

10/09/2021 15:40, Kinsella, Ray:

On 10/09/2021 08:36, David Marchand wrote:

On Fri, Sep 10, 2021 at 9:31 AM Kinsella, Ray  wrote:

On 09/09/2021 17:40, Rahul Shah wrote:

rte_port_eventdev_reader_ops, rte_port_eventdev_writer_nodrops_ops,
rte_port_eventdev_writer_ops symbols promoted

Signed-off-by: Rahul Shah 
---
  lib/port/version.map | 8 +++-
  1 file changed, 3 insertions(+), 5 deletions(-)


Hi Rahul,

You need to strip the __rte_experimental attribute in the header file also.


That's what I first thought... but those are variables, and there were
not marked in the header.


My mistake - should have checked.


At least, those symbols must be alphabetically sorted in version.map.

About checking for experimental mark on variables... I had a patch,
but never got it in.
I think we should instead (forbid such exports and|insist on) rework
API / libraries that rely on public variables.


I'll pull together a script to identify all the variables in DPDK.
Are you expecting the rework on the port api to be done prior to 21.11?


Does it mean we should not promote these variables?




So the net-net is that variables are almost impossible to version.
Think about maintaining two parallel versions of the same variable, and having 
to track and reconcile state between them.

So variables are make ABI versioning (and maintenance) harder, and are best 
avoided.

In this particular case.
I would suggest leaving these as experimental and improving the API, post 21.11.

Ray K

Re: [dpdk-dev] [PATCH 1/2] dmadev: hide devices array

[Walsh, Conor]

> Subject: [dpdk-dev] [PATCH 1/2] dmadev: hide devices array
> 
> No need to expose rte_dma_devices out of the dmadev library.
> Existing helpers should be enough, and inlines make use of
> rte_dma_fp_objs.
> 
> Signed-off-by: David Marchand 
> ---

The devices array is not needed by the drivers.

>From a drivers point of view:
Tested-by: Conor Walsh 

Re: [dpdk-dev] [PATCH v3 3/6] net: advertise no support for keeping flow rules

[Andrew Rybchenko]

On 10/19/21 3:37 PM, Dmitry Kozlyuk wrote:
> When RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP capability bit is zero,
> the specified behavior is the same as it had been before
> this bit was introduced. Explicitly reset it in all PMDs
> supporting rte_flow API in order to attract the attention
> of maintainers, who should eventually choose to advertise
> the new capability or not. It is already known that
> mlx4 and mlx5 will not support this capability.
> 
> For RTE_ETH_DEV_CAPA_FLOW_SHARED_OBJECT_KEEP
> similar action is not performed,
> because no PMD except mlx5 supports indirect actions.
> Any PMD that starts doing so will anyway have to consider
> all relevant API, including this capability.
> 
> Suggested-by: Ferruh Yigit 
> Signed-off-by: Dmitry Kozlyuk 

[snip]

> diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
> index aa7e7fdc85..1a6e0128ff 100644
> --- a/drivers/net/bnxt/bnxt_ethdev.c
> +++ b/drivers/net/bnxt/bnxt_ethdev.c
> @@ -1009,6 +1009,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev 
> *eth_dev,
>   dev_info->speed_capa = bnxt_get_speed_capabilities(bp);
>   dev_info->dev_capa = RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |
>RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP;
> + dev_info->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP;

Sorry, but here and everywhere below I see no point to cleanup
the bit explicitly when it is not actually set.

[snip]

Re: [dpdk-dev] [PATCH v3 0/6] Flow entites behavior on port restart

[Andrew Rybchenko]

On 10/19/21 3:37 PM, Dmitry Kozlyuk wrote:
> It is unspecified whether flow rules and indirect actions are kept
> when a port is stopped, possibly reconfigured, and started again.
> Vendors approach the topic differently, e.g. mlx5 and i40e PMD
> disagree in whether flow rules can be kept, and mlx5 PMD would keep
> indirect actions. In the end, applications are greatly affected
> by whatever contract there is and need to know it.
> 
> It is proposed to advertise capabilities of keeping flow rules
> and indirect actions (as a special case of shared object)
> using a combination of ethdev info and rte_flow calls.
> Then a bug is fixed in mlx5 PMD that prevented indirect RSS action
> from being kept, and the driver starts advertising the new capability.
> 
> Prior discussions:
> 1) http://inbox.dpdk.org/dev/20210727073121.895620-1-dkozl...@nvidia.com/
> 2) http://inbox.dpdk.org/dev/20210901085516.3647814-1-dkozl...@nvidia.com/

Is there real usecase for keeping flow rules or indirect
actions?
Why does application want to restart port?

Re: [dpdk-dev] [PATCH v2] ethdev: fix one MAC address occupies two index in mac addrs

[Kevin Traynor]

On 20/10/2021 08:41, Ferruh Yigit wrote:

On 10/20/2021 7:49 AM, lihuisong (C) wrote:

Hi Ferruh

在 2021/10/20 1:45, Ferruh Yigit 写道:

On 10/11/2021 10:28 AM, Min Hu (Connor) wrote:

From: Huisong Li 

The dev->data->mac_addrs[0] will be changed to a new MAC address when
applications modify the default MAC address by
rte_eth_dev_default_mac_addr_set() API. However, If the new default
MAC address has been added as a non-default MAC address by
rte_eth_dev_mac_addr_add() API, the rte_eth_dev_default_mac_addr_set()
API doesn't remove it from dev->data->mac_addrs[]. As a result, one MAC
address occupies two index capacities in dev->data->mac_addrs[].



Hi Connor,

I see the problem, but can you please clarify what is the impact to the end 
user?

If application does as following:
   rte_eth_dev_mac_addr_add(MAC1);
   rte_eth_dev_mac_addr_add(MAC2);
   rte_eth_dev_mac_addr_add(MAC3);
   rte_eth_dev_default_mac_addr_set(MAC2);

The 'dev->data->mac_addrs[]' will have: "MAC2,MAC2,MAC3" which has 'MAC2' 
duplicated.

Will this cause any problem for the application to receive the packets
with 'MAC2' address?
Or is the only problem one extra space used in 'dev->data->mac_addrs[]'
without any other impact to the application?

I think it's just a waste of space.


True, it is a waste. But if there is no other visible user impact, we can
handle the issue with lower priority and clarifying the impact in commit log
helps to others.




This patch adds the logic of removing MAC addresses for this scenario.

Fixes: 854d8ad4ef68 ("ethdev: add default mac address modifier")
Cc: sta...@dpdk.org

Signed-off-by: Huisong Li 
Signed-off-by: Min Hu (Connor) 
---
v2:
* fixed commit log.
---
   lib/ethdev/rte_ethdev.c | 15 +++
   1 file changed, 15 insertions(+)

diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 028907bc4b..7faff17d9a 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -4340,6 +4340,7 @@ int
   rte_eth_dev_default_mac_addr_set(uint16_t port_id, struct rte_ether_addr 
*addr)
   {
   struct rte_eth_dev *dev;
+    int index;
   int ret;
     RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
@@ -4361,6 +4362,20 @@ rte_eth_dev_default_mac_addr_set(uint16_t port_id, 
struct rte_ether_addr *addr)
   if (ret < 0)
   return ret;
   +    /*
+ * If the address has been added as a non-default MAC address by
+ * rte_eth_dev_mac_addr_add API, it should be removed from
+ * dev->data->mac_addrs[].
+ */
+    index = eth_dev_get_mac_addr_index(port_id, addr);
+    if (index > 0) {
+    /* remove address in NIC data structure */
+    rte_ether_addr_copy(&null_mac_addr,
+    &dev->data->mac_addrs[index]);
+    /* reset pool bitmap */
+    dev->data->mac_pool_sel[index] = 0;
+    }
+


Here only 'dev->data->mac_addrs[]' array is updated and it assumes
driver removes similar duplication itself, but I am not sure if this is
valid for all drivers.

If driver is not removing the duplicate in the HW configuration, the driver
config and 'dev->data->mac_addrs[]' will diverge, which is not good.

The same MAC address does not occupy two HW entries, which is also a
waste for HW. After all, HW entry resources are also limited.
The PMD should also take this into account.
So, I think, we don't have to think about it here.


I am not sure all PMD take this into account, I briefly checked the ixgbe
code and I am not sure if it handles this.

Also it is possible to think that this responsibility is pushed to the
application, like application should remove a MAC address before setting
it as default MAC...



Yes, the API view is more important than saving one entry in an array. 
From API perspective with this patch,


set_default(MAC1)
add(MAC2)
add(MAC3)
add(MAC4)
default=MAC1, Filters=MAC2, MAC3, MAC4

set_default(MAC2)
default=MAC2, Filters= MAC3, MAC4

set_default(MAC3)
default=MAC3, Filters= MAC4

set_default(MAC4)
default=MAC4, Filters=

set_default(MAC5)
default=MAC5, Filters=

Did I get it right? If so, it seems wrong to silently remove the 
filters. In which case, it would be easier to just not remove them in 
the first place (current behaviour).


If they really need to be removed from the filter list when they are 
set_default(), then perhaps they should be restored to it when there is 
a new set_default().




What about following logic to be sure HW configuration and
'dev->data->mac_addrs[]' is same:

   index = eth_dev_get_mac_addr_index(port_id, addr);
   if (index > 0)
rte_eth_dev_mac_addr_remove(port_id, addr);
   (*dev->dev_ops->mac_addr_set)(dev, addr);

The logic above seems to be good. But if .mac_addr_set() failed to
execute, the addr has been removed from HW and 'dev->data->mac_addrs[]'.
It's not good.



Agree. So may need to get a copy of 'addr' and add it back on failure.

The concern I have to call 'rte_eth_dev_mac_addr_remove()' after
'dev_ops->mac_addr_set()' is, it may result different behavior on
diffe

[dpdk-dev] [PATCH v3] app/testpmd: fix l4 sw csum over multi segments

[Xiaoyun Li]

In csum forwarding mode, software UDP/TCP csum calculation only takes
the first segment into account while using the whole packet length so
the calculation will read invalid memory region with multi-segments
packets and will get wrong value.
This patch fixes this issue.

Fixes: af75078fece3 ("first public release")
Cc: sta...@dpdk.org

Signed-off-by: Xiaoyun Li 
---
v3:
 * Use rte_raw_cksum() for multi-segs case instead of copying the whole
 * packet.
v2:
 * Use static stack memory instead of dynamic allocating in datapath
---
 app/test-pmd/csumonly.c | 68 -
 1 file changed, 53 insertions(+), 15 deletions(-)

diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c
index 090797318a..f3e60eb3c3 100644
--- a/app/test-pmd/csumonly.c
+++ b/app/test-pmd/csumonly.c
@@ -91,12 +91,41 @@ struct simple_gre_hdr {
 } __rte_packed;
 
 static uint16_t
-get_udptcp_checksum(void *l3_hdr, void *l4_hdr, uint16_t ethertype)
+get_udptcp_checksum(void *l3_hdr, struct rte_mbuf *m, uint16_t l4_off,
+   uint16_t ethertype)
 {
+   uint16_t off = l4_off;
+   uint32_t cksum = 0;
+   char *buf;
+
+   while (m != NULL) {
+   buf = rte_pktmbuf_mtod_offset(m, char *, off);
+   cksum += rte_raw_cksum(buf, m->data_len - off);
+   off = 0;
+   m = m->next;
+   }
if (ethertype == _htons(RTE_ETHER_TYPE_IPV4))
-   return rte_ipv4_udptcp_cksum(l3_hdr, l4_hdr);
+   cksum += rte_ipv4_phdr_cksum(l3_hdr, 0);
else /* assume ethertype == RTE_ETHER_TYPE_IPV6 */
-   return rte_ipv6_udptcp_cksum(l3_hdr, l4_hdr);
+   cksum += rte_ipv6_phdr_cksum(l3_hdr, 0);
+
+   cksum = ((cksum & 0x) >> 16) + (cksum & 0x);
+   cksum = (~cksum) & 0x;
+
+   /*
+* Per RFC 768:If the computed checksum is zero for UDP,
+* it is transmitted as all ones
+* (the equivalent in one's complement arithmetic).
+*/
+   if (cksum == 0 && ethertype == _htons(RTE_ETHER_TYPE_IPV4) &&
+   ((struct rte_ipv4_hdr *)l3_hdr)->next_proto_id == IPPROTO_UDP)
+   cksum = 0x;
+
+   if (cksum == 0 && ethertype == _htons(RTE_ETHER_TYPE_IPV6) &&
+   ((struct rte_ipv6_hdr *)l3_hdr)->proto == IPPROTO_UDP)
+   cksum = 0x;
+
+   return (uint16_t)cksum;
 }
 
 /* Parse an IPv4 header to fill l3_len, l4_len, and l4_proto */
@@ -455,7 +484,7 @@ parse_encap_ip(void *encap_ip, struct testpmd_offload_info 
*info)
  * depending on the testpmd command line configuration */
 static uint64_t
 process_inner_cksums(void *l3_hdr, const struct testpmd_offload_info *info,
-   uint64_t tx_offloads)
+   uint64_t tx_offloads, struct rte_mbuf *m)
 {
struct rte_ipv4_hdr *ipv4_hdr = l3_hdr;
struct rte_udp_hdr *udp_hdr;
@@ -463,6 +492,7 @@ process_inner_cksums(void *l3_hdr, const struct 
testpmd_offload_info *info,
struct rte_sctp_hdr *sctp_hdr;
uint64_t ol_flags = 0;
uint32_t max_pkt_len, tso_segsz = 0;
+   uint16_t l4_off;
 
/* ensure packet is large enough to require tso */
if (!info->is_tunnel) {
@@ -505,9 +535,15 @@ process_inner_cksums(void *l3_hdr, const struct 
testpmd_offload_info *info,
if (tx_offloads & DEV_TX_OFFLOAD_UDP_CKSUM) {
ol_flags |= PKT_TX_UDP_CKSUM;
} else {
+   if (info->is_tunnel)
+   l4_off = info->l2_len +
+   info->outer_l3_len +
+   info->l2_len + info->l3_len;
+   else
+   l4_off = info->l2_len + info->l3_len;
udp_hdr->dgram_cksum = 0;
udp_hdr->dgram_cksum =
-   get_udptcp_checksum(l3_hdr, udp_hdr,
+   get_udptcp_checksum(l3_hdr, m, l4_off,
info->ethertype);
}
}
@@ -520,9 +556,14 @@ process_inner_cksums(void *l3_hdr, const struct 
testpmd_offload_info *info,
else if (tx_offloads & DEV_TX_OFFLOAD_TCP_CKSUM) {
ol_flags |= PKT_TX_TCP_CKSUM;
} else {
+   if (info->is_tunnel)
+   l4_off = info->l2_len + info->outer_l3_len +
+   info->l2_len + info->l3_len;
+   else
+   l4_off = info->l2_len + info->l3_len;
tcp_hdr->cksum = 0;
tcp_hdr->cksum =
-   get_udptcp_checksum(l3_hdr, tcp_hdr,
+   get_udptcp_checksum(l3_hdr, m, l4_off,