From patchwork Tue Nov 14 13:55:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 16564 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1874350vqg; Tue, 14 Nov 2023 05:57:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IHQWx2WPSozoFM7i3aI8n3qwriTyH+W5kFT289SjeYSEf2avpoT+nHPII69xWGqUwfbzQFD X-Received: by 2002:a17:902:6b03:b0:1cc:40a4:9179 with SMTP id o3-20020a1709026b0300b001cc40a49179mr1975161plk.34.1699970256441; Tue, 14 Nov 2023 05:57:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699970256; cv=none; d=google.com; s=arc-20160816; b=mcA1tjWuDhmy1n7FI6mScsId8ZZ8y66M+xjYPOas+IFj1XnoTcvGGjvPw1RdQ6fJfk utJadQhyIX1hDDMZYGO2+UqFrmqFabVk9NIzOR6p4ak4l32GvCAh1v0hHRH89bLpP6jY Jqt+90qHg53eeCsQR8wvyH07Q4VC5/AQMtGYocOE0yfG7yWmZamyKPC9riGQjO/oH9CP UA4gfV4LUWhwizr3UEFHaRAi9bECC6C4+PW7OgqcuRo5nUih6G9ov9L6jYuKRJVNQZhv fAbQXuC2V1+4TmHTZvMo6+BIhnEbiX7AQ4j87dccLPkj/gkrZEAJw5SUjVDhf7q8D+/y 189g== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=fm1fMMcPhbnfgQSOyfkPHV7QMM91EEYWSOyY3q4Ws0k=; fh=+l5nuMYZGgX4mkGKX/kANxC8looYmFXq90w07M/6BcI=; b=WHGAXLtHIOm9KqSqo5sKMBI/if+h14gDokJk+udsguVVtKNChICMCYwzVbCVSDTrAw Vy8U2JIj0Yiksw7k0EDBk7aStWbA92vpm2wYbSph18zb8vsXRSvCEPH27Zpe0EBF5uDp UQc51gRHbBKV1DiO377Elk2T0pG3IqXqk5m2uHhLd+kg5oQ4ikNlXcM/ssBafVwkoEep TlJzE0vh8nYQLgj4u4qkOrBtPkyq1N3isyUWXjWHmrdxzWphQLoP+8/fmpeXhZeNAWaP 8M0VieYpHtqheY1vSsq84+EEGZqclyapDRwxdHctVUZJBcPmdTVnESv9iOFcFBvGLE/2 2frA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ewfHx0DX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id bh2-20020a170902a98200b001cc6787c705si7785681plb.190.2023.11.14.05.57.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Nov 2023 05:57:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ewfHx0DX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 4E9EA8041FC5; Tue, 14 Nov 2023 05:57:34 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233241AbjKNN4t (ORCPT + 29 others); Tue, 14 Nov 2023 08:56:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231903AbjKNN4j (ORCPT ); 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 133A2D4F; Tue, 14 Nov 2023 05:56:34 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC537C433D9; 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=zn1cZkdmxow6oXx9mlxw4Bxyw+vPUUKmI1YntwViffA=; h=From:To:Cc:Subject:Date:From; b=ewfHx0DX6mWUD5x+Ub9YsdD/9h2Zx4P++52qj+6g/lLhdIMYPULBmDccX740UIkFV h2v1wfdtDWZxpTibEafrM2WXZYn8EMoTUAu85RqPkz/nBH2KYvs2cuMAL3lwu9bXzo UOmC0UC9b65g5nBpaGWNOtuV3trO9LwO73cuaqVEMCtCjmndpvoQ2zm5ouspzDedfz RTC0eKoXwKakmq4i9IYYGYXIknP7cGPsduJnrWJCymoNyq7TLtKfHXsELqNbRh6Fi2 JKiETamQ7EmHJZvmblRZijBNX+pV/UxVAg+Ap6VV5f/2HDH492Dt4uPMwg07h32ZfS gOCPoIyRsnyCQ== Received: from johan by xi.lan with local (Exim 4.96.2) (envelope-from ) id 1r2tu2-0008PN-1V; Tue, 14 Nov 2023 14:56:30 +0100 From: Johan Hovold To: Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy?= =?utf-8?q?=C5=84ski?= , Bjorn Helgaas Cc: Andy Gross , Bjorn Andersson , Konrad Dybcio , Manivannan Sadhasivam , Rob Herring , Nirmal Patel , Jonathan Derrick , linux-arm-msm@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 0/6] PCI: Fix deadlocks when enabling ASPM Date: Tue, 14 Nov 2023 14:55:47 +0100 Message-ID: <20231114135553.32301-1-johan+linaro@kernel.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 14 Nov 2023 05:57:34 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782548011688349750 X-GMAIL-MSGID: 1782548011688349750 The pci_enable_link_state() helper is currently only called from pci_walk_bus(), something which can lead to a deadlock as both helpers take a pci_bus_sem read lock. Add a new locked helper which can be called with the read lock held and fix up the two current users (the second is new in 6.7-rc1). Note that there are no users left of the original unlocked variant after this series, but I decided to leave it in place for now (e.g. to mirror the corresponding helpers to disable link states). Included are also a couple of related cleanups. Johan Johan Hovold (6): PCI/ASPM: Add locked helper for enabling link state PCI: vmd: Fix deadlock when enabling ASPM PCI: qcom: Fix deadlock when enabling ASPM PCI: qcom: Clean up ASPM comment PCI/ASPM: Clean up disable link state parameter PCI/ASPM: Add lockdep assert to link state helper drivers/pci/controller/dwc/pcie-qcom.c | 7 ++- drivers/pci/controller/vmd.c | 2 +- drivers/pci/pcie/aspm.c | 65 +++++++++++++++++++------- include/linux/pci.h | 3 ++ 4 files changed, 56 insertions(+), 21 deletions(-)