Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/43824/?format=api
{ "id": 43824, "url": "http://patches.dpdk.org/api/patches/43824/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180823165157.30001-3-maxime.coquelin@redhat.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": "<20180823165157.30001-3-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180823165157.30001-3-maxime.coquelin@redhat.com", "date": "2018-08-23T16:51:49", "name": "[RFC,02/10] vhost: add number of fds to vhost-user messages and use it", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "6b306593cf46d19088edf16ecf9e8e409567e980", "submitter": { "id": 512, "url": "http://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "http://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20180823165157.30001-3-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 1039, "url": "http://patches.dpdk.org/api/series/1039/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1039", "date": "2018-08-23T16:51:47", "name": "vhost: add postcopy live-migration support", "version": 1, "mbox": "http://patches.dpdk.org/series/1039/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/43824/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/43824/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 B4F1F4CA1;\n\tThu, 23 Aug 2018 18:52:13 +0200 (CEST)", "from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73])\n\tby dpdk.org (Postfix) with ESMTP id 88C354C8D\n\tfor <dev@dpdk.org>; Thu, 23 Aug 2018 18:52:10 +0200 (CEST)", "from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 2C484401B3C4;\n\tThu, 23 Aug 2018 16:52:10 +0000 (UTC)", "from localhost.localdomain (ovpn-112-46.ams2.redhat.com\n\t[10.36.112.46])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id B8BE62166BA1;\n\tThu, 23 Aug 2018 16:52:08 +0000 (UTC)" ], "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, tiwei.bie@intel.com, zhihong.wang@intel.com,\n\tjfreimann@redhat.com", "Cc": "dgilbert@redhat.com,\n\tMaxime Coquelin <maxime.coquelin@redhat.com>", "Date": "Thu, 23 Aug 2018 18:51:49 +0200", "Message-Id": "<20180823165157.30001-3-maxime.coquelin@redhat.com>", "In-Reply-To": "<20180823165157.30001-1-maxime.coquelin@redhat.com>", "References": "<20180823165157.30001-1-maxime.coquelin@redhat.com>", "X-Scanned-By": "MIMEDefang 2.78 on 10.11.54.6", "X-Greylist": [ "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.11.55.6]); Thu, 23 Aug 2018 16:52:10 +0000 (UTC)", "inspected by milter-greylist-4.5.16 (mx1.redhat.com\n\t[10.11.55.6]); \n\tThu, 23 Aug 2018 16:52:10 +0000 (UTC) for IP:'10.11.54.6'\n\tDOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com'\n\tHELO:'smtp.corp.redhat.com' FROM:'maxime.coquelin@redhat.com' RCPT:''" ], "Subject": "[dpdk-dev] [RFC 02/10] vhost: add number of fds to vhost-user\n\tmessages and use it", "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": "As soons as some anciliarry datai (fds) are received, it is copied\nwithout checking its length.\n\nThis patch adds adds the number of fds received to the message,\nwhich is set in read_vhost_message().\n\nThis is preliminary work to support sending fds to Qemu.\n\nSigned-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n lib/librte_vhost/socket.c | 21 ++++++++++++++++-----\n lib/librte_vhost/vhost_user.c | 2 +-\n lib/librte_vhost/vhost_user.h | 4 +++-\n 3 files changed, 20 insertions(+), 7 deletions(-)", "diff": "diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c\nindex d63031747..c04d3d305 100644\n--- a/lib/librte_vhost/socket.c\n+++ b/lib/librte_vhost/socket.c\n@@ -94,18 +94,23 @@ static struct vhost_user vhost_user = {\n \t.mutex = PTHREAD_MUTEX_INITIALIZER,\n };\n \n-/* return bytes# of read on success or negative val on failure. */\n+/*\n+ * return bytes# of read on success or negative val on failure. Update fdnum\n+ * with number of fds read.\n+ */\n int\n-read_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num)\n+read_fd_message(int sockfd, char *buf, int buflen, int *fds, int max_fds,\n+\t\tint *fd_num)\n {\n \tstruct iovec iov;\n \tstruct msghdr msgh;\n-\tsize_t fdsize = fd_num * sizeof(int);\n-\tchar control[CMSG_SPACE(fdsize)];\n+\tchar control[CMSG_SPACE(max_fds * sizeof(int))];\n \tstruct cmsghdr *cmsg;\n \tint got_fds = 0;\n \tint ret;\n \n+\t*fd_num = 0;\n+\n \tmemset(&msgh, 0, sizeof(msgh));\n \tiov.iov_base = buf;\n \tiov.iov_len = buflen;\n@@ -131,13 +136,19 @@ read_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num)\n \t\tif ((cmsg->cmsg_level == SOL_SOCKET) &&\n \t\t\t(cmsg->cmsg_type == SCM_RIGHTS)) {\n \t\t\tgot_fds = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int);\n+\t\t\tif (got_fds > max_fds) {\n+\t\t\t\tRTE_LOG(ERR, VHOST_CONFIG,\n+\t\t\t\t\t\t\"Received msg contains more fds than supported\\n\");\n+\t\t\t\treturn -1;\n+\t\t\t}\n+\t\t\t*fd_num = got_fds;\n \t\t\tmemcpy(fds, CMSG_DATA(cmsg), got_fds * sizeof(int));\n \t\t\tbreak;\n \t\t}\n \t}\n \n \t/* Clear out unused file descriptors */\n-\twhile (got_fds < fd_num)\n+\twhile (got_fds < max_fds)\n \t\tfds[got_fds++] = -1;\n \n \treturn ret;\ndiff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c\nindex a2d4c9ffc..0a7cbfa14 100644\n--- a/lib/librte_vhost/vhost_user.c\n+++ b/lib/librte_vhost/vhost_user.c\n@@ -1410,7 +1410,7 @@ read_vhost_message(int sockfd, struct VhostUserMsg *msg)\n \tint ret;\n \n \tret = read_fd_message(sockfd, (char *)msg, VHOST_USER_HDR_SIZE,\n-\t\tmsg->fds, VHOST_MEMORY_MAX_NREGIONS);\n+\t\tmsg->fds, VHOST_MEMORY_MAX_NREGIONS, &msg->fd_num);\n \tif (ret <= 0)\n \t\treturn ret;\n \ndiff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h\nindex 42166adf2..dd0262f8f 100644\n--- a/lib/librte_vhost/vhost_user.h\n+++ b/lib/librte_vhost/vhost_user.h\n@@ -132,6 +132,7 @@ typedef struct VhostUserMsg {\n \t\tVhostUserVringArea area;\n \t} payload;\n \tint fds[VHOST_MEMORY_MAX_NREGIONS];\n+\tint fd_num;\n } __attribute((packed)) VhostUserMsg;\n \n #define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64)\n@@ -146,7 +147,8 @@ int vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm);\n int vhost_user_host_notifier_ctrl(int vid, bool enable);\n \n /* socket.c */\n-int read_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num);\n+int read_fd_message(int sockfd, char *buf, int buflen, int *fds, int max_fds,\n+\t\tint *fd_num);\n int send_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num);\n \n #endif\n", "prefixes": [ "RFC", "02/10" ] }