Re: [PATCH 2/2] driver core: Fix possible supplier PM-usage counter imbalance
From: Jon Hunter
Date: Fri Feb 15 2019 - 11:44:59 EST
On 15/02/2019 14:37, Ulf Hansson wrote:
> On Fri, 15 Feb 2019 at 12:00, Jon Hunter <jonathanh@xxxxxxxxxx> wrote:
>> Hi Rafael,
>> On 12/02/2019 12:08, Rafael J. Wysocki wrote:
>>> From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
>>> If a stateless device link to a certain supplier with
>>> DL_FLAG_PM_RUNTIME set in the flags is added and then removed by the
>>> consumer driver's probe callback, the supplier's PM-runtime usage
>>> counter will be nonzero after that which effectively causes the
>>> supplier to remain "always on" going forward.
>>> Namely, device_link_add() called to add the link invokes
>>> device_link_rpm_prepare() which notices that the consumer driver is
>>> probing, so it increments the supplier's PM-runtime usage counter
>>> with the assumption that the link will stay around until
>>> pm_runtime_put_suppliers() is called by driver_probe_device(),
>>> but if the link goes away before that point, the supplier's
>>> PM-runtime usage counter will remain nonzero.
>>> To prevent that from happening, first rework pm_runtime_get_suppliers()
>>> and pm_runtime_put_suppliers() to use the rpm_active refounts of device
>>> links and make the latter only drop rpm_active and the supplier's
>>> PM-runtime usage counter for each link by one, unless rpm_active is
>>> one already for it. Next, modify device_link_add() to bump up the
>>> new link's rpm_active refcount and the suppliers PM-runtime usage
>>> counter by two, to prevent pm_runtime_put_suppliers(), if it is
>>> called subsequently, from suspending the supplier prematurely (in
>>> case its PM-runtime usage counter goes down to 0 in there).
>>> Due to the way rpm_put_suppliers() works, this change does not
>>> affect runtime suspend of the consumer ends of new device links (or,
>>> generally, device links for which DL_FLAG_PM_RUNTIME has just been
>>> Fixes: e2f3cd831a28 ("driver core: Fix handling of runtime PM flags in device_link_add()")
>>> Reported-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
>>> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
>>> Note that the issue had been there before commit e2f3cd831a28, but it was
>>> overlooked by that commit and this change is a fix on top of it, so make
>>> the Fixes: tag point to commit e2f3cd831a28 (instead of an earlier one
>>> that the patch will not be applicable to).
>> I noticed that yesterday's and today's -next were no longer booting on
>> one of our Tegra boards (Tegra210 Jetson TX2) because networking is
>> failing. The ethernet chip is a USB device and looking at the bootlogs I
>> can see that the Tegra XHCI driver is failing ...
>> tegra-xusb 70090000.usb: xHCI host controller not responding, assume dead
>> tegra-xusb 70090000.usb: HC died; cleaning up
>> The Tegra XHCI driver uses multiple power-domains and uses
>> device_link_add() to attach them. So now I am wondering if there is
>> something that we have got wrong in our implementation. However, I don't
>> see the device being probed deferred on boot or anything like that.
>> The driver in question is drivers/usb/host/xhci-tegra.c and we add the
>> links in the function tegra_xusb_powerdomain_init() which is before RPM
>> is enabled. Let me know if you have any thoughts.
> If you are willing to help debugging then I am offering my assistance.
> I would start by enabling CONFIG_PM_ADVANCED_DEBUG, which gives you
> some more information about the runtime PM state of the device, like
> the usage count for example.
> I would also add a couple of prints in
> tegra_xusb_runtime_suspend|resume() and in the ->power_on|off()
> callbacks for the corresponding genpds, to see when those gets called.
>From the bootlog I see ...
[ 4.445827] tegra_xusb_runtime_resume-788
[ 4.508799] tegra-xusb 70090000.usb: Firmware timestamp: 2015-08-10 09:47:54 UTC
[ 4.516223] tegra-xusb 70090000.usb: xHCI Host Controller
[ 4.521622] tegra-xusb 70090000.usb: new USB bus registered, assigned bus number 1
[ 4.530087] tegra-xusb 70090000.usb: hcc params 0x0184f525 hci version 0x100 quirks 0x0000000000010010
[ 4.539398] tegra-xusb 70090000.usb: irq 69, io mem 0x70090000
[ 4.553671] tegra-xusb 70090000.usb: xHCI Host Controller
[ 4.559064] tegra-xusb 70090000.usb: new USB bus registered, assigned bus number 2
[ 4.566622] tegra-xusb 70090000.usb: Host supports USB 3.0 SuperSpeed
[ 4.595393] tegra-pmc: tegra_genpd_power_off-673: xusbc
[ 4.600672] tegra-pmc: tegra_genpd_power_off-673: xusba
[ 4.657346] tegra-xusb 70090000.usb: xHCI host controller not responding, assume dead
[ 4.665157] tegra-xusb 70090000.usb: HC died; cleaning up
This shows the xusb controller is runtime resumed during probe but
then after probe the pm-domains, xusba and xusbc, are turned off
without it being runtime suspended. We never suspend it until it
is removed currently.
Following boot the xusb device appears to still be active ...
$ cat /sys/devices/platform/70090000.usb/power/runtime_status
... but the status reported by the pm_genpd summary disagrees ...
$ sudo cat /sys/kernel/debug/pm_genpd/pm_genpd_summary
domain status slaves
/device runtime status
... and ...
$ cat /sys/devices/platform/70090000.usb/power/runtime_suppliers
Let me know if you have any thoughts.