net/mlx5: make VLAN network interface thread safe
[dpdk.git] / drivers / net / octeontx2 / otx2_flow.c
index f1fb9f9..e07cea7 100644 (file)
@@ -3,8 +3,11 @@
  */
 
 #include "otx2_ethdev.h"
+#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)
 {
@@ -269,6 +272,8 @@ flow_program_rss_action(struct rte_eth_dev *eth_dev,
                        if (rc)
                                return rc;
 
+                       flow->npc_action &= (~(0xfULL));
+                       flow->npc_action |= NIX_RX_ACTIONOP_RSS;
                        flow->npc_action |=
                                ((uint64_t)(alg_idx & NIX_RSS_ACT_ALG_MASK) <<
                                 NIX_RSS_ACT_ALG_OFFSET) |
@@ -299,6 +304,21 @@ flow_free_rss_action(struct rte_eth_dev *eth_dev,
        return 0;
 }
 
+static int
+flow_update_sec_tt(struct rte_eth_dev *eth_dev,
+                  const struct rte_flow_action actions[])
+{
+       int rc = 0;
+
+       for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
+               if (actions->type == RTE_FLOW_ACTION_TYPE_SECURITY) {
+                       rc = otx2_eth_sec_update_tag_type(eth_dev);
+                       break;
+               }
+       }
+
+       return rc;
+}
 
 static int
 flow_parse_meta_items(__rte_unused struct otx2_parse_state *pst)
@@ -444,6 +464,109 @@ otx2_flow_validate(struct rte_eth_dev *dev,
                               &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,
@@ -473,6 +596,15 @@ otx2_flow_create(struct rte_eth_dev *dev,
        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,
@@ -491,6 +623,16 @@ otx2_flow_create(struct rte_eth_dev *dev,
                goto err_exit;
        }
 
+       if (hw->rx_offloads & DEV_RX_OFFLOAD_SECURITY) {
+               rc = flow_update_sec_tt(dev, actions);
+               if (rc != 0) {
+                       rte_flow_error_set(error, EIO,
+                                          RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+                                          NULL,
+                                          "Failed to update tt with sec act");
+                       goto err_exit;
+               }
+       }
 
        list = &hw->npc_flow.flow_list[flow->priority];
        /* List in ascending order of mcam entries */
@@ -535,6 +677,17 @@ otx2_flow_destroy(struct rte_eth_dev *dev,
                }
        }
 
+       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,
@@ -823,6 +976,7 @@ otx2_flow_init(struct otx2_eth_dev *hw)
        }
 
        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 */