From patchwork Tue Jul 28 17:36:42 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: 501318 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 63F7D140DFC for ; Wed, 29 Jul 2015 03:38:47 +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=S14yhQpA; dkim-atps=neutral Received: from localhost ([::1]:60191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK8px-00085n-Ac for incoming@patchwork.ozlabs.org; Tue, 28 Jul 2015 13:38:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK8of-0005kh-DK for qemu-devel@nongnu.org; Tue, 28 Jul 2015 13:37:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZK8oe-00014v-Cb for qemu-devel@nongnu.org; Tue, 28 Jul 2015 13:37:25 -0400 Received: from mail-qg0-x234.google.com ([2607:f8b0:400d:c04::234]:34946) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK8oe-00014r-8H for qemu-devel@nongnu.org; Tue, 28 Jul 2015 13:37:24 -0400 Received: by qgii95 with SMTP id i95so79463264qgi.2 for ; Tue, 28 Jul 2015 10:37:23 -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=Vj4IOjkpqmwuZ4gsXSK9VDsu0y/1+fRoLzQOfR93+U8=; b=S14yhQpAbf1GlZ1bjlszA2rfKzYBDfOCujPjs4Tve0K2DRJLvu4E0VQf4yS4hgeQG3 xCkkkrA4soic/+49gyzO4gBdC3LSOvu1+/zhAlaFnc5bjtVEQBNZAzg3SpQKU9trUbxq KeE7lRGKLq0QM472332IcWvg/bxQ6Q9O2wm3/tmkuGPCaaC5IVeoON21M+sdi+aPSpnL n9VpxwiWUURJq3Sd/Yx7K6U/laOTcx54y84svY/1aNFDQL+V1vsxQbwn84GfPvpILXj1 OQF/CtojsvMHDzPWD6XFQHy2ssH11ECcCCpiqH8eR4ixR7YsDQXcltc0UCOfJDoBO5D4 ExMw== X-Received: by 10.140.92.241 with SMTP id b104mr51171920qge.55.1438105043912; Tue, 28 Jul 2015 10:37:23 -0700 (PDT) Received: from localhost (APoitiers-257-1-21-177.w90-38.abo.wanadoo.fr. [90.38.88.177]) by smtp.gmail.com with ESMTPSA id c88sm11567487qge.26.2015.07.28.10.37.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jul 2015 10:37:23 -0700 (PDT) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 28 Jul 2015 19:36:42 +0200 Message-Id: <1438105003-29501-9-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1438105003-29501-1-git-send-email-marcandre.lureau@redhat.com> References: <1438105003-29501-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::234 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 v2 8/9] vhost-user: send log shm fd along with log_base 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 Send the shm for the dirty pages logging if the backend support VHOST_USER_PROTOCOL_F_LOG_SHMFD. Signed-off-by: Marc-André Lureau --- hw/virtio/vhost-user.c | 16 ++++++++++++++-- hw/virtio/vhost.c | 5 +++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 21ecbcd..b2f46a9 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -26,7 +26,9 @@ #define VHOST_MEMORY_MAX_NREGIONS 8 #define VHOST_USER_F_PROTOCOL_FEATURES 30 -#define VHOST_USER_PROTOCOL_FEATURE_MASK 0x0ULL + +#define VHOST_USER_PROTOCOL_FEATURE_MASK 0x1ULL +#define VHOST_USER_PROTOCOL_F_LOG_SHMFD 0 typedef enum VhostUserRequest { VHOST_USER_NONE = 0, @@ -215,8 +217,18 @@ static int vhost_user_call(struct vhost_dev *dev, need_reply = 1; break; + case VHOST_USER_SET_LOG_BASE: { + struct vhost_log *log = va_arg(ap, struct vhost_log *); + + if (__virtio_has_feature(dev->protocol_features, + VHOST_USER_PROTOCOL_F_LOG_SHMFD) && + log->fd != -1) { + fds[fd_num++] = log->fd; + } + } + /* fall through */ + case VHOST_USER_SET_FEATURES: - case VHOST_USER_SET_LOG_BASE: msg.u64 = *((__u64 *) arg); msg.size = sizeof(m.u64); break; diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 057d548..ed8b1a5 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -359,7 +359,7 @@ static inline void vhost_dev_log_resize(struct vhost_dev* dev, uint64_t size) /* inform backend of log switching, this must be done before releasing the current log, to ensure no logging is lost */ - r = dev->vhost_ops->vhost_call(dev, VHOST_SET_LOG_BASE, &log_base); + r = dev->vhost_ops->vhost_call(dev, VHOST_SET_LOG_BASE, &log_base, log); assert(r >= 0); vhost_log_put(dev, true); dev->log = log; @@ -1167,7 +1167,8 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev) hdev->log = vhost_log_get(hdev->log_size, share); log_base = (uintptr_t)hdev->log->log; r = hdev->vhost_ops->vhost_call(hdev, VHOST_SET_LOG_BASE, - hdev->log_size ? &log_base : NULL); + hdev->log_size ? &log_base : NULL, + hdev->log); if (r < 0) { r = -errno; goto fail_log;