| Message ID | 20210902142057.929669-5-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/11] drm/i915: Release i915_gem_context from a worker | expand |
On 02/09/2021 15:20, Daniel Vetter wrote: > The important part isn't so much that this does an rcu lookup - that's > more an implementation detail, which will also be removed. > > The thing that makes this different from other functions is that it's > gettting you the vm that batchbuffers will run in for that gem > context, which is either a full ppgtt stored in gem->ctx, or the ggtt. > > We'll make more use of this function later on. > > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Jon Bloomfield <jon.bloomfield@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> > Cc: Matthew Auld <matthew.auld@intel.com> > Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com> > Cc: Dave Airlie <airlied@redhat.com> > Cc: Jason Ekstrand <jason@jlekstrand.net> > --- > drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 +- > drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 4 ++-- > drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c | 4 ++-- > drivers/gpu/drm/i915/gt/selftest_execlists.c | 2 +- > drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- > drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 ++-- > drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +- > 7 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.h b/drivers/gpu/drm/i915/gem/i915_gem_context.h > index 18060536b0c2..da6e8b506d96 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.h > @@ -155,7 +155,7 @@ i915_gem_context_vm(struct i915_gem_context *ctx) > } > > static inline struct i915_address_space * > -i915_gem_context_get_vm_rcu(struct i915_gem_context *ctx) > +i915_gem_context_get_eb_vm(struct i915_gem_context *ctx) > { > struct i915_address_space *vm; > > diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c > index a094f3ce1a90..6c68fe26bb32 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c > +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c > @@ -1456,7 +1456,7 @@ static int igt_tmpfs_fallback(void *arg) > struct i915_gem_context *ctx = arg; > struct drm_i915_private *i915 = ctx->i915; > struct vfsmount *gemfs = i915->mm.gemfs; > - struct i915_address_space *vm = i915_gem_context_get_vm_rcu(ctx); > + struct i915_address_space *vm = i915_gem_context_get_eb_vm(ctx); > struct drm_i915_gem_object *obj; > struct i915_vma *vma; > u32 *vaddr; > @@ -1512,7 +1512,7 @@ static int igt_shrink_thp(void *arg) > { > struct i915_gem_context *ctx = arg; > struct drm_i915_private *i915 = ctx->i915; > - struct i915_address_space *vm = i915_gem_context_get_vm_rcu(ctx); > + struct i915_address_space *vm = i915_gem_context_get_eb_vm(ctx); Problem here (and probably elsewhere) is that this test does no "eb", nor even submits any requests for execution. More so, execbuf path does currently rely on intel_context->vm which is always set. So I really wonder how it would look, what I touched on elsewhere in the thread, if we instead made ctx->vm always point to something. It would align the rules between intel_context and GEM context and may end up with a more consistent situation. Regards, Tvrtko > struct drm_i915_gem_object *obj; > struct i915_gem_engines_iter it; > struct intel_context *ce; > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c > index 4d2758718d21..fc7fb33a3a52 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c > @@ -1528,7 +1528,7 @@ static int write_to_scratch(struct i915_gem_context *ctx, > > intel_gt_chipset_flush(engine->gt); > > - vm = i915_gem_context_get_vm_rcu(ctx); > + vm = i915_gem_context_get_eb_vm(ctx); > vma = i915_vma_instance(obj, vm, NULL); > if (IS_ERR(vma)) { > err = PTR_ERR(vma); > @@ -1607,7 +1607,7 @@ static int read_from_scratch(struct i915_gem_context *ctx, > if (GRAPHICS_VER(i915) >= 8) { > const u32 GPR0 = engine->mmio_base + 0x600; > > - vm = i915_gem_context_get_vm_rcu(ctx); > + vm = i915_gem_context_get_eb_vm(ctx); > vma = i915_vma_instance(obj, vm, NULL); > if (IS_ERR(vma)) { > err = PTR_ERR(vma); > diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c > index f12ffe797639..b3863abc51f5 100644 > --- a/drivers/gpu/drm/i915/gt/selftest_execlists.c > +++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c > @@ -3493,7 +3493,7 @@ static int smoke_submit(struct preempt_smoke *smoke, > if (batch) { > struct i915_address_space *vm; > > - vm = i915_gem_context_get_vm_rcu(ctx); > + vm = i915_gem_context_get_eb_vm(ctx); > vma = i915_vma_instance(batch, vm, NULL); > i915_vm_put(vm); > if (IS_ERR(vma)) > diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c > index 2c1ed32ca5ac..8be23e0f9306 100644 > --- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c > +++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c > @@ -117,7 +117,7 @@ static struct i915_request * > hang_create_request(struct hang *h, struct intel_engine_cs *engine) > { > struct intel_gt *gt = h->gt; > - struct i915_address_space *vm = i915_gem_context_get_vm_rcu(h->ctx); > + struct i915_address_space *vm = i915_gem_context_get_eb_vm(h->ctx); > struct drm_i915_gem_object *obj; > struct i915_request *rq = NULL; > struct i915_vma *hws, *vma; > diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c > index f843a5040706..2d60a5a5b065 100644 > --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c > @@ -1300,7 +1300,7 @@ static int exercise_mock(struct drm_i915_private *i915, > if (!ctx) > return -ENOMEM; > > - vm = i915_gem_context_get_vm_rcu(ctx); > + vm = i915_gem_context_get_eb_vm(ctx); > err = func(vm, 0, min(vm->total, limit), end_time); > i915_vm_put(vm); > > @@ -1848,7 +1848,7 @@ static int igt_cs_tlb(void *arg) > goto out_unlock; > } > > - vm = i915_gem_context_get_vm_rcu(ctx); > + vm = i915_gem_context_get_eb_vm(ctx); > if (i915_is_ggtt(vm)) > goto out_vm; > > diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c b/drivers/gpu/drm/i915/selftests/i915_vma.c > index dd0607254a95..79ba72da0813 100644 > --- a/drivers/gpu/drm/i915/selftests/i915_vma.c > +++ b/drivers/gpu/drm/i915/selftests/i915_vma.c > @@ -118,7 +118,7 @@ static int create_vmas(struct drm_i915_private *i915, > struct i915_vma *vma; > int err; > > - vm = i915_gem_context_get_vm_rcu(ctx); > + vm = i915_gem_context_get_eb_vm(ctx); > vma = checked_vma_instance(obj, vm, NULL); > i915_vm_put(vm); > if (IS_ERR(vma)) >
On Fri, Sep 03, 2021 at 09:05:00AM +0100, Tvrtko Ursulin wrote: > > On 02/09/2021 15:20, Daniel Vetter wrote: > > The important part isn't so much that this does an rcu lookup - that's > > more an implementation detail, which will also be removed. > > > > The thing that makes this different from other functions is that it's > > gettting you the vm that batchbuffers will run in for that gem > > context, which is either a full ppgtt stored in gem->ctx, or the ggtt. > > > > We'll make more use of this function later on. > > > > Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > Cc: Jon Bloomfield <jon.bloomfield@intel.com> > > Cc: Chris Wilson <chris@chris-wilson.co.uk> > > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> > > Cc: Daniel Vetter <daniel.vetter@ffwll.ch> > > Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> > > Cc: Matthew Auld <matthew.auld@intel.com> > > Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com> > > Cc: Dave Airlie <airlied@redhat.com> > > Cc: Jason Ekstrand <jason@jlekstrand.net> > > --- > > drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 +- > > drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 4 ++-- > > drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c | 4 ++-- > > drivers/gpu/drm/i915/gt/selftest_execlists.c | 2 +- > > drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- > > drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 ++-- > > drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +- > > 7 files changed, 10 insertions(+), 10 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.h b/drivers/gpu/drm/i915/gem/i915_gem_context.h > > index 18060536b0c2..da6e8b506d96 100644 > > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.h > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.h > > @@ -155,7 +155,7 @@ i915_gem_context_vm(struct i915_gem_context *ctx) > > } > > static inline struct i915_address_space * > > -i915_gem_context_get_vm_rcu(struct i915_gem_context *ctx) > > +i915_gem_context_get_eb_vm(struct i915_gem_context *ctx) > > { > > struct i915_address_space *vm; > > diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c > > index a094f3ce1a90..6c68fe26bb32 100644 > > --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c > > +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c > > @@ -1456,7 +1456,7 @@ static int igt_tmpfs_fallback(void *arg) > > struct i915_gem_context *ctx = arg; > > struct drm_i915_private *i915 = ctx->i915; > > struct vfsmount *gemfs = i915->mm.gemfs; > > - struct i915_address_space *vm = i915_gem_context_get_vm_rcu(ctx); > > + struct i915_address_space *vm = i915_gem_context_get_eb_vm(ctx); > > struct drm_i915_gem_object *obj; > > struct i915_vma *vma; > > u32 *vaddr; > > @@ -1512,7 +1512,7 @@ static int igt_shrink_thp(void *arg) > > { > > struct i915_gem_context *ctx = arg; > > struct drm_i915_private *i915 = ctx->i915; > > - struct i915_address_space *vm = i915_gem_context_get_vm_rcu(ctx); > > + struct i915_address_space *vm = i915_gem_context_get_eb_vm(ctx); > > Problem here (and probably elsewhere) is that this test does no "eb", nor > even submits any requests for execution. > > More so, execbuf path does currently rely on intel_context->vm which is > always set. So I really wonder how it would look, what I touched on > elsewhere in the thread, if we instead made ctx->vm always point to > something. It would align the rules between intel_context and GEM context > and may end up with a more consistent situation. The entire thing is substantially more messy, and my few quick attempts at fixing this went flat. The thing is, this _is_ the vm we use for execbuf, patch 8 changes intel context initialization to also use this function. I do think it would make sense to always set the right vm in gem_ctx->vm, but when I tried to do that I've also tried to implement a bit stricter rules for intel_context->vm. Currently that's initialized to the single gt vm deep down in the per-type (virtual vs engine ctx) code, and then later on we'd overwrite that. My idea was that we'd no longer set the intel_context->vm in low-level code at all, but instead the variuos callers that create the ctx either pass the right vm down, or set it after initial setup is done. This way we'd be guaranteed that we never accidentally run a userspace context on the kernel's gt vm, which would be bad. The problem was that the entire refactor became really messy, and it was conflicting against the GuC stuff and the changed engines there, so I figured I'll drop it. There's more locking cleanup tbd, so I'll keep that on the list of things. Maybe once intel_context creation is a bit more untangled. -Daniel > > Regards, > > Tvrtko > > > struct drm_i915_gem_object *obj; > > struct i915_gem_engines_iter it; > > struct intel_context *ce; > > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c > > index 4d2758718d21..fc7fb33a3a52 100644 > > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c > > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c > > @@ -1528,7 +1528,7 @@ static int write_to_scratch(struct i915_gem_context *ctx, > > intel_gt_chipset_flush(engine->gt); > > - vm = i915_gem_context_get_vm_rcu(ctx); > > + vm = i915_gem_context_get_eb_vm(ctx); > > vma = i915_vma_instance(obj, vm, NULL); > > if (IS_ERR(vma)) { > > err = PTR_ERR(vma); > > @@ -1607,7 +1607,7 @@ static int read_from_scratch(struct i915_gem_context *ctx, > > if (GRAPHICS_VER(i915) >= 8) { > > const u32 GPR0 = engine->mmio_base + 0x600; > > - vm = i915_gem_context_get_vm_rcu(ctx); > > + vm = i915_gem_context_get_eb_vm(ctx); > > vma = i915_vma_instance(obj, vm, NULL); > > if (IS_ERR(vma)) { > > err = PTR_ERR(vma); > > diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c > > index f12ffe797639..b3863abc51f5 100644 > > --- a/drivers/gpu/drm/i915/gt/selftest_execlists.c > > +++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c > > @@ -3493,7 +3493,7 @@ static int smoke_submit(struct preempt_smoke *smoke, > > if (batch) { > > struct i915_address_space *vm; > > - vm = i915_gem_context_get_vm_rcu(ctx); > > + vm = i915_gem_context_get_eb_vm(ctx); > > vma = i915_vma_instance(batch, vm, NULL); > > i915_vm_put(vm); > > if (IS_ERR(vma)) > > diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c > > index 2c1ed32ca5ac..8be23e0f9306 100644 > > --- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c > > +++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c > > @@ -117,7 +117,7 @@ static struct i915_request * > > hang_create_request(struct hang *h, struct intel_engine_cs *engine) > > { > > struct intel_gt *gt = h->gt; > > - struct i915_address_space *vm = i915_gem_context_get_vm_rcu(h->ctx); > > + struct i915_address_space *vm = i915_gem_context_get_eb_vm(h->ctx); > > struct drm_i915_gem_object *obj; > > struct i915_request *rq = NULL; > > struct i915_vma *hws, *vma; > > diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c > > index f843a5040706..2d60a5a5b065 100644 > > --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c > > +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c > > @@ -1300,7 +1300,7 @@ static int exercise_mock(struct drm_i915_private *i915, > > if (!ctx) > > return -ENOMEM; > > - vm = i915_gem_context_get_vm_rcu(ctx); > > + vm = i915_gem_context_get_eb_vm(ctx); > > err = func(vm, 0, min(vm->total, limit), end_time); > > i915_vm_put(vm); > > @@ -1848,7 +1848,7 @@ static int igt_cs_tlb(void *arg) > > goto out_unlock; > > } > > - vm = i915_gem_context_get_vm_rcu(ctx); > > + vm = i915_gem_context_get_eb_vm(ctx); > > if (i915_is_ggtt(vm)) > > goto out_vm; > > diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c b/drivers/gpu/drm/i915/selftests/i915_vma.c > > index dd0607254a95..79ba72da0813 100644 > > --- a/drivers/gpu/drm/i915/selftests/i915_vma.c > > +++ b/drivers/gpu/drm/i915/selftests/i915_vma.c > > @@ -118,7 +118,7 @@ static int create_vmas(struct drm_i915_private *i915, > > struct i915_vma *vma; > > int err; > > - vm = i915_gem_context_get_vm_rcu(ctx); > > + vm = i915_gem_context_get_eb_vm(ctx); > > vma = checked_vma_instance(obj, vm, NULL); > > i915_vm_put(vm); > > if (IS_ERR(vma)) > >
On 06/09/2021 09:51, Daniel Vetter wrote: > On Fri, Sep 03, 2021 at 09:05:00AM +0100, Tvrtko Ursulin wrote: >> >> On 02/09/2021 15:20, Daniel Vetter wrote: >>> The important part isn't so much that this does an rcu lookup - that's >>> more an implementation detail, which will also be removed. >>> >>> The thing that makes this different from other functions is that it's >>> gettting you the vm that batchbuffers will run in for that gem >>> context, which is either a full ppgtt stored in gem->ctx, or the ggtt. >>> >>> We'll make more use of this function later on. >>> >>> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> >>> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> >>> Cc: Jon Bloomfield <jon.bloomfield@intel.com> >>> Cc: Chris Wilson <chris@chris-wilson.co.uk> >>> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> >>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> >>> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> >>> Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com> >>> Cc: Matthew Auld <matthew.auld@intel.com> >>> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com> >>> Cc: Dave Airlie <airlied@redhat.com> >>> Cc: Jason Ekstrand <jason@jlekstrand.net> >>> --- >>> drivers/gpu/drm/i915/gem/i915_gem_context.h | 2 +- >>> drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 4 ++-- >>> drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c | 4 ++-- >>> drivers/gpu/drm/i915/gt/selftest_execlists.c | 2 +- >>> drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- >>> drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 ++-- >>> drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +- >>> 7 files changed, 10 insertions(+), 10 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.h b/drivers/gpu/drm/i915/gem/i915_gem_context.h >>> index 18060536b0c2..da6e8b506d96 100644 >>> --- a/drivers/gpu/drm/i915/gem/i915_gem_context.h >>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.h >>> @@ -155,7 +155,7 @@ i915_gem_context_vm(struct i915_gem_context *ctx) >>> } >>> static inline struct i915_address_space * >>> -i915_gem_context_get_vm_rcu(struct i915_gem_context *ctx) >>> +i915_gem_context_get_eb_vm(struct i915_gem_context *ctx) >>> { >>> struct i915_address_space *vm; >>> diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c >>> index a094f3ce1a90..6c68fe26bb32 100644 >>> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c >>> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c >>> @@ -1456,7 +1456,7 @@ static int igt_tmpfs_fallback(void *arg) >>> struct i915_gem_context *ctx = arg; >>> struct drm_i915_private *i915 = ctx->i915; >>> struct vfsmount *gemfs = i915->mm.gemfs; >>> - struct i915_address_space *vm = i915_gem_context_get_vm_rcu(ctx); >>> + struct i915_address_space *vm = i915_gem_context_get_eb_vm(ctx); >>> struct drm_i915_gem_object *obj; >>> struct i915_vma *vma; >>> u32 *vaddr; >>> @@ -1512,7 +1512,7 @@ static int igt_shrink_thp(void *arg) >>> { >>> struct i915_gem_context *ctx = arg; >>> struct drm_i915_private *i915 = ctx->i915; >>> - struct i915_address_space *vm = i915_gem_context_get_vm_rcu(ctx); >>> + struct i915_address_space *vm = i915_gem_context_get_eb_vm(ctx); >> >> Problem here (and probably elsewhere) is that this test does no "eb", nor >> even submits any requests for execution. >> >> More so, execbuf path does currently rely on intel_context->vm which is >> always set. So I really wonder how it would look, what I touched on >> elsewhere in the thread, if we instead made ctx->vm always point to >> something. It would align the rules between intel_context and GEM context >> and may end up with a more consistent situation. > > The entire thing is substantially more messy, and my few quick attempts at > fixing this went flat. > > The thing is, this _is_ the vm we use for execbuf, patch 8 changes intel > context initialization to also use this function. I do think it would make > sense to always set the right vm in gem_ctx->vm, but when I tried to do > that I've also tried to implement a bit stricter rules for > intel_context->vm. Currently that's initialized to the single gt vm deep > down in the per-type (virtual vs engine ctx) code, and then later on we'd > overwrite that. My idea was that we'd no longer set the intel_context->vm > in low-level code at all, but instead the variuos callers that create the > ctx either pass the right vm down, or set it after initial setup is done. > > This way we'd be guaranteed that we never accidentally run a userspace > context on the kernel's gt vm, which would be bad. > > The problem was that the entire refactor became really messy, and it was > conflicting against the GuC stuff and the changed engines there, so I > figured I'll drop it. There's more locking cleanup tbd, so I'll keep that > on the list of things. Maybe once intel_context creation is a bit more > untangled. I understood you were dropping this from the series but now that I noticed it all landed I realized you probably meant something else. I think it's not ideal that you repeatedly ignored my comments to have a cover letter and not mix independent work in the same series. I am pretty sure this exact mode of operation was quite frowned upon, to put it mildly, not so long ago. If I need to be explicit - large series doing multiple things, with no cover letter giving overview, plus merging with outstanding opens. As I was not expecting this would go in so quick, I did not even read the whole series yet. Even on the most prosaic level I even disagree with putting execbuf in the helper name which gets the VM from a GEM context. Proof in the pudding is that you have non-execbuf parts of the driver using this helper. Regards, Tvrtko > -Daniel > >> >> Regards, >> >> Tvrtko >> >>> struct drm_i915_gem_object *obj; >>> struct i915_gem_engines_iter it; >>> struct intel_context *ce; >>> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c >>> index 4d2758718d21..fc7fb33a3a52 100644 >>> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c >>> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c >>> @@ -1528,7 +1528,7 @@ static int write_to_scratch(struct i915_gem_context *ctx, >>> intel_gt_chipset_flush(engine->gt); >>> - vm = i915_gem_context_get_vm_rcu(ctx); >>> + vm = i915_gem_context_get_eb_vm(ctx); >>> vma = i915_vma_instance(obj, vm, NULL); >>> if (IS_ERR(vma)) { >>> err = PTR_ERR(vma); >>> @@ -1607,7 +1607,7 @@ static int read_from_scratch(struct i915_gem_context *ctx, >>> if (GRAPHICS_VER(i915) >= 8) { >>> const u32 GPR0 = engine->mmio_base + 0x600; >>> - vm = i915_gem_context_get_vm_rcu(ctx); >>> + vm = i915_gem_context_get_eb_vm(ctx); >>> vma = i915_vma_instance(obj, vm, NULL); >>> if (IS_ERR(vma)) { >>> err = PTR_ERR(vma); >>> diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c >>> index f12ffe797639..b3863abc51f5 100644 >>> --- a/drivers/gpu/drm/i915/gt/selftest_execlists.c >>> +++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c >>> @@ -3493,7 +3493,7 @@ static int smoke_submit(struct preempt_smoke *smoke, >>> if (batch) { >>> struct i915_address_space *vm; >>> - vm = i915_gem_context_get_vm_rcu(ctx); >>> + vm = i915_gem_context_get_eb_vm(ctx); >>> vma = i915_vma_instance(batch, vm, NULL); >>> i915_vm_put(vm); >>> if (IS_ERR(vma)) >>> diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c >>> index 2c1ed32ca5ac..8be23e0f9306 100644 >>> --- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c >>> +++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c >>> @@ -117,7 +117,7 @@ static struct i915_request * >>> hang_create_request(struct hang *h, struct intel_engine_cs *engine) >>> { >>> struct intel_gt *gt = h->gt; >>> - struct i915_address_space *vm = i915_gem_context_get_vm_rcu(h->ctx); >>> + struct i915_address_space *vm = i915_gem_context_get_eb_vm(h->ctx); >>> struct drm_i915_gem_object *obj; >>> struct i915_request *rq = NULL; >>> struct i915_vma *hws, *vma; >>> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c >>> index f843a5040706..2d60a5a5b065 100644 >>> --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c >>> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c >>> @@ -1300,7 +1300,7 @@ static int exercise_mock(struct drm_i915_private *i915, >>> if (!ctx) >>> return -ENOMEM; >>> - vm = i915_gem_context_get_vm_rcu(ctx); >>> + vm = i915_gem_context_get_eb_vm(ctx); >>> err = func(vm, 0, min(vm->total, limit), end_time); >>> i915_vm_put(vm); >>> @@ -1848,7 +1848,7 @@ static int igt_cs_tlb(void *arg) >>> goto out_unlock; >>> } >>> - vm = i915_gem_context_get_vm_rcu(ctx); >>> + vm = i915_gem_context_get_eb_vm(ctx); >>> if (i915_is_ggtt(vm)) >>> goto out_vm; >>> diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c b/drivers/gpu/drm/i915/selftests/i915_vma.c >>> index dd0607254a95..79ba72da0813 100644 >>> --- a/drivers/gpu/drm/i915/selftests/i915_vma.c >>> +++ b/drivers/gpu/drm/i915/selftests/i915_vma.c >>> @@ -118,7 +118,7 @@ static int create_vmas(struct drm_i915_private *i915, >>> struct i915_vma *vma; >>> int err; >>> - vm = i915_gem_context_get_vm_rcu(ctx); >>> + vm = i915_gem_context_get_eb_vm(ctx); >>> vma = checked_vma_instance(obj, vm, NULL); >>> i915_vm_put(vm); >>> if (IS_ERR(vma)) >>> >
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.h b/drivers/gpu/drm/i915/gem/i915_gem_context.h index 18060536b0c2..da6e8b506d96 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_context.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.h @@ -155,7 +155,7 @@ i915_gem_context_vm(struct i915_gem_context *ctx) } static inline struct i915_address_space * -i915_gem_context_get_vm_rcu(struct i915_gem_context *ctx) +i915_gem_context_get_eb_vm(struct i915_gem_context *ctx) { struct i915_address_space *vm; diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c index a094f3ce1a90..6c68fe26bb32 100644 --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c @@ -1456,7 +1456,7 @@ static int igt_tmpfs_fallback(void *arg) struct i915_gem_context *ctx = arg; struct drm_i915_private *i915 = ctx->i915; struct vfsmount *gemfs = i915->mm.gemfs; - struct i915_address_space *vm = i915_gem_context_get_vm_rcu(ctx); + struct i915_address_space *vm = i915_gem_context_get_eb_vm(ctx); struct drm_i915_gem_object *obj; struct i915_vma *vma; u32 *vaddr; @@ -1512,7 +1512,7 @@ static int igt_shrink_thp(void *arg) { struct i915_gem_context *ctx = arg; struct drm_i915_private *i915 = ctx->i915; - struct i915_address_space *vm = i915_gem_context_get_vm_rcu(ctx); + struct i915_address_space *vm = i915_gem_context_get_eb_vm(ctx); struct drm_i915_gem_object *obj; struct i915_gem_engines_iter it; struct intel_context *ce; diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c index 4d2758718d21..fc7fb33a3a52 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c @@ -1528,7 +1528,7 @@ static int write_to_scratch(struct i915_gem_context *ctx, intel_gt_chipset_flush(engine->gt); - vm = i915_gem_context_get_vm_rcu(ctx); + vm = i915_gem_context_get_eb_vm(ctx); vma = i915_vma_instance(obj, vm, NULL); if (IS_ERR(vma)) { err = PTR_ERR(vma); @@ -1607,7 +1607,7 @@ static int read_from_scratch(struct i915_gem_context *ctx, if (GRAPHICS_VER(i915) >= 8) { const u32 GPR0 = engine->mmio_base + 0x600; - vm = i915_gem_context_get_vm_rcu(ctx); + vm = i915_gem_context_get_eb_vm(ctx); vma = i915_vma_instance(obj, vm, NULL); if (IS_ERR(vma)) { err = PTR_ERR(vma); diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c index f12ffe797639..b3863abc51f5 100644 --- a/drivers/gpu/drm/i915/gt/selftest_execlists.c +++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c @@ -3493,7 +3493,7 @@ static int smoke_submit(struct preempt_smoke *smoke, if (batch) { struct i915_address_space *vm; - vm = i915_gem_context_get_vm_rcu(ctx); + vm = i915_gem_context_get_eb_vm(ctx); vma = i915_vma_instance(batch, vm, NULL); i915_vm_put(vm); if (IS_ERR(vma)) diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c index 2c1ed32ca5ac..8be23e0f9306 100644 --- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c +++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c @@ -117,7 +117,7 @@ static struct i915_request * hang_create_request(struct hang *h, struct intel_engine_cs *engine) { struct intel_gt *gt = h->gt; - struct i915_address_space *vm = i915_gem_context_get_vm_rcu(h->ctx); + struct i915_address_space *vm = i915_gem_context_get_eb_vm(h->ctx); struct drm_i915_gem_object *obj; struct i915_request *rq = NULL; struct i915_vma *hws, *vma; diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index f843a5040706..2d60a5a5b065 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -1300,7 +1300,7 @@ static int exercise_mock(struct drm_i915_private *i915, if (!ctx) return -ENOMEM; - vm = i915_gem_context_get_vm_rcu(ctx); + vm = i915_gem_context_get_eb_vm(ctx); err = func(vm, 0, min(vm->total, limit), end_time); i915_vm_put(vm); @@ -1848,7 +1848,7 @@ static int igt_cs_tlb(void *arg) goto out_unlock; } - vm = i915_gem_context_get_vm_rcu(ctx); + vm = i915_gem_context_get_eb_vm(ctx); if (i915_is_ggtt(vm)) goto out_vm; diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c b/drivers/gpu/drm/i915/selftests/i915_vma.c index dd0607254a95..79ba72da0813 100644 --- a/drivers/gpu/drm/i915/selftests/i915_vma.c +++ b/drivers/gpu/drm/i915/selftests/i915_vma.c @@ -118,7 +118,7 @@ static int create_vmas(struct drm_i915_private *i915, struct i915_vma *vma; int err; - vm = i915_gem_context_get_vm_rcu(ctx); + vm = i915_gem_context_get_eb_vm(ctx); vma = checked_vma_instance(obj, vm, NULL); i915_vm_put(vm); if (IS_ERR(vma))