Add the corresponding data structure and logics, to support
the offload of pop_vlan action.
Signed-off-by: Chaoyong He <chaoyong...@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderl...@corigine.com>
---
doc/guides/nics/features/nfp.ini | 1 +
drivers/net/nfp/flower/nfp_flower_cmsg.h | 5 +++++
drivers/net/nfp/nfp_flow.c | 25 +++++++++++++++++++++++++
3 files changed, 31 insertions(+)
diff --git a/doc/guides/nics/features/nfp.ini b/doc/guides/nics/features/nfp.ini
index 9e86164..2c5d173 100644
--- a/doc/guides/nics/features/nfp.ini
+++ b/doc/guides/nics/features/nfp.ini
@@ -39,6 +39,7 @@ vlan = Y
[rte_flow actions]
count = Y
drop = Y
+of_pop_vlan = Y
port_id = Y
set_mac_dst = Y
set_mac_src = Y
diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h
b/drivers/net/nfp/flower/nfp_flower_cmsg.h
index b61342e..4ce03da 100644
--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h
+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h
@@ -362,6 +362,11 @@ struct nfp_fl_act_set_eth {
uint8_t eth_addr[RTE_ETHER_ADDR_LEN * 2];
};
+struct nfp_fl_act_pop_vlan {
+ struct nfp_fl_act_head head;
+ rte_be16_t reserved;
+};
+
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 b440c95..d496be7 100644
--- a/drivers/net/nfp/nfp_flow.c
+++ b/drivers/net/nfp/nfp_flow.c
@@ -600,6 +600,10 @@ struct nfp_mask_id_entry {
mac_set_flag = true;
}
break;
+ case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN:
+ PMD_DRV_LOG(DEBUG, "RTE_FLOW_ACTION_TYPE_OF_POP_VLAN
detected");
+ key_ls->act_size += sizeof(struct nfp_fl_act_pop_vlan);
+ break;
default:
PMD_DRV_LOG(ERR, "Action type %d not supported.",
action->type);
return -ENOTSUP;
@@ -1248,6 +1252,22 @@ struct nfp_mask_id_entry {
}
}
+static void
+nfp_flow_action_pop_vlan(char *act_data,
+ struct nfp_fl_rule_metadata *nfp_flow_meta)
+{
+ size_t act_size;
+ struct nfp_fl_act_pop_vlan *pop_vlan;
+
+ act_size = sizeof(struct nfp_fl_act_pop_vlan);
+ pop_vlan = (struct nfp_fl_act_pop_vlan *)act_data;
+ pop_vlan->head.jump_id = NFP_FL_ACTION_OPCODE_POP_VLAN;
+ pop_vlan->head.len_lw = act_size >> NFP_FL_LW_SIZ;
+ pop_vlan->reserved = 0;
+
+ nfp_flow_meta->shortcut = rte_cpu_to_be_32(NFP_FL_SC_ACT_POPV);
+}
+
static int
nfp_flow_compile_action(__rte_unused struct nfp_flower_representor
*representor,
const struct rte_flow_action actions[],
@@ -1304,6 +1324,11 @@ struct nfp_mask_id_entry {
mac_set_flag = true;
}
break;
+ case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN:
+ PMD_DRV_LOG(DEBUG, "Process
RTE_FLOW_ACTION_TYPE_OF_POP_VLAN");
+ nfp_flow_action_pop_vlan(position, nfp_flow_meta);
+ position += sizeof(struct nfp_fl_act_pop_vlan);
+ break;
default:
PMD_DRV_LOG(ERR, "Unsupported action type: %d",
action->type);
return -ENOTSUP;
--
1.8.3.1
