PCI/ASPM: Call pcie_aspm_sanity_check() as late as possible
PATCH 1/1 PCI/ASPM: Call pcie_aspm_sanity_check() as late as possible
In pcie_aspm_init_link_state(), a number of checks are made to determine whether the function should proceed, before the result of the call to pcie_aspm_sanity_check() is actually used. The latter function doesn't change any state, it only reports a result, so calling it later doesn't make any difference to the state of the devices or the information we have about them. But having the call early reportedly can cause null-pointer dereferences; see
https://unix.stackexchange.com/q/322337 for one example with pcie_aspm=off (this was reported in 2016, but the relevant code hasn't changed since then).
This moves the call to pcie_aspm_sanity_check() just before the result is actually used, giving all the other checks a chance to run first.
--- drivers/pci/pcie/aspm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/pci/pcie/aspm.c +2 -1
@@ -889,7 +889,7 @@ static void pcie_aspm_update_sysfs_visibility(struct pci_dev *pdev)void pcie_aspm_init_link_state (struct pci_dev *pdev) {struct pcie_link_state *link; -int blacklist = !!pcie_aspm_sanity_check (pdev); +int blacklist;if (!aspm_support_enabled)return ;
@@ -923,6 +923,7 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)* upstream links also because capable state of them can be * update through pcie_aspm_cap_init(). */ + blacklist = !!pcie_aspm_sanity_check (pdev);pcie_aspm_cap_init (link, blacklist);/* Setup initial Clock PM state */
base-commit: 833477fce7a14d43ae4c07f8ddc32fa5119471a2
Signature · 1 line
2.30.2
[+cc Jan]
Quoted 10 lines · Stephen Kitt
In
pcie_aspm_init_link_state(), a number of checks are made to determine whether the function should proceed, before the result of the call topcie_aspm_sanity_check()is actually used. The latter function doesn't change any state, it only reports a result, so calling it later doesn't make any difference to the state of the devices or the information we have about them. But having the call early reportedly can cause null-pointer dereferences; see
https://unix.stackexchange.com/q/322337 for one example with pcie_aspm=off (this was reported in 2016, but the relevant code hasn't changed since then).
Thanks, Stephen!
That stackexchange report doesn't have much information, but it looks similar to this old report from Jan Rueth, which I'm sorry to say I never got resolved:
https://bugzilla.kernel.org/show_bug.cgi?id=187731
https://lore.kernel.org/all/[email protected]/#t
And Jan's patch is almost identical to yours :)
I hope to get this resolved, but I don't have time to work on it before the upcoming merge window, which will probably open Sunday. And then it's holiday time, so it may be January before I get back to it. I'm just dropping the links here as breadcrumbs for picking this back up.
Bjorn
Quoted 34 lines
This moves the call to
pcie_aspm_sanity_check()just before the result is actually used, giving all the other checks a chance to run first.Signed-off-by Stephen Kitt <[email protected]>--- drivers/pci/pcie/aspm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/pci/pcie/aspm.c +2
-1@@ -889,7 +889,7 @@ static void pcie_aspm_update_sysfs_visibility(struct pci_dev *pdev)void pcie_aspm_init_link_state (struct pci_dev *pdev) {struct pcie_link_state *link; -int blacklist = !!pcie_aspm_sanity_check (pdev); +int blacklist;if (!aspm_support_enabled)return ;@@ -923,6 +923,7 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)* upstream links also because capable state of them can be * update through pcie_aspm_cap_init(). */ + blacklist = !!pcie_aspm_sanity_check (pdev);pcie_aspm_cap_init (link, blacklist);/* Setup initial Clock PM state */ base-commit:
833477fce7a14d43ae4c07f8ddc32fa5119471a2Signature · 1 line
2.30.2
Hi Bjorn,
Quoted 21 lines · Bjorn Helgaas
Quoted 10 lines · Stephen Kitt
In
pcie_aspm_init_link_state(), a number of checks are made to determine whether the function should proceed, before the result of the call topcie_aspm_sanity_check()is actually used. The latter function doesn't change any state, it only reports a result, so calling it later doesn't make any difference to the state of the devices or the information we have about them. But having the call early reportedly can cause null-pointer dereferences; see
https://unix.stackexchange.com/q/322337 for one example with pcie_aspm=off (this was reported in 2016, but the relevant code hasn't changed since then).Thanks, Stephen!
That stackexchange report doesn't have much information, but it looks similar to this old report from Jan Rueth, which I'm sorry to say I never got resolved:
https://bugzilla.kernel.org/show_bug.cgi?id=187731
https://lore.kernel.org/all/[email protected]/#t
Quoted 7 lines
And Jan's patch is almost identical to yours :)
I hope to get this resolved, but I don't have time to work on it before the upcoming merge window, which will probably open Sunday. And then it's holiday time, so it may be January before I get back to it. I'm just dropping the links here as breadcrumbs for picking this back up.
Thanks for the update! I was somewhat bemused by the dereference here, I’m reassured to see I’m not the only one. Unfortunately I don’t have hardware which exhibits this problem, I submitted the patch because it seemed reasonably sensible even though as you say there is probably something else going on here. Of course if this approach is useful, Jan’s patch should go in rather than mine.
Anyway, it’s been six years, so a few more weeks won’t make any difference ;-).
Enjoy the holiday season!
Regards,
Stephen
Quoted 32 lines · Stephen Kitt
Hi Bjorn,
Quoted 21 lines · Bjorn Helgaas
Quoted 10 lines · Stephen Kitt
In
pcie_aspm_init_link_state(), a number of checks are made to determine whether the function should proceed, before the result of the call topcie_aspm_sanity_check()is actually used. The latter function doesn't change any state, it only reports a result, so calling it later doesn't make any difference to the state of the devices or the information we have about them. But having the call early reportedly can cause null-pointer dereferences; see
https://unix.stackexchange.com/q/322337 for one example with pcie_aspm=off (this was reported in 2016, but the relevant code hasn't changed since then).Thanks, Stephen!
That stackexchange report doesn't have much information, but it looks similar to this old report from Jan Rueth, which I'm sorry to say I never got resolved:
https://bugzilla.kernel.org/show_bug.cgi?id=187731
https://lore.kernel.org/all/[email protected]/#tQuoted 7 lines
And Jan's patch is almost identical to yours :)
I hope to get this resolved, but I don't have time to work on it before the upcoming merge window, which will probably open Sunday. And then it's holiday time, so it may be January before I get back to it. I'm just dropping the links here as breadcrumbs for picking this back up.
Quoted 3 lines
Thanks for the update! I was somewhat bemused by the dereference here, I’m reassured to see I’m not the only one. Unfortunately I don’t have hardware which exhibits this problem,
Yeah, that's a weird thing about this. This shouldn't be a platform-specific thing, but both stackexchange and Jan's patch mention IBM x3850.
Maybe both came from a single source, or maybe there's something deeper going on.
Quoted 13 lines
I submitted the patch because it seemed
reasonably sensible even though as you say there is probably something else going on here. Of course if this approach is useful, Jan’s patch should go in rather than mine.Anyway, it’s been six years, so a few more weeks won’t make any difference ;-).
Enjoy the holiday season!
Regards,
Stephen