From: Steve Sistare <steven.sistare@oracle.com>
To: kvm@vger.kernel.org
Cc: Alex Williamson <alex.williamson@redhat.com>,
Cornelia Huck <cohuck@redhat.com>,
Kirti Wankhede <kwankhede@nvidia.com>,
Steve Sistare <steven.sistare@oracle.com>
Subject: [PATCH V1 1/5] vfio: maintain dma_list order
Date: Tue, 5 Jan 2021 07:36:49 -0800 [thread overview]
Message-ID: <1609861013-129801-2-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1609861013-129801-1-git-send-email-steven.sistare@oracle.com>
Keep entries properly sorted in the dma_list rb_tree so that iterating
over multiple entries across a range with gaps works, without requiring
one to delete each visited entry as in vfio_dma_do_unmap.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
drivers/vfio/vfio_iommu_type1.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 5fbf0c1..02228d0 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -157,20 +157,24 @@ static struct vfio_group *vfio_iommu_find_iommu_group(struct vfio_iommu *iommu,
static struct vfio_dma *vfio_find_dma(struct vfio_iommu *iommu,
dma_addr_t start, size_t size)
{
+ struct vfio_dma *res = 0;
struct rb_node *node = iommu->dma_list.rb_node;
while (node) {
struct vfio_dma *dma = rb_entry(node, struct vfio_dma, node);
- if (start + size <= dma->iova)
+ if (start < dma->iova + dma->size) {
+ res = dma;
+ if (start >= dma->iova)
+ break;
node = node->rb_left;
- else if (start >= dma->iova + dma->size)
+ } else {
node = node->rb_right;
- else
- return dma;
+ }
}
-
- return NULL;
+ if (res && size && res->iova >= start + size)
+ res = 0;
+ return res;
}
static void vfio_link_dma(struct vfio_iommu *iommu, struct vfio_dma *new)
@@ -182,7 +186,7 @@ static void vfio_link_dma(struct vfio_iommu *iommu, struct vfio_dma *new)
parent = *link;
dma = rb_entry(parent, struct vfio_dma, node);
- if (new->iova + new->size <= dma->iova)
+ if (new->iova < dma->iova)
link = &(*link)->rb_left;
else
link = &(*link)->rb_right;
--
1.8.3.1
next prev parent reply other threads:[~2021-01-05 16:05 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 15:36 [PATCH V1 0/5] vfio virtual address update Steve Sistare
2021-01-05 15:36 ` Steve Sistare [this message]
2021-01-05 18:48 ` [PATCH V1 1/5] vfio: maintain dma_list order kernel test robot
2021-01-06 0:02 ` Alex Williamson
2021-01-06 14:50 ` Steven Sistare
2021-01-05 15:36 ` [PATCH V1 2/5] vfio: option to unmap all Steve Sistare
2021-01-08 19:35 ` Alex Williamson
2021-01-11 21:09 ` Steven Sistare
2021-01-13 19:41 ` Alex Williamson
2021-01-05 15:36 ` [PATCH V1 3/5] vfio: detect closed container Steve Sistare
2021-01-08 19:39 ` Alex Williamson
2021-01-11 21:12 ` Steven Sistare
2021-01-13 19:26 ` Alex Williamson
2021-01-13 19:44 ` Steven Sistare
2021-01-13 19:44 ` Alex Williamson
2021-01-05 15:36 ` [PATCH V1 4/5] vfio: VA suspend interface Steve Sistare
2021-01-08 21:15 ` Alex Williamson
2021-01-11 21:15 ` Steven Sistare
2021-01-12 15:47 ` Jason Zeng
2021-01-12 22:09 ` Alex Williamson
2021-01-13 4:37 ` Jason Zeng
2021-01-12 22:47 ` Alex Williamson
2021-01-13 4:10 ` Alex Williamson
2021-01-13 18:02 ` Steven Sistare
2021-01-13 18:34 ` Alex Williamson
2021-01-13 18:01 ` Steven Sistare
2021-01-19 20:11 ` Steven Sistare
2021-01-05 15:36 ` [PATCH V1 5/5] vfio: block during VA suspend Steve Sistare
2021-01-05 18:08 ` kernel test robot
2021-01-05 20:03 ` kernel test robot
2021-01-07 15:17 ` Steven Sistare
2021-01-05 20:03 ` [RFC PATCH] vfio: vfio_vaddr_valid() can be static kernel test robot
2021-01-08 21:32 ` [PATCH V1 5/5] vfio: block during VA suspend Alex Williamson
2021-01-11 21:16 ` Steven Sistare
2021-01-12 21:52 ` [PATCH V1 0/5] vfio virtual address update Steven Sistare
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=1609861013-129801-2-git-send-email-steven.sistare@oracle.com \
--to=steven.sistare@oracle.com \
--cc=alex.williamson@redhat.com \
--cc=cohuck@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.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).