[dpdk-dev] [PATCH v2 02/13] eventdev: separate internal structures

[pbhagavatula]

From: Pavan Nikhilesh 

Create rte_eventdev_core.h and move all the internal data structures
to this file. These structures are mostly used by drivers, but they
need to be in the public header file as they are accessed by datapath
inline functions for performance reasons.
The accessibility of these data structures is not changed.

Signed-off-by: Pavan Nikhilesh 
---
 lib/eventdev/eventdev_pmd.h  |   3 -
 lib/eventdev/meson.build |   3 +
 lib/eventdev/rte_eventdev.h  | 718 +--
 lib/eventdev/rte_eventdev_core.h | 138 ++
 4 files changed, 437 insertions(+), 425 deletions(-)
 create mode 100644 lib/eventdev/rte_eventdev_core.h

diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
index 682b61cff0..7eb2aa0520 100644
--- a/lib/eventdev/eventdev_pmd.h
+++ b/lib/eventdev/eventdev_pmd.h
@@ -87,9 +87,6 @@ struct rte_eventdev_global {
uint8_t nb_devs;/**< Number of devices found */
 };
 
-extern struct rte_eventdev *rte_eventdevs;
-/** The pool of rte_eventdev structures. */
-
 /**
  * Get the rte_eventdev structure device pointer for the named device.
  *
diff --git a/lib/eventdev/meson.build b/lib/eventdev/meson.build
index 523ea9ccae..8b51fde361 100644
--- a/lib/eventdev/meson.build
+++ b/lib/eventdev/meson.build
@@ -27,6 +27,9 @@ headers = files(
 'rte_event_crypto_adapter.h',
 'rte_event_eth_tx_adapter.h',
 )
+indirect_headers += files(
+'rte_eventdev_core.h',
+)
 driver_sdk_headers += files(
 'eventdev_pmd.h',
 'eventdev_pmd_pci.h',
diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
index 0c701888d5..1b11d4576d 100644
--- a/lib/eventdev/rte_eventdev.h
+++ b/lib/eventdev/rte_eventdev.h
@@ -1324,317 +1324,6 @@ int
 rte_event_eth_tx_adapter_caps_get(uint8_t dev_id, uint16_t eth_port_id,
uint32_t *caps);
 
-struct eventdev_ops;
-struct rte_eventdev;
-
-typedef uint16_t (*event_enqueue_t)(void *port, const struct rte_event *ev);
-/**< @internal Enqueue event on port of a device */
-
-typedef uint16_t (*event_enqueue_burst_t)(void *port,
-   const struct rte_event ev[], uint16_t nb_events);
-/**< @internal Enqueue burst of events on port of a device */
-
-typedef uint16_t (*event_dequeue_t)(void *port, struct rte_event *ev,
-   uint64_t timeout_ticks);
-/**< @internal Dequeue event from port of a device */
-
-typedef uint16_t (*event_dequeue_burst_t)(void *port, struct rte_event ev[],
-   uint16_t nb_events, uint64_t timeout_ticks);
-/**< @internal Dequeue burst of events from port of a device */
-
-typedef uint16_t (*event_tx_adapter_enqueue_t)(void *port,
-  struct rte_event ev[],
-  uint16_t nb_events);
-/**< @internal Enqueue burst of events on port of a device */
-
-typedef uint16_t (*event_tx_adapter_enqueue_same_dest_t)(void *port,
-struct rte_event ev[],
-uint16_t nb_events);
-/**< @internal Enqueue burst of events on port of a device supporting
- * burst having same destination Ethernet port & Tx queue.
- */
-
-typedef uint16_t (*event_crypto_adapter_enqueue_t)(void *port,
-  struct rte_event ev[],
-  uint16_t nb_events);
-/**< @internal Enqueue burst of events on crypto adapter */
-
-#define RTE_EVENTDEV_NAME_MAX_LEN  (64)
-/**< @internal Max length of name of event PMD */
-
-/**
- * @internal
- * The data part, with no function pointers, associated with each device.
- *
- * This structure is safe to place in shared memory to be common among
- * different processes in a multi-process configuration.
- */
-struct rte_eventdev_data {
-   int socket_id;
-   /**< Socket ID where memory is allocated */
-   uint8_t dev_id;
-   /**< Device ID for this instance */
-   uint8_t nb_queues;
-   /**< Number of event queues. */
-   uint8_t nb_ports;
-   /**< Number of event ports. */
-   void **ports;
-   /**< Array of pointers to ports. */
-   struct rte_event_port_conf *ports_cfg;
-   /**< Array of port configuration structures. */
-   struct rte_event_queue_conf *queues_cfg;
-   /**< Array of queue configuration structures. */
-   uint16_t *links_map;
-   /**< Memory to store queues to port connections. */
-   void *dev_private;
-   /**< PMD-specific private data */
-   uint32_t event_dev_cap;
-   /**< Event device capabilities(RTE_EVENT_DEV_CAP_)*/
-   struct rte_event_dev_config dev_conf;
-   /**< Configuration applied to device. */
-   uint8_t service_inited;
-   /* Service initialization state */
-   uint32_t service_id;
-   /* Service ID*/
-   void *dev_stop_flush_arg;
-   /**< User-provided argu

[dpdk-dev] [PATCH v2 01/13] eventdev: make driver interface as internal

[pbhagavatula]

From: Pavan Nikhilesh 

Mark all the driver specific functions as internal, remove
`rte` prefix from `struct rte_eventdev_ops`.
Remove experimental tag from internal functions.
Remove `eventdev_pmd.h` from non-internal header files.

Signed-off-by: Pavan Nikhilesh 
---
 v2 Changes:
 - Rework inline flat array by adding port data into it.
 - Rearrange rte_event_timer elements.

 drivers/event/cnxk/cn10k_eventdev.c|  6 ++---
 drivers/event/cnxk/cn9k_eventdev.c | 10 -
 drivers/event/dlb2/dlb2.c  |  2 +-
 drivers/event/dpaa/dpaa_eventdev.c |  2 +-
 drivers/event/dpaa2/dpaa2_eventdev.c   |  2 +-
 drivers/event/dsw/dsw_evdev.c  |  2 +-
 drivers/event/octeontx/ssovf_evdev.c   |  2 +-
 drivers/event/octeontx/ssovf_worker.c  |  4 ++--
 drivers/event/octeontx2/otx2_evdev.c   | 26 +++---
 drivers/event/opdl/opdl_evdev.c|  2 +-
 drivers/event/skeleton/skeleton_eventdev.c |  2 +-
 drivers/event/sw/sw_evdev.c|  2 +-
 lib/eventdev/eventdev_pmd.h|  6 -
 lib/eventdev/eventdev_pmd_pci.h|  4 +++-
 lib/eventdev/eventdev_pmd_vdev.h   |  2 ++
 lib/eventdev/meson.build   |  6 +
 lib/eventdev/rte_event_crypto_adapter.h|  1 -
 lib/eventdev/rte_eventdev.h| 25 -
 lib/eventdev/version.map   | 17 +++---
 19 files changed, 70 insertions(+), 53 deletions(-)

diff --git a/drivers/event/cnxk/cn10k_eventdev.c 
b/drivers/event/cnxk/cn10k_eventdev.c
index 8af273a01b..b2c3a6cd31 100644
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -375,7 +375,7 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
};

/* Tx modes */
-   const event_tx_adapter_enqueue
+   const event_tx_adapter_enqueue_t
sso_hws_tx_adptr_enq[2][2][2][2][2][2] = {
 #define T(name, f5, f4, f3, f2, f1, f0, sz, flags) 
\
[f5][f4][f3][f2][f1][f0] = cn10k_sso_hws_tx_adptr_enq_##name,
@@ -383,7 +383,7 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 #undef T
};

-   const event_tx_adapter_enqueue
+   const event_tx_adapter_enqueue_t
sso_hws_tx_adptr_enq_seg[2][2][2][2][2][2] = {
 #define T(name, f5, f4, f3, f2, f1, f0, sz, flags) 
\
[f5][f4][f3][f2][f1][f0] = cn10k_sso_hws_tx_adptr_enq_seg_##name,
@@ -858,7 +858,7 @@ cn10k_crypto_adapter_qp_del(const struct rte_eventdev 
*event_dev,
return cnxk_crypto_adapter_qp_del(cdev, queue_pair_id);
 }

-static struct rte_eventdev_ops cn10k_sso_dev_ops = {
+static struct eventdev_ops cn10k_sso_dev_ops = {
.dev_infos_get = cn10k_sso_info_get,
.dev_configure = cn10k_sso_dev_configure,
.queue_def_conf = cnxk_sso_queue_def_conf,
diff --git a/drivers/event/cnxk/cn9k_eventdev.c 
b/drivers/event/cnxk/cn9k_eventdev.c
index 59a3dc22a3..0e0bf7177e 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -507,7 +507,7 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
};

/* Tx modes */
-   const event_tx_adapter_enqueue
+   const event_tx_adapter_enqueue_t
sso_hws_tx_adptr_enq[2][2][2][2][2][2] = {
 #define T(name, f5, f4, f3, f2, f1, f0, sz, flags) 
\
[f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_tx_adptr_enq_##name,
@@ -515,7 +515,7 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 #undef T
};

-   const event_tx_adapter_enqueue
+   const event_tx_adapter_enqueue_t
sso_hws_tx_adptr_enq_seg[2][2][2][2][2][2] = {
 #define T(name, f5, f4, f3, f2, f1, f0, sz, flags) 
\
[f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_tx_adptr_enq_seg_##name,
@@ -523,7 +523,7 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 #undef T
};

-   const event_tx_adapter_enqueue
+   const event_tx_adapter_enqueue_t
sso_hws_dual_tx_adptr_enq[2][2][2][2][2][2] = {
 #define T(name, f5, f4, f3, f2, f1, f0, sz, flags) 
\
[f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_tx_adptr_enq_##name,
@@ -531,7 +531,7 @@ cn9k_sso_fp_fns_set(struct rte_eventdev *event_dev)
 #undef T
};

-   const event_tx_adapter_enqueue
+   const event_tx_adapter_enqueue_t
sso_hws_dual_tx_adptr_enq_seg[2][2][2][2][2][2] = {
 #define T(name, f5, f4, f3, f2, f1, f0, sz, flags) 
\
[f5][f4][f3][f2][f1][f0] = cn9k_sso_hws_dual_tx_adptr_enq_seg_##name,
@@ -1052,7 +1052,7 @@ cn9k_crypto_adapter_qp_del(const struct rte_eventdev 
*event_dev,
return cnxk_crypto_adapter_qp_del(cdev, queue_pair_id);
 }

-static struct rte_eventdev_ops cn9k_sso_dev_ops = {
+static struct eventdev_ops cn9k_sso_dev_ops = {
.dev_inf

[dpdk-dev] [PATCH v2 03/13] eventdev: allocate max space for internal arrays

[pbhagavatula]

From: Pavan Nikhilesh 

Allocate max space for internal port, port config, queue config and
link map arrays.
Introduce new macro RTE_EVENT_MAX_PORTS_PER_DEV and set it to max
possible value.
This simplifies the port and queue reconfigure scenarios and will
also allow inline functions to refer pointer to internal port data
without extra checking of current number of configured queues.

Signed-off-by: Pavan Nikhilesh 
---
 config/rte_config.h  |   1 +
 lib/eventdev/rte_eventdev.c  | 154 +++
 lib/eventdev/rte_eventdev_core.h |   9 +-
 3 files changed, 38 insertions(+), 126 deletions(-)

diff --git a/config/rte_config.h b/config/rte_config.h
index 590903c07d..e0ead8b251 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -72,6 +72,7 @@
 
 /* eventdev defines */
 #define RTE_EVENT_MAX_DEVS 16
+#define RTE_EVENT_MAX_PORTS_PER_DEV 255
 #define RTE_EVENT_MAX_QUEUES_PER_DEV 255
 #define RTE_EVENT_TIMER_ADAPTER_NUM_MAX 32
 #define RTE_EVENT_ETH_INTR_RING_SIZE 1024
diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
index e347d6dfd5..bfcfa31cd1 100644
--- a/lib/eventdev/rte_eventdev.c
+++ b/lib/eventdev/rte_eventdev.c
@@ -209,7 +209,7 @@ rte_event_eth_tx_adapter_caps_get(uint8_t dev_id, uint16_t 
eth_port_id,
 }
 
 static inline int
-rte_event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues)
+event_dev_queue_config(struct rte_eventdev *dev, uint8_t nb_queues)
 {
uint8_t old_nb_queues = dev->data->nb_queues;
struct rte_event_queue_conf *queues_cfg;
@@ -218,37 +218,13 @@ rte_event_dev_queue_config(struct rte_eventdev *dev, 
uint8_t nb_queues)
RTE_EDEV_LOG_DEBUG("Setup %d queues on device %u", nb_queues,
 dev->data->dev_id);
 
-   /* First time configuration */
-   if (dev->data->queues_cfg == NULL && nb_queues != 0) {
-   /* Allocate memory to store queue configuration */
-   dev->data->queues_cfg = rte_zmalloc_socket(
-   "eventdev->data->queues_cfg",
-   sizeof(dev->data->queues_cfg[0]) * nb_queues,
-   RTE_CACHE_LINE_SIZE, dev->data->socket_id);
-   if (dev->data->queues_cfg == NULL) {
-   dev->data->nb_queues = 0;
-   RTE_EDEV_LOG_ERR("failed to get mem for queue cfg,"
-   "nb_queues %u", nb_queues);
-   return -(ENOMEM);
-   }
-   /* Re-configure */
-   } else if (dev->data->queues_cfg != NULL && nb_queues != 0) {
+   if (nb_queues != 0) {
+   queues_cfg = dev->data->queues_cfg;
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_release, -ENOTSUP);
 
for (i = nb_queues; i < old_nb_queues; i++)
(*dev->dev_ops->queue_release)(dev, i);
 
-   /* Re allocate memory to store queue configuration */
-   queues_cfg = dev->data->queues_cfg;
-   queues_cfg = rte_realloc(queues_cfg,
-   sizeof(queues_cfg[0]) * nb_queues,
-   RTE_CACHE_LINE_SIZE);
-   if (queues_cfg == NULL) {
-   RTE_EDEV_LOG_ERR("failed to realloc queue cfg memory,"
-   " nb_queues %u", nb_queues);
-   return -(ENOMEM);
-   }
-   dev->data->queues_cfg = queues_cfg;
 
if (nb_queues > old_nb_queues) {
uint8_t new_qs = nb_queues - old_nb_queues;
@@ -256,7 +232,7 @@ rte_event_dev_queue_config(struct rte_eventdev *dev, 
uint8_t nb_queues)
memset(queues_cfg + old_nb_queues, 0,
sizeof(queues_cfg[0]) * new_qs);
}
-   } else if (dev->data->queues_cfg != NULL && nb_queues == 0) {
+   } else {
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->queue_release, -ENOTSUP);
 
for (i = nb_queues; i < old_nb_queues; i++)
@@ -270,7 +246,7 @@ rte_event_dev_queue_config(struct rte_eventdev *dev, 
uint8_t nb_queues)
 #define EVENT_QUEUE_SERVICE_PRIORITY_INVALID (0xdead)
 
 static inline int
-rte_event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports)
+event_dev_port_config(struct rte_eventdev *dev, uint8_t nb_ports)
 {
uint8_t old_nb_ports = dev->data->nb_ports;
void **ports;
@@ -281,46 +257,7 @@ rte_event_dev_port_config(struct rte_eventdev *dev, 
uint8_t nb_ports)
RTE_EDEV_LOG_DEBUG("Setup %d ports on device %u", nb_ports,
 dev->data->dev_id);
 
-   /* First time configuration */
-   if (dev->data->ports == NULL && nb_ports != 0) {
-   dev->data->ports = rte_zmalloc_socket("eventdev->data->ports",
-   sizeof(dev->data->ports[0]) * nb_ports,
-   RTE_CACHE_LINE_SIZE, 

[dpdk-dev] [PATCH v2 04/13] eventdev: move inline APIs into separate structure

[pbhagavatula]

From: Pavan Nikhilesh 

Move fastpath inline function pointers from rte_eventdev into a
separate structure accessed via a flat array.
The intension is to make rte_eventdev and related structures private
to avoid future API/ABI breakages.`

Signed-off-by: Pavan Nikhilesh 
Acked-by: Ray Kinsella 
---
 lib/eventdev/eventdev_pmd.h  |  25 +++
 lib/eventdev/eventdev_pmd_pci.h  |   5 +-
 lib/eventdev/eventdev_private.c  | 112 +++
 lib/eventdev/meson.build |   1 +
 lib/eventdev/rte_eventdev.c  |  12 +++-
 lib/eventdev/rte_eventdev_core.h |  28 
 lib/eventdev/version.map |   5 ++
 7 files changed, 186 insertions(+), 2 deletions(-)
 create mode 100644 lib/eventdev/eventdev_private.c

diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
index 7eb2aa0520..2f88dbd6d8 100644
--- a/lib/eventdev/eventdev_pmd.h
+++ b/lib/eventdev/eventdev_pmd.h
@@ -1189,4 +1189,29 @@ __rte_internal
 int
 rte_event_pmd_release(struct rte_eventdev *eventdev);
 
+/**
+ * Reset eventdevice fastpath APIs to dummy values.
+ *
+ * @param fp_ops
+ * The *fp_ops* pointer to reset.
+ */
+__rte_internal
+void
+event_dev_fp_ops_reset(struct rte_event_fp_ops *fp_op);
+
+/**
+ * Set eventdevice fastpath APIs to event device values.
+ *
+ * @param fp_ops
+ * The *fp_ops* pointer to set.
+ */
+__rte_internal
+void
+event_dev_fp_ops_set(struct rte_event_fp_ops *fp_ops,
+const struct rte_eventdev *dev);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _RTE_EVENTDEV_PMD_H_ */
diff --git a/lib/eventdev/eventdev_pmd_pci.h b/lib/eventdev/eventdev_pmd_pci.h
index 2f12a5eb24..563b579a77 100644
--- a/lib/eventdev/eventdev_pmd_pci.h
+++ b/lib/eventdev/eventdev_pmd_pci.h
@@ -67,8 +67,11 @@ rte_event_pmd_pci_probe_named(struct rte_pci_driver *pci_drv,
 
/* Invoke PMD device initialization function */
retval = devinit(eventdev);
-   if (retval == 0)
+   if (retval == 0) {
+   event_dev_fp_ops_set(rte_event_fp_ops + eventdev->data->dev_id,
+eventdev);
return 0;
+   }
 
RTE_EDEV_LOG_ERR("driver %s: (vendor_id=0x%x device_id=0x%x)"
" failed", pci_drv->driver.name,
diff --git a/lib/eventdev/eventdev_private.c b/lib/eventdev/eventdev_private.c
new file mode 100644
index 00..9084833847
--- /dev/null
+++ b/lib/eventdev/eventdev_private.c
@@ -0,0 +1,112 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include "eventdev_pmd.h"
+#include "rte_eventdev.h"
+
+static uint16_t
+dummy_event_enqueue(__rte_unused void *port,
+   __rte_unused const struct rte_event *ev)
+{
+   RTE_EDEV_LOG_ERR(
+   "event enqueue requested for unconfigured event device");
+   return 0;
+}
+
+static uint16_t
+dummy_event_enqueue_burst(__rte_unused void *port,
+ __rte_unused const struct rte_event ev[],
+ __rte_unused uint16_t nb_events)
+{
+   RTE_EDEV_LOG_ERR(
+   "event enqueue burst requested for unconfigured event device");
+   return 0;
+}
+
+static uint16_t
+dummy_event_dequeue(__rte_unused void *port, __rte_unused struct rte_event *ev,
+   __rte_unused uint64_t timeout_ticks)
+{
+   RTE_EDEV_LOG_ERR(
+   "event dequeue requested for unconfigured event device");
+   return 0;
+}
+
+static uint16_t
+dummy_event_dequeue_burst(__rte_unused void *port,
+ __rte_unused struct rte_event ev[],
+ __rte_unused uint16_t nb_events,
+ __rte_unused uint64_t timeout_ticks)
+{
+   RTE_EDEV_LOG_ERR(
+   "event dequeue burst requested for unconfigured event device");
+   return 0;
+}
+
+static uint16_t
+dummy_event_tx_adapter_enqueue(__rte_unused void *port,
+  __rte_unused struct rte_event ev[],
+  __rte_unused uint16_t nb_events)
+{
+   RTE_EDEV_LOG_ERR(
+   "event Tx adapter enqueue requested for unconfigured event 
device");
+   return 0;
+}
+
+static uint16_t
+dummy_event_tx_adapter_enqueue_same_dest(__rte_unused void *port,
+__rte_unused struct rte_event ev[],
+__rte_unused uint16_t nb_events)
+{
+   RTE_EDEV_LOG_ERR(
+   "event Tx adapter enqueue same destination requested for 
unconfigured event device");
+   return 0;
+}
+
+static uint16_t
+dummy_event_crypto_adapter_enqueue(__rte_unused void *port,
+  __rte_unused struct rte_event ev[],
+  __rte_unused uint16_t nb_events)
+{
+   RTE_EDEV_LOG_ERR(
+   "event crypto adapter enqueue requested for unconfigured event 
device");
+   return 0;
+}
+
+void
+event_dev_fp_ops_reset(struct rte_event_fp_ops *fp_op)
+{
+

[dpdk-dev] [PATCH v2 05/13] eventdev: use new API for inline functions

[pbhagavatula]

From: Pavan Nikhilesh 

Use new driver interface for the fastpath enqueue/dequeue inline
functions.

Signed-off-by: Pavan Nikhilesh 
Acked-by: Jay Jayatheerthan 
---
 lib/eventdev/rte_event_crypto_adapter.h | 15 +---
 lib/eventdev/rte_event_eth_tx_adapter.h | 15 
 lib/eventdev/rte_eventdev.h | 46 +++--
 3 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/lib/eventdev/rte_event_crypto_adapter.h 
b/lib/eventdev/rte_event_crypto_adapter.h
index 431d05b6ed..eb82818d05 100644
--- a/lib/eventdev/rte_event_crypto_adapter.h
+++ b/lib/eventdev/rte_event_crypto_adapter.h
@@ -568,12 +568,19 @@ rte_event_crypto_adapter_enqueue(uint8_t dev_id,
struct rte_event ev[],
uint16_t nb_events)
 {
-   const struct rte_eventdev *dev = &rte_eventdevs[dev_id];
+   const struct rte_event_fp_ops *fp_ops;
+   void *port;
 
+   fp_ops = &rte_event_fp_ops[dev_id];
+   port = fp_ops->data[port_id];
 #ifdef RTE_LIBRTE_EVENTDEV_DEBUG
-   RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+   if (dev_id >= RTE_EVENT_MAX_DEVS ||
+   port_id >= RTE_EVENT_MAX_PORTS_PER_DEV) {
+   rte_errno = EINVAL;
+   return 0;
+   }
 
-   if (port_id >= dev->data->nb_ports) {
+   if (port == NULL) {
rte_errno = EINVAL;
return 0;
}
@@ -581,7 +588,7 @@ rte_event_crypto_adapter_enqueue(uint8_t dev_id,
rte_eventdev_trace_crypto_adapter_enqueue(dev_id, port_id, ev,
nb_events);
 
-   return dev->ca_enqueue(dev->data->ports[port_id], ev, nb_events);
+   return fp_ops->ca_enqueue(port, ev, nb_events);
 }
 
 #ifdef __cplusplus
diff --git a/lib/eventdev/rte_event_eth_tx_adapter.h 
b/lib/eventdev/rte_event_eth_tx_adapter.h
index 8c59547165..3908c2ded5 100644
--- a/lib/eventdev/rte_event_eth_tx_adapter.h
+++ b/lib/eventdev/rte_event_eth_tx_adapter.h
@@ -355,16 +355,19 @@ rte_event_eth_tx_adapter_enqueue(uint8_t dev_id,
uint16_t nb_events,
const uint8_t flags)
 {
-   const struct rte_eventdev *dev = &rte_eventdevs[dev_id];
+   const struct rte_event_fp_ops *fp_ops;
+   void *port;
 
+   fp_ops = &rte_event_fp_ops[dev_id];
+   port = fp_ops->data[port_id];
 #ifdef RTE_LIBRTE_EVENTDEV_DEBUG
if (dev_id >= RTE_EVENT_MAX_DEVS ||
-   !rte_eventdevs[dev_id].attached) {
+   port_id >= RTE_EVENT_MAX_PORTS_PER_DEV) {
rte_errno = EINVAL;
return 0;
}
 
-   if (port_id >= dev->data->nb_ports) {
+   if (port == NULL) {
rte_errno = EINVAL;
return 0;
}
@@ -372,11 +375,9 @@ rte_event_eth_tx_adapter_enqueue(uint8_t dev_id,
rte_eventdev_trace_eth_tx_adapter_enqueue(dev_id, port_id, ev,
nb_events, flags);
if (flags)
-   return dev->txa_enqueue_same_dest(dev->data->ports[port_id],
- ev, nb_events);
+   return fp_ops->txa_enqueue_same_dest(port, ev, nb_events);
else
-   return dev->txa_enqueue(dev->data->ports[port_id], ev,
-   nb_events);
+   return fp_ops->txa_enqueue(port, ev, nb_events);
 }
 
 /**
diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
index 1b11d4576d..31fa9ac4b8 100644
--- a/lib/eventdev/rte_eventdev.h
+++ b/lib/eventdev/rte_eventdev.h
@@ -1747,15 +1747,19 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t 
port_id,
  const struct rte_event ev[], uint16_t nb_events,
  const event_enqueue_burst_t fn)
 {
-   const struct rte_eventdev *dev = &rte_eventdevs[dev_id];
+   const struct rte_event_fp_ops *fp_ops;
+   void *port;
 
+   fp_ops = &rte_event_fp_ops[dev_id];
+   port = fp_ops->data[port_id];
 #ifdef RTE_LIBRTE_EVENTDEV_DEBUG
-   if (dev_id >= RTE_EVENT_MAX_DEVS || !rte_eventdevs[dev_id].attached) {
+   if (dev_id >= RTE_EVENT_MAX_DEVS ||
+   port_id >= RTE_EVENT_MAX_PORTS_PER_DEV) {
rte_errno = EINVAL;
return 0;
}
 
-   if (port_id >= dev->data->nb_ports) {
+   if (port == NULL) {
rte_errno = EINVAL;
return 0;
}
@@ -1766,9 +1770,9 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
 * requests nb_events as const one
 */
if (nb_events == 1)
-   return (*dev->enqueue)(dev->data->ports[port_id], ev);
+   return (fp_ops->enqueue)(port, ev);
else
-   return fn(dev->data->ports[port_id], ev, nb_events);
+   return fn(port, ev, nb_events);
 }
 
 /**
@@ -1818,10 +1822,11 @@ static inline uint16_t
 rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,
  

[dpdk-dev] [PATCH v2 06/13] eventdev: hide event device related structures

[pbhagavatula]

From: Pavan Nikhilesh 

Move rte_eventdev, rte_eventdev_data structures to eventdev_pmd.h.

Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/dlb2/dlb2_inline_fns.h   |  2 +
 drivers/event/dsw/dsw_evdev.h  |  2 +
 drivers/event/octeontx/timvf_worker.h  |  2 +
 drivers/net/octeontx/octeontx_ethdev.c |  3 +-
 lib/eventdev/eventdev_pmd.h| 92 +
 lib/eventdev/rte_eventdev.c| 22 --
 lib/eventdev/rte_eventdev_core.h   | 93 --
 7 files changed, 100 insertions(+), 116 deletions(-)

diff --git a/drivers/event/dlb2/dlb2_inline_fns.h 
b/drivers/event/dlb2/dlb2_inline_fns.h
index ac8d01aa98..1429281cfd 100644
--- a/drivers/event/dlb2/dlb2_inline_fns.h
+++ b/drivers/event/dlb2/dlb2_inline_fns.h
@@ -5,6 +5,8 @@
 #ifndef _DLB2_INLINE_FNS_H_
 #define _DLB2_INLINE_FNS_H_
 
+#include 
+
 /* Inline functions required in more than one source file. */
 
 static inline struct dlb2_eventdev *
diff --git a/drivers/event/dsw/dsw_evdev.h b/drivers/event/dsw/dsw_evdev.h
index 08889a0990..631daea55c 100644
--- a/drivers/event/dsw/dsw_evdev.h
+++ b/drivers/event/dsw/dsw_evdev.h
@@ -5,6 +5,8 @@
 #ifndef _DSW_EVDEV_H_
 #define _DSW_EVDEV_H_
 
+#include 
+
 #include 
 #include 
 
diff --git a/drivers/event/octeontx/timvf_worker.h 
b/drivers/event/octeontx/timvf_worker.h
index dede1a4a4f..3f1e77f1d1 100644
--- a/drivers/event/octeontx/timvf_worker.h
+++ b/drivers/event/octeontx/timvf_worker.h
@@ -2,6 +2,8 @@
  * Copyright(c) 2017 Cavium, Inc
  */
 
+#include 
+
 #include 
 #include 
 
diff --git a/drivers/net/octeontx/octeontx_ethdev.c 
b/drivers/net/octeontx/octeontx_ethdev.c
index 9f4c0503b4..c55304839e 100644
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -9,13 +9,14 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h
index 2f88dbd6d8..764555d54c 100644
--- a/lib/eventdev/eventdev_pmd.h
+++ b/lib/eventdev/eventdev_pmd.h
@@ -80,6 +80,9 @@
 #define RTE_EVENTDEV_DETACHED  (0)
 #define RTE_EVENTDEV_ATTACHED  (1)
 
+#define RTE_EVENTDEV_NAME_MAX_LEN (64)
+/**< @internal Max length of name of event PMD */
+
 struct rte_eth_dev;
 
 /** Global structure used for maintaining state of allocated event devices */
@@ -87,6 +90,95 @@ struct rte_eventdev_global {
uint8_t nb_devs;/**< Number of devices found */
 };
 
+/**
+ * @internal
+ * The data part, with no function pointers, associated with each device.
+ *
+ * This structure is safe to place in shared memory to be common among
+ * different processes in a multi-process configuration.
+ */
+struct rte_eventdev_data {
+   int socket_id;
+   /**< Socket ID where memory is allocated */
+   uint8_t dev_id;
+   /**< Device ID for this instance */
+   uint8_t nb_queues;
+   /**< Number of event queues. */
+   uint8_t nb_ports;
+   /**< Number of event ports. */
+   void *ports[RTE_EVENT_MAX_PORTS_PER_DEV];
+   /**< Array of pointers to ports. */
+   struct rte_event_port_conf ports_cfg[RTE_EVENT_MAX_PORTS_PER_DEV];
+   /**< Array of port configuration structures. */
+   struct rte_event_queue_conf queues_cfg[RTE_EVENT_MAX_QUEUES_PER_DEV];
+   /**< Array of queue configuration structures. */
+   uint16_t links_map[RTE_EVENT_MAX_PORTS_PER_DEV *
+  RTE_EVENT_MAX_QUEUES_PER_DEV];
+   /**< Memory to store queues to port connections. */
+   void *dev_private;
+   /**< PMD-specific private data */
+   uint32_t event_dev_cap;
+   /**< Event device capabilities(RTE_EVENT_DEV_CAP_)*/
+   struct rte_event_dev_config dev_conf;
+   /**< Configuration applied to device. */
+   uint8_t service_inited;
+   /* Service initialization state */
+   uint32_t service_id;
+   /* Service ID*/
+   void *dev_stop_flush_arg;
+   /**< User-provided argument for event flush function */
+
+   RTE_STD_C11
+   uint8_t dev_started : 1;
+   /**< Device state: STARTED(1)/STOPPED(0) */
+
+   char name[RTE_EVENTDEV_NAME_MAX_LEN];
+   /**< Unique identifier name */
+
+   uint64_t reserved_64s[4]; /**< Reserved for future fields */
+   void *reserved_ptrs[4];   /**< Reserved for future fields */
+} __rte_cache_aligned;
+
+/** @internal The data structure associated with each event device. */
+struct rte_eventdev {
+   struct rte_eventdev_data *data;
+   /**< Pointer to device data */
+   struct eventdev_ops *dev_ops;
+   /**< Functions exported by PMD */
+   struct rte_device *dev;
+   /**< Device info. supplied by probing */
+
+   RTE_STD_C11
+   uint8_t attached : 1;
+   /**< Flag indicating the device is attached */
+
+   event_enqueue_t enqueue;
+   /**< Pointer to PMD enqueue function. */
+   event_enqueu

[dpdk-dev] [PATCH v 07/13] eventdev: hide timer adapter PMD file

[pbhagavatula]

From: Pavan Nikhilesh 

Hide rte_event_timer_adapter_pmd.h file as it is an internal file.
Remove rte_ prefix from rte_event_timer_adapter_ops structure.

Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cnxk_tim_evdev.c   |  5 ++--
 drivers/event/cnxk/cnxk_tim_evdev.h   |  2 +-
 drivers/event/dsw/dsw_evdev.c |  4 +--
 drivers/event/octeontx/ssovf_evdev.c  |  2 +-
 drivers/event/octeontx/timvf_evdev.c  | 17 ++-
 drivers/event/octeontx/timvf_evdev.h  |  9 +++---
 drivers/event/octeontx2/otx2_tim_evdev.c  |  5 ++--
 drivers/event/octeontx2/otx2_tim_evdev.h  |  4 +--
 drivers/event/sw/sw_evdev.c   |  5 ++--
 ...dapter_pmd.h => event_timer_adapter_pmd.h} |  8 ++---
 lib/eventdev/eventdev_pmd.h   |  8 ++---
 lib/eventdev/meson.build  |  2 +-
 lib/eventdev/rte_event_timer_adapter.c| 30 +--
 lib/eventdev/rte_event_timer_adapter.h|  2 +-
 lib/eventdev/rte_eventdev.c   |  2 +-
 15 files changed, 51 insertions(+), 54 deletions(-)
 rename lib/eventdev/{rte_event_timer_adapter_pmd.h => 
event_timer_adapter_pmd.h} (95%)

diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index 9d40e336d7..10634c31e3 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -5,7 +5,7 @@
 #include "cnxk_eventdev.h"
 #include "cnxk_tim_evdev.h"

-static struct rte_event_timer_adapter_ops cnxk_tim_ops;
+static struct event_timer_adapter_ops cnxk_tim_ops;

 static int
 cnxk_tim_chnk_pool_create(struct cnxk_tim_ring *tim_ring,
@@ -353,8 +353,7 @@ cnxk_tim_stats_reset(const struct rte_event_timer_adapter 
*adapter)

 int
 cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
- uint32_t *caps,
- const struct rte_event_timer_adapter_ops **ops)
+ uint32_t *caps, const struct event_timer_adapter_ops **ops)
 {
struct cnxk_tim_evdev *dev = cnxk_tim_priv_get();

diff --git a/drivers/event/cnxk/cnxk_tim_evdev.h 
b/drivers/event/cnxk/cnxk_tim_evdev.h
index c369f6f472..91e163eb5a 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.h
+++ b/drivers/event/cnxk/cnxk_tim_evdev.h
@@ -267,7 +267,7 @@ cnxk_tim_timer_cancel_burst(const struct 
rte_event_timer_adapter *adptr,

 int cnxk_tim_caps_get(const struct rte_eventdev *dev, uint64_t flags,
  uint32_t *caps,
- const struct rte_event_timer_adapter_ops **ops);
+ const struct event_timer_adapter_ops **ops);

 void cnxk_tim_init(struct roc_sso *sso);
 void cnxk_tim_fini(void);
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 01f060fff3..e9d33ad36b 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -381,8 +381,8 @@ dsw_eth_rx_adapter_caps_get(const struct rte_eventdev *dev 
__rte_unused,

 static int
 dsw_timer_adapter_caps_get(const struct rte_eventdev *dev __rte_unused,
-  uint64_t flags  __rte_unused, uint32_t *caps,
-  const struct rte_event_timer_adapter_ops **ops)
+  uint64_t flags __rte_unused, uint32_t *caps,
+  const struct event_timer_adapter_ops **ops)
 {
*caps = 0;
*ops = NULL;
diff --git a/drivers/event/octeontx/ssovf_evdev.c 
b/drivers/event/octeontx/ssovf_evdev.c
index 4a8c6a13a5..e7aecd4139 100644
--- a/drivers/event/octeontx/ssovf_evdev.c
+++ b/drivers/event/octeontx/ssovf_evdev.c
@@ -721,7 +721,7 @@ ssovf_parsekv(const char *key __rte_unused, const char 
*value, void *opaque)

 static int
 ssovf_timvf_caps_get(const struct rte_eventdev *dev, uint64_t flags,
-   uint32_t *caps, const struct rte_event_timer_adapter_ops **ops)
+uint32_t *caps, const struct event_timer_adapter_ops **ops)
 {
return timvf_timer_adapter_caps_get(dev, flags, caps, ops,
timvf_enable_stats);
diff --git a/drivers/event/octeontx/timvf_evdev.c 
b/drivers/event/octeontx/timvf_evdev.c
index 688e9daa66..1f1cda3f7f 100644
--- a/drivers/event/octeontx/timvf_evdev.c
+++ b/drivers/event/octeontx/timvf_evdev.c
@@ -407,18 +407,19 @@ timvf_stats_reset(const struct rte_event_timer_adapter 
*adapter)
return 0;
 }

-static struct rte_event_timer_adapter_ops timvf_ops = {
-   .init   = timvf_ring_create,
-   .uninit = timvf_ring_free,
-   .start  = timvf_ring_start,
-   .stop   = timvf_ring_stop,
-   .get_info   = timvf_ring_info_get,
+static struct event_timer_adapter_ops timvf_ops = {
+   .init = timvf_ring_create,
+   .uninit = timvf_ring_free,
+   .start = timvf_ring_start,
+   .stop = timvf_ring_stop,
+   .get_info = timvf_ring_info_get,
 };

 int
 timvf_timer_adapter_caps_get(const struct rte_eventdev *dev, uint64_t flags,
-   uint3

[dpdk-dev] [PATCH v2 07/13] eventdev: hide timer adapter PMD file

[pbhagavatula]

From: Pavan Nikhilesh 

Hide rte_event_timer_adapter_pmd.h file as it is an internal file.
Remove rte_ prefix from rte_event_timer_adapter_ops structure.

Signed-off-by: Pavan Nikhilesh 
---
 drivers/event/cnxk/cnxk_tim_evdev.c   |  5 ++--
 drivers/event/cnxk/cnxk_tim_evdev.h   |  2 +-
 drivers/event/dsw/dsw_evdev.c |  4 +--
 drivers/event/octeontx/ssovf_evdev.c  |  2 +-
 drivers/event/octeontx/timvf_evdev.c  | 17 ++-
 drivers/event/octeontx/timvf_evdev.h  |  9 +++---
 drivers/event/octeontx2/otx2_tim_evdev.c  |  5 ++--
 drivers/event/octeontx2/otx2_tim_evdev.h  |  4 +--
 drivers/event/sw/sw_evdev.c   |  5 ++--
 ...dapter_pmd.h => event_timer_adapter_pmd.h} |  8 ++---
 lib/eventdev/eventdev_pmd.h   |  8 ++---
 lib/eventdev/meson.build  |  2 +-
 lib/eventdev/rte_event_timer_adapter.c| 30 +--
 lib/eventdev/rte_event_timer_adapter.h|  2 +-
 lib/eventdev/rte_eventdev.c   |  2 +-
 15 files changed, 51 insertions(+), 54 deletions(-)
 rename lib/eventdev/{rte_event_timer_adapter_pmd.h => 
event_timer_adapter_pmd.h} (95%)

diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c 
b/drivers/event/cnxk/cnxk_tim_evdev.c
index 9d40e336d7..10634c31e3 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.c
+++ b/drivers/event/cnxk/cnxk_tim_evdev.c
@@ -5,7 +5,7 @@
 #include "cnxk_eventdev.h"
 #include "cnxk_tim_evdev.h"
 
-static struct rte_event_timer_adapter_ops cnxk_tim_ops;
+static struct event_timer_adapter_ops cnxk_tim_ops;
 
 static int
 cnxk_tim_chnk_pool_create(struct cnxk_tim_ring *tim_ring,
@@ -353,8 +353,7 @@ cnxk_tim_stats_reset(const struct rte_event_timer_adapter 
*adapter)
 
 int
 cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
- uint32_t *caps,
- const struct rte_event_timer_adapter_ops **ops)
+ uint32_t *caps, const struct event_timer_adapter_ops **ops)
 {
struct cnxk_tim_evdev *dev = cnxk_tim_priv_get();
 
diff --git a/drivers/event/cnxk/cnxk_tim_evdev.h 
b/drivers/event/cnxk/cnxk_tim_evdev.h
index c369f6f472..91e163eb5a 100644
--- a/drivers/event/cnxk/cnxk_tim_evdev.h
+++ b/drivers/event/cnxk/cnxk_tim_evdev.h
@@ -267,7 +267,7 @@ cnxk_tim_timer_cancel_burst(const struct 
rte_event_timer_adapter *adptr,
 
 int cnxk_tim_caps_get(const struct rte_eventdev *dev, uint64_t flags,
  uint32_t *caps,
- const struct rte_event_timer_adapter_ops **ops);
+ const struct event_timer_adapter_ops **ops);
 
 void cnxk_tim_init(struct roc_sso *sso);
 void cnxk_tim_fini(void);
diff --git a/drivers/event/dsw/dsw_evdev.c b/drivers/event/dsw/dsw_evdev.c
index 01f060fff3..e9d33ad36b 100644
--- a/drivers/event/dsw/dsw_evdev.c
+++ b/drivers/event/dsw/dsw_evdev.c
@@ -381,8 +381,8 @@ dsw_eth_rx_adapter_caps_get(const struct rte_eventdev *dev 
__rte_unused,
 
 static int
 dsw_timer_adapter_caps_get(const struct rte_eventdev *dev __rte_unused,
-  uint64_t flags  __rte_unused, uint32_t *caps,
-  const struct rte_event_timer_adapter_ops **ops)
+  uint64_t flags __rte_unused, uint32_t *caps,
+  const struct event_timer_adapter_ops **ops)
 {
*caps = 0;
*ops = NULL;
diff --git a/drivers/event/octeontx/ssovf_evdev.c 
b/drivers/event/octeontx/ssovf_evdev.c
index 4a8c6a13a5..e7aecd4139 100644
--- a/drivers/event/octeontx/ssovf_evdev.c
+++ b/drivers/event/octeontx/ssovf_evdev.c
@@ -721,7 +721,7 @@ ssovf_parsekv(const char *key __rte_unused, const char 
*value, void *opaque)
 
 static int
 ssovf_timvf_caps_get(const struct rte_eventdev *dev, uint64_t flags,
-   uint32_t *caps, const struct rte_event_timer_adapter_ops **ops)
+uint32_t *caps, const struct event_timer_adapter_ops **ops)
 {
return timvf_timer_adapter_caps_get(dev, flags, caps, ops,
timvf_enable_stats);
diff --git a/drivers/event/octeontx/timvf_evdev.c 
b/drivers/event/octeontx/timvf_evdev.c
index 688e9daa66..1f1cda3f7f 100644
--- a/drivers/event/octeontx/timvf_evdev.c
+++ b/drivers/event/octeontx/timvf_evdev.c
@@ -407,18 +407,19 @@ timvf_stats_reset(const struct rte_event_timer_adapter 
*adapter)
return 0;
 }
 
-static struct rte_event_timer_adapter_ops timvf_ops = {
-   .init   = timvf_ring_create,
-   .uninit = timvf_ring_free,
-   .start  = timvf_ring_start,
-   .stop   = timvf_ring_stop,
-   .get_info   = timvf_ring_info_get,
+static struct event_timer_adapter_ops timvf_ops = {
+   .init = timvf_ring_create,
+   .uninit = timvf_ring_free,
+   .start = timvf_ring_start,
+   .stop = timvf_ring_stop,
+   .get_info = timvf_ring_info_get,
 };
 
 int
 timvf_timer_adapter_caps_get(const struct rte_eventdev *dev, uint64_t flags,
-  

[dpdk-dev] [PATCH v2 08/13] eventdev: remove rte prefix for internal structs

[pbhagavatula]

From: Pavan Nikhilesh 

Remove rte_ prefix from rte_eth_event_enqueue_buffer,
rte_event_eth_rx_adapter and rte_event_crypto_adapter
as they are only used in rte_event_eth_rx_adapter.c and
rte_event_crypto_adapter.c

Signed-off-by: Pavan Nikhilesh 
Acked-by: Jay Jayatheerthan 
---
 lib/eventdev/rte_event_crypto_adapter.c |  66 +++
 lib/eventdev/rte_event_eth_rx_adapter.c | 249 ++--
 lib/eventdev/rte_eventdev.h |   2 +-
 3 files changed, 141 insertions(+), 176 deletions(-)

diff --git a/lib/eventdev/rte_event_crypto_adapter.c 
b/lib/eventdev/rte_event_crypto_adapter.c
index ebfc8326a8..e9e660a3d2 100644
--- a/lib/eventdev/rte_event_crypto_adapter.c
+++ b/lib/eventdev/rte_event_crypto_adapter.c
@@ -30,7 +30,7 @@
  */
 #define CRYPTO_ENQ_FLUSH_THRESHOLD 1024
 
-struct rte_event_crypto_adapter {
+struct event_crypto_adapter {
/* Event device identifier */
uint8_t eventdev_id;
/* Event port identifier */
@@ -99,7 +99,7 @@ struct crypto_queue_pair_info {
uint8_t len;
 } __rte_cache_aligned;
 
-static struct rte_event_crypto_adapter **event_crypto_adapter;
+static struct event_crypto_adapter **event_crypto_adapter;
 
 /* Macros to check for valid adapter */
 #define EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, retval) do { \
@@ -141,7 +141,7 @@ eca_init(void)
return 0;
 }
 
-static inline struct rte_event_crypto_adapter *
+static inline struct event_crypto_adapter *
 eca_id_to_adapter(uint8_t id)
 {
return event_crypto_adapter ?
@@ -158,7 +158,7 @@ eca_default_config_cb(uint8_t id, uint8_t dev_id,
int started;
int ret;
struct rte_event_port_conf *port_conf = arg;
-   struct rte_event_crypto_adapter *adapter = eca_id_to_adapter(id);
+   struct event_crypto_adapter *adapter = eca_id_to_adapter(id);
 
if (adapter == NULL)
return -EINVAL;
@@ -202,7 +202,7 @@ rte_event_crypto_adapter_create_ext(uint8_t id, uint8_t 
dev_id,
enum rte_event_crypto_adapter_mode mode,
void *conf_arg)
 {
-   struct rte_event_crypto_adapter *adapter;
+   struct event_crypto_adapter *adapter;
char mem_name[CRYPTO_ADAPTER_NAME_LEN];
struct rte_event_dev_info dev_info;
int socket_id;
@@ -304,7 +304,7 @@ rte_event_crypto_adapter_create(uint8_t id, uint8_t dev_id,
 int
 rte_event_crypto_adapter_free(uint8_t id)
 {
-   struct rte_event_crypto_adapter *adapter;
+   struct event_crypto_adapter *adapter;
 
EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, -EINVAL);
 
@@ -329,8 +329,8 @@ rte_event_crypto_adapter_free(uint8_t id)
 }
 
 static inline unsigned int
-eca_enq_to_cryptodev(struct rte_event_crypto_adapter *adapter,
-struct rte_event *ev, unsigned int cnt)
+eca_enq_to_cryptodev(struct event_crypto_adapter *adapter, struct rte_event 
*ev,
+unsigned int cnt)
 {
struct rte_event_crypto_adapter_stats *stats = &adapter->crypto_stats;
union rte_event_crypto_metadata *m_data = NULL;
@@ -420,7 +420,7 @@ eca_enq_to_cryptodev(struct rte_event_crypto_adapter 
*adapter,
 }
 
 static unsigned int
-eca_crypto_enq_flush(struct rte_event_crypto_adapter *adapter)
+eca_crypto_enq_flush(struct event_crypto_adapter *adapter)
 {
struct rte_event_crypto_adapter_stats *stats = &adapter->crypto_stats;
struct crypto_device_info *curr_dev;
@@ -466,8 +466,8 @@ eca_crypto_enq_flush(struct rte_event_crypto_adapter 
*adapter)
 }
 
 static int
-eca_crypto_adapter_enq_run(struct rte_event_crypto_adapter *adapter,
-   unsigned int max_enq)
+eca_crypto_adapter_enq_run(struct event_crypto_adapter *adapter,
+  unsigned int max_enq)
 {
struct rte_event_crypto_adapter_stats *stats = &adapter->crypto_stats;
struct rte_event ev[BATCH_SIZE];
@@ -500,8 +500,8 @@ eca_crypto_adapter_enq_run(struct rte_event_crypto_adapter 
*adapter,
 }
 
 static inline void
-eca_ops_enqueue_burst(struct rte_event_crypto_adapter *adapter,
- struct rte_crypto_op **ops, uint16_t num)
+eca_ops_enqueue_burst(struct event_crypto_adapter *adapter,
+ struct rte_crypto_op **ops, uint16_t num)
 {
struct rte_event_crypto_adapter_stats *stats = &adapter->crypto_stats;
union rte_event_crypto_metadata *m_data = NULL;
@@ -564,8 +564,8 @@ eca_ops_enqueue_burst(struct rte_event_crypto_adapter 
*adapter,
 }
 
 static inline unsigned int
-eca_crypto_adapter_deq_run(struct rte_event_crypto_adapter *adapter,
-   unsigned int max_deq)
+eca_crypto_adapter_deq_run(struct event_crypto_adapter *adapter,
+  unsigned int max_deq)
 {
struct rte_event_crypto_adapter_stats *stats = &adapter->crypto_stats;
struct crypto_device_info *curr_dev;
@@ -627,8 +627,8 @@ eca_crypto_adapter_deq_run(struct rte_event_crypto_adapter 
*adapter,
 }
 
 static void
-eca_cryp

[dpdk-dev] [PATCH v2 09/13] eventdev: rearrange fields in timer object

[pbhagavatula]

From: Pavan Nikhilesh 

Rearrange fields in rte_event_timer data structure to remove holes.
Also, remove use of volatile from rte_event_timer.

Signed-off-by: Pavan Nikhilesh 
---
 lib/eventdev/rte_event_timer_adapter.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eventdev/rte_event_timer_adapter.h 
b/lib/eventdev/rte_event_timer_adapter.h
index cad6d3b4c5..1551741820 100644
--- a/lib/eventdev/rte_event_timer_adapter.h
+++ b/lib/eventdev/rte_event_timer_adapter.h
@@ -475,8 +475,6 @@ struct rte_event_timer {
 *  - op: RTE_EVENT_OP_NEW
 *  - event_type: RTE_EVENT_TYPE_TIMER
 */
-   volatile enum rte_event_timer_state state;
-   /**< State of the event timer. */
uint64_t timeout_ticks;
/**< Expiry timer ticks expressed in number of *timer_ticks_ns* from
 * now.
@@ -488,6 +486,8 @@ struct rte_event_timer {
 * implementation specific values to share between the arm and cancel
 * operations.  The application should not modify this field.
 */
+   enum rte_event_timer_state state;
+   /**< State of the event timer. */
uint8_t user_meta[0];
/**< Memory to store user specific metadata.
 * The event timer adapter implementation should not modify this area.
-- 
2.17.1

[dpdk-dev] [PATCH v2 10/13] eventdev: move timer adapters memory to hugepage

[pbhagavatula]

From: Pavan Nikhilesh 

Move memory used by timer adapters to hugepage.
Allocate memory on the first adapter create or lookup to address
both primary and secondary process usecases.
This will prevent TLB misses if any and aligns to memory structure
of other subsystems.

Signed-off-by: Pavan Nikhilesh 
---
 lib/eventdev/rte_event_timer_adapter.c | 24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/eventdev/rte_event_timer_adapter.c 
b/lib/eventdev/rte_event_timer_adapter.c
index ae55407042..c4dc7a5fd4 100644
--- a/lib/eventdev/rte_event_timer_adapter.c
+++ b/lib/eventdev/rte_event_timer_adapter.c
@@ -33,7 +33,7 @@ RTE_LOG_REGISTER_SUFFIX(evtim_logtype, adapter.timer, NOTICE);
 RTE_LOG_REGISTER_SUFFIX(evtim_buffer_logtype, adapter.timer, NOTICE);
 RTE_LOG_REGISTER_SUFFIX(evtim_svc_logtype, adapter.timer.svc, NOTICE);
 
-static struct rte_event_timer_adapter 
adapters[RTE_EVENT_TIMER_ADAPTER_NUM_MAX];
+static struct rte_event_timer_adapter *adapters;
 
 static const struct event_timer_adapter_ops swtim_ops;
 
@@ -138,6 +138,17 @@ rte_event_timer_adapter_create_ext(
int n, ret;
struct rte_eventdev *dev;
 
+   if (adapters == NULL) {
+   adapters = rte_zmalloc("Eventdev",
+  sizeof(struct rte_event_timer_adapter) *
+  RTE_EVENT_TIMER_ADAPTER_NUM_MAX,
+  RTE_CACHE_LINE_SIZE);
+   if (adapters == NULL) {
+   rte_errno = ENOMEM;
+   return NULL;
+   }
+   }
+
if (conf == NULL) {
rte_errno = EINVAL;
return NULL;
@@ -312,6 +323,17 @@ rte_event_timer_adapter_lookup(uint16_t adapter_id)
int ret;
struct rte_eventdev *dev;
 
+   if (adapters == NULL) {
+   adapters = rte_zmalloc("Eventdev",
+  sizeof(struct rte_event_timer_adapter) *
+  RTE_EVENT_TIMER_ADAPTER_NUM_MAX,
+  RTE_CACHE_LINE_SIZE);
+   if (adapters == NULL) {
+   rte_errno = ENOMEM;
+   return NULL;
+   }
+   }
+
if (adapters[adapter_id].allocated)
return &adapters[adapter_id]; /* Adapter is already loaded */
 
-- 
2.17.1

[dpdk-dev] [PATCH v2 11/13] eventdev: promote event vector API to stable

[pbhagavatula]

From: Pavan Nikhilesh 

Promote event vector configuration APIs to stable.

Signed-off-by: Pavan Nikhilesh 
Acked-by: Jay Jayatheerthan 
Acked-by: Ray Kinsella 
---
 lib/eventdev/rte_event_eth_rx_adapter.h | 2 --
 lib/eventdev/rte_eventdev.h | 1 -
 lib/eventdev/version.map| 6 +++---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/eventdev/rte_event_eth_rx_adapter.h 
b/lib/eventdev/rte_event_eth_rx_adapter.h
index 182dd2e5dd..d13d817025 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.h
+++ b/lib/eventdev/rte_event_eth_rx_adapter.h
@@ -543,7 +543,6 @@ int rte_event_eth_rx_adapter_cb_register(uint8_t id, 
uint16_t eth_dev_id,
  *  - 0: Success.
  *  - <0: Error code on failure.
  */
-__rte_experimental
 int rte_event_eth_rx_adapter_vector_limits_get(
uint8_t dev_id, uint16_t eth_port_id,
struct rte_event_eth_rx_adapter_vector_limits *limits);
@@ -570,7 +569,6 @@ int rte_event_eth_rx_adapter_vector_limits_get(
  *  - 0: Success, Receive queue configured correctly.
  *  - <0: Error code on failure.
  */
-__rte_experimental
 int rte_event_eth_rx_adapter_queue_event_vector_config(
uint8_t id, uint16_t eth_dev_id, int32_t rx_queue_id,
struct rte_event_eth_rx_adapter_event_vector_config *config);
diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
index f1fcd6ce3d..14d4d9ec81 100644
--- a/lib/eventdev/rte_eventdev.h
+++ b/lib/eventdev/rte_eventdev.h
@@ -1734,7 +1734,6 @@ int rte_event_dev_selftest(uint8_t dev_id);
  *- ENOMEM - no appropriate memory area found in which to create memzone
  *- ENAMETOOLONG - mempool name requested is too long.
  */
-__rte_experimental
 struct rte_mempool *
 rte_event_vector_pool_create(const char *name, unsigned int n,
 unsigned int cache_size, uint16_t nb_elem,
diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map
index 33ab447d4b..9c040fea0a 100644
--- a/lib/eventdev/version.map
+++ b/lib/eventdev/version.map
@@ -38,10 +38,12 @@ DPDK_22 {
rte_event_eth_rx_adapter_free;
rte_event_eth_rx_adapter_queue_add;
rte_event_eth_rx_adapter_queue_del;
+   rte_event_eth_rx_adapter_queue_event_vector_config;
rte_event_eth_rx_adapter_service_id_get;
rte_event_eth_rx_adapter_start;
rte_event_eth_rx_adapter_stats_get;
rte_event_eth_rx_adapter_stats_reset;
+   rte_event_eth_rx_adapter_vector_limits_get;
rte_event_eth_rx_adapter_stop;
rte_event_eth_tx_adapter_caps_get;
rte_event_eth_tx_adapter_create;
@@ -83,6 +85,7 @@ DPDK_22 {
rte_event_timer_arm_burst;
rte_event_timer_arm_tmo_tick_burst;
rte_event_timer_cancel_burst;
+   rte_event_vector_pool_create;
rte_eventdevs;
 
#added in 21.11
@@ -135,9 +138,6 @@ EXPERIMENTAL {
__rte_eventdev_trace_port_setup;
 
#added in 21.05
-   rte_event_vector_pool_create;
-   rte_event_eth_rx_adapter_vector_limits_get;
-   rte_event_eth_rx_adapter_queue_event_vector_config;
__rte_eventdev_trace_crypto_adapter_enqueue;
 };
 
-- 
2.17.1

[dpdk-dev] [PATCH v2 12/13] eventdev: make trace APIs internal

[pbhagavatula]

From: Pavan Nikhilesh 

Slowpath trace APIs are only used in rte_eventdev.c so make them
as internal.

Signed-off-by: Pavan Nikhilesh 
Acked-by: Jay Jayatheerthan 
---
 lib/eventdev/{rte_eventdev_trace.h => eventdev_trace.h} | 0
 lib/eventdev/eventdev_trace_points.c| 2 +-
 lib/eventdev/meson.build| 2 +-
 lib/eventdev/rte_event_crypto_adapter.c | 2 +-
 lib/eventdev/rte_event_eth_rx_adapter.c | 2 +-
 lib/eventdev/rte_event_eth_tx_adapter.c | 2 +-
 lib/eventdev/rte_event_timer_adapter.c  | 2 +-
 lib/eventdev/rte_eventdev.c | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename lib/eventdev/{rte_eventdev_trace.h => eventdev_trace.h} (100%)

diff --git a/lib/eventdev/rte_eventdev_trace.h b/lib/eventdev/eventdev_trace.h
similarity index 100%
rename from lib/eventdev/rte_eventdev_trace.h
rename to lib/eventdev/eventdev_trace.h
diff --git a/lib/eventdev/eventdev_trace_points.c 
b/lib/eventdev/eventdev_trace_points.c
index 3867ec8008..237d9383fd 100644
--- a/lib/eventdev/eventdev_trace_points.c
+++ b/lib/eventdev/eventdev_trace_points.c
@@ -4,7 +4,7 @@
 
 #include 
 
-#include "rte_eventdev_trace.h"
+#include "eventdev_trace.h"
 
 /* Eventdev trace points */
 RTE_TRACE_POINT_REGISTER(rte_eventdev_trace_configure,
diff --git a/lib/eventdev/meson.build b/lib/eventdev/meson.build
index f19b831edd..c750e0214f 100644
--- a/lib/eventdev/meson.build
+++ b/lib/eventdev/meson.build
@@ -19,7 +19,6 @@ sources = files(
 )
 headers = files(
 'rte_eventdev.h',
-'rte_eventdev_trace.h',
 'rte_eventdev_trace_fp.h',
 'rte_event_ring.h',
 'rte_event_eth_rx_adapter.h',
@@ -34,6 +33,7 @@ driver_sdk_headers += files(
 'eventdev_pmd.h',
 'eventdev_pmd_pci.h',
 'eventdev_pmd_vdev.h',
+'eventdev_trace.h',
 'event_timer_adapter_pmd.h',
 )
 
diff --git a/lib/eventdev/rte_event_crypto_adapter.c 
b/lib/eventdev/rte_event_crypto_adapter.c
index e9e660a3d2..ae1151fb75 100644
--- a/lib/eventdev/rte_event_crypto_adapter.c
+++ b/lib/eventdev/rte_event_crypto_adapter.c
@@ -16,7 +16,7 @@
 
 #include "rte_eventdev.h"
 #include "eventdev_pmd.h"
-#include "rte_eventdev_trace.h"
+#include "eventdev_trace.h"
 #include "rte_event_crypto_adapter.h"
 
 #define BATCH_SIZE 32
diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c 
b/lib/eventdev/rte_event_eth_rx_adapter.c
index f8225ebd3d..7e97fbd21d 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -20,7 +20,7 @@
 
 #include "rte_eventdev.h"
 #include "eventdev_pmd.h"
-#include "rte_eventdev_trace.h"
+#include "eventdev_trace.h"
 #include "rte_event_eth_rx_adapter.h"
 
 #define BATCH_SIZE 32
diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c 
b/lib/eventdev/rte_event_eth_tx_adapter.c
index 18c0359db7..ee3631bced 100644
--- a/lib/eventdev/rte_event_eth_tx_adapter.c
+++ b/lib/eventdev/rte_event_eth_tx_adapter.c
@@ -6,7 +6,7 @@
 #include 
 
 #include "eventdev_pmd.h"
-#include "rte_eventdev_trace.h"
+#include "eventdev_trace.h"
 #include "rte_event_eth_tx_adapter.h"
 
 #define TXA_BATCH_SIZE 32
diff --git a/lib/eventdev/rte_event_timer_adapter.c 
b/lib/eventdev/rte_event_timer_adapter.c
index c4dc7a5fd4..7404b0cbb2 100644
--- a/lib/eventdev/rte_event_timer_adapter.c
+++ b/lib/eventdev/rte_event_timer_adapter.c
@@ -24,7 +24,7 @@
 #include "eventdev_pmd.h"
 #include "rte_event_timer_adapter.h"
 #include "rte_eventdev.h"
-#include "rte_eventdev_trace.h"
+#include "eventdev_trace.h"
 
 #define DATA_MZ_NAME_MAX_LEN 64
 #define DATA_MZ_NAME_FORMAT "rte_event_timer_adapter_data_%d"
diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
index 8de5f8b47f..7deaa5333c 100644
--- a/lib/eventdev/rte_eventdev.c
+++ b/lib/eventdev/rte_eventdev.c
@@ -36,7 +36,7 @@
 
 #include "rte_eventdev.h"
 #include "eventdev_pmd.h"
-#include "rte_eventdev_trace.h"
+#include "eventdev_trace.h"
 
 static struct rte_eventdev rte_event_devices[RTE_EVENT_MAX_DEVS];
 
-- 
2.17.1

[dpdk-dev] [PATCH v2 13/13] eventdev: mark trace variables as internal

[pbhagavatula]

From: Pavan Nikhilesh 

Mark rte_trace global variables as internal i.e. remove them
from experimental section of version map.
Some of them are used in inline APIs, mark those as global.

Signed-off-by: Pavan Nikhilesh 
Acked-by: Ray Kinsella 
---
 lib/eventdev/version.map | 77 ++--
 1 file changed, 35 insertions(+), 42 deletions(-)

diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map
index 9c040fea0a..d21adedf14 100644
--- a/lib/eventdev/version.map
+++ b/lib/eventdev/version.map
@@ -88,57 +88,19 @@ DPDK_22 {
rte_event_vector_pool_create;
rte_eventdevs;
 
-   #added in 21.11
-   rte_event_fp_ops;
-
-   local: *;
-};
-
-EXPERIMENTAL {
-   global:
-
# added in 20.05
-   __rte_eventdev_trace_configure;
-   __rte_eventdev_trace_queue_setup;
-   __rte_eventdev_trace_port_link;
-   __rte_eventdev_trace_port_unlink;
-   __rte_eventdev_trace_start;
-   __rte_eventdev_trace_stop;
-   __rte_eventdev_trace_close;
+   __rte_eventdev_trace_crypto_adapter_enqueue;
__rte_eventdev_trace_deq_burst;
__rte_eventdev_trace_enq_burst;
-   __rte_eventdev_trace_eth_rx_adapter_create;
-   __rte_eventdev_trace_eth_rx_adapter_free;
-   __rte_eventdev_trace_eth_rx_adapter_queue_add;
-   __rte_eventdev_trace_eth_rx_adapter_queue_del;
-   __rte_eventdev_trace_eth_rx_adapter_start;
-   __rte_eventdev_trace_eth_rx_adapter_stop;
-   __rte_eventdev_trace_eth_tx_adapter_create;
-   __rte_eventdev_trace_eth_tx_adapter_free;
-   __rte_eventdev_trace_eth_tx_adapter_queue_add;
-   __rte_eventdev_trace_eth_tx_adapter_queue_del;
-   __rte_eventdev_trace_eth_tx_adapter_start;
-   __rte_eventdev_trace_eth_tx_adapter_stop;
__rte_eventdev_trace_eth_tx_adapter_enqueue;
-   __rte_eventdev_trace_timer_adapter_create;
-   __rte_eventdev_trace_timer_adapter_start;
-   __rte_eventdev_trace_timer_adapter_stop;
-   __rte_eventdev_trace_timer_adapter_free;
__rte_eventdev_trace_timer_arm_burst;
__rte_eventdev_trace_timer_arm_tmo_tick_burst;
__rte_eventdev_trace_timer_cancel_burst;
-   __rte_eventdev_trace_crypto_adapter_create;
-   __rte_eventdev_trace_crypto_adapter_free;
-   __rte_eventdev_trace_crypto_adapter_queue_pair_add;
-   __rte_eventdev_trace_crypto_adapter_queue_pair_del;
-   __rte_eventdev_trace_crypto_adapter_start;
-   __rte_eventdev_trace_crypto_adapter_stop;
 
-   # changed in 20.11
-   __rte_eventdev_trace_port_setup;
+   #added in 21.11
+   rte_event_fp_ops;
 
-   #added in 21.05
-   __rte_eventdev_trace_crypto_adapter_enqueue;
+   local: *;
 };
 
 INTERNAL {
@@ -156,4 +118,35 @@ INTERNAL {
rte_event_pmd_release;
rte_event_pmd_vdev_init;
rte_event_pmd_vdev_uninit;
+
+   __rte_eventdev_trace_close;
+   __rte_eventdev_trace_configure;
+   __rte_eventdev_trace_crypto_adapter_create;
+   __rte_eventdev_trace_crypto_adapter_free;
+   __rte_eventdev_trace_crypto_adapter_queue_pair_add;
+   __rte_eventdev_trace_crypto_adapter_queue_pair_del;
+   __rte_eventdev_trace_crypto_adapter_start;
+   __rte_eventdev_trace_crypto_adapter_stop;
+   __rte_eventdev_trace_eth_rx_adapter_create;
+   __rte_eventdev_trace_eth_rx_adapter_free;
+   __rte_eventdev_trace_eth_rx_adapter_queue_add;
+   __rte_eventdev_trace_eth_rx_adapter_queue_del;
+   __rte_eventdev_trace_eth_rx_adapter_start;
+   __rte_eventdev_trace_eth_rx_adapter_stop;
+   __rte_eventdev_trace_eth_tx_adapter_create;
+   __rte_eventdev_trace_eth_tx_adapter_free;
+   __rte_eventdev_trace_eth_tx_adapter_queue_add;
+   __rte_eventdev_trace_eth_tx_adapter_queue_del;
+   __rte_eventdev_trace_eth_tx_adapter_start;
+   __rte_eventdev_trace_eth_tx_adapter_stop;
+   __rte_eventdev_trace_port_link;
+   __rte_eventdev_trace_port_setup;
+   __rte_eventdev_trace_port_unlink;
+   __rte_eventdev_trace_queue_setup;
+   __rte_eventdev_trace_start;
+   __rte_eventdev_trace_stop;
+   __rte_eventdev_trace_timer_adapter_create;
+   __rte_eventdev_trace_timer_adapter_free;
+   __rte_eventdev_trace_timer_adapter_start;
+   __rte_eventdev_trace_timer_adapter_stop;
 };
-- 
2.17.1

Re: [dpdk-dev] [PATCH v3 1/5] ethdev: add API to negotiate delivery of Rx meta data

[Ivan Malov]

Hi Ori,

Thanks for reviewing this.

On 03/10/2021 10:42, Ori Kam wrote:

Hi Andrew and Ivan,



-Original Message-
From: Andrew Rybchenko 
Sent: Friday, October 1, 2021 9:50 AM
Subject: Re: [PATCH v3 1/5] ethdev: add API to negotiate delivery of Rx meta
data

On 9/30/21 10:07 PM, Ivan Malov wrote:

Hi Ori,

On 30/09/2021 17:59, Ori Kam wrote:

Hi Ivan,
Sorry for jumping in late.


No worries. That's OK.


I have a concern that this patch breaks other PMDs.


It does no such thing.


 From the rst file " One should negotiate flag delivery beforehand"

since you only added this function for your PMD all other PMD will fail.
I see that you added exception in the  examples, but it doesn't make
sense that applications will also need to add this exception which is
not documented.


Say, you have an application, and you use it with some specific PMD.
Say, that PMD doesn't run into the problem as ours does. In other
words, the user can insert a flow with action MARK at any point and
get mark delivery working starting from that moment without any
problem. Say, this is exactly the way how it works for you at the moment.

Now. This new API kicks in. We update the application to invoke it as
early as possible. But your PMD in question still doesn't support this
API. The comment in the patch says that if the method returns ENOTSUP,
the application should ignore that without batting an eyelid. It
should just keep on working as it did before the introduction of this API.



I understand that it is nice to write in the patch comment that application
should disregard this function in case of
ENOTSUP but in a few month someone will read the official doc,
where it is stated that this function call is a must and then what do you
think the application will do?
I think that the correct way is to add this function to all PMDs.
Another option is to add to the doc that if the function is returning ENOTSUP
the application should assume that all is supported.
  
So from this point of view there is API break.


So, you mean an API breakage in some formal sense? If the doc is fixed 
in accordance with the second option you suggest, will it suffice to 
avoid this formal API breakage?





More specific example:
Say, the application doesn't mind using either "RSS + MARK" or tunnel
offload. What it does right now is attempt to insert tunnel flows
first and, if this fails, fall back to "RSS + MARK". With this API,
the application will try to invoke this API with "USER_MARK |
TUNNEL_ID" in adapter initialised state. If the PMD says that it can
only enable the tunnel offload, then the application will get the
knowledge that it doesn't make sense to even try inserting "RSS +
MARK" flows. It just can skip useless actions. But if the PMD doesn't
support the method, the application will see ENOTSUP and handle this
gracefully: it will make no assumptions about what's guaranteed to be
supported and what's not and will just keep on its old behavior: try
to insert a flow, fail, fall back to another type of flow.



I fully agree with your example, and think that this is the way
to go, application should supply as much info as possible during startup.


Right.


My question/comment is the negotiated result means that all of the actions
are supported on the same rule?
for example if application wants to add mark and tag on the same rule.
(I know it doesn't make much sense) and the PMD can support both of them
but not on the same rule, what should it return?
Or for example if using the mark can only be supported if no decap action is set
on this rule what should be the result?
 From my undstanding this function is only to let the PMD know that on some
rules the application will use those actions, the checking if the action 
combination
is valid only happens on validate function right?


This API does not bind itself to flow API. It's *not* about enabling 
support for metadata *actions* (they are conducted entirely *inside* the 
NIC). It's about enabling *delivery* of metadata from the NIC to host.


Say, you insert a flow rule to mark some packets. The NIC, internally 
(in the e-switch) adds the mark to matching packets. Yes, in the 
boundaries of the NIC HW, the packets bear the mark on them. It has been 
set, yes. But when time comes to *deliver* the packets to the host, the 
NIC (at least, in net/sfc case) has two options: either provide only a 
small chunk of the metadata for each packet *to the host*, which doesn't 
include mark ID, flag and RSS hash, OR, alternatively, provide the full 
set of metadata. In the former option, the mark is simply not delivered. 
Once again: it *has been set*, but simply will not be *delivered to the 
host*.


So, this API is about negotiating *delivery* of metadata. In pure 
technical sense. And the set of flags that this API returns indicates 
which kinds of metadata the NIC will be able to deliver simultaneously.


For example, as I understand, in the case of tunnel offload, MLX5 claims 
Rx mark entirel

Re: [dpdk-dev] [PATCH] test/event_crypto: fix event crypto metadata write

[Gujjar, Abhinandan S]

Acked-by: Abhinandan Gujjar 

> -Original Message-
> From: Shijith Thotton 
> Sent: Monday, September 27, 2021 8:59 PM
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; Shijith Thotton ;
> jer...@marvell.com; ano...@marvell.com; Gujjar, Abhinandan S
> 
> Subject: [PATCH] test/event_crypto: fix event crypto metadata write
> 
> Using memcpy to update event crypto metadata fields (request/response)
> will result in one overwriting the other. To avoid this, fields of each 
> structure
> should be updated one by one.
> 
> Fixes: 3c2c535ecfc0 ("test: add event crypto adapter auto-test")
> 
> Signed-off-by: Shijith Thotton 
> ---
>  app/test/test_event_crypto_adapter.c | 21 +
>  1 file changed, 9 insertions(+), 12 deletions(-)
> 
> diff --git a/app/test/test_event_crypto_adapter.c
> b/app/test/test_event_crypto_adapter.c
> index 279aa3abf5..3d7e9fb93c 100644
> --- a/app/test/test_event_crypto_adapter.c
> +++ b/app/test/test_event_crypto_adapter.c
> @@ -212,10 +212,10 @@ test_op_forward_mode(uint8_t session_less)
> 
>   if (cap &
> RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA) {
>   /* Fill in private user data information */
> - rte_memcpy(&m_data.response_info,
> &response_info,
> - sizeof(response_info));
> - rte_memcpy(&m_data.request_info, &request_info,
> - sizeof(request_info));
> + m_data.request_info.cdev_id =
> request_info.cdev_id;
> + m_data.request_info.queue_pair_id =
> + request_info.queue_pair_id;
> + m_data.response_info.event =
> response_info.event;
>   rte_cryptodev_sym_session_set_user_data(sess,
>   &m_data, sizeof(m_data));
>   }
> @@ -231,10 +231,9 @@ test_op_forward_mode(uint8_t session_less)
>   uint32_t len = IV_OFFSET + MAXIMUM_IV_LENGTH;
>   op->private_data_offset = len;
>   /* Fill in private data information */
> - rte_memcpy(&m_data.response_info, &response_info,
> -sizeof(response_info));
> - rte_memcpy(&m_data.request_info, &request_info,
> -sizeof(request_info));
> + m_data.request_info.cdev_id = request_info.cdev_id;
> + m_data.request_info.queue_pair_id =
> request_info.queue_pair_id;
> + m_data.response_info.event = response_info.event;
>   rte_memcpy((uint8_t *)op + len, &m_data, sizeof(m_data));
>   }
> 
> @@ -405,8 +404,7 @@ test_op_new_mode(uint8_t session_less)
> 
>   if (cap &
> RTE_EVENT_CRYPTO_ADAPTER_CAP_SESSION_PRIVATE_DATA) {
>   /* Fill in private user data information */
> - rte_memcpy(&m_data.response_info,
> &response_info,
> -sizeof(m_data));
> + m_data.response_info.event =
> response_info.event;
>   rte_cryptodev_sym_session_set_user_data(sess,
>   &m_data, sizeof(m_data));
>   }
> @@ -425,8 +423,7 @@ test_op_new_mode(uint8_t session_less)
>   uint32_t len = IV_OFFSET + MAXIMUM_IV_LENGTH;
>   op->private_data_offset = len;
>   /* Fill in private data information */
> - rte_memcpy(&m_data.response_info, &response_info,
> -sizeof(m_data));
> + m_data.response_info.event = response_info.event;
>   rte_memcpy((uint8_t *)op + len, &m_data, sizeof(m_data));
>   }
> 
> --
> 2.25.1

Re: [dpdk-dev] [PATCH v4] doc: remove event crypto metadata deprecation note

[Gujjar, Abhinandan S]

Acked-by: Abhinandan Gujjar 

> -Original Message-
> From: Shijith Thotton 
> Sent: Monday, September 27, 2021 8:53 PM
> To: dev@dpdk.org
> Cc: Shijith Thotton ; Gujjar, Abhinandan S
> ; adwiv...@marvell.com;
> ano...@marvell.com; gak...@marvell.com; jer...@marvell.com;
> pbhagavat...@marvell.com
> Subject: [PATCH v4] doc: remove event crypto metadata deprecation note
> 
> Proposed change to event crypto metadata is not done as per deprecation
> note. Instead, comments are updated in spec to improve readability.
> 
> Signed-off-by: Shijith Thotton 
> ---
> v4:
> * Removed changes as per deprecation note.
> * Updated spec comments.
> 
> v3:
> * Updated ABI section of release notes.
> 
> v2:
> * Updated deprecation notice.
> 
> v1:
> * Rebased.
> 
>  doc/guides/rel_notes/deprecation.rst| 6 --
>  lib/eventdev/rte_event_crypto_adapter.h | 1 +
>  2 files changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/doc/guides/rel_notes/deprecation.rst
> b/doc/guides/rel_notes/deprecation.rst
> index bf1e07c0a8..fae3abd282 100644
> --- a/doc/guides/rel_notes/deprecation.rst
> +++ b/doc/guides/rel_notes/deprecation.rst
> @@ -254,12 +254,6 @@ Deprecation Notices
>An 8-byte reserved field will be added to the structure ``rte_event_timer``
> to
>support future extensions.
> 
> -* eventdev: Reserved bytes of ``rte_event_crypto_request`` is a space
> holder
> -  for ``response_info``. Both should be decoupled for better clarity.
> -  New space for ``response_info`` can be made by changing
> -  ``rte_event_crypto_metadata`` type to structure from union.
> -  This change is targeted for DPDK 21.11.
> -
>  * metrics: The function ``rte_metrics_init`` will have a non-void return
>in order to notify errors instead of calling ``rte_exit``.
> 
> diff --git a/lib/eventdev/rte_event_crypto_adapter.h
> b/lib/eventdev/rte_event_crypto_adapter.h
> index 27fb628eef..edbd5c61a3 100644
> --- a/lib/eventdev/rte_event_crypto_adapter.h
> +++ b/lib/eventdev/rte_event_crypto_adapter.h
> @@ -227,6 +227,7 @@ union rte_event_crypto_metadata {
>   struct rte_event_crypto_request request_info;
>   /**< Request information to be filled in by application
>* for RTE_EVENT_CRYPTO_ADAPTER_OP_FORWARD mode.
> +  * First 8 bytes of request_info is reserved for response_info.
>*/
>   struct rte_event response_info;
>   /**< Response information to be filled in by application
> --
> 2.25.1

Re: [dpdk-dev] [PATCH v5 5/5] devargs: parse global device syntax

[Xueming(Steven) Li]

On Tue, 2021-09-28 at 11:04 +0200, Thomas Monjalon wrote:
> 28/09/2021 10:29, David Marchand:
> > On Tue, Apr 13, 2021 at 5:15 AM Xueming Li  wrote:
> > > 
> > > When parsing a devargs, try to parse using the global device syntax
> > > first. Fallback on legacy syntax on error.
> > > 
> > > Example of new global device syntax:
> > >  -a bus=pci,addr=82:00.0/class=eth/driver=mlx5,dv_flow_en=1
> > > 
> > > Signed-off-by: Xueming Li 
> > > Reviewed-by: Gaetan Rivet 
> > 
> > Starting with a virtio user port, I get a warning:
> > 
> > # dpdk-testpmd --vdev
> > net_virtio_user0,iface=test,path=/dev/vhost-net,queues=1
> > --log-level=pmd.net.virtio.*:debug -- -i
> > ...
> > EAL: Unrecognized layer dev/vhost-net,queues=1
> > ...
> > 
> > Am I doing something wrong?
> > If not, could you have a look?
> 
> The new global syntax is using the slash / as separator.
> We should detect legit use of slash in a path.
> Here, the value starts with a slash so it should be easy to ignore.
> Another way is to consider slash only if followed by "class=" or "driver="

There is an assumption in the function rte_devargs_layers_parse():
 * The last layer is free-form.
 * The "driver" key is not required (but accepted).
For some case like "bus=x,k1=v1/class=y,k2=/some/path/k3=v3", "k3"
belongs to driver layer, this will confuse parser.

Re: [dpdk-dev] [PATCH v3 1/5] ethdev: add API to negotiate delivery of Rx meta data

[Ori Kam]

Hi

> -Original Message-
> From: Ivan Malov 
> Subject: Re: [dpdk-dev] [PATCH v3 1/5] ethdev: add API to negotiate delivery
> of Rx meta data
> 
> 
> 
> On 01/10/2021 01:12, Ajit Khaparde wrote:
> > On Thu, Sep 30, 2021 at 3:01 PM Ivan Malov 
> wrote:
> >>
> >> Hi Ajit,
> >>
> >> On 01/10/2021 00:48, Ajit Khaparde wrote:
> >>> 
>  diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
>  97ae52e17e..7a8da3d7ab 100644
>  --- a/app/test-pmd/testpmd.c
>  +++ b/app/test-pmd/testpmd.c
>  @@ -1485,10 +1485,36 @@ static void
> init_config_port_offloads(portid_t pid, uint32_t socket_id)
> {
>    struct rte_port *port = &ports[pid];
>  +   uint64_t rx_meta_features = 0;
>    uint16_t data_size;
>    int ret;
>    int i;
> 
>  +   rx_meta_features |= RTE_ETH_RX_META_USER_FLAG;
>  +   rx_meta_features |= RTE_ETH_RX_META_USER_MARK;
>  +   rx_meta_features |= RTE_ETH_RX_META_TUNNEL_ID;
>  +
>  +   ret = rte_eth_rx_meta_negotiate(pid, &rx_meta_features);
>  +   if (ret == 0) {
>  +   if (!(rx_meta_features & RTE_ETH_RX_META_USER_FLAG)) {
>  +   TESTPMD_LOG(INFO, "Flow action FLAG will
>  + not affect Rx mbufs on port %u\n",
> >>> Log level info might be a little too noisy?
> >>
> >> Do you really think so? But main() sets default log level to DEBUG, quote:
> >>   rte_log_set_level(testpmd_logtype, RTE_LOG_DEBUG);
> >>
> >> If I go for DEBUG instead of INFO here, it won't get any quieter, will it?
> > You are right. It won't.
> > But then three extra messages per port will stand out. But that's my
> opinion.
> > Maybe you could log the message when a flow is created with any of the
> > meta features?
> 
> The idea is to warn the user from the very beginning that certain flow
> primitives won't actually work. This way, the user can refrain from trying to
> use them in flow rules. This might save their time.
> 
> But I don't mind going for DEBUG here. More opinions are welcome.
> 

+1 for doing it only for configuration, and not per flow.

> >
> >>
> >>>
>  +   pid);
>  +   }
>  +
>  +   if (!(rx_meta_features & RTE_ETH_RX_META_USER_MARK)) {
>  +   TESTPMD_LOG(INFO, "Flow action MARK will not 
>  affect Rx
> mbufs on port %u\n",
>  +   pid);
>  +   }
>  +
>  +   if (!(rx_meta_features & RTE_ETH_RX_META_TUNNEL_ID)) {
>  +   TESTPMD_LOG(INFO, "Flow tunnel offload support 
>  might
> be limited or unavailable on port %u\n",
>  +   pid);
>  +   }
> >>> :::
> 
> >>
> >> --
> >> Ivan M
> 
> --
> Ivan M
Best,
Ori

Re: [dpdk-dev] [PATCH v6 2/2] ethdev: change queue release callback

[Matan Azrad]

From: Xueming(Steven) Li
> Currently, most ethdev callback API use queue ID as parameter, but Rx
> and Tx queue release callback use queue object which is used by Rx and
> Tx burst data plane callback.
> 
> To align with other eth device queue configuration callbacks:
> - queue release callbacks are changed to use queue ID
> - all drivers are adapted
> 
> Signed-off-by: Xueming Li 
> Reviewed-by: Andrew Rybchenko 
Acked-by: Matan Azrad 

Re: [dpdk-dev] [PATCH v3 1/5] ethdev: add API to negotiate delivery of Rx meta data

[Ori Kam]

Hi Andrew and Ivan,


> -Original Message-
> From: Andrew Rybchenko 
> Sent: Friday, October 1, 2021 9:50 AM
> Subject: Re: [PATCH v3 1/5] ethdev: add API to negotiate delivery of Rx meta
> data
> 
> On 9/30/21 10:07 PM, Ivan Malov wrote:
> > Hi Ori,
> >
> > On 30/09/2021 17:59, Ori Kam wrote:
> >> Hi Ivan,
> >> Sorry for jumping in late.
> >
> > No worries. That's OK.
> >
> >> I have a concern that this patch breaks other PMDs.
> >
> > It does no such thing.
> >
> >>> From the rst file " One should negotiate flag delivery beforehand"
> >> since you only added this function for your PMD all other PMD will fail.
> >> I see that you added exception in the  examples, but it doesn't make
> >> sense that applications will also need to add this exception which is
> >> not documented.
> >
> > Say, you have an application, and you use it with some specific PMD.
> > Say, that PMD doesn't run into the problem as ours does. In other
> > words, the user can insert a flow with action MARK at any point and
> > get mark delivery working starting from that moment without any
> > problem. Say, this is exactly the way how it works for you at the moment.
> >
> > Now. This new API kicks in. We update the application to invoke it as
> > early as possible. But your PMD in question still doesn't support this
> > API. The comment in the patch says that if the method returns ENOTSUP,
> > the application should ignore that without batting an eyelid. It
> > should just keep on working as it did before the introduction of this API.
> >

I understand that it is nice to write in the patch comment that application
should disregard this function in case of 
ENOTSUP but in a few month someone will read the official doc,
where it is stated that this function call is a must and then what do you
think the application will do?
I think that the correct way is to add this function to all PMDs.
Another option is to add to the doc that if the function is returning ENOTSUP
the application should assume that all is supported.
 
So from this point of view there is API break.

> > More specific example:
> > Say, the application doesn't mind using either "RSS + MARK" or tunnel
> > offload. What it does right now is attempt to insert tunnel flows
> > first and, if this fails, fall back to "RSS + MARK". With this API,
> > the application will try to invoke this API with "USER_MARK |
> > TUNNEL_ID" in adapter initialised state. If the PMD says that it can
> > only enable the tunnel offload, then the application will get the
> > knowledge that it doesn't make sense to even try inserting "RSS +
> > MARK" flows. It just can skip useless actions. But if the PMD doesn't
> > support the method, the application will see ENOTSUP and handle this
> > gracefully: it will make no assumptions about what's guaranteed to be
> > supported and what's not and will just keep on its old behavior: try
> > to insert a flow, fail, fall back to another type of flow.
> >

I fully agree with your example, and think that this is the way
to go, application should supply as much info as possible during startup.
My question/comment is the negotiated result means that all of the actions
are supported on the same rule?
for example if application wants to add mark and tag on the same rule.
(I know it doesn't make much sense) and the PMD can support both of them
but not on the same rule, what should it return?
Or for example if using the mark can only be supported if no decap action is set
on this rule what should be the result?
From my undstanding this function is only to let the PMD know that on some
rules the application will use those actions, the checking if the action 
combination
is valid only happens on validate function right?

In any case I think this is good idea and I will see how we can add a more 
generic approach of
this API to the new API that I'm going to present.


> > So no breakages with this API.
> >
> >>
> >> Please see more comments inline.
> >>
> >> Thanks,
> >> Ori
> >>
> >>> -Original Message-
> >>> From: Ivan Malov 
> >>> Sent: Thursday, September 23, 2021 2:20 PM
> >>> Subject: [PATCH v3 1/5] ethdev: add API to negotiate delivery of Rx
> >>> meta data
> >>>
> >>> Delivery of mark, flag and the likes might affect small packet
> >>> performance.
> >>> If these features are disabled by default, enabling them in started
> >>> state without causing traffic disruption may not always be possible.
> >>>
> >>> Let applications negotiate delivery of Rx meta data beforehand.
> >>>
> >>> Signed-off-by: Ivan Malov 
> >>> Reviewed-by: Andrew Rybchenko 
> >>> Reviewed-by: Andy Moreton 
> >>> Acked-by: Ray Kinsella 
> >>> Acked-by: Jerin Jacob 
> >>> ---
> >>>   app/test-flow-perf/main.c  | 21 
> >>>   app/test-pmd/testpmd.c | 26 +++
> >>>   doc/guides/rel_notes/release_21_11.rst |  9 ++
> >>>   lib/ethdev/ethdev_driver.h | 19 +++
> >>>   lib/ethdev/rte_ethdev.c    | 25 +++

Re: [dpdk-dev] [PATCH v3 1/5] ethdev: add API to negotiate delivery of Rx meta data

[Ori Kam]

Hi Ivan,

> -Original Message-
> From: Ivan Malov 
> Sent: Sunday, October 3, 2021 12:30 PM
> data
> 
> Hi Ori,
> 
> Thanks for reviewing this.
> 

No problem.

> On 03/10/2021 10:42, Ori Kam wrote:
> > Hi Andrew and Ivan,
> >
> >
> >> -Original Message-
> >> From: Andrew Rybchenko 
> >> Sent: Friday, October 1, 2021 9:50 AM
> >> Subject: Re: [PATCH v3 1/5] ethdev: add API to negotiate delivery of
> >> Rx meta data
> >>
> >> On 9/30/21 10:07 PM, Ivan Malov wrote:
> >>> Hi Ori,
> >>>
> >>> On 30/09/2021 17:59, Ori Kam wrote:
>  Hi Ivan,
>  Sorry for jumping in late.
> >>>
> >>> No worries. That's OK.
> >>>
>  I have a concern that this patch breaks other PMDs.
> >>>
> >>> It does no such thing.
> >>>
> >  From the rst file " One should negotiate flag delivery beforehand"
>  since you only added this function for your PMD all other PMD will fail.
>  I see that you added exception in the  examples, but it doesn't
>  make sense that applications will also need to add this exception
>  which is not documented.
> >>>
> >>> Say, you have an application, and you use it with some specific PMD.
> >>> Say, that PMD doesn't run into the problem as ours does. In other
> >>> words, the user can insert a flow with action MARK at any point and
> >>> get mark delivery working starting from that moment without any
> >>> problem. Say, this is exactly the way how it works for you at the
> moment.
> >>>
> >>> Now. This new API kicks in. We update the application to invoke it
> >>> as early as possible. But your PMD in question still doesn't support
> >>> this API. The comment in the patch says that if the method returns
> >>> ENOTSUP, the application should ignore that without batting an
> >>> eyelid. It should just keep on working as it did before the introduction 
> >>> of
> this API.
> >>>
> >
> > I understand that it is nice to write in the patch comment that
> > application should disregard this function in case of ENOTSUP but in a
> > few month someone will read the official doc, where it is stated that
> > this function call is a must and then what do you think the
> > application will do?
> > I think that the correct way is to add this function to all PMDs.
> > Another option is to add to the doc that if the function is returning
> > ENOTSUP the application should assume that all is supported.
> >
> > So from this point of view there is API break.
> 
> So, you mean an API breakage in some formal sense? If the doc is fixed in
> accordance with the second option you suggest, will it suffice to avoid this
> formal API breakage?
> 

Yes, but I think it will be better to add the missing function.

> >
> >>> More specific example:
> >>> Say, the application doesn't mind using either "RSS + MARK" or
> >>> tunnel offload. What it does right now is attempt to insert tunnel
> >>> flows first and, if this fails, fall back to "RSS + MARK". With this
> >>> API, the application will try to invoke this API with "USER_MARK |
> >>> TUNNEL_ID" in adapter initialised state. If the PMD says that it can
> >>> only enable the tunnel offload, then the application will get the
> >>> knowledge that it doesn't make sense to even try inserting "RSS +
> >>> MARK" flows. It just can skip useless actions. But if the PMD
> >>> doesn't support the method, the application will see ENOTSUP and
> >>> handle this
> >>> gracefully: it will make no assumptions about what's guaranteed to
> >>> be supported and what's not and will just keep on its old behavior:
> >>> try to insert a flow, fail, fall back to another type of flow.
> >>>
> >
> > I fully agree with your example, and think that this is the way to go,
> > application should supply as much info as possible during startup.
> 
> Right.
> 
> > My question/comment is the negotiated result means that all of the
> > actions are supported on the same rule?
> > for example if application wants to add mark and tag on the same rule.
> > (I know it doesn't make much sense) and the PMD can support both of
> > them but not on the same rule, what should it return?
> > Or for example if using the mark can only be supported if no decap
> > action is set on this rule what should be the result?
> >  From my undstanding this function is only to let the PMD know that on
> > some rules the application will use those actions, the checking if the
> > action combination is valid only happens on validate function right?
> 
> This API does not bind itself to flow API. It's *not* about enabling support 
> for
> metadata *actions* (they are conducted entirely *inside* the NIC). It's
> about enabling *delivery* of metadata from the NIC to host.
>

Good point so why not use the same logic as the metadata and register it?
Since in any case, this is something in the mbuf so maybe this should be the 
answer?
 
> Say, you insert a flow rule to mark some packets. The NIC, internally (in the
> e-switch) adds the mark to matching packets. Yes, in the boundaries of the
> NIC HW, the packe

Re: [dpdk-dev] [PATCH v1 01/12] ethdev: add ethdev item to flow API

[Ori Kam]

Hi Andrew and Ivan,

> -Original Message-
> From: Andrew Rybchenko 
> Sent: Friday, October 1, 2021 4:47 PM
> Subject: [PATCH v1 01/12] ethdev: add ethdev item to flow API
> 
> From: Ivan Malov 
> 
> For use with "transfer" flows. Supposed to match traffic transmitted by the
> DPDK application via the specified ethdev, at e-switch level.
> 
> Must not be combined with attributes "ingress" / "egress".
> 
> Signed-off-by: Ivan Malov 
> Signed-off-by: Andrew Rybchenko 
> ---

[Snip]

>  /** Generate flow_action[] entry. */
> diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index
> 7b1ed7f110..880502098e 100644
> --- a/lib/ethdev/rte_flow.h
> +++ b/lib/ethdev/rte_flow.h
> @@ -574,6 +574,15 @@ enum rte_flow_item_type {
>* @see struct rte_flow_item_conntrack.
>*/
>   RTE_FLOW_ITEM_TYPE_CONNTRACK,
> +
> + /**
> +  * [META]
> +  *
> +  * Matches traffic at e-switch going from (sent by) the given ethdev.
> +  *
> +  * @see struct rte_flow_item_ethdev
> +  */
> + RTE_FLOW_ITEM_TYPE_ETHDEV,
>  };
> 
>  /**
> @@ -1799,6 +1808,24 @@ static const struct rte_flow_item_conntrack
> rte_flow_item_conntrack_mask = {  };  #endif
> 
> +/**
> + * @warning
> + * @b EXPERIMENTAL: this structure may change without prior notice
> + *
> + * Provides an ethdev ID for use with items which are as follows:
> + * RTE_FLOW_ITEM_TYPE_ETHDEV.
> + */
> +struct rte_flow_item_ethdev {
> + uint16_t id; /**< Ethdev ID */

True for all above uses,
should this be renamed to port?

> +};
> +
> +/** Default mask for RTE_FLOW_ITEM_TYPE_ETHDEV */ #ifndef
> __cplusplus
> +static const struct rte_flow_item_ethdev rte_flow_item_ethdev_mask = {
> + .id = 0x,
> +};
> +#endif
> +
>  /**
>   * Matching pattern item definition.
>   *
> --
> 2.30.2

Re: [dpdk-dev] [PATCH v1 02/12] ethdev: add eswitch port item to flow API

[Ori Kam]

Hi Andrew and Ivan,

> -Original Message-
> From: Andrew Rybchenko 
> Sent: Friday, October 1, 2021 4:47 PM
> Subject: [PATCH v1 02/12] ethdev: add eswitch port item to flow API
> 
> From: Ivan Malov 
> 
> For use with "transfer" flows. Supposed to match traffic entering the e-switch
> from the external world (network, guests) via the port which is logically
> connected with the given ethdev.
> 
> Must not be combined with attributes "ingress" / "egress".
> 
> This item is meant to use the same structure as ethdev item.
> 

In case the app is not working with representors, meaning
each switch port is mapped to ethdev.
both items (ethdev and eswitch port ) have the same meaning?

> Signed-off-by: Ivan Malov 
> Signed-off-by: Andrew Rybchenko 
> ---
>  app/test-pmd/cmdline_flow.c | 27 +
>  doc/guides/prog_guide/rte_flow.rst  | 22 +
>  doc/guides/rel_notes/release_21_11.rst  |  2 +-
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  4 +++
>  lib/ethdev/rte_flow.c   |  1 +
>  lib/ethdev/rte_flow.h   | 12 -
>  6 files changed, 66 insertions(+), 2 deletions(-)
> 
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index e05b0d83d2..188d0ee39d 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -308,6 +308,8 @@ enum index {
>   ITEM_POL_POLICY,
>   ITEM_ETHDEV,
>   ITEM_ETHDEV_ID,
> + ITEM_ESWITCH_PORT,
> + ITEM_ESWITCH_PORT_ETHDEV_ID,

Like my comment from previous patch, I'm not sure the correct
term for ETHDEV is ID is should be port.

> 
>   /* Validate/create actions. */
>   ACTIONS,
> @@ -1003,6 +1005,7 @@ static const enum index next_item[] = {
>   ITEM_INTEGRITY,
>   ITEM_CONNTRACK,
>   ITEM_ETHDEV,
> + ITEM_ESWITCH_PORT,
>   END_SET,
>   ZERO,
>  };
> @@ -1377,6 +1380,12 @@ static const enum index item_ethdev[] = {
>   ZERO,
>  };
> 
> +static const enum index item_eswitch_port[] = {
> + ITEM_ESWITCH_PORT_ETHDEV_ID,
> + ITEM_NEXT,
> + ZERO,
> +};
> +
>  static const enum index next_action[] = {
>   ACTION_END,
>   ACTION_VOID,
> @@ -3632,6 +3641,21 @@ static const struct token token_list[] = {
>item_param),
>   .args = ARGS(ARGS_ENTRY(struct rte_flow_item_ethdev, id)),
>   },
> + [ITEM_ESWITCH_PORT] = {
> + .name = "eswitch_port",
> + .help = "match traffic at e-switch going from the external port
> associated with the given ethdev",

Missing the word logically since if we are talking about representor the 
connected port
is the PF while we want to match traffic on one of the FVs.

> + .priv = PRIV_ITEM(ESWITCH_PORT,
> +   sizeof(struct rte_flow_item_ethdev)),
> + .next = NEXT(item_eswitch_port),
> + .call = parse_vc,
> + },
> + [ITEM_ESWITCH_PORT_ETHDEV_ID] = {
> + .name = "ethdev_id",
> + .help = "ethdev ID",
> + .next = NEXT(item_eswitch_port,
> NEXT_ENTRY(COMMON_UNSIGNED),
> +  item_param),
> + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_ethdev, id)),
> + },
>   /* Validate/create actions. */
>   [ACTIONS] = {
>   .name = "actions",
> @@ -8370,6 +8394,9 @@ flow_item_default_mask(const struct
> rte_flow_item *item)
>   case RTE_FLOW_ITEM_TYPE_ETHDEV:
>   mask = &rte_flow_item_ethdev_mask;
>   break;
> + case RTE_FLOW_ITEM_TYPE_ESWITCH_PORT:
> + mask = &rte_flow_item_ethdev_mask;
> + break;

Not sure maybe merged the two cases?

>   default:
>   break;
>   }
> diff --git a/doc/guides/prog_guide/rte_flow.rst
> b/doc/guides/prog_guide/rte_flow.rst
> index ab628d9139..292bb42410 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -1460,6 +1460,28 @@ Use this with attribute **transfer**. Attributes
> **ingress** and
> | ``mask`` | ``id``   | zeroed for wildcard match |
> +--+--+---+
> 
> +Item: ``ESWITCH_PORT``
> +^^
> +
> +Matches traffic at e-switch going from the external port associated
> +with the given ethdev, for example, traffic from net. port or guest.

Maybe replace external with e-switch?

> +
> +::
> +
> +   *(Ethdev)  (Internal Port)  []  (External Port)
> +   *:  SW :   LogicalNet / Guest :
> +   *: :  :
> +   *|  PMD Layer  |  E-Switch Layer  |
> +   *
> +   *[] shows the effective ("transfer") standpoint, the match engine;
> +   *<< shows the traffic flow in question hitting the match engine;
> +   *~~ shows logical interconnects between the endpoint

[dpdk-dev] [Bug 821] net/bnxt build failure with clang 3.4.2

[bugzilla]

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

Bug ID: 821
   Summary: net/bnxt build failure with clang 3.4.2
   Product: DPDK
   Version: unspecified
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: Normal
 Component: ethdev
  Assignee: dev@dpdk.org
  Reporter: alia...@nvidia.com
  Target Milestone: ---

"""
$ export CC=clang
$ meson --werror --buildtype=debugoptimized build && ninja-build -C build
[..]
../../root/dpdk/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c:140:18: error:
comparison of constant 2147483648 with expression of type 'const enum
rte_flow_item_type' is always false
[-Werror,-Wtautological-constant-out-of-range-compare]
if (item->type >= (uint32_t)
~~ ^  ~~
../../root/dpdk/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c:142:19: error:
comparison of constant 2147483650 with expression of type 'const enum
rte_flow_item_type' is always false
[-Werror,-Wtautological-constant-out-of-range-compare]
if (item->type >=
~~ ^
../../root/dpdk/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c:188:25: error:
comparison of constant 2147483648 with expression of type 'const enum
rte_flow_action_type' is always false
[-Werror,-Wtautological-constant-out-of-range-compare]
if (action_item->type >=
~ ^
../../root/dpdk/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c:190:26: error:
comparison of constant 2147483650 with expression of type 'const enum
rte_flow_action_type' is always false
[-Werror,-Wtautological-constant-out-of-range-compare]
if (action_item->type >=
~ ^
4 errors generated.
"""

Reproduces on main (086d426406).

OS: CentOS Linux 7
GCC: 4.8.5 20150623 (Red Hat 4.8.5-44)

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

Re: [dpdk-dev] [PATCH v3 1/5] ethdev: add API to negotiate delivery of Rx meta data

[Ivan Malov]

Hi Ori,

On 03/10/2021 14:01, Ori Kam wrote:

Hi Ivan,


-Original Message-
From: Ivan Malov 
Sent: Sunday, October 3, 2021 12:30 PM
data

Hi Ori,

Thanks for reviewing this.



No problem.


On 03/10/2021 10:42, Ori Kam wrote:

Hi Andrew and Ivan,



-Original Message-
From: Andrew Rybchenko 
Sent: Friday, October 1, 2021 9:50 AM
Subject: Re: [PATCH v3 1/5] ethdev: add API to negotiate delivery of
Rx meta data

On 9/30/21 10:07 PM, Ivan Malov wrote:

Hi Ori,

On 30/09/2021 17:59, Ori Kam wrote:

Hi Ivan,
Sorry for jumping in late.


No worries. That's OK.


I have a concern that this patch breaks other PMDs.


It does no such thing.


  From the rst file " One should negotiate flag delivery beforehand"

since you only added this function for your PMD all other PMD will fail.
I see that you added exception in the  examples, but it doesn't
make sense that applications will also need to add this exception
which is not documented.


Say, you have an application, and you use it with some specific PMD.
Say, that PMD doesn't run into the problem as ours does. In other
words, the user can insert a flow with action MARK at any point and
get mark delivery working starting from that moment without any
problem. Say, this is exactly the way how it works for you at the

moment.


Now. This new API kicks in. We update the application to invoke it
as early as possible. But your PMD in question still doesn't support
this API. The comment in the patch says that if the method returns
ENOTSUP, the application should ignore that without batting an
eyelid. It should just keep on working as it did before the introduction of

this API.




I understand that it is nice to write in the patch comment that
application should disregard this function in case of ENOTSUP but in a
few month someone will read the official doc, where it is stated that
this function call is a must and then what do you think the
application will do?
I think that the correct way is to add this function to all PMDs.
Another option is to add to the doc that if the function is returning
ENOTSUP the application should assume that all is supported.

So from this point of view there is API break.


So, you mean an API breakage in some formal sense? If the doc is fixed in
accordance with the second option you suggest, will it suffice to avoid this
formal API breakage?



Yes, but I think it will be better to add the missing function.




More specific example:
Say, the application doesn't mind using either "RSS + MARK" or
tunnel offload. What it does right now is attempt to insert tunnel
flows first and, if this fails, fall back to "RSS + MARK". With this
API, the application will try to invoke this API with "USER_MARK |
TUNNEL_ID" in adapter initialised state. If the PMD says that it can
only enable the tunnel offload, then the application will get the
knowledge that it doesn't make sense to even try inserting "RSS +
MARK" flows. It just can skip useless actions. But if the PMD
doesn't support the method, the application will see ENOTSUP and
handle this
gracefully: it will make no assumptions about what's guaranteed to
be supported and what's not and will just keep on its old behavior:
try to insert a flow, fail, fall back to another type of flow.



I fully agree with your example, and think that this is the way to go,
application should supply as much info as possible during startup.


Right.


My question/comment is the negotiated result means that all of the
actions are supported on the same rule?
for example if application wants to add mark and tag on the same rule.
(I know it doesn't make much sense) and the PMD can support both of
them but not on the same rule, what should it return?
Or for example if using the mark can only be supported if no decap
action is set on this rule what should be the result?
  From my undstanding this function is only to let the PMD know that on
some rules the application will use those actions, the checking if the
action combination is valid only happens on validate function right?


This API does not bind itself to flow API. It's *not* about enabling support for
metadata *actions* (they are conducted entirely *inside* the NIC). It's
about enabling *delivery* of metadata from the NIC to host.



Good point so why not use the same logic as the metadata and register it?
Since in any case, this is something in the mbuf so maybe this should be the 
answer?


I didn't catch your thought. Could you please elaborate on it?

  

Say, you insert a flow rule to mark some packets. The NIC, internally (in the
e-switch) adds the mark to matching packets. Yes, in the boundaries of the
NIC HW, the packets bear the mark on them. It has been set, yes. But when
time comes to *deliver* the packets to the host, the NIC (at least, in net/sfc
case) has two options: either provide only a small chunk of the metadata for
each packet *to the host*, which doesn't include mark ID, flag and RSS hash,
OR, alternatively, provide the full set o

Re: [dpdk-dev] [PATCH v1 01/12] ethdev: add ethdev item to flow API

[Ivan Malov]

Hi Ori,

On 03/10/2021 14:52, Ori Kam wrote:

Hi Andrew and Ivan,


-Original Message-
From: Andrew Rybchenko 
Sent: Friday, October 1, 2021 4:47 PM
Subject: [PATCH v1 01/12] ethdev: add ethdev item to flow API

From: Ivan Malov 

For use with "transfer" flows. Supposed to match traffic transmitted by the
DPDK application via the specified ethdev, at e-switch level.

Must not be combined with attributes "ingress" / "egress".

Signed-off-by: Ivan Malov 
Signed-off-by: Andrew Rybchenko 
---


[Snip]


  /** Generate flow_action[] entry. */
diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index
7b1ed7f110..880502098e 100644
--- a/lib/ethdev/rte_flow.h
+++ b/lib/ethdev/rte_flow.h
@@ -574,6 +574,15 @@ enum rte_flow_item_type {
 * @see struct rte_flow_item_conntrack.
 */
RTE_FLOW_ITEM_TYPE_CONNTRACK,
+
+   /**
+* [META]
+*
+* Matches traffic at e-switch going from (sent by) the given ethdev.
+*
+* @see struct rte_flow_item_ethdev
+*/
+   RTE_FLOW_ITEM_TYPE_ETHDEV,
  };

  /**
@@ -1799,6 +1808,24 @@ static const struct rte_flow_item_conntrack
rte_flow_item_conntrack_mask = {  };  #endif

+/**
+ * @warning
+ * @b EXPERIMENTAL: this structure may change without prior notice
+ *
+ * Provides an ethdev ID for use with items which are as follows:
+ * RTE_FLOW_ITEM_TYPE_ETHDEV.
+ */
+struct rte_flow_item_ethdev {
+   uint16_t id; /**< Ethdev ID */


True for all above uses,
should this be renamed to port?


I'd not rename it to "port". The very idea of this series is to 
disambiguate things. This structure is shared between primitives ETHDEV 
and ESWITCH_PORT. If we go for "port", then in conjunction with 
ESWITCH_PORT the structure name may trick readers into thinking that the 
ID in question is the own ID of the e-switch port itself. But in fact 
this ID is an ethdev ID which is associated with the e-switch port.


Should you wish to elaborate on your concerns with regard to naming, 
please do so. I'm all ears.





+};
+
+/** Default mask for RTE_FLOW_ITEM_TYPE_ETHDEV */ #ifndef
__cplusplus
+static const struct rte_flow_item_ethdev rte_flow_item_ethdev_mask = {
+   .id = 0x,
+};
+#endif
+
  /**
   * Matching pattern item definition.
   *
--
2.30.2


--
Ivan M

Re: [dpdk-dev] [PATCH v1 2/7] eal/interrupts: implement get set APIs

[Dmitry Kozlyuk]

2021-09-03 18:10 (UTC+0530), Harman Kalra:
> [...]
> diff --git a/lib/eal/common/eal_common_interrupts.c 
> b/lib/eal/common/eal_common_interrupts.c
> new file mode 100644
> index 00..2e4fed96f0
> --- /dev/null
> +++ b/lib/eal/common/eal_common_interrupts.c
> @@ -0,0 +1,506 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(C) 2021 Marvell.
> + */
> +
> +#include 
> +#include 
> +
> +#include 
> +#include 
> +#include 
> +
> +#include 
> +
> +
> +struct rte_intr_handle *rte_intr_handle_instance_alloc(int size,
> +bool from_hugepage)

Since the purpose of the series is to reduce future ABI breakages,
how about making the second parameter "flags" to have some spare bits?
(If not removing it completely per David's suggestion.)

> +{
> + struct rte_intr_handle *intr_handle;
> + int i;
> +
> + if (from_hugepage)
> + intr_handle = rte_zmalloc(NULL,
> +   size * sizeof(struct rte_intr_handle),
> +   0);
> + else
> + intr_handle = calloc(1, size * sizeof(struct rte_intr_handle));
> + if (!intr_handle) {
> + RTE_LOG(ERR, EAL, "Fail to allocate intr_handle\n");
> + rte_errno = ENOMEM;
> + return NULL;
> + }
> +
> + for (i = 0; i < size; i++) {
> + intr_handle[i].nb_intr = RTE_MAX_RXTX_INTR_VEC_ID;
> + intr_handle[i].alloc_from_hugepage = from_hugepage;
> + }
> +
> + return intr_handle;
> +}
> +
> +struct rte_intr_handle *rte_intr_handle_instance_index_get(
> + struct rte_intr_handle *intr_handle, int index)

If rte_intr_handle_instance_alloc() returns a pointer to an array,
this function is useless since the user can simply manipulate a pointer.
If we want to make a distinction between a single struct rte_intr_handle and a
commonly allocated bunch of such (but why?), then they should be represented
by distinct types.

> +{
> + if (intr_handle == NULL) {
> + RTE_LOG(ERR, EAL, "Interrupt instance unallocated\n");
> + rte_errno = ENOMEM;

Why it's sometimes ENOMEM and sometimes ENOTSUP when the handle is not
allocated?

> + return NULL;
> + }
> +
> + return &intr_handle[index];
> +}
> +
> +int rte_intr_handle_instance_index_set(struct rte_intr_handle *intr_handle,
> +const struct rte_intr_handle *src,
> +int index)

See above regarding the "index" parameter. If it can be removed, a better name
for this function would be rte_intr_handle_copy().

> +{
> + if (intr_handle == NULL) {
> + RTE_LOG(ERR, EAL, "Interrupt instance unallocated\n");
> + rte_errno = ENOTSUP;
> + goto fail;
> + }
> +
> + if (src == NULL) {
> + RTE_LOG(ERR, EAL, "Source interrupt instance unallocated\n");
> + rte_errno = EINVAL;
> + goto fail;
> + }
> +
> + if (index < 0) {
> + RTE_LOG(ERR, EAL, "Index cany be negative");
> + rte_errno = EINVAL;
> + goto fail;
> + }

How about making this parameter "size_t"?

> +
> + intr_handle[index].fd = src->fd;
> + intr_handle[index].vfio_dev_fd = src->vfio_dev_fd;
> + intr_handle[index].type = src->type;
> + intr_handle[index].max_intr = src->max_intr;
> + intr_handle[index].nb_efd = src->nb_efd;
> + intr_handle[index].efd_counter_size = src->efd_counter_size;
> +
> + memcpy(intr_handle[index].efds, src->efds, src->nb_intr);
> + memcpy(intr_handle[index].elist, src->elist, src->nb_intr);
> +
> + return 0;
> +fail:
> + return rte_errno;

Should be (-rte_errno) per documentation.
Please check all functions in this file that return an "int" status.

> [...]
> +int rte_intr_handle_dev_fd_get(const struct rte_intr_handle *intr_handle)
> +{
> + if (intr_handle == NULL) {
> + RTE_LOG(ERR, EAL, "Interrupt instance unallocated\n");
> + rte_errno = ENOTSUP;
> + goto fail;
> + }
> +
> + return intr_handle->vfio_dev_fd;
> +fail:
> + return rte_errno;
> +}

Returning a errno value instead of an FD is very error-prone.
Probably returning (-1) is both safe and convenient?

> +
> +int rte_intr_handle_max_intr_set(struct rte_intr_handle *intr_handle,
> +  int max_intr)
> +{
> + if (intr_handle == NULL) {
> + RTE_LOG(ERR, EAL, "Interrupt instance unallocated\n");
> + rte_errno = ENOTSUP;
> + goto fail;
> + }
> +
> + if (max_intr > intr_handle->nb_intr) {
> + RTE_LOG(ERR, EAL, "Max_intr=%d greater than 
> PLT_MAX_RXTX_INTR_VEC_ID=%d",

Seems like this common/cnxk name leaked here by mistake?

> + max_intr, intr_handle->nb_intr);
> + rte_errno = ERANGE;
> + goto fail;
> + }

Re: [dpdk-dev] [PATCH v1 02/12] ethdev: add eswitch port item to flow API

[Ivan Malov]

On 03/10/2021 15:40, Ori Kam wrote:

Hi Andrew and Ivan,


-Original Message-
From: Andrew Rybchenko 
Sent: Friday, October 1, 2021 4:47 PM
Subject: [PATCH v1 02/12] ethdev: add eswitch port item to flow API

From: Ivan Malov 

For use with "transfer" flows. Supposed to match traffic entering the e-switch
from the external world (network, guests) via the port which is logically
connected with the given ethdev.

Must not be combined with attributes "ingress" / "egress".

This item is meant to use the same structure as ethdev item.



In case the app is not working with representors, meaning
each switch port is mapped to ethdev.
both items (ethdev and eswitch port ) have the same meaning?


No. Ethdev means ethdev, and e-switch port is the point where this 
ethdev is plugged to. For example, "transfer + ESWITCH_PORT" for a 
regular PF ethdev typically means the network port (maybe you can recall 
the idea that a PF ethdev "represents" the network port it's associated 
with).


I believe, that diagrams which these patches add to 
"doc/guides/prog_guide/rte_flow.rst" may come in handy to understand the 
meaning. Also, you can take a look at our larger diagram from the Sep 14 
gathering.





Signed-off-by: Ivan Malov 
Signed-off-by: Andrew Rybchenko 
---
  app/test-pmd/cmdline_flow.c | 27 +
  doc/guides/prog_guide/rte_flow.rst  | 22 +
  doc/guides/rel_notes/release_21_11.rst  |  2 +-
  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  4 +++
  lib/ethdev/rte_flow.c   |  1 +
  lib/ethdev/rte_flow.h   | 12 -
  6 files changed, 66 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index e05b0d83d2..188d0ee39d 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -308,6 +308,8 @@ enum index {
ITEM_POL_POLICY,
ITEM_ETHDEV,
ITEM_ETHDEV_ID,
+   ITEM_ESWITCH_PORT,
+   ITEM_ESWITCH_PORT_ETHDEV_ID,


Like my comment from previous patch, I'm not sure the correct
term for ETHDEV is ID is should be port.


Please see my reply in the previous thread. "ethdev" here is an 
"anchor", a "beacon" of sorts which allows either to refer namely to 
this ethdev or to the e-switch port associated with it.






/* Validate/create actions. */
ACTIONS,
@@ -1003,6 +1005,7 @@ static const enum index next_item[] = {
ITEM_INTEGRITY,
ITEM_CONNTRACK,
ITEM_ETHDEV,
+   ITEM_ESWITCH_PORT,
END_SET,
ZERO,
  };
@@ -1377,6 +1380,12 @@ static const enum index item_ethdev[] = {
ZERO,
  };

+static const enum index item_eswitch_port[] = {
+   ITEM_ESWITCH_PORT_ETHDEV_ID,
+   ITEM_NEXT,
+   ZERO,
+};
+
  static const enum index next_action[] = {
ACTION_END,
ACTION_VOID,
@@ -3632,6 +3641,21 @@ static const struct token token_list[] = {
 item_param),
.args = ARGS(ARGS_ENTRY(struct rte_flow_item_ethdev, id)),
},
+   [ITEM_ESWITCH_PORT] = {
+   .name = "eswitch_port",
+   .help = "match traffic at e-switch going from the external port
associated with the given ethdev",


Missing the word logically since if we are talking about representor the 
connected port
is the PF while we want to match traffic on one of the FVs.


Doesn't the word "external" say it all?

Representor Ethdev <--> Admin ethdev's PF <--> E-Switch <--> VF 
(external / the most remote endpoint).





+   .priv = PRIV_ITEM(ESWITCH_PORT,
+ sizeof(struct rte_flow_item_ethdev)),
+   .next = NEXT(item_eswitch_port),
+   .call = parse_vc,
+   },
+   [ITEM_ESWITCH_PORT_ETHDEV_ID] = {
+   .name = "ethdev_id",
+   .help = "ethdev ID",
+   .next = NEXT(item_eswitch_port,
NEXT_ENTRY(COMMON_UNSIGNED),
+item_param),
+   .args = ARGS(ARGS_ENTRY(struct rte_flow_item_ethdev, id)),
+   },
/* Validate/create actions. */
[ACTIONS] = {
.name = "actions",
@@ -8370,6 +8394,9 @@ flow_item_default_mask(const struct
rte_flow_item *item)
case RTE_FLOW_ITEM_TYPE_ETHDEV:
mask = &rte_flow_item_ethdev_mask;
break;
+   case RTE_FLOW_ITEM_TYPE_ESWITCH_PORT:
+   mask = &rte_flow_item_ethdev_mask;
+   break;


Not sure maybe merged the two cases?


A noble idea.




default:
break;
}
diff --git a/doc/guides/prog_guide/rte_flow.rst
b/doc/guides/prog_guide/rte_flow.rst
index ab628d9139..292bb42410 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1460,6 +1460,28 @@ Use this with attribute **transfer**. Attributes
**ingress** and
 | ``mask`` | ``id``   | zeroed for wildcard match |
 +--+-

Re: [dpdk-dev] [PATCH v1 6/7] eal/interrupts: make interrupt handle structure opaque

[Dmitry Kozlyuk]

2021-09-03 18:11 (UTC+0530), Harman Kalra:
> [...]
> @@ -31,11 +54,40 @@ struct rte_intr_handle 
> *rte_intr_handle_instance_alloc(int size,
>   }
>  
>   for (i = 0; i < size; i++) {
> + if (from_hugepage)
> + intr_handle[i].efds = rte_zmalloc(NULL,
> + RTE_MAX_RXTX_INTR_VEC_ID * sizeof(uint32_t), 0);
> + else
> + intr_handle[i].efds = calloc(1,
> +RTE_MAX_RXTX_INTR_VEC_ID * sizeof(uint32_t));
> + if (!intr_handle[i].efds) {
> + RTE_LOG(ERR, EAL, "Fail to allocate event fd list\n");
> + rte_errno = ENOMEM;
> + goto fail;
> + }
> +
> + if (from_hugepage)
> + intr_handle[i].elist = rte_zmalloc(NULL,
> + RTE_MAX_RXTX_INTR_VEC_ID *
> + sizeof(struct rte_epoll_event), 0);
> + else
> + intr_handle[i].elist = calloc(1,
> + RTE_MAX_RXTX_INTR_VEC_ID *
> + sizeof(struct rte_epoll_event));
> + if (!intr_handle[i].elist) {
> + RTE_LOG(ERR, EAL, "fail to allocate event fd list\n");
> + rte_errno = ENOMEM;
> + goto fail;
> + }
>   intr_handle[i].nb_intr = RTE_MAX_RXTX_INTR_VEC_ID;
>   intr_handle[i].alloc_from_hugepage = from_hugepage;
>   }
>  
>   return intr_handle;
> +fail:
> + free(intr_handle->efds);
> + free(intr_handle);
> + return NULL;

This is incorrect if "from_hugepage" is set.

>  }
>  
>  struct rte_intr_handle *rte_intr_handle_instance_index_get(
> @@ -73,12 +125,48 @@ int rte_intr_handle_instance_index_set(struct 
> rte_intr_handle *intr_handle,
>   }
>  
>   intr_handle[index].fd = src->fd;
> - intr_handle[index].vfio_dev_fd = src->vfio_dev_fd;
> + intr_handle[index].dev_fd = src->dev_fd;
> +
>   intr_handle[index].type = src->type;
>   intr_handle[index].max_intr = src->max_intr;
>   intr_handle[index].nb_efd = src->nb_efd;
>   intr_handle[index].efd_counter_size = src->efd_counter_size;
>  
> + if (intr_handle[index].nb_intr != src->nb_intr) {
> + if (src->alloc_from_hugepage)
> + intr_handle[index].efds =
> + rte_realloc(intr_handle[index].efds,
> + src->nb_intr *
> + sizeof(uint32_t), 0);
> + else
> + intr_handle[index].efds =
> + realloc(intr_handle[index].efds,
> + src->nb_intr * sizeof(uint32_t));
> + if (intr_handle[index].efds == NULL) {
> + RTE_LOG(ERR, EAL, "Failed to realloc the efds list");
> + rte_errno = ENOMEM;
> + goto fail;
> + }
> +
> + if (src->alloc_from_hugepage)
> + intr_handle[index].elist =
> + rte_realloc(intr_handle[index].elist,
> + src->nb_intr *
> + sizeof(struct rte_epoll_event), 0);
> + else
> + intr_handle[index].elist =
> + realloc(intr_handle[index].elist,
> + src->nb_intr *
> + sizeof(struct rte_epoll_event));
> + if (intr_handle[index].elist == NULL) {
> + RTE_LOG(ERR, EAL, "Failed to realloc the event list");
> + rte_errno = ENOMEM;
> + goto fail;
> + }
> +
> + intr_handle[index].nb_intr = src->nb_intr;
> + }
> +

This implementation leaves "intr_handle" in an invalid state
and leaks memory on error paths.

>   memcpy(intr_handle[index].efds, src->efds, src->nb_intr);
>   memcpy(intr_handle[index].elist, src->elist, src->nb_intr);
>  
> @@ -87,6 +175,45 @@ int rte_intr_handle_instance_index_set(struct 
> rte_intr_handle *intr_handle,
>   return rte_errno;
>  }
>  
> +int rte_intr_handle_event_list_update(struct rte_intr_handle *intr_handle,
> +   int size)
> +{
> + if (intr_handle == NULL) {
> + RTE_LOG(ERR, EAL, "Interrupt instance unallocated\n");
> + rte_errno = ENOTSUP;
> + goto fail;
> + }
> +
> + if (size == 0) {
> + RTE_LOG(ERR, EAL, "Size can't be zero\n");
> + rte_errno = EINVAL;
> + goto fail;
> + }
> +
> + intr_handle->efds = realloc(intr_handle->efds,
> +   size * sizeof(uint32_t));
> + if (intr_handle->efds == NULL) {
> +  

[dpdk-dev] [PATCH 1/3] examples/l3fwd: increase number of routes

[pbhagavatula]

From: Pavan Nikhilesh 

Increase the number of routes from 8 to 16 that are statically added for
lpm and em mode as most of the SoCs support more than 8 interfaces.
The number of routes added is equal to the number of ethernet devices
ports enabled through port mask.

Signed-off-by: Pavan Nikhilesh 
---
 v3 Changes: (Finally!)
 - Add FIB to the list.
 - Update release notes.
 - Update EM route addition routine and use the correct IP addresses
   DTS need not be updated as EM test doesn't use IP addresses defined
   in l3fwd.

 v2 Changes:
 - Fixup for EM mode.

 examples/l3fwd/l3fwd_route.h |  4 ++--
 examples/l3fwd/main.c| 20 ++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/examples/l3fwd/l3fwd_route.h b/examples/l3fwd/l3fwd_route.h
index 89f8634443..c7eba06c4d 100644
--- a/examples/l3fwd/l3fwd_route.h
+++ b/examples/l3fwd/l3fwd_route.h
@@ -14,6 +14,6 @@ struct ipv6_l3fwd_route {
uint8_t if_out;
 };

-extern const struct ipv4_l3fwd_route ipv4_l3fwd_route_array[8];
+extern const struct ipv4_l3fwd_route ipv4_l3fwd_route_array[16];

-extern const struct ipv6_l3fwd_route ipv6_l3fwd_route_array[8];
+extern const struct ipv6_l3fwd_route ipv6_l3fwd_route_array[16];
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 00ac267af1..194f6ac1a4 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -179,7 +179,7 @@ static struct l3fwd_lkp_mode l3fwd_fib_lkp = {

 /*
  * 198.18.0.0/16 are set aside for RFC2544 benchmarking (RFC5735).
- * 198.18.{0-7}.0/24 = Port {0-7}
+ * 198.18.{0-15}.0/24 = Port {0-15}
  */
 const struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {
{RTE_IPV4(198, 18, 0, 0), 24, 0},
@@ -190,11 +190,19 @@ const struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {
{RTE_IPV4(198, 18, 5, 0), 24, 5},
{RTE_IPV4(198, 18, 6, 0), 24, 6},
{RTE_IPV4(198, 18, 7, 0), 24, 7},
+   {RTE_IPV4(198, 18, 8, 0), 24, 8},
+   {RTE_IPV4(198, 18, 9, 0), 24, 9},
+   {RTE_IPV4(198, 18, 10, 0), 24, 10},
+   {RTE_IPV4(198, 18, 11, 0), 24, 11},
+   {RTE_IPV4(198, 18, 12, 0), 24, 12},
+   {RTE_IPV4(198, 18, 13, 0), 24, 13},
+   {RTE_IPV4(198, 18, 14, 0), 24, 14},
+   {RTE_IPV4(198, 18, 15, 0), 24, 15},
 };

 /*
  * 2001:200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180).
- * 2001:200:0:{0-7}::/64 = Port {0-7}
+ * 2001:200:0:{0-15}::/64 = Port {0-15}
  */
 const struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {
{{32, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 0},
@@ -205,6 +213,14 @@ const struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {
{{32, 1, 2, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 5},
{{32, 1, 2, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 6},
{{32, 1, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 7},
+   {{32, 1, 2, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 8},
+   {{32, 1, 2, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 9},
+   {{32, 1, 2, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 10},
+   {{32, 1, 2, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 11},
+   {{32, 1, 2, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 12},
+   {{32, 1, 2, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 13},
+   {{32, 1, 2, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 14},
+   {{32, 1, 2, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 15},
 };

 /*
--
2.33.0

[dpdk-dev] [PATCH 2/3] examples/l3fwd: print port bdf when adding routes

[pbhagavatula]

From: Pavan Nikhilesh 

Since the number of Ethernet ports have gone up, print the pci bdf along
with the routes.
This is also helpful for cases where allow listing order is not honored.

Signed-off-by: Pavan Nikhilesh 
---
 examples/l3fwd/l3fwd_fib.c | 16 ++--
 examples/l3fwd/l3fwd_lpm.c |  9 ++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/examples/l3fwd/l3fwd_fib.c b/examples/l3fwd/l3fwd_fib.c
index f8d6a3ac39..cc6054ca44 100644
--- a/examples/l3fwd/l3fwd_fib.c
+++ b/examples/l3fwd/l3fwd_fib.c
@@ -439,6 +439,7 @@ setup_fib(const int socketid)
 
/* Populate the fib ipv4 table. */
for (i = 0; i < RTE_DIM(ipv4_l3fwd_route_array); i++) {
+   struct rte_eth_dev_info dev_info;
struct in_addr in;
 
/* Skip unused ports. */
@@ -446,6 +447,8 @@ setup_fib(const int socketid)
enabled_port_mask) == 0)
continue;
 
+   rte_eth_dev_info_get(ipv4_l3fwd_route_array[i].if_out,
+&dev_info);
ret = rte_fib_add(ipv4_l3fwd_fib_lookup_struct[socketid],
ipv4_l3fwd_route_array[i].ip,
ipv4_l3fwd_route_array[i].depth,
@@ -459,13 +462,14 @@ setup_fib(const int socketid)
 
in.s_addr = htonl(ipv4_l3fwd_route_array[i].ip);
if (inet_ntop(AF_INET, &in, abuf, sizeof(abuf)) != NULL) {
-   printf("FIB: Adding route %s / %d (%d)\n",
-   abuf,
-   ipv4_l3fwd_route_array[i].depth,
-   ipv4_l3fwd_route_array[i].if_out);
+   printf("FIB: Adding route %s / %d (%d) [%s]\n", abuf,
+  ipv4_l3fwd_route_array[i].depth,
+  ipv4_l3fwd_route_array[i].if_out,
+  dev_info.device->name);
} else {
-   printf("FIB: IPv4 route added to port %d\n",
-   ipv4_l3fwd_route_array[i].if_out);
+   printf("FIB: IPv4 route added to port %d [%s]\n",
+  ipv4_l3fwd_route_array[i].if_out,
+  dev_info.device->name);
}
}
/* >8 End of setup fib. */
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 7200160164..582911c622 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -451,6 +451,7 @@ setup_lpm(const int socketid)
 
/* populate the LPM table */
for (i = 0; i < RTE_DIM(ipv4_l3fwd_route_array); i++) {
+   struct rte_eth_dev_info dev_info;
struct in_addr in;
 
/* skip unused ports */
@@ -458,6 +459,8 @@ setup_lpm(const int socketid)
enabled_port_mask) == 0)
continue;
 
+   rte_eth_dev_info_get(ipv4_l3fwd_route_array[i].if_out,
+&dev_info);
ret = rte_lpm_add(ipv4_l3fwd_lpm_lookup_struct[socketid],
ipv4_l3fwd_route_array[i].ip,
ipv4_l3fwd_route_array[i].depth,
@@ -470,10 +473,10 @@ setup_lpm(const int socketid)
}
 
in.s_addr = htonl(ipv4_l3fwd_route_array[i].ip);
-   printf("LPM: Adding route %s / %d (%d)\n",
+   printf("LPM: Adding route %s / %d (%d) [%s]\n",
   inet_ntop(AF_INET, &in, abuf, sizeof(abuf)),
-   ipv4_l3fwd_route_array[i].depth,
-   ipv4_l3fwd_route_array[i].if_out);
+  ipv4_l3fwd_route_array[i].depth,
+  ipv4_l3fwd_route_array[i].if_out, dev_info.device->name);
}
 
/* create the LPM6 table */
-- 
2.33.0

[dpdk-dev] [PATCH 3/3] examples/l3fwd: use reserved addresses for EM mode

[pbhagavatula]

From: Pavan Nikhilesh 

The l3fwd example should use the reserved IPv4/v6 reserved address
ranges defined in RFC5735, RFC5180 and RFC863 discard protocol for
the port number in the exact match mode of L3 forwarding.

Signed-off-by: Pavan Nikhilesh 
---
 doc/guides/rel_notes/release_21_11.rst |   6 ++
 examples/l3fwd/l3fwd.h |   2 +-
 examples/l3fwd/l3fwd_em.c  | 142 -
 3 files changed, 73 insertions(+), 77 deletions(-)

diff --git a/doc/guides/rel_notes/release_21_11.rst 
b/doc/guides/rel_notes/release_21_11.rst
index 37dc1a7786..ccdfa47baa 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -125,6 +125,12 @@ New Features
   * Added tests to validate packets hard expiry.
   * Added tests to verify tunnel header verification in IPsec inbound.
 
+* **Increase number of routes configured in l3fwd lpm, em and fib lookups.**
+
+  * Increase number of routes from 8 to 16 for all lookup modes of l3fwd, this
+helps in validating SoC with more than 8 ethernet devices using l3fwd.
+  * Update EM mode to use RFC2544 reserved IP address space.
+
 
 Removed Items
 -
diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index a808d60247..853a31d4c2 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -54,7 +54,7 @@
 /* 32-bit has less address-space for hugepage memory, limit to 1M entries */
 #define L3FWD_HASH_ENTRIES (1024*1024*1)
 #endif
-#define HASH_ENTRY_NUMBER_DEFAULT  4
+#define HASH_ENTRY_NUMBER_DEFAULT  16
 
 struct mbuf_table {
uint16_t len;
diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index 2a8ab6aab5..92998e26b2 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -99,33 +99,64 @@ struct ipv6_l3fwd_em_route {
uint8_t if_out;
 };
 
-static struct ipv4_l3fwd_em_route ipv4_l3fwd_em_route_array[] = {
-   {{RTE_IPV4(101, 0, 0, 0), RTE_IPV4(100, 10, 0, 1),  101, 11, 
IPPROTO_TCP}, 0},
-   {{RTE_IPV4(201, 0, 0, 0), RTE_IPV4(200, 20, 0, 1),  102, 12, 
IPPROTO_TCP}, 1},
-   {{RTE_IPV4(111, 0, 0, 0), RTE_IPV4(100, 30, 0, 1),  101, 11, 
IPPROTO_TCP}, 2},
-   {{RTE_IPV4(211, 0, 0, 0), RTE_IPV4(200, 40, 0, 1),  102, 12, 
IPPROTO_TCP}, 3},
+/* 198.18.0.0/16 are set aside for RFC2544 benchmarking (RFC5735).
+ * Use RFC863 Discard Protocol.
+ */
+static const struct ipv4_l3fwd_em_route ipv4_l3fwd_em_route_array[] = {
+   {{RTE_IPV4(198, 18, 0, 0), RTE_IPV4(198, 18, 0, 1),  9, 9, 
IPPROTO_UDP}, 0},
+   {{RTE_IPV4(198, 18, 1, 0), RTE_IPV4(198, 18, 1, 1),  9, 9, 
IPPROTO_UDP}, 1},
+   {{RTE_IPV4(198, 18, 2, 0), RTE_IPV4(198, 18, 2, 1),  9, 9, 
IPPROTO_UDP}, 2},
+   {{RTE_IPV4(198, 18, 3, 0), RTE_IPV4(198, 18, 3, 1),  9, 9, 
IPPROTO_UDP}, 3},
+   {{RTE_IPV4(198, 18, 4, 0), RTE_IPV4(198, 18, 4, 1),  9, 9, 
IPPROTO_UDP}, 4},
+   {{RTE_IPV4(198, 18, 5, 0), RTE_IPV4(198, 18, 5, 1),  9, 9, 
IPPROTO_UDP}, 5},
+   {{RTE_IPV4(198, 18, 6, 0), RTE_IPV4(198, 18, 6, 1),  9, 9, 
IPPROTO_UDP}, 6},
+   {{RTE_IPV4(198, 18, 7, 0), RTE_IPV4(198, 18, 7, 1),  9, 9, 
IPPROTO_UDP}, 7},
+   {{RTE_IPV4(198, 18, 8, 0), RTE_IPV4(198, 18, 8, 1),  9, 9, 
IPPROTO_UDP}, 8},
+   {{RTE_IPV4(198, 18, 9, 0), RTE_IPV4(198, 18, 9, 1),  9, 9, 
IPPROTO_UDP}, 9},
+   {{RTE_IPV4(198, 18, 10, 0), RTE_IPV4(198, 18, 10, 1),  9, 9, 
IPPROTO_UDP}, 10},
+   {{RTE_IPV4(198, 18, 11, 0), RTE_IPV4(198, 18, 11, 1),  9, 9, 
IPPROTO_UDP}, 11},
+   {{RTE_IPV4(198, 18, 12, 0), RTE_IPV4(198, 18, 12, 1),  9, 9, 
IPPROTO_UDP}, 12},
+   {{RTE_IPV4(198, 18, 13, 0), RTE_IPV4(198, 18, 13, 1),  9, 9, 
IPPROTO_UDP}, 13},
+   {{RTE_IPV4(198, 18, 14, 0), RTE_IPV4(198, 18, 14, 1),  9, 9, 
IPPROTO_UDP}, 14},
+   {{RTE_IPV4(198, 18, 15, 0), RTE_IPV4(198, 18, 15, 1),  9, 9, 
IPPROTO_UDP}, 15},
 };
 
-static struct ipv6_l3fwd_em_route ipv6_l3fwd_em_route_array[] = {
-   {{
-   {0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
-   {0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 
0x38, 0x05},
-   101, 11, IPPROTO_TCP}, 0},
-
-   {{
-   {0xfe, 0x90, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
-   {0xfe, 0x90, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 
0x38, 0x05},
-   102, 12, IPPROTO_TCP}, 1},
-
-   {{
-   {0xfe, 0xa0, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
-   {0xfe, 0xa0, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 
0x38, 0x05},
-   101, 11, IPPROTO_TCP}, 2},
-
-   {{
-   {0xfe, 0xb0, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
-   {0xfe, 0xb0, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 
0x38, 0x05},
-   102, 12, IPPROTO_TCP}, 3},
+/* 2001:0200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180).
+ * Use RFC863 Discard Protocol.
+ */
+static const struct ipv6_l3fwd_em_route ipv6_l3fwd_em_route_array[] = {
+   {{{

[dpdk-dev] [PATCH v4 1/3] examples/l3fwd: increase number of routes

[pbhagavatula]

From: Pavan Nikhilesh 

Increase the number of routes from 8 to 16 that are statically added for
lpm and em mode as most of the SoCs support more than 8 interfaces.
The number of routes added is equal to the number of ethernet devices
ports enabled through port mask.

Signed-off-by: Pavan Nikhilesh 
---
 v4 Changes:
 - Use correct patch version and prefix.

 v3 Changes: (Finally!)
 - Add FIB to the list.
 - Update release notes.
 - Update EM route addition routine and use the correct IP addresses
   DTS need not be updated as EM test doesn't use IP addresses defined
   in l3fwd.

 v2 Changes:
 - Fixup for EM mode.

 examples/l3fwd/l3fwd_route.h |  4 ++--
 examples/l3fwd/main.c| 20 ++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/examples/l3fwd/l3fwd_route.h b/examples/l3fwd/l3fwd_route.h
index 89f8634443..c7eba06c4d 100644
--- a/examples/l3fwd/l3fwd_route.h
+++ b/examples/l3fwd/l3fwd_route.h
@@ -14,6 +14,6 @@ struct ipv6_l3fwd_route {
uint8_t if_out;
 };

-extern const struct ipv4_l3fwd_route ipv4_l3fwd_route_array[8];
+extern const struct ipv4_l3fwd_route ipv4_l3fwd_route_array[16];

-extern const struct ipv6_l3fwd_route ipv6_l3fwd_route_array[8];
+extern const struct ipv6_l3fwd_route ipv6_l3fwd_route_array[16];
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index 00ac267af1..194f6ac1a4 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -179,7 +179,7 @@ static struct l3fwd_lkp_mode l3fwd_fib_lkp = {

 /*
  * 198.18.0.0/16 are set aside for RFC2544 benchmarking (RFC5735).
- * 198.18.{0-7}.0/24 = Port {0-7}
+ * 198.18.{0-15}.0/24 = Port {0-15}
  */
 const struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {
{RTE_IPV4(198, 18, 0, 0), 24, 0},
@@ -190,11 +190,19 @@ const struct ipv4_l3fwd_route ipv4_l3fwd_route_array[] = {
{RTE_IPV4(198, 18, 5, 0), 24, 5},
{RTE_IPV4(198, 18, 6, 0), 24, 6},
{RTE_IPV4(198, 18, 7, 0), 24, 7},
+   {RTE_IPV4(198, 18, 8, 0), 24, 8},
+   {RTE_IPV4(198, 18, 9, 0), 24, 9},
+   {RTE_IPV4(198, 18, 10, 0), 24, 10},
+   {RTE_IPV4(198, 18, 11, 0), 24, 11},
+   {RTE_IPV4(198, 18, 12, 0), 24, 12},
+   {RTE_IPV4(198, 18, 13, 0), 24, 13},
+   {RTE_IPV4(198, 18, 14, 0), 24, 14},
+   {RTE_IPV4(198, 18, 15, 0), 24, 15},
 };

 /*
  * 2001:200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180).
- * 2001:200:0:{0-7}::/64 = Port {0-7}
+ * 2001:200:0:{0-15}::/64 = Port {0-15}
  */
 const struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {
{{32, 1, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 0},
@@ -205,6 +213,14 @@ const struct ipv6_l3fwd_route ipv6_l3fwd_route_array[] = {
{{32, 1, 2, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 5},
{{32, 1, 2, 0, 0, 0, 0, 6, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 6},
{{32, 1, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 7},
+   {{32, 1, 2, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 8},
+   {{32, 1, 2, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 9},
+   {{32, 1, 2, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 10},
+   {{32, 1, 2, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 11},
+   {{32, 1, 2, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 12},
+   {{32, 1, 2, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 13},
+   {{32, 1, 2, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 14},
+   {{32, 1, 2, 0, 0, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0}, 64, 15},
 };

 /*
--
2.17.1

[dpdk-dev] [PATCH v4 2/3] examples/l3fwd: print port bdf when adding routes

[pbhagavatula]

From: Pavan Nikhilesh 

Since the number of Ethernet ports have gone up, print the pci bdf along
with the routes.
This is also helpful for cases where allow listing order is not honored.

Signed-off-by: Pavan Nikhilesh 
---
 examples/l3fwd/l3fwd_fib.c | 16 ++--
 examples/l3fwd/l3fwd_lpm.c |  9 ++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/examples/l3fwd/l3fwd_fib.c b/examples/l3fwd/l3fwd_fib.c
index f8d6a3ac39..cc6054ca44 100644
--- a/examples/l3fwd/l3fwd_fib.c
+++ b/examples/l3fwd/l3fwd_fib.c
@@ -439,6 +439,7 @@ setup_fib(const int socketid)
 
/* Populate the fib ipv4 table. */
for (i = 0; i < RTE_DIM(ipv4_l3fwd_route_array); i++) {
+   struct rte_eth_dev_info dev_info;
struct in_addr in;
 
/* Skip unused ports. */
@@ -446,6 +447,8 @@ setup_fib(const int socketid)
enabled_port_mask) == 0)
continue;
 
+   rte_eth_dev_info_get(ipv4_l3fwd_route_array[i].if_out,
+&dev_info);
ret = rte_fib_add(ipv4_l3fwd_fib_lookup_struct[socketid],
ipv4_l3fwd_route_array[i].ip,
ipv4_l3fwd_route_array[i].depth,
@@ -459,13 +462,14 @@ setup_fib(const int socketid)
 
in.s_addr = htonl(ipv4_l3fwd_route_array[i].ip);
if (inet_ntop(AF_INET, &in, abuf, sizeof(abuf)) != NULL) {
-   printf("FIB: Adding route %s / %d (%d)\n",
-   abuf,
-   ipv4_l3fwd_route_array[i].depth,
-   ipv4_l3fwd_route_array[i].if_out);
+   printf("FIB: Adding route %s / %d (%d) [%s]\n", abuf,
+  ipv4_l3fwd_route_array[i].depth,
+  ipv4_l3fwd_route_array[i].if_out,
+  dev_info.device->name);
} else {
-   printf("FIB: IPv4 route added to port %d\n",
-   ipv4_l3fwd_route_array[i].if_out);
+   printf("FIB: IPv4 route added to port %d [%s]\n",
+  ipv4_l3fwd_route_array[i].if_out,
+  dev_info.device->name);
}
}
/* >8 End of setup fib. */
diff --git a/examples/l3fwd/l3fwd_lpm.c b/examples/l3fwd/l3fwd_lpm.c
index 7200160164..582911c622 100644
--- a/examples/l3fwd/l3fwd_lpm.c
+++ b/examples/l3fwd/l3fwd_lpm.c
@@ -451,6 +451,7 @@ setup_lpm(const int socketid)
 
/* populate the LPM table */
for (i = 0; i < RTE_DIM(ipv4_l3fwd_route_array); i++) {
+   struct rte_eth_dev_info dev_info;
struct in_addr in;
 
/* skip unused ports */
@@ -458,6 +459,8 @@ setup_lpm(const int socketid)
enabled_port_mask) == 0)
continue;
 
+   rte_eth_dev_info_get(ipv4_l3fwd_route_array[i].if_out,
+&dev_info);
ret = rte_lpm_add(ipv4_l3fwd_lpm_lookup_struct[socketid],
ipv4_l3fwd_route_array[i].ip,
ipv4_l3fwd_route_array[i].depth,
@@ -470,10 +473,10 @@ setup_lpm(const int socketid)
}
 
in.s_addr = htonl(ipv4_l3fwd_route_array[i].ip);
-   printf("LPM: Adding route %s / %d (%d)\n",
+   printf("LPM: Adding route %s / %d (%d) [%s]\n",
   inet_ntop(AF_INET, &in, abuf, sizeof(abuf)),
-   ipv4_l3fwd_route_array[i].depth,
-   ipv4_l3fwd_route_array[i].if_out);
+  ipv4_l3fwd_route_array[i].depth,
+  ipv4_l3fwd_route_array[i].if_out, dev_info.device->name);
}
 
/* create the LPM6 table */
-- 
2.17.1

[dpdk-dev] [PATCH v4 3/3] examples/l3fwd: use reserved addresses for EM mode

[pbhagavatula]

From: Pavan Nikhilesh 

The l3fwd example should use the reserved IPv4/v6 reserved address
ranges defined in RFC5735, RFC5180 and RFC863 discard protocol for
the port number in the exact match mode of L3 forwarding.

Signed-off-by: Pavan Nikhilesh 
---
 doc/guides/rel_notes/release_21_11.rst |   6 ++
 examples/l3fwd/l3fwd.h |   2 +-
 examples/l3fwd/l3fwd_em.c  | 142 -
 3 files changed, 73 insertions(+), 77 deletions(-)

diff --git a/doc/guides/rel_notes/release_21_11.rst 
b/doc/guides/rel_notes/release_21_11.rst
index 37dc1a7786..ccdfa47baa 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -125,6 +125,12 @@ New Features
   * Added tests to validate packets hard expiry.
   * Added tests to verify tunnel header verification in IPsec inbound.
 
+* **Increase number of routes configured in l3fwd lpm, em and fib lookups.**
+
+  * Increase number of routes from 8 to 16 for all lookup modes of l3fwd, this
+helps in validating SoC with more than 8 ethernet devices using l3fwd.
+  * Update EM mode to use RFC2544 reserved IP address space.
+
 
 Removed Items
 -
diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index a808d60247..853a31d4c2 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -54,7 +54,7 @@
 /* 32-bit has less address-space for hugepage memory, limit to 1M entries */
 #define L3FWD_HASH_ENTRIES (1024*1024*1)
 #endif
-#define HASH_ENTRY_NUMBER_DEFAULT  4
+#define HASH_ENTRY_NUMBER_DEFAULT  16
 
 struct mbuf_table {
uint16_t len;
diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c
index 2a8ab6aab5..92998e26b2 100644
--- a/examples/l3fwd/l3fwd_em.c
+++ b/examples/l3fwd/l3fwd_em.c
@@ -99,33 +99,64 @@ struct ipv6_l3fwd_em_route {
uint8_t if_out;
 };
 
-static struct ipv4_l3fwd_em_route ipv4_l3fwd_em_route_array[] = {
-   {{RTE_IPV4(101, 0, 0, 0), RTE_IPV4(100, 10, 0, 1),  101, 11, 
IPPROTO_TCP}, 0},
-   {{RTE_IPV4(201, 0, 0, 0), RTE_IPV4(200, 20, 0, 1),  102, 12, 
IPPROTO_TCP}, 1},
-   {{RTE_IPV4(111, 0, 0, 0), RTE_IPV4(100, 30, 0, 1),  101, 11, 
IPPROTO_TCP}, 2},
-   {{RTE_IPV4(211, 0, 0, 0), RTE_IPV4(200, 40, 0, 1),  102, 12, 
IPPROTO_TCP}, 3},
+/* 198.18.0.0/16 are set aside for RFC2544 benchmarking (RFC5735).
+ * Use RFC863 Discard Protocol.
+ */
+static const struct ipv4_l3fwd_em_route ipv4_l3fwd_em_route_array[] = {
+   {{RTE_IPV4(198, 18, 0, 0), RTE_IPV4(198, 18, 0, 1),  9, 9, 
IPPROTO_UDP}, 0},
+   {{RTE_IPV4(198, 18, 1, 0), RTE_IPV4(198, 18, 1, 1),  9, 9, 
IPPROTO_UDP}, 1},
+   {{RTE_IPV4(198, 18, 2, 0), RTE_IPV4(198, 18, 2, 1),  9, 9, 
IPPROTO_UDP}, 2},
+   {{RTE_IPV4(198, 18, 3, 0), RTE_IPV4(198, 18, 3, 1),  9, 9, 
IPPROTO_UDP}, 3},
+   {{RTE_IPV4(198, 18, 4, 0), RTE_IPV4(198, 18, 4, 1),  9, 9, 
IPPROTO_UDP}, 4},
+   {{RTE_IPV4(198, 18, 5, 0), RTE_IPV4(198, 18, 5, 1),  9, 9, 
IPPROTO_UDP}, 5},
+   {{RTE_IPV4(198, 18, 6, 0), RTE_IPV4(198, 18, 6, 1),  9, 9, 
IPPROTO_UDP}, 6},
+   {{RTE_IPV4(198, 18, 7, 0), RTE_IPV4(198, 18, 7, 1),  9, 9, 
IPPROTO_UDP}, 7},
+   {{RTE_IPV4(198, 18, 8, 0), RTE_IPV4(198, 18, 8, 1),  9, 9, 
IPPROTO_UDP}, 8},
+   {{RTE_IPV4(198, 18, 9, 0), RTE_IPV4(198, 18, 9, 1),  9, 9, 
IPPROTO_UDP}, 9},
+   {{RTE_IPV4(198, 18, 10, 0), RTE_IPV4(198, 18, 10, 1),  9, 9, 
IPPROTO_UDP}, 10},
+   {{RTE_IPV4(198, 18, 11, 0), RTE_IPV4(198, 18, 11, 1),  9, 9, 
IPPROTO_UDP}, 11},
+   {{RTE_IPV4(198, 18, 12, 0), RTE_IPV4(198, 18, 12, 1),  9, 9, 
IPPROTO_UDP}, 12},
+   {{RTE_IPV4(198, 18, 13, 0), RTE_IPV4(198, 18, 13, 1),  9, 9, 
IPPROTO_UDP}, 13},
+   {{RTE_IPV4(198, 18, 14, 0), RTE_IPV4(198, 18, 14, 1),  9, 9, 
IPPROTO_UDP}, 14},
+   {{RTE_IPV4(198, 18, 15, 0), RTE_IPV4(198, 18, 15, 1),  9, 9, 
IPPROTO_UDP}, 15},
 };
 
-static struct ipv6_l3fwd_em_route ipv6_l3fwd_em_route_array[] = {
-   {{
-   {0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
-   {0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 
0x38, 0x05},
-   101, 11, IPPROTO_TCP}, 0},
-
-   {{
-   {0xfe, 0x90, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
-   {0xfe, 0x90, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 
0x38, 0x05},
-   102, 12, IPPROTO_TCP}, 1},
-
-   {{
-   {0xfe, 0xa0, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
-   {0xfe, 0xa0, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 
0x38, 0x05},
-   101, 11, IPPROTO_TCP}, 2},
-
-   {{
-   {0xfe, 0xb0, 0, 0, 0, 0, 0, 0, 0x02, 0x1e, 0x67, 0xff, 0xfe, 0, 0, 0},
-   {0xfe, 0xb0, 0, 0, 0, 0, 0, 0, 0x02, 0x1b, 0x21, 0xff, 0xfe, 0x91, 
0x38, 0x05},
-   102, 12, IPPROTO_TCP}, 3},
+/* 2001:0200::/48 is IANA reserved range for IPv6 benchmarking (RFC5180).
+ * Use RFC863 Discard Protocol.
+ */
+static const struct ipv6_l3fwd_em_route ipv6_l3fwd_em_route_array[] = {
+   {{{

[dpdk-dev] [PATCH v4 1/3] net/thunderx: enable build only on 64-bit Linux

[pbhagavatula]

From: Pavan Nikhilesh 

Due to Linux kernel AF(Admin fuction) driver dependency, only enable
build for 64-bit Linux.

Signed-off-by: Pavan Nikhilesh 
Acked-by: Jerin Jacob 
---
 v4 Changes:
 - Update commit message regarding dependency on AF driver.

 drivers/net/thunderx/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/thunderx/meson.build b/drivers/net/thunderx/meson.build
index 4bbcea7f93..da665bd76f 100644
--- a/drivers/net/thunderx/meson.build
+++ b/drivers/net/thunderx/meson.build
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Cavium, Inc

-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif

--
2.17.1

[dpdk-dev] [PATCH v4 2/3] common/octeontx: enable build only on 64-bit Linux

[pbhagavatula]

From: Pavan Nikhilesh 

Due to Linux kernel AF(Admin fuction) driver dependency, only enable
build for 64-bit Linux.

Signed-off-by: Pavan Nikhilesh 
Acked-by: Jerin Jacob 
---
 drivers/common/octeontx/meson.build   | 4 ++--
 drivers/compress/octeontx/meson.build | 6 ++
 drivers/crypto/octeontx/meson.build   | 7 +++
 drivers/event/octeontx/meson.build| 6 ++
 drivers/mempool/octeontx/meson.build  | 5 +++--
 drivers/net/octeontx/meson.build  | 4 ++--
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/drivers/common/octeontx/meson.build 
b/drivers/common/octeontx/meson.build
index fcda0f6445..dc060dfea1 100644
--- a/drivers/common/octeontx/meson.build
+++ b/drivers/common/octeontx/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Cavium, Inc
 #
 
-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif
 
diff --git a/drivers/compress/octeontx/meson.build 
b/drivers/compress/octeontx/meson.build
index e1b7bed422..cd8687fde3 100644
--- a/drivers/compress/octeontx/meson.build
+++ b/drivers/compress/octeontx/meson.build
@@ -1,6 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Cavium, Inc
 
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
+   build = false
+   reason = 'only supported on 64-bit Linux'
+   subdir_done()
+endif
+
 sources = files('otx_zip.c', 'otx_zip_pmd.c')
 includes += include_directories('include')
 deps += ['mempool_octeontx', 'bus_pci']
diff --git a/drivers/crypto/octeontx/meson.build 
b/drivers/crypto/octeontx/meson.build
index 244b16230e..bc6187e1cf 100644
--- a/drivers/crypto/octeontx/meson.build
+++ b/drivers/crypto/octeontx/meson.build
@@ -1,5 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Cavium, Inc
+#
+
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
+build = false
+reason = 'only supported on 64-bit Linux'
+subdir_done()
+endif
 
 deps += ['bus_pci']
 deps += ['bus_vdev']
diff --git a/drivers/event/octeontx/meson.build 
b/drivers/event/octeontx/meson.build
index 0d9eec3f2e..eb17e059d8 100644
--- a/drivers/event/octeontx/meson.build
+++ b/drivers/event/octeontx/meson.build
@@ -1,6 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Cavium, Inc
 
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
+build = false
+reason = 'only supported on 64-bit Linux'
+subdir_done()
+endif
+
 sources = files(
 'ssovf_worker.c',
 'ssovf_evdev.c',
diff --git a/drivers/mempool/octeontx/meson.build 
b/drivers/mempool/octeontx/meson.build
index a57213e2d8..fb05928129 100644
--- a/drivers/mempool/octeontx/meson.build
+++ b/drivers/mempool/octeontx/meson.build
@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Cavium, Inc
 
-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
+reason = 'only supported on 64-bit Linux'
+subdir_done()
 endif
 
 sources = files(
diff --git a/drivers/net/octeontx/meson.build b/drivers/net/octeontx/meson.build
index 84cd4e1142..a5a6c9661c 100644
--- a/drivers/net/octeontx/meson.build
+++ b/drivers/net/octeontx/meson.build
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Cavium, Inc
 
-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif
 
-- 
2.17.1

[dpdk-dev] [PATCH v4 3/3] common/octeontx2: enable build only on 64-bit Linux

[pbhagavatula]

From: Pavan Nikhilesh 

Due to Linux kernel AF(Admin Fuction) driver dependency, only enable
build for 64-bit Linux.

Signed-off-by: Pavan Nikhilesh 
Acked-by: Jerin Jacob 
---
 drivers/common/octeontx2/meson.build  | 10 ++
 drivers/event/octeontx2/meson.build   |  4 ++--
 drivers/mempool/octeontx2/meson.build |  9 ++---
 drivers/net/octeontx2/meson.build | 10 ++
 drivers/raw/octeontx2_dma/meson.build | 10 ++
 5 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/drivers/common/octeontx2/meson.build 
b/drivers/common/octeontx2/meson.build
index dcfaa1e102..223ba5ef51 100644
--- a/drivers/common/octeontx2/meson.build
+++ b/drivers/common/octeontx2/meson.build
@@ -2,15 +2,9 @@
 # Copyright(C) 2019 Marvell International Ltd.
 #
 
-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
-subdir_done()
-endif
-
-if not dpdk_conf.get('RTE_ARCH_64')
-build = false
-reason = 'only supported on 64-bit'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif
 
diff --git a/drivers/event/octeontx2/meson.build 
b/drivers/event/octeontx2/meson.build
index 96ebb1f2e7..ce360af5f8 100644
--- a/drivers/event/octeontx2/meson.build
+++ b/drivers/event/octeontx2/meson.build
@@ -2,9 +2,9 @@
 # Copyright(C) 2019 Marvell International Ltd.
 #
 
-if not dpdk_conf.get('RTE_ARCH_64')
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'only supported on 64-bit'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif
 
diff --git a/drivers/mempool/octeontx2/meson.build 
b/drivers/mempool/octeontx2/meson.build
index 2a1dfddd4c..a4bea6d364 100644
--- a/drivers/mempool/octeontx2/meson.build
+++ b/drivers/mempool/octeontx2/meson.build
@@ -2,14 +2,9 @@
 # Copyright(C) 2019 Marvell International Ltd.
 #
 
-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
-subdir_done()
-endif
-if not dpdk_conf.get('RTE_ARCH_64')
-build = false
-reason = 'only supported on 64-bit'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif
 
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index a355313120..ab15844cbc 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -2,15 +2,9 @@
 # Copyright(C) 2019 Marvell International Ltd.
 #
 
-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
-subdir_done()
-endif
-
-if not dpdk_conf.get('RTE_ARCH_64')
-build = false
-reason = 'only supported on 64-bit'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif
 
diff --git a/drivers/raw/octeontx2_dma/meson.build 
b/drivers/raw/octeontx2_dma/meson.build
index e744fccaae..6460bd8242 100644
--- a/drivers/raw/octeontx2_dma/meson.build
+++ b/drivers/raw/octeontx2_dma/meson.build
@@ -2,14 +2,16 @@
 # Copyright(C) 2019 Marvell International Ltd.
 #
 
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
+build = false
+reason = 'only supported on 64-bit Linux'
+subdir_done()
+endif
+
 deps += ['bus_pci', 'common_octeontx2', 'rawdev']
 sources = files('otx2_dpi_rawdev.c', 'otx2_dpi_msg.c', 'otx2_dpi_test.c')
 
 extra_flags = []
-# This integrated controller runs only on a arm64 machine, remove 32bit 
warnings
-if not dpdk_conf.get('RTE_ARCH_64')
-extra_flags += ['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast']
-endif
 
 foreach flag: extra_flags
 if cc.has_argument(flag)
-- 
2.17.1

Re: [dpdk-dev] [PATCH v3 3/7] ethdev: copy ethdev 'fast' API into separate structure

[Ananyev, Konstantin]

> >Copy public function pointers (rx_pkt_burst(), etc.) and related
> >pointers to internal data from rte_eth_dev structure into a
> >separate flat array. That array will remain in a public header.
> >The intention here is to make rte_eth_dev and related structures
> >internal.
> >That should allow future possible changes to core eth_dev structures
> >to be transparent to the user and help to avoid ABI/API breakages.
> >The plan is to keep minimal part of data from rte_eth_dev public,
> >so we still can use inline functions for 'fast' calls
> >(like rte_eth_rx_burst(), etc.) to avoid/minimize slowdown.
> >
> >Signed-off-by: Konstantin Ananyev 
> >---
> > lib/ethdev/ethdev_private.c  | 52
> >
> > lib/ethdev/ethdev_private.h  |  7 +
> > lib/ethdev/rte_ethdev.c  | 17 
> > lib/ethdev/rte_ethdev_core.h | 45
> >+++
> > 4 files changed, 121 insertions(+)
> >
> 
> 
> 
> >+void
> >+eth_dev_fp_ops_reset(struct rte_eth_fp_ops *fpo)
> >+{
> >+static void *dummy_data[RTE_MAX_QUEUES_PER_PORT];
> >+static const struct rte_eth_fp_ops dummy_ops = {
> >+.rx_pkt_burst = dummy_eth_rx_burst,
> >+.tx_pkt_burst = dummy_eth_tx_burst,
> >+.rxq = {.data = dummy_data, .clbk = dummy_data,},
> >+.txq = {.data = dummy_data, .clbk = dummy_data,},
> >+};
> >+
> >+*fpo = dummy_ops;
> >+}
> >+
> >+void
> >+eth_dev_fp_ops_setup(struct rte_eth_fp_ops *fpo,
> >+const struct rte_eth_dev *dev)
> >+{
> >+fpo->rx_pkt_burst = dev->rx_pkt_burst;
> >+fpo->tx_pkt_burst = dev->tx_pkt_burst;
> >+fpo->tx_pkt_prepare = dev->tx_pkt_prepare;
> >+fpo->rx_queue_count = dev->rx_queue_count;
> >+fpo->rx_descriptor_status = dev->rx_descriptor_status;
> >+fpo->tx_descriptor_status = dev->tx_descriptor_status;
> >+
> >+fpo->rxq.data = dev->data->rx_queues;
> >+fpo->rxq.clbk = (void **)(uintptr_t)dev->post_rx_burst_cbs;
> >+
> >+fpo->txq.data = dev->data->tx_queues;
> >+fpo->txq.clbk = (void **)(uintptr_t)dev->pre_tx_burst_cbs;
> >+}
> >diff --git a/lib/ethdev/ethdev_private.h b/lib/ethdev/ethdev_private.h
> >index 3724429577..40333e7651 100644
> >--- a/lib/ethdev/ethdev_private.h
> >+++ b/lib/ethdev/ethdev_private.h
> >@@ -26,4 +26,11 @@ eth_find_device(const struct rte_eth_dev
> >*_start, rte_eth_cmp_t cmp,
> > /* Parse devargs value for representor parameter. */
> > int rte_eth_devargs_parse_representor_ports(char *str, void *data);
> >
> >+/* reset eth 'fast' API to dummy values */
> >+void eth_dev_fp_ops_reset(struct rte_eth_fp_ops *fpo);
> >+
> >+/* setup eth 'fast' API to ethdev values */
> >+void eth_dev_fp_ops_setup(struct rte_eth_fp_ops *fpo,
> >+const struct rte_eth_dev *dev);
> >+
> > #endif /* _ETH_PRIVATE_H_ */
> >diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
> >index 424bc260fa..9fbb1bc3db 100644
> >--- a/lib/ethdev/rte_ethdev.c
> >+++ b/lib/ethdev/rte_ethdev.c
> >@@ -44,6 +44,9 @@
> > static const char *MZ_RTE_ETH_DEV_DATA = "rte_eth_dev_data";
> > struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
> >
> >+/* public 'fast' API */
> >+struct rte_eth_fp_ops rte_eth_fp_ops[RTE_MAX_ETHPORTS];
> >+
> > /* spinlock for eth device callbacks */
> > static rte_spinlock_t eth_dev_cb_lock = RTE_SPINLOCK_INITIALIZER;
> >
> >@@ -1788,6 +1791,9 @@ rte_eth_dev_start(uint16_t port_id)
> > (*dev->dev_ops->link_update)(dev, 0);
> > }
> >
> >+/* expose selection of PMD rx/tx function */
> >+eth_dev_fp_ops_setup(rte_eth_fp_ops + port_id, dev);
> >+
> 
> Secondary process will not set these properly I believe as it might not
> call start() if it does primary process ops will not be set.

That's a very good point, have to admit - I missed that part.

> 
> One simple solution is to call ops_setup() around 
> rte_eth_dev_attach_secondary()
> but if application doesn't invoke start() on Primary the ops will not be set 
> for it.

I think rte_eth_dev_attach_secondary() wouldn't work, as majority of the PMDs 
setup
fast ops function pointers after it.
>From reading the code rte_eth_dev_probing_finish() seems like a good choice -
as it is always the final point in device initialization for secondary process.

BTW, we also need something similar at de-init phase.
rte_eth_dev_release_port() seems like a good candidate for it.

 
> 
> > rte_ethdev_trace_start(port_id);
> > return 0;
> > }
> >@@ -1810,6 +1816,9 @@ rte_eth_dev_stop(uint16_t port_id)
> > return 0;
> > }
> >
> >+/* point rx/tx functions to dummy ones */
> >+eth_dev_fp_ops_reset(rte_eth_fp_ops + port_id);
> >+
> > dev->data->dev_started = 0;
> > ret = (*dev->dev_ops->dev_stop)(dev);
> > rte_ethdev_trace_stop(port_id, ret);
> >2.26.3

Re: [dpdk-dev] [PATCH v3 1/7] ethdev: allocate max space for internal queue array

[Ananyev, Konstantin]

> 
> >At queue configure stage always allocate space for maximum possible
> >number (RTE_MAX_QUEUES_PER_PORT) of queue pointers.
> >That will allow 'fast' inline functions (eth_rx_burst, etc.) to refer
> >pointer to internal queue data without extra checking of current
> >number
> >of configured queues.
> >That would help in future to hide rte_eth_dev and related structures.
> >
> >Signed-off-by: Konstantin Ananyev 
> >---
> > lib/ethdev/rte_ethdev.c | 36 +---
> > 1 file changed, 9 insertions(+), 27 deletions(-)
> >
> >diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
> >index daf5ca9242..424bc260fa 100644
> >--- a/lib/ethdev/rte_ethdev.c
> >+++ b/lib/ethdev/rte_ethdev.c
> >@@ -898,7 +898,8 @@ eth_dev_rx_queue_config(struct rte_eth_dev
> >*dev, uint16_t nb_queues)
> >
> > if (dev->data->rx_queues == NULL && nb_queues != 0) { /*
> >first time configuration */
> > dev->data->rx_queues = rte_zmalloc("ethdev-
> >>rx_queues",
> >-sizeof(dev->data->rx_queues[0]) *
> >nb_queues,
> >+sizeof(dev->data->rx_queues[0]) *
> >+RTE_MAX_QUEUES_PER_PORT,
> > RTE_CACHE_LINE_SIZE);
> > if (dev->data->rx_queues == NULL) {
> > dev->data->nb_rx_queues = 0;
> 
> We could get rid of this zmalloc by declaring rx_queues as array of
> pointers, it would make code much simpler.
> I believe the original code dates back to "Initial" release.

Yep we can, and yes it will simplify this peace of code.
The main reason I decided no to do this change now -
it will change layout of the_eth_dev_data structure.
In this series I tried to mininize(/avoid) changes in rte_eth_dev and 
rte_eth_dev_data,
as much as possible to avoid any unforeseen performance and functional impacts.
If we'll manage to make rte_eth_dev and rte_eth_dev_data private we can in 
future
consider that one and other changes in rte_eth_dev and rte_eth_dev_data layouts
without worrying about ABI breakage.  

> 
> 
> >@@ -909,21 +910,11 @@ eth_dev_rx_queue_config(struct
> >rte_eth_dev *dev, uint16_t nb_queues)
> >
> > rxq = dev->data->rx_queues;
> >
> >-for (i = nb_queues; i < old_nb_queues; i++)
> >+for (i = nb_queues; i < old_nb_queues; i++) {
> > (*dev->dev_ops->rx_queue_release)(rxq[i]);
> >-rxq = rte_realloc(rxq, sizeof(rxq[0]) * nb_queues,
> >-RTE_CACHE_LINE_SIZE);
> >-if (rxq == NULL)
> >-return -(ENOMEM);
> >-if (nb_queues > old_nb_queues) {
> >-uint16_t new_qs = nb_queues -
> >old_nb_queues;
> >-
> >-memset(rxq + old_nb_queues, 0,
> >-sizeof(rxq[0]) * new_qs);
> >+rxq[i] = NULL;
> > }
> >
> >-dev->data->rx_queues = rxq;
> >-
> > } else if (dev->data->rx_queues != NULL && nb_queues == 0) {
> > RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops-
> >>rx_queue_release, -ENOTSUP);
> >
> >@@ -1138,8 +1129,9 @@ eth_dev_tx_queue_config(struct
> >rte_eth_dev *dev, uint16_t nb_queues)
> >
> > if (dev->data->tx_queues == NULL && nb_queues != 0) { /*
> >first time configuration */
> > dev->data->tx_queues = rte_zmalloc("ethdev-
> >>tx_queues",
> >-   sizeof(dev->data-
> >>tx_queues[0]) * nb_queues,
> >-
> >RTE_CACHE_LINE_SIZE);
> >+sizeof(dev->data->tx_queues[0]) *
> >+RTE_MAX_QUEUES_PER_PORT,
> >+RTE_CACHE_LINE_SIZE);
> > if (dev->data->tx_queues == NULL) {
> > dev->data->nb_tx_queues = 0;
> > return -(ENOMEM);
> >@@ -1149,21 +1141,11 @@ eth_dev_tx_queue_config(struct
> >rte_eth_dev *dev, uint16_t nb_queues)
> >
> > txq = dev->data->tx_queues;
> >
> >-for (i = nb_queues; i < old_nb_queues; i++)
> >+for (i = nb_queues; i < old_nb_queues; i++) {
> > (*dev->dev_ops->tx_queue_release)(txq[i]);
> >-txq = rte_realloc(txq, sizeof(txq[0]) * nb_queues,
> >-  RTE_CACHE_LINE_SIZE);
> >-if (txq == NULL)
> >-return -ENOMEM;
> >-if (nb_queues > old_nb_queues) {
> >-uint16_t new_qs = nb_queues -
> >old_nb_queues;
> >-
> >-memset(txq + old_nb_queues, 0,
> >-   sizeof(txq[0]) * new_qs);
> >+txq[i] = NULL;
> > }
> >
> >-dev->data->tx_queues = txq;
> >-
> > } else if (dev->data->tx_queues != NULL && nb_queues == 0) {
> > RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops-
> >>tx_queue_release, -ENOTSUP);
> >
> >--
> >2.26.3

Re: [dpdk-dev] [PATCH v4 1/3] security: add SA config option for inner pkt csum

[Ananyev, Konstantin]

> 
> Add inner packet IPv4 hdr and L4 checksum enable options
> in conf. These will be used in case of protocol offload.
> Per SA, application could specify whether the
> checksum(compute/verify) can be offloaded to security device.
> 
> Signed-off-by: Archana Muniganti 
> ---
>  doc/guides/cryptodevs/features/default.ini |  1 +
>  doc/guides/rel_notes/deprecation.rst   |  4 +--
>  doc/guides/rel_notes/release_21_11.rst |  4 +++
>  lib/cryptodev/rte_cryptodev.h  |  2 ++
>  lib/security/rte_security.h| 31 ++
>  5 files changed, 40 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/guides/cryptodevs/features/default.ini 
> b/doc/guides/cryptodevs/features/default.ini
> index c24814de98..96d95ddc81 100644
> --- a/doc/guides/cryptodevs/features/default.ini
> +++ b/doc/guides/cryptodevs/features/default.ini
> @@ -33,6 +33,7 @@ Non-Byte aligned data  =
>  Sym raw data path API  =
>  Cipher multiple data units =
>  Cipher wrapped key =
> +Inner checksum =
> 
>  ;
>  ; Supported crypto algorithms of a default crypto driver.
> diff --git a/doc/guides/rel_notes/deprecation.rst 
> b/doc/guides/rel_notes/deprecation.rst
> index 05fc2fdee7..8308e00ed4 100644
> --- a/doc/guides/rel_notes/deprecation.rst
> +++ b/doc/guides/rel_notes/deprecation.rst
> @@ -232,8 +232,8 @@ Deprecation Notices
>IPsec payload MSS (Maximum Segment Size), and ESN (Extended Sequence 
> Number).
> 
>  * security: The IPsec SA config options ``struct 
> rte_security_ipsec_sa_options``
> -  will be updated with new fields to support new features like IPsec inner
> -  checksum, TSO in case of protocol offload.
> +  will be updated with new fields to support new features like TSO in case of
> +  protocol offload.
> 
>  * ipsec: The structure ``rte_ipsec_sa_prm`` will be extended with a new field
>``hdr_l3_len`` to configure tunnel L3 header length.
> diff --git a/doc/guides/rel_notes/release_21_11.rst 
> b/doc/guides/rel_notes/release_21_11.rst
> index 3ade7fe5ac..5480f05a99 100644
> --- a/doc/guides/rel_notes/release_21_11.rst
> +++ b/doc/guides/rel_notes/release_21_11.rst
> @@ -196,6 +196,10 @@ ABI Changes
>``rte_security_ipsec_xform`` to allow applications to configure SA soft
>and hard expiry limits. Limits can be either in number of packets or bytes.
> 
> +* security: The new options ``ip_csum_enable`` and ``l4_csum_enable`` were 
> added
> +  in structure ``rte_security_ipsec_sa_options`` to indicate whether inner
> +  packet IPv4 header checksum and L4 checksum need to be offloaded to
> +  security device.
> 
>  Known Issues
>  
> diff --git a/lib/cryptodev/rte_cryptodev.h b/lib/cryptodev/rte_cryptodev.h
> index bb01f0f195..d9271a6c45 100644
> --- a/lib/cryptodev/rte_cryptodev.h
> +++ b/lib/cryptodev/rte_cryptodev.h
> @@ -479,6 +479,8 @@ rte_cryptodev_asym_get_xform_enum(enum 
> rte_crypto_asym_xform_type *xform_enum,
>  /**< Support operations on multiple data-units message */
>  #define RTE_CRYPTODEV_FF_CIPHER_WRAPPED_KEY  (1ULL << 26)
>  /**< Support wrapped key in cipher xform  */
> +#define RTE_CRYPTODEV_FF_SECURITY_INNER_CSUM (1ULL << 27)
> +/**< Support inner checksum computation/verification */
> 
>  /**
>   * Get the name of a crypto device feature flag
> diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
> index ab1a6e1f65..0c5636377e 100644
> --- a/lib/security/rte_security.h
> +++ b/lib/security/rte_security.h
> @@ -230,6 +230,37 @@ struct rte_security_ipsec_sa_options {
>* * 0: Do not match UDP ports
>*/
>   uint32_t udp_ports_verify : 1;
> +
> + /** Compute/verify inner packet IPv4 header checksum in tunnel mode
> +  *
> +  * * 1: For outbound, compute inner packet IPv4 header checksum
> +  *  before tunnel encapsulation and for inbound, verify after
> +  *  tunnel decapsulation.
> +  * * 0: Inner packet IP header checksum is not computed/verified.
> +  *
> +  * The checksum verification status would be set in mbuf using
> +  * PKT_RX_IP_CKSUM_xxx flags.
> +  *
> +  * Inner IP checksum computation can also be enabled(per operation)
> +  * by setting the flag PKT_TX_IP_CKSUM in mbuf.
> +  */
> + uint32_t ip_csum_enable : 1;
> +
> + /** Compute/verify inner packet L4 checksum in tunnel mode
> +  *
> +  * * 1: For outbound, compute inner packet L4 checksum before
> +  *  tunnel encapsulation and for inbound, verify after
> +  *  tunnel decapsulation.
> +  * * 0: Inner packet L4 checksum is not computed/verified.
> +  *
> +  * The checksum verification status would be set in mbuf using
> +  * PKT_RX_L4_CKSUM_xxx flags.
> +  *
> +  * Inner L4 checksum computation can also be enabled(per operation)
> +  * by setting the flags PKT_TX_TCP_CKSUM or PKT_TX_SCTP_CKSUM or
> +  * PKT_TX_UDP_CKSUM or PKT_TX_L4_MASK in mbuf.
> +  */
> + uint32_t l4_csum_enable :

Re: [dpdk-dev] [PATCH v3 3/7] ethdev: copy ethdev 'fast' API into separate structure

[Pavan Nikhilesh Bhagavatula]

>
>> >Copy public function pointers (rx_pkt_burst(), etc.) and related
>> >pointers to internal data from rte_eth_dev structure into a
>> >separate flat array. That array will remain in a public header.
>> >The intention here is to make rte_eth_dev and related structures
>> >internal.
>> >That should allow future possible changes to core eth_dev
>structures
>> >to be transparent to the user and help to avoid ABI/API breakages.
>> >The plan is to keep minimal part of data from rte_eth_dev public,
>> >so we still can use inline functions for 'fast' calls
>> >(like rte_eth_rx_burst(), etc.) to avoid/minimize slowdown.
>> >
>> >Signed-off-by: Konstantin Ananyev
>
>> >---
>> > lib/ethdev/ethdev_private.c  | 52
>> >
>> > lib/ethdev/ethdev_private.h  |  7 +
>> > lib/ethdev/rte_ethdev.c  | 17 
>> > lib/ethdev/rte_ethdev_core.h | 45
>> >+++
>> > 4 files changed, 121 insertions(+)
>> >
>>
>> 
>>
>> >+void
>> >+eth_dev_fp_ops_reset(struct rte_eth_fp_ops *fpo)
>> >+{
>> >+   static void *dummy_data[RTE_MAX_QUEUES_PER_PORT];
>> >+   static const struct rte_eth_fp_ops dummy_ops = {
>> >+   .rx_pkt_burst = dummy_eth_rx_burst,
>> >+   .tx_pkt_burst = dummy_eth_tx_burst,
>> >+   .rxq = {.data = dummy_data, .clbk = dummy_data,},
>> >+   .txq = {.data = dummy_data, .clbk = dummy_data,},
>> >+   };
>> >+
>> >+   *fpo = dummy_ops;
>> >+}
>> >+
>> >+void
>> >+eth_dev_fp_ops_setup(struct rte_eth_fp_ops *fpo,
>> >+   const struct rte_eth_dev *dev)
>> >+{
>> >+   fpo->rx_pkt_burst = dev->rx_pkt_burst;
>> >+   fpo->tx_pkt_burst = dev->tx_pkt_burst;
>> >+   fpo->tx_pkt_prepare = dev->tx_pkt_prepare;
>> >+   fpo->rx_queue_count = dev->rx_queue_count;
>> >+   fpo->rx_descriptor_status = dev->rx_descriptor_status;
>> >+   fpo->tx_descriptor_status = dev->tx_descriptor_status;
>> >+
>> >+   fpo->rxq.data = dev->data->rx_queues;
>> >+   fpo->rxq.clbk = (void **)(uintptr_t)dev->post_rx_burst_cbs;
>> >+
>> >+   fpo->txq.data = dev->data->tx_queues;
>> >+   fpo->txq.clbk = (void **)(uintptr_t)dev->pre_tx_burst_cbs;
>> >+}
>> >diff --git a/lib/ethdev/ethdev_private.h
>b/lib/ethdev/ethdev_private.h
>> >index 3724429577..40333e7651 100644
>> >--- a/lib/ethdev/ethdev_private.h
>> >+++ b/lib/ethdev/ethdev_private.h
>> >@@ -26,4 +26,11 @@ eth_find_device(const struct rte_eth_dev
>> >*_start, rte_eth_cmp_t cmp,
>> > /* Parse devargs value for representor parameter. */
>> > int rte_eth_devargs_parse_representor_ports(char *str, void
>*data);
>> >
>> >+/* reset eth 'fast' API to dummy values */
>> >+void eth_dev_fp_ops_reset(struct rte_eth_fp_ops *fpo);
>> >+
>> >+/* setup eth 'fast' API to ethdev values */
>> >+void eth_dev_fp_ops_setup(struct rte_eth_fp_ops *fpo,
>> >+   const struct rte_eth_dev *dev);
>> >+
>> > #endif /* _ETH_PRIVATE_H_ */
>> >diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
>> >index 424bc260fa..9fbb1bc3db 100644
>> >--- a/lib/ethdev/rte_ethdev.c
>> >+++ b/lib/ethdev/rte_ethdev.c
>> >@@ -44,6 +44,9 @@
>> > static const char *MZ_RTE_ETH_DEV_DATA = "rte_eth_dev_data";
>> > struct rte_eth_dev rte_eth_devices[RTE_MAX_ETHPORTS];
>> >
>> >+/* public 'fast' API */
>> >+struct rte_eth_fp_ops rte_eth_fp_ops[RTE_MAX_ETHPORTS];
>> >+
>> > /* spinlock for eth device callbacks */
>> > static rte_spinlock_t eth_dev_cb_lock =
>RTE_SPINLOCK_INITIALIZER;
>> >
>> >@@ -1788,6 +1791,9 @@ rte_eth_dev_start(uint16_t port_id)
>> >(*dev->dev_ops->link_update)(dev, 0);
>> >}
>> >
>> >+   /* expose selection of PMD rx/tx function */
>> >+   eth_dev_fp_ops_setup(rte_eth_fp_ops + port_id, dev);
>> >+
>>
>> Secondary process will not set these properly I believe as it might not
>> call start() if it does primary process ops will not be set.
>
>That's a very good point, have to admit - I missed that part.
>
>>
>> One simple solution is to call ops_setup() around
>rte_eth_dev_attach_secondary()
>> but if application doesn't invoke start() on Primary the ops will not be
>set for it.
>
>I think rte_eth_dev_attach_secondary() wouldn't work, as majority of
>the PMDs setup
>fast ops function pointers after it.
>From reading the code rte_eth_dev_probing_finish() seems like a good
>choice -
>as it is always the final point in device initialization for secondary
>process.

Ack, make sense to me, I did a similar thing for event device in
http://patches.dpdk.org/project/dpdk/patch/20211003082710.8398-4-pbhagavat...@marvell.com/

>
>BTW, we also need something similar at de-init phase.
>rte_eth_dev_release_port() seems like a good candidate for it.
>

Hindsight I should have added reset to rte_event_pmd_pci_remove(), I will add 
it in next version.

>
>>
>> >rte_ethdev_trace_start(port_id);
>> >return 0;
>> > }
>> >@@ -1810,6 +1816,9 @@ rte_eth_dev_stop(uint16_t port_id)
>> >return 0;
>> >}
>> >
>> >+   /* point rx/tx functions to dummy ones */
>> >+   eth_dev_fp_ops_reset(rte_eth_fp_op

[dpdk-dev] [PATCH v3 1/2] hash: split x86 and SW hash CRC intrinsics

[pbhagavatula]

From: Pavan Nikhilesh 

Split x86 and SW hash crc intrinsics into a separate files.

Signed-off-by: Pavan Nikhilesh 
---
 v3 Changes:
 - Split x86 and SW hash crc functions into separate files.
 - Rename `rte_crc_arm64.h` to `hash_crc_arm64.h` as it is internal and not
 installed by meson build.

 v2 Changes:
 - Don't remove `rte_crc_arm64.h` for ABI purposes.
 - Revert function pointer approach for performance reasons.
 - Select the best available algorithm based on the arch when user passes an
 unsupported crc32 algorithm.

 lib/hash/hash_crc_sw.h  | 419 
 lib/hash/hash_crc_x86.h |  62 ++
 lib/hash/rte_hash_crc.h | 396 +
 3 files changed, 483 insertions(+), 394 deletions(-)
 create mode 100644 lib/hash/hash_crc_sw.h
 create mode 100644 lib/hash/hash_crc_x86.h

diff --git a/lib/hash/hash_crc_sw.h b/lib/hash/hash_crc_sw.h
new file mode 100644
index 00..4790a0970b
--- /dev/null
+++ b/lib/hash/hash_crc_sw.h
@@ -0,0 +1,419 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#ifndef _HASH_CRC_SW_H_
+#define _HASH_CRC_SW_H_
+
+/* Lookup tables for software implementation of CRC32C */
+static const uint32_t crc32c_tables[8][256] = {
+   {0x, 0xF26B8303, 0xE13B70F7, 0x1350F3F4, 0xC79A971F, 0x35F1141C,
+0x26A1E7E8, 0xD4CA64EB, 0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B,
+0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24, 0x105EC76F, 0xE235446C,
+0xF165B798, 0x030E349B, 0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384,
+0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54, 0x5D1D08BF, 0xAF768BBC,
+0xBC267848, 0x4E4DFB4B, 0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A,
+0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35, 0xAA64D611, 0x580F5512,
+0x4B5FA6E6, 0xB93425E5, 0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA,
+0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45, 0xF779DEAE, 0x05125DAD,
+0x1642AE59, 0xE4292D5A, 0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A,
+0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595, 0x417B1DBC, 0xB3109EBF,
+0xA0406D4B, 0x522BEE48, 0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957,
+0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687, 0x0C38D26C, 0xFE53516F,
+0xED03A29B, 0x1F682198, 0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927,
+0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38, 0xDBFC821C, 0x2997011F,
+0x3AC7F2EB, 0xC8AC71E8, 0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7,
+0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096, 0xA65C047D, 0x5437877E,
+0x4767748A, 0xB50CF789, 0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859,
+0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46, 0x7198540D, 0x83F3D70E,
+0x90A324FA, 0x62C8A7F9, 0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6,
+0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36, 0x3CDB9BDD, 0xCEB018DE,
+0xDDE0EB2A, 0x2F8B6829, 0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C,
+0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93, 0x082F63B7, 0xFA44E0B4,
+0xE9141340, 0x1B7F9043, 0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C,
+0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3, 0x55326B08, 0xA759E80B,
+0xB4091BFF, 0x466298FC, 0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C,
+0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033, 0xA24BB5A6, 0x502036A5,
+0x4370C551, 0xB11B4652, 0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D,
+0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D, 0xEF087A76, 0x1D63F975,
+0x0E330A81, 0xFC588982, 0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D,
+0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622, 0x38CC2A06, 0xCAA7A905,
+0xD9F75AF1, 0x2B9CD9F2, 0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED,
+0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530, 0x0417B1DB, 0xF67C32D8,
+0xE52CC12C, 0x1747422F, 0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF,
+0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0, 0xD3D3E1AB, 0x21B862A8,
+0x32E8915C, 0xC083125F, 0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540,
+0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90, 0x9E902E7B, 0x6CFBAD78,
+0x7FAB5E8C, 0x8DC0DD8F, 0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE,
+0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1, 0x69E9F0D5, 0x9B8273D6,
+0x88D28022, 0x7AB90321, 0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E,
+0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81, 0x34F4F86A, 0xC69F7B69,
+0xD5CF889D, 0x27A40B9E, 0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E,
+0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351},
+   {0x, 0x13A29877, 0x274530EE, 0x34E7A899, 0x4E8A61DC, 0x5D28F9AB,
+0x69CF5132, 0x7A6DC945, 0x9D14C3B8, 0x8EB65BCF, 0xBA51F356, 0xA9F36B21,
+0xD39EA264, 0xC03C3A13, 0xF4DB928A, 0xE7790AFD, 0x3FC5F181, 0x2C6769F6,
+0x1880C1

[dpdk-dev] [PATCH v3 2/2] hash: unify crc32 selection for x86 and Arm

[pbhagavatula]

From: Pavan Nikhilesh 

Merge crc32 hash calculation public API implementation for x86 and Arm.
Select the best available CRC32 algorithm when unsupported algorithm
on a given CPU architecture is requested by an application.

Previously, if an application directly includes `rte_crc_arm64.h`
without including `rte_hash_crc.h` it will fail to compile.

Signed-off-by: Pavan Nikhilesh 
---
 lib/hash/hash_crc_arm64.h |  48 ++
 lib/hash/meson.build  |   1 -
 lib/hash/rte_crc_arm64.h  | 183 --
 lib/hash/rte_hash_crc.h   |  75 
 4 files changed, 108 insertions(+), 199 deletions(-)
 create mode 100644 lib/hash/hash_crc_arm64.h
 delete mode 100644 lib/hash/rte_crc_arm64.h

diff --git a/lib/hash/hash_crc_arm64.h b/lib/hash/hash_crc_arm64.h
new file mode 100644
index 00..29b61a07a9
--- /dev/null
+++ b/lib/hash/hash_crc_arm64.h
@@ -0,0 +1,48 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015 Cavium, Inc
+ */
+
+#ifndef _HASH_CRC_ARM64_H_
+#define _HASH_CRC_ARM64_H_
+
+static inline uint32_t
+crc32c_arm64_u8(uint8_t data, uint32_t init_val)
+{
+   __asm__ volatile(
+   "crc32cb %w[crc], %w[crc], %w[value]"
+   : [crc] "+r" (init_val)
+   : [value] "r" (data));
+   return init_val;
+}
+
+static inline uint32_t
+crc32c_arm64_u16(uint16_t data, uint32_t init_val)
+{
+   __asm__ volatile(
+   "crc32ch %w[crc], %w[crc], %w[value]"
+   : [crc] "+r" (init_val)
+   : [value] "r" (data));
+   return init_val;
+}
+
+static inline uint32_t
+crc32c_arm64_u32(uint32_t data, uint32_t init_val)
+{
+   __asm__ volatile(
+   "crc32cw %w[crc], %w[crc], %w[value]"
+   : [crc] "+r" (init_val)
+   : [value] "r" (data));
+   return init_val;
+}
+
+static inline uint32_t
+crc32c_arm64_u64(uint64_t data, uint32_t init_val)
+{
+   __asm__ volatile(
+   "crc32cx %w[crc], %w[crc], %x[value]"
+   : [crc] "+r" (init_val)
+   : [value] "r" (data));
+   return init_val;
+}
+
+#endif /* _HASH_CRC_ARM64_H_ */
diff --git a/lib/hash/meson.build b/lib/hash/meson.build
index 9bc5ef925a..8794ea82a7 100644
--- a/lib/hash/meson.build
+++ b/lib/hash/meson.build
@@ -8,7 +8,6 @@ headers = files(
 'rte_jhash.h',
 'rte_thash.h',
 )
-indirect_headers += files('rte_crc_arm64.h')
 
 sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c', 'rte_thash.c')
 deps += ['net']
diff --git a/lib/hash/rte_crc_arm64.h b/lib/hash/rte_crc_arm64.h
deleted file mode 100644
index b4628cfc09..00
--- a/lib/hash/rte_crc_arm64.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015 Cavium, Inc
- */
-
-#ifndef _RTE_CRC_ARM64_H_
-#define _RTE_CRC_ARM64_H_
-
-/**
- * @file
- *
- * RTE CRC arm64 Hash
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include 
-#include 
-#include 
-#include 
-
-static inline uint32_t
-crc32c_arm64_u8(uint8_t data, uint32_t init_val)
-{
-   __asm__ volatile(
-   "crc32cb %w[crc], %w[crc], %w[value]"
-   : [crc] "+r" (init_val)
-   : [value] "r" (data));
-   return init_val;
-}
-
-static inline uint32_t
-crc32c_arm64_u16(uint16_t data, uint32_t init_val)
-{
-   __asm__ volatile(
-   "crc32ch %w[crc], %w[crc], %w[value]"
-   : [crc] "+r" (init_val)
-   : [value] "r" (data));
-   return init_val;
-}
-
-static inline uint32_t
-crc32c_arm64_u32(uint32_t data, uint32_t init_val)
-{
-   __asm__ volatile(
-   "crc32cw %w[crc], %w[crc], %w[value]"
-   : [crc] "+r" (init_val)
-   : [value] "r" (data));
-   return init_val;
-}
-
-static inline uint32_t
-crc32c_arm64_u64(uint64_t data, uint32_t init_val)
-{
-   __asm__ volatile(
-   "crc32cx %w[crc], %w[crc], %x[value]"
-   : [crc] "+r" (init_val)
-   : [value] "r" (data));
-   return init_val;
-}
-
-/**
- * Allow or disallow use of arm64 SIMD instrinsics for CRC32 hash
- * calculation.
- *
- * @param alg
- *   An OR of following flags:
- *   - (CRC32_SW) Don't use arm64 crc intrinsics
- *   - (CRC32_ARM64) Use ARMv8 CRC intrinsic if available
- *
- */
-static inline void
-rte_hash_crc_set_alg(uint8_t alg)
-{
-   switch (alg) {
-   case CRC32_ARM64:
-   if (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_CRC32))
-   alg = CRC32_SW;
-   /* fall-through */
-   case CRC32_SW:
-   crc32_alg = alg;
-   /* fall-through */
-   default:
-   break;
-   }
-}
-
-/* Setting the best available algorithm */
-RTE_INIT(rte_hash_crc_init_alg)
-{
-   rte_hash_c

Re: [dpdk-dev] [PATCH v3 1/5] ethdev: add API to negotiate delivery of Rx meta data

[Ivan Malov]

Hi Ori,

On 04/10/2021 00:04, Ori Kam wrote:

Hi Ivan,

Sorry for the long review.


-Original Message-
From: Ivan Malov 
Sent: Sunday, October 3, 2021 8:30 PM
Subject: Re: [PATCH v3 1/5] ethdev: add API to negotiate delivery of Rx meta
data

Hi Ori,

On 03/10/2021 14:01, Ori Kam wrote:

Hi Ivan,


-Original Message-
From: Ivan Malov 
Sent: Sunday, October 3, 2021 12:30 PM data

Hi Ori,

Thanks for reviewing this.



No problem.


On 03/10/2021 10:42, Ori Kam wrote:

Hi Andrew and Ivan,



-Original Message-
From: Andrew Rybchenko 
Sent: Friday, October 1, 2021 9:50 AM
Subject: Re: [PATCH v3 1/5] ethdev: add API to negotiate delivery
of Rx meta data

On 9/30/21 10:07 PM, Ivan Malov wrote:

Hi Ori,

On 30/09/2021 17:59, Ori Kam wrote:

Hi Ivan,
Sorry for jumping in late.


No worries. That's OK.


I have a concern that this patch breaks other PMDs.


It does no such thing.


   From the rst file " One should negotiate flag delivery beforehand"

since you only added this function for your PMD all other PMD will

fail.

I see that you added exception in the  examples, but it doesn't
make sense that applications will also need to add this exception
which is not documented.


Say, you have an application, and you use it with some specific PMD.
Say, that PMD doesn't run into the problem as ours does. In other
words, the user can insert a flow with action MARK at any point
and get mark delivery working starting from that moment without
any problem. Say, this is exactly the way how it works for you at
the

moment.


Now. This new API kicks in. We update the application to invoke it
as early as possible. But your PMD in question still doesn't
support this API. The comment in the patch says that if the method
returns ENOTSUP, the application should ignore that without
batting an eyelid. It should just keep on working as it did before
the introduction of

this API.




I understand that it is nice to write in the patch comment that
application should disregard this function in case of ENOTSUP but in
a few month someone will read the official doc, where it is stated
that this function call is a must and then what do you think the
application will do?
I think that the correct way is to add this function to all PMDs.
Another option is to add to the doc that if the function is
returning ENOTSUP the application should assume that all is supported.

So from this point of view there is API break.


So, you mean an API breakage in some formal sense? If the doc is
fixed in accordance with the second option you suggest, will it
suffice to avoid this formal API breakage?



Yes, but I think it will be better to add the missing function.




More specific example:
Say, the application doesn't mind using either "RSS + MARK" or
tunnel offload. What it does right now is attempt to insert tunnel
flows first and, if this fails, fall back to "RSS + MARK". With
this API, the application will try to invoke this API with
"USER_MARK | TUNNEL_ID" in adapter initialised state. If the PMD
says that it can only enable the tunnel offload, then the
application will get the knowledge that it doesn't make sense to
even try inserting "RSS + MARK" flows. It just can skip useless
actions. But if the PMD doesn't support the method, the
application will see ENOTSUP and handle this
gracefully: it will make no assumptions about what's guaranteed to
be supported and what's not and will just keep on its old behavior:
try to insert a flow, fail, fall back to another type of flow.



I fully agree with your example, and think that this is the way to
go, application should supply as much info as possible during startup.


Right.


My question/comment is the negotiated result means that all of the
actions are supported on the same rule?
for example if application wants to add mark and tag on the same rule.
(I know it doesn't make much sense) and the PMD can support both of
them but not on the same rule, what should it return?
Or for example if using the mark can only be supported if no decap
action is set on this rule what should be the result?
   From my undstanding this function is only to let the PMD know that
on some rules the application will use those actions, the checking
if the action combination is valid only happens on validate function right?


This API does not bind itself to flow API. It's *not* about enabling
support for metadata *actions* (they are conducted entirely *inside*
the NIC). It's about enabling *delivery* of metadata from the NIC to host.



Good point so why not use the same logic as the metadata and register it?
Since in any case, this is something in the mbuf so maybe this should be the

answer?

I didn't catch your thought. Could you please elaborate on it?


The metadata action just like the mark or flag is used to give application
data that was set by a flow rule.
To enable the metadata the application must register the metadata field.
Since this happens during the creation of the mbuf it means that it 

Re: [dpdk-dev] [PATCH v1 01/12] ethdev: add ethdev item to flow API

[Ivan Malov]

Hi Ori,

On 04/10/2021 00:09, Ori Kam wrote:

Hi Ivan,


-Original Message-
From: Ivan Malov 
Subject: Re: [PATCH v1 01/12] ethdev: add ethdev item to flow API

Hi Ori,

On 03/10/2021 14:52, Ori Kam wrote:

Hi Andrew and Ivan,


-Original Message-
From: Andrew Rybchenko 
Sent: Friday, October 1, 2021 4:47 PM
Subject: [PATCH v1 01/12] ethdev: add ethdev item to flow API

From: Ivan Malov 

For use with "transfer" flows. Supposed to match traffic transmitted
by the DPDK application via the specified ethdev, at e-switch level.

Must not be combined with attributes "ingress" / "egress".

Signed-off-by: Ivan Malov 
Signed-off-by: Andrew Rybchenko 
---


[Snip]


   /** Generate flow_action[] entry. */ diff --git
a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index
7b1ed7f110..880502098e 100644
--- a/lib/ethdev/rte_flow.h
+++ b/lib/ethdev/rte_flow.h
@@ -574,6 +574,15 @@ enum rte_flow_item_type {
 * @see struct rte_flow_item_conntrack.
 */
RTE_FLOW_ITEM_TYPE_CONNTRACK,
+
+   /**
+* [META]
+*
+* Matches traffic at e-switch going from (sent by) the given ethdev.
+*
+* @see struct rte_flow_item_ethdev
+*/
+   RTE_FLOW_ITEM_TYPE_ETHDEV,
   };

   /**
@@ -1799,6 +1808,24 @@ static const struct rte_flow_item_conntrack
rte_flow_item_conntrack_mask = {  };  #endif

+/**
+ * @warning
+ * @b EXPERIMENTAL: this structure may change without prior notice
+ *
+ * Provides an ethdev ID for use with items which are as follows:
+ * RTE_FLOW_ITEM_TYPE_ETHDEV.
+ */
+struct rte_flow_item_ethdev {
+   uint16_t id; /**< Ethdev ID */


True for all above uses,
should this be renamed to port?


I'd not rename it to "port". The very idea of this series is to disambiguate
things. This structure is shared between primitives ETHDEV and
ESWITCH_PORT. If we go for "port", then in conjunction with ESWITCH_PORT
the structure name may trick readers into thinking that the ID in question is
the own ID of the e-switch port itself. But in fact this ID is an ethdev ID 
which
is associated with the e-switch port.

Should you wish to elaborate on your concerns with regard to naming, please
do so. I'm all ears.


Fully understand and agree that the idea is to clear the ambiguaty.
My concern is that we don't use ethdev id, from application ethdev has only
ports, so what is the id? (if we keep this, we should document that the id is 
the
port)
What about ETHDEV_PORT and ESWITCH_PORT?


I understand that, technically, the only ports which the application can 
really interface with are ethdevs. So, terms "ethdev" and "port" may 
appear synonymous to the application - you are right on that. But, given 
the fact that we have some primitives like PHY_PORT and the likes, which 
also have "PORT" in their names, I'd rather go for "ethdev" as more 
precise term.


But let me assure you: I'm not saying that my opinion should prevail. 
I'm giving more thoughts to this in the background. Maybe Andrew can 
join this conversation as well.




Best,
Ori



+};
+
+/** Default mask for RTE_FLOW_ITEM_TYPE_ETHDEV */ #ifndef
__cplusplus
+static const struct rte_flow_item_ethdev rte_flow_item_ethdev_mask

= {

+   .id = 0x,
+};
+#endif
+
   /**
* Matching pattern item definition.
*
--
2.30.2


--
Ivan M


--
Ivan M

Re: [dpdk-dev] [PATCH v6 2/2] ethdev: change queue release callback

[Ajit Khaparde]

On Sun, Oct 3, 2021 at 12:38 AM Matan Azrad  wrote:

>
>
> From: Xueming(Steven) Li
> > Currently, most ethdev callback API use queue ID as parameter, but Rx
> > and Tx queue release callback use queue object which is used by Rx and
> > Tx burst data plane callback.
> >
> > To align with other eth device queue configuration callbacks:
> > - queue release callbacks are changed to use queue ID
> > - all drivers are adapted
> >
> > Signed-off-by: Xueming Li 
> > Reviewed-by: Andrew Rybchenko 
> Acked-by: Matan Azrad 
>
Acked-by: Ajit Khaparde 

Re: [dpdk-dev] [PATCH v3 1/5] ethdev: add API to negotiate delivery of Rx meta data

[Ori Kam]

Hi Ivan,

Sorry for the long review.

> -Original Message-
> From: Ivan Malov 
> Sent: Sunday, October 3, 2021 8:30 PM
> Subject: Re: [PATCH v3 1/5] ethdev: add API to negotiate delivery of Rx meta
> data
> 
> Hi Ori,
> 
> On 03/10/2021 14:01, Ori Kam wrote:
> > Hi Ivan,
> >
> >> -Original Message-
> >> From: Ivan Malov 
> >> Sent: Sunday, October 3, 2021 12:30 PM data
> >>
> >> Hi Ori,
> >>
> >> Thanks for reviewing this.
> >>
> >
> > No problem.
> >
> >> On 03/10/2021 10:42, Ori Kam wrote:
> >>> Hi Andrew and Ivan,
> >>>
> >>>
>  -Original Message-
>  From: Andrew Rybchenko 
>  Sent: Friday, October 1, 2021 9:50 AM
>  Subject: Re: [PATCH v3 1/5] ethdev: add API to negotiate delivery
>  of Rx meta data
> 
>  On 9/30/21 10:07 PM, Ivan Malov wrote:
> > Hi Ori,
> >
> > On 30/09/2021 17:59, Ori Kam wrote:
> >> Hi Ivan,
> >> Sorry for jumping in late.
> >
> > No worries. That's OK.
> >
> >> I have a concern that this patch breaks other PMDs.
> >
> > It does no such thing.
> >
> >>>   From the rst file " One should negotiate flag delivery beforehand"
> >> since you only added this function for your PMD all other PMD will
> fail.
> >> I see that you added exception in the  examples, but it doesn't
> >> make sense that applications will also need to add this exception
> >> which is not documented.
> >
> > Say, you have an application, and you use it with some specific PMD.
> > Say, that PMD doesn't run into the problem as ours does. In other
> > words, the user can insert a flow with action MARK at any point
> > and get mark delivery working starting from that moment without
> > any problem. Say, this is exactly the way how it works for you at
> > the
> >> moment.
> >
> > Now. This new API kicks in. We update the application to invoke it
> > as early as possible. But your PMD in question still doesn't
> > support this API. The comment in the patch says that if the method
> > returns ENOTSUP, the application should ignore that without
> > batting an eyelid. It should just keep on working as it did before
> > the introduction of
> >> this API.
> >
> >>>
> >>> I understand that it is nice to write in the patch comment that
> >>> application should disregard this function in case of ENOTSUP but in
> >>> a few month someone will read the official doc, where it is stated
> >>> that this function call is a must and then what do you think the
> >>> application will do?
> >>> I think that the correct way is to add this function to all PMDs.
> >>> Another option is to add to the doc that if the function is
> >>> returning ENOTSUP the application should assume that all is supported.
> >>>
> >>> So from this point of view there is API break.
> >>
> >> So, you mean an API breakage in some formal sense? If the doc is
> >> fixed in accordance with the second option you suggest, will it
> >> suffice to avoid this formal API breakage?
> >>
> >
> > Yes, but I think it will be better to add the missing function.
> >
> >>>
> > More specific example:
> > Say, the application doesn't mind using either "RSS + MARK" or
> > tunnel offload. What it does right now is attempt to insert tunnel
> > flows first and, if this fails, fall back to "RSS + MARK". With
> > this API, the application will try to invoke this API with
> > "USER_MARK | TUNNEL_ID" in adapter initialised state. If the PMD
> > says that it can only enable the tunnel offload, then the
> > application will get the knowledge that it doesn't make sense to
> > even try inserting "RSS + MARK" flows. It just can skip useless
> > actions. But if the PMD doesn't support the method, the
> > application will see ENOTSUP and handle this
> > gracefully: it will make no assumptions about what's guaranteed to
> > be supported and what's not and will just keep on its old behavior:
> > try to insert a flow, fail, fall back to another type of flow.
> >
> >>>
> >>> I fully agree with your example, and think that this is the way to
> >>> go, application should supply as much info as possible during startup.
> >>
> >> Right.
> >>
> >>> My question/comment is the negotiated result means that all of the
> >>> actions are supported on the same rule?
> >>> for example if application wants to add mark and tag on the same rule.
> >>> (I know it doesn't make much sense) and the PMD can support both of
> >>> them but not on the same rule, what should it return?
> >>> Or for example if using the mark can only be supported if no decap
> >>> action is set on this rule what should be the result?
> >>>   From my undstanding this function is only to let the PMD know that
> >>> on some rules the application will use those actions, the checking
> >>> if the action combination is valid only happens on validate function 
> >>> right?
> >>
> >> This API does not bind itself to f

Re: [dpdk-dev] [PATCH v1 01/12] ethdev: add ethdev item to flow API

[Ori Kam]

Hi Ivan,

> -Original Message-
> From: Ivan Malov 
> Subject: Re: [PATCH v1 01/12] ethdev: add ethdev item to flow API
> 
> Hi Ori,
> 
> On 03/10/2021 14:52, Ori Kam wrote:
> > Hi Andrew and Ivan,
> >
> >> -Original Message-
> >> From: Andrew Rybchenko 
> >> Sent: Friday, October 1, 2021 4:47 PM
> >> Subject: [PATCH v1 01/12] ethdev: add ethdev item to flow API
> >>
> >> From: Ivan Malov 
> >>
> >> For use with "transfer" flows. Supposed to match traffic transmitted
> >> by the DPDK application via the specified ethdev, at e-switch level.
> >>
> >> Must not be combined with attributes "ingress" / "egress".
> >>
> >> Signed-off-by: Ivan Malov 
> >> Signed-off-by: Andrew Rybchenko 
> >> ---
> >
> > [Snip]
> >
> >>   /** Generate flow_action[] entry. */ diff --git
> >> a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index
> >> 7b1ed7f110..880502098e 100644
> >> --- a/lib/ethdev/rte_flow.h
> >> +++ b/lib/ethdev/rte_flow.h
> >> @@ -574,6 +574,15 @@ enum rte_flow_item_type {
> >> * @see struct rte_flow_item_conntrack.
> >> */
> >>RTE_FLOW_ITEM_TYPE_CONNTRACK,
> >> +
> >> +  /**
> >> +   * [META]
> >> +   *
> >> +   * Matches traffic at e-switch going from (sent by) the given ethdev.
> >> +   *
> >> +   * @see struct rte_flow_item_ethdev
> >> +   */
> >> +  RTE_FLOW_ITEM_TYPE_ETHDEV,
> >>   };
> >>
> >>   /**
> >> @@ -1799,6 +1808,24 @@ static const struct rte_flow_item_conntrack
> >> rte_flow_item_conntrack_mask = {  };  #endif
> >>
> >> +/**
> >> + * @warning
> >> + * @b EXPERIMENTAL: this structure may change without prior notice
> >> + *
> >> + * Provides an ethdev ID for use with items which are as follows:
> >> + * RTE_FLOW_ITEM_TYPE_ETHDEV.
> >> + */
> >> +struct rte_flow_item_ethdev {
> >> +  uint16_t id; /**< Ethdev ID */
> >
> > True for all above uses,
> > should this be renamed to port?
> 
> I'd not rename it to "port". The very idea of this series is to disambiguate
> things. This structure is shared between primitives ETHDEV and
> ESWITCH_PORT. If we go for "port", then in conjunction with ESWITCH_PORT
> the structure name may trick readers into thinking that the ID in question is
> the own ID of the e-switch port itself. But in fact this ID is an ethdev ID 
> which
> is associated with the e-switch port.
> 
> Should you wish to elaborate on your concerns with regard to naming, please
> do so. I'm all ears.
> 
Fully understand and agree that the idea is to clear the ambiguaty.
My concern is that we don't use ethdev id, from application ethdev has only
ports, so what is the id? (if we keep this, we should document that the id is 
the
port) 
What about ETHDEV_PORT and ESWITCH_PORT?

Best,
Ori
> >
> >> +};
> >> +
> >> +/** Default mask for RTE_FLOW_ITEM_TYPE_ETHDEV */ #ifndef
> >> __cplusplus
> >> +static const struct rte_flow_item_ethdev rte_flow_item_ethdev_mask
> = {
> >> +  .id = 0x,
> >> +};
> >> +#endif
> >> +
> >>   /**
> >>* Matching pattern item definition.
> >>*
> >> --
> >> 2.30.2
> 
> --
> Ivan M

Re: [dpdk-dev] [PATCH v4 2/6] net/iavf: rework tx path

[Wu, Jingjing]

> -Original Message-
> From: Nicolau, Radu 
> Sent: Friday, October 1, 2021 5:51 PM
> To: Wu, Jingjing ; Xing, Beilei 
> ; Richardson,
> Bruce ; Ananyev, Konstantin 
> 
> Cc: dev@dpdk.org; Doherty, Declan ; Sinha, Abhijit
> ; Zhang, Qi Z ; Nicolau, Radu
> 
> Subject: [PATCH v4 2/6] net/iavf: rework tx path
> 
> Rework the TX path and TX descriptor usage in order to
> allow for better use of oflload flags and to facilitate enabling of
> inline crypto offload feature.
> 
> Signed-off-by: Declan Doherty 
> Signed-off-by: Abhijit Sinha 
> Signed-off-by: Radu Nicolau 
> ---
>  drivers/net/iavf/iavf_rxtx.c | 536 +++
>  drivers/net/iavf/iavf_rxtx.h |   9 +-
>  drivers/net/iavf/iavf_rxtx_vec_sse.c |  10 +-
>  3 files changed, 319 insertions(+), 236 deletions(-)

Acked-by: Jingjing Wu 

Re: [dpdk-dev] [PATCH v4 3/6] net/iavf: add support for asynchronous virt channel messages

[Wu, Jingjing]

> -Original Message-
> From: Nicolau, Radu 
> Sent: Friday, October 1, 2021 5:51 PM
> To: Wu, Jingjing ; Xing, Beilei 
> Cc: dev@dpdk.org; Doherty, Declan ; Sinha, Abhijit
> ; Zhang, Qi Z ; Richardson, 
> Bruce
> ; Ananyev, Konstantin 
> ;
> Nicolau, Radu 
> Subject: [PATCH v4 3/6] net/iavf: add support for asynchronous virt channel 
> messages
> 
> Add support for asynchronous virtual channel messages, specifically for
> inline IPsec messages.
> 
> Signed-off-by: Declan Doherty 
> Signed-off-by: Abhijit Sinha 
> Signed-off-by: Radu Nicolau 
> ---
>  drivers/net/iavf/iavf.h   |  16 
>  drivers/net/iavf/iavf_vchnl.c | 137 +-
>  2 files changed, 101 insertions(+), 52 deletions(-)

Acked-by: Jingjing Wu 

Re: [dpdk-dev] [PATCH v4 4/6] net/iavf: add iAVF IPsec inline crypto support

[Wu, Jingjing]

> -Original Message-
> From: Nicolau, Radu 
> Sent: Friday, October 1, 2021 5:51 PM
> To: Wu, Jingjing ; Xing, Beilei 
> ; Ray Kinsella
> 
> Cc: dev@dpdk.org; Doherty, Declan ; Sinha, Abhijit
> ; Zhang, Qi Z ; Richardson, 
> Bruce
> ; Ananyev, Konstantin 
> ;
> Nicolau, Radu 
> Subject: [PATCH v4 4/6] net/iavf: add iAVF IPsec inline crypto support
> 
> Add support for inline crypto for IPsec, for ESP transport and
> tunnel over IPv4 and IPv6, as well as supporting the offload for
> ESP over UDP, and inconjunction with TSO for UDP and TCP flows.
> Implement support for rte_security packet metadata
> 
> Add definition for IPsec descriptors, extend support for offload
> in data and context descriptor to support
> 
> Add support to virtual channel mailbox for IPsec Crypto request
> operations. IPsec Crypto requests receive an initial acknowledgement
> from phsyical function driver of receipt of request and then an
> asynchronous response with success/failure of request including any
> response data.
> 
> Add enhanced descriptor debugging
> 
> Refactor of scalar tx burst function to support integration of offload
> 
> Signed-off-by: Declan Doherty 
> Signed-off-by: Abhijit Sinha 
> Signed-off-by: Radu Nicolau 

Reviewed-by: Jingjing Wu 

Re: [dpdk-dev] [PATCH v4 5/6] net/iavf: add xstats support for inline IPsec crypto

[Wu, Jingjing]

> -Original Message-
> From: Nicolau, Radu 
> Sent: Friday, October 1, 2021 5:51 PM
> To: Wu, Jingjing ; Xing, Beilei 
> Cc: dev@dpdk.org; Doherty, Declan ; Sinha, Abhijit
> ; Zhang, Qi Z ; Richardson, 
> Bruce
> ; Ananyev, Konstantin 
> ;
> Nicolau, Radu 
> Subject: [PATCH v4 5/6] net/iavf: add xstats support for inline IPsec crypto
> 
> Add per queue counters for maintaining statistics for inline IPsec
> crypto offload, which can be retrieved through the
> rte_security_session_stats_get() with more detailed errors through the
> rte_ethdev xstats.
> 
> Signed-off-by: Declan Doherty 
> Signed-off-by: Radu Nicolau 

Acked-by: Jingjing Wu 

Re: [dpdk-dev] [PATCH v4 6/6] net/iavf: add watchdog for VFLR

[Wu, Jingjing]

> -Original Message-
> From: Nicolau, Radu 
> Sent: Friday, October 1, 2021 5:52 PM
> To: Wu, Jingjing ; Xing, Beilei 
> Cc: dev@dpdk.org; Doherty, Declan ; Sinha, Abhijit
> ; Zhang, Qi Z ; Richardson, 
> Bruce
> ; Ananyev, Konstantin 
> ;
> Nicolau, Radu 
> Subject: [PATCH v4 6/6] net/iavf: add watchdog for VFLR
> 
> Add watchdog to iAVF PMD which support monitoring the VFLR register. If
> the device is not already in reset then if a VF reset in progress is
> detected then notfiy user through callback and set into reset state.
> If the device is already in reset then poll for completion of reset.
> 
> Signed-off-by: Declan Doherty 
> Signed-off-by: Radu Nicolau 
> ---
>  drivers/net/iavf/iavf.h|  6 +++
>  drivers/net/iavf/iavf_ethdev.c | 97 ++
>  2 files changed, 103 insertions(+)
> 
> diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
> index d5f574b4b3..4481d2e134 100644
> --- a/drivers/net/iavf/iavf.h
> +++ b/drivers/net/iavf/iavf.h
> @@ -212,6 +212,12 @@ struct iavf_info {
>   int cmd_retval; /* return value of the cmd response from PF */
>   uint8_t *aq_resp; /* buffer to store the adminq response from PF */
> 
> + struct {
> + uint8_t enabled:1;
> + uint64_t period_us;
> + } watchdog;
> + /** iAVF watchdog configuration */
> +
>   /* Event from pf */
>   bool dev_closed;
>   bool link_up;
> diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
> index aad6a28585..d02aa9c1c5 100644
> --- a/drivers/net/iavf/iavf_ethdev.c
> +++ b/drivers/net/iavf/iavf_ethdev.c
> @@ -24,6 +24,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
> 
>  #include "iavf.h"
>  #include "iavf_rxtx.h"
> @@ -239,6 +240,94 @@ iavf_tm_ops_get(struct rte_eth_dev *dev __rte_unused,
>   return 0;
>  }
> 
> +
> +static int
> +iavf_vfr_inprogress(struct iavf_hw *hw)
> +{
> + int inprogress = 0;
> +
> + if ((IAVF_READ_REG(hw, IAVF_VFGEN_RSTAT) &
> + IAVF_VFGEN_RSTAT_VFR_STATE_MASK) ==
> + VIRTCHNL_VFR_INPROGRESS)
> + inprogress = 1;
> +
> + if (inprogress)
> + PMD_DRV_LOG(INFO, "Watchdog detected VFR in progress");
> +
> + return inprogress;
> +}
> +
> +static void
> +iavf_dev_watchdog(void *cb_arg)
> +{
> + struct iavf_adapter *adapter = cb_arg;
> + struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(adapter);
> + int vfr_inprogress = 0, rc = 0;
> +
> + /* check if watchdog has been disabled since last call */
> + if (!adapter->vf.watchdog.enabled)
> + return;
> +
> + /* If in reset then poll vfr_inprogress register for completion */
> + if (adapter->vf.vf_reset) {
> + vfr_inprogress = iavf_vfr_inprogress(hw);
> +
> + if (!vfr_inprogress) {
> + PMD_DRV_LOG(INFO, "VF \"%s\" reset has completed",
> + adapter->eth_dev->data->name);
> + adapter->vf.vf_reset = false;
> + }
> + /* If not in reset then poll vfr_inprogress register for VFLR event */
> + } else {
> + vfr_inprogress = iavf_vfr_inprogress(hw);
> +
> + if (vfr_inprogress) {
> + PMD_DRV_LOG(INFO,
> + "VF \"%s\" reset event has been detected by 
> watchdog",
> + adapter->eth_dev->data->name);
> +
> + /* enter reset state with VFLR event */
> + adapter->vf.vf_reset = true;
> +
> + rte_eth_dev_callback_process(adapter->eth_dev,
> + RTE_ETH_EVENT_INTR_RESET, NULL);
> + }
> + }
> +
> + /* re-alarm watchdog */
> + rc = rte_eal_alarm_set(adapter->vf.watchdog.period_us,
> + &iavf_dev_watchdog, cb_arg);
> +
> + if (rc)
> + PMD_DRV_LOG(ERR, "Failed \"%s\" to reset device watchdog alarm",
> + adapter->eth_dev->data->name);
> +}
> +
> +static void
> +iavf_dev_watchdog_enable(struct iavf_adapter *adapter, uint64_t period_us)
> +{
> + int rc;
> +
> + PMD_DRV_LOG(INFO, "Enabling device watchdog");
> +
> + adapter->vf.watchdog.enabled = 1;
> + adapter->vf.watchdog.period_us = period_us;
> +
> + rc = rte_eal_alarm_set(adapter->vf.watchdog.period_us,
> + &iavf_dev_watchdog, (void *)adapter);
> + if (rc)
> + PMD_DRV_LOG(ERR, "Failed to enabled device watchdog");
> +}
> +
> +static void
> +iavf_dev_watchdog_disable(struct iavf_adapter *adapter)
> +{
> + PMD_DRV_LOG(INFO, "Disabling device watchdog");
> +
> + adapter->vf.watchdog.enabled = 0;
> + adapter->vf.watchdog.period_us = 0;
> +}
> +
>  static int
>  iavf_set_mc_addr_list(struct rte_eth_dev *dev,
>   struct rte_ether_addr *mc_addrs,
> @@ -2448,6 +2537,11 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
> 
>   iavf_default_rss_disable(adapter);

[dpdk-dev] [PATCH v5 1/5] eventdev/rx_adapter: add event buffer size configurability

[Naga Harish K S V]

Currently event buffer is static array with a default size defined
internally.

To configure event buffer size from application,
``rte_event_eth_rx_adapter_create_with_params`` api is added which
takes ``struct rte_event_eth_rx_adapter_params`` to configure event
buffer size in addition other params . The event buffer size is
rounded up for better buffer utilization and performance . In case
of NULL params argument, default event buffer size is used.

Signed-off-by: Naga Harish K S V 
Signed-off-by: Ganapati Kundapura 

---
v5:
* reverted queue conf get unit test change

v4:
* rebased with latest dpdk-next-eventdev branch
* changed queue conf get unit test

v3:
* updated documentation and code comments as per review comments.
* updated new create api test case name with suitable one.

v2:
* Updated header file and rx adapter documentation as per review comments.
* new api name is modified as rte_event_eth_rx_adapter_create_with_params
  as per review comments.
* rxa_params pointer argument Value NULL is allowed to represent the
  default values

v1:
* Initial implementation with documentation and unit tests.
---
---
 .../prog_guide/event_ethernet_rx_adapter.rst  |  7 ++
 lib/eventdev/rte_event_eth_rx_adapter.c   | 98 +--
 lib/eventdev/rte_event_eth_rx_adapter.h   | 41 +++-
 lib/eventdev/version.map  |  2 +
 4 files changed, 140 insertions(+), 8 deletions(-)

diff --git a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst 
b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
index ce23d8a474..8526aecf57 100644
--- a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
+++ b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
@@ -62,6 +62,13 @@ service function and needs to create an event port for it. 
The callback is
 expected to fill the ``struct rte_event_eth_rx_adapter_conf structure``
 passed to it.
 
+If the application desires to control the event buffer size, it can use the
+``rte_event_eth_rx_adapter_create_with_params()`` api. The event buffer size is
+specified using ``struct rte_event_eth_rx_adapter_params::event_buf_size``.
+The function is passed the event device to be associated with the adapter
+and port configuration for the adapter to setup an event port if the
+adapter needs to use a service function.
+
 Adding Rx Queues to the Adapter Instance
 
 
diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c 
b/lib/eventdev/rte_event_eth_rx_adapter.c
index 10491ca07b..606db241b8 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -85,7 +85,9 @@ struct rte_eth_event_enqueue_buffer {
/* Count of events in this buffer */
uint16_t count;
/* Array of events in this buffer */
-   struct rte_event events[ETH_EVENT_BUFFER_SIZE];
+   struct rte_event *events;
+   /* size of event buffer */
+   uint16_t events_size;
/* Event enqueue happens from head */
uint16_t head;
/* New packets from rte_eth_rx_burst is enqued from tail */
@@ -946,7 +948,7 @@ rxa_buffer_mbufs(struct rte_event_eth_rx_adapter 
*rx_adapter,
dropped = 0;
nb_cb = dev_info->cb_fn(eth_dev_id, rx_queue_id,
   buf->last |
-  (RTE_DIM(buf->events) & ~buf->last_mask),
+  (buf->events_size & ~buf->last_mask),
   buf->count >= BATCH_SIZE ?
buf->count - BATCH_SIZE : 0,
   &buf->events[buf->tail],
@@ -972,7 +974,7 @@ rxa_pkt_buf_available(struct rte_eth_event_enqueue_buffer 
*buf)
uint32_t nb_req = buf->tail + BATCH_SIZE;
 
if (!buf->last) {
-   if (nb_req <= RTE_DIM(buf->events))
+   if (nb_req <= buf->events_size)
return true;
 
if (buf->head >= BATCH_SIZE) {
@@ -2206,12 +2208,15 @@ rxa_ctrl(uint8_t id, int start)
return 0;
 }
 
-int
-rte_event_eth_rx_adapter_create_ext(uint8_t id, uint8_t dev_id,
-   rte_event_eth_rx_adapter_conf_cb conf_cb,
-   void *conf_arg)
+static int
+rxa_create(uint8_t id, uint8_t dev_id,
+  struct rte_event_eth_rx_adapter_params *rxa_params,
+  rte_event_eth_rx_adapter_conf_cb conf_cb,
+  void *conf_arg)
 {
struct rte_event_eth_rx_adapter *rx_adapter;
+   struct rte_eth_event_enqueue_buffer *buf;
+   struct rte_event *events;
int ret;
int socket_id;
uint16_t i;
@@ -2226,6 +2231,7 @@ rte_event_eth_rx_adapter_create_ext(uint8_t id, uint8_t 
dev_id,
 
RTE_EVENT_ETH_RX_ADAPTER_ID_VALID_OR_ERR_RET(id, -EINVAL);
RTE_EVENTDEV_VALID_DEVID_OR_ERR_RET(dev_id, -EINVAL);
+
if (conf_cb == NULL)
return -EINVAL;
 
@@ -2273,11 +2279,30 @@ rt

[dpdk-dev] [PATCH v5 2/5] test/event: add unit test for Rx adapter

[Naga Harish K S V]

this patch adds unit test for rte_event_eth_rx_adapter_create_with_params
api and validate all possible input combinations.

Signed-off-by: Naga Harish K S V 
---
 app/test/test_event_eth_rx_adapter.c | 53 +---
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/app/test/test_event_eth_rx_adapter.c 
b/app/test/test_event_eth_rx_adapter.c
index 13664a3a3b..7c2cf0dd70 100644
--- a/app/test/test_event_eth_rx_adapter.c
+++ b/app/test/test_event_eth_rx_adapter.c
@@ -428,6 +428,50 @@ adapter_create_free(void)
return TEST_SUCCESS;
 }
 
+static int
+adapter_create_free_with_params(void)
+{
+   int err;
+
+   struct rte_event_port_conf rx_p_conf = {
+   .dequeue_depth = 8,
+   .enqueue_depth = 8,
+   .new_event_threshold = 1200,
+   };
+
+   struct rte_event_eth_rx_adapter_params rxa_params = {
+   .event_buf_size = 1024
+   };
+
+   err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID,
+   TEST_DEV_ID, NULL, NULL);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID,
+   TEST_DEV_ID, &rx_p_conf, &rxa_params);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID,
+   TEST_DEV_ID, &rx_p_conf, &rxa_params);
+   TEST_ASSERT(err == -EEXIST, "Expected -EEXIST %d got %d", -EEXIST, err);
+
+   rxa_params.event_buf_size = 0;
+   err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID,
+   TEST_DEV_ID, &rx_p_conf, &rxa_params);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   err = rte_event_eth_rx_adapter_free(TEST_INST_ID);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_rx_adapter_free(TEST_INST_ID);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL %d got %d", -EINVAL, err);
+
+   err = rte_event_eth_rx_adapter_free(1);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL %d got %d", -EINVAL, err);
+
+   return TEST_SUCCESS;
+}
+
 static int
 adapter_queue_add_del(void)
 {
@@ -435,7 +479,7 @@ adapter_queue_add_del(void)
struct rte_event ev;
uint32_t cap;
 
-   struct rte_event_eth_rx_adapter_queue_conf queue_config;
+   struct rte_event_eth_rx_adapter_queue_conf queue_config = {0};
 
err = rte_event_eth_rx_adapter_caps_get(TEST_DEV_ID, TEST_ETHDEV_ID,
 &cap);
@@ -523,7 +567,7 @@ adapter_multi_eth_add_del(void)
uint16_t port_index, port_index_base, drv_id = 0;
char driver_name[50];
 
-   struct rte_event_eth_rx_adapter_queue_conf queue_config;
+   struct rte_event_eth_rx_adapter_queue_conf queue_config = {0};
 
ev.queue_id = 0;
ev.sched_type = RTE_SCHED_TYPE_ATOMIC;
@@ -594,7 +638,7 @@ adapter_intr_queue_add_del(void)
struct rte_event ev;
uint32_t cap;
uint16_t eth_port;
-   struct rte_event_eth_rx_adapter_queue_conf queue_config;
+   struct rte_event_eth_rx_adapter_queue_conf queue_config = {0};
 
if (!default_params.rx_intr_port_inited)
return 0;
@@ -687,7 +731,7 @@ adapter_start_stop(void)
ev.sched_type = RTE_SCHED_TYPE_ATOMIC;
ev.priority = 0;
 
-   struct rte_event_eth_rx_adapter_queue_conf queue_config;
+   struct rte_event_eth_rx_adapter_queue_conf queue_config = {0};
 
queue_config.rx_queue_flags = 0;
if (default_params.caps &
@@ -774,6 +818,7 @@ static struct unit_test_suite event_eth_rx_tests = {
.teardown = testsuite_teardown,
.unit_test_cases = {
TEST_CASE_ST(NULL, NULL, adapter_create_free),
+   TEST_CASE_ST(NULL, NULL, adapter_create_free_with_params),
TEST_CASE_ST(adapter_create, adapter_free,
adapter_queue_add_del),
TEST_CASE_ST(adapter_create, adapter_free,
-- 
2.25.1

[dpdk-dev] [PATCH v5 3/5] eventdev/rx_adapter: introduce per queue event buffer

[Naga Harish K S V]

To configure per queue event buffer size, application sets
``rte_event_eth_rx_adapter_params::use_queue_event_buf`` flag
as true and is passed to ``rte_event_eth_rx_adapter_create_with_params``
api.

The per queue event buffer size is populated  in
``rte_event_eth_rx_adapter_queue_conf::event_buf_size`` and passed
to ``rte_event_eth_rx_adapter_queue_add`` api.

Signed-off-by: Naga Harish K S V 
---
 .../prog_guide/event_ethernet_rx_adapter.rst  | 19 ---
 lib/eventdev/rte_event_eth_rx_adapter.h   |  4 
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst 
b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
index 8526aecf57..8b58130fc5 100644
--- a/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
+++ b/doc/guides/prog_guide/event_ethernet_rx_adapter.rst
@@ -62,12 +62,14 @@ service function and needs to create an event port for it. 
The callback is
 expected to fill the ``struct rte_event_eth_rx_adapter_conf structure``
 passed to it.
 
-If the application desires to control the event buffer size, it can use the
-``rte_event_eth_rx_adapter_create_with_params()`` api. The event buffer size is
-specified using ``struct rte_event_eth_rx_adapter_params::event_buf_size``.
-The function is passed the event device to be associated with the adapter
-and port configuration for the adapter to setup an event port if the
-adapter needs to use a service function.
+If the application desires to control the event buffer size at adapter level,
+it can use the ``rte_event_eth_rx_adapter_create_with_params()`` api. The event
+buffer size is specified using ``struct rte_event_eth_rx_adapter_params::
+event_buf_size``. To configure the event buffer size at queue level, the 
boolean
+flag ``struct rte_event_eth_rx_adapter_params::use_queue_event_buf`` need to be
+set to true. The function is passed the event device to be associated with
+the adapter and port configuration for the adapter to setup an event port
+if the adapter needs to use a service function.
 
 Adding Rx Queues to the Adapter Instance
 
@@ -79,7 +81,9 @@ parameter. Event information for packets from this Rx queue 
is encoded in the
 ``ev`` field of ``struct rte_event_eth_rx_adapter_queue_conf``. The
 servicing_weight member of the struct  rte_event_eth_rx_adapter_queue_conf
 is the relative polling frequency of the Rx queue and is applicable when the
-adapter uses a service core function.
+adapter uses a service core function. The applications can configure queue
+event buffer size in ``struct 
rte_event_eth_rx_adapter_queue_conf::event_buf_size``
+parameter.
 
 .. code-block:: c
 
@@ -90,6 +94,7 @@ adapter uses a service core function.
 queue_config.rx_queue_flags = 0;
 queue_config.ev = ev;
 queue_config.servicing_weight = 1;
+queue_config.event_buf_size = 1024;
 
 err = rte_event_eth_rx_adapter_queue_add(id,
 eth_dev_id,
diff --git a/lib/eventdev/rte_event_eth_rx_adapter.h 
b/lib/eventdev/rte_event_eth_rx_adapter.h
index 846ca569e9..70ca427d66 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.h
+++ b/lib/eventdev/rte_event_eth_rx_adapter.h
@@ -200,6 +200,8 @@ struct rte_event_eth_rx_adapter_queue_conf {
 * Valid when RTE_EVENT_ETH_RX_ADAPTER_QUEUE_EVENT_VECTOR flag is set in
 * @see rte_event_eth_rx_adapter_queue_conf::rx_queue_flags.
 */
+   uint16_t event_buf_size;
+   /**< event buffer size for this queue */
 };
 
 /**
@@ -267,6 +269,8 @@ struct rte_event_eth_rx_adapter_params {
 * This value is rounded up for better buffer utilization
 * and performance.
 */
+   bool use_queue_event_buf;
+   /**< flag to indicate that event buffer is separate for each queue */
 };
 
 /**
-- 
2.25.1

[dpdk-dev] [PATCH v5 4/5] eventdev/rx_adapter: implement per queue event buffer

[Naga Harish K S V]

this patch implement the per queue event buffer with
required validations.

Signed-off-by: Naga Harish K S V 
---
 lib/eventdev/rte_event_eth_rx_adapter.c | 187 +---
 1 file changed, 138 insertions(+), 49 deletions(-)

diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c 
b/lib/eventdev/rte_event_eth_rx_adapter.c
index 606db241b8..b61af0e75e 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -102,10 +102,12 @@ struct rte_event_eth_rx_adapter {
uint8_t rss_key_be[RSS_KEY_SIZE];
/* Event device identifier */
uint8_t eventdev_id;
-   /* Per ethernet device structure */
-   struct eth_device_info *eth_devices;
/* Event port identifier */
uint8_t event_port_id;
+   /* Flag indicating per rxq event buffer */
+   bool use_queue_event_buf;
+   /* Per ethernet device structure */
+   struct eth_device_info *eth_devices;
/* Lock to serialize config updates with service function */
rte_spinlock_t rx_lock;
/* Max mbufs processed in any service function invocation */
@@ -241,6 +243,7 @@ struct eth_rx_queue_info {
uint32_t flow_id_mask;  /* Set to ~0 if app provides flow id else 0 */
uint64_t event;
struct eth_rx_vector_data vector_data;
+   struct rte_eth_event_enqueue_buffer *event_buf;
 };
 
 static struct rte_event_eth_rx_adapter **event_eth_rx_adapter;
@@ -767,10 +770,9 @@ rxa_enq_block_end_ts(struct rte_event_eth_rx_adapter 
*rx_adapter,
 
 /* Enqueue buffered events to event device */
 static inline uint16_t
-rxa_flush_event_buffer(struct rte_event_eth_rx_adapter *rx_adapter)
+rxa_flush_event_buffer(struct rte_event_eth_rx_adapter *rx_adapter,
+  struct rte_eth_event_enqueue_buffer *buf)
 {
-   struct rte_eth_event_enqueue_buffer *buf =
-   &rx_adapter->event_enqueue_buffer;
struct rte_event_eth_rx_adapter_stats *stats = &rx_adapter->stats;
uint16_t count = buf->last ? buf->last - buf->head : buf->count;
 
@@ -888,15 +890,14 @@ rxa_buffer_mbufs(struct rte_event_eth_rx_adapter 
*rx_adapter,
uint16_t eth_dev_id,
uint16_t rx_queue_id,
struct rte_mbuf **mbufs,
-   uint16_t num)
+   uint16_t num,
+   struct rte_eth_event_enqueue_buffer *buf)
 {
uint32_t i;
struct eth_device_info *dev_info =
&rx_adapter->eth_devices[eth_dev_id];
struct eth_rx_queue_info *eth_rx_queue_info =
&dev_info->rx_queue[rx_queue_id];
-   struct rte_eth_event_enqueue_buffer *buf =
-   &rx_adapter->event_enqueue_buffer;
uint16_t new_tail = buf->tail;
uint64_t event = eth_rx_queue_info->event;
uint32_t flow_id_mask = eth_rx_queue_info->flow_id_mask;
@@ -995,11 +996,10 @@ rxa_eth_rx(struct rte_event_eth_rx_adapter *rx_adapter,
uint16_t queue_id,
uint32_t rx_count,
uint32_t max_rx,
-   int *rxq_empty)
+   int *rxq_empty,
+   struct rte_eth_event_enqueue_buffer *buf)
 {
struct rte_mbuf *mbufs[BATCH_SIZE];
-   struct rte_eth_event_enqueue_buffer *buf =
-   &rx_adapter->event_enqueue_buffer;
struct rte_event_eth_rx_adapter_stats *stats =
&rx_adapter->stats;
uint16_t n;
@@ -1012,7 +1012,7 @@ rxa_eth_rx(struct rte_event_eth_rx_adapter *rx_adapter,
 */
while (rxa_pkt_buf_available(buf)) {
if (buf->count >= BATCH_SIZE)
-   rxa_flush_event_buffer(rx_adapter);
+   rxa_flush_event_buffer(rx_adapter, buf);
 
stats->rx_poll_count++;
n = rte_eth_rx_burst(port_id, queue_id, mbufs, BATCH_SIZE);
@@ -1021,14 +1021,14 @@ rxa_eth_rx(struct rte_event_eth_rx_adapter *rx_adapter,
*rxq_empty = 1;
break;
}
-   rxa_buffer_mbufs(rx_adapter, port_id, queue_id, mbufs, n);
+   rxa_buffer_mbufs(rx_adapter, port_id, queue_id, mbufs, n, buf);
nb_rx += n;
if (rx_count + nb_rx > max_rx)
break;
}
 
if (buf->count > 0)
-   rxa_flush_event_buffer(rx_adapter);
+   rxa_flush_event_buffer(rx_adapter, buf);
 
return nb_rx;
 }
@@ -1169,7 +1169,7 @@ rxa_intr_ring_dequeue(struct rte_event_eth_rx_adapter 
*rx_adapter)
ring_lock = &rx_adapter->intr_ring_lock;
 
if (buf->count >= BATCH_SIZE)
-   rxa_flush_event_buffer(rx_adapter);
+   rxa_flush_event_buffer(rx_adapter, buf);
 
while (rxa_pkt_buf_available(buf)) {
struct eth_device_info *dev_info;
@@ -1221,7 +1221,7 @@ rxa_intr_ring_dequeue(struct rte_event_eth_rx_adapter

[dpdk-dev] [PATCH v5 5/5] test/event: add unit test for Rx adapter

[Naga Harish K S V]

this patch adds unit tests for checking per rx queue event buffer
feature using rte_event_eth_rx_adapter_queue_add api.

Signed-off-by: Naga Harish K S V 
---
 app/test/test_event_eth_rx_adapter.c | 86 
 1 file changed, 86 insertions(+)

diff --git a/app/test/test_event_eth_rx_adapter.c 
b/app/test/test_event_eth_rx_adapter.c
index 7c2cf0dd70..cf3c989efb 100644
--- a/app/test/test_event_eth_rx_adapter.c
+++ b/app/test/test_event_eth_rx_adapter.c
@@ -387,6 +387,90 @@ adapter_create(void)
return err;
 }
 
+static int
+adapter_create_with_params(void)
+{
+   int err;
+   struct rte_event_dev_info dev_info;
+   struct rte_event_port_conf rx_p_conf;
+   struct rte_event_eth_rx_adapter_params rxa_params;
+
+   memset(&rx_p_conf, 0, sizeof(rx_p_conf));
+
+   err = rte_event_dev_info_get(TEST_DEV_ID, &dev_info);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   rx_p_conf.new_event_threshold = dev_info.max_num_events;
+   rx_p_conf.dequeue_depth = dev_info.max_event_port_dequeue_depth;
+   rx_p_conf.enqueue_depth = dev_info.max_event_port_enqueue_depth;
+
+   rxa_params.use_queue_event_buf = false;
+   rxa_params.event_buf_size = 0;
+
+   err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID,
+   TEST_DEV_ID, &rx_p_conf, &rxa_params);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   rxa_params.use_queue_event_buf = true;
+
+   err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID,
+   TEST_DEV_ID, &rx_p_conf, &rxa_params);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_rx_adapter_create_with_params(TEST_INST_ID,
+   TEST_DEV_ID, &rx_p_conf, &rxa_params);
+   TEST_ASSERT(err == -EEXIST, "Expected -EEXIST got %d", err);
+
+   return TEST_SUCCESS;
+}
+
+static int
+adapter_queue_event_buf_test(void)
+{
+   int err;
+   struct rte_event ev;
+   uint32_t cap;
+
+   struct rte_event_eth_rx_adapter_queue_conf queue_config = {0};
+
+   err = rte_event_eth_rx_adapter_caps_get(TEST_DEV_ID, TEST_ETHDEV_ID,
+&cap);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   ev.queue_id = 0;
+   ev.sched_type = RTE_SCHED_TYPE_ATOMIC;
+   ev.priority = 0;
+
+   queue_config.rx_queue_flags = 0;
+   if (cap & RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID) {
+   ev.flow_id = 1;
+   queue_config.rx_queue_flags =
+   RTE_EVENT_ETH_RX_ADAPTER_QUEUE_FLOW_ID_VALID;
+   }
+   queue_config.ev = ev;
+   queue_config.servicing_weight = 1;
+   queue_config.event_buf_size = 0;
+
+   err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
+   TEST_ETHDEV_ID, 0,
+   &queue_config);
+   TEST_ASSERT(err == -EINVAL, "Expected -EINVAL got %d", err);
+
+   queue_config.event_buf_size = 1024;
+
+   err = rte_event_eth_rx_adapter_queue_add(TEST_INST_ID,
+   TEST_ETHDEV_ID, 0,
+   &queue_config);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   err = rte_event_eth_rx_adapter_queue_del(TEST_INST_ID,
+   TEST_ETHDEV_ID,
+   0);
+   TEST_ASSERT(err == 0, "Expected 0 got %d", err);
+
+   return TEST_SUCCESS;
+}
+
 static void
 adapter_free(void)
 {
@@ -826,6 +910,8 @@ static struct unit_test_suite event_eth_rx_tests = {
TEST_CASE_ST(adapter_create, adapter_free, adapter_start_stop),
TEST_CASE_ST(adapter_create, adapter_free, adapter_stats),
TEST_CASE_ST(adapter_create, adapter_free, adapter_queue_conf),
+   TEST_CASE_ST(adapter_create_with_params, adapter_free,
+adapter_queue_event_buf_test),
TEST_CASES_END() /**< NULL terminate unit test array */
}
 };
-- 
2.25.1

[dpdk-dev] [PATCH v4 1/2] hash: split x86 and SW hash CRC intrinsics

[pbhagavatula]

From: Pavan Nikhilesh 

Split x86 and SW hash crc intrinsics into a separate files.

Signed-off-by: Pavan Nikhilesh 
---
 v4 Changes:
 - Fix compilation issues

 v3 Changes:
 - Split x86 and SW hash crc functions into separate files.
 - Rename `rte_crc_arm64.h` to `hash_crc_arm64.h` as it is internal and not
 installed by meson build.

 v2 Changes:
 - Don't remove `rte_crc_arm64.h` for ABI purposes.
 - Revert function pointer approach for performance reasons.
 - Select the best available algorithm based on the arch when user passes an
 unsupported crc32 algorithm.

 lib/hash/hash_crc_sw.h  | 419 
 lib/hash/hash_crc_x86.h |  62 ++
 lib/hash/rte_hash_crc.h | 396 +
 3 files changed, 483 insertions(+), 394 deletions(-)
 create mode 100644 lib/hash/hash_crc_sw.h
 create mode 100644 lib/hash/hash_crc_x86.h

diff --git a/lib/hash/hash_crc_sw.h b/lib/hash/hash_crc_sw.h
new file mode 100644
index 00..4790a0970b
--- /dev/null
+++ b/lib/hash/hash_crc_sw.h
@@ -0,0 +1,419 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
+ */
+
+#ifndef _HASH_CRC_SW_H_
+#define _HASH_CRC_SW_H_
+
+/* Lookup tables for software implementation of CRC32C */
+static const uint32_t crc32c_tables[8][256] = {
+   {0x, 0xF26B8303, 0xE13B70F7, 0x1350F3F4, 0xC79A971F, 0x35F1141C,
+0x26A1E7E8, 0xD4CA64EB, 0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B,
+0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24, 0x105EC76F, 0xE235446C,
+0xF165B798, 0x030E349B, 0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384,
+0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54, 0x5D1D08BF, 0xAF768BBC,
+0xBC267848, 0x4E4DFB4B, 0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A,
+0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35, 0xAA64D611, 0x580F5512,
+0x4B5FA6E6, 0xB93425E5, 0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA,
+0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45, 0xF779DEAE, 0x05125DAD,
+0x1642AE59, 0xE4292D5A, 0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A,
+0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595, 0x417B1DBC, 0xB3109EBF,
+0xA0406D4B, 0x522BEE48, 0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957,
+0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687, 0x0C38D26C, 0xFE53516F,
+0xED03A29B, 0x1F682198, 0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927,
+0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38, 0xDBFC821C, 0x2997011F,
+0x3AC7F2EB, 0xC8AC71E8, 0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7,
+0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096, 0xA65C047D, 0x5437877E,
+0x4767748A, 0xB50CF789, 0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859,
+0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46, 0x7198540D, 0x83F3D70E,
+0x90A324FA, 0x62C8A7F9, 0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6,
+0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36, 0x3CDB9BDD, 0xCEB018DE,
+0xDDE0EB2A, 0x2F8B6829, 0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C,
+0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93, 0x082F63B7, 0xFA44E0B4,
+0xE9141340, 0x1B7F9043, 0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C,
+0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3, 0x55326B08, 0xA759E80B,
+0xB4091BFF, 0x466298FC, 0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C,
+0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033, 0xA24BB5A6, 0x502036A5,
+0x4370C551, 0xB11B4652, 0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D,
+0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D, 0xEF087A76, 0x1D63F975,
+0x0E330A81, 0xFC588982, 0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D,
+0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622, 0x38CC2A06, 0xCAA7A905,
+0xD9F75AF1, 0x2B9CD9F2, 0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED,
+0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530, 0x0417B1DB, 0xF67C32D8,
+0xE52CC12C, 0x1747422F, 0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF,
+0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0, 0xD3D3E1AB, 0x21B862A8,
+0x32E8915C, 0xC083125F, 0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540,
+0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90, 0x9E902E7B, 0x6CFBAD78,
+0x7FAB5E8C, 0x8DC0DD8F, 0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE,
+0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1, 0x69E9F0D5, 0x9B8273D6,
+0x88D28022, 0x7AB90321, 0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E,
+0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81, 0x34F4F86A, 0xC69F7B69,
+0xD5CF889D, 0x27A40B9E, 0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E,
+0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351},
+   {0x, 0x13A29877, 0x274530EE, 0x34E7A899, 0x4E8A61DC, 0x5D28F9AB,
+0x69CF5132, 0x7A6DC945, 0x9D14C3B8, 0x8EB65BCF, 0xBA51F356, 0xA9F36B21,
+0xD39EA264, 0xC03C3A13, 0xF4DB928A, 0xE7790AFD, 0

[dpdk-dev] [PATCH v4 2/2] hash: unify crc32 selection for x86 and Arm

[pbhagavatula]

From: Pavan Nikhilesh 

Merge crc32 hash calculation public API implementation for x86 and Arm.
Select the best available CRC32 algorithm when unsupported algorithm
on a given CPU architecture is requested by an application.

Previously, if an application directly includes `rte_crc_arm64.h`
without including `rte_hash_crc.h` it will fail to compile.

Signed-off-by: Pavan Nikhilesh 
---
 lib/hash/hash_crc_arm64.h |  48 ++
 lib/hash/meson.build  |   1 -
 lib/hash/rte_crc_arm64.h  | 183 --
 lib/hash/rte_hash_crc.h   |  81 +
 4 files changed, 112 insertions(+), 201 deletions(-)
 create mode 100644 lib/hash/hash_crc_arm64.h
 delete mode 100644 lib/hash/rte_crc_arm64.h

diff --git a/lib/hash/hash_crc_arm64.h b/lib/hash/hash_crc_arm64.h
new file mode 100644
index 00..29b61a07a9
--- /dev/null
+++ b/lib/hash/hash_crc_arm64.h
@@ -0,0 +1,48 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015 Cavium, Inc
+ */
+
+#ifndef _HASH_CRC_ARM64_H_
+#define _HASH_CRC_ARM64_H_
+
+static inline uint32_t
+crc32c_arm64_u8(uint8_t data, uint32_t init_val)
+{
+   __asm__ volatile(
+   "crc32cb %w[crc], %w[crc], %w[value]"
+   : [crc] "+r" (init_val)
+   : [value] "r" (data));
+   return init_val;
+}
+
+static inline uint32_t
+crc32c_arm64_u16(uint16_t data, uint32_t init_val)
+{
+   __asm__ volatile(
+   "crc32ch %w[crc], %w[crc], %w[value]"
+   : [crc] "+r" (init_val)
+   : [value] "r" (data));
+   return init_val;
+}
+
+static inline uint32_t
+crc32c_arm64_u32(uint32_t data, uint32_t init_val)
+{
+   __asm__ volatile(
+   "crc32cw %w[crc], %w[crc], %w[value]"
+   : [crc] "+r" (init_val)
+   : [value] "r" (data));
+   return init_val;
+}
+
+static inline uint32_t
+crc32c_arm64_u64(uint64_t data, uint32_t init_val)
+{
+   __asm__ volatile(
+   "crc32cx %w[crc], %w[crc], %x[value]"
+   : [crc] "+r" (init_val)
+   : [value] "r" (data));
+   return init_val;
+}
+
+#endif /* _HASH_CRC_ARM64_H_ */
diff --git a/lib/hash/meson.build b/lib/hash/meson.build
index 9bc5ef925a..8794ea82a7 100644
--- a/lib/hash/meson.build
+++ b/lib/hash/meson.build
@@ -8,7 +8,6 @@ headers = files(
 'rte_jhash.h',
 'rte_thash.h',
 )
-indirect_headers += files('rte_crc_arm64.h')
 
 sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c', 'rte_thash.c')
 deps += ['net']
diff --git a/lib/hash/rte_crc_arm64.h b/lib/hash/rte_crc_arm64.h
deleted file mode 100644
index b4628cfc09..00
--- a/lib/hash/rte_crc_arm64.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015 Cavium, Inc
- */
-
-#ifndef _RTE_CRC_ARM64_H_
-#define _RTE_CRC_ARM64_H_
-
-/**
- * @file
- *
- * RTE CRC arm64 Hash
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include 
-#include 
-#include 
-#include 
-
-static inline uint32_t
-crc32c_arm64_u8(uint8_t data, uint32_t init_val)
-{
-   __asm__ volatile(
-   "crc32cb %w[crc], %w[crc], %w[value]"
-   : [crc] "+r" (init_val)
-   : [value] "r" (data));
-   return init_val;
-}
-
-static inline uint32_t
-crc32c_arm64_u16(uint16_t data, uint32_t init_val)
-{
-   __asm__ volatile(
-   "crc32ch %w[crc], %w[crc], %w[value]"
-   : [crc] "+r" (init_val)
-   : [value] "r" (data));
-   return init_val;
-}
-
-static inline uint32_t
-crc32c_arm64_u32(uint32_t data, uint32_t init_val)
-{
-   __asm__ volatile(
-   "crc32cw %w[crc], %w[crc], %w[value]"
-   : [crc] "+r" (init_val)
-   : [value] "r" (data));
-   return init_val;
-}
-
-static inline uint32_t
-crc32c_arm64_u64(uint64_t data, uint32_t init_val)
-{
-   __asm__ volatile(
-   "crc32cx %w[crc], %w[crc], %x[value]"
-   : [crc] "+r" (init_val)
-   : [value] "r" (data));
-   return init_val;
-}
-
-/**
- * Allow or disallow use of arm64 SIMD instrinsics for CRC32 hash
- * calculation.
- *
- * @param alg
- *   An OR of following flags:
- *   - (CRC32_SW) Don't use arm64 crc intrinsics
- *   - (CRC32_ARM64) Use ARMv8 CRC intrinsic if available
- *
- */
-static inline void
-rte_hash_crc_set_alg(uint8_t alg)
-{
-   switch (alg) {
-   case CRC32_ARM64:
-   if (!rte_cpu_get_flag_enabled(RTE_CPUFLAG_CRC32))
-   alg = CRC32_SW;
-   /* fall-through */
-   case CRC32_SW:
-   crc32_alg = alg;
-   /* fall-through */
-   default:
-   break;
-   }
-}
-
-/* Setting the best available algorithm */
-RTE_INIT(rte_hash_crc_init_alg)
-{
-   rte_hash_

[dpdk-dev] [PATCH v5 1/3] net/thunderx: enable build only on 64-bit Linux

[pbhagavatula]

From: Pavan Nikhilesh 

Due to Linux kernel AF(Admin function) driver dependency, only enable
build for 64-bit Linux.

Signed-off-by: Pavan Nikhilesh 
Acked-by: Jerin Jacob 
---
 v5 Changes
 - s/fuction/function.

 v4 Changes:
 - Update commit message regarding dependency on AF driver.

 drivers/net/thunderx/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/thunderx/meson.build b/drivers/net/thunderx/meson.build
index 4bbcea7f93..da665bd76f 100644
--- a/drivers/net/thunderx/meson.build
+++ b/drivers/net/thunderx/meson.build
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Cavium, Inc

-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif

--
2.17.1

[dpdk-dev] [PATCH v5 2/3] common/octeontx: enable build only on 64-bit Linux

[pbhagavatula]

From: Pavan Nikhilesh 

Due to Linux kernel AF(Admin function) driver dependency, only enable
build for 64-bit Linux.

Signed-off-by: Pavan Nikhilesh 
Acked-by: Jerin Jacob 
---
 drivers/common/octeontx/meson.build   | 4 ++--
 drivers/compress/octeontx/meson.build | 6 ++
 drivers/crypto/octeontx/meson.build   | 7 +++
 drivers/event/octeontx/meson.build| 6 ++
 drivers/mempool/octeontx/meson.build  | 5 +++--
 drivers/net/octeontx/meson.build  | 4 ++--
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/drivers/common/octeontx/meson.build 
b/drivers/common/octeontx/meson.build
index fcda0f6445..dc060dfea1 100644
--- a/drivers/common/octeontx/meson.build
+++ b/drivers/common/octeontx/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Cavium, Inc
 #

-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif

diff --git a/drivers/compress/octeontx/meson.build 
b/drivers/compress/octeontx/meson.build
index e1b7bed422..cd8687fde3 100644
--- a/drivers/compress/octeontx/meson.build
+++ b/drivers/compress/octeontx/meson.build
@@ -1,6 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Cavium, Inc

+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
+   build = false
+   reason = 'only supported on 64-bit Linux'
+   subdir_done()
+endif
+
 sources = files('otx_zip.c', 'otx_zip_pmd.c')
 includes += include_directories('include')
 deps += ['mempool_octeontx', 'bus_pci']
diff --git a/drivers/crypto/octeontx/meson.build 
b/drivers/crypto/octeontx/meson.build
index 244b16230e..bc6187e1cf 100644
--- a/drivers/crypto/octeontx/meson.build
+++ b/drivers/crypto/octeontx/meson.build
@@ -1,5 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Cavium, Inc
+#
+
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
+build = false
+reason = 'only supported on 64-bit Linux'
+subdir_done()
+endif

 deps += ['bus_pci']
 deps += ['bus_vdev']
diff --git a/drivers/event/octeontx/meson.build 
b/drivers/event/octeontx/meson.build
index 0d9eec3f2e..eb17e059d8 100644
--- a/drivers/event/octeontx/meson.build
+++ b/drivers/event/octeontx/meson.build
@@ -1,6 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Cavium, Inc

+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
+build = false
+reason = 'only supported on 64-bit Linux'
+subdir_done()
+endif
+
 sources = files(
 'ssovf_worker.c',
 'ssovf_evdev.c',
diff --git a/drivers/mempool/octeontx/meson.build 
b/drivers/mempool/octeontx/meson.build
index a57213e2d8..fb05928129 100644
--- a/drivers/mempool/octeontx/meson.build
+++ b/drivers/mempool/octeontx/meson.build
@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Cavium, Inc

-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
+reason = 'only supported on 64-bit Linux'
+subdir_done()
 endif

 sources = files(
diff --git a/drivers/net/octeontx/meson.build b/drivers/net/octeontx/meson.build
index 84cd4e1142..a5a6c9661c 100644
--- a/drivers/net/octeontx/meson.build
+++ b/drivers/net/octeontx/meson.build
@@ -1,9 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Cavium, Inc

-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif

--
2.17.1

[dpdk-dev] [PATCH v5 3/3] common/octeontx2: enable build only on 64-bit Linux

[pbhagavatula]

From: Pavan Nikhilesh 

Due to Linux kernel AF(Admin Function) driver dependency, only enable
build for 64-bit Linux.

Signed-off-by: Pavan Nikhilesh 
Acked-by: Jerin Jacob 
---
 drivers/common/octeontx2/meson.build  | 10 ++
 drivers/event/octeontx2/meson.build   |  4 ++--
 drivers/mempool/octeontx2/meson.build |  9 ++---
 drivers/net/octeontx2/meson.build | 10 ++
 drivers/raw/octeontx2_dma/meson.build | 10 ++
 5 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/drivers/common/octeontx2/meson.build 
b/drivers/common/octeontx2/meson.build
index dcfaa1e102..223ba5ef51 100644
--- a/drivers/common/octeontx2/meson.build
+++ b/drivers/common/octeontx2/meson.build
@@ -2,15 +2,9 @@
 # Copyright(C) 2019 Marvell International Ltd.
 #

-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
-subdir_done()
-endif
-
-if not dpdk_conf.get('RTE_ARCH_64')
-build = false
-reason = 'only supported on 64-bit'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif

diff --git a/drivers/event/octeontx2/meson.build 
b/drivers/event/octeontx2/meson.build
index 96ebb1f2e7..ce360af5f8 100644
--- a/drivers/event/octeontx2/meson.build
+++ b/drivers/event/octeontx2/meson.build
@@ -2,9 +2,9 @@
 # Copyright(C) 2019 Marvell International Ltd.
 #

-if not dpdk_conf.get('RTE_ARCH_64')
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'only supported on 64-bit'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif

diff --git a/drivers/mempool/octeontx2/meson.build 
b/drivers/mempool/octeontx2/meson.build
index 2a1dfddd4c..a4bea6d364 100644
--- a/drivers/mempool/octeontx2/meson.build
+++ b/drivers/mempool/octeontx2/meson.build
@@ -2,14 +2,9 @@
 # Copyright(C) 2019 Marvell International Ltd.
 #

-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
-subdir_done()
-endif
-if not dpdk_conf.get('RTE_ARCH_64')
-build = false
-reason = 'only supported on 64-bit'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif

diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index a355313120..ab15844cbc 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -2,15 +2,9 @@
 # Copyright(C) 2019 Marvell International Ltd.
 #

-if is_windows
+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
 build = false
-reason = 'not supported on Windows'
-subdir_done()
-endif
-
-if not dpdk_conf.get('RTE_ARCH_64')
-build = false
-reason = 'only supported on 64-bit'
+reason = 'only supported on 64-bit Linux'
 subdir_done()
 endif

diff --git a/drivers/raw/octeontx2_dma/meson.build 
b/drivers/raw/octeontx2_dma/meson.build
index e744fccaae..6460bd8242 100644
--- a/drivers/raw/octeontx2_dma/meson.build
+++ b/drivers/raw/octeontx2_dma/meson.build
@@ -2,14 +2,16 @@
 # Copyright(C) 2019 Marvell International Ltd.
 #

+if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
+build = false
+reason = 'only supported on 64-bit Linux'
+subdir_done()
+endif
+
 deps += ['bus_pci', 'common_octeontx2', 'rawdev']
 sources = files('otx2_dpi_rawdev.c', 'otx2_dpi_msg.c', 'otx2_dpi_test.c')

 extra_flags = []
-# This integrated controller runs only on a arm64 machine, remove 32bit 
warnings
-if not dpdk_conf.get('RTE_ARCH_64')
-extra_flags += ['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast']
-endif

 foreach flag: extra_flags
 if cc.has_argument(flag)
--
2.17.1

Re: [dpdk-dev] Recent change to make rte_cryptodev_pmd.h internal prevents some important functionality

[Akhil Goyal]

Hi Paul,

Similar comment was discussed in ML for fips_validation app.
https://mails.dpdk.org/archives/dev/2021-August/217781.html

I believe Fan is working on it to fix the issue.
Fan, Could you please share the update.

Regards,
Akhil

Note: Please CC maintainers for a prompt response, or else mails can be skipped.

From: Luse, Paul E 
Sent: Sunday, October 3, 2021 3:14 AM
To: dev@dpdk.org
Cc: Akhil Goyal ; ma...@nvidia.com; Zhang, Roy Fan 
; hemant.agra...@nxp.com
Subject: [EXT] Recent change to make rte_cryptodev_pmd.h internal prevents some 
important functionality

External Email

Hi Everyone,

I sent this last week and haven't heard back - apologize if I missed the 
response but if not here it is again...

We use cryptodev in SPDK and included rte_cryptodev_pmd.h so that we may 
release qpair memory that was allocated when we called 
rte_cryptodev_queue_pair_setup().  We'd do so by calling the function pointer 
queue_pair_release() which I believe is the prescribed way to do this.

The DPDK change in question is here: 
https://github.com/DPDK/dpdk/commit/af668035f7f492424b2e199f155690815944a8ca

Question: Is there another way for us to release this memory? I've looked 
through the public API and nothing stands out.

Thanks
Paul

[dpdk-dev] [PATCH] crypto/cnxk: use IE engine group for IPsec

[Archana Muniganti]

Use IE engine group for cn9k IPsec.

Signed-off-by: Archana Muniganti 
---
 drivers/crypto/cnxk/cn9k_ipsec.c | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/cnxk/cn9k_ipsec.c b/drivers/crypto/cnxk/cn9k_ipsec.c
index 63ae025030..9ca4d20c62 100644
--- a/drivers/crypto/cnxk/cn9k_ipsec.c
+++ b/drivers/crypto/cnxk/cn9k_ipsec.c
@@ -19,6 +19,7 @@ static inline int
 cn9k_cpt_enq_sa_write(struct cn9k_ipsec_sa *sa, struct cnxk_cpt_qp *qp,
  uint8_t opcode, size_t ctx_len)
 {
+   struct roc_cpt *roc_cpt = qp->lf.roc_cpt;
uint64_t lmtline = qp->lmtline.lmt_base;
uint64_t io_addr = qp->lmtline.io_addr;
uint64_t lmt_status, time_out;
@@ -41,7 +42,7 @@ cn9k_cpt_enq_sa_write(struct cn9k_ipsec_sa *sa, struct 
cnxk_cpt_qp *qp,
inst.dptr = rte_mempool_virt2iova(sa);
inst.rptr = 0;
inst.w7.s.cptr = rte_mempool_virt2iova(sa);
-   inst.w7.s.egrp = ROC_CPT_DFLT_ENG_GRP_SE;
+   inst.w7.s.egrp = roc_cpt->eng_grp[CPT_ENG_TYPE_IE];
 
inst.w0.u64 = 0;
inst.w2.u64 = 0;
@@ -278,6 +279,7 @@ cn9k_ipsec_outb_sa_create(struct cnxk_cpt_qp *qp,
 {
struct rte_crypto_sym_xform *auth_xform = crypto_xform->next;
struct roc_ie_on_ip_template *template = NULL;
+   struct roc_cpt *roc_cpt = qp->lf.roc_cpt;
struct cnxk_cpt_inst_tmpl *inst_tmpl;
struct roc_ie_on_outb_sa *out_sa;
struct cn9k_sec_session *sess;
@@ -408,7 +410,7 @@ cn9k_ipsec_outb_sa_create(struct cnxk_cpt_qp *qp,
inst_tmpl->w4 = w4.u64;
 
w7.u64 = 0;
-   w7.s.egrp = ROC_CPT_DFLT_ENG_GRP_SE;
+   w7.s.egrp = roc_cpt->eng_grp[CPT_ENG_TYPE_IE];
w7.s.cptr = rte_mempool_virt2iova(out_sa);
inst_tmpl->w7 = w7.u64;
 
@@ -423,6 +425,7 @@ cn9k_ipsec_inb_sa_create(struct cnxk_cpt_qp *qp,
 struct rte_security_session *sec_sess)
 {
struct rte_crypto_sym_xform *auth_xform = crypto_xform;
+   struct roc_cpt *roc_cpt = qp->lf.roc_cpt;
struct cnxk_cpt_inst_tmpl *inst_tmpl;
struct roc_ie_on_inb_sa *in_sa;
struct cn9k_sec_session *sess;
@@ -474,7 +477,7 @@ cn9k_ipsec_inb_sa_create(struct cnxk_cpt_qp *qp,
inst_tmpl->w4 = w4.u64;
 
w7.u64 = 0;
-   w7.s.egrp = ROC_CPT_DFLT_ENG_GRP_SE;
+   w7.s.egrp = roc_cpt->eng_grp[CPT_ENG_TYPE_IE];
w7.s.cptr = rte_mempool_virt2iova(in_sa);
inst_tmpl->w7 = w7.u64;
 
-- 
2.22.0

Re: [dpdk-dev] [PATCH] crypto/cnxk: use IE engine group for IPsec

[Anoob Joseph]

> 
> Use IE engine group for cn9k IPsec.
> 
> Signed-off-by: Archana Muniganti 
> ---
>  drivers/crypto/cnxk/cn9k_ipsec.c | 9 ++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 

Acked-by: Anoob Joseph