diff mbox series

[v6,6/9] ethdev: support multi-host in representor

Message ID 1613272907-22563-7-git-send-email-xuemingl@nvidia.com (mailing list archive)
State Changes Requested, archived
Delegated to: Ferruh Yigit
Headers show
Series ethdev: support SubFunction representor | expand

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Xueming(Steven) Li Feb. 14, 2021, 3:21 a.m. UTC
The NIC can have multiple PCIe links and can be attached to the multiple
hosts, for example the same single NIC can be shared for multiple server
units in the rack. On each PCIe link NIC can provide multiple PFs and
VFs/SFs based on these ones. To provide the unambiguous identification
of the PCIe function the controller index is added. The full representor
identifier consists of three indices - controller index, PF index, and
VF or SF index (if any).

This patch introduces controller index to ethdev representor syntax,
examples:

[[c#]pf#]vf#: VF port representor/s, example: pf0vf1
[[c#]pf#]sf#: SF port representor/s, example: c1pf1sf[0-3]

c# is controller(host) ID/range in case of multi-host, optional.

For user application (e.g. OVS), PMD is responsible to interpret and
locate representor device based on controller ID, PF ID and VF/SF ID in
representor syntax.

Signed-off-by: Xueming Li <xuemingl@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
---
 config/rte_config.h                |  1 +
 lib/librte_ethdev/ethdev_driver.h  |  4 ++++
 lib/librte_ethdev/ethdev_private.c | 25 +++++++++++++++++++++----
 3 files changed, 26 insertions(+), 4 deletions(-)

Comments

Andrew Rybchenko Feb. 15, 2021, 8:37 a.m. UTC | #1
On 2/14/21 6:21 AM, Xueming Li wrote:
> The NIC can have multiple PCIe links and can be attached to the multiple
> hosts, for example the same single NIC can be shared for multiple server
> units in the rack. On each PCIe link NIC can provide multiple PFs and
> VFs/SFs based on these ones. To provide the unambiguous identification
> of the PCIe function the controller index is added. The full representor
> identifier consists of three indices - controller index, PF index, and
> VF or SF index (if any).
> 
> This patch introduces controller index to ethdev representor syntax,
> examples:
> 
> [[c#]pf#]vf#: VF port representor/s, example: pf0vf1
> [[c#]pf#]sf#: SF port representor/s, example: c1pf1sf[0-3]
> 
> c# is controller(host) ID/range in case of multi-host, optional.
> 
> For user application (e.g. OVS), PMD is responsible to interpret and
> locate representor device based on controller ID, PF ID and VF/SF ID in
> representor syntax.
> 
> Signed-off-by: Xueming Li <xuemingl@nvidia.com>
> Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
> Acked-by: Thomas Monjalon <thomas@monjalon.net>

Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
diff mbox series

Patch

diff --git a/config/rte_config.h b/config/rte_config.h
index 55a2fc50ed..904a40b3c1 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -57,6 +57,7 @@ 
 #define RTE_MAX_QUEUES_PER_PORT 1024
 #define RTE_ETHDEV_QUEUE_STAT_CNTRS 16 /* max 256 */
 #define RTE_ETHDEV_RXTX_CALLBACKS 1
+#define RTE_MAX_MULTI_HOST_CTRLS 4
 
 /* cryptodev defines */
 #define RTE_CRYPTO_MAX_DEVS 64
diff --git a/lib/librte_ethdev/ethdev_driver.h b/lib/librte_ethdev/ethdev_driver.h
index d68b8401e7..06ff35266f 100644
--- a/lib/librte_ethdev/ethdev_driver.h
+++ b/lib/librte_ethdev/ethdev_driver.h
@@ -1222,6 +1222,10 @@  rte_eth_switch_domain_free(uint16_t domain_id);
  * One type of representor each structure.
  */
 struct rte_eth_devargs {
+	uint16_t mh_controllers[RTE_MAX_MULTI_HOST_CTRLS];
+	/** controller/s number in case of multi-host */
+	uint16_t nb_mh_controllers;
+	/** number of controllers in multi-host controllers field */
 	uint16_t ports[RTE_MAX_ETHPORTS];
 	/** port/s number to enable on a multi-port single function */
 	uint16_t nb_ports;
diff --git a/lib/librte_ethdev/ethdev_private.c b/lib/librte_ethdev/ethdev_private.c
index eea0686020..5cd62de6f8 100644
--- a/lib/librte_ethdev/ethdev_private.c
+++ b/lib/librte_ethdev/ethdev_private.c
@@ -118,8 +118,8 @@  rte_eth_devargs_process_list(char *str, uint16_t *list, uint16_t *len_list,
  *
  * Representor format:
  *   #: range or single number of VF representor - legacy
- *   [pf#]vf#: VF port representor/s
- *   [pf#]sf#: SF port representor/s
+ *   [[c#]pf#]vf#: VF port representor/s
+ *   [[c#]pf#]sf#: SF port representor/s
  *
  * Examples of #:
  *  2               - single
@@ -131,6 +131,14 @@  rte_eth_devargs_parse_representor_ports(char *str, void *data)
 {
 	struct rte_eth_devargs *eth_da = data;
 
+	if (str[0] == 'c') {
+		str += 1;
+		str = rte_eth_devargs_process_list(str, eth_da->mh_controllers,
+				&eth_da->nb_mh_controllers,
+				RTE_DIM(eth_da->mh_controllers));
+		if (str == NULL)
+			goto err;
+	}
 	if (str[0] == 'p' && str[1] == 'f') {
 		eth_da->type = RTE_ETH_REPRESENTOR_PF;
 		str += 2;
@@ -146,8 +154,9 @@  rte_eth_devargs_parse_representor_ports(char *str, void *data)
 		eth_da->type = RTE_ETH_REPRESENTOR_SF;
 		str += 2;
 	} else {
-		/* Don't mix legacy syntax with 'pf' section. */
-		if (eth_da->type == RTE_ETH_REPRESENTOR_PF) {
+		/* Don't mix legacy syntax with 'pf' and 'c' section. */
+		if (eth_da->type == RTE_ETH_REPRESENTOR_PF ||
+		    eth_da->nb_mh_controllers > 0) {
 			str = NULL;
 			goto err;
 		}
@@ -156,6 +165,14 @@  rte_eth_devargs_parse_representor_ports(char *str, void *data)
 	str = rte_eth_devargs_process_list(str, eth_da->representor_ports,
 		&eth_da->nb_representor_ports,
 		RTE_DIM(eth_da->representor_ports));
+	if (str == NULL)
+		goto err;
+	/* "pf" must sit in middle of "c" and "vf"/"sf". */
+	if (eth_da->nb_representor_ports > 0 && eth_da->nb_mh_controllers > 0 &&
+	    eth_da->nb_ports == 0) {
+		RTE_LOG(ERR, EAL, "'pf' section missing: %s\n", str);
+		return -1;
+	}
 err:
 	if (str == NULL)
 		RTE_LOG(ERR, EAL, "wrong representor format: %s\n", str);