PCI/ASPM: Fix NULL pointer when find parent pcie_link_state
PATCH v4 2/3 PCI/ASPM: Fix NULL pointer when find parent pcie_link_state
https://bugzilla.kernel.org/show_bug.cgi?id=94361 reported in ATCA platform, system had unusual pcie topology:
(root port) (downstream port) (upstream port)
+-1c.0-[02-0a]----00.0-[03-0a]--+-00.0-[04]-- | +-01.0-[05]-- (downstream port) | +-02.0-[06]-- | +-03.0-[07]-- | +-08.0-[08]-- | +-09.0-[09]-- | \-0a.0-[0a]--
We assumed root port and downstream port always have external link, and downstream port always has a upstream port. So in this case, when we allocated pcie_link_state for downstream port 02:00.0, it try to get parent bus pcie_link_state,
parent = pdev->bus->parent->self->link_state; because root bus self is NULL, system will crash here.
Use pdev->has_secondary_link(introduced in previous patch) to fix this issue.
--- drivers/pci/pcie/aspm.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
drivers/pci/pcie/aspm.c +4 -5
@@ -525,7 +525,7 @@ static struct pcie_link_state *alloc_pcie_link_state(struct pci_dev *pdev)INIT_LIST_HEAD (&link->children);INIT_LIST_HEAD (&link->link); link->pdev = pdev; -if (pci_pcie_type (pdev) ==PCI_EXP_TYPE_DOWNSTREAM ) { +if (pci_pcie_type (pdev) !=PCI_EXP_TYPE_ROOT_PORT ) {struct pcie_link_state *parent; parent = pdev->bus->parent->self->link_state;if (!parent) {
@@ -561,8 +561,8 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)if (!pci_is_pcie (pdev) || pdev->link_state)return ; -if (pci_pcie_type (pdev) !=PCI_EXP_TYPE_ROOT_PORT && -pci_pcie_type (pdev) !=PCI_EXP_TYPE_DOWNSTREAM ) + +if (!pdev->has_secondary_link)return ;/* VIA has a strange chipset, root port is under a bridge */
@@ -715,8 +715,7 @@ static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)if (!pci_is_pcie (pdev))return ; -if (pci_pcie_type (pdev) ==PCI_EXP_TYPE_ROOT_PORT || -pci_pcie_type (pdev) ==PCI_EXP_TYPE_DOWNSTREAM ) +if (pdev->has_secondary_link) parent = pdev;if (!parent || !parent->link_state)return ;
Signature · 1 line
1.7.1
Quoted 19 lines · Yijing Wang
https://bugzilla.kernel.org/show_bug.cgi?id=94361 reported in ATCA platform, system had unusual pcie topology:
(root port) (downstream port) (upstream port)
+-1c.0-[02-0a]----00.0-[03-0a]--+-00.0-[04]-- | +-01.0-[05]-- (downstream port) | +-02.0-[06]-- | +-03.0-[07]-- | +-08.0-[08]-- | +-09.0-[09]-- | \-0a.0-[0a]--We assumed root port and downstream port always have external link, and downstream port always has a upstream port. So in this case, when we allocated
pcie_link_statefor downstream port 02:00.0, it try to get parent buspcie_link_state,
parent =pdev->bus->parent->self->link_state; because root bus self is NULL, system will crash here.
Quoted 4 lines
Use
pdev->has_secondary_link(introduced in previous patch)to fix this issue.Signed-off-by Yijing Wang <[email protected]>
Applied to pci/aspm for v4.2, thanks!
It's easier if:
- You include a [0/3] cover letter. Then I can respond once there to say I've applied the series.
- You post a complete v5 instead of an "[Update][PATCH v4 2/3]". In this case, with only three patches and no further iterations, it's not a big deal, but it does make it harder for me to make sure I have the right version of everything.
Bjorn
Quoted 45 lines
--- drivers/pci/pcie/aspm.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)drivers/pci/pcie/aspm.c +4
-5@@ -525,7 +525,7 @@ static struct pcie_link_state *alloc_pcie_link_state(struct pci_dev *pdev)INIT_LIST_HEAD (&link->children);INIT_LIST_HEAD (&link->link); link->pdev = pdev; -if (pci_pcie_type (pdev) ==PCI_EXP_TYPE_DOWNSTREAM ) { +if (pci_pcie_type (pdev) !=PCI_EXP_TYPE_ROOT_PORT ) {struct pcie_link_state *parent; parent = pdev->bus->parent->self->link_state;if (!parent) {@@ -561,8 +561,8 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)if (!pci_is_pcie (pdev) || pdev->link_state)return ; -if (pci_pcie_type (pdev) !=PCI_EXP_TYPE_ROOT_PORT && -pci_pcie_type (pdev) !=PCI_EXP_TYPE_DOWNSTREAM ) + +if (!pdev->has_secondary_link)return ;/* VIA has a strange chipset, root port is under a bridge */ @@ -715,8 +715,7 @@ static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)if (!pci_is_pcie (pdev))return ; -if (pci_pcie_type (pdev) ==PCI_EXP_TYPE_ROOT_PORT || -pci_pcie_type (pdev) ==PCI_EXP_TYPE_DOWNSTREAM ) +if (pdev->has_secondary_link) parent = pdev;if (!parent || !parent->link_state)return ;Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 10 lines
It's easier if:
- You include a [0/3] cover letter. Then I can respond once there to say I've applied the series.
- You post a complete v5 instead of an "[Update][PATCH v4 2/3]". In this case, with only three patches and no further iterations, it's not a big deal, but it does make it harder for me to make sure I have the right version of everything.
OK, I got it, Thank you for reminding!
Thanks!
Yijing.
Quoted 51 lines
Bjorn
Quoted 45 lines
--- drivers/pci/pcie/aspm.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)drivers/pci/pcie/aspm.c +4
-5@@ -525,7 +525,7 @@ static struct pcie_link_state *alloc_pcie_link_state(struct pci_dev *pdev)INIT_LIST_HEAD (&link->children);INIT_LIST_HEAD (&link->link); link->pdev = pdev; -if (pci_pcie_type (pdev) ==PCI_EXP_TYPE_DOWNSTREAM ) { +if (pci_pcie_type (pdev) !=PCI_EXP_TYPE_ROOT_PORT ) {struct pcie_link_state *parent; parent = pdev->bus->parent->self->link_state;if (!parent) {@@ -561,8 +561,8 @@ void pcie_aspm_init_link_state(struct pci_dev *pdev)if (!pci_is_pcie (pdev) || pdev->link_state)return ; -if (pci_pcie_type (pdev) !=PCI_EXP_TYPE_ROOT_PORT && -pci_pcie_type (pdev) !=PCI_EXP_TYPE_DOWNSTREAM ) + +if (!pdev->has_secondary_link)return ;/* VIA has a strange chipset, root port is under a bridge */ @@ -715,8 +715,7 @@ static void __pci_disable_link_state(struct pci_dev *pdev, int state, bool sem)if (!pci_is_pcie (pdev))return ; -if (pci_pcie_type (pdev) ==PCI_EXP_TYPE_ROOT_PORT || -pci_pcie_type (pdev) ==PCI_EXP_TYPE_DOWNSTREAM ) +if (pdev->has_secondary_link) parent = pdev;if (!parent || !parent->link_state)return ;Signature · 6 lines
1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html.
Signature · 2 lines
Thanks! Yijing