From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2A47FA2EFC for ; Thu, 19 Sep 2019 11:27:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 638491ED49; Thu, 19 Sep 2019 11:26:35 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 303351ED46 for ; Thu, 19 Sep 2019 11:26:34 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x8J9Otgh027068; Thu, 19 Sep 2019 02:26:33 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0818; bh=cgpeSVhoP7xNrTkmg/IMcT99COmuDQ78+BdFCrVxaWw=; b=y2uUE1Z3GpK4xRYUuhN8jWHNPgfFDKgEesJZZPk7x2X+tsDGKCMBW7PeIhP0ZpRpwCwL gZtXk6Iv2XEJmis1voVpozVkqJgxasoJU1sYQ1p5DdjVhR2LqL7YNDUMgFw+GRVFBrO0 laqrksD+n+PSQgwCZA0/RRjBMyhNohux12Nlbd2c/HPUoHmANBFnnKXMe71eZtdQ663n Sp8xVVNuL93YcwbJcQl3O2BNIbZERMvdYqXGA5YKSIURVwdN4spPdmeVUanQJMgGK+re CTHM+ADE/GgzH7luqbwn6VM68xGKKSuMULgz+kt1BxtpSzNji3s8WY3BwcnOgBnsIQZC xA== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0b-0016f401.pphosted.com with ESMTP id 2v3vcfj5x7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 19 Sep 2019 02:26:33 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Thu, 19 Sep 2019 02:26:31 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Thu, 19 Sep 2019 02:26:31 -0700 Received: from BG-LT7430.marvell.com (unknown [10.28.17.12]) by maili.marvell.com (Postfix) with ESMTP id 9EABD3F703F; Thu, 19 Sep 2019 02:26:28 -0700 (PDT) From: To: , , , Marko Kovacevic , Ori Kam , Radu Nicolau , Tomasz Kantecki , Sunil Kumar Kori , "Pavan Nikhilesh" CC: Date: Thu, 19 Sep 2019 14:56:00 +0530 Message-ID: <20190919092603.5485-7-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190919092603.5485-1-pbhagavatula@marvell.com> References: <20190919092603.5485-1-pbhagavatula@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.70,1.0.8 definitions=2019-09-19_03:2019-09-18,2019-09-19 signatures=0 Subject: [dpdk-dev] [PATCH v2 06/10] examples/l2fwd-event: add event Rx/Tx adapter setup X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Pavan Nikhilesh Add event eth Rx/Tx adapter setup for both generic and internal port event device pipelines. Signed-off-by: Sunil Kumar Kori Signed-off-by: Pavan Nikhilesh --- examples/l2fwd-event/l2fwd_eventdev.c | 3 + examples/l2fwd-event/l2fwd_eventdev.h | 17 +++ examples/l2fwd-event/l2fwd_eventdev_generic.c | 117 ++++++++++++++++++ .../l2fwd_eventdev_internal_port.c | 80 ++++++++++++ 4 files changed, 217 insertions(+) diff --git a/examples/l2fwd-event/l2fwd_eventdev.c b/examples/l2fwd-event/l2fwd_eventdev.c index 7a3d077ae..f964c69d6 100644 --- a/examples/l2fwd-event/l2fwd_eventdev.c +++ b/examples/l2fwd-event/l2fwd_eventdev.c @@ -243,6 +243,9 @@ eventdev_resource_setup(void) /* Event port configuration */ eventdev_rsrc->ops.event_port_setup(); + /* Rx/Tx adapters configuration */ + eventdev_rsrc->ops.adapter_setup(ethdev_count); + /* Start event device service */ ret = rte_event_dev_service_id_get(eventdev_rsrc->event_d_id, &service_id); diff --git a/examples/l2fwd-event/l2fwd_eventdev.h b/examples/l2fwd-event/l2fwd_eventdev.h index 7646ef29f..95ff37294 100644 --- a/examples/l2fwd-event/l2fwd_eventdev.h +++ b/examples/l2fwd-event/l2fwd_eventdev.h @@ -6,6 +6,9 @@ #define __L2FWD_EVENTDEV_H__ #include +#include +#include +#include #include #include "l2fwd_common.h" @@ -37,6 +40,18 @@ struct eventdev_ports { rte_spinlock_t lock; }; +struct eventdev_rx_adptr { + uint32_t service_id; + uint8_t nb_rx_adptr; + uint8_t *rx_adptr; +}; + +struct eventdev_tx_adptr { + uint32_t service_id; + uint8_t nb_tx_adptr; + uint8_t *tx_adptr; +}; + struct eventdev_setup_ops { event_queue_setup_cb event_queue_setup; event_port_setup_cb event_port_setup; @@ -50,6 +65,8 @@ struct eventdev_resources { struct rte_event_port_conf def_p_conf; struct l2fwd_port_statistics *stats; /* Default port config. */ + struct eventdev_rx_adptr rx_adptr; + struct eventdev_tx_adptr tx_adptr; uint8_t disable_implicit_release; struct eventdev_setup_ops ops; struct rte_mempool *pkt_pool; diff --git a/examples/l2fwd-event/l2fwd_eventdev_generic.c b/examples/l2fwd-event/l2fwd_eventdev_generic.c index 65166fded..68b63279a 100644 --- a/examples/l2fwd-event/l2fwd_eventdev_generic.c +++ b/examples/l2fwd-event/l2fwd_eventdev_generic.c @@ -192,10 +192,127 @@ event_queue_setup_generic(uint16_t ethdev_count, uint32_t event_queue_cfg) eventdev_rsrc->evq.event_q_id[event_q_id] = event_q_id; } +static void +rx_tx_adapter_setup_generic(uint16_t ethdev_count) +{ + struct eventdev_resources *eventdev_rsrc = get_eventdev_rsrc(); + struct rte_event_eth_rx_adapter_queue_conf eth_q_conf = { + .rx_queue_flags = 0, + .ev = { + .queue_id = 0, + .priority = RTE_EVENT_DEV_PRIORITY_NORMAL, + } + }; + uint8_t event_d_id = eventdev_rsrc->event_d_id; + uint8_t rx_adptr_id = 0; + uint8_t tx_adptr_id = 0; + uint8_t tx_port_id = 0; + uint32_t service_id; + int32_t ret, i; + + /* Rx adapter setup */ + eventdev_rsrc->rx_adptr.nb_rx_adptr = 1; + eventdev_rsrc->rx_adptr.rx_adptr = (uint8_t *)malloc(sizeof(uint8_t) * + eventdev_rsrc->rx_adptr.nb_rx_adptr); + if (!eventdev_rsrc->rx_adptr.rx_adptr) { + free(eventdev_rsrc->evp.event_p_id); + free(eventdev_rsrc->evq.event_q_id); + rte_exit(EXIT_FAILURE, + "failed to allocate memery for Rx adapter"); + } + + ret = rte_event_eth_rx_adapter_create(rx_adptr_id, event_d_id, + &eventdev_rsrc->def_p_conf); + if (ret) + rte_exit(EXIT_FAILURE, "failed to create rx adapter"); + + eth_q_conf.ev.sched_type = eventdev_rsrc->sync_mode; + for (i = 0; i < ethdev_count; i++) { + /* Configure user requested sync mode */ + eth_q_conf.ev.queue_id = eventdev_rsrc->evq.event_q_id[i]; + ret = rte_event_eth_rx_adapter_queue_add(rx_adptr_id, i, -1, + ð_q_conf); + if (ret) + rte_exit(EXIT_FAILURE, + "Failed to add queues to Rx adapter"); + } + + ret = rte_event_eth_rx_adapter_service_id_get(rx_adptr_id, &service_id); + if (ret != -ESRCH && ret != 0) { + rte_exit(EXIT_FAILURE, + "Error getting the service ID for rx adptr\n"); + } + + rte_service_runstate_set(service_id, 1); + rte_service_set_runstate_mapped_check(service_id, 0); + eventdev_rsrc->rx_adptr.service_id = service_id; + + ret = rte_event_eth_rx_adapter_start(rx_adptr_id); + if (ret) + rte_exit(EXIT_FAILURE, "Rx adapter[%d] start failed", + rx_adptr_id); + + eventdev_rsrc->rx_adptr.rx_adptr[0] = rx_adptr_id; + + /* Tx adapter setup */ + eventdev_rsrc->tx_adptr.nb_tx_adptr = 1; + eventdev_rsrc->tx_adptr.tx_adptr = (uint8_t *)malloc(sizeof(uint8_t) * + eventdev_rsrc->tx_adptr.nb_tx_adptr); + if (!eventdev_rsrc->tx_adptr.tx_adptr) { + free(eventdev_rsrc->rx_adptr.rx_adptr); + free(eventdev_rsrc->evp.event_p_id); + free(eventdev_rsrc->evq.event_q_id); + rte_exit(EXIT_FAILURE, + "failed to allocate memery for Rx adapter"); + } + + ret = rte_event_eth_tx_adapter_create(tx_adptr_id, event_d_id, + &eventdev_rsrc->def_p_conf); + if (ret) + rte_exit(EXIT_FAILURE, "failed to create tx adapter"); + + for (i = 0; i < ethdev_count; i++) { + ret = rte_event_eth_tx_adapter_queue_add(tx_adptr_id, i, -1); + if (ret) + rte_exit(EXIT_FAILURE, + "failed to add queues to Tx adapter"); + } + + ret = rte_event_eth_tx_adapter_service_id_get(tx_adptr_id, &service_id); + if (ret != -ESRCH && ret != 0) + rte_exit(EXIT_FAILURE, "Failed to get Tx adapter service ID"); + + rte_service_runstate_set(service_id, 1); + rte_service_set_runstate_mapped_check(service_id, 0); + eventdev_rsrc->tx_adptr.service_id = service_id; + + ret = rte_event_eth_tx_adapter_event_port_get(tx_adptr_id, &tx_port_id); + if (ret) + rte_exit(EXIT_FAILURE, + "Failed to get Tx adapter port id: %d\n", ret); + + ret = rte_event_port_link(event_d_id, tx_port_id, + &eventdev_rsrc->evq.event_q_id[ + eventdev_rsrc->evq.nb_queues - 1], + NULL, 1); + if (ret != 1) + rte_exit(EXIT_FAILURE, + "Unable to link Tx adapter port to Tx queue:err = %d", + ret); + + ret = rte_event_eth_tx_adapter_start(tx_adptr_id); + if (ret) + rte_exit(EXIT_FAILURE, "Tx adapter[%d] start failed", + tx_adptr_id); + + eventdev_rsrc->tx_adptr.tx_adptr[0] = tx_adptr_id; +} + void eventdev_set_generic_ops(struct eventdev_setup_ops *ops) { ops->eventdev_setup = eventdev_setup_generic; ops->event_queue_setup = event_queue_setup_generic; ops->event_port_setup = event_port_setup_generic; + ops->adapter_setup = rx_tx_adapter_setup_generic; } diff --git a/examples/l2fwd-event/l2fwd_eventdev_internal_port.c b/examples/l2fwd-event/l2fwd_eventdev_internal_port.c index 52cb07707..02663242f 100644 --- a/examples/l2fwd-event/l2fwd_eventdev_internal_port.c +++ b/examples/l2fwd-event/l2fwd_eventdev_internal_port.c @@ -186,10 +186,90 @@ event_queue_setup_internal_port(uint16_t ethdev_count, uint32_t event_queue_cfg) } } +static void +rx_tx_adapter_setup_internal_port(uint16_t ethdev_count) +{ + struct eventdev_resources *eventdev_rsrc = get_eventdev_rsrc(); + struct rte_event_eth_rx_adapter_queue_conf eth_q_conf = { + .rx_queue_flags = 0, + .ev = { + .queue_id = 0, + .priority = RTE_EVENT_DEV_PRIORITY_NORMAL, + } + }; + uint8_t event_d_id = eventdev_rsrc->event_d_id; + int32_t ret, i; + + eventdev_rsrc->rx_adptr.nb_rx_adptr = ethdev_count; + eventdev_rsrc->rx_adptr.rx_adptr = (uint8_t *)malloc(sizeof(uint8_t) * + eventdev_rsrc->rx_adptr.nb_rx_adptr); + if (!eventdev_rsrc->rx_adptr.rx_adptr) { + free(eventdev_rsrc->evp.event_p_id); + free(eventdev_rsrc->evq.event_q_id); + rte_exit(EXIT_FAILURE, + "failed to allocate memery for Rx adapter"); + } + + for (i = 0; i < ethdev_count; i++) { + ret = rte_event_eth_rx_adapter_create(i, event_d_id, + &eventdev_rsrc->def_p_conf); + if (ret) + rte_exit(EXIT_FAILURE, + "failed to create rx adapter[%d]", i); + + /* Configure user requested sync mode */ + eth_q_conf.ev.queue_id = eventdev_rsrc->evq.event_q_id[i]; + eth_q_conf.ev.sched_type = eventdev_rsrc->sync_mode; + ret = rte_event_eth_rx_adapter_queue_add(i, i, -1, ð_q_conf); + if (ret) + rte_exit(EXIT_FAILURE, + "Failed to add queues to Rx adapter"); + + ret = rte_event_eth_rx_adapter_start(i); + if (ret) + rte_exit(EXIT_FAILURE, + "Rx adapter[%d] start failed", i); + + eventdev_rsrc->rx_adptr.rx_adptr[i] = i; + } + + eventdev_rsrc->tx_adptr.nb_tx_adptr = ethdev_count; + eventdev_rsrc->tx_adptr.tx_adptr = (uint8_t *)malloc(sizeof(uint8_t) * + eventdev_rsrc->tx_adptr.nb_tx_adptr); + if (!eventdev_rsrc->tx_adptr.tx_adptr) { + free(eventdev_rsrc->rx_adptr.rx_adptr); + free(eventdev_rsrc->evp.event_p_id); + free(eventdev_rsrc->evq.event_q_id); + rte_exit(EXIT_FAILURE, + "failed to allocate memery for Rx adapter"); + } + + for (i = 0; i < ethdev_count; i++) { + ret = rte_event_eth_tx_adapter_create(i, event_d_id, + &eventdev_rsrc->def_p_conf); + if (ret) + rte_exit(EXIT_FAILURE, + "failed to create tx adapter[%d]", i); + + ret = rte_event_eth_tx_adapter_queue_add(i, i, -1); + if (ret) + rte_exit(EXIT_FAILURE, + "failed to add queues to Tx adapter"); + + ret = rte_event_eth_tx_adapter_start(i); + if (ret) + rte_exit(EXIT_FAILURE, + "Tx adapter[%d] start failed", i); + + eventdev_rsrc->tx_adptr.tx_adptr[i] = i; + } +} + void eventdev_set_internal_port_ops(struct eventdev_setup_ops *ops) { ops->eventdev_setup = eventdev_setup_internal_port; ops->event_queue_setup = event_queue_setup_internal_port; ops->event_port_setup = event_port_setup_internal_port; + ops->adapter_setup = rx_tx_adapter_setup_internal_port; } -- 2.17.1