From patchwork Fri Nov 29 19:52:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonios Motakis X-Patchwork-Id: 295512 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ADE5C2C00AD for ; Sat, 30 Nov 2013 06:55:13 +1100 (EST) Received: from localhost ([::1]:49214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmU9f-0004ft-6h for incoming@patchwork.ozlabs.org; Fri, 29 Nov 2013 14:55:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34278) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmU7b-0000X4-PU for qemu-devel@nongnu.org; Fri, 29 Nov 2013 14:53:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmU7V-0005LD-Ot for qemu-devel@nongnu.org; Fri, 29 Nov 2013 14:53:03 -0500 Received: from mail-wi0-f175.google.com ([209.85.212.175]:51166) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmU7V-0005L3-Fq for qemu-devel@nongnu.org; Fri, 29 Nov 2013 14:52:57 -0500 Received: by mail-wi0-f175.google.com with SMTP id hi5so2486397wib.8 for ; Fri, 29 Nov 2013 11:52:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YG/iXHHuO87V45yQhBlpYDJP967DdkPWxFq27iSCa3U=; b=Xv6zkYGZr3yQLnvOEREDlIJ8xauDPXEuHMq1mqmbauNX5xUtz5KKSugwBFoEJpb19X WHuEKd7k8vSyRa+Ad7EKE7c8FWSX92BTfSwX9z3PYYW57IJ2szgtzfM4ieS+H9smsjkg TiMqgaPF2/gZidHsTFIvBba60FAeF66aSttqAvjTgfA+sEzJYUMeaGOxSJZLgCzmCQnj UwfjWBa6YwymjeXck+XUHHdqVdWXoF++sJVEoXxCt2r2GjF+NOwPyEJf1RfUulzt8Rrm Jc1of8QcX0K6ATo9Rs7StRtqUOUC0kHDiNyvTTtmdXyWeNeuMEhUvPXzgkfjJWCz6kRw jLzw== X-Gm-Message-State: ALoCoQn2gMQEL/GUar7VJzvztm05t2zNjx4JADOnvSit9SI3JLqzefyJUtcPzzvSe5dCiVsNhjju X-Received: by 10.194.93.105 with SMTP id ct9mr43120179wjb.6.1385754776780; Fri, 29 Nov 2013 11:52:56 -0800 (PST) Received: from localhost.localdomain (home.tvelocity.eu. [82.67.68.96]) by mx.google.com with ESMTPSA id c10sm94793456wie.11.2013.11.29.11.52.54 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 29 Nov 2013 11:52:55 -0800 (PST) From: Antonios Motakis To: qemu-devel@nongnu.org Date: Fri, 29 Nov 2013 20:52:26 +0100 Message-Id: <1385754746-21172-6-git-send-email-a.motakis@virtualopensystems.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1385754746-21172-1-git-send-email-a.motakis@virtualopensystems.com> References: <1385754746-21172-1-git-send-email-a.motakis@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.175 Cc: lukego@gmail.com, Antonios Motakis , tech@virtualopensystems.com, n.nikolaev@virtualopensystems.com, "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 5/5] Add vhost-user calls implementation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Each ioctl request of vhost-kernel has a vhost-user message equivalent, which is sent it over the control socket. The general approach is to copy the data from the supplied argument pointer to a designated field in the message. If a file descriptor is to be passed it should be placed also in the fds array for inclusion in the sendmsd control header. VHOST_SET_MEM_TABLE ignores the supplied vhost_memory structure and scans the global ram_list for ram blocks wiht a valid fd field set. This would be set when -mem-path and -mem-prealloc command line options are used. Signed-off-by: Antonios Motakis Signed-off-by: Nikolay Nikolaev --- hw/virtio/vhost-backend.c | 105 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 100 insertions(+), 5 deletions(-) diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c index 264a0a1..1bc2928 100644 --- a/hw/virtio/vhost-backend.c +++ b/hw/virtio/vhost-backend.c @@ -67,6 +67,38 @@ typedef struct VhostUserMsg { }; } VhostUserMsg; +static unsigned long int ioctl_to_vhost_user_request[VHOST_USER_MAX] = { + -1, /* VHOST_USER_NONE */ + VHOST_GET_FEATURES, /* VHOST_USER_GET_FEATURES */ + VHOST_SET_FEATURES, /* VHOST_USER_SET_FEATURES */ + VHOST_SET_OWNER, /* VHOST_USER_SET_OWNER */ + VHOST_RESET_OWNER, /* VHOST_USER_RESET_OWNER */ + VHOST_SET_MEM_TABLE, /* VHOST_USER_SET_MEM_TABLE */ + VHOST_SET_LOG_BASE, /* VHOST_USER_SET_LOG_BASE */ + VHOST_SET_LOG_FD, /* VHOST_USER_SET_LOG_FD */ + VHOST_SET_VRING_NUM, /* VHOST_USER_SET_VRING_NUM */ + VHOST_SET_VRING_ADDR, /* VHOST_USER_SET_VRING_ADDR */ + VHOST_SET_VRING_BASE, /* VHOST_USER_SET_VRING_BASE */ + VHOST_GET_VRING_BASE, /* VHOST_USER_GET_VRING_BASE */ + VHOST_SET_VRING_KICK, /* VHOST_USER_SET_VRING_KICK */ + VHOST_SET_VRING_CALL, /* VHOST_USER_SET_VRING_CALL */ + VHOST_SET_VRING_ERR, /* VHOST_USER_SET_VRING_ERR */ + VHOST_NET_SET_BACKEND /* VHOST_USER_NET_SET_BACKEND */ +}; + +static VhostUserRequest vhost_user_request_translate(unsigned long int request) +{ + VhostUserRequest idx; + + for (idx = 0; idx < VHOST_USER_MAX; idx++) { + if (ioctl_to_vhost_user_request[idx] == request) { + break; + } + } + + return (idx == VHOST_USER_MAX) ? VHOST_USER_NONE : idx; +} + static int vhost_user_recv(int fd, VhostUserMsg *msg) { ssize_t r = read(fd, msg, sizeof(VhostUserMsg)); @@ -137,13 +169,72 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request, { int fd = dev->control; VhostUserMsg msg; - int result = 0; + RAMBlock *block = 0; + int result = 0, need_reply = 0; int fds[VHOST_MEMORY_MAX_NREGIONS]; size_t fd_num = 0; - memset(&msg, 0, sizeof(VhostUserMsg)); + msg.request = vhost_user_request_translate(request); + msg.flags = 0; switch (request) { + case VHOST_GET_FEATURES: + case VHOST_GET_VRING_BASE: + need_reply = 1; + break; + + case VHOST_SET_FEATURES: + case VHOST_SET_LOG_BASE: + msg.u64 = *((uint64_t *) arg); + break; + + case VHOST_SET_OWNER: + case VHOST_RESET_OWNER: + break; + + case VHOST_SET_MEM_TABLE: + QTAILQ_FOREACH(block, &ram_list.blocks, next) + { + if (block->fd > 0) { + msg.memory.regions[fd_num].userspace_addr = (__u64) block->host; + msg.memory.regions[fd_num].memory_size = block->length; + msg.memory.regions[fd_num].guest_phys_addr = block->offset; + fds[fd_num++] = block->fd; + } + } + + msg.memory.nregions = fd_num; + + if (!fd_num) { + fprintf(stderr, "Failed initializing vhost-user memory map\n" + "consider -mem-path and -mem-prealloc options\n"); + return -1; + } + break; + + case VHOST_SET_LOG_FD: + msg.fd = *((int *) arg); + break; + + case VHOST_SET_VRING_NUM: + case VHOST_SET_VRING_BASE: + memcpy(&msg.state, arg, sizeof(struct vhost_vring_state)); + break; + + case VHOST_SET_VRING_ADDR: + memcpy(&msg.addr, arg, sizeof(struct vhost_vring_addr)); + break; + + case VHOST_SET_VRING_KICK: + case VHOST_SET_VRING_CALL: + case VHOST_SET_VRING_ERR: + case VHOST_NET_SET_BACKEND: + memcpy(&msg.file, arg, sizeof(struct vhost_vring_file)); + if (msg.file.fd > 0) { + fds[0] = msg.file.fd; + fd_num = 1; + } + break; default: fprintf(stderr, "vhost-user trying to send unhandled ioctl\n"); return -1; @@ -152,12 +243,16 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request, result = vhost_user_send_fds(fd, &msg, fds, fd_num); - if (!result) { + if (!result && need_reply) { result = vhost_user_recv(fd, &msg); if (!result) { switch (request) { - default: - fprintf(stderr, "vhost-user received unhandled message\n"); + case VHOST_GET_FEATURES: + *((uint64_t *) arg) = msg.u64; + break; + case VHOST_GET_VRING_BASE: + memcpy(arg, &msg.state, sizeof(struct vhost_vring_state)); + break; } } }