From patchwork Wed May 4 11:54:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 67126 Delivered-To: patches@linaro.org Received: by 10.140.92.199 with SMTP id b65csp135443qge; Wed, 4 May 2016 04:54:47 -0700 (PDT) X-Received: by 10.28.63.148 with SMTP id m142mr8466461wma.85.1462362887567; Wed, 04 May 2016 04:54:47 -0700 (PDT) Return-Path: Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com. [2a00:1450:400c:c09::22f]) by mx.google.com with ESMTPS id fo6si4422867wjc.131.2016.05.04.04.54.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 May 2016 04:54:47 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22f as permitted sender) client-ip=2a00:1450:400c:c09::22f; 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::22f as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x22f.google.com with SMTP id g17so89440431wme.1 for ; Wed, 04 May 2016 04:54:47 -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=QuRuhABvt06D5ctJmFxu8lubu8bH1JzRwAqZzoQuTa8=; b=gI/rxiZHM++1RtMhWKYxm59XiM/MXfsO7Ow+2niQ0dDoXL+xzGNqwtupnW15LtFg7h DLjb2bJcZVPOmh68q17FnGUqswgEHPwgrrPnhryxDJtOhFBgclhk3xUBOAlFQ4tP+izI FdRICobT20TwmMjOAJgDY87d1gZrQcUlPsxag= 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=QuRuhABvt06D5ctJmFxu8lubu8bH1JzRwAqZzoQuTa8=; b=mzNdPoBIvCSMMKHFFMPnNMLHaZKOvuibbXylRdcI9ewg4ATd4lBEEWKCe8IP/H7lNS Fr6jV3Eb2HTt4Nw6RGEoDcFk7KR0f760OkQ8KbAaGQomCS5r2ag2LxaEi5ZOQPLYOGqx D7NLNFzyQB5vCoFO4dGPuWBIVnwzASQMei4N+H2lIRS5ieX6EN+B4lgMqWil4d7YyskE /N5HsYfFGKyLay+JshtXO7OM6+gMwcIcmrfyUeM5px01aYHv8/H2kka2XY1TPFGSk9I2 +2kZaH2YuRMh1cFG9Xm7l6psoYXk0QR8PK+R1UetC07vvYgKYxNj38jMh/qUevuf9uFp OxZQ== X-Gm-Message-State: AOPr4FVI+UgQIhViK8tbZjDn/wLSNRHxlHvO6nK3tJ22UtTW2EuwKRT/tpdRovSVhs9SwGMtQxA= X-Received: by 10.194.123.102 with SMTP id lz6mr8814888wjb.2.1462362887271; Wed, 04 May 2016 04:54:47 -0700 (PDT) Return-Path: Received: from new-host-61.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id ck9sm3816623wjc.22.2016.05.04.04.54.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 May 2016 04:54:45 -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, yehuday@marvell.com Subject: [PATCH v9 5/7] vfio/type1: also check IRQ remapping capability at msi domain Date: Wed, 4 May 2016 11:54:16 +0000 Message-Id: <1462362858-2925-6-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1462362858-2925-1-git-send-email-eric.auger@linaro.org> References: <1462362858-2925-1-git-send-email-eric.auger@linaro.org> On x86 IRQ remapping is abstracted by the IOMMU. On ARM this is abstracted by the msi controller. vfio_safe_irq_domain allows to check whether interrupts are "safe" for a given device. They are if the device does not use MSI or if the device uses MSI and the msi-parent controller supports IRQ remapping. Then we check at group level if all devices have safe interrupts: if not, we only allow the group to be attached if allow_unsafe_interrupts is set. At this point ARM sMMU still advertises IOMMU_CAP_INTR_REMAP. This is changed in next patch. Signed-off-by: Eric Auger --- v3 -> v4: - rename vfio_msi_parent_irq_remapping_capable into vfio_safe_irq_domain and irq_remapping into safe_irq_domains v2 -> v3: - protect vfio_msi_parent_irq_remapping_capable with CONFIG_GENERIC_MSI_IRQ_DOMAIN --- drivers/vfio/vfio_iommu_type1.c | 44 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 4d3a6f1..2fc8197 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -37,6 +37,8 @@ #include #include #include +#include +#include #define DRIVER_VERSION "0.2" #define DRIVER_AUTHOR "Alex Williamson " @@ -777,6 +779,33 @@ static int vfio_bus_type(struct device *dev, void *data) return 0; } +/** + * vfio_safe_irq_domain: returns whether the irq domain + * the device is attached to is safe with respect to MSI isolation. + * If the irq domain is not an MSI domain, we return it is safe. + * + * @dev: device handle + * @data: unused + * returns 0 if the irq domain is safe, -1 if not. + */ +static int vfio_safe_irq_domain(struct device *dev, void *data) +{ +#ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN + struct irq_domain *domain; + struct msi_domain_info *info; + + domain = dev_get_msi_domain(dev); + if (!domain) + return 0; + + info = msi_get_domain_info(domain); + + if (!(info->flags & MSI_FLAG_IRQ_REMAPPING)) + return -1; +#endif + return 0; +} + static int vfio_iommu_replay(struct vfio_iommu *iommu, struct vfio_domain *domain) { @@ -870,7 +899,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, struct vfio_group *group, *g; struct vfio_domain *domain, *d; struct bus_type *bus = NULL; - int ret; + int ret, safe_irq_domains; mutex_lock(&iommu->lock); @@ -893,6 +922,13 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, group->iommu_group = iommu_group; + /* + * Determine if all the devices of the group have a safe irq domain + * with respect to MSI isolation + */ + safe_irq_domains = !iommu_group_for_each_dev(iommu_group, &bus, + vfio_safe_irq_domain); + /* Determine bus_type in order to allocate a domain */ ret = iommu_group_for_each_dev(iommu_group, &bus, vfio_bus_type); if (ret) @@ -920,8 +956,12 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, INIT_LIST_HEAD(&domain->group_list); list_add(&group->next, &domain->group_list); + /* + * to advertise safe interrupts either the IOMMU or the MSI controllers + * must support IRQ remapping/interrupt translation + */ if (!allow_unsafe_interrupts && - !iommu_capable(bus, IOMMU_CAP_INTR_REMAP)) { + (!iommu_capable(bus, IOMMU_CAP_INTR_REMAP) && !safe_irq_domains)) { pr_warn("%s: No interrupt remapping support. Use the module param \"allow_unsafe_interrupts\" to enable VFIO IOMMU support on this platform\n", __func__); ret = -EPERM;