Skip to contentSkip to conversation

ethdev: limit maximum number of queues

PATCH Superseded Thomas Monjalon 3 participants 10 messages Nov 27, 2019 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ethdev: limit maximum number of queues

A buffer overflow happens in testpmd with some drivers since the queue arrays are limited to RTE_MAX_QUEUES_PER_PORT.

The advertised capabilities of mlx4, mlx5 and softnic for the number of queues were the maximum number: UINT16_MAX. They must be limited by the configured RTE_MAX_QUEUES_PER_PORT that applications expect to be respected.

The limitation is applied in above drivers having no limitation, and at ethdev level (function rte_eth_dev_info_get), in order to force the configured limit for all drivers.

Fixes 7fae69eeff13 ("mlx4: new poll mode driver")
Fixes e60fbd5b24fc ("mlx5: add device configure/start/stop")
Fixes cc6d421574fe ("net/softnic: add softnic PMD")
Fixes 9e6b36c34ce9 ("app/testpmd: reduce memory consumption")
---
 drivers/net/mlx4/mlx4_ethdev.c        | 4 +---
 drivers/net/mlx5/mlx5_ethdev.c        | 4 +---
 drivers/net/softnic/rte_eth_softnic.c | 4 ++--
 lib/librte_ethdev/rte_ethdev.c        | 6 ++++++
 4 files changed, 10 insertions(+), 8 deletions(-)
drivers/net/mlx4/mlx4_ethdev.c +1 -3
index dfb24c22d0..a18a66cb4a 100644
@@ -646,9 +646,7 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
 	 */
 	max = ((priv->device_attr.max_cq > priv->device_attr.max_qp) ?
 	       priv->device_attr.max_qp : priv->device_attr.max_cq);
-	/* If max >= 65535 then max = 0, max_rx_queues is uint16_t. */
-	if (max >= 65535)
-		max = 65535;
+	max = RTE_MIN(max, (unsigned int)RTE_MAX_QUEUES_PER_PORT);
 	info->max_rx_queues = max;
 	info->max_tx_queues = max;
 	info->max_mac_addrs = RTE_DIM(priv->mac);
drivers/net/mlx5/mlx5_ethdev.c +1 -3
index d80ae458bc..045dae6b5a 100644
@@ -617,9 +617,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
 	 */
 	max = RTE_MIN(priv->sh->device_attr.orig_attr.max_cq,
 		      priv->sh->device_attr.orig_attr.max_qp);
-	/* If max >= 65535 then max = 0, max_rx_queues is uint16_t. */
-	if (max >= 65535)
-		max = 65535;
+	max = RTE_MIN(max, (unsigned int)RTE_MAX_QUEUES_PER_PORT);
 	info->max_rx_queues = max;
 	info->max_tx_queues = max;
 	info->max_mac_addrs = MLX5_MAX_UC_MAC_ADDRESSES;
drivers/net/softnic/rte_eth_softnic.c +2 -2
index 11723778fd..1065cbf847 100644
@@ -91,8 +91,8 @@ pmd_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
 	struct rte_eth_dev_info *dev_info)
 {
 	dev_info->max_rx_pktlen = UINT32_MAX;
-	dev_info->max_rx_queues = UINT16_MAX;
-	dev_info->max_tx_queues = UINT16_MAX;
+	dev_info->max_rx_queues = RTE_MAX_QUEUES_PER_PORT;
+	dev_info->max_tx_queues = RTE_MAX_QUEUES_PER_PORT;
 
 	return 0;
 }
lib/librte_ethdev/rte_ethdev.c +6 -0
index 8d2ce31a81..6e9cb243ea 100644
@@ -2986,6 +2986,12 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info)
 		return eth_err(port_id, diag);
 	}
 
+	/* Maximum number of queues should be <= RTE_MAX_QUEUES_PER_PORT */
+	dev_info->max_rx_queues = RTE_MIN(dev_info->max_rx_queues,
+			RTE_MAX_QUEUES_PER_PORT);
+	dev_info->max_tx_queues = RTE_MIN(dev_info->max_tx_queues,
+			RTE_MAX_QUEUES_PER_PORT);
+
 	dev_info->driver_name = dev->device->driver->name;
 	dev_info->nb_rx_queues = dev->data->nb_rx_queues;
 	dev_info->nb_tx_queues = dev->data->nb_tx_queues;
Signature · 1 line
2.23.0
#1 lore raw
Quoted 11 lines · Thomas Monjalon

A buffer overflow happens in testpmd with some drivers since the queue arrays are limited to RTE_MAX_QUEUES_PER_PORT.

The advertised capabilities of mlx4, mlx5 and softnic for the number of queues were the maximum number: UINT16_MAX. They must be limited by the configured RTE_MAX_QUEUES_PER_PORT that applications expect to be respected.

The limitation is applied in above drivers having no limitation, and at ethdev level (function rte_eth_dev_info_get), in order to force the configured limit for all drivers.

The limit is not device limit, should we reflect it into PMDs? Why not keep the limit only in the ethdev?

Quoted 79 lines
Fixes 7fae69eeff13 ("mlx4: new poll mode driver")
Fixes e60fbd5b24fc ("mlx5: add device configure/start/stop")
Fixes cc6d421574fe ("net/softnic: add softnic PMD")
Fixes 9e6b36c34ce9 ("app/testpmd: reduce memory consumption")
---
 drivers/net/mlx4/mlx4_ethdev.c        | 4 +---
 drivers/net/mlx5/mlx5_ethdev.c        | 4 +---
 drivers/net/softnic/rte_eth_softnic.c | 4 ++--
 lib/librte_ethdev/rte_ethdev.c        | 6 ++++++
 4 files changed, 10 insertions(+), 8 deletions(-)
drivers/net/mlx4/mlx4_ethdev.c +1 -3
index dfb24c22d0..a18a66cb4a 100644
@@ -646,9 +646,7 @@ mlx4_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
 	 */
 	max = ((priv->device_attr.max_cq > priv->device_attr.max_qp) ?
 	       priv->device_attr.max_qp : priv->device_attr.max_cq);
-	/* If max >= 65535 then max = 0, max_rx_queues is uint16_t. */
-	if (max >= 65535)
-		max = 65535;
+	max = RTE_MIN(max, (unsigned int)RTE_MAX_QUEUES_PER_PORT);
 	info->max_rx_queues = max;
 	info->max_tx_queues = max;
 	info->max_mac_addrs = RTE_DIM(priv->mac);
drivers/net/mlx5/mlx5_ethdev.c +1 -3
index d80ae458bc..045dae6b5a 100644
@@ -617,9 +617,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
 	 */
 	max = RTE_MIN(priv->sh->device_attr.orig_attr.max_cq,
 		      priv->sh->device_attr.orig_attr.max_qp);
-	/* If max >= 65535 then max = 0, max_rx_queues is uint16_t. */
-	if (max >= 65535)
-		max = 65535;
+	max = RTE_MIN(max, (unsigned int)RTE_MAX_QUEUES_PER_PORT);
 	info->max_rx_queues = max;
 	info->max_tx_queues = max;
 	info->max_mac_addrs = MLX5_MAX_UC_MAC_ADDRESSES;
drivers/net/softnic/rte_eth_softnic.c +2 -2
index 11723778fd..1065cbf847 100644
@@ -91,8 +91,8 @@ pmd_dev_infos_get(struct rte_eth_dev *dev __rte_unused,
 	struct rte_eth_dev_info *dev_info)
 {
 	dev_info->max_rx_pktlen = UINT32_MAX;
-	dev_info->max_rx_queues = UINT16_MAX;
-	dev_info->max_tx_queues = UINT16_MAX;
+	dev_info->max_rx_queues = RTE_MAX_QUEUES_PER_PORT;
+	dev_info->max_tx_queues = RTE_MAX_QUEUES_PER_PORT;
 
 	return 0;
 }
lib/librte_ethdev/rte_ethdev.c +6 -0
index 8d2ce31a81..6e9cb243ea 100644
@@ -2986,6 +2986,12 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info)
 		return eth_err(port_id, diag);
 	}
 
+	/* Maximum number of queues should be <= RTE_MAX_QUEUES_PER_PORT */
+	dev_info->max_rx_queues = RTE_MIN(dev_info->max_rx_queues,
+			RTE_MAX_QUEUES_PER_PORT);
+	dev_info->max_tx_queues = RTE_MIN(dev_info->max_tx_queues,
+			RTE_MAX_QUEUES_PER_PORT);
+
 	dev_info->driver_name = dev->device->driver->name;
 	dev_info->nb_rx_queues = dev->data->nb_rx_queues;
 	dev_info->nb_tx_queues = dev->data->nb_tx_queues;
#2 lore raw
Quoted 10 lines · Ferruh Yigit
Quoted 8 lines · Thomas Monjalon

A buffer overflow happens in testpmd with some drivers since the queue arrays are limited to RTE_MAX_QUEUES_PER_PORT.

The advertised capabilities of mlx4, mlx5 and softnic for the number of queues were the maximum number: UINT16_MAX. They must be limited by the configured RTE_MAX_QUEUES_PER_PORT that applications expect to be respected.

Quoted 6 lines
Quoted 3 lines

The limitation is applied in above drivers having no limitation, and at ethdev level (function rte_eth_dev_info_get), in order to force the configured limit for all drivers.

The limit is not device limit, should we reflect it into PMDs? Why not keep the limit only in the ethdev?

+1.

Signature · 1 line
David Marchand
#3 lore raw

27/11/2019 15:07, David Marchand:

Quoted 11 lines · Ferruh Yigit
Quoted 10 lines · Thomas Monjalon
Quoted 8 lines

A buffer overflow happens in testpmd with some drivers since the queue arrays are limited to RTE_MAX_QUEUES_PER_PORT.

The advertised capabilities of mlx4, mlx5 and softnic for the number of queues were the maximum number: UINT16_MAX. They must be limited by the configured RTE_MAX_QUEUES_PER_PORT that applications expect to be respected.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

The limitation is applied in above drivers having no limitation, and at ethdev level (function rte_eth_dev_info_get), in order to force the configured limit for all drivers.

The limit is not device limit, should we reflect it into PMDs? Why not keep the limit only in the ethdev?

+1.

Yes ethdev is enough.
I thought it would be better to document the limit in the PMDs as well, instead of keeping gigantic max.

I can change if you feel strong about it.

#4 lore raw
Quoted 19 lines · Thomas Monjalon

27/11/2019 15:07, David Marchand:

Quoted 18 lines · Ferruh Yigit
Quoted 16 lines · Thomas Monjalon
Quoted 11 lines

A buffer overflow happens in testpmd with some drivers since the queue arrays are limited to RTE_MAX_QUEUES_PER_PORT.

The advertised capabilities of mlx4, mlx5 and softnic for the number of queues were the maximum number: UINT16_MAX. They must be limited by the configured RTE_MAX_QUEUES_PER_PORT that applications expect to be respected.

The limitation is applied in above drivers having no limitation, and at ethdev level (function rte_eth_dev_info_get), in order to force the configured limit for all drivers.

The limit is not device limit, should we reflect it into PMDs? Why not keep the limit only in the ethdev?

Quoted 8 lines
Quoted 1 line

+1.

Yes ethdev is enough.
I thought it would be better to document the limit in the PMDs as well, instead of keeping gigantic max.

I can change if you feel strong about it.

No strong opinion, but not sure if we should document ethdev limitation in ethdev, for me only ethdev limit looks good.

#5 lore raw
Quoted 26 lines · Ferruh Yigit
Quoted 25 lines · Thomas Monjalon

27/11/2019 15:07, David Marchand:

Quoted 11 lines · Ferruh Yigit
Quoted 10 lines · Thomas Monjalon
Quoted 8 lines

A buffer overflow happens in testpmd with some drivers since the queue arrays are limited to RTE_MAX_QUEUES_PER_PORT.

The advertised capabilities of mlx4, mlx5 and softnic for the number of queues were the maximum number: UINT16_MAX. They must be limited by the configured RTE_MAX_QUEUES_PER_PORT that applications expect to be respected.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

The limitation is applied in above drivers having no limitation, and at ethdev level (function rte_eth_dev_info_get), in order to force the configured limit for all drivers.

The limit is not device limit, should we reflect it into PMDs? Why not keep the limit only in the ethdev?

+1.

Yes ethdev is enough.
I thought it would be better to document the limit in the PMDs as well, instead of keeping gigantic max.

Quoted 6 lines
Quoted 2 lines

I can change if you feel strong about it.

No strong opinion, but not sure if we should document ethdev limitation in ethdev, for me only ethdev limit looks good.

... not sure if we should document ethdev limitation in *PMD* ...

#6 lore raw
In reply to Thomas Monjalon
Quoted 17 lines · Thomas Monjalon

27/11/2019 15:07, David Marchand:

Quoted 15 lines · Ferruh Yigit
Quoted 14 lines · Thomas Monjalon
Quoted 11 lines

A buffer overflow happens in testpmd with some drivers since the queue arrays are limited to RTE_MAX_QUEUES_PER_PORT.

The advertised capabilities of mlx4, mlx5 and softnic for the number of queues were the maximum number: UINT16_MAX. They must be limited by the configured RTE_MAX_QUEUES_PER_PORT that applications expect to be respected.

The limitation is applied in above drivers having no limitation, and at ethdev level (function rte_eth_dev_info_get), in order to force the configured limit for all drivers.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

The limit is not device limit, should we reflect it into PMDs? Why not keep the limit only in the ethdev?

+1.

Yes ethdev is enough.
I thought it would be better to document the limit in the PMDs as well, instead of keeping gigantic max.

This gigantic value also documents that the driver has no limitation itself. The limitation is in the ethdev layer.

Certainly a bit far-fetched but, with the mlx5 driver as a .so, you would prefer the driver not to announce a limitation from ethdev if you recompile ethdev.

--
David Marchand

#7 lore raw

PATCH v2 1/1 ethdev: limit maximum number of queues

In reply to Thomas Monjalon

A buffer overflow happens in testpmd with some drivers since the queue arrays are limited to RTE_MAX_QUEUES_PER_PORT.

The advertised capabilities of mlx4, mlx5 and softnic for the number of queues were the maximum number: UINT16_MAX. They must be limited by the configured RTE_MAX_QUEUES_PER_PORT that applications expect to be respected.

The limitation is applied at ethdev level (function rte_eth_dev_info_get), in order to force the configured limit for all drivers.

Fixes 14b53e27b30e ("ethdev: fix crash with multiprocess")

---
v2: remove changes in drivers, keep limit only in ethdev

---
 lib/librte_ethdev/rte_ethdev.c | 6 ++++++
 1 file changed, 6 insertions(+)
lib/librte_ethdev/rte_ethdev.c +6 -0
index 8d2ce31a81..6e9cb243ea 100644
@@ -2986,6 +2986,12 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info)
 		return eth_err(port_id, diag);
 	}
 
+	/* Maximum number of queues should be <= RTE_MAX_QUEUES_PER_PORT */
+	dev_info->max_rx_queues = RTE_MIN(dev_info->max_rx_queues,
+			RTE_MAX_QUEUES_PER_PORT);
+	dev_info->max_tx_queues = RTE_MIN(dev_info->max_tx_queues,
+			RTE_MAX_QUEUES_PER_PORT);
+
 	dev_info->driver_name = dev->device->driver->name;
 	dev_info->nb_rx_queues = dev->data->nb_rx_queues;
 	dev_info->nb_tx_queues = dev->data->nb_tx_queues;
Signature · 1 line
2.23.0
Reviewed-by on v2 1/1
#8 lore raw
Quoted 12 lines · Thomas Monjalon

A buffer overflow happens in testpmd with some drivers since the queue arrays are limited to RTE_MAX_QUEUES_PER_PORT.

The advertised capabilities of mlx4, mlx5 and softnic for the number of queues were the maximum number: UINT16_MAX. They must be limited by the configured RTE_MAX_QUEUES_PER_PORT that applications expect to be respected.

The limitation is applied at ethdev level (function rte_eth_dev_info_get), in order to force the configured limit for all drivers.

Quoted 6 lines
Fixes 14b53e27b30e ("ethdev: fix crash with multiprocess")
Signature · 1 line
David Marchand
author Applied
#9 lore raw

27/11/2019 15:47, David Marchand:

Quoted 13 lines · Thomas Monjalon
Quoted 12 lines

A buffer overflow happens in testpmd with some drivers since the queue arrays are limited to RTE_MAX_QUEUES_PER_PORT.

The advertised capabilities of mlx4, mlx5 and softnic for the number of queues were the maximum number: UINT16_MAX. They must be limited by the configured RTE_MAX_QUEUES_PER_PORT that applications expect to be respected.

The limitation is applied at ethdev level (function rte_eth_dev_info_get), in order to force the configured limit for all drivers.

Quoted 8 lines
Quoted 6 lines
Fixes 14b53e27b30e ("ethdev: fix crash with multiprocess")

Applied