Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 16178,
    "url": "http://patchwork.dpdk.org/api/patches/16178/?format=api",
    "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/1475003466-146063-4-git-send-email-jianfeng.tan@intel.com/",
    "project": {
        "id": 1,
        "url": "http://patchwork.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": "<1475003466-146063-4-git-send-email-jianfeng.tan@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1475003466-146063-4-git-send-email-jianfeng.tan@intel.com",
    "date": "2016-09-27T19:11:06",
    "name": "[dpdk-dev,v2,3/3] net/virtio_user: fix dev not freed after init error",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "f26cb908db6ec567c9718ad1884407b01f962fa3",
    "submitter": {
        "id": 313,
        "url": "http://patchwork.dpdk.org/api/people/313/?format=api",
        "name": "Jianfeng Tan",
        "email": "jianfeng.tan@intel.com"
    },
    "delegate": {
        "id": 355,
        "url": "http://patchwork.dpdk.org/api/users/355/?format=api",
        "username": "yliu",
        "first_name": "Yuanhan",
        "last_name": "Liu",
        "email": "yuanhan.liu@linux.intel.com"
    },
    "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/1475003466-146063-4-git-send-email-jianfeng.tan@intel.com/mbox/",
    "series": [],
    "comments": "http://patchwork.dpdk.org/api/patches/16178/comments/",
    "check": "pending",
    "checks": "http://patchwork.dpdk.org/api/patches/16178/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 508285689;\n\tTue, 27 Sep 2016 21:10:59 +0200 (CEST)",
            "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby dpdk.org (Postfix) with ESMTP id 29C6A558B;\n\tTue, 27 Sep 2016 21:10:53 +0200 (CEST)",
            "from fmsmga006.fm.intel.com ([10.253.24.20])\n\tby fmsmga103.fm.intel.com with ESMTP; 27 Sep 2016 12:10:53 -0700",
            "from dpdk06.sh.intel.com ([10.239.129.195])\n\tby fmsmga006.fm.intel.com with ESMTP; 27 Sep 2016 12:10:51 -0700"
        ],
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.30,406,1470726000\"; d=\"scan'208\";a=\"13817740\"",
        "From": "Jianfeng Tan <jianfeng.tan@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "stable@dpdk.org, yuanhan.liu@linux.intel.com,\n\tJianfeng Tan <jianfeng.tan@intel.com>",
        "Date": "Tue, 27 Sep 2016 19:11:06 +0000",
        "Message-Id": "<1475003466-146063-4-git-send-email-jianfeng.tan@intel.com>",
        "X-Mailer": "git-send-email 2.7.4",
        "In-Reply-To": "<1475003466-146063-1-git-send-email-jianfeng.tan@intel.com>",
        "References": "<1470397003-5782-1-git-send-email-jianfeng.tan@intel.com>\n\t<1475003466-146063-1-git-send-email-jianfeng.tan@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v2 3/3] net/virtio_user: fix dev not freed after\n\tinit error",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "patches and discussions about DPDK <dev.dpdk.org>",
        "List-Unsubscribe": "<http://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": "<http://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": "Currently, when virtio_user device fails to be started (e.g., vhost\nunix socket does not exit), the init function does not return struct\nrte_eth_dev (and some other structs) back to ether layer. And what's\nmore, it does not report the error to upper layer.\n\nThe fix is to free those structs and report error when failing to\nstart virtio_user devices.\n\nFixes: ce2eabdd43ec (\"net/virtio-user: add virtual device\")\n\nSigned-off-by: Jianfeng Tan <jianfeng.tan@intel.com>\n---\n drivers/net/virtio/virtio_user_ethdev.c | 42 ++++++++++++++++++++-------------\n 1 file changed, 26 insertions(+), 16 deletions(-)",
    "diff": "diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex daef09b..bba7402 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -313,6 +313,17 @@ virtio_user_eth_dev_alloc(const char *name)\n \treturn eth_dev;\n }\n \n+static void\n+virtio_user_eth_dev_free(struct rte_eth_dev *eth_dev)\n+{\n+\tstruct rte_eth_dev_data *data = eth_dev->data;\n+\tstruct virtio_hw *hw = data->dev_private;\n+\n+\trte_free(hw->virtio_user_dev);\n+\trte_free(hw);\n+\trte_eth_dev_release_port(eth_dev);\n+}\n+\n /* Dev initialization routine. Invoked once for each virtio vdev at\n  * EAL init time, see rte_eal_dev_init().\n  * Returns 0 on success.\n@@ -343,9 +354,8 @@ virtio_user_pmd_devinit(const char *name, const char *params)\n \t}\n \n \tif (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_PATH) == 1) {\n-\t\tret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_PATH,\n-\t\t\t\t\t &get_string_arg, &path);\n-\t\tif (ret < 0) {\n+\t\tif (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_PATH,\n+\t\t\t\t       &get_string_arg, &path) < 0) {\n \t\t\tPMD_INIT_LOG(ERR, \"error to parse %s\",\n \t\t\t\t     VIRTIO_USER_ARG_PATH);\n \t\t\tgoto end;\n@@ -357,9 +367,8 @@ virtio_user_pmd_devinit(const char *name, const char *params)\n \t}\n \n \tif (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_MAC) == 1) {\n-\t\tret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_MAC,\n-\t\t\t\t\t &get_string_arg, &mac_addr);\n-\t\tif (ret < 0) {\n+\t\tif (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_MAC,\n+\t\t\t\t       &get_string_arg, &mac_addr) < 0) {\n \t\t\tPMD_INIT_LOG(ERR, \"error to parse %s\",\n \t\t\t\t     VIRTIO_USER_ARG_MAC);\n \t\t\tgoto end;\n@@ -367,9 +376,8 @@ virtio_user_pmd_devinit(const char *name, const char *params)\n \t}\n \n \tif (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_QUEUE_SIZE) == 1) {\n-\t\tret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_QUEUE_SIZE,\n-\t\t\t\t\t &get_integer_arg, &queue_size);\n-\t\tif (ret < 0) {\n+\t\tif (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_QUEUE_SIZE,\n+\t\t\t\t       &get_integer_arg, &queue_size) < 0) {\n \t\t\tPMD_INIT_LOG(ERR, \"error to parse %s\",\n \t\t\t\t     VIRTIO_USER_ARG_QUEUE_SIZE);\n \t\t\tgoto end;\n@@ -377,9 +385,8 @@ virtio_user_pmd_devinit(const char *name, const char *params)\n \t}\n \n \tif (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_QUEUES_NUM) == 1) {\n-\t\tret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_QUEUES_NUM,\n-\t\t\t\t\t &get_integer_arg, &queues);\n-\t\tif (ret < 0) {\n+\t\tif (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_QUEUES_NUM,\n+\t\t\t\t       &get_integer_arg, &queues) < 0) {\n \t\t\tPMD_INIT_LOG(ERR, \"error to parse %s\",\n \t\t\t\t     VIRTIO_USER_ARG_QUEUES_NUM);\n \t\t\tgoto end;\n@@ -387,9 +394,8 @@ virtio_user_pmd_devinit(const char *name, const char *params)\n \t}\n \n \tif (rte_kvargs_count(kvlist, VIRTIO_USER_ARG_CQ_NUM) == 1) {\n-\t\tret = rte_kvargs_process(kvlist, VIRTIO_USER_ARG_CQ_NUM,\n-\t\t\t\t\t &get_integer_arg, &cq);\n-\t\tif (ret < 0) {\n+\t\tif (rte_kvargs_process(kvlist, VIRTIO_USER_ARG_CQ_NUM,\n+\t\t\t\t       &get_integer_arg, &cq) < 0) {\n \t\t\tPMD_INIT_LOG(ERR, \"error to parse %s\",\n \t\t\t\t     VIRTIO_USER_ARG_CQ_NUM);\n \t\t\tgoto end;\n@@ -411,12 +417,16 @@ virtio_user_pmd_devinit(const char *name, const char *params)\n \n \thw = eth_dev->data->dev_private;\n \tif (virtio_user_dev_init(hw->virtio_user_dev, path, queues, cq,\n-\t\t\t\t queue_size, mac_addr) < 0)\n+\t\t\t\t queue_size, mac_addr) < 0) {\n+\t\tPMD_INIT_LOG(ERR, \"virtio_user_dev_init fails\");\n+\t\tvirtio_user_eth_dev_free(eth_dev);\n \t\tgoto end;\n+\t}\n \n \t/* previously called by rte_eal_pci_probe() for physical dev */\n \tif (eth_virtio_dev_init(eth_dev) < 0) {\n \t\tPMD_INIT_LOG(ERR, \"eth_virtio_dev_init fails\");\n+\t\tvirtio_user_eth_dev_free(eth_dev);\n \t\tgoto end;\n \t}\n \tret = 0;\n",
    "prefixes": [
        "dpdk-dev",
        "v2",
        "3/3"
    ]
}