From patchwork Fri May 26 14:28:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 9750641 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2AAB360249 for ; Fri, 26 May 2017 14:32:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BDA226538 for ; Fri, 26 May 2017 14:32:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0DB44283C5; Fri, 26 May 2017 14:32:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B416526538 for ; Fri, 26 May 2017 14:32:33 +0000 (UTC) Received: from localhost ([::1]:37072 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEGI4-0002o2-VX for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 May 2017 10:32:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dEGFH-0001K4-6s for qemu-devel@nongnu.org; Fri, 26 May 2017 10:29:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dEGFD-0008GF-8z for qemu-devel@nongnu.org; Fri, 26 May 2017 10:29:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35558) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dEGFD-0008Dr-3Q for qemu-devel@nongnu.org; Fri, 26 May 2017 10:29:35 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E13C63E01; Fri, 26 May 2017 14:29:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0E13C63E01 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=maxime.coquelin@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0E13C63E01 Received: from max-t460s.redhat.com (ovpn-112-29.ams2.redhat.com [10.36.112.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id B80F55C888; Fri, 26 May 2017 14:29:30 +0000 (UTC) From: Maxime Coquelin To: mst@redhat.com, peterx@redhat.com, marcandre.lureau@gmail.com, vkaplans@redhat.com, jasowang@redhat.com, wexu@redhat.com, yuanhan.liu@linux.intel.com, qemu-devel@nongnu.org, jfreiman@redhat.com Date: Fri, 26 May 2017 16:28:55 +0200 Message-Id: <20170526142858.19931-4-maxime.coquelin@redhat.com> In-Reply-To: <20170526142858.19931-1-maxime.coquelin@redhat.com> References: <20170526142858.19931-1-maxime.coquelin@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 26 May 2017 14:29:34 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3/6] vhost: extend ring information update for IOTLB to all rings X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxime Coquelin Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Vhost-kernel backend need to receive IOTLB entry for used ring information early, which is done by triggering a miss event on its address. This patch extends this behaviour to all rings information, to be compatible with vhost-user backend design. Signed-off-by: Maxime Coquelin --- v2: - Revert back to existing behaviour, i.e. only send IOTLB updates at ring enablement time, not at ring address setting time (mst). - Extend IOTLB misses to all ring addresses, not only used ring. hw/virtio/vhost.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 6eddb09..7867034 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1552,11 +1552,15 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev) if (vhost_dev_has_iommu(hdev)) { hdev->vhost_ops->vhost_set_iotlb_callback(hdev, true); - /* Update used ring information for IOTLB to work correctly, - * vhost-kernel code requires for this.*/ + /* + * Update rings information for IOTLB to work correctly, + * vhost-kernel and vhost-user codes require for this. + */ for (i = 0; i < hdev->nvqs; ++i) { struct vhost_virtqueue *vq = hdev->vqs + i; vhost_device_iotlb_miss(hdev, vq->used_phys, true); + vhost_device_iotlb_miss(hdev, vq->desc_phys, true); + vhost_device_iotlb_miss(hdev, vq->avail_phys, true); } } return 0;