net/cnxk: add Rx metadata negotiate operation

Added rx_metadata_negotiate API to enable mark update RX offload.
Removed software logic to enable/disable mark update inside flow
create/destroy APIs.

Signed-off-by: Satha Rao <skoteshwar@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>

diff --git a/drivers/net/cnxk/cn10k_ethdev.c b/drivers/net/cnxk/cn10k_ethdev.c
index f3003dd3df5dfc28f4dbafb12e0abfd447042d16..03ca1abe458889d7fd87b47892696703f18b0099 100644 (file)
--- a/drivers/net/cnxk/cn10k_ethdev.c
+++ b/drivers/net/cnxk/cn10k_ethdev.c
@@ -39,6 +39,9 @@ nix_rx_offload_flags(struct rte_eth_dev *eth_dev)
        if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SECURITY)
                flags |= NIX_RX_OFFLOAD_SECURITY_F;
 
+       if (dev->rx_mark_update)
+               flags |= NIX_RX_OFFLOAD_MARK_UPDATE_F;
+
        return flags;
 }
 
@@ -448,6 +451,27 @@ cn10k_nix_dev_start(struct rte_eth_dev *eth_dev)
        return 0;
 }
 
+static int
+cn10k_nix_rx_metadata_negotiate(struct rte_eth_dev *eth_dev, uint64_t *features)
+{
+       struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
+
+       *features &=
+               (RTE_ETH_RX_METADATA_USER_FLAG | RTE_ETH_RX_METADATA_USER_MARK);
+
+       if (*features) {
+               dev->rx_offload_flags |= NIX_RX_OFFLOAD_MARK_UPDATE_F;
+               dev->rx_mark_update = true;
+       } else {
+               dev->rx_offload_flags &= ~NIX_RX_OFFLOAD_MARK_UPDATE_F;
+               dev->rx_mark_update = false;
+       }
+
+       cn10k_eth_set_rx_function(eth_dev);
+
+       return 0;
+}
+
 /* Update platform specific eth dev ops */
 static void
 nix_eth_dev_ops_override(void)
@@ -467,6 +491,8 @@ nix_eth_dev_ops_override(void)
        cnxk_eth_dev_ops.dev_ptypes_set = cn10k_nix_ptypes_set;
        cnxk_eth_dev_ops.timesync_enable = cn10k_nix_timesync_enable;
        cnxk_eth_dev_ops.timesync_disable = cn10k_nix_timesync_disable;
+       cnxk_eth_dev_ops.rx_metadata_negotiate =
+               cn10k_nix_rx_metadata_negotiate;
 }
 
 static void

diff --git a/drivers/net/cnxk/cn10k_flow.c b/drivers/net/cnxk/cn10k_flow.c
index 63281d41a4200c2cee04e3abc7f4ea0bed812c4f..7df879a2bb8dd445e4a42f4f5268e51c2d2eeece 100644 (file)
--- a/drivers/net/cnxk/cn10k_flow.c
+++ b/drivers/net/cnxk/cn10k_flow.c
@@ -131,9 +131,9 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,
        const struct rte_flow_action *action_rss = NULL;
        const struct rte_flow_action_meter *mtr = NULL;
        const struct rte_flow_action *act_q = NULL;
-       int mark_actions = 0, vtag_actions = 0;
        struct roc_npc *npc = &dev->npc;
        struct roc_npc_flow *flow;
+       int vtag_actions = 0;
        uint32_t req_act = 0;
        int i, rc;
 
@@ -197,13 +197,6 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,
                        cn10k_mtr_connect(eth_dev, mtr->mtr_id);
        }
 
-       mark_actions = roc_npc_mark_actions_get(npc);
-
-       if (mark_actions) {
-               dev->rx_offload_flags |= NIX_RX_OFFLOAD_MARK_UPDATE_F;
-               cn10k_eth_set_rx_function(eth_dev);
-       }
-
        vtag_actions = roc_npc_vtag_actions_get(npc);
 
        if (vtag_actions) {
@@ -220,20 +213,11 @@ cn10k_flow_destroy(struct rte_eth_dev *eth_dev, struct rte_flow *rte_flow,
 {
        struct roc_npc_flow *flow = (struct roc_npc_flow *)rte_flow;
        struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
-       int mark_actions = 0, vtag_actions = 0;
        struct roc_npc *npc = &dev->npc;
+       int vtag_actions = 0;
        uint32_t mtr_id;
        int rc;
 
-       mark_actions = roc_npc_mark_actions_get(npc);
-       if (mark_actions) {
-               mark_actions = roc_npc_mark_actions_sub_return(npc, 1);
-               if (mark_actions == 0) {
-                       dev->rx_offload_flags &= ~NIX_RX_OFFLOAD_MARK_UPDATE_F;
-                       cn10k_eth_set_rx_function(eth_dev);
-               }
-       }
-
        vtag_actions = roc_npc_vtag_actions_get(npc);
        if (vtag_actions) {
                if (flow->nix_intf == ROC_NPC_INTF_RX) {

diff --git a/drivers/net/cnxk/cn9k_ethdev.c b/drivers/net/cnxk/cn9k_ethdev.c
index a890829065b3af17cbae5845c7d8c14bd26b982a..d81f9ac80f8080141ce8edb0a7da17d3b11c0e15 100644 (file)
--- a/drivers/net/cnxk/cn9k_ethdev.c
+++ b/drivers/net/cnxk/cn9k_ethdev.c
@@ -39,6 +39,9 @@ nix_rx_offload_flags(struct rte_eth_dev *eth_dev)
        if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SECURITY)
                flags |= NIX_RX_OFFLOAD_SECURITY_F;
 
+       if (dev->rx_mark_update)
+               flags |= NIX_RX_OFFLOAD_MARK_UPDATE_F;
+
        return flags;
 }
 
@@ -447,6 +450,27 @@ cn9k_nix_dev_start(struct rte_eth_dev *eth_dev)
        return 0;
 }
 
+static int
+cn9k_nix_rx_metadata_negotiate(struct rte_eth_dev *eth_dev, uint64_t *features)
+{
+       struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
+
+       *features &=
+               (RTE_ETH_RX_METADATA_USER_FLAG | RTE_ETH_RX_METADATA_USER_MARK);
+
+       if (*features) {
+               dev->rx_offload_flags |= NIX_RX_OFFLOAD_MARK_UPDATE_F;
+               dev->rx_mark_update = true;
+       } else {
+               dev->rx_offload_flags &= ~NIX_RX_OFFLOAD_MARK_UPDATE_F;
+               dev->rx_mark_update = false;
+       }
+
+       cn9k_eth_set_rx_function(eth_dev);
+
+       return 0;
+}
+
 /* Update platform specific eth dev ops */
 static void
 nix_eth_dev_ops_override(void)
@@ -467,6 +491,7 @@ nix_eth_dev_ops_override(void)
        cnxk_eth_dev_ops.timesync_enable = cn9k_nix_timesync_enable;
        cnxk_eth_dev_ops.timesync_disable = cn9k_nix_timesync_disable;
        cnxk_eth_dev_ops.mtr_ops_get = NULL;
+       cnxk_eth_dev_ops.rx_metadata_negotiate = cn9k_nix_rx_metadata_negotiate;
 }
 
 static void

diff --git a/drivers/net/cnxk/cn9k_flow.c b/drivers/net/cnxk/cn9k_flow.c
index d67580bf277de0af6e99059c528e30f2dbf7161b..15ccdf8919cbd1140d6527d0115919f20a12a1c7 100644 (file)
--- a/drivers/net/cnxk/cn9k_flow.c
+++ b/drivers/net/cnxk/cn9k_flow.c
@@ -13,21 +13,14 @@ cn9k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,
                 struct rte_flow_error *error)
 {
        struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
-       int mark_actions = 0, vtag_actions = 0;
        struct roc_npc *npc = &dev->npc;
        struct roc_npc_flow *flow;
+       int vtag_actions = 0;
 
        flow = cnxk_flow_create(eth_dev, attr, pattern, actions, error);
        if (!flow)
                return NULL;
 
-       mark_actions = roc_npc_mark_actions_get(npc);
-
-       if (mark_actions) {
-               dev->rx_offload_flags |= NIX_RX_OFFLOAD_MARK_UPDATE_F;
-               cn9k_eth_set_rx_function(eth_dev);
-       }
-
        vtag_actions = roc_npc_vtag_actions_get(npc);
 
        if (vtag_actions) {
@@ -44,17 +37,8 @@ cn9k_flow_destroy(struct rte_eth_dev *eth_dev, struct rte_flow *rte_flow,
 {
        struct roc_npc_flow *flow = (struct roc_npc_flow *)rte_flow;
        struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
-       int mark_actions = 0, vtag_actions = 0;
        struct roc_npc *npc = &dev->npc;
-
-       mark_actions = roc_npc_mark_actions_get(npc);
-       if (mark_actions) {
-               mark_actions = roc_npc_mark_actions_sub_return(npc, 1);
-               if (mark_actions == 0) {
-                       dev->rx_offload_flags &= ~NIX_RX_OFFLOAD_MARK_UPDATE_F;
-                       cn9k_eth_set_rx_function(eth_dev);
-               }
-       }
+       int vtag_actions = 0;
 
        vtag_actions = roc_npc_vtag_actions_get(npc);
        if (vtag_actions) {

diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h
index d71e7465e1a2e85f6537b7427943c439779f2ee7..ce42b8625a78e697d838411c3c934b41dd388e5a 100644 (file)
--- a/drivers/net/cnxk/cnxk_ethdev.h
+++ b/drivers/net/cnxk/cnxk_ethdev.h
@@ -351,6 +351,7 @@ struct cnxk_eth_dev {
        uint8_t ptype_disable;
        bool scalar_ena;
        bool ptp_en;
+       bool rx_mark_update; /* Enable/Disable mark update to mbuf */
 
        /* Pointer back to rte */
        struct rte_eth_dev *eth_dev;