Re: [3.11.4] Thunderbolt/PCI unplug oops in pci_pme_list_scan
From: Andreas Noever
Date: Thu Oct 17 2013 - 09:59:37 EST
On Wed, Oct 16, 2013 at 10:21 PM, Bjorn Helgaas <bhelgaas@xxxxxxxxxx> wrote:
> On Tue, Oct 15, 2013 at 03:44:52AM +0100, Matthew Garrett wrote:
>> On Mon, Oct 14, 2013 at 05:50:38PM -0600, Bjorn Helgaas wrote:
>> > [+cc Rafael, Mika, Kirill, linux-pci]
>> >
>> > On Mon, Oct 14, 2013 at 4:47 PM, Andreas Noever
>> > <andreas.noever@xxxxxxxxx> wrote:
>> > > When I unplug the Thunderbolt ethernet adapter on my MacBookPro Linux
>> > > crashes a few seconds later. Using
>> > > echo 1 > /sys/bus/pci/devices/0000:08:00.0/remove
>> > > to remove a bridge two levels above the device triggers the fault immediately:
>> >
>> > There have been significant changes in acpiphp related to Thunderbolt
>> > since v3.11.
>>
>> Apple don't expose Thunderbolt via ACPI, so it appears as native PCIe.
>> I'd be surprised if acpiphp makes a difference here.
>
> Yeah, you're right; I wasn't paying attention.
>
> We save a pci_dev pointer in the pci_pme_list, which of course has a
> longer lifetime than the pci_dev itself, but we don't acquire a reference
> on it, so I suspect the pci_dev got released before we got around to
> doing the pci_pme_list_scan().
>
> Andreas, can you try the patch below? It's against v3.12-rc2, but it
> should apply to v3.11, too.
I have tested your patch against 3.11 where it solves the problem. Thanks!
Unfortunately I could not reproduce the problem in 3.12-rc5. I only
get the following warning (and no crash):
tg3 0000:0a:00.0: PME# disabled
pcieport 0000:09:00.0: PME# disabled
pciehp 0000:09:00.0:pcie24: unloading service driver pciehp
pci_bus 0000:0a: dev 00, dec refcount to 0
pci_bus 0000:0a: dev 00, released physical slot 9
------------[ cut here ]------------
WARNING: CPU: 0 PID: 122 at drivers/pci/pci.c:1430
pci_disable_device+0x84/0x90()
Device pcieport
disabling already-disabled device
Modules linked in:
btusb bluetooth joydev hid_apple bcm5974 nls_utf8 nls_cp437 hfsplus
vfat fat snd_hda_codec_hdmi x86_pkg_temp_thermal intel_powerclamp
coretemp kvm_intel kvm cfg80211 uvcvideo crc32_pclmul crc32c_intel
videobuf2_vmalloc ghash_clmulni_intel aesni_intel videobuf2_memops
aes_x86_64 glue_helper videobuf2_core tg3 videodev lrw gf128mul
ablk_helper iTCO_wdt hid_generic iTCO_vendor_support cryptd media
applesmc input_polldev usbhid ptp microcode snd_hda_codec_cirrus hid
pps_core libphy rfkill i2c_i801 pcspkr snd_hda_intel apple_gmux
lib80211 snd_hda_codec acpi_cpufreq snd_hwdep snd_pcm snd_page_alloc
snd_timer mei_me snd mei processor soundcore lpc_ich evdev mfd_core
apple_bl ac battery ext4 crc16 mbcache jbd2 sd_mod ahci libahci libata
xhci_hcd ehci_pci sdhci_pci ehci_hcd sdhci scsi_mod mmc_core
usbcore usb_common nouveau mxm_wmi wmi ttm i915 video button
i2c_algo_bit intel_agp intel_gtt drm_kms_helper drm i2c_core
CPU: 0 PID: 122 Comm: kworker/u16:5 Not tainted 3.12.0-1-dirty #30
Hardware name: Apple Inc. MacBookPro10,1/Mac-C3EC7CD22292981F, BIOS
MBP101.88Z.00EE.B03.1212211437 12/21/2012
Workqueue: sysfsd sysfs_schedule_callback_work
0000000000000009 ffff88044c021c00 ffffffff814c4288 ffff88044c021c48
ffff88044c021c38 ffffffff81061b7d ffff880458a5c000 ffffffff8187c5c0
ffff880458a5c000 ffff880458a5b098 0000000000000000 ffff88044c021c98
Call Trace:
[<ffffffff814c4288>] dump_stack+0x54/0x8d
[<ffffffff81061b7d>] warn_slowpath_common+0x7d/0xa0
[<ffffffff81061bec>] warn_slowpath_fmt+0x4c/0x50
[<ffffffff812bdd92>] ? do_pci_disable_device+0x52/0x60
[<ffffffff813097f3>] ? acpi_pci_irq_disable+0x4c/0x8d
[<ffffffff812bde24>] pci_disable_device+0x84/0x90
[<ffffffff812cc62a>] pcie_portdrv_remove+0x1a/0x20
[<ffffffff812bfcdb>] pci_device_remove+0x3b/0xb0
[<ffffffff81381caf>] __device_release_driver+0x7f/0xf0
[<ffffffff81381d43>] device_release_driver+0x23/0x30
[<ffffffff813814d8>] bus_remove_device+0x108/0x180
[<ffffffff8137de75>] device_del+0x135/0x1d0
[<ffffffff812ba394>] pci_stop_bus_device+0x94/0xa0
[<ffffffff812ba33b>] pci_stop_bus_device+0x3b/0xa0
[<ffffffff812ba4a2>] pci_stop_and_remove_bus_device+0x12/0x20
[<ffffffff812c15c5>] remove_callback+0x25/0x40
[<ffffffff81212ad4>] sysfs_schedule_callback_work+0x14/0x80
[<ffffffff8107c9e8>] process_one_work+0x178/0x470
[<ffffffff8107d3b1>] worker_thread+0x121/0x3a0
[<ffffffff8107d290>] ? manage_workers.isra.21+0x2b0/0x2b0
[<ffffffff810840f0>] kthread+0xc0/0xd0
[<ffffffff81084030>] ? kthread_create_on_node+0x120/0x120
[<ffffffff814d2dfc>] ret_from_fork+0x7c/0xb0
[<ffffffff81084030>] ? kthread_create_on_node+0x120/0x120
---[ end trace b39a15fa94fbb2a2 ]---
Bisection points to 928bea964827d7824b548c1f8e06eccbbc4d0d7d .
>From this commit on the pci_pme_list_scan crash disappears and the
warning appears.
Since this commit seems to just mask the problem I went ahead and
tested your patch on 3.12-rc5 as well. It seems to work (not crash)
but the warning is still there.
The above warning was triggered by removing the 08 bridge via sysfs.
The same warning can be triggered by unplugging the adapter (dmesg
below). The ethernet card is removed immediately. The bridges follow
15 seconds later together with the warning. The topology is:
06:03.0 -- 08 -- 09 -- 0a (tg3)
(full lspci -vv is attached)
[ 25.077577] pciehp 0000:06:03.0:pcie24: Card not present on Slot(3-1)
[ 25.077626] tg3 0000:0a:00.0: PME# disabled
[ 26.284664] tg3 0000:0a:00.0: tg3_abort_hw timed out,
TX_MODE_ENABLE will not clear MAC_TX_MODE=ffffffff
[ 27.669942] tg3 0000:0a:00.0 ens9: No firmware running
[ 38.661674] tg3 0000:0a:00.0 ens9: Link is down
[ 40.094609] pcieport 0000:09:00.0: PME# disabled
[ 40.094771] pciehp 0000:09:00.0:pcie24: unloading service driver pciehp
[ 40.094781] pci_bus 0000:0a: dev 00, dec refcount to 0
[ 40.094795] pci_bus 0000:0a: dev 00, released physical slot 9
[ 40.094981] ------------[ cut here ]------------
[ 40.094992] WARNING: CPU: 0 PID: 53 at drivers/pci/pci.c:1430
pci_disable_device+0x84/0x90()
[ 40.094995] Device pcieport
disabling already-disabled device
[ 40.094997] Modules linked in:
[ 40.094999] btusb bluetooth joydev hid_apple bcm5974
lib80211_crypt_tkip nls_cp437 vfat fat snd_hda_codec_hdmi nls_utf8
x86_pkg_temp_thermal intel_powerclamp hfsplus coretemp wl(O) kvm_intel
kvm crc32_pclmul crc32c_intel ghash_clmulni_intel aesni_intel
aes_x86_64 glue_helper lrw gf128mul iTCO_wdt ablk_helper tg3 cryptd
cfg80211 hid_generic applesmc iTCO_vendor_support input_polldev usbhid
ptp hid snd_hda_codec_cirrus microcode pps_core libphy i2c_i801 pcspkr
snd_hda_intel rfkill snd_hda_codec lib80211 uvcvideo snd_hwdep
videobuf2_vmalloc videobuf2_memops snd_pcm videobuf2_core videodev
acpi_cpufreq mei_me apple_gmux snd_page_alloc mei snd_timer lpc_ich
mfd_core snd media battery apple_bl soundcore evdev processor ac ext4
crc16 mbcache jbd2 sd_mod ahci libahci libata xhci_hcd ehci_pci
sdhci_pci ehci_hcd
[ 40.095212] sdhci scsi_mod mmc_core usbcore usb_common nouveau
mxm_wmi wmi ttm i915 video button i2c_algo_bit intel_agp intel_gtt
drm_kms_helper drm i2c_core
[ 40.095242] CPU: 0 PID: 53 Comm: kworker/0:1 Tainted: G W O
3.12.0-1-dirty #31
[ 40.095246] Hardware name: Apple Inc.
MacBookPro10,1/Mac-C3EC7CD22292981F, BIOS
MBP101.88Z.00EE.B03.1212211437 12/21/2012
[ 40.095253] Workqueue: pciehp-3 pciehp_power_thread
[ 40.095256] 0000000000000009 ffff880458ab5b98 ffffffff814c42b8
ffff880458ab5be0
[ 40.095262] ffff880458ab5bd0 ffffffff81061b7d ffff880458a5c000
ffffffff8187c5c0
[ 40.095268] ffff880458a5c000 ffff880458a5b098 0000000000000000
ffff880458ab5c30
[ 40.095287] Call Trace:
[ 40.095293] [<ffffffff814c42b8>] dump_stack+0x54/0x8d
[ 40.095298] [<ffffffff81061b7d>] warn_slowpath_common+0x7d/0xa0
[ 40.095302] [<ffffffff81061bec>] warn_slowpath_fmt+0x4c/0x50
[ 40.095306] [<ffffffff812bddb2>] ? do_pci_disable_device+0x52/0x60
[ 40.095310] [<ffffffff81309823>] ? acpi_pci_irq_disable+0x4c/0x8d
[ 40.095313] [<ffffffff812bde44>] pci_disable_device+0x84/0x90
[ 40.095317] [<ffffffff812cc65a>] pcie_portdrv_remove+0x1a/0x20
[ 40.095321] [<ffffffff812bfd0b>] pci_device_remove+0x3b/0xb0
[ 40.095325] [<ffffffff81381cdf>] __device_release_driver+0x7f/0xf0
[ 40.095328] [<ffffffff81381d73>] device_release_driver+0x23/0x30
[ 40.095331] [<ffffffff81381508>] bus_remove_device+0x108/0x180
[ 40.095336] [<ffffffff8137dea5>] device_del+0x135/0x1d0
[ 40.095350] [<ffffffff812ba394>] pci_stop_bus_device+0x94/0xa0
[ 40.095353] [<ffffffff812ba33b>] pci_stop_bus_device+0x3b/0xa0
[ 40.095357] [<ffffffff812ba4a2>] pci_stop_and_remove_bus_device+0x12/0x20
[ 40.095361] [<ffffffff812d2e48>] pciehp_unconfigure_device+0xa8/0x1b0
[ 40.095364] [<ffffffff812d27a8>] pciehp_disable_slot+0x68/0x200
[ 40.095368] [<ffffffff812d29c3>] pciehp_power_thread+0x83/0xf0
[ 40.095372] [<ffffffff8107c9e8>] process_one_work+0x178/0x470
[ 40.095375] [<ffffffff8107d3b1>] worker_thread+0x121/0x3a0
[ 40.095379] [<ffffffff8107d290>] ? manage_workers.isra.21+0x2b0/0x2b0
[ 40.095382] [<ffffffff810840f0>] kthread+0xc0/0xd0
[ 40.095385] [<ffffffff81084030>] ? kthread_create_on_node+0x120/0x120
[ 40.095389] [<ffffffff814d2e3c>] ret_from_fork+0x7c/0xb0
[ 40.095392] [<ffffffff81084030>] ? kthread_create_on_node+0x120/0x120
[ 40.095404] ---[ end trace 12862498ad48cb36 ]---
[ 40.095513] pcieport 0000:08:00.0: PME# disabled
[ 40.096296] pci_bus 0000:0a: busn_res: [bus 0a] is released
[ 40.096367] pci_bus 0000:09: busn_res: [bus 09-0a] is released
Attachment:
lspcivv
Description: Binary data