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 184C9A2EDB for ; Wed, 2 Oct 2019 22:58:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1F8381BF8D; Wed, 2 Oct 2019 22:58:22 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id EBFE91BF8D for ; Wed, 2 Oct 2019 22:58:20 +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 x92KsZPd015455; Wed, 2 Oct 2019 13:58:20 -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=oEdJhMfGECt1oa+0MrocYPXcSdBGt83XeQ9XbphlFuY=; b=rrAUVH802jzsrOL/DUEil5mq9E3AyZ8EIYeEzBmN4W2Bz71FRWNXvRKFXL/+Ydnb09Y4 ck5DE1Qn8aV9kEeGZhHFiY2aHZDtAMn0XQC8t0gO7gRFdEK6kgWHVDaJFwYi1vPkXgwS 116W1dAJAZVKh+y6e/ZnQyXmmnIyvx/d+RMMYidt7tYl3JO2VR4qen56kpQ4iOvrnoEP QsLdXLGIzFieeaDff9S39vbRfDwJkk8bnBTwl8oObgRIh+82RcihEv0NPWomJ9VZfoZn A15epTCY1fP1gxV3DICXFCv0UwRyHFOCkLea87RFF/oaoN4X7BqCAd3TvD7Nf7iUsmLa Rg== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0b-0016f401.pphosted.com with ESMTP id 2vd0ya0ksn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 02 Oct 2019 13:58:20 -0700 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 2 Oct 2019 13:58:18 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Wed, 2 Oct 2019 13:58:18 -0700 Received: from BG-LT7430.marvell.com (unknown [10.28.17.68]) by maili.marvell.com (Postfix) with ESMTP id 2A5B23F703F; Wed, 2 Oct 2019 13:58:14 -0700 (PDT) From: To: , , , Marko Kovacevic , Ori Kam , Radu Nicolau , Tomasz Kantecki , Sunil Kumar Kori , "Pavan Nikhilesh" CC: Date: Thu, 3 Oct 2019 02:27:49 +0530 Message-ID: <20191002205754.11746-6-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191002205754.11746-1-pbhagavatula@marvell.com> References: <20190924094209.3827-1-pbhagavatula@marvell.com> <20191002205754.11746-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.95,1.0.8 definitions=2019-10-02_08:2019-10-01,2019-10-02 signatures=0 Subject: [dpdk-dev] [PATCH v5 05/10] examples/l2fwd-event: add eventdev queue and port 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: Sunil Kumar Kori Add event device queue and port setup based on event eth Tx adapter capabilities. Signed-off-by: Sunil Kumar Kori Signed-off-by: Pavan Nikhilesh --- examples/l2fwd-event/l2fwd_event.c | 9 +- examples/l2fwd-event/l2fwd_event.h | 10 ++ examples/l2fwd-event/l2fwd_event_generic.c | 111 ++++++++++++++++++ .../l2fwd-event/l2fwd_event_internal_port.c | 106 +++++++++++++++++ 4 files changed, 235 insertions(+), 1 deletion(-) diff --git a/examples/l2fwd-event/l2fwd_event.c b/examples/l2fwd-event/l2fwd_event.c index 188f06fd2..9b315e5e1 100644 --- a/examples/l2fwd-event/l2fwd_event.c +++ b/examples/l2fwd-event/l2fwd_event.c @@ -45,6 +45,7 @@ void l2fwd_event_resource_setup(struct l2fwd_resources *l2fwd_rsrc) { struct l2fwd_event_resources *event_rsrc; + uint32_t event_queue_cfg; if (!rte_event_dev_count()) rte_exit(EXIT_FAILURE, "No Eventdev found\n"); @@ -60,5 +61,11 @@ l2fwd_event_resource_setup(struct l2fwd_resources *l2fwd_rsrc) l2fwd_event_capability_setup(event_rsrc); /* Event device configuration */ - event_rsrc->ops.event_device_setup(l2fwd_rsrc); + event_queue_cfg = event_rsrc->ops.event_device_setup(l2fwd_rsrc); + + /* Event queue configuration */ + event_rsrc->ops.event_queue_setup(l2fwd_rsrc, event_queue_cfg); + + /* Event port configuration */ + event_rsrc->ops.event_port_setup(l2fwd_rsrc); } diff --git a/examples/l2fwd-event/l2fwd_event.h b/examples/l2fwd-event/l2fwd_event.h index 7ec985ae7..93d254cf3 100644 --- a/examples/l2fwd-event/l2fwd_event.h +++ b/examples/l2fwd-event/l2fwd_event.h @@ -14,27 +14,37 @@ #include "l2fwd_common.h" typedef uint32_t (*event_device_setup_cb)(struct l2fwd_resources *l2fwd_rsrc); +typedef void (*event_port_setup_cb)(struct l2fwd_resources *l2fwd_rsrc); +typedef void (*event_queue_setup_cb)(struct l2fwd_resources *l2fwd_rsrc, + uint32_t event_queue_cfg); struct event_queues { + uint8_t *event_q_id; uint8_t nb_queues; }; struct event_ports { + uint8_t *event_p_id; uint8_t nb_ports; + rte_spinlock_t lock; }; struct event_setup_ops { event_device_setup_cb event_device_setup; + event_queue_setup_cb event_queue_setup; + event_port_setup_cb event_port_setup; }; struct l2fwd_event_resources { uint8_t tx_mode_q; + uint8_t deq_depth; uint8_t has_burst; uint8_t event_d_id; uint8_t disable_implicit_release; struct event_ports evp; struct event_queues evq; struct event_setup_ops ops; + struct rte_event_port_conf def_p_conf; }; void l2fwd_event_resource_setup(struct l2fwd_resources *l2fwd_rsrc); diff --git a/examples/l2fwd-event/l2fwd_event_generic.c b/examples/l2fwd-event/l2fwd_event_generic.c index 2e82c6bdf..6922e2e5e 100644 --- a/examples/l2fwd-event/l2fwd_event_generic.c +++ b/examples/l2fwd-event/l2fwd_event_generic.c @@ -89,8 +89,119 @@ l2fwd_event_device_setup_generic(struct l2fwd_resources *l2fwd_rsrc) return event_queue_cfg; } +static void +l2fwd_event_port_setup_generic(struct l2fwd_resources *l2fwd_rsrc) +{ + struct l2fwd_event_resources *event_rsrc = l2fwd_rsrc->event_rsrc; + uint8_t event_d_id = event_rsrc->event_d_id; + struct rte_event_port_conf event_p_conf = { + .dequeue_depth = 32, + .enqueue_depth = 32, + .new_event_threshold = 4096 + }; + struct rte_event_port_conf def_p_conf; + uint8_t event_p_id; + int32_t ret; + + event_rsrc->evp.event_p_id = (uint8_t *)malloc(sizeof(uint8_t) * + event_rsrc->evp.nb_ports); + if (!event_rsrc->evp.event_p_id) + rte_exit(EXIT_FAILURE, " No space is available"); + + memset(&def_p_conf, 0, sizeof(struct rte_event_port_conf)); + rte_event_port_default_conf_get(event_d_id, 0, &def_p_conf); + + if (def_p_conf.new_event_threshold < event_p_conf.new_event_threshold) + event_p_conf.new_event_threshold = + def_p_conf.new_event_threshold; + + if (def_p_conf.dequeue_depth < event_p_conf.dequeue_depth) + event_p_conf.dequeue_depth = def_p_conf.dequeue_depth; + + if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) + event_p_conf.enqueue_depth = def_p_conf.enqueue_depth; + + event_p_conf.disable_implicit_release = + event_rsrc->disable_implicit_release; + event_rsrc->deq_depth = def_p_conf.dequeue_depth; + + for (event_p_id = 0; event_p_id < event_rsrc->evp.nb_ports; + event_p_id++) { + ret = rte_event_port_setup(event_d_id, event_p_id, + &event_p_conf); + if (ret < 0) { + rte_exit(EXIT_FAILURE, + "Error in configuring event port %d\n", + event_p_id); + } + + ret = rte_event_port_link(event_d_id, event_p_id, + event_rsrc->evq.event_q_id, + NULL, + event_rsrc->evq.nb_queues - 1); + if (ret != (event_rsrc->evq.nb_queues - 1)) { + rte_exit(EXIT_FAILURE, "Error in linking event port %d " + "to event queue", event_p_id); + } + event_rsrc->evp.event_p_id[event_p_id] = event_p_id; + } + /* init spinlock */ + rte_spinlock_init(&event_rsrc->evp.lock); + + event_rsrc->def_p_conf = event_p_conf; +} + +static void +l2fwd_event_queue_setup_generic(struct l2fwd_resources *l2fwd_rsrc, + uint32_t event_queue_cfg) +{ + struct l2fwd_event_resources *event_rsrc = l2fwd_rsrc->event_rsrc; + uint8_t event_d_id = event_rsrc->event_d_id; + struct rte_event_queue_conf event_q_conf = { + .nb_atomic_flows = 1024, + .nb_atomic_order_sequences = 1024, + .event_queue_cfg = event_queue_cfg, + .priority = RTE_EVENT_DEV_PRIORITY_NORMAL + }; + struct rte_event_queue_conf def_q_conf; + uint8_t event_q_id; + int32_t ret; + + event_q_conf.schedule_type = l2fwd_rsrc->sched_type; + event_rsrc->evq.event_q_id = (uint8_t *)malloc(sizeof(uint8_t) * + event_rsrc->evq.nb_queues); + if (!event_rsrc->evq.event_q_id) + rte_exit(EXIT_FAILURE, "Memory allocation failure"); + + rte_event_queue_default_conf_get(event_d_id, 0, &def_q_conf); + if (def_q_conf.nb_atomic_flows < event_q_conf.nb_atomic_flows) + event_q_conf.nb_atomic_flows = def_q_conf.nb_atomic_flows; + + for (event_q_id = 0; event_q_id < (event_rsrc->evq.nb_queues - 1); + event_q_id++) { + ret = rte_event_queue_setup(event_d_id, event_q_id, + &event_q_conf); + if (ret < 0) { + rte_exit(EXIT_FAILURE, + "Error in configuring event queue"); + } + event_rsrc->evq.event_q_id[event_q_id] = event_q_id; + } + + event_q_conf.event_queue_cfg |= RTE_EVENT_QUEUE_CFG_SINGLE_LINK; + event_q_conf.priority = RTE_EVENT_DEV_PRIORITY_HIGHEST, + ret = rte_event_queue_setup(event_d_id, event_q_id, &event_q_conf); + if (ret < 0) { + rte_exit(EXIT_FAILURE, + "Error in configuring event queue for Tx adapter"); + } + event_rsrc->evq.event_q_id[event_q_id] = event_q_id; +} + void l2fwd_event_set_generic_ops(struct event_setup_ops *ops) { ops->event_device_setup = l2fwd_event_device_setup_generic; + ops->event_queue_setup = l2fwd_event_queue_setup_generic; + ops->event_port_setup = l2fwd_event_port_setup_generic; } diff --git a/examples/l2fwd-event/l2fwd_event_internal_port.c b/examples/l2fwd-event/l2fwd_event_internal_port.c index f95b1762a..6e3c1da5b 100644 --- a/examples/l2fwd-event/l2fwd_event_internal_port.c +++ b/examples/l2fwd-event/l2fwd_event_internal_port.c @@ -91,8 +91,114 @@ l2fwd_event_device_setup_internal_port(struct l2fwd_resources *l2fwd_rsrc) return event_queue_cfg; } +static void +l2fwd_event_port_setup_internal_port(struct l2fwd_resources *l2fwd_rsrc) +{ + struct l2fwd_event_resources *event_rsrc = l2fwd_rsrc->event_rsrc; + uint8_t event_d_id = event_rsrc->event_d_id; + struct rte_event_port_conf event_p_conf = { + .dequeue_depth = 32, + .enqueue_depth = 32, + .new_event_threshold = 4096 + }; + struct rte_event_port_conf def_p_conf; + uint8_t event_p_id; + int32_t ret; + + event_rsrc->evp.event_p_id = (uint8_t *)malloc(sizeof(uint8_t) * + event_rsrc->evp.nb_ports); + if (!event_rsrc->evp.event_p_id) + rte_exit(EXIT_FAILURE, + "Failed to allocate memory for Event Ports"); + + rte_event_port_default_conf_get(event_d_id, 0, &def_p_conf); + if (def_p_conf.new_event_threshold < event_p_conf.new_event_threshold) + event_p_conf.new_event_threshold = + def_p_conf.new_event_threshold; + + if (def_p_conf.dequeue_depth < event_p_conf.dequeue_depth) + event_p_conf.dequeue_depth = def_p_conf.dequeue_depth; + + if (def_p_conf.enqueue_depth < event_p_conf.enqueue_depth) + event_p_conf.enqueue_depth = def_p_conf.enqueue_depth; + + event_p_conf.disable_implicit_release = + event_rsrc->disable_implicit_release; + + for (event_p_id = 0; event_p_id < event_rsrc->evp.nb_ports; + event_p_id++) { + ret = rte_event_port_setup(event_d_id, event_p_id, + &event_p_conf); + if (ret < 0) { + rte_exit(EXIT_FAILURE, + "Error in configuring event port %d\n", + event_p_id); + } + + ret = rte_event_port_link(event_d_id, event_p_id, NULL, + NULL, 0); + if (ret < 0) { + rte_exit(EXIT_FAILURE, "Error in linking event port %d " + "to event queue", event_p_id); + } + event_rsrc->evp.event_p_id[event_p_id] = event_p_id; + + /* init spinlock */ + rte_spinlock_init(&event_rsrc->evp.lock); + } + + event_rsrc->def_p_conf = event_p_conf; +} + +static void +l2fwd_event_queue_setup_internal_port(struct l2fwd_resources *l2fwd_rsrc, + uint32_t event_queue_cfg) +{ + struct l2fwd_event_resources *event_rsrc = l2fwd_rsrc->event_rsrc; + uint8_t event_d_id = event_rsrc->event_d_id; + struct rte_event_queue_conf event_q_conf = { + .nb_atomic_flows = 1024, + .nb_atomic_order_sequences = 1024, + .event_queue_cfg = event_queue_cfg, + .priority = RTE_EVENT_DEV_PRIORITY_NORMAL + }; + struct rte_event_queue_conf def_q_conf; + uint8_t event_q_id = 0; + int32_t ret; + + rte_event_queue_default_conf_get(event_d_id, event_q_id, &def_q_conf); + + if (def_q_conf.nb_atomic_flows < event_q_conf.nb_atomic_flows) + event_q_conf.nb_atomic_flows = def_q_conf.nb_atomic_flows; + + if (def_q_conf.nb_atomic_order_sequences < + event_q_conf.nb_atomic_order_sequences) + event_q_conf.nb_atomic_order_sequences = + def_q_conf.nb_atomic_order_sequences; + + event_q_conf.event_queue_cfg = event_queue_cfg; + event_q_conf.schedule_type = l2fwd_rsrc->sched_type; + event_rsrc->evq.event_q_id = (uint8_t *)malloc(sizeof(uint8_t) * + event_rsrc->evq.nb_queues); + if (!event_rsrc->evq.event_q_id) + rte_exit(EXIT_FAILURE, "Memory allocation failure"); + + for (event_q_id = 0; event_q_id < event_rsrc->evq.nb_queues; + event_q_id++) { + ret = rte_event_queue_setup(event_d_id, event_q_id, + &event_q_conf); + if (ret < 0) { + rte_exit(EXIT_FAILURE, + "Error in configuring event queue"); + } + event_rsrc->evq.event_q_id[event_q_id] = event_q_id; + } +} + void l2fwd_event_set_internal_port_ops(struct event_setup_ops *ops) { ops->event_device_setup = l2fwd_event_device_setup_internal_port; + ops->event_queue_setup = l2fwd_event_queue_setup_internal_port; + ops->event_port_setup = l2fwd_event_port_setup_internal_port; } -- 2.17.1