diff mbox series

[v1] net/octeontx2: support flow action port id

Message ID 20210325160321.22016-1-smadarf@marvell.com (mailing list archive)
State Superseded, archived
Delegated to: Jerin Jacob
Headers show
Series [v1] net/octeontx2: support flow action port id | expand

Checks

Context Check Description
ci/iol-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/intel-Testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

smadarf@marvell.com March 25, 2021, 4:03 p.m. UTC
From: Smadar Fuks <smadarf@marvell.com>

Action port_id was not supported until now.
In this patch the action port_id supports passing from input
port PF to output port which is one of input port respective VF

Signed-off-by: Smadar Fuks <smadarf@marvell.com>
---
 doc/guides/nics/octeontx2.rst               |  6 +++
 drivers/net/octeontx2/otx2_ethdev.c         |  6 +--
 drivers/net/octeontx2/otx2_ethdev.h         |  5 +++
 drivers/net/octeontx2/otx2_ethdev_devargs.c |  2 +-
 drivers/net/octeontx2/otx2_flow_parse.c     | 47 ++++++++++++++++++++-
 5 files changed, 61 insertions(+), 5 deletions(-)

Comments

Jerin Jacob March 27, 2021, 2:29 p.m. UTC | #1
On Fri, Mar 26, 2021 at 3:18 PM <smadarf@marvell.com> wrote:
>
> From: Smadar Fuks <smadarf@marvell.com>
>
> Action port_id was not supported until now.
> In this patch the action port_id supports passing from input
> port PF to output port which is one of input port respective VF
>
> Signed-off-by: Smadar Fuks <smadarf@marvell.com>

Acked-by: Jerin Jacob <jerinj@marvell.com>
Applied to dpdk-next-net-mrvl/for-main. Thanks

> ---
>  doc/guides/nics/octeontx2.rst               |  6 +++
>  drivers/net/octeontx2/otx2_ethdev.c         |  6 +--
>  drivers/net/octeontx2/otx2_ethdev.h         |  5 +++
>  drivers/net/octeontx2/otx2_ethdev_devargs.c |  2 +-
>  drivers/net/octeontx2/otx2_flow_parse.c     | 47 ++++++++++++++++++++-
>  5 files changed, 61 insertions(+), 5 deletions(-)
>
> diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
> index cca7f7fc7..258c1693f 100644
> --- a/doc/guides/nics/octeontx2.rst
> +++ b/doc/guides/nics/octeontx2.rst
> @@ -401,6 +401,12 @@ Actions:
>     +----+-----------------------------------------+
>     | 11 | RTE_FLOW_ACTION_TYPE_OF_POP_VLAN        |
>     +----+-----------------------------------------+
> +   | 12 | RTE_FLOW_ACTION_TYPE_PORT_ID            |
> +   +----+-----------------------------------------+
> +
> +.. note::
> +
> +   ``RTE_FLOW_ACTION_TYPE_PORT_ID`` is only supported between PF and its VFs.
>
>  .. _table_octeontx2_supported_egress_action_types:
>
> diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c
> index 389b66d03..4f95917e7 100644
> --- a/drivers/net/octeontx2/otx2_ethdev.c
> +++ b/drivers/net/octeontx2/otx2_ethdev.c
> @@ -2802,6 +2802,6 @@ static struct rte_pci_driver pci_nix = {
>         .remove = nix_remove,
>  };
>
> -RTE_PMD_REGISTER_PCI(net_octeontx2, pci_nix);
> -RTE_PMD_REGISTER_PCI_TABLE(net_octeontx2, pci_nix_map);
> -RTE_PMD_REGISTER_KMOD_DEP(net_octeontx2, "vfio-pci");
> +RTE_PMD_REGISTER_PCI(OCTEONTX2_PMD, pci_nix);
> +RTE_PMD_REGISTER_PCI_TABLE(OCTEONTX2_PMD, pci_nix_map);
> +RTE_PMD_REGISTER_KMOD_DEP(OCTEONTX2_PMD, "vfio-pci");
> diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h
> index 99f0469d8..5a9dc9be0 100644
> --- a/drivers/net/octeontx2/otx2_ethdev.h
> +++ b/drivers/net/octeontx2/otx2_ethdev.h
> @@ -164,6 +164,11 @@
>  /* Additional timesync values. */
>  #define OTX2_CYCLECOUNTER_MASK   0xffffffffffffffffULL
>
> +#define OCTEONTX2_PMD                  net_octeontx2
> +
> +#define otx2_ethdev_is_same_driver(dev) \
> +       (strcmp((dev)->device->driver->name, RTE_STR(OCTEONTX2_PMD)) == 0)
> +
>  enum nix_q_size_e {
>         nix_q_size_16,  /* 16 entries */
>         nix_q_size_64,  /* 64 entries */
> diff --git a/drivers/net/octeontx2/otx2_ethdev_devargs.c b/drivers/net/octeontx2/otx2_ethdev_devargs.c
> index 8d9feb3a8..83f905315 100644
> --- a/drivers/net/octeontx2/otx2_ethdev_devargs.c
> +++ b/drivers/net/octeontx2/otx2_ethdev_devargs.c
> @@ -201,7 +201,7 @@ otx2_ethdev_parse_devargs(struct rte_devargs *devargs, struct otx2_eth_dev *dev)
>         return -EINVAL;
>  }
>
> -RTE_PMD_REGISTER_PARAM_STRING(net_octeontx2,
> +RTE_PMD_REGISTER_PARAM_STRING(OCTEONTX2_PMD,
>                               OTX2_RSS_RETA_SIZE "=<64|128|256>"
>                               OTX2_IPSEC_IN_MAX_SPI "=<1-65535>"
>                               OTX2_SCL_ENABLE "=1"
> diff --git a/drivers/net/octeontx2/otx2_flow_parse.c b/drivers/net/octeontx2/otx2_flow_parse.c
> index bbb845811..63a33142a 100644
> --- a/drivers/net/octeontx2/otx2_flow_parse.c
> +++ b/drivers/net/octeontx2/otx2_flow_parse.c
> @@ -900,14 +900,17 @@ otx2_flow_parse_actions(struct rte_eth_dev *dev,
>  {
>         struct otx2_eth_dev *hw = dev->data->dev_private;
>         struct otx2_npc_flow_info *npc = &hw->npc_flow;
> +       const struct rte_flow_action_port_id *port_act;
>         const struct rte_flow_action_count *act_count;
>         const struct rte_flow_action_mark *act_mark;
>         const struct rte_flow_action_queue *act_q;
>         const struct rte_flow_action_vf *vf_act;
> +       uint16_t pf_func, vf_id, port_id, pf_id;
> +       char if_name[RTE_ETH_NAME_MAX_LEN];
>         bool vlan_insert_action = false;
> +       struct rte_eth_dev *eth_dev;
>         const char *errmsg = NULL;
>         int sel_act, req_act = 0;
> -       uint16_t pf_func, vf_id;
>         int errcode = 0;
>         int mark = 0;
>         int rq = 0;
> @@ -983,6 +986,48 @@ otx2_flow_parse_actions(struct rte_eth_dev *dev,
>                         }
>                         break;
>
> +               case RTE_FLOW_ACTION_TYPE_PORT_ID:
> +                       port_act = (const struct rte_flow_action_port_id *)
> +                               actions->conf;
> +                       port_id = port_act->id;
> +                       if (rte_eth_dev_get_name_by_port(port_id, if_name)) {
> +                               errmsg = "Name not found for output port id";
> +                               errcode = EINVAL;
> +                               goto err_exit;
> +                       }
> +                       eth_dev = rte_eth_dev_allocated(if_name);
> +                       if (!eth_dev) {
> +                               errmsg = "eth_dev not found for output port id";
> +                               errcode = EINVAL;
> +                               goto err_exit;
> +                       }
> +                       if (!otx2_ethdev_is_same_driver(eth_dev)) {
> +                               errmsg = "Output port id unsupported type";
> +                               errcode = ENOTSUP;
> +                               goto err_exit;
> +                       }
> +                       if (!otx2_dev_is_vf(otx2_eth_pmd_priv(eth_dev))) {
> +                               errmsg = "Output port should be VF";
> +                               errcode = ENOTSUP;
> +                               goto err_exit;
> +                       }
> +                       vf_id = otx2_eth_pmd_priv(eth_dev)->vf;
> +                       if (vf_id  >= hw->maxvf) {
> +                               errmsg = "Invalid vf for output port";
> +                               errcode = EINVAL;
> +                               goto err_exit;
> +                       }
> +                       pf_id = otx2_eth_pmd_priv(eth_dev)->pf;
> +                       if (pf_id != hw->pf) {
> +                               errmsg = "Output port unsupported PF";
> +                               errcode = ENOTSUP;
> +                               goto err_exit;
> +                       }
> +                       pf_func &= (0xfc00);
> +                       pf_func = (pf_func | (vf_id + 1));
> +                       req_act |= OTX2_FLOW_ACT_VF;
> +                       break;
> +
>                 case RTE_FLOW_ACTION_TYPE_QUEUE:
>                         /* Applicable only to ingress flow */
>                         act_q = (const struct rte_flow_action_queue *)
> --
> 2.27.0
>
Ferruh Yigit March 31, 2021, 4:08 p.m. UTC | #2
On 3/27/2021 2:29 PM, Jerin Jacob wrote:
> On Fri, Mar 26, 2021 at 3:18 PM <smadarf@marvell.com> wrote:
>>
>> From: Smadar Fuks <smadarf@marvell.com>
>>
>> Action port_id was not supported until now.
>> In this patch the action port_id supports passing from input
>> port PF to output port which is one of input port respective VF
>>
>> Signed-off-by: Smadar Fuks <smadarf@marvell.com>
> 
> Acked-by: Jerin Jacob <jerinj@marvell.com>
> Applied to dpdk-next-net-mrvl/for-main. Thanks
> 

Can you please update release notes too?
diff mbox series

Patch

diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index cca7f7fc7..258c1693f 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -401,6 +401,12 @@  Actions:
    +----+-----------------------------------------+
    | 11 | RTE_FLOW_ACTION_TYPE_OF_POP_VLAN        |
    +----+-----------------------------------------+
+   | 12 | RTE_FLOW_ACTION_TYPE_PORT_ID            |
+   +----+-----------------------------------------+
+
+.. note::
+
+   ``RTE_FLOW_ACTION_TYPE_PORT_ID`` is only supported between PF and its VFs.
 
 .. _table_octeontx2_supported_egress_action_types:
 
diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c
index 389b66d03..4f95917e7 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -2802,6 +2802,6 @@  static struct rte_pci_driver pci_nix = {
 	.remove = nix_remove,
 };
 
-RTE_PMD_REGISTER_PCI(net_octeontx2, pci_nix);
-RTE_PMD_REGISTER_PCI_TABLE(net_octeontx2, pci_nix_map);
-RTE_PMD_REGISTER_KMOD_DEP(net_octeontx2, "vfio-pci");
+RTE_PMD_REGISTER_PCI(OCTEONTX2_PMD, pci_nix);
+RTE_PMD_REGISTER_PCI_TABLE(OCTEONTX2_PMD, pci_nix_map);
+RTE_PMD_REGISTER_KMOD_DEP(OCTEONTX2_PMD, "vfio-pci");
diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h
index 99f0469d8..5a9dc9be0 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -164,6 +164,11 @@ 
 /* Additional timesync values. */
 #define OTX2_CYCLECOUNTER_MASK   0xffffffffffffffffULL
 
+#define OCTEONTX2_PMD			net_octeontx2
+
+#define otx2_ethdev_is_same_driver(dev) \
+	(strcmp((dev)->device->driver->name, RTE_STR(OCTEONTX2_PMD)) == 0)
+
 enum nix_q_size_e {
 	nix_q_size_16,	/* 16 entries */
 	nix_q_size_64,	/* 64 entries */
diff --git a/drivers/net/octeontx2/otx2_ethdev_devargs.c b/drivers/net/octeontx2/otx2_ethdev_devargs.c
index 8d9feb3a8..83f905315 100644
--- a/drivers/net/octeontx2/otx2_ethdev_devargs.c
+++ b/drivers/net/octeontx2/otx2_ethdev_devargs.c
@@ -201,7 +201,7 @@  otx2_ethdev_parse_devargs(struct rte_devargs *devargs, struct otx2_eth_dev *dev)
 	return -EINVAL;
 }
 
-RTE_PMD_REGISTER_PARAM_STRING(net_octeontx2,
+RTE_PMD_REGISTER_PARAM_STRING(OCTEONTX2_PMD,
 			      OTX2_RSS_RETA_SIZE "=<64|128|256>"
 			      OTX2_IPSEC_IN_MAX_SPI "=<1-65535>"
 			      OTX2_SCL_ENABLE "=1"
diff --git a/drivers/net/octeontx2/otx2_flow_parse.c b/drivers/net/octeontx2/otx2_flow_parse.c
index bbb845811..63a33142a 100644
--- a/drivers/net/octeontx2/otx2_flow_parse.c
+++ b/drivers/net/octeontx2/otx2_flow_parse.c
@@ -900,14 +900,17 @@  otx2_flow_parse_actions(struct rte_eth_dev *dev,
 {
 	struct otx2_eth_dev *hw = dev->data->dev_private;
 	struct otx2_npc_flow_info *npc = &hw->npc_flow;
+	const struct rte_flow_action_port_id *port_act;
 	const struct rte_flow_action_count *act_count;
 	const struct rte_flow_action_mark *act_mark;
 	const struct rte_flow_action_queue *act_q;
 	const struct rte_flow_action_vf *vf_act;
+	uint16_t pf_func, vf_id, port_id, pf_id;
+	char if_name[RTE_ETH_NAME_MAX_LEN];
 	bool vlan_insert_action = false;
+	struct rte_eth_dev *eth_dev;
 	const char *errmsg = NULL;
 	int sel_act, req_act = 0;
-	uint16_t pf_func, vf_id;
 	int errcode = 0;
 	int mark = 0;
 	int rq = 0;
@@ -983,6 +986,48 @@  otx2_flow_parse_actions(struct rte_eth_dev *dev,
 			}
 			break;
 
+		case RTE_FLOW_ACTION_TYPE_PORT_ID:
+			port_act = (const struct rte_flow_action_port_id *)
+				actions->conf;
+			port_id = port_act->id;
+			if (rte_eth_dev_get_name_by_port(port_id, if_name)) {
+				errmsg = "Name not found for output port id";
+				errcode = EINVAL;
+				goto err_exit;
+			}
+			eth_dev = rte_eth_dev_allocated(if_name);
+			if (!eth_dev) {
+				errmsg = "eth_dev not found for output port id";
+				errcode = EINVAL;
+				goto err_exit;
+			}
+			if (!otx2_ethdev_is_same_driver(eth_dev)) {
+				errmsg = "Output port id unsupported type";
+				errcode = ENOTSUP;
+				goto err_exit;
+			}
+			if (!otx2_dev_is_vf(otx2_eth_pmd_priv(eth_dev))) {
+				errmsg = "Output port should be VF";
+				errcode = ENOTSUP;
+				goto err_exit;
+			}
+			vf_id = otx2_eth_pmd_priv(eth_dev)->vf;
+			if (vf_id  >= hw->maxvf) {
+				errmsg = "Invalid vf for output port";
+				errcode = EINVAL;
+				goto err_exit;
+			}
+			pf_id = otx2_eth_pmd_priv(eth_dev)->pf;
+			if (pf_id != hw->pf) {
+				errmsg = "Output port unsupported PF";
+				errcode = ENOTSUP;
+				goto err_exit;
+			}
+			pf_func &= (0xfc00);
+			pf_func = (pf_func | (vf_id + 1));
+			req_act |= OTX2_FLOW_ACT_VF;
+			break;
+
 		case RTE_FLOW_ACTION_TYPE_QUEUE:
 			/* Applicable only to ingress flow */
 			act_q = (const struct rte_flow_action_queue *)