dma-buf/poll: Get a file reference for outstanding fence callbacks
Subsystems (2)
PATCH 1/1 dma-buf/poll: Get a file reference for outstanding fence callbacks
From: Michel Dänzer <[email protected]>
This makes sure we don't hit the
BUG_ON(dmabuf->cb_in.active || dmabuf->cb_out.active);
in dma_buf_release, which could be triggered by user space closing the dma-buf file description while there are outstanding fence callbacks from dma_buf_poll.
--- drivers/dma-buf/dma-buf.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/dma-buf/dma-buf.c +12 -6
@@ -65,12 +65,9 @@ static void dma_buf_release(struct dentry *dentry)BUG_ON (dmabuf->vmapping_counter);/* -* Any fences that a dma-buf poll can wait on should be signaled -* before releasing dma-buf. This is the responsibility of each -* driver that uses the reservation objects. -* -* If you hit this BUG() it means someone dropped their ref to the -* dma-buf while still having pending operation to the buffer. +* If you hit this BUG() it could mean: +* * There's a file reference imbalance in dma_buf_poll / dma_buf_poll_cb or somewhere else +* * dmabuf->cb_in/out.active are non-0 despite no pending fence callback */ BUG_ON (dmabuf->cb_in.active || dmabuf->cb_out.active);
@@ -196,6 +193,7 @@ static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence)static void dma_buf_poll_cb (struct dma_fence *fence,struct dma_fence_cb *cb) {struct dma_buf_poll_cb_t *dcb = (struct dma_buf_poll_cb_t *)cb; + struct dma_buf *dmabuf = container_of(dcb->poll, struct dma_buf, poll);unsigned long flags;spin_lock_irqsave (&dcb->poll->lock, flags);
@@ -203,6 +201,8 @@ static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) dcb->active =0 ;spin_unlock_irqrestore (&dcb->poll->lock, flags);dma_fence_put (fence); +/* Paired with get_file in dma_buf_poll */ +fput (dmabuf->file); } static bool dma_buf_poll_shared(struct dma_resv *resv,
@@ -278,6 +278,9 @@ static __poll_t dma_buf_poll(struct file *file, poll_table *poll)spin_unlock_irq (&dmabuf->poll.lock);if (events &EPOLLOUT ) { +/* Paired with fput in dma_buf_poll_cb */ +get_file (dmabuf->file); +if (!dma_buf_poll_shared (resv, dcb) && !dma_buf_poll_excl (resv, dcb))/* No callback queued, wake up any other waiters */
@@ -299,6 +302,9 @@ static __poll_t dma_buf_poll(struct file *file, poll_table *poll)spin_unlock_irq (&dmabuf->poll.lock);if (events &EPOLLIN ) { +/* Paired with fput in dma_buf_poll_cb */ +get_file (dmabuf->file); +if (!dma_buf_poll_excl (resv, dcb))/* No callback queued, wake up any other waiters */ dma_buf_poll_cb (NULL , &dcb->cb);
Signature · 1 line
2.32.0
Christian König
maintainerAm 23.07.21 um 09:58 schrieb Michel Dänzer:
Quoted 9 lines
From: Michel Dänzer <[email protected]>
This makes sure we don't hit the
BUG_ON(dmabuf->cb_in.active || dmabuf->cb_out.active);in
dma_buf_release, which could be triggered by user space closing the dma-buf file description while there are outstanding fence callbacks fromdma_buf_poll.
I was also wondering the same thing while working on this, but then thought that the poll interface would take care of this.
Quoted 36 lines
Signed-off-by Michel Dänzer <[email protected]>--- drivers/dma-buf/dma-buf.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)drivers/dma-buf/dma-buf.c +4
-6@@ -65,12 +65,9 @@ static void dma_buf_release(struct dentry *dentry)BUG_ON (dmabuf->vmapping_counter);/* -* Any fences that a dma-buf poll can wait on should be signaled -* before releasing dma-buf. This is the responsibility of each -* driver that uses the reservation objects. -* -* If you hit this BUG() it means someone dropped their ref to the -* dma-buf while still having pending operation to the buffer. +* If you hit this BUG() it could mean: +* * There's a file reference imbalance in dma_buf_poll / dma_buf_poll_cb or somewhere else +* * dmabuf->cb_in/out.active are non-0 despite no pending fence callback */ BUG_ON (dmabuf->cb_in.active || dmabuf->cb_out.active);@@ -196,6 +193,7 @@ static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence)static void dma_buf_poll_cb (struct dma_fence *fence,struct dma_fence_cb *cb) {struct dma_buf_poll_cb_t *dcb = (struct dma_buf_poll_cb_t *)cb; + struct dma_buf *dmabuf = container_of(dcb->poll, struct dma_buf, poll);unsigned long flags;spin_lock_irqsave (&dcb->poll->lock, flags);
drivers/dma-buf/dma-buf.c static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) · line 205
Quoted 5 lines
drivers/dma-buf/dma-buf.c +2
-0@@ -203,6 +201,8 @@ static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) dcb->active =0 ;spin_unlock_irqrestore (&dcb->poll->lock, flags);dma_fence_put (fence); +/* Paired with get_file in dma_buf_poll */ +fput (dmabuf->file);
Is calling fput() in interrupt context ok? IIRC that could potentially sleep.
Regards,
Christian.
Quoted 23 lines
drivers/dma-buf/dma-buf.c +6
-0} static bool dma_buf_poll_shared(struct dma_resv *resv,@@ -278,6 +278,9 @@ static __poll_t dma_buf_poll(struct file *file, poll_table *poll)spin_unlock_irq (&dmabuf->poll.lock);if (events &EPOLLOUT ) { +/* Paired with fput in dma_buf_poll_cb */ +get_file (dmabuf->file); +if (!dma_buf_poll_shared (resv, dcb) && !dma_buf_poll_excl (resv, dcb))/* No callback queued, wake up any other waiters */ @@ -299,6 +302,9 @@ static __poll_t dma_buf_poll(struct file *file, poll_table *poll)spin_unlock_irq (&dmabuf->poll.lock);if (events &EPOLLIN ) { +/* Paired with fput in dma_buf_poll_cb */ +get_file (dmabuf->file); +if (!dma_buf_poll_excl (resv, dcb))/* No callback queued, wake up any other waiters */ dma_buf_poll_cb (NULL , &dcb->cb);
Quoted 5 lines · Christian König
Am 23.07.21 um 09:58 schrieb Michel Dänzer:
Quoted 4 lines
From: Michel Dänzer <[email protected]>
This makes sure we don't hit the
Quoted 7 lines
Quoted 5 lines
BUG_ON(dmabuf->cb_in.active ||
dmabuf->cb_out.active);in
dma_buf_release, which could be triggered by user space closing the dma-buf file description while there are outstanding fence callbacks fromdma_buf_poll.I was also wondering the same thing while working on this, but then thought that the poll interface would take care of this.
I was able to hit the BUG_ON with https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1880 .
Quoted 31 lines
Quoted 31 lines
Signed-off-by Michel Dänzer <[email protected]>---
drivers/dma-buf/dma-buf.c| 18 ++++++++++++------1 file changed, 12 insertions(+), 6 deletions(-)drivers/dma-buf/dma-buf.c +3
-6@@ -65,12 +65,9 @@ static void dma_buf_release(struct dentry *dentry) BUG_ON(dmabuf->vmapping_counter); /* - * Any fences that a dma-buf poll can wait on should be signaled - * before releasing dma-buf. This is the responsibility of each - * driver that uses the reservation objects. - * - * If you hit this BUG() it means someone dropped their ref to the - * dma-buf while still having pending operation to the buffer. + * If you hit this BUG() it could mean: + * * There's a file reference imbalance in dma_buf_poll / dma_buf_poll_cb or somewhere else + * * dmabuf->cb_in/out.active are non-0 despite no pending fence callback */ BUG_ON(dmabuf->cb_in.active || dmabuf->cb_out.active); @@ -196,6 +193,7 @@ static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence) static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb){
structdma_buf_poll_cb_t*dcb = (structdma_buf_poll_cb_t*)cb; + structdma_buf*dmabuf =container_of(dcb->poll, struct dma_buf, poll); unsigned long flags;
spin_lock_irqsave(&dcb->poll->lock, flags);
Quoted 8 lines
drivers/dma-buf/dma-buf.c static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) · line 205
Quoted 6 lines
drivers/dma-buf/dma-buf.c +2
-0@@ -203,6 +201,8 @@ static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) dcb->active = 0; spin_unlock_irqrestore(&dcb->poll->lock, flags); dma_fence_put(fence); + /* Paired with get_file in dma_buf_poll */ + fput(dmabuf->file);Is calling
fput()in interrupt context ok? IIRC that could potentially sleep.
Looks fine AFAICT: It has
if (likely(!in_interrupt() && !(task->flags & PF_KTHREAD))) {and as a fallback for that, it adds the file to a lock-less delayed_fput_list which is processed by a workqueue.
Signature · 2 lines
Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer
Am 23.07.21 um 10:19 schrieb Michel Dänzer:
Quoted 53 lines · Christian König
Quoted 11 lines
Am 23.07.21 um 09:58 schrieb Michel Dänzer:
Quoted 9 lines
From: Michel Dänzer <[email protected]>
This makes sure we don't hit the
BUG_ON(dmabuf->cb_in.active ||
dmabuf->cb_out.active);in
dma_buf_release, which could be triggered by user space closing the dma-buf file description while there are outstanding fence callbacks fromdma_buf_poll.I was also wondering the same thing while working on this, but then thought that the poll interface would take care of this.
I was able to hit the
BUG_ONwith https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1880 .Quoted 30 lines
Quoted 30 lines
Signed-off-by Michel Dänzer <[email protected]>--- drivers/dma-buf/dma-buf.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)drivers/dma-buf/dma-buf.c +3
-6@@ -65,12 +65,9 @@ static void dma_buf_release(struct dentry *dentry) BUG_ON(dmabuf->vmapping_counter); /* - * Any fences that a dma-buf poll can wait on should be signaled - * before releasing dma-buf. This is the responsibility of each - * driver that uses the reservation objects. - * - * If you hit this BUG() it means someone dropped their ref to the - * dma-buf while still having pending operation to the buffer. + * If you hit this BUG() it could mean: + * * There's a file reference imbalance in dma_buf_poll / dma_buf_poll_cb or somewhere else + * * dmabuf->cb_in/out.active are non-0 despite no pending fence callback */ BUG_ON(dmabuf->cb_in.active || dmabuf->cb_out.active); @@ -196,6 +193,7 @@ static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence) static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb){
structdma_buf_poll_cb_t*dcb = (structdma_buf_poll_cb_t*)cb;
+ structdma_buf*dmabuf =container_of(dcb->poll, struct dma_buf, poll);
unsigned long flags;Quoted 8 lines
drivers/dma-buf/dma-buf.c static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) · line 205
Quoted 7 lines
spin_lock_irqsave(&dcb->poll->lock, flags);drivers/dma-buf/dma-buf.c +2
-0@@ -203,6 +201,8 @@ static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) dcb->active = 0; spin_unlock_irqrestore(&dcb->poll->lock, flags); dma_fence_put(fence); + /* Paired with get_file in dma_buf_poll */ + fput(dmabuf->file);Is calling
fput()in interrupt context ok? IIRC that could potentially sleep.
Quoted 5 lines
Looks fine AFAICT: It has
if (likely(!in_interrupt() && !(task->flags & PF_KTHREAD))) {and as a fallback for that, it adds the file to a lock-less
delayed_fput_listwhich is processed by a workqueue.
Ah, yes that makes sense.
Fell free to add Reviewed-by: Christian König <[email protected]>
Thanks,
Christian.
Quoted 56 lines · Christian König
Am 23.07.21 um 10:19 schrieb Michel Dänzer:
Quoted 55 lines · Christian König
Quoted 11 lines
Am 23.07.21 um 09:58 schrieb Michel Dänzer:
Quoted 9 lines
From: Michel Dänzer <[email protected]>
This makes sure we don't hit the
BUG_ON(dmabuf->cb_in.active ||
dmabuf->cb_out.active);in
dma_buf_release, which could be triggered by user space closing the dma-buf file description while there are outstanding fence callbacks fromdma_buf_poll.I was also wondering the same thing while working on this, but then thought that the poll interface would take care of this.
I was able to hit the
BUG_ONwith https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1880 .Quoted 30 lines
Quoted 30 lines
Signed-off-by Michel Dänzer <[email protected]>---
drivers/dma-buf/dma-buf.c| 18 ++++++++++++------1 file changed, 12 insertions(+), 6 deletions(-)drivers/dma-buf/dma-buf.c +3
-6@@ -65,12 +65,9 @@ static void dma_buf_release(struct dentry *dentry) BUG_ON(dmabuf->vmapping_counter); /* - * Any fences that a dma-buf poll can wait on should be signaled - * before releasing dma-buf. This is the responsibility of each - * driver that uses the reservation objects. - * - * If you hit this BUG() it means someone dropped their ref to the - * dma-buf while still having pending operation to the buffer. + * If you hit this BUG() it could mean: + * * There's a file reference imbalance in dma_buf_poll / dma_buf_poll_cb or somewhere else + * * dmabuf->cb_in/out.active are non-0 despite no pending fence callback */ BUG_ON(dmabuf->cb_in.active || dmabuf->cb_out.active); @@ -196,6 +193,7 @@ static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence) static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb){
structdma_buf_poll_cb_t*dcb = (structdma_buf_poll_cb_t*)cb; + structdma_buf*dmabuf =container_of(dcb->poll, struct dma_buf, poll); unsigned long flags;Quoted 8 lines
drivers/dma-buf/dma-buf.c static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) · line 205
Quoted 7 lines
spin_lock_irqsave(&dcb->poll->lock, flags);drivers/dma-buf/dma-buf.c +2
-0@@ -203,6 +201,8 @@ static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) dcb->active = 0; spin_unlock_irqrestore(&dcb->poll->lock, flags); dma_fence_put(fence); + /* Paired with get_file in dma_buf_poll */ + fput(dmabuf->file);Is calling
fput()in interrupt context ok? IIRC that could potentially sleep.Looks fine AFAICT: It has
Quoted 7 lines
Quoted 3 lines
if (
likely(!in_interrupt() && !(task->flags & PF_KTHREAD))) {and as a fallback for that, it adds the file to a lock-less
delayed_fput_listwhich is processed by a workqueue.Ah, yes that makes sense.
Fell free to add Reviewed-by: Christian König <[email protected]>
Thanks! AFAICT this fix can be merged now for 5.16?
Signature · 2 lines
Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and Xwayland developer
Christian König
maintainerAm 03.11.21 um 15:50 schrieb Michel Dänzer:
Quoted 57 lines · Christian König
Quoted 56 lines
Am 23.07.21 um 10:19 schrieb Michel Dänzer:
Quoted 55 lines · Christian König
Quoted 11 lines
Am 23.07.21 um 09:58 schrieb Michel Dänzer:
Quoted 9 lines
From: Michel Dänzer <[email protected]>
This makes sure we don't hit the
BUG_ON(dmabuf->cb_in.active ||
dmabuf->cb_out.active);in
dma_buf_release, which could be triggered by user space closing the dma-buf file description while there are outstanding fence callbacks fromdma_buf_poll.I was also wondering the same thing while working on this, but then thought that the poll interface would take care of this.
Quoted 30 lines
Quoted 30 lines
Signed-off-by Michel Dänzer <[email protected]>--- drivers/dma-buf/dma-buf.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)drivers/dma-buf/dma-buf.c +3
-6@@ -65,12 +65,9 @@ static void dma_buf_release(struct dentry *dentry) BUG_ON(dmabuf->vmapping_counter); /* - * Any fences that a dma-buf poll can wait on should be signaled - * before releasing dma-buf. This is the responsibility of each - * driver that uses the reservation objects. - * - * If you hit this BUG() it means someone dropped their ref to the - * dma-buf while still having pending operation to the buffer. + * If you hit this BUG() it could mean: + * * There's a file reference imbalance in dma_buf_poll / dma_buf_poll_cb or somewhere else + * * dmabuf->cb_in/out.active are non-0 despite no pending fence callback */ BUG_ON(dmabuf->cb_in.active || dmabuf->cb_out.active); @@ -196,6 +193,7 @@ static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence) static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb){
structdma_buf_poll_cb_t*dcb = (structdma_buf_poll_cb_t*)cb;
+ structdma_buf*dmabuf =container_of(dcb->poll, struct dma_buf, poll);
unsigned long flags;Quoted 8 lines
drivers/dma-buf/dma-buf.c static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) · line 205
Quoted 7 lines
spin_lock_irqsave(&dcb->poll->lock, flags);drivers/dma-buf/dma-buf.c +2
-0@@ -203,6 +201,8 @@ static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) dcb->active = 0; spin_unlock_irqrestore(&dcb->poll->lock, flags); dma_fence_put(fence); + /* Paired with get_file in dma_buf_poll */ + fput(dmabuf->file);Is calling
fput()in interrupt context ok? IIRC that could potentially sleep.Looks fine AFAICT: It has
Quoted 7 lines
Quoted 6 lines
Quoted 3 lines
if (
likely(!in_interrupt() && !(task->flags & PF_KTHREAD))) {and as a fallback for that, it adds the file to a lock-less
delayed_fput_listwhich is processed by a workqueue.Ah, yes that makes sense.
Fell free to add Reviewed-by: Christian König <[email protected]>
Thanks! AFAICT this fix can be merged now for 5.16?
I've just pushed it to drm-misc-next-fixes since it won't even apply to drm-misc-fixes.
Could be that we get requests to backport this because of the CC stable.
Christian.
Quoted 8 lines · Michel Dänzer
Quoted 7 lines · Christian König
Am 23.07.21 um 09:58 schrieb Michel Dänzer:
Quoted 6 lines
From: Michel Dänzer <[email protected]>
This makes sure we don't hit the
BUG_ON(dmabuf->cb_in.active ||
dmabuf->cb_out.active);
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
in
dma_buf_release, which could be triggered by user space closing the dma-buf file description while there are outstanding fence callbacks fromdma_buf_poll.I was also wondering the same thing while working on this, but then thought that the poll interface would take care of this.
I was able to hit the
BUG_ONwith https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1880 .
igt test would be really lovely. Maybe base something off the import/export igts from Jason?
-Daniel
Quoted 52 lines
Quoted 33 lines
Quoted 33 lines
Signed-off-by Michel Dänzer <[email protected]>---
drivers/dma-buf/dma-buf.c| 18 ++++++++++++------1 file changed, 12 insertions(+), 6 deletions(-)drivers/dma-buf/dma-buf.c +3
-6@@ -65,12 +65,9 @@ static void dma_buf_release(struct dentry *dentry) BUG_ON(dmabuf->vmapping_counter); /* - * Any fences that a dma-buf poll can wait on should be signaled - * before releasing dma-buf. This is the responsibility of each - * driver that uses the reservation objects. - * - * If you hit this BUG() it means someone dropped their ref to the - * dma-buf while still having pending operation to the buffer. + * If you hit this BUG() it could mean: + * * There's a file reference imbalance in dma_buf_poll / dma_buf_poll_cb or somewhere else + * * dmabuf->cb_in/out.active are non-0 despite no pending fence callback */ BUG_ON(dmabuf->cb_in.active || dmabuf->cb_out.active); @@ -196,6 +193,7 @@ static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence) static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb){
structdma_buf_poll_cb_t*dcb = (structdma_buf_poll_cb_t*)cb; + structdma_buf*dmabuf =container_of(dcb->poll, struct dma_buf, poll); unsigned long flags;
spin_lock_irqsave(&dcb->poll->lock, flags);Quoted 8 lines
drivers/dma-buf/dma-buf.c static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) · line 205
Quoted 6 lines
drivers/dma-buf/dma-buf.c +2
-0@@ -203,6 +201,8 @@ static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb) dcb->active = 0; spin_unlock_irqrestore(&dcb->poll->lock, flags); dma_fence_put(fence); + /* Paired with get_file in dma_buf_poll */ + fput(dmabuf->file);Is calling
fput()in interrupt context ok? IIRC that could potentially sleep.Looks fine AFAICT: It has
if (likely(!in_interrupt() && !(task->flags & PF_KTHREAD))) {and as a fallback for that, it adds the file to a lock-less
delayed_fput_listwhich is processed by a workqueue.Signature · 2 lines
Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 13 lines · Daniel Vetter
Quoted 12 lines · Michel Dänzer
Quoted 11 lines · Christian König
Am 23.07.21 um 09:58 schrieb Michel Dänzer:
Quoted 9 lines
From: Michel Dänzer <[email protected]>
This makes sure we don't hit the
BUG_ON(dmabuf->cb_in.active ||
dmabuf->cb_out.active);in
dma_buf_release, which could be triggered by user space closing the dma-buf file description while there are outstanding fence callbacks fromdma_buf_poll.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
I was also wondering the same thing while working on this, but then thought that the poll interface would take care of this.
I was able to hit the
BUG_ONwith https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1880 .igt test would be really lovely. Maybe base something off the import/export igts from Jason?
I'll see what I can do, busy with other stuff right now though.
Signature · 2 lines
Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer