From patchwork Thu Feb 11 14:34:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 61778 Delivered-To: patches@linaro.org Received: by 10.112.43.199 with SMTP id y7csp229613lbl; Thu, 11 Feb 2016 06:36:44 -0800 (PST) X-Received: by 10.28.223.8 with SMTP id w8mr18955624wmg.54.1455201346028; Thu, 11 Feb 2016 06:35:46 -0800 (PST) Return-Path: Received: from mail-wm0-x22d.google.com (mail-wm0-x22d.google.com. [2a00:1450:400c:c09::22d]) by mx.google.com with ESMTPS id hd7si12394194wjc.186.2016.02.11.06.35.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Feb 2016 06:35:45 -0800 (PST) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22d as permitted sender) client-ip=2a00:1450:400c:c09::22d; Authentication-Results: mx.google.com; spf=pass (google.com: domain of eric.auger@linaro.org designates 2a00:1450:400c:c09::22d as permitted sender) smtp.mailfrom=eric.auger@linaro.org; dkim=pass header.i=@linaro.org Received: by mail-wm0-x22d.google.com with SMTP id g62so71564030wme.0 for ; Thu, 11 Feb 2016 06:35:45 -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=at3gjKn9rTmcZGRNHZA5mI05MJ4sFtPmn9c31P0ISKI=; b=BXB4c5bcF4azAnK5Zo4pqLqSqJnMecTw/eDxuVL0hBNnEzVzHdJlmToUkF1XNk1E85 0t9+NuPiY5akVV8zhRkT6H+csgF4buZG5T1YRc5NTaNnzYg9AYrhEGS587/Mbfsmc4ge V94ZescMIU1EPMC6aJOrv4pdVug+yCQyRFnUQ= 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=at3gjKn9rTmcZGRNHZA5mI05MJ4sFtPmn9c31P0ISKI=; b=jcKOodyVcuphdAojLD5NCxhWJiMgoGSUcks77Xlp6diR/ePlqUfCtsBwk9ksdOxB1D KAdf6kbAJWBDUi164VQb0xTiwJIbhFkCDYHBvgx3hvBQHG2FoTurnR8VnmfKkGULNrZP DfhzfUcFEQVwiv5J3Vd2AJVVCSYmhuVhkmyzMN5kmL0XV7BIcYZoKe+np+brUFisoS4y M0Fhhw8F6o4GtoTSb2bdL+gTbZ0lEgIGYfvt/VR/6cfLWi/rf+lVlYi+3qFCSmz/sdWC 88bivL6/iFzaC1MSsWWwiPY5psPF6lr93IOy6QSY9gdPJxnf4BIV4VqzN0f6fatCh1sS fQZw== X-Gm-Message-State: AG10YORrm9oPSfaR0vKz29xx8NRpVDhIzoZM+2rneA/FDyuIns/luiBvUA2zM+ns/8a8ktJHJKA= X-Received: by 10.28.90.67 with SMTP id o64mr17232633wmb.38.1455201345823; Thu, 11 Feb 2016 06:35:45 -0800 (PST) Return-Path: Received: from new-host-12.home (LMontsouris-657-1-37-90.w80-11.abo.wanadoo.fr. [80.11.198.90]) by smtp.gmail.com with ESMTPSA id t205sm8290751wmt.23.2016.02.11.06.35.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Feb 2016 06:35:44 -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 v2 13/15] vfio/type1: also check IRQ remapping capability at msi domain Date: Thu, 11 Feb 2016 14:34:20 +0000 Message-Id: <1455201262-5259-14-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455201262-5259-1-git-send-email-eric.auger@linaro.org> References: <1455201262-5259-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_msi_parent_irq_remapping_capable allows to check whether interrupts are "safe" for a given device. There 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 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 --- drivers/vfio/vfio_iommu_type1.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) -- 1.9.1 diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index c5d3b48..080321b 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -36,6 +36,8 @@ #include #include #include +#include +#include #define DRIVER_VERSION "0.2" #define DRIVER_AUTHOR "Alex Williamson " @@ -754,6 +756,31 @@ static int vfio_bus_type(struct device *dev, void *data) return 0; } +/** + * vfio_msi_parent_irq_remapping_capable: returns whether the device msi-parent + * controller supports IRQ remapping, aka interrupt translation + * + * @dev: device handle + * @data: unused + * returns 0 if irq remapping is supported or -1 if not supported. + */ +static int vfio_msi_parent_irq_remapping_capable(struct device *dev, void *data) +{ + 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; + + return 0; +} + static int vfio_iommu_replay(struct vfio_iommu *iommu, struct vfio_domain *domain) { @@ -848,7 +875,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, irq_remapping; mutex_lock(&iommu->lock); @@ -871,6 +898,13 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, group->iommu_group = iommu_group; + /* + * Determine if all the devices of the group has an MSI-parent that + * supports irq remapping + */ + irq_remapping = !iommu_group_for_each_dev(iommu_group, &bus, + vfio_msi_parent_irq_remapping_capable); + /* Determine bus_type in order to allocate a domain */ ret = iommu_group_for_each_dev(iommu_group, &bus, vfio_bus_type); if (ret) @@ -899,7 +933,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, list_add(&group->next, &domain->group_list); if (!allow_unsafe_interrupts && - !iommu_capable(bus, IOMMU_CAP_INTR_REMAP)) { + (!iommu_capable(bus, IOMMU_CAP_INTR_REMAP) && !irq_remapping)) { 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;