From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9E4FC42A4F; Wed, 3 May 2023 15:57:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2BE184114B; Wed, 3 May 2023 15:57:58 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 7C7DB41144 for ; Wed, 3 May 2023 15:57:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683122276; 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; bh=2F9Ui91uZiTb94cA0fwMbVaQhuq3mtwatwYpgEhma64=; b=hJSe0bMYAKzVDgLrDojgN5+0XWvKdoCXWD7Hc8cLE8451nzpWAH6vx8CoHjem9Gn91vIw/ saMj057nh+12v71mcQCvInVbUKXxzC5g6lJADdrh0GjkelmVztSLtu9h99j3nUF4miStuA xhjO6kEPPAVrlgLh2XYHmPl4U39d1Dw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-185-tv2Ve2fuMeafE0QHx3gmBQ-1; Wed, 03 May 2023 09:57:53 -0400 X-MC-Unique: tv2Ve2fuMeafE0QHx3gmBQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 78F59A0F381; Wed, 3 May 2023 13:57:53 +0000 (UTC) Received: from [10.39.208.36] (unknown [10.39.208.36]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A49440C94AC; Wed, 3 May 2023 13:57:50 +0000 (UTC) Message-ID: <2c64bd67-9b52-97bc-71d9-e548e4c9eb56@redhat.com> Date: Wed, 3 May 2023 15:57:48 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: [RFC 09/27] vhost: add page size info to IOTLB entry To: "Xia, Chenbo" , "dev@dpdk.org" , "david.marchand@redhat.com" , "mkp@redhat.com" , "fbl@redhat.com" , "jasowang@redhat.com" , "Liang, Cunming" , "Xie, Yongji" , "echaudro@redhat.com" , "eperezma@redhat.com" , "amorenoz@redhat.com" References: <20230331154259.1447831-1-maxime.coquelin@redhat.com> <20230331154259.1447831-10-maxime.coquelin@redhat.com> From: Maxime Coquelin In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Hi Chenbo, On 4/25/23 08:20, Xia, Chenbo wrote: > Hi Maxime, > >> -----Original Message----- >> From: Maxime Coquelin >> Sent: Friday, March 31, 2023 11:43 PM >> To: dev@dpdk.org; david.marchand@redhat.com; Xia, Chenbo >> ; mkp@redhat.com; fbl@redhat.com; >> jasowang@redhat.com; Liang, Cunming ; Xie, Yongji >> ; echaudro@redhat.com; eperezma@redhat.com; >> amorenoz@redhat.com >> Cc: Maxime Coquelin >> Subject: [RFC 09/27] vhost: add page size info to IOTLB entry >> >> VDUSE will close the file descriptor after having mapped >> the shared memory, so it will not be possible to get the >> page size afterwards. >> >> This patch adds an new page_shift field to the IOTLB entry, >> so that the information will be passed at IOTLB cache >> insertion time. The information is stored as a bit shift >> value so that IOTLB entry keeps fitting in a single >> cacheline. >> >> Signed-off-by: Maxime Coquelin >> --- >> lib/vhost/iotlb.c | 46 ++++++++++++++++++++---------------------- >> lib/vhost/iotlb.h | 2 +- >> lib/vhost/vhost.h | 1 - >> lib/vhost/vhost_user.c | 8 +++++--- >> 4 files changed, 28 insertions(+), 29 deletions(-) >> >> diff --git a/lib/vhost/iotlb.c b/lib/vhost/iotlb.c >> index 51f118bc48..188dfb8e38 100644 >> --- a/lib/vhost/iotlb.c >> +++ b/lib/vhost/iotlb.c >> @@ -19,14 +19,14 @@ struct vhost_iotlb_entry { >> uint64_t uaddr; >> uint64_t uoffset; >> uint64_t size; >> + uint8_t page_shift; >> uint8_t perm; >> }; >> >> #define IOTLB_CACHE_SIZE 2048 >> >> static bool >> -vhost_user_iotlb_share_page(struct vhost_iotlb_entry *a, struct >> vhost_iotlb_entry *b, >> - uint64_t align) >> +vhost_user_iotlb_share_page(struct vhost_iotlb_entry *a, struct >> vhost_iotlb_entry *b) >> { >> uint64_t a_start, a_end, b_start; >> >> @@ -38,44 +38,41 @@ vhost_user_iotlb_share_page(struct vhost_iotlb_entry >> *a, struct vhost_iotlb_entr >> >> /* Assumes entry a lower than entry b */ >> RTE_ASSERT(a_start < b_start); >> - a_end = RTE_ALIGN_CEIL(a_start + a->size, align); >> - b_start = RTE_ALIGN_FLOOR(b_start, align); >> + a_end = RTE_ALIGN_CEIL(a_start + a->size, RTE_BIT64(a->page_shift)); >> + b_start = RTE_ALIGN_FLOOR(b_start, RTE_BIT64(b->page_shift)); >> >> return a_end > b_start; >> } >> >> static void >> -vhost_user_iotlb_set_dump(struct virtio_net *dev, struct >> vhost_iotlb_entry *node) >> +vhost_user_iotlb_set_dump(struct vhost_iotlb_entry *node) >> { >> - uint64_t align, start; >> + uint64_t start; >> >> start = node->uaddr + node->uoffset; >> - align = hua_to_alignment(dev->mem, (void *)(uintptr_t)start); >> - >> - mem_set_dump((void *)(uintptr_t)start, node->size, false, align); >> + mem_set_dump((void *)(uintptr_t)start, node->size, false, >> RTE_BIT64(node->page_shift)); >> } >> >> static void >> -vhost_user_iotlb_clear_dump(struct virtio_net *dev, struct >> vhost_iotlb_entry *node, >> +vhost_user_iotlb_clear_dump(struct vhost_iotlb_entry *node, >> struct vhost_iotlb_entry *prev, struct vhost_iotlb_entry *next) >> { >> - uint64_t align, start, end; >> + uint64_t start, end; >> >> start = node->uaddr + node->uoffset; >> end = start + node->size; >> >> - align = hua_to_alignment(dev->mem, (void *)(uintptr_t)start); >> - >> /* Skip first page if shared with previous entry. */ >> - if (vhost_user_iotlb_share_page(prev, node, align)) >> - start = RTE_ALIGN_CEIL(start, align); >> + if (vhost_user_iotlb_share_page(prev, node)) >> + start = RTE_ALIGN_CEIL(start, RTE_BIT64(node->page_shift)); >> >> /* Skip last page if shared with next entry. */ >> - if (vhost_user_iotlb_share_page(node, next, align)) >> - end = RTE_ALIGN_FLOOR(end, align); >> + if (vhost_user_iotlb_share_page(node, next)) >> + end = RTE_ALIGN_FLOOR(end, RTE_BIT64(node->page_shift)); >> >> if (end > start) >> - mem_set_dump((void *)(uintptr_t)start, end - start, false, >> align); >> + mem_set_dump((void *)(uintptr_t)start, end - start, false, >> + RTE_BIT64(node->page_shift)); >> } >> >> static struct vhost_iotlb_entry * >> @@ -198,7 +195,7 @@ vhost_user_iotlb_cache_remove_all(struct virtio_net >> *dev) >> vhost_user_iotlb_wr_lock_all(dev); >> >> RTE_TAILQ_FOREACH_SAFE(node, &dev->iotlb_list, next, temp_node) { >> - vhost_user_iotlb_set_dump(dev, node); >> + vhost_user_iotlb_set_dump(node); >> >> TAILQ_REMOVE(&dev->iotlb_list, node, next); >> vhost_user_iotlb_pool_put(dev, node); >> @@ -223,7 +220,7 @@ vhost_user_iotlb_cache_random_evict(struct virtio_net >> *dev) >> if (!entry_idx) { >> struct vhost_iotlb_entry *next_node = >> RTE_TAILQ_NEXT(node, next); >> >> - vhost_user_iotlb_clear_dump(dev, node, prev_node, >> next_node); >> + vhost_user_iotlb_clear_dump(node, prev_node, next_node); >> >> TAILQ_REMOVE(&dev->iotlb_list, node, next); >> vhost_user_iotlb_pool_put(dev, node); >> @@ -239,7 +236,7 @@ vhost_user_iotlb_cache_random_evict(struct virtio_net >> *dev) >> >> void >> vhost_user_iotlb_cache_insert(struct virtio_net *dev, uint64_t iova, >> uint64_t uaddr, >> - uint64_t uoffset, uint64_t size, uint8_t perm) >> + uint64_t uoffset, uint64_t size, uint64_t >> page_size, uint8_t perm) >> { >> struct vhost_iotlb_entry *node, *new_node; >> >> @@ -263,6 +260,7 @@ vhost_user_iotlb_cache_insert(struct virtio_net *dev, >> uint64_t iova, uint64_t ua >> new_node->uaddr = uaddr; >> new_node->uoffset = uoffset; >> new_node->size = size; >> + new_node->page_shift = __builtin_ctz(page_size); > > __builtin_ctzll ? Indeed, that's better. Weird I don't get a warning! Fixed in v1. Thanks, Maxime > Thanks, > Chenbo