From: "Xia, Chenbo" <chenbo.xia@intel.com>
To: Maxime Coquelin <maxime.coquelin@redhat.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 04/27] vhost: add helper of IOTLB entries coredump
Date: Mon, 24 Apr 2023 02:59:06 +0000 [thread overview]
Message-ID: <SN6PR11MB35046EDA32C6D12E51948BFB9C679@SN6PR11MB3504.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20230331154259.1447831-5-maxime.coquelin@redhat.com>
> -----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 04/27] vhost: add helper of IOTLB entries coredump
>
> This patch reworks IOTLB code to extract madvise-related
> bits into dedicated helper. This refactoring improves code
> sharing.
>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> lib/vhost/iotlb.c | 77 +++++++++++++++++++++++++----------------------
> 1 file changed, 41 insertions(+), 36 deletions(-)
>
> diff --git a/lib/vhost/iotlb.c b/lib/vhost/iotlb.c
> index 870c8acb88..e8f1cb661e 100644
> --- a/lib/vhost/iotlb.c
> +++ b/lib/vhost/iotlb.c
> @@ -23,6 +23,34 @@ struct vhost_iotlb_entry {
>
> #define IOTLB_CACHE_SIZE 2048
>
> +static void
> +vhost_user_iotlb_set_dump(struct virtio_net *dev, struct
> vhost_iotlb_entry *node)
> +{
> + uint64_t align;
> +
> + align = hua_to_alignment(dev->mem, (void *)(uintptr_t)node->uaddr);
> +
> + mem_set_dump((void *)(uintptr_t)node->uaddr, node->size, false,
> align);
> +}
> +
> +static void
> +vhost_user_iotlb_clear_dump(struct virtio_net *dev, struct
> vhost_iotlb_entry *node,
> + struct vhost_iotlb_entry *prev, struct vhost_iotlb_entry *next)
> +{
> + uint64_t align, mask;
> +
> + align = hua_to_alignment(dev->mem, (void *)(uintptr_t)node->uaddr);
> + mask = ~(align - 1);
> +
> + /* Don't disable coredump if the previous node is in the same page
> */
> + if (prev == NULL || (node->uaddr & mask) != ((prev->uaddr + prev-
> >size - 1) & mask)) {
> + /* Don't disable coredump if the next node is in the same page
> */
> + if (next == NULL ||
> + ((node->uaddr + node->size - 1) & mask) != (next-
> >uaddr & mask))
> + mem_set_dump((void *)(uintptr_t)node->uaddr, node->size,
> false, align);
> + }
> +}
> +
> static struct vhost_iotlb_entry *
> vhost_user_iotlb_pool_get(struct vhost_virtqueue *vq)
> {
> @@ -149,8 +177,8 @@ vhost_user_iotlb_cache_remove_all(struct virtio_net
> *dev, struct vhost_virtqueue
> rte_rwlock_write_lock(&vq->iotlb_lock);
>
> RTE_TAILQ_FOREACH_SAFE(node, &vq->iotlb_list, next, temp_node) {
> - mem_set_dump((void *)(uintptr_t)node->uaddr, node->size, false,
> - hua_to_alignment(dev->mem, (void *)(uintptr_t)node-
> >uaddr));
> + vhost_user_iotlb_set_dump(dev, node);
> +
> TAILQ_REMOVE(&vq->iotlb_list, node, next);
> vhost_user_iotlb_pool_put(vq, node);
> }
> @@ -164,7 +192,6 @@ static void
> vhost_user_iotlb_cache_random_evict(struct virtio_net *dev, struct
> vhost_virtqueue *vq)
> {
> struct vhost_iotlb_entry *node, *temp_node, *prev_node = NULL;
> - uint64_t alignment, mask;
> int entry_idx;
>
> rte_rwlock_write_lock(&vq->iotlb_lock);
> @@ -173,20 +200,10 @@ vhost_user_iotlb_cache_random_evict(struct
> virtio_net *dev, struct vhost_virtque
>
> RTE_TAILQ_FOREACH_SAFE(node, &vq->iotlb_list, next, temp_node) {
> if (!entry_idx) {
> - struct vhost_iotlb_entry *next_node;
> - alignment = hua_to_alignment(dev->mem, (void
> *)(uintptr_t)node->uaddr);
> - mask = ~(alignment - 1);
> -
> - /* Don't disable coredump if the previous node is in the
> same page */
> - if (prev_node == NULL || (node->uaddr & mask) !=
> - ((prev_node->uaddr + prev_node->size - 1) &
> mask)) {
> - next_node = RTE_TAILQ_NEXT(node, next);
> - /* Don't disable coredump if the next node is in
> the same page */
> - if (next_node == NULL || ((node->uaddr + node-
> >size - 1) & mask) !=
> - (next_node->uaddr & mask))
> - mem_set_dump((void *)(uintptr_t)node->uaddr,
> node->size,
> - false, alignment);
> - }
> + struct vhost_iotlb_entry *next_node =
> RTE_TAILQ_NEXT(node, next);
> +
> + vhost_user_iotlb_clear_dump(dev, node, prev_node,
> next_node);
> +
> TAILQ_REMOVE(&vq->iotlb_list, node, next);
> vhost_user_iotlb_pool_put(vq, node);
> vq->iotlb_cache_nr--;
> @@ -240,16 +257,16 @@ vhost_user_iotlb_cache_insert(struct virtio_net *dev,
> struct vhost_virtqueue *vq
> vhost_user_iotlb_pool_put(vq, new_node);
> goto unlock;
> } else if (node->iova > new_node->iova) {
> - mem_set_dump((void *)(uintptr_t)new_node->uaddr,
> new_node->size, true,
> - hua_to_alignment(dev->mem, (void
> *)(uintptr_t)new_node->uaddr));
> + vhost_user_iotlb_set_dump(dev, new_node);
> +
> TAILQ_INSERT_BEFORE(node, new_node, next);
> vq->iotlb_cache_nr++;
> goto unlock;
> }
> }
>
> - mem_set_dump((void *)(uintptr_t)new_node->uaddr, new_node->size,
> true,
> - hua_to_alignment(dev->mem, (void *)(uintptr_t)new_node-
> >uaddr));
> + vhost_user_iotlb_set_dump(dev, new_node);
> +
> TAILQ_INSERT_TAIL(&vq->iotlb_list, new_node, next);
> vq->iotlb_cache_nr++;
>
> @@ -265,7 +282,6 @@ vhost_user_iotlb_cache_remove(struct virtio_net *dev,
> struct vhost_virtqueue *vq
> uint64_t iova, uint64_t size)
> {
> struct vhost_iotlb_entry *node, *temp_node, *prev_node = NULL;
> - uint64_t alignment, mask;
>
> if (unlikely(!size))
> return;
> @@ -278,20 +294,9 @@ vhost_user_iotlb_cache_remove(struct virtio_net *dev,
> struct vhost_virtqueue *vq
> break;
>
> if (iova < node->iova + node->size) {
> - struct vhost_iotlb_entry *next_node;
> - alignment = hua_to_alignment(dev->mem, (void
> *)(uintptr_t)node->uaddr);
> - mask = ~(alignment-1);
> -
> - /* Don't disable coredump if the previous node is in the
> same page */
> - if (prev_node == NULL || (node->uaddr & mask) !=
> - ((prev_node->uaddr + prev_node->size - 1) &
> mask)) {
> - next_node = RTE_TAILQ_NEXT(node, next);
> - /* Don't disable coredump if the next node is in
> the same page */
> - if (next_node == NULL || ((node->uaddr + node-
> >size - 1) & mask) !=
> - (next_node->uaddr & mask))
> - mem_set_dump((void *)(uintptr_t)node->uaddr,
> node->size,
> - false, alignment);
> - }
> + struct vhost_iotlb_entry *next_node =
> RTE_TAILQ_NEXT(node, next);
> +
> + vhost_user_iotlb_clear_dump(dev, node, prev_node,
> next_node);
>
> TAILQ_REMOVE(&vq->iotlb_list, node, next);
> vhost_user_iotlb_pool_put(vq, node);
> --
> 2.39.2
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
next prev parent reply other threads:[~2023-04-24 2:59 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 [this message]
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
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=SN6PR11MB35046EDA32C6D12E51948BFB9C679@SN6PR11MB3504.namprd11.prod.outlook.com \
--to=chenbo.xia@intel.com \
--cc=amorenoz@redhat.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=maxime.coquelin@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).