From patchwork Fri Feb 12 08:13:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 61820 Delivered-To: patches@linaro.org Received: by 10.112.43.199 with SMTP id y7csp676608lbl; Fri, 12 Feb 2016 00:14:06 -0800 (PST) X-Received: by 10.28.1.196 with SMTP id 187mr1479309wmb.68.1455264846851; Fri, 12 Feb 2016 00:14:06 -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 y125si2260489wmy.113.2016.02.12.00.14.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Feb 2016 00:14:06 -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 p63so8863728wmp.1 for ; Fri, 12 Feb 2016 00:14:06 -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=muU/OFWOMxVcTpwfFnPC9CJyPh7Bms31qsClJTPUFoY=; b=N3zpFyaq+8cX67kY94dZukIxPHpXkK7TRkuz/P2JE4Vd+G0R39xedqzYdjvLFzSTBc NM4ptvwiPwj9z9imKr9NA08p8TLyGIA0IpqOlPl9Aoe0ku7XAJcB5tMxEH0deykeEEde +zJvCwyL3ybl4bJ27PYz/guZ+pA4OiwHjEfc8= 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=muU/OFWOMxVcTpwfFnPC9CJyPh7Bms31qsClJTPUFoY=; b=B/A6Um7V0DH2MITeHoUEc2ioFdJDzxoVqD5NODEY9qs3y5seXhkjkVr/jOKDqQdpvv frU75CfCW+LSATx+ir72I17NhXsLlbcMnfJ0x6qjwil2d9AJXntBBIf49kbWkObChA9J b9SCEF/3rx2jte36sGy0jxXEwdghD0dVFVjEPlZm0CJ0mJQU4j489Qdj3YJE1TPYA3PS 9F3uHIe1l/9lq3rHfVKbs5RE9eTOnJsbw7dsR2ywNpmd0ZYXqsuCE1T6dfd7maQfSfoL /0Bw9+9qmFDo6jVL0rrvE9ba1zkNkTzTBAiGe6Oa9DNZBhFFeX2wjfB/F7MV3/G8tgWD YcVA== X-Gm-Message-State: AG10YORh+/0KlM0wBngmqh7oRLYw9VaWDqCCqhzQu6VqSJGGuK2ZlPI6Bf5bTuLvDgpMmRBQlDs= X-Received: by 10.194.174.197 with SMTP id bu5mr263679wjc.23.1455264846663; Fri, 12 Feb 2016 00:14:06 -0800 (PST) Return-Path: Received: from new-host-17.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id x66sm1243977wmb.20.2016.02.12.00.14.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 12 Feb 2016 00:14:04 -0800 (PST) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, 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, sherry.hurwitz@amd.com, brijesh.singh@amd.com, leo.duran@amd.com, Thomas.Lendacky@amd.com Subject: [RFC v3 03/15] vfio: introduce VFIO_IOVA_RESERVED vfio_dma type Date: Fri, 12 Feb 2016 08:13:05 +0000 Message-Id: <1455264797-2334-4-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455264797-2334-1-git-send-email-eric.auger@linaro.org> References: <1455264797-2334-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 c5b57e1..b9326c9 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 { @@ -418,7 +428,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); } @@ -694,6 +705,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) {