From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Daley Subject: [PATCH v4 2/2] enic: improve out of resources error handling Date: Sat, 11 Jun 2016 10:27:05 -0700 Message-ID: <1465666025-10159-2-git-send-email-johndale@cisco.com> References: <20160610092236.GA11860@bricha3-MOBL3> <1465666025-10159-1-git-send-email-johndale@cisco.com> Cc: dev@dpdk.org, John Daley To: bruce.richardson@intel.com Return-path: Received: from alln-iport-7.cisco.com (alln-iport-7.cisco.com [173.37.142.94]) by dpdk.org (Postfix) with ESMTP id 906022C6B for ; Sat, 11 Jun 2016 19:27:42 +0200 (CEST) In-Reply-To: <1465666025-10159-1-git-send-email-johndale@cisco.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- v4: only modify wq/rq/cq counts on success, return -EINVAL on error. drivers/net/enic/enic_main.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 738792e..32ecdae 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -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) -- 2.7.0