powerpc: kernel: pci_dn: Add missing of_node_put() for of_get_xx API
PATCH 1/1 powerpc: kernel: pci_dn: Add missing of_node_put() for of_get_xx API
In pci_add_device_node_info(), we should use of_node_put() for the reference 'parent' returned by of_get_parent() to keep refcount balance.
--- arch/powerpc/kernel/pci_dn.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/kernel/pci_dn.c +1 -0
@@ -330,6 +330,7 @@ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose,INIT_LIST_HEAD (&pdn->list); parent =of_get_parent (dn); pdn->parent = parent ?PCI_DN (parent) :NULL ; +of_node_put (parent);if (pdn->parent)list_add_tail (&pdn->list, &pdn->parent->child_list);
Signature · 1 line
2.25.1
Tyrel Datwyler
NAKQuoted 16 lines · Liang He
In
pci_add_device_node_info(), we should useof_node_put()for the reference 'parent' returned byof_get_parent()to keep refcount balance.Fixes cca87d303c85 ("powerpc/pci: Refactor pci_dn")Co-authored-by Miaoqian Lin <[email protected]>Signed-off-by Liang He <[email protected]>--- arch/powerpc/kernel/pci_dn.c | 1 + 1 file changed, 1 insertion(+)arch/powerpc/kernel/pci_dn.c +0
-0
arch/powerpc/kernel/pci_dn.c struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, · line 332
Quoted 3 lines
arch/powerpc/kernel/pci_dn.c +0
-0@@ -330,6 +330,7 @@ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose,INIT_LIST_HEAD (&pdn->list); parent =of_get_parent (dn); pdn->parent = parent ?PCI_DN (parent) :NULL ;
NACK
pdn->parent is now a long term reference so we should not do a put on parent until we pdn->parent is no longer valid.
-Tyrel
Quoted 4 lines
arch/powerpc/kernel/pci_dn.c +1
-0+of_node_put (parent);if (pdn->parent)list_add_tail (&pdn->list, &pdn->parent->child_list);
Quoted 22 lines · Tyrel Datwyler
Quoted 16 lines · Liang He
In
pci_add_device_node_info(), we should useof_node_put()for the reference 'parent' returned byof_get_parent()to keep refcount balance.Fixes cca87d303c85 ("powerpc/pci: Refactor pci_dn")Co-authored-by Miaoqian Lin <[email protected]>Signed-off-by Liang He <[email protected]>--- arch/powerpc/kernel/pci_dn.c | 1 + 1 file changed, 1 insertion(+)arch/powerpc/kernel/pci_dn.c +0
-0arch/powerpc/kernel/pci_dn.c struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, · line 332
Quoted 3 lines
arch/powerpc/kernel/pci_dn.c +0
-0@@ -330,6 +330,7 @@ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose,INIT_LIST_HEAD (&pdn->list); parent =of_get_parent (dn); pdn->parent = parent ?PCI_DN (parent) :NULL ;NACK
Quoted 4 lines
pdn->parentis now a long term reference so we should not do a put on parent until wepdn->parentis no longer valid.-Tyrel
Hi, Tyrel
Thanks for reviewing this code.
But I think there is some confusion about the of_get_parent() and I can confirm my point when I check the 'pci_remove_device_node_info' function, which may be a second bug.
In pci_remove_device_node_info(), I notice the comment, 'Drop the parent pci_dn's ref ...'. However, of_get_parent() will increase the refcount of the parent, and then the following of_node_put() will decrease the refcount, so, finally, there is no any change.
Back to this case, as the 'pdn->parent' is not the reference of parent device_node, it is device_node's data, so I think it is better to keep the original meaning of refcounting, i.e, add a of_node_put() to keep the refcount balance.
If I have some mis-understanding, please correct me.
Thanks,
Liang
Quoted 5 lines
Quoted 5 lines
arch/powerpc/kernel/pci_dn.c +1
-0+of_node_put (parent);if (pdn->parent)list_add_tail (&pdn->list, &pdn->parent->child_list);
Tyrel Datwyler
Reviewed-byQuoted 22 lines · Tyrel Datwyler
Quoted 16 lines · Liang He
In
pci_add_device_node_info(), we should useof_node_put()for the reference 'parent' returned byof_get_parent()to keep refcount balance.Fixes cca87d303c85 ("powerpc/pci: Refactor pci_dn")Co-authored-by Miaoqian Lin <[email protected]>Signed-off-by Liang He <[email protected]>--- arch/powerpc/kernel/pci_dn.c | 1 + 1 file changed, 1 insertion(+)arch/powerpc/kernel/pci_dn.c +0
-0arch/powerpc/kernel/pci_dn.c struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, · line 332
Quoted 3 lines
arch/powerpc/kernel/pci_dn.c +0
-0@@ -330,6 +330,7 @@ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose,INIT_LIST_HEAD (&pdn->list); parent =of_get_parent (dn); pdn->parent = parent ?PCI_DN (parent) :NULL ;NACK
Quoted 2 lines
pdn->parentis now a long term reference so we should not do a put on parent until wepdn->parentis no longer valid.
I withdraw my NACK. On closer inspection pdn->parent is a reference to the parent struct pci_dn and not a reference to a parent struct device_node.
Quoted 8 lines
-Tyrel
Quoted 4 lines
arch/powerpc/kernel/pci_dn.c +1
-0+of_node_put (parent);if (pdn->parent)list_add_tail (&pdn->list, &pdn->parent->child_list);
Michael Ellerman
AppliedQuoted 5 lines · Liang He
In
pci_add_device_node_info(), we should useof_node_put()for the reference 'parent' returned byof_get_parent()to keep refcount balance.
Applied to powerpc/next.
[1/1] powerpc: kernel: pci_dn: Add missing of_node_put() for of_get_xx API
https://git.kernel.org/powerpc/c/110a1fcb6c4d55144d8179983a475f17a1d6f832
cheers