Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/48867/?format=api
{ "id": 48867, "url": "http://patches.dpdk.org/api/patches/48867/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20181214131846.22439-10-mk@semihalf.com/", "project": { "id": 1, "url": "http://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": "<20181214131846.22439-10-mk@semihalf.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20181214131846.22439-10-mk@semihalf.com", "date": "2018-12-14T13:18:35", "name": "[09/20] net/ena: destroy queues if start failed", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "8a6545ef4c04940a3f73a5c5adb20f149e8e03a5", "submitter": { "id": 786, "url": "http://patches.dpdk.org/api/people/786/?format=api", "name": "Michal Krawczyk", "email": "mk@semihalf.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20181214131846.22439-10-mk@semihalf.com/mbox/", "series": [ { "id": 2783, "url": "http://patches.dpdk.org/api/series/2783/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=2783", "date": "2018-12-14T13:18:26", "name": "net/ena: ENAv2 release", "version": 1, "mbox": "http://patches.dpdk.org/series/2783/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/48867/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/48867/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 77D661BBDE;\n\tFri, 14 Dec 2018 14:19:19 +0100 (CET)", "from mail-lf1-f66.google.com (mail-lf1-f66.google.com\n\t[209.85.167.66]) by dpdk.org (Postfix) with ESMTP id 8A03C1BB86\n\tfor <dev@dpdk.org>; Fri, 14 Dec 2018 14:19:09 +0100 (CET)", "by mail-lf1-f66.google.com with SMTP id v5so4229183lfe.7\n\tfor <dev@dpdk.org>; Fri, 14 Dec 2018 05:19:09 -0800 (PST)", "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\to25sm873884lfd.29.2018.12.14.05.19.07\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 14 Dec 2018 05:19:07 -0800 (PST)" ], "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=IKuFkPtSSH7BOtevw+4YqX+a4SaDUIPBBm9lraPmsJg=;\n\tb=Mrmj7/sWRdw7NZXVSO5PrzuV6UdYiO/aAovF+WsE+m6F95yepW3qXRSoet98e+VxL6\n\thqf4ACaeIyhJqB0DL8ikwEycQX7Mr1ZVP7iaH2Sdqv+EGXkVeFr8uVtJRIWD84p8KSeq\n\tQw84GGfeB57h5u5wzwxubbq+7YKidZkGNwtQfsz/g4y2jAXSBbWa5Le+7QxwS24GZJyc\n\tfsiSAflRo0mNXXhvWILhYH1yUrToNxNYoK4WgSR43mHH8ggx0HwfH5yeoxl2hIVHde9j\n\tHh6FtF2XLoEpFbDgoCdjEdkZ27KRn5gWEOEVFy3a9mOH3y+omc+j8IBPoxxqrwNsMcBI\n\t41yg==", "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=IKuFkPtSSH7BOtevw+4YqX+a4SaDUIPBBm9lraPmsJg=;\n\tb=caE3IjkS6PYCX0ELAFC7qsIgND2UAGoiZeI4fO2c/fhGK2TBRU43nnsYdrbzt5DfY3\n\txTO3+9cN4j1Ql24e4gwxjM6PeRXVpBg1mLp1P4bXYwMn5SU2pOiZxdDnebxGHsXZynNN\n\tTnoIoKcpK9Hc/Nwk2JUP2OckWNePrOGISU0oD0+MObav7gYNvSv8JQvASUTrraHg0dJR\n\tFpv0pgu8diwSLXgSvE/CzjByQiuZ58iU6gH73aaQxlpKYfvmbaD3skINQ3A3+wPlgirL\n\tWHVt+Ry/2diWgW1QWrJvNy6cK8dIB5SDMCZ+9dyCne2paArP+yEDuE2azhiPnrYAmvHG\n\tjxmQ==", "X-Gm-Message-State": "AA+aEWayYGxXVQFVfO4/fdhY1ArAf5xC3/zTJbOkRFMk66ibikCJ/v2d\n\taNsfKr71e5E8vTt8Azm/dtUPLAuQ1k0=", "X-Google-Smtp-Source": "AFSGD/XTmwBqSdavtTTyWoeOMKZ4lg3LnS7Op5jNagKM/UFb5MUgRtkQN/sGBpYnL/5ZAa1mXndRuA==", "X-Received": "by 2002:a19:1901:: with SMTP id 1mr1595062lfz.99.1544793548399; \n\tFri, 14 Dec 2018 05:19:08 -0800 (PST)", "From": "Michal Krawczyk <mk@semihalf.com>", "To": "dev@dpdk.org", "Cc": "gtzalik@dpdk.org, mw@dpdk.org, matua@amazon.com, rk@semihalf.com,\n\tstable@dpdk.org", "Date": "Fri, 14 Dec 2018 14:18:35 +0100", "Message-Id": "<20181214131846.22439-10-mk@semihalf.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20181214131846.22439-1-mk@semihalf.com>", "References": "<20181214131846.22439-1-mk@semihalf.com>", "Subject": "[dpdk-dev] [PATCH 09/20] net/ena: destroy queues if start failed", "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://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/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\nIf start function fails, previously created queues have to be removed.\n\nena_queue_restart_all() and ena_queue_restart() are renamed to\nena_queue_start_all() and ena_queue_start().\n\nena_free_io_queues_all() is renamed to ena_queue_stop_all().\n\nFixes: df238f84c0a2 (\"net/ena: recreate HW IO rings on start and stop\")\nCc: stable@dpdk.org\n\nSigned-off-by: Rafal Kozik <rk@semihalf.com>\nAcked-by: Michal Krawczyk <mk@semihalf.com>\n---\n drivers/net/ena/ena_ethdev.c | 95 ++++++++++++++++++++++++++++----------------\n 1 file changed, 60 insertions(+), 35 deletions(-)", "diff": "diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c\nindex 5f7dec086..deb97151d 100644\n--- a/drivers/net/ena/ena_ethdev.c\n+++ b/drivers/net/ena/ena_ethdev.c\n@@ -244,10 +244,12 @@ static void ena_tx_queue_release_bufs(struct ena_ring *ring);\n static int ena_link_update(struct rte_eth_dev *dev,\n \t\t\t int wait_to_complete);\n static int ena_create_io_queue(struct ena_ring *ring);\n-static void ena_free_io_queues_all(struct ena_adapter *adapter);\n-static int ena_queue_restart(struct ena_ring *ring);\n-static int ena_queue_restart_all(struct rte_eth_dev *dev,\n-\t\t\t\t enum ena_ring_type ring_type);\n+static void ena_queue_stop(struct ena_ring *ring);\n+static void ena_queue_stop_all(struct rte_eth_dev *dev,\n+\t\t\t enum ena_ring_type ring_type);\n+static int ena_queue_start(struct ena_ring *ring);\n+static int ena_queue_start_all(struct rte_eth_dev *dev,\n+\t\t\t enum ena_ring_type ring_type);\n static void ena_stats_restart(struct rte_eth_dev *dev);\n static void ena_infos_get(struct rte_eth_dev *dev,\n \t\t\t struct rte_eth_dev_info *dev_info);\n@@ -805,9 +807,6 @@ static void ena_tx_queue_release(void *queue)\n \tena_assert_msg(ring->adapter->state != ENA_ADAPTER_STATE_RUNNING,\n \t\t \"API violation\");\n \n-\t/* Free all bufs */\n-\tena_tx_queue_release_bufs(ring);\n-\n \t/* Free ring resources */\n \tif (ring->push_buf_intermediate_buf)\n \t\trte_free(ring->push_buf_intermediate_buf);\n@@ -872,8 +871,8 @@ static int ena_link_update(struct rte_eth_dev *dev,\n \treturn 0;\n }\n \n-static int ena_queue_restart_all(struct rte_eth_dev *dev,\n-\t\t\t\t enum ena_ring_type ring_type)\n+static int ena_queue_start_all(struct rte_eth_dev *dev,\n+\t\t\t enum ena_ring_type ring_type)\n {\n \tstruct ena_adapter *adapter =\n \t\t(struct ena_adapter *)(dev->data->dev_private);\n@@ -901,18 +900,25 @@ static int ena_queue_restart_all(struct rte_eth_dev *dev,\n \t\t\t\t\t\"Inconsistent state of tx queues\\n\");\n \t\t\t}\n \n-\t\t\trc = ena_queue_restart(&queues[i]);\n+\t\t\trc = ena_queue_start(&queues[i]);\n \n \t\t\tif (rc) {\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 \"failed to start queue %d type(%d)\",\n \t\t\t\t\t i, ring_type);\n-\t\t\t\treturn rc;\n+\t\t\t\tgoto err;\n \t\t\t}\n \t\t}\n \t}\n \n \treturn 0;\n+\n+err:\n+\twhile (i--)\n+\t\tif (queues[i].configured)\n+\t\t\tena_queue_stop(&queues[i]);\n+\n+\treturn rc;\n }\n \n static uint32_t ena_get_mtu_conf(struct ena_adapter *adapter)\n@@ -1101,19 +1107,19 @@ static int ena_start(struct rte_eth_dev *dev)\n \tif (rc)\n \t\treturn rc;\n \n-\trc = ena_queue_restart_all(dev, ENA_RING_TYPE_RX);\n+\trc = ena_queue_start_all(dev, ENA_RING_TYPE_RX);\n \tif (rc)\n \t\treturn rc;\n \n-\trc = ena_queue_restart_all(dev, ENA_RING_TYPE_TX);\n+\trc = ena_queue_start_all(dev, ENA_RING_TYPE_TX);\n \tif (rc)\n-\t\treturn rc;\n+\t\tgoto err_start_tx;\n \n \tif (adapter->rte_dev->data->dev_conf.rxmode.mq_mode &\n \t ETH_MQ_RX_RSS_FLAG && adapter->rte_dev->data->nb_rx_queues > 0) {\n \t\trc = ena_rss_init_default(adapter);\n \t\tif (rc)\n-\t\t\treturn rc;\n+\t\t\tgoto err_rss_init;\n \t}\n \n \tena_stats_restart(dev);\n@@ -1128,6 +1134,12 @@ static int ena_start(struct rte_eth_dev *dev)\n \tadapter->state = ENA_ADAPTER_STATE_RUNNING;\n \n \treturn 0;\n+\n+err_rss_init:\n+\tena_queue_stop_all(dev, ENA_RING_TYPE_TX);\n+err_start_tx:\n+\tena_queue_stop_all(dev, ENA_RING_TYPE_RX);\n+\treturn rc;\n }\n \n static void ena_stop(struct rte_eth_dev *dev)\n@@ -1136,7 +1148,8 @@ static void ena_stop(struct rte_eth_dev *dev)\n \t\t(struct ena_adapter *)(dev->data->dev_private);\n \n \trte_timer_stop_sync(&adapter->timer_wd);\n-\tena_free_io_queues_all(adapter);\n+\tena_queue_stop_all(dev, ENA_RING_TYPE_TX);\n+\tena_queue_stop_all(dev, ENA_RING_TYPE_RX);\n \n \tadapter->state = ENA_ADAPTER_STATE_STOPPED;\n }\n@@ -1199,36 +1212,46 @@ static int ena_create_io_queue(struct ena_ring *ring)\n \treturn 0;\n }\n \n-static void ena_free_io_queues_all(struct ena_adapter *adapter)\n+static void ena_queue_stop(struct ena_ring *ring)\n {\n-\tstruct rte_eth_dev *eth_dev = adapter->rte_dev;\n-\tstruct ena_com_dev *ena_dev = &adapter->ena_dev;\n-\tint i;\n-\tuint16_t ena_qid;\n-\tuint16_t nb_rxq = eth_dev->data->nb_rx_queues;\n-\tuint16_t nb_txq = eth_dev->data->nb_tx_queues;\n-\n-\tfor (i = 0; i < nb_txq; ++i) {\n-\t\tena_qid = ENA_IO_TXQ_IDX(i);\n-\t\tena_com_destroy_io_queue(ena_dev, ena_qid);\n+\tstruct ena_com_dev *ena_dev = &ring->adapter->ena_dev;\n \n-\t\tena_tx_queue_release_bufs(&adapter->tx_ring[i]);\n+\tif (ring->type == ENA_RING_TYPE_RX) {\n+\t\tena_com_destroy_io_queue(ena_dev, ENA_IO_RXQ_IDX(ring->id));\n+\t\tena_rx_queue_release_bufs(ring);\n+\t} else {\n+\t\tena_com_destroy_io_queue(ena_dev, ENA_IO_TXQ_IDX(ring->id));\n+\t\tena_tx_queue_release_bufs(ring);\n \t}\n+}\n \n-\tfor (i = 0; i < nb_rxq; ++i) {\n-\t\tena_qid = ENA_IO_RXQ_IDX(i);\n-\t\tena_com_destroy_io_queue(ena_dev, ena_qid);\n+static void ena_queue_stop_all(struct rte_eth_dev *dev,\n+\t\t\t enum ena_ring_type ring_type)\n+{\n+\tstruct ena_adapter *adapter =\n+\t\t(struct ena_adapter *)(dev->data->dev_private);\n+\tstruct ena_ring *queues = NULL;\n+\tuint16_t nb_queues, i;\n \n-\t\tena_rx_queue_release_bufs(&adapter->rx_ring[i]);\n+\tif (ring_type == ENA_RING_TYPE_RX) {\n+\t\tqueues = adapter->rx_ring;\n+\t\tnb_queues = dev->data->nb_rx_queues;\n+\t} else {\n+\t\tqueues = adapter->tx_ring;\n+\t\tnb_queues = dev->data->nb_tx_queues;\n \t}\n+\n+\tfor (i = 0; i < nb_queues; ++i)\n+\t\tif (queues[i].configured)\n+\t\t\tena_queue_stop(&queues[i]);\n }\n \n-static int ena_queue_restart(struct ena_ring *ring)\n+static int ena_queue_start(struct ena_ring *ring)\n {\n \tint rc, bufs_num;\n \n \tena_assert_msg(ring->configured == 1,\n-\t\t \"Trying to restart unconfigured queue\\n\");\n+\t\t \"Trying to start unconfigured queue\\n\");\n \n \trc = ena_create_io_queue(ring);\n \tif (rc) {\n@@ -1245,6 +1268,8 @@ static int ena_queue_restart(struct ena_ring *ring)\n \tbufs_num = ring->ring_size - 1;\n \trc = ena_populate_rx_queue(ring, bufs_num);\n \tif (rc != bufs_num) {\n+\t\tena_com_destroy_io_queue(&ring->adapter->ena_dev,\n+\t\t\t\t\t ENA_IO_RXQ_IDX(ring->id));\n \t\tPMD_INIT_LOG(ERR, \"Failed to populate rx ring !\");\n \t\treturn ENA_COM_FAULT;\n \t}\n", "prefixes": [ "09/20" ] }