From patchwork Wed Oct 3 15:16:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 45970 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 ED0C41B43F; Wed, 3 Oct 2018 17:16:28 +0200 (CEST) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50064.outbound.protection.outlook.com [40.107.5.64]) by dpdk.org (Postfix) with ESMTP id E1B291B20A for ; Wed, 3 Oct 2018 17:16: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=xN22/oYHjJ1LZdtDzmOuBBY6lGS6LfXcpGj/e/PAgdY=; b=njbeZQ+wfkvk7TVEs3zehJTOl/fS9gIM8Dv/21S8DnDE2K2AhEpt4TPHeaE5Rp75F8vCPaes/mYZZKpptRY8Rou4ZbTC1xD89HxBREupVpGlMQ4gjWwwZSCQMf5QypqSy47jNzdTKfAeL9X9EHxeXnBG51bTTJCzRtvoN8uH168= Received: from DB5PR05MB1254.eurprd05.prod.outlook.com (10.162.157.140) by DB5PR05MB1301.eurprd05.prod.outlook.com (10.162.157.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.22; Wed, 3 Oct 2018 15:16:22 +0000 Received: from DB5PR05MB1254.eurprd05.prod.outlook.com ([fe80::3516:b329:5c35:51a5]) by DB5PR05MB1254.eurprd05.prod.outlook.com ([fe80::3516:b329:5c35:51a5%2]) with mapi id 15.20.1185.026; Wed, 3 Oct 2018 15:16:22 +0000 From: Raslan Darawsheh To: "jingjing.wu@intel.com" CC: Thomas Monjalon , "dev@dpdk.org" , Shahaf Shuler , Raslan Darawsheh , "Xueming(Steven) Li" , Ori Kam , "jerin.jacob@caviumnetworks.com" , "david.marchand@6wind.com" , "bernard.iremonger@intel.com" Thread-Topic: [PATCH v3 1/3] app/testpmd: move dumping packets to a separate function Thread-Index: AQHUWywKMlgiKGQWGkOrESVwI6ptdg== Date: Wed, 3 Oct 2018 15:16:21 +0000 Message-ID: <1538579773-23054-1-git-send-email-rasland@mellanox.com> References: <1537793304-27883-1-git-send-email-rasland@mellanox.com> In-Reply-To: <1537793304-27883-1-git-send-email-rasland@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: AM0PR01CA0028.eurprd01.prod.exchangelabs.com (2603:10a6:208:69::41) To DB5PR05MB1254.eurprd05.prod.outlook.com (2a01:111:e400:51cc::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=rasland@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB5PR05MB1301; 6:YsHvlrU02Vwmh3Y4Mnuey6VkrP7Zav8UDfUKrGrZpU9OCWQkaFovOl5WWuha2oCe6Nm0631SGbxUaIR25yTphrB59Rs3EDYieVMuwtz8tdmBFzCRnvAfRz8rVqqezo0XeT/1GIyJoi7ZAVqMSKL/JYk6TEGr56xFUgYLjhTeSB7hS3K3GTIeudWy+TBY3iNOAjweaozaoGvmSSPDnsGJBm8IidJhHiRzFhQNO99HexY1nFwQeKKFuwgt07l1fKNS9xsZ3EoD+cZ0WOvJZEL+/Q5E0ybUEOHBGL89cCYhAZ/RTsOXut67FWObqgbRAERupOh5d2fDBfBr557wDMdNdvhCYoA6DrOIm8R7ky/ipJVoGwjq6WVpunj0Uc1Ru7gqtaO6iHYHajTec9rnESOLWTDm+FXcOiOMEGVVUZNqoesACzmKQ7qUwfn1rTW5aYAJwpdEmiDSLsngHOg9A9Mm2w==; 5:q2tGaqgMivoLgUmA8y/zoflO+b1xuFJzhtrohZx7GzL2xU660vPo5WgNf3QzAR2+wMoCSnXgeRFUPyQdL3NhBEC5IocoGi2DO+2VCR6/4V74LbEkRJa1XbUajseinBP10Fl8eV1dAyH4DlF/JgvcEqrVLurI6914Q1r4bNFM2Kg=; 7:zZUWvIaTke5IdWsDjLg20zRVszogibO9gC/NkewshnCz5lhKWGsaU7XxV7XQQ3mmuVqIRCvqKI4wK8kbJqPAWUOfSDGibJ1vWMAF3tTtlREPzQ6z0/5I3+BYGaHYq5zzatR2rWegC9A/1rntND15hNLDJEJortG6zVrbjIE1Ys7Q5UUdmg0TE3Btb2u3E0YoQQYIojf1hCu42r8wEdnArz7aytn/4XGn/kXTUQs8p04c4AbrjpM2n8UBIHjxVRJD x-ms-office365-filtering-correlation-id: fa976ad1-c947-40f5-1e3c-08d629432cad x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR05MB1301; x-ms-traffictypediagnostic: DB5PR05MB1301: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr 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)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699051); SRVR:DB5PR05MB1301; BCL:0; PCL:0; RULEID:; SRVR:DB5PR05MB1301; x-forefront-prvs: 0814A2C7A3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(376002)(346002)(396003)(39860400002)(366004)(189003)(199004)(2906002)(2616005)(8936002)(6436002)(476003)(478600001)(106356001)(68736007)(6486002)(5250100002)(186003)(5660300001)(97736004)(2900100001)(7736002)(76176011)(52116002)(305945005)(53936002)(5640700003)(99286004)(50226002)(575784001)(71200400001)(54906003)(71190400001)(2501003)(8676002)(81156014)(81166006)(486006)(36756003)(25786009)(102836004)(86362001)(6512007)(4326008)(6916009)(256004)(14454004)(105586002)(66066001)(316002)(6506007)(6116002)(2351001)(4744004)(386003)(14444005)(3846002)(446003)(11346002)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR05MB1301; H:DB5PR05MB1254.eurprd05.prod.outlook.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-antispam-message-info: 43+VjN9RnGZSzO7KdgtqEKdYXfec62UR6IeBCnxg8siw6yRRfYCM5yvgTXNNrzhjHyRpJwDaGE1nWq3ZIIiPFzLjnq9W9TBWz9n73HRFpyu7wU1vM/FohZcDA0R4yZBqwBs607Zkg/QQtt8Jlwuepi5Jotf/Daei5yZF3nDw2XzjyG4B9U38GS12M2NIOAO+JFbB/+ZQtAkt/2rldU6whW/tXW+Rvk5LDgrFkK8biJh4PmvwMjbU5cT8WLqRtXgUOhE28Q2zkh8z0GfsnL7AHAZdDiMGsQ0mCVkxHg2FBiUsvrfE4IJ0U8+K7c1QavdJXxheg3VU0vX96MysTQNOuDPDhp4J+gbf/Tt9VCc4qu4= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa976ad1-c947-40f5-1e3c-08d629432cad X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Oct 2018 15:16:21.9243 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR05MB1301 Subject: [dpdk-dev] [PATCH v3 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 Signed-off-by: Raslan Darawsheh --- changes in v3: - add util.c in the mason.build file - restore missing check for ol_flags & PKT_RX_RSS_HASH. - add local variables for rte_be_to_cpu to avoid long lines. --- --- app/test-pmd/Makefile | 1 + app/test-pmd/meson.build | 3 +- app/test-pmd/rxonly.c | 134 +------------------------------------------ app/test-pmd/util.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+), 132 deletions(-) create mode 100644 app/test-pmd/util.c diff --git a/app/test-pmd/Makefile b/app/test-pmd/Makefile index 2b4d604..e2c7845 100644 --- a/app/test-pmd/Makefile +++ b/app/test-pmd/Makefile @@ -35,6 +35,7 @@ SRCS-y += csumonly.c SRCS-y += icmpecho.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 a0b3be0..b96ab97 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -20,7 +20,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 a93d806..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_VLAN_STRIPPED) - printf(" - VLAN tci=0x%x", mb->vlan_tci); - if (ol_flags & PKT_RX_QINQ_STRIPPED) - printf(" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x", - mb->vlan_tci, mb->vlan_tci_outer); - 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/util.c b/app/test-pmd/util.c new file mode 100644 index 0000000..12bbe91 --- /dev/null +++ b/app/test-pmd/util.c @@ -0,0 +1,146 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-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); +} + +static inline 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_VLAN_STRIPPED) + printf(" - VLAN tci=0x%x", mb->vlan_tci); + if (ol_flags & PKT_RX_QINQ_STRIPPED) + printf(" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x", + mb->vlan_tci, mb->vlan_tci_outer); + 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(" - 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_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 3 15:16:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 45969 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 3E5701B20A; Wed, 3 Oct 2018 17:16:27 +0200 (CEST) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50064.outbound.protection.outlook.com [40.107.5.64]) by dpdk.org (Postfix) with ESMTP id A09581B1C1 for ; Wed, 3 Oct 2018 17:16: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=fgjv/dQKv3OymA5BUoOzkEI38v4989Lx5TIKIx7EnGY=; b=uf2ZQZ7igd7VQNCE2bxO0saDA2+bznDKJHmzG0xbnNEIJn9aDXUxFT40EUVePvgxVYeyf1qD28nXUcxNt9F0i/xZPQoAhNEVDimPfuK73QYWY4imiazoTiHFRYEtEMSUm5FynW3AkbCdNpJXnAg8Ym9pSygfeF+iRKLWi63MuIs= Received: from DB5PR05MB1254.eurprd05.prod.outlook.com (10.162.157.140) by DB5PR05MB1301.eurprd05.prod.outlook.com (10.162.157.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.22; Wed, 3 Oct 2018 15:16:23 +0000 Received: from DB5PR05MB1254.eurprd05.prod.outlook.com ([fe80::3516:b329:5c35:51a5]) by DB5PR05MB1254.eurprd05.prod.outlook.com ([fe80::3516:b329:5c35:51a5%2]) with mapi id 15.20.1185.026; Wed, 3 Oct 2018 15:16:23 +0000 From: Raslan Darawsheh To: "jingjing.wu@intel.com" CC: Thomas Monjalon , "dev@dpdk.org" , Shahaf Shuler , Raslan Darawsheh , "Xueming(Steven) Li" , Ori Kam , "jerin.jacob@caviumnetworks.com" , "david.marchand@6wind.com" , "bernard.iremonger@intel.com" Thread-Topic: [PATCH v3 2/3] app/testpmd: add packet dump callback functions Thread-Index: AQHUWywLl8r8XGf6Mkqt6mR3yaEDTg== Date: Wed, 3 Oct 2018 15:16:23 +0000 Message-ID: <1538579773-23054-2-git-send-email-rasland@mellanox.com> References: <1537793304-27883-1-git-send-email-rasland@mellanox.com> <1538579773-23054-1-git-send-email-rasland@mellanox.com> In-Reply-To: <1538579773-23054-1-git-send-email-rasland@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: AM0PR01CA0028.eurprd01.prod.exchangelabs.com (2603:10a6:208:69::41) To DB5PR05MB1254.eurprd05.prod.outlook.com (2a01:111:e400:51cc::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=rasland@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB5PR05MB1301; 6:fig5EBIFZFjvlBAYrw5EWSqLpITf1kkR8C7YXTr67jTRawUescFwzBN8Jhwp7cKcnRIT3NGsZl4yN0XBTkWPfxMb7zmXlcsv/uKooFSavAPzuIJr/csjx8wggHFhxApbpgU2KFdhBYgaT0sAjQTnJxu8db0xl/uZb4YL2IjOB/tvJOhTPCSP9udaoTANx8s6HTpJOGSbtOVMGAFROBiu46I2r/eyW4Lhmt80hIcrK3eC8OGw86bxwF/Qgyp1oEq8D1IDi0IsnyV3Qgid6ucTajzyRi35ZlrTwamewzpZ0jSfCT4oeglnc5/11y0dx6NXj9stZ2BppSTdDdou7HUn0wrqYLshpYXVUi+sKHE/eH4po9FgWWaDgx71xBGHNYp5Wi19j07XcxOLTLcyb7SoLZeEp/aNtaEHlrOlMAEnAw+8k2kNM1WN6ZHLR2YtETHCUc5jBkXUfsxiJ5w15eeNPg==; 5:DApMCD+wjtN6qKeo+BYgKsy4D5H3EugzQEVD72LoqwhDoPH+PB41DXt31enWpbf5YvyQHDFc1n1m9kxLYy1VeIsQdzJRPQ2a3qfXrB4ZnkocKZoc3B2Y6l9yFLvL5gKl9aDrjOWC9ymdCyz473oVTwoT6vuuD9/cshWMFzIcJTg=; 7:V7tZtcq8bRRJStyECD/ZgvPVF+I7fF5KmebyV6w9f0ZiOu5NjxdhHvrc8stSbygeIGeHfjtsaW3E9zaO8JffD3ejkoFQ0TtfTwVRK7kSl36DtLj8+680ykeBTl3hjOG7/C8XVE8XMvwfkQtCTjQDM5++SoMHf5Smz170IB2kq5B2yDpR8xWwfhj50ocKluau7dvtrh8jprwX1HO2RMReyCC9ed/+Y/A99ajdeRjWbJAu7oH87+XEdaOSG0k/3+xJ x-ms-office365-filtering-correlation-id: 312f37ed-bb08-40cc-eeea-08d629432e07 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR05MB1301; x-ms-traffictypediagnostic: DB5PR05MB1301: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr 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)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699051); SRVR:DB5PR05MB1301; BCL:0; PCL:0; RULEID:; SRVR:DB5PR05MB1301; x-forefront-prvs: 0814A2C7A3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(376002)(346002)(396003)(39860400002)(366004)(189003)(199004)(2906002)(2616005)(8936002)(6436002)(476003)(478600001)(106356001)(68736007)(6486002)(5250100002)(186003)(5660300001)(97736004)(2900100001)(7736002)(76176011)(52116002)(305945005)(53936002)(5640700003)(99286004)(50226002)(575784001)(71200400001)(54906003)(71190400001)(2501003)(8676002)(81156014)(81166006)(486006)(36756003)(25786009)(102836004)(86362001)(6512007)(4326008)(6916009)(256004)(14454004)(105586002)(66066001)(316002)(6506007)(6116002)(2351001)(386003)(3846002)(446003)(11346002)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR05MB1301; H:DB5PR05MB1254.eurprd05.prod.outlook.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-antispam-message-info: 31hpJxoFepEBXeN3UWydJxWJvmYyzBjbHum+r/Tm0joCNgmGvwJl7+t0Gvozk9Wz7coKhQZa+fL2/KL6py+1Bh1Ln6ImhlzF+0lMAd73dyeQwbwBIt4aeg2is3hZ3alXWAaKdG+DPLnbRYg1IMz7iDv4yWRRsEC17lwOCX8SDgTOzOfwKyP4Y9WD32+7TaRVZg8AeiLOI3eMK2lKdKITZdLyVVyPqD3g9UAb96UpvpBApkPYJ5Qh5sTX+1cLTtawPxaYuoNnPQx/6WHe80sQN+jTQkRepsrhWB7i1OwX9KeH7EEMYjRQliagoP03AN/M5b63Ii68Vy790aXR+zoiQZMW+ti3GuCjIdZWvEBgs7s= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 312f37ed-bb08-40cc-eeea-08d629432e07 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Oct 2018 15:16:23.7478 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR05MB1301 Subject: [dpdk-dev] [PATCH v3 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 --- app/test-pmd/config.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/testpmd.h | 15 +++++++++++ app/test-pmd/util.c | 17 +++++++++++++ 3 files changed, 99 insertions(+) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index a0f9349..fb45fea 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2896,6 +2896,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/testpmd.h b/app/test-pmd/testpmd.h index a1f6614..c0d7656 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -180,6 +180,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 @@ -743,6 +745,19 @@ int check_nb_rxq(queueid_t rxq); queueid_t get_allowed_max_nb_txq(portid_t *pid); int check_nb_txq(queueid_t txq); + +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 * rte_be_to_cpu_16() function. diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c index 12bbe91..3d111a2 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -144,3 +144,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 3 15:16:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 45971 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 E72171B450; Wed, 3 Oct 2018 17:16:30 +0200 (CEST) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50075.outbound.protection.outlook.com [40.107.5.75]) by dpdk.org (Postfix) with ESMTP id 55E661B3C0 for ; Wed, 3 Oct 2018 17:16:27 +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=MySaOVrPXJv1fdlMr12YDLN59jvMh5036pUt9NnkhpY=; b=QD8Xxn7ArsD6rcmQpLPvzWS6riQNncxgZ+1je+WF2R45aKDxkdpf9d6JnAy+s8lY/ZdKWp8MtwwfmRHVHWwWCPb12gq2VRqkRwmSvXdh4b5QVKSZROybnpI1M7lK4jj5Z5y+6iUK4TInTWGaRnR3D3yGB42VNuOoCeYAd1TKcsQ= Received: from DB5PR05MB1254.eurprd05.prod.outlook.com (10.162.157.140) by DB5PR05MB1301.eurprd05.prod.outlook.com (10.162.157.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1185.22; Wed, 3 Oct 2018 15:16:25 +0000 Received: from DB5PR05MB1254.eurprd05.prod.outlook.com ([fe80::3516:b329:5c35:51a5]) by DB5PR05MB1254.eurprd05.prod.outlook.com ([fe80::3516:b329:5c35:51a5%2]) with mapi id 15.20.1185.026; Wed, 3 Oct 2018 15:16:25 +0000 From: Raslan Darawsheh To: "jingjing.wu@intel.com" CC: Thomas Monjalon , "dev@dpdk.org" , Shahaf Shuler , Raslan Darawsheh , "Xueming(Steven) Li" , Ori Kam , "jerin.jacob@caviumnetworks.com" , "david.marchand@6wind.com" , "bernard.iremonger@intel.com" Thread-Topic: [PATCH v3 3/3] app/testpmd: set packet dump based on verbosity level Thread-Index: AQHUWywMT5rebpr9pE6jRSnUjbrxNw== Date: Wed, 3 Oct 2018 15:16:25 +0000 Message-ID: <1538579773-23054-3-git-send-email-rasland@mellanox.com> References: <1537793304-27883-1-git-send-email-rasland@mellanox.com> <1538579773-23054-1-git-send-email-rasland@mellanox.com> In-Reply-To: <1538579773-23054-1-git-send-email-rasland@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: AM0PR01CA0028.eurprd01.prod.exchangelabs.com (2603:10a6:208:69::41) To DB5PR05MB1254.eurprd05.prod.outlook.com (2a01:111:e400:51cc::12) authentication-results: spf=none (sender IP is ) smtp.mailfrom=rasland@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [37.142.13.130] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB5PR05MB1301; 6:HXdj2fs6mgZOtM0/eMHwHlrAJhEhMCeULGnHSeJfoKA2MubpS2u4emXmKpxCtTG1CZrHnLLFlNWCJhjEO7tQYa0nDuWLULRNIgVr7c484vRALFtq2SC3xAk69iPjWI75npX7HReDFNJ5Bmy5enNPru4wFUJEwFmyCmT73FDQh8tQxuORpR++pY94ndaN0vw5lmwtHeDbmoxeOX6y1PJRa6+NrS9B3fnNHppvGisgwadoibqAYodcSFYUTfZeewmzdqWLODLYq1gsl5tS9ad5jVHKaLGZhRw+nNIqCI6nJ0tmesgpX2dFs/hN3PK86nltpcPoHfNLmCgre5s4qPnk0Z/7GDakgY2/pQJSR+rt/OFEhv+xxhH0DAFILd6M4LnorS9tTVoMPT/LVlPrFGgh26pJZbla/g4mg32ZVxGG7D/zv2S2+AMz+C2uj7TYJNroG7J6fD/8QnvRlY4aasOHgA==; 5:sQEHqtcmGxv2HLeyi8ksUQ1gHu/KVbbpcrKGr3n/UH8jJt0jNIcD7ifq6QbolH6LGLj6X60kvyXCEWTDa2Q85EAwc6MrzHAxckhPzMWR+UPH1SuUHdX5go21XRRYvWJuDq6Ik7drDPD3d6eGnlOWZKD7Y1LTyR4sVg48DQ7fIDA=; 7:HBkeyA82yL1qN48Qf8P/h0tEvEVv46umHsBV6c7t8f6quf0QEqYziJJ2ukeW1cDnGa8N4+eMlB6i7iwhTWsWmKCgxTaTBnhSMOIj8HdLfbqVH77JsdOgW+S8nRXF1HowefgoLlvO/iFbqKxzlHK4O9/5WnppuvqqD/7K+RTy9DkTEw936eDNQayP2UV0n4Rjmwr1TS/1h0S9Gi8cjz+Texsu2GuCWEWM/3kNMDAmQ3gFBbaqNljhMxDK0AFvc8PZ x-ms-office365-filtering-correlation-id: 2970f18d-f9ed-4f28-ae84-08d629432f18 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR05MB1301; x-ms-traffictypediagnostic: DB5PR05MB1301: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr 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)(3002001)(3231355)(944501410)(52105095)(10201501046)(93006095)(93001095)(6055026)(149066)(150057)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123560045)(201708071742011)(7699051); SRVR:DB5PR05MB1301; BCL:0; PCL:0; RULEID:; SRVR:DB5PR05MB1301; x-forefront-prvs: 0814A2C7A3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(376002)(346002)(396003)(39860400002)(366004)(189003)(199004)(2906002)(2616005)(8936002)(6436002)(476003)(478600001)(106356001)(68736007)(6486002)(5250100002)(186003)(5660300001)(97736004)(2900100001)(7736002)(76176011)(52116002)(305945005)(53936002)(5640700003)(99286004)(50226002)(575784001)(71200400001)(54906003)(71190400001)(2501003)(8676002)(81156014)(81166006)(486006)(36756003)(25786009)(102836004)(86362001)(6512007)(4326008)(6916009)(256004)(14454004)(105586002)(66066001)(316002)(6506007)(6116002)(2351001)(386003)(3846002)(446003)(11346002)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR05MB1301; H:DB5PR05MB1254.eurprd05.prod.outlook.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-antispam-message-info: nzKlOuZ/2GZXJO56NFJJoSb0rQDSs98VpYfT9O22dhLkAa+vndAIMP/shFt2F4vv9RnLpP0qmVSbTPjjY83JhfOeeyZBoTTc1CDsz+Nkuf2Ok9rtwfIl2LFAC/On0gz65ga4Px6nguOPRO1Sd1ojlJvphTglhWoPS7ti+sONnvpKVKZoEQWUXnLHaCL5e0vhlZaXUBB1rXTYg2hhA5qkmk7+aAA24WUo7jvzWgHxwEI6rIRYkJBLA3Frzn476YHVvGvdDxgtpUjhfKAmSWY4+9W/9NvHKnVzmKosi9y3nXaAQ8pM3lVPN93SOirXViBC6AxF1LiVwc/NnhY2JFDQ66rmJxVHyexi7UFQsGHundA= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2970f18d-f9ed-4f28-ae84-08d629432f18 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Oct 2018 15:16:25.4452 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR05MB1301 Subject: [dpdk-dev] [PATCH v3 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 --- app/test-pmd/config.c | 25 +++++++++++++++++++++++++ app/test-pmd/testpmd.c | 4 ++-- app/test-pmd/testpmd.h | 1 + 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index fb45fea..f402e04 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -50,6 +50,7 @@ #endif #include #include +#include #include "testpmd.h" @@ -2963,11 +2964,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 571ecb4..538723c 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1665,7 +1665,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 */ @@ -1764,7 +1764,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 c0d7656..e68710d 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -757,6 +757,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