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 6D8F2A0544; Mon, 10 Oct 2022 08:09:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2BAF042B72; Mon, 10 Oct 2022 08:09:33 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2136.outbound.protection.outlook.com [40.107.96.136]) by mails.dpdk.org (Postfix) with ESMTP id 11FAF427ED for ; Mon, 10 Oct 2022 08:09:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GlRb/eXaFFoOUGlvCSNVaCnbKt40wUt8TeTsKzXb79HX96XBwMpHNAJikcvcp0DQLUWXXX9vMHikAO2O1gOOhzuOgYH0Bl7ltPzoQmBesrouKojj5JiC58xabR843ccjwveTRhMD0O0xyGkMhF+5C2vI0Z1vdyLEi988wzJSXylpjGbEhlJaW0edjLVEJnBK9zu5mc6wrE2TVqKX2ZAaZciykq1Uwih5AUieJxkqXbXQmZlbSutpDcqrG4DWC4STh4HKqxdXT5y8NqhMUxtgxvQm1s9WmBQC7HmC3cqH/GRa1HrOQ2UNE0YyoMOTuITTUNTeoL+63CFGfV6jiev+kw== 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=bsqcC6bwaXzKZBSv8ceO6aeVhrhPXgpFQK2wm8LTVTw=; b=h8JMOueORJXNX84g+bHCxWSlsuYRhWWGiXnKdbjudQ6Wn3Bxd00BJQzQbz1mgIT9+4w+1N9hjDvvI6dlB04gRQ8hWGGwnkrKuMv/gZ3Mld7vFpYU4Eu1LzDp0v5QjzwvE7YfTfM71KCdi0EVGuL6w0lLKoZNDcwnxXjUdBwPN7Ui93rmcBs4c4XeSoV+FwrMLURKvcAXP3QXFvTfWTQrYcWCqNjM4NBmlzijjlR22zTscgDlyQpqp3e3VBQXZzbPsDqZFmfP+rQ/D1Ve2P48d7ios9jxcAk2IrwBcmZaavU7YkAPDv971hdTtReJ5ejxC4l9gApJA775mZbvV5KfHg== 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=bsqcC6bwaXzKZBSv8ceO6aeVhrhPXgpFQK2wm8LTVTw=; b=u2SqzyLR/eOEy+YHXCEiYdwGqpQC6WRHcgV8Dff9o93EDXFVtA5NolmKhjZ22VNjqwpH4foMZIsBU6g06i36xwf1D1gfxpupd+tkiMHc/LEsT/ofZPWDsOp61FvKwRM0lDnkQfFppLg+6b1Hx70G7qNz4mS+CHKmRp/WddIm5Jo= 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 SN4PR13MB5296.namprd13.prod.outlook.com (2603:10b6:806:207::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.14; Mon, 10 Oct 2022 06:09:29 +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; Mon, 10 Oct 2022 06:09:29 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Chaoyong He Subject: [PATCH v2 05/24] net/nfp: add the offload support of basic actions Date: Mon, 10 Oct 2022 14:08:43 +0800 Message-Id: <1665382142-21684-6-git-send-email-chaoyong.he@corigine.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> References: <1665382142-21684-1-git-send-email-chaoyong.he@corigine.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SI2PR01CA0051.apcprd01.prod.exchangelabs.com (2603:1096:4:193::6) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SN4PR13MB5296:EE_ X-MS-Office365-Filtering-Correlation-Id: 37249d54-6d91-4994-257e-08daaa85fdda X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jcZAgkVQXjp4OPzKK7VZS4Xp3XKo6lycM7kNfTSJ0+qUdzh+jTVJTtx1iGotkho+40AlBEpoZsifJFp3enghNNAoJC+5UlRzfZakYvG4R6WLb//T9p8i+8SGu5Mjb8MHE3pF3eG8oT/wyTxcCa5OznjgK2Q4M2Ko69KLp2LQ3v9VOOxwIMehFf/abeIZBJLGnsMQXs6bJGQXtNW4fTcI1DqezK25YTh0IwbUQLbrJlfUZGrXIyms4kTT5eNDmXAPg5apfxYWt7g90FSJb4esX2N606qA4V2N3W+miU5XF3H7tZz3I2s7s4Y4dGRhl8BTKsoFRDbpj05XPtxZpZev+AEkfuEq9GJY06EhIDH6fFRUVw9/ieN3EpSALKJpN3PpL2mcllI6K8zvSsb+TsEwLrP3SkCXW00bRYUGzuNnO1IwMhgzRWa9s09ASXcyeIGLbNxRuosFyhI4QbA068FZ4FprRiH9NN3BAuyclj8FJPrXjfYZaatk5LUa/6gur/0Am5rC3j5puLC5V/24knSK+hROz2eTpqo7aF9rqmjDAMg2GvH1zxzQIvDJ2Db7RjpKznQe1PiL9Cd/vMX3AuVENvjF2N4UWgE3zqu7AiZO6zP9sky+VVt5Gk3t/HJMLqYpPpPdhAmdEW5568WcePJ5VEeziSQA8AHzWmvue5iAwo7WJaPMurRUKuo/YRrfMN0yWz3cthBPOuzji08Uf46t1+8NjBJzN7CKBBceeDolnkYCvbwItuvljhHd4j4mWoQDjK8b2fLpqDAw6SxRY5TCL+0HSByJ1otCg5hjvdrMK+nk9yAiNDhHsyhH5mjRfP9TwgSBOgszuJIoAfvBcgpE0Q== 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)(366004)(396003)(346002)(376002)(136003)(39830400003)(451199015)(6916009)(316002)(2906002)(186003)(6486002)(2616005)(66476007)(6666004)(107886003)(66556008)(41300700001)(66946007)(83380400001)(8936002)(8676002)(4326008)(5660300002)(44832011)(26005)(6506007)(6512007)(52116002)(86362001)(478600001)(36756003)(38350700002)(38100700002)(473944003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZWRHeW90Ri9oaEVpSXdHWHlGc1JVY1czbUdqcGZQcUJENmdXQTl5dmNQTFB4?= =?utf-8?B?Y3B0MWRDOU5YbWJSY2pQQVl4YlltVmFHSkExcjFQRXVHNTFUV0kveW5GdjF5?= =?utf-8?B?UjNQWFBKZThaa1Boa25hTzN6WXZtNkdXUHo3amh6bnh2aXEvMnNNWHFhenp6?= =?utf-8?B?VVZ1MFp6YzNuWCtDcWNIV1BJYlJLdStJeE82czNWRlZPeERWV3BEM2tvOEJy?= =?utf-8?B?aXZHc3YyMjIyZU53dWJvNXRJVWhsQ2RSUUdXcjVtOW9ZTUE2Y05kd09mTmZS?= =?utf-8?B?djVDYUk0WFZmYy9XY3NRaEx1K2RWTmplZURtVFh2cWkzZlJoUUtWUVBHRVMz?= =?utf-8?B?T1U2MW94K0xncHhRUzAvVHoyQzRoZG5HQkZ1bWlEVHFJSk9WLzdQYzR4MXhs?= =?utf-8?B?ZzJIbnNjSm5QWm5aNDRBV0RvTnZRRnhnYzZLd3Q5NUl3emdhbnNnTUpOMFZ5?= =?utf-8?B?UlJHZjB5alNHbXpmT3J4c3ZXUzhFYzNaZ21lOHFlTStWVnpRUDB5ODdoN1Fm?= =?utf-8?B?MVAzRWxJWGFLdzJJaG92QlVEK1JxR2dsVGVNQzdRYjl3WkFqL3oyc3hpMjla?= =?utf-8?B?K1dWNzhEckFhamV1QjF2V3VUaUVyVUp2QWw4UmF3aVpkM3h3U1U5d0IvTk40?= =?utf-8?B?UDRtbFlmZGpySEk2YXlZd2lrZ0FxQWNudzJFZ1k0aFkyMEpPdVlLUGdFc2xK?= =?utf-8?B?SmswK3lTVGU1RWVOdVJmcytzbnhrVnRQZkxDZ2hnU2M1SHVYL0ZCaElnUEpo?= =?utf-8?B?STIyQkxkc3EreXh0T3VCeUoydnlON2ZWQnZNOHoyaFptWWFvOE9Ta09rb2tC?= =?utf-8?B?UTc0SDczalJheUtxaVdLdDhpbFRQRHpVbzlHTkdMY0VPVUtkT3RsbmNJcGJO?= =?utf-8?B?Y1czSVp1cHVGSlFicG5GVXFrS0pkckxjT3RnVjVIdHNGZlZrV1pIQ2FWMHc5?= =?utf-8?B?N2pBajZBcWxNTGFBTGtvZlpPd3BrOWptMVErUUlBRldOUm9yMlBLeXlod3BC?= =?utf-8?B?Qkdkc0pSSUZ4akQyMnM4emd5T04zN0FRR2xpNXFtRVhoQXJmc3VhNHdLOHNC?= =?utf-8?B?R2JUdkVtM1lOWDNDUzQvOFEzWkU2UTY2SzJSSjNGSHEzeXlDRkRXbmtPL1pI?= =?utf-8?B?YnppWU5FT0o1bkNwbVNHWHBWR1FLdFRaeHEyVTJBV0V3dksxYVFpb3VWTnZw?= =?utf-8?B?ODFUNWxBdy9tY1E5OXo2VktsZTRGUTdHUkRhL1JEMy9oK3B5NFQ3Ti9tVmVL?= =?utf-8?B?cFFsSzFubDhRaWF4M2dCTFczK2h5WktXZ0NBaXV6NG8vVFJENS9FOVBPYVNw?= =?utf-8?B?MU5yU01FcTZNaExtMHMyTUZ3ZXRJYnMyUm1WcElSamR1ZGhDQUdXa1ZLcmVU?= =?utf-8?B?REpyOHlzc2JVZG8yS0ovVlR3TVBuS005bEpoZDVZOFMrMk5JL05PY1RFZ1Jh?= =?utf-8?B?aDJBcjNiSG81K0tWaCtzaXJOdWo5L0pJUmlaekJzdzFuWTBvYUNzNVlobUpK?= =?utf-8?B?UkR4cE50ekNTUDdrdTgwTkE4QWh4cFE0QnFRRDY0V3U4SUNDSWR3eGNqRjRF?= =?utf-8?B?MUF5ZTRDbmplbHJrK0RkQjF3ZFNkQUp1YXNEN3VpZnhnenFzdFdUWkc3Nysw?= =?utf-8?B?Mi9ZWURleFJ4VTIyZy9NS25GSElyZDNEUnprOUxmcWhKOWZaL0hrWWdTYjc2?= =?utf-8?B?eDROczA1bEM5bDdsY3BMc1pXUGM2eFNKMWFkY1N0d2wwUFhQSWl0dWQydmd2?= =?utf-8?B?NXFISVNhcFlpRmJvMm5wcXJKNjh6QlYyM3V4Yk5ZbmVLcWx5dHFQbG0xNDRN?= =?utf-8?B?RE5TUC9FYXFueWhGRVpWdURpUFVzc0YwUmZOVTFMU3hLMFFMY0J2OGdHcHRs?= =?utf-8?B?anZFc0YyZXdyOTQwbTR0eVVlT3FtVXJqU2JiT24ydEJWaE1RODdnU0g1NkhU?= =?utf-8?B?THFUbitRTWQ0clVrSzVHS2V3TXptcUZyQUVpU3FtcjlLNUs2M1Q2QkVrWmd2?= =?utf-8?B?UkZpSkh5SHZJVHpwN2VDSHZ6b0lnYnZsSE1PWFV3Y1hYcEtQTlI4Wk1RaW1y?= =?utf-8?B?STgyWTJ5YlV3SnBwaFlPanlYb09tS0tPQ3dhTTBONzdmUEpsS1BzYXRaSjVE?= =?utf-8?B?UGtaTWtkNWFMbnpacDlHblVKb29KK0VCNkJTZUVxRDJPanhiZ2Nha2U3Smt3?= =?utf-8?B?Ync9PQ==?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37249d54-6d91-4994-257e-08daaa85fdda X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 06:09:29.4056 (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: Iqz12+KTR7hVgb5s+pk77DCiTwhEohoPJ0l+81S5ZZEOGmirTIVf3GLnkJ8vhFbml9VmRS5L8NQZcnc8918FuSjycEGHpyA9yLJl5PEYKFs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR13MB5296 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 | 6 ++ doc/guides/rel_notes/release_22_11.rst | 6 ++ 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, 172 insertions(+) diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini index 4460cf0..194fe64 100644 --- a/doc/guides/nics/features/nfp.ini +++ b/doc/guides/nics/features/nfp.ini @@ -29,3 +29,9 @@ Usage doc = Y [rte_flow items] eth = Y port_id = Y + +[rte_flow actions] +count = Y +dec_ttl = 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 cd22d95..ac0223f 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -155,6 +155,12 @@ New Features * Ethernet + Add the support of rte_flow actions as follow: + + * Count + * Drop + * TTL decrement + * **Updated NXP dpaa2 driver.** * Added support for flow action REPRESENTED_PORT. 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 a077423..ec021f0 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