From patchwork Fri Feb 26 17:35:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 63099 Delivered-To: patches@linaro.org Received: by 10.112.235.234 with SMTP id up10csp1125lbc; Fri, 26 Feb 2016 09:36:52 -0800 (PST) X-Received: by 10.28.111.91 with SMTP id k88mr4139227wmc.86.1456508192819; Fri, 26 Feb 2016 09:36:32 -0800 (PST) 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 dm2si17067804wjb.153.2016.02.26.09.36.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Feb 2016 09:36:32 -0800 (PST) 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; 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; dkim=pass header.i=@linaro.org Received: by mail-wm0-x22e.google.com with SMTP id g62so81600884wme.0 for ; Fri, 26 Feb 2016 09:36:32 -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=c2tmlTZFO34YuIfXdIOC8nYhWzb6H5b7vXh+03gLUc4=; b=ZQ/IvQsZpQK2dSbu8xlQom2KuKmczcVGjhfKN2j2ivJWNDAw8lIdhFC3q+jFMGaeVQ OUeKa2w37c7mCY9ljBRBKwc69k926LvSTFgnCxdZoosOwHKmYfc4aQ8W2NlXE+Kdxip9 rxr8W2RYI6NPlWRNaJFzcSGZ3Awvnb/wUwoxw= 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=c2tmlTZFO34YuIfXdIOC8nYhWzb6H5b7vXh+03gLUc4=; b=KiX3WfrO2mM49FA+fooU0C+z0LE5Rds3nBFr4fpSXVMOeDdUVTen2vopsGvJcje4P6 Xi36qcjSD5QY36Jthw4Bk6xHPNab9SY/+sbpKjqSh+5OHfLgqNI/BHio4CpqBAMcylqd YQLKxhJOA9rkPxoJ/85WZpGIMqamte6B1SfGvBZiKO6TDeO3JUc7oeBCIh9idhvHd9XP +dRJKCok2jNJk/CYEz7CehM4p9bjS/bdaOFwaFHhLkvlOCSZUJYs1lB+KJAC3G92Gp+G WaVrkwc7pVOn9kU+SpwqkHXc7jAi+6eHLnyKHtRTzXXz/6uHHe5MGDLPDFyls9CkzzMN pEkQ== X-Gm-Message-State: AD7BkJLRHY573cjVDIaBPMlGx0SQp2x6PGBafXl0qJhkIk+cfqj1ZmHMcI+H5Z2CvQKJSFwcUiI= X-Received: by 10.28.49.3 with SMTP id x3mr4266434wmx.4.1456508192636; Fri, 26 Feb 2016 09:36:32 -0800 (PST) Return-Path: Received: from new-host-8.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id 77sm3750373wmp.18.2016.02.26.09.36.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 26 Feb 2016 09:36:30 -0800 (PST) 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 Subject: [RFC v4 10/14] vfio: introduce VFIO_IOVA_RESERVED vfio_dma type Date: Fri, 26 Feb 2016 17:35:50 +0000 Message-Id: <1456508154-2253-11-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456508154-2253-1-git-send-email-eric.auger@linaro.org> References: <1456508154-2253-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 6f1ea3d..692e9a2 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) {