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 A72B942CC2 for ; Thu, 15 Jun 2023 08:22:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A107841104; Thu, 15 Jun 2023 08:22:03 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2124.outbound.protection.outlook.com [40.107.243.124]) by mails.dpdk.org (Postfix) with ESMTP id 9334340A84 for ; Thu, 15 Jun 2023 08:22:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gd/CYHSjsZNvaJj/ykTmjXgdPUt/DGWZHf7J7bkXURrkbx4C99GAPNvHF5UvLLDcmzfFreMRHrYcP/sb1IPzWoj/Sz2mIX/hwHpIghm0i5jDFtin38KAMlo9WdSCvlBLfEy1x0rkfrHmzhOYEjkYofhCmGHI0FONXqAyc7k1nCeU9umlPNpLIqwkYG4WoZ5FQFRPRyzdG97Ir82W2spjlxVZN4QtxToHDTlV0VWny1+fGM5HYfXXJybMrGTMKpEclRGNsgpvsnV8Ur/LBkTE7QdhlCLJSbG9wLHBWEOTh+o2s0GHNF1CvW+Kx/dr8vYerIBTxgHNWb4OASBsgYWjhQ== 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=m8DW1Xv0CVtNRwgc8kN4D6eb5eNd4v0/t6wzeQfiwDQ=; b=QudiNAzB3EIP17BYeL54+hc0G267DeYEwNsKVrPDfv2/Th60cnx5jqVwxbPL0vU30pxWPTEuP+233KLOxH44upCGqrBvsH4wyTmBYjZ+3m5JbtK6LWrwrLbwZqrvEsYyV71d+sUFYLuPeG1A2BchQkQ8s2BGSdHagVZn4OJuOqnM+ELLlgBQfdUBCFjvEzSbPTSN473YfN4guHWjk6kN900BRIcMDSLUsIL1ugOrqh73+AgcaNC1uvVrqJFZNyy6Di4PAC0aRppBn8vJlzGtJg6QYTYO3D2o3RTPOm6E+2VzjAlffjZGSywHk5G6scgBiNF1ZhJgQSjl7LBshS7pOw== 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=m8DW1Xv0CVtNRwgc8kN4D6eb5eNd4v0/t6wzeQfiwDQ=; b=p8qLv+TTLEUy8A8VGW/UsoeXgZcBlKp6nXqvpVLw7C5p3Vv/wo+kAxLErYkVAT61cK4jPqOgor0RxQ0i61YDXWWwXPre27TCEZPjMmw93FFW0s7E6zwctxhdjnP7jmbOJCOM3leqIUdEiHC1KFz25knBiN6wqdMVGnKTfkxGzz8= 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 PH0PR13MB5519.namprd13.prod.outlook.com (2603:10b6:510:12a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.42; Thu, 15 Jun 2023 06:21:59 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::d2cb:a650:e1ce:2174%3]) with mapi id 15.20.6455.045; Thu, 15 Jun 2023 06:21:59 +0000 From: Chaoyong He To: stable@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH 20.11] net/nfp: fix Tx descriptor free logic of NFD3 Date: Thu, 15 Jun 2023 14:21:34 +0800 Message-Id: <20230615062134.1266145-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SGBP274CA0003.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::15) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5519:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f7944a7-4e62-4d44-eb4f-08db6d68d311 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /2G/ZUzlpIdg70DNBPeUNdgVNHX3K5+6JrOZVRxE9HAHen1pBCZExRGbWmrZeNqSKTJcMwE1mh/qsTVpe7djawbe1/+riWXjsq5kQpFtnIXXdK21+BWvGyqs8TiooDNzxQ4MytFxnwXf5gsC6p+T/fFxbTsFsb/oC/wUsgAlYEHEm2sOF4ENtWvPdMZOflLMjgDsuCw/nKzOn6GctnoP7ANtUTGFQ2m0MCfUX2AxtU86SP4dA4sq8bkBQOigBzm2iuvg5erK5xjDvasNC6PfLdCbWTkmiHyfdKunRgOUOc0CCO4tKz8yomlRif9Ib/OtuzaBWxYj+Fa7DqYmUE9edM6kOSPt1n+HN7kB/rCp+3qwOS6i7ws8V0tV8J1xfwY07XI0kNpOmCWJ/zwISYSXc1CciQYOr6FAxpcD9xBpHdIEEOxB5WrIGg3JB6CPVyy/RAEycVh1YaWgi3x+m73ydH1O+GMmGEFTuJ+f1x1J5LhuT34bAvnDrfLxCtQGWvqBUZMLfuSDBH6B+Tn6jv12Q0eHSxkxqKUU9En9jNKJAVOLwXAhasG9fHnmSB81CwesKCZRDLKEAMsUvR15g7AOYAtsXqremChkxz1kgj08Z59hC1xGMI+PHEy/56/k8KGL 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)(39840400004)(396003)(136003)(346002)(366004)(451199021)(2906002)(6666004)(478600001)(8676002)(5660300002)(8936002)(44832011)(86362001)(36756003)(66556008)(66946007)(6916009)(4326008)(316002)(66476007)(38350700002)(38100700002)(41300700001)(83380400001)(2616005)(107886003)(1076003)(6506007)(6512007)(186003)(26005)(52116002)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c0EwbWthZkNTcEJpRXZaUU52c3pnOXYyYzFKQXZpNlhmbnVlWlVJNjdzM3RP?= =?utf-8?B?aVpORXNLcGtxV3Z5dWFCa0pZVnRWOHJPMHI1YWYwNS9YOFdXK1VLbGR5RllQ?= =?utf-8?B?cjErUUJVb3BTRmxoVnJsbWtZSXR2UXlKMWRCV3lvT0Uxd3dHenRFdkwxTEs1?= =?utf-8?B?UllBQWVRV1BCVEcraHNZRnRFVVN6QVcxZXZ4S2F3aGdXUEdFTjB4bmtVc2hq?= =?utf-8?B?WkV2c3NGdzZZOHUvVjU4aWEzUnFEeG5BRWQxL3J0MFR2VTZ5Vkp6MVNRN3hU?= =?utf-8?B?bHdKTk1xYjNJdllydExpTm1wNTZCTHZWb2I4MEF6UFRvMlE0WStteGZWNDRW?= =?utf-8?B?QTNoSFJCK041Y3l6ZThrWGVmbkF4dnFtQ0pUdjkvSFFUQjhCL2N4U2VRZFhi?= =?utf-8?B?N0l2ZTVyWmppdWJXTTFuN1djTktVUWVIWHJVbUJyNXlyckxoUHdWSGlKMmhk?= =?utf-8?B?Vmw4SU8xejg0cGc1Z0JYM0x3UUx3VVErLytpSVVpdzVGaXNDanFuV1FCWThK?= =?utf-8?B?TmtMeWRjK1NWaHd3bGxLekV5Y285WUJqR25Bek81R1ozekROelZyZ0NWLzR4?= =?utf-8?B?Uyszb3AzVkNBRzU2UURjeHk5WkJjc2NQc0ZwMW5kNUV0enJYYnJyVHlJVC9w?= =?utf-8?B?QXJuaE0vTkZJelFnM0ZvNFArVWJ2L1VtWjVvT0VtWTZSQkdHWGN2U3JmTXBJ?= =?utf-8?B?ZlhIMjFoVlg0NW9oWUZ2RTB4VlJUVk4wcUw4SjAvTFdVakdBeFlxaVlKL1F2?= =?utf-8?B?am5weHlOU0VwMTBIbDdkNWN6OU1oWldUdVh4N053elIvUlpOY3NpSGg1cWNE?= =?utf-8?B?SjErSjVTcGlyTWlmOFRTTVl0Z1RwcThMU2NqbHB2MkNZUGwrOWlhZzEyL0pl?= =?utf-8?B?QWpNNXZiSzZCMHhKWXVVSUVoTWxTMndycWZwSFkwbjR1ZEJBbmRYc3d1VVAz?= =?utf-8?B?bUN1cE5OcU5DTWZHSzFjQy9lbllFdmtOQjJZZ2p5cVhuN1VXN1VLN3grQTND?= =?utf-8?B?WHNiWXNRR1lQdm1kL2s3T3hxTU5ZTmRtOW90VzRNSFVLS1JZc01pc0tMcWVo?= =?utf-8?B?NExvWk9ORHluaTBZU2FRTlViTlQxc242M25oRFEwV3FJVm1JVjIxSlJVaUJr?= =?utf-8?B?T0FBK2ZNWEViYjlNeTFMQzFPaFlwSmNoRTgzczhpaWJVYmM5V1p5NFlqbGps?= =?utf-8?B?WjM2R0pNVWpsWFRIdW1GaXM4Z3NJUmhLQlFXeTU0RGZsbTJHV0YzNm5hbTl4?= =?utf-8?B?aEdzc0w4bm02NDR0bi9FRmpuRW1ZYnMyN2FydlF1UEp0QUJXTVM2Z0lTRG56?= =?utf-8?B?THpYNXdySWNldXZucnZzMXp4SVRoQnczUlVXdXZYTFowbW9zMEhsMTExVDFh?= =?utf-8?B?TFVEbitxK1JLL21iQlFpMldueTJQS0hqYitwUDZKSi9NRU9JdnNGREhEbElz?= =?utf-8?B?WmR4S3lZTWRVTjJIWkhETGFpZWpBRVlmYi8xS09IOWZkajhJVTNRSUtMZUhX?= =?utf-8?B?OG01MXE0c2JBNUNiZS9DSmJNVmZRWXh1VFA0eC9nOGpZNGk2WVU0NXIrekF4?= =?utf-8?B?cElwZFAzNUZFVFV1SGlMa0ZlK1RWZ3JFc2JVV0dCWFU1OUEzcWtUMjdmTGhm?= =?utf-8?B?MUI1UXpUWnlQQkdZWjMyd2czbStJUmYvKzlsWlh0L2FEbGt1N2EvWHExeWhj?= =?utf-8?B?aFNiTGswbTNWbks4MWFmM3B2c1lCUVArbmR4UGhkZjFHS1Z6NWZ6UGJVazNC?= =?utf-8?B?KzUvellKaGNybndHSU1tcGNlRFRqNzcyL0pieGVGNFAvL0pVdzUwZVFZNUlG?= =?utf-8?B?VnZ4cWU0aVZLdXdQQUpQOFlHODFuTW81UktNMzRwODRYSjVUaXhVRnd2NEJ1?= =?utf-8?B?NFFrRlBROVZCeDY5dDBXeFpIUkdhNU5MK215Qm1PaWROQ25IOFF0Wi9VVnlM?= =?utf-8?B?L0tXRWZaK0lFQTNOb0dEZEZJZCt1MUQrR3NBU25sR2hrS3V4SGdMbmZVM2Jk?= =?utf-8?B?bW10ZmpqV2lzU0FWOVRpaGFmQ2gyTG1uYkJqUTErcVEyTFdQckZzY0FNVjlS?= =?utf-8?B?WE1ac2Ezb0VjSW5ReTlneVhmR0F0c2xjTzNMczNmWS8wWjA0U2lHd0Iya0dl?= =?utf-8?B?YnhFQ1pYRDg4TVRkaDdYRWtFQUdaVHZFT29GdmoyYUdiOVdRSnpiUlJrSXhC?= =?utf-8?B?bEE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f7944a7-4e62-4d44-eb4f-08db6d68d311 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2023 06:21:59.1640 (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: 5CtQnAoo1Ac1BJ5ck4eVcC8UeA+JZLdpGtVzrRMjIBHQ4x0VvlAs+RTL4CkTPgcMGPq5IXn8LICULAV1Woq48m0Y4DJg5XPBz8JcLcSrnOc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5519 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 36d0f4238b2f79850695f49b191ddd4540ff88a6 ] 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_net.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 17e48f1710..f9844851bf 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2238,10 +2238,14 @@ nfp_net_tx_free_bufs(struct nfp_net_txq *txq) static inline uint32_t nfp_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