Skip to contentSkip to conversation

firmware: sysfb: Fix reference count of sysfb parent device

PATCH In review Thomas Zimmermann 3 participants 4 messages Jun 25, 2024 – Jul 2, 2024

Subsystems (2)
lore
Share & tools
lore

Thomas Zimmermann

author maintainer
#0 lore raw

PATCH 1/1 firmware: sysfb: Fix reference count of sysfb parent device

Retrieving the system framebuffer's parent device in sysfb_init() increments the parent device's reference count. Hence release the reference before leaving the init function.

Adding the sysfb platform device acquires and additional reference for the parent. This keeps the parent device around while the system framebuffer is in use.

Fixes 9eac534db001 ("firmware/sysfb: Set firmware-framebuffer parent device")
Cc Thomas Zimmermann <[email protected]>
Cc Javier Martinez Canillas <[email protected]>
Cc Helge Deller <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Dan Carpenter <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Sui Jingfeng <[email protected]>
Cc <[email protected]> # v6.9+
---
 drivers/firmware/sysfb.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/firmware/sysfb.c +9 -4
index 880ffcb50088..dd274563deeb 100644
@@ -101,8 +101,10 @@ static __init struct device *sysfb_parent_dev(const struct screen_info *si)
 	if (IS_ERR(pdev)) {
 		return ERR_CAST(pdev);
 	} else if (pdev) {
-		if (!sysfb_pci_dev_is_enabled(pdev))
+		if (!sysfb_pci_dev_is_enabled(pdev)) {
+			pci_dev_put(pdev);
 			return ERR_PTR(-ENODEV);
+		}
 		return &pdev->dev;
 	}
 
@@ -137,7 +139,7 @@ static __init int sysfb_init(void)
 	if (compatible) {
 		pd = sysfb_create_simplefb(si, &mode, parent);
 		if (!IS_ERR(pd))
-			goto unlock_mutex;
+			goto put_device;
 	}
 
 	/* if the FB is incompatible, create a legacy framebuffer device */
@@ -155,7 +157,7 @@ static __init int sysfb_init(void)
 	pd = platform_device_alloc(name, 0);
 	if (!pd) {
 		ret = -ENOMEM;
-		goto unlock_mutex;
+		goto put_device;
 	}
 
 	pd->dev.parent = parent;
@@ -170,9 +172,12 @@ static __init int sysfb_init(void)
 	if (ret)
 		goto err;
 
-	goto unlock_mutex;
+
+	goto put_device;
 err:
 	platform_device_put(pd);
+put_device:
+	put_device(parent);
 unlock_mutex:
 	mutex_unlock(&disable_lock);
 	return ret;
Signature · 1 line
2.45.2
maintainer Reviewed-by on v1 1/1
#1 lore raw

Thomas Zimmermann <[email protected]> writes:

Hello Thomas,

Quoted 18 lines

Retrieving the system framebuffer's parent device in sysfb_init() increments the parent device's reference count. Hence release the reference before leaving the init function.

Adding the sysfb platform device acquires and additional reference for the parent. This keeps the parent device around while the system framebuffer is in use.

Fixes 9eac534db001 ("firmware/sysfb: Set firmware-framebuffer parent device")
Cc Thomas Zimmermann <[email protected]>
Cc Javier Martinez Canillas <[email protected]>
Cc Helge Deller <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Dan Carpenter <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Sui Jingfeng <[email protected]>
Cc <[email protected]> # v6.9+
Quoted 1 line

---

Looks good to me.

Signature · 5 lines
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat
#2 lore raw
In reply to Thomas Zimmermann

Hi Thomas,

FYI, this doesn't fix the issue of lightdm not being able to start for me.

Marek

Marek

Quoted 74 lines · Thomas Zimmermann

Retrieving the system framebuffer's parent device in sysfb_init() increments the parent device's reference count. Hence release the reference before leaving the init function.

Adding the sysfb platform device acquires and additional reference for the parent. This keeps the parent device around while the system framebuffer is in use.

Fixes 9eac534db001 ("firmware/sysfb: Set firmware-framebuffer parent device")
Cc Thomas Zimmermann <[email protected]>
Cc Javier Martinez Canillas <[email protected]>
Cc Helge Deller <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Dan Carpenter <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Sui Jingfeng <[email protected]>
Cc <[email protected]> # v6.9+
---
 drivers/firmware/sysfb.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/firmware/sysfb.c +9 -5
index 880ffcb50088..dd274563deeb 100644
@@ -101,8 +101,10 @@ static __init struct device *sysfb_parent_dev(const struct screen_info *si)
        if (IS_ERR(pdev)) {
                return ERR_CAST(pdev);
        } else if (pdev) {
-               if (!sysfb_pci_dev_is_enabled(pdev))
+               if (!sysfb_pci_dev_is_enabled(pdev)) {
+                       pci_dev_put(pdev);
                        return ERR_PTR(-ENODEV);
+               }
                return &pdev->dev;
        }
 
@@ -137,7 +139,7 @@ static __init int sysfb_init(void)
        if (compatible) {
                pd = sysfb_create_simplefb(si, &mode, parent);
                if (!IS_ERR(pd))
-                       goto unlock_mutex;
+                       goto put_device;
        }
 
        /* if the FB is incompatible, create a legacy framebuffer device */
@@ -155,7 +157,7 @@ static __init int sysfb_init(void)
        pd = platform_device_alloc(name, 0);
        if (!pd) {
                ret = -ENOMEM;
-               goto unlock_mutex;
+               goto put_device;
        }
 
        pd->dev.parent = parent;
@@ -170,9 +172,12 @@ static __init int sysfb_init(void)
        if (ret)
                goto err;
 
-       goto unlock_mutex;
+
+       goto put_device;
 err:
        platform_device_put(pd);
+put_device:
+       put_device(parent);
 unlock_mutex:
        mutex_unlock(&disable_lock);
        return ret;
--

2.45.2

author maintainer
#3 lore raw

Hi

Am 28.06.24 um 20:54 schrieb Marek Olšák:

Quoted 3 lines

Hi Thomas,

FYI, this doesn't fix the issue of lightdm not being able to start for me.

Of course, that's expected. It's a different bug.

Best regards
Thomas

Quoted 80 lines

Marek

Marek

Quoted 73 lines · Thomas Zimmermann

Retrieving the system framebuffer's parent device in sysfb_init() increments the parent device's reference count. Hence release the reference before leaving the init function.

Adding the sysfb platform device acquires and additional reference for the parent. This keeps the parent device around while the system framebuffer is in use.

Fixes 9eac534db001 ("firmware/sysfb: Set firmware-framebuffer parent device")
Cc Thomas Zimmermann <[email protected]>
Cc Javier Martinez Canillas <[email protected]>
Cc Helge Deller <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Dan Carpenter <[email protected]>
Cc Arnd Bergmann <[email protected]>
Cc Sui Jingfeng <[email protected]>
Cc <[email protected]> # v6.9+
---
  drivers/firmware/sysfb.c | 13 +++++++++----
  1 file changed, 9 insertions(+), 4 deletions(-)
drivers/firmware/sysfb.c +9 -5
index 880ffcb50088..dd274563deeb 100644
@@ -101,8 +101,10 @@ static __init struct device *sysfb_parent_dev(const struct screen_info *si)
         if (IS_ERR(pdev)) {
                 return ERR_CAST(pdev);
         } else if (pdev) {
-               if (!sysfb_pci_dev_is_enabled(pdev))
+               if (!sysfb_pci_dev_is_enabled(pdev)) {
+                       pci_dev_put(pdev);
                         return ERR_PTR(-ENODEV);
+               }
                 return &pdev->dev;
         }
 
@@ -137,7 +139,7 @@ static __init int sysfb_init(void)
         if (compatible) {
                 pd = sysfb_create_simplefb(si, &mode, parent);
                 if (!IS_ERR(pd))
-                       goto unlock_mutex;
+                       goto put_device;
         }
 
         /* if the FB is incompatible, create a legacy framebuffer device */
@@ -155,7 +157,7 @@ static __init int sysfb_init(void)
         pd = platform_device_alloc(name, 0);
         if (!pd) {
                 ret = -ENOMEM;
-               goto unlock_mutex;
+               goto put_device;
         }
 
         pd->dev.parent = parent;
@@ -170,9 +172,12 @@ static __init int sysfb_init(void)
         if (ret)
                 goto err;
 
-       goto unlock_mutex;
+
+       goto put_device;
  err:
         platform_device_put(pd);
+put_device:
+       put_device(parent);
  unlock_mutex:
         mutex_unlock(&disable_lock);
         return ret;
--

2.45.2

Signature · 7 lines
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman
HRB 36809 (AG Nuernberg)