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 369FEA052B; Tue, 28 Jul 2020 15:55:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D59471BFF2; Tue, 28 Jul 2020 15:55:36 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 108311BE8A for ; Tue, 28 Jul 2020 15:55:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595944533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=D813qK4PTcF7pAhtpw+2dpknIWbJps7z7iDrPesfzSQ=; b=ENu9N1oOcn1bNctcTGdOCBAgrowr7xqF4VIwPOIw4uX0xEcMwMKX8UfimcBCoFzj18LCP7 Ev4DfecqVo4OT3SDKO5NpxpTQs5sK+tAqWQZY9z6AXeJRNvAL5oyn9uB0az05/7coDUWYX xAb0kzKmytBX4xZdQvBZj6eEGK4de4Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-468-shZuym0PO9mJJyDPG8r0WA-1; Tue, 28 Jul 2020 09:55:32 -0400 X-MC-Unique: shZuym0PO9mJJyDPG8r0WA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC1FC1005510; Tue, 28 Jul 2020 13:55:30 +0000 (UTC) Received: from [10.36.110.21] (unknown [10.36.110.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 93A6E90E84; Tue, 28 Jul 2020 13:55:29 +0000 (UTC) To: patrick.fu@intel.com, dev@dpdk.org, chenbo.xia@intel.com References: <20200720025242.3066787-1-patrick.fu@intel.com> <20200728032851.3704083-1-patrick.fu@intel.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: <113e052d-8d6e-a0d4-2218-5a022e2497ee@redhat.com> Date: Tue, 28 Jul 2020 15:55:27 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200728032851.3704083-1-patrick.fu@intel.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v4] vhost: fix async copy fail on multi-page buffers 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 7/28/20 5:28 AM, patrick.fu@intel.com wrote: > From: Patrick Fu > > Async copy fails when single ring buffer vector is splited on multiple > physical pages. This happens because current hpa address translation > function doesn't handle multi-page buffers. A new gpa to hpa address > conversion function, which returns the hpa on the first hitting host > pages, is implemented in this patch. Async data path recursively calls > this new function to construct a multi-segments async copy descriptor > for ring buffers crossing physical page boundaries. > > Fixes: cd6760da1076 ("vhost: introduce async enqueue for split ring") > > Signed-off-by: Patrick Fu > --- > v2: > - change commit message and title > - v1 patch used CPU to copy multi-page buffers; v2 patch split the > copy into multiple async copy segments whenever possible > > v3: > - added fixline > > v4: > - fix miss translation of the gpa which is the same length with host > page size > > lib/librte_vhost/vhost.h | 50 +++++++++++++++++++++++++++++++++++ > lib/librte_vhost/virtio_net.c | 40 +++++++++++++++++----------- > 2 files changed, 75 insertions(+), 15 deletions(-) > > diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h > index 0f7212f88..05c202a57 100644 > --- a/lib/librte_vhost/vhost.h > +++ b/lib/librte_vhost/vhost.h > @@ -616,6 +616,56 @@ gpa_to_hpa(struct virtio_net *dev, uint64_t gpa, uint64_t size) > return 0; > } > > +static __rte_always_inline rte_iova_t > +gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa, > + uint64_t gpa_size, uint64_t *hpa_size) > +{ > + uint32_t i; > + struct guest_page *page; > + struct guest_page key; > + > + *hpa_size = gpa_size; > + if (dev->nr_guest_pages >= VHOST_BINARY_SEARCH_THRESH) { > + key.guest_phys_addr = gpa & ~(dev->guest_pages[0].size - 1); > + page = bsearch(&key, dev->guest_pages, dev->nr_guest_pages, > + sizeof(struct guest_page), guest_page_addrcmp); > + if (page) { > + if (gpa + gpa_size <= > + page->guest_phys_addr + page->size) { > + return gpa - page->guest_phys_addr + > + page->host_phys_addr; > + } else if (gpa < page->guest_phys_addr + > + page->size) { > + *hpa_size = page->guest_phys_addr + > + page->size - gpa; > + return gpa - page->guest_phys_addr + > + page->host_phys_addr; > + } > + } > + } else { > + for (i = 0; i < dev->nr_guest_pages; i++) { > + page = &dev->guest_pages[i]; > + > + if (gpa >= page->guest_phys_addr) { > + if (gpa + gpa_size <= > + page->guest_phys_addr + page->size) { > + return gpa - page->guest_phys_addr + > + page->host_phys_addr; > + } else if (gpa < page->guest_phys_addr + > + page->size) { > + *hpa_size = page->guest_phys_addr + > + page->size - gpa; > + return gpa - page->guest_phys_addr + > + page->host_phys_addr; > + } > + } > + } > + } > + > + *hpa_size = 0; > + return 0; > +} > + > static __rte_always_inline uint64_t > hva_to_gpa(struct virtio_net *dev, uint64_t vva, uint64_t len) > { > diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c > index 95a0bc19f..124a33a10 100644 > --- a/lib/librte_vhost/virtio_net.c > +++ b/lib/librte_vhost/virtio_net.c > @@ -980,6 +980,7 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, > struct batch_copy_elem *batch_copy = vq->batch_copy_elems; > struct virtio_net_hdr_mrg_rxbuf tmp_hdr, *hdr = NULL; > int error = 0; > + uint64_t mapped_len; > > uint32_t tlen = 0; > int tvec_idx = 0; > @@ -1072,24 +1073,31 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, > > cpy_len = RTE_MIN(buf_avail, mbuf_avail); > > - if (unlikely(cpy_len >= cpy_threshold)) { > - hpa = (void *)(uintptr_t)gpa_to_hpa(dev, > - buf_iova + buf_offset, cpy_len); > + while (unlikely(cpy_len && cpy_len >= cpy_threshold)) { > + hpa = (void *)(uintptr_t)gpa_to_first_hpa(dev, > + buf_iova + buf_offset, > + cpy_len, &mapped_len); > > - if (unlikely(!hpa)) { > - error = -1; > - goto out; > - } > + if (unlikely(!hpa || mapped_len < cpy_threshold)) > + break; > > async_fill_vec(src_iovec + tvec_idx, > (void *)(uintptr_t)rte_pktmbuf_iova_offset(m, > - mbuf_offset), cpy_len); > + mbuf_offset), (size_t)mapped_len); > > - async_fill_vec(dst_iovec + tvec_idx, hpa, cpy_len); > + async_fill_vec(dst_iovec + tvec_idx, > + hpa, (size_t)mapped_len); > > - tlen += cpy_len; > + tlen += (uint32_t)mapped_len; > + cpy_len -= (uint32_t)mapped_len; > + mbuf_avail -= (uint32_t)mapped_len; > + mbuf_offset += (uint32_t)mapped_len; > + buf_avail -= (uint32_t)mapped_len; > + buf_offset += (uint32_t)mapped_len; > tvec_idx++; > - } else { > + } > + > + if (likely(cpy_len)) { > if (unlikely(vq->batch_copy_nb_elems >= vq->size)) { > rte_memcpy( > (void *)((uintptr_t)(buf_addr + buf_offset)), > @@ -1112,10 +1120,12 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, > } > } > > - mbuf_avail -= cpy_len; > - mbuf_offset += cpy_len; > - buf_avail -= cpy_len; > - buf_offset += cpy_len; > + if (cpy_len) { > + mbuf_avail -= cpy_len; > + mbuf_offset += cpy_len; > + buf_avail -= cpy_len; > + buf_offset += cpy_len; > + } Is that really necessary to check if copy length is not 0? Thanks, Maxime > } > > out: >