Skip to content

Commit

Permalink
net/cnxk: support flow API on CN20K
Browse files Browse the repository at this point in the history 
Support for rte flow in cn20k.

Signed-off-by: Satheesh Paul <[email protected]>
Reviewed-by: Kiran Kumar K <[email protected]>
  • Loading branch information
@satheeshpaul @jerinjacobk
satheeshpaul authored and jerinjacobk committed Feb 6, 2025
1 parent cedbdf7 commit 9d29cd6
Show file tree
Hide file tree
Showing 13 changed files with 399 additions and 237 deletions.
4 changes: 4 additions & 0 deletions doc/guides/rel_notes/release_25_03.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ New Features

* Added support for the TCP Segmentation Offload (TSO).

* **Updated Marvell cnxk net driver.**

* Added flow rules support for CN20K SoC.

* **Updated Wangxun ngbe driver.**

* Added support for virtual function (VF).
Expand Down
227 changes: 14 additions & 213 deletions drivers/net/cnxk/cn10k_flow.c
View file
Original file line number Diff line number Diff line change
@@ -1,215 +1,29 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(C) 2020 Marvell.
*/
#include "cn10k_flow.h"

#include "cn10k_ethdev.h"
#include "cn10k_rx.h"
#include "cnxk_ethdev_mcs.h"
#include "cnxk_flow_common.h"
#include <cn10k_flow.h>
#include <cnxk_flow.h>

static int
cn10k_mtr_connect(struct rte_eth_dev *eth_dev, uint32_t mtr_id)
{
return nix_mtr_connect(eth_dev, mtr_id);
}

static int
cn10k_mtr_destroy(struct rte_eth_dev *eth_dev, uint32_t mtr_id)
{
struct rte_mtr_error mtr_error;

return nix_mtr_destroy(eth_dev, mtr_id, &mtr_error);
}

static int
cn10k_mtr_configure(struct rte_eth_dev *eth_dev,
const struct rte_flow_action actions[])
{
uint32_t mtr_id = 0xffff, prev_mtr_id = 0xffff, next_mtr_id = 0xffff;
const struct rte_flow_action_meter *mtr_conf;
const struct rte_flow_action_queue *q_conf;
const struct rte_flow_action_rss *rss_conf;
struct cnxk_mtr_policy_node *policy;
bool is_mtr_act = false;
int tree_level = 0;
int rc = -EINVAL, i;

for (i = 0; actions[i].type != RTE_FLOW_ACTION_TYPE_END; i++) {
if (actions[i].type == RTE_FLOW_ACTION_TYPE_METER) {
mtr_conf = (const struct rte_flow_action_meter
*)(actions[i].conf);
mtr_id = mtr_conf->mtr_id;
is_mtr_act = true;
}
if (actions[i].type == RTE_FLOW_ACTION_TYPE_QUEUE) {
q_conf = (const struct rte_flow_action_queue
*)(actions[i].conf);
if (is_mtr_act)
nix_mtr_rq_update(eth_dev, mtr_id, 1,
&q_conf->index);
}
if (actions[i].type == RTE_FLOW_ACTION_TYPE_RSS) {
rss_conf = (const struct rte_flow_action_rss
*)(actions[i].conf);
if (is_mtr_act)
nix_mtr_rq_update(eth_dev, mtr_id,
rss_conf->queue_num,
rss_conf->queue);
}
}

if (!is_mtr_act)
return rc;

prev_mtr_id = mtr_id;
next_mtr_id = mtr_id;
while (next_mtr_id != 0xffff) {
rc = nix_mtr_validate(eth_dev, next_mtr_id);
if (rc)
return rc;

rc = nix_mtr_policy_act_get(eth_dev, next_mtr_id, &policy);
if (rc)
return rc;

rc = nix_mtr_color_action_validate(eth_dev, mtr_id,
&prev_mtr_id, &next_mtr_id,
policy, &tree_level);
if (rc)
return rc;
}

return nix_mtr_configure(eth_dev, mtr_id);
}

static int
cn10k_rss_action_validate(struct rte_eth_dev *eth_dev,
const struct rte_flow_attr *attr,
const struct rte_flow_action *act)
{
const struct rte_flow_action_rss *rss;

if (act == NULL)
return -EINVAL;

rss = (const struct rte_flow_action_rss *)act->conf;

if (attr->egress) {
plt_err("No support of RSS in egress");
return -EINVAL;
}

if (eth_dev->data->dev_conf.rxmode.mq_mode != RTE_ETH_MQ_RX_RSS) {
plt_err("multi-queue mode is disabled");
return -ENOTSUP;
}

if (!rss || !rss->queue_num) {
plt_err("no valid queues");
return -EINVAL;
}

if (rss->func != RTE_ETH_HASH_FUNCTION_DEFAULT) {
plt_err("non-default RSS hash functions are not supported");
return -ENOTSUP;
}

if (rss->key_len && rss->key_len > ROC_NIX_RSS_KEY_LEN) {
plt_err("RSS hash key too large");
return -ENOTSUP;
}

return 0;
}

struct rte_flow *
cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
const struct rte_flow_item pattern[], const struct rte_flow_action actions[],
struct rte_flow_error *error)
{
struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
const struct rte_flow_action *action_rss = NULL;
const struct rte_flow_action_meter *mtr = NULL;
const struct rte_flow_action *act_q = NULL;
struct roc_npc *npc = &dev->npc;
struct roc_npc_flow *flow;
void *mcs_flow = NULL;
int vtag_actions = 0;
uint32_t req_act = 0;
int mark_actions;
int i, rc;

for (i = 0; actions[i].type != RTE_FLOW_ACTION_TYPE_END; i++) {
if (actions[i].type == RTE_FLOW_ACTION_TYPE_METER)
req_act |= ROC_NPC_ACTION_TYPE_METER;

if (actions[i].type == RTE_FLOW_ACTION_TYPE_QUEUE) {
req_act |= ROC_NPC_ACTION_TYPE_QUEUE;
act_q = &actions[i];
}
if (actions[i].type == RTE_FLOW_ACTION_TYPE_RSS) {
req_act |= ROC_NPC_ACTION_TYPE_RSS;
action_rss = &actions[i];
}
}

if (req_act & ROC_NPC_ACTION_TYPE_METER) {
if ((req_act & ROC_NPC_ACTION_TYPE_RSS) &&
((req_act & ROC_NPC_ACTION_TYPE_QUEUE))) {
return NULL;
}
if (req_act & ROC_NPC_ACTION_TYPE_RSS) {
rc = cn10k_rss_action_validate(eth_dev, attr,
action_rss);
if (rc)
return NULL;
} else if (req_act & ROC_NPC_ACTION_TYPE_QUEUE) {
const struct rte_flow_action_queue *act_queue;
act_queue = (const struct rte_flow_action_queue *)
act_q->conf;
if (act_queue->index > eth_dev->data->nb_rx_queues)
return NULL;
} else {
return NULL;
}
}
for (i = 0; actions[i].type != RTE_FLOW_ACTION_TYPE_END; i++) {
if (actions[i].type == RTE_FLOW_ACTION_TYPE_METER) {
mtr = (const struct rte_flow_action_meter *)actions[i]
.conf;
rc = cn10k_mtr_configure(eth_dev, actions);
if (rc) {
rte_flow_error_set(error, rc,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"Failed to configure mtr ");
return NULL;
}
break;
}
}

if (actions[0].type == RTE_FLOW_ACTION_TYPE_SECURITY &&
cnxk_eth_macsec_sess_get_by_sess(dev, actions[0].conf) != NULL) {
rc = cnxk_mcs_flow_configure(eth_dev, attr, pattern, actions, error, &mcs_flow);
if (rc) {
rte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_ACTION, NULL,
"Failed to configure mcs flow");
return NULL;
}
return (struct rte_flow *)mcs_flow;
}

flow = cnxk_flow_create(eth_dev, attr, pattern, actions, error);
if (!flow) {
if (mtr)
nix_mtr_chain_reset(eth_dev, mtr->mtr_id);

if (!flow)
return NULL;
} else {
if (mtr)
cn10k_mtr_connect(eth_dev, mtr->mtr_id);
}

mark_actions = roc_npc_mark_actions_get(npc);
if (mark_actions) {
Expand All @@ -231,16 +45,7 @@ int
cn10k_flow_info_get(struct rte_eth_dev *dev, struct rte_flow_port_info *port_info,
struct rte_flow_queue_info *queue_info, struct rte_flow_error *err)
{
RTE_SET_USED(dev);
RTE_SET_USED(err);

memset(port_info, 0, sizeof(*port_info));
memset(queue_info, 0, sizeof(*queue_info));

port_info->max_nb_counters = CN10K_NPC_COUNTERS_MAX;
port_info->max_nb_meters = CNXK_NIX_MTR_COUNT_MAX;

return 0;
return cnxk_flow_info_get_common(dev, port_info, queue_info, err);
}

int
Expand All @@ -250,14 +55,12 @@ 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);
struct roc_npc *npc = &dev->npc;
int vtag_actions = 0;
int vtag_actions = 0, rc = 0;
int mark_actions;
uint16_t match_id;
uint32_t mtr_id;
int rc;

match_id = (flow->npc_action >> NPC_RX_ACT_MATCH_OFFSET) &
NPC_RX_ACT_MATCH_MASK;
match_id = (flow->npc_action >> NPC_RX_ACT_MATCH_OFFSET) & NPC_RX_ACT_MATCH_MASK;
if (match_id) {
mark_actions = roc_npc_mark_actions_sub_return(npc, 1);
if (mark_actions == 0) {
Expand All @@ -271,8 +74,7 @@ cn10k_flow_destroy(struct rte_eth_dev *eth_dev, struct rte_flow *rte_flow,
if (flow->nix_intf == ROC_NPC_INTF_RX) {
vtag_actions = roc_npc_vtag_actions_sub_return(npc, 1);
if (vtag_actions == 0) {
dev->rx_offload_flags &=
~NIX_RX_OFFLOAD_VLAN_STRIP_F;
dev->rx_offload_flags &= ~NIX_RX_OFFLOAD_VLAN_STRIP_F;
cn10k_eth_set_rx_function(eth_dev);
}
}
Expand All @@ -281,19 +83,18 @@ cn10k_flow_destroy(struct rte_eth_dev *eth_dev, struct rte_flow *rte_flow,
if (cnxk_eth_macsec_sess_get_by_sess(dev, (void *)flow) != NULL) {
rc = cnxk_mcs_flow_destroy(dev, (void *)flow);
if (rc < 0)
rte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL, "Failed to free mcs flow");
rte_flow_error_set(error, rc, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
"Failed to free mcs flow");
return rc;
}

mtr_id = flow->mtr_id;
rc = cnxk_flow_destroy(eth_dev, flow, error);
if (!rc && mtr_id != ROC_NIX_MTR_ID_INVALID) {
rc = cn10k_mtr_destroy(eth_dev, mtr_id);
rc = cnxk_mtr_destroy(eth_dev, mtr_id);
if (rc) {
rte_flow_error_set(error, ENXIO,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
"Meter attached to this flow does not exist");
rte_flow_error_set(error, ENXIO, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
"Meter attached to this flow does not exist");
}
}
return rc;
Expand Down
10 changes: 5 additions & 5 deletions drivers/net/cnxk/cn10k_flow.h
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(C) 2020 Marvell.
* Copyright(C) 2024 Marvell.
*/
#ifndef __CN10K_RTE_FLOW_H__
#define __CN10K_RTE_FLOW_H__
#ifndef __CN10K_FLOW_H__
#define __CN10K_FLOW_H__

#include <rte_flow_driver.h>

Expand All @@ -16,6 +16,6 @@ int cn10k_flow_destroy(struct rte_eth_dev *dev, struct rte_flow *flow,
int cn10k_flow_info_get(struct rte_eth_dev *dev, struct rte_flow_port_info *port_info,
struct rte_flow_queue_info *queue_info, struct rte_flow_error *err);

#define CN10K_NPC_COUNTERS_MAX 512
#define CNXK_NPC_COUNTERS_MAX 512

#endif /* __CN10K_RTE_FLOW_H__ */
#endif /* __CN10K_FLOW_H__ */
4 changes: 4 additions & 0 deletions drivers/net/cnxk/cn20k_ethdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* Copyright(C) 2024 Marvell.
*/
#include "cn20k_ethdev.h"
#include "cn20k_flow.h"
#include "cn20k_rx.h"
#include "cn20k_tx.h"

Expand Down Expand Up @@ -867,6 +868,9 @@ npc_flow_ops_override(void)
init_once = 1;

/* Update platform specific ops */
cnxk_flow_ops.create = cn20k_flow_create;
cnxk_flow_ops.destroy = cn20k_flow_destroy;
cnxk_flow_ops.info_get = cn20k_flow_info_get;
}

static int
Expand Down
Loading

0 comments on commit 9d29cd6

Please sign in to comment.