Fix some race conditions that exists between fbmem and sysfb
Subsystems (6)
Javier Martinez Canillas
maintainerv2 cover Fix some race conditions that exists between fbmem and sysfb
Hello,
The patches in this series are mostly changes suggested by Daniel Vetter to fix some race conditions that exists between the fbdev core (fbmem) and sysfb with regard to device registration and removal.
For example, it is currently possible for sysfb to register a platform device after a real DRM driver was registered and requested to remove the conflicting framebuffers.
A symptom of this issue, was worked around with by commit fb561bf9abde ("fbdev: Prevent probing generic drivers if a FB is already registered") but that's really a hack and should be reverted.
This series attempt to fix it more properly and revert the mentioned hack. That will also unblock a pending patch to not make the num_registered_fb variable visible to drivers anymore, since that's internal to fbdev core.
This is a v2 that addresses issues in v1 pointed out by Daniel.
Patch #1 is just a trivial preparatory change.
Patch #2 add sysfb_disable() and sysfb_try_unregister() helpers for fbmem to use them.
Patch #3 changes how is dealt with conflicting framebuffers unregistering, rather than having a variable to determine if a lock should be take, it just drops the lock before unregistering the platform device.
Patch #4 fixes the mentioned race conditions and finally patch #5 is the revert patch that was posted by Daniel before but he dropped from his set.
The patches were tested on a rpi4 using different video configurations:
(simpledrm -> vc4 both builtin, only vc4 builtin, only simpledrm builtin and simpledrm builtin with vc4 built as a module).
Best regards,
Javier
Changes in v2:
- Rebase on top of latest drm-misc-next and fix conflicts (Daniel Vetter).
- Add kernel-doc comments and include in other_interfaces.rst (Daniel Vetter).
- Explain in the commit message that fbmem has to unregister the device as fallback if a driver registered the device itself (Daniel Vetter).
- Also explain that fallback in a comment in the code (Daniel Vetter).
- Don't encode in fbmem the assumption that sysfb will always register platform devices (Daniel Vetter).
- Add a FIXME comment about drivers registering devices (Daniel Vetter).
- Drop RFC prefix since patches were already reviewed by Daniel Vetter.
- Add Daniel Reviewed-by tags to the patches.
Daniel Vetter (1):
Revert "fbdev: Prevent probing generic drivers if a FB is already
registered"
Javier Martinez Canillas (4):
firmware: sysfb: Make sysfb_create_simplefb() return a pdev pointer
firmware: sysfb: Add helpers to unregister a pdev and disable
registration
fbdev: Restart conflicting fb removal loop when unregistering devices
fbdev: Fix some race conditions between fbmem and sysfb
.../driver-api/firmware/other_interfaces.rst | 6 ++ drivers/firmware/sysfb.c | 77 +++++++++++++++++-- drivers/firmware/sysfb_simplefb.c | 16 ++-- drivers/video/fbdev/core/fbmem.c | 57 ++++++++++---- drivers/video/fbdev/efifb.c | 11 --- drivers/video/fbdev/simplefb.c | 11 --- include/linux/fb.h | 1 - include/linux/sysfb.h | 29 +++++-- 8 files changed, 150 insertions(+), 58 deletions(-)
Signature · 1 line
2.35.1
Javier Martinez Canillas
maintainerPATCH v2 1/5 firmware: sysfb: Make sysfb_create_simplefb() return a pdev pointer
This function just returned 0 on success or an errno code on error, but it could be useful for sysfb_init() callers to have a pointer to the device.
---
Changes in v2:
- Rebase on top of latest drm-misc-next and fix conflicts (Daniel Vetter).
drivers/firmware/sysfb.c | 4 ++-- drivers/firmware/sysfb_simplefb.c | 16 ++++++++-------- include/linux/sysfb.h | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-)
drivers/firmware/sysfb.c +2 -2
@@ -46,8 +46,8 @@ static __init int sysfb_init(void)/* try to create a simple-framebuffer device */ compatible =sysfb_parse_mode (si, &mode);if (compatible) { - ret =sysfb_create_simplefb (si, &mode); -if (!ret) + pd =sysfb_create_simplefb (si, &mode); +if (!IS_ERR (pd))return 0 ; }
drivers/firmware/sysfb_simplefb.c +8 -8
@@ -57,8 +57,8 @@ __init bool sysfb_parse_mode(const struct screen_info *si,return false; } -__init int sysfb_create_simplefb (const struct screen_info *si, -const struct simplefb_platform_data *mode) +__init struct platform_device *sysfb_create_simplefb (const struct screen_info *si, +const struct simplefb_platform_data *mode) {struct platform_device *pd;struct resource res;
@@ -76,7 +76,7 @@ __init int sysfb_create_simplefb(const struct screen_info *si, base |= (u64 )si->ext_lfb_base <<32 ;if (!base || (u64 )(resource_size_t )base != base) {printk (KERN_DEBUG "sysfb: inaccessible VRAM base\n" ); -return -EINVAL ; +return ERR_PTR (-EINVAL ); }/*
@@ -93,7 +93,7 @@ __init int sysfb_create_simplefb(const struct screen_info *si, length = mode->height * mode->stride;if (length > size) {printk (KERN_WARNING "sysfb: VRAM smaller than advertised\n" ); -return -EINVAL ; +return ERR_PTR (-EINVAL ); } length =PAGE_ALIGN (length);
@@ -104,11 +104,11 @@ __init int sysfb_create_simplefb(const struct screen_info *si, res.start = base; res.end = res.start + length -1 ;if (res.end <= res.start) -return -EINVAL ; +return ERR_PTR (-EINVAL ); pd =platform_device_alloc ("simple-framebuffer" ,0 );if (!pd) -return -ENOMEM ; +return ERR_PTR (-ENOMEM );sysfb_apply_efi_quirks (pd);
@@ -124,10 +124,10 @@ __init int sysfb_create_simplefb(const struct screen_info *si,if (ret) goto err_put_device; -return 0 ; +return pd; err_put_device:platform_device_put (pd); -return ret; +return ERR_PTR (ret); }
include/linux/sysfb.h +5 -5
@@ -72,8 +72,8 @@ static inline void sysfb_apply_efi_quirks(struct platform_device *pd)bool sysfb_parse_mode (const struct screen_info *si,struct simplefb_platform_data *mode); -int sysfb_create_simplefb (const struct screen_info *si, -const struct simplefb_platform_data *mode); +struct platform_device *sysfb_create_simplefb (const struct screen_info *si, +const struct simplefb_platform_data *mode);#else /* CONFIG_SYSFB_SIMPLE */
@@ -83,10 +83,10 @@ static inline bool sysfb_parse_mode(const struct screen_info *si, return false; } -static inline int sysfb_create_simplefb (const struct screen_info *si, -const struct simplefb_platform_data *mode) +static inline struct platform_device *sysfb_create_simplefb (const struct screen_info *si, +const struct simplefb_platform_data *mode) { -return -EINVAL ; +return ERR_PTR (-EINVAL ); }#endif /* CONFIG_SYSFB_SIMPLE */
Signature · 1 line
2.35.1
Javier Martinez Canillas
maintainerPATCH v2 2/5 firmware: sysfb: Add helpers to unregister a pdev and disable registration
In reply to Javier Martinez CanillasThese can be used by subsystems to unregister a platform device registered by sysfb and also to disable future platform device registration in sysfb.
---
Changes in v2:
- Add kernel-doc comments and include in other_interfaces.rst (Daniel Vetter).
.../driver-api/firmware/other_interfaces.rst | 6 ++ drivers/firmware/sysfb.c | 73 +++++++++++++++++-- include/linux/sysfb.h | 19 +++++ 3 files changed, 92 insertions(+), 6 deletions(-)
Documentation/driver-api/firmware/other_interfaces.rst +6 -0
@@ -13,6 +13,12 @@ EDD Interfaces .. kernel-doc:: drivers/firmware/edd.c :internal: +Generic System Framebuffers Interface +------------------------------------- + +.. kernel-doc:: drivers/firmware/sysfb.c + :export: + Intel Stratix10 SoC Service Layer --------------------------------- Some features of the Intel Stratix10 SoC require a level of privilege
drivers/firmware/sysfb.c +67 -6
105 lines not on this page · raw message
include/linux/sysfb.h +19 -0
@@ -55,6 +55,25 @@ struct efifb_dmi_info {int flags; }; +#ifdef CONFIG_SYSFB + +void sysfb_disable (void ); +bool sysfb_try_unregister (struct device *dev); + +#else /* CONFIG_SYSFB */ + +static inline void sysfb_disable (void ) +{ + +} + +static inline bool sysfb_try_unregister (struct device *dev) +{ +return false; +} + +#endif /* CONFIG_SYSFB */ +#ifdef CONFIG_EFI extern struct efifb_dmi_info efifb_dmi_list[];
Signature · 1 line
2.35.1
Javier Martinez Canillas
maintainerPATCH v2 3/5 fbdev: Restart conflicting fb removal loop when unregistering devices
In reply to Javier Martinez CanillasDrivers that want to remove registered conflicting framebuffers prior to register their own framebuffer, calls remove_conflicting_framebuffers().
This function takes the registration_lock mutex, to prevent a races when drivers register framebuffer devices. But if a conflicting framebuffer device is found, the underlaying platform device is unregistered and this will lead to the platform driver .remove callback to be called, which in turn will call to the unregister_framebuffer() that takes the same lock.
To prevent this, a struct fb_info.forced_out field was used as indication to unregister_framebuffer() whether the mutex has to be grabbed or not.
A cleaner solution is to drop the lock before platform_device_unregister() so unregister_framebuffer() can take it when called from the fbdev driver, and just grab the lock again after the device has been registered and do a removal loop restart.
Since the framebuffer devices will already be removed, the loop would just finish when no more conflicting framebuffers are found.
---
(no changes since v1)
drivers/video/fbdev/core/fbmem.c | 29 +++++++++++++++++++---------- include/linux/fb.h | 1 - 2 files changed, 19 insertions(+), 11 deletions(-)
drivers/video/fbdev/core/fbmem.c +19 -10
@@ -1553,6 +1553,7 @@ static void do_remove_conflicting_framebuffers(struct apertures_struct *a, {int i; +restart_removal:/* check all firmware fbs and kick off if the base addr overlaps */ for_each_registered_fb (i) {struct apertures_struct *gen_aper;
@@ -1576,16 +1577,28 @@ static void do_remove_conflicting_framebuffers(struct apertures_struct *a,* VESA, EFI, etc. A native driver will then be able to * allocate the memory range. * -* If it's not a platform device, at least print a warning. A -* fix would add code to remove the device from the system. +* Drop the lock because if the device is unregistered, its +* drivers will call to unregister_framebuffer() that takes +* this lock. */ +mutex_unlock (®istration_lock);if (dev_is_platform (device)) { - registered_fb[i]->forced_out = true;platform_device_unregister (to_platform_device (device)); }else { +/* +* If it's not a platform device, at least print a warning. A +* fix would add to code to remove the device from the system. +*/ pr_warn ("fb%d: cannot remove device\n" , i); -do_unregister_framebuffer (registered_fb[i]); +/* call unregister_framebuffer() so it can take the lock */ +unregister_framebuffer (registered_fb[i]); } +mutex_lock (®istration_lock); +/* +* Restart the removal loop now that the device has been +* unregistered and its associated framebuffer gone. +*/ + goto restart_removal; } } }
@@ -1892,13 +1905,9 @@ EXPORT_SYMBOL(register_framebuffer);void unregister_framebuffer (struct fb_info *fb_info) { -bool forced_out = fb_info->forced_out; - -if (!forced_out) -mutex_lock (®istration_lock); +mutex_lock (®istration_lock);do_unregister_framebuffer (fb_info); -if (!forced_out) -mutex_unlock (®istration_lock); +mutex_unlock (®istration_lock); }EXPORT_SYMBOL (unregister_framebuffer);
include/linux/fb.h +0 -1
@@ -502,7 +502,6 @@ struct fb_info { } *apertures;bool skip_vt_switch;/* no VT switch on suspend/resume required */ -bool forced_out;/* set when being removed by another driver */ };static inline struct apertures_struct *alloc_apertures (unsigned int max_num) {
Signature · 1 line
2.35.1
Javier Martinez Canillas
maintainerPATCH v2 4/5 fbdev: Fix some race conditions between fbmem and sysfb
In reply to Javier Martinez CanillasThe platform devices registered in sysfb match with a firmware-based fbdev or DRM driver, that are used to have early graphics using framebuffers set up by the system firmware.
Real DRM drivers later are probed and remove all conflicting framebuffers, leading to these platform devices for generic drivers to be unregistered.
But the current solution has two issues that this patch fixes:
1) It is a layering violation for the fbdev core to unregister a device that was registered by sysfb.
Instead, the sysfb_try_unregister() helper function can be called for sysfb to attempt unregistering the device if is the one registered.
2) The sysfb_init() function could be called after a DRM driver is probed and requested to unregister devices for drivers with a conflicting fb.
To prevent this, disable any future sysfb platform device registration by calling sysfb_disable(), if a driver requested to remove conflicting framebuffers with remove_conflicting_framebuffers().
There are video drivers (e.g: vga16fb) that register their own device and don't use the sysfb infrastructure for that, so an unregistration has to be forced by fbmem if sysfb_try_unregister() fails to do the unregister.
---
Changes in v2:
- Explain in the commit message that fbmem has to unregister the device as fallback if a driver registered the device itself (Daniel Vetter).
- Also explain that fallback in a comment in the code (Daniel Vetter).
- Don't encode in fbmem the assumption that sysfb will always register platform devices (Daniel Vetter).
- Add a FIXME comment about drivers registering devices (Daniel Vetter).
drivers/video/fbdev/core/fbmem.c | 42 +++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 11 deletions(-)
drivers/video/fbdev/core/fbmem.c +31 -11
@@ -19,6 +19,7 @@#include <linux/kernel.h> #include <linux/major.h> #include <linux/slab.h> +#include <linux/sysfb.h> #include <linux/mm.h> #include <linux/mman.h> #include <linux/vt.h>
@@ -1582,22 +1583,30 @@ static void do_remove_conflicting_framebuffers(struct apertures_struct *a,* this lock. */ mutex_unlock (®istration_lock); -if (dev_is_platform (device)) { -platform_device_unregister (to_platform_device (device)); - }else { -/* -* If it's not a platform device, at least print a warning. A -* fix would add to code to remove the device from the system. -*/ -pr_warn ("fb%d: cannot remove device\n" , i); -/* call unregister_framebuffer() so it can take the lock */ -unregister_framebuffer (registered_fb[i]); +if (!sysfb_try_unregister (device)) { +if (dev_is_platform (device)) { +/* +* FIXME: sysfb didn't register this device, is a platform +* device registered by a video driver (e.g: vga16fb), so +* force its unregistration here. A proper fix would be to +* move all device registration to the sysfb infrastructure. +*/ +platform_device_unregister (to_platform_device (device)); + }else { +/* +* If it's not a platform device, at least print a warning. A +* fix would add to code to remove the device from the system. +*/ +pr_warn ("fb%d: cannot remove device\n" , i); +/* call unregister_framebuffer() so it can take the lock */ +unregister_framebuffer (registered_fb[i]); + } } -mutex_lock (®istration_lock);/* * Restart the removal loop now that the device has been * unregistered and its associated framebuffer gone. */ +mutex_lock (®istration_lock); goto restart_removal; } }
@@ -1758,6 +1767,17 @@ int remove_conflicting_framebuffers(struct apertures_struct *a, do_free = true; } +/* +* If a driver asked to unregister a platform device registered by +* sysfb, then can be assumed that this is a driver for a display +* that is set up by the system firmware and has a generic driver. +* +* Drivers for devices that don't have a generic driver will never +* ask for this, so let's assume that a real driver for the display +* was already probed and prevent sysfb to register devices later. +*/ +sysfb_disable (); +mutex_lock (®istration_lock);do_remove_conflicting_framebuffers (a, name, primary);mutex_unlock (®istration_lock);
Signature · 1 line
2.35.1
Javier Martinez Canillas
maintainerPATCH v2 5/5 Revert "fbdev: Prevent probing generic drivers if a FB is already registered"
In reply to Javier Martinez CanillasFrom: Daniel Vetter <[email protected]>
This reverts commit fb561bf9abde49f7e00fdbf9ed2ccf2d86cac8ee.
With
commit 27599aacbaefcbf2af7b06b0029459bbf682000d
Author: Thomas Zimmermann <[email protected]> Date: Tue Jan 25 10:12:18 2022 +0100
fbdev: Hot-unplug firmware fb devices on forced removal
this should be fixed properly and we can remove this somewhat hackish check here (e.g. this won't catch drm drivers if fbdev emulation isn't enabled).
---
(no changes since v1)
drivers/video/fbdev/efifb.c | 11 ----------- drivers/video/fbdev/simplefb.c | 11 ----------- 2 files changed, 22 deletions(-)
drivers/video/fbdev/efifb.c +0 -11
@@ -351,17 +351,6 @@ static int efifb_probe(struct platform_device *dev)char *option =NULL ;efi_memory_desc_t md; -/* -* Generic drivers must not be registered if a framebuffer exists. -* If a native driver was probed, the display hardware was already -* taken and attempting to use the system framebuffer is dangerous. -*/ -if (num_registered_fb >0 ) { -dev_err (&dev->dev, -"efifb: a framebuffer is already registered\n" ); -return -EINVAL ; - } -if (screen_info.orig_video_isVGA !=VIDEO_TYPE_EFI || pci_dev_disabled)return -ENODEV ;
drivers/video/fbdev/simplefb.c +0 -11
@@ -413,17 +413,6 @@ static int simplefb_probe(struct platform_device *pdev)struct simplefb_par *par;struct resource *res, *mem; -/* -* Generic drivers must not be registered if a framebuffer exists. -* If a native driver was probed, the display hardware was already -* taken and attempting to use the system framebuffer is dangerous. -*/ -if (num_registered_fb >0 ) { -dev_err (&pdev->dev, -"simplefb: a framebuffer is already registered\n" ); -return -EINVAL ; - } -if (fb_get_options ("simplefb" ,NULL ))return -ENODEV ;
Signature · 1 line
2.35.1