| Message ID | 20191022191215.25781-3-paulmck@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | None | expand |
Quoting paulmck@kernel.org (2019-10-22 22:12:08) > From: "Paul E. McKenney" <paulmck@kernel.org> > > This commit replaces the use of rcu_swap_protected() with the more > intuitively appealing rcu_replace() as a step towards removing > rcu_swap_protected(). > > Link: https://lore.kernel.org/lkml/CAHk-=wiAsJLw1egFEE=Z7-GGtM6wcvtyytXZA1+BHqta4gg6Hw@mail.gmail.com/ > Reported-by: Linus Torvalds <torvalds@linux-foundation.org> > [ paulmck: From rcu_replace() to rcu_replace_pointer() per Ingo Molnar. ] > Signed-off-by: Paul E. McKenney <paulmck@kernel.org> > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > Cc: <intel-gfx@lists.freedesktop.org> > Cc: <dri-devel@lists.freedesktop.org> "drm/i915:" preferred as the subject prefix for increased specificity. Let me know which tree you end up merging with. Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Regards, Joonas
On Mon, Oct 28, 2019 at 02:57:26PM +0200, Joonas Lahtinen wrote: > Quoting paulmck@kernel.org (2019-10-22 22:12:08) > > From: "Paul E. McKenney" <paulmck@kernel.org> > > > > This commit replaces the use of rcu_swap_protected() with the more > > intuitively appealing rcu_replace() as a step towards removing > > rcu_swap_protected(). > > > > Link: https://lore.kernel.org/lkml/CAHk-=wiAsJLw1egFEE=Z7-GGtM6wcvtyytXZA1+BHqta4gg6Hw@mail.gmail.com/ > > Reported-by: Linus Torvalds <torvalds@linux-foundation.org> > > [ paulmck: From rcu_replace() to rcu_replace_pointer() per Ingo Molnar. ] > > Signed-off-by: Paul E. McKenney <paulmck@kernel.org> > > Cc: Jani Nikula <jani.nikula@linux.intel.com> > > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > > Cc: David Airlie <airlied@linux.ie> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > Cc: Chris Wilson <chris@chris-wilson.co.uk> > > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> > > Cc: <intel-gfx@lists.freedesktop.org> > > Cc: <dri-devel@lists.freedesktop.org> > > "drm/i915:" preferred as the subject prefix for increased specificity. "drm/i915" it is! > Let me know which tree you end up merging with. I expect to be sending a pull request for inclusion into the -tip tree in a day or three. > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Applied, thank you! Thanx, Paul
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c index 1cdfe05..3f3e803 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c @@ -1629,7 +1629,7 @@ set_engines(struct i915_gem_context *ctx, i915_gem_context_set_user_engines(ctx); else i915_gem_context_clear_user_engines(ctx); - rcu_swap_protected(ctx->engines, set.engines, 1); + set.engines = rcu_replace_pointer(ctx->engines, set.engines, 1); mutex_unlock(&ctx->engines_mutex); call_rcu(&set.engines->rcu, free_engines_rcu);