Adding represented port item matching and action support
for cnxk device.
Signed-off-by: Kiran Kumar K <kirankum...@marvell.com>
Signed-off-by: Harman Kalra <hka...@marvell.com>
---
doc/guides/nics/features/cnxk.ini | 1 +
doc/guides/nics/features/cnxk_vec.ini | 2 +
doc/guides/nics/features/cnxk_vf.ini | 2 +
drivers/net/cnxk/cnxk_flow.c | 161 ++++++++++++++++----------
4 files changed, 107 insertions(+), 59 deletions(-)
diff --git a/doc/guides/nics/features/cnxk.ini
b/doc/guides/nics/features/cnxk.ini
index f5ff692c27..3b74c6739e 100644
--- a/doc/guides/nics/features/cnxk.ini
+++ b/doc/guides/nics/features/cnxk.ini
@@ -79,6 +79,7 @@ udp = Y
vlan = Y
vxlan = Y
vxlan_gpe = Y
+represented_port = Y
[rte_flow actions]
count = Y
diff --git a/doc/guides/nics/features/cnxk_vec.ini
b/doc/guides/nics/features/cnxk_vec.ini
index e2cac64e4b..b33eaaf5d9 100644
--- a/doc/guides/nics/features/cnxk_vec.ini
+++ b/doc/guides/nics/features/cnxk_vec.ini
@@ -73,6 +73,7 @@ udp = Y
vlan = Y
vxlan = Y
vxlan_gpe = Y
+represented_port = Y
[rte_flow actions]
count = Y
@@ -86,5 +87,6 @@ of_set_vlan_vid = Y
pf = Y
queue = Y
rss = Y
+represented_port = Y
security = Y
vf = Y
diff --git a/doc/guides/nics/features/cnxk_vf.ini
b/doc/guides/nics/features/cnxk_vf.ini
index 5579007831..70d7772b92 100644
--- a/doc/guides/nics/features/cnxk_vf.ini
+++ b/doc/guides/nics/features/cnxk_vf.ini
@@ -70,6 +70,7 @@ udp = Y
vlan = Y
vxlan = Y
vxlan_gpe = Y
+represented_port = Y
[rte_flow actions]
count = Y
@@ -83,6 +84,7 @@ of_set_vlan_pcp = Y
of_set_vlan_vid = Y
pf = Y
queue = Y
+represented_port = Y
rss = Y
security = Y
skip_cman = Y
diff --git a/drivers/net/cnxk/cnxk_flow.c b/drivers/net/cnxk/cnxk_flow.c
index c08b09338d..d8213f92e8 100644
--- a/drivers/net/cnxk/cnxk_flow.c
+++ b/drivers/net/cnxk/cnxk_flow.c
@@ -4,69 +4,48 @@
#include <cnxk_flow.h>
const struct cnxk_rte_flow_term_info term[] = {
- [RTE_FLOW_ITEM_TYPE_ETH] = {ROC_NPC_ITEM_TYPE_ETH,
- sizeof(struct rte_flow_item_eth)},
- [RTE_FLOW_ITEM_TYPE_VLAN] = {ROC_NPC_ITEM_TYPE_VLAN,
- sizeof(struct rte_flow_item_vlan)},
- [RTE_FLOW_ITEM_TYPE_E_TAG] = {ROC_NPC_ITEM_TYPE_E_TAG,
- sizeof(struct rte_flow_item_e_tag)},
- [RTE_FLOW_ITEM_TYPE_IPV4] = {ROC_NPC_ITEM_TYPE_IPV4,
- sizeof(struct rte_flow_item_ipv4)},
- [RTE_FLOW_ITEM_TYPE_IPV6] = {ROC_NPC_ITEM_TYPE_IPV6,
- sizeof(struct rte_flow_item_ipv6)},
- [RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT] = {
- ROC_NPC_ITEM_TYPE_IPV6_FRAG_EXT,
- sizeof(struct rte_flow_item_ipv6_frag_ext)},
- [RTE_FLOW_ITEM_TYPE_ARP_ETH_IPV4] = {
- ROC_NPC_ITEM_TYPE_ARP_ETH_IPV4,
- sizeof(struct rte_flow_item_arp_eth_ipv4)},
- [RTE_FLOW_ITEM_TYPE_MPLS] = {ROC_NPC_ITEM_TYPE_MPLS,
- sizeof(struct rte_flow_item_mpls)},
- [RTE_FLOW_ITEM_TYPE_ICMP] = {ROC_NPC_ITEM_TYPE_ICMP,
- sizeof(struct rte_flow_item_icmp)},
- [RTE_FLOW_ITEM_TYPE_UDP] = {ROC_NPC_ITEM_TYPE_UDP,
- sizeof(struct rte_flow_item_udp)},
- [RTE_FLOW_ITEM_TYPE_TCP] = {ROC_NPC_ITEM_TYPE_TCP,
- sizeof(struct rte_flow_item_tcp)},
- [RTE_FLOW_ITEM_TYPE_SCTP] = {ROC_NPC_ITEM_TYPE_SCTP,
- sizeof(struct rte_flow_item_sctp)},
- [RTE_FLOW_ITEM_TYPE_ESP] = {ROC_NPC_ITEM_TYPE_ESP,
- sizeof(struct rte_flow_item_esp)},
- [RTE_FLOW_ITEM_TYPE_GRE] = {ROC_NPC_ITEM_TYPE_GRE,
- sizeof(struct rte_flow_item_gre)},
- [RTE_FLOW_ITEM_TYPE_NVGRE] = {ROC_NPC_ITEM_TYPE_NVGRE,
- sizeof(struct rte_flow_item_nvgre)},
- [RTE_FLOW_ITEM_TYPE_VXLAN] = {ROC_NPC_ITEM_TYPE_VXLAN,
- sizeof(struct rte_flow_item_vxlan)},
- [RTE_FLOW_ITEM_TYPE_GTPC] = {ROC_NPC_ITEM_TYPE_GTPC,
- sizeof(struct rte_flow_item_gtp)},
- [RTE_FLOW_ITEM_TYPE_GTPU] = {ROC_NPC_ITEM_TYPE_GTPU,
- sizeof(struct rte_flow_item_gtp)},
+ [RTE_FLOW_ITEM_TYPE_ETH] = {ROC_NPC_ITEM_TYPE_ETH, sizeof(struct
rte_flow_item_eth)},
+ [RTE_FLOW_ITEM_TYPE_VLAN] = {ROC_NPC_ITEM_TYPE_VLAN, sizeof(struct
rte_flow_item_vlan)},
+ [RTE_FLOW_ITEM_TYPE_E_TAG] = {ROC_NPC_ITEM_TYPE_E_TAG, sizeof(struct
rte_flow_item_e_tag)},
+ [RTE_FLOW_ITEM_TYPE_IPV4] = {ROC_NPC_ITEM_TYPE_IPV4, sizeof(struct
rte_flow_item_ipv4)},
+ [RTE_FLOW_ITEM_TYPE_IPV6] = {ROC_NPC_ITEM_TYPE_IPV6, sizeof(struct
rte_flow_item_ipv6)},
+ [RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT] = {ROC_NPC_ITEM_TYPE_IPV6_FRAG_EXT,
+ sizeof(struct
rte_flow_item_ipv6_frag_ext)},
+ [RTE_FLOW_ITEM_TYPE_ARP_ETH_IPV4] = {ROC_NPC_ITEM_TYPE_ARP_ETH_IPV4,
+ sizeof(struct
rte_flow_item_arp_eth_ipv4)},
+ [RTE_FLOW_ITEM_TYPE_MPLS] = {ROC_NPC_ITEM_TYPE_MPLS, sizeof(struct
rte_flow_item_mpls)},
+ [RTE_FLOW_ITEM_TYPE_ICMP] = {ROC_NPC_ITEM_TYPE_ICMP, sizeof(struct
rte_flow_item_icmp)},
+ [RTE_FLOW_ITEM_TYPE_UDP] = {ROC_NPC_ITEM_TYPE_UDP, sizeof(struct
rte_flow_item_udp)},
+ [RTE_FLOW_ITEM_TYPE_TCP] = {ROC_NPC_ITEM_TYPE_TCP, sizeof(struct
rte_flow_item_tcp)},
+ [RTE_FLOW_ITEM_TYPE_SCTP] = {ROC_NPC_ITEM_TYPE_SCTP, sizeof(struct
rte_flow_item_sctp)},
+ [RTE_FLOW_ITEM_TYPE_ESP] = {ROC_NPC_ITEM_TYPE_ESP, sizeof(struct
rte_flow_item_esp)},
+ [RTE_FLOW_ITEM_TYPE_GRE] = {ROC_NPC_ITEM_TYPE_GRE, sizeof(struct
rte_flow_item_gre)},
+ [RTE_FLOW_ITEM_TYPE_NVGRE] = {ROC_NPC_ITEM_TYPE_NVGRE, sizeof(struct
rte_flow_item_nvgre)},
+ [RTE_FLOW_ITEM_TYPE_VXLAN] = {ROC_NPC_ITEM_TYPE_VXLAN, sizeof(struct
rte_flow_item_vxlan)},
+ [RTE_FLOW_ITEM_TYPE_GTPC] = {ROC_NPC_ITEM_TYPE_GTPC, sizeof(struct
rte_flow_item_gtp)},
+ [RTE_FLOW_ITEM_TYPE_GTPU] = {ROC_NPC_ITEM_TYPE_GTPU, sizeof(struct
rte_flow_item_gtp)},
[RTE_FLOW_ITEM_TYPE_GENEVE] = {ROC_NPC_ITEM_TYPE_GENEVE,
sizeof(struct rte_flow_item_geneve)},
- [RTE_FLOW_ITEM_TYPE_VXLAN_GPE] = {
- ROC_NPC_ITEM_TYPE_VXLAN_GPE,
- sizeof(struct rte_flow_item_vxlan_gpe)},
+ [RTE_FLOW_ITEM_TYPE_VXLAN_GPE] = {ROC_NPC_ITEM_TYPE_VXLAN_GPE,
+ sizeof(struct
rte_flow_item_vxlan_gpe)},
[RTE_FLOW_ITEM_TYPE_IPV6_EXT] = {ROC_NPC_ITEM_TYPE_IPV6_EXT,
sizeof(struct rte_flow_item_ipv6_ext)},
[RTE_FLOW_ITEM_TYPE_VOID] = {ROC_NPC_ITEM_TYPE_VOID, 0},
[RTE_FLOW_ITEM_TYPE_ANY] = {ROC_NPC_ITEM_TYPE_ANY, 0},
- [RTE_FLOW_ITEM_TYPE_GRE_KEY] = {ROC_NPC_ITEM_TYPE_GRE_KEY,
- sizeof(uint32_t)},
+ [RTE_FLOW_ITEM_TYPE_GRE_KEY] = {ROC_NPC_ITEM_TYPE_GRE_KEY,
sizeof(uint32_t)},
[RTE_FLOW_ITEM_TYPE_HIGIG2] = {ROC_NPC_ITEM_TYPE_HIGIG2,
sizeof(struct rte_flow_item_higig2_hdr)},
- [RTE_FLOW_ITEM_TYPE_RAW] = {ROC_NPC_ITEM_TYPE_RAW,
- sizeof(struct rte_flow_item_raw)},
- [RTE_FLOW_ITEM_TYPE_MARK] = {ROC_NPC_ITEM_TYPE_MARK,
- sizeof(struct rte_flow_item_mark)},
+ [RTE_FLOW_ITEM_TYPE_RAW] = {ROC_NPC_ITEM_TYPE_RAW, sizeof(struct
rte_flow_item_raw)},
+ [RTE_FLOW_ITEM_TYPE_MARK] = {ROC_NPC_ITEM_TYPE_MARK, sizeof(struct
rte_flow_item_mark)},
[RTE_FLOW_ITEM_TYPE_IPV6_ROUTING_EXT] =
{ROC_NPC_ITEM_TYPE_IPV6_ROUTING_EXT,
- sizeof(struct
rte_flow_item_ipv6_routing_ext)},
+ sizeof(struct
rte_flow_item_ipv6_routing_ext)},
[RTE_FLOW_ITEM_TYPE_TX_QUEUE] = {ROC_NPC_ITEM_TYPE_TX_QUEUE,
- sizeof(struct rte_flow_item_tx_queue)}};
+ sizeof(struct rte_flow_item_tx_queue)},
+ [RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT] =
{ROC_NPC_ITEM_TYPE_REPRESENTED_PORT,
+ sizeof(struct
rte_flow_item_ethdev)}};
static int
-npc_rss_action_validate(struct rte_eth_dev *eth_dev,
- const struct rte_flow_attr *attr,
+npc_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;
@@ -274,28 +253,92 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const
struct rte_flow_attr *attr,
}
static int
-cnxk_map_flow_data(struct rte_eth_dev *eth_dev, const struct rte_flow_attr
*attr,
- const struct rte_flow_item pattern[], const struct
rte_flow_action actions[],
- struct roc_npc_attr *in_attr, struct roc_npc_item_info
in_pattern[],
- struct roc_npc_action in_actions[], uint32_t *flowkey_cfg,
uint16_t *dst_pf_func)
+cnxk_map_pattern(struct rte_eth_dev *eth_dev, const struct rte_flow_item
pattern[],
+ struct roc_npc_item_info in_pattern[])
{
+ struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
+ const struct rte_flow_item_ethdev *rep_eth_dev;
+ struct rte_eth_dev *portid_eth_dev;
+ char if_name[RTE_ETH_NAME_MAX_LEN];
+ struct cnxk_eth_dev *hw_dst;
int i = 0;
- in_attr->priority = attr->priority;
- in_attr->ingress = attr->ingress;
- in_attr->egress = attr->egress;
-
while (pattern->type != RTE_FLOW_ITEM_TYPE_END) {
in_pattern[i].spec = pattern->spec;
in_pattern[i].last = pattern->last;
in_pattern[i].mask = pattern->mask;
in_pattern[i].type = term[pattern->type].item_type;
in_pattern[i].size = term[pattern->type].item_size;
+ if (pattern->type == RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT) {
+ rep_eth_dev = (const struct rte_flow_item_ethdev
*)pattern->spec;
+ if (rte_eth_dev_get_name_by_port(rep_eth_dev->port_id,
if_name)) {
+ plt_err("Name not found for output port id");
+ goto fail;
+ }
+ portid_eth_dev = rte_eth_dev_allocated(if_name);
+ if (!portid_eth_dev) {
+ plt_err("eth_dev not found for output port id");
+ goto fail;
+ }
+ if (strcmp(portid_eth_dev->device->driver->name,
+ eth_dev->device->driver->name) != 0) {
+ plt_err("Output port not under same driver");
+ goto fail;
+ }
+ if (cnxk_ethdev_is_representor(if_name)) {
+ /* Case where represented port not part of same
+ * app and represented by a representor port.
+ */
+ struct cnxk_rep_dev *rep_dev;
+ struct cnxk_eth_dev *pf_dev;
+
+ rep_dev = cnxk_rep_pmd_priv(portid_eth_dev);
+ pf_dev = cnxk_eth_pmd_priv(rep_dev->parent_dev);
+ dev->npc.rep_npc = &pf_dev->npc;
+ dev->npc.rep_port_id = rep_eth_dev->port_id;
+ dev->npc.rep_pf_func = rep_dev->pf_func;
+ plt_rep_dbg("Represented port %d act port %d
rep_dev->pf_func 0x%x",
+ rep_eth_dev->port_id,
eth_dev->data->port_id,
+ rep_dev->pf_func);
+ } else {
+ /* Case where represented port part of same app
+ * as PF.
+ */
+ hw_dst = portid_eth_dev->data->dev_private;
+ dev->npc.rep_npc = &hw_dst->npc;
+ dev->npc.rep_port_id = rep_eth_dev->port_id;
+ dev->npc.rep_pf_func = hw_dst->npc.pf_func;
+ }
+ }
pattern++;
i++;
}
in_pattern[i].type = ROC_NPC_ITEM_TYPE_END;
+ return 0;
+fail:
+ return -EINVAL;
+}
+
+static int
+cnxk_map_flow_data(struct rte_eth_dev *eth_dev, const struct rte_flow_attr
*attr,
+ const struct rte_flow_item pattern[], const struct
rte_flow_action actions[],
+ struct roc_npc_attr *in_attr, struct roc_npc_item_info
in_pattern[],
+ struct roc_npc_action in_actions[], uint32_t *flowkey_cfg,
uint16_t *dst_pf_func)
+{
+ int rc;
+
+ in_attr->priority = attr->priority;
+ in_attr->ingress = attr->ingress;
+ in_attr->egress = attr->egress;
+ in_attr->transfer = attr->transfer;
+
+ rc = cnxk_map_pattern(eth_dev, pattern, in_pattern);
+ if (rc) {
+ plt_err("Failed to map pattern list");
+ return rc;
+ }
+
return cnxk_map_actions(eth_dev, attr, actions, in_actions,
flowkey_cfg, dst_pf_func);
}
--
2.18.0
