Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm: serialize access to list of debugfs files

Browse Source 
Nouveau, when configured with debugfs, creates debugfs files for every
channel, so structure holding list of files needs to be protected from
simultaneous changes by multiple threads.

Without this patch it's possible to hit kernel oops in
drm_debugfs_remove_files just by running a couple of xterms with
looped glxinfo.

Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Marcin Slusarz 2011-11-09 22:20:35 +01:00 committed by Dave Airlie
parent 3b9832f662
commit b3e067c0b2
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/drm_debugfs.c
View File

@ -118,7 +118,10 @@ int drm_debugfs_create_files(struct drm_info_list *files, int count,
tmp->minor = minor; tmp->minor = minor;
tmp->dent = ent; tmp->dent = ent;
tmp->info_ent = &files[i]; tmp->info_ent = &files[i];
list_add(&(tmp->list), &(minor->debugfs_nodes.list));
mutex_lock(&minor->debugfs_lock);
list_add(&tmp->list, &minor->debugfs_list);
mutex_unlock(&minor->debugfs_lock);
} }
return 0; return 0;
@ -146,7 +149,8 @@ int drm_debugfs_init(struct drm_minor *minor, int minor_id,
char name[64]; char name[64];
int ret; int ret;
INIT_LIST_HEAD(&minor->debugfs_nodes.list); INIT_LIST_HEAD(&minor->debugfs_list);
mutex_init(&minor->debugfs_lock);
sprintf(name, "%d", minor_id); sprintf(name, "%d", minor_id);
minor->debugfs_root = debugfs_create_dir(name, root); minor->debugfs_root = debugfs_create_dir(name, root);
if (!minor->debugfs_root) { if (!minor->debugfs_root) {
@ -192,8 +196,9 @@ int drm_debugfs_remove_files(struct drm_info_list *files, int count,
struct drm_info_node *tmp; struct drm_info_node *tmp;
int i; int i;
mutex_lock(&minor->debugfs_lock);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
list_for_each_safe(pos, q, &minor->debugfs_nodes.list) { list_for_each_safe(pos, q, &minor->debugfs_list) {
tmp = list_entry(pos, struct drm_info_node, list); tmp = list_entry(pos, struct drm_info_node, list);
if (tmp->info_ent == &files[i]) { if (tmp->info_ent == &files[i]) {
debugfs_remove(tmp->dent); debugfs_remove(tmp->dent);
@ -202,6 +207,7 @@ int drm_debugfs_remove_files(struct drm_info_list *files, int count,
} }
} }
} }
mutex_unlock(&minor->debugfs_lock);
return 0; return 0;
} }
EXPORT_SYMBOL(drm_debugfs_remove_files); EXPORT_SYMBOL(drm_debugfs_remove_files);

5
drivers/gpu/drm/i915/i915_debugfs.c
View File

@ -1506,7 +1506,10 @@ drm_add_fake_info_node(struct drm_minor *minor,
node->minor = minor; node->minor = minor;
node->dent = ent; node->dent = ent;
node->info_ent = (void *) key; node->info_ent = (void *) key;
list_add(&node->list, &minor->debugfs_nodes.list);
mutex_lock(&minor->debugfs_lock);
list_add(&node->list, &minor->debugfs_list);
mutex_unlock(&minor->debugfs_lock);
return 0; return 0;
} }

4
include/drm/drmP.h
View File

@ -990,7 +990,9 @@ struct drm_minor {
struct proc_dir_entry *proc_root; /**< proc directory entry */ struct proc_dir_entry *proc_root; /**< proc directory entry */
struct drm_info_node proc_nodes; struct drm_info_node proc_nodes;
struct dentry *debugfs_root; struct dentry *debugfs_root;
struct drm_info_node debugfs_nodes;
struct list_head debugfs_list;
struct mutex debugfs_lock; /* Protects debugfs_list. */
struct drm_master *master; /* currently active master for this node */ struct drm_master *master; /* currently active master for this node */
struct list_head master_list; struct list_head master_list;