From patchwork Mon Sep 24 12:49:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 45200 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 283614C9F; Mon, 24 Sep 2018 14:49:12 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30080.outbound.protection.outlook.com [40.107.3.80]) by dpdk.org (Postfix) with ESMTP id 734064C8D for ; Mon, 24 Sep 2018 14:49:08 +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=2od4BKIyGSZ/Fj1Ih0Qpzopthz4iUQcghtVEeVxLtus=; b=MFEiFoh5uZiImKpdotjRy6WAsMLBsvlvY/WARB8ObsAmydW+MQi6202/kqLFs2GrHS9hUw9qMhL4Of5+HBHSm2JtD6kyVM+3F5lZRbWKPGa3X5lXms+oWBLdpcpqx4xXDNN4QqKRWhWtMZzvcBnkUbNFxavym9Nevca0QX3n0Ck= Received: from DB5PR05MB1254.eurprd05.prod.outlook.com (10.162.157.140) by DB5PR05MB1205.eurprd05.prod.outlook.com (10.161.244.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Mon, 24 Sep 2018 12:49:03 +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.1164.017; Mon, 24 Sep 2018 12:49:03 +0000 From: Raslan Darawsheh To: "jingjing.wu@intel.com" CC: Thomas Monjalon , "dev@dpdk.org" , Shahaf Shuler , Raslan Darawsheh , "Xueming(Steven) Li" , Ori Katz , "jerin.jacob@caviumnetworks.com" , "david.marchand@6wind.com" Thread-Topic: [PATCH v2 1/3] app/testpmd: move dumping packets to a separate function Thread-Index: AQHUVAT4+O56diyQ4Eq0UB7BuKFsKw== Date: Mon, 24 Sep 2018 12:49:03 +0000 Message-ID: <1537793304-27883-1-git-send-email-rasland@mellanox.com> References: <1536739583-29166-2-git-send-email-rasland@mellanox.com> In-Reply-To: <1536739583-29166-2-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: VI1PR04CA0105.eurprd04.prod.outlook.com (2603:10a6:803:64::40) 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; DB5PR05MB1205; 6:BnsEEiIlbPVl27dBUBnMxKar3Vn8nkkj705ADdtmWbxfkLfRQxwZzrEWD8KMRirwMsNwnNIELhozS/Qpd1ALdlwymF+0IGu2Tzbe9A0fg6UAvGZnS1JYrBwDtk81W3A1aZ6hlbQkStCLjZNYjku06G6iyuuzhLgsR2thRZsvnDMHHebnE51ey6VZf9jfzBYet2CIe+2HWeSp4fRHM3zKhrMpKwrH92Vk9XQWkUbSTGcPrGHBe0DwttGsVPkHVW/wjCYOPhdA/EZYTTuPguN2VuIpMupGahHYbP993jbOoBMX6GEpVJTQCbmXPwOEwM6j2rai6RuCoCM2dfIQp/boMMm0zx/+x9a9+u8NELysqWOWdHfiR16B7Zy7C/NPxt9FhN4eAWXdNCmC1j2Oun5UWHBQnVrppkP499hCGnFflO5U0kGMQZoj5vxu1diAKMh3rV+YlUMQfST/tjmvf7rWBA==; 5:7jhJnEUkz/QRFV5diJgt9Pc31Cul0w0ePIMa0xQyHe/NkoeippbU9vZT/7tpZHSkwsf7G0b8zTsuzMojbxYwGLoXQbBxoefE4qBCI1uhmtPQFYjOafzGuxWhlSmlDAojhCHtuTU72PFs0wnuC1dK8tTc9Ge56fNwJi6j2SjlJ/8=; 7:NS149SG1LpG7LxeyivcEyhzNoRDxImbrVJITNEGiFjZ9SCrpjRh9hOQGbRchSOA9xO5hij7kDkBgJ7H3TAB+piqb8oTGnw7FSpiZ7qfXL6A1HRtyIcHk+v01OVbSoAoZ57dZUGmUJKDNQ4ZM215D+emQ0lQKmZqHKP3dVQuJegEnBlxwEF9015Cc8/2sWdvzvrJcvumbQLO1XYt7w/JhIW4FGtjO+lm/NrVjm7FPytkL9826j0GCXbJ31hzzAHf0 x-ms-office365-filtering-correlation-id: 41af8616-626d-46a7-93da-08d6221c1a97 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR05MB1205; x-ms-traffictypediagnostic: DB5PR05MB1205: 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)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699051); SRVR:DB5PR05MB1205; BCL:0; PCL:0; RULEID:; SRVR:DB5PR05MB1205; x-forefront-prvs: 0805EC9467 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(396003)(346002)(136003)(376002)(199004)(189003)(2900100001)(71190400001)(386003)(6506007)(2351001)(102836004)(8936002)(36756003)(6486002)(478600001)(68736007)(6116002)(3846002)(5250100002)(2906002)(81166006)(81156014)(8676002)(25786009)(106356001)(53936002)(26005)(316002)(186003)(5640700003)(99286004)(86362001)(4326008)(52116002)(14454004)(105586002)(305945005)(6436002)(54906003)(11346002)(476003)(7736002)(97736004)(446003)(256004)(2616005)(486006)(6512007)(71200400001)(50226002)(6916009)(66066001)(5660300001)(2501003)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR05MB1205; H:DB5PR05MB1254.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: VLRhVKpqlAaqI2/4vkmTrEVSbfqXQT7WKZUY1/BQFTMR+5Gbb3j67qJab/nSlTekjqGJbCSUUjwThsczrdhRo8nNC48bmMAG7cpX1OubfBcilEVKbd9MdHLcMMRFSEiRboEHazLwL0wz8dSkGysEvHj0bpZC7uniVVW6FcUHaggzIyEBt3cmh4IBxVDhGovbT399zmvOdXF26xlC1SR+ES0VS6gQrf/PUthsvTEIdD7ow70A1h+b69EJoA9US/+cF8cz5fjXTCd7NtwyhCnK7pNJ3wNiWBJ5J0PUeIjxesjK9OIr4jspWz3TBNFq4FzPGTol1Yi5Ql+cpLw/kYXn8A5h3D9kiUBoZ0K9txvVZ6A= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41af8616-626d-46a7-93da-08d6221c1a97 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2018 12:49:03.0543 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR05MB1205 Subject: [dpdk-dev] [PATCH v2 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 --- app/test-pmd/Makefile | 1 + app/test-pmd/rxonly.c | 134 ++-------------------------------------------- app/test-pmd/util.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+), 131 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/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..97c8349 --- /dev/null +++ b/app/test-pmd/util.c @@ -0,0 +1,144 @@ +/* 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; + + 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); + 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); + + 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(" - %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 Mon Sep 24 12:49:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 45199 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 0CD894C8D; Mon, 24 Sep 2018 14:49:10 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30080.outbound.protection.outlook.com [40.107.3.80]) by dpdk.org (Postfix) with ESMTP id 52E624C8B for ; Mon, 24 Sep 2018 14:49:08 +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=ogHxNYgIvOyAFElCX0PNQv9D/SBZ0/wq+vPvrCrh5Q0=; b=fKCHM9IA+OG3biDlTmYeoFMN9SdjiZMcDSLq1cPsfeNpAXnhFeIAUmzP2mOacA7iH1T9rDEmhnrF/es8T7Dm9zmt5tRqqpqFVZfbSM3pLugumeafUbsNXZKX0ExvKTYfSBimWhwuEfZkILucL7jGlS/biXZXF99RTB2XIHx3/XQ= Received: from DB5PR05MB1254.eurprd05.prod.outlook.com (10.162.157.140) by DB5PR05MB1205.eurprd05.prod.outlook.com (10.161.244.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Mon, 24 Sep 2018 12:49:05 +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.1164.017; Mon, 24 Sep 2018 12:49:05 +0000 From: Raslan Darawsheh To: "jingjing.wu@intel.com" CC: Thomas Monjalon , "dev@dpdk.org" , Shahaf Shuler , Raslan Darawsheh , "Xueming(Steven) Li" , Ori Katz , "jerin.jacob@caviumnetworks.com" , "david.marchand@6wind.com" Thread-Topic: [PATCH v2 2/3] app/testpmd: add packet dump callback functions Thread-Index: AQHUVAT68boOsol2NEekHP/d+J2RqA== Date: Mon, 24 Sep 2018 12:49:05 +0000 Message-ID: <1537793304-27883-2-git-send-email-rasland@mellanox.com> References: <1536739583-29166-2-git-send-email-rasland@mellanox.com> <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: VI1PR04CA0105.eurprd04.prod.outlook.com (2603:10a6:803:64::40) 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; DB5PR05MB1205; 6:s+E5pN2CEv5LrRqVq9R9ABaDPvNHYLBgnY6i9ZrDW+K+nupcU+uELGZ5/kFTxOMFFaRCQ2HAfS3Ql2g0dNTKpFNgpOp92DKmmZO0R3QIZJ+qCnxX70OoWk7rzMt6gtXoyBBhCG1YvUuGl5MSf1N01E+LFOQh5oWc4ySeD+10pG52GLokfreRaQxpVVpJNddtAsurWIgkujuMu8eJ5LQldcXisbeqZxj7ZwfqhfxMdsVBk8sgkB2qEP5IEtiJOtl/b4lNqhTm3HrBxNSmw88n/qtMu9W8YbfK0OMNX5sgEjbWEp1dzTHrqnjBOTe6xnKBspkBPLVhJyR4tGBPNbgK4lLFhmZ8O1OE+68GVQATE/O8uE1bGNf5TPXKoTaKDmUEAGXMlzS2oV249QYulM11g4+QHuJkls4bZGtSkAt5Bg6YexPAg5cp9CYjW1AnrdPdu9Tquv3KG/RkEqRz2/6pSw==; 5:x0mSOC1+LzaLlW+j6PkP9XWOGxT7tZCGVgop1InujRfUaEzO7Tzz0VoKMtosCcQdX6cQnHeJLxGEpmm7Xuo1rsjwa00DrXjxOaYur/XIbos2xyZZoyrqyJEHTXawTqX4C0tlXYfSbvkNkxWUjmUMWUED/0yZnP8xYu9PdmyL0B0=; 7:hqC4U8zsVqh2GFJAVSzEzvRMBSGw5NogM1oV01gQs5tJXkicSW4i+J5uDoLQxJRpRLPVWQz/9BHQV7lb1qAbhKUijgcqiXDVVWpbeIJjtRO7ib1zsikpYPK2cgIDcnBZb3vPMcoAxK6f9VikY9gGdEfP+0C+Q8QbEVvCwvvXJbQi3ypeOyiXlZtqrefnDDm2fcMaNom4bxqI4p/W5JR0ZisGlp6wuYN1otrJDVEwDLHOmAe1yWmN9SR6QAuxXDwR x-ms-office365-filtering-correlation-id: 7aadbf3c-951d-436e-219f-08d6221c1c47 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR05MB1205; x-ms-traffictypediagnostic: DB5PR05MB1205: 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)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699051); SRVR:DB5PR05MB1205; BCL:0; PCL:0; RULEID:; SRVR:DB5PR05MB1205; x-forefront-prvs: 0805EC9467 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(396003)(346002)(136003)(376002)(199004)(189003)(2900100001)(71190400001)(386003)(6506007)(2351001)(102836004)(8936002)(36756003)(6486002)(478600001)(68736007)(6116002)(3846002)(5250100002)(2906002)(81166006)(81156014)(8676002)(25786009)(106356001)(53936002)(26005)(316002)(186003)(5640700003)(99286004)(86362001)(4326008)(52116002)(14454004)(105586002)(305945005)(6436002)(54906003)(11346002)(575784001)(476003)(7736002)(97736004)(446003)(256004)(2616005)(486006)(6512007)(71200400001)(50226002)(6916009)(66066001)(5660300001)(2501003)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR05MB1205; H:DB5PR05MB1254.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: erN90zUe6Sbyoir+9Jt3apSowLBhUsv65uhr0p5ouO5kTCZd5wPovE87Sf4SlHOsCW3gy+2v4iPX9NecYn6l6cjUXqljMMFwoGsEOYkJElkeu7Pls2ZpxwV+qEPG7YvDzXn6gkDypJobyduRnYzRbe5WejVb6CwLNRosKO4dCE1l8LaE/oDojpIuMRG9RoEoDz3LRzYPbtdvnUvLooXQKWluwd99866pdt60vPzBhOs12KPeHBx0hP/WiyYn/AD/N1/hLoYOnNw++Q96JHEYaOlBOnAYi7CdAV4bufjVZHUqyfzebayeFEMl9c91IPWJhyjulBOBqZi2ibDQW/MfxL39ZS5vZMc/tk5aiaPt1Hg= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7aadbf3c-951d-436e-219f-08d6221c1c47 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2018 12:49:05.5544 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR05MB1205 Subject: [dpdk-dev] [PATCH v2 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 97c8349..9a40ec7 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -142,3 +142,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 Mon Sep 24 12:49:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 45201 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 2F6BC4C9D; Mon, 24 Sep 2018 14:49:17 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30064.outbound.protection.outlook.com [40.107.3.64]) by dpdk.org (Postfix) with ESMTP id 4F9C04C93 for ; Mon, 24 Sep 2018 14:49:10 +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=jrBPhu8IkjY9FTW7cseebeqYb/y9Kq2u5s+nzU+IFq5i1BhiPJmNcKNCLhPrls9KI23OhEMkd2olfn3J+taFb7qgxYTYKTgPcHNPTGPDwgGIeZQpo9dd4swpcUhkKyUutLd0ttEalViXTj2a6TIRGRpoUJ2UZo6t95LyiMS50As= Received: from DB5PR05MB1254.eurprd05.prod.outlook.com (10.162.157.140) by DB5PR05MB1205.eurprd05.prod.outlook.com (10.161.244.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.18; Mon, 24 Sep 2018 12:49:07 +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.1164.017; Mon, 24 Sep 2018 12:49:07 +0000 From: Raslan Darawsheh To: "jingjing.wu@intel.com" CC: Thomas Monjalon , "dev@dpdk.org" , Shahaf Shuler , Raslan Darawsheh , "Xueming(Steven) Li" , Ori Katz , "jerin.jacob@caviumnetworks.com" , "david.marchand@6wind.com" Thread-Topic: [PATCH v2 3/3] app/testpmd: set packet dump based on verbosity level Thread-Index: AQHUVAT7TjQEldJBVEesMXwNIiJCdw== Date: Mon, 24 Sep 2018 12:49:07 +0000 Message-ID: <1537793304-27883-3-git-send-email-rasland@mellanox.com> References: <1536739583-29166-2-git-send-email-rasland@mellanox.com> <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: VI1PR04CA0105.eurprd04.prod.outlook.com (2603:10a6:803:64::40) 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; DB5PR05MB1205; 6:OTJEUY+UjXOR0u37zXM9lOwRxQ/EIF9rPIbpV3SlybEbkEYVeS2uL6Wj70sGz7rxgY00xBn2vlzJQFFuF6ad/4NQzCFzYEWGept6AYBSukpkcA1U0XvkonfzwrxZcn1D/vS/4ixApesOQ66V9EMi5DSSIrH2Lu7ZUdo5cz5X3bARjGL9RjWt5PQ7Qvfw4OsoE+eMhnK5smcDDO7SOiGEgkE7yHcFtRe7KyANou5DU9yBygOhNy+/pvfTkqqxCELuAlbD6/ZWMwm8h6UvQBpoIChna1xOMH7915SlWkabwaFmEXGX5ShmPMwpV9L4I3BvRzEkCMaX24/n3kO98OIvknzMUWFBYVs2on2ReTp1Yjbl5HdH8kovrnwxbQZaR20kh6bfmlbBP1rjX5Qgm2SU9QW63AiJ0vEF7p+uOUWgZKzeuVICjsRNxDWmD78lusCHpaVaK48b9nM87sm4MdxaJQ==; 5:2+4uMiiGo8LYKSJh6gTn/S1l0ojzYbVKWwrkQPMyxqiX3lr5tD+RpVMEbesNY/VXlej/J/ajNUmjwfj0xEb2m3zXWeR4psPjXU2u7TxiZpp3YQDjvTeyAXBrICdAhphmw7RydiX3Wn7w8R4BkOOoXCS1Dj//p/DZqc/0i+fx5+8=; 7:QovLUY5TNIolkrHb6Qqr0ChWGSaUP7fn1GNrEBmcFoUPJIuK7X7xmHsh1P+woGU6SFThZYR59XQV+HUDeMXQE6vCW57diEOFhGsBl6S6ux5MtWPj+x8JO4jTgzj+cMjrZemtzmifYDdOaCMw5e0YloyQDgYhWSVIrEIPv+3aroaaToH+ddBZ50zEbHh+4ueW7GJJYpsAFrKn7msJQyPaL4o6B72bCDyHx2QZLaAmnyUllbDaKSZVFal/wrurNMC7 x-ms-office365-filtering-correlation-id: 5575ae32-9ff2-489c-9d8c-08d6221c1dc4 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534165)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR05MB1205; x-ms-traffictypediagnostic: DB5PR05MB1205: 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)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699051); SRVR:DB5PR05MB1205; BCL:0; PCL:0; RULEID:; SRVR:DB5PR05MB1205; x-forefront-prvs: 0805EC9467 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(396003)(346002)(136003)(376002)(199004)(189003)(2900100001)(71190400001)(386003)(6506007)(2351001)(102836004)(8936002)(36756003)(6486002)(478600001)(68736007)(6116002)(3846002)(5250100002)(2906002)(81166006)(81156014)(8676002)(25786009)(106356001)(53936002)(26005)(316002)(186003)(5640700003)(99286004)(86362001)(4326008)(52116002)(14454004)(105586002)(305945005)(6436002)(54906003)(11346002)(575784001)(476003)(7736002)(97736004)(446003)(256004)(2616005)(486006)(6512007)(71200400001)(50226002)(6916009)(66066001)(5660300001)(2501003)(76176011); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR05MB1205; H:DB5PR05MB1254.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: 6s+BC30RNi754O8MwUQOMAF4lfVYshnUtSgP+2GdI4sbuTZp6y/5FBEB4C6OUUGEFothfvphzus9CBNntEXtge2ZXdpqGZqOXEIKJH7qMOPvnuy1Cac0MsUwPKL7s2lanNYaJfBzssD5p3SwF15eWHuil77FM7dldsZXZevwAoJA6AALXzq5FO8L/4POO78UHLWqHrC5zhRF5rlJbtyXR4PAGuL4KfeeYjMTKWfpU+GOyoX7k+pNKwR6053rmq9xAb/RBs2nRDWYlsuAf/07OywdW2zBOvrfqaUeezo4QZo4mwtqS0Xnl4rUCTiG/DM7F8dJU8SBRSPwTXfU+cDbKA4bETi+NQPhkOX/bqCk++c= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5575ae32-9ff2-489c-9d8c-08d6221c1dc4 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Sep 2018 12:49:07.8201 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR05MB1205 Subject: [dpdk-dev] [PATCH v2 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