ethdev: limit maximum number of queues

[dpdk.git] / lib / librte_ethdev / rte_ethdev.c

diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 84e6b60..6e9cb24 100644 (file)
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -1205,7 +1205,7 @@ validate_offloads(uint16_t port_id, uint64_t req_offloads,
                /* Chech if offload couldn't be disabled. */
                if (offload & set_offloads) {
                        RTE_ETHDEV_LOG(DEBUG,
-                               "Port %u failed to disable %s offload %s\n",
+                               "Port %u %s offload %s is not requested but enabled\n",
                                port_id, offload_type, offload_name(offload));
                }
 
@@ -1245,7 +1245,9 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,
         * Copy the dev_conf parameter into the dev structure.
         * rte_eth_dev_info_get() requires dev_conf, copy it before dev_info get
         */
-       memcpy(&dev->data->dev_conf, dev_conf, sizeof(dev->data->dev_conf));
+       if (dev_conf != &dev->data->dev_conf)
+               memcpy(&dev->data->dev_conf, dev_conf,
+                      sizeof(dev->data->dev_conf));
 
        ret = rte_eth_dev_info_get(port_id, &dev_info);
        if (ret != 0)
@@ -2984,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;