d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/enic: improve out of resources error handling

Browse Source 
If configuration fails due to lack of resources, be more specific
about which resources are lacking - work queues, read queues or
completion queues. Return -EINVAL instead of -1 if more queeues
are requested than are available.

Fixes: fefed3d1e62c ("enic: new driver")

Signed-off-by: John Daley <johndale@cisco.com>
This commit is contained in:
John Daley 2016-06-11 10:27:05 -07:00 committed by Bruce Richardson
parent 83a9d8b7eb
commit b6d5fd2e96
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/net/enic/enic_main.c
View File

@ -826,22 +826,32 @@ static void enic_dev_deinit(struct enic *enic)
int enic_set_vnic_res(struct enic *enic)
{
struct rte_eth_dev *eth_dev = enic->rte_dev;
int rc = 0;
if ((enic->rq_count < eth_dev->data->nb_rx_queues) ||
(enic->wq_count < eth_dev->data->nb_tx_queues)) {
dev_err(dev, "Not enough resources configured, aborting\n");
return -1;
if (enic->rq_count < eth_dev->data->nb_rx_queues) {
dev_err(dev, "Not enough Receive queues. Requested:%u, Configured:%u\n",
eth_dev->data->nb_rx_queues, enic->rq_count);
rc = -EINVAL;
}
if (enic->wq_count < eth_dev->data->nb_tx_queues) {
dev_err(dev, "Not enough Transmit queues. Requested:%u, Configured:%u\n",
eth_dev->data->nb_tx_queues, enic->wq_count);
rc = -EINVAL;
}
enic->rq_count = eth_dev->data->nb_rx_queues;
enic->wq_count = eth_dev->data->nb_tx_queues;
if (enic->cq_count < (enic->rq_count + enic->wq_count)) {
dev_err(dev, "Not enough resources configured, aborting\n");
return -1;
dev_err(dev, "Not enough Completion queues. Required:%u, Configured:%u\n",
enic->rq_count + enic->wq_count, enic->cq_count);
rc = -EINVAL;
}
enic->cq_count = enic->rq_count + enic->wq_count;
return 0;
if (rc == 0) {
enic->rq_count = eth_dev->data->nb_rx_queues;
enic->wq_count = eth_dev->data->nb_tx_queues;
enic->cq_count = enic->rq_count + enic->wq_count;
}
return rc;
}
static int enic_dev_init(struct enic *enic)