From patchwork Thu Apr 27 14:28:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 13225525 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A448CC77B61 for ; Thu, 27 Apr 2023 14:29:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243860AbjD0O3N (ORCPT ); Thu, 27 Apr 2023 10:29:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243466AbjD0O3M (ORCPT ); Thu, 27 Apr 2023 10:29:12 -0400 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 616CC1FE6; Thu, 27 Apr 2023 07:29:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1682605750; x=1714141750; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ds9/wjMM0PLi1AVS093HPsnv7S1iVHOpqdUFFwjwWNA=; b=aRDJnYIs6BSGz+H8xZcyZZW+5SgtWCavWxX0TtbX050+hrU1hUvGZXSN n1S6pkdxYbt/Bg8Z2ViIgTt0D7ls2ACf1PFdwCZ9EZJltoEUnRCVnKYRB gzq+8fAEh+X+lOj1V1HTtUWWyXBO5a9R/h+i2DbZN1y4GMKJA2Uudpiia Y2Uwpy4PY/+JINuLeYlt4e9X9ZQOJDPLAPXbDdPsoCegYviMOceilfRlq Sl/XjPRO2aIHAnf/d/qDBOHuKIAm4k+dB4n876lYojU0R5kNlYvgKatRk NeQnEW8i8go7IUX+ZPD2BEAYyb0rc12ggWridICIQufyXwhE7eGDE3H1y g==; X-IronPort-AV: E=Sophos;i="5.99,230,1677538800"; d="scan'208";a="30607876" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 27 Apr 2023 16:29:08 +0200 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Thu, 27 Apr 2023 16:29:08 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Thu, 27 Apr 2023 16:29:08 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1682605748; x=1714141748; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ds9/wjMM0PLi1AVS093HPsnv7S1iVHOpqdUFFwjwWNA=; b=Lf3pZ+ea6b614EGfAExzt9LtkoOJHhiswD3PWBQSZsIWGv6tfZ3/6qGL 0TYgZNuEHS3HTdLWRf2culOpckhf/koWsgPgI+61NM2W0TGaMuq4WwCQT BkWkhyXcSg2oBwabsaTSgM9DOhNFQ10C/rdYX97w1jL2wpw9Jt/dBeAhG r/u5e0o7WGfq+QqL7vNXkpNRvMdwC17/GbzYes8o4NNjBxjIMoRmRxiRV Ue0p9GTLypeKWc2LUKfzdDIsAzcLJKrW19YTmPgQ5wuvPJEAToMkWw6JG OUw+cAapmw8Jk795tka/sLi8oeCh0RplRg9b2LXtX8pQbwBZETqO9e6E0 Q==; X-IronPort-AV: E=Sophos;i="5.99,230,1677538800"; d="scan'208";a="30607874" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 27 Apr 2023 16:29:08 +0200 Received: from steina-w.tq-net.de (unknown [10.123.53.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 44DD7280072; Thu, 27 Apr 2023 16:29:08 +0200 (CEST) From: Alexander Stein To: Bjorn Helgaas Cc: Alexander Stein , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Korneliusz Osmenda , Oliver Neukum Subject: [PATCH 1/3] PCI/sysfs: sort headers alphabetically Date: Thu, 27 Apr 2023 16:28:59 +0200 Message-Id: <20230427142901.3570536-2-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230427142901.3570536-1-alexander.stein@ew.tq-group.com> References: <20230427142901.3570536-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The includes were not sorted alphabetically. Sorts them properly. Signed-off-by: Alexander Stein --- drivers/pci/pci-sysfs.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index ab32a91f287b..289c1c17b41f 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -13,22 +13,22 @@ */ -#include -#include -#include -#include +#include +#include #include -#include -#include #include -#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include #include -#include -#include -#include -#include #include "pci.h" static int sysfs_initialized; /* = 0 */ From patchwork Thu Apr 27 14:29:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 13225527 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18486C77B61 for ; Thu, 27 Apr 2023 14:29:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244070AbjD0O3Q (ORCPT ); Thu, 27 Apr 2023 10:29:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243792AbjD0O3P (ORCPT ); Thu, 27 Apr 2023 10:29:15 -0400 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6E521FE6; Thu, 27 Apr 2023 07:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1682605754; x=1714141754; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vJflgAPzg8RDVjQuBtT2lckjqglKouKkXFWqrky4874=; b=lNSX9/k5JwXMkTeJ69tJQheMy9gG3OAvcpf6TySB/PAWGke1awr9fIBG MSmS6JcNiyCxaL6eHBxyZIAkkoLU1Ifws2yhX2X/ji7LVWLluDgD9SQGV 5DLldgAc6jeM7mOM2I8BsC1uJcjnwj3CN+/oxbe/ZyAWXedtrFUY+irjM 4BN4Ui4EcmTWdpXMJZ/wCwpX7NklNt944XyEagOCIJxBcXPI9gahPZWgM 74rDtdyxTJ0oMObAJh2XaYBmM375EIxvSAMI8faUuWJvf2bh+EfGByhyu M0xNl7kJe2fRUrX7KUEe/ULNkqnt0qAl0WPNmmPe2kSk4dlDTBqet//70 A==; X-IronPort-AV: E=Sophos;i="5.99,230,1677538800"; d="scan'208";a="30607878" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 27 Apr 2023 16:29:08 +0200 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Thu, 27 Apr 2023 16:29:08 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Thu, 27 Apr 2023 16:29:08 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1682605748; x=1714141748; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vJflgAPzg8RDVjQuBtT2lckjqglKouKkXFWqrky4874=; b=az0+pLIQtDltHklgOlpPW/vYzuzilM5OvJaA8lhubHdk2XIDm7hSfLFR YEYFOifqAoVpR44WpCzIuduLURIqSqMqVsaZq8WmngcguuhkSqW1shGUK bVrUNq91XnGGtFZY800VnNbee+JYG7nVwKsgNd7XnBMnKlEfHgZrH9njk yGp7q56irFhF3R3TxGiKBv2RnqqNXAnRbKAMa3XbL2n8Q0dC7a8uNTaC8 XWE1AJkISc2mZZZsrCWJhSx/7/zAFzFUtfeN74RCfkfJoUErwm0s81RmU wd9xIvhD0yiIvWo1T14QsWCMz5gKZpk1ImAtPUi6Y/esyqKi8LIIgF/0z A==; X-IronPort-AV: E=Sophos;i="5.99,230,1677538800"; d="scan'208";a="30607877" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 27 Apr 2023 16:29:08 +0200 Received: from steina-w.tq-net.de (unknown [10.123.53.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 67CE1280073; Thu, 27 Apr 2023 16:29:08 +0200 (CEST) From: Alexander Stein To: Bjorn Helgaas Cc: Alexander Stein , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Korneliusz Osmenda , Oliver Neukum Subject: [PATCH 2/3] PCI/sysfs: create private functions for pci_create_legacy_files/pci_create_sysfs_dev_files Date: Thu, 27 Apr 2023 16:29:00 +0200 Message-Id: <20230427142901.3570536-3-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230427142901.3570536-1-alexander.stein@ew.tq-group.com> References: <20230427142901.3570536-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org The only difference is they don't have the check against sysfs_initialized. This is a preparation for the sysfs init race condition fix. No functional change intended. Signed-off-by: Alexander Stein --- drivers/pci/pci-sysfs.c | 44 ++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 289c1c17b41f..7d4733773633 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -938,24 +938,10 @@ void __weak pci_adjust_legacy_attr(struct pci_bus *b, { } -/** - * pci_create_legacy_files - create legacy I/O port and memory files - * @b: bus to create files under - * - * Some platforms allow access to legacy I/O port and ISA memory space on - * a per-bus basis. This routine creates the files and ties them into - * their associated read, write and mmap files from pci-sysfs.c - * - * On error unwind, but don't propagate the error to the caller - * as it is ok to set up the PCI bus without these files. - */ -void pci_create_legacy_files(struct pci_bus *b) +static void __pci_create_legacy_files(struct pci_bus *b) { int error; - if (!sysfs_initialized) - return; - b->legacy_io = kcalloc(2, sizeof(struct bin_attribute), GFP_ATOMIC); if (!b->legacy_io) @@ -998,6 +984,25 @@ void pci_create_legacy_files(struct pci_bus *b) dev_warn(&b->dev, "could not create legacy I/O port and ISA memory resources in sysfs\n"); } +/** + * pci_create_legacy_files - create legacy I/O port and memory files + * @b: bus to create files under + * + * Some platforms allow access to legacy I/O port and ISA memory space on + * a per-bus basis. This routine creates the files and ties them into + * their associated read, write and mmap files from pci-sysfs.c + * + * On error unwind, but don't propagate the error to the caller + * as it is ok to set up the PCI bus without these files. + */ +void pci_create_legacy_files(struct pci_bus *b) +{ + if (!sysfs_initialized) + return; + + __pci_create_legacy_files(b); +} + void pci_remove_legacy_files(struct pci_bus *b) { if (b->legacy_io) { @@ -1006,6 +1011,8 @@ void pci_remove_legacy_files(struct pci_bus *b) kfree(b->legacy_io); /* both are allocated here */ } } +#else +static void __pci_create_legacy_files(struct pci_bus *b) {} #endif /* HAVE_PCI_LEGACY */ #if defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) @@ -1492,12 +1499,17 @@ static const struct attribute_group pci_dev_resource_resize_group = { .is_visible = resource_resize_is_visible, }; +int __must_check __pci_create_sysfs_dev_files(struct pci_dev *pdev) +{ + return pci_create_resource_files(pdev); +} + int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev) { if (!sysfs_initialized) return -EACCES; - return pci_create_resource_files(pdev); + return __pci_create_sysfs_dev_files(pdev); } /** From patchwork Thu Apr 27 14:29:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 13225528 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08DACC77B7F for ; Thu, 27 Apr 2023 14:29:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244073AbjD0O3R (ORCPT ); Thu, 27 Apr 2023 10:29:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244069AbjD0O3Q (ORCPT ); Thu, 27 Apr 2023 10:29:16 -0400 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D30030D6; Thu, 27 Apr 2023 07:29:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1682605754; x=1714141754; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tCtpg2kzjPTTO6+C2f0a+KHi0QEOneW24SbJ2emNudM=; b=KuRJGzx8lV/sjwNP8LiRfyjcPYIr/uzas9q7X5CR1JLofBbzBeht2++J dWTwnz05ekqzDhTnbBuSZjciM9HdogMDwhebauSSGYwr7CoYj/+xs+EwU vAmunHg151Xw19B8ekWqdWISH8fRus9yC0BBHNAZ6gWgWlawHOMh9+wou Zvx4kohor+ahPXXrshk4uhHqizqsvq/3LctRlS//CKqW3Yys22SQ54v0g X4hYcXrjtO8V/0cfEIkILvUQCe7DjWoS0zY/qDqRhGPJxLbNaAf86Q2Yq x8DRawIcIO4bIe0LdjRWCD5beb8JK2kUktzWXM3fqccy6/nXfCmJZTntN w==; X-IronPort-AV: E=Sophos;i="5.99,230,1677538800"; d="scan'208";a="30607880" Received: from unknown (HELO tq-pgp-pr1.tq-net.de) ([192.168.6.15]) by mx1-pgp.tq-group.com with ESMTP; 27 Apr 2023 16:29:08 +0200 Received: from mx1.tq-group.com ([192.168.6.7]) by tq-pgp-pr1.tq-net.de (PGP Universal service); Thu, 27 Apr 2023 16:29:08 +0200 X-PGP-Universal: processed; by tq-pgp-pr1.tq-net.de on Thu, 27 Apr 2023 16:29:08 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1682605748; x=1714141748; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tCtpg2kzjPTTO6+C2f0a+KHi0QEOneW24SbJ2emNudM=; b=L/YQ/vITar0NtqrbWXl/dzAKUrkYB78hr85SoNiuvkk2LgBeuBaxjq3O pHNBG/UPBA9e8J04M99Bs7W5MlpYEsSRbG8ULCnbGJzbrIGikXukmOuxn PP9mwMOAK42eLIvERYXunEQSUmUkyC+2zfc/WvR/34Yj1Ij6HfYNZ4WcV xTrRtb7ry/xPoOb1FeNX/eSKgI0yqMSUqUgphI9qUkhHzzSIhwDIXokM+ HdH+JEHvMZ8LxjAlN/OanFNsvnEEpVUpfXEAucSY+32nZXF3BOX9kB6zW XyfrVpykrcgsgVXO45fycQS405a5/4PsOxne+Hem5lgcBnZjQ/h9+fGfO Q==; X-IronPort-AV: E=Sophos;i="5.99,230,1677538800"; d="scan'208";a="30607879" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 27 Apr 2023 16:29:08 +0200 Received: from steina-w.tq-net.de (unknown [10.123.53.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by vtuxmail01.tq-net.de (Postfix) with ESMTPSA id 8F0A1280056; Thu, 27 Apr 2023 16:29:08 +0200 (CEST) From: Alexander Stein To: Bjorn Helgaas Cc: Alexander Stein , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Korneliusz Osmenda , Oliver Neukum Subject: [PATCH 3/3] PCI/sysfs: Fix sysfs init race condition Date: Thu, 27 Apr 2023 16:29:01 +0200 Message-Id: <20230427142901.3570536-4-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230427142901.3570536-1-alexander.stein@ew.tq-group.com> References: <20230427142901.3570536-1-alexander.stein@ew.tq-group.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org sysfs attribute files for PCIe devices (pci_create_sysfs_dev_files) can be created by two paths: 1. pci_sysfs_init() 2. pci_bus_add_device() (drivers/pci/bus.c) There is a race during startup where an asynchronous PCIe host probe races against the pci_sysfs_init() late_initcall. In this case the PCIe devices are already added to the bus, for_each_pci_dev() will see them, but pci_bus_add_device() has not yet finished, so both code paths try to add the sysfs attributes. Fix this by waiting on a workqueue until sysfs has been initialized. pci_sysfs_init() needs the internal function without the check that sysfs_initialized has been set to 1. __pci_create_sysfs_dev_files still needs to remove resource files, which might have been created during pci_sysfs_init initcall. Signed-off-by: Alexander Stein --- drivers/pci/pci-sysfs.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 7d4733773633..3067d55f981c 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -29,9 +29,11 @@ #include #include #include +#include #include "pci.h" static int sysfs_initialized; /* = 0 */ +static DECLARE_WAIT_QUEUE_HEAD(sysfs_wq); /* show configuration fields */ #define pci_config_attr(field, format_string) \ @@ -997,8 +999,7 @@ static void __pci_create_legacy_files(struct pci_bus *b) */ void pci_create_legacy_files(struct pci_bus *b) { - if (!sysfs_initialized) - return; + wait_event(sysfs_wq, sysfs_initialized); __pci_create_legacy_files(b); } @@ -1501,13 +1502,18 @@ static const struct attribute_group pci_dev_resource_resize_group = { int __must_check __pci_create_sysfs_dev_files(struct pci_dev *pdev) { + /* + * sysfs attributes might already be created by pci_sysfs_init(), + * delete them here just in case + */ + pci_remove_resource_files(pdev); return pci_create_resource_files(pdev); } int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev) { - if (!sysfs_initialized) - return -EACCES; + /* Wait until sysfs has been initialized */ + wait_event(sysfs_wq, sysfs_initialized); return __pci_create_sysfs_dev_files(pdev); } @@ -1520,8 +1526,8 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev) */ void pci_remove_sysfs_dev_files(struct pci_dev *pdev) { - if (!sysfs_initialized) - return; + /* Wait until sysfs has been initialized */ + wait_event(sysfs_wq, sysfs_initialized); pci_remove_resource_files(pdev); } @@ -1532,9 +1538,8 @@ static int __init pci_sysfs_init(void) struct pci_bus *pbus = NULL; int retval; - sysfs_initialized = 1; for_each_pci_dev(pdev) { - retval = pci_create_sysfs_dev_files(pdev); + retval = __pci_create_sysfs_dev_files(pdev); if (retval) { pci_dev_put(pdev); return retval; @@ -1542,7 +1547,9 @@ static int __init pci_sysfs_init(void) } while ((pbus = pci_find_next_bus(pbus))) - pci_create_legacy_files(pbus); + __pci_create_legacy_files(pbus); + sysfs_initialized = 1; + wake_up_all(&sysfs_wq); return 0; }