[dpdk-dev] [PATCH v2 0/2] pci: add rte prefix

[Thomas Monjalon]

Small namespace cleanups in PCI lib and bus driver.

v2:
   - mark old macro with RTE_DEPRECATED
   - fix common/mlx5

Thomas Monjalon (2):
  pci: rename catch-all ID
  bus/pci: rename probe/remove operation types

 drivers/bus/pci/pci_common.c  |  8 
 drivers/bus/pci/rte_bus_pci.h | 20 
 drivers/common/mlx5/mlx5_common_pci.c |  8 
 lib/librte_pci/rte_pci.h  | 12 +++-
 4 files changed, 23 insertions(+), 25 deletions(-)

-- 
2.31.1

[dpdk-dev] [PATCH v2 1/2] pci: rename catch-all ID

[Thomas Monjalon]

The name of the constant PCI_ANY_ID was missing RTE_ prefix.
It is renamed, and the old name becomes a deprecated alias.

While renaming, the duplicate definitions in rte_bus_pci.h
are removed to keep only those in rte_pci.h.
Note: rte_pci.h is included in rte_bus_pci.h

Signed-off-by: Thomas Monjalon 
---
 drivers/bus/pci/pci_common.c  |  8 
 drivers/bus/pci/rte_bus_pci.h | 12 
 drivers/common/mlx5/mlx5_common_pci.c |  8 
 lib/librte_pci/rte_pci.h  | 12 +++-
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 9b8d769287..ee7f966358 100644
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -133,18 +133,18 @@ rte_pci_match(const struct rte_pci_driver *pci_drv,
 id_table++) {
/* check if device's identifiers match the driver's ones */
if (id_table->vendor_id != pci_dev->id.vendor_id &&
-   id_table->vendor_id != PCI_ANY_ID)
+   id_table->vendor_id != RTE_PCI_ANY_ID)
continue;
if (id_table->device_id != pci_dev->id.device_id &&
-   id_table->device_id != PCI_ANY_ID)
+   id_table->device_id != RTE_PCI_ANY_ID)
continue;
if (id_table->subsystem_vendor_id !=
pci_dev->id.subsystem_vendor_id &&
-   id_table->subsystem_vendor_id != PCI_ANY_ID)
+   id_table->subsystem_vendor_id != RTE_PCI_ANY_ID)
continue;
if (id_table->subsystem_device_id !=
pci_dev->id.subsystem_device_id &&
-   id_table->subsystem_device_id != PCI_ANY_ID)
+   id_table->subsystem_device_id != RTE_PCI_ANY_ID)
continue;
if (id_table->class_id != pci_dev->id.class_id &&
id_table->class_id != RTE_CLASS_ANY_ID)
diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
index 876abddefb..3a092bc6d5 100644
--- a/drivers/bus/pci/rte_bus_pci.h
+++ b/drivers/bus/pci/rte_bus_pci.h
@@ -91,26 +91,22 @@ struct rte_pci_device {
 
 #define RTE_ETH_DEV_TO_PCI(eth_dev)RTE_DEV_TO_PCI((eth_dev)->device)
 
-/** Any PCI device identifier (vendor, device, ...) */
-#define PCI_ANY_ID (0x)
-#define RTE_CLASS_ANY_ID (0xff)
-
 #ifdef __cplusplus
 /** C++ macro used to help building up tables of device IDs */
 #define RTE_PCI_DEVICE(vend, dev) \
RTE_CLASS_ANY_ID, \
(vend),   \
(dev),\
-   PCI_ANY_ID,   \
-   PCI_ANY_ID
+   RTE_PCI_ANY_ID,   \
+   RTE_PCI_ANY_ID
 #else
 /** Macro used to help building up tables of device IDs */
 #define RTE_PCI_DEVICE(vend, dev)  \
.class_id = RTE_CLASS_ANY_ID,  \
.vendor_id = (vend),   \
.device_id = (dev),\
-   .subsystem_vendor_id = PCI_ANY_ID, \
-   .subsystem_device_id = PCI_ANY_ID
+   .subsystem_vendor_id = RTE_PCI_ANY_ID, \
+   .subsystem_device_id = RTE_PCI_ANY_ID
 #endif
 
 /**
diff --git a/drivers/common/mlx5/mlx5_common_pci.c 
b/drivers/common/mlx5/mlx5_common_pci.c
index a7f541a90c..9689ca86fc 100644
--- a/drivers/common/mlx5/mlx5_common_pci.c
+++ b/drivers/common/mlx5/mlx5_common_pci.c
@@ -142,18 +142,18 @@ mlx5_bus_match(const struct mlx5_pci_driver *drv,
 id_table++) {
/* Check if device's ids match the class driver's ids. */
if (id_table->vendor_id != pci_dev->id.vendor_id &&
-   id_table->vendor_id != PCI_ANY_ID)
+   id_table->vendor_id != RTE_PCI_ANY_ID)
continue;
if (id_table->device_id != pci_dev->id.device_id &&
-   id_table->device_id != PCI_ANY_ID)
+   id_table->device_id != RTE_PCI_ANY_ID)
continue;
if (id_table->subsystem_vendor_id !=
pci_dev->id.subsystem_vendor_id &&
-   id_table->subsystem_vendor_id != PCI_ANY_ID)
+   id_table->subsystem_vendor_id != RTE_PCI_ANY_ID)
continue;
if (id_table->subsystem_device_id !=
pci_dev->id.subsystem_device_id &&
-   id_table->subsystem_device_id != PCI_ANY_ID)
+   id_table->subsystem_device_id != RTE_PCI_ANY_ID)
continue;
if (id_table->class_id != pci_dev->id.class_id &&
id_table->class_id != RTE_CLASS_ANY_ID)
diff --git a/lib/librte_pci/rte_pci.h b/lib/librte_pci/rte_pci.h
index f89c7dbbea..a8f8e404a9 100644
--- a/lib/librte_pci/rte_pci.h
+++ b/lib/librte_pci/rte_pci.h
@@ -78,10 +78

[dpdk-dev] [PATCH v2 2/2] bus/pci: rename probe/remove operation types

[Thomas Monjalon]

The names of the prototypes pci_probe_t and pci_remove_t
are missing a prefix rte_.
These function types are simply renamed.

No compatibility break is expected for the applications
because it is considered as an internal name in the driver interface.

Signed-off-by: Thomas Monjalon 
---
 drivers/bus/pci/rte_bus_pci.h | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
index 3a092bc6d5..64886b4731 100644
--- a/drivers/bus/pci/rte_bus_pci.h
+++ b/drivers/bus/pci/rte_bus_pci.h
@@ -112,12 +112,12 @@ struct rte_pci_device {
 /**
  * Initialisation function for the driver called during PCI probing.
  */
-typedef int (pci_probe_t)(struct rte_pci_driver *, struct rte_pci_device *);
+typedef int (rte_pci_probe_t)(struct rte_pci_driver *, struct rte_pci_device 
*);
 
 /**
  * Uninitialisation function for the driver called during hotplugging.
  */
-typedef int (pci_remove_t)(struct rte_pci_device *);
+typedef int (rte_pci_remove_t)(struct rte_pci_device *);
 
 /**
  * Driver-specific DMA mapping. After a successful call the device
@@ -164,8 +164,8 @@ struct rte_pci_driver {
TAILQ_ENTRY(rte_pci_driver) next;  /**< Next in list. */
struct rte_driver driver;  /**< Inherit core driver. */
struct rte_pci_bus *bus;   /**< PCI bus reference. */
-   pci_probe_t *probe;/**< Device Probe function. */
-   pci_remove_t *remove;  /**< Device Remove function. */
+   rte_pci_probe_t *probe;/**< Device probe function. */
+   rte_pci_remove_t *remove;  /**< Device remove function. */
pci_dma_map_t *dma_map;/**< device dma map function. */
pci_dma_unmap_t *dma_unmap;/**< device dma unmap function. */
const struct rte_pci_id *id_table; /**< ID table, NULL terminated. */
-- 
2.31.1

Re: [dpdk-dev] [PATCH 3/3] drivers: align log names

[Thomas Monjalon]

22/03/2021 11:33, David Marchand:
> On Wed, Mar 10, 2021 at 3:02 PM Thomas Monjalon  wrote:
> > diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
> > index 6a1b44bc77..bf7afe4610 100644
> > --- a/drivers/vdpa/ifc/ifcvf_vdpa.c
> > +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
> > @@ -25,7 +25,7 @@
> >
> >  #include "base/ifcvf.h"
> >
> > -RTE_LOG_REGISTER(ifcvf_vdpa_logtype, pmd.net.ifcvf_vdpa, NOTICE);
> > +RTE_LOG_REGISTER(ifcvf_vdpa_logtype, pmd.vdpa.ifcvf, NOTICE);
> 
> The driver is in drivers/vdpa/ifc, I would expect pmd.vdpa.ifc

I'm not sure for this one.
My understanding is that the name of the driver can be
a little different of the directory name, especially if having
multiple drivers in a directory.
Here there is only VF in IFC.

> We have some little variations for the af_packet and bonding drivers,
> worth aligning from my pov.
> drivers/net/af_packet/rte_eth_af_packet.c:RTE_LOG_REGISTER(af_packet_logtype,
> pmd.net.packet, NOTICE);
> drivers/net/bonding/rte_eth_bond_pmd.c:RTE_LOG_REGISTER(bond_logtype,
> pmd.net.bond, NOTICE);

Yes good catch, will align these two.

> And ipn3ke is odd too:
> drivers/net/ipn3ke/ipn3ke_ethdev.c:RTE_LOG_REGISTER(ipn3ke_afu_logtype,
> pmd.afu.ipn3ke, NOTICE);

I agree it's strange, but I don't understand ifpga and ipn3ke enough
to have a good judgement.
I feel more naming have to be carified in this driver.

I will highlight ifc and ipn3ke in v2 to have a conclusion.

Rosen, Xiao, please comment.

[dpdk-dev] [PATCH] net/mlx5: fix the drop action for the DR/DV

[Viacheslav Ovsiienko]

There are multiple branches in rdma-core library backing:
the rte flows:
  - Verbs
  - Direct Verbs (DV)
  - Direct Rules (DR)

The Verbs API always requires the specifying the queue even
if there is the drop action in the flow, though the kernel
optimizes out the actual queue usage for the flows containing
the drop action. The PMD handles the dedicated Rx queue to
provide Verbs API compatibility.

The DV/DR API does not require explicit specifying the queue
at the flow creation, but PMD still specified the dedicated
drop queue as action. It performed the packet forwarding to
the dummy queue (that was not polled at all) causing the
steering pipeline resources usage and degrading the overall
packet processing rate. For example, with inserted flow to
drop all the ingress packets the statistics reported only
15Mpps of 64B packets were received over 100Gbps line.

Since the Direct Rule API for E-Switch was introduced the
rdma-core supports the dedicated drop action, that is recognized
both for DV and DR and can be used for the entire device in
unified fashion, regardless of steering domain. The similar drop
action was introduced for E-Switch, the usage of this one can be
extended for other steering domains, not for E-Switch's one only.

This patch:
  - renames esw_drop_action to dr_drop_action to emphasize
the global nature of the variable (not only E-Switch domain)
  - specifies this global drop action instead of dedicated
drop queue for the DR/DV flows

Cc: sta...@dpdk.org
Fixes: 34fa7c0268e7 ("net/mlx5: add drop action to Direct Verbs E-Switch")
Fixes: 65b3cd0dc39b ("net/mlx5: create global drop action")

Signed-off-by: Viacheslav Ovsiienko 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/linux/mlx5_os.c | 24 +---
 drivers/net/mlx5/mlx5.h  |  2 +-
 drivers/net/mlx5/mlx5_flow_dv.c  | 13 +++--
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 5e3ae9f10e..c9f997963c 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -325,7 +325,17 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
goto error;
}
sh->fdb_domain = domain;
-   sh->esw_drop_action = mlx5_glue->dr_create_flow_action_drop();
+   }
+   /*
+* The drop action is just some dummy placeholder in rdma-core. It
+* does not belong to domains and has no any attributes, and, can be
+* shared by the entire device.
+*/
+   sh->dr_drop_action = mlx5_glue->dr_create_flow_action_drop();
+   if (!sh->dr_drop_action) {
+   DRV_LOG(ERR, "FDB mlx5dv_dr_create_flow_action_drop");
+   err = errno;
+   goto error;
}
 #endif
if (!sh->tunnel_hub)
@@ -361,9 +371,9 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
mlx5_glue->dr_destroy_domain(sh->fdb_domain);
sh->fdb_domain = NULL;
}
-   if (sh->esw_drop_action) {
-   mlx5_glue->destroy_flow_action(sh->esw_drop_action);
-   sh->esw_drop_action = NULL;
+   if (sh->dr_drop_action) {
+   mlx5_glue->destroy_flow_action(sh->dr_drop_action);
+   sh->dr_drop_action = NULL;
}
if (sh->pop_vlan_action) {
mlx5_glue->destroy_flow_action(sh->pop_vlan_action);
@@ -418,9 +428,9 @@ mlx5_os_free_shared_dr(struct mlx5_priv *priv)
mlx5_glue->dr_destroy_domain(sh->fdb_domain);
sh->fdb_domain = NULL;
}
-   if (sh->esw_drop_action) {
-   mlx5_glue->destroy_flow_action(sh->esw_drop_action);
-   sh->esw_drop_action = NULL;
+   if (sh->dr_drop_action) {
+   mlx5_glue->destroy_flow_action(sh->dr_drop_action);
+   sh->dr_drop_action = NULL;
}
 #endif
if (sh->pop_vlan_action) {
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index e4963bd107..1c70e28c77 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -713,7 +713,7 @@ struct mlx5_dev_ctx_shared {
struct mlx5_hlist *flow_tbls;
struct mlx5_flow_tunnel_hub *tunnel_hub;
/* Direct Rules tables for FDB, NIC TX+RX */
-   void *esw_drop_action; /* Pointer to DR E-Switch drop action. */
+   void *dr_drop_action; /* Pointer to DR drop action, any domain. */
void *pop_vlan_action; /* Pointer to DR pop VLAN action. */
struct mlx5_hlist *encaps_decaps; /* Encap/decap action hash list. */
struct mlx5_hlist *modify_cmds;
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 23e5849783..eb70bae900 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -12002,11 +12002,19 @@ flow_dv_apply(struct rte_eth_dev *dev, struct 
rte_flow *flow,
n = dv->actions_n;
if (dh->fate_action == 

[dpdk-dev] [PATCH v2 0/3] drivers: align log names

[Thomas Monjalon]

After working on the option "--log-level help",
it became clear that few adjustments were required
for the log registration of some drivers.

v2:
   - align bonding and af_packet
   - make explicit the RTE_LOGTYPE_EAL default

Thomas Monjalon (3):
  log: choose EAL log type on registration failure
  drivers: fix log level after loading
  drivers: align log names

 doc/guides/cryptodevs/qat.rst | 10 ++---
 drivers/common/mlx5/mlx5_common.c |  9 +
 drivers/common/qat/qat_logs.c |  4 +-
 drivers/crypto/bcmfs/bcmfs_logs.c | 17 +---
 drivers/net/af_packet/rte_eth_af_packet.c |  2 +-
 drivers/net/bonding/rte_eth_bond_pmd.c|  2 +-
 drivers/net/e1000/e1000_logs.c| 49 +++
 drivers/net/e1000/em_ethdev.c |  6 ---
 drivers/net/e1000/igb_ethdev.c|  6 ---
 drivers/raw/ifpga/ifpga_rawdev.c  |  2 +-
 drivers/raw/ioat/ioat_rawdev.c|  2 +-
 drivers/raw/skeleton/skeleton_rawdev.c|  2 +-
 drivers/vdpa/ifc/ifcvf_vdpa.c |  2 +-
 lib/librte_eal/include/rte_log.h  |  2 +
 14 files changed, 23 insertions(+), 92 deletions(-)

-- 
2.31.1

[dpdk-dev] [PATCH v2 1/3] log: choose EAL log type on registration failure

[Thomas Monjalon]

In the unlikely case where something goes wrong
while registering a log type,
the fallback is to use the log type 0, assigned to EAL.

Signed-off-by: Thomas Monjalon 
---
 lib/librte_eal/include/rte_log.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_eal/include/rte_log.h b/lib/librte_eal/include/rte_log.h
index 173004fd71..21a7d16340 100644
--- a/lib/librte_eal/include/rte_log.h
+++ b/lib/librte_eal/include/rte_log.h
@@ -380,6 +380,8 @@ RTE_INIT(__##type)  
\
 {  \
type = rte_log_register_type_and_pick_level(RTE_STR(name),  \
RTE_LOG_##level);   \
+   if (type < 0)   \
+   type = RTE_LOGTYPE_EAL; \
 }
 
 #ifdef __cplusplus
-- 
2.31.1

[dpdk-dev] [PATCH v2 2/3] drivers: fix log level after loading

[Thomas Monjalon]

When compiled as a shared object, and loaded at runtime as a plugin,
the drivers should get the log level set earlier at EAL init
by the user through --log-level option.

The function for applying the log level setting is
rte_log_register_type_and_pick_level().
It is called by most drivers via RTE_LOG_REGISTER().

The drivers common/mlx5, bcmfs and e1000 were missing,
so the user-specified log level was not applied when
those drivers were loaded as plugins.
The macro RTE_LOG_REGISTER() is used for those drivers.

The unnecessary protection for double registration
is removed from e1000.

Fixes: 9c99878aa1b1 ("log: introduce logtype register macro")
Fixes: c8e79da7c676 ("crypto/bcmfs: introduce BCMFS driver")
Cc: sta...@dpdk.org

Signed-off-by: Thomas Monjalon 
Reviewed-by: David Marchand 
Acked-by: Ajit Khaparde 
---
 drivers/common/mlx5/mlx5_common.c |  9 +-
 drivers/crypto/bcmfs/bcmfs_logs.c | 17 ++-
 drivers/net/e1000/e1000_logs.c| 49 ---
 drivers/net/e1000/em_ethdev.c |  6 
 drivers/net/e1000/igb_ethdev.c|  6 
 5 files changed, 8 insertions(+), 79 deletions(-)

diff --git a/drivers/common/mlx5/mlx5_common.c 
b/drivers/common/mlx5/mlx5_common.c
index c26a2cfa30..f92f05bda5 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -14,8 +14,6 @@
 #include "mlx5_common_utils.h"
 #include "mlx5_common_pci.h"
 
-int mlx5_common_logtype;
-
 uint8_t haswell_broadwell_cpu;
 
 /* In case this is an x86_64 intel processor to check if
@@ -41,12 +39,7 @@ static inline void mlx5_cpu_id(unsigned int level,
 }
 #endif
 
-RTE_INIT_PRIO(mlx5_log_init, LOG)
-{
-   mlx5_common_logtype = rte_log_register("pmd.common.mlx5");
-   if (mlx5_common_logtype >= 0)
-   rte_log_set_level(mlx5_common_logtype, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(mlx5_common_logtype, pmd.common.mlx5, NOTICE)
 
 static bool mlx5_common_initialized;
 
diff --git a/drivers/crypto/bcmfs/bcmfs_logs.c 
b/drivers/crypto/bcmfs/bcmfs_logs.c
index 86f4ff3b53..701da9ecf3 100644
--- a/drivers/crypto/bcmfs/bcmfs_logs.c
+++ b/drivers/crypto/bcmfs/bcmfs_logs.c
@@ -8,9 +8,6 @@
 
 #include "bcmfs_logs.h"
 
-int bcmfs_conf_logtype;
-int bcmfs_dp_logtype;
-
 int
 bcmfs_hexdump_log(uint32_t level, uint32_t logtype, const char *title,
const void *buf, unsigned int len)
@@ -24,15 +21,5 @@ bcmfs_hexdump_log(uint32_t level, uint32_t logtype, const 
char *title,
return 0;
 }
 
-RTE_INIT(bcmfs_device_init_log)
-{
-   /* Configuration and general logs */
-   bcmfs_conf_logtype = rte_log_register("pmd.bcmfs_config");
-   if (bcmfs_conf_logtype >= 0)
-   rte_log_set_level(bcmfs_conf_logtype, RTE_LOG_NOTICE);
-
-   /* data-path logs */
-   bcmfs_dp_logtype = rte_log_register("pmd.bcmfs_fp");
-   if (bcmfs_dp_logtype >= 0)
-   rte_log_set_level(bcmfs_dp_logtype, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.bcmfs_config, NOTICE)
+RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.bcmfs_fp, NOTICE)
diff --git a/drivers/net/e1000/e1000_logs.c b/drivers/net/e1000/e1000_logs.c
index 231f5c03ef..d9b8a4672f 100644
--- a/drivers/net/e1000/e1000_logs.c
+++ b/drivers/net/e1000/e1000_logs.c
@@ -4,53 +4,14 @@
 
 #include "e1000_logs.h"
 
-/* declared as extern in e1000_logs.h */
-int e1000_logtype_init;
-int e1000_logtype_driver;
-
+RTE_LOG_REGISTER(e1000_logtype_init, pmd.net.e1000.init, NOTICE)
+RTE_LOG_REGISTER(e1000_logtype_driver, pmd.net.e1000.driver, NOTICE)
 #ifdef RTE_LIBRTE_E1000_DEBUG_RX
-int e1000_logtype_rx;
+RTE_LOG_REGISTER(e1000_logtype_rx, pmd.net.e1000.rx, DEBUG)
 #endif
 #ifdef RTE_LIBRTE_E1000_DEBUG_TX
-int e1000_logtype_tx;
+RTE_LOG_REGISTER(e1000_logtype_tx, pmd.net.e1000.tx, DEBUG)
 #endif
 #ifdef RTE_LIBRTE_E1000_DEBUG_TX_FREE
-int e1000_logtype_tx_free;
+RTE_LOG_REGISTER(e1000_logtype_tx_free, pmd.net.e1000.tx_free, DEBUG)
 #endif
-
-/* avoids double registering of logs if EM and IGB drivers are in use */
-static int e1000_log_initialized;
-
-void
-e1000_igb_init_log(void)
-{
-   if (e1000_log_initialized)
-   return;
-
-   e1000_logtype_init = rte_log_register("pmd.net.e1000.init");
-   if (e1000_logtype_init >= 0)
-   rte_log_set_level(e1000_logtype_init, RTE_LOG_NOTICE);
-   e1000_logtype_driver = rte_log_register("pmd.net.e1000.driver");
-   if (e1000_logtype_driver >= 0)
-   rte_log_set_level(e1000_logtype_driver, RTE_LOG_NOTICE);
-
-#ifdef RTE_LIBRTE_E1000_DEBUG_RX
-   e1000_logtype_rx = rte_log_register("pmd.net.e1000.rx");
-   if (e1000_logtype_rx >= 0)
-   rte_log_set_level(e1000_logtype_rx, RTE_LOG_DEBUG);
-#endif
-
-#ifdef RTE_LIBRTE_E1000_DEBUG_TX
-   e1000_logtype_tx = rte_log_register("pmd.net.e1000.tx");
-   if (e1000_logtype_tx >= 0)
-   rte_log_set_level(e1000_logtype_tx, RTE_LOG_DEBUG);
-#endif
-
-#ifdef RTE_LIBRTE_E1000_DEBUG_TX_FREE
-   e1000_logtype_tx_free = rte

[dpdk-dev] [PATCH v2 3/3] drivers: align log names

[Thomas Monjalon]

The log levels are configured by using the name of the logs.
Some drivers are aligned to follow a common log name standard:
pmd.class.driver[.sub]
Some "common" drivers skip the "class" part:
pmd.driver.sub

Two drivers have exceptions to be clarified:
pmd.vdpa.ifcvf instead of pmd.vdpa.ifc
pmd.afu.ipn3ke instead of pmd.net.ipn3ke

Signed-off-by: Thomas Monjalon 
Acked-by: Bruce Richardson 
Acked-by: Rosen Xu 
Acked-by: Xiao Wang 
Acked-by: Hemant Agrawal 
Acked-by: Ajit Khaparde 
---
 doc/guides/cryptodevs/qat.rst | 10 +-
 drivers/common/qat/qat_logs.c |  4 ++--
 drivers/crypto/bcmfs/bcmfs_logs.c |  4 ++--
 drivers/net/af_packet/rte_eth_af_packet.c |  2 +-
 drivers/net/bonding/rte_eth_bond_pmd.c|  2 +-
 drivers/raw/ifpga/ifpga_rawdev.c  |  2 +-
 drivers/raw/ioat/ioat_rawdev.c|  2 +-
 drivers/raw/skeleton/skeleton_rawdev.c|  2 +-
 drivers/vdpa/ifc/ifcvf_vdpa.c |  2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
index cf16f03503..224b22b3f7 100644
--- a/doc/guides/cryptodevs/qat.rst
+++ b/doc/guides/cryptodevs/qat.rst
@@ -659,15 +659,15 @@ Debugging
 
 There are 2 sets of trace available via the dynamic logging feature:
 
-* pmd.qat_dp exposes trace on the data-path.
-* pmd.qat_general exposes all other trace.
+* pmd.qat.dp exposes trace on the data-path.
+* pmd.qat.general exposes all other trace.
 
 pmd.qat exposes both sets of traces.
 They can be enabled using the log-level option (where 8=maximum log level) on
 the process cmdline, e.g. using any of the following::
 
---log-level="pmd.qat_general,8"
---log-level="pmd.qat_dp,8"
+--log-level="pmd.qat.general,8"
+--log-level="pmd.qat.dp,8"
 --log-level="pmd.qat,8"
 
 .. Note::
@@ -678,4 +678,4 @@ the process cmdline, e.g. using any of the following::
 Also the dynamic global log level overrides both sets of trace, so e.g. no
 QAT trace would display in this case::
 
-   --log-level="7" --log-level="pmd.qat_general,8"
+   --log-level="7" --log-level="pmd.qat.general,8"
diff --git a/drivers/common/qat/qat_logs.c b/drivers/common/qat/qat_logs.c
index fa48be53c3..adbe163cd9 100644
--- a/drivers/common/qat/qat_logs.c
+++ b/drivers/common/qat/qat_logs.c
@@ -17,5 +17,5 @@ qat_hexdump_log(uint32_t level, uint32_t logtype, const char 
*title,
return 0;
 }
 
-RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat_general, NOTICE);
-RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat_dp, NOTICE);
+RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat.general, NOTICE);
+RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat.dp, NOTICE);
diff --git a/drivers/crypto/bcmfs/bcmfs_logs.c 
b/drivers/crypto/bcmfs/bcmfs_logs.c
index 701da9ecf3..9faf12f238 100644
--- a/drivers/crypto/bcmfs/bcmfs_logs.c
+++ b/drivers/crypto/bcmfs/bcmfs_logs.c
@@ -21,5 +21,5 @@ bcmfs_hexdump_log(uint32_t level, uint32_t logtype, const 
char *title,
return 0;
 }
 
-RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.bcmfs_config, NOTICE)
-RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.bcmfs_fp, NOTICE)
+RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.crypto.bcmfs.config, NOTICE)
+RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.crypto.bcmfs.fp, NOTICE)
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c 
b/drivers/net/af_packet/rte_eth_af_packet.c
index bfe5a0a451..a04f7c773a 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -97,7 +97,7 @@ static struct rte_eth_link pmd_link = {
.link_autoneg = ETH_LINK_FIXED,
 };
 
-RTE_LOG_REGISTER(af_packet_logtype, pmd.net.packet, NOTICE);
+RTE_LOG_REGISTER(af_packet_logtype, pmd.net.af_packet, NOTICE);
 
 #define PMD_LOG(level, fmt, args...) \
rte_log(RTE_LOG_ ## level, af_packet_logtype, \
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c 
b/drivers/net/bonding/rte_eth_bond_pmd.c
index 24e3cf3c2e..2e9cea5b8e 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -3775,4 +3775,4 @@ RTE_PMD_REGISTER_PARAM_STRING(net_bonding,
"up_delay= "
"down_delay=");
 
-RTE_LOG_REGISTER(bond_logtype, pmd.net.bond, NOTICE);
+RTE_LOG_REGISTER(bond_logtype, pmd.net.bonding, NOTICE);
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index 05d79bfcc2..d9a46ef915 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -1611,7 +1611,7 @@ static struct rte_pci_driver rte_ifpga_rawdev_pmd = {
 RTE_PMD_REGISTER_PCI(ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd);
 RTE_PMD_REGISTER_KMOD_DEP(ifpga_rawdev_pci_driver, "* igb_uio | 
uio_pci_generic | vfio-pci");
-RTE_LOG_REGISTER(ifpga_rawdev_logtype, driver.raw.init, NOTICE);
+RTE_LOG_REGISTER(ifpga_rawdev_logtype, pmd.raw.ifpga, NOTICE);
 
 static const char * const valid_args[] = {
 #define IFPGA_ARG_NAM

Re: [dpdk-dev] [PATCH v2 0/3] drivers: align log names

[Thomas Monjalon]

Sorry the name of the series should be "cleanup drivers log registration"

05/04/2021 12:02, Thomas Monjalon:
> After working on the option "--log-level help",
> it became clear that few adjustments were required
> for the log registration of some drivers.
> 
> v2:
>- align bonding and af_packet
>- make explicit the RTE_LOGTYPE_EAL default
> 
> Thomas Monjalon (3):
>   log: choose EAL log type on registration failure
>   drivers: fix log level after loading
>   drivers: align log names

[dpdk-dev] [PATCH] net/mlx5: fix drop queue function declarations

[Viacheslav Ovsiienko]

There are some leftovers of removed code - there are
no drop queue handling routines anymore.

Fixes: 78be885295b8 ("net/mlx5: handle drop queues as regular queues")
Cc: sta...@dpdk.org

Signed-off-by: Viacheslav Ovsiienko 
---
 drivers/net/mlx5/mlx5.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 1c70e28c77..4dfb85de4e 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1210,8 +1210,6 @@ int mlx5_ctrl_flow(struct rte_eth_dev *dev,
   struct rte_flow_item_eth *eth_mask);
 int mlx5_flow_lacp_miss(struct rte_eth_dev *dev);
 struct rte_flow *mlx5_flow_create_esw_table_zero_flow(struct rte_eth_dev *dev);
-int mlx5_flow_create_drop_queue(struct rte_eth_dev *dev);
-void mlx5_flow_delete_drop_queue(struct rte_eth_dev *dev);
 void mlx5_flow_async_pool_query_handle(struct mlx5_dev_ctx_shared *sh,
   uint64_t async_id, int status);
 void mlx5_set_query_alarm(struct mlx5_dev_ctx_shared *sh);
-- 
2.28.0

Re: [dpdk-dev] rte_flow ageing

[Matan Azrad]

Hi

I will try to answer inline with prefix [MA].

From: David Bouyeure 
Sent: Tuesday, March 30, 2021 6:46 PM
To: Asaf Penso ; dev@dpdk.org
Cc: Matan Azrad ; Jack Min 
Subject: Re: [dpdk-dev] rte_flow ageing

External email: Use caution opening links or attachments


Thanks a lot Asaf, for your answer, so fast.

depending on the feature we want, the table you mentioned in the doc may give 
different combinations. Mine, DPDK-20.08/OFED 5.1-2, is part of the list.

Anyway, my question is more about the API design. Please, find my comments 
below.
On 3/29/21 8:02 PM, Asaf Penso wrote:

Hello David,



Thanks for reaching out, I'll try to answer as best as I know and I added Matan 
who will be able to provide further info during next week.

First, according to our pmd documentation 
(http://doc.dpdk.org/guides/nics/mlx5.html#supported-hardware-offloads)
 we recommend using DPDK20.11 and OFED5.2, and not the combo you are referring 
to.

Second, we can always improve our documentation and I appreciate your queries.



Please see my comments inline.



Regards,

Asaf Penso



-Original Message-

From: dev  On Behalf Of 
David Bouyeure

Sent: Monday, March 29, 2021 11:35 AM

To: dev@dpdk.org

Subject: [dpdk-dev] rte_flow ageing



Hi,





I've found out the pretty useful experimental brand new flow ageing API

implemented in the mlx5 PMD.



It is useful and I hope you'll fully understand at the end why 😊







I'm trying it (rte_eth_dev_callback_register(RTE_ETH_EVENT_FLOW_AGED),

RTE_FLOW_ACTION_TYPE_AGE) to recover any flow that I previously

offloaded.



The DPDK version is 20.08 and Mellanox(Connect-X6) OFED drivers are 5.1-

2.5.8.0.





See above the suggested versions for this feature



I eventually don't see the usefulness of the callback since it's actually 
triggered

indirectly by us(the DPDK application) when calling

rte_flow_get_aged_flows().



The main intention is to offload the aging logic from the application level to 
the pmd level.

There is so saving of cpu cycles, and the gain here is with simplicity.

The application doesn't need to have complex logic of comparison between 
counters or other HW info that can be retrieve.

Now, the pmd hides all of that and leaves the application only to decide what 
to do with the flows that are aged out.

Please note, the pmd does not delete any flow, just provide the list of all the 
flows that are aged.
I fully understand that and this is a very very useful feature to us.




If we don't call it, the callback is called only once.



And, calling rte_flow_get_aged_flows() from the callback won't trigger it next

time(MLX5_AGE_TRIGGER is reset after the callback call)



Once you call the function the pmd will not trigger more events. Now it's up to 
the application to decide what to do.

Doing it differently, will cause an interrupt storm and the pmd avoids that.If 
new flows are aged then the pmd will trigger a new event.

Sorry, I wasn't realizing that the callback isn't called for each flow but 
rather for each port, though it's clear in the PMD code. But, the fact that we 
can register several RTE_ETH_EVENT_FLOW_AGED event handlers is surprising.

[MA] Yes you can register the event for each port support aging if you want 
your callback will be called for “new” aged flows.

So, you suggest to use the callback as an indicator to later retrieve the 
aged-out flows, that's it?

[MA] the user has 2 options:

  1.  Register the AGE event -> in event time to query the aged-out flows by 
the rte_flow_get_aged_flows API, this call will trigger a new event when new 
aged-out flow will be detected for the port.(if you don’t call 
rte_flow_get_aged_flows the event will not be retriggered.)
  2.  Just call rte_flow_get_aged_flows from time to time(application polling).



Wouldn't calling rte_flow_get_aged_flows with NULL param just to get the number 
of aged_flows do the same, without the need to un/register a callback, and DPDK 
to call it?



[MA]

Here, application need to do polling all the time (option 2), in option 1 
application invest effort only when aged-out flows are detected.

In option 1, you can call it with NULL also in order to know what is the array 
size you need for the actual call.
Another thing, the explanation here 
http://doc.dpdk.org/api/rte__flow_8h.html#a43763e0794d2696b18b6272619aafc2a

Re: [dpdk-dev] [PATCH 1/2] pci: rename catch-all ID

[Parav Pandit]

> From: dev  On Behalf Of Thomas Monjalon
> Sent: Thursday, April 1, 2021 4:04 AM
> 
> The name of the constant PCI_ANY_ID was missing RTE_ prefix.
> It is renamed, and the old name becomes a deprecated alias.
> 
> While renaming, the duplicate definitions in rte_bus_pci.h are removed to
> keep only those in rte_pci.h.
> Note: rte_pci.h is included in rte_bus_pci.h
> 
> Signed-off-by: Thomas Monjalon 
> ---
>  drivers/bus/pci/pci_common.c  |  8   drivers/bus/pci/rte_bus_pci.h |
> 12 
>  lib/librte_pci/rte_pci.h  | 12 +++-
>  3 files changed, 15 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
> index 9b8d769287..ee7f966358 100644
> --- a/drivers/bus/pci/pci_common.c
> +++ b/drivers/bus/pci/pci_common.c
> @@ -133,18 +133,18 @@ rte_pci_match(const struct rte_pci_driver
> *pci_drv,
>id_table++) {
>   /* check if device's identifiers match the driver's ones */
>   if (id_table->vendor_id != pci_dev->id.vendor_id &&
> - id_table->vendor_id != PCI_ANY_ID)
> + id_table->vendor_id != RTE_PCI_ANY_ID)
>   continue;
>   if (id_table->device_id != pci_dev->id.device_id &&
> - id_table->device_id != PCI_ANY_ID)
> + id_table->device_id != RTE_PCI_ANY_ID)
>   continue;
>   if (id_table->subsystem_vendor_id !=
>   pci_dev->id.subsystem_vendor_id &&
> - id_table->subsystem_vendor_id != PCI_ANY_ID)
> + id_table->subsystem_vendor_id != RTE_PCI_ANY_ID)
>   continue;
>   if (id_table->subsystem_device_id !=
>   pci_dev->id.subsystem_device_id &&
> - id_table->subsystem_device_id != PCI_ANY_ID)
> + id_table->subsystem_device_id != RTE_PCI_ANY_ID)
>   continue;
>   if (id_table->class_id != pci_dev->id.class_id &&
>   id_table->class_id != RTE_CLASS_ANY_ID) diff
> --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h index
> 876abddefb..3a092bc6d5 100644
> --- a/drivers/bus/pci/rte_bus_pci.h
> +++ b/drivers/bus/pci/rte_bus_pci.h
> @@ -91,26 +91,22 @@ struct rte_pci_device {
> 
>  #define RTE_ETH_DEV_TO_PCI(eth_dev)  RTE_DEV_TO_PCI((eth_dev)-
> >device)
> 
> -/** Any PCI device identifier (vendor, device, ...) */ -#define PCI_ANY_ID
> (0x) -#define RTE_CLASS_ANY_ID (0xff)
> -
>  #ifdef __cplusplus
>  /** C++ macro used to help building up tables of device IDs */  #define
> RTE_PCI_DEVICE(vend, dev) \
>   RTE_CLASS_ANY_ID, \
>   (vend),   \
>   (dev),\
> - PCI_ANY_ID,   \
> - PCI_ANY_ID
> + RTE_PCI_ANY_ID,   \
> + RTE_PCI_ANY_ID
>  #else
>  /** Macro used to help building up tables of device IDs */
>  #define RTE_PCI_DEVICE(vend, dev)  \
>   .class_id = RTE_CLASS_ANY_ID,  \
>   .vendor_id = (vend),   \
>   .device_id = (dev),\
> - .subsystem_vendor_id = PCI_ANY_ID, \
> - .subsystem_device_id = PCI_ANY_ID
> + .subsystem_vendor_id = RTE_PCI_ANY_ID, \
> + .subsystem_device_id = RTE_PCI_ANY_ID
>  #endif
> 
>  /**
> diff --git a/lib/librte_pci/rte_pci.h b/lib/librte_pci/rte_pci.h index
> f89c7dbbea..ed3196a368 100644
> --- a/lib/librte_pci/rte_pci.h
> +++ b/lib/librte_pci/rte_pci.h
> @@ -78,10 +78,10 @@ extern "C" {
>   */
>  struct rte_pci_id {
>   uint32_t class_id;/**< Class ID or RTE_CLASS_ANY_ID. */
> - uint16_t vendor_id;   /**< Vendor ID or PCI_ANY_ID. */
> - uint16_t device_id;   /**< Device ID or PCI_ANY_ID. */
> - uint16_t subsystem_vendor_id; /**< Subsystem vendor ID or
> PCI_ANY_ID. */
> - uint16_t subsystem_device_id; /**< Subsystem device ID or
> PCI_ANY_ID. */
> + uint16_t vendor_id;   /**< Vendor ID or RTE_PCI_ANY_ID. */
> + uint16_t device_id;   /**< Device ID or RTE_PCI_ANY_ID. */
> + uint16_t subsystem_vendor_id; /**< Subsystem vendor ID or
> RTE_PCI_ANY_ID. */
> + uint16_t subsystem_device_id; /**< Subsystem device ID or
> +RTE_PCI_ANY_ID. */
>  };
> 
>  /**
> @@ -95,7 +95,9 @@ struct rte_pci_addr {
>  };
> 
>  /** Any PCI device identifier (vendor, device, ...) */ -#define PCI_ANY_ID
> (0x)
> +#define RTE_PCI_ANY_ID (0x)
> +/** @deprecated Replaced with RTE_PCI_ANY_ID */ #define PCI_ANY_ID
> +RTE_PCI_ANY_ID
>  #define RTE_CLASS_ANY_ID (0xff)
> 
>  /**
> --
> 2.30.1

Reviewed-by: Parav Pandit 

Re: [dpdk-dev] [PATCH v2 1/2] common/mlx5: support device global syntax

[Slava Ovsiienko]

> -Original Message-
> From: Xueming Li 
> Sent: Monday, January 18, 2021 17:27
> To: Slava Ovsiienko 
> Cc: dev@dpdk.org; Matan Azrad ; Shahaf Shuler
> ; NBU-Contact-Thomas Monjalon
> ; Xueming(Steven) Li ;
> Asaf Penso 
> Subject: [PATCH v2 1/2] common/mlx5: support device global syntax
> 
> This patch supports new device global device syntax, resolve class type from
> "class" section if the devarg is global device syntax:
> bus=,k=v,,,/class=,k=v,,,/driver=,k=v
> 
> To reuse class name of global device syntax, this patch also changes internal
> class name introduced by commit [1] to algin with RTE class name.
Typo: algin -> align

Beside this:
Acked-by: Viacheslav Ovsiienko 


> 
> [1]
> 8a41f4deccc3: common/mlx5: introduce layer for multiple class drivers
> 
> Signed-off-by: Xueming Li 
> ---
>  drivers/common/mlx5/mlx5_common_pci.c | 6 +-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/common/mlx5/mlx5_common_pci.c
> b/drivers/common/mlx5/mlx5_common_pci.c
> index 5208972bb6..c03bdbf4eb 100644
> --- a/drivers/common/mlx5/mlx5_common_pci.c
> +++ b/drivers/common/mlx5/mlx5_common_pci.c
> @@ -4,6 +4,7 @@
> 
>  #include 
>  #include 
> +#include 
>  #include "mlx5_common_utils.h"
>  #include "mlx5_common_pci.h"
> 
> @@ -26,7 +27,7 @@ static const struct {
>   unsigned int driver_class;
>  } mlx5_classes[] = {
>   { .name = "vdpa", .driver_class = MLX5_CLASS_VDPA },
> - { .name = "net", .driver_class = MLX5_CLASS_NET },
> + { .name = "eth", .driver_class = MLX5_CLASS_NET },
>   { .name = "regex", .driver_class = MLX5_CLASS_REGEX },  };
> 
> @@ -115,6 +116,9 @@ parse_class_options(const struct rte_devargs
> *devargs)
> 
>   if (devargs == NULL)
>   return 0;
> + if (devargs->cls != NULL)
> + /* support new global syntax */
> + return class_name_to_value(devargs->cls->name);
>   kvlist = rte_kvargs_parse(devargs->args, NULL);
>   if (kvlist == NULL)
>   return 0;
> --
> 2.25.1

Re: [dpdk-dev] [PATCH v2 2/2] net/mlx5: support new global device syntax

[Slava Ovsiienko]

> -Original Message-
> From: Xueming Li 
> Sent: Monday, January 18, 2021 17:27
> To: Slava Ovsiienko 
> Cc: dev@dpdk.org; Matan Azrad ; Shahaf Shuler
> ; NBU-Contact-Thomas Monjalon
> ; Xueming(Steven) Li ;
> Asaf Penso 
> Subject: [PATCH v2 2/2] net/mlx5: support new global device syntax
> 
> This patch support new global device syntax like:
>   bus=pci,addr=BB:DD.F/class=eth/driver=mlx5,devargs,..
> 
> In driver parameters check, ignores "driver" key which is part of new global
> device syntax instead of reporting error.
> 
> Signed-off-by: Xueming Li 
Acked-by: Viacheslav Ovsiienko 

> ---
>  drivers/net/mlx5/mlx5.c | 6 +-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index
> e245276fce..3b0e59ce1d 100644
> --- a/drivers/net/mlx5/mlx5.c
> +++ b/drivers/net/mlx5/mlx5.c
> @@ -41,6 +41,9 @@
>  #include "mlx5_flow_os.h"
>  #include "rte_pmd_mlx5.h"
> 
> +/* Driver type key for new device global syntax. */ #define
> +MLX5_DRIVER_KEY "driver"
> +
>  /* Device parameter to enable RX completion queue compression. */
> #define MLX5_RXQ_CQE_COMP_EN "rxq_cqe_comp_en"
> 
> @@ -1597,7 +1600,7 @@ mlx5_args_check(const char *key, const char *val,
> void *opaque)
>   signed long tmp;
> 
>   /* No-op, port representors are processed in mlx5_dev_spawn(). */
> - if (!strcmp(MLX5_REPRESENTOR, key))
> + if (!strcmp(MLX5_DRIVER_KEY, key) ||
> !strcmp(MLX5_REPRESENTOR, key))
>   return 0;
>   errno = 0;
>   tmp = strtol(val, NULL, 0);
> @@ -1749,6 +1752,7 @@ int
>  mlx5_args(struct mlx5_dev_config *config, struct rte_devargs *devargs)  {
>   const char **params = (const char *[]){
> + MLX5_DRIVER_KEY,
>   MLX5_RXQ_CQE_COMP_EN,
>   MLX5_RXQ_PKT_PAD_EN,
>   MLX5_RX_MPRQ_EN,
> --
> 2.25.1

Re: [dpdk-dev] [PATCH v2 1/6] app/test: refactor of unit test suite runner

[Aaron Conole]

Ciara Power  writes:

> Some small changes were made to the unit test suite runner for
> readability and to enable reuse of some of the function in a later patch.
>
> On test suite setup skip/fail, the loop to count testcases as
> skipped/failed has been moved to another function.
> This will allow for recursion in a later patch when nested sub-testsuites
> are used.
>
> The unit test suite runner accessed the list of testcases in the suite
> structure every time the testcase was used. This is now replaced by a
> testcase variable which improves readability.
>
> A macro has been introduced for readability, instead of using open
> coded loops.
>
> Rather than keep local variable status counts for testcases,
> these are added to the test suite structure.
>
> The summary output now prints the suite name, this will be useful later
> when multiple nested sub-testsuites are being run.
>
> Signed-off-by: Ciara Power 
>
> ---
> v2:
>   - Added macro to loop testcases in suite.
>   - Testcase counts added to the test suite structure.
> ---

Acked-by: Aaron Conole 

Re: [dpdk-dev] [PATCH v2 2/6] test: introduce parent testsuite format

[Aaron Conole]

Ciara Power  writes:

> The current structure for unit testing only allows for running a
> test suite with nested test cases. This means all test cases for an
> autotest must be in one suite, which is not ideal.
> For example, in some cases we may want to run multiple lists of test
> cases that each require different setup, so should be in separate suites.
>
> The unit test suite struct is modified to hold a pointer to a list of
> sub-testsuite pointers, along with the list of testcases as before.
> Both should not be used at once, if there are sub-testsuite pointers,
> that takes precedence over testcases.
>
> Signed-off-by: Ciara Power 
>
> ---
> v2:
>   - Added macro to loop sub-testsuites.
>   - Added sub-testsuite summary detail.
> ---
>  app/test/test.c | 168 ++--
>  app/test/test.h |   1 +
>  2 files changed, 122 insertions(+), 47 deletions(-)
>
> diff --git a/app/test/test.c b/app/test/test.c
> index a795cba1bb..e401de0fdf 100644
> --- a/app/test/test.c
> +++ b/app/test/test.c
> @@ -41,6 +41,11 @@ extern cmdline_parse_ctx_t main_ctx[];
>   suite->unit_test_cases[iter].testcase;  \
>   iter++, case = suite->unit_test_cases[iter])
>  
> +#define FOR_EACH_SUITE_TESTSUITE(iter, suite, sub_ts)
> \
> + for (iter = 0, sub_ts = suite->unit_test_suites[0]; \
> + suite->unit_test_suites[iter]->suite_name != NULL;  \
> + iter++, sub_ts = suite->unit_test_suites[iter])
> +
>  const char *prgname; /* to be set to argv[0] */
>  
>  static const char *recursive_call; /* used in linux for MP and other tests */
> @@ -214,21 +219,46 @@ main(int argc, char **argv)
>  
>  static void
>  unit_test_suite_count_tcs_on_setup_fail(struct unit_test_suite *suite,
> - int test_success)
> + int test_success, unsigned int *sub_ts_failed,
> + unsigned int *sub_ts_skipped, unsigned int *sub_ts_total)
>  {
>   struct unit_test_case tc;
> -
> - FOR_EACH_SUITE_TESTCASE(suite->total, suite, tc) {
> - if (!tc.enabled || test_success == TEST_SKIPPED)
> - suite->skipped++;
> - else
> - suite->failed++;
> + struct unit_test_suite *ts;
> + int i;
> +
> + if (suite->unit_test_suites) {
> + FOR_EACH_SUITE_TESTSUITE(i, suite, ts) {
> + unit_test_suite_count_tcs_on_setup_fail(
> + ts, test_success, sub_ts_failed,
> + sub_ts_skipped, sub_ts_total);
> + suite->total += ts->total;
> + suite->failed += ts->failed;
> + suite->skipped += ts->skipped;
> + if (ts->failed)
> + (*sub_ts_failed)++;
> + else
> + (*sub_ts_skipped)++;
> + (*sub_ts_total)++;
> + }
> + } else {
> + FOR_EACH_SUITE_TESTCASE(suite->total, suite, tc) {
> + if (!tc.enabled || test_success == TEST_SKIPPED)
> + suite->skipped++;
> + else
> + suite->failed++;
> + }
>   }
>  }
>  
>  static void
>  unit_test_suite_reset_counts(struct unit_test_suite *suite)
>  {
> + struct unit_test_suite *ts;
> + int i;
> +
> + if (suite->unit_test_suites)
> + FOR_EACH_SUITE_TESTSUITE(i, suite, ts)
> + unit_test_suite_reset_counts(ts);
>   suite->total = 0;
>   suite->executed = 0;
>   suite->succeeded = 0;
> @@ -240,9 +270,12 @@ unit_test_suite_reset_counts(struct unit_test_suite 
> *suite)
>  int
>  unit_test_suite_runner(struct unit_test_suite *suite)
>  {
> - int test_success;
> + int test_success, i, ret;
>   const char *status;
>   struct unit_test_case tc;
> + struct unit_test_suite *ts;
> + unsigned int sub_ts_succeeded = 0, sub_ts_failed = 0;
> + unsigned int sub_ts_skipped = 0, sub_ts_total = 0;
>  
>   unit_test_suite_reset_counts(suite);
>  
> @@ -259,70 +292,111 @@ unit_test_suite_runner(struct unit_test_suite *suite)
>* mark them as failed/skipped
>*/
>   unit_test_suite_count_tcs_on_setup_fail(suite,
> - test_success);
> + test_success, &sub_ts_failed,
> + &sub_ts_skipped, &sub_ts_total);
>   goto suite_summary;
>   }
>   }
>  
>   printf(" + --- 
> +\n");
>  
> - FOR_EACH_SUITE_TESTCASE(suite->total, suite, tc) {
> - if (!tc.enabled) {
> - suite->skipped++;
> - continue;
> - } else {
> -  

[dpdk-dev] [PATCH 0/6] net/mlx5: reduce Tx datapath compile time

[Michael Baum]

The mlx5_rxtx.c file contains a lot of Tx burst functions, each of those is 
performance-optimized for the specific set of requested offloads.
These ones are generated on the basis of the template function and it takes 
significant time to compile, just due to a large number of giant functions 
generated in the same file and this compilation is not being done in parallel 
with using multithreading.

Therefore, in this series we split the mlx5_rxtx.c file into several separate 
files to allow different functions to be compiled simultaneously.

Michael Baum (6):
  net/mlx5: separate Rx function declarations to another file
  net/mlx5: separate Rx function implementations to new file
  net/mlx5: separate Tx function declarations to another file
  net/mlx5: separate Tx burst template to header file
  net/mlx5: separate Tx function implementations to new file
  net/mlx5: separate Tx burst functions to different files

 drivers/net/mlx5/linux/mlx5_mp_os.c |2 +
 drivers/net/mlx5/linux/mlx5_os.c|2 +
 drivers/net/mlx5/linux/mlx5_verbs.c |3 +-
 drivers/net/mlx5/meson.build|6 +
 drivers/net/mlx5/mlx5.c |2 +
 drivers/net/mlx5/mlx5_devx.c|3 +-
 drivers/net/mlx5/mlx5_ethdev.c  |2 +
 drivers/net/mlx5/mlx5_flow.c|3 +-
 drivers/net/mlx5/mlx5_flow_dv.c |3 +-
 drivers/net/mlx5/mlx5_flow_verbs.c  |2 +-
 drivers/net/mlx5/mlx5_mr.c  |2 +
 drivers/net/mlx5/mlx5_rss.c |1 +
 drivers/net/mlx5/mlx5_rx.c  | 1203 
 drivers/net/mlx5/mlx5_rx.h  |  598 
 drivers/net/mlx5/mlx5_rxmode.c  |1 -
 drivers/net/mlx5/mlx5_rxq.c |3 +-
 drivers/net/mlx5/mlx5_rxtx.c| 5468 +--
 drivers/net/mlx5/mlx5_rxtx.h|  915 +-
 drivers/net/mlx5/mlx5_rxtx_vec.c|1 +
 drivers/net/mlx5/mlx5_stats.c   |3 +-
 drivers/net/mlx5/mlx5_trigger.c |3 +-
 drivers/net/mlx5/mlx5_tx.c  |  780 +
 drivers/net/mlx5/mlx5_tx.h  | 3734 
 drivers/net/mlx5/mlx5_tx_empw.c |   71 +
 drivers/net/mlx5/mlx5_tx_mpw.c  |   34 +
 drivers/net/mlx5/mlx5_tx_nompw.c|   71 +
 drivers/net/mlx5/mlx5_tx_txpp.c |   45 +
 drivers/net/mlx5/mlx5_txpp.c|3 +-
 drivers/net/mlx5/mlx5_txq.c |3 +-
 drivers/net/mlx5/mlx5_vlan.c|1 +
 drivers/net/mlx5/windows/mlx5_os.c  |2 +
 31 files changed, 6581 insertions(+), 6389 deletions(-)
 create mode 100644 drivers/net/mlx5/mlx5_rx.c
 create mode 100644 drivers/net/mlx5/mlx5_rx.h
 create mode 100644 drivers/net/mlx5/mlx5_tx.c
 create mode 100644 drivers/net/mlx5/mlx5_tx.h
 create mode 100644 drivers/net/mlx5/mlx5_tx_empw.c
 create mode 100644 drivers/net/mlx5/mlx5_tx_mpw.c
 create mode 100644 drivers/net/mlx5/mlx5_tx_nompw.c
 create mode 100644 drivers/net/mlx5/mlx5_tx_txpp.c

-- 
1.8.3.1

[dpdk-dev] [PATCH 3/6] net/mlx5: separate Tx function declarations to another file

[Michael Baum]

This patch separates Tx function declarations to different header file
in preparation for removing their implementation from the source file
and as an optional preparation for Tx cleanup.

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/linux/mlx5_mp_os.c |   1 +
 drivers/net/mlx5/linux/mlx5_os.c|   1 +
 drivers/net/mlx5/linux/mlx5_verbs.c |   2 +-
 drivers/net/mlx5/mlx5.c |   1 +
 drivers/net/mlx5/mlx5_devx.c|   2 +-
 drivers/net/mlx5/mlx5_ethdev.c  |   1 +
 drivers/net/mlx5/mlx5_flow.c|   2 +-
 drivers/net/mlx5/mlx5_flow_dv.c |   2 +-
 drivers/net/mlx5/mlx5_flow_verbs.c  |   1 -
 drivers/net/mlx5/mlx5_mr.c  |   1 +
 drivers/net/mlx5/mlx5_rxmode.c  |   1 -
 drivers/net/mlx5/mlx5_rxq.c |   2 +-
 drivers/net/mlx5/mlx5_rxtx.c|   1 +
 drivers/net/mlx5/mlx5_rxtx.h| 344 -
 drivers/net/mlx5/mlx5_stats.c   |   2 +-
 drivers/net/mlx5/mlx5_trigger.c |   2 +-
 drivers/net/mlx5/mlx5_tx.h  | 371 
 drivers/net/mlx5/mlx5_txpp.c|   2 +-
 drivers/net/mlx5/mlx5_txq.c |   2 +-
 drivers/net/mlx5/windows/mlx5_os.c  |   1 +
 20 files changed, 387 insertions(+), 355 deletions(-)
 create mode 100644 drivers/net/mlx5/mlx5_tx.h

diff --git a/drivers/net/mlx5/linux/mlx5_mp_os.c 
b/drivers/net/mlx5/linux/mlx5_mp_os.c
index 63fa278..ca529b6 100644
--- a/drivers/net/mlx5/linux/mlx5_mp_os.c
+++ b/drivers/net/mlx5/linux/mlx5_mp_os.c
@@ -17,6 +17,7 @@
 #include "mlx5.h"
 #include "mlx5_rxtx.h"
 #include "mlx5_rx.h"
+#include "mlx5_tx.h"
 #include "mlx5_utils.h"
 
 int
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 97a28ec..026423b 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -41,6 +41,7 @@
 #include "mlx5_utils.h"
 #include "mlx5_rxtx.h"
 #include "mlx5_rx.h"
+#include "mlx5_tx.h"
 #include "mlx5_autoconf.h"
 #include "mlx5_mr.h"
 #include "mlx5_flow.h"
diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c 
b/drivers/net/mlx5/linux/mlx5_verbs.c
index 73096af..0b0759f 100644
--- a/drivers/net/mlx5/linux/mlx5_verbs.c
+++ b/drivers/net/mlx5/linux/mlx5_verbs.c
@@ -20,9 +20,9 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 6f77bc2..02cc2c7 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -36,6 +36,7 @@
 #include "mlx5_utils.h"
 #include "mlx5_rxtx.h"
 #include "mlx5_rx.h"
+#include "mlx5_tx.h"
 #include "mlx5_autoconf.h"
 #include "mlx5_mr.h"
 #include "mlx5_flow.h"
diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 76935f6..76d31f5 100644
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -20,7 +20,7 @@
 
 #include "mlx5.h"
 #include "mlx5_common_os.h"
-#include "mlx5_rxtx.h"
+#include "mlx5_tx.h"
 #include "mlx5_rx.h"
 #include "mlx5_utils.h"
 #include "mlx5_devx.h"
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 708e3a3..90baee5 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -24,6 +24,7 @@
 
 #include "mlx5_rxtx.h"
 #include "mlx5_rx.h"
+#include "mlx5_tx.h"
 #include "mlx5_autoconf.h"
 
 /**
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index b3877a1..4dea006 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -29,8 +29,8 @@
 #include "mlx5.h"
 #include "mlx5_flow.h"
 #include "mlx5_flow_os.h"
-#include "mlx5_rxtx.h"
 #include "mlx5_rx.h"
+#include "mlx5_tx.h"
 #include "mlx5_common_os.h"
 #include "rte_pmd_mlx5.h"
 
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index cac05fb..cb5b3c9 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -32,8 +32,8 @@
 #include "mlx5_common_os.h"
 #include "mlx5_flow.h"
 #include "mlx5_flow_os.h"
-#include "mlx5_rxtx.h"
 #include "mlx5_rx.h"
+#include "mlx5_tx.h"
 #include "rte_pmd_mlx5.h"
 
 #if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c 
b/drivers/net/mlx5/mlx5_flow_verbs.c
index c331350..0fdafbb 100644
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -23,7 +23,6 @@
 #include "mlx5_defs.h"
 #include "mlx5.h"
 #include "mlx5_flow.h"
-#include "mlx5_rxtx.h"
 #include "mlx5_rx.h"
 
 #define VERBS_SPEC_INNER(item_flags) \
diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c
index 2014936..e791b63 100644
--- a/drivers/net/mlx5/mlx5_mr.c
+++ b/drivers/net/mlx5/mlx5_mr.c
@@ -16,6 +16,7 @@
 #include "mlx5_mr.h"
 #include "mlx5_rxtx.h"
 #include "mlx5_rx.h"
+#include "mlx5_tx.h"
 
 struct mr_find_contig_memsegs_data {
uintptr_t addr;
diff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c
index cf93cca..25fb47c 100644
--- a/

[dpdk-dev] [PATCH 1/6] net/mlx5: separate Rx function declarations to another file

[Michael Baum]

The mlx5_rxtx.c file contains a lot of Tx burst functions, each of those
is performance-optimized for the specific set of requested offloads.
These ones are generated on the basis of the template function and it
takes significant time to compile, just due to a large number of giant
functions generated in the same file and this compilation is not being
done in parallel with using multithreading.

Therefore we can split the mlx5_rxtx.c file into several separate files
to allow different functions to be compiled simultaneously.
In this patch, we separate Rx function declarations to different header
file in preparation for removing them from the source file and as an
optional preparation step for further consolidation of Rx burst
functions.

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/linux/mlx5_mp_os.c |   1 +
 drivers/net/mlx5/linux/mlx5_os.c|   1 +
 drivers/net/mlx5/linux/mlx5_verbs.c |   1 +
 drivers/net/mlx5/mlx5.c |   1 +
 drivers/net/mlx5/mlx5_devx.c|   1 +
 drivers/net/mlx5/mlx5_ethdev.c  |   1 +
 drivers/net/mlx5/mlx5_flow.c|   1 +
 drivers/net/mlx5/mlx5_flow_dv.c |   1 +
 drivers/net/mlx5/mlx5_flow_verbs.c  |   1 +
 drivers/net/mlx5/mlx5_mr.c  |   1 +
 drivers/net/mlx5/mlx5_rss.c |   1 +
 drivers/net/mlx5/mlx5_rx.h  | 598 
 drivers/net/mlx5/mlx5_rxq.c |   1 +
 drivers/net/mlx5/mlx5_rxtx.c|   1 +
 drivers/net/mlx5/mlx5_rxtx.h| 569 --
 drivers/net/mlx5/mlx5_rxtx_vec.c|   1 +
 drivers/net/mlx5/mlx5_stats.c   |   1 +
 drivers/net/mlx5/mlx5_trigger.c |   1 +
 drivers/net/mlx5/mlx5_txpp.c|   1 +
 drivers/net/mlx5/mlx5_vlan.c|   1 +
 drivers/net/mlx5/windows/mlx5_os.c  |   1 +
 21 files changed, 617 insertions(+), 569 deletions(-)
 create mode 100644 drivers/net/mlx5/mlx5_rx.h

diff --git a/drivers/net/mlx5/linux/mlx5_mp_os.c 
b/drivers/net/mlx5/linux/mlx5_mp_os.c
index 8011ca8..63fa278 100644
--- a/drivers/net/mlx5/linux/mlx5_mp_os.c
+++ b/drivers/net/mlx5/linux/mlx5_mp_os.c
@@ -16,6 +16,7 @@
 
 #include "mlx5.h"
 #include "mlx5_rxtx.h"
+#include "mlx5_rx.h"
 #include "mlx5_utils.h"
 
 int
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 2d5bcab..97a28ec 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -40,6 +40,7 @@
 #include "mlx5_common_os.h"
 #include "mlx5_utils.h"
 #include "mlx5_rxtx.h"
+#include "mlx5_rx.h"
 #include "mlx5_autoconf.h"
 #include "mlx5_mr.h"
 #include "mlx5_flow.h"
diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c 
b/drivers/net/mlx5/linux/mlx5_verbs.c
index c7d4b17..73096af 100644
--- a/drivers/net/mlx5/linux/mlx5_verbs.c
+++ b/drivers/net/mlx5/linux/mlx5_verbs.c
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 9557d06..6f77bc2 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -35,6 +35,7 @@
 #include "mlx5.h"
 #include "mlx5_utils.h"
 #include "mlx5_rxtx.h"
+#include "mlx5_rx.h"
 #include "mlx5_autoconf.h"
 #include "mlx5_mr.h"
 #include "mlx5_flow.h"
diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 5c940ed..76935f6 100644
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -21,6 +21,7 @@
 #include "mlx5.h"
 #include "mlx5_common_os.h"
 #include "mlx5_rxtx.h"
+#include "mlx5_rx.h"
 #include "mlx5_utils.h"
 #include "mlx5_devx.h"
 #include "mlx5_flow.h"
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 564d713..708e3a3 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -23,6 +23,7 @@
 #include 
 
 #include "mlx5_rxtx.h"
+#include "mlx5_rx.h"
 #include "mlx5_autoconf.h"
 
 /**
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index c347f81..b3877a1 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -30,6 +30,7 @@
 #include "mlx5_flow.h"
 #include "mlx5_flow_os.h"
 #include "mlx5_rxtx.h"
+#include "mlx5_rx.h"
 #include "mlx5_common_os.h"
 #include "rte_pmd_mlx5.h"
 
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 533dadf..cac05fb 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -33,6 +33,7 @@
 #include "mlx5_flow.h"
 #include "mlx5_flow_os.h"
 #include "mlx5_rxtx.h"
+#include "mlx5_rx.h"
 #include "rte_pmd_mlx5.h"
 
 #if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H)
diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c 
b/drivers/net/mlx5/mlx5_flow_verbs.c
index b442b9b..c331350 100644
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -24,6 +24,7 @@
 #include "mlx5.h"
 #include "mlx5_flow.h"
 #include "mlx5_rxtx.h"
+#include "mlx5_rx.h"
 
 #define VERBS_SPEC_INNER(item_flags) \
(!!((item_flags) & MLX

[dpdk-dev] [PATCH 6/6] net/mlx5: separate Tx burst functions to different files

[Michael Baum]

This patch separates Tx burst function implementations to different
source files, thus allowing them to compile in parallel.

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/meson.build |   4 +
 drivers/net/mlx5/mlx5_rxtx.c | 201 ---
 drivers/net/mlx5/mlx5_tx.h   |   8 +-
 drivers/net/mlx5/mlx5_tx_empw.c  |  71 ++
 drivers/net/mlx5/mlx5_tx_mpw.c   |  34 +++
 drivers/net/mlx5/mlx5_tx_nompw.c |  71 ++
 drivers/net/mlx5/mlx5_tx_txpp.c  |  45 +
 7 files changed, 232 insertions(+), 202 deletions(-)
 create mode 100644 drivers/net/mlx5/mlx5_tx_empw.c
 create mode 100644 drivers/net/mlx5/mlx5_tx_mpw.c
 create mode 100644 drivers/net/mlx5/mlx5_tx_nompw.c
 create mode 100644 drivers/net/mlx5/mlx5_tx_txpp.c

diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index 688a925..59afd3f 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -26,6 +26,10 @@ sources = files(
'mlx5_stats.c',
'mlx5_trigger.c',
 'mlx5_tx.c',
+'mlx5_tx_empw.c',
+'mlx5_tx_mpw.c',
+'mlx5_tx_nompw.c',
+'mlx5_tx_txpp.c',
'mlx5_txq.c',
'mlx5_txpp.c',
'mlx5_vlan.c',
diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 35c4cc3..7b984ef 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -429,204 +429,3 @@
}
return ret;
 }
-
-/* Generate routines with Enhanced Multi-Packet Write support. */
-MLX5_TXOFF_DECL(full_empw,
-   MLX5_TXOFF_CONFIG_FULL | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(none_empw,
-   MLX5_TXOFF_CONFIG_NONE | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(md_empw,
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(mt_empw,
-   MLX5_TXOFF_CONFIG_MULTI | MLX5_TXOFF_CONFIG_TSO |
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(mtsc_empw,
-   MLX5_TXOFF_CONFIG_MULTI | MLX5_TXOFF_CONFIG_TSO |
-   MLX5_TXOFF_CONFIG_SWP | MLX5_TXOFF_CONFIG_CSUM |
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(mti_empw,
-   MLX5_TXOFF_CONFIG_MULTI | MLX5_TXOFF_CONFIG_TSO |
-   MLX5_TXOFF_CONFIG_INLINE |
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(mtv_empw,
-   MLX5_TXOFF_CONFIG_MULTI | MLX5_TXOFF_CONFIG_TSO |
-   MLX5_TXOFF_CONFIG_VLAN |
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(mtiv_empw,
-   MLX5_TXOFF_CONFIG_MULTI | MLX5_TXOFF_CONFIG_TSO |
-   MLX5_TXOFF_CONFIG_INLINE | MLX5_TXOFF_CONFIG_VLAN |
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(sc_empw,
-   MLX5_TXOFF_CONFIG_SWP | MLX5_TXOFF_CONFIG_CSUM |
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(sci_empw,
-   MLX5_TXOFF_CONFIG_SWP | MLX5_TXOFF_CONFIG_CSUM |
-   MLX5_TXOFF_CONFIG_INLINE |
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(scv_empw,
-   MLX5_TXOFF_CONFIG_SWP | MLX5_TXOFF_CONFIG_CSUM |
-   MLX5_TXOFF_CONFIG_VLAN |
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(sciv_empw,
-   MLX5_TXOFF_CONFIG_SWP | MLX5_TXOFF_CONFIG_CSUM |
-   MLX5_TXOFF_CONFIG_INLINE | MLX5_TXOFF_CONFIG_VLAN |
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(i_empw,
-   MLX5_TXOFF_CONFIG_INLINE |
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(v_empw,
-   MLX5_TXOFF_CONFIG_VLAN |
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-MLX5_TXOFF_DECL(iv_empw,
-   MLX5_TXOFF_CONFIG_INLINE | MLX5_TXOFF_CONFIG_VLAN |
-   MLX5_TXOFF_CONFIG_METADATA | MLX5_TXOFF_CONFIG_EMPW)
-
-/* Generate routines without Enhanced Multi-Packet Write support. */
-MLX5_TXOFF_DECL(full,
-   MLX5_TXOFF_CONFIG_FULL)
-
-MLX5_TXOFF_DECL(none,
-   MLX5_TXOFF_CONFIG_NONE)
-
-MLX5_TXOFF_DECL(md,
-   MLX5_TXOFF_CONFIG_METADATA)
-
-MLX5_TXOFF_DECL(mt,
-   MLX5_TXOFF_CONFIG_MULTI | MLX5_TXOFF_CONFIG_TSO |
-   MLX5_TXOFF_CONFIG_METADATA)
-
-MLX5_TXOFF_DECL(mtsc,
-   MLX5_TXOFF_CONFIG_MULTI | MLX5_TXOFF_CONFIG_TSO |
-   MLX5_TXOFF_CONFIG_SWP | MLX5_TXOFF_CONFIG_CSUM |
-   MLX5_TXOFF_CONFIG_METADATA)
-
-MLX5_TXOFF_DECL(mti,
-   MLX5_TXOFF_CONFIG_MULTI | MLX5_TXOFF_CONFIG_TSO |
-   MLX5_TXOFF_CONFIG_INLINE |
-   MLX5_TXOFF_CONFIG_METADATA)
-
-
-MLX5_TXOFF_DECL(mtv,
-   MLX5_TXOFF_CONFIG_MULTI | MLX5_TXOFF_CONFIG_TSO |
-   MLX5_TXOFF_CONFIG

[dpdk-dev] [PATCH 2/6] net/mlx5: separate Rx function implementations to new file

[Michael Baum]

This patch separates Rx function implementations to different source
file as an optional preparation step for further consolidation of Rx
burst functions.

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/meson.build |1 +
 drivers/net/mlx5/mlx5_rx.c   | 1203 ++
 drivers/net/mlx5/mlx5_rx.h   |4 +-
 drivers/net/mlx5/mlx5_rxtx.c | 1179 +
 drivers/net/mlx5/mlx5_rxtx.h |2 +
 5 files changed, 1209 insertions(+), 1180 deletions(-)
 create mode 100644 drivers/net/mlx5/mlx5_rx.c

diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index f2fafbd..0a89a27 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -19,6 +19,7 @@ sources = files(
'mlx5_mac.c',
'mlx5_mr.c',
'mlx5_rss.c',
+'mlx5_rx.c',
'mlx5_rxmode.c',
'mlx5_rxq.c',
'mlx5_rxtx.c',
diff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c
new file mode 100644
index 000..e9fcb52
--- /dev/null
+++ b/drivers/net/mlx5/mlx5_rx.c
@@ -0,0 +1,1203 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2021 6WIND S.A.
+ * Copyright 2021 Mellanox Technologies, Ltd
+ */
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include "mlx5_autoconf.h"
+#include "mlx5_defs.h"
+#include "mlx5.h"
+#include "mlx5_mr.h"
+#include "mlx5_utils.h"
+#include "mlx5_rxtx.h"
+#include "mlx5_rx.h"
+
+
+static __rte_always_inline uint32_t
+rxq_cq_to_pkt_type(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cqe,
+  volatile struct mlx5_mini_cqe8 *mcqe);
+
+static __rte_always_inline int
+mlx5_rx_poll_len(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cqe,
+uint16_t cqe_cnt, volatile struct mlx5_mini_cqe8 **mcqe);
+
+static __rte_always_inline uint32_t
+rxq_cq_to_ol_flags(volatile struct mlx5_cqe *cqe);
+
+static __rte_always_inline void
+rxq_cq_to_mbuf(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt,
+  volatile struct mlx5_cqe *cqe,
+  volatile struct mlx5_mini_cqe8 *mcqe);
+
+static inline void
+mlx5_lro_update_tcp_hdr(struct rte_tcp_hdr *__rte_restrict tcp,
+   volatile struct mlx5_cqe *__rte_restrict cqe,
+   uint32_t phcsum, uint8_t l4_type);
+
+static inline void
+mlx5_lro_update_hdr(uint8_t *__rte_restrict padd,
+   volatile struct mlx5_cqe *__rte_restrict cqe,
+   volatile struct mlx5_mini_cqe8 *mcqe,
+   struct mlx5_rxq_data *rxq, uint32_t len);
+
+
+/**
+ * Internal function to compute the number of used descriptors in an RX queue.
+ *
+ * @param rxq
+ *   The Rx queue.
+ *
+ * @return
+ *   The number of used Rx descriptor.
+ */
+static uint32_t
+rx_queue_count(struct mlx5_rxq_data *rxq)
+{
+   struct rxq_zip *zip = &rxq->zip;
+   volatile struct mlx5_cqe *cqe;
+   const unsigned int cqe_n = (1 << rxq->cqe_n);
+   const unsigned int sges_n = (1 << rxq->sges_n);
+   const unsigned int elts_n = (1 << rxq->elts_n);
+   const unsigned int strd_n = (1 << rxq->strd_num_n);
+   const unsigned int cqe_cnt = cqe_n - 1;
+   unsigned int cq_ci, used;
+
+   /* if we are processing a compressed cqe */
+   if (zip->ai) {
+   used = zip->cqe_cnt - zip->ai;
+   cq_ci = zip->cq_ci;
+   } else {
+   used = 0;
+   cq_ci = rxq->cq_ci;
+   }
+   cqe = &(*rxq->cqes)[cq_ci & cqe_cnt];
+   while (check_cqe(cqe, cqe_n, cq_ci) != MLX5_CQE_STATUS_HW_OWN) {
+   int8_t op_own;
+   unsigned int n;
+
+   op_own = cqe->op_own;
+   if (MLX5_CQE_FORMAT(op_own) == MLX5_COMPRESSED)
+   n = rte_be_to_cpu_32(cqe->byte_cnt);
+   else
+   n = 1;
+   cq_ci += n;
+   used += n;
+   cqe = &(*rxq->cqes)[cq_ci & cqe_cnt];
+   }
+   used = RTE_MIN(used * sges_n, elts_n * strd_n);
+   return used;
+}
+
+/**
+ * DPDK callback to check the status of a Rx descriptor.
+ *
+ * @param rx_queue
+ *   The Rx queue.
+ * @param[in] offset
+ *   The index of the descriptor in the ring.
+ *
+ * @return
+ *   The status of the Rx descriptor.
+ */
+int
+mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset)
+{
+   struct mlx5_rxq_data *rxq = rx_queue;
+   struct mlx5_rxq_ctrl *rxq_ctrl =
+   container_of(rxq, struct mlx5_rxq_ctrl, rxq);
+   struct rte_eth_dev *dev = ETH_DEV(rxq_ctrl->priv);
+
+   if (dev->rx_pkt_burst == NULL ||
+   dev->rx_pkt_burst == removed_rx_burst) {
+   rte_errno = ENOTSUP;
+   return -rte_errno;
+   }
+   if (offset >= (1 << rxq->cqe_n)) {
+   rte_errno = EINVAL;
+   return -rte_errno;
+   }
+   if (

[dpdk-dev] [PATCH 5/6] net/mlx5: separate Tx function implementations to new file

[Michael Baum]

This patch separates Tx function implementations to different source
file as an optional preparation step for Tx cleanup.

Signed-off-by: Michael Baum 
---
 drivers/net/mlx5/meson.build |   1 +
 drivers/net/mlx5/mlx5_rxtx.c | 757 -
 drivers/net/mlx5/mlx5_tx.c   | 780 +++
 drivers/net/mlx5/mlx5_tx.h   |  59 +++-
 drivers/net/mlx5/mlx5_txq.c  |   1 +
 5 files changed, 838 insertions(+), 760 deletions(-)
 create mode 100644 drivers/net/mlx5/mlx5_tx.c

diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index 0a89a27..688a925 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -25,6 +25,7 @@ sources = files(
'mlx5_rxtx.c',
'mlx5_stats.c',
'mlx5_trigger.c',
+'mlx5_tx.c',
'mlx5_txq.c',
'mlx5_txpp.c',
'mlx5_vlan.c',
diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 2f36754..35c4cc3 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -28,8 +28,6 @@
 #include "mlx5_rx.h"
 #include "mlx5_tx.h"
 
-#define MLX5_TXOFF_INFO(func, olx) {mlx5_tx_burst_##func, olx},
-
 /* static asserts */
 static_assert(MLX5_CQE_STATUS_HW_OWN < 0, "Must be negative value");
 static_assert(MLX5_CQE_STATUS_SW_OWN < 0, "Must be negative value");
@@ -357,113 +355,6 @@
 }
 
 /**
- * Move QP from error state to running state and initialize indexes.
- *
- * @param txq_ctrl
- *   Pointer to TX queue control structure.
- *
- * @return
- *   0 on success, else -1.
- */
-static int
-tx_recover_qp(struct mlx5_txq_ctrl *txq_ctrl)
-{
-   struct mlx5_mp_arg_queue_state_modify sm = {
-   .is_wq = 0,
-   .queue_id = txq_ctrl->txq.idx,
-   };
-
-   if (mlx5_queue_state_modify(ETH_DEV(txq_ctrl->priv), &sm))
-   return -1;
-   txq_ctrl->txq.wqe_ci = 0;
-   txq_ctrl->txq.wqe_pi = 0;
-   txq_ctrl->txq.elts_comp = 0;
-   return 0;
-}
-
-/* Return 1 if the error CQE is signed otherwise, sign it and return 0. */
-static int
-check_err_cqe_seen(volatile struct mlx5_err_cqe *err_cqe)
-{
-   static const uint8_t magic[] = "seen";
-   int ret = 1;
-   unsigned int i;
-
-   for (i = 0; i < sizeof(magic); ++i)
-   if (!ret || err_cqe->rsvd1[i] != magic[i]) {
-   ret = 0;
-   err_cqe->rsvd1[i] = magic[i];
-   }
-   return ret;
-}
-
-/**
- * Handle error CQE.
- *
- * @param txq
- *   Pointer to TX queue structure.
- * @param error_cqe
- *   Pointer to the error CQE.
- *
- * @return
- *   Negative value if queue recovery failed, otherwise
- *   the error completion entry is handled successfully.
- */
-static int
-mlx5_tx_error_cqe_handle(struct mlx5_txq_data *__rte_restrict txq,
-volatile struct mlx5_err_cqe *err_cqe)
-{
-   if (err_cqe->syndrome != MLX5_CQE_SYNDROME_WR_FLUSH_ERR) {
-   const uint16_t wqe_m = ((1 << txq->wqe_n) - 1);
-   struct mlx5_txq_ctrl *txq_ctrl =
-   container_of(txq, struct mlx5_txq_ctrl, txq);
-   uint16_t new_wqe_pi = rte_be_to_cpu_16(err_cqe->wqe_counter);
-   int seen = check_err_cqe_seen(err_cqe);
-
-   if (!seen && txq_ctrl->dump_file_n <
-   txq_ctrl->priv->config.max_dump_files_num) {
-   MKSTR(err_str, "Unexpected CQE error syndrome "
- "0x%02x CQN = %u SQN = %u wqe_counter = %u "
- "wq_ci = %u cq_ci = %u", err_cqe->syndrome,
- txq->cqe_s, txq->qp_num_8s >> 8,
- rte_be_to_cpu_16(err_cqe->wqe_counter),
- txq->wqe_ci, txq->cq_ci);
-   MKSTR(name, "dpdk_mlx5_port_%u_txq_%u_index_%u_%u",
- PORT_ID(txq_ctrl->priv), txq->idx,
- txq_ctrl->dump_file_n, (uint32_t)rte_rdtsc());
-   mlx5_dump_debug_information(name, NULL, err_str, 0);
-   mlx5_dump_debug_information(name, "MLX5 Error CQ:",
-   (const void *)((uintptr_t)
-   txq->cqes),
-   sizeof(*err_cqe) *
-   (1 << txq->cqe_n));
-   mlx5_dump_debug_information(name, "MLX5 Error SQ:",
-   (const void *)((uintptr_t)
-   txq->wqes),
-   MLX5_WQE_SIZE *
-   (1 << txq->wqe_n));
-   txq_ctrl->dump_file_n++;
-   }
-   if (!seen)
-   /*
- 

[dpdk-dev] [PATCH] net/mlx5/windows: fix link speed calculation

[Tal Shnaiderman]

In Windows DevX returns the value of the current link speed
in bps rate, the conversion to the Mbps rate expected by DPDK
is incorrect and fixed.

Fixes: 6fbd73709ee4be32 ("net/mlx5: support link update on Windows")
Cc: sta...@dpdk.org

Signed-off-by: Tal Shnaiderman 
---
 drivers/net/mlx5/windows/mlx5_ethdev_os.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/windows/mlx5_ethdev_os.c 
b/drivers/net/mlx5/windows/mlx5_ethdev_os.c
index 8609d38eca..c709dd19be 100644
--- a/drivers/net/mlx5/windows/mlx5_ethdev_os.c
+++ b/drivers/net/mlx5/windows/mlx5_ethdev_os.c
@@ -254,7 +254,7 @@ mlx5_link_update(struct rte_eth_dev *dev, int 
wait_to_complete)
}
priv = dev->data->dev_private;
context_obj = (mlx5_context_st *)priv->sh->ctx;
-   dev_link.link_speed = context_obj->mlx5_dev.link_speed / (1024 * 1024);
+   dev_link.link_speed = context_obj->mlx5_dev.link_speed / (1000 * 1000);
dev_link.link_status =
  (context_obj->mlx5_dev.link_state == 1 && !mlx5_is_removed(dev))
  ? 1 : 0;
-- 
2.16.1.windows.4

[dpdk-dev] [PATCH] event/octeontx2: fix device reconfigure for single slot

[Harman Kalra]

When device is re-configured, memory allocated for work slot is freed
and new memory is allocated. Due to this we may loose some important
configurations/mappings done with initial work slot memory.

For example, whenever rte_event_eth_tx_adapter_queue_add is called
some important meta i.e. txq handle is stored in work slot structure.
If device gets reconfigured after this tx adaptor add, txq to work
slot mapping will be lost resulting in seg fault during packet
processing, as txq handle could not be retrieved from work slot.

Fixes: 67b5f4686459 ("event/octeontx2: add port config functions")
Cc: sta...@dpdk.org

Signed-off-by: Harman Kalra 
---
 drivers/event/octeontx2/otx2_evdev.c | 34 +---
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/drivers/event/octeontx2/otx2_evdev.c 
b/drivers/event/octeontx2/otx2_evdev.c
index 7e2343599..a6beed069 100644
--- a/drivers/event/octeontx2/otx2_evdev.c
+++ b/drivers/event/octeontx2/otx2_evdev.c
@@ -885,29 +885,27 @@ sso_configure_ports(const struct rte_eventdev *event_dev)
struct otx2_ssogws *ws;
uintptr_t base;
 
-   /* Free memory prior to re-allocation if needed */
if (event_dev->data->ports[i] != NULL) {
ws = event_dev->data->ports[i];
-   rte_free(ssogws_get_cookie(ws));
-   ws = NULL;
-   }
+   } else {
+   /* Allocate event port memory */
+   ws = rte_zmalloc_socket("otx2_sso_ws",
+   sizeof(struct otx2_ssogws) +
+   RTE_CACHE_LINE_SIZE,
+   RTE_CACHE_LINE_SIZE,
+   event_dev->data->socket_id);
+   if (ws == NULL) {
+   otx2_err("Failed to alloc memory for port=%d",
+i);
+   rc = -ENOMEM;
+   break;
+   }
 
-   /* Allocate event port memory */
-   ws = rte_zmalloc_socket("otx2_sso_ws",
-   sizeof(struct otx2_ssogws) +
-   RTE_CACHE_LINE_SIZE,
-   RTE_CACHE_LINE_SIZE,
-   event_dev->data->socket_id);
-   if (ws == NULL) {
-   otx2_err("Failed to alloc memory for port=%d", i);
-   rc = -ENOMEM;
-   break;
+   /* First cache line is reserved for cookie */
+   ws = (struct otx2_ssogws *)
+   ((uint8_t *)ws + RTE_CACHE_LINE_SIZE);
}
 
-   /* First cache line is reserved for cookie */
-   ws = (struct otx2_ssogws *)
-   ((uint8_t *)ws + RTE_CACHE_LINE_SIZE);
-
ws->port = i;
base = dev->bar2 + (RVU_BLOCK_ADDR_SSOW << 20 | i << 12);
sso_set_port_ops(ws, base);
-- 
2.18.0

Re: [dpdk-dev] vfio error

[Liang Ma]

On Sun, Apr 04, 2021 at 07:10:43PM +0430, hamidreza Kheirabadi wrote:
> Hi,
> I have a dpdk application which binds nic with igb_uio. My problem is
> whenever the kernel updates, I must recompile igb_uio.ko as well.
> I want to use vfio instead but I got an error:
> 
> Error: bind failed for :06:00.0 - Cannot bind to driver vfio-pci
> Error: unbind failed for :06:00.0 - Cannot open
> /sys/bus/pci/drivers//unbind
> 
> I used ubuntu 20.04 and dpdk-18.05 and use dpdk-setup.py helper script
> 
> Regards,
> hamid
Hi Hamid, 
   Please double check if you enable IOMMU(VT-d) in you bios and if you
   kernel boot parameter has "intel_iommu=on".
Regards
Liang

Re: [dpdk-dev] [PATCH v4 1/3] eventdev: introduce crypto adapter enqueue API

[Akhil Goyal]

Hi Abhnandan,
> >
> > In case an event from a previous stage is required to be forwarded to a
> > crypto adapter and PMD supports internal event port in crypto adapter,
> > exposed via capability
> > RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD, we do not
> > have a way to check in the API rte_event_enqueue_burst(), whether it is for
> > crypto adapter or for eth tx adapter.
> I may be missing something here. Crypto adapter is an atomic stage has a
> port which is setup during the adapter configuration.
> So, application enqueuing events will end up sending to the crypto adapter
> (As the adapter dequeues from a specific port).
> Still wondering why there is requirement for new API.

While we do rte_event_enqueue_burst(), we do not have a way to identify whether
The event is for crypto adapter or the eth adaptor.
At the application layer, we know where to send the event, but in the event lib
We do not know which port it need to be sent.
IMO, event port is specifically designed to work for OP_NEW mode.
I did not find a way to make it land into crypto adapter.
Please let me know in case there is a better option other than adding a new API.

> 
> >
> > Hence we need a new API similar to rte_event_eth_tx_adapter_enqueue(),
> > which can send to a crypto adapter.
> >
> > Note that RTE_EVENT_TYPE_* cannot be used to make that decision, as it is
> > meant for event source and not event destination.
> > And event port designated for crypto adapter is designed to be used for
> > OP_NEW mode.
> >
> > Hence, in order to support an event PMD which has an internal event port
> in
> > crypto adapter (RTE_EVENT_CRYPTO_ADAPTER_OP_FORWARD mode),
> > exposed via capability
> > RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD,
> > application should use rte_event_crypto_adapter_enqueue() API to
> > enqueue events.
> >
> > When internal port is not
> available(RTE_EVENT_CRYPTO_ADAPTER_OP_NEW
> > mode), application can use API rte_event_enqueue_burst() as it was doing
> > earlier, i.e. retrieve event port used by crypto adapter and bind its event
> > queues to that port and enqueue events using the API
> > rte_event_enqueue_burst().
> >
> > Signed-off-by: Akhil Goyal 

[dpdk-dev] [PATCH] ethdev: add packet integrity checks

[Ori Kam]

Currently, DPDK application can offload the checksum check,
and report it in the mbuf.

However, as more and more applications are offloading some or all
logic and action to the HW, there is a need to check the packet
integrity so the right decision can be taken.

The application logic can be positive meaning if the packet is
valid jump / do  actions, or negative if packet is not valid
jump to SW / do actions (like drop)  a, and add default flow
(match all in low priority) that will direct the miss packet
to the miss path.

Since currenlty rte_flow works in positive way the assumtion is
that the postive way will be the common way in this case also.

When thinking what is the best API to implement such feature,
we need to considure the following (in no specific order):
1. API breakage.
2. Simplicity.
3. Performance.
4. HW capabilities.
5. rte_flow limitation.
6. Flexability.

First option: Add integrity flags to each of the items.
For example add checksum_ok to ipv4 item.

Pros:
1. No new rte_flow item.
2. Simple in the way that on each item the app can see
what checks are available.

Cons:
1. API breakage.
2. increase number of flows, since app can't add global rule and
   must have dedicated flow for each of the flow combinations, for example
   matching on icmp traffic or UDP/TCP  traffic with IPv4 / IPv6 will
   result in 5 flows.

Second option: dedicated item

Pros:
1. No API breakage, and there will be no for some time due to having
   extra space. (by using bits)
2. Just one flow to support the icmp or UDP/TCP traffic with IPv4 /
   IPv6.
3. Simplicity application can just look at one place to see all possible
   checks.
4. Allow future support for more tests.

Cons:
1. New item, that holds number of fields from different items.

For starter the following bits are suggested:
1. packet_ok - means that all HW checks depending on packet layer have
   passed. This may mean that in some HW such flow should be splited to
   number of flows or fail.
2. l2_ok - all check flor layer 2 have passed.
3. l3_ok - all check flor layer 2 have passed. If packet doens't have
   l3 layer this check shoudl fail.
4. l4_ok - all check flor layer 2 have passed. If packet doesn't
   have l4 layer this check should fail.
5. l2_crc_ok - the layer 2 crc is O.K. it is possible that the crc will
   be O.K. but the l3_ok will be 0. it is not possible that l2_crc_ok will
   be 0 and the l3_ok will be 0.
6. ipv4_csum_ok - IPv4 checksum is O.K.
7. l4_csum_ok - layer 4 checksum is O.K.
8. l3_len_OK - check that the reported layer 3 len is smaller than the
   packet len.

Example of usage:
1. check packets from all possible layers for integrity.
   flow create integrity spec packet_ok = 1 mask packet_ok = 1 .

2. Check only packet with layer 4 (UDP / TCP)
   flow create integrity spec l3_ok = 1, l4_ok = 1 mask l3_ok = 1 l4_ok = 1

Signed-off-by: Ori Kam 
---
 doc/guides/prog_guide/rte_flow.rst | 19 
 lib/librte_ethdev/rte_flow.h   | 46 ++
 2 files changed, 65 insertions(+)

diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index aec2ba1..58b116e 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1398,6 +1398,25 @@ Matches a eCPRI header.
 - ``hdr``: eCPRI header definition (``rte_ecpri.h``).
 - Default ``mask`` matches nothing, for all eCPRI messages.
 
+Item: ``PACKET_INTEGRITY_CHECKS``
+^
+
+Matches packet integrity.
+
+- ``level``: the encapsulation level that should be checked. level 0 means the
+  default PMD mode (Can be inner most / outermost). value of 1 means outermost
+  and higher value means inner header. See also RSS level.
+- ``packet_ok``: All HW packet integrity checks have passed based on the max
+  layer of the packet.
+  layer of the packet.
+- ``l2_ok``: all layer 2 HW integrity checks passed.
+- ``l3_ok``: all layer 3 HW integrity checks passed.
+- ``l4_ok``: all layer 3 HW integrity checks passed.
+- ``l2_crc_ok``: layer 2 crc check passed.
+- ``ipv4_csum_ok``: ipv4 checksum check passed.
+- ``l4_csum_ok``: layer 4 checksum check passed.
+- ``l3_len_ok``: the layer 3 len is smaller than the packet len.
+
 Actions
 ~~~
 
diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
index 6cc5713..f6888a1 100644
--- a/lib/librte_ethdev/rte_flow.h
+++ b/lib/librte_ethdev/rte_flow.h
@@ -551,6 +551,15 @@ enum rte_flow_item_type {
 * See struct rte_flow_item_geneve_opt
 */
RTE_FLOW_ITEM_TYPE_GENEVE_OPT,
+
+   /**
+* [META]
+*
+* Matches on packet integrity.
+*
+* See struct rte_flow_item_packet_integrity_checks.
+*/
+   RTE_FLOW_ITEM_TYPE_PACKET_INTEGRITY_CHECKS,
 };
 
 /**
@@ -1685,6 +1694,43 @@ struct rte_flow_item_geneve_opt {
 };
 #endif
 
+struct rte_flow_item_packet_integrity_checks {
+   uint32_t level;
+   /**< Packet encapsulation level the 

Re: [dpdk-dev] [PATCH v2 2/4] mbuf: add packet type for UDP-ESP tunnel packets

[Akhil Goyal]

> Adding new mbuf packet type for UDP encapsulated
> ESP packets.
> 
> Signed-off-by: Tejasree Kondoj 
> ---
>  doc/guides/rel_notes/release_21_05.rst |  5 +
>  lib/librte_mbuf/rte_mbuf_ptype.h   | 21 +
>  2 files changed, 26 insertions(+)
> 
Acked-by: Akhil Goyal 

++Olivier

Thomas,
Can this patch be part of crypto tree if acked by Olivier?

Regards,
Akhil

Re: [dpdk-dev] [PATCH v2 1/4] crypto/octeontx2: add UDP encapsulation support

[Akhil Goyal]

> Adding UDP encapsulation support for IPsec in
> lookaside protocol mode.
> 
> Signed-off-by: Tejasree Kondoj 
> ---
Acked-by: Akhil Goyal 

Re: [dpdk-dev] [PATCH v2 4/4] crypto/octeontx2: support lookaside IPv4 transport mode

[Akhil Goyal]

> 
> Adding support for IPv4 lookaside IPsec transport mode.
> 
> Signed-off-by: Tejasree Kondoj 
> ---
Acked-by: Akhil Goyal 

Re: [dpdk-dev] [PATCH v2 3/4] examples/ipsec-secgw: add UDP encapsulation support

[Akhil Goyal]

> 
> Adding lookaside IPsec UDP encapsulation support
> for NAT traversal.
> Application has to add udp-encap option to sa config file
> to enable UDP encapsulation on the SA.
> 
> Signed-off-by: Tejasree Kondoj 
> ---
Acked-by: Akhil Goyal 

Konstantin,
Any more comments on this?

Regards,
Akhil

Re: [dpdk-dev] [PATCH v2 0/2] support block cipher DIGEST_ENCRYPTED mode

[Akhil Goyal]

> This series adds support for block cipher DIGEST_ENCRYPTED mode in
> OCTEON TX, OCTEON TX2 PMDs and sample unit test application.
> 
> v2:
> * Removed duplicate test vectors in test application
> * Updated comment with more information
> 
Series applied to dpdk-next-crypto

Thanks.

Re: [dpdk-dev] [PATCH] doc: update limitations of OCTEON TX crypto PMDs

[Akhil Goyal]

> Update known limitations of OCTEON TX crypto PMDs.
> 
> Signed-off-by: Anoob Joseph 
> ---
Applied to dpdk-next-crypto

Thanks.

[dpdk-dev] RSS hash computation on Intel X550 NIC with ixgbe driver

[Deepak Gowda]

Hello,

I have been doing some experiments on rss hash computation, i'm using
DPDK's testpmd application. Even though I apply rss conf on the
available DPDK port, i don't see any value populated in the rss hash, it's
always zero.

Setup details --
*Debian 10 VM with a (Intel X550) VF attached to it.*
*DPDK version* *-* dpdk-18.11.2
*NIC - *
root@debian:~# lspci | grep -i ether
00:03.0 Ethernet controller: Red Hat, Inc Virtio network device

*00:09.0 Ethernet controller: Intel Corporation X550 Virtual Function**DPDK
dev_bind o/p -*
root@debian:~/dpdk-stable-18.11.2/usertools# ./dpdk-devbind.py --status
Network devices using DPDK-compatible driver

:00:09.0 'X550 Virtual Function 1565' drv=igb_uio unused=ixgbevf

Network devices using kernel driver
===
:00:03.0 'Virtio network device 1000' if=ens3 drv=virtio-pci
unused=virtio_pci,igb_uio *Active*

No 'Crypto' devices detected


No 'Eventdev' devices detected
==

No 'Mempool' devices detected
=

No 'Compress' devices detected
==
root@debian:~/dpdk-stable-18.11.2/usertools#

*This is how launch test pmd -* ./testpmd -l 0-3 -n 4 -- -i --portmask=0x1
--nb-cores=2
Then, when the testpmd is up, i issue the following commands on the testpmd
cli -- in the same order as below
testpmd> set fwd rxonly
Set rxonly packet forwarding mode
testpmd> start
rxonly packet forwarding - ports=1 - cores=1 - streams=1 - NUMA support
enabled, MP allocation mode: native
Logical Core 1 (socket 0) forwards packets on 1 streams:
  RX P=0/Q=0 (socket 0) -> TX P=0/Q=0 (socket 0) peer=02:00:00:00:00:00

  rxonly packet forwarding packets/burst=32
  nb forwarding cores=2 - nb forwarding ports=1
  port 0: RX queue number: 1 Tx queue number: 1
Rx offloads=0x0 Tx offloads=0x0
RX queue: 0
  RX desc=512 - RX free threshold=32
  RX threshold registers: pthresh=8 hthresh=8  wthresh=0
  RX Offloads=0x0
TX queue: 0
  TX desc=512 - TX free threshold=32
  TX threshold registers: pthresh=32 hthresh=0  wthresh=0
  TX offloads=0x0 - TX RS bit threshold=32
testpmd> port config all rss all
Port 0 modified RSS hash function based on hardware
support,requested:0x3fffc configured:0

After this I send udp packets from another machine and I see 0x0 in the
hash field on all the received packets. Am i missing something here?
Do I need to configure anything on the host machine or the PF?
Any insight is appreciated. Thanks!

-Deepak Gowda

[dpdk-dev] [PATCH] l2fwd-crypto: remove padding after decrypting

[Akhil Goyal]

There were some padding left when a packet gets decrypted. This
patch removes those padding.
This patch also removes the padding left after verifying auth of
the packet.

Signed-off-by: Rohit Raj 
---
 examples/l2fwd-crypto/main.c | 14 ++
 1 file changed, 14 insertions(+)

this patch is a fix for a bug.
Could you please add a fixes tag and update the
title of patch accordingly
examples/l2fwd-crypto: fix packet length while decryption

[dpdk-dev] [PATCH] l2fwd-crypto: skip dev configure for masked devices

[Akhil Goyal]

The devices which are masked by cryptodev mask should not be initialized
and skipped while traversing the device list.

Signed-off-by: Apeksha Gupta 
---
 examples/l2fwd-crypto/main.c | 6 ++
 1 file changed, 6 insertions(+)

again a fixes tag is missing.
title should be
examples/l2fwd-crypto: fix dev configure for masked devices

[dpdk-dev] [PATCH] l2fwd-crypto: align private data size to cache size

[Akhil Goyal]

L2fwd-crypto is passing 24b private data size while packet
pool creation. This patch aligns that private data size
to cache line size for better performance results.

Signed-off-by: Gagandeep Singh 
---
 app/proc-info/main.c | 2 +-
 examples/l2fwd-crypto/main.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

I believe proc-info change is added by mistake in this patch.
Please fix this.

[dpdk-dev] [PATCH] net/ena: fix releasing Tx ring mbufs

[David Harton]

When ena_tx_queue_release_bufs() frees the mbufs it does not clear
the mbuf pointers.  So, when the device starts and stops multiple
times it can cause the application to receive duplicate mbufs for
two different packets.  Fix the issue by clearing the mbuf pointer.

Also, while tracking down the "double free" issue the ena calls to
allocate and free mbufs in bulk were migrated to the mbuf based APIs
so the common mbuf alloc/free routines are exercised.

Fixes: 79405ee17585 ("net/ena: fix out of order completion")
Fixes: 1173fca25af9 ("ena: add polling-mode driver")

Signed-off-by: David Harton 
---
 drivers/net/ena/ena_ethdev.c | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 9aa51c9dc..222f2510e 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -767,8 +767,10 @@ static void ena_tx_queue_release_bufs(struct ena_ring 
*ring)
for (i = 0; i < ring->ring_size; ++i) {
struct ena_tx_buffer *tx_buf = &ring->tx_buffer_info[i];
 
-   if (tx_buf->mbuf)
+   if (tx_buf->mbuf) {
rte_pktmbuf_free(tx_buf->mbuf);
+   tx_buf->mbuf = NULL;
+   }
}
 }
 
@@ -1457,7 +1459,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, 
unsigned int count)
"bad ring state\n");
 
/* get resources for incoming packets */
-   rc = rte_mempool_get_bulk(rxq->mb_pool, (void **)mbufs, count);
+   rc = rte_pktmbuf_alloc_bulk(rxq->mb_pool, (void **)mbufs, count);
if (unlikely(rc < 0)) {
rte_atomic64_inc(&rxq->adapter->drv_stats->rx_nombuf);
++rxq->rx_stats.mbuf_alloc_fail;
@@ -1486,7 +1488,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, 
unsigned int count)
if (unlikely(i < count)) {
PMD_DRV_LOG(WARNING, "refilled rx qid %d with only %d "
"buffers (from %d)\n", rxq->id, i, count);
-   rte_mempool_put_bulk(rxq->mb_pool, (void **)(&mbufs[i]),
+   rte_pktmbuf_alloc_bulk(rxq->mb_pool, (void **)(&mbufs[i]),
 count - i);
++rxq->rx_stats.refill_partial;
}
-- 
2.26.2.Cisco

Re: [dpdk-dev] [PATCH v2 1/2] test/crypto: close PMD after tests

[Akhil Goyal]

Hi Adam/Arek,

Could you please reply to the below query.

> > This patch adds closing of the PMD after running the tests.
> >
> > Signed-off-by: Adam Dybkowski 
> > ---
> >  app/test/test_cryptodev.c | 6 +-
> >  1 file changed, 5 insertions(+), 1 deletion(-)
> >
> > diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
> > index f91debc16..ea965a64a 100644
> > --- a/app/test/test_cryptodev.c
> > +++ b/app/test/test_cryptodev.c
> > @@ -928,6 +928,7 @@ ut_teardown(void)
> > struct crypto_testsuite_params *ts_params = &testsuite_params;
> > struct crypto_unittest_params *ut_params = &unittest_params;
> > struct rte_cryptodev_stats stats;
> > +   int res;
> >
> > /* free crypto session structure */
> >  #ifdef RTE_LIB_SECURITY
> > @@ -976,8 +977,11 @@ ut_teardown(void)
> >
> > rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats);
> >
> > -   /* Stop the device */
> > +   /* Stop and close the device */
> > rte_cryptodev_stop(ts_params->valid_devs[0]);
> > +   res = rte_cryptodev_close(ts_params->valid_devs[0]);
> > +   if (res)
> > +   RTE_LOG(ERR, USER1, "Crypto device close error %d\n", res);
> 
> Shouldn't this be part of testsuite_setup() instead of ut_teardown()?
> In cases of vdev, devices are initialized as part of testsuite_setup().
> 
> Should we also call rte_cryptodev_queue_pair_release from ut_teardown?
> 
> Regards,
> Akhil

Re: [dpdk-dev] [PATCH] net/mlx5/windows: fix link speed calculation

[Thomas Monjalon]

There is no previous commit with net/mlx5/windows as title prefix.
In general, there is "on Windows" at the end of the title.
This way we can have the same formatting when fixing the common code
for a Windows case.

05/04/2021 18:18, Tal Shnaiderman:
> In Windows DevX returns the value of the current link speed
> in bps rate, the conversion to the Mbps rate expected by DPDK
> is incorrect and fixed.

"was" incorrect.

I think you should explain the confusion between Mbit/s and Mibit/s.

> - dev_link.link_speed = context_obj->mlx5_dev.link_speed / (1024 * 1024);
> + dev_link.link_speed = context_obj->mlx5_dev.link_speed / (1000 * 1000);

Re: [dpdk-dev] [RFC] drivers: introduce mlx5 crypto PMD

[Akhil Goyal]

Hi Matan/Shiri,

> 
> Add a new PMD for Mellanox devices- crypto PMD.
> 
> The crypto PMD will be supported starting Mellanox ConnectX6 and
> BlueField2.
> 
> The crypto PMD will add the support of encryption and decryption using
> the AES-XTS symmetric algorithm.
> 
> The crypto PMD requires rdma-core and uses mlx5 DevX.
> 
> This patch adds the PCI probing, basic functions, build files and
> log utility.
> 
> Signed-off-by: Shiri Kuzin 
> Acked-by: Matan Azrad 
> ---
Could you please send the complete patchset for the PMD?
Or is it postponed for 21.08?

Regards,
Akhil

Re: [dpdk-dev] [PATCH v2 2/4] mbuf: add packet type for UDP-ESP tunnel packets

[Thomas Monjalon]

05/04/2021 20:11, Akhil Goyal:
> > Adding new mbuf packet type for UDP encapsulated
> > ESP packets.
> > 
> > Signed-off-by: Tejasree Kondoj 
> > ---
> >  doc/guides/rel_notes/release_21_05.rst |  5 +
> >  lib/librte_mbuf/rte_mbuf_ptype.h   | 21 +
> >  2 files changed, 26 insertions(+)
> > 
> Acked-by: Akhil Goyal 
> 
> ++Olivier
> 
> Thomas,
> Can this patch be part of crypto tree if acked by Olivier?

Yes, adding a packet type is OK if reviewed by Olivier or Andrew.
Olivier, Andrew, please could you review?

Re: [dpdk-dev] [PATCH] cryptodev: formalize key wrap method in API

[Akhil Goyal]

Hi Matan,

> The Key Wrap approach is used by applications in order to protect keys
> located in untrusted storage or transmitted over untrusted
> communications networks. The constructions are typically built from
> standard primitives such as block ciphers and cryptographic hash
> functions.
> 
> The Key Wrap method and its parameters are a secret between the keys
> provider and the device, means that the device is preconfigured for
> this method using very secured way.
> 
> The key wrap method may change the key length and layout.
> 
> Add a description for the cipher transformation key to allow wrapped key
> to be forwarded by the same API.
> 
> Signed-off-by: Matan Azrad 
> ---

How will the driver gets notified whether the key is wrapped or not?
The driver would expect the keys are as per the capabilities exposed.
If it does not check as per the capabilities, how will it identify a bad
Key len and the wrapped key length?

>  lib/librte_cryptodev/rte_crypto_sym.h | 7 +++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/lib/librte_cryptodev/rte_crypto_sym.h
> b/lib/librte_cryptodev/rte_crypto_sym.h
> index 5973e31..6aca2c7 100644
> --- a/lib/librte_cryptodev/rte_crypto_sym.h
> +++ b/lib/librte_cryptodev/rte_crypto_sym.h
> @@ -200,6 +200,13 @@ struct rte_crypto_cipher_xform {
>   uint16_t length;/**< key length in bytes */
>   } key;
>   /**< Cipher key
> +  * The original key data may be provided wrapped (encrypted) using
> a key
> +  * wrap algorithm such as AES key wrap (from rfc3394) or other. In
> such
> +  * case, the wrapping details is a secret between the key provider and
> +  * the device. Such key wrapping may increase the length of the
> provided
> +  * key beyond the advertised supported key size. Hence it is the
> +  * responsibility of the driver/device to validate the length of the
> +  * provided key.
>*
>* For the RTE_CRYPTO_CIPHER_AES_F8 mode of operation, key.data
> will
>* point to a concatenation of the AES encryption key followed by a
> --
> 1.8.3.1

[dpdk-dev] [PATCH v5 0/4] log level enhancements

[Thomas Monjalon]

This series is a part of a bigger one split after v4:
"improve options help"

The main intent of this series is to provide a nice help
for the --log-level option.

v5:
   - rename more private functions
   - sort log types when printing help

Thomas Monjalon (4):
  log: move private functions
  log: introduce macro for maximum level
  log: catch invalid level option number
  log: add option argument help

 lib/librte_eal/common/eal_common_log.c | 87 --
 lib/librte_eal/common/eal_common_options.c | 60 ++-
 lib/librte_eal/common/eal_log.h| 32 
 lib/librte_eal/common/eal_private.h| 29 
 lib/librte_eal/include/rte_log.h   | 12 +++
 lib/librte_eal/linux/eal.c |  3 +-
 lib/librte_eal/linux/eal_log.c |  4 +-
 lib/librte_eal/version.map |  1 +
 lib/librte_eal/windows/eal.c   |  3 +-
 lib/librte_eal/windows/eal_log.c   |  6 +-
 10 files changed, 162 insertions(+), 75 deletions(-)
 create mode 100644 lib/librte_eal/common/eal_log.h

-- 
2.31.1

[dpdk-dev] [PATCH v5 1/4] log: move private functions

[Thomas Monjalon]

Some private log functions had a wrong "rte_" prefix.

All private log functions are moved from eal_private.h
to the new file eal_log.h:
rte_eal_log_init -> eal_log_init
rte_log_save_regexp -> eal_log_save_regexp
rte_log_save_pattern -> eal_log_save_pattern
eal_log_set_default

The static functions in the file eal_common_log.c are renamed:
rte_log_save_level -> log_save_level
rte_log_init -> log_init

Signed-off-by: Thomas Monjalon 
Acked-by: Bruce Richardson 
Acked-by: Andrew Rybchenko 
---
 lib/librte_eal/common/eal_common_log.c | 28 +++--
 lib/librte_eal/common/eal_common_options.c |  5 ++--
 lib/librte_eal/common/eal_log.h| 27 
 lib/librte_eal/common/eal_private.h| 29 --
 lib/librte_eal/linux/eal.c |  3 ++-
 lib/librte_eal/linux/eal_log.c |  4 +--
 lib/librte_eal/windows/eal.c   |  3 ++-
 lib/librte_eal/windows/eal_log.c   |  6 +++--
 8 files changed, 55 insertions(+), 50 deletions(-)
 create mode 100644 lib/librte_eal/common/eal_log.h

diff --git a/lib/librte_eal/common/eal_common_log.c 
b/lib/librte_eal/common/eal_common_log.c
index c5554badb2..058fa10ffc 100644
--- a/lib/librte_eal/common/eal_common_log.c
+++ b/lib/librte_eal/common/eal_common_log.c
@@ -15,7 +15,7 @@
 #include 
 #include 
 
-#include "eal_private.h"
+#include "eal_log.h"
 
 struct rte_log_dynamic_type {
const char *name;
@@ -178,8 +178,8 @@ rte_log_set_level_regexp(const char *regex, uint32_t level)
  * Save the type string and the loglevel for later dynamic
  * logtypes which may register later.
  */
-static int rte_log_save_level(int priority,
- const char *regex, const char *pattern)
+static int
+log_save_level(uint32_t priority, const char *regex, const char *pattern)
 {
struct rte_eal_opt_loglevel *opt_ll = NULL;
 
@@ -207,9 +207,10 @@ static int rte_log_save_level(int priority,
return -1;
 }
 
-int rte_log_save_regexp(const char *regex, int tmp)
+int
+eal_log_save_regexp(const char *regex, uint32_t level)
 {
-   return rte_log_save_level(tmp, regex, NULL);
+   return log_save_level(level, regex, NULL);
 }
 
 /* set log level based on globbing pattern */
@@ -232,9 +233,10 @@ rte_log_set_level_pattern(const char *pattern, uint32_t 
level)
return 0;
 }
 
-int rte_log_save_pattern(const char *pattern, int priority)
+int
+eal_log_save_pattern(const char *pattern, uint32_t level)
 {
-   return rte_log_save_level(priority, NULL, pattern);
+   return log_save_level(level, NULL, pattern);
 }
 
 /* get the current loglevel for the message being processed */
@@ -250,7 +252,7 @@ int rte_log_cur_msg_logtype(void)
 }
 
 static int
-rte_log_lookup(const char *name)
+log_lookup(const char *name)
 {
size_t i;
 
@@ -268,7 +270,7 @@ rte_log_lookup(const char *name)
  * is not yet registered.
  */
 static int
-__rte_log_register(const char *name, int id)
+log_register(const char *name, int id)
 {
char *dup_name = strdup(name);
 
@@ -288,7 +290,7 @@ rte_log_register(const char *name)
struct rte_log_dynamic_type *new_dynamic_types;
int id, ret;
 
-   id = rte_log_lookup(name);
+   id = log_lookup(name);
if (id >= 0)
return id;
 
@@ -299,7 +301,7 @@ rte_log_register(const char *name)
return -ENOMEM;
rte_logs.dynamic_types = new_dynamic_types;
 
-   ret = __rte_log_register(name, rte_logs.dynamic_types_len);
+   ret = log_register(name, rte_logs.dynamic_types_len);
if (ret < 0)
return ret;
 
@@ -376,7 +378,7 @@ static const struct logtype logtype_strings[] = {
 };
 
 /* Logging should be first initializer (before drivers and bus) */
-RTE_INIT_PRIO(rte_log_init, LOG)
+RTE_INIT_PRIO(log_init, LOG)
 {
uint32_t i;
 
@@ -389,7 +391,7 @@ RTE_INIT_PRIO(rte_log_init, LOG)
 
/* register legacy log types */
for (i = 0; i < RTE_DIM(logtype_strings); i++)
-   __rte_log_register(logtype_strings[i].logtype,
+   log_register(logtype_strings[i].logtype,
logtype_strings[i].log_id);
 
rte_logs.dynamic_types_len = RTE_LOGTYPE_FIRST_EXT_ID;
diff --git a/lib/librte_eal/common/eal_common_options.c 
b/lib/librte_eal/common/eal_common_options.c
index 622c7bc429..cd1a2856c9 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -41,6 +41,7 @@
 #include "eal_options.h"
 #include "eal_filesystem.h"
 #include "eal_private.h"
+#include "eal_log.h"
 #ifndef RTE_EXEC_ENV_WINDOWS
 #include "eal_trace.h"
 #endif
@@ -1299,7 +1300,7 @@ eal_parse_log_level(const char *arg)
regex, priority);
goto fail;
}
-   if (rte_log_save_regexp(regex, priority) < 0)
+   if (eal_log_save_regexp(regex, p

[dpdk-dev] [PATCH v5 2/4] log: introduce macro for maximum level

[Thomas Monjalon]

RTE_DIM(...) and RTE_LOG_DEBUG were used to get the highest log level.
For better clarity a new constant RTE_LOG_MAX is introduced
and mapped to RTE_LOG_DEBUG.

Signed-off-by: Thomas Monjalon 
Acked-by: Bruce Richardson 
Acked-by: Andrew Rybchenko 
---
 lib/librte_eal/common/eal_common_log.c | 8 
 lib/librte_eal/common/eal_common_options.c | 2 +-
 lib/librte_eal/include/rte_log.h   | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_log.c 
b/lib/librte_eal/common/eal_common_log.c
index 058fa10ffc..b9b982fdb5 100644
--- a/lib/librte_eal/common/eal_common_log.c
+++ b/lib/librte_eal/common/eal_common_log.c
@@ -140,7 +140,7 @@ rte_log_set_level(uint32_t type, uint32_t level)
 {
if (type >= rte_logs.dynamic_types_len)
return -1;
-   if (level > RTE_LOG_DEBUG)
+   if (level > RTE_LOG_MAX)
return -1;
 
rte_logs.dynamic_types[type].loglevel = level;
@@ -155,7 +155,7 @@ rte_log_set_level_regexp(const char *regex, uint32_t level)
regex_t r;
size_t i;
 
-   if (level > RTE_LOG_DEBUG)
+   if (level > RTE_LOG_MAX)
return -1;
 
if (regcomp(&r, regex, 0) != 0)
@@ -219,7 +219,7 @@ rte_log_set_level_pattern(const char *pattern, uint32_t 
level)
 {
size_t i;
 
-   if (level > RTE_LOG_DEBUG)
+   if (level > RTE_LOG_MAX)
return -1;
 
for (i = 0; i < rte_logs.dynamic_types_len; i++) {
@@ -323,7 +323,7 @@ rte_log_register_type_and_pick_level(const char *name, 
uint32_t level_def)
return type;
 
TAILQ_FOREACH(opt_ll, &opt_loglevel_list, next) {
-   if (opt_ll->level > RTE_LOG_DEBUG)
+   if (opt_ll->level > RTE_LOG_MAX)
continue;
 
if (opt_ll->pattern) {
diff --git a/lib/librte_eal/common/eal_common_options.c 
b/lib/librte_eal/common/eal_common_options.c
index cd1a2856c9..38b72fb665 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -1249,7 +1249,7 @@ eal_parse_log_priority(const char *level)
return -1;
 
/* look for named values, skip 0 which is not a valid level */
-   for (i = 1; i < RTE_DIM(levels); i++) {
+   for (i = 1; i <= RTE_LOG_MAX; i++) {
if (strncmp(levels[i], level, len) == 0)
return i;
}
diff --git a/lib/librte_eal/include/rte_log.h b/lib/librte_eal/include/rte_log.h
index 21a7d16340..424dfa3fd0 100644
--- a/lib/librte_eal/include/rte_log.h
+++ b/lib/librte_eal/include/rte_log.h
@@ -72,6 +72,7 @@ extern "C" {
 #define RTE_LOG_NOTICE   6U  /**< Normal but significant condition. */
 #define RTE_LOG_INFO 7U  /**< Informational.*/
 #define RTE_LOG_DEBUG8U  /**< Debug-level messages. */
+#define RTE_LOG_MAX RTE_LOG_DEBUG /**< Most detailed log level. */
 
 /**
  * Change the stream that will be used by the logging system.
-- 
2.31.1

[dpdk-dev] [PATCH v5 4/4] log: add option argument help

[Thomas Monjalon]

The option --log-level was not completely described in the usage text,
and it was difficult to guess the names of the log types and levels.

A new value "help" is accepted after --log-level to give more details
about the syntax and listing the log types and levels.

The array "levels" used for level name parsing is replaced with
a (modified) existing function which was used in rte_log_dump().

The new function rte_log_list_types() is exported in the API
for allowing an application to give this info to the user
if not exposing the EAL option --log-level.
The list of log types cannot include all drivers if not linked in the
application (shared object plugin case).

Signed-off-by: Thomas Monjalon 
Acked-by: Bruce Richardson 
Acked-by: Andrew Rybchenko 
---
 lib/librte_eal/common/eal_common_log.c | 51 +++---
 lib/librte_eal/common/eal_common_options.c | 44 +--
 lib/librte_eal/common/eal_log.h|  5 +++
 lib/librte_eal/include/rte_log.h   | 11 +
 lib/librte_eal/version.map |  1 +
 5 files changed, 94 insertions(+), 18 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_log.c 
b/lib/librte_eal/common/eal_common_log.c
index b9b982fdb5..4c6766a360 100644
--- a/lib/librte_eal/common/eal_common_log.c
+++ b/lib/librte_eal/common/eal_common_log.c
@@ -397,12 +397,12 @@ RTE_INIT_PRIO(log_init, LOG)
rte_logs.dynamic_types_len = RTE_LOGTYPE_FIRST_EXT_ID;
 }
 
-static const char *
-loglevel_to_string(uint32_t level)
+const char *
+eal_log_level2str(uint32_t level)
 {
switch (level) {
case 0: return "disabled";
-   case RTE_LOG_EMERG: return "emerg";
+   case RTE_LOG_EMERG: return "emergency";
case RTE_LOG_ALERT: return "alert";
case RTE_LOG_CRIT: return "critical";
case RTE_LOG_ERR: return "error";
@@ -414,6 +414,47 @@ loglevel_to_string(uint32_t level)
}
 }
 
+static int
+log_type_compare(const void *a, const void *b)
+{
+   const struct rte_log_dynamic_type *type_a = a;
+   const struct rte_log_dynamic_type *type_b = b;
+
+   if (type_a->name == NULL && type_b->name == NULL)
+   return 0;
+   if (type_a->name == NULL)
+   return -1;
+   if (type_b->name == NULL)
+   return 1;
+   return strcmp(type_a->name, type_b->name);
+}
+
+/* Dump name of each logtype, one per line. */
+void
+rte_log_list_types(FILE *out, const char *prefix)
+{
+   struct rte_log_dynamic_type *sorted_types;
+   const size_t type_size = sizeof(rte_logs.dynamic_types[0]);
+   const size_t type_count = rte_logs.dynamic_types_len;
+   const size_t total_size = type_size * type_count;
+   size_t type;
+
+   sorted_types = malloc(total_size);
+   if (sorted_types == NULL) {
+   /* no sorting - unlikely */
+   sorted_types = rte_logs.dynamic_types;
+   } else {
+   memcpy(sorted_types, rte_logs.dynamic_types, total_size);
+   qsort(sorted_types, type_count, type_size, log_type_compare);
+   }
+
+   for (type = 0; type < type_count; ++type) {
+   if (sorted_types[type].name == NULL)
+   continue;
+   fprintf(out, "%s%s\n", prefix, sorted_types[type].name);
+   }
+}
+
 /* dump global level and registered log types */
 void
 rte_log_dump(FILE *f)
@@ -421,14 +462,14 @@ rte_log_dump(FILE *f)
size_t i;
 
fprintf(f, "global log level is %s\n",
-   loglevel_to_string(rte_log_get_global_level()));
+   eal_log_level2str(rte_log_get_global_level()));
 
for (i = 0; i < rte_logs.dynamic_types_len; i++) {
if (rte_logs.dynamic_types[i].name == NULL)
continue;
fprintf(f, "id %zu: %s, level is %s\n",
i, rte_logs.dynamic_types[i].name,
-   loglevel_to_string(rte_logs.dynamic_types[i].loglevel));
+   eal_log_level2str(rte_logs.dynamic_types[i].loglevel));
}
 }
 
diff --git a/lib/librte_eal/common/eal_common_options.c 
b/lib/librte_eal/common/eal_common_options.c
index 7075a051b8..2951b1aca2 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -1227,19 +1227,31 @@ eal_parse_syslog(const char *facility, struct 
internal_config *conf)
 }
 #endif
 
+static void
+eal_log_usage(void)
+{
+   unsigned int level;
+
+   printf("Log type is a pattern matching items of this list"
+   " (plugins may be missing):\n");
+   rte_log_list_types(stdout, "\t");
+   printf("\n");
+   printf("Syntax using globbing pattern: ");
+   printf("--"OPT_LOG_LEVEL" pattern:level\n");
+   printf("Syntax using regular expression:   ");
+   printf("--"OPT_LOG_LEVEL" regexp,level\n");
+   printf("Syntax for the global level:   ");
+   printf("--"OPT_LOG_LEVEL" level\n");
+   p

[dpdk-dev] [PATCH v5 3/4] log: catch invalid level option number

[Thomas Monjalon]

The parsing check for invalid log level was not trying to catch
irrelevant numeric values.
A log level 0 becomes a failure in parsing so it can be caught early.
A log level higher than the max (8) is accepted with a warning message.

Signed-off-by: Thomas Monjalon 
Acked-by: Bruce Richardson 
Acked-by: Andrew Rybchenko 
---
 lib/librte_eal/common/eal_common_options.c | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_options.c 
b/lib/librte_eal/common/eal_common_options.c
index 38b72fb665..7075a051b8 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -1289,10 +1289,15 @@ eal_parse_log_level(const char *arg)
}
 
priority = eal_parse_log_priority(level);
-   if (priority < 0) {
-   fprintf(stderr, "invalid log priority: %s\n", level);
+   if (priority <= 0) {
+   fprintf(stderr, "Invalid log level: %s\n", level);
goto fail;
}
+   if (priority > (int)RTE_LOG_MAX) {
+   fprintf(stderr, "Log level %d higher than maximum (%d)\n",
+   priority, RTE_LOG_MAX);
+   priority = RTE_LOG_MAX;
+   }
 
if (regex) {
if (rte_log_set_level_regexp(regex, priority) < 0) {
-- 
2.31.1

[dpdk-dev] [PATCH v5 0/3] cleanup exit and usage messages in apps

[Thomas Monjalon]

This series is a part of a bigger one split after v4:
"improve options help"

v5: no change

Thomas Monjalon (3):
  app: fix exit messages
  app/regex: fix usage text
  app/testpmd: fix usage text

 .../comp_perf_options_parse.c |  2 +-
 app/test-crypto-perf/cperf_options_parsing.c  |  2 +-
 app/test-flow-perf/main.c | 59 +--
 app/test-pmd/parameters.c | 39 
 app/test-regex/main.c |  7 +--
 5 files changed, 43 insertions(+), 66 deletions(-)

-- 
2.31.1

[dpdk-dev] [PATCH v5 2/3] app/regex: fix usage text

[Thomas Monjalon]

The usage syntax help includes the program name which was fake.
It is replaced with the real name from argv.

Fixes: de06137cb295 ("app/regex: add RegEx test application")
Cc: sta...@dpdk.org

Signed-off-by: Thomas Monjalon 
Acked-by: Ori Kam 
Acked-by: Bruce Richardson 
Acked-by: Andrew Rybchenko 
---
 app/test-regex/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/test-regex/main.c b/app/test-regex/main.c
index 7bb87bb1b8..f18dc2eef8 100644
--- a/app/test-regex/main.c
+++ b/app/test-regex/main.c
@@ -151,10 +151,10 @@ args_parse(int argc, char **argv, char *rules_file, char 
*data_file,
*nb_lcores = atoi(optarg);
break;
case ARG_HELP:
-   usage("RegEx test app");
+   usage(argv[0]);
break;
default:
-   usage("RegEx test app");
+   usage(argv[0]);
rte_exit(EXIT_FAILURE, "Invalid option: %s\n", 
argv[optind]);
break;
}
-- 
2.31.1

[dpdk-dev] [PATCH v5 1/3] app: fix exit messages

[Thomas Monjalon]

Some applications were printing useless messages with rte_exit()
after showing the help. Using exit() is enough in this case.

Some applications were using a redundant printf or fprintf() before
calling rte_exit(). The messages are unified in a single rte_exit().

Some rte_exit() calls were missing a line feed or returning a wrong code.

Signed-off-by: Thomas Monjalon 
Acked-by: Wisam Jaddo 
Acked-by: Ori Kam 
Acked-by: Bruce Richardson 
Acked-by: Andrew Rybchenko 
---
 .../comp_perf_options_parse.c |  2 +-
 app/test-crypto-perf/cperf_options_parsing.c  |  2 +-
 app/test-flow-perf/main.c | 59 +--
 app/test-pmd/parameters.c |  4 +-
 app/test-regex/main.c |  3 +-
 5 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/app/test-compress-perf/comp_perf_options_parse.c 
b/app/test-compress-perf/comp_perf_options_parse.c
index 04a8d2fbee..019eddb7bd 100644
--- a/app/test-compress-perf/comp_perf_options_parse.c
+++ b/app/test-compress-perf/comp_perf_options_parse.c
@@ -620,7 +620,7 @@ comp_perf_options_parse(struct comp_test_data *test_data, 
int argc, char **argv)
switch (opt) {
case 'h':
usage(argv[0]);
-   rte_exit(EXIT_SUCCESS, "Displayed help\n");
+   exit(EXIT_SUCCESS);
break;
/* long options */
case 0:
diff --git a/app/test-crypto-perf/cperf_options_parsing.c 
b/app/test-crypto-perf/cperf_options_parsing.c
index 0466f7baf8..40b6dfb648 100644
--- a/app/test-crypto-perf/cperf_options_parsing.c
+++ b/app/test-crypto-perf/cperf_options_parsing.c
@@ -983,7 +983,7 @@ cperf_options_parse(struct cperf_options *options, int 
argc, char **argv)
switch (opt) {
case 'h':
usage(argv[0]);
-   rte_exit(EXIT_SUCCESS, "Displayed help\n");
+   exit(EXIT_SUCCESS);
break;
/* long options */
case 0:
diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c
index 99d0463456..0aef767350 100644
--- a/app/test-flow-perf/main.c
+++ b/app/test-flow-perf/main.c
@@ -639,7 +639,7 @@ args_parse(int argc, char **argv)
case 0:
if (strcmp(lgopts[opt_idx].name, "help") == 0) {
usage(argv[0]);
-   rte_exit(EXIT_SUCCESS, "Displayed help\n");
+   exit(EXIT_SUCCESS);
}
 
if (strcmp(lgopts[opt_idx].name, "group") == 0) {
@@ -647,7 +647,7 @@ args_parse(int argc, char **argv)
if (n >= 0)
flow_group = n;
else
-   rte_exit(EXIT_SUCCESS,
+   rte_exit(EXIT_FAILURE,
"flow group should be >= 0\n");
printf("group %d / ", flow_group);
}
@@ -667,7 +667,7 @@ args_parse(int argc, char **argv)
if (n > 0)
hairpin_queues_num = n;
else
-   rte_exit(EXIT_SUCCESS,
+   rte_exit(EXIT_FAILURE,
"Hairpin queues should be > 
0\n");
 
flow_actions[actions_idx++] =
@@ -680,7 +680,7 @@ args_parse(int argc, char **argv)
if (n > 0)
hairpin_queues_num = n;
else
-   rte_exit(EXIT_SUCCESS,
+   rte_exit(EXIT_FAILURE,
"Hairpin queues should be > 
0\n");
 
flow_actions[actions_idx++] =
@@ -704,11 +704,9 @@ args_parse(int argc, char **argv)
break;
}
/* Reached last item with no 
match */
-   if (i == (RTE_DIM(flow_options) 
- 1)) {
-   fprintf(stderr, 
"Invalid encap item: %s\n", token);
-   usage(argv[0]);
-   rte_exit(EXIT_SUCCESS, 
"Invalid encap item\n");
-   }
+   if (i == (RTE_DIM(flow_options) 
- 1))
+   rte_exit(EXIT_FAILURE,
+

[dpdk-dev] [PATCH v5 3/3] app/testpmd: fix usage text

[Thomas Monjalon]

The options help text was including an incomplete and redundant
summary of the options before explaining each. The summary is dropped.

The details of the option --hairpin-mode had an extra space,
breaking the alignment with the next line.

There were some mismatches between options in the usage text
sed -rn 's/.*\(" *--([a-z-]*)[=: ].*/\1/p' app/test-pmd/parameters.c
and the options declared in lgopts array
sed -rn 's/.*\{.*"(.*)",.*,.*,.*},.*/\1/p' app/test-pmd/parameters.c
The misses were:
--no-numa
--enable-scatter
--tx-ip
--tx-udp
--noisy-lkup-num-reads-writes
The option --ports was not implemented.

Fixes: 01817b10d27c ("app/testpmd: change hairpin queues setup")
Fixes: 3c156061b938 ("app/testpmd: add noisy neighbour forwarding mode")
Fixes: bf5b2126bf44 ("app/testpmd: add ability to set Tx IP and UDP parameters")
Fixes: 0499793854f5 ("app/testpmd: add scatter enabling option")
Fixes: 999b2ee0fe45 ("app/testpmd: enable NUMA support by default")
Fixes: af75078fece3 ("first public release")
Cc: sta...@dpdk.org

Signed-off-by: Thomas Monjalon 
Acked-by: Ajit Khaparde 
Acked-by: Bruce Richardson 
Acked-by: Andrew Rybchenko 
Acked-by: Xiaoyun Li 
Reviewed-by: Jens Freimann 
Reviewed-by: Bing Zhao 
---
 app/test-pmd/parameters.c | 35 ---
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index b7d4ef76b0..f3954c1c63 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -49,29 +49,7 @@
 static void
 usage(char* progname)
 {
-   printf("usage: %s [EAL options] -- "
-#ifdef RTE_LIB_CMDLINE
-  "[--interactive|-i] "
-  "[--cmdline-file=FILENAME] "
-#endif
-  "[--help|-h] | [--auto-start|-a] | ["
-  "--tx-first | --stats-period=PERIOD | "
-  "--coremask=COREMASK --portmask=PORTMASK --numa "
-  "--portlist=PORTLIST "
-  "--mbuf-size= | --total-num-mbufs= | "
-  "--nb-cores= | --nb-ports= | "
-#ifdef RTE_LIB_CMDLINE
-  "--eth-peers-configfile= | "
-  "--eth-peer=X,M:M:M:M:M:M | "
-  "--tx-ip=SRC,DST | --tx-udp=PORT | "
-#endif
-  "--pkt-filter-mode= |"
-  "--rss-ip | --rss-udp | --rss-level-inner | --rss-level-outer |"
-  "--rxpt= | --rxht= | --rxwt= |"
-  " --rxfreet= | --txpt= | --txht= | --txwt= | --txfreet= | "
-  "--txrst= | --tx-offloads= | | --rx-offloads= | "
-  "--vxlan-gpe-port= | --geneve-parsed-port= | "
-  "--record-core-cycles | --record-burst-stats]\n",
+   printf("\nUsage: %s [EAL options] -- [testpmd options]\n\n",
   progname);
 #ifdef RTE_LIB_CMDLINE
printf("  --interactive: run in interactive mode.\n");
@@ -97,6 +75,7 @@ usage(char* progname)
printf("  --portlist=PORTLIST: list of forwarding ports\n");
printf("  --numa: enable NUMA-aware allocation of RX/TX rings and of "
   "RX memory buffers (mbufs).\n");
+   printf("  --no-numa: disable NUMA-aware allocation.\n");
printf("  --port-numa-config=(port,socket)[,(port,socket)]: "
   "specify the socket on which the memory pool "
   "used by the port will be allocated.\n");
@@ -136,6 +115,7 @@ usage(char* progname)
   "monitoring on forwarding lcore id N.\n");
 #endif
printf("  --disable-crc-strip: disable CRC stripping by hardware.\n");
+   printf("  --enable-scatter: enable scattered Rx.\n");
printf("  --enable-lro: enable large receive offload.\n");
printf("  --enable-rx-cksum: enable rx hardware checksum offload.\n");
printf("  --enable-rx-timestamp: enable rx hardware timestamp 
offload.\n");
@@ -184,6 +164,8 @@ usage(char* progname)
printf("  --txpkts=X[,Y]*: set TX segment sizes"
" or total packet length.\n");
printf("  --txonly-multi-flow: generate multiple flows in txonly 
mode\n");
+   printf("  --tx-ip=src,dst: IP addresses in Tx-only mode\n");
+   printf("  --tx-udp=src[,dst]: UDP ports in Tx-only mode\n");
printf("  --eth-link-speed: force link speed.\n");
printf("  --disable-link-check: disable check on link status when "
   "starting/stopping ports.\n");
@@ -215,14 +197,14 @@ usage(char* progname)
printf("  --noisy-lkup-memory=N: allocate N MB of VNF memory\n");
printf("  --noisy-lkup-num-writes=N: do N random writes per packet\n");
printf("  --noisy-lkup-num-reads=N: do N random reads per packet\n");
-   printf("  --noisy-lkup-num-writes=N: do N random reads and writes per 
packet\n");
+   printf("  --noisy-lkup-num-reads-writes=N: do N random reads and writes 
per packet\n");
printf("  --no-iova-contig: mempool memory can be IOVA non contiguous. "
   "valid only with --mp-alloc=anon\n");

[dpdk-dev] [PATCH v5 0/4] improve options help

[Thomas Monjalon]

After v4, this series is split in several parts.
The remaining 4 patches of this series are low priority.

Patches 1 and 3 are simple improvements.

Patches 2 and 4 lead to a new formatting of the usage text.
It is a matter of taste and should be discussed more.

v5: no change

Thomas Monjalon (4):
  eal: explain argv behaviour during init
  eal: improve options usage text
  eal: use macros for help option
  app: hook in EAL usage help

 app/pdump/main.c |  2 ++
 app/proc-info/main.c |  2 ++
 app/test-acl/main.c  |  2 ++
 app/test-bbdev/main.c|  3 ++-
 app/test-compress-perf/comp_perf_options.h   |  2 ++
 app/test-compress-perf/comp_perf_options_parse.c |  8 
 app/test-compress-perf/main.c|  3 ++-
 app/test-crypto-perf/cperf_options.h |  2 ++
 app/test-crypto-perf/cperf_options_parsing.c |  8 
 app/test-crypto-perf/main.c  |  3 ++-
 app/test-fib/main.c  |  8 
 app/test-flow-perf/main.c|  4 +++-
 app/test-pmd/parameters.c|  4 ++--
 app/test-pmd/testpmd.c   |  2 ++
 app/test-pmd/testpmd.h   |  1 +
 app/test-regex/main.c|  3 ++-
 app/test-sad/main.c  |  7 +++
 lib/librte_eal/common/eal_common_options.c   | 13 ++---
 lib/librte_eal/freebsd/eal.c | 10 +-
 lib/librte_eal/include/rte_eal.h |  2 ++
 lib/librte_eal/linux/eal.c   | 14 +++---
 lib/librte_eal/windows/eal.c | 12 +---
 22 files changed, 74 insertions(+), 41 deletions(-)

-- 
2.31.1

[dpdk-dev] [PATCH v5 2/4] eal: improve options usage text

[Thomas Monjalon]

The description of the EAL options was printed before the application
description provided via the hook.
It is better to let the application print the global syntax
and describes the detail of the EAL options below.

Also, some useless lines are removed,
and the alignment of few options is fixed.

Signed-off-by: Thomas Monjalon 
Acked-by: Bruce Richardson 
Acked-by: Andrew Rybchenko 
---
 lib/librte_eal/common/eal_common_options.c | 11 +--
 lib/librte_eal/freebsd/eal.c   |  8 
 lib/librte_eal/linux/eal.c | 12 ++--
 lib/librte_eal/windows/eal.c   | 10 --
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_options.c 
b/lib/librte_eal/common/eal_common_options.c
index 2951b1aca2..08a85614c9 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -2045,8 +2045,7 @@ rte_vect_set_max_simd_bitwidth(uint16_t bitwidth)
 void
 eal_common_usage(void)
 {
-   printf("[options]\n\n"
-  "EAL common options:\n"
+   printf("EAL common options:\n"
   "  -c COREMASK Hexadecimal bitmask of cores to run on\n"
   "  -l CORELIST List of cores to run on\n"
   "  The argument format is 
[-c2][,c3[-c4],...]\n"
@@ -2076,7 +2075,7 @@ eal_common_usage(void)
   "  --"OPT_VDEV"  Add a virtual device.\n"
   "  The argument format is 
[,key=val,...]\n"
   "  (ex: --vdev=net_pcap0,iface=eth2).\n"
-  "  --"OPT_IOVA_MODE"   Set IOVA mode. 'pa' for IOVA_PA\n"
+  "  --"OPT_IOVA_MODE" Set IOVA mode. 'pa' for IOVA_PA\n"
   "  'va' for IOVA_VA\n"
   "  -d LIB.so|DIR   Add a driver or driver directory\n"
   "  (can be used multiple times)\n"
@@ -2116,11 +2115,11 @@ eal_common_usage(void)
 #endif /* !RTE_EXEC_ENV_WINDOWS */
   "  -v  Display version information on startup\n"
   "  -h, --help  This help\n"
-  "  --"OPT_IN_MEMORY"   Operate entirely in memory. This will\n"
+  "  --"OPT_IN_MEMORY" Operate entirely in memory. This 
will\n"
   "  disable secondary process support\n"
   "  --"OPT_BASE_VIRTADDR" Base virtual address\n"
-  "  --"OPT_TELEMETRY"   Enable telemetry support (on by 
default)\n"
-  "  --"OPT_NO_TELEMETRY"   Disable telemetry support\n"
+  "  --"OPT_TELEMETRY" Enable telemetry support (on by 
default)\n"
+  "  --"OPT_NO_TELEMETRY"  Disable telemetry support\n"
   "  --"OPT_FORCE_MAX_SIMD_BITWIDTH" Force the max SIMD bitwidth\n"
   "\nEAL options for DEBUG use only:\n"
   "  --"OPT_HUGE_UNLINK"   Unlink hugepage files after init\n"
diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c
index 32442e5ba6..4e10d37253 100644
--- a/lib/librte_eal/freebsd/eal.c
+++ b/lib/librte_eal/freebsd/eal.c
@@ -421,13 +421,13 @@ eal_usage(const char *prgname)
 {
rte_usage_hook_t hook = eal_get_application_usage_hook();
 
-   printf("\nUsage: %s ", prgname);
-   eal_common_usage();
-   /* Allow the application to print its usage message too if hook is set 
*/
if (hook) {
-   printf("= Application Usage =\n\n");
+   /* Print application usage through EAL options parsing. */
(hook)(prgname);
+   printf("\n");
}
+
+   eal_common_usage();
 }
 
 static inline size_t
diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c
index ac27dd4274..4f36f9b1f5 100644
--- a/lib/librte_eal/linux/eal.c
+++ b/lib/librte_eal/linux/eal.c
@@ -535,7 +535,12 @@ eal_usage(const char *prgname)
 {
rte_usage_hook_t hook = eal_get_application_usage_hook();
 
-   printf("\nUsage: %s ", prgname);
+   if (hook) {
+   /* Print application usage through EAL options parsing. */
+   (hook)(prgname);
+   printf("\n");
+   }
+
eal_common_usage();
printf("EAL Linux options:\n"
   "  --"OPT_SOCKET_MEM"Memory to allocate on sockets 
(comma separated values)\n"
@@ -549,11 +554,6 @@ eal_usage(const char *prgname)
   "  --"OPT_SINGLE_FILE_SEGMENTS" Put all hugepage memory in 
single files\n"
   "  --"OPT_MATCH_ALLOCATIONS" Free hugepages exactly as 
allocated\n"
   "\n");
-   /* Allow the application to print its usage message too if hook is set 
*/
-   if (hook) {
-   printf("= Application Usage =\n\n");
-   (hook)(prgname);
-   }
 }
 
 static int
diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.

[dpdk-dev] [PATCH v5 1/4] eal: explain argv behaviour during init

[Thomas Monjalon]

After argument parsing done by rte_eal_init(),
the remaining arguments are to be parsed by the application
by progressing in the argv array.
In this context, the first string represented by argv[0] is still
the same program name as the original argv[0],
while the next strings are the application arguments.
This is because rte_eal_init() manipulates the argv array
after EAL parsing, before returning to the application.

This note was missing in the doxygen comment of the API.

Signed-off-by: Thomas Monjalon 
Acked-by: Bruce Richardson 
Acked-by: Andrew Rybchenko 
---
 lib/librte_eal/include/rte_eal.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/librte_eal/include/rte_eal.h b/lib/librte_eal/include/rte_eal.h
index eaf6469e50..0cbeedb594 100644
--- a/lib/librte_eal/include/rte_eal.h
+++ b/lib/librte_eal/include/rte_eal.h
@@ -76,6 +76,8 @@ int rte_eal_iopl_init(void);
  * @param argv
  *   An array of strings.  The contents of the array, as well as the strings
  *   which are pointed to by the array, may be modified by this function.
+ *   The program name pointer argv[0] is copied into the last parsed argv
+ *   so that argv[0] is still the same after deducing the parsed arguments.
  * @return
  *   - On success, the number of parsed arguments, which is greater or
  * equal to zero. After the call to rte_eal_init(),
-- 
2.31.1

[dpdk-dev] [PATCH v5 3/4] eal: use macros for help option

[Thomas Monjalon]

The macros OPT_HELP and OPT_HELP_NUM were not used where appropriate.

Signed-off-by: Thomas Monjalon 
Acked-by: Bruce Richardson 
Acked-by: Andrew Rybchenko 
---
 lib/librte_eal/common/eal_common_options.c | 2 +-
 lib/librte_eal/freebsd/eal.c   | 2 +-
 lib/librte_eal/linux/eal.c | 2 +-
 lib/librte_eal/windows/eal.c   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/librte_eal/common/eal_common_options.c 
b/lib/librte_eal/common/eal_common_options.c
index 08a85614c9..1da6583d71 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -2114,7 +2114,7 @@ eal_common_usage(void)
   "  must be specified once only.\n"
 #endif /* !RTE_EXEC_ENV_WINDOWS */
   "  -v  Display version information on startup\n"
-  "  -h, --help  This help\n"
+  "  -h, --"OPT_HELP"  This help\n"
   "  --"OPT_IN_MEMORY" Operate entirely in memory. This 
will\n"
   "  disable secondary process support\n"
   "  --"OPT_BASE_VIRTADDR" Base virtual address\n"
diff --git a/lib/librte_eal/freebsd/eal.c b/lib/librte_eal/freebsd/eal.c
index 4e10d37253..73229ff9c4 100644
--- a/lib/librte_eal/freebsd/eal.c
+++ b/lib/librte_eal/freebsd/eal.c
@@ -549,7 +549,7 @@ eal_parse_args(int argc, char **argv)
}
break;
}
-   case 'h':
+   case OPT_HELP_NUM:
eal_usage(prgname);
exit(EXIT_SUCCESS);
default:
diff --git a/lib/librte_eal/linux/eal.c b/lib/librte_eal/linux/eal.c
index 4f36f9b1f5..d3615de641 100644
--- a/lib/librte_eal/linux/eal.c
+++ b/lib/librte_eal/linux/eal.c
@@ -717,7 +717,7 @@ eal_parse_args(int argc, char **argv)
continue;
 
switch (opt) {
-   case 'h':
+   case OPT_HELP_NUM:
eal_usage(prgname);
exit(EXIT_SUCCESS);
 
diff --git a/lib/librte_eal/windows/eal.c b/lib/librte_eal/windows/eal.c
index 25921eecb2..5bca3ace1c 100644
--- a/lib/librte_eal/windows/eal.c
+++ b/lib/librte_eal/windows/eal.c
@@ -159,7 +159,7 @@ eal_parse_args(int argc, char **argv)
continue;
 
switch (opt) {
-   case 'h':
+   case OPT_HELP_NUM:
eal_usage(prgname);
exit(EXIT_SUCCESS);
default:
-- 
2.31.1

[dpdk-dev] [PATCH v5 4/4] app: hook in EAL usage help

[Thomas Monjalon]

Use rte_set_application_usage_hook() in the test applications,
so the full help including EAL options can be printed in one go
with the EAL option -h or --help.

Signed-off-by: Thomas Monjalon 
Acked-by: Wisam Jaddo 
Acked-by: Bruce Richardson 
Acked-by: Andrew Rybchenko 
---
 app/pdump/main.c | 2 ++
 app/proc-info/main.c | 2 ++
 app/test-acl/main.c  | 2 ++
 app/test-bbdev/main.c| 3 ++-
 app/test-compress-perf/comp_perf_options.h   | 2 ++
 app/test-compress-perf/comp_perf_options_parse.c | 8 
 app/test-compress-perf/main.c| 3 ++-
 app/test-crypto-perf/cperf_options.h | 2 ++
 app/test-crypto-perf/cperf_options_parsing.c | 8 
 app/test-crypto-perf/main.c  | 3 ++-
 app/test-fib/main.c  | 8 
 app/test-flow-perf/main.c| 4 +++-
 app/test-pmd/parameters.c| 4 ++--
 app/test-pmd/testpmd.c   | 2 ++
 app/test-pmd/testpmd.h   | 1 +
 app/test-regex/main.c| 3 ++-
 app/test-sad/main.c  | 7 +++
 17 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/app/pdump/main.c b/app/pdump/main.c
index 63bbe65cd8..8641017f48 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -974,6 +974,8 @@ main(int argc, char **argv)
char mp_flag[] = "--proc-type=secondary";
char *argp[argc + 2];
 
+   rte_set_application_usage_hook(pdump_usage);
+
/* catch ctrl-c so we can print on exit */
signal(SIGINT, signal_handler);
 
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index b9587f7ded..e7d86bfa9d 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -1361,6 +1361,8 @@ main(int argc, char **argv)
char *argp[argc + 4];
uint16_t nb_ports;
 
+   rte_set_application_usage_hook(proc_info_usage);
+
/* preparse app arguments */
ret = proc_info_preparse_args(argc, argv);
if (ret < 0) {
diff --git a/app/test-acl/main.c b/app/test-acl/main.c
index 2cb2fe2579..9f95cb0fbf 100644
--- a/app/test-acl/main.c
+++ b/app/test-acl/main.c
@@ -1080,6 +1080,8 @@ main(int argc, char **argv)
int ret;
uint32_t lcore;
 
+   rte_set_application_usage_hook(print_usage);
+
ret = rte_eal_init(argc, argv);
if (ret < 0)
rte_panic("Cannot init EAL\n");
diff --git a/app/test-bbdev/main.c b/app/test-bbdev/main.c
index ff65173fdb..5960ec18b2 100644
--- a/app/test-bbdev/main.c
+++ b/app/test-bbdev/main.c
@@ -340,7 +340,8 @@ main(int argc, char **argv)
 {
int ret;
 
-   /* Init EAL */
+   rte_set_application_usage_hook(print_usage);
+
ret = rte_eal_init(argc, argv);
if (ret < 0)
return 1;
diff --git a/app/test-compress-perf/comp_perf_options.h 
b/app/test-compress-perf/comp_perf_options.h
index 0b777521c5..7dd785fba1 100644
--- a/app/test-compress-perf/comp_perf_options.h
+++ b/app/test-compress-perf/comp_perf_options.h
@@ -73,6 +73,8 @@ struct comp_test_data {
uint32_t cyclecount_delay;
 };
 
+void comp_perf_usage(const char *progname);
+
 int
 comp_perf_options_parse(struct comp_test_data *test_data, int argc,
char **argv);
diff --git a/app/test-compress-perf/comp_perf_options_parse.c 
b/app/test-compress-perf/comp_perf_options_parse.c
index 019eddb7bd..39d7fd8c69 100644
--- a/app/test-compress-perf/comp_perf_options_parse.c
+++ b/app/test-compress-perf/comp_perf_options_parse.c
@@ -38,8 +38,8 @@ struct name_id_map {
uint32_t id;
 };
 
-static void
-usage(char *progname)
+void
+comp_perf_usage(const char *progname)
 {
printf("%s [EAL options] --\n"
" --ptest throughput / verify / pmd-cyclecount\n"
@@ -619,7 +619,7 @@ comp_perf_options_parse(struct comp_test_data *test_data, 
int argc, char **argv)
while ((opt = getopt_long(argc, argv, "h", lgopts, &opt_idx)) != EOF) {
switch (opt) {
case 'h':
-   usage(argv[0]);
+   comp_perf_usage(argv[0]);
exit(EXIT_SUCCESS);
break;
/* long options */
@@ -631,7 +631,7 @@ comp_perf_options_parse(struct comp_test_data *test_data, 
int argc, char **argv)
break;
 
default:
-   usage(argv[0]);
+   comp_perf_usage(argv[0]);
return -EINVAL;
}
}
diff --git a/app/test-compress-perf/main.c b/app/test-compress-perf/main.c
index cc9951a9b1..dcd347528e 100644
--- a/app/test-compress-perf/main.c
+++ b/app/test-compress-perf/main.c
@@ -323,7 +323,8 @@ main(int argc, char **argv)
uint8_t cdev_id;
uint32_t lcore_id;
 
-   /* In

Re: [dpdk-dev] [Linuxarm] [PATCH V2 0/4] add Hisilicon kunpeng CPU support

[Honnappa Nagarahalli]

> 
> 在 2021/3/25 22:40, Thomas Monjalon 写道:
> > 25/03/2021 14:26, oulijun:
> >> 在 2021/3/25 20:19, Thomas Monjalon 写道:
> >>> 25/03/2021 12:17, oulijun:
>  Ruifeng has reviewed-by. Does anyone else have any comments? Is it
>  necessary to send the V2?
> >>>
> >>> v2 for what? There is a change?
> >>>
> >> No. no change.
> >
> > So why are you asking to send a v2?
> >
> Sorry. My suggestion is to ask if you need to reset the patch based on the
> latest date. If not, wait for other's reviews and to incorporate the patch.
> >
I suggest to rework this patch once [1] is merged.

[1] 
http://patches.dpdk.org/project/dpdk/cover/1617186371-18699-1-git-send-email-juraj.lin...@pantheon.tech/

>  在 2021/3/25 17:07, Thomas Monjalon 写道:
> > 25/03/2021 09:54, oulijun:
> >> Hi, Thomas&&Ferruh
> >>
> >> Do I need to send a patchset?
> >
> > ???
> > What do you mean?
> >
> >> 在 2021/3/10 9:35, Lijun Ou 写道:
> >>> This series add meson build for Hisilicon kunpeng CPU.
> >>>
> >>> Lijun Ou (4):
> >>>   config/arm: add Hisilicon kunpeng920 implementer
> >>>   config/arm: add Hisilicon kunpeng930 implementer
> >>>   config/arm: add kunpeng920 meson cross compile target
> >>>   config/arm: add kunpeng930 meson cross compile target
> >
> >
> >
> > .
> >

Re: [dpdk-dev] [PATCH v2 3/4] examples/ipsec-secgw: add UDP encapsulation support

[Ananyev, Konstantin]

Hi Akhil,

> >
> > Adding lookaside IPsec UDP encapsulation support
> > for NAT traversal.
> > Application has to add udp-encap option to sa config file
> > to enable UDP encapsulation on the SA.
> >
> > Signed-off-by: Tejasree Kondoj 
> > ---
> Acked-by: Akhil Goyal 
> 
> Konstantin,
> Any more comments on this?

Didn't look at v2 yet.
Will try to do that during this week. 
Konstantin

[dpdk-dev] [PATCH] net/ena: fix releasing Tx ring mbufs

[David Harton]

When ena_tx_queue_release_bufs() frees the mbufs it does not clear
the mbuf pointers.  So, when the device starts and stops multiple
times it can cause the application to receive duplicate mbufs for
two different packets.  Fix the issue by clearing the mbuf pointer.

Also, while tracking down the "double free" issue the ena calls to
allocate and free mbufs in bulk were migrated to the mbuf based APIs
so the common mbuf alloc/free routines are exercised.

Fixes: 79405ee17585 ("net/ena: fix out of order completion")
Fixes: 1173fca25af9 ("ena: add polling-mode driver")

Signed-off-by: David Harton 
---
 drivers/net/ena/ena_ethdev.c | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
index 9aa51c9dc..f60e843b7 100644
--- a/drivers/net/ena/ena_ethdev.c
+++ b/drivers/net/ena/ena_ethdev.c
@@ -767,8 +767,10 @@ static void ena_tx_queue_release_bufs(struct ena_ring 
*ring)
for (i = 0; i < ring->ring_size; ++i) {
struct ena_tx_buffer *tx_buf = &ring->tx_buffer_info[i];
 
-   if (tx_buf->mbuf)
+   if (tx_buf->mbuf) {
rte_pktmbuf_free(tx_buf->mbuf);
+   tx_buf->mbuf = NULL;
+   }
}
 }
 
@@ -1457,7 +1459,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, 
unsigned int count)
"bad ring state\n");
 
/* get resources for incoming packets */
-   rc = rte_mempool_get_bulk(rxq->mb_pool, (void **)mbufs, count);
+   rc = rte_pktmbuf_alloc_bulk(rxq->mb_pool, mbufs, count);
if (unlikely(rc < 0)) {
rte_atomic64_inc(&rxq->adapter->drv_stats->rx_nombuf);
++rxq->rx_stats.mbuf_alloc_fail;
@@ -1486,8 +1488,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, 
unsigned int count)
if (unlikely(i < count)) {
PMD_DRV_LOG(WARNING, "refilled rx qid %d with only %d "
"buffers (from %d)\n", rxq->id, i, count);
-   rte_mempool_put_bulk(rxq->mb_pool, (void **)(&mbufs[i]),
-count - i);
+   rte_pktmbuf_free_bulk(&mbufs[i], count - i);
++rxq->rx_stats.refill_partial;
}
 
-- 
2.26.2.Cisco

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

[oulijun]

Hi, all,
any comments for this patch?
Hope for your reply.

Thanks

在 2021/3/25 19:09, Lijun Ou 写道:

Currently, upper-layer application could get queue state only
through pointers such as dev->data->tx_queue_state[queue_id],
this is not the recommended way to access it. So this patch
add get queue state when call rte_eth_rx_queue_info_get and
rte_eth_tx_queue_info_get API.

Note: The hairpin queue is not supported with above
rte_eth_*x_queue_info_get, so the queue state could be
RTE_ETH_QUEUE_STATE_STARTED or RTE_ETH_QUEUE_STATE_STOPPED.
Note: After add queue_state field, the 'struct rte_eth_rxq_info' size
remains 128B, and the 'struct rte_eth_txq_info' size remains 64B, so
it could be ABI compatible.

Signed-off-by: Chengwen Feng 
Signed-off-by: Lijun Ou 
---
V1->V2:
- move queue state defines to public file
---
  doc/guides/rel_notes/release_21_05.rst |  6 ++
  lib/librte_ethdev/ethdev_driver.h  |  7 ---
  lib/librte_ethdev/rte_ethdev.c |  3 +++
  lib/librte_ethdev/rte_ethdev.h | 11 +++
  4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/doc/guides/rel_notes/release_21_05.rst 
b/doc/guides/rel_notes/release_21_05.rst
index 22aa80a..503daf9 100644
--- a/doc/guides/rel_notes/release_21_05.rst
+++ b/doc/guides/rel_notes/release_21_05.rst
@@ -164,6 +164,12 @@ ABI Changes
  
  * No ABI change that would break compatibility with 20.11.
  
+* Added new field ``queue_state`` to ``rte_eth_rxq_info`` structure

+  to provide indicated rxq queue state.
+
+* Added new field ``queue_state`` to ``rte_eth_txq_info`` structure
+  to provide indicated txq queue state.
+
  
  Known Issues

  
diff --git a/lib/librte_ethdev/ethdev_driver.h 
b/lib/librte_ethdev/ethdev_driver.h
index cdd4b43..ec5a17d 100644
--- a/lib/librte_ethdev/ethdev_driver.h
+++ b/lib/librte_ethdev/ethdev_driver.h
@@ -970,13 +970,6 @@ struct eth_dev_ops {
  };
  
  /**

- * RX/TX queue states
- */
-#define RTE_ETH_QUEUE_STATE_STOPPED 0
-#define RTE_ETH_QUEUE_STATE_STARTED 1
-#define RTE_ETH_QUEUE_STATE_HAIRPIN 2
-
-/**
   * @internal
   * Check if the selected Rx queue is hairpin queue.
   *
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 3059aa5..fbd10b2 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -5042,6 +5042,8 @@ rte_eth_rx_queue_info_get(uint16_t port_id, uint16_t 
queue_id,
  
  	memset(qinfo, 0, sizeof(*qinfo));

dev->dev_ops->rxq_info_get(dev, queue_id, qinfo);
+   qinfo->queue_state = dev->data->rx_queue_state[queue_id];
+
return 0;
  }
  
@@ -5082,6 +5084,7 @@ rte_eth_tx_queue_info_get(uint16_t port_id, uint16_t queue_id,
  
  	memset(qinfo, 0, sizeof(*qinfo));

dev->dev_ops->txq_info_get(dev, queue_id, qinfo);
+   qinfo->queue_state = dev->data->tx_queue_state[queue_id];
  
  	return 0;

  }
diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h
index efda313..4f0b1b2 100644
--- a/lib/librte_ethdev/rte_ethdev.h
+++ b/lib/librte_ethdev/rte_ethdev.h
@@ -1582,6 +1582,13 @@ struct rte_eth_dev_info {
  };
  
  /**

+ * RX/TX queue states
+ */
+#define RTE_ETH_QUEUE_STATE_STOPPED 0
+#define RTE_ETH_QUEUE_STATE_STARTED 1
+#define RTE_ETH_QUEUE_STATE_HAIRPIN 2
+
+/**
   * Ethernet device RX queue information structure.
   * Used to retrieve information about configured queue.
   */
@@ -1591,6 +1598,8 @@ struct rte_eth_rxq_info {
uint8_t scattered_rx;   /**< scattered packets RX supported. */
uint16_t nb_desc;   /**< configured number of RXDs. */
uint16_t rx_buf_size;   /**< hardware receive buffer size. */
+   /**< Queues state: STARTED(1) / STOPPED(0). */
+   uint8_t queue_state;
  } __rte_cache_min_aligned;
  
  /**

@@ -1600,6 +1609,8 @@ struct rte_eth_rxq_info {
  struct rte_eth_txq_info {
struct rte_eth_txconf conf; /**< queue config parameters. */
uint16_t nb_desc;   /**< configured number of TXDs. */
+   /**< Queues state: STARTED(1) / STOPPED(0). */
+   uint8_t queue_state;
  } __rte_cache_min_aligned;
  
  /* Generic Burst mode flag definition, values can be ORed. */

[dpdk-dev] [PATCH v2] net/hns3: use the correct HiSilicon copyright

[Min Hu (Connor)]

According to the suggestion of our legal department,
to standardize the copyright license of our code to
avoid potential copyright risks, we make a unified
modification to the "Hisilicon", which was nonstandard,
in the main modules we maintain.

We change it to "HiSilicon", which is consistent with
the terms used on the following official website:
https://www.hisilicon.com/en/terms-of-use.

Fixes: 565829db8b8f ("net/hns3: add build and doc infrastructure")
Fixes: 952ebacce4f2 ("net/hns3: support SVE Rx")
Fixes: e31f123db06b ("net/hns3: support NEON Tx")
Fixes: c09c7847d892 ("net/hns3: support traffic management")
Cc: sta...@dpdk.org

Signed-off-by: Min Hu (Connor) 
---
v2:
* add "Cc".
---
 drivers/net/hns3/hns3_cmd.c   | 2 +-
 drivers/net/hns3/hns3_cmd.h   | 2 +-
 drivers/net/hns3/hns3_dcb.c   | 2 +-
 drivers/net/hns3/hns3_dcb.h   | 2 +-
 drivers/net/hns3/hns3_ethdev.c| 2 +-
 drivers/net/hns3/hns3_ethdev.h| 2 +-
 drivers/net/hns3/hns3_ethdev_vf.c | 2 +-
 drivers/net/hns3/hns3_fdir.c  | 2 +-
 drivers/net/hns3/hns3_fdir.h  | 2 +-
 drivers/net/hns3/hns3_flow.c  | 2 +-
 drivers/net/hns3/hns3_intr.c  | 2 +-
 drivers/net/hns3/hns3_intr.h  | 2 +-
 drivers/net/hns3/hns3_logs.h  | 2 +-
 drivers/net/hns3/hns3_mbx.c   | 2 +-
 drivers/net/hns3/hns3_mbx.h   | 2 +-
 drivers/net/hns3/hns3_mp.c| 2 +-
 drivers/net/hns3/hns3_mp.h| 2 +-
 drivers/net/hns3/hns3_regs.c  | 2 +-
 drivers/net/hns3/hns3_regs.h  | 2 +-
 drivers/net/hns3/hns3_rss.c   | 2 +-
 drivers/net/hns3/hns3_rss.h   | 2 +-
 drivers/net/hns3/hns3_rxtx.c  | 2 +-
 drivers/net/hns3/hns3_rxtx.h  | 2 +-
 drivers/net/hns3/hns3_rxtx_vec.c  | 2 +-
 drivers/net/hns3/hns3_rxtx_vec.h  | 2 +-
 drivers/net/hns3/hns3_rxtx_vec_neon.h | 2 +-
 drivers/net/hns3/hns3_rxtx_vec_sve.c  | 2 +-
 drivers/net/hns3/hns3_stats.c | 2 +-
 drivers/net/hns3/hns3_stats.h | 2 +-
 drivers/net/hns3/hns3_tm.c| 2 +-
 drivers/net/hns3/hns3_tm.h| 2 +-
 31 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
index 03f8048..1087178 100644
--- a/drivers/net/hns3/hns3_cmd.c
+++ b/drivers/net/hns3/hns3_cmd.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 Hisilicon Limited.
+ * Copyright(c) 2018-2019 HiSilicon Limited.
  */
 
 #include 
diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
index 5d1fb67..9ca2529 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 Hisilicon Limited.
+ * Copyright(c) 2018-2019 HiSilicon Limited.
  */
 
 #ifndef _HNS3_CMD_H_
diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c
index ebfc240..3fcec82 100644
--- a/drivers/net/hns3/hns3_dcb.c
+++ b/drivers/net/hns3/hns3_dcb.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 Hisilicon Limited.
+ * Copyright(c) 2018-2019 HiSilicon Limited.
  */
 
 #include 
diff --git a/drivers/net/hns3/hns3_dcb.h b/drivers/net/hns3/hns3_dcb.h
index 0d25d3b..9c60ab9 100644
--- a/drivers/net/hns3/hns3_dcb.h
+++ b/drivers/net/hns3/hns3_dcb.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 Hisilicon Limited.
+ * Copyright(c) 2018-2019 HiSilicon Limited.
  */
 
 #ifndef _HNS3_DCB_H_
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 0e812bb..24583af 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 Hisilicon Limited.
+ * Copyright(c) 2018-2019 HiSilicon Limited.
  */
 
 #include 
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index d23239d..d666b1a 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 Hisilicon Limited.
+ * Copyright(c) 2018-2019 HiSilicon Limited.
  */
 
 #ifndef _HNS3_ETHDEV_H_
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c 
b/drivers/net/hns3/hns3_ethdev_vf.c
index 6c3ddcc..a677cc8 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 Hisilicon Limited.
+ * Copyright(c) 2018-2019 HiSilicon Limited.
  */
 
 #include 
diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c
index 896540d..658f6a6 100644
--- a/drivers/net/hns3/hns3_fdir.c
+++ b/drivers/net/hns3/hns3_fdir.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 Hisilicon Limited.
+ * Copyright(c) 2018-2019 HiSilicon Limited.
  */
 
 #include 
diff --git a/drivers/net/hns3/hns3_f

Re: [dpdk-dev] [PATCH] net/hns3: use the correct HiSilicon copyright

[Min Hu (Connor)]

在 2021/4/2 16:07, Ferruh Yigit 写道:

On 4/2/2021 2:45 AM, Min Hu (Connor) wrote:



在 2021/4/1 22:45, Ferruh Yigit 写道:

On 4/1/2021 9:53 AM, Min Hu (Connor) wrote:

According to the suggestion of our legal department,
to standardize the copyright license of our code to
avoid potential copyright risks, we make a unified
modification to the "Hisilicon", which was nonstandard,
in the main modules we maintain.

We change it to "HiSilicon", which is consistent with
the terms used on the following official website:
https://www.hisilicon.com/en/terms-of-use.

Fixes: 565829db8b8f ("net/hns3: add build and doc infrastructure")
Fixes: 952ebacce4f2 ("net/hns3: support SVE Rx")
Fixes: e31f123db06b ("net/hns3: support NEON Tx")
Fixes: c09c7847d892 ("net/hns3: support traffic management")



Is backport not requested intentionally?


Yes, we think this is just spelling bug, which does not affect
functionality, so there is no need to backport.

By the way, Is there any standard for which patch should be backported?


We are backporting fixes, unless the fix doesn't apply to an old version 
somehow, like some patches fixes problems coming from external 
components, like problem comes with new version of FW that is not used 
by LTS code etc..., these doesn't need to be backported to old versions.


Personally I am for backporting as much as possible, even syntax 
changes, because in long term they may cause conflicts and cause trouble 
merging actual fixes. Also for someone who gets a diff between latest 
and LTS version code, it helps to reduce the noise.



Agree with you, done in v2, thanks.
cc'ed LTS maintainers for more authoritative response, at the end of the 
day they get the patches to the stable trees.



Signed-off-by: Min Hu (Connor) 


<...>


.


.

Re: [dpdk-dev] [Linuxarm] [PATCH V2 0/4] add Hisilicon kunpeng CPU support

[oulijun]

在 2021/4/6 3:50, Honnappa Nagarahalli 写道:





在 2021/3/25 22:40, Thomas Monjalon 写道:

25/03/2021 14:26, oulijun:

在 2021/3/25 20:19, Thomas Monjalon 写道:

25/03/2021 12:17, oulijun:

Ruifeng has reviewed-by. Does anyone else have any comments? Is it
necessary to send the V2?


v2 for what? There is a change?


No. no change.


So why are you asking to send a v2?


Sorry. My suggestion is to ask if you need to reset the patch based on the
latest date. If not, wait for other's reviews and to incorporate the patch.



I suggest to rework this patch once [1] is merged.

[1] 
http://patches.dpdk.org/project/dpdk/cover/1617186371-18699-1-git-send-email-juraj.lin...@pantheon.tech/

I checked it out, and this series has not been received, and I don't 
think it can be reworked based on it.

在 2021/3/25 17:07, Thomas Monjalon 写道:

25/03/2021 09:54, oulijun:

Hi, Thomas&&Ferruh

Do I need to send a patchset?


???
What do you mean?


在 2021/3/10 9:35, Lijun Ou 写道:

This series add meson build for Hisilicon kunpeng CPU.

Lijun Ou (4):
   config/arm: add Hisilicon kunpeng920 implementer
   config/arm: add Hisilicon kunpeng930 implementer
   config/arm: add kunpeng920 meson cross compile target
   config/arm: add kunpeng930 meson cross compile target




.

Re: [dpdk-dev] [PATCH v2 3/3] drivers: align log names

[Wang, Xiao W]

Hi Thomas,  

> -Original Message-
> From: Thomas Monjalon 
> Sent: Monday, April 5, 2021 6:03 PM
> To: dev@dpdk.org
> Cc: Richardson, Bruce ; Xu, Rosen
> ; Wang, Xiao W ; Hemant
> Agrawal ; Ajit Khaparde
> ; Griffin, John ;
> Trahe, Fiona ; Jain, Deepak K
> ; Raveendra Padasalagi
> ; Vikas Gupta
> ; John W. Linville ;
> Chas Williams ; Min Hu (Connor)
> ; Zhang, Tianfei ; Nipun
> Gupta 
> Subject: [PATCH v2 3/3] drivers: align log names
> 
> The log levels are configured by using the name of the logs.
> Some drivers are aligned to follow a common log name standard:
>   pmd.class.driver[.sub]
> Some "common" drivers skip the "class" part:
>   pmd.driver.sub
> 
> Two drivers have exceptions to be clarified:
>   pmd.vdpa.ifcvf instead of pmd.vdpa.ifc
>   pmd.afu.ipn3ke instead of pmd.net.ipn3ke
> 
> Signed-off-by: Thomas Monjalon 
> Acked-by: Bruce Richardson 
> Acked-by: Rosen Xu 
> Acked-by: Xiao Wang 
> Acked-by: Hemant Agrawal 
> Acked-by: Ajit Khaparde 
> ---
>  doc/guides/cryptodevs/qat.rst | 10 +-
>  drivers/common/qat/qat_logs.c |  4 ++--
>  drivers/crypto/bcmfs/bcmfs_logs.c |  4 ++--
>  drivers/net/af_packet/rte_eth_af_packet.c |  2 +-
>  drivers/net/bonding/rte_eth_bond_pmd.c|  2 +-
>  drivers/raw/ifpga/ifpga_rawdev.c  |  2 +-
>  drivers/raw/ioat/ioat_rawdev.c|  2 +-
>  drivers/raw/skeleton/skeleton_rawdev.c|  2 +-
>  drivers/vdpa/ifc/ifcvf_vdpa.c |  2 +-
>  9 files changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
> index cf16f03503..224b22b3f7 100644
> --- a/doc/guides/cryptodevs/qat.rst
> +++ b/doc/guides/cryptodevs/qat.rst
> @@ -659,15 +659,15 @@ Debugging
> 
>  There are 2 sets of trace available via the dynamic logging feature:
> 
> -* pmd.qat_dp exposes trace on the data-path.
> -* pmd.qat_general exposes all other trace.
> +* pmd.qat.dp exposes trace on the data-path.
> +* pmd.qat.general exposes all other trace.
> 
>  pmd.qat exposes both sets of traces.
>  They can be enabled using the log-level option (where 8=maximum log
> level) on
>  the process cmdline, e.g. using any of the following::
> 
> ---log-level="pmd.qat_general,8"
> ---log-level="pmd.qat_dp,8"
> +--log-level="pmd.qat.general,8"
> +--log-level="pmd.qat.dp,8"
>  --log-level="pmd.qat,8"
> 
>  .. Note::
> @@ -678,4 +678,4 @@ the process cmdline, e.g. using any of the following::
>  Also the dynamic global log level overrides both sets of trace, so e.g. 
> no
>  QAT trace would display in this case::
> 
> - --log-level="7" --log-level="pmd.qat_general,8"
> + --log-level="7" --log-level="pmd.qat.general,8"
> diff --git a/drivers/common/qat/qat_logs.c
> b/drivers/common/qat/qat_logs.c
> index fa48be53c3..adbe163cd9 100644
> --- a/drivers/common/qat/qat_logs.c
> +++ b/drivers/common/qat/qat_logs.c
> @@ -17,5 +17,5 @@ qat_hexdump_log(uint32_t level, uint32_t logtype,
> const char *title,
>   return 0;
>  }
> 
> -RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat_general, NOTICE);
> -RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat_dp, NOTICE);
> +RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat.general, NOTICE);
> +RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat.dp, NOTICE);
> diff --git a/drivers/crypto/bcmfs/bcmfs_logs.c
> b/drivers/crypto/bcmfs/bcmfs_logs.c
> index 701da9ecf3..9faf12f238 100644
> --- a/drivers/crypto/bcmfs/bcmfs_logs.c
> +++ b/drivers/crypto/bcmfs/bcmfs_logs.c
> @@ -21,5 +21,5 @@ bcmfs_hexdump_log(uint32_t level, uint32_t logtype,
> const char *title,
>   return 0;
>  }
> 
> -RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.bcmfs_config, NOTICE)
> -RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.bcmfs_fp, NOTICE)
> +RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.crypto.bcmfs.config,
> NOTICE)
> +RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.crypto.bcmfs.fp, NOTICE)
> diff --git a/drivers/net/af_packet/rte_eth_af_packet.c
> b/drivers/net/af_packet/rte_eth_af_packet.c
> index bfe5a0a451..a04f7c773a 100644
> --- a/drivers/net/af_packet/rte_eth_af_packet.c
> +++ b/drivers/net/af_packet/rte_eth_af_packet.c
> @@ -97,7 +97,7 @@ static struct rte_eth_link pmd_link = {
>   .link_autoneg = ETH_LINK_FIXED,
>  };
> 
> -RTE_LOG_REGISTER(af_packet_logtype, pmd.net.packet, NOTICE);
> +RTE_LOG_REGISTER(af_packet_logtype, pmd.net.af_packet, NOTICE);
> 
>  #define PMD_LOG(level, fmt, args...) \
>   rte_log(RTE_LOG_ ## level, af_packet_logtype, \
> diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
> b/drivers/net/bonding/rte_eth_bond_pmd.c
> index 24e3cf3c2e..2e9cea5b8e 100644
> --- a/drivers/net/bonding/rte_eth_bond_pmd.c
> +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
> @@ -3775,4 +3775,4 @@
> RTE_PMD_REGISTER_PARAM_STRING(net_bonding,
>   "up_delay= "
>   "down_delay=");
> 
> -RTE_LOG_REGISTER(bond_logtype, pmd.net.bond, NOTICE);
> +RTE_LOG_REGISTER(bond_logtype, pmd.net.bonding, NOTICE);
> diff --git a/drivers/raw/ifpga/ifpga_rawdev.c
> b/drivers/raw

Re: [dpdk-dev] [PATCH v2 0/6] test: refactor crypto unit test framework

[Ruifeng Wang]

> -Original Message-
> From: Ciara Power 
> Sent: Friday, April 2, 2021 10:24 PM
> To: dev@dpdk.org
> Cc: declan.dohe...@intel.com; gak...@marvell.com; acon...@redhat.com;
> hemant.agra...@nxp.com; ano...@marvell.com; Ruifeng Wang
> ; asoma...@amd.com; Ajit Khaparde
> (ajit.khapa...@broadcom.com) ;
> g.si...@nxp.com; Ciara Power 
> Subject: [PATCH v2 0/6] test: refactor crypto unit test framework
> 
> v2:
>   - Added macro in place of testcase/testsuite loops.
>   - Added more detail in the summary output.
>   - Moved testcase counts to the testsuite structure.
>   - Flattened testsuite structure to remove union.
>   - Added patch for fix of blockcipher test return value.
>   - Squashed release note into last patch.
> 
> The current crypto unit test framework is not granular enough to accurately
> track unit test results. This is caused by one testcase in a suite actually
> running multiple testcases, but only returning one result.
> 
> The approach taken in this patchset allows a test suite have either a list of
> sub-testsuites, or a list of testcases as previously used.
> The unit test suite runner can then recursively iterate and run the sub-
> testsuites, until it reaches a suite with testcases, and it then runs each
> testcase as it had done previously.
> 
> By allowing this further breakdown into sub-testsuites, a refactor of the
> crypto unit tests solves the issue of inaccurate reporting, as sub-testsuites
> can be used in place of the testcases that had multiple testcases hidden on a
> sub level.
> The blockcipher tests previously had these hidden testcases, but are now
> sub-testsuites that are dynamically created and added to a parent test suite,
> allowing for each testcase status to be reported directly to the runner.
> The cryptodev test suite is broken down into smaller suites that are used as
> sub-testsuites, which allows for more flexibility choosing which sub-
> testsuites should run for the current device autotest.
> The introduction of sub-testsuites also allows for more precise
> setup/teardown functions, rather than general ones loaded with conditions
> as was seen with the initial setup function used for all crypto testsuites.
> 
> For example, when running the cryptodev_aesni_mb_autotest, the AESNI
> MB parent test suite has its own setup function to initialise the AESNI MB
> device.
> Various sub-testsuites are added to the parent test suite, such as some of
> the static suites that were once in the cryptodev_testsuite, and blockcipher
> suites.
> The unit test runner can then run the AESNI MB parent test suite, which in
> turn will run the sub-testsuites.
> 
> Documentation will be added in a later version of the patchset, adding to the
> test document that isn't yet merged. [1]
> 
> ---
> [1]
> https://patchwork.dpdk.org/project/dpdk/patch/20210309155757.615536-1-
> acon...@redhat.com/
> 
> Ciara Power (6):
>   app/test: refactor of unit test suite runner
>   test: introduce parent testsuite format
>   test/crypto: refactor to use sub-testsuites
>   test/crypto: move testsuite params to header file
>   test/crypto: fix return value on test skipped
>   test/crypto: dynamically build blockcipher suite
> 
>  app/test/test.c|  226 ++-
>  app/test/test.h|   23 +-
>  app/test/test_cryptodev.c  | 1964 ++--
>  app/test/test_cryptodev.h  |   20 +
>  app/test/test_cryptodev_asym.c |   93 +-
>  app/test/test_cryptodev_blockcipher.c  |  127 +-
>  app/test/test_cryptodev_blockcipher.h  |   12 +-
>  app/test/test_ipsec.c  |   32 +-
>  doc/guides/rel_notes/release_21_05.rst |5 +
>  9 files changed, 1831 insertions(+), 671 deletions(-)
> 
> --
> 2.25.1

Tested against armv8crypto PMD and the result looks good.
Tested-by: Ruifeng Wang 

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

[Stephen Hemminger]

On Tue, 6 Apr 2021 08:49:04 +0800
oulijun  wrote:

> >   /**
> > + * RX/TX queue states
> > + */
> > +#define RTE_ETH_QUEUE_STATE_STOPPED 0
> > +#define RTE_ETH_QUEUE_STATE_STARTED 1
> > +#define RTE_ETH_QUEUE_STATE_HAIRPIN 2

These could be an enum?

> > +/**
> >* Ethernet device RX queue information structure.
> >* Used to retrieve information about configured queue.
> >*/
> > @@ -1591,6 +1598,8 @@ struct rte_eth_rxq_info {
> > uint8_t scattered_rx;   /**< scattered packets RX supported. */

There is a one byte hole here waiting to be used.
Why not use that?

> > uint16_t nb_desc;   /**< configured number of RXDs. */
> > uint16_t rx_buf_size;   /**< hardware receive buffer size. */
> > +   /**< Queues state: STARTED(1) / STOPPED(0). */
> > +   uint8_t queue_state;
> >   } __rte_cache_min_aligned;

[dpdk-dev] [PATCH] test/power: fix several bugs in cpufreq autotest

[Richael Zhuang]

1. Sleep for 1s before checking the newly updated value from
"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_cur_freq", because
for some systems it may not be effective immediately.

2. The value in "/sys/.../cpuinfo_cur_freq" may not be exactly the
same as what we set. For example, we write "240" to
"/sys/.../cpufreq/scaling_setspeed" to set the frequency, then the
value in "/sys/.../cpuinfo_cur_freq" may be "2401222". So need to
round the value.

Fixes: ed7c51a6a680 ("app/test: vm power management")
Cc: alan.ca...@intel.com
Cc: sta...@dpdk.org

Change-Id: I3b0266415a2b655d58294a3f51a6051bc1e5fc7f
CustomizedGitHooks: yes
Jira: ENTWLS-2032
Signed-off-by: Richael Zhuang 
---
 app/test/test_power_cpufreq.c | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index 731c6b4dc..c4f4541ac 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -34,6 +34,10 @@ test_power_caps(void)
 #define TEST_POWER_LCORE_INVALID ((unsigned)RTE_MAX_LCORE)
 #define TEST_POWER_FREQS_NUM_MAX ((unsigned)RTE_MAX_LCORE_FREQS)

+/* macros used for rounding frequency to nearest 10 */
+#define TEST_FREQ_ROUNDING_DELTA 5
+#define TEST_ROUND_FREQ_TO_N_10 10
+
 #define TEST_POWER_SYSFILE_CUR_FREQ \
"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_cur_freq"

@@ -43,6 +47,9 @@ static uint32_t freqs[TEST_POWER_FREQS_NUM_MAX];
 static int
 check_cur_freq(unsigned lcore_id, uint32_t idx)
 {
+   /* wait for the value to be updated */
+   sleep(1);
+
 #define TEST_POWER_CONVERT_TO_DECIMAL 10
FILE *f;
char fullpath[PATH_MAX];
@@ -62,7 +69,17 @@ check_cur_freq(unsigned lcore_id, uint32_t idx)
goto fail_get_cur_freq;
}
cur_freq = strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DECIMAL);
-   ret = (freqs[idx] == cur_freq ? 0 : -1);
+
+   /* convert the frequency to nearest 10 value
+* Ex: if cur_freq=1396789 then freq_conv=140
+* Ex: if cur_freq=800030 then freq_conv=80
+*/
+   unsigned int freq_conv = 0;
+   freq_conv = (cur_freq + TEST_FREQ_ROUNDING_DELTA)
+   / TEST_ROUND_FREQ_TO_N_10;
+   freq_conv = freq_conv * TEST_ROUND_FREQ_TO_N_10;
+
+   ret = (freqs[idx] == freq_conv ? 0 : -1);

 fail_get_cur_freq:
fclose(f);
--
2.20.1

IMPORTANT NOTICE: The contents of this email and any attachments are 
confidential and may also be privileged. If you are not the intended recipient, 
please notify the sender immediately and do not disclose the contents to any 
other person, use it for any purpose, or store or copy the information in any 
medium. Thank you.

[dpdk-dev] [PATCH v1 2/2] test/power: fix a bug in cpufreq autotest

[Richael Zhuang]

For platforms that don't support turbo boost,rte_power_turbo_status()
returns "-ENOTSUP" (like power_kvm_vm_turbo_status()). So don't allow
check_power_turbo() to continue if 
rte_power_turbo_status(TEST_POWER_LCORE_ID)!=1

Fixes: aeaeaf5f2d62 ("test/power: add cases for turbo feature")
Cc: lukaszx.krakow...@intel.com
Cc: sta...@dpdk.org

CustomizedGitHooks: yes
Change-Id: I5702d5c647e941253c556ae2be8c1edeefacb618
Signed-off-by: Richael Zhuang 
---
 app/test/test_power_cpufreq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index c4f4541ac..7a93bc90a 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -389,7 +389,7 @@ check_power_turbo(void)
 {
int ret;

-   if (rte_power_turbo_status(TEST_POWER_LCORE_ID) == 0) {
+   if (rte_power_turbo_status(TEST_POWER_LCORE_ID) != 1) {
printf("Turbo not available on lcore %u, skipping test\n",
TEST_POWER_LCORE_ID);
return 0;
--
2.20.1

IMPORTANT NOTICE: The contents of this email and any attachments are 
confidential and may also be privileged. If you are not the intended recipient, 
please notify the sender immediately and do not disclose the contents to any 
other person, use it for any purpose, or store or copy the information in any 
medium. Thank you.

[dpdk-dev] [PATCH v1 1/1] test/power: fix several bugs in cpufreq autotest

[Richael Zhuang]

1. Sleep for 1s before checking the newly updated value from
"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_cur_freq", because
for some systems it may not be effective immediately.

2. The value in "/sys/.../cpuinfo_cur_freq" may not be exactly the
same as what we set. For example, we write "240" to
"/sys/.../cpufreq/scaling_setspeed" to set the frequency, then the
value in "/sys/.../cpuinfo_cur_freq" may be "2401222". So need to
round the value.

Fixes: ed7c51a6a680 ("app/test: vm power management")
Cc: alan.ca...@intel.com
Cc: sta...@dpdk.org

Signed-off-by: Richael Zhuang 
---
 app/test/test_power_cpufreq.c | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index 731c6b4dc..c4f4541ac 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -34,6 +34,10 @@ test_power_caps(void)
 #define TEST_POWER_LCORE_INVALID ((unsigned)RTE_MAX_LCORE)
 #define TEST_POWER_FREQS_NUM_MAX ((unsigned)RTE_MAX_LCORE_FREQS)

+/* macros used for rounding frequency to nearest 10 */
+#define TEST_FREQ_ROUNDING_DELTA 5
+#define TEST_ROUND_FREQ_TO_N_10 10
+
 #define TEST_POWER_SYSFILE_CUR_FREQ \
"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_cur_freq"

@@ -43,6 +47,9 @@ static uint32_t freqs[TEST_POWER_FREQS_NUM_MAX];
 static int
 check_cur_freq(unsigned lcore_id, uint32_t idx)
 {
+   /* wait for the value to be updated */
+   sleep(1);
+
 #define TEST_POWER_CONVERT_TO_DECIMAL 10
FILE *f;
char fullpath[PATH_MAX];
@@ -62,7 +69,17 @@ check_cur_freq(unsigned lcore_id, uint32_t idx)
goto fail_get_cur_freq;
}
cur_freq = strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DECIMAL);
-   ret = (freqs[idx] == cur_freq ? 0 : -1);
+
+   /* convert the frequency to nearest 10 value
+* Ex: if cur_freq=1396789 then freq_conv=140
+* Ex: if cur_freq=800030 then freq_conv=80
+*/
+   unsigned int freq_conv = 0;
+   freq_conv = (cur_freq + TEST_FREQ_ROUNDING_DELTA)
+   / TEST_ROUND_FREQ_TO_N_10;
+   freq_conv = freq_conv * TEST_ROUND_FREQ_TO_N_10;
+
+   ret = (freqs[idx] == freq_conv ? 0 : -1);

 fail_get_cur_freq:
fclose(f);
--
2.20.1

IMPORTANT NOTICE: The contents of this email and any attachments are 
confidential and may also be privileged. If you are not the intended recipient, 
please notify the sender immediately and do not disclose the contents to any 
other person, use it for any purpose, or store or copy the information in any 
medium. Thank you.

[dpdk-dev] [PATCH v1 2/2] test/power: fix a bug in cpufreq autotest

[Richael Zhuang]

For platforms that don't support turbo boost,rte_power_turbo_status()
returns "-ENOTSUP" (like power_kvm_vm_turbo_status()). So don't allow
check_power_turbo() to continue if 
rte_power_turbo_status(TEST_POWER_LCORE_ID)!=1

Fixes: aeaeaf5f2d62 ("test/power: add cases for turbo feature")
Cc: lukaszx.krakow...@intel.com
Cc: sta...@dpdk.org

Signed-off-by: Richael Zhuang 
---
 app/test/test_power_cpufreq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index c4f4541ac..7a93bc90a 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -389,7 +389,7 @@ check_power_turbo(void)
 {
int ret;

-   if (rte_power_turbo_status(TEST_POWER_LCORE_ID) == 0) {
+   if (rte_power_turbo_status(TEST_POWER_LCORE_ID) != 1) {
printf("Turbo not available on lcore %u, skipping test\n",
TEST_POWER_LCORE_ID);
return 0;
--
2.20.1

IMPORTANT NOTICE: The contents of this email and any attachments are 
confidential and may also be privileged. If you are not the intended recipient, 
please notify the sender immediately and do not disclose the contents to any 
other person, use it for any purpose, or store or copy the information in any 
medium. Thank you.

Re: [dpdk-dev] [PATCH] vfio: change default per vfio_cfg map all dpdk segments for DMA

[Xia, Chenbo]

Hi, Yunjian

> -Original Message-
> From: dev  On Behalf Of wangyunjian
> Sent: Friday, May 15, 2020 7:02 PM
> To: dev@dpdk.org
> Cc: Burakov, Anatoly ; jerry.lili...@huawei.com;
> xudin...@huawei.com; Yunjian Wang 
> Subject: [dpdk-dev] [PATCH] vfio: change default per vfio_cfg map all dpdk
> segments for DMA
> 
> From: Yunjian Wang 
> 
> As all vfio_cfgs need to map all dpdk segments for DMA, but now only
> default_vfio_cfg map it. This patch changes rte_vfio_setup_device()
> as a default map, so that IOMMU progrming does notneed to map dpdk
> segments separately.
> 
> Signed-off-by: Yunjian Wang 
> ---
>  lib/librte_eal/linux/eal_vfio.c | 5 +
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/lib/librte_eal/linux/eal_vfio.c b/lib/librte_eal/linux/eal_vfio.c
> index d26e1649a..46160c328 100644
> --- a/lib/librte_eal/linux/eal_vfio.c
> +++ b/lib/librte_eal/linux/eal_vfio.c
> @@ -807,10 +807,7 @@ rte_vfio_setup_device(const char *sysfs_base, const char
> *dev_addr,
>* after registering callback, to prevent races
>*/
>   rte_mcfg_mem_read_lock();
> - if (vfio_cfg == default_vfio_cfg)
> - ret = t->dma_map_func(vfio_container_fd);
> - else
> - ret = 0;
> + ret = t->dma_map_func(vfio_container_fd);

Anatoly is correct, this is intentional for ifc vdpa. For vdpa/ifc, we need 
another vfio container
for vdpa device and the dma map info comes from QEMU/virtio-user, so this 
container will not use dpdk
memsegs. Your patch will break current ifc vdpa driver.

Thanks,
Chenbo

>   if (ret) {
>   RTE_LOG(ERR, EAL,
>   "  %s DMA remapping failed, error %i 
> (%s)\n",
> --
> 2.23.0
> 

Re: [dpdk-dev] [PATCH] net/ena: fix releasing Tx ring mbufs

[Michał Krawczyk]

wt., 6 kwi 2021 o 02:27 David Harton  napisał(a):
>
> When ena_tx_queue_release_bufs() frees the mbufs it does not clear
> the mbuf pointers.  So, when the device starts and stops multiple
> times it can cause the application to receive duplicate mbufs for
> two different packets.  Fix the issue by clearing the mbuf pointer.
>
> Also, while tracking down the "double free" issue the ena calls to
> allocate and free mbufs in bulk were migrated to the mbuf based APIs
> so the common mbuf alloc/free routines are exercised.
>
> Fixes: 79405ee17585 ("net/ena: fix out of order completion")
> Fixes: 1173fca25af9 ("ena: add polling-mode driver")
>
> Signed-off-by: David Harton 
Acked-by: Michal Krawczyk 
> ---
>  drivers/net/ena/ena_ethdev.c | 9 +
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c
> index 9aa51c9dc..f60e843b7 100644
> --- a/drivers/net/ena/ena_ethdev.c
> +++ b/drivers/net/ena/ena_ethdev.c
> @@ -767,8 +767,10 @@ static void ena_tx_queue_release_bufs(struct ena_ring 
> *ring)
> for (i = 0; i < ring->ring_size; ++i) {
> struct ena_tx_buffer *tx_buf = &ring->tx_buffer_info[i];
>
> -   if (tx_buf->mbuf)
> +   if (tx_buf->mbuf) {
> rte_pktmbuf_free(tx_buf->mbuf);
> +   tx_buf->mbuf = NULL;
> +   }
> }
>  }
>
> @@ -1457,7 +1459,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, 
> unsigned int count)
> "bad ring state\n");
>
> /* get resources for incoming packets */
> -   rc = rte_mempool_get_bulk(rxq->mb_pool, (void **)mbufs, count);
> +   rc = rte_pktmbuf_alloc_bulk(rxq->mb_pool, mbufs, count);
> if (unlikely(rc < 0)) {
> rte_atomic64_inc(&rxq->adapter->drv_stats->rx_nombuf);
> ++rxq->rx_stats.mbuf_alloc_fail;
> @@ -1486,8 +1488,7 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, 
> unsigned int count)
> if (unlikely(i < count)) {
> PMD_DRV_LOG(WARNING, "refilled rx qid %d with only %d "
> "buffers (from %d)\n", rxq->id, i, count);
> -   rte_mempool_put_bulk(rxq->mb_pool, (void **)(&mbufs[i]),
> -count - i);
> +   rte_pktmbuf_free_bulk(&mbufs[i], count - i);
> ++rxq->rx_stats.refill_partial;
> }
>
> --
> 2.26.2.Cisco
>

Re: [dpdk-dev] [PATCH v2 3/3] drivers: align log names

[Xu, Rosen]

Hi,

> -Original Message-
> From: Thomas Monjalon 
> Sent: Monday, April 05, 2021 18:03
> To: dev@dpdk.org
> Cc: Richardson, Bruce ; Xu, Rosen
> ; Wang, Xiao W ; Hemant
> Agrawal ; Ajit Khaparde
> ; Griffin, John ;
> Trahe, Fiona ; Jain, Deepak K
> ; Raveendra Padasalagi
> ; Vikas Gupta
> ; John W. Linville ;
> Chas Williams ; Min Hu (Connor) ;
> Zhang, Tianfei ; Nipun Gupta
> 
> Subject: [PATCH v2 3/3] drivers: align log names
> 
> The log levels are configured by using the name of the logs.
> Some drivers are aligned to follow a common log name standard:
>   pmd.class.driver[.sub]
> Some "common" drivers skip the "class" part:
>   pmd.driver.sub
> 
> Two drivers have exceptions to be clarified:
>   pmd.vdpa.ifcvf instead of pmd.vdpa.ifc
>   pmd.afu.ipn3ke instead of pmd.net.ipn3ke
> 
> Signed-off-by: Thomas Monjalon 
> Acked-by: Bruce Richardson 
> Acked-by: Rosen Xu 
> Acked-by: Xiao Wang 
> Acked-by: Hemant Agrawal 
> Acked-by: Ajit Khaparde 
> ---
>  doc/guides/cryptodevs/qat.rst | 10 +-
>  drivers/common/qat/qat_logs.c |  4 ++--
>  drivers/crypto/bcmfs/bcmfs_logs.c |  4 ++--
>  drivers/net/af_packet/rte_eth_af_packet.c |  2 +-
>  drivers/net/bonding/rte_eth_bond_pmd.c|  2 +-
>  drivers/raw/ifpga/ifpga_rawdev.c  |  2 +-
>  drivers/raw/ioat/ioat_rawdev.c|  2 +-
>  drivers/raw/skeleton/skeleton_rawdev.c|  2 +-
>  drivers/vdpa/ifc/ifcvf_vdpa.c |  2 +-
>  9 files changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
> index cf16f03503..224b22b3f7 100644
> --- a/doc/guides/cryptodevs/qat.rst
> +++ b/doc/guides/cryptodevs/qat.rst
> @@ -659,15 +659,15 @@ Debugging
> 
>  There are 2 sets of trace available via the dynamic logging feature:
> 
> -* pmd.qat_dp exposes trace on the data-path.
> -* pmd.qat_general exposes all other trace.
> +* pmd.qat.dp exposes trace on the data-path.
> +* pmd.qat.general exposes all other trace.
> 
>  pmd.qat exposes both sets of traces.
>  They can be enabled using the log-level option (where 8=maximum log level)
> on  the process cmdline, e.g. using any of the following::
> 
> ---log-level="pmd.qat_general,8"
> ---log-level="pmd.qat_dp,8"
> +--log-level="pmd.qat.general,8"
> +--log-level="pmd.qat.dp,8"
>  --log-level="pmd.qat,8"
> 
>  .. Note::
> @@ -678,4 +678,4 @@ the process cmdline, e.g. using any of the following::
>  Also the dynamic global log level overrides both sets of trace, so e.g. 
> no
>  QAT trace would display in this case::
> 
> - --log-level="7" --log-level="pmd.qat_general,8"
> + --log-level="7" --log-level="pmd.qat.general,8"
> diff --git a/drivers/common/qat/qat_logs.c
> b/drivers/common/qat/qat_logs.c index fa48be53c3..adbe163cd9 100644
> --- a/drivers/common/qat/qat_logs.c
> +++ b/drivers/common/qat/qat_logs.c
> @@ -17,5 +17,5 @@ qat_hexdump_log(uint32_t level, uint32_t logtype,
> const char *title,
>   return 0;
>  }
> 
> -RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat_general, NOTICE); -
> RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat_dp, NOTICE);
> +RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat.general, NOTICE);
> +RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat.dp, NOTICE);
> diff --git a/drivers/crypto/bcmfs/bcmfs_logs.c
> b/drivers/crypto/bcmfs/bcmfs_logs.c
> index 701da9ecf3..9faf12f238 100644
> --- a/drivers/crypto/bcmfs/bcmfs_logs.c
> +++ b/drivers/crypto/bcmfs/bcmfs_logs.c
> @@ -21,5 +21,5 @@ bcmfs_hexdump_log(uint32_t level, uint32_t logtype,
> const char *title,
>   return 0;
>  }
> 
> -RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.bcmfs_config, NOTICE) -
> RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.bcmfs_fp, NOTICE)
> +RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.crypto.bcmfs.config, NOTICE)
> +RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.crypto.bcmfs.fp, NOTICE)
> diff --git a/drivers/net/af_packet/rte_eth_af_packet.c
> b/drivers/net/af_packet/rte_eth_af_packet.c
> index bfe5a0a451..a04f7c773a 100644
> --- a/drivers/net/af_packet/rte_eth_af_packet.c
> +++ b/drivers/net/af_packet/rte_eth_af_packet.c
> @@ -97,7 +97,7 @@ static struct rte_eth_link pmd_link = {
>   .link_autoneg = ETH_LINK_FIXED,
>  };
> 
> -RTE_LOG_REGISTER(af_packet_logtype, pmd.net.packet, NOTICE);
> +RTE_LOG_REGISTER(af_packet_logtype, pmd.net.af_packet, NOTICE);
> 
>  #define PMD_LOG(level, fmt, args...) \
>   rte_log(RTE_LOG_ ## level, af_packet_logtype, \ diff --git
> a/drivers/net/bonding/rte_eth_bond_pmd.c
> b/drivers/net/bonding/rte_eth_bond_pmd.c
> index 24e3cf3c2e..2e9cea5b8e 100644
> --- a/drivers/net/bonding/rte_eth_bond_pmd.c
> +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
> @@ -3775,4 +3775,4 @@
> RTE_PMD_REGISTER_PARAM_STRING(net_bonding,
>   "up_delay= "
>   "down_delay=");
> 
> -RTE_LOG_REGISTER(bond_logtype, pmd.net.bond, NOTICE);
> +RTE_LOG_REGISTER(bond_logtype, pmd.net.bonding, NOTICE);
> diff --git a/drivers/raw/ifpga/ifpga_rawdev.c
> b/drivers/raw/ifpga/ifpga_rawde

[dpdk-dev] [PATCH] net/bnxt: fix FW unregister log

[Kalesh A P]

From: Kalesh AP 

The "Unregistered with fw" message was being logged in a wrong function.
Moved it to the right place.

Fixes: a7dda7e0a00b ("net/bnxt: log port id in async events")

Signed-off-by: Kalesh AP 
Reviewed-by: Somnath Kotur 
Reviewed-by: Ajit Kumar Khaparde 
---
 drivers/net/bnxt/bnxt_hwrm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 6a70b6e..a119fc3 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -1364,6 +1364,9 @@ int bnxt_hwrm_func_driver_unregister(struct bnxt *bp, 
uint32_t flags)
HWRM_CHECK_RESULT();
HWRM_UNLOCK();
 
+   PMD_DRV_LOG(DEBUG, "Port %u: Unregistered with fw\n",
+   bp->eth_dev->data->port_id);
+
return rc;
 }
 
@@ -1448,8 +1451,6 @@ static int bnxt_hwrm_port_phy_cfg(struct bnxt *bp, struct 
bnxt_link_info *conf)
HWRM_CHECK_RESULT();
HWRM_UNLOCK();
 
-   PMD_DRV_LOG(DEBUG, "Port %u: Unregistered with fw\n",
-   bp->eth_dev->data->port_id);
return rc;
 }
 
-- 
2.10.1

Re: [dpdk-dev] [PATCH v2 3/3] drivers: align log names

[Min Hu (Connor)]

Acked-by: Min Hu (Connor) 

在 2021/4/5 18:03, Thomas Monjalon 写道:

The log levels are configured by using the name of the logs.
Some drivers are aligned to follow a common log name standard:
pmd.class.driver[.sub]
Some "common" drivers skip the "class" part:
pmd.driver.sub

Two drivers have exceptions to be clarified:
pmd.vdpa.ifcvf instead of pmd.vdpa.ifc
pmd.afu.ipn3ke instead of pmd.net.ipn3ke

Signed-off-by: Thomas Monjalon 
Acked-by: Bruce Richardson 
Acked-by: Rosen Xu 
Acked-by: Xiao Wang 
Acked-by: Hemant Agrawal 
Acked-by: Ajit Khaparde 
---
  doc/guides/cryptodevs/qat.rst | 10 +-
  drivers/common/qat/qat_logs.c |  4 ++--
  drivers/crypto/bcmfs/bcmfs_logs.c |  4 ++--
  drivers/net/af_packet/rte_eth_af_packet.c |  2 +-
  drivers/net/bonding/rte_eth_bond_pmd.c|  2 +-
  drivers/raw/ifpga/ifpga_rawdev.c  |  2 +-
  drivers/raw/ioat/ioat_rawdev.c|  2 +-
  drivers/raw/skeleton/skeleton_rawdev.c|  2 +-
  drivers/vdpa/ifc/ifcvf_vdpa.c |  2 +-
  9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
index cf16f03503..224b22b3f7 100644
--- a/doc/guides/cryptodevs/qat.rst
+++ b/doc/guides/cryptodevs/qat.rst
@@ -659,15 +659,15 @@ Debugging
  
  There are 2 sets of trace available via the dynamic logging feature:
  
-* pmd.qat_dp exposes trace on the data-path.

-* pmd.qat_general exposes all other trace.
+* pmd.qat.dp exposes trace on the data-path.
+* pmd.qat.general exposes all other trace.
  
  pmd.qat exposes both sets of traces.

  They can be enabled using the log-level option (where 8=maximum log level) on
  the process cmdline, e.g. using any of the following::
  
---log-level="pmd.qat_general,8"

---log-level="pmd.qat_dp,8"
+--log-level="pmd.qat.general,8"
+--log-level="pmd.qat.dp,8"
  --log-level="pmd.qat,8"
  
  .. Note::

@@ -678,4 +678,4 @@ the process cmdline, e.g. using any of the following::
  Also the dynamic global log level overrides both sets of trace, so e.g. no
  QAT trace would display in this case::
  
-	--log-level="7" --log-level="pmd.qat_general,8"

+   --log-level="7" --log-level="pmd.qat.general,8"
diff --git a/drivers/common/qat/qat_logs.c b/drivers/common/qat/qat_logs.c
index fa48be53c3..adbe163cd9 100644
--- a/drivers/common/qat/qat_logs.c
+++ b/drivers/common/qat/qat_logs.c
@@ -17,5 +17,5 @@ qat_hexdump_log(uint32_t level, uint32_t logtype, const char 
*title,
return 0;
  }
  
-RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat_general, NOTICE);

-RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat_dp, NOTICE);
+RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat.general, NOTICE);
+RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat.dp, NOTICE);
diff --git a/drivers/crypto/bcmfs/bcmfs_logs.c 
b/drivers/crypto/bcmfs/bcmfs_logs.c
index 701da9ecf3..9faf12f238 100644
--- a/drivers/crypto/bcmfs/bcmfs_logs.c
+++ b/drivers/crypto/bcmfs/bcmfs_logs.c
@@ -21,5 +21,5 @@ bcmfs_hexdump_log(uint32_t level, uint32_t logtype, const 
char *title,
return 0;
  }
  
-RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.bcmfs_config, NOTICE)

-RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.bcmfs_fp, NOTICE)
+RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.crypto.bcmfs.config, NOTICE)
+RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.crypto.bcmfs.fp, NOTICE)
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c 
b/drivers/net/af_packet/rte_eth_af_packet.c
index bfe5a0a451..a04f7c773a 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -97,7 +97,7 @@ static struct rte_eth_link pmd_link = {
.link_autoneg = ETH_LINK_FIXED,
  };
  
-RTE_LOG_REGISTER(af_packet_logtype, pmd.net.packet, NOTICE);

+RTE_LOG_REGISTER(af_packet_logtype, pmd.net.af_packet, NOTICE);
  
  #define PMD_LOG(level, fmt, args...) \

rte_log(RTE_LOG_ ## level, af_packet_logtype, \
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c 
b/drivers/net/bonding/rte_eth_bond_pmd.c
index 24e3cf3c2e..2e9cea5b8e 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -3775,4 +3775,4 @@ RTE_PMD_REGISTER_PARAM_STRING(net_bonding,
"up_delay= "
"down_delay=");
  
-RTE_LOG_REGISTER(bond_logtype, pmd.net.bond, NOTICE);

+RTE_LOG_REGISTER(bond_logtype, pmd.net.bonding, NOTICE);
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index 05d79bfcc2..d9a46ef915 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -1611,7 +1611,7 @@ static struct rte_pci_driver rte_ifpga_rawdev_pmd = {
  RTE_PMD_REGISTER_PCI(ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd);
  RTE_PMD_REGISTER_PCI_TABLE(ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd);
  RTE_PMD_REGISTER_KMOD_DEP(ifpga_rawdev_pci_driver, "* igb_uio | uio_pci_generic | 
vfio-pci");
-RTE_LOG_REGISTER(ifpga_rawdev_logtype, driver.raw.init, NOTICE);
+RTE_LOG_REGISTER(ifpga_

Re: [dpdk-dev] [RFC] drivers: introduce mlx5 crypto PMD

[Matan Azrad]

Hi Akhil

From: Akhil Goyal
> Hi Matan/Shiri,
> 
> >
> > Add a new PMD for Mellanox devices- crypto PMD.
> >
> > The crypto PMD will be supported starting Mellanox ConnectX6 and
> > BlueField2.
> >
> > The crypto PMD will add the support of encryption and decryption using
> > the AES-XTS symmetric algorithm.
> >
> > The crypto PMD requires rdma-core and uses mlx5 DevX.
> >
> > This patch adds the PCI probing, basic functions, build files and log
> > utility.
> >
> > Signed-off-by: Shiri Kuzin 
> > Acked-by: Matan Azrad 
> > ---
> Could you please send the complete patchset for the PMD?
> Or is it postponed for 21.08?

We are doing an effort to send it before 21.05-RC1 but remember that we can 
close it until RC2 (new PMD). 

> 
> Regards,
> Akhil

Re: [dpdk-dev] [PATCH] vhost: fix accessing uninitialized variables

[Xia, Chenbo]

Hi Marvin,

> -Original Message-
> From: Liu, Yong 
> Sent: Wednesday, March 3, 2021 3:28 PM
> To: maxime.coque...@redhat.com; Xia, Chenbo 
> Cc: dev@dpdk.org; Liu, Yong ; sta...@dpdk.org
> Subject: [PATCH] vhost: fix accessing uninitialized variables
> 
> This patch fixs coverity issue by adding initialization step before
> using temporary virtio header.
> 
> Coverity issue: 366181, 366123
> Fixes: fb3815cc614d ("vhost: handle virtually non-contiguous buffers in Rx-
> mrg")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Marvin Liu 
> 
> diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c
> index 583bf379c6..fe464b3088 100644
> --- a/lib/librte_vhost/virtio_net.c
> +++ b/lib/librte_vhost/virtio_net.c
> @@ -808,9 +808,10 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct
> vhost_virtqueue *vq,

You should apply the same fix to async_mbuf_to_desc.
Maybe you did not notice: one coverity issue is in copy_mbuf_to_desc, but 
another
in async_mbuf_to_desc :)

Thanks,
Chenbo

> 
>   hdr_mbuf = m;
>   hdr_addr = buf_addr;
> - if (unlikely(buf_len < dev->vhost_hlen))
> + if (unlikely(buf_len < dev->vhost_hlen)) {
> + memset(&tmp_hdr, 0, sizeof(struct virtio_net_hdr_mrg_rxbuf));
>   hdr = &tmp_hdr;
> - else
> + } else
>   hdr = (struct virtio_net_hdr_mrg_rxbuf *)(uintptr_t)hdr_addr;
> 
>   VHOST_LOG_DATA(DEBUG, "(%d) RX: num merge buffers %d\n",
> --
> 2.17.1

Re: [dpdk-dev] [PATCH] cryptodev: formalize key wrap method in API

[Matan Azrad]

Hi Akhil

From: Akhil Goyal
> Hi Matan,
> 
> > The Key Wrap approach is used by applications in order to protect keys
> > located in untrusted storage or transmitted over untrusted
> > communications networks. The constructions are typically built from
> > standard primitives such as block ciphers and cryptographic hash
> > functions.
> >
> > The Key Wrap method and its parameters are a secret between the keys
> > provider and the device, means that the device is preconfigured for
> > this method using very secured way.
> >
> > The key wrap method may change the key length and layout.
> >
> > Add a description for the cipher transformation key to allow wrapped
> > key to be forwarded by the same API.
> >
> > Signed-off-by: Matan Azrad 
> > ---
> 
> How will the driver gets notified whether the key is wrapped or not?
> The driver would expect the keys are as per the capabilities exposed.
> If it does not check as per the capabilities, how will it identify a bad Key 
> len and
> the wrapped key length?

As I wrote, the device is preconfigured to the key wrapping mode in very 
secured way.
No one knows this secret except the device and the key provider (outside the 
crypto lib and dpdk application).
The driver may know something but not necessarily.
If the device validation to the key is failed, the driver will return an error 
to the app.
 

> >  lib/librte_cryptodev/rte_crypto_sym.h | 7 +++
> >  1 file changed, 7 insertions(+)
> >
> > diff --git a/lib/librte_cryptodev/rte_crypto_sym.h
> > b/lib/librte_cryptodev/rte_crypto_sym.h
> > index 5973e31..6aca2c7 100644
> > --- a/lib/librte_cryptodev/rte_crypto_sym.h
> > +++ b/lib/librte_cryptodev/rte_crypto_sym.h
> > @@ -200,6 +200,13 @@ struct rte_crypto_cipher_xform {
> >   uint16_t length;/**< key length in bytes */
> >   } key;
> >   /**< Cipher key
> > +  * The original key data may be provided wrapped (encrypted)
> > + using
> > a key
> > +  * wrap algorithm such as AES key wrap (from rfc3394) or other.
> > + In
> > such
> > +  * case, the wrapping details is a secret between the key provider and
> > +  * the device. Such key wrapping may increase the length of the
> > provided
> > +  * key beyond the advertised supported key size. Hence it is the
> > +  * responsibility of the driver/device to validate the length of the
> > +  * provided key.
> >*
> >* For the RTE_CRYPTO_CIPHER_AES_F8 mode of operation, key.data
> > will
> >* point to a concatenation of the AES encryption key followed
> > by a
> > --
> > 1.8.3.1

Re: [dpdk-dev] [PATCH v2 1/2] pci: rename catch-all ID

[Xueming(Steven) Li]

>-Original Message-
>From: dev  On Behalf Of Thomas Monjalon
>Sent: Monday, April 5, 2021 5:15 PM
>To: dev@dpdk.org
>Cc: Matan Azrad ; Shahaf Shuler ; Slava 
>Ovsiienko ; Gaetan
>Rivet 
>Subject: [dpdk-dev] [PATCH v2 1/2] pci: rename catch-all ID
>
>The name of the constant PCI_ANY_ID was missing RTE_ prefix.
>It is renamed, and the old name becomes a deprecated alias.
>
>While renaming, the duplicate definitions in rte_bus_pci.h are removed to keep 
>only those in rte_pci.h.
>Note: rte_pci.h is included in rte_bus_pci.h
>
>Signed-off-by: Thomas Monjalon 
>---
> drivers/bus/pci/pci_common.c  |  8 
> drivers/bus/pci/rte_bus_pci.h | 12 
> drivers/common/mlx5/mlx5_common_pci.c |  8 
> lib/librte_pci/rte_pci.h  | 12 +++-
> 4 files changed, 19 insertions(+), 21 deletions(-)
>
>diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 
>9b8d769287..ee7f966358 100644
>--- a/drivers/bus/pci/pci_common.c
>+++ b/drivers/bus/pci/pci_common.c
>@@ -133,18 +133,18 @@ rte_pci_match(const struct rte_pci_driver *pci_drv,
>id_table++) {
>   /* check if device's identifiers match the driver's ones */
>   if (id_table->vendor_id != pci_dev->id.vendor_id &&
>-  id_table->vendor_id != PCI_ANY_ID)
>+  id_table->vendor_id != RTE_PCI_ANY_ID)
>   continue;
>   if (id_table->device_id != pci_dev->id.device_id &&
>-  id_table->device_id != PCI_ANY_ID)
>+  id_table->device_id != RTE_PCI_ANY_ID)
>   continue;
>   if (id_table->subsystem_vendor_id !=
>   pci_dev->id.subsystem_vendor_id &&
>-  id_table->subsystem_vendor_id != PCI_ANY_ID)
>+  id_table->subsystem_vendor_id != RTE_PCI_ANY_ID)
>   continue;
>   if (id_table->subsystem_device_id !=
>   pci_dev->id.subsystem_device_id &&
>-  id_table->subsystem_device_id != PCI_ANY_ID)
>+  id_table->subsystem_device_id != RTE_PCI_ANY_ID)
>   continue;
>   if (id_table->class_id != pci_dev->id.class_id &&
>   id_table->class_id != RTE_CLASS_ANY_ID) diff 
> --git a/drivers/bus/pci/rte_bus_pci.h
>b/drivers/bus/pci/rte_bus_pci.h index 876abddefb..3a092bc6d5 100644
>--- a/drivers/bus/pci/rte_bus_pci.h
>+++ b/drivers/bus/pci/rte_bus_pci.h
>@@ -91,26 +91,22 @@ struct rte_pci_device {
>
> #define RTE_ETH_DEV_TO_PCI(eth_dev)   RTE_DEV_TO_PCI((eth_dev)->device)
>
>-/** Any PCI device identifier (vendor, device, ...) */ -#define PCI_ANY_ID 
>(0x) -#define RTE_CLASS_ANY_ID (0xff)
>-
> #ifdef __cplusplus
> /** C++ macro used to help building up tables of device IDs */  #define 
> RTE_PCI_DEVICE(vend, dev) \
>   RTE_CLASS_ANY_ID, \
>   (vend),   \
>   (dev),\
>-  PCI_ANY_ID,   \
>-  PCI_ANY_ID
>+  RTE_PCI_ANY_ID,   \
>+  RTE_PCI_ANY_ID
> #else
> /** Macro used to help building up tables of device IDs */
> #define RTE_PCI_DEVICE(vend, dev)  \
>   .class_id = RTE_CLASS_ANY_ID,  \
>   .vendor_id = (vend),   \
>   .device_id = (dev),\
>-  .subsystem_vendor_id = PCI_ANY_ID, \
>-  .subsystem_device_id = PCI_ANY_ID
>+  .subsystem_vendor_id = RTE_PCI_ANY_ID, \
>+  .subsystem_device_id = RTE_PCI_ANY_ID
> #endif
>
> /**
>diff --git a/drivers/common/mlx5/mlx5_common_pci.c 
>b/drivers/common/mlx5/mlx5_common_pci.c
>index a7f541a90c..9689ca86fc 100644
>--- a/drivers/common/mlx5/mlx5_common_pci.c
>+++ b/drivers/common/mlx5/mlx5_common_pci.c
>@@ -142,18 +142,18 @@ mlx5_bus_match(const struct mlx5_pci_driver *drv,
>id_table++) {
>   /* Check if device's ids match the class driver's ids. */
>   if (id_table->vendor_id != pci_dev->id.vendor_id &&
>-  id_table->vendor_id != PCI_ANY_ID)
>+  id_table->vendor_id != RTE_PCI_ANY_ID)
>   continue;
>   if (id_table->device_id != pci_dev->id.device_id &&
>-  id_table->device_id != PCI_ANY_ID)
>+  id_table->device_id != RTE_PCI_ANY_ID)
>   continue;
>   if (id_table->subsystem_vendor_id !=
>   pci_dev->id.subsystem_vendor_id &&
>-  id_table->subsystem_vendor_id != PCI_ANY_ID)
>+  id_table->subsystem_vendor_id != RTE_PCI_ANY_ID)
>   continue;
>   if (id_table->subsystem_device_id !=
>   pci_dev->id.subsystem_device_id &&
>-  id_table->subsystem_device_id != PCI_ANY_ID)
>+  id_table->subsystem_device_id != RTE_PCI_ANY_ID)
>   cont

Re: [dpdk-dev] [PATCH v2 2/2] bus/pci: rename probe/remove operation types

[Xueming(Steven) Li]

>-Original Message-
>From: dev  On Behalf Of Thomas Monjalon
>Sent: Monday, April 5, 2021 5:15 PM
>To: dev@dpdk.org
>Subject: [dpdk-dev] [PATCH v2 2/2] bus/pci: rename probe/remove operation types
>
>The names of the prototypes pci_probe_t and pci_remove_t are missing a prefix 
>rte_.
>These function types are simply renamed.
>
>No compatibility break is expected for the applications because it is 
>considered as an internal name in the driver interface.

No long line warning with checkpatch?

Besides this,
Reviewed-by: Xueming Li 

>
>Signed-off-by: Thomas Monjalon 
>---
> drivers/bus/pci/rte_bus_pci.h | 8 
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h 
>index 3a092bc6d5..64886b4731 100644
>--- a/drivers/bus/pci/rte_bus_pci.h
>+++ b/drivers/bus/pci/rte_bus_pci.h
>@@ -112,12 +112,12 @@ struct rte_pci_device {
> /**
>  * Initialisation function for the driver called during PCI probing.
>  */
>-typedef int (pci_probe_t)(struct rte_pci_driver *, struct rte_pci_device *);
>+typedef int (rte_pci_probe_t)(struct rte_pci_driver *, struct
>+rte_pci_device *);
>
> /**
>  * Uninitialisation function for the driver called during hotplugging.
>  */
>-typedef int (pci_remove_t)(struct rte_pci_device *);
>+typedef int (rte_pci_remove_t)(struct rte_pci_device *);
>
> /**
>  * Driver-specific DMA mapping. After a successful call the device @@ -164,8 
> +164,8 @@ struct rte_pci_driver {
>   TAILQ_ENTRY(rte_pci_driver) next;  /**< Next in list. */
>   struct rte_driver driver;  /**< Inherit core driver. */
>   struct rte_pci_bus *bus;   /**< PCI bus reference. */
>-  pci_probe_t *probe;/**< Device Probe function. */
>-  pci_remove_t *remove;  /**< Device Remove function. */
>+  rte_pci_probe_t *probe;/**< Device probe function. */
>+  rte_pci_remove_t *remove;  /**< Device remove function. */
>   pci_dma_map_t *dma_map;/**< device dma map function. */
>   pci_dma_unmap_t *dma_unmap;/**< device dma unmap function. */
>   const struct rte_pci_id *id_table; /**< ID table, NULL terminated. */
>--
>2.31.1

[dpdk-dev] [PATCH v1 1/1] test/power: fix several bugs in cpufreq autotest

[Richael Zhuang]

1. Sleep for 1s before checking the newly updated value from
"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_cur_freq", because
for some systems it may not be effective immediately.

2. The value in "/sys/.../cpuinfo_cur_freq" may not be exactly the
same as what we set. For example, we write "240" to
"/sys/.../cpufreq/scaling_setspeed" to set the frequency, then the
value in "/sys/.../cpuinfo_cur_freq" may be "2401222". So need to
round the value.

Fixes: ed7c51a6a680 ("app/test: vm power management")
Cc: alan.ca...@intel.com
Cc: sta...@dpdk.org

Signed-off-by: Richael Zhuang 
---
 app/test/test_power_cpufreq.c | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index 731c6b4dc..c4f4541ac 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -34,6 +34,10 @@ test_power_caps(void)
 #define TEST_POWER_LCORE_INVALID ((unsigned)RTE_MAX_LCORE)
 #define TEST_POWER_FREQS_NUM_MAX ((unsigned)RTE_MAX_LCORE_FREQS)

+/* macros used for rounding frequency to nearest 10 */
+#define TEST_FREQ_ROUNDING_DELTA 5
+#define TEST_ROUND_FREQ_TO_N_10 10
+
 #define TEST_POWER_SYSFILE_CUR_FREQ \
"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_cur_freq"

@@ -43,6 +47,9 @@ static uint32_t freqs[TEST_POWER_FREQS_NUM_MAX];
 static int
 check_cur_freq(unsigned lcore_id, uint32_t idx)
 {
+   /* wait for the value to be updated */
+   sleep(1);
+
 #define TEST_POWER_CONVERT_TO_DECIMAL 10
FILE *f;
char fullpath[PATH_MAX];
@@ -62,7 +69,17 @@ check_cur_freq(unsigned lcore_id, uint32_t idx)
goto fail_get_cur_freq;
}
cur_freq = strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DECIMAL);
-   ret = (freqs[idx] == cur_freq ? 0 : -1);
+
+   /* convert the frequency to nearest 10 value
+* Ex: if cur_freq=1396789 then freq_conv=140
+* Ex: if cur_freq=800030 then freq_conv=80
+*/
+   unsigned int freq_conv = 0;
+   freq_conv = (cur_freq + TEST_FREQ_ROUNDING_DELTA)
+   / TEST_ROUND_FREQ_TO_N_10;
+   freq_conv = freq_conv * TEST_ROUND_FREQ_TO_N_10;
+
+   ret = (freqs[idx] == freq_conv ? 0 : -1);

 fail_get_cur_freq:
fclose(f);
--
2.20.1

IMPORTANT NOTICE: The contents of this email and any attachments are 
confidential and may also be privileged. If you are not the intended recipient, 
please notify the sender immediately and do not disclose the contents to any 
other person, use it for any purpose, or store or copy the information in any 
medium. Thank you.

[dpdk-dev] [PATCH] app/flow-perf: support meter policy API

[Haifei Luo]

Add option "policy-mtr" to indicate if meter creation will include policy
or not. Meter creation will keep same without it.

With "policy-mtr", policy is introduced. API create_meter_policy
is to create a policy. API create_meter_rule will use it to create
meter.

Depends-on: series=16037 ("Support meter policy API ")
https://patchwork.dpdk.org/project/dpdk/list/?series=16037

Signed-off-by: Haifei Luo 
---
 app/test-flow-perf/actions_gen.c |  6 ++-
 app/test-flow-perf/actions_gen.h |  3 +-
 app/test-flow-perf/config.h  |  6 +--
 app/test-flow-perf/flow_gen.c|  2 +-
 app/test-flow-perf/main.c| 93 ++--
 doc/guides/tools/flow-perf.rst   |  3 ++
 6 files changed, 102 insertions(+), 11 deletions(-)

diff --git a/app/test-flow-perf/actions_gen.c b/app/test-flow-perf/actions_gen.c
index 1f5c64f..248e19a 100644
--- a/app/test-flow-perf/actions_gen.c
+++ b/app/test-flow-perf/actions_gen.c
@@ -19,7 +19,6 @@
 #include "flow_gen.h"
 #include "config.h"
 
-
 /* Storage for additional parameters for actions */
 struct additional_para {
uint16_t queue;
@@ -30,6 +29,7 @@ struct additional_para {
uint64_t encap_data;
uint64_t decap_data;
uint8_t core_idx;
+   uint16_t port_id;
 };
 
 /* Storage for struct rte_flow_action_raw_encap including external data. */
@@ -907,7 +907,8 @@ struct action_rss_data {
 void
 fill_actions(struct rte_flow_action *actions, uint64_t *flow_actions,
uint32_t counter, uint16_t next_table, uint16_t hairpinq,
-   uint64_t encap_data, uint64_t decap_data, uint8_t core_idx)
+   uint64_t encap_data, uint64_t decap_data, uint8_t core_idx,
+   uint16_t port_id)
 {
struct additional_para additional_para_data;
uint8_t actions_counter = 0;
@@ -930,6 +931,7 @@ struct action_rss_data {
.encap_data = encap_data,
.decap_data = decap_data,
.core_idx = core_idx,
+   .port_id = port_id,
};
 
if (hairpinq != 0) {
diff --git a/app/test-flow-perf/actions_gen.h b/app/test-flow-perf/actions_gen.h
index 77353cf..f846734 100644
--- a/app/test-flow-perf/actions_gen.h
+++ b/app/test-flow-perf/actions_gen.h
@@ -19,6 +19,7 @@
 
 void fill_actions(struct rte_flow_action *actions, uint64_t *flow_actions,
uint32_t counter, uint16_t next_table, uint16_t hairpinq,
-   uint64_t encap_data, uint64_t decap_data, uint8_t core_idx);
+   uint64_t encap_data, uint64_t decap_data, uint8_t core_idx,
+   uint16_t port_id);
 
 #endif /* FLOW_PERF_ACTION_GEN */
diff --git a/app/test-flow-perf/config.h b/app/test-flow-perf/config.h
index 3d4696d..50dbf90 100644
--- a/app/test-flow-perf/config.h
+++ b/app/test-flow-perf/config.h
@@ -8,15 +8,15 @@
 #define GET_RSS_HF() (ETH_RSS_IP | ETH_RSS_TCP)
 
 /* Configuration */
-#define RXQ_NUM 4
-#define TXQ_NUM 4
+#define RXQ_NUM 10
+#define TXQ_NUM 10
 #define TOTAL_MBUF_NUM 32000
 #define MBUF_SIZE 2048
 #define MBUF_CACHE_SIZE 512
 #define NR_RXD  256
 #define NR_TXD  256
 #define MAX_PORTS 64
-#define METER_CIR 125
+#define METER_CIR 125000
 #define DEFAULT_METER_PROF_ID 100
 
 /* This is used for encap/decap & header modify actions.
diff --git a/app/test-flow-perf/flow_gen.c b/app/test-flow-perf/flow_gen.c
index df4af16..62e4cf5 100644
--- a/app/test-flow-perf/flow_gen.c
+++ b/app/test-flow-perf/flow_gen.c
@@ -61,7 +61,7 @@ struct rte_flow *
 
fill_actions(actions, flow_actions,
outer_ip_src, next_table, hairpinq,
-   encap_data, decap_data, core_idx);
+   encap_data, decap_data, core_idx, port_id);
 
fill_items(items, flow_items, outer_ip_src, core_idx);
 
diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c
index 66ec776..9a0d758 100644
--- a/app/test-flow-perf/main.c
+++ b/app/test-flow-perf/main.c
@@ -53,6 +53,8 @@
 static uint64_t flow_items[MAX_ITEMS_NUM];
 static uint64_t flow_actions[MAX_ACTIONS_NUM];
 static uint64_t flow_attrs[MAX_ATTRS_NUM];
+uint32_t g_policy_id[MAX_PORTS];
+
 static uint8_t items_idx, actions_idx, attrs_idx;
 
 static uint64_t ports_mask;
@@ -61,6 +63,7 @@
 static bool delete_flag;
 static bool dump_socket_mem_flag;
 static bool enable_fwd;
+static bool policy_mtr;
 
 static struct rte_mempool *mbuf_mp;
 static uint32_t nb_lcores;
@@ -114,6 +117,13 @@ struct multi_cores_pool {
.cores_count = 1,
 };
 
+/* Storage for struct rte_flow_action_rss including external data. */
+struct action_rss_data {
+   struct rte_flow_action_rss conf;
+   uint8_t key[40];
+   uint16_t queue[128];
+};
+
 static void
 usage(char *progname)
 {
@@ -131,6 +141,7 @@ struct multi_cores_pool {
printf("  --enable-fwd: To enable packets forwarding"
" after insertion\n");
printf("  --portmask=N: hexadecimal bitmask of ports used\n");
+   printf("  --policy-mtr: To create meter with policy\n");
 
printf("To set flow attributes:\n");