Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 7760A4A207F; Thu, 17 Sep 2026 17:29:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789666188; cv=none; b=TbMEP04HhX9JfR6Ps1r0qiHLv9ilINjs62IkPztGAqL1V5t2AgBpB56HVPM7NBUyW1DfL7OLQYTm1bLdj73COSXCIHI3m/onc/BNr/6wVVBmVQnaZu8YxUgk0hyqW2k41o6AoKXwAxUyFaabWUazjjGMqdH9xzz+nRTdb7izEc8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789666188; c=relaxed/simple; bh=qD5Qu0X+Xe0jtKEeMiZyjvg3BNBJqH5jeQTV2fkK13I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=exrC+H+2FFcCLmyu1hx/A4n8e6xpoxWN56XiF21kpUFAOe90PcauqtZYytxm0rOF3iO/ScGiHxgoI7OC2nzfQhEqwU+2hSzV01jPgkul9dpsygo6vtNIVTL/9cWfNovzdaI1WLdRHOiZpbwnWI9nMVultUTwctbEkIZ+WNt9/uo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RCQTHm9f; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RCQTHm9f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D4731F000FF; Thu, 17 Sep 2026 17:29:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789666185; bh=/5mdXbdWS/L97+BE7nfq3zY7AKM6nih2nykjxACpleI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RCQTHm9fSqAp/NtGdX3wSSTS0FyYaFO1r5zmezPWPRRPgdMeBUuPrWYkVQIYN6xu8 xUGVZRuc8HiZfBbY6VJRHxWlv9383ss5WX5Fw7XBAGjDHkfO/VN9gpmEm4OwztwSvN jIS1flKY7uPvTRxfJsTBj+Jk7Ita41PSrohmK4CI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , "Ritesh Harjani (IBM)" , Shivaprasad G Bhat , Amit Machhiwal , Madhavan Srinivasan Subject: [PATCH 6.18 0954/1250] powerpc/eeh: Fix recursive locking on devices without EEH sensitive driver Date: Thu, 17 Sep 2026 16:12:29 +0100 Message-ID: <20260917151617.877191405@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151551.901433442@linuxfoundation.org> References: <20260917151551.901433442@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shivaprasad G Bhat commit c5e68706527968282e49de205cc2b935823cb88a upstream. The commit 1010b4c012b0 ("powerpc/eeh: Make EEH driver device hotplug safe") refactored the EEH code such that the pci_rescan_remove_lock is held at the beginning of eeh_handle_normal_event() and the eeh_reset_device() is called with that lock being held. Looks like the commit missed to remove the existing lock/unlock inside eeh_rmv_device() which is no longer necessary. This is causing the eehd to hang on the lock which it actually holds when that code path is taken. [<0>] 0xc00000011c78f870 [<0>] __switch_to+0xfc/0x1a0 [<0>] pci_lock_rescan_remove+0x30/0x44 [<0>] eeh_rmv_device+0x290/0x2e0 [<0>] eeh_pe_dev_traverse+0x80/0x130 [<0>] eeh_reset_device+0xcc/0x23c [<0>] eeh_handle_normal_event+0x830/0xa80 [<0>] eeh_event_handler+0xf8/0x190 [<0>] kthread+0x194/0x1b0 [<0>] start_kernel_thread+0x14/0x18 The issue is seen for cases where the errors are detected on the PHB directly AND|OR for devices where the driver error_detected() returns PCI_ERS_RESULT_NEED_RESET, and driver being not EEH sensitive(i.e no error handlers like slot_reset(), resume() etc defined). Fixes: 1010b4c012b0 ("powerpc/eeh: Make EEH driver device hotplug safe") Cc: stable Reviewed-by: Ritesh Harjani (IBM) Signed-off-by: Shivaprasad G Bhat Reviewed-by: Amit Machhiwal Signed-off-by: Madhavan Srinivasan Link: https://patch.msgid.link/178404937381.913.2759874335293830160.stgit@linux.ibm.com Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/kernel/eeh_driver.c | 2 -- 1 file changed, 2 deletions(-) --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c @@ -533,9 +533,7 @@ static void eeh_rmv_device(struct eeh_de if (rmv_data) list_add(&edev->rmv_entry, &rmv_data->removed_vf_list); } else { - pci_lock_rescan_remove(); pci_stop_and_remove_bus_device(dev); - pci_unlock_rescan_remove(); } }