AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

dma-buf/sw-sync: Reduce irqsave/irqrestore from known context

Browse Source 
If we know the context under which we are called, then we can use the
simpler form of spin_lock_irq (saving the save/restore).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170629125930.821-4-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2017-06-29 13:59:27 +01:00 committed by Gustavo Padovan
parent 8f66d3aa17
commit a6aa8fca4d
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/dma-buf/sw_sync.c
View File

@ -135,12 +135,11 @@ static void sync_timeline_put(struct sync_timeline *obj)
*/ */
static void sync_timeline_signal(struct sync_timeline *obj, unsigned int inc) static void sync_timeline_signal(struct sync_timeline *obj, unsigned int inc)
{ {
unsigned long flags;
struct sync_pt *pt, *next; struct sync_pt *pt, *next;
trace_sync_timeline(obj); trace_sync_timeline(obj);
spin_lock_irqsave(&obj->child_list_lock, flags); spin_lock_irq(&obj->child_list_lock);
obj->value += inc; obj->value += inc;
@ -150,7 +149,7 @@ static void sync_timeline_signal(struct sync_timeline *obj, unsigned int inc)
list_del_init(&pt->active_list); list_del_init(&pt->active_list);
} }
spin_unlock_irqrestore(&obj->child_list_lock, flags); spin_unlock_irq(&obj->child_list_lock);
} }
/** /**
@ -167,7 +166,6 @@ static void sync_timeline_signal(struct sync_timeline *obj, unsigned int inc)
static struct sync_pt *sync_pt_create(struct sync_timeline *obj, int size, static struct sync_pt *sync_pt_create(struct sync_timeline *obj, int size,
unsigned int value) unsigned int value)
{ {
unsigned long flags;
struct sync_pt *pt; struct sync_pt *pt;
if (size < sizeof(*pt)) if (size < sizeof(*pt))
@ -177,13 +175,16 @@ static struct sync_pt *sync_pt_create(struct sync_timeline *obj, int size,
if (!pt) if (!pt)
return NULL; return NULL;
spin_lock_irqsave(&obj->child_list_lock, flags); spin_lock_irq(&obj->child_list_lock);
sync_timeline_get(obj); sync_timeline_get(obj);
dma_fence_init(&pt->base, &timeline_fence_ops, &obj->child_list_lock, dma_fence_init(&pt->base, &timeline_fence_ops, &obj->child_list_lock,
obj->context, value); obj->context, value);
list_add_tail(&pt->child_list, &obj->child_list_head); list_add_tail(&pt->child_list, &obj->child_list_head);
INIT_LIST_HEAD(&pt->active_list); INIT_LIST_HEAD(&pt->active_list);
spin_unlock_irqrestore(&obj->child_list_lock, flags);
spin_unlock_irq(&obj->child_list_lock);
return pt; return pt;
} }
@ -206,9 +207,11 @@ static void timeline_fence_release(struct dma_fence *fence)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(fence->lock, flags); spin_lock_irqsave(fence->lock, flags);
list_del(&pt->child_list); list_del(&pt->child_list);
if (!list_empty(&pt->active_list)) if (!list_empty(&pt->active_list))
list_del(&pt->active_list); list_del(&pt->active_list);
spin_unlock_irqrestore(fence->lock, flags); spin_unlock_irqrestore(fence->lock, flags);
sync_timeline_put(parent); sync_timeline_put(parent);

14
drivers/dma-buf/sync_debug.c
View File

@ -116,17 +116,16 @@ static void sync_print_fence(struct seq_file *s,
static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj) static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj)
{ {
struct list_head *pos; struct list_head *pos;
unsigned long flags;
seq_printf(s, "%s: %d\n", obj->name, obj->value); seq_printf(s, "%s: %d\n", obj->name, obj->value);
spin_lock_irqsave(&obj->child_list_lock, flags); spin_lock_irq(&obj->child_list_lock);
list_for_each(pos, &obj->child_list_head) { list_for_each(pos, &obj->child_list_head) {
struct sync_pt *pt = struct sync_pt *pt =
container_of(pos, struct sync_pt, child_list); container_of(pos, struct sync_pt, child_list);
sync_print_fence(s, &pt->base, false); sync_print_fence(s, &pt->base, false);
} }
spin_unlock_irqrestore(&obj->child_list_lock, flags); spin_unlock_irq(&obj->child_list_lock);
} }
static void sync_print_sync_file(struct seq_file *s, static void sync_print_sync_file(struct seq_file *s,
@ -151,12 +150,11 @@ static void sync_print_sync_file(struct seq_file *s,
static int sync_debugfs_show(struct seq_file *s, void *unused) static int sync_debugfs_show(struct seq_file *s, void *unused)
{ {
unsigned long flags;
struct list_head *pos; struct list_head *pos;
seq_puts(s, "objs:\n--------------\n"); seq_puts(s, "objs:\n--------------\n");
spin_lock_irqsave(&sync_timeline_list_lock, flags); spin_lock_irq(&sync_timeline_list_lock);
list_for_each(pos, &sync_timeline_list_head) { list_for_each(pos, &sync_timeline_list_head) {
struct sync_timeline *obj = struct sync_timeline *obj =
container_of(pos, struct sync_timeline, container_of(pos, struct sync_timeline,
@ -165,11 +163,11 @@ static int sync_debugfs_show(struct seq_file *s, void *unused)
sync_print_obj(s, obj); sync_print_obj(s, obj);
seq_putc(s, '\n'); seq_putc(s, '\n');
} }
spin_unlock_irqrestore(&sync_timeline_list_lock, flags); spin_unlock_irq(&sync_timeline_list_lock);
seq_puts(s, "fences:\n--------------\n"); seq_puts(s, "fences:\n--------------\n");
spin_lock_irqsave(&sync_file_list_lock, flags); spin_lock_irq(&sync_file_list_lock);
list_for_each(pos, &sync_file_list_head) { list_for_each(pos, &sync_file_list_head) {
struct sync_file *sync_file = struct sync_file *sync_file =
container_of(pos, struct sync_file, sync_file_list); container_of(pos, struct sync_file, sync_file_list);
@ -177,7 +175,7 @@ static int sync_debugfs_show(struct seq_file *s, void *unused)
sync_print_sync_file(s, sync_file); sync_print_sync_file(s, sync_file);
seq_putc(s, '\n'); seq_putc(s, '\n');
} }
spin_unlock_irqrestore(&sync_file_list_lock, flags); spin_unlock_irq(&sync_file_list_lock);
return 0; return 0;
} }