From patchwork Fri Nov 24 03:30:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunyang Wu X-Patchwork-Id: 134601 X-Patchwork-Delegate: david.marchand@redhat.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 6D779433B2; Fri, 24 Nov 2023 04:31:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0097442FD1; Fri, 24 Nov 2023 04:31:37 +0100 (CET) Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2059.outbound.protection.outlook.com [40.107.215.59]) by mails.dpdk.org (Postfix) with ESMTP id D268042FC5; Fri, 24 Nov 2023 04:31:34 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gF6PdMPFBitfnwrQjNV3B+fv6LJTzN/jkkHMg67n17Fq2AH1nhMyXdzR3RqeE87Y5iGPCnbqcCc3oU/KoWgrDZXUY3GWEIR5yLXIICmM45GiWcMmCo/mqpBY7+QiNwWM0NTybcBziLovt2zbXbl4BgRVUvzqO1gdUEBB6bPtP1vHaoXsFwaTIuDKUZHV2m5Pcbrl5m7xNBhSq7kpl4GahGddTxHzYQ8rMiigr9/oq0DO0x4OBgVWhJ8PD1sAIIWb0pFTItIddNJxaW4MxJfjqKvlnGSzpkL+XEqsqdus3du05jCbPqxs+JnZ55t87ll0QDZ4T8i1r8vaDOkd1c4MmQ== 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=WRNLTbH6sny7GLZPccmAyu0j1k+q+eJCHrU1yepGjYA=; b=d1SJWzHR4Zm9U3HV9RI1hZAM5ik3x/JkBdYyYPOjBQsFmPCX1yY1rPckrv8RWFIZzXonl3wogjlJH5sPmFP886o/8FLVLSYWkJMrgOLPBWp+TCaCNWTosXC6PLr20fvnVDBiptI9mR1lZq0MK01Njn2hMoUxg3NuZNvQLl6JN18TxF5tVvVOdroUpobeaeiNln3dVmbpSuAR1VlX6OSndg/NAAuobuyVn4OENDGd6uXrPTbG57ZalaIkzdsR3P+bAtnd7wafnaVHo9Y9hEJAJ0h6V45jhnMIHP+SPd48oRShj1h7V6JU9HFRG0wYJyN9+Z9CVbcJuj/tFjC0gCZz0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=jaguarmicro.com; dmarc=pass action=none header.from=jaguarmicro.com; dkim=pass header.d=jaguarmicro.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jaguarmicro.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WRNLTbH6sny7GLZPccmAyu0j1k+q+eJCHrU1yepGjYA=; b=Y87OYArGoB0pOliSDZe5S2/SqxY4UMuorN5GTAFxGh3/nOed8MTlnGu9nsPS9aKKjEe3QSECJ3dQ589otz5F9GzTAUVe9nBIFvmyDqu/xwFiBiUTcF/WocYouYFfTcl0/kneaoM96CGeLKOdZ+F4bQleSfmCk8vg/PQK79Mbde+PsPuKrnIsDs0mEEf8sy5Q0n70lzk3fCK+w2dmIDOM2xJRI/suI9jScLs/8pyjIaif45nYWwiF+3bIqgzWPH4usIyjhkK/GbHq+ljKHgoPuH3VaXLz/4jHzzHyhCUA3ft0NBNXdXCf813SY+gV5r4s1WsFf9fTdHfxDzSNiChHFw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=jaguarmicro.com; Received: from KL1PR0601MB5567.apcprd06.prod.outlook.com (2603:1096:820:c5::14) by TYZPR06MB6283.apcprd06.prod.outlook.com (2603:1096:400:41a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.20; Fri, 24 Nov 2023 03:31:31 +0000 Received: from KL1PR0601MB5567.apcprd06.prod.outlook.com ([fe80::e1ea:bae0:b8f:138a]) by KL1PR0601MB5567.apcprd06.prod.outlook.com ([fe80::e1ea:bae0:b8f:138a%7]) with mapi id 15.20.7025.021; Fri, 24 Nov 2023 03:31:30 +0000 From: Sunyang Wu To: dev@dpdk.org Cc: orika@nvidia.com, stable@dpdk.org, Joey Xing Subject: [PATCH] lib/ethdev: modified the definition of 'NVGRE_ENCAP' Date: Fri, 24 Nov 2023 11:30:59 +0800 Message-Id: <20231124033059.22972-1-sunyang.wu@jaguarmicro.com> X-Mailer: git-send-email 2.19.0.rc0.windows.1 X-ClientProxiedBy: SI2P153CA0014.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::6) To KL1PR0601MB5567.apcprd06.prod.outlook.com (2603:1096:820:c5::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: KL1PR0601MB5567:EE_|TYZPR06MB6283:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a682340-27cf-4bd8-5f1b-08dbec9dd942 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ws9oC2aN9P4YXOcnz2lAKCCywaECU5fRC/XB+smDIpXrKJe7zNSTWtznPkarxguoT84r90GupkAY+T8EHOyCcwezZJlm102yCY1Z3HYl8AZmTwganlM7apNY5h/w+wxTB8GDtpsdZTQpkxTyc5t90q+kVTaM9MSSOeekkBwx0mXB4gqz1HD2NjGqchkX77S/+PeMjpU2dwG370dClxhS3o/icop5P59rQHR6Rdd06TrvL03nKdWc9pqRxM5CtHXpXSZwIO7dmvAwuU03+waY/Suimzixpn/rYJ7Igh1eH9l4rGLlwC/c8YpY2T8qqIJ/ixoJ6NkqF9+FjHMtqxS6v3gdz+B61U5MZHOf2xPbBqjj6jO5nWfhfvabvbE0Vp0AU9m53pzIuYW4Zszi78EvKL1n0X6cZYsDrOXwJH/Mcv+rYMZ25Q4TuTOI6MXsB+K9xEA3cpdHUbuV8RIgXo1XRfj+iTCVJ/IghBuclg80URiA43MCrzFbIQpVse/2j9YSbTU+vK4nM6Lffv0B9r4Hoh8lkfYr8MEQHcPohp+7JkrbKGoR7gKXtxN7ElePPRdB+pJs5diqSHLXSEx24rS4rLV48uWSYJiraCTOOTid6b4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:KL1PR0601MB5567.apcprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(396003)(366004)(136003)(376002)(346002)(39850400004)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(38350700005)(66946007)(66476007)(66556008)(36756003)(38100700002)(86362001)(316002)(1076003)(83380400001)(107886003)(2616005)(6512007)(6506007)(6666004)(52116002)(44832011)(478600001)(2906002)(6916009)(26005)(6486002)(4326008)(5660300002)(8936002)(41300700001)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 28IQ6FLGbvF4a7nLNugPo2TZRLieW/NzlmsEh0KWkB5J8EZ5h1aXKkLdKIQfA154hHxt0EY545WyHa+7KAaxMM8il1zwlAOTg+JLJwnGeblKHBoTlyrHikukrb7V2aD/U+qfGcedKtSx9AFMRf5jw7CDYWBDg7NFF7aYrfAQEiv40cyi64IaRFnWw/uvSNO4OeIX1qj1tJwTV/ZPFCbORnP9vRAVAmVWstme7nqS2BaR+cm0IFGniOs6U4RaB9wLzfCfhRgX6bUItee61KhwxVWZVpd8wc8bD9AIBo3efG3P9HTvuFzlgnMG1Kb8+p/yfQ9yUdy05unt/ErGMqoAGzCLw6jcmCzNCQAqlcxi0XNN0gpgZNlewCpFfzc6oDy38QTRK62AR2yd0LXyqurenJXJhhCDMxXBBF8Sj9VRB79ppYr/9t8q5/KXaK6ISo/Jg6Rcuzqge768kjGhDqYsQWzq4p2bQOwtasQXLxynMpo4CJ9knjqi/k5VC82ZxjNgV0lz0UATIH3RKhNYLOjPyDBfHE6k3dANPMXtMOnRUJ9deciENRxo9v2ej4bGPvMcV8X8rJrP3ehvMZ8tcDWFfgpu0w1ME7lCkZTtRaPgqq6Z/3uLHWjAq0BTs95ZY9zSDyES9u6Nuzj6Ozd1IO9BLGfHw05B8qL86j4Hg4pQN1g7c7j6wxv4U8qBmS7YXWiAWvi32ij/gRw1NDnhSLaWePWY69jHTIURqnm18JqN+5WxMlSS//7PD6Vll3sGOhTmeSApXh29Yrj00u8EeeoI4DPzt8ojODf2z4e74JHma0PnA6ksU2nsPaVc7qga20Htajjqj2EJpMEDWcKj4ml5aYJEWnpVzjU7RhVYkgAhKfQWTivmni0IzdmorOWtU26IIl588rsXnGWAKqwR8i8jplgZKa3G3zHfp1RYgMbGZKCGKXCUXS+XiTt3K50LTPx6Z9T6xE1aMKYkPSjJ3OG/jSOvOubXhSGUrvUoEG5q88PtxXa+0HqcXaUPhk8MnmrZAbyyLLv7KE+VYm/QS2mxpV7ARV9+NScXiAlg//HKh+OXgz7HNZzfX/tjB6mxJ40lO8QUWkQ7/VnmHzL8nnfh27kY0mqaH75FdX0bQ+XPN6rIt54pxK5cmQHMTHclz19UX8tMM8fSgKMUYMrr56lLU3/K64L8hm5UiG45wduZnMyrRmCYD5WmRyATJ38YKdXB9RTbR0JloEF+OFk2q03aCb9ngs9hnQHH417rAwCqPVTUdhoWTSyaiowhNyvSXT/98r/3U6LvynAWHgXsYIXLE373woz86iS+/Mm+wpSJy7tcCnksSENZ0Y2EJdxWb0KyOX39xApkEhQJSNzoDVnnWOF3coeQyrS+FOhFAGA7Bf+m43I4rnIYnJY7IWzLW7LgiErYI30SU1nd93YZUJ7RvMxxi0jKy9yWA9K9v4Vy0qaxv7AWUpmWSyMVhSoiv7yyTLpvU7ykM1QgrUTgqZOJGirMlKhdE43WTAWyfdM1jwJWgfhGzZf6soTENnMvcxaqum/TG/ZXtMFClglHrYEPNY2f1JD3l0TiLHcTOwctsMfya8MtreFbO8w1GzhBWKpw8wIWecbkLZWS4ccMJzv5eQ== X-OriginatorOrg: jaguarmicro.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a682340-27cf-4bd8-5f1b-08dbec9dd942 X-MS-Exchange-CrossTenant-AuthSource: KL1PR0601MB5567.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2023 03:31:30.4400 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 1e45a5c2-d3e1-46b3-a0e6-c5ebf6d8ba7b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /mXunRRTdSq0y+ZsB2ORav8w7Dc1P2VjRXn+IYWXj3AMTcNc1PfZu6AxZFjKEjg4xQ7jFpwzEpZK8WvveE1Smh/8pCcSWhXs+MT0VymvV+g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB6283 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 Fix the issue of incorrect definition of 'NVGRE_ENCAP', and modified the error comments of 'rte_flow_action_nvgre_encap'. Fixes: c2beb1d ("ethdev: add missing items/actions to flow object converter") Fixes: 3850cf0 ("ethdev: add tunnel encap/decap actions") Cc: stable@dpdk.org Signed-off-by: Joey Xing Signed-off-by: Sunyang Wu Reviewed-by: Ferruh Yigit Acked-by: Ori Kam --- lib/ethdev/rte_flow.c | 2 +- lib/ethdev/rte_flow.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c index 549e329558..04348e0243 100644 --- a/lib/ethdev/rte_flow.c +++ b/lib/ethdev/rte_flow.c @@ -216,7 +216,7 @@ static const struct rte_flow_desc_data rte_flow_desc_action[] = { sizeof(struct rte_flow_action_of_push_mpls)), MK_FLOW_ACTION(VXLAN_ENCAP, sizeof(struct rte_flow_action_vxlan_encap)), MK_FLOW_ACTION(VXLAN_DECAP, 0), - MK_FLOW_ACTION(NVGRE_ENCAP, sizeof(struct rte_flow_action_vxlan_encap)), + MK_FLOW_ACTION(NVGRE_ENCAP, sizeof(struct rte_flow_action_nvgre_encap)), MK_FLOW_ACTION(NVGRE_DECAP, 0), MK_FLOW_ACTION(RAW_ENCAP, sizeof(struct rte_flow_action_raw_encap)), MK_FLOW_ACTION(RAW_DECAP, sizeof(struct rte_flow_action_raw_decap)), diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index affdc8121b..4cdc1f1d8f 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -3471,7 +3471,7 @@ struct rte_flow_action_vxlan_encap { */ struct rte_flow_action_nvgre_encap { /** - * Encapsulating vxlan tunnel definition + * Encapsulating nvgre tunnel definition * (terminated by the END pattern item). */ struct rte_flow_item *definition;