Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/62893/?format=api
{ "id": 62893, "url": "https://patches.dpdk.org/api/patches/62893/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20191112151852.27341-2-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": "<20191112151852.27341-2-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191112151852.27341-2-maxime.coquelin@redhat.com", "date": "2019-11-12T15:18:50", "name": "[v16.11,v2,2/4] vhost: add number of fds to vhost-user messages", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": true, "hash": "7c4bdb9751b0a51e438ac88a51153b7f958674a6", "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/20191112151852.27341-2-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 7417, "url": "https://patches.dpdk.org/api/series/7417/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=7417", "date": "2019-11-12T15:18:49", "name": "[v16.11,v2,1/4] vhost: validate virtqueue size", "version": 2, "mbox": "https://patches.dpdk.org/series/7417/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/62893/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/62893/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 7F36FA04B6;\n\tTue, 12 Nov 2019 16:19:20 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id AA9D82BAF;\n\tTue, 12 Nov 2019 16:19:13 +0100 (CET)", "from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com\n [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id D708C2B99\n for <dev@dpdk.org>; Tue, 12 Nov 2019 16:19:10 +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-20-7cOSCngNNPKFnRUqj73LzQ-1; Tue, 12 Nov 2019 10:19:08 -0500", "from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com\n [10.5.11.15])\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 08ED610C76FD;\n Tue, 12 Nov 2019 15:19:08 +0000 (UTC)", "from localhost.localdomain (ovpn-112-39.ams2.redhat.com\n [10.36.112.39])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 96C8A63BA9;\n Tue, 12 Nov 2019 15:19:06 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1573571950;\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=tEKjZZ3WFM1Z5hy4Oo9vMmQNfKGV44eyW0NF/sHMWbE=;\n b=TAJe/5bh3/18uSuSvfFLBWJiDbHw3FqXBaqfgTIPt4wBd8988s5gXFRQ/wWCOQFtoZhCKi\n 3qEWS//KVkCieI+6ypqQx4peMEC7ROFYj/WnrZswZ97d9ZOhObYYbyddWtnNQGNKLa5jHH\n EzlyohYiZes+wygZ4xuEACdttzFiY34=", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org,\n\tstable@dpdk.org", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>,\n \"Dr . David Alan Gilbert\" <dgilbert@redhat.com>", "Date": "Tue, 12 Nov 2019 16:18:50 +0100", "Message-Id": "<20191112151852.27341-2-maxime.coquelin@redhat.com>", "In-Reply-To": "<20191112151852.27341-1-maxime.coquelin@redhat.com>", "References": "<b45c3416-0b1d-0ee4-89eb-c23a69e7cef3@intel.com>\n <20191112151852.27341-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.15", "X-MC-Unique": "7cOSCngNNPKFnRUqj73LzQ-1", "X-Mimecast-Spam-Score": "0", "Content-Type": "text/plain; charset=WINDOWS-1252", "Content-Transfer-Encoding": "quoted-printable", "Subject": "[dpdk-dev] [v16.11 PATCH v2 2/4] vhost: add number of fds to\n\tvhost-user messages", "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 <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": "As soon as some ancillary data (fds) are received, it is copied\nwithout checking its length.\n\nThis patch 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(cherry picked from commit c00bb88d35fe975ede0ea35bdf4f765a2cece7e8)\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n lib/librte_vhost/socket.c | 22 +++++++++++++++++-----\n lib/librte_vhost/vhost_user.c | 2 +-\n lib/librte_vhost/vhost_user.h | 4 +++-\n 3 files changed, 21 insertions(+), 7 deletions(-)", "diff": "diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c\nindex 805b2e5b23..4a19280fb3 100644\n--- a/lib/librte_vhost/socket.c\n+++ b/lib/librte_vhost/socket.c\n@@ -101,17 +101,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@@ -136,11 +142,17 @@ read_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num)\n \t\tcmsg = CMSG_NXTHDR(&msgh, cmsg)) {\n \t\tif ((cmsg->cmsg_level == SOL_SOCKET) &&\n \t\t\t(cmsg->cmsg_type == SCM_RIGHTS)) {\n-\t\t\tmemcpy(fds, CMSG_DATA(cmsg), fdsize);\n+\t\t\tgot_fds = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int);\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 < max_fds)\n+\t\tfds[got_fds++] = -1;\n+\n \treturn ret;\n }\n \ndiff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c\nindex 8a01c295e7..b8f6a9fba5 100644\n--- a/lib/librte_vhost/vhost_user.c\n+++ b/lib/librte_vhost/vhost_user.c\n@@ -963,7 +963,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 ba78d32684..ea9d304f82 100644\n--- a/lib/librte_vhost/vhost_user.h\n+++ b/lib/librte_vhost/vhost_user.h\n@@ -110,6 +110,7 @@ typedef struct VhostUserMsg {\n \t\tVhostUserLog log;\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@@ -122,7 +123,8 @@ typedef struct VhostUserMsg {\n int vhost_user_msg_handler(int vid, int fd);\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": [ "v16.11", "v2", "2/4" ] }