Received-SPF: pass (google.com: domain of linux-kernel+bounces-200727-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Niklas Schnelle <schnelle@linux.ibm.com>
Date: Tue, 04 Jun 2024 15:38:39 +0200
Subject: [PATCH] PCI: Add missing lockdep assertion in
 pci_cfg_access_trylock()
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240604-pci_cfg_lockdep-v1-1-00da1706c9fd@linux.ibm.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
        Dan Williams <dan.j.williams@intel.com>,
        Dave Jiang <dave.jiang@intel.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
        Matthew Rosato <mjrosato@linux.ibm.com>,
        Niklas Schnelle <schnelle@linux.ibm.com>

In commit 7e89efc6e9e4 ("PCI: Lock upstream bridge for
pci_reset_function()") it was missed that pci_cfg_access_trylock() needs
the same lockdep assertion as pci_cfg_access_lock(). This leads to false
positive lockdep splats for users of pci_cfg_access_trylock(). Add the
missing assertion when the lock was successfully acquired.

Fixes: 7e89efc6e9e4 ("PCI: Lock upstream bridge for pci_reset_function()")
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
---
 drivers/pci/access.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 30f031de9cfe..5b6620da30d7 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -319,6 +319,8 @@ bool pci_cfg_access_trylock(struct pci_dev *dev)
 		dev->block_cfg_access = 1;
 	raw_spin_unlock_irqrestore(&pci_lock, flags);
 
+	if (locked)
+		lock_map_acquire(&dev->cfg_access_lock);
 	return locked;
 }
 EXPORT_SYMBOL_GPL(pci_cfg_access_trylock);

---
base-commit: c3f38fa61af77b49866b006939479069cd451173
change-id: 20240604-pci_cfg_lockdep-b6914e62d726

Best regards,
-- 
Niklas Schnelle