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 3C36BA2EFC for ; Mon, 14 Oct 2019 20:23:16 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0FEA11D14D; Mon, 14 Oct 2019 20:23:06 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 1D0631C0CF for ; Mon, 14 Oct 2019 20:23:03 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x9EIK1Bi006624; Mon, 14 Oct 2019 11:23:02 -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=lyO/sxA5D6ik9Bti4SG2Rh+6x3Zez5yOffsVN1SJ65c=; b=MCQt0nEr5N2CN+Z26JF9EGizwM+3Mz4CfSCf9F3DOpT/gdxct/dFJZUbtbLm8FnzxaCU 0xSAsOrxKG1FEdneBV0jufk20vZwxnK9H/MMPa1CoqMfT9qb7U8WnarXRmHmxJxTGZUX 2oWDg+kOhxGqN1+0TIoD3DvYVXTLT1mguOxj2RHPyDvGfo5dUrPo3WeSRyNpcB8aWVz+ qEsuVZUC9/mUH6QKTSevqiLWa1vbuIqtWaiW3c79f7/TxRLy/IcNCtBLiNXXrkFIRVhr LKmHJ5V+t5UQRHfZxxc1hJ9TeMCqqQ25O165pcbXlN7DgrVLWGys6+UkXZ2v/kD3Skg8 Tg== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 2vkc6r7k34-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 14 Oct 2019 11:23:01 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Mon, 14 Oct 2019 11:23:00 -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; Mon, 14 Oct 2019 11:23:00 -0700 Received: from BG-LT7430.marvell.com (pe-lt7585.marvell.com [10.28.17.46]) by maili.marvell.com (Postfix) with ESMTP id A52DC3F703F; Mon, 14 Oct 2019 11:22:56 -0700 (PDT) From: To: , , , Marko Kovacevic , "Ori Kam" , Radu Nicolau , Akhil Goyal , Tomasz Kantecki , "Sunil Kumar Kori" , Pavan Nikhilesh CC: Date: Mon, 14 Oct 2019 23:52:39 +0530 Message-ID: <20191014182247.961-3-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191014182247.961-1-pbhagavatula@marvell.com> References: <20191002205754.11746-1-pbhagavatula@marvell.com> <20191014182247.961-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-14_09:2019-10-11,2019-10-14 signatures=0 Subject: [dpdk-dev] [PATCH v6 02/10] examples/l2fwd-event: add infra for eventdev 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 infra to select event device as a mode to process packets through command line arguments. Also, allow the user to select the schedule type to be RTE_SCHED_TYPE_ORDERED, RTE_SCHED_TYPE_ATOMIC or RTE_SCHED_TYPE_PARALLEL. Usage: `--mode="eventdev"` or `--mode="poll"` `--eventq-sched="ordered"`, `--eventq-sched="atomic"` or `--event-sched=parallel` Signed-off-by: Sunil Kumar Kori Signed-off-by: Pavan Nikhilesh --- examples/l2fwd-event/Makefile | 1 + examples/l2fwd-event/l2fwd_common.h | 4 +++ examples/l2fwd-event/l2fwd_event.c | 34 +++++++++++++++++++ examples/l2fwd-event/l2fwd_event.h | 21 ++++++++++++ examples/l2fwd-event/main.c | 52 +++++++++++++++++++++++++++-- examples/l2fwd-event/meson.build | 1 + 6 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 examples/l2fwd-event/l2fwd_event.c create mode 100644 examples/l2fwd-event/l2fwd_event.h diff --git a/examples/l2fwd-event/Makefile b/examples/l2fwd-event/Makefile index 73f02dd3b..08ba1835d 100644 --- a/examples/l2fwd-event/Makefile +++ b/examples/l2fwd-event/Makefile @@ -8,6 +8,7 @@ APP = l2fwd-event # all source are stored in SRCS-y SRCS-y := main.c SRCS-y += l2fwd_poll.c +SRCS-y += l2fwd_event.c SRCS-y += l2fwd_common.c # Build using pkg-config variables if possible diff --git a/examples/l2fwd-event/l2fwd_common.h b/examples/l2fwd-event/l2fwd_common.h index 0f6101fa5..7ce78da3d 100644 --- a/examples/l2fwd-event/l2fwd_common.h +++ b/examples/l2fwd-event/l2fwd_common.h @@ -65,6 +65,8 @@ struct l2fwd_port_statistics { struct l2fwd_resources { volatile uint8_t force_quit; + uint8_t event_mode; + uint8_t sched_type; uint8_t mac_updating; uint8_t rx_queue_per_lcore; uint16_t nb_rxd; @@ -75,6 +77,7 @@ struct l2fwd_resources { uint32_t dst_ports[RTE_MAX_ETHPORTS]; struct rte_ether_addr eth_addr[RTE_MAX_ETHPORTS]; struct l2fwd_port_statistics port_stats[RTE_MAX_ETHPORTS]; + void *evt_rsrc; void *poll_rsrc; } __rte_cache_aligned; @@ -112,6 +115,7 @@ l2fwd_get_rsrc(void) memset(rsrc, 0, sizeof(struct l2fwd_resources)); rsrc->mac_updating = true; rsrc->rx_queue_per_lcore = 1; + rsrc->sched_type = RTE_SCHED_TYPE_ATOMIC; rsrc->timer_period = 10 * rte_get_timer_hz(); return mz->addr; diff --git a/examples/l2fwd-event/l2fwd_event.c b/examples/l2fwd-event/l2fwd_event.c new file mode 100644 index 000000000..48d32d718 --- /dev/null +++ b/examples/l2fwd-event/l2fwd_event.c @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2019 Marvell International Ltd. + */ + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "l2fwd_event.h" + +void +l2fwd_event_resource_setup(struct l2fwd_resources *rsrc) +{ + struct l2fwd_event_resources *evt_rsrc; + + if (!rte_event_dev_count()) + rte_panic("No Eventdev found\n"); + + evt_rsrc = rte_zmalloc("l2fwd_event", + sizeof(struct l2fwd_event_resources), 0); + if (evt_rsrc == NULL) + rte_panic("Failed to allocate memory\n"); + + rsrc->evt_rsrc = evt_rsrc; +} diff --git a/examples/l2fwd-event/l2fwd_event.h b/examples/l2fwd-event/l2fwd_event.h new file mode 100644 index 000000000..9a1bb1612 --- /dev/null +++ b/examples/l2fwd-event/l2fwd_event.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2019 Marvell International Ltd. + */ + +#ifndef __L2FWD_EVENT_H__ +#define __L2FWD_EVENT_H__ + +#include +#include +#include +#include +#include + +#include "l2fwd_common.h" + +struct l2fwd_event_resources { +}; + +void l2fwd_event_resource_setup(struct l2fwd_resources *rsrc); + +#endif /* __L2FWD_EVENT_H__ */ diff --git a/examples/l2fwd-event/main.c b/examples/l2fwd-event/main.c index 11092b0d6..f60ab0c73 100644 --- a/examples/l2fwd-event/main.c +++ b/examples/l2fwd-event/main.c @@ -2,6 +2,7 @@ * Copyright(C) 2019 Marvell International Ltd. */ +#include "l2fwd_event.h" #include "l2fwd_poll.h" /* display usage */ @@ -16,7 +17,12 @@ l2fwd_event_usage(const char *prgname) " --[no-]mac-updating: Enable or disable MAC addresses updating (enabled by default)\n" " When enabled:\n" " - The source MAC address is replaced by the TX port MAC address\n" - " - The destination MAC address is replaced by 02:00:00:00:00:TX_PORT_ID\n", + " - The destination MAC address is replaced by 02:00:00:00:00:TX_PORT_ID\n" + " --mode: Packet transfer mode for I/O, poll or eventdev\n" + " Default mode = eventdev\n" + " --eventq-sched: Event queue schedule type, ordered, atomic or parallel.\n" + " Default: atomic\n" + " Valid only if --mode=eventdev\n\n", prgname); } @@ -71,6 +77,28 @@ l2fwd_event_parse_timer_period(const char *q_arg) return n; } +static void +l2fwd_event_parse_mode(const char *optarg, + struct l2fwd_resources *rsrc) +{ + if (!strncmp(optarg, "poll", 4)) + rsrc->event_mode = false; + else if (!strncmp(optarg, "eventdev", 8)) + rsrc->event_mode = true; +} + +static void +l2fwd_event_parse_eventq_sched(const char *optarg, + struct l2fwd_resources *rsrc) +{ + if (!strncmp(optarg, "ordered", 7)) + rsrc->sched_type = RTE_SCHED_TYPE_ORDERED; + else if (!strncmp(optarg, "atomic", 6)) + rsrc->sched_type = RTE_SCHED_TYPE_ATOMIC; + else if (!strncmp(optarg, "parallel", 8)) + rsrc->sched_type = RTE_SCHED_TYPE_PARALLEL; +} + static const char short_options[] = "p:" /* portmask */ "q:" /* number of queues */ @@ -79,6 +107,8 @@ static const char short_options[] = #define CMD_LINE_OPT_MAC_UPDATING "mac-updating" #define CMD_LINE_OPT_NO_MAC_UPDATING "no-mac-updating" +#define CMD_LINE_OPT_MODE "mode" +#define CMD_LINE_OPT_EVENTQ_SCHED "eventq-sched" enum { /* long options mapped to a short option */ @@ -87,6 +117,8 @@ enum { * conflict with short options */ CMD_LINE_OPT_MIN_NUM = 256, + CMD_LINE_OPT_MODE_NUM, + CMD_LINE_OPT_EVENTQ_SCHED_NUM, }; /* Parse the argument given in the command line of the application */ @@ -98,6 +130,10 @@ l2fwd_event_parse_args(int argc, char **argv, struct option lgopts[] = { { CMD_LINE_OPT_MAC_UPDATING, no_argument, &mac_updating, 1}, { CMD_LINE_OPT_NO_MAC_UPDATING, no_argument, &mac_updating, 0}, + { CMD_LINE_OPT_MODE, required_argument, NULL, + CMD_LINE_OPT_MODE_NUM}, + { CMD_LINE_OPT_EVENTQ_SCHED, required_argument, NULL, + CMD_LINE_OPT_EVENTQ_SCHED_NUM}, {NULL, 0, 0, 0} }; int opt, ret, timer_secs; @@ -145,6 +181,14 @@ l2fwd_event_parse_args(int argc, char **argv, rsrc->timer_period *= rte_get_timer_hz(); break; + case CMD_LINE_OPT_MODE_NUM: + l2fwd_event_parse_mode(optarg, rsrc); + break; + + case CMD_LINE_OPT_EVENTQ_SCHED_NUM: + l2fwd_event_parse_eventq_sched(optarg, rsrc); + break; + /* long options */ case 0: break; @@ -330,7 +374,11 @@ main(int argc, char **argv) if (!nb_ports_available) rte_panic("All available ports are disabled. Please set portmask.\n"); - l2fwd_poll_resource_setup(rsrc); + /* Configure eventdev parameters if required */ + if (rsrc->event_mode) + l2fwd_event_resource_setup(rsrc); + else + l2fwd_poll_resource_setup(rsrc); /* initialize port stats */ memset(&rsrc->port_stats, 0, diff --git a/examples/l2fwd-event/meson.build b/examples/l2fwd-event/meson.build index c936aa72e..c1ae2037c 100644 --- a/examples/l2fwd-event/meson.build +++ b/examples/l2fwd-event/meson.build @@ -12,4 +12,5 @@ sources = files( 'main.c', 'l2fwd_poll.c', 'l2fwd_common.c', + 'l2fwd_event.c', ) -- 2.17.1