From patchwork Wed Sep 28 05:25:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117023 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C3C37A00C2; Wed, 28 Sep 2022 07:25:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1E4914281C; Wed, 28 Sep 2022 07:25:40 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60088.outbound.protection.outlook.com [40.107.6.88]) by mails.dpdk.org (Postfix) with ESMTP id 7F68341145 for ; Wed, 28 Sep 2022 07:25:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y922YxrL0i2RU/Jwgrs8652zFvwRRJAggz0Q1YeBhDvPLx9XSNFN2aVquRaKLgz54dvl/psVkdus5cJPw87FPAU6CLK2MUV2u00oNtr/+2ckQfz47V7UvcGdWX0qCmMotChK5l6fP1sKDq74figFy3NJpXWbBecXJPUXnbs5EElb2lCghhx1aM+2c5Qts2dJR7AZ1fU3ulb7o/1lf8DE+/inochrOwi1xDsbPIUjjOs5ENqY1jzT5Q3S8VSo2ZzlVsmFZOVX/n4nbHWSi/2qdjfAzdtrEtRfxiWyRd32sb9KV7CyETJR7G7A3ORGLdN9v2T/HioAx3PfF3+jFPXvqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=1rnnjtM9nYJ3R6kkkt2a0cTqPcoJwiwORFBckVqRzp4=; b=WfIraMBPOG+d6J8ICsunVkaFaEthVvIqsAI2tQZjhyv7iY53rCFVpZ9i038td3wBTZk+D+MhzOdtevz3yJ4sfLwwdt7od3BA1jw4ltN4JmGPQjHHqd2xoduvN5Yk1DO+MUWl20A11lpSM9EyWAhCK1PFI8c1WL+1N5i+WZ+ZhvFPixjim/b9O/3tigLAabuAedVGHNXyGbo3KuPZoFdOt6CALIvinZCasGJzjpHcpJC4/sFKk11g9H3ZwaVHZoXYpjJa88rwNHF5PJsnr56fezC+TjSThXO0l4yKEIMU/JPxqTL8ZXGDp/oMNP0hDtA797iA5W0EgA7kiyq0zSF/2A== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1rnnjtM9nYJ3R6kkkt2a0cTqPcoJwiwORFBckVqRzp4=; b=jDNCvtZFQw7oPXY2jswGlZ+xkQoezXUIv/Q8KXgsP5hSQje7lzSSEBKHfK0QNT0UIBRZGLj2/nyV65pKcZbxT0xlnqBM7Oi9/YxqBi1LRe7a6q9XR0e6dsebLjRJBK+KnN+/lgGpocR4inLYk5B3swVV1Cnoip5YPN0UXcFJm1E= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:25:37 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:25:37 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Vanshika Shukla Subject: [PATCH 01/15] bus/dpaa: use non-block mode for FD open Date: Wed, 28 Sep 2022 10:55:02 +0530 Message-Id: <20220928052516.1279442-2-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: d4494d9d-f71b-4ef2-5225-08daa111dff3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZJ5l2pKGxOyxUM1m+aYA/DDR8ufBq+l1preUqRUz/coi8lFUrQo6cBaN5L7gAb5wb8koMtw091pH2S5+ZctEtm0DBsCE0tTbhvbYuHClLil8KfLChB0n1k1e2puHahRGsPTAukQQxqtoNBlafd6Le+Wg1N/MWiSN3KieDWWwp1mMwuCbf253jVpa3D03gX5ZlsxIw+FSlWE2SIWubGQ6KrdOXoscN7wZI8M+GO1+U+heVshPOUROv4XnMD7JL/yl3dQta3mkswgpSaNJpCrTW27dkMnlEko4JwGflHUR5M3J898bSX0+3u7I01qHC7A88/MbbwSMnZofrTaLi/+LEASsNbZPE/e0y584waG3pSRoDl9Vz+TAcbOvqrqXkOo5/t1F8j/CvC1TSoxy142DNUN1NTZ1Gs82nzdFqwvERJTJFTw3CUU3KrSRQy6ey/jcv1sU6txYSalEoIFexjRKmQoqMEUUXUzp8OAoYQKdoOdIfGiSv1CLczYQeiCmX7q+Y0JYyNSV/I0QNZiM1hRSfCyMDkJ+uJiIq15JZVlXS7xVrbpTStrqhJdo6stEnzsREgO6WgkG3T2i2LvF/6JlNjoGVdx0Q4WAn/MzI732SBa9WCi8CcigIpjtHjQQ4LvJ3QRMkcN07ZijIKAt4TIMTW2J5Ar6VWVGffSmM26/T262bLD6GGJvjmAPRiaU32Rxx+EUlG2Wc4o8pOqqyaK0HBxCK5IxmigdalSrX02/QJ9+PbP+UF3TZe4ZqdRnpNjkDLGJhKW4zWgom857chJv8Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(83380400001)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TG4PDhcGEU0lxdddwC7UBNO/Zsv1D+ILwRzapMQn5fwCUx0AFBg1/f3kQnUw8EsLx1jzQk4e8zyg1MtTrkbiuaS1DYpmxodRfkbLg8qIyyubm5sWQYQFAh4JRJ/bYUcAagYbojr2H0t4mwblBR4X4fWn0+dBikn+IDJTfEoMagoMtRIaZMCBEAtRFoVM5h2HKFpylNr7SntXZXnR1Zw2CTyTlgqAH2TKYjIZvQshFAjPtwQAUXft5TOAcgalcVQ863mykVqNHWMkjjWYqjq7ysQ0vZRBIeu4hrp7d2b9HdCCnQtdilDvkfn0KCRzCvXC5ncHhbiHtzV45UnVW7q/aQAIMvDcCILJm+rgSg8QqcD7oUov4S0ruKdNYU0ib1naE8Ql0FxnsvkWfeYpArzVXYnOsavfV91uSlbMGXNGXv46S8y+UIX8ZsCa5hpNEnQy8Z/GEiMY2Sgcz7U3R5wGPjEXOG5may2q4+J4DTy3SZ8D1ABs+03izqtRhhY0eamez30TspMKcgrRRRJjgoTGM6QQA/iQl8hSlJvM0tLAtY1WSh5WzenU4fQ5F63vyLPsdoW8O1hwtT/FS/ZIrDJV5KSoQa+gs+eSJckStnFfRL2zp8Z6GZqfqtqNKbBjMI4a359ew5f+Ie7KseD9WRiy8IYuWOe4XMRejhx06NS5qS4KzoF8YsvqAFANv3RKrVChDc4Tb0mLEq/ZqXjGVLGLm2mQWZK4UU+b8w3R3r3jy66uHdMRLuRis3caSBQwEy6oVBvpAzsSuA4HuGgS2f4O/upRieLzoVDPE1ReJMebUxaS7s5cLE8hYx1+VwjAirB6dXeIyTO0BHeVtLT8ekZdYrbOaQAbtCSjS2VnlK0I7pMFDg18MQDzDkU03WEnh5lW0XJXlQgFmYwAXyXQGJ7QUceif9x8RKnHi6TzLQdiMuWbrr7ervBK6C555yuweHtL4Y9q9uDqfxx53RzxtqypahKfGKorp4W6ZZSvMi/VhxYg5VDd4W8Rh8ycsYqMDMcelixVFA5R5L4W/c57sNKWSujRf1Wvsj4byGcKziX6rLRVWqkc3mrlXoxnHDcUS4iGs0HBXYS5S6LctAR+G0/s9AX6G8FlTH/iV6hbh+BcpbkAhRsV0qF8KETYBXvsPWE9v7qSp9EOCwQAd8Q9Fo+JjebjEmpZTkDYoln3btJVmQBQdP7eTft8VWY1bfMn5Fz5zkIfeEOWzLhYwyeZd9sY68MtGcAdlOcw+aoAHtPjm20AjZOeHq3Fn9vCDvmfrTuwzRAzjOBpAhMXx/5xtCsDV8uLLREWtjRQmZ9iGevzN14jDCNGEVWqy7z/p/SchxtCXL+romk1PHS3Was1R7YwFwG0mZdbPfFlGq/d5zdQGzCTu8RFbacaR66ZEZi4m7MoVa3Di3+X0WpEyYfu3iDfs8JPK7gwgEm6MpQzLK1lJ1g4DOSeCMg26RSGPsyCrP8q4Ycpu1uurgEQR7TeoJe941psvi5lH9ROmy1TACDCOuy5p4CyCxBYPPMFd19Tn1HGRnJ530/RTBnnPh/o1gOZLYI09lzDYzn86d49u3dQYPFnVgrdZCkXUYD8VASqdohP X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4494d9d-f71b-4ef2-5225-08daa111dff3 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:25:37.2783 (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: zkXB/XDm4L4DvZH9pns+Nu3kQWHgVqh7YhQ3OSLmjVPgj2lag/4sTbJqvC1mgoV8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 From: Vanshika Shukla This patch sets qman portal file descriptors used for interrupts IO processing in non-blocking mode to avoid any unwanted blocks while IO operations over the FD. Signed-off-by: Vanshika Shukla --- drivers/bus/dpaa/base/qbman/qman_driver.c | 6 +++--- drivers/net/dpaa/dpaa_ethdev.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bus/dpaa/base/qbman/qman_driver.c b/drivers/bus/dpaa/base/qbman/qman_driver.c index dfbafe581a..7a129a2d86 100644 --- a/drivers/bus/dpaa/base/qbman/qman_driver.c +++ b/drivers/bus/dpaa/base/qbman/qman_driver.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * * Copyright 2008-2016 Freescale Semiconductor Inc. - * Copyright 2017,2019 NXP + * Copyright 2017-2022 NXP * */ @@ -64,7 +64,7 @@ static int fsl_qman_portal_init(uint32_t index, int is_shared) qpcfg.addr_virt[DPAA_PORTAL_CE] = map.addr.cena; qpcfg.addr_virt[DPAA_PORTAL_CI] = map.addr.cinh; - qmfd = open(QMAN_PORTAL_IRQ_PATH, O_RDONLY); + qmfd = open(QMAN_PORTAL_IRQ_PATH, O_RDONLY | O_NONBLOCK); if (qmfd == -1) { pr_err("QMan irq init failed\n"); process_portal_unmap(&map.addr); @@ -174,7 +174,7 @@ struct qman_portal *fsl_qman_fq_portal_create(int *fd) q_pcfg->addr_virt[DPAA_PORTAL_CE] = q_map.addr.cena; q_pcfg->addr_virt[DPAA_PORTAL_CI] = q_map.addr.cinh; - q_fd = open(QMAN_PORTAL_IRQ_PATH, O_RDONLY); + q_fd = open(QMAN_PORTAL_IRQ_PATH, O_RDONLY | O_NONBLOCK); if (q_fd == -1) { pr_err("QMan irq init failed\n"); goto err; diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index f21cbba0d9..abcb1bc9ec 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -1496,7 +1496,7 @@ static int dpaa_dev_queue_intr_disable(struct rte_eth_dev *dev, temp1 = read(rxq->q_fd, &temp, sizeof(temp)); if (temp1 != sizeof(temp)) - DPAA_PMD_ERR("irq read error"); + DPAA_PMD_DEBUG("read did not return anything"); qman_fq_portal_thread_irq(rxq->qp); From patchwork Wed Sep 28 05:25:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117024 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 992A0A00C2; Wed, 28 Sep 2022 07:25:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA81241145; Wed, 28 Sep 2022 07:25:41 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60067.outbound.protection.outlook.com [40.107.6.67]) by mails.dpdk.org (Postfix) with ESMTP id 6F8C0427F1; Wed, 28 Sep 2022 07:25:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NqBpAin6P7Jab+qU+n2gWlJISXcJONtJCG/sgV/Bv88SnuxVUAn6esKzpPBwoK9nZ40XkdNQshKvF+joa0Ew5FcCHcARbF+jppLUgCv0H1fXRioPWIfSgZyaiIltcoNab+/d30Air1hTTIhChMWLQCI4FTh8u/+553JMOuavgmp5Slo1N0+T2CbfTQt1TkXKBuKwj8fwJvqcxGxX9GBKk7VS2WPQavk/N6eSMevOfkfHhifzZOZYzHtuS57hkLcsuAPqR2m/5VN+cg9SXLeho3eGcKImt9HHjcO3i1NqgGRAg2/tzdJg5IXLuDa6nMExEBfyXCVZuLM62B3KVB57+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=mCVFKEXdRtfaKaqesNqjtabavVG6BiydZqJMI9RFzWs=; b=N7kqm7izcTR2TQRcIx0Th37f+C9IhehihGGuc9VlkuP4APDiCFD11Ru/DYtcgD1dks6gP5z9Pj7YVn8MREJH3GFM/62fjjM1HxCs1HvFJY1EaeF1s9hsCn2cZSj3tYdW1d1QAxmhKgjK+eANh5shhkXFD9+SqOLhyRDOGFcJk63LmHvYZ0cuaZvtxkm855T2ZNjH3oSmFwPZ2NYku/OYRzgC3l5+ZGzeLNm3Q355WxtGfWR5S8uGK++1EU8sAqXN65y7gTuJUikpesWDwOwEjCF56zd1N1dHCAVwDprKp6PZ2woDROlljoz6jIB5RTpbst6egd04CNrc2DpopYVdpg== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mCVFKEXdRtfaKaqesNqjtabavVG6BiydZqJMI9RFzWs=; b=fbfH4QOzXsN6s7kgcmgs0SGBVCfDhupJNTmjBi3AclzIrZ/gm7+7dnK5E3nRso4KaNM8ZdgbGevFZ1llmDDX0OzNnkaDLVHDtJ+1ORoCxf1t1a5jSG3vW0kH5jsq1RO+hnPHssQ1nSaB7kv/XQtL9rOHM3yJVF4z/THBAJAhhxc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:25:39 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:25:39 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Apeksha Gupta , stable@dpdk.org, Sachin Saxena Subject: [PATCH 02/15] net/enetfec: fix restart issue Date: Wed, 28 Sep 2022 10:55:03 +0530 Message-Id: <20220928052516.1279442-3-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: f87407c2-c123-4ee5-ceea-08daa111e13e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4UTyfTpFZCnxKOeap9QcFGeG1MecTlmdVhdBbD6NRtEJZI9bh+yNV63KvIonR4mIAsCG4zdFrX4jvAAKKXfIInVi6UDxouNU4UQdLoWXLqTe5op/wJ8zTBwsUBQNflPnsa10KnN7hQwZT4LFctXF9kXJK+K/CJVTn5Ch3wtRPDyxieqJWgiuSZAKoB4WJytwUov80YrssIPJ5yOvtOt2zCBcfXLBNXVCQDLfQI1BlgwXpDRAcQXC/SClYvxyaudVcywo5ZtWcDQCt1Jd6lsFFTjFegcNobMZuMxYI8j1t5Nd650eJmofCyAm/JHuPqFAM3PPFqxQztjNHoE+bDQnweso0cLjU2ufOGzFJJoywqqThH7FpXGntNOO/4AvXb7AJD3wnOhyDKPsjqZv+oeBXy1SmCVGMCRfzCcjtQGa9De7seopvdCCXCYjlWfGPTcCIluBT5GKa9WYqu41npMD8qVpd3S49k5V76v1k65MCG8RWJXiBmhJeCWh+wdCKp334dmUnqbhy9tP7Y0aP3iJjB+7RWfmm1PvkY6nGoxCuFt4nKDV7c+ySUelCqNjShdUSfZfAERGouYe5YFW+tciihMSt4tkLn2QC0xkXmBZSZY2sgrd8Vogqy0WRxwPeyyBQcyWfMuTbOWlt3e847on6igJCUOB9c8ZpcWh49MC4rpn4cuab059BVYLufT6MxQkEs4IzfNu+PQB+IBWNzDO8PjWlvUTYYvSBKHxD9R5G/9B+PgfoWnx84piBE5dAndyrjwXtGShlgXOmqtHwLTh1A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(54906003)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GxErkZkdXaKzx+5wBFwebm7fQm+iqPa8VSdQrlY+x4mvzeOzjeVwqMwvA1GzN/8nBLT+JRG79/WbuEpZHqE8983CunAWJMfNjGa1G+L4wVNsc54hSHFbAWY+gjoWo62Pvup7FI8r7hnqejm07/Alz+KIi3t2No1j0/jXILJzD8n3oKSUIz0pYVn8TjjI+olOlxpIl7aushiqGwbrD/JW5u1xKuE9yh3tvJ2IBZ3JMW47ue/wJHEAzwav3MvTngqeIOCBNNlKgfAkH10uWxcje9Xfd7ITzr50G4SRaEQUmTnp1/huuwEM8w/D1NJPiyDAZOvm9bQtUT816NiqdEJt1p02/BXxptQdjqrRC92QYmRwlx1FvBeaW7Alo+8G/UiSwUqU45jGVVolsbYQVL2D9wtEnSm+FLXrpyr1h2WQtLRicP2HFiRZvgR1C9XvcgSKQMj/GOU2xM83gfahdwY3pNXx6hSj7KFjlOOLIRVtOmHP1h41QB/t67vNuMtFtwbRvb1Hn2biGrG3Pqwo0x9viTC9Q5MZhIwSNWO+YI+CXpm9bGfuQfIl9fKAeBhnNxG0GFx12DWIuDU0H2Cw/k0HSbtdU07dkEBz6gMs8HnE8txzRZIYXrZqPzWd9l0e5D0nVuFUYOYbPW20cqGuVLzrxR19pxEWHYzg94PBhIg2hnRMU4/iHBBD75Ecy5JrXy0UFkaJOZolCI35PyzqBEd+lbDyFJIAdAhB/np9VP6wucwmtZ1WzhwTY6uH8kk7WFDMgQO0941CKRL0gODeE7Ozhi8LMqy+CJxEMOp2NZDCexLwv8zs9rhPyt9aG81QRhy7PwQTk9ArjZ1gSiRZmRa6C0bM1ncG7PhjFkmEzRYHgwatil853P4pesq+6XKTcApIXsuaNXu69XMs8apF+c5DH7NxmP0NkyDK125d8oe5CcVnrlFX1uop6JYoTVNO+8OG7fV1l7c/G6fHqSH3WdjEMCgRViDV8Nt1adCA1hOvvUnhMEo7K0kXklw+fyNrFdn0Os8+cIPxlk7iS6FkS05ICGemzXK6rmQ+zA3HamrDFMHJkKMe9mS+t3lONZB6ard9WyStiAiEddYQw6L9J35IVRZ1sJmm8GTPw6hn91Hf1OKsPvKtFvf7WWn8WAb2ubqOWxsoUkfertAiaefnfawqfiw1W9kBPHJVaZv3cQHeCirYG0pJcP+dILZZ/+f7kaADr3xb4hQOr41MDJwE0WixojAXYQpQ8iZceLdmMGb8kW46kLsA7Y0RdCxMihIEPMBAvM5p3w/LNAZdz83ZkPC+ShkuAsLpczU9aYNQA1eBPLuinchfHzzMnTJ/g0SeaBwq6P1b30sO32qjNKYPzxt/vULxa0530AmUTDK8VkQ19zLBVYI0Rqxx+L9SbeY38KcRsO0pBmPnkHkBvcZ1wE7QQzgrljUJWG9+p2n+G8BWRiICB5vD8XtfbLruYys1z3BE3th4FjYClNvsBxjFoekoyHtpKuAHiEA3tqyCiqqWdbqmfnNHzlsEdvtnkZdpFC1HthVXpyXrCCzEiaxtQnMcVqHS5+5VgVTdSrtiDhOFNnatwS7x65u3bcvm8lmdgyIb X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f87407c2-c123-4ee5-ceea-08daa111e13e X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:25:39.6070 (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: 1EmxhRxMpJEMn/18Q/qU3ANWeq1xfp1jmy3XI75mCv34QMU8vC70HfWyXWTu46+y X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 From: Apeksha Gupta Queue reset is missing in restart because of which IO cannot work on device restart. This patch fixes the issue by resetting the queues on device restart. Fixes: b84fdd39638b ("net/enetfec: support UIO") Cc: stable@dpdk.org Signed-off-by: Apeksha Gupta Signed-off-by: Sachin Saxena --- drivers/net/enetfec/enet_ethdev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/enetfec/enet_ethdev.c b/drivers/net/enetfec/enet_ethdev.c index c938e58204..898aad1c37 100644 --- a/drivers/net/enetfec/enet_ethdev.c +++ b/drivers/net/enetfec/enet_ethdev.c @@ -54,6 +54,7 @@ enetfec_restart(struct rte_eth_dev *dev) uint32_t rcntl = OPT_FRAME_SIZE | 0x04; uint32_t ecntl = ENETFEC_ETHEREN; uint32_t val; + int i; /* Clear any outstanding interrupt. */ writel(0xffffffff, (uint8_t *)fep->hw_baseaddr_v + ENETFEC_EIR); @@ -149,6 +150,9 @@ enetfec_restart(struct rte_eth_dev *dev) /* And last, enable the transmit and receive processing */ rte_write32(rte_cpu_to_le_32(ecntl), (uint8_t *)fep->hw_baseaddr_v + ENETFEC_ECR); + + for (i = 0; i < fep->max_rx_queues; i++) + rte_write32(0, fep->rx_queues[i]->bd.active_reg_desc); rte_delay_us(10); } From patchwork Wed Sep 28 05:25:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117025 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B988DA00C2; Wed, 28 Sep 2022 07:25:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D370542836; Wed, 28 Sep 2022 07:25:43 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60068.outbound.protection.outlook.com [40.107.6.68]) by mails.dpdk.org (Postfix) with ESMTP id 9A61D42836; Wed, 28 Sep 2022 07:25:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PTab9pIaMfXB8nH/iPL5JhTRxyfzqtkgs0Rv7K25w2KQN2azzyUUvS1nZWW3bZ92MWsiATp2GNBZl+3VyFuhJwEaL6ySRca1Ah7ufQjMgfDf1WcWy12vjUImqS0tuaUlhcSKam5IBDOBb26U1zkffLtqlauirioqiTLyOwHHkrTHd3qdG00mapDurdMAUxpHHuPzmZZH6DrN8uBaqiRG2HjwgrE6/d8MSFZjQmfUCLX2O0XYXa2p8P7ryH521egLVUxoJKHh4bNlvZlH+EYmNPe06dsCB0D6oXbaTHCobKlN70dlxmoxnYA71Ns+TfFhHX9+ShdguvzLCx9xxdGtvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=pDMY9AFvcxLlgm9rxlXk6xs5TvGJ5CK/skV4vabhJTs=; b=n5OS7iZM5SpA8SAOMml9p1w4ivB5c5P1l/FtEBWeJhDwkj8P1eBox4ASeAYBOpQ8k02OJ03Cm8c7f3bvmEsPi9gjj6EPBsRGbtrF0FCGRx56Z4Ys2CM3d8oxeWAN5DpPDlrnIYl5QJtMa5m6H5+V8RDUTjeAB3vV/nLGuWBlZ9pr44ApravVhHbzCkMlXRogGLvOOq5j/wF6bFkdkYDYu9aEYvxwPsablDtVZzrlmDPKTnqLU/iaQCAwP4YxmD1Vgi2dHpU5jv7rYzrL/xqnLYGz9nsnNuA2ohSmX3NGQvy84PSOxkUa4tKvSutzRoTWZalcdU8U2fHU+feVbJa4mA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=pDMY9AFvcxLlgm9rxlXk6xs5TvGJ5CK/skV4vabhJTs=; b=Ezm7gREReEnbwmw6y/4aDwEfxrKi/o0rFbEEidzuKw2U6cAMfk7V+fUdLmsmc4TnTtGxVCHQUy77Q9Pt9XaR0Yzer+wImbnOMtaVcbqL772Cw4Mlf/GBY8lN/jzQmycZTTUENsyLooXpfyYGG/xbEtCxfOQyANMjgAeVvEFSEBE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:25:41 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:25:41 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Apeksha Gupta , stable@dpdk.org, Sachin Saxena Subject: [PATCH 03/15] net/enetfec: fix buffer leak issue Date: Wed, 28 Sep 2022 10:55:04 +0530 Message-Id: <20220928052516.1279442-4-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: 034bfdd0-06a1-4f7c-41c6-08daa111e296 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Eww1XImaEZRhBv48xPSrCovRjLmGrc0MUxC3mRafWb6XUVz3/oR4owHhRB421u/VTB5nCspY3a/XQo49PAdhtbJaVy7fEB7x7CCUtSMec1txEtwepzZdpWRVR5vmiQ1jdEk9Wqe7KMowVxl22KISsXZGLnejMvw5mUNhqw6yvXdlO+eS9qeKJibn9OwaS/l8mXgIEK6zMBi3t2WlPfYgkYuL23nmqd27O3d+w36hw4Uoh35tN9llguWYRKRcFdtKwwTDt8LyyQYunjrUQ7MfYFZ25kwMFuytLAkY1FNgd526Gb7I7qoka/Pd5hbxp+gts3rtOomuUXJcVxlgdew4BZSMADfIanjEbzqUj4vskc1JXkZOB7s9/bsg8Jsdn6LhqPiu/qn8lrtzSkPxqMg6fZRokut9H+StaiamUhlTONLnbGLpSMO809L3jA68BZbds/xgdkYTJQzshJzQ4e1okA2YQRHA0I8JuRa1QHEnp/m6v8bEZc+e6JYF6EFfOcUEzrmjD15TJq4YkjdN/iZTdke55Gfrk9Yv7Cj78ifuy5NZ8n4Xrdv0aOcJ+XHc2duOro7aOcOsHFs61Wf3QqQ/aJQELmKoD72rWvhYJxIqRMfz+I6r8d/TZU4AHUtNRBnl2zAzLB4oQkViZs2og59Z4G9ObHs83aBbdrsH4t0x0vrXe/aHUslZmvLYZ4WvUOL/YobmPubOLvY7/LGuqEeRS2UGJZ0tD4wC3kRNM/FS9wQwE+Ic5LN/NggmXVovYEPE X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(83380400001)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(54906003)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FHp9ykR5lJrH8Oa7q9l3+TwSkh87zw941MLUCWEhj2Je0Ki+jK+a7+xMTYoY7UzF32FtmqQtX2zPcWsczXar2Tis0xPMXqylv6nlodwd7c3nxq9LRRZ4gOerWcmAJ1kruGV7QO+hoCIg3ghrFjnzFbI9Gv3PlQpgNJ1wfIwIbued8xLb+t5wXYRjM4ulM2+VWC8AqtHr22dec01WzIz5W0+u57i+A/HeHfYCSR9y/Jx+30Yf6Dn/8Z7oIoybgsn15IyOAj7ZN694fPLd86JMulYYqfDtJuhca0Z8w+4m/Jx+YT8uP0Qr6MBBQ2pjjeyGvOOKirj16yLMyge3jhIJHkq4dwBvpOjs4hgbpqSKf4NkqzfE8Eeuv08B0FKSRG1bKXHGz37S2dW0svfIX32LTfMPP2LrS688vM44PGWDRdBjwtvCYAidQb3VTPpVbuS7Q7qz3rtHDNxfEBJ/v5gEIwh/GDOpiYuP/2n90i0JIxT9vS7njUq7DRLDat1ciBPNnnvrAeIE9nnNHOgfdjxm5qFRNo/j8y2JIXT5FFDaLh49OH5NedbG7mVVhypIxXwzKkyaWivx3holAxpTKcO18Ohy+Au/T+s1GXPWcqWBpO9bVrzGMEYl7F1iga7X5iVJaOWnEPjhex2IJ8YZ4WIO0ssU+emlVrX3TI/IB7yWGN6DKoXoh1vpS/hODlm0uVyAZVpeLApKkpxJUba2AvB3b3qps7H3ElmrjwvFHNVlUXlrnb08NyCaxrF7xI+b67JlAD8zc3KphHtdw1mGKi6SXwFxnIVD3+MUgQKZr7ky1+4dnshMzllY0SRqpJc6LlsBAQfL3zqPIgEpXrkAZKecA01Cqolw/pTAGu6cNgqoW7YLqihLLcLwWVhl35i8W9rde47F2zM7o97BdUZI+mbcpTrRTNyUFBbWIcd7GLnpk3mgLYE6QrPILqqKx/fkFFK27ooUit9I1RmAVGd4DG8XOjLyJkCF9DkaWXsuiYGXgEB1r/mNmNIrfqtG7FvmMxOojWwdnlGRaaSZVjPjDA1AuP5UURHGtjRvek2neO6+96Vaw5f5U+HwJocUDAmyVRBMJ3iqBkQR1mR/l5xACKkAf/mtUirVOf6sWT2D7LrxBoAUubwX1RmJSIc9su+vp/ff2lzTSwuZ8dyTuKT/RhD8fRMLk8x7PHl/QyTK9W7hYlm0jRfRyooWHje6kxH2VDUMi7sIEzg6mKsyZdmQ9jzqhLuTJAnN10vsN4YhnwVGsk0jV/U+4Cswq8ua88H43w8CJTdQkmjr6QFKUEw81ZJWpY4CMbr8fi6mJpa3nx2/Umw2SZrcQbMBCI+5QsO3+Dn7j9l0NuwI5Qd/ZA8c9n0OpQqINYkxwxyNeISDb66R3VNK3BISQOaRsupKQS4TjknGFwFAEJDeSMl2b4ED8L53J9jvS0nl0tdwOtraFYuUTe3xSurfH1MdudEyMvL06GglPsmNCzYyWaDNat9Z4k7mRdPwWpM1FEv7UPln1hV5XBtPyixPamUB9IRtdksNhpKc0w8XlRG1/043v1uoppLA4r6zJV9rILxbeXNZ8kJd7/FanS8hhx3ymsoZYoK+fDx8 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 034bfdd0-06a1-4f7c-41c6-08daa111e296 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:25:41.7953 (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: 3Np93FBPqTcaxRfDB3L2OSOQu3V9wbHvbx19fF8cOMzC5Ck//+ziuZ2CwkBvbamx X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 From: Apeksha Gupta Driver has no proper handling to free unused allocated mbufs in case of error or when the rx processing complete because of which mempool can be empty after some time. This patch fixes this issue by moving the buffer allocation code to the right place in driver. Fixes: ecae71571b0d ("net/enetfec: support Rx/Tx") Cc: stable@dpdk.org Signed-off-by: Apeksha Gupta Signed-off-by: Sachin Saxena --- drivers/net/enetfec/enet_rxtx.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/net/enetfec/enet_rxtx.c b/drivers/net/enetfec/enet_rxtx.c index 49b326315d..0aea8b240d 100644 --- a/drivers/net/enetfec/enet_rxtx.c +++ b/drivers/net/enetfec/enet_rxtx.c @@ -39,11 +39,6 @@ enetfec_recv_pkts(void *rxq1, struct rte_mbuf **rx_pkts, if (pkt_received >= nb_pkts) break; - new_mbuf = rte_pktmbuf_alloc(pool); - if (unlikely(new_mbuf == NULL)) { - stats->rx_nombuf++; - break; - } /* Check for errors. */ status ^= RX_BD_LAST; if (status & (RX_BD_LG | RX_BD_SH | RX_BD_NO | @@ -72,6 +67,12 @@ enetfec_recv_pkts(void *rxq1, struct rte_mbuf **rx_pkts, goto rx_processing_done; } + new_mbuf = rte_pktmbuf_alloc(pool); + if (unlikely(new_mbuf == NULL)) { + stats->rx_nombuf++; + break; + } + /* Process the incoming frame. */ stats->ipackets++; pkt_len = rte_le_to_cpu_16(rte_read16(&bdp->bd_datlen)); @@ -193,7 +194,16 @@ enetfec_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) tx_st = 0; break; } + + mbuf = *(tx_pkts); + if (mbuf->nb_segs > 1) { + ENETFEC_DP_LOG(DEBUG, "SG not supported"); + return pkt_transmitted; + } + + tx_pkts++; bdp = txq->bd.cur; + /* First clean the ring */ index = enet_get_bd_index(bdp, &txq->bd); status = rte_le_to_cpu_16(rte_read16(&bdp->bd_sc)); @@ -207,9 +217,6 @@ enetfec_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) txq->tx_mbuf[index] = NULL; } - mbuf = *(tx_pkts); - tx_pkts++; - /* Fill in a Tx ring entry */ last_bdp = bdp; status &= ~TX_BD_STATS; @@ -219,10 +226,6 @@ enetfec_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) stats->opackets++; stats->obytes += buflen; - if (mbuf->nb_segs > 1) { - ENETFEC_DP_LOG(DEBUG, "SG not supported"); - return -1; - } status |= (TX_BD_LAST); data = rte_pktmbuf_mtod(mbuf, void *); for (i = 0; i <= buflen; i += RTE_CACHE_LINE_SIZE) @@ -268,5 +271,5 @@ enetfec_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) */ txq->bd.cur = bdp; } - return nb_pkts; + return pkt_transmitted; } From patchwork Wed Sep 28 05:25:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117026 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 07242A00C2; Wed, 28 Sep 2022 07:26:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E215B4284D; Wed, 28 Sep 2022 07:25:45 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60053.outbound.protection.outlook.com [40.107.6.53]) by mails.dpdk.org (Postfix) with ESMTP id 98D5942B70; Wed, 28 Sep 2022 07:25:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=duiwybNnl5b8Sn2XDwq5jvo2fgmUPAiZMxcE7Z5ImCFZPWDr8peRvXw+zDFj8GW2Ih3qmEJauP6iOz+ZPzaM0Qg5Xv7xLZ2eEtioGRajLFg+ZIO/Tb5GulR01+7eJrCYoH90om1BYDAPCFHg4OdZtOLq8ZihC/gCbowj8lAA+E3yVcsxmOcQ5Tickn6Pr1bfZGZT60hFsJTI4YpV6St1315Lvn+xupoVJh3tVcsY9OAZZ60ZKmsUy9MliDo0m1ESz6NWHykGjSiL9IOy2kBOJu6LygDqpyaQiaNRgiVbbTRrfyl9ZC+WXA+JB9qS3IjhqL42wf8DD1U4wEQ1+RaYzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=ESUF2L0RR1TA3oIqpjadIKt2uFaV1MB87D8Sm68bj+U=; b=PQsSXh3NTra5UxsVvg/vPlLMCWYQEaGmoBBR88B9ZfZSxr7eoaCVJORxTYM1nGVuw9YtXWuocGtceHt9PbR/Jvv73YnfENmPlKDIwXP89PhVMrdVLC7gxvuHQ9tZz9D3yE4kO0XUreTTPlDOzNKg1gt3E1NCd3CsKihvOT7DWi5a7SHzuLWERalmsjy9pE7IhsW443E+bmfWRfVbyALPZfnrV6Bxr+8QNzh+QIk3A2UP4fYfx7Kek88t65Py7wHUdj5GcJxQRO5C+VjJONQ0Hkioxh54FTBL5u54XASj9pQF5eq4ejfkF+8kWrD64oIXk6UCzfQLEetXsSmP/HEYjA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ESUF2L0RR1TA3oIqpjadIKt2uFaV1MB87D8Sm68bj+U=; b=rY2D6dXJx1s6XspE0AQOhTpNLBLnfButrMf17uFoGXG5oivBDwZnYZ8FE8gOpUYXHp3M4bnqDp5QWIBfxiSPsxhe3X8WZmsbvXMy0sR8BD/vGwMrMdAAwLUqkd8P/lhzYUEgIlaXQKejD6K8ZVHm6TCpNjgqAV3K5QnUguD1LOo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:25:43 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:25:43 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Vanshika Shukla , stable@dpdk.org Subject: [PATCH 04/15] net/dpaa2: fix dpdmux configuration for error behaviour Date: Wed, 28 Sep 2022 10:55:05 +0530 Message-Id: <20220928052516.1279442-5-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: 4dd16bea-8207-442c-7191-08daa111e3c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wo6lkCtRu6X7bjuaUtZsFs9YPbLdKJJwYPWlA7rxEmduIYs17uRgGRSBdgLptrXoWhCAv9Tpw9E1wCv3HYL/ANIPWVvZUFmf0avShs/f/mAxy6DD0TQBz+POHRvEoQKMCx3y8hXIa79vNkO/1+wVWJjFza20iUddki5jfrx3J642Zq/4Kb5V+Z/zFQYIF6s+Wcxxc955xtPgRMifqqfmxltMAQmY2zMQ/gigD06VjJwLG/fodYppjcopxZyOhqM9H1H+LBGHSeyBBybZAe9TqmriJ8jvdXL8nUNDugHjxqbQ3X4pQDp6OTpnllxNxnEFhnlDHRVbKEOHaYJQqYmUHUOrEPESofR0lfnXe7XVWfIjD6RRx3Af4GL8RdsXp3AsZvjleWAC6WWmwuZVG81PQRrHbPxkqZDdgLFSnUA8WvTXeSgrFkVIu61gW5akgzuDR7B9b47262ATYjMl8U1EOsTKvUwwS02jFXUQC9QHrmXNQQBKX41GJxHmWxGWRW8kZGp+rFnPbKsC8BtXmiAIoA4+0r5DcOJacRI6/N+tGQ4Cd9ZzTRROA0hC85Ua3j724v6ojxGwNhGEA8MX446vfaR5JhZIASzr/jbbfGDKAuEzBrBYPVOtO0cC3vjBbGg6dlFJuWI04V1shcNpmuL7+enoG9RC2F+cl9STCMMhgtJmr8TzCuow+yzqDqrdF1JcsUV12RhuI3wRj/5a7sunLpFWy5SWP/z7DxKoOnusnNqVlK7I1fzlyNDVZxWnSIwosy3CySTyxauUzK6ssPbrvA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(83380400001)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x58prHgfaPeq0V3dEb/cLf2Ot5CsdCKH916yKxRFev1eNVVn5poyHvqC3EMArxvWYFL9Bz3MF/NMTnsQ3U5JXTAK6ZqiXOw/TigGYjIrJEsLc5WBVtOscImfRW6DCAJ7nD+vfvuUpHE/Xk3YBzfvgHa660iPlSlk8eaSFLEiZ1S/w7w8ZT6JEeSuJ4/aPoYXKf2XYqfT+fTFusp8qVk8y1ChPxD+xKGdeSjva9q9oMIwo+npT+B28qLpcBEztn0hYVg6MBetEObzvQVB/s3QjyeeLe6aqyMCfR5erQV1DO/BmptKXh22E1HbKBYsCoJ9LoM2rc5NSdF661JYlVglzOvhykrB07b5wtkRgKJp/AV91OvWLRq2TfWq8soJKzNdg4pJ+M1QCR5i+biv9lhYTdc+lB1sFwGi779gxNdUflyw3ey5LBRziqaQvu1+VMZXztVdTB0F7oFo/HyzkrFznptPjiUlC2WfA2uf7wi1MSXfsZdLY9q9yHxjH4EOwm7JzLUNbS2MTrKVyllz5nDkx8S3ZZlfg6VPBFQKsnpiUtcwdK03/jNN6ct/LK33bLNl48koBf5MtoHzOhGfnBBELkEC57haVdhpUwzSjdHr3x0VPu1Qm76c9oO/n1wX862hrBqU8+Gs/4pH7GwZDDUfXKBc9mzGhMcG03mDGDJa/E25X+QOtCl95EfwtsA8mCwvxvk8EV9jL/lST7LXmAQG5e7TU0X88kRyFA0pLWkcYXRgiKMUgFElzD+okeIU3mewyY8ohHjsF/ZiQwMEN1ILaEUJ9bw8Jo9ZTntrPGamCvdrm2mkiEUpyyn95bZxVCOf/gqxUZ6KnbFtBHmN1Zn97hpVKx24l479sByHdbxafyzjiW2NzDQIxYmJuXZtOyrAeJfOlWxeSQc/8eSSBeQSPhq+0yVixPZ2bIShxP+wjZJQB3prg572nyzn3gv3i3dPKMArTrvVvNLqWoW9t3tfr12/r0avztXcQrkjLBV0RTJxlkMnYyoMy7MnTaGT6zS6O2VkRnsK1Y9zCEEcSaq+AkVUamxpsocg/9VyLc9yliUYo+Scd7/qyRfa55uS3kX8X2IPO8ncEM3TNJw+p33f7J2YrgxW/RCOVsrSYswiUZSwFTUxdb+255WENFvL8y8b0//Nsu5w3pHrf5IWmZC6KH7xQ8F2uydctyhnmgRD792M26TgxyyPPMynIeN9zsxXvVa02YzlgB3jdD5QgWi/LYLdcNBqyHIqt5zkvd5YxQLGq8FRzIE/kYMXNUX4x4uLjedJ0cgAUCptC8OdwnaIF+bP3ev5MEwoTJrmAkJerT0VEPeKZqf3AU4oNc2W44FAgUufJJpINNUXxxSQ2qJkK0EiIAmNXCuITGPfEvZcHWB8dq3ZNB1sDnXvNh7PZ8qGdq8HtOgpmvIjwRcy1OrvXfL6Maq+X6tlDxRxA0k43GJTrX9MaVzcePslauxZFcKYUGDqJDzWEHPqXWHPJZyv3k24LqZB0BjoAWFDt32vbhpNt4ZnZHgcF9zJiAoytnN37mDY+vYa8wqePRoupL34veIZELEyT9WgB2kFhE4afF1/xpZTTMJgfY+2JpGEzwW3 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4dd16bea-8207-442c-7191-08daa111e3c7 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:25:43.8266 (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: yospu2VClv/kx8wYhEK/Qayc66Mbht8bJTK//Rc85ez6eWCyXNPHQyT8jOIrcyUA X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 From: Vanshika Shukla Driver is giving the wrong interface ID while setting the error behaviour. This patch fixes the issue by passing the correct MAC interface index value to the API. Fixes: 3d43972b1b42 ("net/dpaa2: do not drop parse error packets by dpdmux") Cc: stable@dpdk.org Signed-off-by: Vanshika Shukla --- drivers/net/dpaa2/dpaa2_ethdev.h | 3 +++ drivers/net/dpaa2/dpaa2_mux.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index f69df95253..32ae762e4a 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -66,6 +66,9 @@ /* Tx confirmation enabled */ #define DPAA2_TX_CONF_ENABLE 0x06 +/* DPDMUX index for DPMAC */ +#define DPAA2_DPDMUX_DPMAC_IDX 0 + /* HW loopback the egress traffic to self ingress*/ #define DPAA2_TX_MAC_LOOPBACK_MODE 0x20 diff --git a/drivers/net/dpaa2/dpaa2_mux.c b/drivers/net/dpaa2/dpaa2_mux.c index 3289f388e1..7456f43f42 100644 --- a/drivers/net/dpaa2/dpaa2_mux.c +++ b/drivers/net/dpaa2/dpaa2_mux.c @@ -336,7 +336,7 @@ dpaa2_create_dpdmux_device(int vdev_fd __rte_unused, ret = dpdmux_if_set_errors_behavior(&dpdmux_dev->dpdmux, CMD_PRI_LOW, - dpdmux_dev->token, dpdmux_id, + dpdmux_dev->token, DPAA2_DPDMUX_DPMAC_IDX, &mux_err_cfg); if (ret) { DPAA2_PMD_ERR("dpdmux_if_set_errors_behavior %s err %d", From patchwork Wed Sep 28 05:25:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117027 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A1658A00C2; Wed, 28 Sep 2022 07:26:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 50DB342B89; Wed, 28 Sep 2022 07:25:48 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60080.outbound.protection.outlook.com [40.107.6.80]) by mails.dpdk.org (Postfix) with ESMTP id 4257142B84; Wed, 28 Sep 2022 07:25:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bXPJlSI8qqDaR8+QsJ3IzQsppMsg9BaGg45BraR87HKcaMx1vVOStOlP9/YE9rhtMUHA0Y+kUrt4Q8j5jhprbxUHyDGONkbRUx28lQpLH3xInSxEFPbfqODajcaHkewclABp0vLXykeXcwqWGaqj2EFf6xXQwCGcZh3SZ9VJabQjY43Jc4DzqFwjb9doptva+EGit5xFsQYb91Uh30ukHP5WpRhKm7oC021iK4rwE6UQvIVn2zihsZ60SOvx0TwdFTxju3ZFEUHEQKS9/DRo8NKjtgxgwf6rzmxa1NNoMHO57s/KbSquvVExEwWdsMmvVbVvmJKGi9oz609BdZYYrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=RNvpqKf4OPl+YInJxJ6qkxSMrig5vURCxahDcAvSCVQ=; b=OzsgAEe413QRutglKfYpI7tDkeEOgrzkTyOEPqwGwc9yy+/J1q85pV0EVE7Ps81Pwz8o2vSWy3b6bFtuDT5yo8agTmt9bNkN0GWx8HKDJoldLVAX8lbVgfPKSswm/8fiq/g6kHpdSvdfSwVvQfwidpM/q1UukMl6ndEC5n5va7POxWnSpJ2xqiBxFQhMvetrdLFEi34ij/KyP5ZMab1fBHGYvJdUzWJx+28rw3u/NPF6ORWjIUavRN7HtXSF5RhU19jyHXcbL6ghKM6fFYrZzg4N1gDSWvgQWW0Q84zt+fKYrTPkC5iql4S3E0hLAjf1DTweFxAY49kS03Zoa/+DpA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RNvpqKf4OPl+YInJxJ6qkxSMrig5vURCxahDcAvSCVQ=; b=RBj9rueQmyaUEElaNJBAAEkFPgO9dGjAnlhVUE9FPH9oiYORZLogdacBfiZ4ERO37SVMISK+RQZb9T1oopTXYbwXI2oy/Id7OdvDuIhonvzjWU59+5On+PLzj55H3DawPreCIYlAoTZGyRClTTZep1wzybv6+MKUWBettVufj8M= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:25:46 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:25:46 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: brick , stable@dpdk.org, Rohit Raj Subject: [PATCH 05/15] net/dpaa2: check free enqueue descriptors before Tx Date: Wed, 28 Sep 2022 10:55:06 +0530 Message-Id: <20220928052516.1279442-6-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: 3c8456ee-e1f5-463c-e3c7-08daa111e51e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qXfV3tOIwCJ5vfjEQ2bg871S3SvewzzxHRyeOt6iUakLe4sAgySWpROn5UfVELYK7tsLikj8JFVynCb7/fU7yFfEyYtMj5bvihi0jqegRc5hTviinQTSG4w+SnrX9uMFb9bAHpYwnM+Ah5FK/zZ3j7J5pV6WdXI/Bur1Y/gsoTUbmMJenG8ILy03/R4q5OHl86wMofeLqvP91ZC79HGNbowMPvQbEPWk1UYkRJJOi53+vyj4TsKmxc0Qveanbt1NP+9PhmC5TEgvLJ6gx8bWJ5/68WFVHfErx57UGsFmsDet/DVceSkE8+2LWjv17kcqPdJnfXNifDRvWc+fdKe8l0uy81HVHY1SgCOw4/Yo+CIHivb5dCaN9GAqVZmkoWxl42KfNXAykJbo6PCqZk9EQTkxTpI3IP6M7OfvE2i2D7Ah2mWqsHq80Yt5d04TIiZT+8R+M8KEvSDj7DiYRIhPC68qB3MNPUkjw5H2DXWVle67i1gOy/YJ/WLz9DAkVlvg3LRJsQuainzUFEoBc8/jWtBgwCWiP9+eLoOvgrl7O5TId28/3XJ0wsg7in4gm89lSazaXCTbuvc37QxJUEOc8/5Oewm6FFokrSnEim6xn+w1k1AIjsZagyskIOX5lKQRV28jsVGH5MuYnWxQtFyt6Gf3eVoTRLdgOcWu4BIgaw3YtvqlFSKx0rB+dEWGhK5Wd5Z7CuYLe9EdawgspKJvdA8KwY1nZOJYtjOCL+z5yJm7Tt5TEFiIB3O5xR3/iBEaq/sb5nbWHNe+r4bXbhNPqw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(83380400001)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(54906003)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dytqerMy2nTLMs2AvBBSnkvlu7iclubrLy6+HG/+cNftM9DudSw5mibx3ND4xs6aaO/8jUMYT0edUYGcuRyd27mS7ILVe3+Zj3mke1cbDHbGZHTFst2PBLNNREz/UXgu1FgpkguAz1eBhevOshPrNOG1nbYUR8qgLy054hdKPZKggs8pNJRssFwH3l+5AfmZoHmm7wAHzojr2P4KCK5ZrXi1O+0i7IhitSJ6CrRIzjAmMVc3bIEXJL6c3aC7O8+n79C206bLVwRssWYW/F+cJjKijsazEQ6XVd603VeXUrhu8K7Ix6uZTMRMjDAOdk+teDmR1alYY5XP8+dgggJHEqjmqKOx8tsPBFGorchFHz9q717QzrcZEpEqc5UE1vVWr5WxRlwprtLV+WQ6XtGrtBd922KlzmjWtnJ+nxsDTaYO6UYqdljNFGUU9kOD6qimKWa29n0JYYGRPCRpiOUoqfS8rgKHNU0TFJFcaRQZhjMx6QWAduJN9ZJMfrlNzJV9UrYG/E6NnmCxwxeLCKaU6jMMfWFE33Iz9VF27gNlHZ8uhbVpZmECpGhpaHXPGHZcb+gyf4jyO2vjzphvPb4C1LEgc7g4NtN6sstKD8ZBVDeAd2qZTPWmQAyp16xKOa5AyAE8l5WfQsw3X4CtnG+kwIwVwcr59nSXE0y24TlbTPJRMSwV5J/0AWx9PqqhlC/x4xm6JDYBiCCdkmHDqHZSNqVDIqQ3HkZ3PhBlHwX09xUgju22JDee7HNbxN/FFd0uGktcyA1phgljNLbs1zfTmEY74Bh9fvLwvAqW2unqtTaIXCkj6GR2y6uxQYqyQdF09BUwRbpPt7/MWT5WQNuPgx6jfm35xmW+JXS3owaLwc658RILLl8aTuOq7/2ii6uXmphiDMl+98p8o+wFs2V3VlvUaE4Gyoj6jbIeH27+SULLb2s1kyTN9vpnY2+xDP3hiWwgWrv4LHLI+tahOktxVP7ajVoS1dhai3wx1YyfoXIhSnZrVgmzCsTEviTeQ7VqSi2kDkcxQs0GvVJRE13Zna/lR9dtsIA0xiUItY0a4D9V6Szw5BCAI4HAsiwv2JdgaVXZfGbTYGnMgpgxjEb/EpqhfrBJICeg37R5N0zT+sshatskM7AkPWWlL6l5O/RuFrMzb6jUCDsolmzdGWTtjILxvXXXkiML5SvpqqPz5n7JgzZAoYxrINzoemVcnoPQ+AXAhxUcDEDaOiAcihKzWeUzLl5nPp+HZ4BQ1y+otBEtlYxad+vnFHJ5/ffa12cVMIfYMlU58Lw/7Iqs0BGLCN5/sjXlNcHruYUgLIM3NVfytricThwb0P4FW2roj5FoZ5kPxvpJa5N+WPAO8nUm4bt3SjNSgyFpgd1ZN1gjUr2jF6yqd18NHTFt9zQgYE227QxsxPmn7E05YiZ0g7c09cy3a6VapdqUa71tA48Hb0Mu1dkVQGE3zpb6uwo+xyuJZiRvqaymyAU1WA08E2aoXwQqjMJ9qD66TV5WeRJGu3nxVdYWSAwRRe+xaFCIf3TyKN2Z7uffz1/ghtw4PbSXek+II3OmHLrX/Ql7h4T8ny9W4fo9W8F/2kh6xK+9/DYo X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3c8456ee-e1f5-463c-e3c7-08daa111e51e X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:25:46.3287 (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: Ck/iE2H7NkwaRYV1746dDv806aR0D9AKYFbxhhiAV86xvFDdd3nNegTYy/rEt88c X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 From: brick Check if there exists free enqueue descriptors before enqueuing Tx packet. Also try to free enqueue descriptors in case they are not free. Fixes: ed1cdbed6a15 ("net/dpaa2: support multiple Tx queues enqueue for ordered") Cc: stable@dpdk.org Signed-off-by: brick Signed-off-by: Rohit Raj --- drivers/event/dpaa2/dpaa2_eventdev.c | 8 ++--- drivers/net/dpaa2/dpaa2_rxtx.c | 50 +++++++++++++++++++--------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/drivers/event/dpaa2/dpaa2_eventdev.c b/drivers/event/dpaa2/dpaa2_eventdev.c index 1001297cda..d09c5b8778 100644 --- a/drivers/event/dpaa2/dpaa2_eventdev.c +++ b/drivers/event/dpaa2/dpaa2_eventdev.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2017,2019-2021 NXP + * Copyright 2017,2019-2022 NXP */ #include @@ -175,7 +175,7 @@ dpaa2_eventdev_enqueue_burst(void *port, const struct rte_event ev[], if (retry_count > DPAA2_EV_TX_RETRY_COUNT) { num_tx += loop; nb_events -= loop; - return num_tx + loop; + return num_tx; } } else { loop += ret; @@ -1015,9 +1015,7 @@ dpaa2_eventdev_txa_enqueue(void *port, txq[i] = rte_eth_devices[m[i]->port].data->tx_queues[qid]; } - dpaa2_dev_tx_multi_txq_ordered(txq, m, nb_events); - - return nb_events; + return dpaa2_dev_tx_multi_txq_ordered(txq, m, nb_events); } static struct eventdev_ops dpaa2_eventdev_ops = { diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index 9436a95ac8..bc0e49b0d4 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -1525,7 +1525,7 @@ dpaa2_dev_tx_multi_txq_ordered(void **queue, uint32_t loop, retry_count; int32_t ret; struct qbman_fd fd_arr[MAX_TX_RING_SLOTS]; - uint32_t frames_to_send; + uint32_t frames_to_send, num_free_eq_desc = 0; struct rte_mempool *mp; struct qbman_eq_desc eqdesc[MAX_TX_RING_SLOTS]; struct dpaa2_queue *dpaa2_q[MAX_TX_RING_SLOTS]; @@ -1547,16 +1547,44 @@ dpaa2_dev_tx_multi_txq_ordered(void **queue, } swp = DPAA2_PER_LCORE_PORTAL; - for (loop = 0; loop < nb_pkts; loop++) { + frames_to_send = (nb_pkts > dpaa2_eqcr_size) ? + dpaa2_eqcr_size : nb_pkts; + + for (loop = 0; loop < frames_to_send; loop++) { dpaa2_q[loop] = (struct dpaa2_queue *)queue[loop]; eth_data = dpaa2_q[loop]->eth_data; priv = eth_data->dev_private; + if (!priv->en_loose_ordered) { + if (*dpaa2_seqn(*bufs) & DPAA2_ENQUEUE_FLAG_ORP) { + if (!num_free_eq_desc) { + num_free_eq_desc = dpaa2_free_eq_descriptors(); + if (!num_free_eq_desc) + goto send_frames; + } + num_free_eq_desc--; + } + } + + DPAA2_PMD_DP_DEBUG("===> eth_data =%p, fqid =%d\n", + eth_data, dpaa2_q[loop]->fqid); + + /*Check if the queue is congested*/ + retry_count = 0; + while (qbman_result_SCN_state(dpaa2_q[loop]->cscn)) { + retry_count++; + /* Retry for some time before giving up */ + if (retry_count > CONG_RETRY_COUNT) + goto send_frames; + } + + /*Prepare enqueue descriptor*/ qbman_eq_desc_clear(&eqdesc[loop]); + if (*dpaa2_seqn(*bufs) && priv->en_ordered) { order_sendq = (struct dpaa2_queue *)priv->tx_vq[0]; dpaa2_set_enqueue_descriptor(order_sendq, - (*bufs), - &eqdesc[loop]); + (*bufs), + &eqdesc[loop]); } else { qbman_eq_desc_set_no_orp(&eqdesc[loop], DPAA2_EQ_RESP_ERR_FQ); @@ -1564,14 +1592,6 @@ dpaa2_dev_tx_multi_txq_ordered(void **queue, dpaa2_q[loop]->fqid); } - retry_count = 0; - while (qbman_result_SCN_state(dpaa2_q[loop]->cscn)) { - retry_count++; - /* Retry for some time before giving up */ - if (retry_count > CONG_RETRY_COUNT) - goto send_frames; - } - if (likely(RTE_MBUF_DIRECT(*bufs))) { mp = (*bufs)->pool; /* Check the basic scenario and set @@ -1591,7 +1611,6 @@ dpaa2_dev_tx_multi_txq_ordered(void **queue, &fd_arr[loop], mempool_to_bpid(mp)); bufs++; - dpaa2_q[loop]++; continue; } } else { @@ -1637,18 +1656,19 @@ dpaa2_dev_tx_multi_txq_ordered(void **queue, } bufs++; - dpaa2_q[loop]++; } send_frames: frames_to_send = loop; loop = 0; + retry_count = 0; while (loop < frames_to_send) { ret = qbman_swp_enqueue_multiple_desc(swp, &eqdesc[loop], &fd_arr[loop], frames_to_send - loop); if (likely(ret > 0)) { loop += ret; + retry_count = 0; } else { retry_count++; if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) @@ -1834,7 +1854,7 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) retry_count = 0; while (i < loop) { ret = qbman_swp_enqueue_multiple_desc(swp, - &eqdesc[loop], &fd_arr[i], loop - i); + &eqdesc[i], &fd_arr[i], loop - i); if (unlikely(ret < 0)) { retry_count++; if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) From patchwork Wed Sep 28 05:25:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117028 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 138A9A00C2; Wed, 28 Sep 2022 07:26:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B33F42B8C; Wed, 28 Sep 2022 07:25:50 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80052.outbound.protection.outlook.com [40.107.8.52]) by mails.dpdk.org (Postfix) with ESMTP id 43DF142B8E for ; Wed, 28 Sep 2022 07:25:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FUgHsjqdtrZQW8v1vFVAZcu+SIItYCSP1/PsR03roW1rNvfHHEDRxZve6+1w3umtrQoB1NwR+Fgezvj22Ngqo0WugUDVZTOZ3s5s04GyroUQx4dn+RGuSAXd6TTGTXqzgDD9NzJJV5ZXTwSrfV/yAKzFLFo4ovynl1BBTDIn0fNkQsQn4tEtgHUuSPf4hz0+bKdQka33AzG1fP9r/4CEmyc1mfVQwiw99qDBWgUpQspYuOFGYC0l4aiKsC6QaNrhpPPPs3DgK285ateIPlLamp74RcnQnQo5kHHT/IYsJAgX4UPLFHlmPM9eIoAB/d/dfyA6rCX3t1fWfFCx/fnqVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=iuB5ZW6VaKolcL7YuiaOwtC2RP6n8T6cBk5WR8WG4rM=; b=Z1cheJkoy+NFu050Xt1aMY821voWTtEyw2s9Y894d5PLX3s3n6niulf1wuUnMASBb9qU+lT15axBs16nlilbog38hndw8PHgJssa4HSKmCzc2/StIeB0ma9fI5hgMxYL2lbzoM2VTNQTYj0B6pcXFrYwom8IWEu5mYDzqjtUoJxu77sUueu79rGWN8BDpjT+mCYX1OxobdwEikZYsSYr/kPfZ7hVY2k95D6QwDpSXHlpYnnqj7EXv/ysaoyfRsAVVbflDf8T86Q1Y1+mlX0XWGGn1z57Cucfpy0NY6zPiZVtLYb/mXSVQczAJQEysbkPUaNV3OhtLvxAbjl35eo9IA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iuB5ZW6VaKolcL7YuiaOwtC2RP6n8T6cBk5WR8WG4rM=; b=Y/SeK4UGlbJiwksfNlsB10X5EhKvBtobI9hEMgVcjlAtNriDRzaS3KZSm2l3RpW6dG1HzVHX25VVItLPzQl4MjA/Q5IJCY5+gdTOWVNt3otCO9oGWYFNHYMsM9VMzqkqtBQ/sRMCCOOPX8Pj0Ooh5YW3Zb0Bbc56k1cjxW+rgYk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:25:48 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:25:48 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Gagandeep Singh Subject: [PATCH 06/15] net/dpaa: support ESP packet type in packet parsing Date: Wed, 28 Sep 2022 10:55:07 +0530 Message-Id: <20220928052516.1279442-7-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: c6da6383-b95f-4a22-c0d7-08daa111e659 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p7IGf3eu6FTWXUmGzN0PaeCr53SZeUJwL0x4RChMAFfem2xRwBEoYEFIPOOvRbb0ThZJsjdDKk0a145654dFn9i+82I2oNAtjCKcR6PnXXZVvUCAGWTRBpE9yN/AFiZ+QHf9uRWmbr6kdyewyrsQfpTBCiu6GG6ai+Vvvwe6ewIp1FnVtXJjcHWoHOVu5FjfnhClw//mpDn/4+wsv6uW6lV3AOrOjpE5lZdORJgkY3FvtjwBb2Tr0IP25txpHUHe/QBVi1v2gMzEl39EC84JTm0Uufc1oTViCQyVFAx+rEkn3gVdf6kpNTYW3ZEVlOWZAIKfPdAR1J4hejvvG5BPhpuOGVddS6GbjwUPi7ZlCrXfaSpBHMv2m+npvLmBgl+IIsnGDYjP8AREtaiNyJX3pszWANgq48Two6+wOexAjlj3gbiEKRJdDEtoI9GzIWnmMDT9qLilYak//5gNcSgCqHUFP5JAmCJ6OOrKh4omz47B7sQPJldvHrfh0cT0ZXXU9TwoHFJtdSF+7zDoJRGEW7qdCQjF7d+JnXsSk0nX4j93qJNzpSLCoqWw4F1nJri/mIbV1DznEXEDlzntzTnhvVe8kadk+p0J7109AObhHHPbdlBsECEHtWu5LT2k4vN/5gWp03kl6niqactyU6oq6p5T3U25VjFz79yV9rYqgegaNiE2XXFID1lvEqP9OLcWQHFHj/8iiWb2czxumhI+g7K3rhbXkCQl78TYUmBhstFY4D0wS6qY7F3Qk1VKAITztSPl2nXt7X080bfWng6jaw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +7AFVFQNQZDz6Gkec+LGUymv5oJkaaoePspphRfzx36lxdY5tC39HL4jmo140khXRuM0hUH4VCR05n06reYge6i1H8IKUj2dOwJfhgTgPq5DZ6bpBRRKD1fNWDvPR7Nmza+5kG/XwUnewxsp/rvPp+AYWHqA7h+Wa70Pw06/SNuBWp0Bjgsh83wPkg8OrJJ0zO54iq19QbGKFj3Qaw/D7LNMrgu8/Mo3Fhd5x5pIq6kE3/NBYLd0HtEMH8l7qxwvWgGX8cDqatc5oCwp2RMCBO95qr9mZZJPKw4uzpeFj8nAAkR/y7u71QvXjSkhScLPUi6/jpEG7AorpCCIr+p/Wud3/VTXXtGjedYfEMBVNP8ekYnATH9OXgy/LeNkcNvZi7bgoc8ZGFYeRVYzzQnvykg7B9VrKGZnk2w+STPDbO/AI096QAAkmMFTXaAe/cod5YJ7mHPdFBC/PO5mH3fRFcD7/wjm1FbJywbFZWpBWMGdR99FpCL0fav5ktohwb90uOkQvL5I5tZySGXpkqq2ePCj6R9qUt3dwShEMTy/jsjSO/6W1ycfwwtYlhpIVBvnGcLssyVFOwhELkqQm1MvCHM4ZRFPmWtEBctOiZpa/U/5v2fpBU5OHqUcpNz1QVbJaPgDn/DRa57e+Dzi7QT8nnz2HrQ/n+b0B0Ha4mMbXuvUR9kzmk2sfNHrYe/w2GiGvVcRYPYgPEVf1/9wy6hWdCs2tm45E6Vr0dJG34pX63iBIchWFYaZtTy2wSw8T4EWTjLFVgCPHqkc/DwNmC2IigrDvHTva0xBILDh6WDDFdKQrYwkHwaTYdmEphYV0a52+fSb2bpHqpz26Ep16I/KnDiLrRRTz+wEwWBEwEgOsUI8zHjLUvW/5jqRW/CULl6ljv2/TpN5yhndttYVdt0czJPHIzcIFT71tSoJrn2nGXryBFWaBdiK/HBBzfsdhm/DNuAp2XyP7SEy960H1ERQdkDiFYHqSB3vhJGQfoFceAuFDNjtSvI0qH608fSMvkncn6zSNkF8uT26D+G8857DTpq1yWcoY94pqybbnVHasrAZL3eGryBzxKq2gBxOk+shgbbzecqldtHZF0qsobcWfQ2quBzt/ZLS/uCChkBWJCCZDl0dzcDKtkImdE81lmcqo84HH3ylEGWmo6wR3GZMjph0XR5F/rDCPZM3WqWKHU641I8SvfmRlkYTad8TElleKf4T/E19Im3WIycsxEwrbrrvPbGLq1s8dU/ITWsrYUn2q8AVbVPdY7l5a+q3nKuIiV8Ypg8Qhq7NaCNKa9SaGO/9kXYoViNM7IcL5jP5FOXKH717I7SzSpiDgbSv/uWVQUk02FgBBNQwubCK7+X1X6XyHj8prKfKbUlaWH1hnWcK5MJrPBvEurrqsbbgDI/PE5R1pKF86g5aDu5U86FxWnowkYbNOaMSHHSh0xaCF3iyb/mvArKLz28fVl2gNeh3qRRcnkV/ncrECZtC5eLhePRxoRlgYRTEpAeLd81s8FTNMeQVneqSL7pqPrno1scQk5A5j4E+zJMFsEBdm1HFkI0tD+wJOveG1w6JjL8ZapeJRLU7BE+wVk3zqDwROJYQ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6da6383-b95f-4a22-c0d7-08daa111e659 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:25:48.0472 (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: VEkPgEs91u5hZFlP26xfPJZULPibAhu0UXMypZ9EIxny1J02N7ZXHJQGHuw4qvC+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 Add support of ESP packet type in packet receive path. Signed-off-by: Gagandeep Singh --- drivers/net/dpaa/dpaa_rxtx.c | 10 ++++++++++ drivers/net/dpaa/dpaa_rxtx.h | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 20b75efb63..22205cec30 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -178,6 +178,16 @@ static inline void dpaa_eth_packet_info(struct rte_mbuf *m, void *fd_virt_addr) m->packet_type = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_UDP; break; + case DPAA_PKT_TYPE_IPSEC_IPV4: + if (*((uintptr_t *)&annot->parse) & DPAA_PARSE_ESP_MASK) + m->packet_type = RTE_PTYPE_L2_ETHER | + RTE_PTYPE_L3_IPV4 | RTE_PTYPE_TUNNEL_ESP; + break; + case DPAA_PKT_TYPE_IPSEC_IPV6: + if (*((uintptr_t *)&annot->parse) & DPAA_PARSE_ESP_MASK) + m->packet_type = RTE_PTYPE_L2_ETHER | + RTE_PTYPE_L3_IPV6 | RTE_PTYPE_TUNNEL_ESP; + break; case DPAA_PKT_TYPE_IPV4_EXT_UDP: m->packet_type = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT | RTE_PTYPE_L4_UDP; diff --git a/drivers/net/dpaa/dpaa_rxtx.h b/drivers/net/dpaa/dpaa_rxtx.h index 99e09196e9..b2d7c0f2a3 100644 --- a/drivers/net/dpaa/dpaa_rxtx.h +++ b/drivers/net/dpaa/dpaa_rxtx.h @@ -47,6 +47,7 @@ * L4R 0xE0 - * 0x20 - TCP * 0x40 - UDP + * 0x60 - IPsec * 0x80 - SCTP * L3R 0xEDC4 (in Big Endian) - * 0x8000 - IPv4 @@ -63,6 +64,7 @@ */ #define DPAA_PARSE_MASK 0x00F044EF00800000 #define DPAA_PARSE_VLAN_MASK 0x0000000000700000 +#define DPAA_PARSE_ESP_MASK 0x0008000000000000 /* Parsed values (Little Endian) */ #define DPAA_PKT_TYPE_NONE 0x0000000000000000 @@ -137,6 +139,10 @@ (0x0020000000000000 | DPAA_PKT_TYPE_TUNNEL_4_6) #define DPAA_PKT_TYPE_TUNNEL_6_4_TCP \ (0x0020000000000000 | DPAA_PKT_TYPE_TUNNEL_6_4) +#define DPAA_PKT_TYPE_IPSEC_IPV4 \ + (0x0060000000000000 | DPAA_PKT_TYPE_IPV4) +#define DPAA_PKT_TYPE_IPSEC_IPV6 \ + (0x0060000000000000 | DPAA_PKT_TYPE_IPV6) /* Checksum Errors */ #define DPAA_PKT_IP_CSUM_ERR 0x0000400200000000 From patchwork Wed Sep 28 05:25:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117029 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 51AEFA00C2; Wed, 28 Sep 2022 07:26:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D7DE42B78; Wed, 28 Sep 2022 07:25:52 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80055.outbound.protection.outlook.com [40.107.8.55]) by mails.dpdk.org (Postfix) with ESMTP id 99CD241133 for ; Wed, 28 Sep 2022 07:25:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AhqmNHyi7n41vHdfzwUXDcN6eF3juu6pnasZEAMUE+NV2S/qdI3RhHn9RJ6mwaD+BfYOQdSUfOjE2sLyFhPiu+4BpKZ9ZxSVZcUFl39KR1jHbrKmeYuLaK0PBGRPbenC2yfv9Hn4z44faAIm9Mnu6QBN2VnF85/nmsijOYnKdMrbEG0EtsnceVPTIR2iN8K0cQ6D9RXc+cVN7L273V+dlR8RwzF3ixig3gnTpzoK5wa09GAK/m0JW8QrMeW+Kjr5HFFZiP0D8GL0t0HlBxdC1GXJDetTf2zhyG9fjLhx15sqnz3w3Syk6Bivi4xJPBjVRAISKz4i1FYqF5ylmg90ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=ZZqMSU79vKIFWjQyoVrYBEpPvH/BO19DaG8KVjQMXlw=; b=VmRrX4W1YcbTjW3XMPu+lCWP6EcOkHKOFpNNnYw1RXir4J4eoTfvNf15/izI65fhNvhcunHTPc1wFGHQG3YpMgdwOD6xc/rIbd9wTBFNhTRQrGGkTwSjyKMwmHhmQC5JgQMsYzeKTZt5/O0TPDQaLDld3WV7NmvfkmBvYdo8uNceDaJobEz14v9oD/n9sOxTQUNPuyqOmLbH4DvXmBxQlVec645WF5rY2NE8BLqknQAfiTzAfppwfcyyq/HSieIFx2pkxqosXjfHLibWo2j3yvkmUAlcqKh5LEm8QqbwSR4KRM7ssGeSgy4WucUf0uf11rQje1gPI9IoQptLcQVYjw== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZZqMSU79vKIFWjQyoVrYBEpPvH/BO19DaG8KVjQMXlw=; b=HVF/PguiGCZEOPs47MuwwqZJXro8yWbhW2mSbcGgSJl/G1TecwZZk99qRL47Er4hmTXLG1UkGcrjUvgHO1i4jGN9lC210x94MMU41aUKpgZUje34BXTO5zgROSrN7HATI8IAnuDz31WZYEXxc1bqwRgoiYyPs50eGcShefc1SL8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:25:49 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:25:49 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Gagandeep Singh Subject: [PATCH 07/15] net/dpaa2: use internal mempool for SG table Date: Wed, 28 Sep 2022 10:55:08 +0530 Message-Id: <20220928052516.1279442-8-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: fd2037f3-842d-4300-a0ab-08daa111e75d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uZaCbiFlIEbTZgWrUSzgN9P3CN0S4BorRkv88sytBDOsZyFGG7get1V86MMhk7uVcIfp1KV7N67zBR8KQ4dEYHT7d5myyx9i/4B0nSJ+TsHwR3JeTQhopjlL+pkKONmtykXbEgI46VLb9oEcEEzhqp7hnAhWj6F+Qp2LDsVpY25/Jy5mawEh5UdpDvZnzzhaKtAFcNzsKKYgTtW1QFjBn6K7putYkUN1cYdhkTVp9wG2iqpNkkgBjDsp3FdTkGFKl7qjTG/sg60OgwLp/o8KGCwLnKwrEGuwk5hNhOpNBt1JOk8oILrK5ex2sRzik22aXFOF7ry4cBffjwBnp8q8rKGlyRc2rma9f7CChdWUZGRwYmuRk0+mitI3VQLJ8IL4US5AlUVvkFcfwn3hR1enHABZ969I+HVJ4PdWP6DjxATOA4V4ycVVf0dIYjVHDZgqJC3RlGeducJpZfzdbOpLm0/ppiWw1opXGNnxhEOCWHKr1uu6oZdkUUeL8srZh5mg1CGFmpGZczHcUlgoHc+a/aNKjd+jpiIMUFwHSeaIg4SoGQXHZLLsemHUS4DVeKGz+a9D+WYgZ1nx6rlwXiOxp5qxZ0H4mkTyrLAGOF5waKK2HaPC20uzewz9jgnhokoDvVEM64wOr82p7tw+Zn0Np/dYEc0jnKvUvG5JQm9OEZz1r3NJMy+Lffk7JSNpuEvSDRtWb/Z1eid0Bw3uRXCJom6DCZ0wni5zdJ87Kzcs/AsLXP4nB8ptd259aYKbek0s+z+n3HlOaasU7OSzIXZwRg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(83380400001)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KKGjekamUW3rMXxyTHwjW0tG+VukqtgnBZbbz9ZOoJGmZz3kx0PQ9Q9vO5TShyndGPVuISk6U8IRttgD48Phl40mL7eY/8FaKx0ZCcOg9ErsOSu83XrZWxRobU9GuxA7z03H8xnFPpeaL2ToHJe7qO4RenFvO52iIIpydUWCe1GRWsVNfdrqXI8rt+C7D0mMYq3pSqcQ0mXbi3KrHtQYz3rv8O4iAu2A9n+1OcN/h7oS+oMl3Dln9XB05m/CEBSPyTDn6GYknIcCzCoHlDDzw4gnAUiEOze1QwIu4oiKcAj7lD0QBJSOFWtkvUS4o8LhC31hjQvlGCU3bRm8XD21bl4XbIWhQ7Xp8u1Iym34u9GALRWQnxHkSaKWZENmv1XTC+9YHar9UsMelk290DINin85Q2nYhIU+IQKewNKkkdGLVmO/wHkb/ykY+hyCnO4PcrfwAeTptfucc6it1/RRrt+Bn7De1h//+benop1YY0veOVBXDTyVD/T5EfufgFmkK/6EdiSBeqMKQp+86hco8MJkGBNyseF5qMpDeQNHztAK7PNW4WjePwicC1X06MsA5e1UQisC88wVdve9Dk8c/WTvabPE/xXMUIX2Nvrt15WbvWCHfxGwPXR17DjRx/ZrlHEuKciw0ZTqpAIvpXi0uQHjtNz+eL5UXMI6ufV5dA7JXtIfIxsep6oOXKPv0gmpp1/EmSiPckdVRVxWto6EPEue6o/OvXUpQOs+Ni+SQChCGIfT+oAxKb0foTuUdOyUkzka6tCWPuZLso3EoN5xVzt9ta4eAaYfZRZsiRlnXEH+69GDtGZgoT1oMcjneUAk1CIc0805WAs7tVEbkXrbW0VybqbL+fvZHl4r9xTHdLRdjGMyhrhVcshmPHG6HJQTKdSr2ZwoZxoRn3JIzmWErTRXxtG/AizU/kRmf/YdnYcjcZSAreG5LB3AuyqgeIIuosTQ0k1vrciyG++dUlROF/QfIYkjRocKAG/oEAKuNp4/0AUVsxlz5ZUtGFid4TFEzkgTXy7F4LlQgY7jWoMa2KqErJrhWCKb5SJ3aggheMwh12BDVQ9ENrmVrnW12h20CypLIYyE9zKrXB+z4g8xU2h7r3w3UbPhV1Q6mCZo2aTeSEsUPDcGnfqm+Ks3ORtRnFKHfq1BD5G//FfGwj3Tb3vb8s5ohcNGn18hPpsJ0O2+ufRXFSo6Db8nTlfv/TCbOXEcjVFxDPO64Ri6eFeTVd4B8bl3dZVQ9L8MwNiwWMxX45d9CMLj+WFJrB6FkuffKUw6mG9jbnXHyxYExFPGoGSDeLrd5IkFKi5W8PQyp+Of+kLwjnVvGL3oLAlDyqF8mI+psLC+tBh7DCbybLpWlpW8GdUko5zNhnkSc09eZkyTknLRCVF4qHrheiH0VWYfeQLS+nNz61W8cir4SGpvR8Dz94U+yNrrZ2YVjN2c3MKgdCmI4BFrjf6UIR0nar6rHXfIsZ+sHNUkeFCyLTPPmkoSLhd0bWaq1buEZGy/PfA/j2pcRPBhmMAyq6x/4AuOA1WUNwUFcqK+YTbi0Y//wpY4RJJ8SpxWvsNyeXrUve06VmV1PDe19phkTJzk0mDX X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd2037f3-842d-4300-a0ab-08daa111e75d X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:25:49.6721 (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: Bus3fKKNsOAcIm0vJPiZTs8OG3ZNyTmdYfQHL/FMnutUBJeKT5An9IGdY/Ar3CIc X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 Creating and using driver's mempool for allocating the SG table memory required for FD creation instead of relying on user mempool. Signed-off-by: Gagandeep Singh --- drivers/net/dpaa2/dpaa2_ethdev.c | 14 ++++++++++++++ drivers/net/dpaa2/dpaa2_ethdev.h | 9 +++++++++ drivers/net/dpaa2/dpaa2_rxtx.c | 13 ++++++------- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 37a8b43114..c7aae70300 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -78,6 +78,8 @@ bool dpaa2_enable_err_queue; #define MAX_NB_RX_DESC 11264 int total_nb_rx_desc; +struct rte_mempool *dpaa2_tx_sg_pool; + struct rte_dpaa2_xstats_name_off { char name[RTE_ETH_XSTATS_NAME_SIZE]; uint8_t page_id; /* dpni statistics page id */ @@ -2907,6 +2909,18 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv, /* Invoke PMD device initialization function */ diag = dpaa2_dev_init(eth_dev); if (diag == 0) { + if (!dpaa2_tx_sg_pool) { + dpaa2_tx_sg_pool = + rte_pktmbuf_pool_create("dpaa2_mbuf_tx_sg_pool", + DPAA2_POOL_SIZE, + DPAA2_POOL_CACHE_SIZE, 0, + DPAA2_MAX_SGS * sizeof(struct qbman_sge), + rte_socket_id()); + if (dpaa2_tx_sg_pool == NULL) { + DPAA2_PMD_ERR("SG pool creation failed\n"); + return -ENOMEM; + } + } rte_eth_dev_probing_finish(eth_dev); return 0; } diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 32ae762e4a..872dced517 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -121,6 +121,15 @@ #define DPAA2_PKT_TYPE_VLAN_1 0x0160 #define DPAA2_PKT_TYPE_VLAN_2 0x0260 +/* Global pool used by driver for SG list TX */ +extern struct rte_mempool *dpaa2_tx_sg_pool; +/* Maximum SG segments */ +#define DPAA2_MAX_SGS 128 +/* SG pool size */ +#define DPAA2_POOL_SIZE 2048 +/* SG pool cache size */ +#define DPAA2_POOL_CACHE_SIZE 256 + /* enable timestamp in mbuf*/ extern bool dpaa2_enable_ts[]; extern uint64_t dpaa2_timestamp_rx_dynflag; diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index bc0e49b0d4..dcd86c4056 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -403,7 +403,7 @@ eth_fd_to_mbuf(const struct qbman_fd *fd, static int __rte_noinline __rte_hot eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, struct qbman_fd *fd, - struct rte_mempool *mp, uint16_t bpid) + uint16_t bpid) { struct rte_mbuf *cur_seg = mbuf, *prev_seg, *mi, *temp; struct qbman_sge *sgt, *sge = NULL; @@ -433,12 +433,12 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, } DPAA2_SET_FD_OFFSET(fd, offset); } else { - temp = rte_pktmbuf_alloc(mp); + temp = rte_pktmbuf_alloc(dpaa2_tx_sg_pool); if (temp == NULL) { DPAA2_PMD_DP_DEBUG("No memory to allocate S/G table\n"); return -ENOMEM; } - DPAA2_SET_ONLY_FD_BPID(fd, bpid); + DPAA2_SET_ONLY_FD_BPID(fd, mempool_to_bpid(dpaa2_tx_sg_pool)); DPAA2_SET_FD_OFFSET(fd, temp->data_off); #ifdef RTE_LIBRTE_MEMPOOL_DEBUG rte_mempool_check_cookies(rte_mempool_from_obj((void *)temp), @@ -1321,9 +1321,10 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (unlikely(RTE_MBUF_HAS_EXTBUF(*bufs))) { if (unlikely((*bufs)->nb_segs > 1)) { + mp = (*bufs)->pool; if (eth_mbuf_to_sg_fd(*bufs, &fd_arr[loop], - mp, 0)) + mempool_to_bpid(mp))) goto send_n_return; } else { eth_mbuf_to_fd(*bufs, @@ -1372,7 +1373,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (unlikely((*bufs)->nb_segs > 1)) { if (eth_mbuf_to_sg_fd(*bufs, &fd_arr[loop], - mp, bpid)) + bpid)) goto send_n_return; } else { eth_mbuf_to_fd(*bufs, @@ -1646,7 +1647,6 @@ dpaa2_dev_tx_multi_txq_ordered(void **queue, if (unlikely((*bufs)->nb_segs > 1)) { if (eth_mbuf_to_sg_fd(*bufs, &fd_arr[loop], - mp, bpid)) goto send_frames; } else { @@ -1810,7 +1810,6 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (unlikely((*bufs)->nb_segs > 1)) { if (eth_mbuf_to_sg_fd(*bufs, &fd_arr[loop], - mp, bpid)) goto send_n_return; } else { From patchwork Wed Sep 28 05:25:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117030 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5693FA00C2; Wed, 28 Sep 2022 07:26:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D124427EE; Wed, 28 Sep 2022 07:25:56 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60040.outbound.protection.outlook.com [40.107.6.40]) by mails.dpdk.org (Postfix) with ESMTP id 3A2F1427EE; Wed, 28 Sep 2022 07:25:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j3VD/7XxmS80OTS4XXC4a8awLrI9z3D3c+E+FQaqwxT46AC+BgML8ElIm9UQPMfWzOysf+tY3exyUj2byNSH3zecaHE5diWTNT/G9O4WUSK0ZyTeHYD9IS3MxsoYgjei4oRDyWrYJD85PQfCOBW9k9Dv5Jb9ILBh4CkbCt1FNOymkalx5girujkWNrCafb9YAEcTJk2O8BYfzgkggP1Kj1nAerJO4lqOo/Mnexo17nqAoyzbnOw7ztrxgXC7az2aZ+PVd31hchGIe6RssNOeyIQbNwW4+e6y1muKLryFRYv23KSYvNfnBKduaRvOUdFT6snBJttDAV5OhIFybNbFSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=0toi+zGgVxHR3LmBeUSPbc12NKbonwlCGpLNPWhb3Lg=; b=LYpobcy+ZelgixxXo/Mq2Qkqvwys2M1vv21NgokBKRfDfJca1ld/XqE+VpHAvGbdvFfrpu6sFz3KfKT3H3Usi7PNp3UEOjm0ogiWcUAWq0gV+KLvzDXK1s9AT5VDXhBDDhtjTRd/SH095U2L8GwLFFOHBWT+rrLiFdAyPbEw9FqFkidaqWvjZQhFzQNICL9cY5iwuhNW0+7NebEwkjaBzpqgqlPY78NnDcsyN5OoowrSepnnVIgtn+s1sN242RYs8Qp12MHHgDmCXmh8LFayruZRpEjjovVGzE3znI51j5LHHPr8nokkY1HUWXEJHVrA4y1exiKkqRZrNjLUPWcsXg== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0toi+zGgVxHR3LmBeUSPbc12NKbonwlCGpLNPWhb3Lg=; b=alTKX3ToBr1qpa8R9YgowY8oATcmwTArqwLeEU/MHhu4/G2dnHIXLFXgn22f5OIecXD1cPL2ctPl27zU82zpJMfgycRthJWQAfOGaWh/z1K/5MRMNxc3/Orke5TNGa+tyNQfOHQU2l1u2itE6BZ2SLmKkYeR+CNznz8X3MdVriQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:25:51 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:25:51 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Gagandeep Singh , stable@dpdk.org Subject: [PATCH 08/15] net/dpaa2: fix buffer free on transmit SG packets Date: Wed, 28 Sep 2022 10:55:09 +0530 Message-Id: <20220928052516.1279442-9-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: 8721dede-4490-408d-7bd3-08daa111e879 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fr3LGEJ0mjdYxgseB7kqaaaEgLhYPckNUMbFFxwiRwzh1LuQHPGIyUhfU08iV52WPuEU6hXEvVWsZTGwEN4808S/uHg+MD1uxoP/5WK4qXpPFa8WA2iWUFy2LTMqNrduoepEtBTbA72NsIOyG02CQyLbHnB3gYK+BXc6Kqzjk7sAXvY+rylevv8Y5g3hQAiwN9H5RzcDKyXLXhfm9ARttaFQeFzDGynZY5NwIu4qXdj0uIITrAhIoABMWCz2ek0xBHTNEf1C+KmE2bY06fN0rSFlE7sj2Rbcke7tCv2M7NejCtaRwmlpA+K40bQzDMYALXA1w/cAuhIifif7+pXtDsm5/unpSyH89p7KDb5IwfLB9ALKpi4zz/Hf+UOqI0kVtIEqRHL/0OuFmL/Ab9tG5jmDOzrygULDgqCjaOeGRhJ2RcT5K5CHdrw4Gkugt60bxtG+zXoZ3AjMZvrlzbQ/S9E7mzLY6VbZGHBfGXnbz0EqjdWPiGaNo6e1Bm8O3A86FQcjgc5D9vJ1VRpgjne1DC3rXK9Ow6RAQtUVbbMkim6d8SZMM1h+H8tmL9wNl4fhYpPIjls0zE/Kn23c9pffVKCLts1eSYyBfZAwj374B3uzlsXtM+aHoi3TyDdUfy/tPD7ItGarffNyzLBx+TdNhQJoOY8tYI2bBLKTyLBvjJJu2yiizccsNjR7fqyki4v5i3um4ogA45CCj8Tp5buAVMTXTQCUBg5K36DC/SFWPCWbBGAZFIW1acMisKM2HrWTFjFkTXm9Qa39DQK0uJFhIA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(83380400001)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /WI98kd482SBOxw88RkDSrXx71PeOIIKMgKVbBj480q2fu2pgdeew2mz5zxkq0CkTttQKxr0fWddm6Op3oMoOJp/sRpeehYke+uVxbRyBpbyMcT/65X4BvyRVkap7i6RPzfeD5pW5oaZkNMUQlipU9gcHWyh04/lwtqFRCj39wsn1bAp5YNuFRd/b4AhtlE2f6piTUXu6wtlPM2kjsdk+iYowpD/tPT5pPa1Gh6WEbVM2Ox0SEY7hciQp6M4Vq1I8+DniPzNGdFJaF7LXyUhyzNwAh9NdxIllnI6mNj+ixKuuAle1T5YcU3Tzx9iuh+FqmBRaVfsp1o4FNac/3dGGjf0sJc05LALQ+7OA+Gt5AN7JuhYDihU8E8tVY0X1d8jYieSgKdqIAB+PIz7mBRpuoyPvmerfTtM6MxUSlQiAjNyUdBBf9CouUlcfGmQ29TcfMeIC/rRwp9ABQQQNVwx7xRV44lDKUyAIBCd9KzeCwxHBCiK5xjYXKK0qOLKx6jJ1bGnJL+53LH8GmZpmyUD2KDntWtHhRNLD+b3olqASe8VO6GgM9RE60vgIMP3z3pJmmc8L4xazt+NXljFKAoMOu/ch5oInRrFe3qfMfvwuTEqle+XzXSgGKvVIUo/Tg7KIvxkFGG1UsfqK5g+ibqEdEqP2FlDSC+LO86oRJf4rrI30aNzUcsbRC8xLp6VLRWLX++SdMuAsGK77W3DddECgjhVbBNyPwcXN6ue0O84435IPylIGzB6UjUoYBPA8slV6ydKO8KC17K1EIMuI20OgKQxVd5Ro+5axXevaYlqRC7FnxnZZviRlHNfbXn8YV1tloN31Xbpk80pgmpHfpSwd/7w/37ZIOrZ8+JVhoNHp9MDrUTfxiwjeOFgOp3n0Djswl6Lo7F+ePjYmP6bKnJ28c1E1DBz7HKbK4Gqcs+wpngFttSa4WyP4l5se6jsZvggCmvZGU8o1OH8Qx5i8oWYSLsYUwfsP0Gd045xSsMixRSBFBDbrpRc4RekOtu2eg7b6DUKgnYea7lL+d4GsXPoL1VEhFLxVja6Y7Ohz1a+L/3RUVno9tBuxKkBLr8X/ogTEPF1oxoOfJTLK0dxH+mtOjjiHBLLBXoNGvlvK39lMng1u1eQE9qBlc9GgFigQ9rNx+oyVkGN3TXMIA/YnMT2tf64hZJ0iyYJyotBUU/pKKomYvYItBOARqAlaIDR49dbMWRO580oYALT6z0X1c2gyTto2jD5M/RJlz8FQHCsh1mHjvWOzHuCHITB1PLbfITg36/OYB+IVVijTXr8XISfV1ODWJmxiHBBvFG1jJ4JT5ggTYgQyZR3En67zlMzIoiq0r0HzDjilnkruJRX5wxOSMY9KlDQOrJuZhGaKSWtEl80pMyCl0bQuqsL+epNyYbdJh0mKMCKD9ucuH05AA02mEeE3scMTdUSBZFL9u6hBJkyWQCYL1VoRoIAo82PpeKqIA5y4QH7/vh8bH1hYPXUNQCVoORQRyzTaFlwOjXpTOhTxIRRXcYItEpFafFw1B5rBKzbfvdCi90ND3VW+78yyh3yqt3jcLf8AJPvmS/pNaJeLTDSCdyM8ppvvEj0i+gH X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8721dede-4490-408d-7bd3-08daa111e879 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:25:51.6575 (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: Rx+Djp/cCFO84e0jeuxOCgZ+7a873gt0wrpapZUfgSxbkQ9wZDLXps1F7ivtDUM3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 When using SG list to TX with external and direct buffers, HW free the direct buffers and driver free the external buffers. Software scans the complete SG mbuf list to find the external buffers to free, but this is wrong as hardware can free the direct buffers if any present in the list and same can be re-allocated for other purpose in multi thread or high spead running traffic environment with new data in it. So the software which is scanning the SG mbuf list, if that list has any direct buffer present then that direct buffer's next pointor can give wrong pointer value, if already freed by hardware which can do the mempool corruption or memory leak. In this patch instead of relying on user given SG mbuf list we are storing the buffers in an internal list which will be scanned by driver after transmit to free non-direct buffers. This patch also fixes 2 more memory leak issues. Driver is freeing complete SG list by checking external buffer flag in first segment only, but external buffer can be attached to any of the segment. Because of which driver either can double free buffers or there can be memory leak. In case of indirect buffers, driver is modifying the original buffer list to free the indirect buffers but this orginal buffer list is being used even after transmit packets for software buffer cleanup. This can cause the buffer leak issue. Fixes: 6bfbafe18d15 ("net/dpaa2: support external buffers in Tx") Cc: stable@dpdk.org Signed-off-by: Gagandeep Singh --- drivers/net/dpaa2/dpaa2_ethdev.h | 9 +++ drivers/net/dpaa2/dpaa2_rxtx.c | 111 +++++++++++++++++++++++-------- 2 files changed, 92 insertions(+), 28 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 872dced517..c88c8146dc 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -129,6 +129,15 @@ extern struct rte_mempool *dpaa2_tx_sg_pool; #define DPAA2_POOL_SIZE 2048 /* SG pool cache size */ #define DPAA2_POOL_CACHE_SIZE 256 +/* structure to free external and indirect + * buffers. + */ +struct sw_buf_free { + /* To which packet this segment belongs */ + uint16_t pkt_id; + /* The actual segment */ + struct rte_mbuf *seg; +}; /* enable timestamp in mbuf*/ extern bool dpaa2_enable_ts[]; diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index dcd86c4056..94815485b8 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -403,9 +403,12 @@ eth_fd_to_mbuf(const struct qbman_fd *fd, static int __rte_noinline __rte_hot eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, struct qbman_fd *fd, + struct sw_buf_free *free_buf, + uint32_t *free_count, + uint32_t pkt_id, uint16_t bpid) { - struct rte_mbuf *cur_seg = mbuf, *prev_seg, *mi, *temp; + struct rte_mbuf *cur_seg = mbuf, *mi, *temp; struct qbman_sge *sgt, *sge = NULL; int i, offset = 0; @@ -486,10 +489,11 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, #endif } } - cur_seg = cur_seg->next; } else if (RTE_MBUF_HAS_EXTBUF(cur_seg)) { + free_buf[*free_count].seg = cur_seg; + free_buf[*free_count].pkt_id = pkt_id; + ++*free_count; DPAA2_SET_FLE_IVP(sge); - cur_seg = cur_seg->next; } else { /* Get owner MBUF from indirect buffer */ mi = rte_mbuf_from_indirect(cur_seg); @@ -503,11 +507,11 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, mempool_to_bpid(mi->pool)); rte_mbuf_refcnt_update(mi, 1); } - prev_seg = cur_seg; - cur_seg = cur_seg->next; - prev_seg->next = NULL; - rte_pktmbuf_free(prev_seg); + free_buf[*free_count].seg = cur_seg; + free_buf[*free_count].pkt_id = pkt_id; + ++*free_count; } + cur_seg = cur_seg->next; } DPAA2_SG_SET_FINAL(sge, true); return 0; @@ -515,11 +519,19 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, static void eth_mbuf_to_fd(struct rte_mbuf *mbuf, - struct qbman_fd *fd, uint16_t bpid) __rte_unused; + struct qbman_fd *fd, + struct sw_buf_free *buf_to_free, + uint32_t *free_count, + uint32_t pkt_id, + uint16_t bpid) __rte_unused; static void __rte_noinline __rte_hot eth_mbuf_to_fd(struct rte_mbuf *mbuf, - struct qbman_fd *fd, uint16_t bpid) + struct qbman_fd *fd, + struct sw_buf_free *buf_to_free, + uint32_t *free_count, + uint32_t pkt_id, + uint16_t bpid) { DPAA2_MBUF_TO_CONTIG_FD(mbuf, fd, bpid); @@ -540,6 +552,9 @@ eth_mbuf_to_fd(struct rte_mbuf *mbuf, (void **)&mbuf, 1, 0); #endif } else if (RTE_MBUF_HAS_EXTBUF(mbuf)) { + buf_to_free[*free_count].seg = mbuf; + buf_to_free[*free_count].pkt_id = pkt_id; + ++*free_count; DPAA2_SET_FD_IVP(fd); } else { struct rte_mbuf *mi; @@ -549,7 +564,10 @@ eth_mbuf_to_fd(struct rte_mbuf *mbuf, DPAA2_SET_FD_IVP(fd); else rte_mbuf_refcnt_update(mi, 1); - rte_pktmbuf_free(mbuf); + + buf_to_free[*free_count].seg = mbuf; + buf_to_free[*free_count].pkt_id = pkt_id; + ++*free_count; } } @@ -1226,7 +1244,8 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) struct rte_eth_dev_data *eth_data = dpaa2_q->eth_data; struct dpaa2_dev_priv *priv = eth_data->dev_private; uint32_t flags[MAX_TX_RING_SLOTS] = {0}; - struct rte_mbuf **orig_bufs = bufs; + struct sw_buf_free buf_to_free[DPAA2_MAX_SGS * dpaa2_dqrr_size]; + uint32_t free_count = 0; if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); @@ -1324,11 +1343,17 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) mp = (*bufs)->pool; if (eth_mbuf_to_sg_fd(*bufs, &fd_arr[loop], + buf_to_free, + &free_count, + loop, mempool_to_bpid(mp))) goto send_n_return; } else { eth_mbuf_to_fd(*bufs, - &fd_arr[loop], 0); + &fd_arr[loop], + buf_to_free, + &free_count, + loop, 0); } bufs++; #ifdef RTE_LIBRTE_IEEE1588 @@ -1373,11 +1398,17 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (unlikely((*bufs)->nb_segs > 1)) { if (eth_mbuf_to_sg_fd(*bufs, &fd_arr[loop], + buf_to_free, + &free_count, + loop, bpid)) goto send_n_return; } else { eth_mbuf_to_fd(*bufs, - &fd_arr[loop], bpid); + &fd_arr[loop], + buf_to_free, + &free_count, + loop, bpid); } } #ifdef RTE_LIBRTE_IEEE1588 @@ -1410,12 +1441,9 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) } dpaa2_q->tx_pkts += num_tx; - loop = 0; - while (loop < num_tx) { - if (unlikely(RTE_MBUF_HAS_EXTBUF(*orig_bufs))) - rte_pktmbuf_free(*orig_bufs); - orig_bufs++; - loop++; + for (loop = 0; loop < free_count; loop++) { + if (buf_to_free[loop].pkt_id < num_tx) + rte_pktmbuf_free_seg(buf_to_free[loop].seg); } return num_tx; @@ -1445,12 +1473,9 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) skip_tx: dpaa2_q->tx_pkts += num_tx; - loop = 0; - while (loop < num_tx) { - if (unlikely(RTE_MBUF_HAS_EXTBUF(*orig_bufs))) - rte_pktmbuf_free(*orig_bufs); - orig_bufs++; - loop++; + for (loop = 0; loop < free_count; loop++) { + if (buf_to_free[loop].pkt_id < num_tx) + rte_pktmbuf_free_seg(buf_to_free[loop].seg); } return num_tx; @@ -1523,7 +1548,7 @@ dpaa2_dev_tx_multi_txq_ordered(void **queue, struct rte_mbuf **bufs, uint16_t nb_pkts) { /* Function to transmit the frames to multiple queues respectively.*/ - uint32_t loop, retry_count; + uint32_t loop, i, retry_count; int32_t ret; struct qbman_fd fd_arr[MAX_TX_RING_SLOTS]; uint32_t frames_to_send, num_free_eq_desc = 0; @@ -1536,6 +1561,8 @@ dpaa2_dev_tx_multi_txq_ordered(void **queue, struct rte_eth_dev_data *eth_data; struct dpaa2_dev_priv *priv; struct dpaa2_queue *order_sendq; + struct sw_buf_free buf_to_free[DPAA2_MAX_SGS * dpaa2_dqrr_size]; + uint32_t free_count = 0; if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); @@ -1647,11 +1674,17 @@ dpaa2_dev_tx_multi_txq_ordered(void **queue, if (unlikely((*bufs)->nb_segs > 1)) { if (eth_mbuf_to_sg_fd(*bufs, &fd_arr[loop], + buf_to_free, + &free_count, + loop, bpid)) goto send_frames; } else { eth_mbuf_to_fd(*bufs, - &fd_arr[loop], bpid); + &fd_arr[loop], + buf_to_free, + &free_count, + loop, bpid); } } @@ -1676,6 +1709,10 @@ dpaa2_dev_tx_multi_txq_ordered(void **queue, } } + for (i = 0; i < free_count; i++) { + if (buf_to_free[i].pkt_id < loop) + rte_pktmbuf_free_seg(buf_to_free[i].seg); + } return loop; } @@ -1698,6 +1735,8 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) int32_t ret; uint16_t num_tx = 0; uint16_t bpid; + struct sw_buf_free buf_to_free[DPAA2_MAX_SGS * dpaa2_dqrr_size]; + uint32_t free_count = 0; if (unlikely(!DPAA2_PER_LCORE_DPIO)) { ret = dpaa2_affine_qbman_swp(); @@ -1810,11 +1849,17 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (unlikely((*bufs)->nb_segs > 1)) { if (eth_mbuf_to_sg_fd(*bufs, &fd_arr[loop], + buf_to_free, + &free_count, + loop, bpid)) goto send_n_return; } else { eth_mbuf_to_fd(*bufs, - &fd_arr[loop], bpid); + &fd_arr[loop], + buf_to_free, + &free_count, + loop, bpid); } } bufs++; @@ -1843,6 +1888,11 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) nb_pkts -= loop; } dpaa2_q->tx_pkts += num_tx; + for (loop = 0; loop < free_count; loop++) { + if (buf_to_free[loop].pkt_id < num_tx) + rte_pktmbuf_free_seg(buf_to_free[loop].seg); + } + return num_tx; send_n_return: @@ -1867,6 +1917,11 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) } skip_tx: dpaa2_q->tx_pkts += num_tx; + for (loop = 0; loop < free_count; loop++) { + if (buf_to_free[loop].pkt_id < num_tx) + rte_pktmbuf_free_seg(buf_to_free[loop].seg); + } + return num_tx; } From patchwork Wed Sep 28 05:25:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117031 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1D752A00C2; Wed, 28 Sep 2022 07:26:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A16BC42B88; Wed, 28 Sep 2022 07:25:58 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60081.outbound.protection.outlook.com [40.107.6.81]) by mails.dpdk.org (Postfix) with ESMTP id E12B6427EE for ; Wed, 28 Sep 2022 07:25:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e1cxaMTwo5dKr6Pvu7N4DD0tDd9N1xW3OURmgNyeZD3rKVhofW9L7CIDcy3B2NkPALjPhqHVCAGkrOW6bv9RI6VqLUVctWDSaiY+EV0IevtCf17iA+aIQm8h4aDeYFg9vOnNm57KKocgr78+t7NeLPk4I7g01PS1nureKefr1V7nWSQBpt7UTdtR/mWJkxjuxpG7wGl3Lf7xUi55vrTOgfQ/hrrAalzdMIw0pGoDlfFTAqw8t9PLHziAI0DkOIEv5jaQm0fzINKOczx2eMPz4AnrPIcSUEXtKBxYM92bg40b9sJZDpqOK+mBCDNHVVVQB3qxbdl+cR8MJABS4R1Gxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=f0GCYo7RXbC9woyz6IDGHYCw4mK8kzliZCYcAgJx1/E=; b=EB7LoTUaYSaAv9FWa1LyhBU9YZF5iXgPQOuva8CPn2OALYxQOtnpQATDgIwrWXL/CI5/SXv1ymuU0qQKFuCIPup+NYoyOBFia3Psha1nVpyT2O+id6Fitu46L+Y1QGpOBZJGlbKo+deLrz5fTOoLqqSUDr89pt1Ua7cWBFvzDtEHFjrDws+5US170RORHbOmEMxMLY+4gsEnF7/DhwtO1exi/hDWo+bAsrbqNXHttWsO4dUMBki0BurLAfeoOtorulVI/xrcUnWF8iDKJwQMhfH7ajyy6pDadc8o3gbPHpA5rzHNgKd5UDR5o1O2OPd+yuMdAfY0vwFKjhf7VeqgaA== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=f0GCYo7RXbC9woyz6IDGHYCw4mK8kzliZCYcAgJx1/E=; b=Vco+6Ibq1WyiQ/M0oQRD96xHZz6WrEHyYTVkCujJOIsq0jxb2ZxQCDcYUqN5NKN96WZfTIJWFCRw6PVfOgV0MnRDmq+e0m5Q7kMqzKFwb4HeP7Xk7HAcGfWO9+eHl7EYmkZt64r2A67wVI2XRSvb6G3+LsSSnT/bMMbypkyqZpY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:25:54 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:25:53 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Rohit Raj Subject: [PATCH 09/15] bus/fslmc: add timeout in MC send command API Date: Wed, 28 Sep 2022 10:55:10 +0530 Message-Id: <20220928052516.1279442-10-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: fd68f8ac-44e8-49c4-e69a-08daa111e984 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0udTobBUxSOnfYl4+eoioY+2iW3zMRa9RgDLjyDDC80MXKOVwdZugHhl7HeyP//3OOmhFEp0VFPLuyR+pZ9QhWD4L+4Qcw/3t4t9NpJeM+lrM7fS0BNCYOnq3XM/xwhhT4v/AjtSz8zWwqgGDMicCo2meigkQmqKnBKAU+oSS46SFXzBfM0TJb3UbVDcZA3UdXgyaj/m7alxfXQ45YF7NaKZvnOmBkiFCXoytUC5a+yI9NsxCUoxHle8nycct5H2fw25v6w1DqJ+Wb9+XAorlNRP73PRaJUArwmeXAu83jUGkkgkFciCZH7CNC9OPeOMh1xNk18mSwZiikBBCZuFflR2g0dOD5xLAjy4fTsEJ+rcgKP3iR7U1lVSUmAB+h8dlCja+vuLu4NkarkJAY/Qw/UM1P7u7i6JEvLluBHTe/3imhERYnaQbObF5RCgW9lcVh6u+EGB6TpAhMqnRwSIBWoWHRQjeQS4LMUNKPxqiAYLK1f0HTxQQY1w6Ya6c54Mk3yTlN5R/2H0FlbTedan6j3+fxzwLQ6D8RVhcss6B4AxTnLX92Qx2LeLVhb73ssmrq0ZCfSa2oDl6gtxIuviz080gX/4xWO1HNRp+j2AqmVtcFshRpFSrX0CVa1WEjEFyWcvNwPNlIkDjPhHbB6K7sObSZSjOv0+ZBMyCaQDJ+6CBy1J3cAvet6embKUETR3HT5fgj8JT9PF1xw+DfbRmBBCEvUWaslumRD2Ff4bJgBVNBxLYnLMmvE8YmkBzOAV4iYmA0DrvMQPtiV7t4C69w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(83380400001)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VMRKlBs13lgTZKW/JnNCeD/1CNsasEQxsEwRIYfGAcKzpi6iNs6qfvUamZ+/mMeOJutjlrTEo8d5i6cQLQJ1ofInxsp+ZgCxEOF7SdyUQ8Py79RWnPJwOGSG8tSbsq3W8wd++CAr3if7pnJTJIBtdLEy0QqJ8weYk1GyLU6bt0booo4h5Nojm3vLrluVanAQjR8AENLJ/B6xae8N1JzENpFClFmEx3Gda3M9oP3fLxa2M4rh34EmK2STRu/fc2ZGXV40/PpzzAjNRdKnHrNgM7IAvzgDfPPVlVuD/rPisfVOX2aLPusGEAzf4uuXn2ooEffpinsYMpcsYSSxEKgtf3ZEzPHN+UYbhqY9Oqmbf9/xa/EbuNJsT5uVgCuW5hREnNaFSVcnGpmpmlcpWPp1yPqu/NtB6k0Jm7I6XfK/7nhL1ZVDaDQWqB9nIX7dfDg8sXuEerF7pA83Ytje3+uEKEhOE5/IJAEwvfGZ6SOpYdlo24uI8pQVvEuKDxvEv31qQo5ISy0gx06nwNfqA/3b0aOgmOLYsoz/3eoGyMG8dCRpQl4Qwd7dGJ5Kq4SB2Uz7iDvYXy1zN4Aa9zoVSmOZzlG7sEdHttC8GHPeU69IlMtd1DWHb3Fznx7gmRnSyaS+I1rsa4DfQexgmI1vyWJsDkZZxehab33nfQ9NCYGbUaKQYW42zenitUqVZ+oTwCZpJ731XyIOKlmtRQcZJ4EMF5S56GhHXviBTbblLJikyxlJxp2De/f7mmH0UsY7z0Ao4XkBvkJkc7FcQbrY58xmq7Y4Ihofsf7jm8IhIAdcy4f7h8hiM1BdAHgMtNU9l4C8kd7ZStiQaIF02f2vnnTW1sEowucOpYvFs1Q0Heeewld6QXqvdmOe1snojz8XPMzSk25EJtRIDgYPNKjJms23QjV7Fnv8176Zm7Y87kiydcprhswtgWx8mpApA0s+Lv9I1Y7g4/uArYk6N6MwLBeAGk5PtBB5UfkLbRKqAIFtJLozX4c3F4e5wBFiXhu7bAbneU7vIn9eCCsCVyXiNwj0NvOZMvXqKj0zrOqXXvZ8UakrqkK6TovCU0QIAg/gbjcToKglRj52NpRYwD6GU5gl5izPG3/wi1LrkuhB5bckNcmpYsbeb+Bqp6xgjxIN89Gt1oVixD64vtgJX1Fsjrqw2GlrTH1lo9nidGWKlJoRziqFCCD5feHUv3Af9621DQ6/aRkRz1Ut1W0NldzqkfV9y05bEsOWmllDtFO+mx10PK3G8bJgiPpP8AZ2EXjBIUtik4N3UPP0jz9nLs4SkTRciQPHBlam80K97+v5Ha4jaoHwjz48B1eADTzTZ7Kl2OGMmBFydXLz1KwC15n7syuv9BOuVGACTHu2sDNtE4w/Wn5kzkApp/9wR7H3rE1i+2oV0rOytN4EUGKe1h/uge7Se37PoBLPKur0C6vadu6wsXWq5XmbQCrb2yERaSUQAsPHQ26XolF4c+M9Ot/1qzLaN3Pr4zaWf1EYCEpbnKlOpMKCm2JFMD+RMQV3mKXv3Da8RR7pry9jcjnR4LqBbd1NeDGZl/Gggqese+oGJxoX8dukbSKh79Pq1xSQ41hZqjT6 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd68f8ac-44e8-49c4-e69a-08daa111e984 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:25:53.2838 (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: DoJ3ZtmLErM15Illf2njN3xlpXSzy1XZHOBzhfeSG3sqzeiZ5eDWKrOYemHT4h+O X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 From: Rohit Raj Adding one second timeout in MC send command API to ensure it doesn't gets stuck in case of failure. Signed-off-by: Rohit Raj --- drivers/bus/fslmc/mc/mc_sys.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/bus/fslmc/mc/mc_sys.c b/drivers/bus/fslmc/mc/mc_sys.c index efafdc3101..ab9a074835 100644 --- a/drivers/bus/fslmc/mc/mc_sys.c +++ b/drivers/bus/fslmc/mc/mc_sys.c @@ -1,13 +1,14 @@ /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * * Copyright 2013-2015 Freescale Semiconductor Inc. - * Copyright 2017 NXP + * Copyright 2017,2022 NXP * */ #include #include #include +#include /** User space framework uses MC Portal in shared mode. Following change * introduces lock in MC FLIB @@ -54,7 +55,7 @@ static int mc_status_to_error(enum mc_cmd_status status) int mc_send_command(struct fsl_mc_io *mc_io, struct mc_command *cmd) { enum mc_cmd_status status; - uint64_t response; + uint64_t response, start_time, total_time, time_to_wait; if (!mc_io || !mc_io->regs) return -EACCES; @@ -64,15 +65,20 @@ int mc_send_command(struct fsl_mc_io *mc_io, struct mc_command *cmd) mc_write_command(mc_io->regs, cmd); + /* Wait for one second. rte_get_timer_hz() returns frequency of CPU */ + time_to_wait = rte_get_timer_hz(); + total_time = 0; + start_time = rte_get_timer_cycles(); + /* Spin until status changes */ do { response = ioread64(mc_io->regs); status = mc_cmd_read_status((struct mc_command *)&response); + total_time = rte_get_timer_cycles() - start_time; + } while (status == MC_CMD_STATUS_READY && total_time <= time_to_wait); - /* --- Call wait function here to prevent blocking --- - * Change the loop condition accordingly to exit on timeout. - */ - } while (status == MC_CMD_STATUS_READY); + if (status == MC_CMD_STATUS_READY) + return mc_status_to_error(MC_CMD_STATUS_TIMEOUT); /* Read the response back into the command buffer */ mc_read_response(mc_io->regs, cmd); From patchwork Wed Sep 28 05:25:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117032 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 15117A00C2; Wed, 28 Sep 2022 07:26:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9BB3742BA6; Wed, 28 Sep 2022 07:25:59 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60077.outbound.protection.outlook.com [40.107.6.77]) by mails.dpdk.org (Postfix) with ESMTP id 48DE7427EE; Wed, 28 Sep 2022 07:25:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SbhzCaCOaRknE3VPBO/QoNbQn0EDymkZbuHzvFfAJuVtkNuggkgRmkHmjRGJwEUhx6v15XL9EUtqE927cOLiMbMc0KyR7UAOiqToi33tt84lfM8dCN5MReZtRGkqe93TvC4PWmf1/BhmiDRD8Z/2ngMJ25VzBwmvjF9cLITEECS8OzOhyuU0xWU8zXnHUtCbpb35Yj7MFcwZtl0TnWn9B9fYh1TXrfFjySiGqUVl/R6GnPAZ0E+ePRciCgYteFdSmuGGQOaxgMx6AvCt/ZwzSqRI49LVx7HaoLBXbd6OoaK3SzY5LYm4M75YkU+9haxAomd2sLj0pVVt3iHH3hpziw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=+Ibhu1iVGJjc2vYUg/dcNY30bt6arqIotwxS9xXAip4=; b=doRR84K9nfPYQh7kz1hKpQRF5CFF48N1MDgbBbQ0ZTReeMMu9Ex/V5kUnbUnRnIyquxXdlaWKn1lynOlJZmpBfe1R+EOA3hP4u9aFeRVJKLwMuXgNXjNuDCsM9AV+E9vaboku2aL3XQFsINSy5kEOoVusWyezTUm5ZSdQbDceGI/WV9J2uj3kd6HeM6alCprb10+UB+EEQXV9l+PiF7+gDyY3NxIw5pFT46YEBvoTX3S4mWrpQrQI/bwL9vo21UQ0OlnnmFf3OVYYgo51zHnVCZCEm4dHDZBw/n32usQHIoiWJKy4/kcH9eIl4s9KFBeyQ9nELCp6UNx3HvfpvSO5Q== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+Ibhu1iVGJjc2vYUg/dcNY30bt6arqIotwxS9xXAip4=; b=Ad1KY46nNy14DVN6Lkrvm6bZ3XqxEB4yerejE7CxIA5UtWumdQGmPmSGDugXvg44Gn2gLgKUiCsQ/Yg+eGGEkJvzkXBPuBOICOzMtCCgpZE9tBtVMVGFVVIAj+sZcgIr6pHGd6rd+9JI913hVsqUcx78RoTbuUzTsSqI1/nAOfw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:25:55 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:25:55 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Rohit Raj , stable@dpdk.org Subject: [PATCH 10/15] net/dpaa: fix Jumbo packet Rx in case of VSP Date: Wed, 28 Sep 2022 10:55:11 +0530 Message-Id: <20220928052516.1279442-11-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: a3d34cd7-686f-4923-39e3-08daa111ea9e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ErxZETSA4vrx2R2wFZpXqc0B9d0zikEZ0R9fne7t8FwutCT7RsA8UyXC1+i8YRS8xbRWAAHjTtjJ4EPtLAv3btw9TwoCNRTwEP50UI2XcQp+4mdK8fYmcrSylDsAzWw0kMkRr1TgxFUk58I/mo2o0pqHwh+SNWTaw1L/DsC6tFMskYGkC8YKh6JTb92G0tUMsRQfagbgrNHc2GNQNdB5hxEocSOCDqotmcOsjMiEXrKrfjWGtawYcxbIhaAg297U9HwlDmpgFbTVxwU4dlwtSiMCV4a7PbAY2g2jVzizc/6xTUoTsfn5B6KL+6fQPCiLGWySU15mYQjEpvCmmVX/KlWGZURHQEQCIhuEAQlIKhFIGKs0u/l1y5ywYUZ90EZGY2A8FT6DBawwxqL+2YG+yZePImJNrsfa2QOM7/OeoTvftAUGVh+PjRW9G72NwV4XrsgnP2gYKrmJSEdXN4Cnzrk/tLP0wlifHUS0S6eDK8MoLIygkbXAk55iIQASDupZiRxFWr3zAE444o3+MlpErKbWnxqJKTFqESzjyJGkUbzefOSgmBZlbxswLLJj5Jt6M5gR4Xrq0DBqHOFQmKq9Vmg+8NHUjvcsvSwMgmsOY62uXla2abifE0eEVaVY/Y/ju6jyrDYZ7JzDkhjBXOUqQlPRKmCiRDbuwVp+jUTKl6IrZPllV+7ozR+YIhiaPWIdZbRu5Wl1GKzAcBhbRtgRULMhOxOTc+lSrGWroPzotlFI36Xxxwa91xY3sJjsaWcQLrhFnCHOuGm+PY9cO5BWCA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(83380400001)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HyT7B3vcu6JG4WCTy5eCY2FjcCrQX0Sy9So2r2BuZEjUoUWwp4knY3jKOuhuexErq6BHv9iWcqz2LVdU+bIFeq9fjQ2zJfqxE6/ox1c12VLHffzy0he1z1e3R7qBww4/MwImSHYem9zAS/ndl6WSGgVzwYG7ye/ux69gBBS65gmKiVKYDyYNRLigKd8JCQlqsjEmuG+9NqSKoIn1jlKbDrM+4TVt+eA29kdkDf/mJGNFaT+3NlJ6qD29jxbRl0+f4TGsML4o6n+KTbP7lHjkTWTKS6qVBPEDxEDYCAU3O7RqWkK2JmGYDGfwr7piJCtkR2CM1PUs6brFRoO/DECuT6E9B91kk+gMieGXGt8DmqxLvdTALvVc8ZwyQVO8I7hzXbKq6pZkoeRYKWCSiFBCpip6/F55x3trAUVVBM66KGjjQVi9b+zu5KWfNZi4IjF0usEDnwxIKmGoXziSfRp3tu1PGYNdPYmp0G22Aq/NkKaXcv//6dWUBnoAg/LDQZUoYE8AkYinfxKnzKmEzZ1AEGghX2QfiG1f44g39rbkKUEm1o7vmqPRbIqH2Y1BNv8HRAYacyaQwUi6vdza3Max1UpCSAu7aQmWoh+VBcCG82XEOZJejbso0kUT15hjyL63div8l2EfXrq6nSGdRAmFOncZ/2PnHYSotqVCMWBkx3tDsu53f7zNDTVobm77IkksHNJZ+A8CVPcazLvrkI7klfRUbJsow34zrCYrCFsFQJqBewVO15SVf+Rt3kNXk1xltjwu6zdvdRI9WyYNlKRDyWs+HfuizfdOMvmCoTM9ufWAwaCm68DGOTSyRoZiVpyE/S3Vhx/+bk39KxTQMyLR/HIJPBRBxny/vVTg4cmPdMTdA9eMLSYHozxuRlg0v9vD6K5/2eCMpsOVT/UtWzEUqkqBZWIQO+oifJ2E8dEDgR/CBMtrsjcjMcmJiRCLxLlKxRTFQNVBUhnVv3vmQVJHNxX0dGAkqBNPqxnVAmnvIHm90NbSKf2FfKHZLnR5C+kSLiUrDKLB6nm8EXljuk07l3KwNM+lifF+QMdrnesG5C3tnwrVWU9Ki8Tvx3fYeAGqaEoerDrRkVSMdHde2gFvkk8vfZXkN3B5hI3uAGgv68v0fmSSbMwR02LDB0/RT13C1Svwyd33Yay/MJoGHxKvzUOhsI25MMHeiXAvyXqjwqFwURluXuGPXjGOW2vkVpFT7Bpzw+fdVAnF22VCpc8cGNFrBLyu4U8SPE+8s9MApfqfMRiWAx2rZD2ipUL/xNo1fff7ZagfJUJA6ofNjC+gXyiq2AOfhZMSVZEUEw7sXCEPBFd5okpF4ZFgd6j/84JTXRAcdxtChxKSUQ7UARk9QkzTcwyj4/8Zd4EzHpYNIOHZxnA+p29h7jZja4ql1mbVoJaqAGEYMNfgCSRByZWR0ctfGzT+GS1cCsdLPwc8v2+wZ/tT0r2F7y/TYm7rUNx6mB4FrWvBdKntY8F44Wl8ZGeo9AI/hDp+dGo+yPOGh45sF372/TXmpEbXHNJnpFJiwKwg4PqqPJGm67OOIxlNFtCkXgSP30MJLIFfzN5V5yDwmBLG72Swrs195sFoE8y1 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3d34cd7-686f-4923-39e3-08daa111ea9e X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:25:55.3005 (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: TSnmgqZPmKmBqAy8IC+ON87gKqrNhEZWPjGlgiqym9zRuuUrt1wTLi+MDsvQz22+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 From: Rohit Raj For packet length of size more than 2K bytes, segmented packets were being received in DPDK even if mbuf size was greater than packet length. This is due to the configuration in VSP. This patch fixes the issue by configurating the VSP according to the mbuf size configured during mempool configuration. Fixes: e4abd4ff183c ("net/dpaa: support virtual storage profile") Cc: stable@dpdk.org Signed-off-by: Rohit Raj --- drivers/net/dpaa/dpaa_ethdev.c | 5 ++--- drivers/net/dpaa/dpaa_flow.c | 13 ++++++------- drivers/net/dpaa/dpaa_flow.h | 5 +++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index abcb1bc9ec..9b281ba8cb 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -988,8 +988,7 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, } else { DPAA_PMD_WARN("The requested maximum Rx packet size (%u) is" " larger than a single mbuf (%u) and scattered" - " mode has not been requested", - max_rx_pktlen, buffsz - RTE_PKTMBUF_HEADROOM); + " mode has not been requested", max_rx_pktlen, buffsz); } dpaa_intf->bp_info = DPAA_MEMPOOL_TO_POOL_INFO(mp); @@ -1004,7 +1003,7 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, if (vsp_id >= 0) { ret = dpaa_port_vsp_update(dpaa_intf, fmc_q, vsp_id, DPAA_MEMPOOL_TO_POOL_INFO(mp)->bpid, - fif); + fif, buffsz + RTE_PKTMBUF_HEADROOM); if (ret) { DPAA_PMD_ERR("dpaa_port_vsp_update failed"); return ret; diff --git a/drivers/net/dpaa/dpaa_flow.c b/drivers/net/dpaa/dpaa_flow.c index 1ccd036027..690ba6bcb3 100644 --- a/drivers/net/dpaa/dpaa_flow.c +++ b/drivers/net/dpaa/dpaa_flow.c @@ -939,7 +939,7 @@ int dpaa_fm_term(void) static int dpaa_port_vsp_configure(struct dpaa_if *dpaa_intf, uint8_t vsp_id, t_handle fman_handle, - struct fman_if *fif) + struct fman_if *fif, u32 mbuf_data_room_size) { t_fm_vsp_params vsp_params; t_fm_buffer_prefix_content buf_prefix_cont; @@ -976,10 +976,8 @@ static int dpaa_port_vsp_configure(struct dpaa_if *dpaa_intf, return -1; } vsp_params.ext_buf_pools.num_of_pools_used = 1; - vsp_params.ext_buf_pools.ext_buf_pool[0].id = - dpaa_intf->vsp_bpid[vsp_id]; - vsp_params.ext_buf_pools.ext_buf_pool[0].size = - RTE_MBUF_DEFAULT_BUF_SIZE; + vsp_params.ext_buf_pools.ext_buf_pool[0].id = dpaa_intf->vsp_bpid[vsp_id]; + vsp_params.ext_buf_pools.ext_buf_pool[0].size = mbuf_data_room_size; dpaa_intf->vsp_handle[vsp_id] = fm_vsp_config(&vsp_params); if (!dpaa_intf->vsp_handle[vsp_id]) { @@ -1023,7 +1021,7 @@ static int dpaa_port_vsp_configure(struct dpaa_if *dpaa_intf, int dpaa_port_vsp_update(struct dpaa_if *dpaa_intf, bool fmc_mode, uint8_t vsp_id, uint32_t bpid, - struct fman_if *fif) + struct fman_if *fif, u32 mbuf_data_room_size) { int ret = 0; t_handle fman_handle; @@ -1054,7 +1052,8 @@ int dpaa_port_vsp_update(struct dpaa_if *dpaa_intf, dpaa_intf->vsp_bpid[vsp_id] = bpid; - return dpaa_port_vsp_configure(dpaa_intf, vsp_id, fman_handle, fif); + return dpaa_port_vsp_configure(dpaa_intf, vsp_id, fman_handle, fif, + mbuf_data_room_size); } int dpaa_port_vsp_cleanup(struct dpaa_if *dpaa_intf, struct fman_if *fif) diff --git a/drivers/net/dpaa/dpaa_flow.h b/drivers/net/dpaa/dpaa_flow.h index f5e131acfa..4742b8dd0a 100644 --- a/drivers/net/dpaa/dpaa_flow.h +++ b/drivers/net/dpaa/dpaa_flow.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2017,2019 NXP + * Copyright 2017,2019,2022 NXP */ #ifndef __DPAA_FLOW_H__ @@ -11,7 +11,8 @@ int dpaa_fm_config(struct rte_eth_dev *dev, uint64_t req_dist_set); int dpaa_fm_deconfig(struct dpaa_if *dpaa_intf, struct fman_if *fif); void dpaa_write_fm_config_to_file(void); int dpaa_port_vsp_update(struct dpaa_if *dpaa_intf, - bool fmc_mode, uint8_t vsp_id, uint32_t bpid, struct fman_if *fif); + bool fmc_mode, uint8_t vsp_id, uint32_t bpid, struct fman_if *fif, + u32 mbuf_data_room_size); int dpaa_port_vsp_cleanup(struct dpaa_if *dpaa_intf, struct fman_if *fif); int dpaa_port_fmc_init(struct fman_if *fif, uint32_t *fqids, int8_t *vspids, int max_nb_rxq); From patchwork Wed Sep 28 05:25:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117033 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6A841A00C2; Wed, 28 Sep 2022 07:26:55 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7C2D142BAB; Wed, 28 Sep 2022 07:26:00 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60048.outbound.protection.outlook.com [40.107.6.48]) by mails.dpdk.org (Postfix) with ESMTP id E3FDF42B88 for ; Wed, 28 Sep 2022 07:25:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nJ93Lz9tZ0KNMI6Ao+29qsRRS9znwefIdLbdyo/e7KVQLL04jjUCy8q+Q3uuX1FzBuIqcXz9gdyf0Lq/4VWWOeIoH6qPZz1RRFmWrfhWZbsOoq5TBcj5O6z0wC0m40hKT6GmnQCJGS3Bsga7oxb6lb5lqEk63Knd5+Vp+snMAtcSzjNV/pHUNifLLotbmnV2Nk6yU7d0FD8ZYgDgEq8zAeFU9xXZn5anAB9N528CFr474WmsAoypyfgt0US6dS5gvqomFeHZXZTtywDTZFFs50RCE84cypWMIhAXAtpEL/r/UQaGEoqBdczniSRIYxI2vf7eSmq97VUezzW7nMnFAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=l1QguYMBxhuQDZ9W0OH0zwT9JehG3wDWaZmI36Iq2Vg=; b=l3t5UCBqeO8mU7NGJVhdjAzDO2O4o/MK2CjlnAY3i58gR5CjxmopjouLWilkRf5ihFjnhARpWelFSZrXWMRpGilWeN0fBpJqLlf+cD8JSj8MwxdjgKhZ00q5NUWEh42cicsnWGCui5qwpYbRfDx8j/vOd/lVl17b3rsoOxZChKR72GcDolKX2vBmm9npVunbXFmssy7MHHOcP8fXczr+vR5Wk066al35aYM5fkTssdJswkXPgsuGzf6f3UDeOpOQopyG6Gj0rOxU7MQhHaFBVzxJs+JpqGa4kP4RWF9Wi7F1RBuPYaD6qFvCbfbxBsj6Qro6YwbLh/8jW0saAbxG5g== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l1QguYMBxhuQDZ9W0OH0zwT9JehG3wDWaZmI36Iq2Vg=; b=F7NIcy6i1BVJqwkHX+ZcB/KqZUvdz4bqBt3oTOUad/vpJuhp39260JEOHpzFAzV/D6dEfmJb+CUsuWiO2B/cUBL8PZk7SuyV14V0gFHFUKsivEqKEv9Rq61uoEFYOSEQ5lZaMB2tJp5vRemALMmIlIq138ISKGHgUJ236pcOjA4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:25:57 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:25:57 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Rohit Raj Subject: [PATCH 11/15] bus/dpaa: pass interface name as a string instead of pointer Date: Wed, 28 Sep 2022 10:55:12 +0530 Message-Id: <20220928052516.1279442-12-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: 5025c45b-8fda-483e-557e-08daa111ebb5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bYfILky4ESuLTWPWmnehwwDyDzI6km8gKI1VCRt6p9oT2TdAPW6G9U6gvCW1QsG7a2bdmWKUOea1KUnepXpFx+LagLWlrhjiECVnQYfWNgY4JIy/Fs0pOgX0IBzPClDvY5HxPH2DSDKzDA8ZD4EufGiVG+v8VpTwARQl62Yv+iI2To7XvZvwmSI37bUK32QiJSFO0G3fa7jS1Cx6U2MMGjZXgK3GGed8qGDJrSEQnrLehEhyP39EwPyhBKZlpxsN2n3+NEMNmoiPN67ZtmkyT8lkcKplwEoig012wG/EcZVnFp0Q57cT5EmdjcSoVpxiN7tOjxdMVah3XXLXsbkyv6US/d4Ti1yeoEKTmgcL9m4QBY6YpS3QZwMRa03+381ns4WsOUufH5r7pfiEwM1Xd3ZQMLa9LH0o5Q7bptsBJQuw0iBRksYEkPsWwod32lPjORRnywlczs7191HWbwDwqrDz6dswkAymu9BalqaxjrZkQM04x3P6t4EqbouRePBisooaY5SYysgjQ2azbwsaPL3tjoly0BVg9v1UZjwdgR8Oeq/45A01XRU3+0L4sc/8Eg5dCG4Z+gLrOx4toRLxRREQUse3XWlHMLCjgJLTZSXph+stz3C772GVbch+6Q23ubpkPvXk4xx82S6gyHk9iAAk+g/ifZ8VPkwhxPLqxAFl9SeGyi+h2jIrpGIbR5VKcnUo+xj8FbClMG8RfdY787A2vtLDC9YOH+oAUkzzOz9Ls16FbftIj3UWiM+CkSMYHuznyfi69SSsqFacaMqlJw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(83380400001)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lu5xYSYz0ukgC4tPOLKmc7u6zWqrZWWlpJyf63vAyf2QEHi8Ez/1gSyMVr6NA9KVsbdglchhafIE107OMn4LEBEfVS0+lmKZP97WtSw9rH+koqpukMv6nxHeh3zFIbAIlvwkQabTQ6PXWjmverCK9dWAJPl/KvMz2/kZHuOHSNHOovKGYB0zsykuayM2RtAeRdbTXIwHiS8KXWizI/Dxt5ctMY02IljyTryTLxIANQaIJO1WvTbnobk8+uXLgeRjtYFNS1K3D24dfZJYAPSKMgfZ86ehWYS3T87jwCE/4Wj6fJCmK2JrzYwgNXpxleswQ3fYZP4b6WUmL5q20c+jATJFhrbh29yM1ecK5Dcp4pxbmDyH1hjDV5xVqN9rdZpTQbkKZRukcRJ55jOYLsDx1rGR+NjBwcn6/liUsUI4C6amJtqr1P6M6eswI0V9zzn7pyVl0dMMEE+ZiXZvb8xILxer62w9UieqXkQ0Y/kqgV2UknLKxATYs1Q/gSSJfLSyBRwyS2k96m+McddcPLJSomkpDOgC9a7zILSMMRA6/qDbm6TjdPysK6VmYmdkBzDZ3YDYHn57DwqtFD4RkJ9sd7vVg8APzc6ga5JCKKPYOiFRVEtQmTUqQsc7ejGnw+/BKChoyAg1OtsIVsvZrO0rCIaKTHTK4Uon1HOhp+kp8B5OzzrOg5JySPET9AEwP0I+O4Qlu/5FwCnlrTcMGu/O36BKknuzjwztRfOiL7iQVMLZpeq+Yaf1niLJW19ChsfJJP9JkmN52fYNl6HJrjL2xyeO4PG3te4htAzY+Ca2yjoaxQFdHJLQNsS/8vgRS5n8JpugSF/Hp8BYokMFgSF/SfHen+9KgbsKtt+2SajjgnbIyLUlmpFl5byFmgXxafXtSG+BxZTUHEcJybgAQSwyLhaqfN96572FIAF6+FSKNqBrRn/inQn9jscICDO1F6f0CgMaoCOEJ/lUI+KmHCcBVkLZQq664WfxJaV6P5UejIudLqAmSCyfXCLm1CHJmwVz8SD+CwdVm+koJ3MB5OYODjlRJzm0RkzNHnsG8rc+sMJezRMNfKhJ8utVME4S0yaXnvKkdm5K4Yrl3C5Q/NVRHACvEyfu7jGM60bj1Wz0Y95y/fx1TXs6reMD2xnKPQHZGvD0XgIIYxvWLZL7ON5S47SdQQgmtF/B7hmHkLOILbTe48EO4tZt2taW//ik26GFUPaMOY210l6MNMbDARS5zAyVUH4KE5sl5KVHb/2wsj1bh8m+4zeHpLRlMd9gUKzUm5C0Iyae9vWOi/kCUpmbMbrLYDe7CRTJ0/CNBlDZQ+UcrrKisvx+MtoLXSsX/a+7uNdYoV7vblVa/z0UrfMTpUayBeHT+Eb6mHrxuaXHWvDX+hLkxSqUdjdbTNBpM7PgP+pgPoUEWrZYRJLswxQ/egA8Tt3g+kQxFIDSxtdo0c+yFT7IwahCvN9TpwhLYdGRR0GhB70ml93FpG53iq/IFPfRZnwo2OfkuOV14YxHPP0qwN8Ar9Ya0+UwZgkjV2ZEd9A4JyD/Nr4J8lZXWXIg5KBRSrJ06LQi9tecbaLRKBVYfH6bYjcCpwO73jHwstwl X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5025c45b-8fda-483e-557e-08daa111ebb5 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:25:57.0829 (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: 8dtd6942DOuW/vS5bmwabZUCEn9zqlcZP8UN9kXkrPKjaQiE2oe6m2TxeJL2xWL8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 From: Rohit Raj Due to change in latest kernel, passing the interface name to kernel through IOCTL as string instead of character pointer. Signed-off-by: Rohit Raj --- drivers/bus/dpaa/base/qbman/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bus/dpaa/base/qbman/process.c b/drivers/bus/dpaa/base/qbman/process.c index 9bc92681cd..3504ec97db 100644 --- a/drivers/bus/dpaa/base/qbman/process.c +++ b/drivers/bus/dpaa/base/qbman/process.c @@ -302,7 +302,7 @@ int bman_free_raw_portal(struct dpaa_raw_portal *portal) _IOW(DPAA_IOCTL_MAGIC, 0x0E, struct usdpaa_ioctl_link_status) #define DPAA_IOCTL_DISABLE_LINK_STATUS_INTERRUPT \ - _IOW(DPAA_IOCTL_MAGIC, 0x0F, char*) + _IOW(DPAA_IOCTL_MAGIC, 0x0F, char[IF_NAME_MAX_LEN]) int dpaa_intr_enable(char *if_name, int efd) { @@ -330,7 +330,7 @@ int dpaa_intr_disable(char *if_name) if (ret) return ret; - ret = ioctl(fd, DPAA_IOCTL_DISABLE_LINK_STATUS_INTERRUPT, &if_name); + ret = ioctl(fd, DPAA_IOCTL_DISABLE_LINK_STATUS_INTERRUPT, if_name); if (ret) { if (errno == EINVAL) printf("Failed to disable interrupt: Not Supported\n"); @@ -472,7 +472,7 @@ int dpaa_update_link_speed(char *if_name, int link_speed, int link_duplex) } #define DPAA_IOCTL_RESTART_LINK_AUTONEG \ - _IOW(DPAA_IOCTL_MAGIC, 0x13, char *) + _IOW(DPAA_IOCTL_MAGIC, 0x13, char[IF_NAME_MAX_LEN]) int dpaa_restart_link_autoneg(char *if_name) { @@ -481,7 +481,7 @@ int dpaa_restart_link_autoneg(char *if_name) if (ret) return ret; - ret = ioctl(fd, DPAA_IOCTL_RESTART_LINK_AUTONEG, &if_name); + ret = ioctl(fd, DPAA_IOCTL_RESTART_LINK_AUTONEG, if_name); if (ret) { if (errno == EINVAL) printf("Failed to restart autoneg: Not Supported\n"); From patchwork Wed Sep 28 05:25:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117034 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4258EA00C2; Wed, 28 Sep 2022 07:27:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 99B5042BB5; Wed, 28 Sep 2022 07:26:01 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60057.outbound.protection.outlook.com [40.107.6.57]) by mails.dpdk.org (Postfix) with ESMTP id B766F42B99 for ; Wed, 28 Sep 2022 07:25:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ea8K6qwqJLD0k1m1v3lpGza/AgtyHNgZryLW74oLEnh+qtGtwLJ1rHRYdEdpFaiuNVBqHzpJpBVtKY9190yHPNhpxu9VqIqxJ+85X99j9Si7MeBbOjQpEQyxi2FA7dsIZBcCeXQuDrBxcshfjegUDNk7ELY8AoosstzucQIUC/OQ4IJKOu77AgMIYb2WWxYQMttWOqh5/g+wSWA4UYNlcUT7UGwwl6Uo83jHIeeWRHQzO1Cyu0IJJcDC/KEe1Rr4IAFI+yD3MXo8lA+JRgZNOhuPZqoZ/jtfpFA9xloHYloLJGV61y/GnP11H4TudlKKe9xNpO5FMSSqpuhCiXKuEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=AA9Xyv18FmPErafiouyr3AWlg/6Fe+owpLFrQeNUHfo=; b=NXNX3eYBhTsaaI0PWUkPIAhVzU4KVl4EDUBqGESdeafgrg660+pnNHyzcM4H2mgbQbzLtc2W4P2WZWikGP3ihuBFRsrIc9YaybFfKO05fQUOb5Lo5CEMbYtuPIxgAqVxHjJRul23NsCNJlyrHGEPczcqSzfTE0+os36bCDu7Q5nd4nYHcoJq6PiI46c5uNAF3b2sEK7E0J1J8oFoTxEh8f1v0m9+3K6hfZDXxqLQs7jdEIeImpDArvxiOUTEGjCHP0h0fIZQxROm4iVOgQW00iE+0rSTuW3fAGuAyfLvPkgMLG+EKW36xgXcj9koPs76FmkrbEPvwZN3QLgYHBpY2A== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=AA9Xyv18FmPErafiouyr3AWlg/6Fe+owpLFrQeNUHfo=; b=TGrv68MOWyDYJONpfDRMcoa7HqWJJ4v0s2zwMLGkzQxEl090RaDUR7n3DNNhYDVIDoiS0Bm59VdBqyF34zyL2cjBNRx2lw7P39O2W0j2KWKnrf/eQf99oMXmLrGCh9y2tbFoarxIPsDG/BZfNxNpnHGV8bZfZ5VkiUngL/lRtbI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:25:58 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:25:58 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Gagandeep Singh Subject: [PATCH 12/15] net/dpaa: use internal mempool for SG table Date: Wed, 28 Sep 2022 10:55:13 +0530 Message-Id: <20220928052516.1279442-13-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: 0fee896b-2478-4a33-4e79-08daa111ecc5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5llM3giQ0TT6clB94Dhg+D690T1CK/YUJ2Y9QohRjc3/HFP23XuGZZBOsRJXnq+JkZCJeD/7ws5CBIVE8SKBA5P9MOrUIinnY/EEkj5MKTVCnerU0jkhqikc/gJGjo/jxCDAlk9IwTkP7/V5T/iO8/4OIo0/KofRybugaXcSW0PwZaS9lsvhqYXnPJa0WEmMX3Zhu0OD7qk0KfjI07GAxgUuQtupIR8phwnspmpzh62pKNDgi3pri4t6qcVQv5tpgWHTjY6wXUC7Umn8F5VIaU+Y1AZ5B9HJ1+BmeM2L6NzxoQADchszdQGdv9x4liC95LvtxViYH/pSqNWAK8e9qsUy1VIl8NVRVk7UNopxKAtFwa7OIewabLCDbo52QxaGJ5umrY1Aa1fn1EOT/HvN9/38wKK0R99MCQHJP3DOPX3GJr8tayHVVYck8RJA8Fe9t6P2sXuNmTfUP9QmVPBey6qPo+Ui0bzo5vIK6EklAcjLCrfDBAT3FA0sEBHcBNB5dQGV2XQxh7St4mC6OXNcQ3cHVl3UBqITkxD986c41+JmCEQIjGyIYBzcWjUvXiNphXuOp5qjoE/krPsintSqJl5Ug/HJlkxtIsZeGIRjQ+8z52RmCOTc7Q+EPFP/BcPS3gv5OcJcwLH1if4Rd4n1hGZOIFZDmBWD1BzRnc7Gd8SfaFi3RSe1f5O8zrmQ3r1dtGpV+T6psDo7NWCUpehjjMsYilJNQGCU8IwluCCKKE7tX3hxi0r4MJSu0+v7TLOy7RCIcV9Sj9g2Rq4pwPU/tg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(83380400001)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Yi/2YBu7ohVSmmFrTT5QypWiY6B5dFCb/TaaJ+JM/1RS7XnGjOBMeViMRZsBVkMwr67gnsO/6vnbCje6Kc41G9zi/MxLNEo8RtjPByY8hPJG+5fqMVt6DM9VMrXP90uBl4Ow+IMp9WWlY9dT93CNFcpuyHBE5EXdDIyOFko15Lo5iS3jpIUAlou0VDIR79YQ4YCOjs5uJhsTSUR3aO8iLjpEJKp+D4RmeWWz+sPQcuyPNPwjEOMQNvm3HbmBqIdx4AU6HuTg1T9petmEuUcyh9AeC0LW2/S4aemVyRZDrKpDmgpKqonFK/1AxfrLblydswBSvotWa0JDp6hDd4JH/QOMlsrhBB2wOSKDGtFI7oQEuyGZCJABoUyEquBbVRBg0tHXrvNdw4U/3uPz11HQuLMgBppj+W1LZxIEnUr/nXuEcz4AqT3fiZvgvR/RhcnbEtcEhAVrvUvpiByPnc0XwyEfdvs/xIU/4I1JlPzlzuIhxyWN3lcqmtABtVQ2Y2+XHLuk3KkXdrGMzMovM/jgz+r89PwDNopKwWDhtehN98WvfEpuPTUYWkmYHdw6nqk/jr3d2isuIAWv2+43UEk97oyy7eZI8pWjHEVQThJ+zH4BmvZOMnMqYkAZZS+OpDql8WhxRXCqZvxcNnL+VcLi1bB3QY3dK734VszCvcRGcl/Jy2n5AgJmSbUFIIW7cLveNHJsB/KeJx8TwVHiinAoV7qQb/gdNuF8eIE8qjX3+cIfw50xoiMDRnRKdDa5Auqs7wh8Pvw9U4RwczGNiPn7plIEOsb9+dfdkp5ycseB0tCKS5qIX+ERmaGrpQuG+G7HdFWusriLUn/btIx6mmztX5yELFJeh+9TdvYdTSJ4BQFoiVi9ssBK7t4Kg22uFEn8u6G021DuoCTFuEG4Ed8nLau5SJlNCh9REVlRPhNflGrPG/Jmu2XzPL1W0VIwYXoV9T/LHAsdFEIFQUNsC4D5WvFM8/Kv/gVd8m4PKn+ACSsPq7ukGAFtfbC+IC+xmizsNR/+wFCPza1FKsWCEWbUKNW7PKZ2c3VNHjl75uOf7cB0q81LJQBWTROh/sayiJfIj/4dVMz267IwzgE7C9gGk/RvKGB4KCLjxGMHlYa6VwvgqgYteX2wLIReDPCktrhW5QiJjwn59zRLNaWanzpAityGuYanltuTUFi6TvK6mlxTURMxSO3Z7SwuwrIRC6eeNX8tOHF49wPquXfnCjN3QswEU5WHS+KjJcb9Ll9+LrS98EB+4moagYGAEXFXz4nie8yKH6qvWNgCZEHCWHh4WvoL4GuKa4x/bXYq6rFU3vFIuEKtzyplOhjxUDeW4uZEU+YcNWqkS0xAVhWvd+FjP19JlZyikv0+np2D1v5h9bWZhek8LLLj7IiT7TauUvxFThf//2SmTCpteMQJwS13GNYPv2zr4UuA9bpzuNwJlIw2UcQXVKVQ5aQM2yFSR1B9J/3XsR9Rzqg+bRuJ0RzlrU5YETCdeBakXpJlZDQJNMXndfVb9xrCocjJQu9leHgkO/2L9P2Xy1rLAceqiLDUFC/w94R8JcSJAYqrjycFid3maNDhe7BP/4fj6ruBQj2u X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0fee896b-2478-4a33-4e79-08daa111ecc5 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:25:58.8184 (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: wpywFujFJNQbKMILbXJrAt2AUy9EyshLT9lAxpAZupS1emMU1d2Sa55kVwsHUQgE X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 Creating and using driver's mempool for allocating the SG table memory required for FD creation. Signed-off-by: Gagandeep Singh --- drivers/net/dpaa/dpaa_ethdev.c | 13 +++++++++++++ drivers/net/dpaa/dpaa_ethdev.h | 9 +++++++++ drivers/net/dpaa/dpaa_rxtx.c | 9 ++++----- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 9b281ba8cb..1e804e1462 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -133,6 +133,7 @@ static const struct rte_dpaa_xstats_name_off dpaa_xstats_strings[] = { }; static struct rte_dpaa_driver rte_dpaa_pmd; +struct rte_mempool *dpaa_tx_sg_pool; static int dpaa_eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info); @@ -2222,6 +2223,18 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv, /* Invoke PMD device initialization function */ diag = dpaa_dev_init(eth_dev); if (diag == 0) { + if (!dpaa_tx_sg_pool) { + dpaa_tx_sg_pool = + rte_pktmbuf_pool_create("dpaa_mbuf_tx_sg_pool", + DPAA_POOL_SIZE, + DPAA_POOL_CACHE_SIZE, 0, + DPAA_MAX_SGS * sizeof(struct qm_sg_entry), + rte_socket_id()); + if (dpaa_tx_sg_pool == NULL) { + DPAA_PMD_ERR("SG pool creation failed\n"); + return -ENOMEM; + } + } rte_eth_dev_probing_finish(eth_dev); return 0; } diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index 6fdd57dbc3..f9c0554530 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -33,6 +33,13 @@ #define DPAA_SGT_MAX_ENTRIES 16 /* maximum number of entries in SG Table */ +/* Maximum SG segments supported on all cores*/ +#define DPAA_MAX_SGS 128 +/* SG pool size */ +#define DPAA_POOL_SIZE 2048 +/* SG pool cache size */ +#define DPAA_POOL_CACHE_SIZE 256 + /* RX queue tail drop threshold (CGR Based) in frame count */ #define CGR_RX_PERFQ_THRESH 256 #define CGR_TX_CGR_THRESH 512 @@ -103,6 +110,8 @@ #define FMC_FILE "/tmp/fmc.bin" +extern struct rte_mempool *dpaa_tx_sg_pool; + /* Each network interface is represented by one of these */ struct dpaa_if { int valid; diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 22205cec30..e23206bf5c 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -803,8 +803,7 @@ uint16_t dpaa_eth_queue_rx(void *q, static int dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, - struct qm_fd *fd, - struct dpaa_bp_info *bp_info) + struct qm_fd *fd) { struct rte_mbuf *cur_seg = mbuf, *prev_seg = NULL; struct rte_mbuf *temp, *mi; @@ -813,7 +812,7 @@ dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, DPAA_DP_LOG(DEBUG, "Creating SG FD to transmit"); - temp = rte_pktmbuf_alloc(bp_info->mp); + temp = rte_pktmbuf_alloc(dpaa_tx_sg_pool); if (!temp) { DPAA_PMD_ERR("Failure in allocation of mbuf"); return -1; @@ -849,7 +848,7 @@ dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, fd->format = QM_FD_SG; fd->addr = temp->buf_iova; fd->offset = temp->data_off; - fd->bpid = bp_info ? bp_info->bpid : 0xff; + fd->bpid = DPAA_MEMPOOL_TO_BPID(dpaa_tx_sg_pool); fd->length20 = mbuf->pkt_len; while (i < DPAA_SGT_MAX_ENTRIES) { @@ -967,7 +966,7 @@ tx_on_dpaa_pool(struct rte_mbuf *mbuf, tx_on_dpaa_pool_unsegmented(mbuf, bp_info, fd_arr); } else if (mbuf->nb_segs > 1 && mbuf->nb_segs <= DPAA_SGT_MAX_ENTRIES) { - if (dpaa_eth_mbuf_to_sg_fd(mbuf, fd_arr, bp_info)) { + if (dpaa_eth_mbuf_to_sg_fd(mbuf, fd_arr)) { DPAA_PMD_DEBUG("Unable to create Scatter Gather FD"); return 1; } From patchwork Wed Sep 28 05:25:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117035 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2ADC0A00C2; Wed, 28 Sep 2022 07:27:08 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9956542BB8; Wed, 28 Sep 2022 07:26:03 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60053.outbound.protection.outlook.com [40.107.6.53]) by mails.dpdk.org (Postfix) with ESMTP id 9EDF742BB6 for ; Wed, 28 Sep 2022 07:26:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nv3mTdQrfl7OyC3EKOia7ywIwegiuaHCx6eYvgW5h3FVdmnNWHTTAz3LEur8qB3dc9V6/qMWs1zzRG4YWKT55EY/5lozcgu25b/AkHFWhMUqIN9yRX8PYF4GhNQqHflQ2FCGc3GThZZM1QYIP1N9KF9qoDvLORd7TN6HMFO/ajdv6FzmRGy/frgn866oWwReVMquBDZw4BF4u3gugKUm36orLuE9GAtfOvIjqpyLeMcv1gESC1cgP5kgHLIOaa/rQ5DziMeNswFWnq/D5cbSlYzourRCK2nCVFJdVKIzLB+/R6B9wAf3bWp8Z+YV6WwzzrW0RVDkeUfef+vePZivrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=UpjuIVlzqZTiaM3JZ6N/DaR7QogOkNoAz9MvFimlgQ4=; b=HgBIQakkG8WIBgS2FGERjHEMNNTtwlCuhW3lf3M8+6qpvPrFwVmlL6Tti/KDRs3o+SazCq+QZoEN5GLAJERy2ygzwR26XLfezQEpSru3EYD1I1MQDXLNqYbPkQcABVdAAx/U64T3E0l24A5Z8e82BiOY5nZFsp61BZfzKhq1V3sX/zYm2ii5KND7P83NsZTTGFgle/nyJQSHZUZKYJkrPB2zH1o7OAzVkttViehVj1RA+3+8zYE22U+zx7nQKD+Em6Zr4mCis474xrObCAarFHdcj+pE5Lot03E1HMJ/IZQYAL1CJjAsLfu2InpZZXqyR+WKwHfjGDaP12qCHfJ7gw== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UpjuIVlzqZTiaM3JZ6N/DaR7QogOkNoAz9MvFimlgQ4=; b=PhSiP+5teEKVJPptUSvbGDtOCNrU2qMf1jpLiLG/tLxnPIKXe+PwrL4NTmAtbPyauq1ybDDB+62p6mk9JEbgsvWrgBEeN9nZ693aQhjwu5Bg/1PCq/PM4OBdpaWAq6XLyTYiF/+2ufn29Zzydfb9bYVqiMYrn9qxBmRHS2dm9JA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by PA4PR04MB7504.eurprd04.prod.outlook.com (2603:10a6:102:e6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.25; Wed, 28 Sep 2022 05:26:00 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:26:00 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Gagandeep Singh Subject: [PATCH 13/15] bus/dpaa: mempool ops registration change Date: Wed, 28 Sep 2022 10:55:14 +0530 Message-Id: <20220928052516.1279442-14-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|PA4PR04MB7504:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e55d927-1d4a-425c-ba0f-08daa111edcb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NAipNp1vipLbkcJHiTYBQu0a+hKjG0+Ct1EHDekjo3DLDszOG50vmcT8U2eSO10/Z1qEAwMYIjw083Hu3bT5jbSJu7dV/BwWjoyoyMltSMpVGFWSnQzy8hEq1I/8npl1fMdPRKVwVruB4P3TgFBQHrLutuZi79tgG4Lj1MmwCPMG1FESPdAm4KnDTD0pyS31aH4jPoxTCCGpfIydX5vWk1XMcAfKXZLppp+K9Z4RV28bi8nkPdh2rtqmW+i3bY+Tu5rIlLMkIxvF5OtYa7Kw8rP2gSQm4WFqSBhqQyWRSZQiiwvsah9Q32LlKQ2B50jc3s3YtjsCPm1YblS9O8t+Gl2uDOImHVCqi4cRtMqXd+GVdidr8YtluXHt7HDnmUvJYQuoK6Y44pvW0nGkPnwmYRgcu1DwosNirW9Uxxt75bQhgkyWMp+UimWxutfa5nKochxIYBdEWHE2cLTEvzJcr9929gpCtHlY64vaXnIwK0aVVmnNZKmQvOqd/PMOapwel+50HbQ7tGU6bGXO7Kx4sBDcLiH6kM4aOOjyS1o2uMvxoGSLcMhmXY2PoTZmdGQXCgm1OKAj4/xGI9aYEij5kuvXxUzxLDT/1rNWdWBahW8jieAw9U8tYM/Zn05JoX0QRjFwt5TRyvWgSQpelgzzNSXh2A6J11qFWugHHeiUwjqH7PWGojV/D5UfTljx3spwQni7lW+FEGKrawt43DNfJbVQ6GaAynt82gbyyCg1beT1aHjAvMicXXUlPuVwvFocctk54Oyrrknq186dWXYXfg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(376002)(396003)(136003)(39860400002)(451199015)(1076003)(186003)(2616005)(8676002)(83380400001)(38350700002)(8936002)(6506007)(38100700002)(26005)(86362001)(6512007)(6666004)(2906002)(5660300002)(52116002)(478600001)(66556008)(66476007)(66946007)(316002)(36756003)(41300700001)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Zh9P4GHW5Z/9fx6EAzah7/t+jwJjDOI+exVlRmJurfW5v1E37Gr9GpNCVleUrdQxrmnVaUtuGg/34yo6Ld2oqyFC2lCgZ6w36zTuwiQRtlW4ej+N4axbM8mtOh/PXPTb2Gkd9fA8DTJ7BBRXU7EcpHww5w1RvD9/SZ7OqmHCjfSkvkFEfvLomF4h2flqECbcqjv0CkBADYkjKhqt6QR60PElQ2Qa4ZYzg4YXV6ciNR3ONC5PYg3jlot0XPH2EgrrhbBWe6XDo3xzIWcMnzaPXAj6wxssiEylt8YwA7V89NJmymyAKUpi2JkppcgjZF4vuhROrePFMKCD3nR7uMjE1Y7NBFajBQHRjYa5fHQjabfGNwgGtuH3fOhdzvObviKEbZEBgPzUv2ihQ1Exo6DUz87DWCBSGvFEQtNS+cVMsJOZHpVfZB848MmV+kc2TGo4xrscYrtIguEVom94x/RKhbwX7BX4P7jehHDq7k1LXKGzBAAxnYK3+BPnGtXLKdvGKfUWrp9XQXw7dq8QYXU0/5TWB7IqUh6pFyq3axAcMz1aTLPguYuYDyqB9dmiNPR9NHlWoWFZJHG7MEWI7GaVpcaHqZzMNd5V02BkRI4DX+sux/UyGqPHqt6bn5vhOmzeUW4fYf7kEE+C8KRNsI8Nrf/fQF0aecvYa7yqX6dGxx3o5BDVCTMITTqCm1MLiOx2HGeYXKGXqP5Eld+1sVjvhTL+trcI34z6ItgB7nA97J/QQWz96/OOVB2JCZGQ09+0il6f6+0WdWCM/1UBycWKwjiBHCBTe9dxUTB5kuybepgV5BRvse4GiKRKztd2Gi3OFmHx34EvjIsCe7uNmqXIQ9m7MeONe/zUJFEKEq6/l7zGQPuZqwvp93hhUgSSd/rnUxnmwsE051iGk2ixkgGjrramydVbH2HyYnvdIgkAOYg5urrzUP+36atKk9K4ICjEw1t9b207D7iDs2CydB4Gp+OhW5pckoKSlRkR+jbKMy+pXIpe9xt0qBOpMOveUtZkCRE4MYhxdMsVYO1UpgsHPWhJ9/TQ4jmyG6AgtUS+NEBweYDHB/Epn4HAn1SfwvfP1pteFaDtxLAVsbgZOYmxi1IPrrdSfUfAeiXTXqNuq7VEQtH3JFKAa7uOb5L7VgVJn0vQu52fevuWLwreOchTITHW/FoVDDA4dVoGQyn1OIhWln3sDVEcy1MKpH5LRRQVvdHbsDdfeDK+w8AJ7KjZPz6BmB46k0fx2SssTnxZ4jpr4zOcke2Ws4G4Tf0q6bT4nTTXVAm6K5hqS/77YukMp3mn1ROlUi/RZUDqkcieLKJcp59pzMOEJhZR8fKjpP+viVZvI0FGqJTnmg8q1alpn8b5OJjBekB7CYGCJ+UQ8+whPBlNF6x3mOe0XEVlLv7EGsI7m8YBFhW+8hMPgGLSmh04CFcNq6gjvJRbq3aOzho4pDkzJjw9WukXVCVIA33bcyR0dZ+ziU5M0E53vGYMtrr4WKN0u9IhXBPm7AX5PwXAmuS9HjDFw1c44NXoYOcvoChdhG2vq4QKAKHX7UYAwFAnkot5NjouGMX5iy+n7Kyeh91G6JUNPY5NWt6KJFAL X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e55d927-1d4a-425c-ba0f-08daa111edcb X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:26:00.6788 (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: lSpOTL1Sj54vs3PSDyGCLLM1D+RjDAEludNTjY3QAiDiwr0onyDwtFX5SmEA4iFY X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7504 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 moving the mempool ops registration before DPAA devices probe so that device probe functions can also be able to use mempool operations. Signed-off-by: Gagandeep Singh --- drivers/bus/dpaa/dpaa_bus.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 682427ba2c..3ca5147761 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -655,6 +655,11 @@ rte_dpaa_bus_probe(void) if (TAILQ_EMPTY(&rte_dpaa_bus.device_list)) return 0; + /* Register DPAA mempool ops only if any DPAA device has + * been detected. + */ + rte_mbuf_set_platform_mempool_ops(DPAA_MEMPOOL_OPS_NAME); + svr_file = fopen(DPAA_SOC_ID_FILE, "r"); if (svr_file) { if (fscanf(svr_file, "svr:%x", &svr_ver) > 0) @@ -704,11 +709,6 @@ rte_dpaa_bus_probe(void) } } - /* Register DPAA mempool ops only if any DPAA device has - * been detected. - */ - rte_mbuf_set_platform_mempool_ops(DPAA_MEMPOOL_OPS_NAME); - return 0; } From patchwork Wed Sep 28 05:25:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117036 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CBABEA00C2; Wed, 28 Sep 2022 07:27:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EDE8042BBE; Wed, 28 Sep 2022 07:26:05 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80075.outbound.protection.outlook.com [40.107.8.75]) by mails.dpdk.org (Postfix) with ESMTP id C3EC742BBF; Wed, 28 Sep 2022 07:26:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eregez4Zr6dp5y52jnXvVfPnB87X16D3imFWsA5Ogz8mygOwbHxyDiKHCyfNt3nLjksYO5i2fQv8PblUYGYcEAzGYh10rifs8YDv3Zdiyt15B63eXh/zY7TZTnyHvAokACteGK36RAq8Kt8GqiDB0edVtBk3PvxF1YmOXT2Fac2p9SkdDjY3SjaJ7eAV+UO8J3r8P0piTRIdDZL3EF+UrU2c1pKkk7/gTpnW6UcCgk4WIAwMROW74zJ97xGyamENPA5tIOpzfMA5s3W/BacpzsIAclfBVKZmCzSbw6v2SriuIag4A5my9U253FCVfB8iE3+DMf/7eRTyTKWtdqLhiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=cxl6QkJJOSbtfwH3YOWq8ZIL+h91jY/XkzjgTlVXj4Y=; b=W6nWYMhyqPK64wZ/RpKw7F6AyjUkz4Go/7qUO+yIh4OjFWWUQnnz995qc7cn6yM/VhJLrjxsa1QzPHtmu4fHr/hpY+dvJBPputJuHWOqe2KJI4+Di5pNgw5/P8U1xxXcpZU6SEXAxwbn/lh8NrPJd7S4HuNEFMaghqLFYz9vd1SdgUzuE1DNcmsHTAe+3qyQA59R0hpCareHG3sMVlp5AKep6McwDdpJEDyS/TTptoiNJDTHZuFDN/OlnDG4ZQZjFD6i/y4vBxOWuFnHZs7QwfnUBBrmLCHZD5qU/j6QX0F9nyAr3YNjBnd+XNChrM5WRpKEiwjcnH3HNVJTuk063A== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cxl6QkJJOSbtfwH3YOWq8ZIL+h91jY/XkzjgTlVXj4Y=; b=kwu6y1YwMUV6vP1T57lsNKjOMIX5pHfAgzWurfZJU2B31eBtKvkKhlDdFdhnFQ4vWr6o0lGgZQUwBNvPBVCPNC+s+K7rc5mJZ9dqaN78sUZ8JoM5OEGO6O2Xt8EDLVM3KAcz/+1MZCmc4WyuK4NVfulExty1u3w1thx7NOnGYCg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by DB9PR04MB8495.eurprd04.prod.outlook.com (2603:10a6:10:2c7::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Wed, 28 Sep 2022 05:26:02 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:26:02 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Gagandeep Singh , stable@dpdk.org Subject: [PATCH 14/15] net/dpaa: fix buffer free on transmit SG packets Date: Wed, 28 Sep 2022 10:55:15 +0530 Message-Id: <20220928052516.1279442-15-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|DB9PR04MB8495:EE_ X-MS-Office365-Filtering-Correlation-Id: 03f54b07-acbb-410e-5cfd-08daa111ef0a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DIiF/Gx8n1DYBbPQz9UOSF2uYxBj9bbmNohl3Qa/9vk57JHn+3ExDcan6eGQ9fVSehtiyJpG6xTj6UvY19bGNdVA1hTDlOrN6xRXsdH0nDDfWsbV2WzYFTreYyuLeWSRDrBYU0NTWPK8DHfO5xb2Bdo+58ZRw5uuVH5yUuIvC3y/99FNMzWKAPZogEQI0DqoMZbpkydQnDWXT8jihEkbJC2dP2nrevE++cpciZagRwYWSXxOcMpM618Cr3xTG012rQjHD/Ces07xrd0Sb9yrmqe2XcU7nMLGOpQX/YSHKmKbU9Qzo1EAp5tDXnis2eiASN5NsAanYaxYpzcCO61hhdAvSrbmeVNBxp98D4p98nz8JTH38bCV6pMRER0rXc1x+klUvdterRnvgxwTEd3spAn+lAzUsjnS5u7bET03XRvK4fr2g9dO7HErhCpBvTILxd2dhUokXYlCvudhx8kFLUSxCnQinSno8fQB0I9B9oFMng+D/QlBxh4p7FCN00b/xOpdRJq8JOrKzpT9d3UHgGhpPcJX+fGSqTV+tmbAKIZvUa04jHfCV2/gN1E9skFd4s2vsaVI32rziDauO0BgcG0SMAxXCGbLvfdbKyoIS/v4GZATwBQceJ9DuSk9gmpb8DsLe3PGodKrOpw5nNwZiVGnbQHwoz1loM3Jyi88oEsoc0MtOVlAjcwYaDDYt0yWP044bimNMDPOLCL0Nw1bkdkdzc1OfTko+Wq3Qa9gQhloHm9J9vOLled30+90XTsYFVhCQNEuR+1A5K6U9KJJFA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(376002)(396003)(346002)(136003)(39860400002)(451199015)(8676002)(6486002)(316002)(478600001)(38100700002)(38350700002)(5660300002)(4326008)(36756003)(66476007)(66556008)(66946007)(41300700001)(8936002)(83380400001)(6666004)(6506007)(52116002)(186003)(86362001)(2616005)(1076003)(26005)(6512007)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lw467c6+W0wkTlYrmvxUQPLPBWwv6+jiEaG8PlxDmhLLEe+rDJcmojBA4Et4DXgrMjr+A3mh6zn3kT6knxRV5BGdXVdq7bCETr7t9ixUqXtnV/Ysh2Y3ydkVjFjV/9o0PSz6BP4ACh2lxvaK8wFzOhrGxR7+pldfCeCie3cetcABShUfAywx20E/j7Qghq3G40LmJwle7i4+vv1qDYQ/LTCRjY7bAnifPREKzbfaMM5Mka7/SCuoVNgLRblJTKYv2FffTHcb3uae7Ty+WA4yyoTmc6ItDV5ajm7xef7ud/JLklJHxQbCBEXOJ8u6h9k9JQPrQEl5+Or6kCSAAW3alrVRoUjMvqMRy0ay6III0RsKLKzgY/CFONJ4jZdx0Z1EwrrWoJY4R33yp7klzpQKYaJJ0BV0pUg/ix7mTHuha8YTzVl1hgdztj83mZUmsQr+YnhNHC9QbcCpEpgkRuNqRpvA8pSsWknaOogRuSMSlO/vMlpc3NHD7v6jz5VxpT4TQs1rGC6z/Rl7g5+/Yimd5ye8vTDok/IUZiACe8y3GRGnun6MckQsbffrW8onXBpiUTu/6IT9k/4+kccl3As16u3hlymlO19AmsaRhw014/O8erLRj+JZ5zpS8y8LxVUj6j7YJuBTd1ZI6itsovRQRJXDdB14LTonvQ2q1K+bOU9lcz1V3DMkqdhQG27Zq63Z2Rd1zxzO1IozZ9xUZMpg/gD2aKNcDT+K9uzlwzu0G9Lt5t8SU52kgf96tBOlQUt5Kgp7fgmKd/tPIzvM85ctHBNCa7hYFuYlBLeO9R6e82BcRPqOkjOd4AQrbbbTYV5tOLub6asb5pvH5oe2rYIssIdIB1aB3manpbJFgzvRprw0iJA3VMc48E21g/5fJDNBZ16DyKI/Vo5rFbh+2vyJK2ZkUuwmQ6r2B5ef9LnQlTvAnW5uSn8T8aezgER0sEfHXS62t+9+Y8RRGglcJtR5/HLlpjeMLb52u4j2c39XZncNzUWUFSctL3C26zyIN8yy5qfEBBZy2VUBqPbsn5tQyl4CWza+23IgmQtBsODh/BQ+otAVfMEiTho3yqEnug3AB5r9q0TFYQ2pdc9xefASNhAl8uIvvQbJf2xHIluACh+GAKwBuq3LH7IbmAGmdDYeBAd38jSVZI6/eKfg/cEcwh6ZVFfT/KvJPOV5434RI+8YFKW2rOAkQzBAyC/iqUVbvmJ8qo2ssVJ6MSjekL0Ltyu+eTxHjf0crtv+mFMutXQvFJgfF1hRm+Qwn+1lAYILP/zUAwgmK0ONzg1a7eZ1v/ZyHVNwW3B+CbUOWG4Rh686YF6Jyq3No92VDiDm7CAbwcTIYxmBuzZqiG8lfaXTtbJg9Ai18oCDHEt2HhZuV6nfnqgxUF7ABVVe8GFkJjPzKVglwSGsW9dLrXUh24z3j/8tL1ccgCTCPpjO7FqZgQcMwWYKdP7+hWM5QOI9E4KVv4L7s5HVN/FQ7tGnYG1WhZeJuEHTE8FbyZ+yfwH2cFO90TT47wx4cFDf3CDznxxp+XMBRSofmw7hf9AsCnd2PV699vSu7vcewk43Jh/9Ci1HeV6kceOtoTHKRs77aOpZ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03f54b07-acbb-410e-5cfd-08daa111ef0a X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:26:02.5951 (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: C7V5X9mFr8u64MLX9Mt8CsjvbeMcg+0CpbTwKR4BI98sLHSGi455+8Fn/msfxhE0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8495 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 When using SG list to TX with external and direct buffers, HW free direct buffers and driver free external buffers. Software scans the complete SG mbuf list to find the external buffers to free, but this is wrong as hardware can free the direct buffers if any present in the list and same can be re-allocated for other purpose in multi thread or high spead running traffic environment with new data in it. So the software which is scanning the SG mbuf list, if that list has any direct buffer present then that direct buffer's next pointor can give wrong pointer value, if already freed by hardware which can do the mempool corruption or memory leak. In this patch instead of relying on user given SG mbuf list we are storing the buffers in an internal list which will be scanned by driver after transmit to free non-direct buffers. This patch also fixes below issues. Driver is freeing complete SG list by checking external buffer flag in first segment only, but external buffer can be attached to any of the segment. Because of this, driver either can double free buffers or there can be memory leak. In case of indirect buffers, driver is modifying the original buffer list to free the indirect buffers but this orginal buffer list is being used by driver even after transmit packets for non-direct buffer cleanup. This can cause the buffer leak issue. Fixes: f191d5abda54 ("net/dpaa: support external buffers in Tx") Cc: stable@dpdk.org Signed-off-by: Gagandeep Singh --- drivers/net/dpaa/dpaa_ethdev.h | 10 ++++++ drivers/net/dpaa/dpaa_rxtx.c | 61 ++++++++++++++++++++++------------ 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index f9c0554530..502c1c88b8 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -112,6 +112,16 @@ extern struct rte_mempool *dpaa_tx_sg_pool; +/* structure to free external and indirect + * buffers. + */ +struct dpaa_sw_buf_free { + /* To which packet this segment belongs */ + uint16_t pkt_id; + /* The actual segment */ + struct rte_mbuf *seg; +}; + /* Each network interface is represented by one of these */ struct dpaa_if { int valid; diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index e23206bf5c..4d285b4f38 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -803,9 +803,12 @@ uint16_t dpaa_eth_queue_rx(void *q, static int dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, - struct qm_fd *fd) + struct qm_fd *fd, + struct dpaa_sw_buf_free *free_buf, + uint32_t *free_count, + uint32_t pkt_id) { - struct rte_mbuf *cur_seg = mbuf, *prev_seg = NULL; + struct rte_mbuf *cur_seg = mbuf; struct rte_mbuf *temp, *mi; struct qm_sg_entry *sg_temp, *sgt; int i = 0; @@ -869,10 +872,11 @@ dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, sg_temp->bpid = DPAA_MEMPOOL_TO_BPID(cur_seg->pool); } - cur_seg = cur_seg->next; } else if (RTE_MBUF_HAS_EXTBUF(cur_seg)) { + free_buf[*free_count].seg = cur_seg; + free_buf[*free_count].pkt_id = pkt_id; + ++*free_count; sg_temp->bpid = 0xff; - cur_seg = cur_seg->next; } else { /* Get owner MBUF from indirect buffer */ mi = rte_mbuf_from_indirect(cur_seg); @@ -885,11 +889,11 @@ dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, sg_temp->bpid = DPAA_MEMPOOL_TO_BPID(mi->pool); rte_mbuf_refcnt_update(mi, 1); } - prev_seg = cur_seg; - cur_seg = cur_seg->next; - prev_seg->next = NULL; - rte_pktmbuf_free(prev_seg); + free_buf[*free_count].seg = cur_seg; + free_buf[*free_count].pkt_id = pkt_id; + ++*free_count; } + cur_seg = cur_seg->next; if (cur_seg == NULL) { sg_temp->final = 1; cpu_to_hw_sg(sg_temp); @@ -904,7 +908,10 @@ dpaa_eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, static inline void tx_on_dpaa_pool_unsegmented(struct rte_mbuf *mbuf, struct dpaa_bp_info *bp_info, - struct qm_fd *fd_arr) + struct qm_fd *fd_arr, + struct dpaa_sw_buf_free *buf_to_free, + uint32_t *free_count, + uint32_t pkt_id) { struct rte_mbuf *mi = NULL; @@ -923,6 +930,9 @@ tx_on_dpaa_pool_unsegmented(struct rte_mbuf *mbuf, DPAA_MBUF_TO_CONTIG_FD(mbuf, fd_arr, bp_info->bpid); } } else if (RTE_MBUF_HAS_EXTBUF(mbuf)) { + buf_to_free[*free_count].seg = mbuf; + buf_to_free[*free_count].pkt_id = pkt_id; + ++*free_count; DPAA_MBUF_TO_CONTIG_FD(mbuf, fd_arr, bp_info ? bp_info->bpid : 0xff); } else { @@ -946,7 +956,9 @@ tx_on_dpaa_pool_unsegmented(struct rte_mbuf *mbuf, DPAA_MBUF_TO_CONTIG_FD(mbuf, fd_arr, bp_info ? bp_info->bpid : 0xff); } - rte_pktmbuf_free(mbuf); + buf_to_free[*free_count].seg = mbuf; + buf_to_free[*free_count].pkt_id = pkt_id; + ++*free_count; } if (mbuf->ol_flags & DPAA_TX_CKSUM_OFFLOAD_MASK) @@ -957,16 +969,21 @@ tx_on_dpaa_pool_unsegmented(struct rte_mbuf *mbuf, static inline uint16_t tx_on_dpaa_pool(struct rte_mbuf *mbuf, struct dpaa_bp_info *bp_info, - struct qm_fd *fd_arr) + struct qm_fd *fd_arr, + struct dpaa_sw_buf_free *buf_to_free, + uint32_t *free_count, + uint32_t pkt_id) { DPAA_DP_LOG(DEBUG, "BMAN offloaded buffer, mbuf: %p", mbuf); if (mbuf->nb_segs == 1) { /* Case for non-segmented buffers */ - tx_on_dpaa_pool_unsegmented(mbuf, bp_info, fd_arr); + tx_on_dpaa_pool_unsegmented(mbuf, bp_info, fd_arr, + buf_to_free, free_count, pkt_id); } else if (mbuf->nb_segs > 1 && mbuf->nb_segs <= DPAA_SGT_MAX_ENTRIES) { - if (dpaa_eth_mbuf_to_sg_fd(mbuf, fd_arr)) { + if (dpaa_eth_mbuf_to_sg_fd(mbuf, fd_arr, buf_to_free, + free_count, pkt_id)) { DPAA_PMD_DEBUG("Unable to create Scatter Gather FD"); return 1; } @@ -1070,7 +1087,8 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) uint16_t state; int ret, realloc_mbuf = 0; uint32_t seqn, index, flags[DPAA_TX_BURST_SIZE] = {0}; - struct rte_mbuf **orig_bufs = bufs; + struct dpaa_sw_buf_free buf_to_free[DPAA_MAX_SGS * DPAA_MAX_DEQUEUE_NUM_FRAMES]; + uint32_t free_count = 0; if (unlikely(!DPAA_PER_LCORE_PORTAL)) { ret = rte_dpaa_portal_init((void *)0); @@ -1153,7 +1171,10 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) } indirect_buf: state = tx_on_dpaa_pool(mbuf, bp_info, - &fd_arr[loop]); + &fd_arr[loop], + buf_to_free, + &free_count, + loop); if (unlikely(state)) { /* Set frames_to_send & nb_bufs so * that packets are transmitted till @@ -1178,13 +1199,9 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) DPAA_DP_LOG(DEBUG, "Transmitted %d buffers on queue: %p", sent, q); - - loop = 0; - while (loop < sent) { - if (unlikely(RTE_MBUF_HAS_EXTBUF(*orig_bufs))) - rte_pktmbuf_free(*orig_bufs); - orig_bufs++; - loop++; + for (loop = 0; loop < free_count; loop++) { + if (buf_to_free[loop].pkt_id < sent) + rte_pktmbuf_free_seg(buf_to_free[loop].seg); } return sent; From patchwork Wed Sep 28 05:25:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 117037 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0FE7AA00C2; Wed, 28 Sep 2022 07:27:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE8C142BCF; Wed, 28 Sep 2022 07:26:07 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2069.outbound.protection.outlook.com [40.107.22.69]) by mails.dpdk.org (Postfix) with ESMTP id 1CA8742BCC; Wed, 28 Sep 2022 07:26:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M5UtA57vshfodOlZO1LZY03e2tQJHFN+z0lXYPoHj/vZuZyztu90Mepk5KdME70M+rJAP1qAvifcGS1ClzlZSYUW6fYX0R+ZbXN4DqCXHsyJkImJSGR6Chmg6cC/tWKCQD5BpYQGju1aWAPNY2UxNsIQbJpuLhfbjUW54bZTfu3/l0STCCgQB9yZ274sSF/rYQ5h4Pib8U16EXlJfBuVsynnC+OrsmEDDz/TRGY6D64F0+EQEbdPWSOqlYqC5jqyWs4xIqi33nlRAKE3ZG34rQkrd0Q4ZrYMGzEHm2EEW27F63K2ROLR/FPmrxzhTUVXxWMMfXgpY3nzu+SpP4GFIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=r+QpVLrLpeO4VxgrvGUdY2yYiUsvDbVpkzG7RqjN2Nc=; b=ZzWK6R0IA/VbaQe09UQtrHk2+9uqAtcT1MXth/ezfqTmcBoD3ajU4IirJAaBLhaKo8O+AXvKBQOTBPGskuXJ+N+HsyzIxo3QEI+OcbcP2JXJI5ZytwZ0AuWXc797nUOdlP1obdS2wySqeF8g3AGxM9URG9uNZghKGR0eUItLIYvTUa/h3r1M7omKPnpZjVhwi3fkAxb1KeIHS12vZTHJ+d+Ar7hIpdtCVEtpnjswcDrqAIkyG9QmcJc3b8P/Rp0fpBL43QoRdjBIQPTDOx/ngBZw0ZCf6br88yGaXGJGsBjr7YgsHJE2jAzc/8QveU1se1z+vJKTXqlMZCa4WcFBuQ== 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=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r+QpVLrLpeO4VxgrvGUdY2yYiUsvDbVpkzG7RqjN2Nc=; b=KdgkuQBJm9v7ODnjh+TLgCd8TZ03twSVloHBAXGxW86YahOXxmYe3/d6pWlT84SONmXxGQyc/uHW6bd/zeaGz5hozpBhTrxxcCamMAzpBqcsRqyc3qk/P73KK14ah3d2xL0xlpmZHF5s3u0138kwOb0SJU81a1hdDEo3hynYz4s= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) by AM9PR04MB8988.eurprd04.prod.outlook.com (2603:10a6:20b:40b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Wed, 28 Sep 2022 05:26:04 +0000 Received: from AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1]) by AS8PR04MB8198.eurprd04.prod.outlook.com ([fe80::14d0:4458:d6ec:b8b1%7]) with mapi id 15.20.5676.017; Wed, 28 Sep 2022 05:26:04 +0000 From: Gagandeep Singh To: ferruh.yigit@amd.com, dev@dpdk.org Cc: Gagandeep Singh , stable@dpdk.org Subject: [PATCH 15/15] net/dpaa: fix buffer free in slow path Date: Wed, 28 Sep 2022 10:55:16 +0530 Message-Id: <20220928052516.1279442-16-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928052516.1279442-1-g.singh@nxp.com> References: <20220928052516.1279442-1-g.singh@nxp.com> X-ClientProxiedBy: SGBP274CA0015.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::27) To AS8PR04MB8198.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8198:EE_|AM9PR04MB8988:EE_ X-MS-Office365-Filtering-Correlation-Id: 69ef2dbc-ca78-491a-7576-08daa111f02d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OjUhNcKaRoq9A3TPe4jnE0KIe7J7QcLpMFgnu7WTmtecTWlGGlX5dcnW0wGkKbpn4Mv3utnaiJcmn5cZw+Uf5zDEaXV9tjxHS3Izul6UQZThyx9oalnQmtEXvRuE5tZkmATcHbIqbSGCnQ+GFxdd82tkwN5nCWligciNetyF16+N2uQEnB8ZA9Q9Xbzv14atXnexibCyNsMNXBJ1I6XRhHi78Fpb6q9ue+kxQGTvJbnnrZhKJbNOjPimy5VqjrNu3Ncz1FFDwB+XaqF9JXC/IpqOutTvXU06rUKkYbqvpec/nWwFRbMo4Tu6aM/MLFAH/xk2vgdDowzrD0g/nqzPvK5sZ4jSv6L4jjId6EzP45kdk0UJ3+xwAkgiXPUaONCxHNx9Jsf5JAP7jXQExIRzWGjgRdyFdFWJQYDlD0J2mi081RECp9Zz7hVo7fWFG4XdgoyYPQRVl0j3xPIJ0cde2jFlgdiJj6lbkMoUpat0JQ+HR/vKdsD161IM5a0DWckxSDfWBsGBij5ONisQRpuc1jvmtXLn4BoejX7zKrKHsmVqZsPD3qKmM0Concyqk0MTr88APVsdJl5chrcWuObA4R/4tMHow4FzFGdPWTCE//d+7czaPXboBLT7yKnPWmcK5I9rISq2yrOCwtvY9sQYRck0F0c5N1xFAxD+hc8aRn0K9yH7KDBnDRwXN74GsfJWWrjdeB/zXNZJl/c5NwjDNQBu1ePYuttk4KX1D3peUzljCVB82kBUGhaUgtoFtoRB258wV4isWcrjw6Vu9n6YJA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8198.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(376002)(346002)(136003)(39860400002)(366004)(396003)(451199015)(26005)(52116002)(6512007)(478600001)(6506007)(6666004)(83380400001)(2616005)(186003)(1076003)(2906002)(5660300002)(8936002)(316002)(6486002)(41300700001)(66556008)(66476007)(4326008)(8676002)(66946007)(36756003)(38350700002)(38100700002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: itrQ0i3TmHX33Slf0lgq6HcHbos+2O7NPVMyIXOGu/H656zOsGZFf2PPbrebfEgrRiNHdqIjX/FXDEYmRoNvql/V0YPHF45tt1bJapg/bd7voPb7BRnplVdlrP2xj+tWPc+pZNY+QQ060bBWCWoq2UVxCRo7q9NA05zLHjoltNH9GlOZ03jz1m3JdFWKgzXSUH5iu8BAMSRnLG3sOhyOnZEQMm87uKW4XteZajIs8dBjCEKrpBMywtNiVkfB0gMTzeaCleIGQBnTF/57mmCFHcwL81g+9LjbEtzYDIQlTFtEwqzUuyXiqmulETs5/Xchx0AeQkEGHfQc0caCYWCHE9xruaB7HJ7eggKwPg44Jxkrh05RjF+C+CYfvVXJJlJgLjSwVyezmBJmiv7QEdzCeXVhBM3j2xutgj6m5vGYmagEmQ+pIrr/uFqBuQBxgag6mmybmR2ajNgta6eS704LDTgxhVvV5ON748LMNPDoyvYTqTmuki8cKBFmU/FLD16c2t/6zQmaKLFuQhr9mAllRrZQUquPBFbKYkI/gVF6uky5UK2OSiVs24x8hRxMyfwEqUph9md39Hnq04fWCI7FMn3ykOofMSeQSdT94jxr+ZqxkrzeyKDK+B85X2CJUVgGqxrOgmdf3Onwb3tTh6vUL9k0ZHQtQsSfAXnTQ3nbftV5xd+o9McGUHZHhoFXBtPRQMd6xi9vRfeywQGFmxXuKsDSG0KTvfMLIy7APAq+uVPQiXfSq4OiCXHFS7cB+OL7Cb0f5s/4XXh8lxMLr785x3H0Q2+RxX4TQaobN/sBw/XjZeLOJGfPidnOvqzJ1fQ+22K+teZBd/5bQyvQZLvzSB5PoX9a14BhuXtb3S2+slNrITWt1DMqb+4U2mFFi5BldOF34XU4EHjLqUJN0gYK3M5D4Tymm87d+XukCeuyk3PTVLkXEOlf/MZMMgYRTXmrK3p/njjpIG4P6lIn/qAgv4FZvzN6N0D0sNSGx9B54+jLlXchRGiXTaVHXantPymflaNlPJsWJvwwH1uNsrjlU7+D+WbP8HB4s+eAtwsU/cSSiyTTDHt1K9vHp5CXHMZQ5rSv9e00vsM4QedgZKyO6WN59wsr7KLGiAkF6JHtFQH0NpttFrOGF9TpTwVxHtLhdSpCqIUWmpOg5x7VMWoeJw9PRzcbNXn+9F9/oMGjr7S3/IHJreWmFOTskV8KMIMUW2SN+Cr52W9YDhOJdkenH6dO/aqM0gG7bciJqx8dt9iU4l/Jl+w/XkyLsOlmbtAmC8SWOLFNi+wG0vB4I7UJ7pzmSZi3NQjDO4xcf1Mj0EiZEGyW72oc3R/b/3AEmlAcQKWjfbLybdoclcYu1LXkYrZ8zF4OKTV5bmrmr5OibIz96hLkCNPJEXQkZ/OR1iiwb8IZgX29sWwMyFw9MaS1DPbMBAmOG2vK7L/Vay0n27yVcwbjQSfYF5hKwQUjwtn7axKyCUP3DDNRtXrp7C9qWCUrXbLLWEP6T2to2B7DtSbxfN40amVlby35KIyrZ5Q2WTJJcqAGrpMIRl/bPW5MaqdNWvHwVMcL8SRN7p6+e3fUj8bdyGjqwTHgicoWw7Wa X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69ef2dbc-ca78-491a-7576-08daa111f02d X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8198.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2022 05:26:04.4561 (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: hf5kjBvhm0hsb1kvLUfVL71Fyg8SMSiX8Yup+hZjUG9TiFPChRFrdN5/56hfYKuy X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8988 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 Adding a check in slow path to free those buffers which are not external. Fixes: 9124e65dd3eb ("net/dpaa: enable Tx queue taildrop") Cc: stable@dpdk.org Signed-off-by: Gagandeep Singh --- drivers/net/dpaa/dpaa_rxtx.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 4d285b4f38..ce4f3d6c85 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -455,7 +455,7 @@ dpaa_free_mbuf(const struct qm_fd *fd) bp_info = DPAA_BPID_TO_POOL_INFO(fd->bpid); format = (fd->opaque & DPAA_FD_FORMAT_MASK) >> DPAA_FD_FORMAT_SHIFT; if (unlikely(format == qm_fd_sg)) { - struct rte_mbuf *first_seg, *prev_seg, *cur_seg, *temp; + struct rte_mbuf *first_seg, *cur_seg; struct qm_sg_entry *sgt, *sg_temp; void *vaddr, *sg_vaddr; int i = 0; @@ -469,32 +469,25 @@ dpaa_free_mbuf(const struct qm_fd *fd) sgt = vaddr + fd_offset; sg_temp = &sgt[i++]; hw_sg_to_cpu(sg_temp); - temp = (struct rte_mbuf *) - ((char *)vaddr - bp_info->meta_data_size); sg_vaddr = DPAA_MEMPOOL_PTOV(bp_info, qm_sg_entry_get64(sg_temp)); - first_seg = (struct rte_mbuf *)((char *)sg_vaddr - bp_info->meta_data_size); first_seg->nb_segs = 1; - prev_seg = first_seg; while (i < DPAA_SGT_MAX_ENTRIES) { sg_temp = &sgt[i++]; hw_sg_to_cpu(sg_temp); - sg_vaddr = DPAA_MEMPOOL_PTOV(bp_info, + if (sg_temp->bpid != 0xFF) { + bp_info = DPAA_BPID_TO_POOL_INFO(sg_temp->bpid); + sg_vaddr = DPAA_MEMPOOL_PTOV(bp_info, qm_sg_entry_get64(sg_temp)); - cur_seg = (struct rte_mbuf *)((char *)sg_vaddr - + cur_seg = (struct rte_mbuf *)((char *)sg_vaddr - bp_info->meta_data_size); - first_seg->nb_segs += 1; - prev_seg->next = cur_seg; - if (sg_temp->final) { - cur_seg->next = NULL; - break; + rte_pktmbuf_free_seg(cur_seg); } - prev_seg = cur_seg; + if (sg_temp->final) + break; } - - rte_pktmbuf_free_seg(temp); rte_pktmbuf_free_seg(first_seg); return 0; }