From patchwork Fri Jun 26 00:27:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 11626403 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6D19C6C1 for ; Fri, 26 Jun 2020 00:27:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 53CFB20767 for ; Fri, 26 Jun 2020 00:27:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="gsWwDuEW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725876AbgFZA1R (ORCPT ); Thu, 25 Jun 2020 20:27:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725816AbgFZA1Q (ORCPT ); Thu, 25 Jun 2020 20:27:16 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DDFBC08C5DB for ; Thu, 25 Jun 2020 17:27:16 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id p22so7826350ybg.21 for ; Thu, 25 Jun 2020 17:27:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=iv7sfYwPBb+T3sh9Tm/gYiOZsGJSNCHeo7sHuB/mAjU=; b=gsWwDuEWxxXpafc13YiTJ2OicmolQf5h7KB/1owTbiu6Ee1j93pn2eUyAh2einvluw E8nZ02G/7r07CFhIK5dPv0ZlK2iUzky20NJwNJzL3BmkInHkfTJUi0whj4v7SeoBFp3g L/3uvCEgLYksFm2o4W1T7X4v2l1c/6dVt1wvCZUbCr3HPRrMHD/Wx73XJpbZlJYqrhpV KaBzdZ96OBEfsKzgIwFT42MUz/2ka3sVvK4ATXx/XlaVPmoIodvUZOQza8cC5ubLjNIz E74HpampI/OVzg9d/tQFsKbYUOV6dBx9FZXpN2zmmaEvoJ5q72zzytovyjewoIGXtbDl naBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=iv7sfYwPBb+T3sh9Tm/gYiOZsGJSNCHeo7sHuB/mAjU=; b=B6Qhckv5mf8z/qXAAmqjviG+OVOYu5e1TbbIjZHzXyv+Ok44S+SBm99J588PKNYpUo 9ld88IRFVS3IFe/r8XTgZTnUoYQdvM9DPVxn+f/l/TeUp7GoYamz8CLD537knFUIOhWv ANSIRwd92J/IVHw/fL+AX3TM7wL4jBLSnVxFHsC0kBaNwATaCDz9MqfVjHF+3wOcYHHc YOe6N//L2umeEqrSJvAKMl8fZw1ZTAarDAmsaKrg1O/USeOCnjwoKW5PyyErj7+JX3gg gaTiz0E78J2klyFsG1hVs88Myyylg5PamBADuX6FUL/kNm+ra8ixp97ma78lOreIgsuF 0ijw== X-Gm-Message-State: AOAM532dFCdxPSZ17QUdD9DjZqlytgyRvMa+zfXnBbUMp/i5wDo4awCr Qh5CwP8xMbUzGbNggMhuFQQYv7r7yVTR X-Google-Smtp-Source: ABdhPJyJZ32y84BWOCzPlXnj6DBPie+kwwNvt36mcjomQYjcSGXpCQX3nGJKpsx74v22jf/R8UEafr0WqCf3 X-Received: by 2002:a25:aaa9:: with SMTP id t38mr763977ybi.312.1593131235516; Thu, 25 Jun 2020 17:27:15 -0700 (PDT) Date: Thu, 25 Jun 2020 17:27:09 -0700 Message-Id: <20200626002710.110200-1-rajatja@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog Subject: [PATCH 1/2] pci: Add pci device even if the driver failed to attach From: Rajat Jain To: David Woodhouse , Lu Baolu , Joerg Roedel , Bjorn Helgaas , "Rafael J. Wysocki" , Len Brown , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, Raj Ashok , lalithambika.krishnakumar@intel.com, Mika Westerberg , Jean-Philippe Brucker , Prashant Malani , Benson Leung , Todd Broch , Alex Levin , Mattias Nissler , Rajat Jain , Bernie Keany , Aaron Durbin , Diego Rivas , Duncan Laurie , Furquan Shaikh , Jesse Barnes , Christian Kellner , Alex Williamson , Greg Kroah-Hartman , oohall@gmail.com Cc: Rajat Jain Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org device_attach() returning failure indicates a driver error while trying to probe the device. In such a scenario, the PCI device should still be added in the system and be visible to the user. This patch partially reverts: commit ab1a187bba5c ("PCI: Check device_attach() return value always") Signed-off-by: Rajat Jain Reviewed-by: Greg Kroah-Hartman --- drivers/pci/bus.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 8e40b3e6da77d..3cef835b375fd 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -322,12 +322,8 @@ void pci_bus_add_device(struct pci_dev *dev) dev->match_driver = true; retval = device_attach(&dev->dev); - if (retval < 0 && retval != -EPROBE_DEFER) { + if (retval < 0 && retval != -EPROBE_DEFER) pci_warn(dev, "device attach failed (%d)\n", retval); - pci_proc_detach_device(dev); - pci_remove_sysfs_dev_files(dev); - return; - } pci_dev_assign_added(dev, true); } From patchwork Fri Jun 26 00:27:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rajat Jain X-Patchwork-Id: 11626405 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8E6D0138C for ; Fri, 26 Jun 2020 00:27:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 719F820767 for ; Fri, 26 Jun 2020 00:27:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="paDQtPIb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726106AbgFZA1V (ORCPT ); Thu, 25 Jun 2020 20:27:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725821AbgFZA1U (ORCPT ); Thu, 25 Jun 2020 20:27:20 -0400 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F1C9C08C5DC for ; Thu, 25 Jun 2020 17:27:20 -0700 (PDT) Received: by mail-pl1-x649.google.com with SMTP id x8so4803122pll.19 for ; Thu, 25 Jun 2020 17:27:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=EfF/SDXieMxdBzzRNR3vjXRP9ELsApXSIPoFiYsV8L8=; b=paDQtPIbzZ2WSuFquOtQehWbSHMmSB+a126xQsSFdnJ+LWvXx9zh3xoaXaxtDIWPS1 aj+RavY/oV4sdZMGj+JxuTxWLKrxKs/vuctrDwS3ssgObe36pmdICn64FKPmAyRHjxwe XtehEjQ0v87qVFGKmNVDHwVMoI5Pn9GxvrlDvItnji8r2/359JdayOqIPyCmWStKA9+v 5bmemCJMXczy9khjne/ZecgDVafiUFo3pgwAosZuPIctUt449NK/rI3VYJ1hM3BWMdSf CUP5JOLmNVSWSZ/xqN/vEyuLzjYjfWCuHZX6swe8v49YWnPDTEIbd5ny/cAj9qxjVpkU YbuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=EfF/SDXieMxdBzzRNR3vjXRP9ELsApXSIPoFiYsV8L8=; b=J1KLckg278u6K6vbL34prGTDSOnGoh4ggAaWx4VNYijtfIK0NPhKaHuvA2v0IKt4VK qAcRvsQN92lVigODKYkwPsqTmOlrqNV97LXyBH69yWArS79pNZMnZfV2O78rqADtKIpO h4dhJVgExtlIySd8v8/1VQkg9x9375YzdpgbUpX6OacPRYGXJ4nANhcJjxRJlVwsewej GILBFi4AZTWHr5AAcFc0ghvVp+yKLwNqyScf2Ns+4v449bLadYtqTV1qmi64vGC3S/06 m4N5hfh/OMTtYEJCM4nn0nDaATcT+yVwmDi7Hao+qsQFKMq24bYk+FfbvIeEHXbDYsl3 FHuQ== X-Gm-Message-State: AOAM5323qBGYSgEOgvFbECVCYQasqpUEClLrO7LN0A8tEiGO0pMVG7dI aSuuKRrnBqu5yyZTPxM3qYnKB5nKHBx0 X-Google-Smtp-Source: ABdhPJyg+Tx781kWCf0f1ygzfZiFbsIs8XO5OHEWZ3G9zVxZL03LpMQELqZK3FRDzjGcWC5sc5IvuWvWCLEp X-Received: by 2002:a17:90a:6343:: with SMTP id v3mr611640pjs.196.1593131239458; Thu, 25 Jun 2020 17:27:19 -0700 (PDT) Date: Thu, 25 Jun 2020 17:27:10 -0700 In-Reply-To: <20200626002710.110200-1-rajatja@google.com> Message-Id: <20200626002710.110200-2-rajatja@google.com> Mime-Version: 1.0 References: <20200626002710.110200-1-rajatja@google.com> X-Mailer: git-send-email 2.27.0.212.ge8ba1cc988-goog Subject: [PATCH 2/2] pci: Add parameter to disable attaching untrusted devices From: Rajat Jain To: David Woodhouse , Lu Baolu , Joerg Roedel , Bjorn Helgaas , "Rafael J. Wysocki" , Len Brown , iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, Raj Ashok , lalithambika.krishnakumar@intel.com, Mika Westerberg , Jean-Philippe Brucker , Prashant Malani , Benson Leung , Todd Broch , Alex Levin , Mattias Nissler , Rajat Jain , Bernie Keany , Aaron Durbin , Diego Rivas , Duncan Laurie , Furquan Shaikh , Jesse Barnes , Christian Kellner , Alex Williamson , Greg Kroah-Hartman , oohall@gmail.com Cc: Rajat Jain Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Introduce a PCI parameter that disables the automatic attachment of untrusted devices to their drivers. Signed-off-by: Rajat Jain --- Context: I set out to implement the approach outlined in https://lkml.org/lkml/2020/6/9/1331 https://lkml.org/lkml/2020/6/15/1453 But to my surprise, I found that the new hotplugged PCI devices were getting automatically attached to drivers even though /sys/bus/pci/drivers_autoprobe was set to 0. I realized that the device core's "drivers_autoprobe": * only disables the *initial* probe of the device (i.e. from device_add()). If a subsystem calls device_attach() explicitly for its devices like PCI subsystem does, the drivers_autoprobe setting does not matter. The core will attach device to the driver. This looks like correct semantic behavior to me because PCI is explicitly calling device_attach(), which is a way to explicitly ask the core to find and attach a driver for a device. * "drivers_autoprobe" cannot be controlled at boot time (to restrict any drivers before userspace comes up). The options I considered were: 1) Change device_attach() so that it takes into consideration the drivers_autoprobe property. Not sure if this is semantically correct thing to do though. If I do this, then the only way a driver can be attached to the drivers would be via userspace (/sys/bus/pci/drivers/bind) (Good for our use case though!). 2) Make the drivers_autoprobe property available to PCI to use (currently it is private to device core). The PCI could use this to determine whether or not to call device_attach(). This still leaves the other problem (of not being able to set drivers_autoprobe via command line open). 3) I found the pci_dev->match_driver, which seemed similar to what I am trying to do, but can't be controlled from userspace. I considered populating that field based on drivers_autoprobe (still need (2)). But the problem is that there is the AMD IOMMU driver which is setting this independently, so setting the match_driver based on drivers_autoprobe may not be a good idea. May be we can populate it for untrusted devicesi, based on the parameter that I'm introducing? 4) This patch was my option 4 that helps fix both the problems for me. drivers/pci/bus.c | 11 ++++++++--- drivers/pci/pci.c | 9 +++++++++ drivers/pci/pci.h | 1 + 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 3cef835b375fd..336aeeb4c4ebf 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c @@ -321,9 +321,14 @@ void pci_bus_add_device(struct pci_dev *dev) pci_bridge_d3_update(dev); dev->match_driver = true; - retval = device_attach(&dev->dev); - if (retval < 0 && retval != -EPROBE_DEFER) - pci_warn(dev, "device attach failed (%d)\n", retval); + + if (dev->untrusted && pci_dont_attach_untrusted_devs) { + pci_info(dev, "not attaching untrusted device\n"); + } else { + retval = device_attach(&dev->dev); + if (retval < 0 && retval != -EPROBE_DEFER) + pci_warn(dev, "device attach failed (%d)\n", retval); + } pci_dev_assign_added(dev, true); } diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index ce096272f52b1..dec1f9ef27d71 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -127,6 +127,13 @@ static bool pcie_ats_disabled; /* If set, the PCI config space of each device is printed during boot. */ bool pci_early_dump; +/* + * If set, the devices with "untrusted" flag shall not be attached automatically + * Userspace will need to attach them manually: + * echo > /sys/bus/pci/drivers//bind + */ +bool pci_dont_attach_untrusted_devs; + bool pci_ats_disabled(void) { return pcie_ats_disabled; @@ -6522,6 +6529,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 (!strcmp(str, "dont_attach_untrusted_devs")) { + pci_dont_attach_untrusted_devs = true; } else { pr_err("PCI: Unknown option `%s'\n", str); } diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 6d3f758671064..30ffad047d926 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -13,6 +13,7 @@ extern const unsigned char pcie_link_speed[]; extern bool pci_early_dump; +extern bool pci_dont_attach_untrusted_devs; bool pcie_cap_has_lnkctl(const struct pci_dev *dev); bool pcie_cap_has_rtctl(const struct pci_dev *dev);