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 80A5DA00BE; Tue, 28 Apr 2020 17:28:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 601B21D602; Tue, 28 Apr 2020 17:28:26 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 1473E1D5FC for ; Tue, 28 Apr 2020 17:28:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588087704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc: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=wUDiyGK8xA2iaFY5iRHOIh3iX9dtAit2yKkhN96mhnU=; b=LNlbsOlhbLS5+u0zDZI50bJ2S7bH9dbZWKoqPaV9N/3crx+kXrMDqLKYfxs/79wvCmwAZv fUseK4tPJp24VtNzGt41Xt86qulOZ3xRkT1/BxoHLs5nGL1BqNen3I9L8qNWbu418Q/CpR GnFibSccGR6Cp+mh+f5cptHymeMILjw= 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-255-33F8Coy6PK6FQfw3RGd1lg-1; Tue, 28 Apr 2020 11:28:20 -0400 X-MC-Unique: 33F8Coy6PK6FQfw3RGd1lg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BD04F1054F8F; Tue, 28 Apr 2020 15:28:18 +0000 (UTC) Received: from [10.36.110.26] (unknown [10.36.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 734ED19C4F; Tue, 28 Apr 2020 15:28:17 +0000 (UTC) To: Marvin Liu , xiaolong.ye@intel.com, zhihong.wang@intel.com Cc: dev@dpdk.org References: <20200316153353.112897-1-yong.liu@intel.com> <20200428091359.11297-1-yong.liu@intel.com> <20200428091359.11297-2-yong.liu@intel.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: <0328ee15-d26a-3a21-035b-077361417191@redhat.com> Date: Tue, 28 Apr 2020 17:28:15 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: <20200428091359.11297-2-yong.liu@intel.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-dev] [PATCH v3 2/2] vhost: binary search address mapping table 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 4/28/20 11:13 AM, Marvin Liu wrote: > If Tx zero copy enabled, gpa to hpa mapping table is updated one by > one. This will harm performance when guest memory backend using 2M > hugepages. Now utilize binary search to find the entry in mapping > table, meanwhile set threshold to 256 entries for linear search. >=20 > Signed-off-by: Marvin Liu >=20 > diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile > index e592795f2..8769afaad 100644 > --- a/lib/librte_vhost/Makefile > +++ b/lib/librte_vhost/Makefile > @@ -10,7 +10,7 @@ EXPORT_MAP :=3D rte_vhost_version.map > =20 > CFLAGS +=3D $(WERROR_FLAGS) -I$(SRCDIR) -O3 > CFLAGS +=3D -I vhost_user > -CFLAGS +=3D -fno-strict-aliasing > +CFLAGS +=3D -fno-strict-aliasing -Wno-maybe-uninitialized > LDLIBS +=3D -lpthread > =20 > ifeq ($(RTE_TOOLCHAIN), gcc) > diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h > index 507dbf214..a0fee39d5 100644 > --- a/lib/librte_vhost/vhost.h > +++ b/lib/librte_vhost/vhost.h > @@ -546,20 +546,46 @@ extern int vhost_data_log_level; > #define MAX_VHOST_DEVICE=091024 > extern struct virtio_net *vhost_devices[MAX_VHOST_DEVICE]; > =20 > +#define VHOST_BINARY_SEARCH_THRESH 256 > +static int guest_page_addrcmp(const void *p1, const void *p2) > +{ > +=09const struct guest_page *page1 =3D (const struct guest_page *)p1; > +=09const struct guest_page *page2 =3D (const struct guest_page *)p2; > + > +=09if (page1->guest_phys_addr > page2->guest_phys_addr) > +=09=09return 1; > +=09if (page1->guest_phys_addr < page2->guest_phys_addr) > +=09=09return -1; > + > +=09return 0; > +} > + > /* Convert guest physical address to host physical address */ > static __rte_always_inline rte_iova_t > gpa_to_hpa(struct virtio_net *dev, uint64_t gpa, uint64_t size) > { > =09uint32_t i; > =09struct guest_page *page; > - > -=09for (i =3D 0; i < dev->nr_guest_pages; i++) { > -=09=09page =3D &dev->guest_pages[i]; > - > -=09=09if (gpa >=3D page->guest_phys_addr && > -=09=09 gpa + size < page->guest_phys_addr + page->size) { > -=09=09=09return gpa - page->guest_phys_addr + > -=09=09=09 page->host_phys_addr; > +=09struct guest_page key; > + > +=09if (dev->nr_guest_pages >=3D VHOST_BINARY_SEARCH_THRESH) { I would have expected the binary search to be more efficient for much smaller number of pages. Have you done some tests to define this threshold value? > +=09=09key.guest_phys_addr =3D gpa; > +=09=09page =3D bsearch(&key, dev->guest_pages, dev->nr_guest_pages, > +=09=09=09 sizeof(struct guest_page), guest_page_addrcmp); > +=09=09if (page) { > +=09=09=09if (gpa + size < page->guest_phys_addr + page->size) > +=09=09=09=09return gpa - page->guest_phys_addr + > +=09=09=09=09=09page->host_phys_addr; > +=09=09} Is all the generated code inlined? I see that in the elf file: 2386: 0000000000874f70 16 FUNC LOCAL DEFAULT 13 guest_page_addrcmp > +=09} else { > +=09=09for (i =3D 0; i < dev->nr_guest_pages; i++) { > +=09=09=09page =3D &dev->guest_pages[i]; > + > +=09=09=09if (gpa >=3D page->guest_phys_addr && > +=09=09=09 gpa + size < page->guest_phys_addr + > +=09=09=09 page->size) > +=09=09=09=09return gpa - page->guest_phys_addr + > +=09=09=09=09 page->host_phys_addr; > =09=09} > =09} > =20 > diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.= c > index 79fcb9d19..15e50d27d 100644 > --- a/lib/librte_vhost/vhost_user.c > +++ b/lib/librte_vhost/vhost_user.c > @@ -965,6 +965,12 @@ add_guest_pages(struct virtio_net *dev, struct rte_v= host_mem_region *reg, > =09=09reg_size -=3D size; > =09} > =20 > +=09/* sort guest page array if over binary search threshold */ > +=09if (dev->nr_guest_pages >=3D VHOST_BINARY_SEARCH_THRESH) { > +=09=09qsort((void *)dev->guest_pages, dev->nr_guest_pages, > +=09=09=09sizeof(struct guest_page), guest_page_addrcmp); > +=09} > + > =09return 0; > } > =20 >=20