Skip to contentSkip to conversation

fb: move mutex_init to framebuffer_alloc()

PATCH In review Daniel Mack 3 participants 3 messages Jul 1, 2009 – Jul 8, 2009 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fb: move mutex_init to framebuffer_alloc()

In 537a1bf05, a per-fbinfo mutex was added and framebuffer drivers were adopted accordingly. This new lock is currently initialized in register_framebuffer().

The mx3fb driver takes this lock in mx3fb_map_video_memory() _before_ register_framebuffer() is called and hence crashes the system very early.

Moving this mutex_init() to framebuffer_alloc() solves this and also seems a lot more straight forward.

Cc : Krzysztof Helt <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
Cc Andrew Morton <[email protected]>
---
 drivers/video/fbmem.c   |    3 ---
 drivers/video/fbsysfs.c |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/video/fbmem.c +0 -3
index 53ea056..1d8d098 100644
@@ -1513,9 +1513,6 @@ register_framebuffer(struct fb_info *fb_info)
 		if (!registered_fb[i])
 			break;
 	fb_info->node = i;
-	mutex_init(&fb_info->lock);
-	mutex_init(&fb_info->mm_lock);
-
 	fb_info->dev = device_create(fb_class, fb_info->device,
 				     MKDEV(FB_MAJOR, i), NULL, "fb%d", i);
 	if (IS_ERR(fb_info->dev)) {
drivers/video/fbsysfs.c +3 -0
index d4a2c11..60ddd1d 100644
@@ -58,6 +58,9 @@ struct fb_info *framebuffer_alloc(size_t size, struct device *dev)
 
 	info->device = dev;
 
+	mutex_init(&info->lock);
+	mutex_init(&info->mm_lock);
+
 #ifdef CONFIG_FB_BACKLIGHT
 	mutex_init(&info->bl_curve_mutex);
 #endif
Signature · 1 line
1.6.3.1
#1 lore raw
Quoted 11 lines · Daniel Mack

In 537a1bf05, a per-fbinfo mutex was added and framebuffer drivers were adopted accordingly. This new lock is currently initialized in register_framebuffer().

The mx3fb driver takes this lock in mx3fb_map_video_memory() _before_ register_framebuffer() is called and hence crashes the system very early.

Moving this mutex_init() to framebuffer_alloc() solves this and also seems a lot more straight forward.

but this may introduce deadlock to some _old_ drivers which have not used framebuffer_alloc to allocate fb_info structure.

to avoid deadlock, these drivers need to change kmalloc to framebuffer_alloc, otherwise, they need to add their own mutexes initialization source code:

		mutex_init(&info->lock);	mutex_init(&info->mm_lock);

here is only a record for the _old_ drivers' maintainers. hope they can get this info from google or find this commit:

commit 4148df9b0f38bdd362dd91d52076926c11cbe5a9

Author: Paul Mundt <[email protected]>
Date:   Mon Jul 6 00:25:57 2009 +0900

fb: Initialize fb_info mutexes in framebuffer_alloc()

This way they'll be properly initialized early enough for users that
may
touch them before the framebuffer has been registered.

Drivers that allocate their fb_info structure some other way (like matrocfb's broken static allocation) need to be fixed up
appropriately.

Regards,
Wu Zhangjin

Quoted 39 lines
Cc : Krzysztof Helt <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Rafael J. Wysocki <[email protected]>
Cc Andrew Morton <[email protected]>
---
 drivers/video/fbmem.c   |    3 ---
 drivers/video/fbsysfs.c |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/video/fbmem.c +0 -3
index 53ea056..1d8d098 100644
@@ -1513,9 +1513,6 @@ register_framebuffer(struct fb_info *fb_info)
 		if (!registered_fb[i])
 			break;
 	fb_info->node = i;
-	mutex_init(&fb_info->lock);
-	mutex_init(&fb_info->mm_lock);
-
 	fb_info->dev = device_create(fb_class, fb_info->device,
 				     MKDEV(FB_MAJOR, i), NULL, "fb%d", i);
 	if (IS_ERR(fb_info->dev)) {
drivers/video/fbsysfs.c +3 -0
index d4a2c11..60ddd1d 100644
@@ -58,6 +58,9 @@ struct fb_info *framebuffer_alloc(size_t size, struct device *dev)
 
 	info->device = dev;
 
+	mutex_init(&info->lock);
+	mutex_init(&info->mm_lock);
+
 #ifdef CONFIG_FB_BACKLIGHT
 	mutex_init(&info->bl_curve_mutex);
 #endif
#2 lore raw
Quoted 16 lines · Wu Zhangjin
Quoted 11 lines · Daniel Mack

In 537a1bf05, a per-fbinfo mutex was added and framebuffer drivers were adopted accordingly. This new lock is currently initialized in register_framebuffer().

The mx3fb driver takes this lock in mx3fb_map_video_memory() _before_ register_framebuffer() is called and hence crashes the system very early.

Moving this mutex_init() to framebuffer_alloc() solves this and also seems a lot more straight forward.

but this may introduce deadlock to some _old_ drivers which have not used framebuffer_alloc to allocate fb_info structure.

Quoted 8 lines

to avoid deadlock, these drivers need to change kmalloc to framebuffer_alloc, otherwise, they need to add their own mutexes initialization source code:

		mutex_init(&info->lock);	mutex_init(&info->mm_lock);

here is only a record for the _old_ drivers' maintainers. hope they can get this info from google or find this commit:

Yes, I'm going through and gradually converting all of the outstanding drivers (both old and new) over to framebuffer_alloc(). The old ones are a bit more tedious given all of the casting games they play. I should have the outstanding ones finished tomorrow.