From patchwork Mon Apr 4 08:30:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 64963 Delivered-To: patches@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1057163lbc; Mon, 4 Apr 2016 01:30:29 -0700 (PDT) X-Received: by 10.112.55.97 with SMTP id r1mr7341522lbp.78.1459758623012; Mon, 04 Apr 2016 01:30:23 -0700 (PDT) Return-Path: Received: from mail-lb0-x22a.google.com (mail-lb0-x22a.google.com. [2a00:1450:4010:c04::22a]) by mx.google.com with ESMTPS id a3si4303559lfa.128.2016.04.04.01.30.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Apr 2016 01:30:23 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:4010:c04::22a as permitted sender) client-ip=2a00:1450:4010:c04::22a; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:4010:c04::22a as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-lb0-x22a.google.com with SMTP id u8so149273528lbk.0 for ; Mon, 04 Apr 2016 01:30:22 -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=CcuIdBHhXFIQLCC7+pmd6lKBNa6lEKI1lJTf2izdlYE=; b=RugYSaro5h28F8XmtpPC+w7TgwvfOkOpEcG1CKdbH8CovZLWBfhV49JEnqExPpRzFo DGqgOgeuCv5uPe9RiB474CSMmu8yicXUbeTugwybA+QEldVcK9TrYjVC9JGCajzKuL4U o+sJiXNSFAxz2cOn5ynX6zv7GXBNiKF8wOrVw= 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=CcuIdBHhXFIQLCC7+pmd6lKBNa6lEKI1lJTf2izdlYE=; b=Xrvy3IRU/3Dbf2r2vHCTwT0XLJllewQjVnIh2t7vDh2iinswWg9EefITKXBStUmmQ/ TJb8oBuEWx8CkhHUfzVURXYBm94N0vz/wnuffRaC+cfTP3plkD6UYKZx07O1z6wjce1d vl2UY1bcb9KT9Q3XZfHDfanDipQclxWt/Fi8BhLc8lDcKyZoARj5Vrs6eohI/PkMmDUD DbDcEleikXvdvdZnR1snhjtxk6ZiNGMlQegYgOFPLLZBjLx++56u0kzLyGWrHfeMuMa6 785O48eVEcS9HKufPd8XovabDgdmIgC9g2vuh7dDsIKjARbOSO0K3BpZVziCWrzHg7U/ zVrA== X-Gm-Message-State: AD7BkJKdBuibgVYTbin+9fR40vwnxY97jIyv3bbDgNAyUV/QmhOK9KUyVvuio9vGKFJFjvQpMGY= X-Received: by 10.28.16.141 with SMTP id 135mr10838208wmq.67.1459758622418; Mon, 04 Apr 2016 01:30:22 -0700 (PDT) Return-Path: Received: from new-host-2.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id j71sm1178257wmj.21.2016.04.04.01.30.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Apr 2016 01:30:20 -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, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Cc: suravee.suthikulpanit@amd.com, patches@linaro.org, linux-kernel@vger.kernel.org, Manish.Jaggi@caviumnetworks.com, 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 v6 1/5] vfio: introduce VFIO_IOVA_RESERVED vfio_dma type Date: Mon, 4 Apr 2016 08:30:07 +0000 Message-Id: <1459758611-2972-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1459758611-2972-1-git-send-email-eric.auger@linaro.org> References: <1459758611-2972-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 treatments need to be reworked: removal, replay. Currently they are unplugged. In subsequent patches they will be reworked. 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 75b24e9..c9ddbde 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; @@ -75,6 +84,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_group { @@ -395,7 +405,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); } @@ -671,6 +682,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) {