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 58881A0560; Tue, 18 Oct 2022 13:28:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4263642670; Tue, 18 Oct 2022 13:27:48 +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 285714281E for ; Tue, 18 Oct 2022 13:27:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nOgRFF//1ZSaQO5TadiPzD+zbbhsuHqfsWv53Y3+ZaB/lIt1D/gpaVK+x/F/QP68E3Ou7Pe6cYb7AfLPE9XIWXBoZkdJVVPG8u9D620wKB7KicuhbD1MvsHCvBufDyOkR71gckUaS2JjxuE7U+GFCba36kYhmUEVgDusdgww4Tujnc+9PPqZFzFe3zDua/4npuw+8wxRpqfaAJ2t/Xkn/dz8xmXVefb/oMxbzFjwAbP2BUzh9QlzSiM+EkvTHXS6rzNpR8387+mClfW7SODmP9SZ/EuoXSd7Oiojce6N3gsnjihLDJkTQ/BqTP/0fWiz7HLzp7OiVVTKpYbLXHbOmw== 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=cm7yRM3IAUps4WtiwikP1HpUXs0GPAdpGGIFevx+rMQ=; b=N0iIpP8oO7rM9NXULlXL3U3QE5dby0y3r7FxGMgwbU7EY7s3eylw5Yd8l7Ay28iYQu9+be6SJcA9TVlFSNu6Dm8/+wExcf8bRFtcVGTqN+y6iTKv8riBtzPwF6bO0TUfMdgZWq/krUYgI6YznRI5bFSijwgtfwAi3F/spzmd9GSt0X3DB9gkV/yw3g4PxuyW3wV04TozlcLPH6Z4X8RO7s2wagHeOEsbfFPWidRq3/Mub9dUHCaPxTLgbu2HiiffdPfAzJvoPf4jPFOy+Jnu/cC8+k7bcdAnOA0R24hsL9Z8Zb3G2Qa1SDvDybaZ80H6TE+W/gEzA2FEKIi/PpYavg== 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=cm7yRM3IAUps4WtiwikP1HpUXs0GPAdpGGIFevx+rMQ=; b=qCY9HO0Hf00nLoCGZyzKSEMyQPQY0QOpg4Ftw1LXjwTOMZM91+m82aiXLyWNNZ9ecF1XyXZ05KyNTioAIAinx5SgodcHdRVNLMKvavEtJsbtOltEGc4+XTs0Scwxnw2tlc/8eT1c9jGXt1nYKM/PSbZIksYttV2ZhCDztzcvUTE= 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 CO3PR13MB5686.namprd13.prod.outlook.com (2603:10b6:303:179::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.16; Tue, 18 Oct 2022 11:27:44 +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, 18 Oct 2022 11:27:44 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v4 06/25] net/nfp: support basic flow actions Date: Tue, 18 Oct 2022 19:26:55 +0800 Message-Id: <1666092434-10357-7-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1666092434-10357-1-git-send-email-chaoyong.he@corigine.com> References: <1666092434-10357-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SG2PR02CA0052.apcprd02.prod.outlook.com (2603:1096:4:54::16) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CO3PR13MB5686:EE_ X-MS-Office365-Filtering-Correlation-Id: a8960844-ddb9-48c5-1f28-08dab0fbc6f8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3xrCHTjr+zn2H1pSx0Jg1n7fABEeG97/aRROfhPWLLoQSBQWpqyhzFFptHNDQGuyJpsYVWilwqd4FlRDqR270xDz4IEoYSVxCGms/kvQtuNYnZTLm4t5T6WzwjcSimHGEH+r70U5CMXYuLKqEhcf1B0SgvGgoLV2UQcoxNsxlKZHmQTy+vbvfLJuuWHBUYuAObOuHOo/9PhKq/bgpo2qxDlHiJed9qrlxBr7AgR12n0Wamjxnc0+kL9BFpQJc6LQe+fYZsYM7UjDG8ppokC3gHrJzw5Ac4PXz6Hu9vlklYwDe0D9qpyPcLXrviSyaQ4eMhE3omeHzCI2jOsqavmbZ4/32x/3JbOC0fbeFgTSktTMwcSusrmqowR1JotQiNWTXso4mxo2M4/Y0jo7arvGAElM1JTC9jO35wksCgIrEjASodnnGpO2sb0r9U50/W6KZZ0pVD0oxGAMQg/I4PsfrNR8/LgPCPIhz9vGBEWF2ZPgXgZdIksGvqbm+OrvY1IoP1489AG7HMt5g4s5TZpJjtGnU4IW1pnS+yADLU8LVAyv33m8obkfF6FGcguppxE5kdmV+w+24rIY6zB9bjx2dmtaDCu5ukFIb4VzDaWoJGLAUf450jwQgK4ZI/qNNk3czojDMVP43rA+Sbr/ESCywFDu30Xy3hQDrARjTmDBhh8Ih3LIsQ5GMjouneEDVIbjFYk3vdmc4/Tcqpffp1dP4H7ItFuzNfFg9fu2bevufoGc/IiCPac3Y6YKy3TC2Hnsrx1ALIcusJK2xp3EUYf6V/FkvfFNzdUS5+Ann6U/iSaY6VDJitGflm4HPpCgX9darhQdkI8B/WMsMbCYX/eN8w== 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)(346002)(366004)(39840400004)(396003)(136003)(376002)(451199015)(38350700002)(38100700002)(2906002)(66574015)(41300700001)(316002)(66946007)(66556008)(66476007)(83380400001)(4326008)(8676002)(6916009)(86362001)(44832011)(2616005)(8936002)(186003)(36756003)(5660300002)(6506007)(107886003)(6666004)(6486002)(478600001)(26005)(6512007)(52116002)(473944003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U3BCRDRZNnlWaU8wZTdLNjRPeFp0K20zYkVoY0NRaDAxZUU5NGQySjNyWGdC?= =?utf-8?B?VkZvQnc2STh0UTRLUDVtUXpld3dQMXQvUllZOXZDVFRZQnV1Y3dnV1NuNEpz?= =?utf-8?B?M1pnaUFXUi81VHd6SzREWHRlU1R0UGxHTjNpa1p0Q3ZkYUdybTNVNU4xTHRq?= =?utf-8?B?dkZxMklRM2NIMnY4bmdjTHZmOHpWYkpOZU5iOCt1K3YwQUpJZitTbGU2WXZ1?= =?utf-8?B?Z3BDbnNVeUxrcSszNUpCdUo3K0NWM3RZVTd4eWZDU0hNRXRhU3R3VUg0YzJW?= =?utf-8?B?NVVDR0ZOTnhlbDlJRjRiVFhLMUJmODZNL0VsOStxUnFTaUhOZVZORTNMd3hh?= =?utf-8?B?OExkSVBPczBwSmo1M2Rrc2Jpd25JZno5clZHUnEzUEkyVm41MEt4R0FucHVS?= =?utf-8?B?TXZ3bUllRmxMMG5FUlhQUTVQS1pPVXc1d3VPTTdHaHYzS0s4VmNBN1pvdEhN?= =?utf-8?B?RXJ1UDBvMmhBYnJHT1p5eG9TMk5NT3JLLzNiU2pBd2RUM3pmYk9SNnpDNmtt?= =?utf-8?B?MHBXRzhHVFNocCtadjk3NFd4cngvTjVWZXRvNDkzU2F0bDkwM1gybVQ5bm0r?= =?utf-8?B?aC91OUhjTzNDR0JubzFPcHQzRE41NjEvY0Q4aUhFM3pWV0FTSWdidVowUm1x?= =?utf-8?B?dC9MZHRVSUdEeVNVeUduUkhPaWw0d1pHdGtBaUR3UmtGVEpROUdkeXl5dC9Q?= =?utf-8?B?TzNPbWVUVXpwdk1pZDlMdDhxMHg3OGhqT2l0MEc3T3ZkcEYwUDcxV1k5NFBE?= =?utf-8?B?eHB1UEIwWVlRUkJOZTdzNmlLKzBHZDlCLytKeUJZU01GRDBvb2dQVVhyWWx3?= =?utf-8?B?MUwyS1JLNU1HakIrV3k0RzJZeWxIS1BkUjVsUWtHQzFMQ3FGYm4rTHQrT0Ny?= =?utf-8?B?QlQwUzY4NjBQQ05XZU9acnBQenlqMkhLYjN0QU1YRmFmMkdROHJZc1J2MGpM?= =?utf-8?B?aVFxVUFjalNhaHAxYU4vVnVtaHpQeEtEWStQaERzKzVyOWloSGxvL3dSL2NG?= =?utf-8?B?bGRZS3RDb2RmR0t4REdYS24zc0E2a21IbW05VGErUHpwMzVHRHJyRU5zMkVV?= =?utf-8?B?RTZ0MTIyUmtHSnBkMm1UM1pOVnJXK3pWaWtDKzZpOVVKekw0MnpybG5SODNT?= =?utf-8?B?eGlSNjQybEtqTW9Da3plSlVkZndRdlh3eVU4dWFGN2JDSTNkdGttNkJYdTVl?= =?utf-8?B?K1AwWmJqOU1RTCt1bXA2MGZRRFFXbXBpMnZodXVveFJ4R1RWKzZSUzQ3RUQ2?= =?utf-8?B?VmQxNFIyN2taMUhNQ3gzQXBZdEpqa3U2Z1M3dXZaMkdnNGlVRERiWlZuMnNH?= =?utf-8?B?ZWN3TzlhNEtuZUtsUzNwdlMxRWI1d1kxeWtNOXl4VUpObWFhQTdVVHduakQz?= =?utf-8?B?Y2NzazZIT2xBMTFEbUdLZUJtY0FiYzJnd3FhRTBFbTFHZ1EyRmMzMHdJSW1i?= =?utf-8?B?T3hURkV1NDQ3RnV6Vk94OHdrTTFMSzhQV1ZMdkFkZXFUNkNZWWZMcXFZV2xr?= =?utf-8?B?SmltaDZHT0M3L3RLRWxlMElHeHRMTjdnZHg3SGJNRll5N1VOSTNDa2toekZz?= =?utf-8?B?VEVxaGxIMWQrZXFCWjJYbkd4VFhGL3A1ZWE5SzRPWmJtdEtsM0Z2c3oydUlV?= =?utf-8?B?MHR5NW9CNURRcS9EYTZLZ3JBZGQ4N3RZcWNreGpkVWhtcFpueE9GOFYxcHB1?= =?utf-8?B?b21BeXdHTGRCaE1UNWNsZktHMHBhRTBsWXBGbGQ3dVhrVEhXZCtCbXN4VDV5?= =?utf-8?B?Q1ExeElONW9ScVdPZVBwWEZmb1htNjkxTGJRWkpoSktSdnNwaHNST25Yb3Q1?= =?utf-8?B?cFhabUF1dzQ3ck9vaE9FaWNJUGtZSkhlVi9PT0wvSEc0VkovdHJRd00zbEUr?= =?utf-8?B?T3BhQ21ZRDlEN0FXOEhHMTFTSDEwZ2lvVWVKaGlVK0JKTllNWnZ5bzc5Ukpq?= =?utf-8?B?YWxFS3pZTU5jR2hLTDJaQVI1aUdkNmd5NndrejBKVVBZM2dPYWZTZ2NDaEZP?= =?utf-8?B?V2xSenU4S2gvalNNM0NsS1daaDRsbUJob2lpbjhIN1NabS90ZTBaKzJPc1Bj?= =?utf-8?B?MTF0TWtyNXBDQUxkQ2Y4bmpCZ2ZLM0pIQUVtbVBTZ3BvUlRpWmd5S0h4YS9Q?= =?utf-8?B?Y0ZteWdZZml3TDZIdTJBcTBSQzB4MUs0ZXFUYUhVMkVQelB3Vk1BcVlkWkQ4?= =?utf-8?B?UUE9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8960844-ddb9-48c5-1f28-08dab0fbc6f8 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2022 11:27:44.8727 (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: 4tpMfyK7KuN/F4vsPaHdvY4x7n6zStFw49JsZOYMqObYqxcU/Gxm3gZc4Yd4kTrHUqBS6H0lQmIr/CqIu9Gay2viJB7sTZQo3vCNg3AGKlM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO3PR13MB5686 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 very basic actions: mark, rss, count, drop and output. Signed-off-by: Chaoyong He Reviewed-by: Niklas Söderlund --- doc/guides/nics/features/nfp.ini | 5 ++ doc/guides/rel_notes/release_22_11.rst | 2 +- drivers/net/nfp/flower/nfp_flower_cmsg.h | 11 +++ drivers/net/nfp/nfp_flow.c | 112 +++++++++++++++++++++++++++++++ drivers/net/nfp/nfp_flow.h | 37 ++++++++++ 5 files changed, 166 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 4460cf0..f91da82 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -29,3 +29,8 @@ Usage doc = Y [rte_flow items] eth = Y port_id = Y + +[rte_flow actions] +count = Y +drop = Y +port_id = Y diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 6d421a2..471f300 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -163,7 +163,7 @@ New Features * Added the control message interactive channels between PMD and firmware. * Added the support of representor port. - Add the support of rte_flow pattern items. + Add the support of rte_flow pattern items and actions. * **Updated NXP dpaa2 driver.** diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h index 75a3b91..d776e37 100644 --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h @@ -253,6 +253,17 @@ struct nfp_flower_mac_mpls { rte_be32_t mpls_lse; }; +struct nfp_fl_act_head { + uint8_t jump_id; + uint8_t len_lw; +}; + +struct nfp_fl_act_output { + struct nfp_fl_act_head head; + rte_be16_t flags; + rte_be32_t port; +}; + int nfp_flower_cmsg_mac_repr(struct nfp_app_fw_flower *app_fw_flower); int nfp_flower_cmsg_repr_reify(struct nfp_app_fw_flower *app_fw_flower, struct nfp_flower_representor *repr); diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c index 56cbfb7..dcc0942 100644 --- a/drivers/net/nfp/nfp_flow.c +++ b/drivers/net/nfp/nfp_flow.c @@ -558,6 +558,22 @@ struct nfp_mask_id_entry { case RTE_FLOW_ACTION_TYPE_VOID: PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_VOID detected"); break; + case RTE_FLOW_ACTION_TYPE_MARK: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_MARK detected"); + break; + case RTE_FLOW_ACTION_TYPE_DROP: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_DROP detected"); + break; + case RTE_FLOW_ACTION_TYPE_COUNT: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_COUNT detected"); + break; + case RTE_FLOW_ACTION_TYPE_RSS: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_RSS detected"); + break; + case RTE_FLOW_ACTION_TYPE_PORT_ID: + PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_PORT_ID detected"); + key_ls->act_size += sizeof(struct nfp_fl_act_output); + break; default: PMD_DRV_LOG(ERR, "Action type %d not supported.", action->type); return -ENOTSUP; @@ -785,6 +801,96 @@ struct nfp_mask_id_entry { return 0; } +static int +nfp_flow_action_output(char *act_data, + const struct rte_flow_action *action, + struct nfp_fl_rule_metadata *nfp_flow_meta) +{ + size_t act_size; + struct rte_eth_dev *ethdev; + struct nfp_fl_act_output *output; + struct nfp_flower_representor *representor; + const struct rte_flow_action_port_id *port_id; + + port_id = action->conf; + if (port_id == NULL || port_id->id >= RTE_MAX_ETHPORTS) + return -ERANGE; + + ethdev = &rte_eth_devices[port_id->id]; + representor = (struct nfp_flower_representor *)ethdev->data->dev_private; + act_size = sizeof(struct nfp_fl_act_output); + + output = (struct nfp_fl_act_output *)act_data; + output->head.jump_id = NFP_FL_ACTION_OPCODE_OUTPUT; + output->head.len_lw = act_size >> NFP_FL_LW_SIZ; + output->flags = rte_cpu_to_be_16(NFP_FL_OUT_FLAGS_LAST); + output->port = rte_cpu_to_be_32(representor->port_id); + + nfp_flow_meta->shortcut = rte_cpu_to_be_32(representor->port_id); + + return 0; +} + +static int +nfp_flow_compile_action(__rte_unused struct nfp_flower_representor *representor, + const struct rte_flow_action actions[], + struct rte_flow *nfp_flow) +{ + int ret = 0; + char *position; + char *action_data; + bool drop_flag = false; + uint32_t total_actions = 0; + const struct rte_flow_action *action; + struct nfp_fl_rule_metadata *nfp_flow_meta; + + nfp_flow_meta = nfp_flow->payload.meta; + action_data = nfp_flow->payload.action_data; + position = action_data; + + for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) { + switch (action->type) { + case RTE_FLOW_ACTION_TYPE_VOID: + break; + case RTE_FLOW_ACTION_TYPE_MARK: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_MARK"); + break; + case RTE_FLOW_ACTION_TYPE_DROP: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_DROP"); + drop_flag = true; + break; + case RTE_FLOW_ACTION_TYPE_COUNT: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_COUNT"); + break; + case RTE_FLOW_ACTION_TYPE_RSS: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_RSS"); + break; + case RTE_FLOW_ACTION_TYPE_PORT_ID: + PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_PORT_ID"); + ret = nfp_flow_action_output(position, action, nfp_flow_meta); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Failed when process" + " RTE_FLOW_ACTION_TYPE_PORT_ID"); + return ret; + } + + position += sizeof(struct nfp_fl_act_output); + break; + default: + PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type); + return -ENOTSUP; + } + total_actions++; + } + + if (drop_flag) + nfp_flow_meta->shortcut = rte_cpu_to_be_32(NFP_FL_SC_ACT_DROP); + else if (total_actions > 1) + nfp_flow_meta->shortcut = rte_cpu_to_be_32(NFP_FL_SC_ACT_NULL); + + return 0; +} + static struct rte_flow * nfp_flow_process(struct nfp_flower_representor *representor, const struct rte_flow_item items[], @@ -833,6 +939,12 @@ struct nfp_mask_id_entry { goto free_flow; } + ret = nfp_flow_compile_action(representor, actions, nfp_flow); + if (ret != 0) { + PMD_DRV_LOG(ERR, "nfp flow action process failed."); + goto free_flow; + } + nfp_flow_meta = nfp_flow->payload.meta; mask_data = nfp_flow->payload.mask_data; mask_len = key_layer.key_size; diff --git a/drivers/net/nfp/nfp_flow.h b/drivers/net/nfp/nfp_flow.h index 83f9f29..f1fbada 100644 --- a/drivers/net/nfp/nfp_flow.h +++ b/drivers/net/nfp/nfp_flow.h @@ -33,6 +33,43 @@ /* The firmware expects lengths in units of long words */ #define NFP_FL_LW_SIZ 2 +#define NFP_FL_SC_ACT_DROP 0x80000000 +#define NFP_FL_SC_ACT_USER 0x7D000000 +#define NFP_FL_SC_ACT_POPV 0x6A000000 +#define NFP_FL_SC_ACT_NULL 0x00000000 + +/* Action opcodes */ +#define NFP_FL_ACTION_OPCODE_OUTPUT 0 +#define NFP_FL_ACTION_OPCODE_PUSH_VLAN 1 +#define NFP_FL_ACTION_OPCODE_POP_VLAN 2 +#define NFP_FL_ACTION_OPCODE_PUSH_MPLS 3 +#define NFP_FL_ACTION_OPCODE_POP_MPLS 4 +#define NFP_FL_ACTION_OPCODE_USERSPACE 5 +#define NFP_FL_ACTION_OPCODE_SET_TUNNEL 6 +#define NFP_FL_ACTION_OPCODE_SET_ETHERNET 7 +#define NFP_FL_ACTION_OPCODE_SET_MPLS 8 +#define NFP_FL_ACTION_OPCODE_SET_IPV4_ADDRS 9 +#define NFP_FL_ACTION_OPCODE_SET_IPV4_TTL_TOS 10 +#define NFP_FL_ACTION_OPCODE_SET_IPV6_SRC 11 +#define NFP_FL_ACTION_OPCODE_SET_IPV6_DST 12 +#define NFP_FL_ACTION_OPCODE_SET_IPV6_TC_HL_FL 13 +#define NFP_FL_ACTION_OPCODE_SET_UDP 14 +#define NFP_FL_ACTION_OPCODE_SET_TCP 15 +#define NFP_FL_ACTION_OPCODE_PRE_LAG 16 +#define NFP_FL_ACTION_OPCODE_PRE_TUNNEL 17 +#define NFP_FL_ACTION_OPCODE_PRE_GS 18 +#define NFP_FL_ACTION_OPCODE_GS 19 +#define NFP_FL_ACTION_OPCODE_PUSH_NSH 20 +#define NFP_FL_ACTION_OPCODE_POP_NSH 21 +#define NFP_FL_ACTION_OPCODE_SET_QUEUE 22 +#define NFP_FL_ACTION_OPCODE_CONNTRACK 23 +#define NFP_FL_ACTION_OPCODE_METER 24 +#define NFP_FL_ACTION_OPCODE_CT_NAT_EXT 25 +#define NFP_FL_ACTION_OPCODE_PUSH_GENEVE 26 +#define NFP_FL_ACTION_OPCODE_NUM 32 + +#define NFP_FL_OUT_FLAGS_LAST (1 << 15) + /* Tunnel ports */ #define NFP_FL_PORT_TYPE_TUN 0x50000000 -- 1.8.3.1