[dpdk-dev,v3,3/4] event/dpaa2: support event eth adapter
Checks
Commit Message
Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
Reviewed-by: Nikhil Rao <nikhil.rao@intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
Changes in v3:
Fix shared library build
Changes in v2:
Support rx_queue_id = -1 in eth adapter queue and and del (Nikhil)
Remove duplicate returns (Nikhil)
drivers/Makefile | 2 +-
drivers/event/Makefile | 4 +-
drivers/event/dpaa2/Makefile | 2 +
drivers/event/dpaa2/dpaa2_eventdev.c | 151 ++++++++++++++++++++++++++++++++++-
drivers/event/dpaa2/dpaa2_eventdev.h | 8 ++
5 files changed, 163 insertions(+), 4 deletions(-)
Comments
-----Original Message-----
> Date: Tue, 17 Oct 2017 03:14:34 +0530
> From: Nipun Gupta <nipun.gupta@nxp.com>
> To: dev@dpdk.org
> CC: hemant.agrawal@nxp.com, jerin.jacob@caviumnetworks.com,
> nikhil.rao@intel.com, Nipun Gupta <nipun.gupta@nxp.com>
> Subject: [PATCH v3 3/4] event/dpaa2: support event eth adapter
> X-Mailer: git-send-email 1.9.1
>
> Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
> Reviewed-by: Nikhil Rao <nikhil.rao@intel.com>
> Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> ---
> Changes in v3:
> Fix shared library build
> Changes in v2:
> Support rx_queue_id = -1 in eth adapter queue and and del (Nikhil)
> Remove duplicate returns (Nikhil)
>
> drivers/Makefile | 2 +-
> drivers/event/Makefile | 4 +-
> drivers/event/dpaa2/Makefile | 2 +
> drivers/event/dpaa2/dpaa2_eventdev.c | 151 ++++++++++++++++++++++++++++++++++-
> drivers/event/dpaa2/dpaa2_eventdev.h | 8 ++
> 5 files changed, 163 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/Makefile b/drivers/Makefile
> index 0467250..db0cd76 100644
> --- a/drivers/Makefile
> +++ b/drivers/Makefile
> @@ -39,6 +39,6 @@ DEPDIRS-net := bus mempool
> DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto
> DEPDIRS-crypto := bus mempool
> DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event
> -DEPDIRS-event := bus mempool
> +DEPDIRS-event := bus mempool net
>
> include $(RTE_SDK)/mk/rte.subdir.mk
> diff --git a/drivers/event/Makefile b/drivers/event/Makefile
> index d09be74..e119d60 100644
> --- a/drivers/event/Makefile
> +++ b/drivers/event/Makefile
> @@ -31,7 +31,7 @@
>
> include $(RTE_SDK)/mk/rte.vars.mk
>
> -core-libs := librte_eal librte_eventdev
> +core-libs := librte_eal librte_ether librte_eventdev
The above two changes makes sense to me as eventdev-ethdev Rx adapter is
depended on ethdev and there could be an Rx adapter implementation in
event area that may use ethdev driver exported API.
Can you split driver/event and driver/Makefile change to different
patch?
Other than that, This patch set looks good to me and it is ready to merge.
But, There is a compilation error[1] in event-next tree be case of
Hemant reported problem[2].I can apply this patch set once the solution for
the reported problem[3] is applied to master branch(so that I pull those
changes to next-eventdev to avoid build issue)
[1]
Applying: event/dpaa2: support event eth adapter
/export/dpdk-next-eventdev/mk/rte.subdir.mk:62: target 'event' given
more than once in the same rule
make[2]: Circular mempool <- event dependency dropped.
[2]
http://dpdk.org/ml/archives/dev/2017-October/079249.html
[3]
http://dpdk.org/ml/archives/dev/2017-October/079324.html
> -----Original Message-----
> From: Jerin Jacob [mailto:jerin.jacob@caviumnetworks.com]
> Sent: Tuesday, October 17, 2017 10:31
> To: Nipun Gupta <nipun.gupta@nxp.com>
> Cc: dev@dpdk.org; Hemant Agrawal <hemant.agrawal@nxp.com>;
> nikhil.rao@intel.com
> Subject: Re: [PATCH v3 3/4] event/dpaa2: support event eth adapter
>
> -----Original Message-----
> > Date: Tue, 17 Oct 2017 03:14:34 +0530
> > From: Nipun Gupta <nipun.gupta@nxp.com>
> > To: dev@dpdk.org
> > CC: hemant.agrawal@nxp.com, jerin.jacob@caviumnetworks.com,
> > nikhil.rao@intel.com, Nipun Gupta <nipun.gupta@nxp.com>
> > Subject: [PATCH v3 3/4] event/dpaa2: support event eth adapter
> > X-Mailer: git-send-email 1.9.1
> >
> > Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
> > Reviewed-by: Nikhil Rao <nikhil.rao@intel.com>
> > Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
> > ---
> > Changes in v3:
> > Fix shared library build
> > Changes in v2:
> > Support rx_queue_id = -1 in eth adapter queue and and del (Nikhil)
> > Remove duplicate returns (Nikhil)
> >
> > drivers/Makefile | 2 +-
> > drivers/event/Makefile | 4 +-
> > drivers/event/dpaa2/Makefile | 2 +
> > drivers/event/dpaa2/dpaa2_eventdev.c | 151
> ++++++++++++++++++++++++++++++++++-
> > drivers/event/dpaa2/dpaa2_eventdev.h | 8 ++
> > 5 files changed, 163 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/Makefile b/drivers/Makefile
> > index 0467250..db0cd76 100644
> > --- a/drivers/Makefile
> > +++ b/drivers/Makefile
> > @@ -39,6 +39,6 @@ DEPDIRS-net := bus mempool
> > DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto
> > DEPDIRS-crypto := bus mempool
> > DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event
> > -DEPDIRS-event := bus mempool
> > +DEPDIRS-event := bus mempool net
> >
> > include $(RTE_SDK)/mk/rte.subdir.mk
> > diff --git a/drivers/event/Makefile b/drivers/event/Makefile
> > index d09be74..e119d60 100644
> > --- a/drivers/event/Makefile
> > +++ b/drivers/event/Makefile
> > @@ -31,7 +31,7 @@
> >
> > include $(RTE_SDK)/mk/rte.vars.mk
> >
> > -core-libs := librte_eal librte_eventdev
> > +core-libs := librte_eal librte_ether librte_eventdev
>
> The above two changes makes sense to me as eventdev-ethdev Rx adapter is
> depended on ethdev and there could be an Rx adapter implementation in
> event area that may use ethdev driver exported API.
>
> Can you split driver/event and driver/Makefile change to different
> patch?
I have sent the v4 for this series.
>
> Other than that, This patch set looks good to me and it is ready to merge.
>
> But, There is a compilation error[1] in event-next tree be case of
> Hemant reported problem[2].I can apply this patch set once the solution for
> the reported problem[3] is applied to master branch(so that I pull those
> changes to next-eventdev to avoid build issue)
I understand this :)
Thanks,
Nipun
>
> [1]
> Applying: event/dpaa2: support event eth adapter
> /export/dpdk-next-eventdev/mk/rte.subdir.mk:62: target 'event' given
> more than once in the same rule
> make[2]: Circular mempool <- event dependency dropped.
>
> [2]
> http://dpdk.org/ml/archives/dev/2017-October/079249.html
>
> [3]
> http://dpdk.org/ml/archives/dev/2017-October/079324.html
@@ -39,6 +39,6 @@ DEPDIRS-net := bus mempool
DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += crypto
DEPDIRS-crypto := bus mempool
DIRS-$(CONFIG_RTE_LIBRTE_EVENTDEV) += event
-DEPDIRS-event := bus mempool
+DEPDIRS-event := bus mempool net
include $(RTE_SDK)/mk/rte.subdir.mk
@@ -31,7 +31,7 @@
include $(RTE_SDK)/mk/rte.vars.mk
-core-libs := librte_eal librte_eventdev
+core-libs := librte_eal librte_ether librte_eventdev
DIRS-$(CONFIG_RTE_LIBRTE_PMD_SKELETON_EVENTDEV) += skeleton
DEPDIRS-skeleton = $(core-libs)
@@ -40,6 +40,6 @@ DEPDIRS-sw = $(core-libs) librte_kvargs librte_ring
DIRS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF) += octeontx
DEPDIRS-octeontx = $(core-libs) librte_mempool_octeontx
DIRS-$(CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV) += dpaa2
-DEPDIRS-dpaa2 = $(core-libs) librte_bus_fslmc
+DEPDIRS-dpaa2 = $(core-libs) librte_bus_fslmc librte_pmd_dpaa2
include $(RTE_SDK)/mk/rte.subdir.mk
@@ -45,6 +45,8 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal
CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2
CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa2
CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal
+CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2
+CFLAGS += -I$(RTE_SDK)/drivers/net/dpaa2/mc
# versioning export map
EXPORT_MAP := rte_pmd_dpaa2_event_version.map
@@ -53,11 +53,14 @@
#include <rte_memzone.h>
#include <rte_pci.h>
#include <rte_vdev.h>
+#include <rte_ethdev.h>
+#include <rte_event_eth_rx_adapter.h>
#include <fslmc_vfio.h>
#include <dpaa2_hw_pvt.h>
#include <dpaa2_hw_mempool.h>
#include <dpaa2_hw_dpio.h>
+#include <dpaa2_ethdev.h>
#include "dpaa2_eventdev.h"
#include <portal/dpaa2_hw_pvt.h>
#include <mc/fsl_dpci.h>
@@ -557,6 +560,147 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp,
RTE_SET_USED(f);
}
+static int
+dpaa2_eventdev_eth_caps_get(const struct rte_eventdev *dev,
+ const struct rte_eth_dev *eth_dev,
+ uint32_t *caps)
+{
+ const char *ethdev_driver = eth_dev->device->driver->name;
+
+ PMD_DRV_FUNC_TRACE();
+
+ RTE_SET_USED(dev);
+
+ if (!strcmp(ethdev_driver, "net_dpaa2"))
+ *caps = RTE_EVENT_ETH_RX_ADAPTER_DPAA2_CAP;
+ else
+ *caps = RTE_EVENT_ETH_RX_ADAPTER_SW_CAP;
+
+ return 0;
+}
+
+static int
+dpaa2_eventdev_eth_queue_add_all(const struct rte_eventdev *dev,
+ const struct rte_eth_dev *eth_dev,
+ const struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
+{
+ struct dpaa2_eventdev *priv = dev->data->dev_private;
+ uint8_t ev_qid = queue_conf->ev.queue_id;
+ uint16_t dpcon_id = priv->evq_info[ev_qid].dpcon->dpcon_id;
+ int i, ret;
+
+ PMD_DRV_FUNC_TRACE();
+
+ for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
+ ret = dpaa2_eth_eventq_attach(eth_dev, i,
+ dpcon_id, queue_conf);
+ if (ret) {
+ PMD_DRV_ERR("dpaa2_eth_eventq_attach failed: ret %d\n",
+ ret);
+ goto fail;
+ }
+ }
+ return 0;
+fail:
+ for (i = (i - 1); i >= 0 ; i--)
+ dpaa2_eth_eventq_detach(eth_dev, i);
+
+ return ret;
+}
+
+static int
+dpaa2_eventdev_eth_queue_add(const struct rte_eventdev *dev,
+ const struct rte_eth_dev *eth_dev,
+ int32_t rx_queue_id,
+ const struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
+{
+ struct dpaa2_eventdev *priv = dev->data->dev_private;
+ uint8_t ev_qid = queue_conf->ev.queue_id;
+ uint16_t dpcon_id = priv->evq_info[ev_qid].dpcon->dpcon_id;
+ int ret;
+
+ PMD_DRV_FUNC_TRACE();
+
+ if (rx_queue_id == -1)
+ return dpaa2_eventdev_eth_queue_add_all(dev,
+ eth_dev, queue_conf);
+
+ ret = dpaa2_eth_eventq_attach(eth_dev, rx_queue_id,
+ dpcon_id, queue_conf);
+ if (ret) {
+ PMD_DRV_ERR("dpaa2_eth_eventq_attach failed: ret: %d\n", ret);
+ return ret;
+ }
+ return 0;
+}
+
+static int
+dpaa2_eventdev_eth_queue_del_all(const struct rte_eventdev *dev,
+ const struct rte_eth_dev *eth_dev)
+{
+ int i, ret;
+
+ PMD_DRV_FUNC_TRACE();
+
+ RTE_SET_USED(dev);
+
+ for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
+ ret = dpaa2_eth_eventq_detach(eth_dev, i);
+ if (ret) {
+ PMD_DRV_ERR("dpaa2_eth_eventq_detach failed: ret %d\n",
+ ret);
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
+static int
+dpaa2_eventdev_eth_queue_del(const struct rte_eventdev *dev,
+ const struct rte_eth_dev *eth_dev,
+ int32_t rx_queue_id)
+{
+ int ret;
+
+ PMD_DRV_FUNC_TRACE();
+
+ if (rx_queue_id == -1)
+ return dpaa2_eventdev_eth_queue_del_all(dev, eth_dev);
+
+ ret = dpaa2_eth_eventq_detach(eth_dev, rx_queue_id);
+ if (ret) {
+ PMD_DRV_ERR("dpaa2_eth_eventq_detach failed: ret: %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int
+dpaa2_eventdev_eth_start(const struct rte_eventdev *dev,
+ const struct rte_eth_dev *eth_dev)
+{
+ PMD_DRV_FUNC_TRACE();
+
+ RTE_SET_USED(dev);
+ RTE_SET_USED(eth_dev);
+
+ return 0;
+}
+
+static int
+dpaa2_eventdev_eth_stop(const struct rte_eventdev *dev,
+ const struct rte_eth_dev *eth_dev)
+{
+ PMD_DRV_FUNC_TRACE();
+
+ RTE_SET_USED(dev);
+ RTE_SET_USED(eth_dev);
+
+ return 0;
+}
+
static const struct rte_eventdev_ops dpaa2_eventdev_ops = {
.dev_infos_get = dpaa2_eventdev_info_get,
.dev_configure = dpaa2_eventdev_configure,
@@ -572,7 +716,12 @@ static void dpaa2_eventdev_process_atomic(struct qbman_swp *swp,
.port_link = dpaa2_eventdev_port_link,
.port_unlink = dpaa2_eventdev_port_unlink,
.timeout_ticks = dpaa2_eventdev_timeout_ticks,
- .dump = dpaa2_eventdev_dump
+ .dump = dpaa2_eventdev_dump,
+ .eth_rx_adapter_caps_get = dpaa2_eventdev_eth_caps_get,
+ .eth_rx_adapter_queue_add = dpaa2_eventdev_eth_queue_add,
+ .eth_rx_adapter_queue_del = dpaa2_eventdev_eth_queue_del,
+ .eth_rx_adapter_start = dpaa2_eventdev_eth_start,
+ .eth_rx_adapter_stop = dpaa2_eventdev_eth_stop,
};
static int
@@ -74,6 +74,14 @@ enum {
DPAA2_EVENT_DPCI_MAX_QUEUES
};
+#define RTE_EVENT_ETH_RX_ADAPTER_DPAA2_CAP \
+ (RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT | \
+ RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ | \
+ RTE_EVENT_ETH_RX_ADAPTER_CAP_OVERRIDE_FLOW_ID)
+/**< Ethernet Rx adapter cap to return If the packet transfers from
+ * the ethdev to eventdev with DPAA2 devices.
+ */
+
struct dpaa2_dpcon_dev {
TAILQ_ENTRY(dpaa2_dpcon_dev) next;
struct fsl_mc_io dpcon;