From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 57E5D45A79; Tue, 1 Oct 2024 13:05:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 044DA40DCD; Tue, 1 Oct 2024 13:04:08 +0200 (CEST) Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010063.outbound.protection.outlook.com [52.101.69.63]) by mails.dpdk.org (Postfix) with ESMTP id AB0014069D for ; Tue, 1 Oct 2024 13:04:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nk8X4YWnuzi2GxCVxn9DeYMByI07aGpHfaLRWlPl0KPrRHlTEBWHCaCAvmwQfF7oYxmE6MyIwSUduiEiS4Y+qTPgHxb6fgr2+vZd1FptWJMX0/ngOdLqdzL7zOFCdkOGAt0I8lfq8qdzopIzEQB9sdiGuaFBA46n889C31o/Aikf0CeAk7f3zpJ1BlEnyCPJJ+VBYYpe4aj5wDpQj7/wq2PwXzuLhxZW9TFc6aVOCZ48Eg6NEENRWxcsM/wkR4SwMMlzxgY1eSLPCN89mPMcMNAmZJH5reK32aUCoyNeilaOpNSZxO0qlJzsim6FFY5XKmAvM8KyjgvTn+GHxqiaOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vrr0W9Y4JWVDY974GQ5sb7u8NEO1zaLgrv1+Jg+xRfg=; b=EBtHC0/p41zRQNhuTlItcSb29UxnwBL99UUpzznMQ3wSoLoRaGqUNcDvLNNho+j7wtLzQ+GT6vH6RGLpkK0PJS2wI2LwRU+xDAlxXvo7SZg5zvBww5/B6ymr+kB++t+oCk8+bGHuzqyNpt8w8q68oZjeC9gfLNT6xwG97DqK4LYiHlC2Km6NCSjmOAq2i1g2yOpVG6J9laHD9kG9K71DNJ+IiLzSLH8FdmHFf7V94pi92I/4fOH8YGIARqsdFkmTy+szfUeCbIPHCoPClr4hvvq4muIKFmLsdCwP/UTi6fvc0pIkEFfzTyRrYwXSP4DJ9+uuu0pB5E4bhDw+TAEaPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vrr0W9Y4JWVDY974GQ5sb7u8NEO1zaLgrv1+Jg+xRfg=; b=FZ0FugcMfN5XJBuil+pNJMeKzy7OTk8Pgq5VMXPBwVJB31N3WasragMqjkctrNNW9nO9+rjilHXdC2p94enm4Z3NQ1/vKqiuNHWmdIa8uPvtEFdHkivIiQdihX/IBbWx2QuPMEa7HngIleWzephaqPt5FKL4eYJs0Ihm/ngE64Zg8O027d6HRlSyH9Z24dMGxZYttFQlif1JNDM6lWnwZOFkNrEm2t3O0Q15jNqlw/Y6jjCTQb+qO6YM1mY5Jhnt2QsFTL252ArD12ELAdhtOenWoKwR1PDI6eiPHCfQapVrCiiExEL21V7kHUAZOJ706ewHhMP1Y81TNskDiDqXSQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9328.eurprd04.prod.outlook.com (2603:10a6:102:2b6::15) by PAXPR04MB8702.eurprd04.prod.outlook.com (2603:10a6:102:21d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.27; Tue, 1 Oct 2024 11:04:00 +0000 Received: from PAXPR04MB9328.eurprd04.prod.outlook.com ([fe80::367:d59:375:fb87]) by PAXPR04MB9328.eurprd04.prod.outlook.com ([fe80::367:d59:375:fb87%3]) with mapi id 15.20.8005.026; Tue, 1 Oct 2024 11:04:00 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@amd.com, Jun Yang Subject: [PATCH v5 12/18] net/dpaa: enhance DPAA frame display Date: Tue, 1 Oct 2024 16:33:19 +0530 Message-Id: <20241001110325.4173762-13-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241001110325.4173762-1-hemant.agrawal@nxp.com> References: <20240930121525.3452847-1-hemant.agrawal@nxp.com> <20241001110325.4173762-1-hemant.agrawal@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR02CA0086.apcprd02.prod.outlook.com (2603:1096:4:90::26) To PAXPR04MB9328.eurprd04.prod.outlook.com (2603:10a6:102:2b6::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9328:EE_|PAXPR04MB8702:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ab2c859-7440-404a-b45c-08dce208c0a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|52116014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?EKZ2viI1SXD7QcrC83OcaQR8genXp1tjp1YmxDv2CJgXMgaDF6DqeUiqxOGy?= =?us-ascii?Q?fhNsODQ6d/EPGSBgPvaw9dDM4r04zpskTQY2Nd8fwjWN79yF8G0vDrmmG2P0?= =?us-ascii?Q?Ya+K2ylsJseJ+e+f1WzzTZXke326396wHo59ebvBtzZoOPgExfua3JYG4H+f?= =?us-ascii?Q?flfK3f6n5WrSxdRTeP4r2CLhvNqwjO3MXQDsl9cE2hp3SOX9i+bBPLf+Azzm?= =?us-ascii?Q?SsOI1a6i0fyATZS33+OBS01TGKSC4g85TCbII3tOg2TeP5bUD+tQUlYuhxPa?= =?us-ascii?Q?dIaHPK8L/mzLuTJSTPcPtCGnP2DypzPAQpHsAoZYxvfp/DY/W1/ap/ZqyguP?= =?us-ascii?Q?Mq56g95hHiqamCG7xKgKCSjjGK9jhQgpR7ptFSRZY2UZOGrYh90QK2cyXKLo?= =?us-ascii?Q?gJATngoJbG9+ET/tpCrUNomhp+SSwNbN4WudIgLmZL9Rw4+tnf5BkBmceQR+?= =?us-ascii?Q?7Zdg7kbVKTS462NlIFKNLAnFLVJ7+E/8vgi7hpW7h0a4ZnvsUoAJ7H+jC0DE?= =?us-ascii?Q?n99BDto+S0rIyPP5FceenXgEWOXt7DL2F3Lo6j6TaSN/WFg3A2ffd29qS4Dx?= =?us-ascii?Q?6M9T6uTqUHCbVulhfcpfeRTr1WYT0bEhrmgv1OhVjT7sT3hvqAV8h20k/S2+?= =?us-ascii?Q?j+kFmjoBT+vDjIhXIF8Tjrqf2WqdvfCZADM37VfiGidhdxYuEKGIk+YRdhhz?= =?us-ascii?Q?2t9UuNdeRwqmUGwk+f+gILn2OcWz4Cuz0JwpYZc70pQXPsK4OTr2nGuCqXQ5?= =?us-ascii?Q?HUQ3v2P7OHFKgEZG1xZ+qDvPHBFSb2WFIvjmEbfDAMIKdKJ5dEhl3LqTbmTl?= =?us-ascii?Q?qIRty0CkRivaa13fgTCPN+95ako5vbLWFeJ77HDdTRolyD94m+NLrH5BUldo?= =?us-ascii?Q?zOySzEwU8SpHngp4t1YJer+iCLVy445Z8NxwxMUdnmQySOh2j40yDrwwnIG9?= =?us-ascii?Q?1cWBG4metzmU3z+rzhVHhNC89SJOJ+ONjqhZS7f+AAiKI4O35UeEsKpM/9cn?= =?us-ascii?Q?vxU1UsbRqLyHMMAKcsvmpVQPXpVGGmp5pwjJW02x0ZLhIvRedn0OxB4eN9yp?= =?us-ascii?Q?HPMr4J6hYQGawm/UuoHL2T+5NAZG9U4KATV+fIqhfkcgiCK1rcX64Tx3ss9N?= =?us-ascii?Q?zAux/hlPCkcMrkGWJp7/MchG+62e9ElBvZKjBkYoDhOksl5dNz/Je0qTZ3Jh?= =?us-ascii?Q?6JtAeRRtR/3cJ8bFlm7CmcZaDsC6bP8YQrJc1/GEDSlsfj1rUMY3jCT5j06Q?= =?us-ascii?Q?gwmEvIPqB4C1PIasDWafzqYlZpBQSQfP+kSfUsXXdSHtPR9pl1JxObKFkTAp?= =?us-ascii?Q?sGzhHuFm4OnSaGkMzmOGcXynUjeVDCgHHQPlaAAMJjR1WA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB9328.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(52116014)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?S2yRtrAGUh2uDx3Fv4Ojxt3DLk4/AKD5wrurnrgd0GEE/0aZYbBOMiIoz7G+?= =?us-ascii?Q?LNb7KnODHPXy1o7GPfZCoIIQfrYum9LGRPtCqUlJ2hHwH4Vq7Xyos/gY8cC9?= =?us-ascii?Q?DE54IWoLCWZDfgZvc8PG0rnd2nokHECJ/3wCe4zofDgobvzAjgHgCJ1ikwJb?= =?us-ascii?Q?aqzaouduzITfe1zUAka2Bg1hASKyr18Fh5JqlusezgG4KORkeBrwQ1jDhs58?= =?us-ascii?Q?iUqkTwa86YkOAZLGF44qmj9fvsZ19ffkxNrc97lp5L8Vg+5dJ3BZFW+CcwsB?= =?us-ascii?Q?12XdyoVVSHsPYuY8XeRxCzm2fe3yRk/eppH1tg5y5yeilx0XSNIwSEY81D42?= =?us-ascii?Q?sbRpaG8mwBA0C34EMAcxCyBrBptLaTy1zgTy5s7gQAzFrmMDV2WbM2ohkFIA?= =?us-ascii?Q?6X4w2DQ9RAwocpeLOPZA8/AseMd3uiOuz+mTsG6uNFnPkE6WzKiJmKy+vKqE?= =?us-ascii?Q?3o1IpBzDw7PKJMpD6hCuvQQLU8QZVyRlDkQBFlBBV3GfopRPWiIy6rNGU1n4?= =?us-ascii?Q?L1VuimV1CO8QdrQCcuXypo/VmlGi/tBmNt8l5klqj9L7H6ubJxQuSlrpWE5i?= =?us-ascii?Q?dTHccTXmjW5EBSYhtbsgcPs8sIi2GX+/00M6Fj9WcFaQr9Iu1rlRwvu/VqfD?= =?us-ascii?Q?+K+2bUxTJWvh37ngifLOYUD330zGZ4Xdl/LR2LYH7pC285qTDKlPzvdOKMd1?= =?us-ascii?Q?+KeRYbKbxdHUlSWEI3k1fCyQXh0Bap4yeCou0+jhariWi7JsA2kx/+cUIZBn?= =?us-ascii?Q?vKFeH6aQLNwVxLv0ZTHtdWRMNDOvEaSI24KD+NmBBP5f6WmdJ8rcOtUkXrpZ?= =?us-ascii?Q?RHBQdHo/EHKUKtWvbe/yzQv2Pab6WhjNHxo0cq3wvx96JvVoe7SBZ4u7jjdw?= =?us-ascii?Q?OsLz7QfzBp5UFDZfp4EvQiuKGdGjpXKZZmlbW6Kn7NiI66bC3jHHHpfJtBEh?= =?us-ascii?Q?j6P1eKyuPc24ZBpUxJiPJfGqBk7rV2BJQ0WEEIjA79dBNSI4KLhw6W+v+CoV?= =?us-ascii?Q?hOtQMR/+hKx1FFl2W41MEVYV2CspXbvmNMOPaqsmEqyaCxtanPFTi/Dh2doL?= =?us-ascii?Q?MAEbfKVrhrHMUOqHMFexfV72431kfOzmoserjH+2LSOUn03FF6ZGlgKSuzWO?= =?us-ascii?Q?UTCU/G5spN9OATH/4LYLAIPsWpwZcPH5TtUTyyhC8B+dT1h7LDR0R0tNM3TJ?= =?us-ascii?Q?1zB+OuuY6FIDaIIpsXrJoGWXJA+PO95zLcFRRUFApl/K8mPysk0ob6Hpiw/1?= =?us-ascii?Q?gGbOwjOjxjLT1o9VP+sbqbXMTzu3QGY0oT5KB+EGwn6yTex0z3LN3KD0Bn7x?= =?us-ascii?Q?P2BCmNcoUX/+JYLAcexf/lCZf0YKmucAphPl74/SKHJ+ST9kLDaQj0vUeBvK?= =?us-ascii?Q?LA4JlNAAtsIPSgUuuu4835T+i02Q/5qATBbhfPlCq7LHRC/iO4jluUHCmqp7?= =?us-ascii?Q?zD1tN4WZC8HPRz2w6ssAGfXI4zFlZTUCmEiJo2oPfZJLdr2DFFGD6ZS/7cdC?= =?us-ascii?Q?Q4BSSkEJ8Lkje58b6/J189+MK7nSFpeID+oVNfm9Sk2w91gtLz4RwGFdnNDo?= =?us-ascii?Q?PRvOHLdG43Miw6QT0C6+hCssbummbNDq9/QM2VZxGKN8l7+T9UWLEeGeI9S5?= =?us-ascii?Q?lg=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ab2c859-7440-404a-b45c-08dce208c0a8 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9328.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 11:04:00.1485 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: XFHKK3l+H+nh4WlRxad+xjyHDvD7MChlgV468xg6D02GIj38tsZbYm9cFC9Dbe3SLOpMbntgTFskAiuDxIkBgQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8702 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This patch enhances the received packet debugging capability. This help displaying the full packet parsing output. Signed-off-by: Jun Yang Signed-off-by: Hemant Agrawal --- doc/guides/nics/dpaa.rst | 5 ++ drivers/net/dpaa/dpaa_ethdev.c | 9 +++ drivers/net/dpaa/dpaa_rxtx.c | 138 +++++++++++++++++++++++++++------ drivers/net/dpaa/dpaa_rxtx.h | 5 ++ 4 files changed, 133 insertions(+), 24 deletions(-) diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index ea86e6146c..edf7a7e350 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -227,6 +227,11 @@ state during application initialization: application want to use eventdev with DPAA device. Currently these queues are not used for LS1023/LS1043 platform by default. +- ``DPAA_DISPLAY_FRAME_AND_PARSER_RESULT`` (default 0) + + This defines the debug flag, whether to dump the detailed frame and packet + parsing result for the incoming packets. + Driver compilation and testing ------------------------------ diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index a302b24be6..4ead890278 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -2056,6 +2056,9 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) int8_t dev_vspids[DPAA_MAX_NUM_PCD_QUEUES]; int8_t vsp_id = -1; struct rte_device *dev = eth_dev->device; +#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER + char *penv; +#endif PMD_INIT_FUNC_TRACE(); @@ -2135,6 +2138,12 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) td_tx_threshold = CGR_RX_PERFQ_THRESH; } +#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER + penv = getenv("DPAA_DISPLAY_FRAME_AND_PARSER_RESULT"); + if (penv) + dpaa_force_display_frame_set(atoi(penv)); +#endif + /* If congestion control is enabled globally*/ if (num_rx_fqs > 0 && td_threshold) { dpaa_intf->cgr_rx = rte_zmalloc(NULL, diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 99fc3f1b43..945c84ab10 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -47,6 +47,10 @@ #include #include +#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER +static int s_force_display_frm; +#endif + #define DPAA_MBUF_TO_CONTIG_FD(_mbuf, _fd, _bpid) \ do { \ (_fd)->opaque_addr = 0; \ @@ -58,37 +62,122 @@ } while (0) #ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER +void +dpaa_force_display_frame_set(int set) +{ + s_force_display_frm = set; +} + #define DISPLAY_PRINT printf -static void dpaa_display_frame_info(const struct qm_fd *fd, - uint32_t fqid, bool rx) +static void +dpaa_display_frame_info(const struct qm_fd *fd, + uint32_t fqid, bool rx) { - int ii; - char *ptr; + int pos, offset = 0; + char *ptr, info[1024]; struct annotations_t *annot = rte_dpaa_mem_ptov(fd->addr); uint8_t format; + const struct dpaa_eth_parse_results_t *psr; - if (!fd->status) { - /* Do not display correct packets.*/ + if (!fd->status && !s_force_display_frm) { + /* Do not display correct packets unless force display.*/ return; } + psr = &annot->parse; - format = (fd->opaque & DPAA_FD_FORMAT_MASK) >> - DPAA_FD_FORMAT_SHIFT; - - DISPLAY_PRINT("fqid %d bpid %d addr 0x%lx, format %d\r\n", - fqid, fd->bpid, (unsigned long)fd->addr, fd->format); - DISPLAY_PRINT("off %d, len %d stat 0x%x\r\n", - fd->offset, fd->length20, fd->status); + format = (fd->opaque & DPAA_FD_FORMAT_MASK) >> DPAA_FD_FORMAT_SHIFT; + if (format == qm_fd_contig) + sprintf(info, "simple"); + else if (format == qm_fd_sg) + sprintf(info, "sg"); + else + sprintf(info, "unknown format(%d)", format); + + DISPLAY_PRINT("%s: fqid=%08x, bpid=%d, phy addr=0x%lx ", + rx ? "RX" : "TX", fqid, fd->bpid, (unsigned long)fd->addr); + DISPLAY_PRINT("format=%s offset=%d, len=%d, stat=0x%x\r\n", + info, fd->offset, fd->length20, fd->status); if (rx) { - ptr = (char *)&annot->parse; - DISPLAY_PRINT("RX parser result:\r\n"); - for (ii = 0; ii < (int)sizeof(struct dpaa_eth_parse_results_t); - ii++) { - DISPLAY_PRINT("%02x ", ptr[ii]); - if (((ii + 1) % 16) == 0) - DISPLAY_PRINT("\n"); + DISPLAY_PRINT("Display usual RX parser result:\r\n"); + if (psr->eth_frame_type == 0) + offset += sprintf(&info[offset], "unicast"); + else if (psr->eth_frame_type == 1) + offset += sprintf(&info[offset], "multicast"); + else if (psr->eth_frame_type == 3) + offset += sprintf(&info[offset], "broadcast"); + else + offset += sprintf(&info[offset], "unknown eth type(%d)", + psr->eth_frame_type); + if (psr->l2r_err) { + offset += sprintf(&info[offset], " L2 error(%d)", + psr->l2r_err); + } else { + offset += sprintf(&info[offset], " L2 non error"); } - DISPLAY_PRINT("\n"); + DISPLAY_PRINT("L2: %s, %s, ethernet type:%s\r\n", + psr->ethernet ? "is ethernet" : "non ethernet", + psr->vlan ? "is vlan" : "non vlan", info); + + offset = 0; + DISPLAY_PRINT("L3: %s/%s, %s/%s, %s, %s\r\n", + psr->first_ipv4 ? "first IPv4" : "non first IPv4", + psr->last_ipv4 ? "last IPv4" : "non last IPv4", + psr->first_ipv6 ? "first IPv6" : "non first IPv6", + psr->last_ipv6 ? "last IPv6" : "non last IPv6", + psr->gre ? "GRE" : "non GRE", + psr->l3_err ? "L3 has error" : "L3 non error"); + + if (psr->l4_type == DPAA_PR_L4_TCP_TYPE) { + offset += sprintf(&info[offset], "tcp"); + } else if (psr->l4_type == DPAA_PR_L4_UDP_TYPE) { + offset += sprintf(&info[offset], "udp"); + } else if (psr->l4_type == DPAA_PR_L4_IPSEC_TYPE) { + offset += sprintf(&info[offset], "IPSec "); + if (psr->esp_sum) + offset += sprintf(&info[offset], "ESP"); + if (psr->ah) + offset += sprintf(&info[offset], "AH"); + } else if (psr->l4_type == DPAA_PR_L4_SCTP_TYPE) { + offset += sprintf(&info[offset], "sctp"); + } else if (psr->l4_type == DPAA_PR_L4_DCCP_TYPE) { + offset += sprintf(&info[offset], "dccp"); + } else { + offset += sprintf(&info[offset], "unknown l4 type(%d)", + psr->l4_type); + } + DISPLAY_PRINT("L4: type:%s, L4 validation %s\r\n", + info, psr->l4cv ? "Performed" : "NOT performed"); + + offset = 0; + if (psr->ethernet) { + offset += sprintf(&info[offset], + "Eth offset=%d, ethtype offset=%d, ", + psr->eth_off, psr->etype_off); + } + if (psr->vlan) { + offset += sprintf(&info[offset], "vLAN offset=%d, ", + psr->vlan_off[0]); + } + if (psr->first_ipv4 || psr->first_ipv6) { + offset += sprintf(&info[offset], "first IP offset=%d, ", + psr->ip_off[0]); + } + if (psr->last_ipv4 || psr->last_ipv6) { + offset += sprintf(&info[offset], "last IP offset=%d, ", + psr->ip_off[1]); + } + if (psr->gre) { + offset += sprintf(&info[offset], "GRE offset=%d, ", + psr->gre_off); + } + if (psr->l4_type >= DPAA_PR_L4_TCP_TYPE) { + offset += sprintf(&info[offset], "L4 offset=%d, ", + psr->l4_off); + } + offset += sprintf(&info[offset], "Next HDR(0x%04x) offset=%d.", + rte_be_to_cpu_16(psr->nxthdr), psr->nxthdr_off); + + DISPLAY_PRINT("%s\r\n", info); } if (unlikely(format == qm_fd_sg)) { @@ -99,13 +188,14 @@ static void dpaa_display_frame_info(const struct qm_fd *fd, DISPLAY_PRINT("Frame payload:\r\n"); ptr = (char *)annot; ptr += fd->offset; - for (ii = 0; ii < fd->length20; ii++) { - DISPLAY_PRINT("%02x ", ptr[ii]); - if (((ii + 1) % 16) == 0) + for (pos = 0; pos < fd->length20; pos++) { + DISPLAY_PRINT("%02x ", ptr[pos]); + if (((pos + 1) % 16) == 0) DISPLAY_PRINT("\n"); } DISPLAY_PRINT("\n"); } + #else #define dpaa_display_frame_info(a, b, c) #endif diff --git a/drivers/net/dpaa/dpaa_rxtx.h b/drivers/net/dpaa/dpaa_rxtx.h index 215bdeaf7f..392926e286 100644 --- a/drivers/net/dpaa/dpaa_rxtx.h +++ b/drivers/net/dpaa/dpaa_rxtx.h @@ -274,4 +274,9 @@ void dpaa_rx_cb_prepare(struct qm_dqrr_entry *dq, void **bufs); void dpaa_rx_cb_no_prefetch(struct qman_fq **fq, struct qm_dqrr_entry **dqrr, void **bufs, int num_bufs); +#ifdef RTE_LIBRTE_DPAA_DEBUG_DRIVER +void +dpaa_force_display_frame_set(int set); +#endif + #endif -- 2.25.1