From patchwork Mon Dec 11 05:45:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 135003 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 685F4436C4; Mon, 11 Dec 2023 06:45:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0806F40A6C; Mon, 11 Dec 2023 06:45:54 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2099.outbound.protection.outlook.com [40.107.223.99]) by mails.dpdk.org (Postfix) with ESMTP id C5A74402DC; Mon, 11 Dec 2023 06:45:51 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GJJXxbGg/pHQB4cj+PXQevsiESrgzA8cS1eUZX4MNBwqE2l9uW9IrAx3FXFjN7xUBtGJSoqlKwqpG/XZunJfdGzK0CLrogP0t0NocNhyErvnDTKSvNnfKT7hfJWxrtfIbe4knVhhV//WH5bCz9QbDMPNFFagpVy5qN9Ck01kc8e0uKdpVxT0IkFN9USgsWniOU3zR547YSdWkKnZx1gGkW4Sp2k54/EcuApIQDTt4pbPJQHe8Jz8xj6TKKiGVZ6DYXIG0D7lqUp8oNk5NqinHUcMFEOy9qLzIn88mJWljZPR35eeof9m3DbTNsZF0lIV8D4BO9US51lleBt58D6aAg== 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=cgknoE3bVFLfq9VJKCHvq0cDJf+La38FfaW4to6Gux4=; b=UCX6VN6/aXSvrYFi510ash75t1WhcixxTrFs63N6m03qbSJw415GlO9ke3PiOHeD0LcoQZaZKvlCYoRzA+ulyjzBfzfVC+Bri94Qpp6l6nO8T+NrX07aYdVvhWnV/ugT+LqYQzzRtMTGayZW6HDb7Y6rvCHpiqpPpNrKNc+HwU2ekMmnq1aT09gaZJY7d5udLxt5F3gC9iF64yO6mmQINMOsCKjmMGunzHP5YZUJ9QAGVQYDXR7vzNaTVMrf96r3qLsuvpUYpGJkvp2y0kN1nxtygHmfSruVRWmICdcEbDcYjjWQFq4N0N8T/8v/KE1+WgSZ5I3x6ByOYoA2a+tWlQ== 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=cgknoE3bVFLfq9VJKCHvq0cDJf+La38FfaW4to6Gux4=; b=tR9LLmdBrqrPsaF4/cGoZhn5LsB9VaIOe3qlfw8ZP9IRiPuN6FI9GycE0QYXqMgjuquW9UXtvQ/Y8bYn8BumZlRKKfny0vaSzrkmabhoTjAHqRbZFSia7iUzgd/U2b7cs3ZpNeETOPYafAoVfJKvpdV+6BfeR7zA7MgSP5vd+yk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by PH0PR13MB5975.namprd13.prod.outlook.com (2603:10b6:510:16e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 05:45:49 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 05:45:49 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , chaoyong.he@corigine.com, stable@dpdk.org, Peng Zhang Subject: [PATCH 1/2] net/nfp: fix receive function memory leak Date: Mon, 11 Dec 2023 13:45:25 +0800 Message-Id: <20231211054526.1701663-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231211054526.1701663-1-chaoyong.he@corigine.com> References: <20231211054526.1701663-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BY3PR05CA0005.namprd05.prod.outlook.com (2603:10b6:a03:254::10) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5975:EE_ X-MS-Office365-Filtering-Correlation-Id: 4ccb161e-c84a-41ee-bcc0-08dbfa0c6db1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0jC5BO9BzFAbof+k1eRbzojA42aZEGb9/EYTLZW1gn6h01eAHZmmpArni1pdSah6KwmmmrKpcpsQ8kt3MJ1XYfI+3WbcD/lHes1pTvrXoU4F9l6WDfSB9KXDKxtZEJW2GSIwHRcZ4ANnoML8LwwMVk8gaHrfyH8ORc+gDfmVFJtcZHkF0DbbaflXyVNSCLaMHG51+9iphmTfCnlS53iLt3xWW6s30fMqYH3dMwNa4GelKFiSsuHmLNG3f8FMtnKPBYFzJgeIFNXHhoFpwKKSVZH6HOTCxX8lCB/7gd1zYc29xOBWvGQGjsyqKgImUyesQf1fqvCBt1hj2XwyCz1zjUcblGSKbjsErEdQ4PSI4IsOrtpTBZdoyohmIlbUiy9JBcxo4ads9f9te5EHqU0ljZsK8mx5hoSQjbfpF77pR4o3zqiqvWYWuHxOkNuY+sANzLSYKHN5AzRqdrQA/Y3gFeLqVttqptWPnsc1jzWoxa9ExjUVrrYju23qcIM9guzgtLRAzWNNWOLjm2x4QuqZfiplyP69AQ46Cna8EBqnHOqlk2R+OlVngcVAZMvMIOfftc9KS7tWtKWD6NeBVNkxceJnAFUYVd4BpeZO7uNrF137dG8NH7OSCEdEE5v2dAL229lsOWJZiE1pp2pRKLK5F1kViBUNnoCocxBghlxiOfA= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(136003)(346002)(376002)(396003)(39830400003)(230922051799003)(186009)(1800799012)(451199024)(64100799003)(107886003)(6486002)(478600001)(2616005)(1076003)(26005)(6666004)(6506007)(52116002)(6512007)(38350700005)(38100700002)(86362001)(36756003)(41300700001)(44832011)(5660300002)(6916009)(66476007)(54906003)(2906002)(4744005)(83380400001)(66946007)(4326008)(450100002)(316002)(8676002)(8936002)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZkhUKP+H26OJLFFGEfshUeOXzIfhUYP56knFJdLpZ+RFCwM/j4nf4rzCcJljPesuepCDHjyHyvHoauT/wx0RVke9LetHNb5NGWZY6LPTGNDqEDFShhhYIT7bGpGlRbaTzA6OAfHvRcJNBIEt2rY+uu8SwODL6nzmKg95weuBtrSV92TU92bv5Fw3KikMesvKZYDeqnh6hb8xr1CY7B53CYVfPHzIrAfLK6/9S8gKZaVWNHXbotORKQlmqp+E0v0UPa0yK4AycCu8JSSk8jLpQkoA/I+q8+LIHOoDllNgzTDqxkE+XDwk0bPcxTQui0NvuY3TXnvTzGDF8Yz/sIo+O01T91JYxqJx03zWTQDFEBD5aMy8uAuiDYZtHyFT0+tjALqNMR8k2irkLe0jzl3F5Ca4kaLBGBHYnbbBkjyAAEFuVd9Pouv3b5m/maVwbtdcOld4eNhkGdy1oUgOcMy+PpAjGTFclJ2SgAPhn2zyD2KKePmmNVLH+2bmiwcL5Whaf9CU3jrpVi/CoBv9A4GoKZGj7hbEcGWTCzeydWPQvDcyWY7DKq7rOCbfHgDBClgA/Lqywov6FjyctytLiBFyxr0v9a9+HDlPjdmTNuTVL1/I/xTFlmGpN3SSAiCEAYcfbxWnjTbjZuEpfbZi2ykYmcjLBA97yyc/xG6nYPe+0yWuP56bhlRD2sEIDz3xFGnOkre/PZj1pjaH0Zqjd9YgiIDEcPVFpg2O2VTAss9PrCMMYhc5gzpDI5fD+f0s6OBoJ7FYeLDw+C/BcrXJAOvknAmjShnE1QhnwlMz0lSP/dfViijlz0wDnDDsCSWG5yzwyvoBGjIE/zMglI8MFiKIetdjL2bXHjrk2WQy+TbylEtdqpk9s+KkMBJS037O86LMkAK4j+D7mf7DT/HelBkMbcK+W1kjNq+5jsWeMbGUNMVIqzZSDRRbqF1rFrlzS0/aZPq6L0u0iUKMGP1jDUQKnGRSBkar7zW282qn2lm4VrPEE5HES/p3H0dI9t6q9LsIVB1aSqSa9o1pjF09UacRGOY7Zc5aeKGJmyOyds8HX06GtyQ2wf8djmZawDJ14zZlYF7VZOvfEAz+PCAsoNm+2e6yJfEnZIYqKbPIBO7aoNMzrEpXqMSLCRtH/ekMMy57KvCtI+PeKfUZrTAViHhOMqS9MkMuxlX/D/yZlUf0PGdWfSdixpWz99rPCRT98DUQJ186jGZW7MDTycbmHNY3LU3uBpQ/iRIbkyq0hgd/1h1FdvwXpY52BVbFjVOE8iy15dPYi7FfgSgcDGLAyeCFcHwaviNCVVna4KJSLi4WGsziKPe4W7Rm3+K3Vy+rWLvj+vPxqwImhcAuVIYVHFxZofzNdlui/0+OzRa3YFzf57ywpmhn1ZrKfgUhHeRN4N7WqQEKDzyczI+LqH6d6RlH+wnyMfav66FwYwMfVhDiYSq+YVk8udfup7PbcSP+a7ndBguoRc6CesdVJrm/1Etr7ZAAsbP3xEFGVOEgWO3BLTf8XJnWw/6VhetP75g5sxG77+2euDsqJBGzDoYK6S80fwxOq2DrmWvFPSqxRfUfWgiupCWuBJyMuMnH6VJWXlluLugYv9pwCrNi+AvEPI73og== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ccb161e-c84a-41ee-bcc0-08dbfa0c6db1 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 05:45:49.2815 (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: ReVB4uEXfmc4Qj9LVp3T9HSw8WYPxGR9D/mZoJXqbGC8yYG3Rhzs6ueI+8f7VrjqY7QC6igboFSwHxpq6QsLtwtIYyncM2812jeQEN0NKt8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5975 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: Long Wu If the Rx ring is full and do not care its return value, this will cause memory leak. Fixes: 766d51c9ce29 ("net/nfp: merge receive function") Cc: chaoyong.he@corigine.com Cc: stable@dpdk.org Signed-off-by: Long Wu Reviewed-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/flower/nfp_flower.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index f950ae233b..94b50611f0 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -133,7 +133,9 @@ nfp_flower_pf_dispatch_pkts(struct nfp_net_hw *hw, return false; } - rte_ring_enqueue(repr->ring, (void *)mbuf); + if (rte_ring_enqueue(repr->ring, (void *)mbuf) != 0) + return false; + return true; } From patchwork Mon Dec 11 05:45:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 135004 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 BA8EE436C4; Mon, 11 Dec 2023 06:46:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A4C5E40E72; Mon, 11 Dec 2023 06:45:55 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2130.outbound.protection.outlook.com [40.107.223.130]) by mails.dpdk.org (Postfix) with ESMTP id B8321402B2; Mon, 11 Dec 2023 06:45:52 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a3o2hbbMgijxTTkBz/FC44kq7zs6OZNarjpqvBYPFnUMJT6Itrz5quJR9rsDRAaNVbZHo/PuRNGiIO9rkB/tI2ISrHK9+34ZqETcWsBrWFTEmRdVJpAuPihV4iX2Nl6NzYa86DCRWa/+D4rHj+mbUGqmaYp+nurACf7RskH7FIdlxfEEl/d+iwcFeRW48Txh6k5Thk3I7fcHZjlw265cQsCGJeA7+rw5AqyJCCTlMfuSUH/QjY+oA6CDg1FuRYTEEwDXnahDBTtTVgMpgyPud35ItaBRSBNrRfEJtfTLQA8J9LN+niLsg5EcXYjagCuKEmbNDOn5qz2KjkmKBT7i3Q== 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=58RPhZhj+AlxJkJL6FjzBhhmkzFXzbw2zBPgTX1EN9k=; b=DFeP0J3bl8AoDEr1dPnqLaPHrmaM72lKf6rb+Blfjf4hWrbMTv4jPIcDec9c3JONHaGwzyfkogR12Vg25+rgWZdihHIz3NGF4x/Y6HPj8jsDoVtu9kLTRQJC3cUz9pgGy2ZyIZED1OUQYm5ByANrEMlA5xLJDjLQTRP51AT8NTYSsuE9Rbmt4i5R5Uv+/oT8uH+bW/nfdRg0HSq4ZSTXHNlbdK/pSUCMl3LsF2vT9js4IYriUSz2Ydh2x574iyQQxwxmWlvpU6hS8W/WR5sQUDKrC4Vb0cprYnypsqNV1PoO2qaEzoWEfxl2xkRy1DhF1i7FPJiY5jOxHoC3VQHAKw== 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=58RPhZhj+AlxJkJL6FjzBhhmkzFXzbw2zBPgTX1EN9k=; b=cq/fT4/3Qr/v/9a5E8RY7BpjVJJJyWMTQdFBONeW49dIsbyzJ7Dg5xgBS/3C9x8PmSXsenfCEoMpUNlNLZxcYbbbZpSz+2TZ7YfZxJ0BPhgf7ASI5/JkrQL6kUbCs3h4naQs9yeWaQDDcqpE8+rpQj8MX52SBTLZWFSSRd8AUBc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by PH0PR13MB5975.namprd13.prod.outlook.com (2603:10b6:510:16e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 05:45:51 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.7068.031; Mon, 11 Dec 2023 05:45:51 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , chaoyong.he@corigine.com, stable@dpdk.org, Peng Zhang Subject: [PATCH 2/2] net/nfp: fix invalid Rx descriptor data Date: Mon, 11 Dec 2023 13:45:26 +0800 Message-Id: <20231211054526.1701663-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231211054526.1701663-1-chaoyong.he@corigine.com> References: <20231211054526.1701663-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BY3PR05CA0005.namprd05.prod.outlook.com (2603:10b6:a03:254::10) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5975:EE_ X-MS-Office365-Filtering-Correlation-Id: 9245b0f7-9e0b-4690-9ac7-08dbfa0c6ef3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wzVSWyJK2t0iNlmdQR4O1og+Jz1g7/04vYnaHWz1UKkIe5cJpZBWFhBk9FYr3iLIFAFKU9fFGp5Y2EDrJz5chmhmTolecgS5BOdpskbmCCbj09E+VBn/fdaSeWS0aPJQthmHMXrLLs2Jhd/ntAl/3mynZyPCFySwD60RDjQp/Putafpo8aX7p+48zROOFSKnauqaIytvWCHfz/VnJh6MzwlAPq7dD3xAweNanCQmC/DJp36oDQx/TgVFyX0WvdgyhYA+5PTWRdBp89PKe6OaiBAKffkhIeitQrPYwc0ACTTfLwEDu19nDSYDchSpjJA0bx/SsdaWGogPuTr6K8QfwJUDaxM4xJ+4rQNvb+NpP8AIgiphqIHH8pipyTkg7Ea/aN7tKZsQoAtPX+t7ACL/eRPMwPADTAYCGd75YSdEgSwz/o8HGkiWYuZBKglZhZNTI86+N0lKIHpl33pMwlb9wYExt3w6H1StsfoC2DlaKTrsLFiYn82Qh+H9qjIhMFA7HKNZD5edx/A2RV+2Z0EX8UPp0jXST1ji6LjspXwcgKGlRSqvESFNLYCZH+UC7pkBrC7oOGUBxOlWkVBcOdm/5KTysUwvJU1qEXPIC9wjbf4Tu06R5kGSN+n1VYLnG8ogfj1TYTDi/IMdyM0GjLZ+QR47vb6jI+IzJ6ctEbYfpHc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(136003)(346002)(376002)(396003)(39830400003)(230922051799003)(186009)(1800799012)(451199024)(64100799003)(107886003)(6486002)(478600001)(2616005)(1076003)(26005)(6666004)(6506007)(52116002)(6512007)(38350700005)(38100700002)(86362001)(36756003)(41300700001)(44832011)(5660300002)(6916009)(66476007)(54906003)(2906002)(83380400001)(66946007)(4326008)(450100002)(316002)(8676002)(8936002)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: mu9iSvczC8kSyiC2yHvV+9+wI9Vs6HshvUvIG1klgtR8HpE6jM2ulFp/cSYIrkIBq/bHVmyTKPoKvR9hMUIWe6opHHljjfSRYFmtAfBz26ge2EhkSPPW9IB+150eUQhzgDtxmEngXMIpek/jGfSJUCwyX0kwn++0QnodKXr9nsug9Vs93Xu9CHopHo6zP/30LFP3q58+g5BFuSp03ALiNZ2uH7Zg5AxQvRPOBnr9ASNwdxLecslmyUF6+ODoQ6I88AxWoTQKw6HIIr5m+8hWkWsh/bz16cIP/N8KHUQGxgrc6UOxWpG8+67i1ZnQ8H0dChLF+MF4DvwY0bi5Sdhqq9AxpgGxqBpg3lLNwdn9RjVDqpCZLhS2zwuzZ42f18oE2A2Ybb4KNGqrFs5KtHIOCDQOx9RmirKXQ6r5Do9KatrVSiqDmRbuXoAHi3s+biK/0A+vvxiaXbqY16vPN+Klfx5nSYXOH/PnEcBEcufvs/HusJOXKM6JuD85YAvysSQiXSWyL+po6h0wVE68CFa16W2H9NM+NisjkZjaAYHMUMCs3hv+chSTymwxPrUOCI512JBw0rAFdCla+LTK39ypvSPFumBW+MbAyMKYrO4TFA9RHNDwd+hr3pd7QiR/lbr0dIifk9aEcqmSV0w2GzUXvowT5bBgH8xY4sSrvmcv2PQKeCiuHBDj14d2snNOb6lFGqDLd09rH8u4CXbumfBmOxVhal6StO1R7qsnfBkattLKQItYhMJ4eYxNj2YvKGtPNOeWOYxU5zrO18+qOvN07HneYM3XzLAUH0jev5EE1WMfNidAQn1wamKVvq0Ew7LTqHEw91zVQnKijOgUB9/FeEV/31RhnBIKRXfxc9OCbYIuy3IkcxBjJ6g7BO43bVKYtViWDIyIrF9iiaycR7Dg5V4evwa2f/kbYU4wOzIH/x9tHMuZ579etdTE5ZkSo30SeOsY2MW419OcflqC58FJtDUS8jTbJ3B28kz39PLlwnX1ye7ygYe1vQq34CGNZzO07IsGh1+XAtyxS9SuSnqDac3g85OADn/PCjFyyQnoa+ah9yhEmxXn+iv4/ihsPRh5yJcb/wYvOjfny/t8dpAAKNZxxA2NsOO/mYcNlqbBzqGgIm5OJHgarELNIzzDCkL+k0JZpeoe1CDz5SH4uJXUyG7EmLTcBftCptBlcvU44OlUVMCIk8rgG7ydxA3ZZEa64sAB55TVDQJZjBUr0gPnc8za/EtyZ0Wb8xCDs2IzDXZg12zx72hfpLjF2/L2U9sGZO24TXiie8AoczJbILEnxsX66apqRlSV3EBx/6tYpS354QjBaKiLiUoTNRms7sWdC43FrYT/Rz0LyWs/aBkwSKPrCUwi2F4VdEd9Dlz1FzQbi+ZrqzJ6KyBmCq43aRkt3j2/EbADxiOB7LakwimsszwRwP8dilGms0ZQiR4YjGnoXbEoNrZouofpl2WmXLH9RyXjQ0QnvWZso5ONKobw5/2g61fAuossLwcaN0BVNKR/MyMlPyzc0/AP3MHxL3BAG9snrYQXQ9McnotQ03A3owtLXKUe5Xjq28OsmAwpr7O1pVypKurCu6oir4cTkTeIvyno+2a4gfOgm2kB8Tu0UA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9245b0f7-9e0b-4690-9ac7-08dbfa0c6ef3 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 05:45:51.3709 (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: xqN8t/B7gt/kHMhuHx1bFowyy/utsXxeF7AfkEBYDIwIv31PKlTuJE6EKG3FY08RqsLMQpkUL6BpveSAMozkN3frZMCVUj8dgjug2psbG+4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5975 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: Long Wu If the Rx loop is broken and PMD does not update the descriptor, packets will can not be received successfully. Fixes: 766d51c9ce29 ("net/nfp: merge receive function") Cc: chaoyong.he@corigine.com Cc: stable@dpdk.org Signed-off-by: Long Wu Reviewed-by: Chaoyong He Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_rxtx.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 5094bbf145..3840e2372c 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -765,15 +765,6 @@ nfp_net_recv_pkts(void *rx_queue, /* Checking the checksum flag */ nfp_net_rx_cksum(rxq, rxds, mb); - if (meta.port_id == 0) { - rx_pkts[avail++] = mb; - } else if (nfp_flower_pf_dispatch_pkts(hw, mb, meta.port_id)) { - avail_multiplexed++; - } else { - rte_pktmbuf_free(mb); - break; - } - /* Now resetting and updating the descriptor */ rxds->vals[0] = 0; rxds->vals[1] = 0; @@ -786,6 +777,15 @@ nfp_net_recv_pkts(void *rx_queue, rxq->rd_p++; if (unlikely(rxq->rd_p == rxq->rx_count)) /* Wrapping */ rxq->rd_p = 0; + + if (meta.port_id == 0) { + rx_pkts[avail++] = mb; + } else if (nfp_flower_pf_dispatch_pkts(hw, mb, meta.port_id)) { + avail_multiplexed++; + } else { + rte_pktmbuf_free(mb); + break; + } } if (nb_hold == 0)