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 1D5F842C91; Mon, 12 Jun 2023 05:18:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B262342F86; Mon, 12 Jun 2023 05:18:56 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2131.outbound.protection.outlook.com [40.107.244.131]) by mails.dpdk.org (Postfix) with ESMTP id BE2DA42DB9; Mon, 12 Jun 2023 05:18:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QQu9iiUlRd5Ra88NFoNt/Hiqu/FyOvEkw71qqvXEqALPw/iGHFCxRGGjxaXdeFgdIjd6KfBWeYlpvlALcyziBPIBijA7qa63enE2IwhElTyHXf6gdvbwvRlBp02cXVjrMMh1XzO/NERrSbHA85DAcQFgacbjUb8BTtylIshnN4fK43e1rQ7tGtdAb6tbiJdIqXQQ8Vqyq8kcw7jWeOednThLJvO5c80W9+bXTeztBqCU29iJ7o+mKNK0e/RPXC8woJIsQ2fW+ruSZ8+IP52anj7KzTofhFESXUQp+SzQ/zWtrlKeq7f1CnAqMtSDFwvAttn3knSmS8kPbu1MAWS01g== 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=ga1LoIErIMpwKwxl7+MsFqPJFRUf3q7D6Kgbuiholbg=; b=mYap4NvoJB0I1vlLPTImgQaVMtK/NAX/a2ZamxqZ1zR3+oErXYBLCR6FspNxFGfnVIPrwkbBeIxYpCoENLUrP9G2wG/tdtP8vSJSikqMp/AYXPu0Hj/nroWi0ZHjE2Qg/o4s6dZm4qA93JAJUCtOB3U6l7seZQMZEr2G4jTp5zzxJfsFORd04YPYnfaYfYpBIKmGCSIyXDR3QGydbtRJIahy02LPusnkKO571OjlZMtvPXHbE3mPuTug050Ob0ajtOaOtGATyIgdLO7rSnuoE8Via5k3/085rjhmCa+vxjtUlHrDznzmWwId4IRGjycKpmfzA3xrTOFjrK9f4ApkkQ== 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=ga1LoIErIMpwKwxl7+MsFqPJFRUf3q7D6Kgbuiholbg=; b=FfAozKjXOCautHpm7ZaPwOPnK3idGbYuHXM6jQs2bUavUFVc7WWyjPJdPm6Vto2w73Wt5JpvmiecpBMPRZ37boFfMunHXfkS1726HWMXt5vUA+rrQ2tx4qRj89Xdl9Xh3S9ZHdgl1rhpYv+jRGkQBMGdQHNjqriIN6pGOSV7CbM= 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 DM6PR13MB4148.namprd13.prod.outlook.com (2603:10b6:5:2af::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.38; Mon, 12 Jun 2023 03:18:51 +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; Mon, 12 Jun 2023 03:18:51 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He , stable@dpdk.org Subject: [PATCH] net/nfp: fix the new solution for tunnel decap action Date: Mon, 12 Jun 2023 11:18:32 +0800 Message-Id: <20230612031832.1832984-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: BY3PR05CA0026.namprd05.prod.outlook.com (2603:10b6:a03:254::31) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|DM6PR13MB4148:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f7f3dd4-54b5-4d5e-a4c2-08db6af3be63 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OFYiSA93Zj7CR58Ul3cPPvGqjlTTEToGu/KYgpV042to1RIzXdfus+hlUbrpdEFcFxBJzZxerl6s7TwcwS4vBBppqTo+D1UYfRssUJv3AsTjVwhIR2TxXgqktra6/ca3ycH654brznYuScIOeNiKoW1Oia8RKlUn36JPYVxFOa3ULtSujxVPml06p2ZlC0WWIYg+uRsi4aTz84wK/HrsZMrkjEgJoeHxC2rFIivcq5ybvAAYVF8Px8A6p/tNJTJfnGGrTZd/+udRdV1b6Dld53RPvoTdC8PuDmlC5alH1d1AkEU1LgnK7jMkatv+KMZDPPX2M98HodB2jCxxCnuXw02j6CmnBCUKY9Zpadg369RG+m0o6KUsub8x+PX98JAOzOIjJcXroI8tVr85/mJ9PUQt05ndfCmGOKJPnaBUVvCZV4Y9ck/MgWhjg19+WWGEawRNLYUYZqnNfCAL+jEcNHbojaNxdKQQogAGYY8QFbILDdIxheChmXBR+7CPxQqds55vNLsvu7g10Mrgh1tWtg8XqrOTHPonwEydX/xzFxOoQ/5pqFkjfEBMEdMZawo8boqV7xRnQUxTcNHrZO5fNxAvpqoI5NGe207itxuJ9OkCtJzQV0Ci0FrOb0a20lWjbukH0RR0OJfeXv8coYNFhswad3zUFbl86EVkDLj3d1I= 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)(366004)(376002)(136003)(39830400003)(346002)(396003)(451199021)(86362001)(36756003)(2906002)(44832011)(450100002)(38350700002)(52116002)(6486002)(186003)(6666004)(83380400001)(6512007)(26005)(6506007)(1076003)(478600001)(66556008)(4326008)(66476007)(8936002)(66946007)(38100700002)(2616005)(6916009)(316002)(5660300002)(41300700001)(8676002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dnhBQXNPemF3M1lmOXBnSEFNbG5QR1JhSDBiSk5TVmM3cVVacStYOFpuaWdU?= =?utf-8?B?WXQ0UHdEL3pjNkREZXlwbkNBTVQ1eVpuOTNWb3RsNi9pZEFIMUJ1ZFpBaFZy?= =?utf-8?B?L3ZEWmRLakJGSUNXVFRKSnJhNFgwQ1B0ZHRtNXFVZHB4YTd2Nm8zRyt1TldE?= =?utf-8?B?aWMzZndKYkszclFBQ1JnUlBEWUJUSGxIa2pUVko5N05CWXkydkIxb3pOTC80?= =?utf-8?B?NWVFd3ROOVJMMFRhNFJlckczanFEZzMxY0E1WURPVnBadXJaMWpNS3cxZ2h1?= =?utf-8?B?cjhjdU1jUmZvQXpSbDhPV1Y0VkdzMXJqZE5zVDVWQ1NCNDRNdjF2WVdRaVgy?= =?utf-8?B?amdaaDlTd2Z0Vjd6SWZtMldRMmRWQ3hSNGNLcWE5RDJpU3pCR3F2RHVvT2s1?= =?utf-8?B?Z2Z5Z0lzLzljK0h5Y2lUVzFzc3p1SzRnUmxaR0VqVlV4UmU0dnRLMm4vWXla?= =?utf-8?B?TkJ0S2dSb3Ixb0NaSWMzY3RQYnU2OVN4S0RCN2d5OHhVbzg4c3UvUXgrYlFm?= =?utf-8?B?SS9tTkx2S25MdldxeUlUOE9KYUgzZ21OSnRDQTJjMk93ekNzMFVGN3VTTEs5?= =?utf-8?B?NFNPWmFxVVp1alVLWVBOT2ZoVnlFdGZIaHArNFN5eGhhcHllQ2Q2NUtnUEVW?= =?utf-8?B?L29UeU5PNFdSYWZYeG5rZDdCSnhIOEJlbU81L1dWUVBNL21KeUlQRDdYNGJ1?= =?utf-8?B?bzliaXNhNTZQTzRjcU13MkF1bFlSaVo5ckllOHFaS2tXV0wzWlFBVzdjeGg5?= =?utf-8?B?ZFlOV2c3RTlwM29wOTdyRDZzZ21aSlRBMUFDMUF4L1lwclloVFpCTUlpZ3ds?= =?utf-8?B?TS9NdnJUSDdqdTk5Tmxic00zSHZMMVpqdWhUdHdyd1hOdFNveG16ZTZwdU9D?= =?utf-8?B?b0JEZTBzQ1NBNFhIdGV0aXI5SjZUcG8vNlZPZmg2L1lQcUlnanIxNU1ldE5V?= =?utf-8?B?UzdEQVZRVmFGT0FCUUM3dFYyU3Z5NUtPQmRMWFNtR3l5dzVHVXFMSVRyaVda?= =?utf-8?B?Z2xvaklLeEV1ZXpYZDcrRkR4Vzc1OFA1UkNweGJOWFlIbHNzcEt0OFdTVGxr?= =?utf-8?B?ZThWNzNlaVFmZFhUb1VnUEJlenZWZGEzU3pIQy9vdUlUdTlEQkhBQ1NYN1lt?= =?utf-8?B?U3pZK1M5VTF0ZStWaFpSKy91Rjl5cS8vMmR2QWNCeVZQRkgzaXNFdTM4ODRn?= =?utf-8?B?V0ViYWtLT0VFN1JsTTh3b2hYL3ZtY2p5M1N5L2diM2ZIVnFiTzV0RmtMcVFV?= =?utf-8?B?WHR5UkxIZFBUMmRRekhrRzB2RDZmUkxpSnp4dnZQTk9wMUlDTi9vTVJoWmhG?= =?utf-8?B?ZTc1Y2I2YzI5ZW1NbWwweEVJR1RwZXBqT1FPS3VkMnFLZEVNKzVOTnBjWTl2?= =?utf-8?B?SCtrbGVUbVZ0RWloMERJWFJhemszTThWdmhHeXNuZWhMMTBTUUI5bEJVa2Va?= =?utf-8?B?Y1g4clNDMk14TFZBTytCeUVyYjUrYm9pdThGUjhsVGdnbGxZRkdiMVJwcFVr?= =?utf-8?B?OUhuTkliMWk1cTRId1hKeFZvVGttQkZtWjN5VllJMWJGQ2RVMTgvT2RBUkRU?= =?utf-8?B?bDZuSmp6dm5LUjV6ZzdjOEFxVURmV1R4ZlJZRU5NY3hHN1lwWWg2b1dsTHMy?= =?utf-8?B?TEN3SlZ2bStLWmJNcEZmbnVBTjZ4VDZFODZBSDMweXVBM2I2cG5wY1hWdUU2?= =?utf-8?B?dUZMSnJuK1NGY2Q1UjhFN3Y3V1k5NkxqVGtDSUxvYk5VUzlPMDVLbnYwRjcz?= =?utf-8?B?TllpazJlT0g1bjN0a2ErQnk2WUE2cjRRa0N2N2ZteWNIcUVrT1doRU1GdGRq?= =?utf-8?B?d05wV3JwMW1DK0xHQ2l0ZkljQWgva0l0eDJWUUtJQVlROUYrdFU3aCtyVWt6?= =?utf-8?B?Q1h0S1NTbm5GZzdFbU9CbnA4TFJna0RJVW5KaVVWTGhKTnFQQUprOXhxN21H?= =?utf-8?B?YzQzRk5pTzFyOGpBaE00aUlLNUl6eFlDRG5nejE4NTV2ZWMxVkdmWDIrQzdP?= =?utf-8?B?bmVrWFR1ZlJueDNoN3NBZFh0UlIzWm9Lalh2U3F5amFUOFpWMEVmZGtmSWxa?= =?utf-8?B?N3NiMllNenR4b3VsZGk0cE1mcDE5OEdJU3A5YW9Qdms4SHVwMWtuQ1ZNajFF?= =?utf-8?B?dS90MVEvMlU1UnFiSE9VNytZQUNoUkZORFg2Q2FKUWZWL3hmbmRPUlYxeWUx?= =?utf-8?B?ekE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f7f3dd4-54b5-4d5e-a4c2-08db6af3be63 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2023 03:18:50.9429 (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: xLQAbBt0yBUAx+tC/Q2vKLh+rhgYK6uAfkNn36S9DAgwpTBMyc6l2mJjuRodhyhTHCtpERMjaxntFj6vWSimABe6lVEHXrM3+kAekGhZqYc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB4148 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 Add the missing data endian convert operations, the former logic of processing the 'vlan_tpid' field will cause the tunnel decap action don't work as expect in some case. Fixes: 9082336048e8 ("net/nfp: support new solution for tunnel decap action") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 41b722f4d8..8be2d03de1 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -2474,10 +2474,10 @@ nfp_flower_add_tun_neigh_v4_decap(struct nfp_app_fw_flower *app_fw_flower, if (nfp_flower_support_decap_v2(app_fw_flower)) { if (meta_tci->tci != 0) { payload.ext.vlan_tci = meta_tci->tci; - payload.ext.vlan_tpid = 0x88a8; + payload.ext.vlan_tpid = RTE_BE16(0x88a8); } else { - payload.ext.vlan_tci = 0xffff; - payload.ext.vlan_tpid = 0xffff; + payload.ext.vlan_tci = RTE_BE16(0xffff); + payload.ext.vlan_tpid = RTE_BE16(0xffff); } payload.ext.host_ctx = nfp_flow_meta->host_ctx_id; } @@ -2601,10 +2601,10 @@ nfp_flower_add_tun_neigh_v6_decap(struct nfp_app_fw_flower *app_fw_flower, if (nfp_flower_support_decap_v2(app_fw_flower)) { if (meta_tci->tci != 0) { payload.ext.vlan_tci = meta_tci->tci; - payload.ext.vlan_tpid = 0x88a8; + payload.ext.vlan_tpid = RTE_BE16(0x88a8); } else { - payload.ext.vlan_tci = 0xffff; - payload.ext.vlan_tpid = 0xffff; + payload.ext.vlan_tci = RTE_BE16(0xffff); + payload.ext.vlan_tpid = RTE_BE16(0xffff); } payload.ext.host_ctx = nfp_flow_meta->host_ctx_id; } -- 2.39.1