From: Danylo Vodopianov <dvo-...@napatech.com>
Add possibility to use RTE_FLOW_ACTION_TYPE_MODIFY_FIELD
Signed-off-by: Danylo Vodopianov <dvo-...@napatech.com>
---
doc/guides/nics/features/ntnic.ini | 1 +
drivers/net/ntnic/include/flow_api_engine.h | 7 +
drivers/net/ntnic/include/hw_mod_backend.h | 1 +
.../profile_inline/flow_api_profile_inline.c | 181 ++++++++++++++++++
4 files changed, 190 insertions(+)
diff --git a/doc/guides/nics/features/ntnic.ini
b/doc/guides/nics/features/ntnic.ini
index 320d3c7e0b..4201c8e8b9 100644
--- a/doc/guides/nics/features/ntnic.ini
+++ b/doc/guides/nics/features/ntnic.ini
@@ -30,5 +30,6 @@ vlan = Y
drop = Y
jump = Y
mark = Y
+modify_field = Y
port_id = Y
queue = Y
diff --git a/drivers/net/ntnic/include/flow_api_engine.h
b/drivers/net/ntnic/include/flow_api_engine.h
index 13fad2760a..f6557d0d20 100644
--- a/drivers/net/ntnic/include/flow_api_engine.h
+++ b/drivers/net/ntnic/include/flow_api_engine.h
@@ -129,6 +129,10 @@ struct nic_flow_def {
*/
struct {
uint32_t select;
+ uint32_t dyn;
+ uint32_t ofs;
+ uint32_t len;
+ uint32_t level;
union {
uint8_t value8[16];
uint16_t value16[8];
@@ -137,6 +141,9 @@ struct nic_flow_def {
} modify_field[MAX_CPY_WRITERS_SUPPORTED];
uint32_t modify_field_count;
+ uint8_t ttl_sub_enable;
+ uint8_t ttl_sub_ipv4;
+ uint8_t ttl_sub_outer;
/*
* Key Matcher flow definitions
diff --git a/drivers/net/ntnic/include/hw_mod_backend.h
b/drivers/net/ntnic/include/hw_mod_backend.h
index 4f381bc0ef..6a8a38636f 100644
--- a/drivers/net/ntnic/include/hw_mod_backend.h
+++ b/drivers/net/ntnic/include/hw_mod_backend.h
@@ -140,6 +140,7 @@ enum frame_offs_e {
DYN_L4_PAYLOAD = 8,
DYN_TUN_L3 = 13,
DYN_TUN_L4 = 16,
+ DYN_TUN_L4_PAYLOAD = 17,
};
/* Sideband info bit indicator */
diff --git
a/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
b/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
index 0b0b9f2033..2cda2e8b14 100644
--- a/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
+++ b/drivers/net/ntnic/nthw/flow_api/profile_inline/flow_api_profile_inline.c
@@ -323,6 +323,8 @@ static int interpret_flow_actions(const struct flow_eth_dev
*dev,
{
unsigned int encap_decap_order = 0;
+ uint64_t modify_field_use_flags = 0x0;
+
*num_dest_port = 0;
*num_queues = 0;
@@ -461,6 +463,185 @@ static int interpret_flow_actions(const struct
flow_eth_dev *dev,
break;
+ case RTE_FLOW_ACTION_TYPE_MODIFY_FIELD:
+ NT_LOG(DBG, FILTER, "Dev:%p:
RTE_FLOW_ACTION_TYPE_MODIFY_FIELD", dev);
+ {
+ /* Note: This copy method will not work for
FLOW_FIELD_POINTER */
+ struct rte_flow_action_modify_field
modify_field_tmp;
+ const struct rte_flow_action_modify_field
*modify_field =
+ memcpy_mask_if(&modify_field_tmp,
action[aidx].conf,
+ action_mask ? action_mask[aidx].conf :
NULL,
+ sizeof(struct
rte_flow_action_modify_field));
+
+ uint64_t modify_field_use_flag = 0;
+
+ if (modify_field->src.field !=
RTE_FLOW_FIELD_VALUE) {
+ NT_LOG(ERR, FILTER,
+ "MODIFY_FIELD only src type
VALUE is supported.");
+
flow_nic_set_error(ERR_ACTION_UNSUPPORTED, error);
+ return -1;
+ }
+
+ if (modify_field->dst.level > 2) {
+ NT_LOG(ERR, FILTER,
+ "MODIFY_FIELD only dst level 0,
1, and 2 is supported.");
+
flow_nic_set_error(ERR_ACTION_UNSUPPORTED, error);
+ return -1;
+ }
+
+ if (modify_field->dst.field ==
RTE_FLOW_FIELD_IPV4_TTL ||
+ modify_field->dst.field ==
RTE_FLOW_FIELD_IPV6_HOPLIMIT) {
+ if (modify_field->operation !=
RTE_FLOW_MODIFY_SUB) {
+ NT_LOG(ERR, FILTER,
+ "MODIFY_FIELD only
operation SUB is supported for TTL/HOPLIMIT.");
+
flow_nic_set_error(ERR_ACTION_UNSUPPORTED, error);
+ return -1;
+ }
+
+ if (fd->ttl_sub_enable) {
+ NT_LOG(ERR, FILTER,
+ "MODIFY_FIELD
TTL/HOPLIMIT resource already in use.");
+
flow_nic_set_error(ERR_ACTION_UNSUPPORTED, error);
+ return -1;
+ }
+
+ fd->ttl_sub_enable = 1;
+ fd->ttl_sub_ipv4 =
+ (modify_field->dst.field ==
RTE_FLOW_FIELD_IPV4_TTL)
+ ? 1
+ : 0;
+ fd->ttl_sub_outer =
(modify_field->dst.level <= 1) ? 1 : 0;
+
+ } else {
+ if (modify_field->operation !=
RTE_FLOW_MODIFY_SET) {
+ NT_LOG(ERR, FILTER,
+ "MODIFY_FIELD only
operation SET is supported in general.");
+
flow_nic_set_error(ERR_ACTION_UNSUPPORTED, error);
+ return -1;
+ }
+
+ if (fd->modify_field_count >=
+
dev->ndev->be.tpe.nb_cpy_writers) {
+ NT_LOG(ERR, FILTER,
+ "MODIFY_FIELD exceeded
maximum of %u MODIFY_FIELD actions.",
+
dev->ndev->be.tpe.nb_cpy_writers);
+
flow_nic_set_error(ERR_ACTION_UNSUPPORTED, error);
+ return -1;
+ }
+
+ int mod_outer = modify_field->dst.level
<= 1;
+
+ switch (modify_field->dst.field) {
+ case RTE_FLOW_FIELD_IPV4_DSCP:
+
fd->modify_field[fd->modify_field_count].select =
+ CPY_SELECT_DSCP_IPV4;
+
fd->modify_field[fd->modify_field_count].dyn =
+ mod_outer ? DYN_L3 :
DYN_TUN_L3;
+
fd->modify_field[fd->modify_field_count].ofs = 1;
+
fd->modify_field[fd->modify_field_count].len = 1;
+ break;
+
+ case RTE_FLOW_FIELD_IPV6_DSCP:
+
fd->modify_field[fd->modify_field_count].select =
+ CPY_SELECT_DSCP_IPV6;
+
fd->modify_field[fd->modify_field_count].dyn =
+ mod_outer ? DYN_L3 :
DYN_TUN_L3;
+
fd->modify_field[fd->modify_field_count].ofs = 0;
+ /*
+ * len=2 is needed because
+ * IPv6 DSCP overlaps 2 bytes.
+ */
+
fd->modify_field[fd->modify_field_count].len = 2;
+ break;
+
+ case RTE_FLOW_FIELD_GTP_PSC_QFI:
+
fd->modify_field[fd->modify_field_count].select =
+ CPY_SELECT_RQI_QFI;
+
fd->modify_field[fd->modify_field_count].dyn =
+ mod_outer ?
DYN_L4_PAYLOAD
+ : DYN_TUN_L4_PAYLOAD;
+
fd->modify_field[fd->modify_field_count].ofs = 14;
+
fd->modify_field[fd->modify_field_count].len = 1;
+ break;
+
+ case RTE_FLOW_FIELD_IPV4_SRC:
+
fd->modify_field[fd->modify_field_count].select =
+ CPY_SELECT_IPV4;
+
fd->modify_field[fd->modify_field_count].dyn =
+ mod_outer ? DYN_L3 :
DYN_TUN_L3;
+
fd->modify_field[fd->modify_field_count].ofs = 12;
+
fd->modify_field[fd->modify_field_count].len = 4;
+ break;
+
+ case RTE_FLOW_FIELD_IPV4_DST:
+
fd->modify_field[fd->modify_field_count].select =
+ CPY_SELECT_IPV4;
+
fd->modify_field[fd->modify_field_count].dyn =
+ mod_outer ? DYN_L3 :
DYN_TUN_L3;
+
fd->modify_field[fd->modify_field_count].ofs = 16;
+
fd->modify_field[fd->modify_field_count].len = 4;
+ break;
+
+ case RTE_FLOW_FIELD_TCP_PORT_SRC:
+ case RTE_FLOW_FIELD_UDP_PORT_SRC:
+
fd->modify_field[fd->modify_field_count].select =
+ CPY_SELECT_PORT;
+
fd->modify_field[fd->modify_field_count].dyn =
+ mod_outer ? DYN_L4 :
DYN_TUN_L4;
+
fd->modify_field[fd->modify_field_count].ofs = 0;
+
fd->modify_field[fd->modify_field_count].len = 2;
+ break;
+
+ case RTE_FLOW_FIELD_TCP_PORT_DST:
+ case RTE_FLOW_FIELD_UDP_PORT_DST:
+
fd->modify_field[fd->modify_field_count].select =
+ CPY_SELECT_PORT;
+
fd->modify_field[fd->modify_field_count].dyn =
+ mod_outer ? DYN_L4 :
DYN_TUN_L4;
+
fd->modify_field[fd->modify_field_count].ofs = 2;
+
fd->modify_field[fd->modify_field_count].len = 2;
+ break;
+
+ case RTE_FLOW_FIELD_GTP_TEID:
+
fd->modify_field[fd->modify_field_count].select =
+ CPY_SELECT_TEID;
+
fd->modify_field[fd->modify_field_count].dyn =
+ mod_outer ?
DYN_L4_PAYLOAD
+ : DYN_TUN_L4_PAYLOAD;
+
fd->modify_field[fd->modify_field_count].ofs = 4;
+
fd->modify_field[fd->modify_field_count].len = 4;
+ break;
+
+ default:
+ NT_LOG(ERR, FILTER,
+ "MODIFY_FIELD dst type
is not supported.");
+
flow_nic_set_error(ERR_ACTION_UNSUPPORTED, error);
+ return -1;
+ }
+
+ modify_field_use_flag = 1
+ <<
fd->modify_field[fd->modify_field_count].select;
+
+ if (modify_field_use_flag &
modify_field_use_flags) {
+ NT_LOG(ERR, FILTER,
+ "MODIFY_FIELD dst type
hardware resource already used.");
+
flow_nic_set_error(ERR_ACTION_UNSUPPORTED, error);
+ return -1;
+ }
+
+
memcpy(fd->modify_field[fd->modify_field_count].value8,
+ modify_field->src.value, 16);
+
+
fd->modify_field[fd->modify_field_count].level =
+ modify_field->dst.level;
+
+ modify_field_use_flags |=
modify_field_use_flag;
+ fd->modify_field_count += 1;
+ }
+ }
+
+ break;
+
default:
NT_LOG(ERR, FILTER, "Invalid or unsupported flow action
received - %i",
action[aidx].type);
--
2.45.0
