From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id D877FA2F6B
for <public@inbox.dpdk.org>; Tue, 8 Oct 2019 08:33:51 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 809801BF54;
Tue, 8 Oct 2019 08:33:50 +0200 (CEST)
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
by dpdk.org (Postfix) with ESMTP id B82351BF4A;
Tue, 8 Oct 2019 08:33:48 +0200 (CEST)
X-Amp-Result: UNKNOWN
X-Amp-Original-Verdict: FILE UNKNOWN
X-Amp-File-Uploaded: False
Received: from fmsmga005.fm.intel.com ([10.253.24.32])
by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
07 Oct 2019 23:33:47 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.67,269,1566889200"; d="scan'208";a="393257525"
Received: from dpdk-virtio-tbie-2.sh.intel.com (HELO ___) ([10.67.104.74])
by fmsmga005.fm.intel.com with ESMTP; 07 Oct 2019 23:33:46 -0700
Date: Tue, 8 Oct 2019 14:30:49 +0800
From: Tiwei Bie <tiwei.bie@intel.com>
To: Adrian Moreno <amorenoz@redhat.com>
Cc: dev@dpdk.org, zhihong.wang@intel.com, maxime.coquelin@redhat.com,
stable@dpdk.org
Message-ID: <20191008063049.GB25865@___>
References: <20190927183759.18816-1-amorenoz@redhat.com>
<20190927183759.18816-3-amorenoz@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <20190927183759.18816-3-amorenoz@redhat.com>
User-Agent: Mutt/1.9.4 (2018-02-28)
Subject: Re: [dpdk-dev] [PATCH v3 2/3] vhost: convert buffer addresses to
GPA for logging
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
On Fri, Sep 27, 2019 at 08:37:58PM +0200, Adrian Moreno wrote:
> Note that the API facing rte_vhost_log_write is not modified.
> So, make explicit that it expects the address in GPA space.
>
> Fixes: 69c90e98f483 ("vhost: enable IOMMU support")
> Cc: maxime.coquelin@redhat.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Adrian Moreno <amorenoz@redhat.com>
> ---
> lib/librte_vhost/rte_vhost.h | 2 +-
> lib/librte_vhost/vdpa.c | 4 +++-
> lib/librte_vhost/vhost.c | 21 +++++++++++++++++++++
> lib/librte_vhost/vhost.h | 16 ++++++++++++++++
> lib/librte_vhost/virtio_net.c | 12 +++++++-----
> 5 files changed, 48 insertions(+), 7 deletions(-)
>
> diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
> index 7fb172912..16c7e4243 100644
> --- a/lib/librte_vhost/rte_vhost.h
> +++ b/lib/librte_vhost/rte_vhost.h
> @@ -265,7 +265,7 @@ rte_vhost_va_from_guest_pa(struct rte_vhost_memory *mem,
> * @param vid
> * vhost device ID
> * @param addr
> - * the starting address for write
> + * the starting address for write (in guest physical address space)
> * @param len
> * the length to write
> */
> diff --git a/lib/librte_vhost/vdpa.c b/lib/librte_vhost/vdpa.c
> index 8e45ce9f8..11fd5aede 100644
> --- a/lib/librte_vhost/vdpa.c
> +++ b/lib/librte_vhost/vdpa.c
> @@ -201,7 +201,9 @@ rte_vdpa_relay_vring_used(int vid, uint16_t qid, void *vring_m)
> goto fail;
> desc = desc_ring[desc_id];
> if (desc.flags & VRING_DESC_F_WRITE)
> - vhost_log_write(dev, desc.addr, desc.len);
> + vhost_log_cache_write_iova(dev, vq,
> + desc.addr,
> + desc.len);
This will only log the dirty pages in cache.
> desc_id = desc.next;
> } while (desc.flags & VRING_DESC_F_NEXT);
>
> diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c
> index e57dda22f..78457a77c 100644
> --- a/lib/librte_vhost/vhost.c
> +++ b/lib/librte_vhost/vhost.c
> @@ -200,6 +200,27 @@ __vhost_log_cache_write(struct virtio_net *dev, struct vhost_virtqueue *vq,
> }
> }
>
> +void
> +__vhost_log_cache_write_iova(struct virtio_net *dev, struct vhost_virtqueue *vq,
> + uint64_t iova, uint64_t len)
> +{
> + uint64_t hva, gpa, map_len;
> + map_len = len;
> +
> + hva = __vhost_iova_to_vva(dev, vq, iova, &map_len, VHOST_ACCESS_RW);
> + if (map_len != len) {
> + RTE_LOG(ERR, VHOST_CONFIG,
> + "Failed to write log for IOVA 0x%0lx."
PRIx64 should be used here, otherwise the build will be
broken on i686.
It's better to add a space after '.'
> + "No IOTLB entry found\n",
> + iova);
> + return;
> + }
> +
> + gpa = hva_to_gpa(dev, hva, len);
> + if (gpa)
> + __vhost_log_cache_write(dev, vq, gpa, len);
> +}
> +