On Sat, Jan 11, 2020 at 7:17 PM <pbhagavat...@marvell.com> wrote:
>
> From: Sunil Kumar Kori <sk...@marvell.com>
>
> Add infra to split eventdev framework based on event Tx adapter
> capability.
> If event Tx adapter has internal port capability then we use
> `rte_event_eth_tx_adapter_enqueue` to transmitting packets else
> we use a SINGLE_LINK event queue to enqueue packets to a service
> core which is responsible for transmitting packets.
>
> Signed-off-by: Sunil Kumar Kori <sk...@marvell.com>
Acked-by: Jerin Jacob <jer...@marvell.com>
> ---
> examples/l3fwd/Makefile | 1 +
> examples/l3fwd/l3fwd_event.c | 31 ++++++++++++++++++++++
> examples/l3fwd/l3fwd_event.h | 20 ++++++++++++++
> examples/l3fwd/l3fwd_event_generic.c | 14 ++++++++++
> examples/l3fwd/l3fwd_event_internal_port.c | 14 ++++++++++
> examples/l3fwd/meson.build | 3 ++-
> 6 files changed, 82 insertions(+), 1 deletion(-)
> create mode 100644 examples/l3fwd/l3fwd_event_generic.c
> create mode 100644 examples/l3fwd/l3fwd_event_internal_port.c
>
> diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile
> index c892b867b..59a110d12 100644
> --- a/examples/l3fwd/Makefile
> +++ b/examples/l3fwd/Makefile
> @@ -6,6 +6,7 @@ APP = l3fwd
>
> # all source are stored in SRCS-y
> SRCS-y := main.c l3fwd_lpm.c l3fwd_em.c l3fwd_event.c
> +SRCS-y += l3fwd_event_generic.c l3fwd_event_internal_port.c
>
> # Build using pkg-config variables if possible
> ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
> diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
> index 1040da4ea..62218f3ca 100644
> --- a/examples/l3fwd/l3fwd_event.c
> +++ b/examples/l3fwd/l3fwd_event.c
> @@ -30,6 +30,31 @@ l3fwd_get_eventdev_rsrc(void)
> return NULL;
> }
>
> +static void
> +l3fwd_event_capability_setup(void)
> +{
> + struct l3fwd_event_resources *evt_rsrc = l3fwd_get_eventdev_rsrc();
> + uint32_t caps = 0;
> + uint16_t i;
> + int ret;
> +
> + RTE_ETH_FOREACH_DEV(i) {
> + ret = rte_event_eth_tx_adapter_caps_get(0, i, &caps);
> + if (ret)
> + rte_exit(EXIT_FAILURE,
> + "Invalid capability for Tx adptr port %d\n",
> + i);
> +
> + evt_rsrc->tx_mode_q |= !(caps &
> +
> RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT);
> + }
> +
> + if (evt_rsrc->tx_mode_q)
> + l3fwd_event_set_generic_ops(&evt_rsrc->ops);
> + else
> + l3fwd_event_set_internal_port_ops(&evt_rsrc->ops);
> +}
> +
> void
> l3fwd_event_resource_setup(void)
> {
> @@ -37,4 +62,10 @@ l3fwd_event_resource_setup(void)
>
> if (!evt_rsrc->enabled)
> return;
> +
> + if (!rte_event_dev_count())
> + rte_exit(EXIT_FAILURE, "No Eventdev found");
> +
> + /* Setup eventdev capability callbacks */
> + l3fwd_event_capability_setup();
> }
> diff --git a/examples/l3fwd/l3fwd_event.h b/examples/l3fwd/l3fwd_event.h
> index 4c23c4e1a..d25c8d222 100644
> --- a/examples/l3fwd/l3fwd_event.h
> +++ b/examples/l3fwd/l3fwd_event.h
> @@ -7,17 +7,37 @@
>
> #include <rte_common.h>
> #include <rte_eventdev.h>
> +#include <rte_event_eth_tx_adapter.h>
> #include <rte_spinlock.h>
>
> #include "l3fwd.h"
>
> +typedef uint32_t (*event_device_setup_cb)(void);
> +typedef void (*event_queue_setup_cb)(uint32_t event_queue_cfg);
> +typedef void (*event_port_setup_cb)(void);
> +typedef void (*adapter_setup_cb)(void);
> +typedef int (*event_loop_cb)(void *);
> +
> +struct l3fwd_event_setup_ops {
> + event_device_setup_cb event_device_setup;
> + event_queue_setup_cb event_queue_setup;
> + event_port_setup_cb event_port_setup;
> + adapter_setup_cb adapter_setup;
> + event_loop_cb lpm_event_loop;
> + event_loop_cb em_event_loop;
> +};
> +
> struct l3fwd_event_resources {
> + struct l3fwd_event_setup_ops ops;
> uint8_t sched_type;
> + uint8_t tx_mode_q;
> uint8_t enabled;
> uint8_t eth_rx_queues;
> };
>
> struct l3fwd_event_resources *l3fwd_get_eventdev_rsrc(void);
> void l3fwd_event_resource_setup(void);
> +void l3fwd_event_set_generic_ops(struct l3fwd_event_setup_ops *ops);
> +void l3fwd_event_set_internal_port_ops(struct l3fwd_event_setup_ops *ops);
>
> #endif /* __L3FWD_EVENTDEV_H__ */
> diff --git a/examples/l3fwd/l3fwd_event_generic.c
> b/examples/l3fwd/l3fwd_event_generic.c
> new file mode 100644
> index 000000000..7fff850e5
> --- /dev/null
> +++ b/examples/l3fwd/l3fwd_event_generic.c
> @@ -0,0 +1,14 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(C) 2019 Marvell International Ltd.
> + */
> +
> +#include <stdbool.h>
> +
> +#include "l3fwd.h"
> +#include "l3fwd_event.h"
> +
> +void
> +l3fwd_event_set_generic_ops(struct l3fwd_event_setup_ops *ops)
> +{
> + RTE_SET_USED(ops);
> +}
> diff --git a/examples/l3fwd/l3fwd_event_internal_port.c
> b/examples/l3fwd/l3fwd_event_internal_port.c
> new file mode 100644
> index 000000000..085e9c825
> --- /dev/null
> +++ b/examples/l3fwd/l3fwd_event_internal_port.c
> @@ -0,0 +1,14 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(C) 2019 Marvell International Ltd.
> + */
> +
> +#include <stdbool.h>
> +
> +#include "l3fwd.h"
> +#include "l3fwd_event.h"
> +
> +void
> +l3fwd_event_set_internal_port_ops(struct l3fwd_event_setup_ops *ops)
> +{
> + RTE_SET_USED(ops);
> +}
> diff --git a/examples/l3fwd/meson.build b/examples/l3fwd/meson.build
> index 864327c7b..ebed3b518 100644
> --- a/examples/l3fwd/meson.build
> +++ b/examples/l3fwd/meson.build
> @@ -8,5 +8,6 @@
>
> deps += ['hash', 'lpm', 'eventdev']
> sources = files(
> - 'l3fwd_em.c', 'l3fwd_lpm.c', 'l3fwd_event.c', 'main.c'
> + 'l3fwd_em.c', 'l3fwd_lpm.c', 'l3fwd_event.c',
> + 'l3fwd_event_internal_port.c', 'l3fwd_event_generic.c', 'main.c'
> )
> --
> 2.17.1
>
