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 77D2AA2EFC for ; Thu, 19 Sep 2019 11:26:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 715891ECED; Thu, 19 Sep 2019 11:26:27 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 1F7341EC62 for ; Thu, 19 Sep 2019 11:26:26 +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 x8J9PaXS027666; Thu, 19 Sep 2019 02:26:25 -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=hkrxcdjbsvQcN3JwllrzShWdQKDvJevKl7mKO8SKVR0=; b=F3kn4TmBiT1zrYgO5iV1cXh4xiPRXKVFFTjxRqs0ouXzFnQLT/J4Ot0jaWQwfjqgQet7 caaFR07AiEju84EmlTG2vVlJvOYk/njs2UBUZjQch+Ds+AE+nDMpM4+C8zRq3kMtsEla wYGq7ngjBKiOJrhxXTyZy1SSA2oSUDounD5AQhvBYmk+0GSwkFHnTpgfQXcHhCw6Kufq 2IkqzfFE8uGU44TkSXQDTcrdobclTBKAiTpTbS6U4+NmOjLTJ3ugmH7l47EZsmtfu0ra B0WFyBdDqFEoHHAGcT1pxEGcJ728RFSaqxWrSmKqaJlkaTa95C79jERHU/2nutFTd6dF xw== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0b-0016f401.pphosted.com with ESMTP id 2v3vcfj5wn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 19 Sep 2019 02:26:25 -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:23 -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:23 -0700 Received: from BG-LT7430.marvell.com (unknown [10.28.17.12]) by maili.marvell.com (Postfix) with ESMTP id 6D7E23F7040; Thu, 19 Sep 2019 02:26:20 -0700 (PDT) From: To: , , , Marko Kovacevic , Ori Kam , Radu Nicolau , Tomasz Kantecki , Sunil Kumar Kori , "Pavan Nikhilesh" CC: Date: Thu, 19 Sep 2019 14:55:58 +0530 Message-ID: <20190919092603.5485-5-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 04/10] examples/l2fwd-event: add eth port setup 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: Sunil Kumar Kori Add ethernet port Rx/Tx queue setup for event device which are later used for setting up event eth Rx/Tx adapters. Signed-off-by: Sunil Kumar Kori --- examples/l2fwd-event/l2fwd_eventdev.c | 114 ++++++++++++++++++++++++++ examples/l2fwd-event/l2fwd_eventdev.h | 1 + examples/l2fwd-event/main.c | 17 ++++ 3 files changed, 132 insertions(+) diff --git a/examples/l2fwd-event/l2fwd_eventdev.c b/examples/l2fwd-event/l2fwd_eventdev.c index df76f1c1f..0d0d3b8b9 100644 --- a/examples/l2fwd-event/l2fwd_eventdev.c +++ b/examples/l2fwd-event/l2fwd_eventdev.c @@ -18,6 +18,14 @@ #include "l2fwd_common.h" #include "l2fwd_eventdev.h" +static void +print_ethaddr(const char *name, const struct rte_ether_addr *eth_addr) +{ + char buf[RTE_ETHER_ADDR_FMT_SIZE]; + rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, eth_addr); + printf("%s%s", name, buf); +} + static void parse_mode(const char *optarg) { @@ -76,6 +84,108 @@ parse_eventdev_args(char **argv, int argc) return 0; } +static void +eth_dev_port_setup(uint16_t ethdev_count __rte_unused) +{ + struct eventdev_resources *eventdev_rsrc = get_eventdev_rsrc(); + static struct rte_eth_conf port_config = { + .rxmode = { + .mq_mode = ETH_MQ_RX_RSS, + .max_rx_pkt_len = RTE_ETHER_MAX_LEN, + .split_hdr_size = 0, + .offloads = DEV_RX_OFFLOAD_CHECKSUM + }, + .rx_adv_conf = { + .rss_conf = { + .rss_key = NULL, + .rss_hf = ETH_RSS_IP, + } + }, + .txmode = { + .mq_mode = ETH_MQ_TX_NONE, + } + }; + struct rte_eth_conf local_port_conf; + struct rte_eth_dev_info dev_info; + struct rte_eth_txconf txconf; + struct rte_eth_rxconf rxconf; + uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT; + uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT; + uint16_t port_id; + int32_t ret; + + /* initialize all ports */ + RTE_ETH_FOREACH_DEV(port_id) { + local_port_conf = port_config; + /* skip ports that are not enabled */ + if ((eventdev_rsrc->port_mask & (1 << port_id)) == 0) { + printf("\nSkipping disabled port %d\n", port_id); + continue; + } + + /* init port */ + printf("Initializing port %d ... ", port_id); + fflush(stdout); + rte_eth_dev_info_get(port_id, &dev_info); + if (dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE) + local_port_conf.txmode.offloads |= + DEV_TX_OFFLOAD_MBUF_FAST_FREE; + + local_port_conf.rx_adv_conf.rss_conf.rss_hf &= + dev_info.flow_type_rss_offloads; + if (local_port_conf.rx_adv_conf.rss_conf.rss_hf != + port_config.rx_adv_conf.rss_conf.rss_hf) { + printf("Port %u modified RSS hash function " + "based on hardware support," + "requested:%#"PRIx64" configured:%#"PRIx64"\n", + port_id, + port_config.rx_adv_conf.rss_conf.rss_hf, + local_port_conf.rx_adv_conf.rss_conf.rss_hf); + } + + ret = rte_eth_dev_configure(port_id, 1, 1, &local_port_conf); + if (ret < 0) + rte_exit(EXIT_FAILURE, + "Cannot configure device: err=%d, port=%d\n", + ret, port_id); + + ret = rte_eth_dev_adjust_nb_rx_tx_desc(port_id, &nb_rxd, + &nb_txd); + if (ret < 0) + rte_exit(EXIT_FAILURE, + "Cannot adjust number of descriptors: err=%d, " + "port=%d\n", ret, port_id); + + rte_eth_macaddr_get(port_id, + &eventdev_rsrc->ports_eth_addr[port_id]); + print_ethaddr(" Address:", + &eventdev_rsrc->ports_eth_addr[port_id]); + printf("\n"); + + + /* init one Rx queue per port */ + rxconf = dev_info.default_rxconf; + rxconf.offloads = local_port_conf.rxmode.offloads; + ret = rte_eth_rx_queue_setup(port_id, 0, nb_rxd, 0, &rxconf, + eventdev_rsrc->pkt_pool); + if (ret < 0) + rte_exit(EXIT_FAILURE, + "rte_eth_rx_queue_setup: err=%d, " + "port=%d\n", ret, port_id); + + /* init one Tx queue per port */ + txconf = dev_info.default_txconf; + txconf.offloads = local_port_conf.txmode.offloads; + ret = rte_eth_tx_queue_setup(port_id, 0, nb_txd, 0, &txconf); + if (ret < 0) + rte_exit(EXIT_FAILURE, + "rte_eth_tx_queue_setup: err=%d, " + "port=%d\n", ret, port_id); + + rte_eth_promiscuous_enable(port_id); + } +} + static void eventdev_capability_setup(void) { @@ -105,6 +215,7 @@ void eventdev_resource_setup(void) { struct eventdev_resources *eventdev_rsrc = get_eventdev_rsrc(); + uint16_t ethdev_count = rte_eth_dev_count_avail(); uint32_t service_id; int32_t ret; @@ -119,6 +230,9 @@ eventdev_resource_setup(void) /* Setup eventdev capability callbacks */ eventdev_capability_setup(); + /* Ethernet device configuration */ + eth_dev_port_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 717f688ce..cc0bdd1ad 100644 --- a/examples/l2fwd-event/l2fwd_eventdev.h +++ b/examples/l2fwd-event/l2fwd_eventdev.h @@ -51,6 +51,7 @@ struct eventdev_resources { uint8_t enabled; uint8_t nb_args; char **args; + struct rte_ether_addr ports_eth_addr[RTE_MAX_ETHPORTS]; }; static inline struct eventdev_resources * diff --git a/examples/l2fwd-event/main.c b/examples/l2fwd-event/main.c index 661f0833f..f24bdd4a4 100644 --- a/examples/l2fwd-event/main.c +++ b/examples/l2fwd-event/main.c @@ -602,6 +602,22 @@ main(int argc, char **argv) /* Configure eventdev parameters if user has requested */ eventdev_resource_setup(); + if (eventdev_rsrc->enabled) { + /* All settings are done. Now enable eth devices */ + RTE_ETH_FOREACH_DEV(portid) { + /* skip ports that are not enabled */ + if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) + continue; + + ret = rte_eth_dev_start(portid); + if (ret < 0) + rte_exit(EXIT_FAILURE, + "rte_eth_dev_start:err=%d, port=%u\n", + ret, portid); + } + + goto skip_port_config; + } /* Initialize the port/queue configuration of each logical core */ RTE_ETH_FOREACH_DEV(portid) { @@ -733,6 +749,7 @@ main(int argc, char **argv) "All available ports are disabled. Please set portmask.\n"); } +skip_port_config: check_all_ports_link_status(l2fwd_enabled_port_mask); ret = 0; -- 2.17.1