From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com,
Chaoyong He <chaoyong.he@corigine.com>
Subject: [PATCH v6 25/27] net/nfp: support TTL flow action
Date: Fri, 21 Oct 2022 16:02:01 +0800 [thread overview]
Message-ID: <1666339323-24016-26-git-send-email-chaoyong.he@corigine.com> (raw)
In-Reply-To: <1666339323-24016-1-git-send-email-chaoyong.he@corigine.com>
Add the corresponding data structure and logics, to support
the offload of set TTL action.
Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
doc/guides/nics/features/nfp.ini | 1 +
drivers/net/nfp/flower/nfp_flower_cmsg.h | 44 +++++++++++++++++
drivers/net/nfp/nfp_flow.c | 84 ++++++++++++++++++++++++++++++++
3 files changed, 129 insertions(+)
diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini
index e8ccd6a..1283583 100644
--- a/doc/guides/nics/features/nfp.ini
+++ b/doc/guides/nics/features/nfp.ini
@@ -52,3 +52,4 @@ set_mac_dst = Y
set_mac_src = Y
set_tp_dst = Y
set_tp_src = Y
+set_ttl = Y
diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h
index 26de8b1..6bf8ff7 100644
--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h
+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h
@@ -400,6 +400,25 @@ struct nfp_fl_act_set_ip4_addrs {
};
/*
+ * IPv4 ttl tos
+ * 3 2 1
+ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | - |opcode | |jump_id| ttl_mask | tos_mask |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | ttl | tos | 0 |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+struct nfp_fl_act_set_ip4_ttl_tos {
+ struct nfp_fl_act_head head;
+ uint8_t ipv4_ttl_mask;
+ uint8_t ipv4_tos_mask;
+ uint8_t ipv4_ttl;
+ uint8_t ipv4_tos;
+ rte_be16_t reserved;
+};
+
+/*
* IPv6 addr
* 3 2 1
* 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
@@ -433,6 +452,31 @@ struct nfp_fl_act_set_ipv6_addr {
};
/*
+ * ipv6 tc hl fl
+ * 3 2 1
+ * 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | - |opcode | |jump_id| tclass_mask | hlimit_mask |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | 0 | tclass | hlimit |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | 0 | flabel_mask |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ * | 0 | flabel |
+ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ */
+struct nfp_fl_act_set_ipv6_tc_hl_fl {
+ struct nfp_fl_act_head head;
+ uint8_t ipv6_tc_mask;
+ uint8_t ipv6_hop_limit_mask;
+ rte_be16_t reserved;
+ uint8_t ipv6_tc;
+ uint8_t ipv6_hop_limit;
+ rte_be32_t ipv6_label_mask;
+ rte_be32_t ipv6_label;
+};
+
+/*
* TCP/UDP/SCTP
* 3 2 1
* 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
diff --git a/drivers/net/nfp/nfp_flow.c b/drivers/net/nfp/nfp_flow.c
index 666dd8c..a4c14d3 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -561,9 +561,11 @@ struct nfp_mask_id_entry {
struct nfp_fl_key_ls *key_ls)
{
int ret = 0;
+ bool tc_hl_flag = false;
bool mac_set_flag = false;
bool ip_set_flag = false;
bool tp_set_flag = false;
+ bool ttl_tos_flag = false;
const struct rte_flow_action *action;
for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) {
@@ -654,6 +656,22 @@ struct nfp_mask_id_entry {
tp_set_flag = true;
}
break;
+ case RTE_FLOW_ACTION_TYPE_SET_TTL:
+ PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_SET_TTL detected");
+ if (key_ls->key_layer & NFP_FLOWER_LAYER_IPV4) {
+ if (!ttl_tos_flag) {
+ key_ls->act_size +=
+ sizeof(struct nfp_fl_act_set_ip4_ttl_tos);
+ ttl_tos_flag = true;
+ }
+ } else {
+ if (!tc_hl_flag) {
+ key_ls->act_size +=
+ sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl);
+ tc_hl_flag = true;
+ }
+ }
+ break;
default:
PMD_DRV_LOG(ERR, "Action type %d not supported.", action->type);
return -ENOTSUP;
@@ -1431,6 +1449,52 @@ struct nfp_mask_id_entry {
return 0;
}
+static void
+nfp_flow_action_set_ttl(char *act_data,
+ const struct rte_flow_action *action,
+ bool ttl_tos_flag)
+{
+ size_t act_size;
+ struct nfp_fl_act_set_ip4_ttl_tos *ttl_tos;
+ const struct rte_flow_action_set_ttl *ttl_conf;
+
+ if (ttl_tos_flag)
+ ttl_tos = (struct nfp_fl_act_set_ip4_ttl_tos *)act_data - 1;
+ else
+ ttl_tos = (struct nfp_fl_act_set_ip4_ttl_tos *)act_data;
+
+ act_size = sizeof(struct nfp_fl_act_set_ip4_ttl_tos);
+ ttl_tos->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV4_TTL_TOS;
+ ttl_tos->head.len_lw = act_size >> NFP_FL_LW_SIZ;
+
+ ttl_conf = (const struct rte_flow_action_set_ttl *)action->conf;
+ ttl_tos->ipv4_ttl = ttl_conf->ttl_value;
+ ttl_tos->reserved = 0;
+}
+
+static void
+nfp_flow_action_set_hl(char *act_data,
+ const struct rte_flow_action *action,
+ bool tc_hl_flag)
+{
+ size_t act_size;
+ struct nfp_fl_act_set_ipv6_tc_hl_fl *tc_hl;
+ const struct rte_flow_action_set_ttl *ttl_conf;
+
+ if (tc_hl_flag)
+ tc_hl = (struct nfp_fl_act_set_ipv6_tc_hl_fl *)act_data - 1;
+ else
+ tc_hl = (struct nfp_fl_act_set_ipv6_tc_hl_fl *)act_data;
+
+ act_size = sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl);
+ tc_hl->head.jump_id = NFP_FL_ACTION_OPCODE_SET_IPV6_TC_HL_FL;
+ tc_hl->head.len_lw = act_size >> NFP_FL_LW_SIZ;
+
+ ttl_conf = (const struct rte_flow_action_set_ttl *)action->conf;
+ tc_hl->ipv6_hop_limit = ttl_conf->ttl_value;
+ tc_hl->reserved = 0;
+}
+
static int
nfp_flow_compile_action(__rte_unused struct nfp_flower_representor *representor,
const struct rte_flow_action actions[],
@@ -1439,17 +1503,21 @@ struct nfp_mask_id_entry {
int ret = 0;
char *position;
char *action_data;
+ bool ttl_tos_flag = false;
+ bool tc_hl_flag = false;
bool drop_flag = false;
bool ip_set_flag = false;
bool tp_set_flag = false;
bool mac_set_flag = false;
uint32_t total_actions = 0;
const struct rte_flow_action *action;
+ struct nfp_flower_meta_tci *meta_tci;
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;
+ meta_tci = (struct nfp_flower_meta_tci *)nfp_flow->payload.unmasked_data;
for (action = actions; action->type != RTE_FLOW_ACTION_TYPE_END; ++action) {
switch (action->type) {
@@ -1553,6 +1621,22 @@ struct nfp_mask_id_entry {
tp_set_flag = true;
}
break;
+ case RTE_FLOW_ACTION_TYPE_SET_TTL:
+ PMD_DRV_LOG(DEBUG, "Process RTE_FLOW_ACTION_TYPE_SET_TTL");
+ if (meta_tci->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV4) {
+ nfp_flow_action_set_ttl(position, action, ttl_tos_flag);
+ if (!ttl_tos_flag) {
+ position += sizeof(struct nfp_fl_act_set_ip4_ttl_tos);
+ ttl_tos_flag = true;
+ }
+ } else {
+ nfp_flow_action_set_hl(position, action, ttl_tos_flag);
+ if (!tc_hl_flag) {
+ position += sizeof(struct nfp_fl_act_set_ipv6_tc_hl_fl);
+ tc_hl_flag = true;
+ }
+ }
+ break;
default:
PMD_DRV_LOG(ERR, "Unsupported action type: %d", action->type);
return -ENOTSUP;
--
1.8.3.1
next prev parent reply other threads:[~2022-10-21 8:06 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 11:26 [PATCH v4 00/25] add the basic rte_flow offload support of nfp PMD Chaoyong He
2022-10-18 11:26 ` [PATCH v4 01/25] net/nfp: fix the requirement of cpp bridge service Chaoyong He
2022-10-18 12:39 ` Ferruh Yigit
2022-10-18 11:26 ` [PATCH v4 02/25] net/nfp: add the structures and functions for flow offload Chaoyong He
2022-10-18 11:26 ` [PATCH v4 03/25] net/nfp: add the stats process logic in ctrl VNIC service Chaoyong He
2022-10-18 11:26 ` [PATCH v4 04/25] net/nfp: add the flow APIs of nfp PMD Chaoyong He
2022-10-18 11:26 ` [PATCH v4 05/25] net/nfp: support basic flow items Chaoyong He
2022-10-18 11:26 ` [PATCH v4 06/25] net/nfp: support basic flow actions Chaoyong He
2022-10-18 11:26 ` [PATCH v4 07/25] net/nfp: support VLAN flow item Chaoyong He
2022-10-18 11:26 ` [PATCH v4 08/25] net/nfp: support IPv4 " Chaoyong He
2022-10-18 11:26 ` [PATCH v4 09/25] net/nfp: support IPv6 " Chaoyong He
2022-10-18 11:26 ` [PATCH v4 10/25] net/nfp: support TCP " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 11/25] net/nfp: support UDP " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 12/25] net/nfp: support SCTP " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 13/25] net/nfp: support SRC MAC flow action Chaoyong He
2022-10-18 11:27 ` [PATCH v4 14/25] net/nfp: support DST " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 15/25] net/nfp: support pop VLAN " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 16/25] net/nfp: support push " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 17/25] net/nfp: support SRC IPv4 " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 18/25] net/nfp: support DST " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 19/25] net/nfp: support SRC IPv6 " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 20/25] net/nfp: support DST " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 21/25] net/nfp: support TP SRC " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 22/25] net/nfp: support TP DST " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 23/25] net/nfp: support TTL " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 24/25] net/nfp: support IPv4 DSCP " Chaoyong He
2022-10-18 11:27 ` [PATCH v4 25/25] net/nfp: support IPv6 " Chaoyong He
2022-10-18 12:27 ` [PATCH v4 00/25] add the basic rte_flow offload support of nfp PMD Ferruh Yigit
2022-10-20 2:19 ` [PATCH v5 " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 01/25] net/nfp: fix CPP bridge service requirement Chaoyong He
2022-10-20 2:19 ` [PATCH v5 02/25] net/nfp: add the structures and functions for flow offload Chaoyong He
2022-10-20 2:19 ` [PATCH v5 03/25] net/nfp: add the stats process logic in ctrl VNIC service Chaoyong He
2022-10-20 2:19 ` [PATCH v5 04/25] net/nfp: add the flow APIs of nfp PMD Chaoyong He
2022-10-20 11:09 ` Ferruh Yigit
2022-10-20 11:42 ` Chaoyong He
2022-10-20 2:19 ` [PATCH v5 05/25] net/nfp: support basic flow items Chaoyong He
2022-10-20 11:11 ` Ferruh Yigit
2022-10-20 11:43 ` Chaoyong He
2022-10-20 2:19 ` [PATCH v5 06/25] net/nfp: support basic flow actions Chaoyong He
2022-10-20 11:12 ` Ferruh Yigit
2022-10-20 11:41 ` Chaoyong He
2022-10-20 2:19 ` [PATCH v5 07/25] net/nfp: support VLAN flow item Chaoyong He
2022-10-20 2:19 ` [PATCH v5 08/25] net/nfp: support IPv4 " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 09/25] net/nfp: support IPv6 " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 10/25] net/nfp: support TCP " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 11/25] net/nfp: support UDP " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 12/25] net/nfp: support SCTP " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 13/25] net/nfp: support SRC MAC flow action Chaoyong He
2022-10-20 11:12 ` Ferruh Yigit
2022-10-20 11:48 ` Chaoyong He
2022-10-20 11:55 ` Ferruh Yigit
2022-10-20 2:19 ` [PATCH v5 14/25] net/nfp: support DST " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 15/25] net/nfp: support pop VLAN " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 16/25] net/nfp: support push " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 17/25] net/nfp: support SRC IPv4 " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 18/25] net/nfp: support DST " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 19/25] net/nfp: support SRC IPv6 " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 20/25] net/nfp: support DST " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 21/25] net/nfp: support TP SRC " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 22/25] net/nfp: support TP DST " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 23/25] net/nfp: support TTL " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 24/25] net/nfp: support IPv4 DSCP " Chaoyong He
2022-10-20 2:19 ` [PATCH v5 25/25] net/nfp: support IPv6 " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 00/27] add the basic rte_flow offload support of nfp PMD Chaoyong He
2022-10-21 8:01 ` [PATCH v6 01/27] net/nfp: fix CPP bridge service requirement Chaoyong He
2022-10-21 8:01 ` [PATCH v6 02/27] net/nfp: fix the promiscuous mode control functions Chaoyong He
2022-10-21 13:03 ` Ferruh Yigit
2022-10-22 6:49 ` Chaoyong He
2022-10-22 8:11 ` [PATCH v7] net/nfp: fix the promiscuous mode functions Chaoyong He
2022-10-24 12:31 ` Ferruh Yigit
2022-10-21 8:01 ` [PATCH v6 03/27] net/nfp: fix the service stuck the app end Chaoyong He
2022-10-21 8:01 ` [PATCH v6 04/27] net/nfp: add the structures and functions for flow offload Chaoyong He
2022-10-21 8:01 ` [PATCH v6 05/27] net/nfp: add the stats process logic in ctrl VNIC service Chaoyong He
2022-10-21 8:01 ` [PATCH v6 06/27] net/nfp: add the flow APIs of nfp PMD Chaoyong He
2022-10-21 8:01 ` [PATCH v6 07/27] net/nfp: support basic flow items Chaoyong He
2022-10-21 8:01 ` [PATCH v6 08/27] net/nfp: support basic flow actions Chaoyong He
2022-10-21 8:01 ` [PATCH v6 09/27] net/nfp: support VLAN flow item Chaoyong He
2022-10-21 8:01 ` [PATCH v6 10/27] net/nfp: support IPv4 " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 11/27] net/nfp: support IPv6 " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 12/27] net/nfp: support TCP " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 13/27] net/nfp: support UDP " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 14/27] net/nfp: support SCTP " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 15/27] net/nfp: support SRC MAC flow action Chaoyong He
2022-10-21 8:01 ` [PATCH v6 16/27] net/nfp: support DST " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 17/27] net/nfp: support pop VLAN " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 18/27] net/nfp: support push " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 19/27] net/nfp: support SRC IPv4 " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 20/27] net/nfp: support DST " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 21/27] net/nfp: support SRC IPv6 " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 22/27] net/nfp: support DST " Chaoyong He
2022-10-21 8:01 ` [PATCH v6 23/27] net/nfp: support TP SRC " Chaoyong He
2022-10-21 8:02 ` [PATCH v6 24/27] net/nfp: support TP DST " Chaoyong He
2022-10-21 8:02 ` Chaoyong He [this message]
2022-10-21 8:02 ` [PATCH v6 26/27] net/nfp: support IPv4 DSCP " Chaoyong He
2022-10-21 8:02 ` [PATCH v6 27/27] net/nfp: support IPv6 " Chaoyong He
2022-10-21 13:04 ` [PATCH v6 00/27] add the basic rte_flow offload support of nfp PMD 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=1666339323-24016-26-git-send-email-chaoyong.he@corigine.com \
--to=chaoyong.he@corigine.com \
--cc=dev@dpdk.org \
--cc=niklas.soderlund@corigine.com \
--cc=oss-drivers@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).