From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, Chaoyong He <chaoyong.he@corigine.com>,
Long Wu <long.wu@corigine.com>,
Peng Zhang <peng.zhang@corigine.com>
Subject: [PATCH 06/21] net/nfp: pack various flags of flow item
Date: Wed, 19 Jun 2024 17:13:43 +0800 [thread overview]
Message-ID: <20240619091358.3479247-7-chaoyong.he@corigine.com> (raw)
In-Reply-To: <20240619091358.3479247-1-chaoyong.he@corigine.com>
Pack various flags of the flow item into single structure, also
refactor the related logic.
Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Long Wu <long.wu@corigine.com>
Reviewed-by: Peng Zhang <peng.zhang@corigine.com>
---
drivers/net/nfp/flower/nfp_flower_flow.c | 28 ++++++++++++++----------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/drivers/net/nfp/flower/nfp_flower_flow.c b/drivers/net/nfp/flower/nfp_flower_flow.c
index bfd4645afb..db4551d98b 100644
--- a/drivers/net/nfp/flower/nfp_flower_flow.c
+++ b/drivers/net/nfp/flower/nfp_flower_flow.c
@@ -809,13 +809,17 @@ nfp_flow_compile_metadata(struct nfp_flow_priv *priv,
mbuf_off_mask += sizeof(struct nfp_flower_in_port);
}
+struct nfp_item_flag {
+ bool outer_ip4_flag;
+ bool outer_ip6_flag;
+};
+
static int
nfp_flow_key_layers_calculate_items(const struct rte_flow_item items[],
struct nfp_fl_key_ls *key_ls)
{
struct rte_eth_dev *ethdev;
- bool outer_ip4_flag = false;
- bool outer_ip6_flag = false;
+ struct nfp_item_flag flag = {};
const struct rte_flow_item *item;
struct nfp_flower_representor *representor;
const struct rte_flow_item_port_id *port_id;
@@ -850,15 +854,15 @@ nfp_flow_key_layers_calculate_items(const struct rte_flow_item items[],
PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV4 detected");
key_ls->key_layer |= NFP_FLOWER_LAYER_IPV4;
key_ls->key_size += sizeof(struct nfp_flower_ipv4);
- if (!outer_ip4_flag)
- outer_ip4_flag = true;
+ if (!flag.outer_ip4_flag)
+ flag.outer_ip4_flag = true;
break;
case RTE_FLOW_ITEM_TYPE_IPV6:
PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_IPV6 detected");
key_ls->key_layer |= NFP_FLOWER_LAYER_IPV6;
key_ls->key_size += sizeof(struct nfp_flower_ipv6);
- if (!outer_ip6_flag)
- outer_ip6_flag = true;
+ if (!flag.outer_ip6_flag)
+ flag.outer_ip6_flag = true;
break;
case RTE_FLOW_ITEM_TYPE_TCP:
PMD_DRV_LOG(DEBUG, "RTE_FLOW_ITEM_TYPE_TCP detected");
@@ -882,14 +886,14 @@ nfp_flow_key_layers_calculate_items(const struct rte_flow_item items[],
key_ls->key_layer &= ~NFP_FLOWER_LAYER_IPV6;
key_ls->tun_type = NFP_FL_TUN_VXLAN;
key_ls->key_layer |= NFP_FLOWER_LAYER_VXLAN;
- if (outer_ip4_flag) {
+ if (flag.outer_ip4_flag) {
key_ls->key_size += sizeof(struct nfp_flower_ipv4_udp_tun);
/*
* The outer l3 layer information is
* in `struct nfp_flower_ipv4_udp_tun`.
*/
key_ls->key_size -= sizeof(struct nfp_flower_ipv4);
- } else if (outer_ip6_flag) {
+ } else if (flag.outer_ip6_flag) {
key_ls->key_layer |= NFP_FLOWER_LAYER_EXT_META;
key_ls->key_layer_two |= NFP_FLOWER_LAYER2_TUN_IPV6;
key_ls->key_size += sizeof(struct nfp_flower_ext_meta);
@@ -913,14 +917,14 @@ nfp_flow_key_layers_calculate_items(const struct rte_flow_item items[],
key_ls->key_layer |= NFP_FLOWER_LAYER_EXT_META;
key_ls->key_layer_two |= NFP_FLOWER_LAYER2_GENEVE;
key_ls->key_size += sizeof(struct nfp_flower_ext_meta);
- if (outer_ip4_flag) {
+ if (flag.outer_ip4_flag) {
key_ls->key_size += sizeof(struct nfp_flower_ipv4_udp_tun);
/*
* The outer l3 layer information is
* in `struct nfp_flower_ipv4_udp_tun`.
*/
key_ls->key_size -= sizeof(struct nfp_flower_ipv4);
- } else if (outer_ip6_flag) {
+ } else if (flag.outer_ip6_flag) {
key_ls->key_layer_two |= NFP_FLOWER_LAYER2_TUN_IPV6;
key_ls->key_size += sizeof(struct nfp_flower_ipv6_udp_tun);
/*
@@ -942,14 +946,14 @@ nfp_flow_key_layers_calculate_items(const struct rte_flow_item items[],
key_ls->key_layer |= NFP_FLOWER_LAYER_EXT_META;
key_ls->key_layer_two |= NFP_FLOWER_LAYER2_GRE;
key_ls->key_size += sizeof(struct nfp_flower_ext_meta);
- if (outer_ip4_flag) {
+ if (flag.outer_ip4_flag) {
key_ls->key_size += sizeof(struct nfp_flower_ipv4_gre_tun);
/*
* The outer l3 layer information is
* in `struct nfp_flower_ipv4_gre_tun`.
*/
key_ls->key_size -= sizeof(struct nfp_flower_ipv4);
- } else if (outer_ip6_flag) {
+ } else if (flag.outer_ip6_flag) {
key_ls->key_layer_two |= NFP_FLOWER_LAYER2_TUN_IPV6;
key_ls->key_size += sizeof(struct nfp_flower_ipv6_gre_tun);
/*
--
2.39.1
next prev parent reply other threads:[~2024-06-19 9:15 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-19 9:13 [PATCH 00/21] support modify field flow action Chaoyong He
2024-06-19 9:13 ` [PATCH 01/21] net/nfp: fix IPv6 TTL and DSCP " Chaoyong He
2024-06-19 9:13 ` [PATCH 02/21] net/nfp: pack parameters of flow item function Chaoyong He
2024-06-19 9:13 ` [PATCH 03/21] net/nfp: pack various flags of flow action Chaoyong He
2024-06-19 9:13 ` [PATCH 04/21] net/nfp: refactor flow action calculate function Chaoyong He
2024-06-19 9:13 ` [PATCH 05/21] net/nfp: refactor flow action compile function Chaoyong He
2024-06-19 9:13 ` Chaoyong He [this message]
2024-06-19 9:13 ` [PATCH 07/21] net/nfp: refactor flow item calculate function Chaoyong He
2024-06-19 9:13 ` [PATCH 08/21] net/nfp: support modify IPv4 source address Chaoyong He
2024-06-19 9:13 ` [PATCH 09/21] net/nfp: support modify IPv4 dest address Chaoyong He
2024-06-19 9:13 ` [PATCH 10/21] net/nfp: support modify IPv6 source address Chaoyong He
2024-06-19 9:13 ` [PATCH 11/21] net/nfp: support modify IPv6 dest address Chaoyong He
2024-06-19 9:13 ` [PATCH 12/21] net/nfp: support modify TCP source port Chaoyong He
2024-06-19 9:13 ` [PATCH 13/21] net/nfp: support modify TCP dest port Chaoyong He
2024-06-19 9:13 ` [PATCH 14/21] net/nfp: support modify UDP source port Chaoyong He
2024-06-19 9:13 ` [PATCH 15/21] net/nfp: support modify UDP dest port Chaoyong He
2024-06-19 9:13 ` [PATCH 16/21] net/nfp: support modify IPv4 TTL Chaoyong He
2024-06-19 9:13 ` [PATCH 17/21] net/nfp: support modify IPv6 hop limit Chaoyong He
2024-06-19 9:13 ` [PATCH 18/21] net/nfp: support modify MAC source address Chaoyong He
2024-06-19 9:13 ` [PATCH 19/21] net/nfp: support modify MAC dest address Chaoyong He
2024-06-19 9:13 ` [PATCH 20/21] net/nfp: support modify IPv4 DSCP Chaoyong He
2024-06-19 9:13 ` [PATCH 21/21] net/nfp: support modify IPv6 DSCP Chaoyong He
2024-07-07 2:10 ` [PATCH 00/21] support modify field flow action Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240619091358.3479247-7-chaoyong.he@corigine.com \
--to=chaoyong.he@corigine.com \
--cc=dev@dpdk.org \
--cc=long.wu@corigine.com \
--cc=oss-drivers@corigine.com \
--cc=peng.zhang@corigine.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).