From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: "Xia, Chenbo" <chenbo.xia@intel.com>,
"dev@dpdk.org" <dev@dpdk.org>,
"david.marchand@redhat.com" <david.marchand@redhat.com>,
"mkp@redhat.com" <mkp@redhat.com>,
"fbl@redhat.com" <fbl@redhat.com>,
"jasowang@redhat.com" <jasowang@redhat.com>,
"Liang, Cunming" <cunming.liang@intel.com>,
"Xie, Yongji" <xieyongji@bytedance.com>,
"echaudro@redhat.com" <echaudro@redhat.com>,
"eperezma@redhat.com" <eperezma@redhat.com>,
"amorenoz@redhat.com" <amorenoz@redhat.com>
Subject: Re: [RFC 09/27] vhost: add page size info to IOTLB entry
Date: Wed, 3 May 2023 15:57:48 +0200 [thread overview]
Message-ID: <2c64bd67-9b52-97bc-71d9-e548e4c9eb56@redhat.com> (raw)
In-Reply-To: <SN6PR11MB3504F9BBA06CE262FB5C37FB9C649@SN6PR11MB3504.namprd11.prod.outlook.com>
Hi Chenbo,
On 4/25/23 08:20, Xia, Chenbo wrote:
> Hi Maxime,
>
>> -----Original Message-----
>> From: Maxime Coquelin <maxime.coquelin@redhat.com>
>> Sent: Friday, March 31, 2023 11:43 PM
>> To: dev@dpdk.org; david.marchand@redhat.com; Xia, Chenbo
>> <chenbo.xia@intel.com>; mkp@redhat.com; fbl@redhat.com;
>> jasowang@redhat.com; Liang, Cunming <cunming.liang@intel.com>; Xie, Yongji
>> <xieyongji@bytedance.com>; echaudro@redhat.com; eperezma@redhat.com;
>> amorenoz@redhat.com
>> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
>> 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 <maxime.coquelin@redhat.com>
>> ---
>> 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
next prev parent reply other threads:[~2023-05-03 13:57 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-31 15:42 [RFC 00/27] Add VDUSE support to Vhost library Maxime Coquelin
2023-03-31 15:42 ` [RFC 01/27] vhost: fix missing guest notif stat increment Maxime Coquelin
2023-04-24 2:57 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 02/27] vhost: fix invalid call FD handling Maxime Coquelin
2023-04-24 2:58 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 03/27] vhost: fix IOTLB entries overlap check with previous entry Maxime Coquelin
2023-04-17 19:15 ` Mike Pattrick
2023-04-24 2:58 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 04/27] vhost: add helper of IOTLB entries coredump Maxime Coquelin
2023-04-24 2:59 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 05/27] vhost: add helper for IOTLB entries shared page check Maxime Coquelin
2023-04-17 19:39 ` Mike Pattrick
2023-04-19 9:35 ` Maxime Coquelin
2023-04-19 14:52 ` Mike Pattrick
2023-04-24 2:59 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 06/27] vhost: don't dump unneeded pages with IOTLB Maxime Coquelin
2023-04-20 17:11 ` Mike Pattrick
2023-04-24 3:00 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 07/27] vhost: change to single IOTLB cache per device Maxime Coquelin
2023-04-25 6:19 ` Xia, Chenbo
2023-05-03 13:47 ` Maxime Coquelin
2023-03-31 15:42 ` [RFC 08/27] vhost: add offset field to IOTLB entries Maxime Coquelin
2023-04-25 6:20 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 09/27] vhost: add page size info to IOTLB entry Maxime Coquelin
2023-04-25 6:20 ` Xia, Chenbo
2023-05-03 13:57 ` Maxime Coquelin [this message]
2023-03-31 15:42 ` [RFC 10/27] vhost: retry translating IOVA after IOTLB miss Maxime Coquelin
2023-05-05 5:07 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 11/27] vhost: introduce backend ops Maxime Coquelin
2023-05-05 5:07 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 12/27] vhost: add IOTLB cache entry removal callback Maxime Coquelin
2023-05-05 5:07 ` Xia, Chenbo
2023-05-25 11:20 ` Maxime Coquelin
2023-03-31 15:42 ` [RFC 13/27] vhost: add helper for IOTLB misses Maxime Coquelin
2023-03-31 15:42 ` [RFC 14/27] vhost: add helper for interrupt injection Maxime Coquelin
2023-05-05 5:07 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 15/27] vhost: add API to set max queue pairs Maxime Coquelin
2023-05-05 5:07 ` Xia, Chenbo
2023-05-25 11:23 ` Maxime Coquelin
2023-03-31 15:42 ` [RFC 16/27] net/vhost: use " Maxime Coquelin
2023-05-05 5:07 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 17/27] vhost: add control virtqueue support Maxime Coquelin
2023-05-09 5:29 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 18/27] vhost: add VDUSE device creation and destruction Maxime Coquelin
2023-05-09 5:31 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 19/27] vhost: add VDUSE callback for IOTLB miss Maxime Coquelin
2023-05-09 5:31 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 20/27] vhost: add VDUSE callback for IOTLB entry removal Maxime Coquelin
2023-05-09 5:32 ` Xia, Chenbo
2023-05-25 11:35 ` Maxime Coquelin
2023-03-31 15:42 ` [RFC 21/27] vhost: add VDUSE callback for IRQ injection Maxime Coquelin
2023-05-09 5:33 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 22/27] vhost: add VDUSE events handler Maxime Coquelin
2023-05-09 5:34 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 23/27] vhost: add support for virtqueue state get event Maxime Coquelin
2023-05-09 5:34 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 24/27] vhost: add support for VDUSE status set event Maxime Coquelin
2023-05-09 5:34 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 25/27] vhost: add support for VDUSE IOTLB update event Maxime Coquelin
2023-05-09 5:35 ` Xia, Chenbo
2023-05-25 11:43 ` Maxime Coquelin
2023-03-31 15:42 ` [RFC 26/27] vhost: add VDUSE device startup Maxime Coquelin
2023-05-09 5:35 ` Xia, Chenbo
2023-03-31 15:42 ` [RFC 27/27] vhost: add multiqueue support to VDUSE Maxime Coquelin
2023-05-09 5:35 ` Xia, Chenbo
2023-04-06 3:44 ` [RFC 00/27] Add VDUSE support to Vhost library Yongji Xie
2023-04-06 8:16 ` Maxime Coquelin
2023-04-06 11:04 ` Yongji Xie
2023-04-12 11:33 ` Ferruh Yigit
2023-04-12 15:28 ` Maxime Coquelin
2023-04-12 19:40 ` Morten Brørup
2023-04-13 7:08 ` Xia, Chenbo
2023-04-13 7:58 ` Morten Brørup
2023-04-13 7:59 ` Maxime Coquelin
2023-04-14 10:48 ` Ferruh Yigit
2023-04-14 12:06 ` Maxime Coquelin
2023-04-14 14:25 ` Ferruh Yigit
2023-04-17 3:10 ` Jason Wang
2023-05-05 5:53 ` Xia, Chenbo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2c64bd67-9b52-97bc-71d9-e548e4c9eb56@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=amorenoz@redhat.com \
--cc=chenbo.xia@intel.com \
--cc=cunming.liang@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=echaudro@redhat.com \
--cc=eperezma@redhat.com \
--cc=fbl@redhat.com \
--cc=jasowang@redhat.com \
--cc=mkp@redhat.com \
--cc=xieyongji@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).