From: "Rafael J. Wysocki" <rjw@rjwysocki.net> To: linux-nvme <linux-nvme@lists.infradead.org> Cc: Keith Busch <kbusch@kernel.org>, Mario Limonciello <Mario.Limonciello@dell.com>, Kai-Heng Feng <kai.heng.feng@canonical.com>, Keith Busch <keith.busch@intel.com>, Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>, Linux PM <linux-pm@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Rajat Jain <rajatja@google.com>, Linux PCI <linux-pci@vger.kernel.org>, Bjorn Helgaas <helgaas@kernel.org> Subject: [PATCH v3 2/2] nvme-pci: Allow PCI bus-level PM to be used if ASPM is disabled Date: Thu, 08 Aug 2019 23:58:38 +0200 [thread overview] Message-ID: <4856352.pThfM6cRGE@kreacher> (raw) In-Reply-To: <2184247.yL3mcj2FRQ@kreacher> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> One of the modifications made by commit d916b1be94b6 ("nvme-pci: use host managed power state for suspend") was adding a pci_save_state() call to nvme_suspend() so as to instruct the PCI bus type to leave devices handled by the nvme driver in D0 during suspend-to-idle. That was done with the assumption that ASPM would transition the device's PCIe link into a low-power state when the device became inactive. However, if ASPM is disabled for the device, its PCIe link will stay in L0 and in that case commit d916b1be94b6 is likely to cause the energy used by the system while suspended to increase. Namely, if the device in question works in accordance with the PCIe specification, putting it into D3hot causes its PCIe link to go to L1 or L2/L3 Ready, which is lower-power than L0. Since the energy used by the system while suspended depends on the state of its PCIe link (as a general rule, the lower-power the state of the link, the less energy the system will use), putting the device into D3hot during suspend-to-idle should be more energy-efficient that leaving it in D0 with disabled ASPM. For this reason, avoid leaving NVMe devices with disabled ASPM in D0 during suspend-to-idle. Instead, shut them down entirely and let the PCI bus type put them into D3. Fixes: d916b1be94b6 ("nvme-pci: use host managed power state for suspend") Link: https://lore.kernel.org/linux-pm/2763495.NmdaWeg79L@kreacher/T/#t Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> --- v2 -> v3: * Modify the changelog to describe the rationale for this patch in a less confusing and more convincing way. -> v2: * Move the PCI/PCIe ASPM changes to a separate patch. * Do not add a redundant ndev->last_ps == U32_MAX check in nvme_suspend(). --- drivers/nvme/host/pci.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) Index: linux-pm/drivers/nvme/host/pci.c =================================================================== --- linux-pm.orig/drivers/nvme/host/pci.c +++ linux-pm/drivers/nvme/host/pci.c @@ -2846,7 +2846,7 @@ static int nvme_resume(struct device *de struct nvme_dev *ndev = pci_get_drvdata(to_pci_dev(dev)); struct nvme_ctrl *ctrl = &ndev->ctrl; - if (pm_resume_via_firmware() || !ctrl->npss || + if (ndev->last_ps == U32_MAX || nvme_set_power_state(ctrl, ndev->last_ps) != 0) nvme_reset_ctrl(ctrl); return 0; @@ -2859,6 +2859,8 @@ static int nvme_suspend(struct device *d struct nvme_ctrl *ctrl = &ndev->ctrl; int ret = -EBUSY; + ndev->last_ps = U32_MAX; + /* * The platform does not remove power for a kernel managed suspend so * use host managed nvme power settings for lowest idle power if @@ -2866,8 +2868,14 @@ static int nvme_suspend(struct device *d * shutdown. But if the firmware is involved after the suspend or the * device does not support any non-default power states, shut down the * device fully. + * + * If ASPM is not enabled for the device, shut down the device and allow + * the PCI bus layer to put it into D3 in order to take the PCIe link + * down, so as to allow the platform to achieve its minimum low-power + * state (which may not be possible if the link is up). */ - if (pm_suspend_via_firmware() || !ctrl->npss) { + if (pm_suspend_via_firmware() || !ctrl->npss || + !pcie_aspm_enabled(pdev)) { nvme_dev_disable(ndev, true); return 0; } @@ -2880,7 +2888,6 @@ static int nvme_suspend(struct device *d ctrl->state != NVME_CTRL_ADMIN_ONLY) goto unfreeze; - ndev->last_ps = 0; ret = nvme_get_power_state(ctrl, &ndev->last_ps); if (ret < 0) goto unfreeze;
WARNING: multiple messages have this Message-ID (diff)
From: rjw@rjwysocki.net (Rafael J. Wysocki) Subject: [PATCH v3 2/2] nvme-pci: Allow PCI bus-level PM to be used if ASPM is disabled Date: Thu, 08 Aug 2019 23:58:38 +0200 [thread overview] Message-ID: <4856352.pThfM6cRGE@kreacher> (raw) In-Reply-To: <2184247.yL3mcj2FRQ@kreacher> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> One of the modifications made by commit d916b1be94b6 ("nvme-pci: use host managed power state for suspend") was adding a pci_save_state() call to nvme_suspend() so as to instruct the PCI bus type to leave devices handled by the nvme driver in D0 during suspend-to-idle. That was done with the assumption that ASPM would transition the device's PCIe link into a low-power state when the device became inactive. However, if ASPM is disabled for the device, its PCIe link will stay in L0 and in that case commit d916b1be94b6 is likely to cause the energy used by the system while suspended to increase. Namely, if the device in question works in accordance with the PCIe specification, putting it into D3hot causes its PCIe link to go to L1 or L2/L3 Ready, which is lower-power than L0. Since the energy used by the system while suspended depends on the state of its PCIe link (as a general rule, the lower-power the state of the link, the less energy the system will use), putting the device into D3hot during suspend-to-idle should be more energy-efficient that leaving it in D0 with disabled ASPM. For this reason, avoid leaving NVMe devices with disabled ASPM in D0 during suspend-to-idle. Instead, shut them down entirely and let the PCI bus type put them into D3. Fixes: d916b1be94b6 ("nvme-pci: use host managed power state for suspend") Link: https://lore.kernel.org/linux-pm/2763495.NmdaWeg79L at kreacher/T/#t Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki at intel.com> --- v2 -> v3: * Modify the changelog to describe the rationale for this patch in a less confusing and more convincing way. -> v2: * Move the PCI/PCIe ASPM changes to a separate patch. * Do not add a redundant ndev->last_ps == U32_MAX check in nvme_suspend(). --- drivers/nvme/host/pci.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) Index: linux-pm/drivers/nvme/host/pci.c =================================================================== --- linux-pm.orig/drivers/nvme/host/pci.c +++ linux-pm/drivers/nvme/host/pci.c @@ -2846,7 +2846,7 @@ static int nvme_resume(struct device *de struct nvme_dev *ndev = pci_get_drvdata(to_pci_dev(dev)); struct nvme_ctrl *ctrl = &ndev->ctrl; - if (pm_resume_via_firmware() || !ctrl->npss || + if (ndev->last_ps == U32_MAX || nvme_set_power_state(ctrl, ndev->last_ps) != 0) nvme_reset_ctrl(ctrl); return 0; @@ -2859,6 +2859,8 @@ static int nvme_suspend(struct device *d struct nvme_ctrl *ctrl = &ndev->ctrl; int ret = -EBUSY; + ndev->last_ps = U32_MAX; + /* * The platform does not remove power for a kernel managed suspend so * use host managed nvme power settings for lowest idle power if @@ -2866,8 +2868,14 @@ static int nvme_suspend(struct device *d * shutdown. But if the firmware is involved after the suspend or the * device does not support any non-default power states, shut down the * device fully. + * + * If ASPM is not enabled for the device, shut down the device and allow + * the PCI bus layer to put it into D3 in order to take the PCIe link + * down, so as to allow the platform to achieve its minimum low-power + * state (which may not be possible if the link is up). */ - if (pm_suspend_via_firmware() || !ctrl->npss) { + if (pm_suspend_via_firmware() || !ctrl->npss || + !pcie_aspm_enabled(pdev)) { nvme_dev_disable(ndev, true); return 0; } @@ -2880,7 +2888,6 @@ static int nvme_suspend(struct device *d ctrl->state != NVME_CTRL_ADMIN_ONLY) goto unfreeze; - ndev->last_ps = 0; ret = nvme_get_power_state(ctrl, &ndev->last_ps); if (ret < 0) goto unfreeze;
next prev parent reply other threads:[~2019-08-08 21:59 UTC|newest] Thread overview: 150+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-25 9:51 [Regression] Commit "nvme/pci: Use host managed power state for suspend" has problems Rafael J. Wysocki 2019-07-25 9:51 ` Rafael J. Wysocki 2019-07-25 14:02 ` Kai-Heng Feng 2019-07-25 14:02 ` Kai-Heng Feng 2019-07-25 16:23 ` Mario.Limonciello 2019-07-25 16:23 ` Mario.Limonciello 2019-07-25 17:03 ` Rafael J. Wysocki 2019-07-25 17:03 ` Rafael J. Wysocki 2019-07-25 17:23 ` Mario.Limonciello 2019-07-25 17:23 ` Mario.Limonciello 2019-07-25 18:20 ` Kai-Heng Feng 2019-07-25 18:20 ` Kai-Heng Feng 2019-07-25 19:09 ` Mario.Limonciello 2019-07-25 19:09 ` Mario.Limonciello 2019-07-30 10:45 ` Rafael J. Wysocki 2019-07-30 10:45 ` Rafael J. Wysocki 2019-07-30 14:41 ` Keith Busch 2019-07-30 14:41 ` Keith Busch 2019-07-30 17:14 ` Mario.Limonciello 2019-07-30 17:14 ` Mario.Limonciello 2019-07-30 18:50 ` Kai-Heng Feng 2019-07-30 18:50 ` Kai-Heng Feng 2019-07-30 19:19 ` Keith Busch 2019-07-30 19:19 ` Keith Busch 2019-07-30 21:05 ` Mario.Limonciello 2019-07-30 21:05 ` Mario.Limonciello 2019-07-30 21:31 ` Keith Busch 2019-07-30 21:31 ` Keith Busch 2019-07-31 21:25 ` Rafael J. Wysocki 2019-07-31 21:25 ` Rafael J. Wysocki 2019-07-31 22:19 ` Keith Busch 2019-07-31 22:19 ` Keith Busch 2019-07-31 22:33 ` Rafael J. Wysocki 2019-07-31 22:33 ` Rafael J. Wysocki 2019-08-01 9:05 ` Kai-Heng Feng 2019-08-01 9:05 ` Kai-Heng Feng 2019-08-01 17:29 ` Rafael J. Wysocki 2019-08-01 17:29 ` Rafael J. Wysocki 2019-08-01 19:05 ` Mario.Limonciello 2019-08-01 19:05 ` Mario.Limonciello 2019-08-01 22:26 ` Rafael J. Wysocki 2019-08-01 22:26 ` Rafael J. Wysocki 2019-08-02 10:55 ` Kai-Heng Feng 2019-08-02 10:55 ` Kai-Heng Feng 2019-08-02 11:04 ` Rafael J. Wysocki 2019-08-02 11:04 ` Rafael J. Wysocki 2019-08-05 19:13 ` Kai-Heng Feng 2019-08-05 19:13 ` Kai-Heng Feng 2019-08-05 21:28 ` Rafael J. Wysocki 2019-08-05 21:28 ` Rafael J. Wysocki 2019-08-06 14:02 ` Mario.Limonciello 2019-08-06 14:02 ` Mario.Limonciello 2019-08-06 15:00 ` Rafael J. Wysocki 2019-08-06 15:00 ` Rafael J. Wysocki 2019-08-07 10:29 ` Rafael J. Wysocki 2019-08-07 10:29 ` Rafael J. Wysocki 2019-08-01 20:22 ` Keith Busch 2019-08-01 20:22 ` Keith Busch 2019-08-07 9:48 ` Rafael J. Wysocki 2019-08-07 9:48 ` Rafael J. Wysocki 2019-08-07 10:45 ` Christoph Hellwig 2019-08-07 10:45 ` Christoph Hellwig 2019-08-07 10:54 ` Rafael J. Wysocki 2019-08-07 10:54 ` Rafael J. Wysocki 2019-08-07 9:53 ` [PATCH] nvme-pci: Do not prevent PCI bus-level PM from being used Rafael J. Wysocki 2019-08-07 9:53 ` Rafael J. Wysocki 2019-08-07 10:14 ` Rafael J. Wysocki 2019-08-07 10:14 ` Rafael J. Wysocki 2019-08-07 10:43 ` Christoph Hellwig 2019-08-07 10:43 ` Christoph Hellwig 2019-08-07 14:37 ` Keith Busch 2019-08-07 14:37 ` Keith Busch 2019-08-08 8:36 ` [PATCH] nvme-pci: Allow PCI bus-level PM to be used if ASPM is disabled Rafael J. Wysocki 2019-08-08 8:36 ` Rafael J. Wysocki 2019-08-08 8:48 ` Christoph Hellwig 2019-08-08 8:48 ` Christoph Hellwig 2019-08-08 9:06 ` Rafael J. Wysocki 2019-08-08 9:06 ` Rafael J. Wysocki 2019-08-08 10:03 ` [PATCH v2 0/2] " Rafael J. Wysocki 2019-08-08 10:03 ` Rafael J. Wysocki 2019-08-08 10:06 ` [PATCH v2 1/2] PCI: PCIe: ASPM: Introduce pcie_aspm_enabled_mask() Rafael J. Wysocki 2019-08-08 10:06 ` Rafael J. Wysocki 2019-08-08 13:15 ` Bjorn Helgaas 2019-08-08 13:15 ` Bjorn Helgaas 2019-08-08 14:48 ` Rafael J. Wysocki 2019-08-08 14:48 ` Rafael J. Wysocki 2019-08-08 10:10 ` [PATCH v2 2/2] nvme-pci: Allow PCI bus-level PM to be used if ASPM is disabled Rafael J. Wysocki 2019-08-08 10:10 ` Rafael J. Wysocki 2019-08-08 13:43 ` Bjorn Helgaas 2019-08-08 13:43 ` Bjorn Helgaas 2019-08-08 14:47 ` Rafael J. Wysocki 2019-08-08 14:47 ` Rafael J. Wysocki 2019-08-08 17:06 ` Rafael J. Wysocki 2019-08-08 17:06 ` Rafael J. Wysocki 2019-08-08 18:39 ` Bjorn Helgaas 2019-08-08 18:39 ` Bjorn Helgaas 2019-08-08 20:01 ` Keith Busch 2019-08-08 20:01 ` Keith Busch 2019-08-08 20:05 ` Mario.Limonciello 2019-08-08 20:05 ` Mario.Limonciello 2019-08-08 20:41 ` Rafael J. Wysocki 2019-08-08 20:41 ` Rafael J. Wysocki 2019-08-09 4:47 ` Bjorn Helgaas 2019-08-09 4:47 ` Bjorn Helgaas 2019-08-09 8:04 ` Rafael J. Wysocki 2019-08-09 8:04 ` Rafael J. Wysocki 2019-08-08 21:51 ` [PATCH v3 0/2] " Rafael J. Wysocki 2019-08-08 21:51 ` Rafael J. Wysocki 2019-08-08 21:55 ` [PATCH v3 1/2] PCI: PCIe: ASPM: Introduce pcie_aspm_enabled() Rafael J. Wysocki 2019-08-08 21:55 ` Rafael J. Wysocki 2019-08-09 4:50 ` Bjorn Helgaas 2019-08-09 4:50 ` Bjorn Helgaas 2019-08-09 8:00 ` Rafael J. Wysocki 2019-08-09 8:00 ` Rafael J. Wysocki 2019-10-07 22:34 ` Bjorn Helgaas 2019-10-07 22:34 ` Bjorn Helgaas 2019-10-08 9:27 ` Rafael J. Wysocki 2019-10-08 9:27 ` Rafael J. Wysocki 2019-10-08 21:16 ` Bjorn Helgaas 2019-10-08 21:16 ` Bjorn Helgaas 2019-10-08 22:54 ` Rafael J. Wysocki 2019-10-08 22:54 ` Rafael J. Wysocki 2019-10-09 12:49 ` Bjorn Helgaas 2019-10-09 12:49 ` Bjorn Helgaas 2019-08-08 21:58 ` Rafael J. Wysocki [this message] 2019-08-08 21:58 ` [PATCH v3 2/2] nvme-pci: Allow PCI bus-level PM to be used if ASPM is disabled Rafael J. Wysocki 2019-08-08 22:13 ` [PATCH v3 0/2] " Keith Busch 2019-08-08 22:13 ` Keith Busch 2019-08-09 8:05 ` Rafael J. Wysocki 2019-08-09 8:05 ` Rafael J. Wysocki 2019-08-09 14:52 ` Keith Busch 2019-08-09 14:52 ` Keith Busch 2019-07-25 16:59 ` [Regression] Commit "nvme/pci: Use host managed power state for suspend" has problems Rafael J. Wysocki 2019-07-25 16:59 ` Rafael J. Wysocki 2019-07-25 14:52 ` Keith Busch 2019-07-25 14:52 ` Keith Busch 2019-07-25 19:48 ` Rafael J. Wysocki 2019-07-25 19:48 ` Rafael J. Wysocki 2019-07-25 19:52 ` Keith Busch 2019-07-25 19:52 ` Keith Busch 2019-07-25 20:02 ` Rafael J. Wysocki 2019-07-25 20:02 ` Rafael J. Wysocki 2019-07-26 14:02 ` Kai-Heng Feng 2019-07-26 14:02 ` Kai-Heng Feng 2019-07-27 12:55 ` Rafael J. Wysocki 2019-07-27 12:55 ` Rafael J. Wysocki 2019-07-29 15:51 ` Mario.Limonciello 2019-07-29 15:51 ` Mario.Limonciello 2019-07-29 22:05 ` Rafael J. Wysocki 2019-07-29 22:05 ` Rafael J. Wysocki
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=4856352.pThfM6cRGE@kreacher \ --to=rjw@rjwysocki.net \ --cc=Mario.Limonciello@dell.com \ --cc=hch@lst.de \ --cc=helgaas@kernel.org \ --cc=kai.heng.feng@canonical.com \ --cc=kbusch@kernel.org \ --cc=keith.busch@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=rajatja@google.com \ --cc=sagi@grimberg.me \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.