From patchwork Tue Jan 26 13:12: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: 60454 Delivered-To: patches@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1949037lbb; Tue, 26 Jan 2016 05:13:31 -0800 (PST) X-Received: by 10.28.64.137 with SMTP id n131mr23159305wma.96.1453814011174; Tue, 26 Jan 2016 05:13:31 -0800 (PST) Return-Path: Received: from mail-wm0-x231.google.com (mail-wm0-x231.google.com. [2a00:1450:400c:c09::231]) by mx.google.com with ESMTPS id u127si5457975wmd.36.2016.01.26.05.13.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2016 05:13:31 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::231 as permitted sender) client-ip=2a00:1450:400c:c09::231; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::231 as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dkim=pass header.i=@linaro.org Received: by mail-wm0-x231.google.com with SMTP id u188so105678783wmu.1 for ; Tue, 26 Jan 2016 05:13:31 -0800 (PST) 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=PjMEHhTlHqm0y6zEGcNQ9fL0DqWYPq1dF2MIwZvU9r4=; b=ZkuST9omE+ZYo7lBtCukvI2fayhuVo0+An8wk0fXwYRaWdPgu0eylb2H4OW1Xs7pHV 1bAi0qhZmO0CL9sidEtnAHEIE+FhEYtb2S1w9MopTGKYoiv8wGu4GiiTOFjHBlTMxrfz h0wPGnREZCKFA9JQNWzodimcDlX7/BD2FRZtQ= 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=PjMEHhTlHqm0y6zEGcNQ9fL0DqWYPq1dF2MIwZvU9r4=; b=VfdshDv5CQVE8ZZH8GKGCxrBLQms7XbZ9rK1DEhkjXqWbgMnjzIN8A7APEGLUGrPx/ nC96whaXO+u943fuUBXghToVyl9hFsqHSb0pxm2Mxep03urJmkIZAMH0eYKkg6J5jlVi QIv98ZR2AOF4xw1gWBho0VzvpCu7uPOPBZUC98DzBCSd23WOmZpWv3NHioiv9QbZE14r 08tTupeyEsOyaehfoldR2PHMSFKMzYEIkY2QZR46NyA5xS+mbRUhO1fEQOvgAiLxdAHM 1+3xvxq9HEPWOKcM/BZtjy6yBPsmv1Lj9B53UPEqF8lcWOjd9XSv4ybry8dDwbmNMVTu wiJw== X-Gm-Message-State: AG10YOQZvvDDOoREVcZEHwmMKTFUkJfez6kAuprye4sVDi3rwHKQqfrNgKEvI/Nu6hlCKy+IDBo= X-Received: by 10.28.232.221 with SMTP id f90mr23219797wmi.60.1453814010934; Tue, 26 Jan 2016 05:13:30 -0800 (PST) Return-Path: Received: from localhost.localdomain (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id ct2sm1388885wjb.46.2016.01.26.05.13.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Jan 2016 05:13:29 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, alex.williamson@redhat.com, will.deacon@arm.com, christoffer.dall@linaro.org, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: Bharat.Bhushan@freescale.com, pranav.sawargaonkar@gmail.com, p.fedin@samsung.com, suravee.suthikulpanit@amd.com, linux-kernel@vger.kernel.org, patches@linaro.org, iommu@lists.linux-foundation.org Subject: [PATCH 04/10] vfio: introduce VFIO_IOVA_RESERVED vfio_dma type Date: Tue, 26 Jan 2016 13:12:42 +0000 Message-Id: <1453813968-2024-5-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453813968-2024-1-git-send-email-eric.auger@linaro.org> References: <1453813968-2024-1-git-send-email-eric.auger@linaro.org> We introduce a vfio_dma type since we will need to discriminate legacy vfio_dma's from new reserved ones. Since those latter are not mapped at registration, some handlings must be unplugged: removal, replay. They will be enhanced later on. Signed-off-by: Eric Auger --- drivers/vfio/vfio_iommu_type1.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 32438d9..33a9ce4 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -53,6 +53,15 @@ module_param_named(disable_hugepages, MODULE_PARM_DESC(disable_hugepages, "Disable VFIO IOMMU support for IOMMU hugepages."); +enum vfio_iova_type { + VFIO_IOVA_USER = 0, /* standard IOVA used to map user vaddr */ + /* + * IOVA reserved to map special host physical addresses, + * MSI frames for instance + */ + VFIO_IOVA_RESERVED, +}; + struct vfio_iommu { struct list_head domain_list; struct mutex lock; @@ -78,6 +87,7 @@ struct vfio_dma { unsigned long vaddr; /* Process virtual addr */ size_t size; /* Map size (bytes) */ int prot; /* IOMMU_READ/WRITE */ + enum vfio_iova_type type; /* type of IOVA */ }; struct vfio_reserved_binding { @@ -480,7 +490,8 @@ static void vfio_unmap_unpin(struct vfio_iommu *iommu, struct vfio_dma *dma) static void vfio_remove_dma(struct vfio_iommu *iommu, struct vfio_dma *dma) { - vfio_unmap_unpin(iommu, dma); + if (likely(dma->type != VFIO_IOVA_RESERVED)) + vfio_unmap_unpin(iommu, dma); vfio_unlink_dma(iommu, dma); kfree(dma); } @@ -756,6 +767,10 @@ static int vfio_iommu_replay(struct vfio_iommu *iommu, dma_addr_t iova; dma = rb_entry(n, struct vfio_dma, node); + + if (unlikely(dma->type == VFIO_IOVA_RESERVED)) + continue; + iova = dma->iova; while (iova < dma->iova + dma->size) {