Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/40734/?format=api
{ "id": 40734, "url": "https://patches.dpdk.org/api/patches/40734/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20180607094322.14312-21-mk@semihalf.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20180607094322.14312-21-mk@semihalf.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180607094322.14312-21-mk@semihalf.com", "date": "2018-06-07T09:43:16", "name": "[dpdk-dev,v3,21/27] net/ena: adjust error checking and cleaning", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "3f8136c6e767142e14efe61daf9c467f0648d9f4", "submitter": { "id": 786, "url": "https://patches.dpdk.org/api/people/786/?format=api", "name": "Michal Krawczyk", "email": "mk@semihalf.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20180607094322.14312-21-mk@semihalf.com/mbox/", "series": [ { "id": 26, "url": "https://patches.dpdk.org/api/series/26/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=26", "date": "2018-06-07T09:43:00", "name": "net/ena: new features and fixes", "version": 3, "mbox": "https://patches.dpdk.org/series/26/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/40734/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/40734/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id AE1B41B416;\n\tThu, 7 Jun 2018 11:44:12 +0200 (CEST)", "from mail-lf0-f66.google.com (mail-lf0-f66.google.com\n\t[209.85.215.66]) by dpdk.org (Postfix) with ESMTP id 0F2251B1D9\n\tfor <dev@dpdk.org>; Thu, 7 Jun 2018 11:44:11 +0200 (CEST)", "by mail-lf0-f66.google.com with SMTP id t134-v6so13651894lff.6\n\tfor <dev@dpdk.org>; Thu, 07 Jun 2018 02:44:11 -0700 (PDT)", "from mkPC.semihalf.local (31-172-191-173.noc.fibertech.net.pl.\n\t[31.172.191.173]) by smtp.gmail.com with ESMTPSA id\n\tp28-v6sm3612368lfh.24.2018.06.07.02.44.07\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 07 Jun 2018 02:44:08 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=semihalf-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=davHwj/T50tulN4nOCmqGEr4UAIjxABoGjTcRtrDbcs=;\n\tb=rrZRWj2vW1KndZczWreSJMEJzxsfnUIo8UL3bKbmUgIrsNyG1lpKNDFuM4H9d5CYuz\n\tyQTJcvy36Ajlig4+UPwszLHlV1mQ9eHxaX1Mr5nOu2nM505F3HtzsscXib6Iq6x88j+5\n\tbeFIJy6XzzUY5rSZApi4cTqvFDvskZwyonACQAjTp4Q50dzXJW/c4Bx/xZLhhaHsow9P\n\tkgH9y0Z5ykfYGhQRXlXdIn9MgGhL1+jYCXsE1mNgpG2ki84gkqJCGl0BL1G39llLVuyn\n\tPrVARsesz3EA86WpYhr0tHqlQHuqTf1hmEZgoE4cMAV9q6e4c4As6JmhcvCzZ1igaMe/\n\tkQNQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=davHwj/T50tulN4nOCmqGEr4UAIjxABoGjTcRtrDbcs=;\n\tb=msyXxHNxCPSrQJ8J6iLG4IPQOYcIeRpTlvkcXQZc8IRIxZkOtrxIaT3nUPGbSgPErs\n\tfGUqSBVEl8JKJY9xgGVGx+REIVT1sWC3Y/pEgnjJYeBeZQn6btdccWvYMPiTotoIUhLT\n\tsDEVR3jAbR2d4n0jgQiQzQ/EjpwJbQG614GwdDhIhYd7o6GjlZiO507Ih7e418PCd7Bz\n\tDEjhlteIOmDmqV8/gTaa5pyrRu35tcWRJqNGIGjOnwe4LOcO6OLegY9UwjrbZ+3jVHhN\n\tJx/xTzK7kQUw8J+La5mXc9jiLCRJFVNEa+noteo2SBD8v/JfJJDuKuqCPXhn2r5jdfJW\n\tPF+A==", "X-Gm-Message-State": "APt69E3aBMnU2Wp5BVaE0RyCF8Y7PVC3s19DJ+w8TowxwckTHg03Wwe3\n\tSfy2OivasIv/Y3k7ebygItluRg==", "X-Google-Smtp-Source": "ADUXVKJaotvBwl++pOUwk93B3cNFIWpIStagaf7xTKUru/jNxCfvWcyv6lJAvqPybti6Gko97Ttgcw==", "X-Received": "by 2002:a19:cc4b:: with SMTP id\n\tc72-v6mr886120lfg.30.1528364650534; \n\tThu, 07 Jun 2018 02:44:10 -0700 (PDT)", "From": "Michal Krawczyk <mk@semihalf.com>", "To": "Marcin Wojtas <mw@semihalf.com>, Michal Krawczyk <mk@semihalf.com>,\n\tGuy Tzalik <gtzalik@amazon.com>, Evgeny Schemeilin <evgenys@amazon.com>", "Cc": "dev@dpdk.org,\n\tmatua@amazon.com,\n\tRafal Kozik <rk@semihalf.com>", "Date": "Thu, 7 Jun 2018 11:43:16 +0200", "Message-Id": "<20180607094322.14312-21-mk@semihalf.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20180607094322.14312-1-mk@semihalf.com>", "References": "<20180607094322.14312-1-mk@semihalf.com>", "Subject": "[dpdk-dev] [PATCH v3 21/27] net/ena: adjust error checking and\n\tcleaning", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Rafal Kozik <rk@semihalf.com>\n\nAdjust error checking and cleaning to Linux driver:\n * add checking if MTU is to small,\n * fix error messages (mismatched Rx and Tx),\n * return error received from base driver or proper error\n code instead of -1,\n * in case of error release occupied resources,\n * in case of Rx error trigger NIC reset.\n\nSigned-off-by: Rafal Kozik <rk@semihalf.com>\nAcked-by: Michal Krawczyk <mk@semihalf.com>\n---\n drivers/net/ena/ena_ethdev.c | 158 ++++++++++++++++++++++++++++---------------\n drivers/net/ena/ena_ethdev.h | 2 +\n 2 files changed, 104 insertions(+), 56 deletions(-)", "diff": "diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex 1425a0496..c051f23a3 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -436,9 +436,12 @@ static void ena_config_host_info(struct ena_com_dev *ena_dev)\n \n \trc = ena_com_set_host_attributes(ena_dev);\n \tif (rc) {\n-\t\tRTE_LOG(ERR, PMD, \"Cannot set host attributes\\n\");\n-\t\tif (rc != -ENA_COM_UNSUPPORTED)\n-\t\t\tgoto err;\n+\t\tif (rc == -ENA_COM_UNSUPPORTED)\n+\t\t\tRTE_LOG(WARNING, PMD, \"Cannot set host attributes\\n\");\n+\t\telse\n+\t\t\tRTE_LOG(ERR, PMD, \"Cannot set host attributes\\n\");\n+\n+\t\tgoto err;\n \t}\n \n \treturn;\n@@ -489,9 +492,12 @@ static void ena_config_debug_area(struct ena_adapter *adapter)\n \n \trc = ena_com_set_host_attributes(&adapter->ena_dev);\n \tif (rc) {\n-\t\tRTE_LOG(WARNING, PMD, \"Cannot set host attributes\\n\");\n-\t\tif (rc != -ENA_COM_UNSUPPORTED)\n-\t\t\tgoto err;\n+\t\tif (rc == -ENA_COM_UNSUPPORTED)\n+\t\t\tRTE_LOG(WARNING, PMD, \"Cannot set host attributes\\n\");\n+\t\telse\n+\t\t\tRTE_LOG(ERR, PMD, \"Cannot set host attributes\\n\");\n+\n+\t\tgoto err;\n \t}\n \n \treturn;\n@@ -534,7 +540,9 @@ ena_dev_reset(struct rte_eth_dev *dev)\n \n \tena_com_set_admin_running_state(ena_dev, false);\n \n-\tena_com_dev_reset(ena_dev, adapter->reset_reason);\n+\trc = ena_com_dev_reset(ena_dev, adapter->reset_reason);\n+\tif (rc)\n+\t\tRTE_LOG(ERR, PMD, \"Device reset failed\\n\");\n \n \tfor (i = 0; i < nb_queues; i++)\n \t\tmb_pool_rx[i] = adapter->rx_ring[i].mb_pool;\n@@ -579,7 +587,7 @@ static int ena_rss_reta_update(struct rte_eth_dev *dev,\n \tstruct ena_adapter *adapter =\n \t\t(struct ena_adapter *)(dev->data->dev_private);\n \tstruct ena_com_dev *ena_dev = &adapter->ena_dev;\n-\tint ret, i;\n+\tint rc, i;\n \tu16 entry_value;\n \tint conf_idx;\n \tint idx;\n@@ -591,8 +599,7 @@ static int ena_rss_reta_update(struct rte_eth_dev *dev,\n \t\tRTE_LOG(WARNING, PMD,\n \t\t\t\"indirection table %d is bigger than supported (%d)\\n\",\n \t\t\treta_size, ENA_RX_RSS_TABLE_SIZE);\n-\t\tret = -EINVAL;\n-\t\tgoto err;\n+\t\treturn -EINVAL;\n \t}\n \n \tfor (i = 0 ; i < reta_size ; i++) {\n@@ -604,29 +611,28 @@ static int ena_rss_reta_update(struct rte_eth_dev *dev,\n \t\tif (TEST_BIT(reta_conf[conf_idx].mask, idx)) {\n \t\t\tentry_value =\n \t\t\t\tENA_IO_RXQ_IDX(reta_conf[conf_idx].reta[idx]);\n-\t\t\tret = ena_com_indirect_table_fill_entry(ena_dev,\n-\t\t\t\t\t\t\t\ti,\n-\t\t\t\t\t\t\t\tentry_value);\n-\t\t\tif (unlikely(ret && (ret != ENA_COM_UNSUPPORTED))) {\n+\n+\t\t\trc = ena_com_indirect_table_fill_entry(ena_dev,\n+\t\t\t\t\t\t\t i,\n+\t\t\t\t\t\t\t entry_value);\n+\t\t\tif (unlikely(rc && rc != ENA_COM_UNSUPPORTED)) {\n \t\t\t\tRTE_LOG(ERR, PMD,\n \t\t\t\t\t\"Cannot fill indirect table\\n\");\n-\t\t\t\tret = -ENOTSUP;\n-\t\t\t\tgoto err;\n+\t\t\t\treturn rc;\n \t\t\t}\n \t\t}\n \t}\n \n-\tret = ena_com_indirect_table_set(ena_dev);\n-\tif (unlikely(ret && (ret != ENA_COM_UNSUPPORTED))) {\n+\trc = ena_com_indirect_table_set(ena_dev);\n+\tif (unlikely(rc && rc != ENA_COM_UNSUPPORTED)) {\n \t\tRTE_LOG(ERR, PMD, \"Cannot flush the indirect table\\n\");\n-\t\tret = -ENOTSUP;\n-\t\tgoto err;\n+\t\treturn rc;\n \t}\n \n \tRTE_LOG(DEBUG, PMD, \"%s(): RSS configured %d entries for port %d\\n\",\n \t\t__func__, reta_size, adapter->rte_dev->data->port_id);\n-err:\n-\treturn ret;\n+\n+\treturn 0;\n }\n \n /* Query redirection table. */\n@@ -637,7 +643,7 @@ static int ena_rss_reta_query(struct rte_eth_dev *dev,\n \tstruct ena_adapter *adapter =\n \t\t(struct ena_adapter *)(dev->data->dev_private);\n \tstruct ena_com_dev *ena_dev = &adapter->ena_dev;\n-\tint ret;\n+\tint rc;\n \tint i;\n \tu32 indirect_table[ENA_RX_RSS_TABLE_SIZE] = {0};\n \tint reta_conf_idx;\n@@ -647,11 +653,10 @@ static int ena_rss_reta_query(struct rte_eth_dev *dev,\n \t (reta_size > RTE_RETA_GROUP_SIZE && ((reta_conf + 1) == NULL)))\n \t\treturn -EINVAL;\n \n-\tret = ena_com_indirect_table_get(ena_dev, indirect_table);\n-\tif (unlikely(ret && (ret != ENA_COM_UNSUPPORTED))) {\n+\trc = ena_com_indirect_table_get(ena_dev, indirect_table);\n+\tif (unlikely(rc && rc != ENA_COM_UNSUPPORTED)) {\n \t\tRTE_LOG(ERR, PMD, \"cannot get indirect table\\n\");\n-\t\tret = -ENOTSUP;\n-\t\tgoto err;\n+\t\treturn -ENOTSUP;\n \t}\n \n \tfor (i = 0 ; i < reta_size ; i++) {\n@@ -661,8 +666,8 @@ static int ena_rss_reta_query(struct rte_eth_dev *dev,\n \t\t\treta_conf[reta_conf_idx].reta[reta_idx] =\n \t\t\t\tENA_IO_RXQ_IDX_REV(indirect_table[i]);\n \t}\n-err:\n-\treturn ret;\n+\n+\treturn 0;\n }\n \n static int ena_rss_init_default(struct ena_adapter *adapter)\n@@ -884,7 +889,7 @@ static int ena_queue_restart_all(struct rte_eth_dev *dev,\n \t\t\t\tPMD_INIT_LOG(ERR,\n \t\t\t\t\t \"failed to restart queue %d type(%d)\",\n \t\t\t\t\t i, ring_type);\n-\t\t\t\treturn -1;\n+\t\t\t\treturn rc;\n \t\t\t}\n \t\t}\n \t}\n@@ -908,9 +913,11 @@ static int ena_check_valid_conf(struct ena_adapter *adapter)\n {\n \tuint32_t max_frame_len = ena_get_mtu_conf(adapter);\n \n-\tif (max_frame_len > adapter->max_mtu) {\n-\t\tPMD_INIT_LOG(ERR, \"Unsupported MTU of %d\", max_frame_len);\n-\t\treturn -1;\n+\tif (max_frame_len > adapter->max_mtu || max_frame_len < ENA_MIN_MTU) {\n+\t\tPMD_INIT_LOG(ERR, \"Unsupported MTU of %d. \"\n+\t\t\t\t \"max mtu: %d, min mtu: %d\\n\",\n+\t\t\t max_frame_len, adapter->max_mtu, ENA_MIN_MTU);\n+\t\treturn ENA_COM_UNSUPPORTED;\n \t}\n \n \treturn 0;\n@@ -1008,12 +1015,12 @@ static int ena_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)\n \tena_dev = &adapter->ena_dev;\n \tena_assert_msg(ena_dev != NULL, \"Uninitialized device\");\n \n-\tif (mtu > ena_get_mtu_conf(adapter)) {\n+\tif (mtu > ena_get_mtu_conf(adapter) || mtu < ENA_MIN_MTU) {\n \t\tRTE_LOG(ERR, PMD,\n-\t\t\t\"Given MTU (%d) exceeds maximum MTU supported (%d)\\n\",\n-\t\t\tmtu, ena_get_mtu_conf(adapter));\n-\t\trc = -EINVAL;\n-\t\tgoto err;\n+\t\t\t\"Invalid MTU setting. new_mtu: %d \"\n+\t\t\t\"max mtu: %d min mtu: %d\\n\",\n+\t\t\tmtu, ena_get_mtu_conf(adapter), ENA_MIN_MTU);\n+\t\treturn -EINVAL;\n \t}\n \n \trc = ena_com_set_dev_mtu(ena_dev, mtu);\n@@ -1022,7 +1029,6 @@ static int ena_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)\n \telse\n \t\tRTE_LOG(NOTICE, PMD, \"Set MTU: %d\\n\", mtu);\n \n-err:\n \treturn rc;\n }\n \n@@ -1093,7 +1099,7 @@ static int ena_queue_restart(struct ena_ring *ring)\n \trc = ena_populate_rx_queue(ring, bufs_num);\n \tif (rc != bufs_num) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to populate rx ring !\");\n-\t\treturn (-1);\n+\t\treturn ENA_COM_FAULT;\n \t}\n \n \treturn 0;\n@@ -1123,12 +1129,12 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,\n \t\tRTE_LOG(CRIT, PMD,\n \t\t\t\"API violation. Queue %d is already configured\\n\",\n \t\t\tqueue_idx);\n-\t\treturn -1;\n+\t\treturn ENA_COM_FAULT;\n \t}\n \n \tif (!rte_is_power_of_2(nb_desc)) {\n \t\tRTE_LOG(ERR, PMD,\n-\t\t\t\"Unsupported size of RX queue: %d is not a power of 2.\",\n+\t\t\t\"Unsupported size of TX queue: %d is not a power of 2.\",\n \t\t\tnb_desc);\n \t\treturn -EINVAL;\n \t}\n@@ -1154,6 +1160,7 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,\n \t\tRTE_LOG(ERR, PMD,\n \t\t\t\"failed to create io TX queue #%d (qid:%d) rc: %d\\n\",\n \t\t\tqueue_idx, ena_qid, rc);\n+\t\treturn rc;\n \t}\n \ttxq->ena_com_io_cq = &ena_dev->io_cq_queues[ena_qid];\n \ttxq->ena_com_io_sq = &ena_dev->io_sq_queues[ena_qid];\n@@ -1165,8 +1172,7 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,\n \t\tRTE_LOG(ERR, PMD,\n \t\t\t\"Failed to get TX queue handlers. TX queue num %d rc: %d\\n\",\n \t\t\tqueue_idx, rc);\n-\t\tena_com_destroy_io_queue(ena_dev, ena_qid);\n-\t\tgoto err;\n+\t\tgoto err_destroy_io_queue;\n \t}\n \n \ttxq->port_id = dev->data->port_id;\n@@ -1180,7 +1186,8 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\t\t RTE_CACHE_LINE_SIZE);\n \tif (!txq->tx_buffer_info) {\n \t\tRTE_LOG(ERR, PMD, \"failed to alloc mem for tx buffer info\\n\");\n-\t\treturn -ENOMEM;\n+\t\trc = -ENOMEM;\n+\t\tgoto err_destroy_io_queue;\n \t}\n \n \ttxq->empty_tx_reqs = rte_zmalloc(\"txq->empty_tx_reqs\",\n@@ -1188,9 +1195,10 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\t\t RTE_CACHE_LINE_SIZE);\n \tif (!txq->empty_tx_reqs) {\n \t\tRTE_LOG(ERR, PMD, \"failed to alloc mem for tx reqs\\n\");\n-\t\trte_free(txq->tx_buffer_info);\n-\t\treturn -ENOMEM;\n+\t\trc = -ENOMEM;\n+\t\tgoto err_free;\n \t}\n+\n \tfor (i = 0; i < txq->ring_size; i++)\n \t\ttxq->empty_tx_reqs[i] = i;\n \n@@ -1202,7 +1210,14 @@ static int ena_tx_queue_setup(struct rte_eth_dev *dev,\n \t/* Store pointer to this queue in upper layer */\n \ttxq->configured = 1;\n \tdev->data->tx_queues[queue_idx] = txq;\n-err:\n+\n+\treturn 0;\n+\n+err_free:\n+\trte_free(txq->tx_buffer_info);\n+\n+err_destroy_io_queue:\n+\tena_com_destroy_io_queue(ena_dev, ena_qid);\n \treturn rc;\n }\n \n@@ -1229,12 +1244,12 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,\n \t\tRTE_LOG(CRIT, PMD,\n \t\t\t\"API violation. Queue %d is already configured\\n\",\n \t\t\tqueue_idx);\n-\t\treturn -1;\n+\t\treturn ENA_COM_FAULT;\n \t}\n \n \tif (!rte_is_power_of_2(nb_desc)) {\n \t\tRTE_LOG(ERR, PMD,\n-\t\t\t\"Unsupported size of TX queue: %d is not a power of 2.\",\n+\t\t\t\"Unsupported size of RX queue: %d is not a power of 2.\",\n \t\t\tnb_desc);\n \t\treturn -EINVAL;\n \t}\n@@ -1256,9 +1271,11 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,\n \tctx.numa_node = ena_cpu_to_node(queue_idx);\n \n \trc = ena_com_create_io_queue(ena_dev, &ctx);\n-\tif (rc)\n+\tif (rc) {\n \t\tRTE_LOG(ERR, PMD, \"failed to create io RX queue #%d rc: %d\\n\",\n \t\t\tqueue_idx, rc);\n+\t\treturn rc;\n+\t}\n \n \trxq->ena_com_io_cq = &ena_dev->io_cq_queues[ena_qid];\n \trxq->ena_com_io_sq = &ena_dev->io_sq_queues[ena_qid];\n@@ -1271,6 +1288,7 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\"Failed to get RX queue handlers. RX queue num %d rc: %d\\n\",\n \t\t\tqueue_idx, rc);\n \t\tena_com_destroy_io_queue(ena_dev, ena_qid);\n+\t\treturn rc;\n \t}\n \n \trxq->port_id = dev->data->port_id;\n@@ -1284,6 +1302,7 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\t\t RTE_CACHE_LINE_SIZE);\n \tif (!rxq->rx_buffer_info) {\n \t\tRTE_LOG(ERR, PMD, \"failed to alloc mem for rx buffer info\\n\");\n+\t\tena_com_destroy_io_queue(ena_dev, ena_qid);\n \t\treturn -ENOMEM;\n \t}\n \n@@ -1294,6 +1313,7 @@ static int ena_rx_queue_setup(struct rte_eth_dev *dev,\n \t\tRTE_LOG(ERR, PMD, \"failed to alloc mem for empty rx reqs\\n\");\n \t\trte_free(rxq->rx_buffer_info);\n \t\trxq->rx_buffer_info = NULL;\n+\t\tena_com_destroy_io_queue(ena_dev, ena_qid);\n \t\treturn -ENOMEM;\n \t}\n \n@@ -1344,6 +1364,10 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)\n \t\trte_prefetch0(mbufs[((next_to_use + 4) & ring_mask)]);\n \n \t\treq_id = rxq->empty_rx_reqs[next_to_use_masked];\n+\t\trc = validate_rx_req_id(rxq, req_id);\n+\t\tif (unlikely(rc < 0))\n+\t\t\tbreak;\n+\n \t\t/* prepare physical address for DMA transaction */\n \t\tebuf.paddr = mbuf->buf_iova + RTE_PKTMBUF_HEADROOM;\n \t\tebuf.len = mbuf->buf_len - RTE_PKTMBUF_HEADROOM;\n@@ -1359,9 +1383,17 @@ static int ena_populate_rx_queue(struct ena_ring *rxq, unsigned int count)\n \t\tnext_to_use++;\n \t}\n \n+\tif (unlikely(i < count))\n+\t\tRTE_LOG(WARNING, PMD, \"refilled rx qid %d with only %d \"\n+\t\t\t\"buffers (from %d)\\n\", rxq->id, i, count);\n+\n \t/* When we submitted free recources to device... */\n \tif (likely(i > 0)) {\n-\t\t/* ...let HW know that it can fill buffers with data */\n+\t\t/* ...let HW know that it can fill buffers with data\n+\t\t *\n+\t\t * Add memory barrier to make sure the desc were written before\n+\t\t * issue a doorbell\n+\t\t */\n \t\trte_wmb();\n \t\tena_com_write_sq_doorbell(rxq->ena_com_io_sq);\n \n@@ -1589,7 +1621,7 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)\n \trc = ena_device_init(ena_dev, &get_feat_ctx, &wd_state);\n \tif (rc) {\n \t\tPMD_INIT_LOG(CRIT, \"Failed to init ENA device\");\n-\t\treturn -1;\n+\t\tgoto err;\n \t}\n \tadapter->wd_state = wd_state;\n \n@@ -1598,8 +1630,10 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)\n \t\t\t\t\t\t &get_feat_ctx);\n \n \tqueue_size = ena_calc_queue_size(ena_dev, &tx_sgl_size, &get_feat_ctx);\n-\tif ((queue_size <= 0) || (adapter->num_queues <= 0))\n-\t\treturn -EFAULT;\n+\tif (queue_size <= 0 || adapter->num_queues <= 0) {\n+\t\trc = -EFAULT;\n+\t\tgoto err_device_destroy;\n+\t}\n \n \tadapter->tx_ring_size = queue_size;\n \tadapter->rx_ring_size = queue_size;\n@@ -1628,7 +1662,8 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)\n \t\t\t\t\t RTE_CACHE_LINE_SIZE);\n \tif (!adapter->drv_stats) {\n \t\tRTE_LOG(ERR, PMD, \"failed to alloc mem for adapter stats\\n\");\n-\t\treturn -ENOMEM;\n+\t\trc = -ENOMEM;\n+\t\tgoto err_delete_debug_area;\n \t}\n \n \trte_intr_callback_register(intr_handle,\n@@ -1646,6 +1681,16 @@ static int eth_ena_dev_init(struct rte_eth_dev *eth_dev)\n \tadapter->state = ENA_ADAPTER_STATE_INIT;\n \n \treturn 0;\n+\n+err_delete_debug_area:\n+\tena_com_delete_debug_area(ena_dev);\n+\n+err_device_destroy:\n+\tena_com_delete_host_info(ena_dev);\n+\tena_com_admin_destroy(ena_dev);\n+\n+err:\n+\treturn rc;\n }\n \n static int eth_ena_dev_uninit(struct rte_eth_dev *eth_dev)\n@@ -1839,6 +1884,7 @@ static uint16_t eth_ena_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\t\t &ena_rx_ctx);\n \t\tif (unlikely(rc)) {\n \t\t\tRTE_LOG(ERR, PMD, \"ena_com_rx_pkt error %d\\n\", rc);\n+\t\t\trx_ring->adapter->trigger_reset = true;\n \t\t\treturn 0;\n \t\t}\n \ndiff --git a/drivers/net/ena/ena_ethdev.h b/drivers/net/ena/ena_ethdev.h\nindex 73c110ab9..2dc8129e0 100644\n--- a/drivers/net/ena/ena_ethdev.h\n+++ b/drivers/net/ena/ena_ethdev.h\n@@ -50,6 +50,8 @@\n #define ENA_NAME_MAX_LEN\t20\n #define ENA_PKT_MAX_BUFS\t17\n \n+#define ENA_MIN_MTU\t\t128\n+\n #define ENA_MMIO_DISABLE_REG_READ\tBIT(0)\n \n #define ENA_WD_TIMEOUT_SEC\t3\n", "prefixes": [ "dpdk-dev", "v3", "21/27" ] }