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 2/5] vfio: option to unmap all
Date: Tue, 5 Jan 2021 07:36:50 -0800 [thread overview]
Message-ID: <1609861013-129801-3-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1609861013-129801-1-git-send-email-steven.sistare@oracle.com>
For VFIO_IOMMU_UNMAP_DMA, delete all mappings if iova=0 and size=0.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
drivers/vfio/vfio_iommu_type1.c | 11 ++++++++---
include/uapi/linux/vfio.h | 3 ++-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
index 02228d0..3dc501d 100644
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@ -1079,6 +1079,8 @@ static int vfio_dma_do_unmap(struct vfio_iommu *iommu,
size_t unmapped = 0, pgsize;
int ret = 0, retries = 0;
unsigned long pgshift;
+ dma_addr_t iova;
+ unsigned long size;
mutex_lock(&iommu->lock);
@@ -1090,7 +1092,7 @@ static int vfio_dma_do_unmap(struct vfio_iommu *iommu,
goto unlock;
}
- if (!unmap->size || unmap->size & (pgsize - 1)) {
+ if ((!unmap->size && unmap->iova) || unmap->size & (pgsize - 1)) {
ret = -EINVAL;
goto unlock;
}
@@ -1154,8 +1156,11 @@ static int vfio_dma_do_unmap(struct vfio_iommu *iommu,
}
}
- while ((dma = vfio_find_dma(iommu, unmap->iova, unmap->size))) {
- if (!iommu->v2 && unmap->iova > dma->iova)
+ iova = unmap->iova;
+ size = unmap->size ? unmap->size : SIZE_MAX;
+
+ while ((dma = vfio_find_dma(iommu, iova, size))) {
+ if (!iommu->v2 && iova > dma->iova)
break;
/*
* Task with same address space who mapped this iova range is
diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h
index 9204705..896e527 100644
--- a/include/uapi/linux/vfio.h
+++ b/include/uapi/linux/vfio.h
@@ -1073,7 +1073,8 @@ struct vfio_bitmap {
* Caller sets argsz. The actual unmapped size is returned in the size
* field. No guarantee is made to the user that arbitrary unmaps of iova
* or size different from those used in the original mapping call will
- * succeed.
+ * succeed. If iova=0 and size=0, all addresses are unmapped.
+ *
* VFIO_DMA_UNMAP_FLAG_GET_DIRTY_BITMAP should be set to get the dirty bitmap
* before unmapping IO virtual addresses. When this flag is set, the user must
* provide a struct vfio_bitmap in data[]. User must provide zero-allocated
--
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 ` [PATCH V1 1/5] vfio: maintain dma_list order Steve Sistare
2021-01-05 18:48 ` kernel test robot
2021-01-06 0:02 ` Alex Williamson
2021-01-06 14:50 ` Steven Sistare
2021-01-05 15:36 ` Steve Sistare [this message]
2021-01-08 19:35 ` [PATCH V1 2/5] vfio: option to unmap all 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-3-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).