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?*/ From patchwork Fri Nov 18 01:44:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 119943 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 26F61A0542; Fri, 18 Nov 2022 02:44:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 188C942D21; Fri, 18 Nov 2022 02:44:33 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2096.outbound.protection.outlook.com [40.107.92.96]) by mails.dpdk.org (Postfix) with ESMTP id BB65140F18 for ; Fri, 18 Nov 2022 02:44:30 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XkChYNSGmERQoYMQNGTg5OxzBp/FBPxWVH3j3VP3V1dojSar76Rp4pcVCOhps4xEnoU1Kx91IJjpI8ER0spWM2lRnBLhGQcih/hveJwkGxgxMHOLhViRYR4scQrmKaaGIq9sG5tNp08gVcBBHv+ghelVKrLPJfjAaQnlZvd/5YI2crPdy/hO8lQj0ohrunDlQuZ8s5wPtnAsI9UOk44hWW77rW8WcjrcqV8pd+yswD2fm+jrfBROpGfsRO/XJH5NJhyW47cQiTMNDw+BHyOoT0rvx9IBPiLd/7CqpI8WCLvCTn6YhQdTlGfI1y1v6B8bHxPvS3YbbUK9zvkAwz1HdA== 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=HfFsrV0Ahs41fwgBPlOCNh3Ua1irEALPm9uqciB6RxE=; b=G/Z13zEH8vDCpxCf+ixn5HeA2ZMTsolka1q/a0Ynd/aR1xp5eQdteNuZizQAh7Ebj/1EUdxbgp7dbqQ4jTmA3P7AM8WgZ3Lv6JBetHTSNWe+HBqJClQDVvhShQGLksLx/O+AHAHlm0gr+yXzDfeGwQ0a8ORrUU71ouNwGOkdfUC9WulcULetUQ2Rc5VO3fxyqs4szUdYCqzCVvc81eYJlaNArWrHza9wlKFPoMOOL8G8n7dCxz8JzVClHJsX3BeTogYOZrH3W1633Tw5H1twyVl9/IAVxOu87mCTW6/9XXUBHV4o8v9nQxeP7IvRbsrGXVzDGWiybkFw1iRn9zZ/lA== 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=HfFsrV0Ahs41fwgBPlOCNh3Ua1irEALPm9uqciB6RxE=; b=XuHkSCwxb850ifl/AOJKV2pmkNt0JJdvjH3N+w+1HAEkPD1rXwzxPHph0oJi9YXpKEVHuJ9pBTr46/rFMvR0yQnqmNmtbFPcXAbbfeMlTtqAjrHjd1U3krF8XcolrleHCOOr9/mlQocShPkKsMVu81/oil1VC5R7e1c/aAaV5kY= 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:29 +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:29 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 2/3] net/nfp: fix wrong increment of free list counter for PF Date: Fri, 18 Nov 2022 09:44:07 +0800 Message-Id: <20221118014408.19565-3-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: 7daed64a-8614-463c-222e-08dac9066e9a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Dvz0NWBHQ6xLQ43u0KL145kJxcGDf4nCWO4pUzjszAiB2HKJl/BK2SuIMdakrHgwtklMhlGcczzfc9xq0P05Qyr76d86RGkUHY1xF/LqjzlgihaIOOOBOUFdZStBoNni8o1I/TXOL+akjHXIgT3UFKWjQvn1ubOGZbVsdBWidGRuVAqcy9Dlh3jgzqGrtdpaJFyvfFRQHPRTm/GqosD64RYBhqgEWc7SG9GsrzEi2FlIhdAjVSUtB3Fk+PhWTXEtPY5GrKCfji8gad/YYmAvDpCGEqbP+P0cJUel5cT1mfSqUA7xOOGxwy3ek26oFft8JB1CBIeIW1aevIuNVISS4P1qRoY2fxC9XaZRXvFrURTYenINAu511npVmbZ7zn3camuOBTelMpRE7owBRCWRd4mcN6VQ6zpRbquZ9HwSj88vs2qHDA6SNibJ2N0kPFqVXWYg7ihfwL92Bw5R0N3tcVggM/OChtzswdLMm49lERs4Mj1zlcZI5a/VFwfceMyVP7QHf/8QpE4y6GI87JvoDturC432ExU4X+HlZp9m6Lt4FChYu54xm31v3yPnSZWWG7pMKkarUeutntkETLbDwVHNbWfclGE9YHitr3Zzj75vKvjmlukIzw5we2KGEgSmx8S/T/UX9wJjeikcqmpsEMqT9bU2WeMxQ1T75G/TYu6SktMtoiKOdt1vyGT/wK/kL3CND27aBtjux5WIDHDyVQ== 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)(6486002)(6916009)(8676002)(107886003)(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?EnJ/iTXdmgU6bZaJLTWV771edGAT?= =?utf-8?q?yqpl1GZA3fQ1TKbWEqoAWEcfNeUF+hHWUuduZKpL1mZexsc0MVRbN4Lhcz1Tb6E9m?= =?utf-8?q?JHVE131zh60kFsQOvo1ly6uQ4AJeARDw+yReHpa/MOrRH5XlJ2qp88dLCKY5UN1UI?= =?utf-8?q?eRd5Euel7gmrWpMiubOxKsZ5Y3hZIBwGmKHGPOrFKiF+nihAuWKSHMxWIUpfbxbXX?= =?utf-8?q?OEx4TFo+si3xtMrSWFhB/WbIUsyk3lNmfsV62kp/yF5ycgiA2+669uQyGZ6cmnOH/?= =?utf-8?q?Fnkii113USU4UWKPUjwp3+bD2fdsr50MXEAedTjVjQyX2JfJnuQfqWLYGdHUsDDfO?= =?utf-8?q?b1um27kC2Ju3qJKXWzn2slzbMMPiJ29xyWAms53lKBolUZBlUfzPesEyCb6k1WMqr?= =?utf-8?q?0EK5QCeDzOXymVm7UHUqDFOrJxTI4W4tgQHHjj1HZ1CafdIGweNIAMTzZu773I066?= =?utf-8?q?HBlpGlmdGiZMneBDjg47YsEfUmTiHn+d0ttCTnoFHj8TU5Y/oH7ujXoefG2zNIbIU?= =?utf-8?q?8Hiwhu5T+fCUxtJ3RwTWW4XjGfmjFdd6EICQCmLiZmBgh0QiuYRhxzlj1A0UiAxpz?= =?utf-8?q?OdweFlHuJ7tcMF3HrZqdQt+Jwu99JyDQOj8ijsMQutqrlD91UV+WXF703OhBDIRbs?= =?utf-8?q?+AAF/qMdUo9i6SAb5giZPDP7dOjMrVxeP5FINoscRBSISPxMBUrE9FhrRWi7Y9lKm?= =?utf-8?q?NqajztyuSvQFBRQOMuZU3RgO6FtCMIW1rID7n7V/fLubHaiAI6CHsX2ysWNhTJcfL?= =?utf-8?q?RPjKl244OJeCntHVgbmSRK3U9juI5HBKq5h28meLcBDOCyQN6pnAJ9l1jDOuGrq5q?= =?utf-8?q?GiRhjN3jBsB1iuaGY/ROj4leNBVbdA3+kITtfQNrbfn2ahPTpN33RXylDo1nHucpN?= =?utf-8?q?NaVikDacW7Q7r63aVEjyHrn7RSDIS2W2PkrdZmVO+4Mp/bjag+d1gmu1WvOx1LtKC?= =?utf-8?q?DCbvlEJqYkSLyIHMSgMK/Cz+tYaKJEIMYMz6MTY/t0A1YR3neDBt7mC1dEC3Bhc7v?= =?utf-8?q?dYh6ms1sF92nTKhV0ORwFDvVIZKYTc5Orq5bu57NrWNxXGd9vzo5iSKxpBmqAj3VR?= =?utf-8?q?VL9kYq8sDXkTUlyXiEieZMijc7AKd3nWkl/61LqRR8sH/2p55+H5VUbp/0oBQnL9X?= =?utf-8?q?XEQQBTakV51e5USYvERCOEHcq9w8pDFx2kV2cPsJWSJthQzW25eaCXc+NRdMvJW7b?= =?utf-8?q?wfgoX3Wtn3XTxRZXUm+4C9BWd2nQ38sAnqxIP+ZJp0MFuMAsM3KKcdiAW98fh3Qx1?= =?utf-8?q?A71YHT8gmrX4/M7lt7W14wrU6Cke20Qgws8jSJ5ZRsK1eps9fuZ3GmC0xRGsHUoGf?= =?utf-8?q?247ul10moHENrd8e1Mw4yr9V9BwSyNiZS0johhA4oThZAOmnS+h7/TZ4Y7QPwWe/X?= =?utf-8?q?+blsKZFH2y/vxqaARgwluMfmjI6YP0b5WrIDxaEq5InmsgWly+kKLqqyOUpX6b+rZ?= =?utf-8?q?/Sd/felNHRRmaAq0+AJs7YRix6DazpV3UDsUZxKjqkvtJOkqdoCPRIYMPTFlzr6wO?= =?utf-8?q?PqWOfLTTrgTILztSHHJLzayDWWSHr+5Crw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7daed64a-8614-463c-222e-08dac9066e9a 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:29.2208 (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: CMy+HT7QmQlDkIuJDH7tydvzO47XQp2ryqVLLg0siaeoHz7ugJP+D1lEcYOEtOVJpRLc1o45RCJhvPQtlB1LWyIBwcghpyrrQUkFFcIRAW4= 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 using flower firmware application, and the PF 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: cf559c2a1d2a ("net/nfp: add flower PF Rx/Tx") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index aa8199dde2..e447258d97 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -369,8 +369,6 @@ nfp_flower_pf_recv_pkts(void *rx_queue, break; } - nb_hold++; - /* * Grab the mbuf and refill the descriptor with the * previously allocated mbuf @@ -455,6 +453,7 @@ nfp_flower_pf_recv_pkts(void *rx_queue, 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)) From patchwork Fri Nov 18 01:44:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 119944 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 8F3C0A0542; Fri, 18 Nov 2022 02:44:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E9EA42D27; Fri, 18 Nov 2022 02:44:34 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2103.outbound.protection.outlook.com [40.107.92.103]) by mails.dpdk.org (Postfix) with ESMTP id 94AF141181 for ; Fri, 18 Nov 2022 02:44:32 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HkeoFNhbdLLOkBrWUcDEQq/45sCIe3bVlBVJnPfpEgRi3hrYgUikjvOOBMOA03JgYuy+7ut372ApDf39Pdut8vQnfx6qVwmyr5G/9HftLk15b7GE05mBg1aWhqRHeT+nRqaq6gb2aTDv/yx80gxLMschfEsvQY8fZfbykX1+9LjJkHkNI3avI1H7Q7+gnGVK+slkMzU8lP1N+7bAUHyxHoGB36LzzbeXZTXolhOJKoyQaP8vaxorHTFhzHrhhzqQAyxi8iuMR9onAcKhF4IVPhtkvaCuZPm0t+wRSeyM5yA4ZArJMUkAEMGRAhmhEiAN4PLeW/tE5hkKYsznAbWdRQ== 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=7vTWTkUuhQUhSsvQR6ehoHHkeRdRMslBBw6aTytFHrw=; b=TztdSWbHlEyWMj3TaPiR8Ru5XFJyA46OkSSVBI+eTcVrhaEoov7N2Otq6snYNhM0duZ2mvkph6NAONgDvd0vOuSpG05gQWUk2QP5KTjIFYy/xtAyh7gc1jJBIFBouYGNXVopqn6yc6u8jJH97Kqy8FzChK33gi7KH6JZjPoCnj09KpnCvyd5jc6EvmImAGfP/0xNcLgZzHidnMO7yWrlAk38adwG+LT64s/GbqzF97ql1qIgXvJMhy0JghD84i7iN8C/LOPJ+QsnsCUOo35vdLZ4hEOQJY41NmWBjJurVxKpXB2I95fmHkiOlCduYbUuFQx9Jk/DxrruaeRZkczM2Q== 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=7vTWTkUuhQUhSsvQR6ehoHHkeRdRMslBBw6aTytFHrw=; b=tDm+yXgnqArNlnlo9UCUAF/9N2HFL+y9jD1krhXt7VpWrxt1Lt9srLR0uxvaHVdSxi8uTJ2louDkaa6JxMxU0yZHyQsgA5Igkh7DF3KvXjnhtAXMNEra/C7jgGuv+dXDXSYP0R2syE99JmO88OiHchnEIsB1RHL5njchc5dO7M8= 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:31 +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:31 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 3/3] net/nfp: fix wrong increment of free list counter for VNIC Date: Fri, 18 Nov 2022 09:44:08 +0800 Message-Id: <20221118014408.19565-4-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: b3316872-b9e5-49d5-bead-08dac9066fd9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XW6596aSKmGdriShd+gXrfNIKxtolesjZ0txAtSgTyyYyswgBVtorXETLr+A6QwGOZwpEcayRREk+tk75Ld40RgejaB57dUEIkLfyEA4kBmowJOAU1Bla7B3DW574gTbCa1TqZx4LKLNXhWcVfgZGAme8i/IxHIcXgqF5QKGunVkbhs4A/Q1ZJDlLu6I0y/jgM9wHZZQjiisNb0RwWv1bj1hHx6qkL0qfa7gWHUO2buo5VcsTdxQ/3pKkBCdgKo1xq6m5JBeKNOkirqJ6yowA4np/nV9n6GJ79ZsXwulB2uz7enJfVZ0CUg2RbrJwhC0GoRbzIb3ACcZp1K3lyO9rMxNdNWinRA+ePKiIw2v4Ftjwe4kEbVF+yBuHwkC8y7F7Ob+ClorxZ7eVRq+8IFBeVQ4QHn+5NntKnqSfh3UyvRBO08VFnlZmbvLoCNnwTmvAwG6mUZBNgYIYYLyfNt7FvwCr53tQl8N49AfxiKfPmEQqzJTI+05ICBdc3BpG61syzz9e9BGXUKYJMZyRSC5z95/pKTCsjIzYRQyn81izUIcrk2TgR7CtnRIWYh829jRTg1CfDnDRPeN+RsKKxYp0paZkLN3ZE3slhaw/yM3ANydRVfx1IsL1h3/51EKDDBSSYv13AJY26DiTrHX5s4pUSK9e/3fFAz3JVxzhwJ706qzB2nryIthnHXqYOaGVpBwQZSRnRfs9o26v2OigcB0gw== 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)(6486002)(6916009)(8676002)(107886003)(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?8T4BlwDMRE5nc7CIr4WMAfLQBf14?= =?utf-8?q?r4uNAkZtASUy1FERTTmp7oGGj8zUY86b7O0REMChl18qjsH/ecjO4t0mqvlOZC6QL?= =?utf-8?q?Qs9QcaJFMWbzgH6yD13At3I+fVudeNiTwm6HUrvec3hlcJ+KcvQbOD2tB/X7PNpFr?= =?utf-8?q?9CJIY8Uw0oc5hRY3JWy4lxfMDAbg/WPfW0KbCrBvcQTinBGHXxGLkX2BUmKxlqUPp?= =?utf-8?q?4AP0jfm1q0qjPzHSCrrmCLLDITWj2kfK/0KTkvtkXLQgvyu8W2/KmwCZIK4g8Ta1q?= =?utf-8?q?sT6m7AxbhmRdZqyOoP3ynyhcFuAn8RSJbYJuFzUDJjYRIuU5TsdSEwUHj6XJf9Sz7?= =?utf-8?q?TfrgLkc94UPgWgml9dUu5r5jkiVsWtzAXhmxSsYsOeRPOZRFndspPTastQQehmiok?= =?utf-8?q?0aWK2vHDKRgdPjlTwPN1SB3YNb8qhzrWDaEi9DSSlpbLnlPWcXPpS7hwgHFgZpBf0?= =?utf-8?q?mo32Z4bd2Na3FT/ZMgP9Es6jDW9ZVNoRl1LaNz5+ABWd9AbaTuhenhncYD4Sog7mC?= =?utf-8?q?qSVMSz2IPuVjMFZ7Zt5GBF23HclNN5WRQ3eJiZx+MuMKHo5igG5NE1ZB78nKu9od+?= =?utf-8?q?2EYVeo/8M6u8r46iMUpDTa/DZz1WcjalO6QWTT83nMGrEJ1fKBHq6oAAG/MFRgAmv?= =?utf-8?q?p8c48edj5Os/OiFpeQ8dwLtYGYrPTE1aqxdYjAeb9aS5hO8bMlQC4O3mSg/65UEmj?= =?utf-8?q?nWwsaiF2cK+rKWzGItdBlMbD6IKm0ZDVAJ7hJzWqgc4BOQoK9UaHtE9+WJ0zzgCHW?= =?utf-8?q?tf9/GP/eiFSngiPC0S056IDaCv6xXFxQkABnLEi88A5nk52/M952Os9HXi0mUEkuj?= =?utf-8?q?mCGmhwD4vKmKPiX01METrCXnZYuf9ohb/rYR0dkUME9Tu5mhB7zFqU5sj0ip+Rrd8?= =?utf-8?q?Zy0VxxVoUc7J24IvVUuo7h0myanzTCtC5hh5h9hm5rwMxVZ6vgrDJ9IDU6ksZWkcC?= =?utf-8?q?QcIepKNjXZUwxdbPJQuzVb6f3vNWg6+Y7ZdgqxI26mq2sWi8CquHFeXMkGxjEhp8R?= =?utf-8?q?2LTG+t5R8G3E3fqjkhQzoJxDqUSpZXTyp4HBxm8BiXMisZb8QyyYf0zkeLJt96llP?= =?utf-8?q?y2M9WPNSARWTykjuim12bTvKdgVYiGEFlnC7Cvdg+xslmTvRjWZLURyInzd0F7y4T?= =?utf-8?q?TirIGElDJylqOhDaAizHU/SNTc5y/xU83sJ6fgCvNqkhq+WD+UHiTPCKHiJsDedn+?= =?utf-8?q?3517hHrupr8/q/7AqWOuqPMGfuDnZNH3dXmOiUhc6Dr0Kf+TWxO5CyXKd3qCkN7aJ?= =?utf-8?q?/vfLM1C7Ujbi3e3O1QK7KltcxcxPXys2ZKCt90wQeIjjAddLJZZyMpIBWkB49NE1I?= =?utf-8?q?1aTCO/nefUnAXRKt+ZNXdoBi9JI97GfL+vFQOfKybz1+5svLTmQmp/cX4Aw7kXZVA?= =?utf-8?q?nvs8EROuFMWHJY4sdfxeeQyX59+GXIiycpaeM5Ao85UT1jEpIKSwWAPAp+oaKelZx?= =?utf-8?q?1W5pwcIhCmgNQE6UXMI5tyoLdCvaeQpOwxzHStKt2xAjuJyPUn76uvFxjVMl7ethG?= =?utf-8?q?61pAeNAadcYjR8nkrpGcLcIkOGiVvI49jg=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3316872-b9e5-49d5-bead-08dac9066fd9 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:31.2842 (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: EOnFSomR89oj64qSTgbkKxkXuh+QTbyRKNBuKYWZ4EQRjlEcR7U4vIctZ0IkFjV4LNjTDonr4HcrbuZzp8GT/amqhHF+cfiVG1L1AcIg0wc= 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 using flower firmware application, and the ctrl vNIC 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: a36634e87e16 ("net/nfp: add flower ctrl VNIC Rx/Tx") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/flower/nfp_flower_ctrl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c index 953ab6e98c..3631e764fe 100644 --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c @@ -74,8 +74,6 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue, break; } - nb_hold++; - /* * Grab the mbuf and refill the descriptor with the * previously allocated mbuf @@ -127,6 +125,7 @@ nfp_flower_ctrl_vnic_recv(void *rx_queue, 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?*/