From patchwork Tue Apr 19 17:24:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 66135 Delivered-To: patches@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1983705qge; Tue, 19 Apr 2016 10:25:10 -0700 (PDT) X-Received: by 10.28.189.133 with SMTP id n127mr5085787wmf.5.1461086704669; Tue, 19 Apr 2016 10:25:04 -0700 (PDT) Return-Path: Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com. [2a00:1450:400c:c09::22a]) by mx.google.com with ESMTPS id o13si1313299wjq.52.2016.04.19.10.25.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Apr 2016 10:25:04 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22a as permitted sender) client-ip=2a00:1450:400c:c09::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:400c:c09::22a as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x22a.google.com with SMTP id n3so41793323wmn.0 for ; Tue, 19 Apr 2016 10:25:04 -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=HhNdYwqu8q8EEl7lExf7a3TgDBrNXu37t16udirmi8Q=; b=erNQWIHcXLYRUKmUmkmTyboAlr1PPz9F69KxOaIl5V+doB7RM9zO2XJQsMFamQ9yNh iubr0pwI4/EMKhfmKY9rGmhWakEDxClYzeLXX9onoZZ1blGlwBaoa7ot/NXQBQNDBvA3 eYezO5afZu9oa+ib1RPD+nQwEXfI+Fq8raKMw= 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=HhNdYwqu8q8EEl7lExf7a3TgDBrNXu37t16udirmi8Q=; b=K6zJbK/SLidgeLUoLmhXsDuA5qU+QCMjHp+r3+7WAOMb7HoUxLbgPYKFDtpLsMge7G 9uy2xx6FWqxvsGERHZTcBlNLcDZQTbVG4afiqWmC1PGTemHo8nW1byjFmMvpvGsLsOw8 VU887b5F9AVzSwoQvfcCszldSmOpfqTKFc7E8k0jA0VnN53Mr3PPqUvbaJ0RCvae0/hZ kTPcwPnu0U7kD0DATeEt0Waan3sAqMVC0omBGvcD/j0Qfnc6ZpKku64+eZQnex0vN3kM Gnh6YX3NsTjsphCwSvqmyQ3EnO4KRjEcw0ZqQ+He3sB7yu3r1VnGzxNASmepXU8AHuCU dYOg== X-Gm-Message-State: AOPr4FXQZkoKnBbKqVT/1Qo/COmlv4gMlNyP/rrTU9Eur2uNnS4v8MzVJSqNLVWpitMPLWsBGic= X-Received: by 10.28.187.5 with SMTP id l5mr4649335wmf.17.1461086704358; Tue, 19 Apr 2016 10:25:04 -0700 (PDT) Return-Path: Received: from new-host-34.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id w202sm5330220wmw.18.2016.04.19.10.25.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Apr 2016 10:25:03 -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 Subject: [PATCH v7 5/7] vfio/type1: also check IRQ remapping capability at msi domain Date: Tue, 19 Apr 2016 17:24:45 +0000 Message-Id: <1461086687-2658-6-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461086687-2658-1-git-send-email-eric.auger@linaro.org> References: <1461086687-2658-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 fa6b8b1..51b1f15 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 " @@ -842,6 +844,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) { @@ -935,7 +964,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); @@ -958,6 +987,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) @@ -985,8 +1021,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;