From patchwork Thu Jun 14 11:48:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anoob Joseph X-Patchwork-Id: 41129 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 122821E424; Thu, 14 Jun 2018 13:50:19 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0076.outbound.protection.outlook.com [104.47.36.76]) by dpdk.org (Postfix) with ESMTP id 285701E3DB for ; Thu, 14 Jun 2018 13:50:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FYxO0GKA5R57ctOIUuMh/+ButdOn18MKlezRw5Qn0Bw=; b=bYblvJvk/haVJYjsfUp/WvRz24OjfbfjGh1nGf2nwW6OBhP5eWmlHuYLAYRDKYNdB81lNxUeJzMuR6fVDArzounaOj0o7VoEmpTH6Udpk8OE27UnZWsyvSvS1lOsIBscII5faB+aExngfb/HC+enKMy5kcvcO58zsCizx0g2mMA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Anoob.Joseph@cavium.com; Received: from ajoseph83.caveonetworks.com.caveonetworks.com (115.113.156.2) by BN7PR07MB4898.namprd07.prod.outlook.com (2603:10b6:406:ef::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.16; Thu, 14 Jun 2018 11:50:10 +0000 From: Anoob Joseph To: Bruce Richardson , Pablo de Lara Cc: Anoob Joseph , Jerin Jacob , Narayana Prasad , dev@dpdk.org Date: Thu, 14 Jun 2018 17:18:58 +0530 Message-Id: <1528976946-14396-8-git-send-email-anoob.joseph@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528976946-14396-1-git-send-email-anoob.joseph@caviumnetworks.com> References: <1528477766-15788-1-git-send-email-anoob.joseph@caviumnetworks.com> <1528976946-14396-1-git-send-email-anoob.joseph@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [115.113.156.2] X-ClientProxiedBy: PN1PR01CA0095.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00::11) To BN7PR07MB4898.namprd07.prod.outlook.com (2603:10b6:406:ef::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba53a883-941e-4968-8738-08d5d1ecfcff X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(711020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:BN7PR07MB4898; X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4898; 3:kkQIfoHKbJKnGhCieaOglOPUu6uko6GZf0nQuTi/Fbl3gMAoX/8AL9/j7pVeuIdZNxSGacZlqPHEhrXHuiABuY5PD1bnKiW0bjh7MD041fJxNqCBe81ofP6aB2PDwtREKr1pHw1jsorYoomHuY8LSX1LmsfHNdBBLfhAWl+4FFdGqDDgpOyzO7mLftQ5tTP6vnEuDkAGALqez7mjDco6O14SGf1lQLeuhwTm3YM6nxf6ysSWZXn32dQTo+Zu0pCu; 25:xTV8yzWoZXJPH1YOrigpWFh5BwgbeJH+uoI56BEsySAeBU9S68ioDI4ApVredimpy0f+Nd3Pbd2vzlAbg8ShSOn2oRil3YvExy0zRUe1VYYtbG6Fp4vMJib36mG60mB0/yCRYn3nGZkMJq6voBBVY5FDIzIkCAJZ+Jn7sYLcBDOnmns+14tLu86qSC5rfM/xHqmiGLp6H2nSvi2KlxJMWLnPsSjr8X3dPADR8f3uH2StQSJF2ILlTj2gRtioQZMwU1jZw+9LrS54W/aSPaxne8cXVp9BWOmserzlVEwchsEGX4y7Tu5PtDPoXWdSGygRt5IzMrtRKcc/dBT+ZAL9XQ==; 31:Bb+596c9rMFlJR79eQVaUmHtuEbjTi4cAfAurrMJ2k5ylVNZ5WlzvTy2ryWJOK1gLu6p+iaYVK+Qd9ZVDpTl1JFvDYo0HyPPtqsG7jiyRXKrO7ySpsJGx3wl17h8ma7HofaPOL5ooSrz8hBd/UH0T85kvXe8BUJTRKsWe5tuDPjd3/rcR+1TiZ5+NVAuYRy9x516f/2fCfrTGb33IqfqTnwn4BBgFbdtaQL1l9X/+WY= X-MS-TrafficTypeDiagnostic: BN7PR07MB4898: X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4898; 20:x+F3gg8PLSAJn3jpL7P1EtPQ3j6dDk8TFsmUYquYuiEy2N+Q5LOOF0G36tJiyBskewX43zjZ2uuVTrXBBjPaSYCpA3uYF5AQVLGFGuwx1ojsdr9xHdQqcHIRTy3Mxz9HT0Df14mE1tYxAqRJfXGxkMmPyTd1zayv7xOmgqV8CqMdFI9vHpZjInUQJM5GCBas3Xmk5gMBzDHbWP4qhRR8pUKM5vUCj6/e5brVFCgMGDOPtpzcnLFRAngVH3WU1aqHGfawIqTpm8iHnctYy8j6/Ee7GmbA3S0IBTs4Bj6WHSHiVPdFc+neef2XylwQMgQlDzfgC+7EwOUOssbHiezyp0GwYPFQvhZmUaJ4MPetJpZPAqKXsN697e3yiWF1p4A+w0A35Y6U0B7rk9Inml0B25nuva5T6FLB7T4AOMhUCgmJ3Rug/oWAIbVLnPQTFqC+7UpYfOrquOIRrd8U3M9lPuf6M+wNtgCGtPb4S7cXJh56jfMi+ztZhGBH+Tpq9LlVbZsgq/FAzE0tGbBzgsle95OhniseacqjnUgnTrEtJfEehPl6PKEAGYZtBnRDKC5Ijw8M85iuqYF0TeWyFTntl9hZFREsPBFIgBUOvdL9xr8=; 4:ja316709ILRO5rtOexde9Kad99MxqlW80U4jIofxD9eeu4gMcTimvGmFhIai3AzoLxxM7C3AHSYixFfWG2WkRE99799m4YjDedz6+DRgpMpL7yGc/V49wO00A8gYVDtGtYYmUYO+ER6io++g35T1KuhBXgJpF2q+LNVzr0IX1Pv//2tbOvR1Tr3UIrzwh0qSIVygwC7i5NJ8p5wKMmB6CIrvtClsFLk8vWThxuk1eNhE7SkhX23l7TtsfEQXUQBd37yHvbPKzxzsSusMEhMQFg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(3231254)(944501410)(52105095)(93006095)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:BN7PR07MB4898; BCL:0; PCL:0; RULEID:; SRVR:BN7PR07MB4898; X-Forefront-PRVS: 0703B549E4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(39380400002)(396003)(376002)(346002)(366004)(199004)(189003)(446003)(956004)(2616005)(305945005)(6666003)(47776003)(476003)(54906003)(44832011)(53936002)(68736007)(486006)(110136005)(8936002)(8676002)(81156014)(16586007)(316002)(81166006)(25786009)(4326008)(7736002)(6116002)(3846002)(11346002)(97736004)(36756003)(106356001)(478600001)(105586002)(42882007)(52116002)(51416003)(26005)(16526019)(186003)(59450400001)(50226002)(66066001)(72206003)(6486002)(2906002)(55236004)(50466002)(6512007)(386003)(6506007)(5660300001)(76176011)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN7PR07MB4898; H:ajoseph83.caveonetworks.com.caveonetworks.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN7PR07MB4898; 23:rmy7J0TjFmeiJFPw5B+gYHN7upkpRd71cq04I8vcd?= Fo/f2HQqoOuNPc4Wt3mvtb/8g71a2mez+7GR2d13X6y4rpQ+9wq20gluOGQ+I+HRcn+ryO0a3pb8aVpwJaVho3pwXKuXKaS54QxXn4hYaYOA6YSKTWN5Ymgm1x+Q9LMnOrz5laFCRvztpa4Z0FFZpeTArzBZO+0DM8iA3feeDR/7ouhSY/9ptj6KSeBQNjNdTtfho+QJby78JEsa4oqC3OLWpznBSLIn2UVqAzasDA23Ii6KaWPugqIbq+2Bx9AWvCyr25RlpItM4LF4BzTckzh7i0aY+W0+5DCBkOJeRHtaIn9rrSUyRrtYkN47DKGX8IES2HTqQaeVq8eHJWJOM+znAfLR3o/90CXk26d4Q+eDVLUbZRMOHpPOqFtF/A6PM7bDfSaivw128/4yyGB7axcHT5yL3sbk3Iecpdj2ADUTdJ1YJWeUwv2XugXf2n0GhAi+IAa+2DWTQI4Y1MySktKjpznLNS5bkRWUNFeuH4aagfw8s8WgxaQhwFAJRMo8BdAC1elLPoNDyoOhDG757F9ujwzx7GkCmlNysWDbRMqilA/HMV1yfDx3fRI7Q1kVkjjC8opjQpMr5VCLJDiom726KzSmB96cTn9kp3I2ym0nUO5H5AQSExijMX6PC3uA2sK+UM7CBfalvsVayo/7bYQXHUKZge9UZRVuVOnVMsoXfmfbiRpCJhWxpPVO6rpt7wxyj9j3llxRZxZnIROFydC9WgsvjqwJA8BcAn+MOqqP81xe8cOcf45Gjae2PiFNOD7KmAn1IGBsEyDE36vVgkDhiyUKrb9Y5LqZOkYoWiUaVFoMv191yPcK8PTlvmbDGleTuOTMoOU2NBvNdRva6XeNX1WiOqQQS2KzygmRNOhCH9dXuHEXfqhFjWvqKN3zR6nlPMZ9phrxc9psrfihhYAOrHE1Rr3pgsoYDUrVfLo25o8Nd7Ya6D2EyOtAegOo2J2IZv5mT1TG9tjjOnMyONu8DDdcxZMmH5bzT9Eb8wKbA1MMPM+DGsxOHg1JSMaEBQxNu1N56bTivWxMdeXvYGdvJVkUggPGNu3pWuZqR7XSdohLWy4KbDdg3QlAKy0lwBUiPiowUoEJXJlvz0nbzLz9ujjDbJ8IsQXvKn0VZYKJ8t3g5A0lAHGO3omeiIDkOJoIrTfa8jgnoRkqpcT3lZ28kUuE7PEfmYoGTpCXBGS5/HLHDuDkhHUrzFNoEDeOSt5/mMuy5AyHlLSwLA6jHZDaJj4j6KllqW7PpxYlOXw6A== X-Microsoft-Antispam-Message-Info: cyinV+OTvTiFxd5x6rHbWOgg5odDkP0WXKogM0+8DvGtVCDKc8BVwHjA8kkX5TQW+vDbDxmvMU9yGGaUssE3ZlNbF/UwS3yAgqA8viVzNykQh8sfwEnh5D1OOZFx9N8Viau78vgtZIUAfiwcDenPgqtVDqEAm4EQFhLCkOOw+vhZSi1zUnK1zaw7+lX9kzhs X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4898; 6:FqwpDKPboiPOtOngSCvpeLhGYZqi0kVvpZrXNBss9J+xL9dpLov5TaC2UIqVPC++yUHIUfdxOkURV7o7R7uOp7Kn7ML+um6a6Wn8zorDDcMvJN/qrtsq8huOsOx2ys8Kt4gJQ7I4rmwiyjurjoV/3kdTJdxakrfonMpyPyNPOccSbrmmPhmoRwo5YOgje1G2hoYhDxQ5bFPdetYczMDtbdAxuIXxCna4L8ej17h1Qa2leUhWTYBJ+lrollSeQVCEeg+rzIpAQ6tuBM9NzL+C61u4G6mxI0vjffuKONcnkooYxuqdufL2teK1GKwqOOgXXEWvzV0+buU4Q35FS7KSJyklHtI9X8iLvfU2hyQVrAGBLs+a9Wl9q5GrTNGdQew9X5NIjDIb2qmGNOq9odYib+gWQX8mpzXHNHg7woxlEM5leccRM/cHAJ3zrGVCdl0S0cyqjoPevEu/Gv2EPFW8xA==; 5:FHyeJEfn+9CEHC6rPBbF6Nb9gD3aUgKlFjF6UlSqBZN2rLt1FrlirG9VZN5vlDSmBPBe093ofDCinLfSiliwL+R6ToRc+Ora8hvglsxe35NH/68jM5Knff8nOEWgKyvpNv6jNtohq74T2AhGl6q1P9c00XgLd443lxSLc1/Xwc0=; 24:TwCy0MVuO3dJESXwIiv9N2k7XPJS56Se5b41z+ZGe7bvmGlqdfDUc++qza70cUmqgP46jhnA9iXCvSlFknw/cWbHpIJYogUBr3x9eDryLn4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN7PR07MB4898; 7:4AjEGAtmpukRBFy6KPnoLsAPtbwEof+QeHZcFmgryjx0crTLVtZk3DNUI/46b016kNXLjRc2Chb12VpehDOx6kidAARQ3dpbZDQV7f2Feheq3bXM7fDHWzHdlDhiBngIyWaS3yIVsOsHq3ucngOXOsz9sbxxz0scPyfAeFn1RfWNOb0Nn5OIv8j3Wr/KKuoUB9qlzebPI4bVV7XNDUkk7j88rPMp9yZVaaRf5uhXe7GDXgnqT/tDwUzT3xzf1ApH X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2018 11:50:10.8850 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba53a883-941e-4968-8738-08d5d1ecfcff X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR07MB4898 Subject: [dpdk-dev] [PATCH v1 07/15] examples/l2fwd: move dataplane code to new file 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" Signed-off-by: Anoob Joseph --- v1: * Replaced 'unsigned' with 'unsigned int' examples/l2fwd/Makefile | 1 + examples/l2fwd/l2fwd_worker.c | 233 ++++++++++++++++++++++++++++++++++++++++++ examples/l2fwd/l2fwd_worker.h | 10 ++ examples/l2fwd/main.c | 191 +--------------------------------- 4 files changed, 245 insertions(+), 190 deletions(-) create mode 100644 examples/l2fwd/l2fwd_worker.c create mode 100644 examples/l2fwd/l2fwd_worker.h diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile index a8a47ad..24d1e4e 100644 --- a/examples/l2fwd/Makefile +++ b/examples/l2fwd/Makefile @@ -6,6 +6,7 @@ APP = l2fwd # all source are stored in SRCS-y SRCS-y := main.c +SRCS-y += l2fwd_worker.c # Build using pkg-config variables if possible $(shell pkg-config --exists libdpdk) diff --git a/examples/l2fwd/l2fwd_worker.c b/examples/l2fwd/l2fwd_worker.c new file mode 100644 index 0000000..663c505 --- /dev/null +++ b/examples/l2fwd/l2fwd_worker.c @@ -0,0 +1,233 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2016 Intel Corporation + * Copyright(c) 2018 Cavium, Inc + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "l2fwd_common.h" +#include "l2fwd_worker.h" + +/* Print out statistics on packets dropped */ +static void +print_stats(void) +{ + uint64_t total_packets_dropped, total_packets_tx, total_packets_rx; + unsigned int portid; + + total_packets_dropped = 0; + total_packets_tx = 0; + total_packets_rx = 0; + + const char clr[] = { 27, '[', '2', 'J', '\0' }; + const char topLeft[] = { 27, '[', '1', ';', '1', 'H', '\0' }; + + /* Clear screen and move to top left */ + printf("%s%s", clr, topLeft); + + printf("\nPort statistics ===================================="); + + for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) { + /* skip disabled ports */ + if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) + continue; + printf("\nStatistics for port %u ------------------------------" + "\nPackets sent: %24"PRIu64 + "\nPackets received: %20"PRIu64 + "\nPackets dropped: %21"PRIu64, + portid, + port_statistics[portid].tx, + port_statistics[portid].rx, + port_statistics[portid].dropped); + + total_packets_dropped += port_statistics[portid].dropped; + total_packets_tx += port_statistics[portid].tx; + total_packets_rx += port_statistics[portid].rx; + } + printf("\nAggregate statistics ===============================" + "\nTotal packets sent: %18"PRIu64 + "\nTotal packets received: %14"PRIu64 + "\nTotal packets dropped: %15"PRIu64, + total_packets_tx, + total_packets_rx, + total_packets_dropped); + printf("\n====================================================\n"); +} + +static void +l2fwd_mac_updating(struct rte_mbuf *m, unsigned int dest_portid) +{ + struct ether_hdr *eth; + void *tmp; + + eth = rte_pktmbuf_mtod(m, struct ether_hdr *); + + /* 02:00:00:00:00:xx */ + tmp = ð->d_addr.addr_bytes[0]; + *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dest_portid << 40); + + /* src addr */ + ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], ð->s_addr); +} + +static void +l2fwd_simple_forward(struct rte_mbuf *m, unsigned int portid) +{ + unsigned int dst_port; + int sent; + struct rte_eth_dev_tx_buffer *buffer; + + dst_port = l2fwd_dst_ports[portid]; + + if (mac_updating) + l2fwd_mac_updating(m, dst_port); + + buffer = tx_buffer[dst_port]; + sent = rte_eth_tx_buffer(dst_port, 0, buffer, m); + if (sent) + port_statistics[dst_port].tx += sent; +} + +/* main processing loop */ +static void +l2fwd_main_loop(void) +{ + struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; + struct rte_mbuf *m; + int sent; + unsigned int lcore_id; + unsigned int master_core_id; + uint64_t prev_tsc, diff_tsc, cur_tsc, timer_tsc; + unsigned int i, j, portid, nb_rx; + struct lcore_queue_conf *qconf; + const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) + / US_PER_S * BURST_TX_DRAIN_US; + struct rte_eth_dev_tx_buffer *buffer; + + prev_tsc = 0; + timer_tsc = 0; + + lcore_id = rte_lcore_id(); + qconf = &lcore_queue_conf[lcore_id]; + + if (qconf->n_rx_port == 0) { + RTE_LOG(INFO, L2FWD, "lcore %u has nothing to do\n", lcore_id); + return; + } + + RTE_LOG(INFO, L2FWD, "entering main loop on lcore %u\n", lcore_id); + + for (i = 0; i < qconf->n_rx_port; i++) { + + portid = qconf->rx_port_list[i]; + RTE_LOG(INFO, L2FWD, " -- lcoreid=%u portid=%u\n", lcore_id, + portid); + + } + + master_core_id = rte_get_master_lcore(); + + while (!force_quit) { + + cur_tsc = rte_rdtsc(); + + /* + * TX burst queue drain + */ + diff_tsc = cur_tsc - prev_tsc; + if (unlikely(diff_tsc > drain_tsc)) { + + for (i = 0; i < qconf->n_rx_port; i++) { + + portid = + l2fwd_dst_ports[qconf->rx_port_list[i]]; + buffer = tx_buffer[portid]; + + sent = rte_eth_tx_buffer_flush(portid, 0, + buffer); + if (sent) + port_statistics[portid].tx += sent; + + } + + /* if timer is enabled */ + if (timer_period > 0) { + + /* advance the timer */ + timer_tsc += diff_tsc; + + /* if timer has reached its timeout */ + if (unlikely(timer_tsc >= timer_period)) { + + /* do this only on master core */ + if (lcore_id == master_core_id) { + print_stats(); + /* reset the timer */ + timer_tsc = 0; + } + } + } + + prev_tsc = cur_tsc; + } + + /* + * Read packet from RX queues + */ + for (i = 0; i < qconf->n_rx_port; i++) { + + portid = qconf->rx_port_list[i]; + nb_rx = rte_eth_rx_burst(portid, 0, + pkts_burst, MAX_PKT_BURST); + + port_statistics[portid].rx += nb_rx; + + for (j = 0; j < nb_rx; j++) { + m = pkts_burst[j]; + rte_prefetch0(rte_pktmbuf_mtod(m, void *)); + l2fwd_simple_forward(m, portid); + } + } + } +} + +int +l2fwd_launch_one_lcore(__attribute__((unused)) void *dummy) +{ + l2fwd_main_loop(); + return 0; +} diff --git a/examples/l2fwd/l2fwd_worker.h b/examples/l2fwd/l2fwd_worker.h new file mode 100644 index 0000000..8971a6a --- /dev/null +++ b/examples/l2fwd/l2fwd_worker.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Cavium, Inc + */ +#ifndef _L2FWD_WORKER_H_ +#define _L2FWD_WORKER_H_ + +int +l2fwd_launch_one_lcore(__attribute__((unused)) void *dummy); + +#endif /* _L2FWD_WORKER_H_ */ diff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c index 3e0269e..05f9d28 100644 --- a/examples/l2fwd/main.c +++ b/examples/l2fwd/main.c @@ -40,6 +40,7 @@ #include #include "l2fwd_common.h" +#include "l2fwd_worker.h" static uint16_t nb_rxd = RTE_TEST_RX_DESC_DEFAULT; static uint16_t nb_txd = RTE_TEST_TX_DESC_DEFAULT; @@ -59,196 +60,6 @@ static struct rte_eth_conf port_conf = { struct rte_mempool * l2fwd_pktmbuf_pool = NULL; -/* Print out statistics on packets dropped */ -static void -print_stats(void) -{ - uint64_t total_packets_dropped, total_packets_tx, total_packets_rx; - unsigned portid; - - total_packets_dropped = 0; - total_packets_tx = 0; - total_packets_rx = 0; - - const char clr[] = { 27, '[', '2', 'J', '\0' }; - const char topLeft[] = { 27, '[', '1', ';', '1', 'H', '\0' }; - - /* Clear screen and move to top left */ - printf("%s%s", clr, topLeft); - - printf("\nPort statistics ===================================="); - - for (portid = 0; portid < RTE_MAX_ETHPORTS; portid++) { - /* skip disabled ports */ - if ((l2fwd_enabled_port_mask & (1 << portid)) == 0) - continue; - printf("\nStatistics for port %u ------------------------------" - "\nPackets sent: %24"PRIu64 - "\nPackets received: %20"PRIu64 - "\nPackets dropped: %21"PRIu64, - portid, - port_statistics[portid].tx, - port_statistics[portid].rx, - port_statistics[portid].dropped); - - total_packets_dropped += port_statistics[portid].dropped; - total_packets_tx += port_statistics[portid].tx; - total_packets_rx += port_statistics[portid].rx; - } - printf("\nAggregate statistics ===============================" - "\nTotal packets sent: %18"PRIu64 - "\nTotal packets received: %14"PRIu64 - "\nTotal packets dropped: %15"PRIu64, - total_packets_tx, - total_packets_rx, - total_packets_dropped); - printf("\n====================================================\n"); -} - -static void -l2fwd_mac_updating(struct rte_mbuf *m, unsigned dest_portid) -{ - struct ether_hdr *eth; - void *tmp; - - eth = rte_pktmbuf_mtod(m, struct ether_hdr *); - - /* 02:00:00:00:00:xx */ - tmp = ð->d_addr.addr_bytes[0]; - *((uint64_t *)tmp) = 0x000000000002 + ((uint64_t)dest_portid << 40); - - /* src addr */ - ether_addr_copy(&l2fwd_ports_eth_addr[dest_portid], ð->s_addr); -} - -static void -l2fwd_simple_forward(struct rte_mbuf *m, unsigned portid) -{ - unsigned dst_port; - int sent; - struct rte_eth_dev_tx_buffer *buffer; - - dst_port = l2fwd_dst_ports[portid]; - - if (mac_updating) - l2fwd_mac_updating(m, dst_port); - - buffer = tx_buffer[dst_port]; - sent = rte_eth_tx_buffer(dst_port, 0, buffer, m); - if (sent) - port_statistics[dst_port].tx += sent; -} - -/* main processing loop */ -static void -l2fwd_main_loop(void) -{ - struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; - struct rte_mbuf *m; - int sent; - unsigned lcore_id; - unsigned int master_core_id; - uint64_t prev_tsc, diff_tsc, cur_tsc, timer_tsc; - unsigned i, j, portid, nb_rx; - struct lcore_queue_conf *qconf; - const uint64_t drain_tsc = (rte_get_tsc_hz() + US_PER_S - 1) - / US_PER_S * BURST_TX_DRAIN_US; - struct rte_eth_dev_tx_buffer *buffer; - - prev_tsc = 0; - timer_tsc = 0; - - lcore_id = rte_lcore_id(); - qconf = &lcore_queue_conf[lcore_id]; - - if (qconf->n_rx_port == 0) { - RTE_LOG(INFO, L2FWD, "lcore %u has nothing to do\n", lcore_id); - return; - } - - RTE_LOG(INFO, L2FWD, "entering main loop on lcore %u\n", lcore_id); - - for (i = 0; i < qconf->n_rx_port; i++) { - - portid = qconf->rx_port_list[i]; - RTE_LOG(INFO, L2FWD, " -- lcoreid=%u portid=%u\n", lcore_id, - portid); - - } - - master_core_id = rte_get_master_lcore(); - - while (!force_quit) { - - cur_tsc = rte_rdtsc(); - - /* - * TX burst queue drain - */ - diff_tsc = cur_tsc - prev_tsc; - if (unlikely(diff_tsc > drain_tsc)) { - - for (i = 0; i < qconf->n_rx_port; i++) { - - portid = - l2fwd_dst_ports[qconf->rx_port_list[i]]; - buffer = tx_buffer[portid]; - - sent = rte_eth_tx_buffer_flush(portid, 0, - buffer); - if (sent) - port_statistics[portid].tx += sent; - - } - - /* if timer is enabled */ - if (timer_period > 0) { - - /* advance the timer */ - timer_tsc += diff_tsc; - - /* if timer has reached its timeout */ - if (unlikely(timer_tsc >= timer_period)) { - - /* do this only on master core */ - if (lcore_id == master_core_id) { - print_stats(); - /* reset the timer */ - timer_tsc = 0; - } - } - } - - prev_tsc = cur_tsc; - } - - /* - * Read packet from RX queues - */ - for (i = 0; i < qconf->n_rx_port; i++) { - - portid = qconf->rx_port_list[i]; - nb_rx = rte_eth_rx_burst(portid, 0, - pkts_burst, MAX_PKT_BURST); - - port_statistics[portid].rx += nb_rx; - - for (j = 0; j < nb_rx; j++) { - m = pkts_burst[j]; - rte_prefetch0(rte_pktmbuf_mtod(m, void *)); - l2fwd_simple_forward(m, portid); - } - } - } -} - -static int -l2fwd_launch_one_lcore(__attribute__((unused)) void *dummy) -{ - l2fwd_main_loop(); - return 0; -} - /* display usage */ static void l2fwd_usage(const char *prgname)