From: Eric Auger <eric.auger@linaro.org>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: eric.auger@st.com, robin.murphy@arm.com, will.deacon@arm.com,
joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net,
marc.zyngier@arm.com, christoffer.dall@linaro.org,
linux-arm-kernel@lists.infradead.org, patches@linaro.org,
linux-kernel@vger.kernel.org, Bharat.Bhushan@freescale.com,
pranav.sawargaonkar@gmail.com, p.fedin@samsung.com,
iommu@lists.linux-foundation.org, Jean-Philippe.Brucker@arm.com,
julien.grall@arm.com, yehuday@marvell.com
Subject: Re: [PATCH v9 2/7] vfio/type1: vfio_find_dma accepting a type argument
Date: Tue, 10 May 2016 16:54:03 +0200 [thread overview]
Message-ID: <5731F60B.6040105@linaro.org> (raw)
In-Reply-To: <20160509164928.518a05a8@t450s.home>
Hi Alex,
On 05/10/2016 12:49 AM, Alex Williamson wrote:
> On Wed, 4 May 2016 11:54:13 +0000
> Eric Auger <eric.auger@linaro.org> wrote:
>
>> In our RB-tree we now have slots of different types (USER and RESERVED).
>> It becomes useful to be able to search for dma slots of a specific type or
>> any type. This patch proposes an implementation for that modality and also
>> changes the existing callers using the USER type.
>>
>> Signed-off-by: Eric Auger <eric.auger@linaro.org>
>> ---
>> drivers/vfio/vfio_iommu_type1.c | 63 ++++++++++++++++++++++++++++++++++-------
>> 1 file changed, 53 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c
>> index aaf5a6c..2d769d4 100644
>> --- a/drivers/vfio/vfio_iommu_type1.c
>> +++ b/drivers/vfio/vfio_iommu_type1.c
>> @@ -98,23 +98,64 @@ struct vfio_group {
>> * into DMA'ble space using the IOMMU
>> */
>>
>> -static struct vfio_dma *vfio_find_dma(struct vfio_iommu *iommu,
>> - dma_addr_t start, size_t size)
>> +/**
>> + * vfio_find_dma_from_node: looks for a dma slot intersecting a window
>> + * from a given rb tree node
>> + * @top: top rb tree node where the search starts (including this node)
>> + * @start: window start
>> + * @size: window size
>> + * @type: window type
>> + */
>> +static struct vfio_dma *vfio_find_dma_from_node(struct rb_node *top,
>> + dma_addr_t start, size_t size,
>> + enum vfio_iova_type type)
>> {
>> - struct rb_node *node = iommu->dma_list.rb_node;
>> + struct rb_node *node = top;
>> + struct vfio_dma *dma;
>>
>> while (node) {
>> - struct vfio_dma *dma = rb_entry(node, struct vfio_dma, node);
>> -
>> + dma = rb_entry(node, struct vfio_dma, node);
>> if (start + size <= dma->iova)
>> node = node->rb_left;
>> else if (start >= dma->iova + dma->size)
>> node = node->rb_right;
>> else
>> + break;
>> + }
>> + if (!node)
>> + return NULL;
>> +
>> + /* a dma slot intersects our window, check the type also matches */
>> + if (type == VFIO_IOVA_ANY || dma->type == type)
>> + return dma;
>> +
>> + /* restart 2 searches skipping the current node */
>> + if (start < dma->iova) {
>> + dma = vfio_find_dma_from_node(node->rb_left, start,
>> + size, type);
>> + if (dma)
>> return dma;
>> }
>> + if (start + size > dma->iova + dma->size)
>> + dma = vfio_find_dma_from_node(node->rb_right, start,
>> + size, type);
>
> It might be nice to split this little bit of trickery out to a separate
> patch so that you can better explain what it does. It's really not
> needed until we start creating user-type entries, so it shouldn't hurt
> bisection.
OK I will
Regards
Eric
>
>> + return dma;
>> +}
>> +
>> +/**
>> + * vfio_find_dma: find a dma slot intersecting a given window
>> + * @iommu: vfio iommu handle
>> + * @start: window base iova
>> + * @size: window size
>> + * @type: window type
>> + */
>> +static struct vfio_dma *vfio_find_dma(struct vfio_iommu *iommu,
>> + dma_addr_t start, size_t size,
>> + enum vfio_iova_type type)
>> +{
>> + struct rb_node *top_node = iommu->dma_list.rb_node;
>>
>> - return NULL;
>> + return vfio_find_dma_from_node(top_node, start, size, type);
>> }
>>
>> static void vfio_link_dma(struct vfio_iommu *iommu, struct vfio_dma *new)
>> @@ -488,19 +529,21 @@ static int vfio_dma_do_unmap(struct vfio_iommu *iommu,
>> * mappings within the range.
>> */
>> if (iommu->v2) {
>> - dma = vfio_find_dma(iommu, unmap->iova, 0);
>> + dma = vfio_find_dma(iommu, unmap->iova, 0, VFIO_IOVA_USER);
>> if (dma && dma->iova != unmap->iova) {
>> ret = -EINVAL;
>> goto unlock;
>> }
>> - dma = vfio_find_dma(iommu, unmap->iova + unmap->size - 1, 0);
>> + dma = vfio_find_dma(iommu, unmap->iova + unmap->size - 1, 0,
>> + VFIO_IOVA_USER);
>> if (dma && dma->iova + dma->size != unmap->iova + unmap->size) {
>> ret = -EINVAL;
>> goto unlock;
>> }
>> }
>>
>> - while ((dma = vfio_find_dma(iommu, unmap->iova, unmap->size))) {
>> + while ((dma = vfio_find_dma(iommu, unmap->iova, unmap->size,
>> + VFIO_IOVA_USER))) {
>> if (!iommu->v2 && unmap->iova > dma->iova)
>> break;
>> unmapped += dma->size;
>> @@ -604,7 +647,7 @@ static int vfio_dma_do_map(struct vfio_iommu *iommu,
>>
>> mutex_lock(&iommu->lock);
>>
>> - if (vfio_find_dma(iommu, iova, size)) {
>> + if (vfio_find_dma(iommu, iova, size, VFIO_IOVA_ANY)) {
>> mutex_unlock(&iommu->lock);
>> return -EEXIST;
>> }
>
next prev parent reply other threads:[~2016-05-10 14:55 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-04 11:54 [PATCH v9 0/7] KVM PCIe/MSI passthrough on ARM/ARM64: kernel part 3/3: vfio changes Eric Auger
2016-05-04 11:54 ` [PATCH v9 1/7] vfio: introduce a vfio_dma type field Eric Auger
2016-05-04 11:54 ` [PATCH v9 2/7] vfio/type1: vfio_find_dma accepting a type argument Eric Auger
2016-05-09 22:49 ` Alex Williamson
2016-05-10 14:54 ` Eric Auger [this message]
2016-05-04 11:54 ` [PATCH v9 3/7] vfio/type1: bypass unmap/unpin and replay for VFIO_IOVA_RESERVED slots Eric Auger
2016-05-09 22:49 ` Alex Williamson
2016-05-11 12:58 ` Eric Auger
2016-05-04 11:54 ` [PATCH v9 4/7] vfio: allow reserved msi iova registration Eric Auger
2016-05-05 19:22 ` Chalamarla, Tirumalesh
2016-05-09 7:55 ` Eric Auger
2016-05-10 15:29 ` Alex Williamson
2016-05-10 15:34 ` Eric Auger
2016-05-04 11:54 ` [PATCH v9 5/7] vfio/type1: also check IRQ remapping capability at msi domain Eric Auger
2016-05-05 19:23 ` Chalamarla, Tirumalesh
2016-05-09 8:05 ` Eric Auger
2016-05-09 22:49 ` Alex Williamson
2016-05-10 16:10 ` Eric Auger
2016-05-10 17:24 ` Robin Murphy
2016-05-11 8:38 ` Eric Auger
2016-05-11 9:31 ` Robin Murphy
2016-05-11 9:44 ` Eric Auger
2016-05-11 13:48 ` Robin Murphy
2016-05-11 14:37 ` Eric Auger
2016-05-04 11:54 ` [PATCH v9 6/7] iommu/arm-smmu: do not advertise IOMMU_CAP_INTR_REMAP Eric Auger
2016-05-04 11:54 ` [PATCH v9 7/7] vfio/type1: return MSI geometry through VFIO_IOMMU_GET_INFO capability chains Eric Auger
2016-05-04 12:06 ` Eric Auger
2016-05-09 23:03 ` Alex Williamson
2016-05-10 16:50 ` Eric Auger
2016-05-09 22:49 ` Alex Williamson
2016-05-10 16:36 ` Eric Auger
2016-05-20 16:01 ` [PATCH v9 0/7] KVM PCIe/MSI passthrough on ARM/ARM64: kernel part 3/3: vfio changes Eric Auger
2016-06-08 8:29 ` Auger Eric
2016-06-08 21:06 ` Alex Williamson
2016-06-09 7:55 ` Auger Eric
2016-06-09 19:44 ` Alex Williamson
2016-06-20 15:42 ` Pranav Sawargaonkar
2016-06-20 15:46 ` Pranav Sawargaonkar
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=5731F60B.6040105@linaro.org \
--to=eric.auger@linaro.org \
--cc=Bharat.Bhushan@freescale.com \
--cc=Jean-Philippe.Brucker@arm.com \
--cc=alex.williamson@redhat.com \
--cc=christoffer.dall@linaro.org \
--cc=eric.auger@st.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jason@lakedaemon.net \
--cc=joro@8bytes.org \
--cc=julien.grall@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marc.zyngier@arm.com \
--cc=p.fedin@samsung.com \
--cc=patches@linaro.org \
--cc=pranav.sawargaonkar@gmail.com \
--cc=robin.murphy@arm.com \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
--cc=yehuday@marvell.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).