Message ID | 20231114135553.32301-7-johan+linaro@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1874267vqg; Tue, 14 Nov 2023 05:57:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IHTGbHfardWXn/wd7sTVpwJ75Sk8pJ7m1B0IYwXyRDzlPDpfK+iqFgIyM3B+woUTVFK0joh X-Received: by 2002:a05:6a20:1601:b0:187:449d:a4cd with SMTP id l1-20020a056a20160100b00187449da4cdmr78750pzj.27.1699970248535; Tue, 14 Nov 2023 05:57:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699970248; cv=none; d=google.com; s=arc-20160816; b=B2vZiZDyNSCVu0WJr3kDf8piabXB3Y0m837wYCjLpTQtbmqyt6ieG2TIGwYVBmFom8 uTOGBRcSebKL8ujesgYzJbQG1GmlNgHPunqCzuQN9FH2wbPJTcmQYQJ3ENoiQmIZ9l7B /4Q0TWTbC3tBim8z6L/Olyf/cOjELIvAIVfJlVfDuBcr/yBEC8cfc2fr7MkTuR4MihPg l1uzKoubLhvAE2XbEdv/oAi3Zb+4+BaXQEGpzJbUUd1M2KSKZ7OnqMYt3DsQpdRgBAcS oHk9v3WV5DxQTX0KSyLDemAHiHupqBiohiTc3++4ERQBi+i0rN3pOf8/FaHyYARhO4rX 6fzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=N1KJ43xgV7kXXTwaGDM7hXEQfqgIFHK5pOQWP596VZk=; fh=+l5nuMYZGgX4mkGKX/kANxC8looYmFXq90w07M/6BcI=; b=YZYo5vjR5GYvTbBf7OqmOsfcZa9ci77sHqQatB5qjo/Gf5nx3p2sc3VVnR4t1SsFMR wi17/8FPvX2QxIBArhM7Z0c++YI2KkKVBZXGme7o4sw4n13n23CMscTRA268UYN+/ycG 4XbrW0PprhIyG1fqO8a91r4QdYAehvDQLNyleeVds6jsjibzkGvYaJTqAIxUu7Ok5YlH yM6Mwn6xHVYrSIgTE1NA1AJUzVDOTQ0NqjoWLkzRzLyZqKY/gRafXHd3rAvWX6dj15YR Ad5AzyCsbJ/S8JtIxnoU0v3Kl1LLq+T6BSB0jrq+hkeoJ1CztxcP5n6UBheOOBp59mMc 35Og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SeWpsd+8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id x26-20020a056a000bda00b006c3182d2a84si7477665pfu.322.2023.11.14.05.57.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 05:57:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=SeWpsd+8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id C1B81804E79D; Tue, 14 Nov 2023 05:56:52 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233228AbjKNN4q (ORCPT <rfc822;lhua1029@gmail.com> + 29 others); Tue, 14 Nov 2023 08:56:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231935AbjKNN4j (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 14 Nov 2023 08:56:39 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 359F7D51; Tue, 14 Nov 2023 05:56:34 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C2E42C43391; Tue, 14 Nov 2023 13:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699970193; bh=IyFpJ4IPW+04Qg7uetnTuAVDseZG4Zu5u7tnsvS+xhA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SeWpsd+8blmriSQBMZBlDg9HTiPOqC/TQjd6pKDcunLzqR3jShDyFDuVGX3o+W+XL Qoas/TI4ZoSf+VvVCy+P07qZYXvxi7ChCBAtOpvPnbQinxnLfLcuAuTbeAOpTkbOuQ i8wswos2HLxVIWnBf2h2TXvEL8GoEUBo47tOC/L2ugI/3E+n7o+q+N5+mqYJOBpgnY +UpX+ekmhHjqTIQDRuTjxbdrsokfqOrV5SdFdKfOzRvpTLvEMGsBjJM6Ns/kuFAArc PpdVsvyLFgEZJ1jFRzTWNb0rwCc82mDHeIZ806JJ3F+rGx/KyHm+KiumEl5rD92iFh couZyIiRK1mWQ== Received: from johan by xi.lan with local (Exim 4.96.2) (envelope-from <johan+linaro@kernel.org>) id 1r2tu3-0008PZ-0I; Tue, 14 Nov 2023 14:56:31 +0100 From: Johan Hovold <johan+linaro@kernel.org> To: Lorenzo Pieralisi <lpieralisi@kernel.org>, =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= <kw@linux.com>, Bjorn Helgaas <bhelgaas@google.com> Cc: Andy Gross <agross@kernel.org>, Bjorn Andersson <andersson@kernel.org>, Konrad Dybcio <konrad.dybcio@linaro.org>, Manivannan Sadhasivam <mani@kernel.org>, Rob Herring <robh@kernel.org>, Nirmal Patel <nirmal.patel@linux.intel.com>, Jonathan Derrick <jonathan.derrick@linux.dev>, linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold <johan+linaro@kernel.org> Subject: [PATCH 6/6] PCI/ASPM: Add lockdep assert to link state helper Date: Tue, 14 Nov 2023 14:55:53 +0100 Message-ID: <20231114135553.32301-7-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231114135553.32301-1-johan+linaro@kernel.org> References: <20231114135553.32301-1-johan+linaro@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Tue, 14 Nov 2023 05:56:52 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782548002991649507 X-GMAIL-MSGID: 1782548002991649507 |
Series |
PCI: Fix deadlocks when enabling ASPM
|
|
Commit Message
Johan Hovold
Nov. 14, 2023, 1:55 p.m. UTC
Add a lockdep assert to the locked disable link state helper which
should only be called with a pci_bus_sem read lock held.
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
drivers/pci/pcie/aspm.c | 2 ++
1 file changed, 2 insertions(+)
Comments
On Tue, Nov 14, 2023 at 02:55:53PM +0100, Johan Hovold wrote: > Add a lockdep assert to the locked disable link state helper which > should only be called with a pci_bus_sem read lock held. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - Mani > --- > drivers/pci/pcie/aspm.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c > index 19b7256d2dc9..ef2e7a186f57 100644 > --- a/drivers/pci/pcie/aspm.c > +++ b/drivers/pci/pcie/aspm.c > @@ -1090,6 +1090,8 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool locked > > int pci_disable_link_state_locked(struct pci_dev *pdev, int state) > { > + lockdep_assert_held_read(&pci_bus_sem); > + > return __pci_disable_link_state(pdev, state, true); > } > EXPORT_SYMBOL(pci_disable_link_state_locked); > -- > 2.41.0 >
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 19b7256d2dc9..ef2e7a186f57 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -1090,6 +1090,8 @@ static int __pci_disable_link_state(struct pci_dev *pdev, int state, bool locked int pci_disable_link_state_locked(struct pci_dev *pdev, int state) { + lockdep_assert_held_read(&pci_bus_sem); + return __pci_disable_link_state(pdev, state, true); } EXPORT_SYMBOL(pci_disable_link_state_locked);