Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87332/?format=api
https://patches.dpdk.org/api/patches/87332/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-45-maxime.coquelin@redhat.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": "<20210126101639.250481-45-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126101639.250481-45-maxime.coquelin@redhat.com", "date": "2021-01-26T10:16:39", "name": "[v4,44/44] net/virtio: handle Virtio-user setup failure properly", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "f75b9ae2497f9463d77322a9368a35e272107a66", "submitter": { "id": 512, "url": "https://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "https://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-45-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 14950, "url": "https://patches.dpdk.org/api/series/14950/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14950", "date": "2021-01-26T10:15:55", "name": "net/virtio: Virtio PMD rework", "version": 4, "mbox": "https://patches.dpdk.org/series/14950/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/87332/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/87332/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id AB917A052A;\n\tTue, 26 Jan 2021 11:24:09 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 611F1141452;\n\tTue, 26 Jan 2021 11:18:54 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [216.205.24.124])\n by mails.dpdk.org (Postfix) with ESMTP id C211214143D\n for <dev@dpdk.org>; Tue, 26 Jan 2021 11:18:53 +0100 (CET)", "from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id\n us-mta-463-dnRovzz7NgaTSQnVMrWdpA-1; Tue, 26 Jan 2021 05:18:50 -0500", "from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com\n [10.5.11.11])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2B03B107ACFB;\n Tue, 26 Jan 2021 10:18:49 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.31])\n by smtp.corp.redhat.com (Postfix) with ESMTP id C31927216D;\n Tue, 26 Jan 2021 10:18:44 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1611656333;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=nz58QZf+qEzUplo6+Ymwvur0T+PBvGPyEGJPBtwUcOU=;\n b=btH22QCdAgKaY9Nei30RtpPYdxJRKSv9mggusUryDhNm+W9jetkIwZkjbJ47kD2ZQJ8zR3\n oURCn9UyIo27PeTr21njf+8VQe6v8Web3sbhYxbbzjSVs0d+8vvXc/HtMifK1IEmXAsOVN\n 2l7FHQZgRHSvWma2/vjSEYlrgAbldIQ=", "X-MC-Unique": "dnRovzz7NgaTSQnVMrWdpA-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, chenbo.xia@intel.com, olivier.matz@6wind.com,\n amorenoz@redhat.com, david.marchand@redhat.com", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Date": "Tue, 26 Jan 2021 11:16:39 +0100", "Message-Id": "<20210126101639.250481-45-maxime.coquelin@redhat.com>", "In-Reply-To": "<20210126101639.250481-1-maxime.coquelin@redhat.com>", "References": "<20210126101639.250481-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "Authentication-Results": "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"", "Subject": "[dpdk-dev] [PATCH v4 44/44] net/virtio: handle Virtio-user setup\n failure properly", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <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 <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This patch fixes virtio_user_dev_setup() error path,\nby cleaning all resources it allocates. It introduces\nvirtio_user_dev_uninit_notify() that cleans all open\nFDs. It implies assigning all FDs to -1 at init time.\n\nWith these changes done, virtio_user_dev_init_notify()\ncan be simplified.\n\nSuggested-by: Adrian Moreno <amorenoz@redhat.com>\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n .../net/virtio/virtio_user/virtio_user_dev.c | 70 +++++++++++++------\n 1 file changed, 47 insertions(+), 23 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c\nindex a1e32158bb..2998473622 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c\n@@ -283,13 +283,7 @@ virtio_user_dev_init_notify(struct virtio_user_dev *dev)\n \tint callfd;\n \tint kickfd;\n \n-\tfor (i = 0; i < VIRTIO_MAX_VIRTQUEUES; ++i) {\n-\t\tif (i >= dev->max_queue_pairs * 2) {\n-\t\t\tdev->kickfds[i] = -1;\n-\t\t\tdev->callfds[i] = -1;\n-\t\t\tcontinue;\n-\t\t}\n-\n+\tfor (i = 0; i < dev->max_queue_pairs * 2; i++) {\n \t\t/* May use invalid flag, but some backend uses kickfd and\n \t\t * callfd as criteria to judge if dev is alive. so finally we\n \t\t * use real event_fd.\n@@ -297,28 +291,49 @@ virtio_user_dev_init_notify(struct virtio_user_dev *dev)\n \t\tcallfd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK);\n \t\tif (callfd < 0) {\n \t\t\tPMD_DRV_LOG(ERR, \"(%s) callfd error, %s\", dev->path, strerror(errno));\n-\t\t\tbreak;\n+\t\t\tgoto err;\n \t\t}\n \t\tkickfd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK);\n \t\tif (kickfd < 0) {\n \t\t\tclose(callfd);\n \t\t\tPMD_DRV_LOG(ERR, \"(%s) kickfd error, %s\", dev->path, strerror(errno));\n-\t\t\tbreak;\n+\t\t\tgoto err;\n \t\t}\n \t\tdev->callfds[i] = callfd;\n \t\tdev->kickfds[i] = kickfd;\n \t}\n \n-\tif (i < VIRTIO_MAX_VIRTQUEUES) {\n-\t\tfor (j = 0; j < i; ++j) {\n-\t\t\tclose(dev->callfds[j]);\n+\treturn 0;\n+err:\n+\tfor (j = 0; j < i; j++) {\n+\t\tif (dev->kickfds[j] >= 0) {\n \t\t\tclose(dev->kickfds[j]);\n+\t\t\tdev->kickfds[j] = -1;\n+\t\t}\n+\t\tif (dev->callfds[j] >= 0) {\n+\t\t\tclose(dev->callfds[j]);\n+\t\t\tdev->callfds[j] = -1;\n \t\t}\n-\n-\t\treturn -1;\n \t}\n \n-\treturn 0;\n+\treturn -1;\n+}\n+\n+static void\n+virtio_user_dev_uninit_notify(struct virtio_user_dev *dev)\n+{\n+\tuint32_t i;\n+\n+\tfor (i = 0; i < dev->max_queue_pairs; ++i) {\n+\t\tif (dev->kickfds[i] >= 0) {\n+\t\t\tclose(dev->kickfds[i]);\n+\t\t\tdev->kickfds[i] = -1;\n+\t\t}\n+\t\tif (dev->callfds[i] >= 0) {\n+\t\t\tclose(dev->callfds[i]);\n+\t\t\tdev->callfds[i] = -1;\n+\t\t}\n+\t}\n }\n \n static int\n@@ -427,15 +442,22 @@ virtio_user_dev_setup(struct virtio_user_dev *dev)\n \n \tif (virtio_user_dev_init_notify(dev) < 0) {\n \t\tPMD_INIT_LOG(ERR, \"(%s) Failed to init notifiers\\n\", dev->path);\n-\t\treturn -1;\n+\t\tgoto destroy;\n \t}\n \n \tif (virtio_user_fill_intr_handle(dev) < 0) {\n \t\tPMD_INIT_LOG(ERR, \"(%s) Failed to init interrupt handler\\n\", dev->path);\n-\t\treturn -1;\n+\t\tgoto uninit;\n \t}\n \n \treturn 0;\n+\n+uninit:\n+\tvirtio_user_dev_uninit_notify(dev);\n+destroy:\n+\tdev->ops->destroy(dev);\n+\n+\treturn -1;\n }\n \n /* Use below macro to filter features from vhost backend */\n@@ -466,9 +488,16 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,\n \t\t enum virtio_user_backend_type backend_type)\n {\n \tuint64_t backend_features;\n+\tint i;\n \n \tpthread_mutex_init(&dev->mutex, NULL);\n \tstrlcpy(dev->path, path, PATH_MAX);\n+\n+\tfor (i = 0; i < VIRTIO_MAX_VIRTQUEUES; i++) {\n+\t\tdev->kickfds[i] = -1;\n+\t\tdev->callfds[i] = -1;\n+\t}\n+\n \tdev->started = 0;\n \tdev->max_queue_pairs = queues;\n \tdev->queue_pairs = 1; /* mq disabled by default */\n@@ -565,16 +594,11 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,\n void\n virtio_user_dev_uninit(struct virtio_user_dev *dev)\n {\n-\tuint32_t i;\n-\n \tvirtio_user_stop_device(dev);\n \n \trte_mem_event_callback_unregister(VIRTIO_USER_MEM_EVENT_CLB_NAME, dev);\n \n-\tfor (i = 0; i < dev->max_queue_pairs * 2; ++i) {\n-\t\tclose(dev->callfds[i]);\n-\t\tclose(dev->kickfds[i]);\n-\t}\n+\tvirtio_user_dev_uninit_notify(dev);\n \n \tfree(dev->ifname);\n \n", "prefixes": [ "v4", "44/44" ] }{ "id": 87332, "url": "