linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anatoli Antonovitch <a.antonovitch@gmail.com>
To: linux-pci@vger.kernel.org
Cc: bhelgaas@google.com, lukas@wunner.de, Alexander.Deucher@amd.com,
	christian.koenig@amd.com,
	Anatoli Antonovitch <anatoli.antonovitch@amd.com>
Subject: [PATCH] PCI/hotplug: Replaced down_write_nested with hotplug_slot_rwsem if ctrl->depth > 0 when taking the ctrl->reset_lock.
Date: Thu,  5 Jan 2023 13:43:55 -0500	[thread overview]
Message-ID: <20230105184355.9829-1-a.antonovitch@gmail.com> (raw)

From: Anatoli Antonovitch <anatoli.antonovitch@amd.com>

It is to avoid any potential issues when S3 resume but at the same time we want to hot-unplug.
Need to do some more testing to see if it is still necessary.

To fix the race between pciehp and AER reported in https://bugzilla.kernel.org/show_bug.cgi?id=215590

INFO: task irq/26-aerdrv:104 blocked for more than 120 seconds.
Tainted: G        W          6.1.0-rc5-custom-master-nov14+ #2
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:irq/26-aerdrv   state:D stack:0     pid:104   ppid:2      flags:0x00004000
Call Trace:
<TASK>
__schedule+0x39c/0xe90
? rcu_read_lock_sched_held+0x25/0x80
schedule+0x6b/0xf0
rwsem_down_write_slowpath+0x3b2/0x9c0
down_write_nested+0x16b/0x210
pciehp_reset_slot+0x63/0x160
pci_reset_hotplug_slot+0x44/0x70
pci_slot_reset+0x10d/0x190
pci_bus_error_reset+0xb2/0xe0
aer_root_reset+0x144/0x190
pcie_do_recovery+0x15a/0x270
? aer_dev_correctable_show+0xc0/0xc0
aer_process_err_devices+0xcf/0xea
aer_isr.cold+0x52/0xa1
? __kmem_cache_free+0x36a/0x3b0
? irq_thread+0xb0/0x1e0
? irq_thread+0xb0/0x1e0
irq_thread_fn+0x28/0x70
irq_thread+0x106/0x1e0
? irq_forced_thread_fn+0xb0/0xb0
? wake_threads_waitq+0x40/0x40
? irq_thread_check_affinity+0xf0/0xf0
kthread+0x10a/0x130
? kthread_complete_and_exit+0x20/0x20
ret_from_fork+0x22/0x30
</TASK>

INFO: task irq/26-pciehp:105 blocked for more than 120 seconds.
Tainted: G        W          6.1.0-rc5-custom-master-nov14+ #2
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:irq/26-pciehp   state:D stack:0     pid:105   ppid:2      flags:0x00004000
Call Trace:
<TASK>
__schedule+0x39c/0xe90
schedule+0x6b/0xf0
schedule_preempt_disabled+0x18/0x30
__mutex_lock+0x685/0xf60
? rcu_read_lock_sched_held+0x25/0x80
? lock_release+0x24d/0x410
? __device_driver_lock+0x2d/0x50
mutex_lock_nested+0x1b/0x30
? mutex_lock_nested+0x1b/0x30
__device_driver_lock+0x2d/0x50
device_release_driver_internal+0x1f/0x170
device_release_driver+0x12/0x20
pci_stop_bus_device+0x74/0xa0
pci_stop_bus_device+0x30/0xa0
pci_stop_and_remove_bus_device+0x13/0x30
pciehp_unconfigure_device+0x80/0x140
pciehp_disable_slot+0x6e/0x110
pciehp_handle_presence_or_link_change+0xf1/0x310
pciehp_ist+0x1a0/0x1b0
? irq_thread+0xb0/0x1e0
irq_thread_fn+0x28/0x70
irq_thread+0x106/0x1e0
? irq_forced_thread_fn+0xb0/0xb0
? wake_threads_waitq+0x40/0x40
? irq_thread_check_affinity+0xf0/0xf0
kthread+0x10a/0x130
? kthread_complete_and_exit+0x20/0x20
ret_from_fork+0x22/0x30
</TASK>

Signed-off-by: Anatoli Antonovitch <anatoli.antonovitch@amd.com>
---
 drivers/pci/hotplug/pciehp_hpc.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 10e9670eea0b..b1084e67f798 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -27,6 +27,8 @@
 #include "../pci.h"
 #include "pciehp.h"
 
+static DECLARE_RWSEM(hotplug_slot_rwsem);
+
 static const struct dmi_system_id inband_presence_disabled_dmi_table[] = {
 	/*
 	 * Match all Dell systems, as some Dell systems have inband
@@ -911,7 +913,10 @@ int pciehp_reset_slot(struct hotplug_slot *hotplug_slot, bool probe)
 	if (probe)
 		return 0;
 
-	down_write_nested(&ctrl->reset_lock, ctrl->depth);
+	if (ctrl->depth > 0)
+		down_write_nested(&ctrl->reset_lock, ctrl->depth);
+	else
+		down_write(&hotplug_slot_rwsem);
 
 	if (!ATTN_BUTTN(ctrl)) {
 		ctrl_mask |= PCI_EXP_SLTCTL_PDCE;
@@ -931,7 +936,11 @@ int pciehp_reset_slot(struct hotplug_slot *hotplug_slot, bool probe)
 	ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n", __func__,
 		 pci_pcie_cap(ctrl->pcie->port) + PCI_EXP_SLTCTL, ctrl_mask);
 
-	up_write(&ctrl->reset_lock);
+	if (ctrl->depth > 0)
+		up_write(&ctrl->reset_lock);
+	else
+		up_write(&hotplug_slot_rwsem);
+
 	return rc;
 }
 
-- 
2.25.1


             reply	other threads:[~2023-01-05 18:44 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-05 18:43 Anatoli Antonovitch [this message]
2023-01-05 19:18 ` [PATCH] PCI/hotplug: Replaced down_write_nested with hotplug_slot_rwsem if ctrl->depth > 0 when taking the ctrl->reset_lock Bjorn Helgaas
     [not found]   ` <5b9a2dc7-54ab-82c5-81e7-1770a4ec891c@amd.com>
2023-01-16 18:37     ` Bjorn Helgaas
2023-01-13 17:01 Anatoli Antonovitch
2023-01-20  9:28 ` Lukas Wunner
2023-01-20 21:35   ` Anatoli Antonovitch
2023-01-21  7:21     ` Lukas Wunner
2023-01-23 19:30       ` Anatoli Antonovitch
2023-02-13 14:59         ` Anatoli Antonovitch
2023-02-17 16:03           ` Bjorn Helgaas
2023-02-17 18:37             ` Deucher, Alexander
2023-02-19 20:21               ` Lukas Wunner
2023-04-10 20:36                 ` Anatoli Antonovitch

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230105184355.9829-1-a.antonovitch@gmail.com \
    --to=a.antonovitch@gmail.com \
    --cc=Alexander.Deucher@amd.com \
    --cc=anatoli.antonovitch@amd.com \
    --cc=bhelgaas@google.com \
    --cc=christian.koenig@amd.com \
    --cc=linux-pci@vger.kernel.org \
    --cc=lukas@wunner.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).