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 4B3F542C9D; Tue, 13 Jun 2023 05:21:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 30DF442C76; Tue, 13 Jun 2023 05:21:05 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id F318141143; Tue, 13 Jun 2023 05:21:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VudrJ2fJ5Tg7rb6D/pyeXr5vP3ou03YriNwRhlr5WgRwetEJW2kkDznDv0kKylncWk3Sk6eSBnV+l8HPwqOeJkipgLuKN458ZzmYaHVNEIep/J3EeZ4/c4JVblDSh6yiQk3tkqFCjThKHtF60SxyzFcwyeBohrozYPefftrn3OxkASwgZa9lne1LWBjY5iFWFZhg0AsSjLPSvB73CQDkOKpOrnFaCeR5njwYmHTxsye1pqeHnzwBi/UPMqP0lO5GARcrmzqdByAtkjWCydRnSvYThBtAmPpRqbym6tE0uMDk8yMm6eGg0N3McKFKNv6kMwQxjFsIUUB75WhpShqokw== 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=eJrk9C6yXnWzmWspi4V78gzAiw3zgotLX7YB2WM/Gn0=; b=gXlsXtf80G5hLoZFVUz/TM8ijqRnvaj717w+X+1fc2VyDHryMMTMhS+MvQ5uvLSOkiZjnb7RtJAv/3DNJhAHHGdtJgMqaxP8wL+o24LnjbjqUnYFeS1cP/VjfOsqbgRbG7gxBISSxyD+6oGf9kCG2JyKCtDy6OgfbbMAZ3SbdV8r8isyh0x7hI8vOaXE5CmBUvQ6erpMyOlvChD6ohKosMobyKLGDUeUTuVB4ej6T/zVqbnddavGpwIhTbIXrSWl62CU1SbBGQJaZUOs+FMn7RtJvgtZBoiZOQrTqJqQpqV531g5ymyMcpYRlJZ7jU8UfHzuSJcytpgjgDivoi/L8A== 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=eJrk9C6yXnWzmWspi4V78gzAiw3zgotLX7YB2WM/Gn0=; b=OwmxUa9AMYJtqVaTgwqB4For9FiQqDoV3cG3WrLauU5MtMVgsMGFpe/t54hBLPzLIaePhFrDKICfQSRz27vbUlOdeyW6c8g9hBRWCVPHjMrYjFA9Cw3KXtuYXsTuxkd1rS/Ig/3S4U2GOJYPEVcWOVrJPU34e5wSNePte0YNSA0= 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 BL0PR13MB4452.namprd13.prod.outlook.com (2603:10b6:208:1c3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.44; Tue, 13 Jun 2023 03:21:01 +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; Tue, 13 Jun 2023 03:21:01 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He , stable@dpdk.org Subject: [PATCH 1/2] net/nfp: fix VNI of IPv4 NVGRE encap action Date: Tue, 13 Jun 2023 11:20:35 +0800 Message-Id: <20230613032036.30968-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230613032036.30968-1-chaoyong.he@corigine.com> References: <20230613032036.30968-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SGAP274CA0002.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::14) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BL0PR13MB4452:EE_ X-MS-Office365-Filtering-Correlation-Id: e48c6017-d474-4a37-1cd6-08db6bbd36a7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A0PomCCG5xrIC/BOcYmapyS6Oth0KZnQNNUfq8yueUDSBHDc1MfqAvUDXINYQQ9anB36k92lgbO/Vo7t4ZIDQJgRUOAjd62b4C5suWtk7NupX8HkXrrlnDAUAyudV87pSxEOLIluDx/aTkQbhhf8ujkmnfPkcRpfao3PHo39NNoJDW5tqySwgJs3Cy6aUkXE2rLwDz2c7+BtqIyT32Sdx32mVgz3vwBH/Bl++GPYOHyI7zCT4P/NMXzIjSfoAB/EbQEheEnluIL/Pc13bF19vy0ebgmjR9Di6mZpZWRw5FkoIuq8FMqbP9ifxf9Ipdr6dGMml8YSTdDN9/lrFv/iiIgTuONj+FVU02DGybSYr23SSW3TesHMKUVFj+LJOLG/HFUUthxNBxZ72+AAjHQEb2CujI2pyAmVRy7XjSW8Rc8X/BONReq4YAFKvtE680y7NITdl6PC3wkenapZiRoffBYkw1pq4tTwS3KxE1j8tC3Pu8CcJY835xqIduMvZQfJX7VSYSBpUTzSuO60Z+Tad7n3GQ3B/xbfI4JpknWxfJEKHREB/ed9hPlVhAL+8lY5oG4Mc6UJM9NPKiE7b4EhyO4CsVM5SEyCeCD5FhblBItbwGrEGNAHslIkGGzbH3CA 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)(396003)(39830400003)(136003)(376002)(366004)(346002)(451199021)(83380400001)(66574015)(66556008)(66946007)(41300700001)(4326008)(36756003)(66476007)(316002)(38100700002)(38350700002)(6512007)(6666004)(52116002)(6506007)(1076003)(26005)(6486002)(6916009)(450100002)(2616005)(5660300002)(86362001)(2906002)(8676002)(8936002)(44832011)(478600001)(186003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?amx4c2g3QzlFM2trNzBkN2dZZytmOUhrQmN2T09vT3NCbFpwVTVUaDFqcnJv?= =?utf-8?B?cTBzYmE3ckJMMWJSNHBuY2lYMmE4ak9vU3NYM0doZUlONndIOXlKUmwzVXVz?= =?utf-8?B?VXZYV2UxY2dZOThRR2FvdkNBZkxjOWVzVWRsalRNVm81ak40Uzd3My9YbHZC?= =?utf-8?B?eEFWNXlkMEFSRURROEIvQi9Db2QrTVFvSkpOOWxPekRaaFd0cVBpNXo5SEZW?= =?utf-8?B?M0loU0laSVRiVXpxT1l0M0RoNXVCMExsK3JGWmthajdCVW5iUzlYMXg5dFZG?= =?utf-8?B?ckRkUXh0VFc4Z2poRFJ0MXFRL3YxZTJsS2VFT0s5Vmt0YlpnS2N4bXl1UWNT?= =?utf-8?B?bk1xbFpUVUg2T3pBd2NrdisyYzgyZzVVVjJkN3k2ZHlxUWlxd2orcEl6S1Rq?= =?utf-8?B?QjFKSGtlb0lqSmdibEphc3hvREh2YVJTZHQ5d3dCN3hYRW96VmN6QkYzYUNW?= =?utf-8?B?b2E0WXN1MEthbXl6M09Rd2lsSHdFRjlCS2FxR2ZoekdacDA4Z0RyWWpmeFNJ?= =?utf-8?B?RVpxTUpaR1dBbG9NN0ZUZWE0bHowY04yc3liV0dEWXN3OGNuamJjSmFwdDhu?= =?utf-8?B?azlpd2FLSzE1cUN5TWQvcnZlbU92NjFkWkJXdzZTeDN0SEhrMDN0RnRKZmND?= =?utf-8?B?eHgyVWpiMUVqM3NqczRoR1kzOHBreHdmdjNvNmlCUjNtSlhDT21KUFJmSmhK?= =?utf-8?B?RlRsbHNuUXBWdlliTm42YmFuY0RtRnQwenVYREVqSFBHYXY1Ri9LcUgwU1ZU?= =?utf-8?B?V3JZN3pZakw1U2UxY2lMbkdUbktCK1EwRVg4cDZDNWdPVytrTXlGYllOOGNG?= =?utf-8?B?ejlSbGloYk9vS2JBNWg4SmFrNENRN1g5SXU4YnRIK0hvdjAwN3BqNTdVU3ps?= =?utf-8?B?MU4xQnVFMGNCd2lMejV3SWFZdnk3QkY3cFVDczA3a3RObDdpSFpIQ0hZNU5C?= =?utf-8?B?Y29GTmhRSkEwa1g0YWptSmFNaE5WV2pYbFB4ZUNiL1hKcTNKZG9QeG1ibENa?= =?utf-8?B?SVZQTGxDdURJaUY2RUY4bGs2OEFubGwxUEszcHlpTUtSbGhqRi92YXNyWmtU?= =?utf-8?B?ZnkwYmhORUMwWm15UXRhbFk2djUrQVFIUUlMTFNMRXVXUE44cUVKcko0bGNj?= =?utf-8?B?SlhkZU9WeE5qaGZ4RXJReDFZdzR6V0x0ZFZzNHBuVWZvRTNtSmhMVkVuWTlK?= =?utf-8?B?YzRtVXpyQmZRK1Bsc2I4b2VPRzIwQ3NjYjZUdm5RRnZhVHN5REJxejhMVjdw?= =?utf-8?B?UUxTa3ZrU0picmRLdS9GKzdVa3FYb04yT1l3Yjc2M3Y0M3lKTEZESWdrdmFj?= =?utf-8?B?cjU2VGgra081R0I3cm9uN1BPcFFPUmw5ZCszTDBGbWtUSlBBeVVqdVZzUml3?= =?utf-8?B?Qmh4RjlwUDlvMEJ3WHZxLys3ODZRNGt6eHpUVnZ2a09xZzJ0YkR5ZThDVU54?= =?utf-8?B?Z0IzRHRaRTBnQXVLd01lYnFGRXM2RWNTeVY5UlBSaEpQaTlNUThMenIzZ2M0?= =?utf-8?B?Zm5ScTlrME01Yy9QRnJIajN3UkpwaGlDYVlmb1JzK1E5OWpYTUpkeDV1MzBn?= =?utf-8?B?QXE2MWNyZGxPamczUk1ZMlZEeDVRWFprT3grTm5HSXBSdmFRTnRZNkwrOE5X?= =?utf-8?B?R3o5YTF4dXFLdlRqRHE2TC8rNzA1dTR0cXNadFRMc0JNWjhxK1hRLzM1K2ZN?= =?utf-8?B?Y1hvYlRyT25wVnBQdjFvY3RsT1NFV2lxVXAzZDU2Z0pCWDd6dm5qcWlkTU0z?= =?utf-8?B?K1ZQY3lPUUczQjJyclltTUlwVkxqTDRmc1V5TDlML1VNUkdGWlY5SEFSaExN?= =?utf-8?B?YjFPaHlGeDQ2aXRHZDR4SVlBSTNCK0E3Zis5ZU0zZWgxWlhWQmI4TUdhK1Zh?= =?utf-8?B?MEt4bVcyaHVETUVoN251R3JQZUtFMFppZW1OUGNKR3N0UndidkxQcUwyK2FP?= =?utf-8?B?cGJ0WG1kUEJjNnZMQ2xmNVBrbng4VlgwRUZ3S0NFUzM3eDZoeHlvOUYyMEpi?= =?utf-8?B?U3ZMUkRwL2c0Qms0OGQ2ZGNiVnVHbTVtS1c5RUZya1VUb2xacjA2c1lrOHF1?= =?utf-8?B?NlRyRXBmVUtNY2pFMlUvcndlWWgrNUVxQnpEZ2pkTWJSdnRKV3lCQi9aUFFz?= =?utf-8?B?eHpHb29UbUlFVlJ6T2luZlFDV0M0SStyaWVsNkMyYjdTNWc0dytIMUZFNWZE?= =?utf-8?B?YUE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: e48c6017-d474-4a37-1cd6-08db6bbd36a7 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2023 03:21:01.5340 (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: U/rlvnkQmhnR23r34NN5Pe3FqbOfI0JD6j1MKPgQ8lycTwqxT34eZ55C/iJ+0xJawoIGf7frlz5ai/MGRjS+cPYwXXTxgbF50sv1QjBT9o0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR13MB4452 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 Complete the missing logic of parse the tunnel id of IPv4 NVGRE tunnel and send it to the firmware by control message. Fixes: 88cce0538073 ("net/nfp: support IPv4 NVGRE encap flow action") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 5acb7f6ff3..6aea2b1559 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -3171,6 +3171,7 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower, struct nfp_fl_rule_metadata *nfp_flow_meta, struct nfp_fl_tun *tun) { + uint64_t tun_id; const struct rte_ether_hdr *eth; const struct rte_flow_item_ipv4 *ipv4; const struct rte_flow_item_gre *gre; @@ -3182,6 +3183,7 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower, eth = (const struct rte_ether_hdr *)raw_encap->data; ipv4 = (const struct rte_flow_item_ipv4 *)(eth + 1); gre = (const struct rte_flow_item_gre *)(ipv4 + 1); + tun_id = rte_be_to_cpu_32(*(const rte_be32_t *)(gre + 1)); pre_tun = (struct nfp_fl_act_pre_tun *)actions; memset(pre_tun, 0, act_pre_size); @@ -3189,7 +3191,7 @@ nfp_flow_action_nvgre_encap_v4(struct nfp_app_fw_flower *app_fw_flower, set_tun = (struct nfp_fl_act_set_tun *)(act_data + act_pre_size); memset(set_tun, 0, act_set_size); - nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GRE, 0, + nfp_flow_set_tun_process(set_tun, NFP_FL_TUN_GRE, tun_id, ipv4->hdr.time_to_live, ipv4->hdr.type_of_service); set_tun->tun_proto = gre->protocol; -- 2.39.1