Adding support for RTE Flow VLAN insert and strip actions.
Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
.. table:: Ingress action types
- +----+--------------------------------+
- | # | Action Type |
- +====+================================+
- | 1 | RTE_FLOW_ACTION_TYPE_VOID |
- +----+--------------------------------+
- | 2 | RTE_FLOW_ACTION_TYPE_MARK |
- +----+--------------------------------+
- | 3 | RTE_FLOW_ACTION_TYPE_FLAG |
- +----+--------------------------------+
- | 4 | RTE_FLOW_ACTION_TYPE_COUNT |
- +----+--------------------------------+
- | 5 | RTE_FLOW_ACTION_TYPE_DROP |
- +----+--------------------------------+
- | 6 | RTE_FLOW_ACTION_TYPE_QUEUE |
- +----+--------------------------------+
- | 7 | RTE_FLOW_ACTION_TYPE_RSS |
- +----+--------------------------------+
- | 8 | RTE_FLOW_ACTION_TYPE_SECURITY |
- +----+--------------------------------+
- | 9 | RTE_FLOW_ACTION_TYPE_PF |
- +----+--------------------------------+
- | 10 | RTE_FLOW_ACTION_TYPE_VF |
- +----+--------------------------------+
+ +----+-----------------------------------------+
+ | # | Action Type |
+ +====+=========================================+
+ | 1 | RTE_FLOW_ACTION_TYPE_VOID |
+ +----+-----------------------------------------+
+ | 2 | RTE_FLOW_ACTION_TYPE_MARK |
+ +----+-----------------------------------------+
+ | 3 | RTE_FLOW_ACTION_TYPE_FLAG |
+ +----+-----------------------------------------+
+ | 4 | RTE_FLOW_ACTION_TYPE_COUNT |
+ +----+-----------------------------------------+
+ | 5 | RTE_FLOW_ACTION_TYPE_DROP |
+ +----+-----------------------------------------+
+ | 6 | RTE_FLOW_ACTION_TYPE_QUEUE |
+ +----+-----------------------------------------+
+ | 7 | RTE_FLOW_ACTION_TYPE_RSS |
+ +----+-----------------------------------------+
+ | 8 | RTE_FLOW_ACTION_TYPE_SECURITY |
+ +----+-----------------------------------------+
+ | 9 | RTE_FLOW_ACTION_TYPE_PF |
+ +----+-----------------------------------------+
+ | 10 | RTE_FLOW_ACTION_TYPE_VF |
+ +----+-----------------------------------------+
+ | 11 | RTE_FLOW_ACTION_TYPE_OF_POP_VLAN |
+ +----+-----------------------------------------+
.. _table_octeontx2_supported_egress_action_types:
.. table:: Egress action types
- +----+--------------------------------+
- | # | Action Type |
- +====+================================+
- | 1 | RTE_FLOW_ACTION_TYPE_COUNT |
- +----+--------------------------------+
- | 2 | RTE_FLOW_ACTION_TYPE_DROP |
- +----+--------------------------------+
+ +----+-----------------------------------------+
+ | # | Action Type |
+ +====+=========================================+
+ | 1 | RTE_FLOW_ACTION_TYPE_COUNT |
+ +----+-----------------------------------------+
+ | 2 | RTE_FLOW_ACTION_TYPE_DROP |
+ +----+-----------------------------------------+
+ | 3 | RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN |
+ +----+-----------------------------------------+
+ | 4 | RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID |
+ +----+-----------------------------------------+
+ | 5 | RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP |
+ +----+-----------------------------------------+
#include "otx2_ethdev_sec.h"
#include "otx2_flow.h"
+enum flow_vtag_cfg_dir { VTAG_TX, VTAG_RX };
+
int
otx2_flow_free_all_resources(struct otx2_eth_dev *hw)
{
&parse_state);
}
+static int
+flow_program_vtag_action(struct rte_eth_dev *eth_dev,
+ const struct rte_flow_action actions[],
+ struct rte_flow *flow)
+{
+ uint16_t vlan_id = 0, vlan_ethtype = RTE_ETHER_TYPE_VLAN;
+ struct otx2_eth_dev *dev = eth_dev->data->dev_private;
+ union {
+ uint64_t reg;
+ struct nix_tx_vtag_action_s act;
+ } tx_vtag_action;
+ struct otx2_mbox *mbox = dev->mbox;
+ struct nix_vtag_config *vtag_cfg;
+ struct nix_vtag_config_rsp *rsp;
+ bool vlan_insert_action = false;
+ uint64_t rx_vtag_action = 0;
+ uint8_t vlan_pcp = 0;
+ int rc;
+
+ for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
+ if (actions->type == RTE_FLOW_ACTION_TYPE_OF_POP_VLAN) {
+ if (dev->npc_flow.vtag_actions == 1) {
+ vtag_cfg =
+ otx2_mbox_alloc_msg_nix_vtag_cfg(mbox);
+ vtag_cfg->cfg_type = VTAG_RX;
+ vtag_cfg->rx.strip_vtag = 1;
+ /* Always capture */
+ vtag_cfg->rx.capture_vtag = 1;
+ vtag_cfg->vtag_size = NIX_VTAGSIZE_T4;
+ vtag_cfg->rx.vtag_type = 0;
+
+ rc = otx2_mbox_process(mbox);
+ if (rc)
+ return rc;
+ }
+
+ rx_vtag_action |= (NIX_RX_VTAGACTION_VTAG_VALID << 15);
+ rx_vtag_action |= (NPC_LID_LB << 8);
+ rx_vtag_action |= NIX_RX_VTAGACTION_VTAG0_RELPTR;
+ flow->vtag_action = rx_vtag_action;
+ } else if (actions->type ==
+ RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID) {
+ const struct rte_flow_action_of_set_vlan_vid *vtag =
+ (const struct rte_flow_action_of_set_vlan_vid *)
+ actions->conf;
+ vlan_id = rte_be_to_cpu_16(vtag->vlan_vid);
+ if (vlan_id > 0xfff) {
+ otx2_err("Invalid vlan_id for set vlan action");
+ return -EINVAL;
+ }
+ vlan_insert_action = true;
+ } else if (actions->type == RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN) {
+ const struct rte_flow_action_of_push_vlan *ethtype =
+ (const struct rte_flow_action_of_push_vlan *)
+ actions->conf;
+ vlan_ethtype = rte_be_to_cpu_16(ethtype->ethertype);
+ if (vlan_ethtype != RTE_ETHER_TYPE_VLAN &&
+ vlan_ethtype != RTE_ETHER_TYPE_QINQ) {
+ otx2_err("Invalid ethtype specified for push"
+ " vlan action");
+ return -EINVAL;
+ }
+ vlan_insert_action = true;
+ } else if (actions->type ==
+ RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP) {
+ const struct rte_flow_action_of_set_vlan_pcp *pcp =
+ (const struct rte_flow_action_of_set_vlan_pcp *)
+ actions->conf;
+ vlan_pcp = pcp->vlan_pcp;
+ if (vlan_pcp > 0x7) {
+ otx2_err("Invalid PCP value for pcp action");
+ return -EINVAL;
+ }
+ vlan_insert_action = true;
+ }
+ }
+
+ if (vlan_insert_action) {
+ vtag_cfg = otx2_mbox_alloc_msg_nix_vtag_cfg(mbox);
+ vtag_cfg->cfg_type = VTAG_TX;
+ vtag_cfg->vtag_size = NIX_VTAGSIZE_T4;
+ vtag_cfg->tx.vtag0 =
+ ((vlan_ethtype << 16) | (vlan_pcp << 13) | vlan_id);
+ vtag_cfg->tx.cfg_vtag0 = 1;
+ rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
+ if (rc)
+ return rc;
+
+ tx_vtag_action.reg = 0;
+ tx_vtag_action.act.vtag0_def = rsp->vtag0_idx;
+ if (tx_vtag_action.act.vtag0_def < 0) {
+ otx2_err("Failed to config TX VTAG action");
+ return -EINVAL;
+ }
+ tx_vtag_action.act.vtag0_lid = NPC_LID_LA;
+ tx_vtag_action.act.vtag0_op = NIX_TX_VTAGOP_INSERT;
+ tx_vtag_action.act.vtag0_relptr =
+ NIX_TX_VTAGACTION_VTAG0_RELPTR;
+ flow->vtag_action = tx_vtag_action.reg;
+ }
+ return 0;
+}
+
static struct rte_flow *
otx2_flow_create(struct rte_eth_dev *dev,
const struct rte_flow_attr *attr,
if (rc != 0)
goto err_exit;
+ rc = flow_program_vtag_action(dev, actions, flow);
+ if (rc != 0) {
+ rte_flow_error_set(error, EIO,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "Failed to program vlan action");
+ goto err_exit;
+ }
+
rc = flow_program_npc(&parse_state, mbox, &hw->npc_flow);
if (rc != 0) {
rte_flow_error_set(error, EIO,
}
}
+ if (flow->nix_intf == OTX2_INTF_RX && flow->vtag_action) {
+ npc->vtag_actions--;
+ if (npc->vtag_actions == 0) {
+ if (hw->vlan_info.strip_on == 0) {
+ hw->rx_offload_flags &=
+ ~NIX_RX_OFFLOAD_VLAN_STRIP_F;
+ otx2_eth_set_rx_function(dev);
+ }
+ }
+ }
+
rc = flow_free_rss_action(dev, flow);
if (rc != 0) {
rte_flow_error_set(error, EIO,
}
rte_atomic32_init(&npc->mark_actions);
+ npc->vtag_actions = 0;
npc->mcam_entries = NPC_MCAM_TOT_ENTRIES >> npc->keyw[NPC_MCAM_RX];
/* Free, free_rev, live and live_rev entries */
#define OTX2_FLOW_ACT_COUNT (1 << 7)
#define OTX2_FLOW_ACT_PF (1 << 8)
#define OTX2_FLOW_ACT_VF (1 << 9)
+#define OTX2_FLOW_ACT_VLAN_STRIP (1 << 10)
+#define OTX2_FLOW_ACT_VLAN_INSERT (1 << 11)
+#define OTX2_FLOW_ACT_VLAN_ETHTYPE_INSERT (1 << 12)
+#define OTX2_FLOW_ACT_VLAN_PCP_INSERT (1 << 13)
/* terminating actions */
#define OTX2_FLOW_ACT_TERM (OTX2_FLOW_ACT_DROP | \
uint64_t mcam_data[OTX2_MAX_MCAM_WIDTH_DWORDS];
uint64_t mcam_mask[OTX2_MAX_MCAM_WIDTH_DWORDS];
uint64_t npc_action;
+ uint64_t vtag_action;
TAILQ_ENTRY(rte_flow) next;
};
/* Accessed from ethdev private - otx2_eth_dev */
struct otx2_npc_flow_info {
rte_atomic32_t mark_actions;
+ uint32_t vtag_actions;
uint32_t keyx_supp_nmask[NPC_MAX_INTF];/* nibble mask */
uint32_t keyx_len[NPC_MAX_INTF]; /* per intf key len in bits */
uint32_t datax_len[NPC_MAX_INTF]; /* per intf data len in bits */
const struct rte_flow_action_mark *act_mark;
const struct rte_flow_action_queue *act_q;
const struct rte_flow_action_vf *vf_act;
+ bool vlan_insert_action = false;
const char *errmsg = NULL;
int sel_act, req_act = 0;
uint16_t pf_func, vf_id;
req_act |= OTX2_FLOW_ACT_SEC;
rq = 0;
break;
+ case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID:
+ req_act |= OTX2_FLOW_ACT_VLAN_INSERT;
+ break;
+ case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN:
+ req_act |= OTX2_FLOW_ACT_VLAN_STRIP;
+ break;
+ case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN:
+ req_act |= OTX2_FLOW_ACT_VLAN_ETHTYPE_INSERT;
+ break;
+ case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP:
+ req_act |= OTX2_FLOW_ACT_VLAN_PCP_INSERT;
+ break;
default:
errmsg = "Unsupported action specified";
errcode = ENOTSUP;
}
}
+ if (req_act &
+ (OTX2_FLOW_ACT_VLAN_INSERT | OTX2_FLOW_ACT_VLAN_ETHTYPE_INSERT |
+ OTX2_FLOW_ACT_VLAN_PCP_INSERT))
+ vlan_insert_action = true;
+
+ if ((req_act &
+ (OTX2_FLOW_ACT_VLAN_INSERT | OTX2_FLOW_ACT_VLAN_ETHTYPE_INSERT |
+ OTX2_FLOW_ACT_VLAN_PCP_INSERT)) ==
+ OTX2_FLOW_ACT_VLAN_PCP_INSERT) {
+ errmsg = " PCP insert action can't be supported alone";
+ errcode = ENOTSUP;
+ goto err_exit;
+ }
+
+ /* Both STRIP and INSERT actions are not supported */
+ if (vlan_insert_action && (req_act & OTX2_FLOW_ACT_VLAN_STRIP)) {
+ errmsg = "Both VLAN insert and strip actions not supported"
+ " together";
+ errcode = ENOTSUP;
+ goto err_exit;
+ }
+
/* Check if actions specified are compatible */
if (attr->egress) {
- /* Only DROP/COUNT is supported */
- if (!(req_act & OTX2_FLOW_ACT_DROP)) {
- errmsg = "DROP is required action for egress";
- errcode = EINVAL;
- goto err_exit;
- } else if (req_act & ~(OTX2_FLOW_ACT_DROP |
- OTX2_FLOW_ACT_COUNT)) {
- errmsg = "Unsupported action specified";
+ if (req_act & OTX2_FLOW_ACT_VLAN_STRIP) {
+ errmsg = "VLAN pop action is not supported on Egress";
errcode = ENOTSUP;
goto err_exit;
}
- flow->npc_action = NIX_TX_ACTIONOP_DROP;
+
+ if (req_act & OTX2_FLOW_ACT_DROP) {
+ flow->npc_action = NIX_TX_ACTIONOP_DROP;
+ } else if ((req_act & OTX2_FLOW_ACT_COUNT) ||
+ vlan_insert_action) {
+ flow->npc_action = NIX_TX_ACTIONOP_UCAST_DEFAULT;
+ } else {
+ errmsg = "Unsupported action for egress";
+ errcode = EINVAL;
+ goto err_exit;
+ }
goto set_pf_func;
}
goto err_exit;
}
+ if (vlan_insert_action) {
+ errmsg = "VLAN push/Insert action is not supported on Ingress";
+ errcode = ENOTSUP;
+ goto err_exit;
+ }
+
+ if (req_act & OTX2_FLOW_ACT_VLAN_STRIP)
+ npc->vtag_actions++;
+
+ /* Only VLAN action is provided */
+ if (req_act == OTX2_FLOW_ACT_VLAN_STRIP)
+ flow->npc_action = NIX_RX_ACTIONOP_UCAST;
/* Set NIX_RX_ACTIONOP */
- if (req_act & (OTX2_FLOW_ACT_PF | OTX2_FLOW_ACT_VF)) {
+ else if (req_act & (OTX2_FLOW_ACT_PF | OTX2_FLOW_ACT_VF)) {
flow->npc_action = NIX_RX_ACTIONOP_UCAST;
if (req_act & OTX2_FLOW_ACT_QUEUE)
flow->npc_action |= (uint64_t)rq << 20;
otx2_eth_set_rx_function(dev);
}
+ if (npc->vtag_actions == 1) {
+ hw->rx_offload_flags |= NIX_RX_OFFLOAD_VLAN_STRIP_F;
+ otx2_eth_set_rx_function(dev);
+ }
+
set_pf_func:
/* Ideally AF must ensure that correct pf_func is set */
flow->npc_action |= (uint64_t)pf_func << 4;
(flow->nix_intf == OTX2_INTF_RX) ? NPC_MCAM_RX : NPC_MCAM_TX;
req->enable_entry = 1;
req->entry_data.action = flow->npc_action;
-
- /*
- * DPDK sets vtag action on per interface basis, not
- * per flow basis. It is a matter of how we decide to support
- * this pmd specific behavior. There are two ways:
- * 1. Inherit the vtag action from the one configured
- * for this interface. This can be read from the
- * vtag_action configured for default mcam entry of
- * this pf_func.
- * 2. Do not support vtag action with rte_flow.
- *
- * Second approach is used now.
- */
- req->entry_data.vtag_action = 0ULL;
+ req->entry_data.vtag_action = flow->vtag_action;
for (idx = 0; idx < OTX2_MAX_MCAM_WIDTH_DWORDS; idx++) {
req->entry_data.kw[idx] = flow->mcam_data[idx];
git.droids-corp.org / dpdk.git / commitdiff