Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/134333/?format=api
https://patches.dpdk.org/api/patches/134333/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20231114123552.398072-9-huangdengdui@huawei.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": "<20231114123552.398072-9-huangdengdui@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20231114123552.398072-9-huangdengdui@huawei.com", "date": "2023-11-14T12:35:18", "name": "[v3,08/42] vhost: use rte strerror", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "afe4f4d6f73a0c700b62ada36646ac3c6e60ae95", "submitter": { "id": 3066, "url": "https://patches.dpdk.org/api/people/3066/?format=api", "name": "huangdengdui", "email": "huangdengdui@huawei.com" }, "delegate": { "id": 24651, "url": "https://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20231114123552.398072-9-huangdengdui@huawei.com/mbox/", "series": [ { "id": 30293, "url": "https://patches.dpdk.org/api/series/30293/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=30293", "date": "2023-11-14T12:35:13", "name": "replace strerror", "version": 3, "mbox": "https://patches.dpdk.org/series/30293/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/134333/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/134333/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 A61CC43329;\n\tTue, 14 Nov 2023 13:37:11 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C17DE40A6E;\n\tTue, 14 Nov 2023 13:36:10 +0100 (CET)", "from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])\n by mails.dpdk.org (Postfix) with ESMTP id 6A001402E2\n for <dev@dpdk.org>; Tue, 14 Nov 2023 13:35:56 +0100 (CET)", "from dggpeml500011.china.huawei.com (unknown [172.30.72.57])\n by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SV5Kb1XhkzmXDl;\n Tue, 14 Nov 2023 20:32:35 +0800 (CST)", "from localhost.huawei.com (10.50.165.33) by\n dggpeml500011.china.huawei.com (7.185.36.84) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.1.2507.31; Tue, 14 Nov 2023 20:35:54 +0800" ], "From": "Dengdui Huang <huangdengdui@huawei.com>", "To": "<dev@dpdk.org>", "CC": "<ferruh.yigit@amd.com>, <stephen@networkplumber.org>,\n <lihuisong@huawei.com>, <fengchengwen@huawei.com>, <liuyonglong@huawei.com>", "Subject": "[PATCH v3 08/42] vhost: use rte strerror", "Date": "Tue, 14 Nov 2023 20:35:18 +0800", "Message-ID": "<20231114123552.398072-9-huangdengdui@huawei.com>", "X-Mailer": "git-send-email 2.33.0", "In-Reply-To": "<20231114123552.398072-1-huangdengdui@huawei.com>", "References": "<20231114082539.1858594-44-huangdengdui@huawei.com>\n <20231114123552.398072-1-huangdengdui@huawei.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[10.50.165.33]", "X-ClientProxiedBy": "dggems706-chm.china.huawei.com (10.3.19.183) To\n dggpeml500011.china.huawei.com (7.185.36.84)", "X-CFilter-Loop": "Reflected", "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" }, "content": "The function strerror() is insecure in a multi-thread environment.\nThis patch uses rte_strerror() to replace it.\n\nCc: stable@dpdk.org\n\nSigned-off-by: Dengdui Huang <huangdengdui@huawei.com>\nAcked-by: Chengwen Feng <fengchengwen@huawei.com>\n---\n lib/vhost/socket.c | 13 +++++++------\n lib/vhost/vduse.c | 31 ++++++++++++++++---------------\n lib/vhost/vhost_user.c | 11 ++++++-----\n 3 files changed, 29 insertions(+), 26 deletions(-)", "diff": "diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c\nindex 5882e44176..0b030222d6 100644\n--- a/lib/vhost/socket.c\n+++ b/lib/vhost/socket.c\n@@ -16,6 +16,7 @@\n \n #include <rte_thread.h>\n #include <rte_log.h>\n+#include <rte_errno.h>\n \n #include \"fd_man.h\"\n #include \"vduse.h\"\n@@ -129,7 +130,7 @@ read_fd_message(char *ifname, int sockfd, char *buf, int buflen, int *fds, int m\n \tif (ret <= 0) {\n \t\tif (ret)\n \t\t\tVHOST_LOG_CONFIG(ifname, ERR, \"recvmsg failed on fd %d (%s)\\n\",\n-\t\t\t\tsockfd, strerror(errno));\n+\t\t\t\tsockfd, rte_strerror(errno));\n \t\treturn ret;\n \t}\n \n@@ -200,7 +201,7 @@ send_fd_message(char *ifname, int sockfd, char *buf, int buflen, int *fds, int f\n \n \tif (ret < 0) {\n \t\tVHOST_LOG_CONFIG(ifname, ERR, \"sendmsg error on fd %d (%s)\\n\",\n-\t\t\tsockfd, strerror(errno));\n+\t\t\tsockfd, rte_strerror(errno));\n \t\treturn ret;\n \t}\n \n@@ -358,7 +359,7 @@ create_unix_socket(struct vhost_user_socket *vsocket)\n \tif (!vsocket->is_server && fcntl(fd, F_SETFL, O_NONBLOCK)) {\n \t\tVHOST_LOG_CONFIG(vsocket->path, ERR,\n \t\t\t\"vhost-user: can't set nonblocking mode for socket, fd: %d (%s)\\n\",\n-\t\t\tfd, strerror(errno));\n+\t\t\tfd, rte_strerror(errno));\n \t\tclose(fd);\n \t\treturn -1;\n \t}\n@@ -392,7 +393,7 @@ vhost_user_start_server(struct vhost_user_socket *vsocket)\n \tret = bind(fd, (struct sockaddr *)&vsocket->un, sizeof(vsocket->un));\n \tif (ret < 0) {\n \t\tVHOST_LOG_CONFIG(path, ERR, \"failed to bind: %s; remove it and try again\\n\",\n-\t\t\tstrerror(errno));\n+\t\t\trte_strerror(errno));\n \t\tgoto err;\n \t}\n \tVHOST_LOG_CONFIG(path, INFO, \"binding succeeded\\n\");\n@@ -445,7 +446,7 @@ vhost_user_connect_nonblock(char *path, int fd, struct sockaddr *un, size_t sz)\n \tflags = fcntl(fd, F_GETFL, 0);\n \tif (flags < 0) {\n \t\tVHOST_LOG_CONFIG(path, ERR, \"can't get flags for connfd %d (%s)\\n\",\n-\t\t\tfd, strerror(errno));\n+\t\t\tfd, rte_strerror(errno));\n \t\treturn -2;\n \t}\n \tif ((flags & O_NONBLOCK) && fcntl(fd, F_SETFL, flags & ~O_NONBLOCK)) {\n@@ -539,7 +540,7 @@ vhost_user_start_client(struct vhost_user_socket *vsocket)\n \t\treturn 0;\n \t}\n \n-\tVHOST_LOG_CONFIG(path, WARNING, \"failed to connect: %s\\n\", strerror(errno));\n+\tVHOST_LOG_CONFIG(path, WARNING, \"failed to connect: %s\\n\", rte_strerror(errno));\n \n \tif (ret == -2 || !vsocket->reconnect) {\n \t\tclose(fd);\ndiff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c\nindex 080b58f7de..e2e056754c 100644\n--- a/lib/vhost/vduse.c\n+++ b/lib/vhost/vduse.c\n@@ -17,6 +17,7 @@\n \n #include <rte_common.h>\n #include <rte_thread.h>\n+#include <rte_errno.h>\n \n #include \"fd_man.h\"\n #include \"iotlb.h\"\n@@ -135,7 +136,7 @@ vduse_control_queue_event(int fd, void *arg, int *remove __rte_unused)\n \tret = read(fd, &buf, sizeof(buf));\n \tif (ret < 0) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"Failed to read control queue event: %s\\n\",\n-\t\t\t\tstrerror(errno));\n+\t\t\t\trte_strerror(errno));\n \t\treturn;\n \t}\n \n@@ -157,7 +158,7 @@ vduse_vring_setup(struct virtio_net *dev, unsigned int index)\n \tret = ioctl(dev->vduse_dev_fd, VDUSE_VQ_GET_INFO, &vq_info);\n \tif (ret) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"Failed to get VQ %u info: %s\\n\",\n-\t\t\t\tindex, strerror(errno));\n+\t\t\t\tindex, rte_strerror(errno));\n \t\treturn;\n \t}\n \n@@ -183,7 +184,7 @@ vduse_vring_setup(struct virtio_net *dev, unsigned int index)\n \tvq->kickfd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);\n \tif (vq->kickfd < 0) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"Failed to init kickfd for VQ %u: %s\\n\",\n-\t\t\t\tindex, strerror(errno));\n+\t\t\t\tindex, rte_strerror(errno));\n \t\tvq->kickfd = VIRTIO_INVALID_EVENTFD;\n \t\treturn;\n \t}\n@@ -213,7 +214,7 @@ vduse_vring_setup(struct virtio_net *dev, unsigned int index)\n \tret = ioctl(dev->vduse_dev_fd, VDUSE_VQ_SETUP_KICKFD, &vq_efd);\n \tif (ret) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"Failed to setup kickfd for VQ %u: %s\\n\",\n-\t\t\t\tindex, strerror(errno));\n+\t\t\t\tindex, rte_strerror(errno));\n \t\tclose(vq->kickfd);\n \t\tvq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD;\n \t\treturn;\n@@ -224,7 +225,7 @@ vduse_vring_setup(struct virtio_net *dev, unsigned int index)\n \t\tif (ret) {\n \t\t\tVHOST_LOG_CONFIG(dev->ifname, ERR,\n \t\t\t\t\t\"Failed to setup kickfd handler for VQ %u: %s\\n\",\n-\t\t\t\t\tindex, strerror(errno));\n+\t\t\t\t\tindex, rte_strerror(errno));\n \t\t\tvq_efd.fd = VDUSE_EVENTFD_DEASSIGN;\n \t\t\tioctl(dev->vduse_dev_fd, VDUSE_VQ_SETUP_KICKFD, &vq_efd);\n \t\t\tclose(vq->kickfd);\n@@ -254,7 +255,7 @@ vduse_vring_cleanup(struct virtio_net *dev, unsigned int index)\n \tret = ioctl(dev->vduse_dev_fd, VDUSE_VQ_SETUP_KICKFD, &vq_efd);\n \tif (ret)\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"Failed to cleanup kickfd for VQ %u: %s\\n\",\n-\t\t\t\tindex, strerror(errno));\n+\t\t\t\tindex, rte_strerror(errno));\n \n \tclose(vq->kickfd);\n \tvq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD;\n@@ -291,7 +292,7 @@ vduse_device_start(struct virtio_net *dev)\n \tret = ioctl(dev->vduse_dev_fd, VDUSE_DEV_GET_FEATURES, &dev->features);\n \tif (ret) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"Failed to get features: %s\\n\",\n-\t\t\t\tstrerror(errno));\n+\t\t\t\trte_strerror(errno));\n \t\treturn;\n \t}\n \n@@ -358,7 +359,7 @@ vduse_events_handler(int fd, void *arg, int *remove __rte_unused)\n \tret = read(fd, &req, sizeof(req));\n \tif (ret < 0) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"Failed to read request: %s\\n\",\n-\t\t\t\tstrerror(errno));\n+\t\t\t\trte_strerror(errno));\n \t\treturn;\n \t} else if (ret < (int)sizeof(req)) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"Incomplete to read request %d\\n\", ret);\n@@ -400,7 +401,7 @@ vduse_events_handler(int fd, void *arg, int *remove __rte_unused)\n \tret = write(dev->vduse_dev_fd, &resp, sizeof(resp));\n \tif (ret != sizeof(resp)) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"Failed to write response %s\\n\",\n-\t\t\t\tstrerror(errno));\n+\t\t\t\trte_strerror(errno));\n \t\treturn;\n \t}\n \n@@ -453,13 +454,13 @@ vduse_device_create(const char *path, bool compliant_ol_flags)\n \tcontrol_fd = open(VDUSE_CTRL_PATH, O_RDWR);\n \tif (control_fd < 0) {\n \t\tVHOST_LOG_CONFIG(name, ERR, \"Failed to open %s: %s\\n\",\n-\t\t\t\tVDUSE_CTRL_PATH, strerror(errno));\n+\t\t\t\tVDUSE_CTRL_PATH, rte_strerror(errno));\n \t\treturn -1;\n \t}\n \n \tif (ioctl(control_fd, VDUSE_SET_API_VERSION, &ver)) {\n \t\tVHOST_LOG_CONFIG(name, ERR, \"Failed to set API version: %\" PRIu64 \": %s\\n\",\n-\t\t\t\tver, strerror(errno));\n+\t\t\t\tver, rte_strerror(errno));\n \t\tret = -1;\n \t\tgoto out_ctrl_close;\n \t}\n@@ -507,14 +508,14 @@ vduse_device_create(const char *path, bool compliant_ol_flags)\n \tret = ioctl(control_fd, VDUSE_CREATE_DEV, dev_config);\n \tif (ret < 0) {\n \t\tVHOST_LOG_CONFIG(name, ERR, \"Failed to create VDUSE device: %s\\n\",\n-\t\t\t\tstrerror(errno));\n+\t\t\t\trte_strerror(errno));\n \t\tgoto out_free;\n \t}\n \n \tdev_fd = open(path, O_RDWR);\n \tif (dev_fd < 0) {\n \t\tVHOST_LOG_CONFIG(name, ERR, \"Failed to open device %s: %s\\n\",\n-\t\t\t\tpath, strerror(errno));\n+\t\t\t\tpath, rte_strerror(errno));\n \t\tret = -1;\n \t\tgoto out_dev_close;\n \t}\n@@ -522,7 +523,7 @@ vduse_device_create(const char *path, bool compliant_ol_flags)\n \tret = fcntl(dev_fd, F_SETFL, O_NONBLOCK);\n \tif (ret < 0) {\n \t\tVHOST_LOG_CONFIG(name, ERR, \"Failed to set chardev as non-blocking: %s\\n\",\n-\t\t\t\tstrerror(errno));\n+\t\t\t\trte_strerror(errno));\n \t\tgoto out_dev_close;\n \t}\n \n@@ -625,7 +626,7 @@ vduse_device_destroy(const char *path)\n \t\tret = ioctl(dev->vduse_ctrl_fd, VDUSE_DESTROY_DEV, name);\n \t\tif (ret)\n \t\t\tVHOST_LOG_CONFIG(name, ERR, \"Failed to destroy VDUSE device: %s\\n\",\n-\t\t\t\t\tstrerror(errno));\n+\t\t\t\t\trte_strerror(errno));\n \t\tclose(dev->vduse_ctrl_fd);\n \t\tdev->vduse_ctrl_fd = -1;\n \t}\ndiff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c\nindex e36312181a..ebf5afe45d 100644\n--- a/lib/vhost/vhost_user.c\n+++ b/lib/vhost/vhost_user.c\n@@ -772,7 +772,8 @@ mem_set_dump(void *ptr, size_t size, bool enable, uint64_t pagesz)\n \n \tif (madvise(start, len, enable ? MADV_DODUMP : MADV_DONTDUMP) == -1) {\n \t\trte_log(RTE_LOG_INFO, vhost_config_log_level,\n-\t\t\t\"VHOST_CONFIG: could not set coredump preference (%s).\\n\", strerror(errno));\n+\t\t\t\"VHOST_CONFIG: could not set coredump preference (%s).\\n\",\n+\t\t\trte_strerror(errno));\n \t}\n #endif\n }\n@@ -1138,7 +1139,7 @@ vhost_user_postcopy_region_register(struct virtio_net *dev,\n \t\t\t(uint64_t)reg_struct.range.start +\n \t\t\t(uint64_t)reg_struct.range.len - 1,\n \t\t\tdev->postcopy_ufd,\n-\t\t\tstrerror(errno));\n+\t\t\trte_strerror(errno));\n \t\treturn -1;\n \t}\n \n@@ -1267,7 +1268,7 @@ vhost_user_mmap_region(struct virtio_net *dev,\n \t\t\tMAP_SHARED | populate, region->fd, 0);\n \n \tif (mmap_addr == MAP_FAILED) {\n-\t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"mmap failed (%s).\\n\", strerror(errno));\n+\t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"mmap failed (%s).\\n\", rte_strerror(errno));\n \t\treturn -1;\n \t}\n \n@@ -2698,7 +2699,7 @@ vhost_user_set_postcopy_advise(struct virtio_net **pdev,\n \tif (dev->postcopy_ufd == -1) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR,\n \t\t\t\"userfaultfd not available: %s\\n\",\n-\t\t\tstrerror(errno));\n+\t\t\trte_strerror(errno));\n \t\treturn RTE_VHOST_MSG_RESULT_ERR;\n \t}\n \tapi_struct.api = UFFD_API;\n@@ -2706,7 +2707,7 @@ vhost_user_set_postcopy_advise(struct virtio_net **pdev,\n \tif (ioctl(dev->postcopy_ufd, UFFDIO_API, &api_struct)) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR,\n \t\t\t\"UFFDIO_API ioctl failure: %s\\n\",\n-\t\t\tstrerror(errno));\n+\t\t\trte_strerror(errno));\n \t\tclose(dev->postcopy_ufd);\n \t\tdev->postcopy_ufd = -1;\n \t\treturn RTE_VHOST_MSG_RESULT_ERR;\n", "prefixes": [ "v3", "08/42" ] }{ "id": 134333, "url": "