Skip to content

Commit f556b6b

Browse files
dns42gregkh
authored andcommitted
PCI/ASPM: Fix link state exit during switch upstream function removal
[ Upstream commit cbf937d ] Before 456d8aa ("PCI/ASPM: Disable ASPM on MFD function removal to avoid use-after-free"), we would free the ASPM link only after the last function on the bus pertaining to the given link was removed. That was too late. If function 0 is removed before sibling function, link->downstream would point to free'd memory after. After above change, we freed the ASPM parent link state upon any function removal on the bus pertaining to a given link. That is too early. If the link is to a PCIe switch with MFD on the upstream port, then removing functions other than 0 first would free a link which still remains parent_link to the remaining downstream ports. The resulting GPFs are especially frequent during hot-unplug, because pciehp removes devices on the link bus in reverse order. On that switch, function 0 is the virtual P2P bridge to the internal bus. Free exactly when function 0 is removed -- before the parent link is obsolete, but after all subordinate links are gone. Link: https://lore.kernel.org/r/e12898835f25234561c9d7de4435590d957b85d9.1734924854.git.dns@arista.com Fixes: 456d8aa ("PCI/ASPM: Disable ASPM on MFD function removal to avoid use-after-free") Signed-off-by: Daniel Stodden <dns@arista.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> [kwilczynski: commit log] Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 4f99784 commit f556b6b

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

drivers/pci/pcie/aspm.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1242,16 +1242,16 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
12421242
parent_link = link->parent;
12431243

12441244
/*
1245-
* link->downstream is a pointer to the pci_dev of function 0. If
1246-
* we remove that function, the pci_dev is about to be deallocated,
1247-
* so we can't use link->downstream again. Free the link state to
1248-
* avoid this.
1245+
* Free the parent link state, no later than function 0 (i.e.
1246+
* link->downstream) being removed.
12491247
*
1250-
* If we're removing a non-0 function, it's possible we could
1251-
* retain the link state, but PCIe r6.0, sec 7.5.3.7, recommends
1252-
* programming the same ASPM Control value for all functions of
1253-
* multi-function devices, so disable ASPM for all of them.
1248+
* Do not free the link state any earlier. If function 0 is a
1249+
* switch upstream port, this link state is parent_link to all
1250+
* subordinate ones.
12541251
*/
1252+
if (pdev != link->downstream)
1253+
goto out;
1254+
12551255
pcie_config_aspm_link(link, 0);
12561256
list_del(&link->sibling);
12571257
free_link_state(link);
@@ -1262,6 +1262,7 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev)
12621262
pcie_config_aspm_path(parent_link);
12631263
}
12641264

1265+
out:
12651266
mutex_unlock(&aspm_lock);
12661267
up_read(&pci_bus_sem);
12671268
}

0 commit comments

Comments
 (0)