From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A6C1DA0613 for ; Mon, 23 Sep 2019 09:28:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6E8D337B0; Mon, 23 Sep 2019 09:28:07 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 2DD0D37A2 for ; Mon, 23 Sep 2019 09:28:04 +0200 (CEST) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Sep 2019 00:28:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,539,1559545200"; d="scan'208";a="193014295" Received: from dpdk-virtio-tbie-2.sh.intel.com (HELO ___) ([10.67.104.73]) by orsmga006.jf.intel.com with ESMTP; 23 Sep 2019 00:28:02 -0700 Date: Mon, 23 Sep 2019 15:25:15 +0800 From: Tiwei Bie To: Adrian Moreno Cc: dev@dpdk.org, zhihong.wang@intel.com, Maxime Coquelin , Pei Zhang Message-ID: <20190923072515.GA20810@___> References: <20190917144900.14407-1-amorenoz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20190917144900.14407-1-amorenoz@redhat.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [dpdk-dev] [PATCH] vhost: translate incoming log address to gpa X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Tue, Sep 17, 2019 at 04:49:00PM +0200, Adrian Moreno wrote: > When IOMMU is enabled the incoming log address is in IOVA space. In that > case, look in IOTLB table and translate the resulting HVA to GPA. > > If IOMMU is not enabled, the incoming log address is already a GPA so no > transformation is needed. > > This change makes page logging work when IOVA_VA is selected in the guest. Besides the log address of the ring, when IOMMU is enabled, the addresses in descriptors are also IOVAs and should be translated to GPAs before doing the dirty page logging. > Further information: https://bugs.dpdk.org/show_bug.cgi?id=337 As this is fixing a real bug, we also need a "Fixes: " line and Cc stable. Thanks! Tiwei > > Cc: Maxime Coquelin > Reported-by: Pei Zhang > > Signed-off-by: Adrian Moreno > --- > lib/librte_vhost/vhost.c | 1 + > lib/librte_vhost/vhost_user.c | 78 ++++++++++++++++++++++++++++++++++- > 2 files changed, 78 insertions(+), 1 deletion(-) > > diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c > index 981837b5d..e57dda22f 100644 > --- a/lib/librte_vhost/vhost.c > +++ b/lib/librte_vhost/vhost.c > @@ -383,6 +383,7 @@ vring_invalidate(struct virtio_net *dev, struct vhost_virtqueue *vq) > vq->desc = NULL; > vq->avail = NULL; > vq->used = NULL; > + vq->log_guest_addr = 0; > > if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) > vhost_user_iotlb_wr_unlock(vq); > diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c > index 0b72648a5..35fca00fe 100644 > --- a/lib/librte_vhost/vhost_user.c > +++ b/lib/librte_vhost/vhost_user.c > @@ -570,6 +570,74 @@ ring_addr_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq, > return qva_to_vva(dev, ra, size); > } > > +/* > + * Converts Vhost Virtual Address to Guest Physical Address > + */ > +static uint64_t > +vva_to_gpa(struct virtio_net *dev, uint64_t vva, uint64_t *len) > +{ > + struct rte_vhost_mem_region *r; > + uint32_t i; > + > + if (unlikely(!dev || !dev->mem)) > + goto out_error; > + > + /* Find the region where the address lives. */ > + for (i = 0; i < dev->mem->nregions; i++) { > + r = &dev->mem->regions[i]; > + > + if (vva >= r->host_user_addr && > + vva < r->host_user_addr + r->size) { > + > + if (unlikely(vva + *len > r->host_user_addr + r->size)) > + *len = r->guest_user_addr + r->size - vva; > + > + return r->guest_phys_addr + vva - r->host_user_addr; > + } > + } > +out_error: > + *len = 0; > + > + return 0; > +} > + > +/* > + * Converts vring log address to GPA > + * If IOMMU is enabled, the log address is IOVA > + * If IOMMU not enabled, the log address is already GPA > + */ > +static uint64_t > +translate_log_addr(struct virtio_net *dev, struct vhost_virtqueue *vq, > + uint64_t log_addr) > +{ > + if (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) { > + const uint64_t exp_size = sizeof(struct vring_used) + > + sizeof(struct vring_used_elem) * vq->size; > + uint64_t vva, gpa; > + uint64_t size = exp_size; > + > + vva = vhost_user_iotlb_cache_find(vq, log_addr, > + &size, VHOST_ACCESS_RW); > + if (size != exp_size) { > + vhost_user_iotlb_miss(dev, log_addr + size, > + VHOST_ACCESS_RW); > + return 0; > + } > + > + gpa = vva_to_gpa(dev, vva, &size); > + if (size != exp_size) { > + RTE_LOG(ERR, VHOST_CONFIG, > + "VQ: Failed to find GPA mapping for log_addr." > + "log_addr: 0x%0lx vva: 0x%0lx\n", > + log_addr, vva); > + return 0; > + } > + return gpa; > + > + } else > + return log_addr; > +} > + > static struct virtio_net * > translate_ring_addresses(struct virtio_net *dev, int vq_index) > { > @@ -676,7 +744,15 @@ translate_ring_addresses(struct virtio_net *dev, int vq_index) > vq->last_avail_idx = vq->used->idx; > } > > - vq->log_guest_addr = addr->log_guest_addr; > + vq->log_guest_addr = > + translate_log_addr(dev, vq, addr->log_guest_addr); > + if (vq->log_guest_addr == 0) { > + RTE_LOG(DEBUG, VHOST_CONFIG, > + "(%d) failed to map log_guest_addr .\n", > + dev->vid); > + return dev; > + } > + > > VHOST_LOG_DEBUG(VHOST_CONFIG, "(%d) mapped address desc: %p\n", > dev->vid, vq->desc); > -- > 2.21.0 >