From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92047C2D0DF for ; Wed, 1 Jan 2020 05:37:05 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 71E912072C for ; Wed, 1 Jan 2020 05:37:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 71E912072C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 55DED889F7; Wed, 1 Jan 2020 05:37:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vfFC5veRwy4e; Wed, 1 Jan 2020 05:37:03 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0BDD588A06; Wed, 1 Jan 2020 05:37:03 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id EF31CC1D87; Wed, 1 Jan 2020 05:37:02 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 909D8C18DC for ; Wed, 1 Jan 2020 05:28:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7FD6888799 for ; Wed, 1 Jan 2020 05:28:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KL8bywTQgZqL for ; Wed, 1 Jan 2020 05:28:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 88B108872B for ; Wed, 1 Jan 2020 05:28:25 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Dec 2019 21:28:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,382,1571727600"; d="scan'208";a="244319515" Received: from allen-box.sh.intel.com ([10.239.159.136]) by fmsmga004.fm.intel.com with ESMTP; 31 Dec 2019 21:28:23 -0800 From: Lu Baolu To: Joerg Roedel , Greg Kroah-Hartman , Bjorn Helgaas Subject: [RFC PATCH 2/4] PCI: Add "pci=iommu_passthrough=" parameter for iommu passthrough Date: Wed, 1 Jan 2020 13:26:46 +0800 Message-Id: <20200101052648.14295-3-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200101052648.14295-1-baolu.lu@linux.intel.com> References: <20200101052648.14295-1-baolu.lu@linux.intel.com> Cc: kevin.tian@intel.com, ashok.raj@intel.com, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, jacob.jun.pan@intel.com, Robin Murphy , Christoph Hellwig X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" The new parameter takes a list of devices separated by a semicolon. Each device specified will have its iommu_passthrough bit in struct device set. This is very similar to the existing 'disable_acs_redir' parameter. Signed-off-by: Lu Baolu --- .../admin-guide/kernel-parameters.txt | 5 +++ drivers/pci/pci.c | 34 +++++++++++++++++++ drivers/pci/pci.h | 1 + drivers/pci/probe.c | 2 ++ 4 files changed, 42 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index ade4e6ec23e0..d3edc2cb6696 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3583,6 +3583,11 @@ may put more devices in an IOMMU group. force_floating [S390] Force usage of floating interrupts. nomio [S390] Do not use MIO instructions. + iommu_passthrough=[; ...] + Specify one or more PCI devices (in the format + specified above) separated by semicolons. + Each device specified will bypass IOMMU DMA + translation. pcie_aspm= [PCIE] Forcibly enable or disable PCIe Active State Power Management. diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 90dbd7c70371..05bf3f4acc36 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -6401,6 +6401,37 @@ void __weak pci_fixup_cardbus(struct pci_bus *bus) } EXPORT_SYMBOL(pci_fixup_cardbus); +static const char *iommu_passthrough_param; +bool pci_iommu_passthrough_match(struct pci_dev *dev) +{ + int ret = 0; + const char *p = iommu_passthrough_param; + + if (!p) + return false; + + while (*p) { + ret = pci_dev_str_match(dev, p, &p); + if (ret < 0) { + pr_info_once("PCI: Can't parse iommu_passthrough parameter: %s\n", + iommu_passthrough_param); + + break; + } else if (ret == 1) { + pci_info(dev, "PCI: IOMMU passthrough\n"); + return true; + } + + if (*p != ';' && *p != ',') { + /* End of param or invalid format */ + break; + } + p++; + } + + return false; +} + static int __init pci_setup(char *str) { while (str) { @@ -6462,6 +6493,8 @@ static int __init pci_setup(char *str) pci_add_flags(PCI_SCAN_ALL_PCIE_DEVS); } else if (!strncmp(str, "disable_acs_redir=", 18)) { disable_acs_redir_param = str + 18; + } else if (!strncmp(str, "iommu_passthrough=", 18)) { + iommu_passthrough_param = str + 18; } else { pr_err("PCI: Unknown option `%s'\n", str); } @@ -6486,6 +6519,7 @@ static int __init pci_realloc_setup_params(void) resource_alignment_param = kstrdup(resource_alignment_param, GFP_KERNEL); disable_acs_redir_param = kstrdup(disable_acs_redir_param, GFP_KERNEL); + iommu_passthrough_param = kstrdup(iommu_passthrough_param, GFP_KERNEL); return 0; } diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index a0a53bd05a0b..95f6af06aba6 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -288,6 +288,7 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev); void pci_disable_bridge_window(struct pci_dev *dev); struct pci_bus *pci_bus_get(struct pci_bus *bus); void pci_bus_put(struct pci_bus *bus); +bool pci_iommu_passthrough_match(struct pci_dev *dev); /* PCIe link information */ #define PCIE_SPEED2STR(speed) \ diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 512cb4312ddd..4c571ee75621 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2404,6 +2404,8 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) dev->state_saved = false; + dev->dev.iommu_passthrough = pci_iommu_passthrough_match(dev); + pci_init_capabilities(dev); /* -- 2.17.1 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu