From nobody Wed Jun 10 09:40:44 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E68DA3ED5CD; Wed, 22 Apr 2026 14:37:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776868672; cv=none; b=tYqyC7nUO65eLYEy3dfWG/ndYs9ZoteX1/v0+5heO8roAyGKx38W3kBUJFfYSIoE+DfDQRs/WZwmT1rsM2laXb/dW2tyZZAd4eLT9WDnDR6su/7YOCudXSHbkuL0IW2clcGBk721xUtAzHj+oZNjqdq7HkAfQaWDA9wQvZfbAjE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776868672; c=relaxed/simple; bh=AOgrJvt8eAQd3uhRUBWWqieBYQQirzu5sfsd07wnJ0s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KXBHhwe/5rCvlKdDSrvRdu0LvROz8q059j65a5wMCDc35YPB/ZFKgZx/mESyZs+izbnIByUDa+T9m0RbEPzRvH1iEc+rBmqqL/QCXlOjD+rq0TeLbNS5Q+qpxf+JyGRjDUz1S/xwvZiTsy7e2a5dom0SL1VTvnhA91kOeYtBnTw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=gT8ajzhc; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="gT8ajzhc" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63MARLE5876696; Wed, 22 Apr 2026 14:37:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:sender:subject:to; s=pp1; bh=/B8iiDzQPv divl/buJcKUq4lAcbq+Yp2V/5n/G8nloU=; b=gT8ajzhcIXV63I6QId/GAUG7td hcN6veZQJ2w8v+dJGkL8t7REsYA/G20xMbikpX0KtmDNMIkRpiVz44D1nAyC+kcY fjhEhoc8yaJZWRWjtR3jlOLvVQ4c4ZzHwSg/iMVMNvKhUFc80FYPEZvAWXLW4dlf EvgbdC0DmbFtITGQ2+hc5oDljNT3vWXiCE8Sx4qWC8wbtFe/u0MJJ8brGsr1j2oN nCF+WJdegY2IMnZEvVcYlaXs0+KmhS9u23/D1mSxza4ApILsoVN+jbRDmO3t8F54 YUgp0xEQs5PnbKwhHNTDPj2t+Z8/H3TBCbdKMI+w8kN+DLFh2tHY8W+vsaJA== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dpeu2409v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Apr 2026 14:37:49 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 63MEZPBQ004822; Wed, 22 Apr 2026 14:37:48 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4dpjkxtm0x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Apr 2026 14:37:48 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 63MEbjmv36110838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 22 Apr 2026 14:37:45 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0B2DA20043; Wed, 22 Apr 2026 14:37:45 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EB7A720040; Wed, 22 Apr 2026 14:37:44 +0000 (GMT) Received: from p1gen4-pw042f0m (unknown [9.52.223.163]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTPS; Wed, 22 Apr 2026 14:37:44 +0000 (GMT) Received: from bblock by p1gen4-pw042f0m with local (Exim 4.99.1) (envelope-from ) id 1wFYi0-0000000G4RW-2ukc; Wed, 22 Apr 2026 16:37:44 +0200 From: Benjamin Block To: Bjorn Helgaas Cc: Niklas Schnelle , Tobias Schumacher , linux-s390 , Heiko Carstens , Ionut Nechita , Sven Schnelle , Ionut Nechita , Farhan Ali , Alexander Gordeev , Julian Ruess , Andreas Krebbel , Gerd Bayer , Vasily Gorbik , linux-pci , linux-kernel , Christian Borntraeger , Matthew Rosato , Benjamin Block Subject: [PATCH v4 1/3] PCI: Move declaration of pci_rescan_remove_lock into public pci.h Date: Wed, 22 Apr 2026 16:37:42 +0200 Message-ID: X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: =?unknown-8bit?q?IBM_Deutschland_Research_=26_Development_GmbH=2C_https=3A//www=2Eibm=2Ecom/privacy=2C_Vors=2E_Aufs=2E-R=2E=3A_Wolfgang_Wendt=2C_Gesch=C3=A4ftsf=C3=BChrung=3A_David_Faller=2E_Sitz_der_Ges=2E=3A_Ehningen=2C_Registergericht=3A_AmtsG_Stuttgart=2C_HRB_243294?= Content-Transfer-Encoding: quoted-printable Sender: Benjamin Block X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDIyMDEzOCBTYWx0ZWRfX5qAqdt7TsJbt SnthpVsCTErylbLQ3cvko54l0CPQcYrmAj1zagJYQj7m7oChuQQ9WmPZPDaqXTSx7b/zEGYWBOG YAwU9vSqGJ7cPhG+Q+0miZOkMOvzXZUStixxjxIN95eXfvET2Nps+3R+rVoRjc+Zm+dWgAQv0/L sjrmqsPIkBJmU4nL/krc86vUEmm0kzFIuOjwSDufF1u8329DPpWyFlpQIOeJmrPyREwSdCBejar /rxv81sApB6/W2Rv7ByzpT3a1k1LjRzPjezTK3uyeMH473qoV1gxmgpljjQvdOH4coC5yO9jn2X 9+NzfCKmGPgE2oD9q0xKfoQ1jl3sURjcghncFMxLonEefWaXrsQXhuUdlhjxCLKEnFtaZXmz/R8 QPoqyAX2GHYfc1su/OquEZDACbe7mA5xO2yyb5w+XipjJ/EkHCxb4J+WGVsMZRH7EQ5fEd3JSTZ /0Ea+Rt1nPUjtVpYc4A== X-Proofpoint-ORIG-GUID: i-apgRMqPvEPmC_aFkQ9NZi3pKgMWL2S X-Proofpoint-GUID: n2fVAIjDJtn3MAwfgLwj3_nZYVdYXHv7 X-Authority-Analysis: v=2.4 cv=XMUAjwhE c=1 sm=1 tr=0 ts=69e8dd3e cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=vf2HUNMP9xvVswJDcwYA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-22_01,2026-04-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 clxscore=1015 priorityscore=1501 impostorscore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 phishscore=0 adultscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604220138 Content-Type: text/plain; charset="utf-8" So far it is possible to use and call the functions pci_lock_rescan_remove() and pci_unlock_rescan_remove() from any PCI code, including modules and architecture code; but the lock variable `pci_rescan_remove_lock` itself is private to objects residing in `drivers/pci/` via the header `drivers/pci/pci.h`. This makes it possible to use the lock - lock it, unlock it - from anywhere, but it is not possible to use lockdep annotations such as lockdep_assert_held(), or sparse annotations such as __must_hold() in modules or architecture code for PCI to make the usage more safe. Since it is useful for `pci_rescan_remove_lock` to have such annotations, move the variable declaration into `include/linux/pci.h`. Reviewed-by: Niklas Schnelle Signed-off-by: Benjamin Block --- drivers/pci/pci.h | 2 -- drivers/pci/probe.c | 1 + include/linux/pci.h | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 13d998fbacce..6d611523420f 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -110,8 +110,6 @@ struct pcie_tlp_log; extern const unsigned char pcie_link_speed[]; extern bool pci_early_dump; =20 -extern struct mutex pci_rescan_remove_lock; - bool pcie_cap_has_lnkctl(const struct pci_dev *dev); bool pcie_cap_has_lnkctl2(const struct pci_dev *dev); bool pcie_cap_has_rtctl(const struct pci_dev *dev); diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 850a63c175f0..81a7db71ebc3 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -3509,6 +3509,7 @@ EXPORT_SYMBOL_GPL(pci_rescan_bus); * routines should always be executed under this mutex. */ DEFINE_MUTEX(pci_rescan_remove_lock); +EXPORT_SYMBOL_GPL(pci_rescan_remove_lock); static const struct task_struct *pci_rescan_remove_owner; static unsigned int pci_rescan_remove_depth; =20 diff --git a/include/linux/pci.h b/include/linux/pci.h index 1c270f1d5123..fd7a962a64ef 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -39,6 +39,7 @@ #include #include #include +#include #include =20 #include @@ -1533,6 +1534,7 @@ void set_pcie_hotplug_bridge(struct pci_dev *pdev); =20 /* Functions for PCI Hotplug drivers to use */ unsigned int pci_rescan_bus(struct pci_bus *bus); +extern struct mutex pci_rescan_remove_lock; void pci_lock_rescan_remove(void); void pci_unlock_rescan_remove(void); =20 --=20 2.54.0 From nobody Wed Jun 10 09:40:44 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E68433ED5C5; Wed, 22 Apr 2026 14:37:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776868672; cv=none; b=lfGFxDAv+qNSQON9VM2E+QZwTRGHmrYhPledMOB7NNrr79ZF2ObZOese3Ce+oJHQhDJLhZBBr2bxIESlXdhZUQPrFuM6k4JGHJotMMkDrwD9D+BYsRnU7joY6T7WdiezPV3HDWuYQTZctfgvocL1oTW5cgXicLPqJC2MuGCocYc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776868672; c=relaxed/simple; bh=6C0btdHehmcdBHpQXETgyuRBlAldDb54Mofy35XMiNw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FmjsBIlBK0ylUesrBYT3N9texF6N3ahtOq0DrJ4FVf7MkQasjP+0Go44dG1zeCW244feq4p5f2GAQ/B814rLYK6bm2knFhgXE1wBIfmjsSjSXRo2wv7LE3jUiml7F3pqm787DfczjPezswtnOavod+lJsV03u23Nu688O1AiigY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=U4cKQjv7; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="U4cKQjv7" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63MB9LFB590754; Wed, 22 Apr 2026 14:37:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:sender:subject:to; s=pp1; bh=U7PquSzLk0 46oRsJNtAhBNjD2BGpHFpbkUiQcZTx0Ng=; b=U4cKQjv7wvAWQ4DUJ1N25N5tY/ s/EPwX5hopTycy+xf4WE+ei2TNcevjgS1Wol5iVIQWC9PWHpgB1v3dnmUB4e9gDP Oe9hwsocvtZGfgq8frmdhTGzoUrZwUhLQI0hdRGx1WFi1txPjqSWagYMROauQ92P d9HqNcShGl7DHK6LY5v0Z+Omq2LxTAox+B4PQ2ToYVT5MWFrVgReZaRIuxqZUQb/ 3GhwBEOVUDmIBk/llMeaB1JJGE/mau1t5iOEImQ/bG85dBdbSDfLBigDH+cqxSQe uLFWKc0YEmWMkCPQg7WhDLUtTyn7f8+e3NUTOgXm9xUH9wYeLLk2/qzp7B/Q== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dpeu23yq3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Apr 2026 14:37:49 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 63MEZQw1018163; Wed, 22 Apr 2026 14:37:48 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4dpjky2ktn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Apr 2026 14:37:48 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 63MEbjsO42402272 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 22 Apr 2026 14:37:45 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1B4BB2004D; Wed, 22 Apr 2026 14:37:45 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0790120043; Wed, 22 Apr 2026 14:37:45 +0000 (GMT) Received: from p1gen4-pw042f0m (unknown [9.52.223.163]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTPS; Wed, 22 Apr 2026 14:37:44 +0000 (GMT) Received: from bblock by p1gen4-pw042f0m with local (Exim 4.99.1) (envelope-from ) id 1wFYi0-0000000G4Rb-3438; Wed, 22 Apr 2026 16:37:44 +0200 From: Benjamin Block To: Bjorn Helgaas Cc: Niklas Schnelle , Tobias Schumacher , linux-s390 , Heiko Carstens , Ionut Nechita , Sven Schnelle , Ionut Nechita , Farhan Ali , Alexander Gordeev , Julian Ruess , Andreas Krebbel , Gerd Bayer , Vasily Gorbik , linux-pci , linux-kernel , Christian Borntraeger , Matthew Rosato , Benjamin Block Subject: [PATCH v4 2/3] PCI: Provide lock guard for pci_rescan_remove_lock Date: Wed, 22 Apr 2026 16:37:43 +0200 Message-ID: <5abcac047ec9cb40cddca1d28c92ebb370ea3b9f.1776868550.git.bblock@linux.ibm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: =?unknown-8bit?q?IBM_Deutschland_Research_=26_Development_GmbH=2C_https=3A//www=2Eibm=2Ecom/privacy=2C_Vors=2E_Aufs=2E-R=2E=3A_Wolfgang_Wendt=2C_Gesch=C3=A4ftsf=C3=BChrung=3A_David_Faller=2E_Sitz_der_Ges=2E=3A_Ehningen=2C_Registergericht=3A_AmtsG_Stuttgart=2C_HRB_243294?= Content-Transfer-Encoding: quoted-printable Sender: Benjamin Block X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: _HN-b5r82uKwrSGAPkG3mqRl4X4r-lMh X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDIyMDEzOCBTYWx0ZWRfX88tvFuaP7FtK EQlEn03icKLLTLCFE10OmcUOUnZDa/15HG/EVwG8ontHRuEuU1Fa0QVrgLnDC0CRz3EtLglj9ER 567rueEcRqtwCVgKR6rSS+mwsoytNC9nZSGGoczslLlSpx71YXN3iXNHZ7PoHFAyG7CqlCPN+XN ykrMltySHiwgAwLIxq9jjbkn2xozlYDMgVDuVuNMCkGFgZf+Q0NTnPphMsIBm8QBfZNq7T47wnZ C8372HZgdNhfolm2w7Yjort5M1y1KZssi5sq6xfKYaUrh/O2tX9/jWi06VrjHzP/U8TqLNU93Js ZiH5G8+XLm58k7KQHInFqUX/tJ3cGDHsIyqNM23mYazlaZEbX63bg/jTlDCekWBdCTOjAqg47IR UJtaPdiKES28j4KNRFoj78w18HijNuVntCSNIXz1Fb4jAvNn4ErpWk2AI3+AF7HxeaIXtLcCKr9 lYlHq71Jc4uYkVAO5OQ== X-Authority-Analysis: v=2.4 cv=C8LZDwP+ c=1 sm=1 tr=0 ts=69e8dd3e cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=qAR2Z3AMSIpdRBh0OscA:9 X-Proofpoint-ORIG-GUID: AYr71c6qmVbzrFp9zzEX8XpAbWIIf4LU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-22_01,2026-04-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 suspectscore=0 priorityscore=1501 malwarescore=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 impostorscore=0 spamscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604220138 Content-Type: text/plain; charset="utf-8" Make it possible to use guard() or scoped_guard() to lock, and automatically unlock `pci_rescan_remove_lock`. Since the actual mutex `pci_rescan_remove_lock` is always supposed to be taken and released using the functions pci_lock_rescan_remove() and pci_unlock_rescan_remove() it is not possible to simply use the already existing guards for `struct mutex`. Instead define a new guard `pci_rescan_remove` that will also call the functions in question, but is usable via guard() or scoped_guard(). Reviewed-by: Niklas Schnelle Signed-off-by: Benjamin Block --- include/linux/pci.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/linux/pci.h b/include/linux/pci.h index fd7a962a64ef..4c41b5a2c90a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -41,6 +41,7 @@ #include #include #include +#include =20 #include =20 @@ -1537,6 +1538,8 @@ unsigned int pci_rescan_bus(struct pci_bus *bus); extern struct mutex pci_rescan_remove_lock; void pci_lock_rescan_remove(void); void pci_unlock_rescan_remove(void); +DEFINE_LOCK_GUARD_0(pci_rescan_remove, pci_lock_rescan_remove(), + pci_unlock_rescan_remove()); =20 /* Vital Product Data routines */ ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *= buf); --=20 2.54.0 From nobody Wed Jun 10 09:40:44 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2161F3ED5D6; Wed, 22 Apr 2026 14:37:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776868672; cv=none; b=m4jOUNVIERvBNr1J1whTcyTb/qqdExK0TkBZRNcxWsunpKgnalVGiWzdrx3DrtQoNNIOyEM4olJ30wQMzOIzrNYI+amiuLHYo0xLiFJttcje3I8QrqnLL0Yx/KOCtsqMCDxGDVjgYeupmFKNf+Wdf3odiXi5t3QBM2ZZL8TuWYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776868672; c=relaxed/simple; bh=ZNta48hiP9ii+dlj+m8fLbFgyJ5rLhiaUCHbCNYBwHw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jpELV2kSfDPhoUOKnELnjhCheAxZrdPmYA2h9F2z+gHcoQ01rgzdV9OEwb+mStx9W/y8d/IpOxv4yY0kbuG17PwQtkXCiklnd82m5rqrzaP7guy9sydtvEf62nR0mPCvXbiGpps79hbCkaqlQ8c0tgnfoo3G4C/mpj0y/8HDGyU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=fHm++sUt; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="fHm++sUt" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 63M5wtEF2295513; Wed, 22 Apr 2026 14:37:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:sender:subject:to; s=pp1; bh=lwxQ+vf6iGOq/j3B8Fs5yWgFSv8Kc5kF1vMdl+NnF2k=; b=fHm++sUtJ1p0 mA74FNIXWMOR7PV/tbT7Inmac6kT6+M36W2HUiy9cpuAnHW+DkG12oz9t/Dof/En PJ6L07mcybKM4jL6wxKZ4+M8bXzXIbEGEh7aPPuc4mNIrBzCAc9iuquYM9a9riEV cjjNoKbNzjeIPAv4GellVX4ohn/teUq96vrTsk2GpWqNdj3yzvsy4/orEX71xHJJ dw3341tWpwHYnVzilR+AjR5mnnx4gTQNvaDg4zJGnJTq9lxRYrCsBtvbDTwnIj7P Ztw5HuxuWZavkuyjx0jN0DgyyGJmtt2a9CgxHA3UyxjmtXJ8j/dZOvgD4hJa8UdI IsXeoyT4nQ== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dpeu3kpkr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Apr 2026 14:37:49 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 63MEZf0C026690; Wed, 22 Apr 2026 14:37:49 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4dpjkyakrf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 22 Apr 2026 14:37:48 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 63MEbjP145744486 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 22 Apr 2026 14:37:45 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2681E2004E; Wed, 22 Apr 2026 14:37:45 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 09AD32004B; Wed, 22 Apr 2026 14:37:45 +0000 (GMT) Received: from p1gen4-pw042f0m (unknown [9.52.223.163]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTPS; Wed, 22 Apr 2026 14:37:44 +0000 (GMT) Received: from bblock by p1gen4-pw042f0m with local (Exim 4.99.1) (envelope-from ) id 1wFYi0-0000000G4Rg-3DwY; Wed, 22 Apr 2026 16:37:44 +0200 From: Benjamin Block To: Bjorn Helgaas Cc: Niklas Schnelle , Tobias Schumacher , linux-s390 , Heiko Carstens , Ionut Nechita , Sven Schnelle , Ionut Nechita , Farhan Ali , Alexander Gordeev , Julian Ruess , Andreas Krebbel , Gerd Bayer , Vasily Gorbik , linux-pci , linux-kernel , Christian Borntraeger , Matthew Rosato , Benjamin Block Subject: [PATCH v4 3/3] s390/pci: Fix circular/recursive deadlocks in PCI-bus and -device release Date: Wed, 22 Apr 2026 16:37:44 +0200 Message-ID: <5c06d6cf37dfc8ff6e8de35fdef4cd5652cdb8b9.1776868550.git.bblock@linux.ibm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Organization: =?unknown-8bit?q?IBM_Deutschland_Research_=26_Development_GmbH=2C_https=3A//www=2Eibm=2Ecom/privacy=2C_Vors=2E_Aufs=2E-R=2E=3A_Wolfgang_Wendt=2C_Gesch=C3=A4ftsf=C3=BChrung=3A_David_Faller=2E_Sitz_der_Ges=2E=3A_Ehningen=2C_Registergericht=3A_AmtsG_Stuttgart=2C_HRB_243294?= Content-Transfer-Encoding: quoted-printable Sender: Benjamin Block X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: lkKc0Z41StXDSEsPprwY_dgph0RDnCvn X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNDIyMDEzOCBTYWx0ZWRfX/5xJx50QUxaa FWOsQVkCHyFzDpF7+kePpleSBUEGCuwnYPgDpyPYnXtuSVAXZ4EeRUNQZlaQTxH+Bj2oAHXzt4Y XTXMs7AbfcRjr5dXAwGiJ92BihQJveiHy4W1/j/apsabhelxpmNxdlwwuOlGn+v1WMlpWalxP+E 6pPA+noFjaIePgXME82RLSQ4zpvf71zOkFSuMTe1kDxTMPRSYVjpN6dmz8RObkCkosSjjNzcxvx zu26/x7jECG01KnFsilCXCV6yUBOoXL3hELjcQXvWkitq5OWHn97SW8EOdB8K2AILey+JvRokNx sm8Hv4aTZK9bozfav7uxcDh3tIJ4nVa92dRlFZ4j/qbuyjsxowz6ye3X0GYJ26Ef+X9JLNoMl5J 8/aCjzBwy0qaF/DHFrSF1E93rj5MQCu7KI8REiwFbUPJjRlitAOxMrlFmShQgQ1gobA+u95Dwj9 mxZRU8A8lGZl4xPQXaw== X-Authority-Analysis: v=2.4 cv=a6kAM0SF c=1 sm=1 tr=0 ts=69e8dd3d cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=qptzKXhuCiR4edXAYWEA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 X-Proofpoint-ORIG-GUID: 67O-PfFj3lSi5AFlZ2PpLPfsHjetMJzF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-04-22_01,2026-04-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 spamscore=0 adultscore=0 bulkscore=0 lowpriorityscore=0 impostorscore=0 clxscore=1015 phishscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604220138 When removing PCI device or PCI bus objects there are a couple of call-chains where it is possible that the kernel runs into a circular deadlock involving the central `pci_rescan_remove_lock`. Two examples: (A) Thread =CE=B1 receives a PCI event notifying the kernel that a PCI virtual function has been moved into Reserved state, and so the PCI subsystem will try to remove that PCI function. The call-chain for that looks like this: __zpci_event_availability() -> zpci_zdev_put() # will lock(zpci_add_remove_lock), # and lock(zpci_list_lock) -> zpci_release_device() # will unlock(zpci_list_lock) -> zpci_cleanup_bus_resources() # will lock(pci_rescan_remove_lock) Thread =CE=B2 is triggered by userspace writing 0 into the SysFS attribute `sriov_numvfs` of the parent PCI physical function of the same function we just try to remove. This will also try to release the PCI virtual function; but this time the call-chain looks like this: sriov_numvfs_store() -> ... (device driver dependent) -> sriov_disable() -> sriov_del_vfs() # will lock(pci_rescan_remove_lock) -> ... (deep chain) -> pci_release_dev() -> pcibios_release_device() -> zpci_zdev_put() # will lock(zpci_add_remove_lock) If thread =CE=B1 and =CE=B2 coincide, this will result in a cyclic deadlock. (B) Thread =CE=B3 receives a PCI event notifying the kernel that one or more PCI functions got hot plugged, and need to be configured. A possible call-chain that might happen while the PCI subsystem is trying to add those new function looks like this: __zpci_event_availability() -> ... (multiple ways in which a device gets added) -> zpci_add_device() # will lock(zpci_add_remove_lock) -> zpci_bus_device_register() -> zpci_bus_put() # will lock(zbus_list_lock) -> zpci_bus_release() # will unlock(zbus_list_lock) # will lock(pci_rescan_remove_lock) Now the same thread =CE=B2 as above in (A) might coincide, and again could result in a cyclic deadlock. `pci_rescan_remove_lock` has to be and is taken at a "high level" in most call-chains since it is intended to protect/mutual exclude all rescan and/or removal actions taken in the PCI subsystem. So to prevent the outlined deadlock scenarios above remove it instead from the "low level" release functions for both the PCI device and PCI bus objects. Instead, lock `pci_rescan_remove_lock` in all call-chains leading to those release functions: * initialization of the PCI subsystem; * processing of availability events (CRWs) for PCI functions; * processing of error events (CRWs) for PCI functions; * architecture specific release PCI device implementation. Additionally, remove `pci_rescan_remove_lock` from zpci_bus_scan_bus() since its only caller zpci_scan_devices() is now always called with `pci_rescan_remove_lock` already held. Lastly, document the new locking expectations after these changes. Add sparse and lockdep annotations to functions that previously locked `pci_rescan_remove_lock` explicitly, making sure the lock is now already held when called. Additionally also add the annotations to zpci_zdev_put() and zpci_bus_put() to make sure that every function that potentially drops the last reference already holds the lock to prevent surprises. Fixes: 05bc1be6db4b2 ("s390/pci: create zPCI bus") Fixes: ab909509850b2 ("PCI: s390: Fix use-after-free of PCI resources with = per-function hotplug") Reviewed-by: Niklas Schnelle Tested-by: Niklas Schnelle Signed-off-by: Benjamin Block --- arch/s390/pci/pci.c | 11 ++++++++--- arch/s390/pci/pci_bus.c | 15 ++++++++------- arch/s390/pci/pci_event.c | 28 +++++++++++++++++++--------- arch/s390/pci/pci_iov.c | 3 +-- arch/s390/pci/pci_sysfs.c | 9 +++------ 5 files changed, 39 insertions(+), 27 deletions(-) diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c index 2a430722cbe4..86ef1e516857 100644 --- a/arch/s390/pci/pci.c +++ b/arch/s390/pci/pci.c @@ -71,9 +71,11 @@ struct airq_iv *zpci_aif_sbv; EXPORT_SYMBOL_GPL(zpci_aif_sbv); =20 void zpci_zdev_put(struct zpci_dev *zdev) + __must_hold(&pci_rescan_remove_lock) { if (!zdev) return; + lockdep_assert_held(&pci_rescan_remove_lock); mutex_lock(&zpci_add_remove_lock); kref_put_lock(&zdev->kref, zpci_release_device, &zpci_list_lock); mutex_unlock(&zpci_add_remove_lock); @@ -582,11 +584,13 @@ int zpci_setup_bus_resources(struct zpci_dev *zdev) } =20 static void zpci_cleanup_bus_resources(struct zpci_dev *zdev) + __must_hold(&pci_rescan_remove_lock) { struct resource *res; int i; =20 - pci_lock_rescan_remove(); + lockdep_assert_held(&pci_rescan_remove_lock); + for (i =3D 0; i < PCI_STD_NUM_BARS; i++) { res =3D zdev->bars[i].res; if (!res) @@ -599,7 +603,6 @@ static void zpci_cleanup_bus_resources(struct zpci_dev = *zdev) kfree(res); } zdev->has_resources =3D 0; - pci_unlock_rescan_remove(); } =20 int pcibios_device_add(struct pci_dev *pdev) @@ -629,6 +632,7 @@ void pcibios_release_device(struct pci_dev *pdev) { struct zpci_dev *zdev =3D to_zpci(pdev); =20 + guard(pci_rescan_remove)(); zpci_unmap_resources(pdev); zpci_zdev_put(zdev); } @@ -1208,7 +1212,8 @@ static int __init pci_base_init(void) if (rc) goto out_irq; =20 - rc =3D zpci_scan_devices(); + scoped_guard(pci_rescan_remove) + rc =3D zpci_scan_devices(); if (rc) goto out_find; =20 diff --git a/arch/s390/pci/pci_bus.c b/arch/s390/pci/pci_bus.c index 36a4807285fa..c1b48b572e86 100644 --- a/arch/s390/pci/pci_bus.c +++ b/arch/s390/pci/pci_bus.c @@ -82,9 +82,8 @@ int zpci_bus_scan_device(struct zpci_dev *zdev) if (!pdev) return -ENODEV; =20 - pci_lock_rescan_remove(); + guard(pci_rescan_remove)(); pci_bus_add_device(pdev); - pci_unlock_rescan_remove(); =20 return 0; } @@ -132,10 +131,13 @@ void zpci_bus_remove_device(struct zpci_dev *zdev, bo= ol set_error) * Return: 0 on success, an error value otherwise */ int zpci_bus_scan_bus(struct zpci_bus *zbus) + __must_hold(&pci_rescan_remove_lock) { struct zpci_dev *zdev; int devfn, rc, ret =3D 0; =20 + lockdep_assert_held(&pci_rescan_remove_lock); + for (devfn =3D 0; devfn < ZPCI_FUNCTIONS_PER_BUS; devfn++) { zdev =3D zbus->function[devfn]; if (zdev && zdev->state =3D=3D ZPCI_FN_STATE_CONFIGURED) { @@ -145,10 +147,8 @@ int zpci_bus_scan_bus(struct zpci_bus *zbus) } } =20 - pci_lock_rescan_remove(); pci_scan_child_bus(zbus->bus); pci_bus_add_devices(zbus->bus); - pci_unlock_rescan_remove(); =20 return ret; } @@ -214,11 +214,12 @@ static int zpci_bus_create_pci_bus(struct zpci_bus *z= bus, struct zpci_dev *fr, s * run of the function. */ static inline void zpci_bus_release(struct kref *kref) - __releases(&zbus_list_lock) + __releases(&zbus_list_lock) __must_hold(&pci_rescan_remove_lock) { struct zpci_bus *zbus =3D container_of(kref, struct zpci_bus, kref); =20 lockdep_assert_held(&zbus_list_lock); + lockdep_assert_held(&pci_rescan_remove_lock); =20 list_del(&zbus->bus_next); mutex_unlock(&zbus_list_lock); @@ -229,14 +230,12 @@ static inline void zpci_bus_release(struct kref *kref) */ =20 if (zbus->bus) { - pci_lock_rescan_remove(); pci_stop_root_bus(zbus->bus); =20 zpci_free_domain(zbus->domain_nr); pci_free_resource_list(&zbus->resources); =20 pci_remove_root_bus(zbus->bus); - pci_unlock_rescan_remove(); } =20 zpci_remove_parent_msi_domain(zbus); @@ -250,7 +249,9 @@ static inline void __zpci_bus_get(struct zpci_bus *zbus) } =20 static inline void zpci_bus_put(struct zpci_bus *zbus) + __must_hold(&pci_rescan_remove_lock) { + lockdep_assert_held(&pci_rescan_remove_lock); kref_put_mutex(&zbus->kref, zpci_bus_release, &zbus_list_lock); } =20 diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c index 839bd91c056e..98253706b591 100644 --- a/arch/s390/pci/pci_event.c +++ b/arch/s390/pci/pci_event.c @@ -342,6 +342,7 @@ static void __zpci_event_error(struct zpci_ccdf_err *cc= df) no_pdev: if (zdev) mutex_unlock(&zdev->state_lock); + guard(pci_rescan_remove)(); zpci_zdev_put(zdev); } =20 @@ -400,9 +401,11 @@ static void __zpci_event_availability(struct zpci_ccdf= _avail *ccdf) zdev =3D zpci_create_device(ccdf->fid, ccdf->fh, ZPCI_FN_STATE_CONFIGUR= ED); if (IS_ERR(zdev)) break; - if (zpci_add_device(zdev)) { - kfree(zdev); - break; + scoped_guard(pci_rescan_remove) { + if (zpci_add_device(zdev)) { + kfree(zdev); + break; + } } } else { if (zdev->state =3D=3D ZPCI_FN_STATE_RESERVED) @@ -419,9 +422,11 @@ static void __zpci_event_availability(struct zpci_ccdf= _avail *ccdf) zdev =3D zpci_create_device(ccdf->fid, ccdf->fh, ZPCI_FN_STATE_STANDBY); if (IS_ERR(zdev)) break; - if (zpci_add_device(zdev)) { - kfree(zdev); - break; + scoped_guard(pci_rescan_remove) { + if (zpci_add_device(zdev)) { + kfree(zdev); + break; + } } } else { if (zdev->state =3D=3D ZPCI_FN_STATE_RESERVED) @@ -450,24 +455,29 @@ static void __zpci_event_availability(struct zpci_ccd= f_avail *ccdf) /* The 0x0304 event may immediately reserve the device */ if (!clp_get_state(zdev->fid, &state) && state =3D=3D ZPCI_FN_STATE_RESERVED) { + guard(pci_rescan_remove)(); zpci_device_reserved(zdev); } } break; case 0x0306: /* 0x308 or 0x302 for multiple devices */ - zpci_remove_reserved_devices(); - zpci_scan_devices(); + scoped_guard(pci_rescan_remove) { + zpci_remove_reserved_devices(); + zpci_scan_devices(); + } break; case 0x0308: /* Standby -> Reserved */ if (!zdev) break; - zpci_device_reserved(zdev); + scoped_guard(pci_rescan_remove) + zpci_device_reserved(zdev); break; default: break; } if (existing_zdev) { mutex_unlock(&zdev->state_lock); + guard(pci_rescan_remove)(); zpci_zdev_put(zdev); } } diff --git a/arch/s390/pci/pci_iov.c b/arch/s390/pci/pci_iov.c index 13050ce5c3e9..1f7e4dd018e7 100644 --- a/arch/s390/pci/pci_iov.c +++ b/arch/s390/pci/pci_iov.c @@ -38,10 +38,9 @@ void zpci_iov_map_resources(struct pci_dev *pdev) =20 void zpci_iov_remove_virtfn(struct pci_dev *pdev, int vfn) { - pci_lock_rescan_remove(); + guard(pci_rescan_remove)(); /* Linux' vfid's start at 0 vfn at 1 */ pci_iov_remove_virtfn(pdev->physfn, vfn - 1); - pci_unlock_rescan_remove(); } =20 static int zpci_iov_link_virtfn(struct pci_dev *pdev, struct pci_dev *virt= fn, int vfid) diff --git a/arch/s390/pci/pci_sysfs.c b/arch/s390/pci/pci_sysfs.c index c2444a23e26c..f5027aa95928 100644 --- a/arch/s390/pci/pci_sysfs.c +++ b/arch/s390/pci/pci_sysfs.c @@ -98,9 +98,9 @@ static ssize_t recover_store(struct device *dev, struct d= evice_attribute *attr, WARN_ON_ONCE(!kn); =20 /* Device needs to be configured and state must not change */ - mutex_lock(&zdev->state_lock); + guard(mutex)(&zdev->state_lock); if (zdev->state !=3D ZPCI_FN_STATE_CONFIGURED) - goto out; + return count; =20 /* device_remove_file() serializes concurrent calls ignoring all but * the first @@ -112,15 +112,12 @@ static ssize_t recover_store(struct device *dev, stru= ct device_attribute *attr, * Once it unblocks from pci_lock_rescan_remove() the original pdev * will already be removed. */ - pci_lock_rescan_remove(); + guard(pci_rescan_remove)(); if (pci_dev_is_added(pdev)) { ret =3D _do_recover(pdev, zdev); } pci_rescan_bus(zdev->zbus->bus); - pci_unlock_rescan_remove(); =20 -out: - mutex_unlock(&zdev->state_lock); if (kn) sysfs_unbreak_active_protection(kn); return ret ? ret : count; --=20 2.54.0