drm/i915/sw_fence: Replace private use of wq->flags with bit zero in wq->private
Subsystems (2)
Tvrtko Ursulin
maintainerPATCH 1/1 drm/i915/sw_fence: Replace private use of wq->flags with bit zero in wq->private
From: Tvrtko Ursulin <[email protected]>
Use of an un-allocated bit in flags is making me nervous so I thought to use the bit zero of the private pointer instead.
That should be safer against the core kernel changes and safe since I can't imagine we can get a fence at the odd address.
--- drivers/gpu/drm/i915/i915_sw_fence.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_sw_fence.c +16 -8
@@ -13,7 +13,8 @@#include "i915_sw_fence.h" -#define I915_SW_FENCE_FLAG_ALLOC BIT(3)/* after WQ_FLAG_* for safety */ +#define I915_SW_FENCE_FLAG_ALLOC (1) +#define I915_SW_FENCE_PRIVATE_MASK ~(I915_SW_FENCE_FLAG_ALLOC)static DEFINE_SPINLOCK (i915_sw_fence_lock);
@@ -132,12 +133,17 @@ void i915_sw_fence_commit(struct i915_sw_fence *fence)i915_sw_fence_put (fence); } +#define wq_to_i915_sw_fence (wq) (struct i915_sw_fence *) \ + ((unsigned long)(wq)->private & I915_SW_FENCE_PRIVATE_MASK) +static int i915_sw_fence_wake (wait_queue_t *wq,unsigned mode,int flags,void *key) { +struct i915_sw_fence *fence =wq_to_i915_sw_fence (wq); +list_del (&wq->task_list); -__i915_sw_fence_complete (wq->private, key); -i915_sw_fence_put (wq->private); -if (wq->flags &I915_SW_FENCE_FLAG_ALLOC ) +__i915_sw_fence_complete (fence, key); +i915_sw_fence_put (fence); +if ((unsigned long )wq->private &I915_SW_FENCE_FLAG_ALLOC )kfree (wq);return 0 ; }
@@ -157,7 +163,8 @@ static bool __i915_sw_fence_check_if_after(struct i915_sw_fence *fence,if (wq->func != i915_sw_fence_wake)continue ; -if (__i915_sw_fence_check_if_after (wq->private, signaler)) +if (__i915_sw_fence_check_if_after (wq_to_i915_sw_fence (wq), + signaler))return true; }
@@ -175,7 +182,7 @@ static void __i915_sw_fence_clear_checked_bit(struct i915_sw_fence *fence)if (wq->func != i915_sw_fence_wake)continue ; -__i915_sw_fence_clear_checked_bit (wq->private); +__i915_sw_fence_clear_checked_bit (wq_to_i915_sw_fence (wq)); } }
@@ -221,13 +228,14 @@ static int __i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence,return 0 ; } - pending |=I915_SW_FENCE_FLAG_ALLOC ; + pending =I915_SW_FENCE_FLAG_ALLOC ; }INIT_LIST_HEAD (&wq->task_list); - wq->flags = pending; wq->func = i915_sw_fence_wake; wq->private =i915_sw_fence_get (fence); +BUG_ON ((unsigned long )wq->private &I915_SW_FENCE_FLAG_ALLOC ); + wq->private = (void *)((unsigned long )wq->private | pending);i915_sw_fence_await (fence);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Use of an un-allocated bit in flags is making me nervous so I thought to use the bit zero of the private pointer instead.
That should be safer against the core kernel changes and safe since I can't imagine we can get a fence at the odd address.
I'm not squeamish about using flags ;)
Quoted 11 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_sw_fence.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/i915_sw_fence.c +0
-0
drivers/gpu/drm/i915/i915_sw_fence.c line 16
Quoted 5 lines
drivers/gpu/drm/i915/i915_sw_fence.c +1
-1@@ -13,7 +13,8 @@#include "i915_sw_fence.h" -#define I915_SW_FENCE_FLAG_ALLOC BIT(3)/* after WQ_FLAG_* for safety */ +#define I915_SW_FENCE_FLAG_ALLOC (1)
BIT(0) before Joonas notices.
drivers/gpu/drm/i915/i915_sw_fence.c void i915_sw_fence_commit(struct i915_sw_fence *fence) · line 137
Quoted 10 lines
drivers/gpu/drm/i915/i915_sw_fence.c +3
-0+#define I915_SW_FENCE_PRIVATE_MASK ~(I915_SW_FENCE_FLAG_ALLOC)static DEFINE_SPINLOCK (i915_sw_fence_lock);@@ -132,12 +133,17 @@ void i915_sw_fence_commit(struct i915_sw_fence *fence)i915_sw_fence_put (fence); } +#define wq_to_i915_sw_fence (wq) (struct i915_sw_fence *) \ + ((unsigned long)(wq)->private & I915_SW_FENCE_PRIVATE_MASK)
I quite like:
#define wq_to_i915_sw_fence(wq) ({
unsigned long __v = (unsigned long)(wq)->private;
(struct i915_sw_fence *)(__v & I915_SW_FENCE_PRIVATE_MASK);)}
or better
static inline struct i915_sw_fence *wq_to_i915_sw_fence(const wait_queue_t *wq)
{
unsigned long __v = (unsigned long)wq->private;
return (struct i915_sw_fence *)(__v & I915_SW_FENCE_PRIVATE_MASK);
}static inline boolwq_is_alloc(const wait_queue_t *wq)
{
unsigned long __v = (unsigned long)wq->private;
return __v & I915_SW_FENCE_FLAG_ALLOC;
}Quoted 35 lines
drivers/gpu/drm/i915/i915_sw_fence.c +9
-5+static int i915_sw_fence_wake (wait_queue_t *wq,unsigned mode,int flags,void *key) { +struct i915_sw_fence *fence =wq_to_i915_sw_fence (wq); +list_del (&wq->task_list); -__i915_sw_fence_complete (wq->private, key); -i915_sw_fence_put (wq->private); -if (wq->flags &I915_SW_FENCE_FLAG_ALLOC ) +__i915_sw_fence_complete (fence, key); +i915_sw_fence_put (fence); +if ((unsigned long )wq->private &I915_SW_FENCE_FLAG_ALLOC )kfree (wq);return 0 ; }@@ -157,7 +163,8 @@ static bool __i915_sw_fence_check_if_after(struct i915_sw_fence *fence,if (wq->func != i915_sw_fence_wake)continue ; -if (__i915_sw_fence_check_if_after (wq->private, signaler)) +if (__i915_sw_fence_check_if_after (wq_to_i915_sw_fence (wq), + signaler))return true; }@@ -175,7 +182,7 @@ static void __i915_sw_fence_clear_checked_bit(struct i915_sw_fence *fence)if (wq->func != i915_sw_fence_wake)continue ; -__i915_sw_fence_clear_checked_bit (wq->private); +__i915_sw_fence_clear_checked_bit (wq_to_i915_sw_fence (wq)); } }
drivers/gpu/drm/i915/i915_sw_fence.c static int __i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence, · line 228
Quoted 9 lines
drivers/gpu/drm/i915/i915_sw_fence.c +1
-2@@ -221,13 +228,14 @@ static int __i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence,return 0 ; } - pending |=I915_SW_FENCE_FLAG_ALLOC ; + pending =I915_SW_FENCE_FLAG_ALLOC ; }INIT_LIST_HEAD (&wq->task_list); - wq->flags = pending;
We still need to set wq->flags to 0.
It looks ok, but I just don't see the point. wq->flags is private to the wq->func callback.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 102 lines · Chris Wilson
Quoted 7 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Use of an un-allocated bit in flags is making me nervous so I thought to use the bit zero of the private pointer instead.
That should be safer against the core kernel changes and safe since I can't imagine we can get a fence at the odd address.
I'm not squeamish about using flags ;)
Quoted 11 lines
Signed-off-by Tvrtko Ursulin <[email protected]>Cc Chris Wilson <[email protected]>--- drivers/gpu/drm/i915/i915_sw_fence.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)drivers/gpu/drm/i915/i915_sw_fence.c +0
-0drivers/gpu/drm/i915/i915_sw_fence.c line 16
Quoted 5 lines
drivers/gpu/drm/i915/i915_sw_fence.c +1
-1@@ -13,7 +13,8 @@#include "i915_sw_fence.h" -#define I915_SW_FENCE_FLAG_ALLOC BIT(3)/* after WQ_FLAG_* for safety */ +#define I915_SW_FENCE_FLAG_ALLOC (1)BIT(0) before Joonas notices.
drivers/gpu/drm/i915/i915_sw_fence.c void i915_sw_fence_commit(struct i915_sw_fence *fence) · line 137
Quoted 10 lines
drivers/gpu/drm/i915/i915_sw_fence.c +3
-0+#define I915_SW_FENCE_PRIVATE_MASK ~(I915_SW_FENCE_FLAG_ALLOC)static DEFINE_SPINLOCK (i915_sw_fence_lock);@@ -132,12 +133,17 @@ void i915_sw_fence_commit(struct i915_sw_fence *fence)i915_sw_fence_put (fence); } +#define wq_to_i915_sw_fence (wq) (struct i915_sw_fence *) \ + ((unsigned long)(wq)->private & I915_SW_FENCE_PRIVATE_MASK)I quite like:
#define wq_to_i915_sw_fence(wq) ({ unsigned long __v = (unsigned long)(wq)->private; (struct i915_sw_fence *)(__v & I915_SW_FENCE_PRIVATE_MASK);)}
or better
static inline struct
i915_sw_fence*wq_to_i915_sw_fence(const wait_queue_t *wq){ unsigned long __v = (unsigned long)wq->private; return (struct i915_sw_fence *)(__v & I915_SW_FENCE_PRIVATE_MASK); }static inline bool
wq_is_alloc(const wait_queue_t *wq){ unsigned long __v = (unsigned long)wq->private; return __v & I915_SW_FENCE_FLAG_ALLOC; }Quoted 38 lines
drivers/gpu/drm/i915/i915_sw_fence.c +9
-5+static int i915_sw_fence_wake (wait_queue_t *wq,unsigned mode,int flags,void *key) { +struct i915_sw_fence *fence =wq_to_i915_sw_fence (wq); +list_del (&wq->task_list); -__i915_sw_fence_complete (wq->private, key); -i915_sw_fence_put (wq->private); -if (wq->flags &I915_SW_FENCE_FLAG_ALLOC ) +__i915_sw_fence_complete (fence, key); +i915_sw_fence_put (fence); +if ((unsigned long )wq->private &I915_SW_FENCE_FLAG_ALLOC )kfree (wq);return 0 ; }@@ -157,7 +163,8 @@ static bool __i915_sw_fence_check_if_after(struct i915_sw_fence *fence,if (wq->func != i915_sw_fence_wake)continue ; -if (__i915_sw_fence_check_if_after (wq->private, signaler)) +if (__i915_sw_fence_check_if_after (wq_to_i915_sw_fence (wq), + signaler))return true; }@@ -175,7 +182,7 @@ static void __i915_sw_fence_clear_checked_bit(struct i915_sw_fence *fence)if (wq->func != i915_sw_fence_wake)continue ; -__i915_sw_fence_clear_checked_bit (wq->private); +__i915_sw_fence_clear_checked_bit (wq_to_i915_sw_fence (wq)); } }@@ -221,13 +228,14 @@ static int __i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence,return 0 ; }
Quoted 8 lines
drivers/gpu/drm/i915/i915_sw_fence.c static int __i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence, · line 228
Quoted 6 lines
drivers/gpu/drm/i915/i915_sw_fence.c +1
-2- pending |=I915_SW_FENCE_FLAG_ALLOC ; + pending =I915_SW_FENCE_FLAG_ALLOC ; }INIT_LIST_HEAD (&wq->task_list); - wq->flags = pending;We still need to set
wq->flagsto 0.
Ooops.
Quoted 2 lines
It looks ok, but I just don't see the point.
wq->flagsis private to thewq->funccallback.
A very superficial skim shows that wake_up_common at least looks at the flags. So I thought, as long as wake_up_something gets called form somewhere on these ones, it would be safer not to potentially silently collide with some core flag.
Or are you saying no one ever touches them outside i915_sw_fence.c ? Hm, I have to admit I haven't figured it all out yet so I am not sure.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 10 lines · Tvrtko Ursulin
Quoted 2 lines · Chris Wilson
It looks ok, but I just don't see the point.
wq->flagsis private to thewq->funccallback.A very superficial skim shows that
wake_up_commonat least looks at the flags. So I thought, as long aswake_up_somethinggets called form somewhere on these ones, it would be safer not to potentially silently collide with some core flag.Or are you saying no one ever touches them outside
i915_sw_fence.c?
That would break the encapsulation of the waitqueue being inside the fence. I was not intending for people to call wake_up_all(fence.wait), kfence_wake_up_all() [bad name, I was trying to borrow the concept from wake_up_all() but it is not the same, it is for the completion of a deferred signal notify] completes the fence in addition to signaling its waiters.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/sw_fence: Replace private use of wq->flags with bit zero in wq->private
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915/sw_fence: Replace private use of wq->flags with bit zero in wq->private
URL : https://patchwork.freedesktop.org/series/14745/
State : success
== Summary ==
Series 14745v1 drm/i915/sw_fence: Replace private use of wq->flags with bit zero in wq->private
https://patchwork.freedesktop.org/api/1.0/series/14745/revisions/1/mbox/
fi-bdw-5557u total:241 pass:226 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:241 pass:201 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:241 pass:213 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:241 pass:213 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:241 pass:209 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:241 pass:221 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:241 pass:220 dwarn:0 dfail:0 fail:0 skip:21 fi-ilk-650 total:241 pass:187 dwarn:0 dfail:0 fail:0 skip:54 fi-ivb-3520m total:241 pass:218 dwarn:0 dfail:0 fail:0 skip:23 fi-ivb-3770 total:241 pass:218 dwarn:0 dfail:0 fail:0 skip:23 fi-kbl-7200u total:241 pass:219 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:241 pass:227 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:241 pass:220 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:241 pass:219 dwarn:1 dfail:0 fail:0 skip:21 fi-skl-6770hq total:241 pass:227 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:241 pass:208 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:241 pass:207 dwarn:0 dfail:0 fail:0 skip:34
bf6b989af8b0fde56a352d9005c97b2d8e3bbbe3 drm-intel-nightly: 2016y-11m-02d-15h-44m-03s UTC integration manifest 9067391 drm/i915/sw_fence: Replace private use of wq->flags with bit zero in wq->private
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_2892/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx