From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 52F3042D01 for ; Tue, 20 Jun 2023 04:50:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E5A5242BAC; Tue, 20 Jun 2023 04:50:27 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2126.outbound.protection.outlook.com [40.107.212.126]) by mails.dpdk.org (Postfix) with ESMTP id 3B0144068E for ; Tue, 20 Jun 2023 04:50:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j8n7Det7LOESiDwLplY7p9bLOpp4pYjnvRY+ZlFRHYkv0F2HQPG7ojXGcuWfLuhDhWJoPTssvLrD0GMjmAwTbGXUthDPY8u90InlfpFo/VDeQx6XpN7esbVdUkSLBDZaDKnYgLpSRgvlgOaC2zfr1Z6JFDufvz1CPv+l2hyG92QBelY/dYDEafCnDV50b/DCo9pLBFOL64guZ8RDSWUxQQx+ig2dqf3CdkzeUW1svXeaE4iJmmT/njYlFQtCH9txUN74/zYpBYVDVGTXPJamqxMy5cZKgNlPh4pD4CTa4HOl6R6h8KhvgnmPUgXbCnFEyLlrZeXZzC5KNgUeYqr8qA== 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=wZrMEhxTlYCJHAco9QrnPiPSiHxdx0nleJe7hRvaN2M=; b=aGhmCSkD/RIsQ+FbAWzS1IQKU21n9GV8rMurgT2evB4355XWycAQNZEAcxejHXlv2bDhvarlaRZkxCYih7p7CvR2dTz7QTmXxPGMyemvkmGdblLYy5ihXgA4zGtt0NI0B3JTjH5fUPGm+d0jYp7h2GBr+BjEyCvQXaPHqVXgS/zri0hlXRhXwFv0UmgIcQJ/pUASyiCqgG+FdsRhm4dl5b7c6P6AkECw9zkKhoQ4TCMeyS+uy+PabYBGtN2GLpv5jS7J65l19NEys+FAeJGjU3IUrFFSH6nr2ieeWb7+IjM8KydqX22UB7Vhqcck/svf02Roo27ElYtjF7sxQldUYQ== 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=wZrMEhxTlYCJHAco9QrnPiPSiHxdx0nleJe7hRvaN2M=; b=eCiU84xWv97aKSCQ4SkrsOrliQ8BZS+wNsXMilWqmOUr6VrHlty/RilUWkzY9BqXtb++wO2Wg5jliijwFbfVgdlGnJFGlMoVpwYTUDoCxrS4N3mpramkF5tFGAP0Fr3yrAesqk89eA2CRiFWBTpy4xJ2xlh1SiDxBe4xH64oHL8= 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 CH0PR13MB4716.namprd13.prod.outlook.com (2603:10b6:610:c8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.36; Tue, 20 Jun 2023 02:50:25 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174%4]) with mapi id 15.20.6500.031; Tue, 20 Jun 2023 02:50:25 +0000 From: Chaoyong He To: stable@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 22.11 1/2] net/nfp: fix Tx descriptor free logic of NFD3 Date: Tue, 20 Jun 2023 10:49:57 +0800 Message-Id: <20230620024958.2004152-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230620024958.2004152-1-chaoyong.he@corigine.com> References: <20230620024958.2004152-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2PR02CA0031.apcprd02.prod.outlook.com (2603:1096:3:18::19) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CH0PR13MB4716:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b774b73-a33c-467b-a55a-08db713918e9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bisaPNbmhaLTL1ZYeibbFrdg1QE9aMy0zbiwiGv9ggqGr5aFWrwJFdbs6FwNfOgU1qUkUffAAt3URc5wVODxOonVqp/JNuwvRr6tg0H1A1XtZc3gUe1ZQL0aTQCd/15nKhpt8VY5FF1HDnnSmcKKzOy4e6rXdGQkz8ZrPL1/KRw2wZ+sMBh/T1vJIYdH75x5WXPXB46qAync+cBNGstdZ0FLSArEPEZhh8jAtslTm4orFMeRhVbwy17j2eYTwr9/+rROG8cSWNsvN784iceuXbLm+ZDHvjh1npjZ4tWuay4fWXLQUryipUvueVIOv8LMw0TnQx4QHcGDhBHk6k/iZluaNVkOAaiiewnIxzTx5GFrws2FjTpBA2k+b6ynekNBL4Ww/IaDLlN/95xk8jqTJl6gZw4OlXLgNE8QtHkIfWwihxOofaxG7rpBdE8DjwAQAd+ebLyBo8qczAHuGjg/UFPH8FdiZYIKjk69+4ZuSqzc0C9dsNxc9K3ZhVOacpPlBwn2FzztyuEDBAg3WOVZ/LQh8zHC1oDwX6iGn8KzsQYbAsk4kV3cslv3JPgrBu++WY216/yRO9at452+8kfr2Hbi1SkBtIOoKlYnEwUbqCchPbyTbDbBPHV+IUWhQmXswDs8DyMuI06s+yvED9bST6usSbKyMr9GGgc/f3NXzmk= 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:(13230028)(4636009)(376002)(396003)(136003)(346002)(366004)(39840400004)(451199021)(478600001)(66946007)(6916009)(36756003)(8676002)(66476007)(66556008)(41300700001)(4326008)(2616005)(83380400001)(38350700002)(38100700002)(44832011)(6486002)(86362001)(52116002)(5660300002)(2906002)(316002)(8936002)(6506007)(1076003)(6512007)(26005)(186003)(107886003)(6666004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Q0t6QnBSWlJoc213SUF1QnQrdnUxYjJwNS85OUswVytVRXQ5MHR5UEl3ckZk?= =?utf-8?B?c3gwKzdFNm0yT3R6cnNxd0M3U20wcHFSUDlXRWlQaXhvbTJGcU02UHV6QnpG?= =?utf-8?B?dHVzU1ZsclpuWGJlb1ppekN0Z3NuSGozZyt3K1cxTmFXVm85L3JmQ2lYZU9Z?= =?utf-8?B?YkxhK1hRdkdVdlN3UjRwSlRadndFQjZPUmFhUzB2cHcxbzBjUTl0ZzJERU4z?= =?utf-8?B?a2hVbXBPUW8yVzhpVFpqK1gxTWx4SjNkMmdGZDJGOVdGSjVaT1k4aHpoSzBC?= =?utf-8?B?dWxSZTVqdE9BWHluRVFRanJsemRqTzk0UkVSeTRWbTl0NmY2VkFQTzFtaVEv?= =?utf-8?B?bnZ2S1VCZ1R1eHd3TCtNb1VQcUZJZFNvYlBMSzhhYkpVUnpmc3FpeEFwZmwz?= =?utf-8?B?TjFuSHAwbk5XSml4cnVmSkxDQ2NPRkIyMHdhMHA5a2RuMnpjTEdyZjJqTmNV?= =?utf-8?B?S3dCME5KTEJLZmlqaVhOSzFLNjdnWko0dU5BQTF6cmQ3STg0VU5oMnV3Sm9F?= =?utf-8?B?d2xwckdaRnhKcVBMTU1tZi90OU1MWkRQSkNtMmpEM2tsSU5RKzU5a29Bandi?= =?utf-8?B?L0djWE5hZW1GbEZhcWxVVFNYcGtaNnhSZExCR0U5NHFLMklKYmJ0OWs0YXIv?= =?utf-8?B?VmRJWHBWY2tkS0NIRWx3Q2d1SGVOUzRRUnNiaExrMU5ZVlhGWm5qbHJ2azBq?= =?utf-8?B?R3N4Sk1Vb2Jid1F2a0NYbWE5QVorUlI3M3lSYkhOdzl5TXZSMXpxa2tOaGw2?= =?utf-8?B?RU9JQVVlbXBoK1NvYzBLekEvU2E5dVNzTkZnOWlTdjcvcmJJbGdsK0FySktY?= =?utf-8?B?Nm45Mmt5cGRjK0NGZ2dIVTFsTWdHaU5NQi8wcUQvSnNuOUpZS01ERHBub3Ev?= =?utf-8?B?VnpkVVdvM2lQN1dmQVVhSFhNbitZTmlYdkxqTW1UeGRnT1krQk9sY0FpMjJD?= =?utf-8?B?a1VsZitGWkVETWdBVEhzK0hVVDBIb3I3RGlPdU51bkdkQU5PNUhTSzhCY1Rr?= =?utf-8?B?aEoyTkZwV1JnZDRNQld1M2NuWllkZ0U2WkhKOHpYdy9LMlJIaUZLaFE4am10?= =?utf-8?B?OU9qa09XdnZzQmV0VzljNUJPL2pXaWRGVFd6ZW45Smsvckxsa1lNK3JHRC9D?= =?utf-8?B?bDUvcUFDLzlKSFVVOXRuM2VaaGgyU3ZkNmZsYXVRSVVjWGlodUxQL2FMNEl3?= =?utf-8?B?aFgzYVdZUWNBanF1UHZNSkVEdlRjdGpKeWcvb1BZdFJyZmo2c0FBdHpPNGhS?= =?utf-8?B?RUY1R1lCRWQwTWowU09mb254WER0OXdiYjRNMFh6dE9kRUpJbjdIcStLb1M0?= =?utf-8?B?dE1yVjJteUh2TDdveVMrbFUvT0JlRytuckpRdTNkeUpuNDNxTStwTS9yU3Fs?= =?utf-8?B?dTdkY3VBY0ZUQkdOWEpjQWJGYUVoK0xLVjNBcDdxSHpPZDlMZGViR1lJdDBJ?= =?utf-8?B?REZ5L0ZlV2h3d21MM0pvbi9IckN6M3Q4L01zQUdING03U3A0SVppeThTOUs2?= =?utf-8?B?VHpIV3hudVhtQVhpdEQySGw2M2NUbVNxZk1LNlhqVkQvNStrOU0vaXV0SmVB?= =?utf-8?B?L3BKdjkzNlRDeTNYbzFVeENWdkhScHYvb1dJT2FjenhQb3lCeTkxSlVVWGpZ?= =?utf-8?B?OGdUaThRekx4QmJ4bWFhWC82eU16aDRIbVgvaVpLYXRRUGlPd2RCZ0F3Znhm?= =?utf-8?B?OFBhci8wa3JsdTVYUVFZTmp5VW9kTzZ1dmd4U3NGTHcwdThhbjBQZTJiYzRj?= =?utf-8?B?YnJKVEpzTUNMbFc0dW5sMzZ4L29HUDlvVUFSOTB2a2ZmYmtnS1VmU29SZ3dn?= =?utf-8?B?NEtoNFBSRlppS1dnS1JuL0Q3VDRBRC9LVFRuU1NGdnkwS2xXdEpZbE1HRnk0?= =?utf-8?B?dGY3amtuT3AvZHREVFZieXFJSTRZT0lVVHZ4Y0tXZzZFZDhWYkJTbVVhSWVE?= =?utf-8?B?SlVlQmhoVURVanFwNVllQzJhNVpYcXRmbjA2a1MyZ3FrWUgxbVVpZzdPa1lZ?= =?utf-8?B?OWhMTmhEV3gyOTdGUEdKQ1B3eEIrMjlQMXVmSzN3a0VjdUxjdzJ6eWxBamd6?= =?utf-8?B?aTVkSHJyVUJwUnZhVElERGZ4SVZGTEtudExrSUI2bmxiT0xudXVWRXZqcXVs?= =?utf-8?B?L0ZPT3ljUGpPSUdXSnEzaE1nZ0g2ZmlmdUdXb2F3VksxUmhRcmhBaHhudnVU?= =?utf-8?B?WEE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b774b73-a33c-467b-a55a-08db713918e9 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jun 2023 02:50:25.1357 (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: XU1Od3dJjCspUAdhw438YacqdAHbMIdI5WuxlpTYLmAsrnSvJ/rt+e8VLd8tUiaLHQh3UixREq4kUAdK2h3ivk/UErLPmHM7rXgUuLmwWzo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR13MB4716 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org [ upstream commit e97738919c2315e07c2e98b6a9cc3912c335364a ] In the Tx descriptor free logic of nfd3, the former logic might force cast a negative number into a very big unsigned number, and which will cause potential problem in the xmit loop. The xmit loop will continue in the place where it should break, and will overwrite the Tx descriptor which is not free to use by the PMD. Fixes: 74a640dac864 ("net/nfp: avoid modulo operations for handling ring wrapping") Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_rxtx.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index e2b48374fe..1c2a00e300 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -340,10 +340,14 @@ nfp_net_mbuf_alloc_failed(struct nfp_net_rxq *rxq) static inline uint32_t nfp_net_nfd3_free_tx_desc(struct nfp_net_txq *txq) { + uint32_t free_desc; + if (txq->wr_p >= txq->rd_p) - return txq->tx_count - (txq->wr_p - txq->rd_p) - 8; + free_desc = txq->tx_count - (txq->wr_p - txq->rd_p); else - return txq->rd_p - txq->wr_p - 8; + free_desc = txq->rd_p - txq->wr_p; + + return (free_desc > 8) ? (free_desc - 8) : 0; } /* -- 2.39.1