From patchwork Fri Nov 18 01:44:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 119942 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 2A22BA0542; Fri, 18 Nov 2022 02:44:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3C20742D13; Fri, 18 Nov 2022 02:44:32 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2093.outbound.protection.outlook.com [40.107.92.93]) by mails.dpdk.org (Postfix) with ESMTP id 98A044021F; Fri, 18 Nov 2022 02:44:28 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VXkAwydV75hArTQNFl269Al7cgqOljDuYQUcyqD+6b8UxtSMHzNTuZPOzJvERgCYlVs/BDOSxqx03qvRmSRkhttgmxYaBzJAXwgXg/8BSFseEGXtzcltzoJlqakuN0vhu9V90RTKamiyKc9KKZ7pJyc71rQIM7YFDpKxDG5K2ypimadfO0xgjwmOvvpmpKTIG07bE9Sxt3WaP8i2mff3ifB2d22ZuTxLYBsu15IcO7kpbvBFpTASWpqsZx5RQJKZuydzhCwCw62TCtcS+C0DIIpI3xtmN3/94vE3KWSkoZd22dnXUcREjgsvul5xypDAZOPyFyxJHO6bj8LILtuEkQ== 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=DMn4f3lW2vl6t2MfxzT2UhtLkgmmjk0CF82BQCNyfF0=; b=Sn8uoqXrE7uWvWQCRXh2pVwl0yFZVuWoi6smp5cAgD8DsLQXoxSXs1WcLoDNXeg/UvZgVZihlLksNS7xUvDfssptowi9YkOsJvt14dlVOiMFqFs9kCRDH231p9/M2SHuucfswjcArTPlHBsi0LkIi7HxabKWjfANT709CXE/2BJvbFTkghCzsoFdyO7tFYmheGjsRCd7DJjY3bCeoEbXVvPbjdPYyF4/f3P7aOOpeBzm3+ZR2CRGmwerP+2xvfqvlF0H8PT/8xVnnddNvuJrt5yVMxve/zql2daDo+L4tXd1SVA2EXCK/Iu8RR4AVkrr5+CU77OObErVIkmS4BvoCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DMn4f3lW2vl6t2MfxzT2UhtLkgmmjk0CF82BQCNyfF0=; b=EJD4Ozd/VHqOyWjLVCA8k9xMCRG8iOhJqjvInbQo+psKBQ038HW920gw46VCsOHPmgbjce4WEglDkrDepEl/Hn72TQ6wmuk0g8OVr0LKyJMWdVZWvg8RDG7LMQLP54vsbsZdlG6CHzUr6X8YrtMV9vbVqN3Gv/RqZ4963wsh7eA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) by CH0PR13MB4684.namprd13.prod.outlook.com (2603:10b6:610:d9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.18; Fri, 18 Nov 2022 01:44:27 +0000 Received: from PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::e3c3:d3cd:ec50:6dd3]) by PH0PR13MB5568.namprd13.prod.outlook.com ([fe80::e3c3:d3cd:ec50:6dd3%9]) with mapi id 15.20.5813.018; Fri, 18 Nov 2022 01:44:27 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He , long.wu@corigine.com, stable@dpdk.org Subject: [PATCH 1/3] net/nfp: fix wrong increment of free list counter Date: Fri, 18 Nov 2022 09:44:06 +0800 Message-Id: <20221118014408.19565-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20221118014408.19565-1-chaoyong.he@corigine.com> References: <20221118014408.19565-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR02CA0086.apcprd02.prod.outlook.com (2603:1096:4:90::26) To PH0PR13MB5568.namprd13.prod.outlook.com (2603:10b6:510:12b::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR13MB5568:EE_|CH0PR13MB4684:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d875834-0293-487e-75d1-08dac9066d53 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Dync3JXEwwSvcEmzI52mtDz0HBK2TpNJh3YVfbcOEIqG02fPaSDZ61eF6nwQipPDFxEJJWkO/MpeIl0ZG4ZcKuyjyAQkNLs0uXDO7a405/bnBl+1rCjqo5uV9hLXHj3pAARbWnZTxbXR7WWtv0kC9p5kNg3mIfNlKriIXi3Uot50Tx8dNHGw26cWA1jMD4Vc/2U+zOveG+w8QYtvj7Tfx9ErePEd0GStiWc3SKdFCY8VFVDKFe2hG6FERDMvvdWV83zBp9mNM7LLVr/3rU0+YpfmhvGvhxW/agXmjE5nqG5EqgnpizMoz61qoGFSdUCFMhR1PkIr/8PnQf1jvCJ7KOpsl2PcuPNZBimq8H0ANOXaQhWyEuJpRFDMeWs3AmJgZQ8KYSO2/G9+e5YPMJFpLpkcyMB72sFnStZIB/6HUJn39pUVJio6K/ED1wARbcZyrORowKGQMAa0bXG9dNeT1K4KhH8EbJVKJQTAHic+Ca/VUaTsAnoiJX+H8qd5Zy4a5+kh+QR82xNwKO3tp9wKeGfW4DQlwKOig2Ry496hUx+gKULxAeRBzEQ6w+naCiFKsPWIA5U3eau2B1fukO6yScpvtplgzHOsvzWTUCXFFgOfX5kM5an2O6dAPxOYIj1Saf7w2JmFf5bx4F3vAFZXh/lkkDCNam5/QheBrtoykZwdBDAnh5NGj7/yaFxQHWLVZ98CwYDx0g03yAjkcs8xaQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH0PR13MB5568.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(366004)(396003)(39840400004)(136003)(376002)(346002)(451199015)(36756003)(86362001)(52116002)(83380400001)(2906002)(5660300002)(44832011)(6506007)(26005)(186003)(6512007)(1076003)(38350700002)(2616005)(38100700002)(450100002)(6486002)(6916009)(8676002)(6666004)(66946007)(66556008)(8936002)(66476007)(478600001)(41300700001)(4326008)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?g+RJrnrzcPyaCkos22M4mNQ7WJm7?= =?utf-8?q?9dtSMXll4AX4ejDMO6tIYDcN1AT0ChTEXjP6S6gNAnDVbcWvhfuks9ToUIX/eORJY?= =?utf-8?q?oy61aFUkJl7Sd3NFdLIxMhXJfxl/IhrL2Px6NMicYCqj4DBQXk4W1ugkXLI5hUdG6?= =?utf-8?q?aqswQZl5MJveQxHBp2SRYtnfGIDbLmSlALgBwdEb48EOFN1jLcu+Brj4OoTVxMMcV?= =?utf-8?q?rE0ndZgO4lD37bZbbcdWYqYdhsp3d0mDRQoo7ut7veTjmC/8jJY054wpdSDFuw+K0?= =?utf-8?q?fOD0tKfS+El670AvU2j44UMEOSbVsNyf5AahyEFcR1N/0QNvROHXo5CmsiK+aGqHC?= =?utf-8?q?jNHupPBQ2Ka2IddLxj15RKniVjMB0nqObbbfLHBrc2e9QizwsXpZfVkBtudHGt1yK?= =?utf-8?q?dE/RpJbhkcOQjlh1eLVnq+MyNxL7p41rjrLqmT0r1N4TTtmdU4I4RN3eFuOaAo8x7?= =?utf-8?q?R007PTGV5EeL0F3XWnwz+IPhuMc6BNJq0CnyckilQeOOu7PHsCFfW8tvKVZoUPqDn?= =?utf-8?q?2IAUQ0ExmlzvsSL1NEPSRUQcDAnpE9auxZnsGbB6+7D6Lnrn7f3kfreb2FsyY7/SD?= =?utf-8?q?EKNbuh82QXeuTy4QH2VhoMG4pCEp8gNs2VGf7LHekkS7yIOZDLQichBOaNbiuc+Cx?= =?utf-8?q?87MnqrqvUoepV3MwkBDn/Yzwy3n1jyNGTIAqSp1nllc7JDH3GShPzai4+Yw6FuRDV?= =?utf-8?q?f47GGFAkKldEVNWfDzQ4scj7nqwPeQ1qmvmoX/U5RhMhNwDxkFPgEBW3sAZU0XobF?= =?utf-8?q?p3Mr/yS/ygbSRdC0jHv2c8IDxOsebM1LGkvVYlaWlC4ozKzU+j29UDs/UVsvX33Nj?= =?utf-8?q?VFpxr4LaYaK6UnsyE6pf/d0zE78JxlZAm8K7CPT2VfStziQHO5wV6AzWqJkw0IZjq?= =?utf-8?q?xe/DYL18Qlaokv2zKvxoHeYVqI3LshB2WfaBE6Xn5hoyA1AR8P08MKB4z8HTqzjSQ?= =?utf-8?q?Amr8C+xzWIeRpr4e+vcz/VzjS9NJhE5GNfTBUF+RFwyTEUH9L6DV9m2Dw8xnFjVUK?= =?utf-8?q?PtTmSY3rpe8VS0Lee9ewUy0SX32k5/IIlZG6UxjpzWDAxsVZF12s85d3zH8uQufb5?= =?utf-8?q?FglHsJQEwNuSiRpc7tEOpqeG/hw7ORe+wN8dSEG5IkJ1QqSLXnwEHPoWViIVsQUGM?= =?utf-8?q?/Sij/eJRiMLKLYXelw0razC6FyAdUSeg7Qk7DUhujqaZm+oLy5FIvvWB1yzTId8Cp?= =?utf-8?q?+FZ11a6mCY3CvZ0xZFhreqEnw1MaH95c3rZ9OXV1gPmCxo78yiarO6U5hLY6yoyig?= =?utf-8?q?uR69aEoGNWr8+1i/Awx/nFsjMZy8EvJxCuQ7Ov1EEhyLZeToE+gqoasQib6gw4hNG?= =?utf-8?q?CyWYdiyzZTcvTIr4td+puuPNgPrekHtU0Au9vk8pmwzaX51eqvzIgDdMbJFnHqrEO?= =?utf-8?q?u90pw+U/I+f7Q8l71e+Ou64vNZzAIktlsSxLxaXtldNiceXLAwY8D70mrQMLKXQYn?= =?utf-8?q?MVWxV0stbQO1qTOPuN+OJm2DbYTlzjQLCxD4HfcZ13xEW5txIi5By0M5JBd1a/csR?= =?utf-8?q?4+jYep9OAzat8ALCJr53bVarKvUORUVdyg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d875834-0293-487e-75d1-08dac9066d53 X-MS-Exchange-CrossTenant-AuthSource: PH0PR13MB5568.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2022 01:44:27.1112 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uypKT09c0SLqSn2w85Ou59lNeOw+xNjUDyRZ5/Zzl9FiOiocV2uA1gh9m2PLulua8Sd5bMFl7JRocq7KI+qD8KlLBDO34aw8mdzqVmQohuI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR13MB4684 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 receiving a packet that is larger than the mbuf size, the Rx function will break the receive loop and sent a free list descriptor with random DMA address. Fix this by moving the increment of the free list descriptor counter to after the packet size have been checked and acted on. Fixes: bb340f56fcb7 ("net/nfp: fix memory leak in Rx") Cc: long.wu@corigine.com Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_rxtx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index b8c874d315..38377ca218 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -293,8 +293,6 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) break; } - nb_hold++; - /* * Grab the mbuf and refill the descriptor with the * previously allocated mbuf @@ -365,6 +363,7 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) rxds->fld.dd = 0; rxds->fld.dma_addr_hi = (dma_addr >> 32) & 0xff; rxds->fld.dma_addr_lo = dma_addr & 0xffffffff; + nb_hold++; rxq->rd_p++; if (unlikely(rxq->rd_p == rxq->rx_count)) /* wrapping?*/