From patchwork Wed Oct 17 15:22:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 46994 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 F11125F1A; Wed, 17 Oct 2018 17:22:25 +0200 (CEST) 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 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?= qsXRUzC2ia1wv4JR6ktXexGsgXhzEtsCP+rIMeBIVybSoD4/nJmIYu2hLCncy2yuI/GEj98ivcEsdxP6VFFX1/YgfRL1TksqauKek9dMV3/VAAsgPGNEsSCz7lk6UUx5KG313M+mcK4knQpYwdOopvxTCrdo0toC2Kx1ElozUmPEQorskZEjNLbAyQg/DXmZ+japTJtSaKvvVyvzBh880BG4PQjbHRP2lQcKsYeUC0Go1+Ld5i/HbKbw+9Y9F4qgO2pnV5n8GU4bU9FrhthO0cbT1XImEilz/Inwcc8ZmCfMgAEeplBGXhs6AdctbG8TEX2iQysdGkSNWZ5ZKKRmPAN8/W/3tjdQSuTDpTPalMj+hb6Hrqt3JUYRpq29gYGx6NP2DbZvdbJGTGmJLbS/nUrJEYnB2YmVjHzRF/72nb7Ntd56eU6Oc5vdPzr9Rc8Nlv9Rikn/hBCHtzNr342x6S4RPNuebyLt9aGMjdZ+sNbIKlsPlPwrDlkW9d8YV+3ZEjdEPI1M79RL75YTETu/uipfYx8Vaw/CJXlQ1hoqTtiCDteujH2Hc7YwhBbAOkEqmPJefmRW+0JqC90SSMQQMl10WMX5YuQvvPQNcy4f+AqvJ8W9gaGTuFTYgfWehCmf+w3s+fckLllPnjcOpMndcqxDD2IY0vYyShN47UjmAxvrJ62oMumlGxA+oEKb9vXrlAwbcbw8qzYjH8XhOP150hT46WiSc9KUcP+l5cgkG7aSX9He00IMKk3u1+zPXK25lHFAGIeoQqqAwsjlUnpYH0GvwVQPYsJu60pirb8sQwVGYfCgfl3+04RHSfFapE0wQb8QlMupja73vuN2jC/mXsmoIRW9eu3Q+4Q5iYTWpXSeRZTnsKGoKlIVFt+wQ3PgFS4TtJtYNKCm9jtZu2fovh+4fqQL7zlUX6dkttsNeFCLhqh4GHItpKcRDhK6/M8WDxRoTAlBgp/+ot84J0i8NsMd7FRpC7JS53cB8R1bSjSZDkhHhX8+R6kXJoWoUaomkMuKIYGaVbneA0H3rxOHV1mCUBKoxi+x+v3cxnufSiVuPhA631pjJ8V4hVtO9IGmiuK3T7rz2AxfxOFSWLjkUIBfscCCbMRR84/E0K1cHqAtNahOwmqf0cXJjqrtHz1hBIHlSZY+QycqRHIQU3WePQ4xgB8u5fzSlXQUNdsX06ThwQgFRkovuF4NW4MsgYDkPYdKVl4WPyHQBEJPjNZUwCwROioPUSZHqLx6bDwSO4XKtle7Hc0uV+yk3wuHtPNOKE= 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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); + } +} From patchwork Wed Oct 17 15:22:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 46995 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 51EDA1B12A; Wed, 17 Oct 2018 17:22:32 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60083.outbound.protection.outlook.com [40.107.6.83]) by dpdk.org (Postfix) with ESMTP id 3F9D0559A for ; Wed, 17 Oct 2018 17:22:24 +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=tyuZfTT6JQ44K7gSmFG7OdLLQT1LOsmohYnkUUiGcMw=; b=fyNxqjsi9CLSTfK1y9H+VRRkFY23AOlrKO5T4Ar5Vp7jyFMi4IMjFU3499aoccwYL1eJn4HKAH0FYgGmF91YYd73djWznGEEDBPfq8TjQF3U4F7bGWnEMRutJqZMSw9B05TnTWpM3x5IES7di3rnOeIp5tGShIMl2qzMu4AQ3Gs= 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:22 +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:10 +0300 Message-Id: <1539789731-18409-2-git-send-email-rasland@mellanox.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539789731-18409-1-git-send-email-rasland@mellanox.com> References: <1538897848-1693-1-git-send-email-rasland@mellanox.com> <1539789731-18409-1-git-send-email-rasland@mellanox.com> MIME-Version: 1.0 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: c931d3c9-4aa8-41e4-40cb-08d634445686 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:fA9CEgoM4A1FfdYLKAHd/KGZRA2WPL0SIJjOwi9qo71Hpp0OQyqERUaPjFXRfMXAuIJzKbohY9sqyKZSaHxZDz9PjPC+bi5zRx88RIYMHKyrgouOawkUtgV+HL/z4lx7P8fevyDZClAc4wq51pxumyIyuhC03sNf2yg+LAERYDBiiebzmsInNvi68ipwVFM9qpc6aFZW6zPDFRspIvDpJqgcTKXcHNXuH8Hqo6CjnS7WFMfDVtm4MB/iIQOWNoFR; 25:YvegzgDrb9yEDSAJxNwg90/oyCg7oznPZrdWFg9bv0sOxNw0qFUz5R1C89ggrTqBci4sZn+wG1LOZVyJOg7p05EKkUNLvS/dxA1ADFRwy1HRDTQ1E6PBDLwu3Ff3tn6YNQwDaA5wU0rdd9XYluWbnm9OVqz00SanKoJsW9iw349BrJvqA3mVY2L9RNca/7yG8SzuQimGT9zycan+w1jNGfKFqki0Pap6jez5ahCLoqeyOiY+h031+GD3XvHilyL5YAvVWAhEuc2vGvhIPXwatT0Y/dLhV9fptLkUh1pzhLgjYR+WhCVUhqydKKSPJQMBSmdtgitrHrsSd9bISZ2w6Pqd8loNfSxa+eV0h8bn1Lo=; 31:NaZlVjN533jtht8BQpv415tfq45xOCrfrB0jZwuYt5THj/o6+4EEZvb/UXjSqTLwGM1ZREdywHyX6x2KnO3lY27vhNgz/BPZDwgi+Xkb8IiP/XQAiMxxSLeJSNrBhG0BzwYCbj9c5Q70odRhTQhx+Zz+zezul8bcps+UUDwWW9rI2OT45AD0jqEuJDOpNiXO/c+cH3o//5E3GitIs0FMSb4ZcOmlT+nthgVeirvgtsA= X-MS-TrafficTypeDiagnostic: HE1PR05MB1257: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1257; 20:MnJARV5z2ryzb1fyCNyHtuse7vjfau8PDFEG+4ounqrqxjC8+/f8NlTjR9ACOTaI/REayGLY39IJWD/BMd0cPmxA66SRIAqdvMTWO5SswBO/P/1t0AcIW8sElmA/59nftF3YPI3L+XPE56kXmWJnFs8TrWG7vC/T9JFxTpLYt8oGZoMQN4b8UEQVqTCF0tEijkAkBFRMe/YKzqBTa8jYis/3vgwYZJKtuANA88Nktn7Ud35XF34IbqEnUrAYZzfZ760zmuymx5kNB7s9RLyCP99JuX4CPiuAE13C6KdaUgF1sIn4jFdx0pz96G1CQ8AkSbm/RsXs5IjRiKwk/PKZTCT51lRkHiqVEuOKbe8Q9fLO5MinhU0DIDOB/YCjFioh0baAgytZOanYakQn2JXa9cKNHaA9NkztDxQ9E16xd/UFsc2XJV6MxtJRfczRwSJFu7m3x/Stgf6uS1lF9/SHdF5yEy7sd3Z6rcSzNqPFd1E//F1IzPwXbsEphNmFmPgw; 4:hfcVZZ8fHabdYrraP2WZeFHfGRoBqfUsTeqcRxRVKveLqc3tXEgA4bnD0sjA+jC9UZvpst40uKyu/dKBjWY6VYkV6epA9aIRF/kN/HL1MgpM7xhB4u/Xh2Vhe/+yNjA0T9lVsRZAvG1lstu0FoiHMPfjHbQNximUUri86gvncN5+m9sEusyFctzhjwPY9o1qJWRz1/YdpcKyr0L7ObKQjnS/6KNsGOGdMFsbDmQmbFRR7+SQzrPHjrY7qs99BLbu0ZopenKBkRWPsoLVkegf2Af77VXh9yU3kpIzI9JvFJNQPBKQcj4oRC1WOj/MK77t 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)(446003)(6116002)(11346002)(956004)(2906002)(50466002)(476003)(7736002)(486006)(21086003)(2616005)(36756003)(50226002)(51416003)(69596002)(48376002)(478600001)(5660300001)(386003)(86362001)(2351001)(52116002)(7696005)(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:I1Zp81fX7PUheeKkf12lKsN9giMHOqdnsTXvCbTKa?= snWMlHNqTapMuPhzhkS0hpUqi+GGwRW3rZoTzo0A2WqV49KGoHTTteRuD4K0M6fiTA3xwH3UetwKHReUi3qJsnOzEJAbDZ33eYLjZYJH6Idj6pCp9FG2QfyZBO5JG8Uv3ClqoQP6JFfYlysTsfVwY4BDccsA1Y+TsiXn7Nr6huR2A5/JM+0zkOGRzVVcUNc6ueX0uOBdUpb1DYHzX8SlouPsjxdoyrJ8b8Sy7/pZmSwCaCKjsyAbX4ZulJ20bGG82RIYT03OgN92i+j8vQrur8vJMYEnDmpLIbRWuXAvd1bQWz/qN3J4iARmMzN1xahrQFXbK9qloyalD0nimPgsAmcGN3p8WEXZ7HvnUokSVTC8T+GnKoCThI68fvkmlApqS0TZ4NBk4NpxYSQ5Nvj0Voc3qeCO8Vw67znkmg+rKjsKRLONW/0M1zZuq3UoakCp26WdogZjdtrpqxhVgaVk/s8m2Z2/MQ4QAMrhydx/kc6nokku3b/acrLn0JUDUOrANbKzH8Cl09b+exfab8lRYAae+EuRqqp4mAv/HDTmDurxQaCKLBoyGSC8DtLNGuZNhHavU3sAHFXfjoys4TgN0Blms0S7J08jJfXBvMFh02Kcy5tTsUu4WB9p2YzHWAcn9vDsQggjYo+FifGuro557tS4yFUrJ/OUorXbV+j1Cg9ngFqof4ZFI366XKqx1JArzt6RgmbhsuesWiNHG1S9SWQezGKhfNkCHaqqFBcr5gnruLxP6cGMkUf8Qta3GYrJDCWelvZjKOB70ChUPLuB3m/RkRajZD6bwp8vjlAVJmtQm2xn3agEUqqzg6eQ30mbIHWN8MsJqYUrQ4TytEQA93b5ncikXNlWrzgYj1M+bHKPhiByEjwiUo8dok9Ij2qQkeMQkwMimaQlSB+mV1ADpu9dC97bN4WiL0R+d23eLG/sVjS/EccEpwgqHZHaidAjwuhPlW+OL5vxlC9G8vSbjGXDR8hYXpY4q1bYg9Esxi5SFEpP2+KRflKkDpxHKlVqkWM6bqh/sLut4/Nk01kABq0/gxOLYQ8Ek8DvtqEii+syuZnzKf1qbWvNpnOS08uPPZJjTKXGGoibq9s5q6jzDCD43BfbacA9PblElcMwlN2/kLv6+ZsRxOSM2riMp1xUJmVXvIz7zNKt3AncHuK/WeWvkvEJT/+kYX8ZnSdydmRD5YVa+CLZolRihYgJkjEIzFaKPQraPKtpqtHT3PEZjUn X-Microsoft-Antispam-Message-Info: Hx67/BQGSIC9VVaYLcw3VEQQwgU21h++1R8al2f3jeWnOzwzXBwI14LxUpGJMQlW4KWYFtCO00k3AJMrD9PROFqGlzcr4SxM749OzNnGymYRO3BF3sQGLJav85nRJbfKb4H544VSfIaL6LzCzITRixBdamXwyQLFbpLRBVLthfg1qIqeBBfQsW6rSzp5gpCGhdmMRIlA0LECQKT51LA5flnsZY1GiVjhK8vsb2f4M+KEHLo3BdsjUGptLL5+RqzuZJRr5xlXsKpTIEM0u5H+8yLKGoWZy10DPHf1MsFi0IYOfaMNc85rf7A1IFCvqUCdDn9JZFQOD4R2trquA5CMr2TICcaxiO5sVRhvjuhh6LM= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1257; 6:0ad4bV8icSUG/LJ/QEpcsJ8ck51X7ijkQQnDchcf+4bN8oLSDjYInBltqfV+IIZ2QAaOrh+uCMgGtdlpppJQ8C5W3YBb+4Ae96vUGmZI8HJ8A4q94VJdwUpAwSKvOgawFDtyQEWVWLnvI2hO8TZ2kXE3IXZVeH9bs7ytAHmbjs/4Z1kVtkwnMzGK23cJNLEgLh69HSozCLf3ZlnxqaThLMFabgTqrJwnFL1F+gC4YHkNpGPZuCvLbiCfSDM2yULFMRrSd2lZODwK6b4+zQdE1brsAXFqZ3hu63Mpx5Dwdomo/HywSpRUZ4Fp4IScJZvrL6Brlqg9Y01T0lRY4lr53xwTIQfK1PnACTLjwUgJssKYGOyPqYd91qtfSIVZJeo2Zki0sqBj8jpiji03Won4LORGTlaJ+nIS1hDRp3x51V3/MrYzBIDB5KpGmSiW+TRPzr5AeLFC+z7POqsR01G/Lg==; 5:ihrONyziHFH79y7Pb93dL915MZnodoS1z4q7IsB71rGaaqxedfDNf41UaupsKRXoP7rqPZZBIi7scm83oUT3kU+W0g71se/AIcekmlGfVO/ZjzPeNXpOyGwcKxIeZZixdrRzExwxgiZFAQV7L/BEbhAQ/z0z5hhpN8c29kf0cCY=; 7:9R1nEH2xcrvnZ6/iTveg4vK8gYQCnNxV0kjwgqK6Pp86dmVWsZ6s5c6Giek138EZjifHFqpKIskyWuNYYm3ws7tuMIm5+FtDyLhKi9apho3dshgAyeinB70qNxyVUg4GMRbOBf7htDUi62/Txhp8O/QNpIWZD6iEVkfieSpLR6O5LhZPh3vlzRIsmzntvuL8gbPyikVIEoUtuAdClrCs8BAbPNZm5ugJha65aSM3qAvtuksJgnikusSHhbRht/XX SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2018 15:22:22.0091 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c931d3c9-4aa8-41e4-40cb-08d634445686 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 2/3] app/testpmd: add packet dump callback functions 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" add new rx/tx callback functions to be used for dumping the packets. Signed-off-by: Raslan Darawsheh Acked-by: Bernard Iremonger --- changes in v6: rebase the work on top of the fix for compilation --- --- app/test-pmd/config.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/rxonly.c | 4 --- app/test-pmd/testpmd.h | 15 +++++++++-- app/test-pmd/util.c | 19 +++++++++++++- 4 files changed, 98 insertions(+), 7 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index a6db5df..55fec7f 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2706,6 +2706,73 @@ set_pkt_forwarding_mode(const char *fwd_mode_name) } void +add_rx_dump_callbacks(portid_t portid) +{ + struct rte_eth_dev_info dev_info; + uint16_t queue; + + if (port_id_is_invalid(portid, ENABLED_WARN)) + return; + + rte_eth_dev_info_get(portid, &dev_info); + for (queue = 0; queue < dev_info.nb_rx_queues; queue++) + if (!ports[portid].rx_dump_cb[queue]) + ports[portid].rx_dump_cb[queue] = + rte_eth_add_rx_callback(portid, queue, + dump_rx_pkts, NULL); +} + +void +add_tx_dump_callbacks(portid_t portid) +{ + struct rte_eth_dev_info dev_info; + uint16_t queue; + + if (port_id_is_invalid(portid, ENABLED_WARN)) + return; + rte_eth_dev_info_get(portid, &dev_info); + for (queue = 0; queue < dev_info.nb_tx_queues; queue++) + if (!ports[portid].tx_dump_cb[queue]) + ports[portid].tx_dump_cb[queue] = + rte_eth_add_tx_callback(portid, queue, + dump_tx_pkts, NULL); +} + +void +remove_rx_dump_callbacks(portid_t portid) +{ + struct rte_eth_dev_info dev_info; + uint16_t queue; + + if (port_id_is_invalid(portid, ENABLED_WARN)) + return; + rte_eth_dev_info_get(portid, &dev_info); + for (queue = 0; queue < dev_info.nb_rx_queues; queue++) + if (ports[portid].rx_dump_cb[queue]) { + rte_eth_remove_rx_callback(portid, queue, + ports[portid].rx_dump_cb[queue]); + ports[portid].rx_dump_cb[queue] = NULL; + } +} + +void +remove_tx_dump_callbacks(portid_t portid) +{ + struct rte_eth_dev_info dev_info; + uint16_t queue; + + if (port_id_is_invalid(portid, ENABLED_WARN)) + return; + rte_eth_dev_info_get(portid, &dev_info); + for (queue = 0; queue < dev_info.nb_tx_queues; queue++) + if (ports[portid].tx_dump_cb[queue]) { + rte_eth_remove_tx_callback(portid, queue, + ports[portid].tx_dump_cb[queue]); + ports[portid].tx_dump_cb[queue] = NULL; + } +} + +void set_verbose_level(uint16_t vb_level) { printf("Change verbose level from %u to %u\n", diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c index 3eca89c..5c65fc4 100644 --- a/app/test-pmd/rxonly.c +++ b/app/test-pmd/rxonly.c @@ -70,10 +70,6 @@ pkt_burst_receive(struct fwd_stream *fs) fs->rx_burst_stats.pkt_burst_spread[nb_rx]++; #endif fs->rx_packets += nb_rx; - - /* - * Dump each received packet if verbose_level > 0. - */ for (i = 0; i < nb_rx; i++) rte_pktmbuf_free(pkts_burst[i]); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index cba9640..c07bee8 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -191,6 +191,8 @@ struct rte_port { uint32_t mc_addr_nb; /**< nb. of addr. in mc_addr_pool */ uint8_t slave_flag; /**< bonding slave port */ struct port_flow *flow_list; /**< Associated flows. */ + const struct rte_eth_rxtx_callback *rx_dump_cb[MAX_QUEUE_ID+1]; + const struct rte_eth_rxtx_callback *tx_dump_cb[MAX_QUEUE_ID+1]; #ifdef SOFTNIC struct softnic_port softport; /**< softnic params */ #endif @@ -764,8 +766,17 @@ 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); +uint16_t dump_rx_pkts(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], + uint16_t nb_pkts, __rte_unused uint16_t max_pkts, + __rte_unused void *user_param); + +uint16_t dump_tx_pkts(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], + uint16_t nb_pkts, __rte_unused void *user_param); + +void add_rx_dump_callbacks(portid_t portid); +void remove_rx_dump_callbacks(portid_t portid); +void add_tx_dump_callbacks(portid_t portid); +void remove_tx_dump_callbacks(portid_t portid); /* * Work-around of a compilation error with ICC on invocations of the diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c index 3ba3b58..f4125df 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -21,7 +21,7 @@ print_ether_addr(const char *what, struct ether_addr *eth_addr) printf("%s%s", what, buf); } -void +static inline void dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], uint16_t nb_pkts, int is_rx) { @@ -149,3 +149,20 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], printf(" ol_flags: %s\n", buf); } } + +uint16_t +dump_rx_pkts(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], + uint16_t nb_pkts, __rte_unused uint16_t max_pkts, + __rte_unused void *user_param) +{ + dump_pkt_burst(port_id, queue, pkts, nb_pkts, 1); + return nb_pkts; +} + +uint16_t +dump_tx_pkts(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], + uint16_t nb_pkts, __rte_unused void *user_param) +{ + dump_pkt_burst(port_id, queue, pkts, nb_pkts, 0); + return nb_pkts; +} From patchwork Wed Oct 17 15:22:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 46996 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 A9A211B135; Wed, 17 Oct 2018 17:22:33 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60063.outbound.protection.outlook.com [40.107.6.63]) by dpdk.org (Postfix) with ESMTP id 0A4857D04 for ; Wed, 17 Oct 2018 17:22:25 +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=tqiSmnNvJ1Z9hmX959TayRbL9WewbOeMAucjWiW5+ok=; b=HqT4C6ibugm6Z/A4ag6KL4E4tln/Ug2FP6PNtUM7GtsG8b1nw1Tiwb3XyIdZOVYlfLd2RTKZcrNf1VKAUeBUk2LyIcy2YoH5CnSLIS5ZDYksPqVYwp7QgILG+eyzrrqoR/HXVTrFMJzpymPcF5REsfF+zpRLGXbuYwG2dH6URpI= 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:23 +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:11 +0300 Message-Id: <1539789731-18409-3-git-send-email-rasland@mellanox.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1539789731-18409-1-git-send-email-rasland@mellanox.com> References: <1538897848-1693-1-git-send-email-rasland@mellanox.com> <1539789731-18409-1-git-send-email-rasland@mellanox.com> MIME-Version: 1.0 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: 4fa51e7c-756b-4609-87a1-08d634445786 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:Wqtb3bsov8WtyM/ooI1Sw9mmJcfX+u5J5+kJ+F5w7n+VZZXONz5b/O0YpUZI1/60EDaOhxFEQatt+t+OrYlrYkpQjikDfIaTdgDrQQN49ZDgwg4mFwth3mt5gRH8/BaIr0NZauWEl/jJu69hEZpbqsy6ebtWnswLB0vr9vHF+xKxs5tR03BMJk0DO7Ima5l3T+Ax1cZnnHEVPLuWNNozZDh8uF+G8XCq0XGU5wDxF10w0ofC+c1DEGREAPanE4cq; 25:9ntvhpmnK0ktSfgNdbd0R8k9RmWxBI6PDbDW31UEdZGjgOCGXgR+iZZe/dSZW5J/ZrfK1LIy6Efcx6Zkv/lYHbWqm7poJzimkSyhzV+fBiLUllifHQZ8faf/0hUYXM0IzePpifmYgpVibao1tbjP/5t8LYNWCpuLdZ/d+mhYtfcja5rPgMQv1qp/KzvDuotPqoGR7QMz6+ap4BilgK6+DaRQlmDp6FDQFo1wy6Gu3PVb+GL7KyIaCX1obdJsVdQ7CvN3f80SGMBuxhheQp7QcdGp1Q7/Cmc5s1GczzJ/AQcCWQHxW2bOj7FzZvGM+wymPGxKPUdeYKQXelI9OzrW4RM1i57/vKc3Avh/wmUdBNA=; 31:Vk9XQDr0UIGWI3grGC2d0vdvIMd1eJbpluYP7pHcLYooeBfeNrqDwFqD0xXV9iXc/1Vqgf3nbJbPY40ARN9hh7Nx4tvxZBzkNk/C7Aqv+w6XTy+BpSVqgFuM0H3m6b5tQEaGrbfIOIOxpAv/CiTGyWhaeSYW6F53CfOTqOGhe28v+BUn8Tx4j6KaNMVakATcoYXCWcyVakJuD3g2Mfl8sZuraScTeUUx+P3YY0MRyo8= X-MS-TrafficTypeDiagnostic: HE1PR05MB1257: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1257; 20:VizMMp0GnAz4VTt3yvcllGylzindFSU1Y/RKzwcS0qkRLt9qJuee8ElgKZ7zxh0OkcucUjXhpPF9hU1nGSaTikc52IRt4XolE6GaJeYOFjt7fTn3QiYv8F7cJVm40qXQlEVEgxAvfgMGkI2AmfBl8Tcd6jeEDMQMdbm1nv+gYjwIRutX/7kKpQ39PVv8na1mmQRvy+ZL+pFnNHjM0I9VqSz7ACa0QoHcKBrv4fRFR5Sb+MrDorAkTRa8GqdC7j3Ip6bJjnEi2/h16UqfSNrdRHbDBIxpm2Yj1BpSF3OzMYgkEzLvtE0SkMAFiSviZeNmKIwARVunspY3UcGiF0zYxMf3sC3+TNcRiB4UrrcDnMoFBJ9kMxlYkcG3qs6GqYWg5RhK+G96+C3CUG69SxDEa4YICumrxrW1yTYORo0vXmmAeANpMVE8BriXpd5JBNkk4fti8M5tk1n+MQfOpotwRpQhDq2dDBhwqEgRjDsZDPx+oN94Z2lU9CR6WuMVU0cr; 4:QwpKgZM1HG92d6RPWLe4OvvleCJTREwSmIASnLuj/BAZNtWH6rHhbJ8/1OWnrUS6+x2bDrxN9gjxvzGNCZSCgeSmYO0Xgip+yEIMZmsecvQ73UgEmEi0cSGFjs/p2UPnSyxPNh1F8l+mZwIhDdgc8C7NFWWfrCTSJ6tGVeHxwWEJmG4vybVqCkhDiXTgk2ADfb5TYgEIPr7VmvOooGdsA2QwSRYbOi4sqaGi9jbESX78D294EuEt7V5UFWpoRhL0tp/oaQ1zfVZ+xkeF1PHcvs0y4SL6C7HqDeTXzz0Ab2JvbSS2Te3LkiFrPgK7TPLm 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)(446003)(6116002)(11346002)(956004)(2906002)(50466002)(476003)(7736002)(486006)(21086003)(2616005)(36756003)(50226002)(51416003)(69596002)(48376002)(478600001)(5660300001)(386003)(86362001)(2351001)(52116002)(7696005)(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:+QfnY4VsQ//ClTHZAeXqJH+CSNESh6FSgH11was+H?= X9tr2+VBMW3zMAE97NAE9PPqapwE8U1yaQFJKYb/biL3Fvh9l6SZCkGlfkXSF/7WAzYKaxl0fjqmWDkyMVEwZKzpj3PGVgVVaf3XNoJSmWAWrH8+AJe3Npx3r+zphDCCYsovwetgXBdWqkfqMj2QKE2Q9JzHS/Xwfc4K7jdmf/PO2NXNMmaBXSNh7JCth7NpXydblG7+jwxQFNAFiwchdx6XEbL94G0bSj4JOvt9d+YrjQDTSvrQbMtF9c+K55pmuNud6vZAmU8v5sZIgbuwI2BLlWQr7v9BQqzejI3oyRdbPA9IzE7TCYzFeDjlBE7oln+etcSSXjtZ78WgC59llu1rchnKBuVsd6+RXbM3QyKgm1LhWJy85/eyl9KT/jsAC2DGeL0PyWLGQD+sVNBcaDAtBpNLjs8d03NJahJC38M4koejAPqRH9Qjg2fj3y1HfZyKdXgKX6imFBtEbtRwGmLwA7rDBceR+sg0ICX4I9REZ/gM9RYGNtTVAkTkhdpcn0BoNQZ+B6eJ5pYeSgqYje+GB2OyguvsAAfx9yWwyqPeydkDb4vb3lA7NZ1iqy5mqLM/zAjHA+21uMAAa2wB/MfgN6/aqnDJeF2ex4/A8WAJ8nYoZiWo/058VfJ5O26Ip3ySefT+2RIuXs26Dxh84JF3jC9ZakAY99oFSDJHlHIhWEIiPSnkmYMxUIOJq1fVG/yP0ls+qRzc2mO6XFqRLxZqLF6ncMBbiNGGoyJsCuWgxKUHllXobanIFdSvvfspGJ6XnhE1BFrPq1Vp32Dv3YgGkLp/OsHJqiHM4SOF6iblfujcAlYNFufrMZ1m6xxV7TEZGn8+C5zMi0mgi58b8ZaBbd0VyhjbfFBpDAo0oj7baO9wLYJgrccuvF8Ey3iUqQojDAy1bHgY/9AwZtvJTysrWxnDDXdfKcRiWQdinO+z/nJvzB/XJWvtHF1DUWAkuw/F5b/F9JZ+PosWeknqBa5tZutJ8Dw8RwPqG3u01eXKDUHyDUNRJNhBsMf6EcT/Z0dA3epXnODgfjDjKI0ozda6LNcYr5g+70fGMTfe3tBwQKP9z/lT3XzmntBMvHVsJXBtvNTsk6G+CPFdwloQBqzG/IrsQH5fMiPKIz2c7Seq8HkHYlzMfFS8BKY4MA68dvmS43BI6f/bcRPEwELrKrMDqtHo2DqKBlfOZOtdAG7eEUPvNj6DQ5tomFY0P6yax8YDFMhSRr5hejNX1mQxKN8 X-Microsoft-Antispam-Message-Info: uHmas6xbCnoQHgxUegGropKVJ+9ZJb4QDXPLKuckcfljcf81S7X5tord+5Sxv8ke1Ym/zB1WBfwfVoWm3FPh7PiiVEhFW8kYpa+xlcG/IxIP7p5gRfBxBSp9BWcQWPvfp44twKqcXbZ1Gat9s9v2TR5wJTHmYNR1pCYamAU7wm1YwZPb4e7LF6XUsFc7MCdPgzPHdr6r43xrOAeQJkDJrkJn2qm9OdNnAR1EamjMEGbNrc42/xrjlsanq+2lgvUoXHDw4wmznefTjJkf2kK9sSRSu68UAd0/tPcGHCu0I/oPwCsaM4ZH/bw5BWo10FdWfY3VVlMxkYqkRYrZPg0nVLqpSpBmKrGm2D0nbk7xzJE= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB1257; 6:wDMTaGGSb9kFrMkmdZNEvXW1fKLy+Q8vgMQRBHaQaWFzZRmUtD3sH51e6Bi7zOQyecZfijc8guKBCvRX951tCrkitIXDkELpHszrN9PXMbRynba0CV1YycQbuKTHWwuK1Mh3DOdpWIG6TXPTlC3Abo5n7lrLoVvgkSS11nT0gY0JbhaOStgkLH8cnkK/1ZeCh3+g75v+lU4zHkt01QW3EgRMG13HJiZzouwvJDtJto/3U40UvEBUdsn2y5LmyQ7gS3VPedWUkY+oavEGwZZb4qFLaU9IL39bMO2zm9CUddFgJpYKGu8nee7K2/thkwFCUR+FIGuLYLv+84FzMFmn67UjXb23YS3+hRdcPXJE3/4lKNprgFWXJeNjH0vTYQ/kd7QUL++pAi6rZ9HmhYztf687A7d1xRMw4nVou9r/6PcFT9qTGdmFNu0izptmLobyXOOmfBzs0faV+ziVQvAeoA==; 5:XfFXW2UdrJ0igMGUvq6yqXKk79Z5FjQWEtp6okmJVpdk7PyTqUPs8svVulVLYxTL3f4uiwGQAeDJ6Au+hbExvnPzA3GCD4M+YwMm7kqxouoWKlX2lqCyL0A63Ng/fwJkKgoe3fUTVA8j/eQpoM009ZO523DdZv3ll1RzAF3Ie6Q=; 7:yiLpjOt6L8MDQyrfoV1kuQrlRmZMMn0pU8pyZXY+aCTh/y+PzeVpfDrdtVJiirOGBeJ8+iouPmU71te3abkqMpjr1jLaEnO2h6YhZOcpL/yQRn5PlqFNDVjy4tK0S+Cry4HXXt7xSIUV0eU+jG0DLlRPC5Hbdoyukdj/0yxJBNSTl1FeBOQaPfWaAyPAMYuUxJeiJOJ0uSeUp8ukz9VBj70QnCWAa/9r4b3/9hSaatHCBaZvZPPP++MDYG+E1/46 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2018 15:22:23.7256 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4fa51e7c-756b-4609-87a1-08d634445786 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 3/3] app/testpmd: set packet dump based on verbosity level 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" when changing verbosity level it will configure rx/tx callbacks to dump packets based on the verbosity value as following: 1- dump only received packets: testpmd> set verbose 1 2- dump only sent packets: testpmd> set verbose 2 3- dump sent and received packets: testpmd> set verbose (any number > 2) 4- disable dump testpmd> set verbose 0 Signed-off-by: Raslan Darawsheh Acked-by: Bernard Iremonger --- changes in v6: add documentation for the packet dump --- --- app/test-pmd/config.c | 25 +++++++++++++++++++++++++ app/test-pmd/testpmd.c | 4 ++-- app/test-pmd/testpmd.h | 1 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 6 +++++- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 55fec7f..1696623 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -50,6 +50,7 @@ #endif #include #include +#include #include "testpmd.h" @@ -2773,11 +2774,35 @@ remove_tx_dump_callbacks(portid_t portid) } void +configure_rxtx_dump_callbacks(uint16_t verbose) +{ + portid_t portid; + +#ifndef RTE_ETHDEV_RXTX_CALLBACKS + TESTPMD_LOG(ERR, "setting rxtx callbacks is not enabled\n"); + return; +#endif + + RTE_ETH_FOREACH_DEV(portid) + { + if (verbose == 1 || verbose > 2) + add_rx_dump_callbacks(portid); + else + remove_rx_dump_callbacks(portid); + if (verbose >= 2) + add_tx_dump_callbacks(portid); + else + remove_tx_dump_callbacks(portid); + } +} + +void set_verbose_level(uint16_t vb_level) { printf("Change verbose level from %u to %u\n", (unsigned int) verbose_level, (unsigned int) vb_level); verbose_level = vb_level; + configure_rxtx_dump_callbacks(verbose_level); } void diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 5dbbf78..3c42924 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1988,7 +1988,7 @@ start_port(portid_t pid) return -1; } } - + configure_rxtx_dump_callbacks(0); printf("Configuring Port %d (socket %u)\n", pi, port->socket_id); /* configure port */ @@ -2087,7 +2087,7 @@ start_port(portid_t pid) return -1; } } - + configure_rxtx_dump_callbacks(verbose_level); /* start port */ if (rte_eth_dev_start(pi) < 0) { printf("Fail to start port %d\n", pi); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index c07bee8..3da728c 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -777,6 +777,7 @@ void add_rx_dump_callbacks(portid_t portid); void remove_rx_dump_callbacks(portid_t portid); void add_tx_dump_callbacks(portid_t portid); void remove_tx_dump_callbacks(portid_t portid); +void configure_rxtx_dump_callbacks(uint16_t verbose); /* * Work-around of a compilation error with ICC on invocations of the diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index ca060e1..60855c6 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -449,7 +449,11 @@ Set the debug verbosity level:: testpmd> set verbose (level) -Currently the only available levels are 0 (silent except for error) and 1 (fully verbose). +Available levels are as following: +* ``0`` silent except for error. +* ``1`` fully verbose except for Tx packets. +* ``2`` fully verbose except for Rx packets. +* ``> 2`` fully verbose. set log ~~~~~~~