net/octeontx2: sync inline tag type

Tag type configuration for the inline processed packets is set during
ethdev configuration, it might conflict with tag type configuration
done during Rx adapter configuration which would be setup later.

This conflict is fixed as part of flow rule creation by updating
tag type config of inline same as Rx adapter configured tag type.

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
Signed-off-by: Anoob Joseph <anoobj@marvell.com>
Signed-off-by: Archana Muniganti <marchana@marvell.com>
Signed-off-by: Tejasree Kondoj <ktejasree@marvell.com>
Signed-off-by: Vamsi Attunuru <vattunuru@marvell.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>

diff --git a/drivers/net/octeontx2/otx2_ethdev_sec.c b/drivers/net/octeontx2/otx2_ethdev_sec.c
index 9ea0dc49965e75dc7633a77a65c1a1416ef6b023..3858218cac3c2dad9d1b05a64fb70847120437a5 100644 (file)
--- a/drivers/net/octeontx2/otx2_ethdev_sec.c
+++ b/drivers/net/octeontx2/otx2_ethdev_sec.c
@@ -753,6 +753,34 @@ eth_sec_ipsec_cfg(struct rte_eth_dev *eth_dev, uint8_t tt)
        return otx2_mbox_process(mbox);
 }
 
+int
+otx2_eth_sec_update_tag_type(struct rte_eth_dev *eth_dev)
+{
+       struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+       struct otx2_mbox *mbox = dev->mbox;
+       struct nix_aq_enq_rsp *rsp;
+       struct nix_aq_enq_req *aq;
+       int ret;
+
+       aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
+       aq->qidx = 0; /* Read RQ:0 context */
+       aq->ctype = NIX_AQ_CTYPE_RQ;
+       aq->op = NIX_AQ_INSTOP_READ;
+
+       ret = otx2_mbox_process_msg(mbox, (void *)&rsp);
+       if (ret < 0) {
+               otx2_err("Could not read RQ context");
+               return ret;
+       }
+
+       /* Update tag type */
+       ret = eth_sec_ipsec_cfg(eth_dev, rsp->rq.sso_tt);
+       if (ret < 0)
+               otx2_err("Could not update sec eth tag type");
+
+       return ret;
+}
+
 int
 otx2_eth_sec_init(struct rte_eth_dev *eth_dev)
 {

diff --git a/drivers/net/octeontx2/otx2_ethdev_sec.h b/drivers/net/octeontx2/otx2_ethdev_sec.h
index 783e41d9e2050072afed10f9bf0c2304dae12449..e24358a05ab8f0d23478e8eef98d57199313eae6 100644 (file)
--- a/drivers/net/octeontx2/otx2_ethdev_sec.h
+++ b/drivers/net/octeontx2/otx2_ethdev_sec.h
@@ -130,6 +130,8 @@ int otx2_eth_sec_ctx_create(struct rte_eth_dev *eth_dev);
 
 void otx2_eth_sec_ctx_destroy(struct rte_eth_dev *eth_dev);
 
+int otx2_eth_sec_update_tag_type(struct rte_eth_dev *eth_dev);
+
 int otx2_eth_sec_init(struct rte_eth_dev *eth_dev);
 
 void otx2_eth_sec_fini(struct rte_eth_dev *eth_dev);

diff --git a/drivers/net/octeontx2/otx2_flow.c b/drivers/net/octeontx2/otx2_flow.c
index f1fb9f9884d7e9047b902edcfc4c94219eb190b5..13a76e441251ef7102e97606c88b2bb7d4cf7419 100644 (file)
--- a/drivers/net/octeontx2/otx2_flow.c
+++ b/drivers/net/octeontx2/otx2_flow.c
@@ -3,6 +3,7 @@
  */
 
 #include "otx2_ethdev.h"
+#include "otx2_ethdev_sec.h"
 #include "otx2_flow.h"
 
 int
@@ -299,6 +300,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)
@@ -491,6 +507,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 */