From patchwork Thu Sep 24 16:22:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 522418 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A22A214010F for ; Fri, 25 Sep 2015 02:26:33 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=WBEXq9Bo; dkim-atps=neutral Received: from localhost ([::1]:45878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf9Lr-0006Ty-Dt for incoming@patchwork.ozlabs.org; Thu, 24 Sep 2015 12:26:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf9IM-0000u2-9D for qemu-devel@nongnu.org; Thu, 24 Sep 2015 12:22:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zf9IL-0005EQ-C1 for qemu-devel@nongnu.org; Thu, 24 Sep 2015 12:22:54 -0400 Received: from mail-qg0-x232.google.com ([2607:f8b0:400d:c04::232]:33487) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zf9IL-0005EM-6L for qemu-devel@nongnu.org; Thu, 24 Sep 2015 12:22:53 -0400 Received: by qgev79 with SMTP id v79so48389858qge.0 for ; Thu, 24 Sep 2015 09:22:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=obkSFBeP2yWw0s6AcgAdgJcR3Bchy55vBRUOllDdojM=; b=WBEXq9BoFopBXJWoazdpkKaFVmwlWEGDsJACSTTHnchcMhn7aA4OgwCBobXtwFsqcd nqtzpKMTW9b6BA+zCAOtp5bSTAoR/zZCLPzUbm5PwEhM0K8OXRfom7GUELA7CuThOTZC W1l6FWw9ds3Sucr6GYbR73LCz8EkZDdZeSvFVpaZnkQoGuibCYDQ/68rmeMwMdq1Ohu3 Sy//V/58wW2nO2fQjssqONA6gFzsrpwMFA3RXVuTTdQbaVplDAzt2uZN+vqCHXmTDoV0 +1MjVNdi14s5q63B3bYPA8OccaMB9SY1dd6o9IwaO2/WqHZ+iU+qaJqEbDe6qRgzUQPr iikQ== X-Received: by 10.140.235.84 with SMTP id g81mr792888qhc.75.1443111772893; Thu, 24 Sep 2015 09:22:52 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id 39sm4771708qkw.33.2015.09.24.09.22.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2015 09:22:52 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Thu, 24 Sep 2015 18:22:11 +0200 Message-Id: <1443111741-4736-12-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443111741-4736-1-git-send-email-marcandre.lureau@redhat.com> References: <1443111741-4736-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::232 Cc: haifeng.lin@huawei.com, mst@redhat.com, thibaut.collet@6wind.com, jasowang@redhat.com, pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCH v5 11/21] vhost: only use shared log if in use by backend 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 From: Marc-André Lureau Do not allocate a shared log if the backend doesn't support it. Signed-off-by: Marc-André Lureau --- hw/virtio/vhost-user.c | 9 +++++++++ hw/virtio/vhost.c | 15 ++++++++++----- include/hw/virtio/vhost-backend.h | 4 ++++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 41e0364..455caba 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -553,6 +553,14 @@ static int vhost_user_get_vq_index(struct vhost_dev *dev, int idx) return idx; } +static bool vhost_user_requires_shm_log(struct vhost_dev *dev) +{ + assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER); + + return virtio_has_feature(dev->protocol_features, + VHOST_USER_PROTOCOL_F_LOG_SHMFD); +} + const VhostOps user_ops = { .backend_type = VHOST_BACKEND_TYPE_USER, .vhost_backend_init = vhost_user_init, @@ -573,4 +581,5 @@ const VhostOps user_ops = { .vhost_reset_device = vhost_user_reset_device, .vhost_get_vq_index = vhost_user_get_vq_index, .vhost_set_vring_enable = vhost_user_set_vring_enable, + .vhost_requires_shm_log = vhost_user_requires_shm_log, }; diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index d9f2131..ec27c7b 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -357,10 +357,15 @@ static void vhost_log_put(struct vhost_dev *dev, bool sync) } } -static inline void vhost_dev_log_resize(struct vhost_dev* dev, uint64_t size) +static bool vhost_dev_log_is_shared(struct vhost_dev *dev) { - bool share = dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER; - struct vhost_log *log = vhost_log_get(size, share); + return dev->vhost_ops->vhost_requires_shm_log && + dev->vhost_ops->vhost_requires_shm_log(dev); +} + +static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size) +{ + struct vhost_log *log = vhost_log_get(size, vhost_dev_log_is_shared(dev)); uint64_t log_base = (uintptr_t)log->log; int r; @@ -1166,10 +1171,10 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev) if (hdev->log_enabled) { uint64_t log_base; - bool share = hdev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER; hdev->log_size = vhost_get_log_size(hdev); - hdev->log = vhost_log_get(hdev->log_size, share); + hdev->log = vhost_log_get(hdev->log_size, + vhost_dev_log_is_shared(hdev)); log_base = (uintptr_t)hdev->log->log; r = hdev->vhost_ops->vhost_set_log_base(hdev, hdev->log_size ? log_base : 0, diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h index 868a78a..e07118c 100644 --- a/include/hw/virtio/vhost-backend.h +++ b/include/hw/virtio/vhost-backend.h @@ -11,6 +11,8 @@ #ifndef VHOST_BACKEND_H_ #define VHOST_BACKEND_H_ +#include + typedef enum VhostBackendType { VHOST_BACKEND_TYPE_NONE = 0, VHOST_BACKEND_TYPE_KERNEL = 1, @@ -64,6 +66,7 @@ typedef int (*vhost_reset_device_op)(struct vhost_dev *dev); typedef int (*vhost_get_vq_index_op)(struct vhost_dev *dev, int idx); typedef int (*vhost_set_vring_enable_op)(struct vhost_dev *dev, int enable); +typedef bool (*vhost_requires_shm_log_op)(struct vhost_dev *dev); typedef struct VhostOps { VhostBackendType backend_type; @@ -90,6 +93,7 @@ typedef struct VhostOps { vhost_reset_device_op vhost_reset_device; vhost_get_vq_index_op vhost_get_vq_index; vhost_set_vring_enable_op vhost_set_vring_enable; + vhost_requires_shm_log_op vhost_requires_shm_log; } VhostOps; extern const VhostOps user_ops;