>> Add lpm main loop for handling events based on capabilities of the
>> event device.
>>
>> Signed-off-by: Pavan Nikhilesh <pbhagavat...@marvell.com>
>> ---
>> examples/l3fwd/l3fwd.h | 9 ++
>> examples/l3fwd/l3fwd_event.c | 9 ++
>> examples/l3fwd/l3fwd_event.h | 5 +
>> examples/l3fwd/l3fwd_lpm.c | 231
>+++++++++++++++++++++++++++++++++++
>> examples/l3fwd/main.c | 10 +-
>> 5 files changed, 260 insertions(+), 4 deletions(-)
>>
>> diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
>> index 6d16cde74..8f2e4be23 100644
>> --- a/examples/l3fwd/l3fwd.h
>> +++ b/examples/l3fwd/l3fwd.h
>> @@ -212,6 +212,15 @@ em_main_loop(__attribute__((unused)) void
>*dummy);
>> int
>> lpm_main_loop(__attribute__((unused)) void *dummy);
>>
>> +int
>> +lpm_event_main_loop_tx_d(__attribute__((unused)) void
>*dummy);
>> +int
>> +lpm_event_main_loop_tx_d_burst(__attribute__((unused)) void
>*dummy);
>> +int
>> +lpm_event_main_loop_tx_q(__attribute__((unused)) void
>*dummy);
>> +int
>> +lpm_event_main_loop_tx_q_burst(__attribute__((unused)) void
>*dummy);
>
>No need to add unused attribute in function declaration.
>BTW, if all event_loop_cb functions don't use parameter, why just not
>make them 'typedef int (*event_loop_cb)(void)'?
>
These functions are used in remote launch so, we can't modify the prototype.
rte_eal_mp_remote_launch(l3fwd_lkp.main_loop, NULL, CALL_MASTER);
I will remove the unnecessary attribute in next version.
>> +
>> /* Return ipv4/ipv6 fwd lookup struct for LPM or EM. */
>> void *
>> em_get_ipv4_l3fwd_lookup_struct(const int socketid);
>> diff --git a/examples/l3fwd/l3fwd_event.c
>b/examples/l3fwd/l3fwd_event.c
>> index 0e796f003..c7de046e3 100644
>> --- a/examples/l3fwd/l3fwd_event.c
>> +++ b/examples/l3fwd/l3fwd_event.c
>> @@ -235,6 +235,12 @@ void
>> l3fwd_event_resource_setup(struct rte_eth_conf *port_conf)
>> {
>> struct l3fwd_event_resources *evt_rsrc =
>l3fwd_get_eventdev_rsrc();
>> + const event_loop_cb lpm_event_loop[2][2] = {
>> + [0][0] = lpm_event_main_loop_tx_d,
>> + [0][1] = lpm_event_main_loop_tx_d_burst,
>> + [1][0] = lpm_event_main_loop_tx_q,
>> + [1][1] = lpm_event_main_loop_tx_q_burst,
>> + };
>> uint32_t event_queue_cfg;
>> int ret;
>>
>> @@ -268,4 +274,7 @@ l3fwd_event_resource_setup(struct
>rte_eth_conf *port_conf)
>> ret = rte_event_dev_start(evt_rsrc->event_d_id);
>> if (ret < 0)
>> rte_exit(EXIT_FAILURE, "Error in starting eventdev");
>> +
>> + evt_rsrc->ops.lpm_event_loop = lpm_event_loop[evt_rsrc-
>>tx_mode_q]
>> + [evt_rsrc-
>>has_burst];
>> }
>> diff --git a/examples/l3fwd/l3fwd_event.h
>b/examples/l3fwd/l3fwd_event.h
>> index 9d8bd5a36..fcc0ce51a 100644
>> --- a/examples/l3fwd/l3fwd_event.h
>> +++ b/examples/l3fwd/l3fwd_event.h
>> @@ -14,6 +14,11 @@
>>
>> #include "l3fwd.h"
>>
>> +#define L3FWD_EVENT_SINGLE 0x1
>> +#define L3FWD_EVENT_BURST 0x2
>> +#define L3FWD_EVENT_TX_DIRECT 0x4
>> +#define L3FWD_EVENT_TX_ENQ 0x8
>> +
>> #define CMD_LINE_OPT_MODE "mode"
>> #define CMD_LINE_OPT_EVENTQ_SYNC "eventq-sched"
>>
>> diff --git a/examples/l3fwd/l3fwd_lpm.c
>b/examples/l3fwd/l3fwd_lpm.c
>> index 349de2703..c4669d6d5 100644
>> --- a/examples/l3fwd/l3fwd_lpm.c
>> +++ b/examples/l3fwd/l3fwd_lpm.c
>> @@ -28,6 +28,7 @@
>> #include <rte_lpm6.h>
>>
>> #include "l3fwd.h"
>> +#include "l3fwd_event.h"
>>
>> struct ipv4_l3fwd_lpm_route {
>> uint32_t ip;
>> @@ -254,6 +255,236 @@ lpm_main_loop(__attribute__((unused))
>void *dummy)
>> return 0;
>> }
>>
>> +static __rte_always_inline void
>> +lpm_event_loop_single(struct l3fwd_event_resources *evt_rsrc,
>> + const uint8_t flags)
>> +{
>> + const int event_p_id = l3fwd_get_free_event_port(evt_rsrc);
>> + const uint8_t tx_q_id = evt_rsrc->evq.event_q_id[
>> + evt_rsrc->evq.nb_queues - 1];
>> + const uint8_t event_d_id = evt_rsrc->event_d_id;
>> + struct lcore_conf *lconf;
>> + unsigned int lcore_id;
>> + struct rte_event ev;
>> +
>> + if (event_p_id < 0)
>> + return;
>> +
>> + lcore_id = rte_lcore_id();
>> + lconf = &lcore_conf[lcore_id];
>> +
>> + RTE_LOG(INFO, L3FWD, "entering %s on lcore %u\n", __func__,
>lcore_id);
>> + while (!force_quit) {
>> + if (!rte_event_dequeue_burst(event_d_id,
>event_p_id, &ev, 1, 0))
>> + continue;
>> +
>> + struct rte_mbuf *mbuf = ev.mbuf;
>> + mbuf->port = lpm_get_dst_port(lconf, mbuf, mbuf-
>>port);
>> +
>> +#if defined RTE_ARCH_X86 || defined
>RTE_MACHINE_CPUFLAG_NEON \
>> + || defined RTE_ARCH_PPC_64
>> + process_packet(mbuf, &mbuf->port);
>> +#else
>> +
>> + struct rte_ether_hdr *eth_hdr =
>rte_pktmbuf_mtod(mbuf,
>> + struct
>rte_ether_hdr *);
>> +#ifdef DO_RFC_1812_CHECKS
>> + struct rte_ipv4_hdr *ipv4_hdr;
>> + if (RTE_ETH_IS_IPV4_HDR(mbuf->packet_type)) {
>> + /* Handle IPv4 headers.*/
>> + ipv4_hdr = rte_pktmbuf_mtod_offset(mbuf,
>> + struct rte_ipv4_hdr *,
>> + sizeof(struct rte_ether_hdr));
>> +
>> + if (is_valid_ipv4_pkt(ipv4_hdr, mbuf->pkt_len)
>> + < 0) {
>> + mbuf->port = BAD_PORT;
>> + continue;
>> + }
>> + /* Update time to live and header checksum */
>> + --(ipv4_hdr->time_to_live);
>> + ++(ipv4_hdr->hdr_checksum);
>> + }
>> +#endif
>> + /* dst addr */
>> + *(uint64_t *)ð_hdr->d_addr =
>dest_eth_addr[mbuf->port];
>> +
>> + /* src addr */
>> + rte_ether_addr_copy(&ports_eth_addr[mbuf->port],
>> + ð_hdr->s_addr);
>> +#endif
>
>The code snippet above looks pretty much the same as in
>l3fwd_lpm_simple_forward()
>except missing IPv6 part.
>Same for loop_burst() below.
>Instead od duplicating the code in dozen places, can we put this
>common code
>into a function and use it?
Sure, I will move it to l3fwd_lpm.h and use it across.
>
>
>
>> + if (mbuf->port == BAD_PORT) {
>> + rte_pktmbuf_free(mbuf);
>> + continue;
>> + }
>> +
>> + if (flags & L3FWD_EVENT_TX_ENQ) {
>> + ev.queue_id = tx_q_id;
>> + ev.op = RTE_EVENT_OP_FORWARD;
>> + while (rte_event_enqueue_burst(event_d_id,
>event_p_id,
>> + &ev, 1) && !force_quit)
>> + ;
>> + }
>> +
>> + if (flags & L3FWD_EVENT_TX_DIRECT) {
>> + rte_event_eth_tx_adapter_txq_set(mbuf, 0);
>> + while
>(!rte_event_eth_tx_adapter_enqueue(event_d_id,
>> + event_p_id, &ev, 1, 0)
>&&
>> + !force_quit)
>> + ;
>> + }
>> + }
>> +}
>> +
>> +static __rte_always_inline void
>> +lpm_event_loop_burst(struct l3fwd_event_resources *evt_rsrc,
>> + const uint8_t flags)
>> +{
>> + const int event_p_id = l3fwd_get_free_event_port(evt_rsrc);
>> + const uint8_t tx_q_id = evt_rsrc->evq.event_q_id[
>> + evt_rsrc->evq.nb_queues - 1];
>> + const uint8_t event_d_id = evt_rsrc->event_d_id;
>> + const uint16_t deq_len = evt_rsrc->deq_depth;
>> + struct rte_event events[MAX_PKT_BURST];
>> + struct lcore_conf *lconf;
>> + unsigned int lcore_id;
>> + int i, nb_enq, nb_deq;
>> +
>> + if (event_p_id < 0)
>> + return;
>> +
>> + lcore_id = rte_lcore_id();
>> +
>> + lconf = &lcore_conf[lcore_id];
>> +
>> + RTE_LOG(INFO, L3FWD, "entering %s on lcore %u\n", __func__,
>lcore_id);
>> +
>> + while (!force_quit) {
>> + /* Read events from RX queues */
>> + nb_deq = rte_event_dequeue_burst(event_d_id,
>event_p_id,
>> + events, deq_len, 0);
>> + if (nb_deq == 0) {
>> + rte_pause();
>> + continue;
>> + }
>> +
>> + for (i = 0; i < nb_deq; i++) {
>> + struct rte_mbuf *mbuf = events[i].mbuf;
>> +
>> + mbuf->port = lpm_get_dst_port(lconf, mbuf,
>mbuf->port);
>> +
>> +#if defined RTE_ARCH_X86 || defined
>RTE_MACHINE_CPUFLAG_NEON \
>> + || defined RTE_ARCH_PPC_64
>> + process_packet(mbuf, &mbuf->port);
>> +#else
>> + struct rte_ether_hdr *eth_hdr =
>rte_pktmbuf_mtod(mbuf,
>> + struct rte_ether_hdr *);
>> +
>> +#ifdef DO_RFC_1812_CHECKS
>> + struct rte_ipv4_hdr *ipv4_hdr;
>> + if (RTE_ETH_IS_IPV4_HDR(mbuf-
>>packet_type)) {
>> + /* Handle IPv4 headers.*/
>> + ipv4_hdr =
>rte_pktmbuf_mtod_offset(mbuf,
>> + struct rte_ipv4_hdr *,
>> + sizeof(struct
>rte_ether_hdr));
>> +
>> + if (is_valid_ipv4_pkt(ipv4_hdr, mbuf-
>>pkt_len)
>> + < 0) {
>> + mbuf->port = BAD_PORT;
>> + continue;
>> + }
>> + /* Update time to live and header
>checksum */
>> + --(ipv4_hdr->time_to_live);
>> + ++(ipv4_hdr->hdr_checksum);
>> + }
>> +#endif
>> + /* dst addr */
>> + *(uint64_t *)ð_hdr->d_addr =
>dest_eth_addr[
>> + mbuf-
>>port];
>> + /* src addr */
>> + rte_ether_addr_copy(&ports_eth_addr[mbuf-
>>port],
>> + ð_hdr->s_addr);
>> +#endif
>> + if (flags & L3FWD_EVENT_TX_ENQ) {
>> + events[i].queue_id = tx_q_id;
>> + events[i].op =
>RTE_EVENT_OP_FORWARD;
>> + }
>> +
>> + if (flags & L3FWD_EVENT_TX_DIRECT)
>> +
> rte_event_eth_tx_adapter_txq_set(mbuf, 0);
>> + }
>> +
>> + if (flags & L3FWD_EVENT_TX_ENQ) {
>> + nb_enq =
>rte_event_enqueue_burst(event_d_id, event_p_id,
>> + events, nb_deq);
>> + while (nb_enq < nb_deq && !force_quit)
>> + nb_enq +=
>rte_event_enqueue_burst(event_d_id,
>> + event_p_id, events +
>nb_enq,
>> + nb_deq - nb_enq);
>> + }
>> +
>> + if (flags & L3FWD_EVENT_TX_DIRECT) {
>> + nb_enq =
>rte_event_eth_tx_adapter_enqueue(event_d_id,
>> + event_p_id, events, nb_deq, 0);
>> + while (nb_enq < nb_deq && !force_quit)
>> + nb_enq +=
>rte_event_eth_tx_adapter_enqueue(
>> + event_d_id,
>event_p_id,
>> + events + nb_enq,
>> + nb_deq - nb_enq, 0);
>> + }
>> + }
>> +}
>> +
>> +static __rte_always_inline void
>> +lpm_event_loop(struct l3fwd_event_resources *evt_rsrc,
>> + const uint8_t flags)
>> +{
>> + if (flags & L3FWD_EVENT_SINGLE)
>> + lpm_event_loop_single(evt_rsrc, flags);
>> + if (flags & L3FWD_EVENT_BURST)
>> + lpm_event_loop_burst(evt_rsrc, flags);
>> +}
>> +
>> +int __rte_noinline
>> +lpm_event_main_loop_tx_d(__attribute__((unused)) void
>*dummy)
>> +{
>> + struct l3fwd_event_resources *evt_rsrc =
>> + l3fwd_get_eventdev_rsrc();
>> +
>> + lpm_event_loop(evt_rsrc, L3FWD_EVENT_TX_DIRECT |
>L3FWD_EVENT_SINGLE);
>> + return 0;
>> +}
>> +
>> +int __rte_noinline
>> +lpm_event_main_loop_tx_d_burst(__attribute__((unused)) void
>*dummy)
>> +{
>> + struct l3fwd_event_resources *evt_rsrc =
>> + l3fwd_get_eventdev_rsrc();
>> +
>> + lpm_event_loop(evt_rsrc, L3FWD_EVENT_TX_DIRECT |
>L3FWD_EVENT_BURST);
>> + return 0;
>> +}
>> +
>> +int __rte_noinline
>> +lpm_event_main_loop_tx_q(__attribute__((unused)) void
>*dummy)
>> +{
>> + struct l3fwd_event_resources *evt_rsrc =
>> + l3fwd_get_eventdev_rsrc();
>> +
>> + lpm_event_loop(evt_rsrc, L3FWD_EVENT_TX_ENQ |
>L3FWD_EVENT_SINGLE);
>> + return 0;
>> +}
>> +
>> +int __rte_noinline
>> +lpm_event_main_loop_tx_q_burst(__attribute__((unused)) void
>*dummy)
>> +{
>> + struct l3fwd_event_resources *evt_rsrc =
>> + l3fwd_get_eventdev_rsrc();
>> +
>> + lpm_event_loop(evt_rsrc, L3FWD_EVENT_TX_ENQ |
>L3FWD_EVENT_BURST);
>> + return 0;
>> +}
>> +
>> void
>> setup_lpm(const int socketid)
>> {
>> diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
>> index 69d212bc2..b88fd88db 100644
>> --- a/examples/l3fwd/main.c
>> +++ b/examples/l3fwd/main.c
>> @@ -951,13 +951,18 @@ main(int argc, char **argv)
>> if (ret < 0)
>> rte_exit(EXIT_FAILURE, "Invalid L3FWD parameters\n");
>>
>> + /* Setup function pointers for lookup method. */
>> + setup_l3fwd_lookup_tables();
>> +
>> evt_rsrc->per_port_pool = per_port_pool;
>> evt_rsrc->pkt_pool = pktmbuf_pool;
>> evt_rsrc->port_mask = enabled_port_mask;
>> /* Configure eventdev parameters if user has requested */
>> l3fwd_event_resource_setup(&port_conf);
>> - if (evt_rsrc->enabled)
>> + if (evt_rsrc->enabled) {
>> + l3fwd_lkp.main_loop = evt_rsrc->ops.lpm_event_loop;
>> goto skip_port_config;
>> + }
>>
>> if (check_lcore_params() < 0)
>> rte_exit(EXIT_FAILURE, "check_lcore_params
>failed\n");
>> @@ -973,9 +978,6 @@ main(int argc, char **argv)
>>
>> nb_lcores = rte_lcore_count();
>>
>> - /* Setup function pointers for lookup method. */
>> - setup_l3fwd_lookup_tables();
>> -
>> /* initialize all ports */
>> RTE_ETH_FOREACH_DEV(portid) {
>> struct rte_eth_conf local_port_conf = port_conf;
>> --
>> 2.17.1
