From patchwork Fri Nov 29 19:52:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonios Motakis X-Patchwork-Id: 295509 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 9406C2C008F for ; Sat, 30 Nov 2013 06:53:39 +1100 (EST) Received: from localhost ([::1]:49193 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmU89-0000ZH-2S for incoming@patchwork.ozlabs.org; Fri, 29 Nov 2013 14:53:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34202) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmU7U-0000Me-H0 for qemu-devel@nongnu.org; Fri, 29 Nov 2013 14:53:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmU7O-0005JP-H7 for qemu-devel@nongnu.org; Fri, 29 Nov 2013 14:52:56 -0500 Received: from mail-wg0-f49.google.com ([74.125.82.49]:60603) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmU7O-0005JL-7u for qemu-devel@nongnu.org; Fri, 29 Nov 2013 14:52:50 -0500 Received: by mail-wg0-f49.google.com with SMTP id x12so9534439wgg.4 for ; Fri, 29 Nov 2013 11:52:49 -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=AMUxJzpyhmqBEX8XP8Z2gHc914SMkvYolFp7QGxiSYs=; b=kaOD7523CL56lSzYlZ6M6B8vymBayHFxE8O08o+JHb+iUr0/q49UHp1tH9jn0AgOcM mvuyu4iej/8dPkdKGJlbA5j6oRnYATbRkqm6JNelMrYVkWSESJlFuPQX/6na7bCF7S6f C6Nyu4QdS86SMjs3UybvuNSnoUO3yJdZj9CViyHsg246UEBq11fb2CioVTB84S0iraz/ TPZ7kB/dD5th/lyYKWsSzoNmzLstPC3ZzZEzKiMbHIy1BAJ1daTL8jblSzF7QneuMGkI oBHjygznKxIqiwIumyeeec69gmvcNTSOdMaJT9X60gZ/c6X/AraCBX8SBnSSaSY7F1rN /LHg== X-Gm-Message-State: ALoCoQkFhM4UM0Q7v+AAZ8U+DmyX2sJGTGseGSjagznTrRJ6qOfhLKBEaBX8sNrdzalw1zsxGB04 X-Received: by 10.180.149.175 with SMTP id ub15mr8282027wib.10.1385754769430; Fri, 29 Nov 2013 11:52:49 -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.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 29 Nov 2013 11:52:48 -0800 (PST) From: Antonios Motakis To: qemu-devel@nongnu.org Date: Fri, 29 Nov 2013 20:52:23 +0100 Message-Id: <1385754746-21172-3-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: 74.125.82.49 Cc: "Michael S. Tsirkin" , n.nikolaev@virtualopensystems.com, Anthony Liguori , Paolo Bonzini , lukego@gmail.com, Antonios Motakis , tech@virtualopensystems.com Subject: [Qemu-devel] [PATCH 2/5] Add vhost-kernel and the vhost-user skeleton 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 Introduce the backend type - vhost-kernel and vhost-user. Add basic ioctl, open, close multiplexing depending on selected backend. Signed-off-by: Antonios Motakis Signed-off-by: Nikolay Nikolaev --- hw/net/vhost_net.c | 3 +-- hw/scsi/vhost-scsi.c | 4 ++-- hw/virtio/vhost-backend.c | 25 ++++++++++++++++++++++--- hw/virtio/vhost.c | 6 ++++-- include/hw/virtio/vhost-backend.h | 7 +++++++ include/hw/virtio/vhost.h | 4 +++- 6 files changed, 39 insertions(+), 10 deletions(-) diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 0d1943f..58a1880 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -36,7 +36,6 @@ #include #include "hw/virtio/vhost.h" -#include "hw/virtio/vhost-backend.h" #include "hw/virtio/virtio-bus.h" struct vhost_net { @@ -113,7 +112,7 @@ struct vhost_net *vhost_net_init(NetClientState *backend, int devfd, net->dev.nvqs = 2; net->dev.vqs = net->vqs; - r = vhost_dev_init(&net->dev, devfd, "/dev/vhost-net", force); + r = vhost_dev_init(&net->dev, devfd, "/dev/vhost-net", VHOST_BACKEND_TYPE_KERNEL, force); if (r < 0) { goto fail; } diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 14d5030..fdc5d44 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -21,7 +21,6 @@ #include "migration/migration.h" #include "hw/virtio/vhost-scsi.h" #include "hw/virtio/vhost.h" -#include "hw/virtio/vhost-backend.h" #include "hw/virtio/virtio-scsi.h" #include "hw/virtio/virtio-bus.h" @@ -226,7 +225,8 @@ static int vhost_scsi_init(VirtIODevice *vdev) s->dev.vqs = g_new(struct vhost_virtqueue, s->dev.nvqs); s->dev.vq_index = 0; - ret = vhost_dev_init(&s->dev, vhostfd, "/dev/vhost-scsi", true); + ret = vhost_dev_init(&s->dev, vhostfd, "/dev/vhost-scsi", + VHOST_BACKEND_TYPE_KERNEL, true); if (ret < 0) { error_report("vhost-scsi: vhost initialization failed: %s\n", strerror(-ret)); diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c index 05de174..80defe4 100644 --- a/hw/virtio/vhost-backend.c +++ b/hw/virtio/vhost-backend.c @@ -25,9 +25,18 @@ static int vhost_kernel_call(struct vhost_dev *dev, unsigned long int request, int vhost_call(struct vhost_dev *dev, unsigned long int request, void *arg) { - int result; + int result = -1; - result = vhost_kernel_call(dev, request, arg); + switch (dev->backend_type) { + case VHOST_BACKEND_TYPE_KERNEL: + result = vhost_kernel_call(dev, request, arg); + break; + case VHOST_BACKEND_TYPE_USER: + fprintf(stderr, "vhost-user not implemented\n"); + break; + default: + fprintf(stderr, "Unknown vhost backend type\n"); + } return result; } @@ -36,7 +45,17 @@ int vhost_backend_init(struct vhost_dev *dev, const char *devpath) { int fd = -1; - fd = open(devpath, O_RDWR); + switch (dev->backend_type) { + case VHOST_BACKEND_TYPE_KERNEL: + fd = open(devpath, O_RDWR); + break; + case VHOST_BACKEND_TYPE_USER: + fprintf(stderr, "vhost-user not implemented\n"); + break; + default: + fprintf(stderr, "Unknown vhost backend type\n"); + } + dev->control = fd; return fd; diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 42f4d5f..35eeb5f 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -14,7 +14,6 @@ */ #include "hw/virtio/vhost.h" -#include "hw/virtio/vhost-backend.h" #include "hw/hw.h" #include "qemu/atomic.h" #include "qemu/range.h" @@ -815,10 +814,13 @@ static void vhost_virtqueue_cleanup(struct vhost_virtqueue *vq) } int vhost_dev_init(struct vhost_dev *hdev, int devfd, const char *devpath, - bool force) + VhostBackendType backend_type, bool force) { uint64_t features; int i, r; + + hdev->backend_type = backend_type; + if (devfd >= 0) { hdev->control = devfd; } else { diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h index fc51b72..970f033 100644 --- a/include/hw/virtio/vhost-backend.h +++ b/include/hw/virtio/vhost-backend.h @@ -12,6 +12,13 @@ #ifndef VHOST_BACKEND_H_ #define VHOST_BACKEND_H_ +typedef enum VhostBackendType { + VHOST_BACKEND_TYPE_NONE = 0, + VHOST_BACKEND_TYPE_KERNEL = 1, + VHOST_BACKEND_TYPE_USER = 2, + VHOST_BACKEND_TYPE_MAX = 3, +} VhostBackendType; + struct vhost_dev; int vhost_call(struct vhost_dev *dev, unsigned long int request, void *arg); diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index de24746..c08ae46 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -2,6 +2,7 @@ #define VHOST_H #include "hw/hw.h" +#include "hw/virtio/vhost-backend.h" #include "hw/virtio/virtio.h" #include "exec/memory.h" @@ -48,10 +49,11 @@ struct vhost_dev { bool memory_changed; hwaddr mem_changed_start_addr; hwaddr mem_changed_end_addr; + VhostBackendType backend_type; }; int vhost_dev_init(struct vhost_dev *hdev, int devfd, const char *devpath, - bool force); + VhostBackendType backend_type, bool force); void vhost_dev_cleanup(struct vhost_dev *hdev); bool vhost_dev_query(struct vhost_dev *hdev, VirtIODevice *vdev); int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev);