From patchwork Tue Apr 19 17:24:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 66132 Delivered-To: patches@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1983622qge; Tue, 19 Apr 2016 10:25:00 -0700 (PDT) X-Received: by 10.194.243.226 with SMTP id xb2mr4287464wjc.35.1461086698893; Tue, 19 Apr 2016 10:24:58 -0700 (PDT) Return-Path: Received: from mail-wm0-x22e.google.com (mail-wm0-x22e.google.com. [2a00:1450:400c:c09::22e]) by mx.google.com with ESMTPS id op7si1295708wjc.120.2016.04.19.10.24.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Apr 2016 10:24:58 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22e as permitted sender) client-ip=2a00:1450:400c:c09::22e; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22e as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x22e.google.com with SMTP id n3so41789399wmn.0 for ; Tue, 19 Apr 2016 10:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z8YBl4ZqH0bHblyfju2cXJEXTTzf3HJj35wi4sP0obU=; b=VU+ypmVDWq3PCKjK+dlNWert+l6AZcTHYTD9LMiAR97Wu0H1K5RIlLn3MDEWCC3Obf GxafB+dXRU54q8tQP2UUiCnp3bU/ddofcP2jua0srSLfDpEUyc6sFn0MmCUPZn7W2zaO LFT/61SdOw4VCC5DJbPfL2QLJiSBhzbDN/C7A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z8YBl4ZqH0bHblyfju2cXJEXTTzf3HJj35wi4sP0obU=; b=c2rOuZrlLpCLnbRPO4Env0QG9tlL1Q+YupC6cl5hKoOLBKOxHitkBWV40aO6yD5T77 CKJXBc+VQO8pOjoJ2J8f/Uv1BWVVqLsDegRNuh4b8wBsvcWkBok5MsmT74CqN08CIPyG a3ghiyk3FEECymNTcpQkFqNpUnCMLka+xkG8zBF6eo333zrmy99W7BNJEIATvlpYf2XE UyBQ2n6zFppZs6UY6zml6YEQyIvei5KSg7TakQTOn/f1PfAy4mfm3TogzjS1zoQ5322Y msw7upoHahYlyd067ZSwrV/0CQRhQ5aekXQBjSH2NL8dI1H/FPfJSTye97gjm7oQ3yi8 i2NQ== X-Gm-Message-State: AOPr4FURuxEvsekabMKOKMCf4qzHkjR2TW84/NOsMOhNoXZB5o+HnqUQLj/9h9xGOck/viWiu0A= X-Received: by 10.28.133.14 with SMTP id h14mr4949037wmd.100.1461086698595; Tue, 19 Apr 2016 10:24:58 -0700 (PDT) Return-Path: Received: from new-host-34.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id w202sm5330220wmw.18.2016.04.19.10.24.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Apr 2016 10:24:57 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, robin.murphy@arm.com, alex.williamson@redhat.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 Cc: 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 Subject: [PATCH v7 2/7] vfio/type1: vfio_find_dma accepting a type argument Date: Tue, 19 Apr 2016 17:24:42 +0000 Message-Id: <1461086687-2658-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461086687-2658-1-git-send-email-eric.auger@linaro.org> References: <1461086687-2658-1-git-send-email-eric.auger@linaro.org> 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 --- drivers/vfio/vfio_iommu_type1.c | 63 ++++++++++++++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 10 deletions(-) -- 1.9.1 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); + 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; }