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 18644A0543; Tue, 25 Oct 2022 10:03:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8755642C28; Tue, 25 Oct 2022 10:00:59 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2136.outbound.protection.outlook.com [40.107.237.136]) by mails.dpdk.org (Postfix) with ESMTP id F08CA42C40 for ; Tue, 25 Oct 2022 10:00:41 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nqmFRp6UaMtftQp/M3xAZcAajpQQvrqBRoPuBD9tEOW75I1i99DBIrGIfQaOVA/Nk5g+Kh/YGmYiH2LL7VB1ARHNVP5V08CCO8rMgD2JDEk/yOx0/8ptbC4/7fcUMiCZr2KYSf+l/RH6FcWInA1LGECOPN/vs5R6ITkJ9JBMYwEjZMYOf8RTzBI+UQS+zr7jcQMvbPE2B/G2W/nPO4GFbo1jLsgW/jDcZoeEYFfbRG0uiORF5e+Y4aQbnZIfUM1Z1Dy4S6wEdLFUNNxFLoluzUgU2exiwFuFPVA36nr3oeYTKqx3+XzhZ+b9BwgJb5xDXuxCX0VUvtTEiULSJVD+iQ== 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=E6wkqoKCkS3WbPT133ituL+mB27+lJyBJCZgcaevTI0=; b=O0sQjaZTOo3RCuMmCt6JJeN/6MuevJB2+GLqL2yGA9lBv+f5WauuMpFPRRPOjs+z6B2NxHJGBPMkjDndSfDOIkyhUJ05BSQixi8J8e+aMmRi3lvcA66r7dMcIxNhI9PZ/L6j3YZvGRed0phzicBjKXlc8Rdyy1XRV0azRqR+3sywGGYbT3hutsCXZc4zOzlWwVuZRv7f98k600TwWTqgGPkuCmBOwmZ8VvCZ1dCBUXMOvIyhZ5FYVsP+8aBaxJ80K62jtJAIM5zfZ++gLE/yTy/2NY0RnmYHwo0dFe7EHkB+StdBBAzIBAlEjjFJRM/dppLnhWsggHERF54RgnLKcw== 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=E6wkqoKCkS3WbPT133ituL+mB27+lJyBJCZgcaevTI0=; b=k09/c3OZH3N7U0MEBgevxDJvWbUh24gLKSOKWio95zLjej++4/YH9gu1kXrW74jiZPEqIQc5aA8t11Eefhf5uwfrseRHv9+aDoTrxWhsxnaFk1Z/xg0O7v8vH4w0wwnqBGruQ+3CqSLXMkaQnGY22bOE0BJVapMaaOOUEVBTDMY= 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 BLAPR13MB4739.namprd13.prod.outlook.com (2603:10b6:208:306::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.25; Tue, 25 Oct 2022 08:00:40 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::7c26:1a0b:2825:6f4b%4]) with mapi id 15.20.5723.014; Tue, 25 Oct 2022 08:00:40 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v3 24/26] net/nfp: support IPv4 NVGRE decap flow action Date: Tue, 25 Oct 2022 15:59:16 +0800 Message-Id: <20221025075918.7778-25-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20221025075918.7778-1-chaoyong.he@corigine.com> References: <1666427069-10553-1-git-send-email-chaoyong.he@corigine.com> <20221025075918.7778-1-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2PR01CA0142.apcprd01.prod.exchangelabs.com (2603:1096:4:8f::22) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BLAPR13MB4739:EE_ X-MS-Office365-Filtering-Correlation-Id: 540139be-c4bc-4fbf-909b-08dab65f0250 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i16XwzOQv4OjVE14FWUBN8ZAGOAFv1f1Oi4ZbYbf3wUohRkp2Bgm2OpL+BKzk9Zqo+o8w7jhDjrf2q/LiOrEoV2nInputx2qlNi3C8tgMqatitlHL7Dp5hbiHQdYvC2urTvwirAweV2oaS0GpPL4+Xv3a+GZje34H4SrGdZHm1ukUJZ/9nE/g3S8ck01XT/LmsajSxAIM9hB2ghL9+1p+kNCoxvKqsMQKDQQHIS7GUW1caMn2fUlye+UpFpjtVsCI2zZxKilzT0HKgwrpVYbcPk9MhkHX6BJf7jWvjXQWf4n3lhpP0C+zT9PzxZyEaRx++UoopY3HtOIpXHCjcZJHQJM8QeLaXoFpOylk1k3VFkRtsntRQhqIJ9rA64G2ADRrcq0GeCzQIpJfw1ZLVuz9fR2Rqo+/J5s9iFePOYiDNaeP7V+zNi5e9uQAz6WVdr03vYp/7Qx9lqrIJLxqZ3E/B2Qwo4g2ZifbioQZ7y6DTQG/ctYfhnpvr17PxMt8gCedB6CwW9QpMBHMQzsqj3AEW5kBuuoiL4SbnDl/fsU1jKRhean5pwyJvLgIwqc/UB09yVpPPGbLm2ScDG2oL04J20ItSohNpv07ffO89c5KdSFyR8ieAVvfNXe65pKoS/Z0WivzrpU+qpt6ui2bRvQMCTAF1xlbTDT3sTOl51j/9C9qGcqlWNLJkJjPHFJZQRIKs71oMUrg4ywOMEbeos0kGBFSHXs4kP7dyyxCrKaPR2Hp52kiFg6oHbaMiffeFcgy0vJ8RO8DKgOEOWq4nERUA== 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:(13230022)(4636009)(376002)(366004)(396003)(136003)(39850400004)(346002)(451199015)(36756003)(38350700002)(86362001)(38100700002)(41300700001)(83380400001)(66946007)(1076003)(2906002)(6512007)(6666004)(26005)(186003)(6916009)(6506007)(52116002)(107886003)(478600001)(44832011)(66556008)(5660300002)(8936002)(2616005)(6486002)(8676002)(316002)(66476007)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Q0MwdGlQYkhsUzdsU3FJcnF5THZtNTlvSDBFellRUHVTSURuRHpjUXVaZThv?= =?utf-8?B?R1FJbWJ1dURPWGc3Q3c5YVNOYWpHRXc0Z1JIM20vZkpwSmJUT2MvQTNuNWNB?= =?utf-8?B?MlI1cDJZMDJRK3E2WVg3WjlvbE1yY1I1VlJDMzBMb3R3aWhySXptcVk1bE0v?= =?utf-8?B?YUdtd0tSTy9kUldOQmdUanBtQk5uRzVnZHVJWVFFdWpqZThHYzFTQ2VvSGtl?= =?utf-8?B?SE9HWTVIeE1qYjRUbUFVK2NNZ0dpNmNuNHh4Q0JSNThDc0dwRDFpem11RFRE?= =?utf-8?B?K3pUSUV5UWJYdFBJYytZazB6ZEovczlyNDIyczZ6Yk10dXdOYk5DYzd4aFVu?= =?utf-8?B?bzZld3dqNEsxM3pzUWpmRzBYR3doem1KUEoxQVFhNlNtVXVQZ0gvZ2Qya0hB?= =?utf-8?B?WTlPMmVKWWVGWFYxdGVUVHN0ZTZ4Rjc0NmVOaGZZa3BqSW9CV0prWlJuZUJJ?= =?utf-8?B?di9ubXI5WlZFQ2lwUDR4QXhvQXFOS1ZlVmRKRDJlZTI4UmVQaVYrK21oclRS?= =?utf-8?B?NjdrVStnK0ZpNkhQc1BwaHRwOGt1dXBiYkEycGRSenA3aGlLUGd6R1JES2J3?= =?utf-8?B?ODNtVG15WTBLR2hOZHVqUFVoR3lMa001WnQzclRNTjNjRkdrS0dyb3JMODRQ?= =?utf-8?B?eDBRTWVRMTBQdjVDTytGY21zaXF6aTBld1M4cUZnOGlaWjR4TVhUTUt3cHdK?= =?utf-8?B?eGdCdDMxOHQ5YUtQdVBHa0svQ0lRZE5EN203cEFDRmFYQUpBMEY5eG9OYTlO?= =?utf-8?B?Q3RKVkdBZEs2aEx6Q0lzNFFNS2xlQnZFR0FSZlRtZ3A1ZlV4WlJkVVdMTUxB?= =?utf-8?B?R2ZqZW1yemUwcEtLY3I1UC9qUzdadVdyaHZOZWNHSEJoZUZyMTBHaDYxYlFa?= =?utf-8?B?SS9JYjN5OXJhMjB2L0dHOCtML3NCdXJwS1Y4SzZlZGNvRmxlbmZPK2Z6dkhk?= =?utf-8?B?VjZKR2NHanlkMGNWWU1CWUdzOFNsM0RMeHVDRGRYZVZ5UVZMVWxMMktKZ29h?= =?utf-8?B?TmpSZXUyY2E5eEpNMHVMVXJPMUJUYWxCUjBhUHBuZGpmUCtmVFlKYnpYTkRu?= =?utf-8?B?MGk0L3BOcHhFdzhDUWZ3dDhLTml4aElnaWZBM2RrY1pZd0JhaFM4dmNNU0hm?= =?utf-8?B?MElVNVJFQTk5dFYwVlNWNnJQNUNuMkVza0ljWTBRMWRLNExMQVk2TEl0NGFI?= =?utf-8?B?dVF0K2l6WXRWQUhaWWFsWjVzcEN0NGJJZDdvd3pTQU5hakJGNEtJajJWVll1?= =?utf-8?B?K1ZNZkdyYUFyVVFpbjJ4SFBEVFhYR01UR3MzNjN3STRrejUrelpabDVHRjVq?= =?utf-8?B?VzJvTC8waUNyempoN2F2bnI1Nm90M2NpWFdzNHhsSG1ER1JqeVlCZjlzRC85?= =?utf-8?B?K2VRVnlrK1BYbTYvRTJvMjQ3MWlhNWZtRXhqNGxiRWE2b2VsTDNQM3Z0d09N?= =?utf-8?B?dzM3OHpSeXpjK3pvY0I1OUpSVG55S0xudlpMQVlZRXdyOHdzVGdBUzhYVjBH?= =?utf-8?B?TzhTbWYwY1BVeXBMUUNyNFpSTTJvZk1ML2k1SFBzYktiR1U4ZndDU2NGdDJn?= =?utf-8?B?ak00OHVWL1pwa2c1b1NKZDlFeGpsZytTeGdSelhYZkg3Vld3RmhQMjI3OHpN?= =?utf-8?B?dUY1eUhDUStrbHJ6WE8xZEJlZ0dESW1uTzhHbEZUcVcxL21XRVBBL0ZER1Jo?= =?utf-8?B?USswTEl4TGoxdG1IQ25iZC9ROWJBYlFRZGJMcHlLOEd3aDJ1bExZcGpIenhu?= =?utf-8?B?TGZZUWd4US9BTVRJNXNoTnU1RkxEZmM2cnl2Z1Flc1BCQ3hCMDhsdmp4UER4?= =?utf-8?B?dXpzTnpHSUpPSjZpS3ZkTWZZZndhL2JzdnR0MUFaN3k4MGFGcVlaSFZ3Sy9X?= =?utf-8?B?VzM0TDlpUThOWEJMNkFhOENrUnh2Vko0MDFyZ3lWUmoySVpTL2tWckFsUTJN?= =?utf-8?B?WW5oRXZ3ak9OaGFOWVlGZUVXeU9Zdmh5c2IrMmk4bWZ2M3Uwd2dlMUllQVR4?= =?utf-8?B?dGNXUTFzK0FjZUZDWkRueDJJSmd4dnBncGRSNVFwT1YvVzJtY0ZWUXFIakE3?= =?utf-8?B?bm8wM3MyV2ViYm9tZFZlMGRISCtRUVA2MlBLLzFNU3RDRXB0dUE5aUZHSFJz?= =?utf-8?B?eWZra1B3U0pGaEZnK0Y1UDFENHF6R2lybERMV0REQ0hCUlNWK0hieTc1SEw1?= =?utf-8?B?akE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 540139be-c4bc-4fbf-909b-08dab65f0250 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 08:00:40.5360 (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: GJVosULAF6cTT0U2WKp/KzRmT275pRYU8GG8En26OAOvwbAkGphaJMo7eAsLoZgNQwaKNvPDfvk/hZV54HpfQWfJ92ovXcKFfOmqDb6vpwM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR13MB4739 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 offload support of decap action of IPv4 NVGRE tunnel. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- drivers/net/nfp/nfp_flow.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 78af7bcf0c..d666446edf 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -1609,7 +1609,7 @@ nfp_flow_merge_gre(__rte_unused struct nfp_app_fw_flower *app_fw_flower, } static int -nfp_flow_merge_gre_key(__rte_unused struct nfp_app_fw_flower *app_fw_flower, +nfp_flow_merge_gre_key(struct nfp_app_fw_flower *app_fw_flower, struct rte_flow *nfp_flow, char **mbuf_off, const struct rte_flow_item *item, @@ -1617,6 +1617,7 @@ nfp_flow_merge_gre_key(__rte_unused struct nfp_app_fw_flower *app_fw_flower, bool is_mask, __rte_unused bool is_outer_layer) { + int ret = 0; rte_be32_t tun_key; const rte_be32_t *spec; const rte_be32_t *mask; @@ -1646,6 +1647,8 @@ nfp_flow_merge_gre_key(__rte_unused struct nfp_app_fw_flower *app_fw_flower, tun4 = (struct nfp_flower_ipv4_gre_tun *)*mbuf_off; tun4->tun_key = tun_key; tun4->tun_flags = rte_cpu_to_be_16(NFP_FL_GRE_FLAG_KEY); + if (!is_mask) + ret = nfp_tun_add_ipv4_off(app_fw_flower, tun4->ipv4.dst); } gre_key_end: @@ -1655,7 +1658,7 @@ nfp_flow_merge_gre_key(__rte_unused struct nfp_app_fw_flower *app_fw_flower, else *mbuf_off += sizeof(struct nfp_flower_ipv4_gre_tun); - return 0; + return ret; } const rte_be32_t nfp_flow_item_gre_key = 0xffffffff; @@ -3831,6 +3834,7 @@ nfp_flow_tunnel_decap_set(__rte_unused struct rte_eth_dev *dev, *num_of_actions = 1; break; case RTE_FLOW_ITEM_TYPE_GENEVE: + case RTE_FLOW_ITEM_TYPE_GRE: nfp_action->type = RTE_FLOW_ACTION_TYPE_RAW_DECAP; *pmd_actions = nfp_action; *num_of_actions = 1; -- 2.29.3