From patchwork Tue Mar 1 18:27:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 8468481 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 725EA9F38C for ; Tue, 1 Mar 2016 18:29:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B38420304 for ; Tue, 1 Mar 2016 18:29:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ECAA42017D for ; Tue, 1 Mar 2016 18:29:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753143AbcCAS3E (ORCPT ); Tue, 1 Mar 2016 13:29:04 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:33222 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753178AbcCAS3B (ORCPT ); Tue, 1 Mar 2016 13:29:01 -0500 Received: by mail-wm0-f47.google.com with SMTP id l68so48105323wml.0 for ; Tue, 01 Mar 2016 10:29:00 -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=n9wSKNogaJcXPkntCDKwbuuI+RAlcRNZmd8oiZfdi00=; b=P5IDjT8/3ztgFvqxpKsV4ymdKrsP635mkMdT8CLIcpKN3HwOnhYz8czoVhB0vb1vMi J+MzmgRErgbGCls/4bARvLz1WXZjt7NTMSlUHYBECp6agQgUUM0WCV1X8kPSQ5L7T/7M 9cbRD8zW10pKKrVF4xkUsyVbgXk5tRR5Uzj2E= 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=n9wSKNogaJcXPkntCDKwbuuI+RAlcRNZmd8oiZfdi00=; b=m3pZAUkifxvMbXFmdTmVeMxitLYf1unE8um3zcUE1oxcvZdzjzgOeDG3AMNz+cOqsM TZwEgotEKlJ1xvgYBSCnyfraM0kZLyZx/9gluTxaTJeXSVOmY+0+QCKzPWFdeU+n7NN5 PHwwIjNx3QfOrLPUjt1l4Yi+YeU8AgT6/oE7fRhs9ieHWszp9k6PHMHkbhw0uaI1cOlY 2ERkqrtEvdUtw06U60+2FCQ+7Ga5L7J6pzTVSJAIB3vFgqH62Baz3e1eFI68SXpt/C4M AAUCFdmOWbbkHcFSWIjJkv7Xy06Huz9rrpGoECsGnP/7/BkO+fjkdJ3EBOUSSjwkVK6D Xh+Q== X-Gm-Message-State: AD7BkJLVc9hslZjL7u0bGd5HPq7xIm0cpg1Awc9IcKC9iI6UnAzZDCsKQjnDkbKCti5BdIAd X-Received: by 10.28.189.67 with SMTP id n64mr504671wmf.24.1456856940285; Tue, 01 Mar 2016 10:29:00 -0800 (PST) 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 k8sm32176385wjr.38.2016.03.01.10.28.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Mar 2016 10:28:57 -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 v5 15/17] vfio/type1: also check IRQ remapping capability at msi domain Date: Tue, 1 Mar 2016 18:27:55 +0000 Message-Id: <1456856877-4817-16-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456856877-4817-1-git-send-email-eric.auger@linaro.org> References: <1456856877-4817-1-git-send-email-eric.auger@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 4e01ebe..88a40f1 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 " @@ -788,6 +790,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) { @@ -882,7 +911,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); @@ -905,6 +934,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) @@ -932,8 +968,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;