From patchwork Mon Apr 15 02:47:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 139279 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 AA36043E73; Mon, 15 Apr 2024 04:48:24 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 463EB40293; Mon, 15 Apr 2024 04:48:24 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2136.outbound.protection.outlook.com [40.107.92.136]) by mails.dpdk.org (Postfix) with ESMTP id E4D66400EF; Mon, 15 Apr 2024 04:48:22 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZHIdNjQeGo92bqlbKjFJIVh4PlEHQ0EZddxWgUbZ5NDHlVblp/AD3iRAGoJrjnVBITvQ1P8R9NMf81tAVH8p1YadqivlZ0pp/14vzDsod8HD+B/rjviHWoCB5DdVf1lyRgmOUboKnoRbgWxXzv1jIc2Sz891iWCJ4MqVjv68nrj07aWMomETzzkhJ1lUdDGLV4QV4yasx6nAXRA22Wda10wAgnlParM/3H2AA8MOCSDvivZf9DzMfevK6g/ZO5CF4BwjHuPLGd9A4nQnzxIFnSH6OzgWRq/95MHp6Q2VHuxSvea/VrdjjtVXixi6LdOIrqExrU1Gh9oJx69jb39ckQ== 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=RmmX0hOQVDtAuRegQnd1sIn3+3E9O0dd9ei6T8d1RHM=; b=fB57GhRi+xFLi1td5pKFFMDGJSCEynEVRV6FzLQskoyMglbD1NOqjWHu6f38nnQMEJlEoir8QClqTe9opf5hbf9xFaqyPF58KnTVx/4S3yHQaMMS/taN2khhaJoVeJrSPc5pV3lPinwmchhBi3LtJDlDo0ARPu83h6QeBO2YP4pgLPLNZ3yANORb5YUdvIm82uXW15e2Pbr7YcMl10dKPPD3dHExorzB0VpSyim05u9y5tmgPeyh2Jo+icqMHNDIPxIzPBYUrvE5HJkXMKx7bTxnFxg1E5RVATj7byq8asJh20LZTBklQcjL4ktusts5WsGYReSHDcLx82DkKW00hA== 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=RmmX0hOQVDtAuRegQnd1sIn3+3E9O0dd9ei6T8d1RHM=; b=MIpoLOARdKLOaAAYC5FAKbLe7NgQ9OkhWPlQF6grfb5HiZcuxTO/gpVMeF7QmwU/W4frg38+tQbO5UDsOnlxb9uxlOktMDFMOoHSQw57waR8L7P193i7u+g61gQhW3tEB/y/pJSKvmeeDOuLWzQN9b1Cb/Xpt/sL8ttPMs0O3Pk= 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 SJ0PR13MB5272.namprd13.prod.outlook.com (2603:10b6:a03:3e3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Mon, 15 Apr 2024 02:48:19 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7409.042; Mon, 15 Apr 2024 02:48:19 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Long Wu , stable@dpdk.org, Chaoyong He , Peng Zhang , Zerun Fu Subject: [PATCH] net/nfp: fix parsing non-exist meta data Date: Mon, 15 Apr 2024 10:47:58 +0800 Message-Id: <20240415024758.1001527-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 X-ClientProxiedBy: SG2PR03CA0122.apcprd03.prod.outlook.com (2603:1096:4:91::26) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ0PR13MB5272:EE_ X-MS-Office365-Filtering-Correlation-Id: 9da9e74f-e4cc-42b4-7ce2-08dc5cf681a6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SenTs28oETG6dqByB9Rwi24gd5zttU7lsdsHP9oq6zfPY9s2h6URBH2i1terUX+ikxNDVW1BWeRhEBgRrysXkF7EOSlh3MxfrULw4KSPpWJJgoWTPf0PecjvuhYUCtKgv47ht5s+3PDT28zwfg2qa2hjmf/r3tByUrF+RXoL0kqJP8hz+Fx53qMCE3TCyBHJDJWN3d8xFAiCXJk61Zu4bu/cDFHsZu2EyR0oQqUQZ53fduwoznjY39cEUong3xcNMd84buFqjMn214ztLCaWpf64ymYNwj47tOy4zzcOy4C5+bn6YAjdezGRJ9ocbrhuIcDqqvWnOo34j2mgHaNrn0uCTnYSwEw6mtQjuiu5Xa3X4thc4M+PHj84bZeh4UtMUxcixTUrMBTn8O2kKkvRTkp9ck3Y0ccfzvX5OWIbXtRGgOuoxeTyw9j3+7EWblg/8WCEaINjXxlzvNhH2Cae8Wk09vBVqmIC7Ddj2Uy08lf6eT5aygsT9ogeFTzUwIUi1bNBxA7vQ6O7yDGhgobSkw2U89SDPByRu9rCxE3qoXzrJcB9BOxZ8Se4ZlKvueqIg/4Ee0XVs60Sg5W5+XVGAvh3mJ9qsiJEQhwjvOAcgLsXe1blGxijBKbPkf0MNDiZIguuFsqzPfpBhvfHxS16fQjXpJaoh+j68KOeEJTZk2kGC8ncu8QFUFqtXS0zyfAL6VNBPJFbsSEpp4wtaqdLK0ByQWbYFKI/mETwSwPGqf8yqOqXVfJpd7+iUnkcCQY2j+VXkM/hs1Mj7COgk8TKrrvgr43WFhhWJ+hH0A5ceY1lVq/M5dAobg+m9H0YFXnMASR4OSwLOWmZq7XyS3AyDaMyGSMpsXFeloVEPfFxt1lXSkFlkWuWsStVbx/LSqCK5fHzySjnPjdX797vGwgyfAB207ivV7GC7LgNJ5/N4y1dxeXaJKk8lcN5g2uPA7GqGdUbjv8LyPiz/WY8BL468I1rWdBGZ1sCTXhSGzEYU9OKWc/ivCidwN4ac+8XZGYEp5Wyyk9T8h6fBUhXQ4ZYkqJS2eZVsBXz6hW8F8wzETbgQ+J+2fOhrpq66Kg+QFYt53cXL02HdBB0zSvrVWgK+uqnTBP7vHXWb6vdxGy0VNEB0A7dcfXL6CGPlXPHhQAfmTLZ0WpOOJ8cQUd22XQm0VziYdQDhxLxLgQpHtigV1kjTsleYISZ53wE4iwGQRuNE94PtHtMWfP1ohhlaK03dYw4HfsJLzJe7hAQZartIe72mV4KzkKH+SBQtWdaK+s11IrcwCjR9g1MN0S2qUI0Z53e8a/uQIhZHYgJarupEg98jSRik3IClgfucFf7rNs7Zs0SNi+1JQOxi7N94s0iSw== 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)(1800799015)(52116005)(376005)(366007)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lgqwo2byNBZWClUz+Vj/VmUrQKFL0WBGBJWOwrmIJcXyxpCG2U9riLwwWyAQRRYo/cAtrGWLl8AvFhWQpLR6NKa72cgS7fP0dA+khMC02DgVYkRcIY40XeFh6mCRK9zM4Tpar4FpCnrRXfYhkGOHQKyp2gGAPU3KG3Fs0gCwkHarsrNgGxk5JczF2iC01IJM5jRpmPPoVVobKXmPHqno2ZHxl2yKgrTprvYzrJ75SSyDgtrRiY7W+Jl6l6+pOyWFolx6NY1EJlFOPTEj1bY01fAuFsRnY09kQHV8/hDl/j2djWs+97NmsXV03WweINRaAFtk7KH1ftGgCvTvtbAGLItgWniE8inbLImoolAORIQwQQ9hSMr5eGr33ZHYwikrnjyCFYbFZhFBomoetIvPmrkEJOlfdAGYWbuAs8Lxvi1ssox4Mum2WO2l/3Lhw+UIUVyI0WRCm9LqSQ18FIWbymt/J+nfpd57JZfTU3q2ZMGBhQyo9UapzbIPLA4pjkqMqscqhO7qViltBu84FC43oPhXteQMgCXyX1mKsOUA/3qQPD7CWuPmoPZc8BF/dd1x2ujGqM6sXojkT7fbqzMk4P467dpQlPXd4lfJdEuP2nGTSgaTKi27178tGTT1Mo9GpGF8b+C5W6hXuTpLnsgR2ks2+q/PiiNm+kwVbKg0AJ7lDSOvnd/VBaRzTJT+VWvX7zBGp5QwC30DbpWAooa/7mO/2hcQ4SH0VXSCE7shF6YiRDZ+ZUsYSeIi7+DnwSTDoYNCTPPko1GH97M+/QQuilFXhBzFkkNhOndsD9RQ6dcAMA1C56UUMwfps1kksoHmyyh1diWTys3X04Yvj3m7SGOFltqulLW77Y2q1eWTAigdIu9rOx53n8bZMeUpKznU67GmEtuPuLT3zZe2OXvz0PJ8j4BTj/uRMmeKu3AFrQJFuHdJjGXRvCXONrW36c3CsFFgnq4plUOylKVdjCYFcRU+5EMfjofGIwK+x8lJm16/fWQPg+AhsY3BPaSjelahIXdU421BQk3vSeEKYU9i0ZiF8CaaDriSe9yaoRNF7EE1SNHVjkH6le6qrCKdJoawvDZBA9XX0no1iAbhW2SpHO0euYprNGuG6F2rkQcyZrFVggwN4BwiL0EFYLLvmdVL30BcWbG2Ul2L7PvXbdZxIV0iP9P9BY7VU0Yt05ogoufleGrd09pxtRpcfEu8XGLND6SrL4o744wXoFcK7ToOHiydODuINZANAIvHLS+NihfglMgI4jCRY82ANcs2ahJ5rYQsXCBkbYjhuOce6V6PMfX5944DzR/moNqWE0fUKoCE3SfFJqbVgy7DqFbRx2st6ozouVbQKLjJ8+tz7EVd0Acqu2lSto4BOFdYESZdEEYXDE6v8N21oO+gXMLhck5n6A0egTMVf8yC5xZLTgLtmWUqIbhnKR8CwkmxtEAFLFxeS4PvwvdIiXG3A/CeohjexEW1cZtz+8J8J+KWpP1f28pqj2iWNsPymcwMiRK4JtyViAQTEkM4LgT2jrYS3x2lD6h78fa9ZNBWgmMIMWodDjo18oLfSU/OJa9NRsbhdpiPIpJJMm8q+vVergFFd8SRpqXuaesNpOM18Ajsv280rw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9da9e74f-e4cc-42b4-7ce2-08dc5cf681a6 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2024 02:48:18.9504 (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: 6x59BBJXj4roXsUH/3+Yx1x7y29HE+7TqZtOKhCKtaUo3mU7WmZ21XV9f+5EfNRWCYlPkil62Pk4V4n4RABCq8auuw+dHisyHoewUEJJFoA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR13MB5272 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 packet without meta data, the initialization logic of 'meta->flags' will be skipped and lead to the wrong logic because of 'meta->flags' has random value. Fix it by make sure 'meta->flags' can be initialized in any situation. Fixes: 5eed6ad5a7b9 ("net/nfp: use flag bits to control meta data parsing") Cc: stable@dpdk.org Signed-off-by: Long Wu Reviewed-by: Chaoyong He Reviewed-by: Peng Zhang Reviewed-by: Zerun Fu --- drivers/net/nfp/nfp_net_meta.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_net_meta.c b/drivers/net/nfp/nfp_net_meta.c index fa7e0d3d00..b31ef56f17 100644 --- a/drivers/net/nfp/nfp_net_meta.c +++ b/drivers/net/nfp/nfp_net_meta.c @@ -27,7 +27,6 @@ nfp_net_meta_parse_chained(uint8_t *meta_base, meta_info = rte_be_to_cpu_32(meta_header); meta_offset = meta_base + 4; - meta->flags = 0; for (; meta_info != 0; meta_info >>= NFP_NET_META_FIELD_SIZE, meta_offset += 4) { switch (meta_info & NFP_NET_META_FIELD_MASK) { @@ -237,6 +236,8 @@ nfp_net_meta_parse(struct nfp_net_rx_desc *rxds, uint8_t *meta_base; rte_be32_t meta_header; + meta->flags = 0; + if (unlikely(NFP_DESC_META_LEN(rxds) == 0)) return;