From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60054.outbound.protection.outlook.com [40.107.6.54]) by dpdk.org (Postfix) with ESMTP id AC1B8559A for ; Wed, 17 Oct 2018 17:22:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZcAGZJn+pDoQ6GYAsZSYNeBwk2mDuYrt8uCe+Or77lw=; b=dRdKJ5KKDK2BzLu+z8hNnlqRHNVQUawTw8dcNZeA5ZYTQWaU1za2znwtSWMHZaXyqvwHuQpVxhM91AsLj0L5+BYrHNRSeUIq4EcjCY2BLIrOCNKkyRTPYdsSfpcQb2845Musgxp+quneg8v7lzS0MbfcjS4oh3A7odrb42sKiEc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=rasland@mellanox.com; Received: from mellanox.com (37.142.13.130) by HE1PR05MB1257.eurprd05.prod.outlook.com (2a01:111:e400:5889::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1250.21; Wed, 17 Oct 2018 15:22:20 +0000 From: Raslan Darawsheh To: jingjing.wu@intel.com Cc: thomas@monjalon.net, dev@dpdk.org, shahafs@mellanox.com, rasland@mellanox.com, xuemingl@mellanox.com, orika@mellanox.com, jerin.jacob@caviumnetworks.com, david.marchand@6wind.com, bernard.iremonger@intel.com, ferruh.yigit@intel.com Date: Wed, 17 Oct 2018 18:22:09 +0300 Message-Id: <1539789731-18409-1-git-send-email-rasland@mellanox.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1538897848-1693-1-git-send-email-rasland@mellanox.com> References: <1538897848-1693-1-git-send-email-rasland@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: LO2P265CA0158.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:9::26) To HE1PR05MB1257.eurprd05.prod.outlook.com (2a01:111:e400:5889::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 44783337-d3b6-4756-5347-08d634445580 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(5600074)(711020)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:HE1PR05MB1257; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1257; 3:KRetMHWouWfPuGtjC1v6CLdsvkm9Aw5AXnwCZU+N/0ai2miYE8eJz+RggZpcuwD6kSbsoPoDSawQqp+HKBIFI4lmc4hNucBDpukEUnvpmxOqZ/WOiya8jzRBQro4/Aadw1jWkFRKstmpZ51hR0/bdgwaZCVy+3UuZPP1O63E3T2APwaF+jA76D0PhJ1b1/nwWz/iQss2VR83/xvI/hD371uFrUJP+Y9uYnDV7Ca0ugzjMmjiFJOGx+5avPn9D8bR; 25:pm6dWYXGUWhctHFbekxP1NbYLGT+7FUI+mtY0En9j6Tw1JANkLTBIdCOzgqbyXjHqljGqRpc8sxByqE+3QqtAPwHX+nur2tF2pjQcE9GFf3SM+I1GBYGff2HGifyem5QsbhZ3XbEFDXhS9ICF4HJoWlxtV7E1e29QJVMJT7SG+k1+/Ham3IKRnKmQZWsp4drDA0KMU/q4B8UmaolLlzS/Hyaa6MarPS8O4jNN1uwjqlti4xtTMQ3IiY4vhbzCYzyfex5v0uEOJ0oI6cqvaHKfhmYH0KXV7zy10COzTA/SoiQw2/rLwGWxX06LUNLkWs1r0szcwaVkX5St4msTPEFxOipxDpfx9vEjy+b1GSt6MM=; 31:X2+Zdt1POykYe/BlgnWQ8J3UPC2jzU0jdy3ceABnW2dL2kwxoYOIB+yIMPu6a/N9WO6V4WpVGb1UUhHTUtopSMZyn+OcqO/iVOcLeI6B0AdFfPzo257fRS+c57r1NPV+xBQCBapfFux7cDqVzsKQRjlEO/SlvVwF1GoKAMjKUw8eGD37ZsrWf92kVIIo2aWLXKdU/apntk5aTdvRejfF2s8r4qjzz+/+m1io08T8JkE= X-MS-TrafficTypeDiagnostic: HE1PR05MB1257: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1257; 20:TIZrizh6pL+PO+3EwsPbsx4qrupw8VeRDyxAMciBB2vfEu5VdpSKq8W1eNc53cofo58LH8AtVfhvw+fmthX7iScG1zTwli3HlVvyaBUBbYWav7NWL8vkzt+gRzGXZM5DEmhUhopMdmtMUgT1UugoDEPRrYF+W2azNix/rJQuKLfUBLlB3TcDo8OQvCSXCe+F75Pp+S6rtxyO+8UQIG5iYBaD74/8a3NMoNPeI2SDY0d/v09fiDNo8QsC5J1fheaL9Yf/IC8kHuzsWr8QADuyhFRWacCiHyYDDTuTRzyXYkMeZOd2Y/0zVmWQmy53thvKF9FqnX51T+zCPx/sG4+fLnxHBrF6i2sSN+u4T7R95xZ6CINsckphRdELCP5ge/3iA4kN+IRsxGtKDDXEp9/u0HdyILohjIf8NC1aoP9xa30LP9XhsocKLJQKJZG/qR/7KvHK561S1dsgzl1sYIEQ5i1k/PW9lIwXIGuem9geaPUlIbS04ShcNi+GQEMDNmso; 4:drrjAs3+E9zcXRJAXvAKS4i0Ab2V5xEn3uSd8/KMYuO/dBx37Ggt6rvINU/M8Fjy/JHilCpRzYEIgHesYflowB+Lqo3QGuuQUdkznmaToZ2j2fczfBFLTDP2Jn/dj8Z7NPYWIqMA2viJgmQsItoqJvGupiF3KftRuFUDGMQi3p0yQa3JdRfLmgIHJ8Herdj9Gp+hEeX+xTAYyY0jjRgoozsFN7bwSktXO6kQB0uaN1wZ1lu+wmKFF2Hi3dejCj5MYPHO43I6jiRhYr1wHrG+sE+oxGLlKrVn3vxWMN+CnnAy9cVtRwFz7ko7UveHVHpc X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(228905959029699); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150057)(6041310)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:HE1PR05MB1257; BCL:0; PCL:0; RULEID:; SRVR:HE1PR05MB1257; X-Forefront-PRVS: 08286A0BE2 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39860400002)(366004)(376002)(346002)(136003)(189003)(199004)(53936002)(47776003)(3846002)(8886007)(97736004)(55016002)(4326008)(316002)(16586007)(2361001)(66066001)(305945005)(33026002)(4744004)(446003)(6116002)(11346002)(956004)(2906002)(50466002)(476003)(7736002)(486006)(21086003)(2616005)(36756003)(50226002)(51416003)(69596002)(48376002)(478600001)(5660300001)(386003)(86362001)(2351001)(52116002)(7696005)(575784001)(68736007)(76176011)(186003)(25786009)(8676002)(81166006)(16526019)(81156014)(106356001)(105586002)(26005)(6916009)(6666004)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB1257; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR05MB1257; 23:bbwqjAK9dMuqtuPi02wM8eMIdqYkisx80VfDmUQGk?= =?us-ascii?Q?qsXRUzC2ia1wv4JR6ktXexGsgXhzEtsCP+rIMeBIVybSoD4/nJmIYu2hLCnc?= =?us-ascii?Q?y2yuI/GEj98ivcEsdxP6VFFX1/YgfRL1TksqauKek9dMV3/VAAsgPGNEsSCz?= =?us-ascii?Q?7lk6UUx5KG313M+mcK4knQpYwdOopvxTCrdo0toC2Kx1ElozUmPEQorskZEj?= =?us-ascii?Q?NLbAyQg/DXmZ+japTJtSaKvvVyvzBh880BG4PQjbHRP2lQcKsYeUC0Go1+Ld?= =?us-ascii?Q?5i/HbKbw+9Y9F4qgO2pnV5n8GU4bU9FrhthO0cbT1XImEilz/Inwcc8ZmCfM?= =?us-ascii?Q?gAEeplBGXhs6AdctbG8TEX2iQysdGkSNWZ5ZKKRmPAN8/W/3tjdQSuTDpTPa?= =?us-ascii?Q?lMj+hb6Hrqt3JUYRpq29gYGx6NP2DbZvdbJGTGmJLbS/nUrJEYnB2YmVjHzR?= =?us-ascii?Q?F/72nb7Ntd56eU6Oc5vdPzr9Rc8Nlv9Rikn/hBCHtzNr342x6S4RPNuebyLt?= =?us-ascii?Q?9aGMjdZ+sNbIKlsPlPwrDlkW9d8YV+3ZEjdEPI1M79RL75YTETu/uipfYx8V?= =?us-ascii?Q?aw/CJXlQ1hoqTtiCDteujH2Hc7YwhBbAOkEqmPJefmRW+0JqC90SSMQQMl10?= =?us-ascii?Q?WMX5YuQvvPQNcy4f+AqvJ8W9gaGTuFTYgfWehCmf+w3s+fckLllPnjcOpMnd?= =?us-ascii?Q?cqxDD2IY0vYyShN47UjmAxvrJ62oMumlGxA+oEKb9vXrlAwbcbw8qzYjH8Xh?= =?us-ascii?Q?OP150hT46WiSc9KUcP+l5cgkG7aSX9He00IMKk3u1+zPXK25lHFAGIeoQqqA?= =?us-ascii?Q?wsjlUnpYH0GvwVQPYsJu60pirb8sQwVGYfCgfl3+04RHSfFapE0wQb8QlMup?= =?us-ascii?Q?ja73vuN2jC/mXsmoIRW9eu3Q+4Q5iYTWpXSeRZTnsKGoKlIVFt+wQ3PgFS4T?= =?us-ascii?Q?tJtYNKCm9jtZu2fovh+4fqQL7zlUX6dkttsNeFCLhqh4GHItpKcRDhK6/M8W?= =?us-ascii?Q?DxRoTAlBgp/+ot84J0i8NsMd7FRpC7JS53cB8R1bSjSZDkhHhX8+R6kXJoWo?= =?us-ascii?Q?UaomkMuKIYGaVbneA0H3rxOHV1mCUBKoxi+x+v3cxnufSiVuPhA631pjJ8V4?= =?us-ascii?Q?hVtO9IGmiuK3T7rz2AxfxOFSWLjkUIBfscCCbMRR84/E0K1cHqAtNahOwmqf?= =?us-ascii?Q?0cXJjqrtHz1hBIHlSZY+QycqRHIQU3WePQ4xgB8u5fzSlXQUNdsX06ThwQgF?= =?us-ascii?Q?RkovuF4NW4MsgYDkPYdKVl4WPyHQBEJPjNZUwCwROioPUSZHqLx6bDwSO4XK?= =?us-ascii?Q?tle7Hc0uV+yk3wuHtPNOKE=3D?= X-Microsoft-Antispam-Message-Info: YXy3ROwmd6yJkHwPL4put0NN6xyelgsN+/QEVAbG+owKp7MhMkEIDO+eYOpy3uIaaMtftBYDD3Ggg4empkMxoIVsFxbhdUeN1whUrqYWDNxS9V469yZsC3bdRLOQYriT5KAQUQ4BcTAujVYeltbEvAlBrh8OJFay8S5D6SSDk1NiG/m48BAzhnScn3W8xlO/v/7aMdlcTiq+8F+Zj1JzWskJ+WBc3hQ20G97/Euk8UGwpY2ACdL14fCtqMaJmZGfFKqD/5dp9nbmuh742ulEAMvZrPNP+EaT6KphKeWZy+huLEMlzMFgu/WupQsWemNLSHuRWidOsyN0fzXVpNBx4UVzUyeE2xhlQZ6qORTTd3U= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1257; 6:JpUymhJufPLZ342wOqIKtuOv8RlcSTPDOHGuoFh2KzvP0V+RcuJSPTW/DKVMsDWbp/Gmc8ID7EGz0QzJ9IbwAoOv0Nz+UlKEIGkCEDtCn3hr+brIl5eL8w8DQpcybOS3jqnTm5AwPxcVn7K0Dz/ZccE6mbpWf0EUht62uUmi0HfB9wqMACy9LovBCQ8fqBEg0TKsE2fqvjt+S/tn1H5kJsMLWd1lrDsilfdkU720Pjkc8oe7SYehb5iMh7+5NOALAQxz9qyJqqqAMjRW5eucT+ojoX7tUTgN2Z65f7U8zXdmQsGFRlW+B1XwwuvqTe9mFZ+3jV9+UiGwq8X6yp58Ix0kKff/t+7+7vHO3VZDaJUJmslvpeWIRo3r9HuFoZC5YfWYOhG0PZyYe6kGNcfeiy2TnuVg7zjzQuQ04I51Mm876UYw20ZI01xQQAsF5bzFTcGJEpY9QNOtB0BBXeRj5Q==; 5:NcNaR7tJws8OAlb97uIWEKkSiQRulbXbJvpxwCuQH6Ln4wHf5s2VQPPVPn/Y+4yrc/QH2Zf3Agw2NhCW0sysuA8c1PXCYMby/nnc0quePJiAVt9CDA/AMcG0zDo9BGX84dE8mLdlNHwa32eCoFEYzg9kUlr+p+YpAKYHgIEe8p8=; 7:Tv3WDsJ1+3frBTOFroEAqr17sHx+VvIoybTLCx2jF9kl9s/qf1xxgDR9gFQRV/6Y9I4YwMWmAcz8pjmmrUtn3YoNEMdLwisRY3h9Jdr9C8cKTzaphF8RXsGbWS4WqjZwp3W/Dp0HDOmyVMrH2N9l84I8qO7b9CPNnAFZX9QnHqNc8Mb3ldywlffeIeVfUmZ3ZDFVi6dSJbq4MAvN6sx9OZs9OOWXDY20h78mqtBQMr5D1zKOzsHvOig8qlFx9o5U SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2018 15:22:20.0913 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 44783337-d3b6-4756-5347-08d634445580 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB1257 Subject: [dpdk-dev] [PATCH v6 1/3] app/testpmd: move dumping packets to a separate function 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: , X-List-Received-Date: Wed, 17 Oct 2018 15:22:24 -0000 verbosity for the received/sent packets is needed in all of the forwarding engines so moving it to be in a separate function Acked-by: Bernard Iremonger Signed-off-by: Raslan Darawsheh --- changes in v6: - fix compilation issue for patch --- --- app/test-pmd/Makefile | 1 + app/test-pmd/meson.build | 3 +- app/test-pmd/rxonly.c | 134 +---------------------------------------- app/test-pmd/testpmd.h | 3 + app/test-pmd/util.c | 151 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 160 insertions(+), 132 deletions(-) create mode 100644 app/test-pmd/util.c diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile index e2581ca..8e4ff5b 100644 --- a/app/test-pmd/Makefile +++ b/app/test-pmd/Makefile @@ -36,6 +36,7 @@ SRCS-y += icmpecho.c SRCS-y += noisy_vnf.c SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) += ieee1588fwd.c SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_cmd.c +SRCS-y += util.c ifeq ($(CONFIG_RTE_LIBRTE_PMD_SOFTNIC), y) SRCS-y += softnicfwd.c diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 9ef6ed9..cd66618 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -21,7 +21,8 @@ sources = files('cmdline.c', 'parameters.c', 'rxonly.c', 'testpmd.c', - 'txonly.c') + 'txonly.c', + 'util.c') deps = ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci'] if dpdk_conf.has('RTE_LIBRTE_PDUMP') diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c index 41db0ff..3eca89c 100644 --- a/app/test-pmd/rxonly.c +++ b/app/test-pmd/rxonly.c @@ -40,14 +40,6 @@ #include "testpmd.h" -static inline void -print_ether_addr(const char *what, struct ether_addr *eth_addr) -{ - char buf[ETHER_ADDR_FMT_SIZE]; - ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr); - printf("%s%s", what, buf); -} - /* * Received a burst of packets. */ @@ -55,16 +47,8 @@ static void pkt_burst_receive(struct fwd_stream *fs) { struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; - struct rte_mbuf *mb; - struct ether_hdr *eth_hdr; - uint16_t eth_type; - uint64_t ol_flags; uint16_t nb_rx; - uint16_t i, packet_type; - uint16_t is_encapsulation; - char buf[256]; - struct rte_net_hdr_lens hdr_lens; - uint32_t sw_packet_type; + uint16_t i; #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES uint64_t start_tsc; @@ -90,120 +74,8 @@ pkt_burst_receive(struct fwd_stream *fs) /* * Dump each received packet if verbose_level > 0. */ - if (verbose_level > 0) - printf("port %u/queue %u: received %u packets\n", - fs->rx_port, - (unsigned) fs->rx_queue, - (unsigned) nb_rx); - for (i = 0; i < nb_rx; i++) { - mb = pkts_burst[i]; - if (verbose_level == 0) { - rte_pktmbuf_free(mb); - continue; - } - eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *); - eth_type = RTE_BE_TO_CPU_16(eth_hdr->ether_type); - ol_flags = mb->ol_flags; - packet_type = mb->packet_type; - is_encapsulation = RTE_ETH_IS_TUNNEL_PKT(packet_type); - - print_ether_addr(" src=", ð_hdr->s_addr); - print_ether_addr(" - dst=", ð_hdr->d_addr); - printf(" - type=0x%04x - length=%u - nb_segs=%d", - eth_type, (unsigned) mb->pkt_len, - (int)mb->nb_segs); - if (ol_flags & PKT_RX_RSS_HASH) { - printf(" - RSS hash=0x%x", (unsigned) mb->hash.rss); - printf(" - RSS queue=0x%x",(unsigned) fs->rx_queue); - } - if (ol_flags & PKT_RX_FDIR) { - printf(" - FDIR matched "); - if (ol_flags & PKT_RX_FDIR_ID) - printf("ID=0x%x", - mb->hash.fdir.hi); - else if (ol_flags & PKT_RX_FDIR_FLX) - printf("flex bytes=0x%08x %08x", - mb->hash.fdir.hi, mb->hash.fdir.lo); - else - printf("hash=0x%x ID=0x%x ", - mb->hash.fdir.hash, mb->hash.fdir.id); - } - if (ol_flags & PKT_RX_TIMESTAMP) - printf(" - timestamp %"PRIu64" ", mb->timestamp); - if (ol_flags & PKT_RX_QINQ) - printf(" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x", - mb->vlan_tci, mb->vlan_tci_outer); - else if (ol_flags & PKT_RX_VLAN) - printf(" - VLAN tci=0x%x", mb->vlan_tci); - if (mb->packet_type) { - rte_get_ptype_name(mb->packet_type, buf, sizeof(buf)); - printf(" - hw ptype: %s", buf); - } - sw_packet_type = rte_net_get_ptype(mb, &hdr_lens, - RTE_PTYPE_ALL_MASK); - rte_get_ptype_name(sw_packet_type, buf, sizeof(buf)); - printf(" - sw ptype: %s", buf); - if (sw_packet_type & RTE_PTYPE_L2_MASK) - printf(" - l2_len=%d", hdr_lens.l2_len); - if (sw_packet_type & RTE_PTYPE_L3_MASK) - printf(" - l3_len=%d", hdr_lens.l3_len); - if (sw_packet_type & RTE_PTYPE_L4_MASK) - printf(" - l4_len=%d", hdr_lens.l4_len); - if (sw_packet_type & RTE_PTYPE_TUNNEL_MASK) - printf(" - tunnel_len=%d", hdr_lens.tunnel_len); - if (sw_packet_type & RTE_PTYPE_INNER_L2_MASK) - printf(" - inner_l2_len=%d", hdr_lens.inner_l2_len); - if (sw_packet_type & RTE_PTYPE_INNER_L3_MASK) - printf(" - inner_l3_len=%d", hdr_lens.inner_l3_len); - if (sw_packet_type & RTE_PTYPE_INNER_L4_MASK) - printf(" - inner_l4_len=%d", hdr_lens.inner_l4_len); - if (is_encapsulation) { - struct ipv4_hdr *ipv4_hdr; - struct ipv6_hdr *ipv6_hdr; - struct udp_hdr *udp_hdr; - uint8_t l2_len; - uint8_t l3_len; - uint8_t l4_len; - uint8_t l4_proto; - struct vxlan_hdr *vxlan_hdr; - - l2_len = sizeof(struct ether_hdr); - - /* Do not support ipv4 option field */ - if (RTE_ETH_IS_IPV4_HDR(packet_type)) { - l3_len = sizeof(struct ipv4_hdr); - ipv4_hdr = rte_pktmbuf_mtod_offset(mb, - struct ipv4_hdr *, - l2_len); - l4_proto = ipv4_hdr->next_proto_id; - } else { - l3_len = sizeof(struct ipv6_hdr); - ipv6_hdr = rte_pktmbuf_mtod_offset(mb, - struct ipv6_hdr *, - l2_len); - l4_proto = ipv6_hdr->proto; - } - if (l4_proto == IPPROTO_UDP) { - udp_hdr = rte_pktmbuf_mtod_offset(mb, - struct udp_hdr *, - l2_len + l3_len); - l4_len = sizeof(struct udp_hdr); - vxlan_hdr = rte_pktmbuf_mtod_offset(mb, - struct vxlan_hdr *, - l2_len + l3_len + l4_len); - - printf(" - VXLAN packet: packet type =%d, " - "Destination UDP port =%d, VNI = %d", - packet_type, RTE_BE_TO_CPU_16(udp_hdr->dst_port), - rte_be_to_cpu_32(vxlan_hdr->vx_vni) >> 8); - } - } - printf(" - Receive queue=0x%x", (unsigned) fs->rx_queue); - printf("\n"); - rte_get_rx_ol_flag_list(mb->ol_flags, buf, sizeof(buf)); - printf(" ol_flags: %s\n", buf); - rte_pktmbuf_free(mb); - } + for (i = 0; i < nb_rx; i++) + rte_pktmbuf_free(pkts_burst[i]); #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES end_tsc = rte_rdtsc(); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 121b756..cba9640 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -764,6 +764,9 @@ int check_nb_rxq(queueid_t rxq); queueid_t get_allowed_max_nb_txq(portid_t *pid); int check_nb_txq(queueid_t txq); +void dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], + uint16_t nb_pkts, int is_rx); + /* * Work-around of a compilation error with ICC on invocations of the * rte_be_to_cpu_16() function. diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c new file mode 100644 index 0000000..3ba3b58 --- /dev/null +++ b/app/test-pmd/util.c @@ -0,0 +1,151 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation + * Copyright(c) 2018 Mellanox Technology + */ + +#include + +#include +#include +#include +#include +#include + +#include "testpmd.h" + +static inline void +print_ether_addr(const char *what, struct ether_addr *eth_addr) +{ + char buf[ETHER_ADDR_FMT_SIZE]; + ether_format_addr(buf, ETHER_ADDR_FMT_SIZE, eth_addr); + printf("%s%s", what, buf); +} + +void +dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], + uint16_t nb_pkts, int is_rx) +{ + struct rte_mbuf *mb; + struct ether_hdr *eth_hdr; + uint16_t eth_type; + uint64_t ol_flags; + uint16_t i, packet_type; + uint16_t is_encapsulation; + char buf[256]; + struct rte_net_hdr_lens hdr_lens; + uint32_t sw_packet_type; + uint16_t udp_port; + uint32_t vx_vni; + + if (!nb_pkts) + return; + printf("port %u/queue %u: %s %u packets\n", + port_id, queue, + is_rx ? "received" : "sent", + (unsigned int) nb_pkts); + for (i = 0; i < nb_pkts; i++) { + mb = pkts[i]; + eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *); + eth_type = RTE_BE_TO_CPU_16(eth_hdr->ether_type); + ol_flags = mb->ol_flags; + packet_type = mb->packet_type; + is_encapsulation = RTE_ETH_IS_TUNNEL_PKT(packet_type); + + print_ether_addr(" src=", ð_hdr->s_addr); + print_ether_addr(" - dst=", ð_hdr->d_addr); + printf(" - type=0x%04x - length=%u - nb_segs=%d", + eth_type, (unsigned int) mb->pkt_len, + (int)mb->nb_segs); + if (ol_flags & PKT_RX_RSS_HASH) { + printf(" - RSS hash=0x%x", (unsigned int) mb->hash.rss); + printf(" - RSS queue=0x%x", (unsigned int) queue); + } + if (ol_flags & PKT_RX_FDIR) { + printf(" - FDIR matched "); + if (ol_flags & PKT_RX_FDIR_ID) + printf("ID=0x%x", + mb->hash.fdir.hi); + else if (ol_flags & PKT_RX_FDIR_FLX) + printf("flex bytes=0x%08x %08x", + mb->hash.fdir.hi, mb->hash.fdir.lo); + else + printf("hash=0x%x ID=0x%x ", + mb->hash.fdir.hash, mb->hash.fdir.id); + } + if (ol_flags & PKT_RX_TIMESTAMP) + printf(" - timestamp %"PRIu64" ", mb->timestamp); + if (ol_flags & PKT_RX_QINQ) + printf(" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x", + mb->vlan_tci, mb->vlan_tci_outer); + else if (ol_flags & PKT_RX_VLAN) + printf(" - VLAN tci=0x%x", mb->vlan_tci); + if (mb->packet_type) { + rte_get_ptype_name(mb->packet_type, buf, sizeof(buf)); + printf(" - hw ptype: %s", buf); + } + sw_packet_type = rte_net_get_ptype(mb, &hdr_lens, + RTE_PTYPE_ALL_MASK); + rte_get_ptype_name(sw_packet_type, buf, sizeof(buf)); + printf(" - sw ptype: %s", buf); + if (sw_packet_type & RTE_PTYPE_L2_MASK) + printf(" - l2_len=%d", hdr_lens.l2_len); + if (sw_packet_type & RTE_PTYPE_L3_MASK) + printf(" - l3_len=%d", hdr_lens.l3_len); + if (sw_packet_type & RTE_PTYPE_L4_MASK) + printf(" - l4_len=%d", hdr_lens.l4_len); + if (sw_packet_type & RTE_PTYPE_TUNNEL_MASK) + printf(" - tunnel_len=%d", hdr_lens.tunnel_len); + if (sw_packet_type & RTE_PTYPE_INNER_L2_MASK) + printf(" - inner_l2_len=%d", hdr_lens.inner_l2_len); + if (sw_packet_type & RTE_PTYPE_INNER_L3_MASK) + printf(" - inner_l3_len=%d", hdr_lens.inner_l3_len); + if (sw_packet_type & RTE_PTYPE_INNER_L4_MASK) + printf(" - inner_l4_len=%d", hdr_lens.inner_l4_len); + if (is_encapsulation) { + struct ipv4_hdr *ipv4_hdr; + struct ipv6_hdr *ipv6_hdr; + struct udp_hdr *udp_hdr; + uint8_t l2_len; + uint8_t l3_len; + uint8_t l4_len; + uint8_t l4_proto; + struct vxlan_hdr *vxlan_hdr; + + l2_len = sizeof(struct ether_hdr); + + /* Do not support ipv4 option field */ + if (RTE_ETH_IS_IPV4_HDR(packet_type)) { + l3_len = sizeof(struct ipv4_hdr); + ipv4_hdr = rte_pktmbuf_mtod_offset(mb, + struct ipv4_hdr *, + l2_len); + l4_proto = ipv4_hdr->next_proto_id; + } else { + l3_len = sizeof(struct ipv6_hdr); + ipv6_hdr = rte_pktmbuf_mtod_offset(mb, + struct ipv6_hdr *, + l2_len); + l4_proto = ipv6_hdr->proto; + } + if (l4_proto == IPPROTO_UDP) { + udp_hdr = rte_pktmbuf_mtod_offset(mb, + struct udp_hdr *, + l2_len + l3_len); + l4_len = sizeof(struct udp_hdr); + vxlan_hdr = rte_pktmbuf_mtod_offset(mb, + struct vxlan_hdr *, + l2_len + l3_len + l4_len); + udp_port = RTE_BE_TO_CPU_16(udp_hdr->dst_port); + vx_vni = rte_be_to_cpu_32(vxlan_hdr->vx_vni); + printf(" - VXLAN packet: packet type =%d, " + "Destination UDP port =%d, VNI = %d", + packet_type, udp_port, vx_vni >> 8); + } + } + printf(" - %s queue=0x%x", is_rx ? "Receive" : "Send", + (unsigned int) queue); + printf("\n"); + rte_get_rx_ol_flag_list(mb->ol_flags, buf, sizeof(buf)); + printf(" ol_flags: %s\n", buf); + } +} -- 2.7.4