From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable 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: , X-List-Received-Date: Mon, 24 Sep 2018 12:49:08 -0000 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 +=3D csumonly.c SRCS-y +=3D icmpecho.c SRCS-$(CONFIG_RTE_LIBRTE_IEEE1588) +=3D ieee1588fwd.c SRCS-$(CONFIG_RTE_LIBRTE_BPF) +=3D bpf_cmd.c +SRCS-y +=3D util.c =20 ifeq ($(CONFIG_RTE_LIBRTE_PMD_SOFTNIC), y) SRCS-y +=3D 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 @@ =20 #include "testpmd.h" =20 -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; =20 #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 =3D 0; i < nb_rx; i++) { - mb =3D pkts_burst[i]; - if (verbose_level =3D=3D 0) { - rte_pktmbuf_free(mb); - continue; - } - eth_hdr =3D rte_pktmbuf_mtod(mb, struct ether_hdr *); - eth_type =3D RTE_BE_TO_CPU_16(eth_hdr->ether_type); - ol_flags =3D mb->ol_flags; - packet_type =3D mb->packet_type; - is_encapsulation =3D RTE_ETH_IS_TUNNEL_PKT(packet_type); - - print_ether_addr(" src=3D", ð_hdr->s_addr); - print_ether_addr(" - dst=3D", ð_hdr->d_addr); - printf(" - type=3D0x%04x - length=3D%u - nb_segs=3D%d", - eth_type, (unsigned) mb->pkt_len, - (int)mb->nb_segs); - if (ol_flags & PKT_RX_RSS_HASH) { - printf(" - RSS hash=3D0x%x", (unsigned) mb->hash.rss); - printf(" - RSS queue=3D0x%x",(unsigned) fs->rx_queue); - } - if (ol_flags & PKT_RX_FDIR) { - printf(" - FDIR matched "); - if (ol_flags & PKT_RX_FDIR_ID) - printf("ID=3D0x%x", - mb->hash.fdir.hi); - else if (ol_flags & PKT_RX_FDIR_FLX) - printf("flex bytes=3D0x%08x %08x", - mb->hash.fdir.hi, mb->hash.fdir.lo); - else - printf("hash=3D0x%x ID=3D0x%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=3D0x%x", mb->vlan_tci); - if (ol_flags & PKT_RX_QINQ_STRIPPED) - printf(" - QinQ VLAN tci=3D0x%x, VLAN tci outer=3D0x%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 =3D 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=3D%d", hdr_lens.l2_len); - if (sw_packet_type & RTE_PTYPE_L3_MASK) - printf(" - l3_len=3D%d", hdr_lens.l3_len); - if (sw_packet_type & RTE_PTYPE_L4_MASK) - printf(" - l4_len=3D%d", hdr_lens.l4_len); - if (sw_packet_type & RTE_PTYPE_TUNNEL_MASK) - printf(" - tunnel_len=3D%d", hdr_lens.tunnel_len); - if (sw_packet_type & RTE_PTYPE_INNER_L2_MASK) - printf(" - inner_l2_len=3D%d", hdr_lens.inner_l2_len); - if (sw_packet_type & RTE_PTYPE_INNER_L3_MASK) - printf(" - inner_l3_len=3D%d", hdr_lens.inner_l3_len); - if (sw_packet_type & RTE_PTYPE_INNER_L4_MASK) - printf(" - inner_l4_len=3D%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 =3D sizeof(struct ether_hdr); - - /* Do not support ipv4 option field */ - if (RTE_ETH_IS_IPV4_HDR(packet_type)) { - l3_len =3D sizeof(struct ipv4_hdr); - ipv4_hdr =3D rte_pktmbuf_mtod_offset(mb, - struct ipv4_hdr *, - l2_len); - l4_proto =3D ipv4_hdr->next_proto_id; - } else { - l3_len =3D sizeof(struct ipv6_hdr); - ipv6_hdr =3D rte_pktmbuf_mtod_offset(mb, - struct ipv6_hdr *, - l2_len); - l4_proto =3D ipv6_hdr->proto; - } - if (l4_proto =3D=3D IPPROTO_UDP) { - udp_hdr =3D rte_pktmbuf_mtod_offset(mb, - struct udp_hdr *, - l2_len + l3_len); - l4_len =3D sizeof(struct udp_hdr); - vxlan_hdr =3D rte_pktmbuf_mtod_offset(mb, - struct vxlan_hdr *, - l2_len + l3_len + l4_len); - - printf(" - VXLAN packet: packet type =3D%d, " - "Destination UDP port =3D%d, VNI =3D %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=3D0x%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 =3D 0; i < nb_rx; i++) + rte_pktmbuf_free(pkts_burst[i]); =20 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES end_tsc =3D 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 =3D 0; i < nb_pkts; i++) { + mb =3D pkts[i]; + eth_hdr =3D rte_pktmbuf_mtod(mb, struct ether_hdr *); + eth_type =3D RTE_BE_TO_CPU_16(eth_hdr->ether_type); + ol_flags =3D mb->ol_flags; + packet_type =3D mb->packet_type; + is_encapsulation =3D RTE_ETH_IS_TUNNEL_PKT(packet_type); + + print_ether_addr(" src=3D", ð_hdr->s_addr); + print_ether_addr(" - dst=3D", ð_hdr->d_addr); + printf(" - type=3D0x%04x - length=3D%u - nb_segs=3D%d", + eth_type, (unsigned int) mb->pkt_len, + (int)mb->nb_segs); + printf(" - RSS hash=3D0x%x", (unsigned int) mb->hash.rss); + printf(" - RSS queue=3D0x%x", (unsigned int) queue); + if (ol_flags & PKT_RX_FDIR) { + printf(" - FDIR matched "); + if (ol_flags & PKT_RX_FDIR_ID) + printf("ID=3D0x%x", + mb->hash.fdir.hi); + else if (ol_flags & PKT_RX_FDIR_FLX) + printf("flex bytes=3D0x%08x %08x", + mb->hash.fdir.hi, mb->hash.fdir.lo); + else + printf("hash=3D0x%x ID=3D0x%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=3D0x%x", mb->vlan_tci); + if (ol_flags & PKT_RX_QINQ_STRIPPED) + printf(" - QinQ VLAN tci=3D0x%x, VLAN tci outer=3D0x%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 =3D 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=3D%d", hdr_lens.l2_len); + if (sw_packet_type & RTE_PTYPE_L3_MASK) + + printf(" - l4_len=3D%d", hdr_lens.l4_len); + if (sw_packet_type & RTE_PTYPE_TUNNEL_MASK) + printf(" - tunnel_len=3D%d", hdr_lens.tunnel_len); + if (sw_packet_type & RTE_PTYPE_INNER_L2_MASK) + printf(" - inner_l2_len=3D%d", hdr_lens.inner_l2_len); + if (sw_packet_type & RTE_PTYPE_INNER_L4_MASK) + printf(" - inner_l4_len=3D%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 =3D sizeof(struct ether_hdr); + + /* Do not support ipv4 option field */ + if (RTE_ETH_IS_IPV4_HDR(packet_type)) { + l3_len =3D sizeof(struct ipv4_hdr); + ipv4_hdr =3D rte_pktmbuf_mtod_offset(mb, + struct ipv4_hdr *, + l2_len); + l4_proto =3D ipv4_hdr->next_proto_id; + } else { + l3_len =3D sizeof(struct ipv6_hdr); + ipv6_hdr =3D rte_pktmbuf_mtod_offset(mb, + struct ipv6_hdr *, + l2_len); + l4_proto =3D ipv6_hdr->proto; + } + if (l4_proto =3D=3D IPPROTO_UDP) { + udp_hdr =3D rte_pktmbuf_mtod_offset(mb, + struct udp_hdr *, + l2_len + l3_len); + l4_len =3D sizeof(struct udp_hdr); + vxlan_hdr =3D rte_pktmbuf_mtod_offset(mb, + struct vxlan_hdr *, + l2_len + l3_len + l4_len); + + printf(" - VXLAN packet: packet type =3D%d, " + "Destination UDP port =3D%d, VNI =3D %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=3D0x%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); + } +} --=20 2.7.4