In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.
Cc: Daniel Vetter daniel.vetter@intel.com Cc: Jani Nikula jani.nikula@linux.intel.com Cc: David Airlie airlied@linux.ie Cc: Chris Wilson chris@chris-wilson.co.uk Cc: Joonas Lahtinen joonas.lahtinen@linux.intel.com Cc: Tvrtko Ursulin tvrtko.ursulin@intel.com Cc: Oscar Mateo oscar.mateo@intel.com Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: Thomas Gleixner tglx@linutronix.de Signed-off-by: Kees Cook keescook@chromium.org --- This requires commit 686fef928bba ("timer: Prepare to change timer callback argument type") in v4.14-rc3, but should be otherwise stand-alone. --- drivers/gpu/drm/i915/selftests/mock_engine.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/selftests/mock_engine.c b/drivers/gpu/drm/i915/selftests/mock_engine.c index fc0fd7498689..331c2b09869e 100644 --- a/drivers/gpu/drm/i915/selftests/mock_engine.c +++ b/drivers/gpu/drm/i915/selftests/mock_engine.c @@ -32,9 +32,9 @@ static struct mock_request *first_request(struct mock_engine *engine) link); }
-static void hw_delay_complete(unsigned long data) +static void hw_delay_complete(struct timer_list *t) { - struct mock_engine *engine = (typeof(engine))data; + struct mock_engine *engine = from_timer(engine, t, hw_delay); struct mock_request *request;
spin_lock(&engine->hw_lock); @@ -161,9 +161,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
/* fake hw queue */ spin_lock_init(&engine->hw_lock); - setup_timer(&engine->hw_delay, - hw_delay_complete, - (unsigned long)engine); + timer_setup(&engine->hw_delay, hw_delay_complete, 0); INIT_LIST_HEAD(&engine->hw_queue);
return &engine->base;
On Wed, 2017-10-04 at 17:54 -0700, Kees Cook wrote:
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.
Cc: Daniel Vetter daniel.vetter@intel.com Cc: Jani Nikula jani.nikula@linux.intel.com Cc: David Airlie airlied@linux.ie Cc: Chris Wilson chris@chris-wilson.co.uk Cc: Joonas Lahtinen joonas.lahtinen@linux.intel.com Cc: Tvrtko Ursulin tvrtko.ursulin@intel.com Cc: Oscar Mateo oscar.mateo@intel.com Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: Thomas Gleixner tglx@linutronix.de Signed-off-by: Kees Cook keescook@chromium.org
<SNIP>
@@ -32,9 +32,9 @@ static struct mock_request *first_request(struct mock_engine *engine) link); }
-static void hw_delay_complete(unsigned long data) +static void hw_delay_complete(struct timer_list *t) {
- struct mock_engine *engine = (typeof(engine))data;
- struct mock_engine *engine = from_timer(engine, t, hw_delay);
The order is bit strange to me, it's not same as with container_of, but I guess GCC will complain for getting it wrong. It's also slightly different doing the typeof for you, so I guess it makes sense, so:
Reviewed-by: Joonas Lahtinen joonas.lahtinen@linux.intel.com
Do you expect for us to merge or are you looking to merge all timer changes from single tree?
Regards, Joonas
On Thu, Oct 5, 2017 at 6:45 AM, Joonas Lahtinen joonas.lahtinen@linux.intel.com wrote:
On Wed, 2017-10-04 at 17:54 -0700, Kees Cook wrote:
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.
Cc: Daniel Vetter daniel.vetter@intel.com Cc: Jani Nikula jani.nikula@linux.intel.com Cc: David Airlie airlied@linux.ie Cc: Chris Wilson chris@chris-wilson.co.uk Cc: Joonas Lahtinen joonas.lahtinen@linux.intel.com Cc: Tvrtko Ursulin tvrtko.ursulin@intel.com Cc: Oscar Mateo oscar.mateo@intel.com Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: Thomas Gleixner tglx@linutronix.de Signed-off-by: Kees Cook keescook@chromium.org
<SNIP>
@@ -32,9 +32,9 @@ static struct mock_request *first_request(struct mock_engine *engine) link); }
-static void hw_delay_complete(unsigned long data) +static void hw_delay_complete(struct timer_list *t) {
struct mock_engine *engine = (typeof(engine))data;
struct mock_engine *engine = from_timer(engine, t, hw_delay);The order is bit strange to me, it's not same as with container_of, but I guess GCC will complain for getting it wrong. It's also slightly different doing the typeof for you, so I guess it makes sense, so:
Yeah, this seemed to be the least bad of several options. Other things ended up being either very long, named unlike anything else already in the kernel, etc.
Reviewed-by: Joonas Lahtinen joonas.lahtinen@linux.intel.com
Thanks!
Do you expect for us to merge or are you looking to merge all timer changes from single tree?
If you have -rc3 in your tree already, please take this into your tree. If you prefer the timer tree to carry it, that can happen too. tglx suggested to me that it was better for maintainers to carry the changes.
-Kees
On Thu, 05 Oct 2017, Kees Cook keescook@chromium.org wrote:
On Thu, Oct 5, 2017 at 6:45 AM, Joonas Lahtinen joonas.lahtinen@linux.intel.com wrote:
On Wed, 2017-10-04 at 17:54 -0700, Kees Cook wrote:
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.
Cc: Daniel Vetter daniel.vetter@intel.com Cc: Jani Nikula jani.nikula@linux.intel.com Cc: David Airlie airlied@linux.ie Cc: Chris Wilson chris@chris-wilson.co.uk Cc: Joonas Lahtinen joonas.lahtinen@linux.intel.com Cc: Tvrtko Ursulin tvrtko.ursulin@intel.com Cc: Oscar Mateo oscar.mateo@intel.com Cc: intel-gfx@lists.freedesktop.org Cc: dri-devel@lists.freedesktop.org Cc: Thomas Gleixner tglx@linutronix.de Signed-off-by: Kees Cook keescook@chromium.org
<SNIP>
@@ -32,9 +32,9 @@ static struct mock_request *first_request(struct mock_engine *engine) link); }
-static void hw_delay_complete(unsigned long data) +static void hw_delay_complete(struct timer_list *t) {
struct mock_engine *engine = (typeof(engine))data;
struct mock_engine *engine = from_timer(engine, t, hw_delay);The order is bit strange to me, it's not same as with container_of, but I guess GCC will complain for getting it wrong. It's also slightly different doing the typeof for you, so I guess it makes sense, so:
Yeah, this seemed to be the least bad of several options. Other things ended up being either very long, named unlike anything else already in the kernel, etc.
Reviewed-by: Joonas Lahtinen joonas.lahtinen@linux.intel.com
Thanks!
Do you expect for us to merge or are you looking to merge all timer changes from single tree?
If you have -rc3 in your tree already, please take this into your tree. If you prefer the timer tree to carry it, that can happen too. tglx suggested to me that it was better for maintainers to carry the changes.
We'll pick this when we have -rc3.
Thanks, Jani.
dri-devel@lists.freedesktop.org
-
Jani Nikula -
Joonas Lahtinen -
Kees Cook