On Fri, Jan 10, 2020 at 03:25:36PM -0700, Khalid Aziz and Shuah Khan wrote: > On 1/10/20 2:42 PM, Bjorn Helgaas wrote: > > [+cc Deepa (also working in this area)] > > > > On Thu, Dec 26, 2019 at 03:21:18AM +0800, Kairui Song wrote: > >> There are reports about kdump hang upon reboot on some HPE machines, > >> kernel hanged when trying to shutdown a PCIe port, an uncorrectable > >> error occurred and crashed the system. > > > > Details? Do you have URLs for bug reports, dmesg logs, etc? > > > >> On the machine I can reproduce this issue, part of the topology > >> looks like this: > >> > >> [0000:00]-+-00.0 Intel Corporation Xeon E7 v3/Xeon E5 v3/Core i7 DMI2 > >> +-01.0-[02]-- > >> +-01.1-[05]-- > >> +-02.0-[06]--+-00.0 Emulex Corporation OneConnect NIC (Skyhawk) > >> | +-00.1 Emulex Corporation OneConnect NIC (Skyhawk) > >> | +-00.2 Emulex Corporation OneConnect NIC (Skyhawk) > >> | +-00.3 Emulex Corporation OneConnect NIC (Skyhawk) > >> | +-00.4 Emulex Corporation OneConnect NIC (Skyhawk) > >> | +-00.5 Emulex Corporation OneConnect NIC (Skyhawk) > >> | +-00.6 Emulex Corporation OneConnect NIC (Skyhawk) > >> | \-00.7 Emulex Corporation OneConnect NIC (Skyhawk) > >> +-02.1-[0f]-- > >> +-02.2-[07]----00.0 Hewlett-Packard Company Smart Array Gen9 Controllers > >> > >> When shutting down PCIe port 0000:00:02.2 or 0000:00:02.0, the machine > >> will hang, depend on which device is reinitialized in kdump kernel. > >> > >> If force remove unused device then trigger kdump, the problem will never > >> happen: > >> > >> echo 1 > /sys/bus/pci/devices/0000\:00\:02.2/0000\:07\:00.0/remove > >> echo c > /proc/sysrq-trigger > >> > >> ... Kdump save vmcore through network, the NIC get reinitialized and > >> hpsa is untouched. Then reboot with no problem. (If hpsa is used > >> instead, shutdown the NIC in first kernel will help) > >> > >> The cause is that some devices are enabled by the first kernel, but it > >> don't have the chance to shutdown the device, and kdump kernel is not > >> aware of it, unless it reinitialize the device. > >> > >> Upon reboot, kdump kernel will skip downstream device shutdown and > >> clears its bridge's master bit directly. The downstream device could > >> error out as it can still send requests but upstream refuses it. > > > > Can you help me understand the sequence of events? If I understand > > correctly, the desired sequence is: > > > > - user kernel boots > > - user kernel panics and kexecs to kdump kernel > > - kdump kernel writes vmcore to network or disk > > - kdump kernel reboots > > - user kernel boots > > > > But the problem is that as part of the kdump kernel reboot, > > > > - kdump kernel disables bus mastering for a Root Port > > - device below the Root Port attempts DMA > > - Root Port receives DMA transaction, handles it as Unsupported > > Request, sends UR Completion to device > > - device signals uncorrectable error > > - uncorrectable error causes a crash (Or a hang? You mention both > > and I'm not sure which it is) > > > > Is that right so far? > > > >> So for kdump, let kernel read the correct hardware power state on boot, > >> and always clear the bus master bit of PCI device upon shutdown if the > >> device is on. PCIe port driver will always shutdown all downstream > >> devices first, so this should ensure all downstream devices have bus > >> master bit off before clearing the bridge's bus master bit. > >> > >> Signed-off-by: Kairui Song <kasong@xxxxxxxxxx> > >> --- > >> drivers/pci/pci-driver.c | 11 ++++++++--- > >> drivers/pci/quirks.c | 20 ++++++++++++++++++++ > >> 2 files changed, 28 insertions(+), 3 deletions(-) > >> > >> diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c > >> index 0454ca0e4e3f..84a7fd643b4d 100644 > >> --- a/drivers/pci/pci-driver.c > >> +++ b/drivers/pci/pci-driver.c > >> @@ -18,6 +18,7 @@ > >> #include <linux/kexec.h> > >> #include <linux/of_device.h> > >> #include <linux/acpi.h> > >> +#include <linux/crash_dump.h> > >> #include "pci.h" > >> #include "pcie/portdrv.h" > >> > >> @@ -488,10 +489,14 @@ static void pci_device_shutdown(struct device *dev) > >> * If this is a kexec reboot, turn off Bus Master bit on the > >> * device to tell it to not continue to do DMA. Don't touch > >> * devices in D3cold or unknown states. > >> - * If it is not a kexec reboot, firmware will hit the PCI > >> - * devices with big hammer and stop their DMA any way. > >> + * If this is kdump kernel, also turn off Bus Master, the device > >> + * could be activated by previous crashed kernel and may block > >> + * it's upstream from shutting down. > >> + * Else, firmware will hit the PCI devices with big hammer > >> + * and stop their DMA any way. > >> */ > >> - if (kexec_in_progress && (pci_dev->current_state <= PCI_D3hot)) > >> + if ((kexec_in_progress || is_kdump_kernel()) && > >> + pci_dev->current_state <= PCI_D3hot) > >> pci_clear_master(pci_dev); > > > > I'm clearly missing something because this will turn off bus mastering > > in cases where we previously left it enabled. > > > > I was assuming the crash was related to a device doing DMA when the > > Root Port had bus mastering disabled. But that must be wrong. > > > > I'd like to understand the crash/hang better because the quirk > > especially is hard to connect to anything. If the crash is because of > > an AER or other PCIe error, maybe another possibility is that we could > > handle it better or disable signaling of it or something. > > > > I am not understanding this failure mode either. That code in > pci_device_shutdown() was added originally to address this very issue. > The patch 4fc9bbf98fd6 ("PCI: Disable Bus Master only on kexec reboot") > shut down any errant DMAs from PCI devices as we kexec a new kernel. In > this new patch, this is the same code path that will be taken again when > kdump kernel is shutting down. If the errant DMA problem was not fixed > by clearing Bus Master bit in this path when kdump kernel was being > kexec'd, why does the same code path work the second time around when > kdump kernel is shutting down? Is there more going on that we don't > understand? > Khalid, I don't believe we execute that code path in the crash case. The variable kexec_in_progress is set true in kernel_kexec() before calling machine_kexec(). This is the fast reboot case. I don't see kexec_in_progress set true elsewhere. The code path for crash is different. For instance, panic() will call -> __crash_kexec() which calls -> machine_kexec(). So the setting of kexec_in_progress is bypassed. Jerry -- ----------------------------------------------------------------------------- Jerry Hoemann Software Engineer Hewlett Packard Enterprise ----------------------------------------------------------------------------- _______________________________________________ kexec mailing list kexec@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/kexec