dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Matthew Auld <matthew.william.auld@gmail.com>
To: Jason Ekstrand <jason@jlekstrand.net>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	ML dri-devel <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 3/7] drm/i915/gem: Unify user object creation
Date: Wed, 21 Jul 2021 09:24:40 +0100	[thread overview]
Message-ID: <CAM0jSHMMN6neG5DtiqWb54ZA46gh4iCmB94i7ZJCH=YTS8t=bg@mail.gmail.com> (raw)
In-Reply-To: <CAOFGe96dsX4x6CFYL+CT+b11Lwkv6a-Pn=MKJqgtbPBC+nZ60w@mail.gmail.com>

On Tue, 20 Jul 2021 at 23:04, Jason Ekstrand <jason@jlekstrand.net> wrote:
>
> On Tue, Jul 20, 2021 at 4:35 AM Matthew Auld
> <matthew.william.auld@gmail.com> wrote:
> >
> > On Thu, 15 Jul 2021 at 23:39, Jason Ekstrand <jason@jlekstrand.net> wrote:
> > >
> > > Instead of hand-rolling the same three calls in each function, pull them
> > > into an i915_gem_object_create_user helper.  Apart from re-ordering of
> > > the placements array ENOMEM check, the only functional change here
> > > should be that i915_gem_dumb_create now calls i915_gem_flush_free_objects
> > > which it probably should have been calling all along.
> > >
> > > Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
> > > ---
> > >  drivers/gpu/drm/i915/gem/i915_gem_create.c | 106 +++++++++------------
> > >  1 file changed, 43 insertions(+), 63 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_create.c b/drivers/gpu/drm/i915/gem/i915_gem_create.c
> > > index 391c8c4a12172..69bf9ec777642 100644
> > > --- a/drivers/gpu/drm/i915/gem/i915_gem_create.c
> > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_create.c
> > > @@ -11,13 +11,14 @@
> > >  #include "i915_trace.h"
> > >  #include "i915_user_extensions.h"
> > >
> > > -static u32 object_max_page_size(struct drm_i915_gem_object *obj)
> > > +static u32 object_max_page_size(struct intel_memory_region **placements,
> > > +                               unsigned int n_placements)
> > >  {
> > >         u32 max_page_size = 0;
> > >         int i;
> > >
> > > -       for (i = 0; i < obj->mm.n_placements; i++) {
> > > -               struct intel_memory_region *mr = obj->mm.placements[i];
> > > +       for (i = 0; i < n_placements; i++) {
> > > +               struct intel_memory_region *mr = placements[i];
> > >
> > >                 GEM_BUG_ON(!is_power_of_2(mr->min_page_size));
> > >                 max_page_size = max_t(u32, max_page_size, mr->min_page_size);
> > > @@ -81,22 +82,35 @@ static int i915_gem_publish(struct drm_i915_gem_object *obj,
> > >         return 0;
> > >  }
> > >
> > > -static int
> > > -i915_gem_setup(struct drm_i915_gem_object *obj, u64 size)
> > > +static struct drm_i915_gem_object *
> > > +i915_gem_object_create_user(struct drm_i915_private *i915, u64 size,
> > > +                           struct intel_memory_region **placements,
> > > +                           unsigned int n_placements)
> > >  {
> > > -       struct intel_memory_region *mr = obj->mm.placements[0];
> > > +       struct intel_memory_region *mr = placements[0];
> > > +       struct drm_i915_gem_object *obj;
> > >         unsigned int flags;
> > >         int ret;
> > >
> > > -       size = round_up(size, object_max_page_size(obj));
> > > +       i915_gem_flush_free_objects(i915);
> > > +
> > > +       obj = i915_gem_object_alloc();
> > > +       if (!obj)
> > > +               return ERR_PTR(-ENOMEM);
> > > +
> > > +       size = round_up(size, object_max_page_size(placements, n_placements));
> > >         if (size == 0)
> > > -               return -EINVAL;
> > > +               return ERR_PTR(-EINVAL);
> > >
> > >         /* For most of the ABI (e.g. mmap) we think in system pages */
> > >         GEM_BUG_ON(!IS_ALIGNED(size, PAGE_SIZE));
> > >
> > >         if (i915_gem_object_size_2big(size))
> > > -               return -E2BIG;
> > > +               return ERR_PTR(-E2BIG);
> > > +
> > > +       ret = object_set_placements(obj, placements, n_placements);
> > > +       if (ret)
> > > +               goto object_free;
> >
> > Thinking on this again, it might be way too thorny to expose
> > create_user as-is to other parts of i915, like we do in the last
> > patch. Since the caller will be expected to manually validate the
> > placements, otherwise we might crash and burn in weird ways as new
> > users pop up. i.e it needs the same validation that happens as part of
> > the extension. Also as new extensions arrive, like with PXP, that also
> > has to get bolted onto create_user, which might have its own hidden
> > constraints.
>
> Perhaps.  Do you have a suggestion for how to make it available to
> selftests without exposing it to "the rest of i915"?  If you want, I
> can make create_user duplicate the placements uniqueness check.
> That's really the only validation currently in the ioctl besides all
> the stuff for making sure that the class/instance provided by the user
> isn't bogus.  But if we've got real i915_memory_region pointers, we
> don't need that.

Yeah, I guess the concern here was duplicated placements(that would
change the meaning of n_placements > 1), and then ofc regions not
supported by the device. Also maybe stolen which doesn't have a TTM
backend yet.

If this is just for the selftests, doing what the mman selftests do
with create_region + set_placements would be one option. Otherwise
maybe just add  __two_underscores and a big comment, for why you
should be careful when using this?

>
> --Jason

  reply	other threads:[~2021-07-21  8:25 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-15 22:38 [PATCH 0/7] drm/i915: Migrate memory to SMEM when imported cross-device Jason Ekstrand
2021-07-15 22:38 ` [PATCH 1/7] drm/i915/gem: Check object_can_migrate from object_migrate Jason Ekstrand
2021-07-15 22:38 ` [PATCH 2/7] drm/i915/gem: Refactor placement setup for i915_gem_object_create* Jason Ekstrand
2021-07-16 11:12   ` [Intel-gfx] " Matthew Auld
2021-07-16 13:52     ` Jason Ekstrand
2021-07-15 22:38 ` [PATCH 3/7] drm/i915/gem: Unify user object creation Jason Ekstrand
2021-07-16 11:20   ` Matthew Auld
2021-07-16 14:02     ` Jason Ekstrand
2021-07-20  9:34   ` Matthew Auld
2021-07-20 22:04     ` Jason Ekstrand
2021-07-21  8:24       ` Matthew Auld [this message]
2021-07-21 15:47         ` Jason Ekstrand
2021-07-21 16:29           ` Matthew Auld
2021-07-15 22:38 ` [PATCH 4/7] drm/i915/gem/ttm: Place new BOs in the requested region Jason Ekstrand
2021-07-16 13:17   ` Matthew Auld
2021-07-16 13:46     ` Jason Ekstrand
2021-08-04  6:49   ` Thomas Hellström
2021-08-04  6:52     ` Thomas Hellström
2021-07-15 22:38 ` [PATCH 5/7] drm/i915/gem/ttm: Respect the objection region in placement_from_obj Jason Ekstrand
2021-07-16 13:54   ` Matthew Auld
2021-07-16 14:10     ` Jason Ekstrand
2021-07-16 15:52       ` Matthew Auld
2021-07-16 16:00         ` Matthew Auld
2021-07-16 17:38           ` Jason Ekstrand
2021-07-16 18:44             ` Matthew Auld
2021-07-16 19:49               ` Jason Ekstrand
2021-07-19 13:34                 ` Matthew Auld
2021-07-21 20:11                   ` Jason Ekstrand
2021-07-21 20:32                     ` [Intel-gfx] " Daniel Vetter
2021-07-22  9:49                     ` Matthew Auld
2021-07-22  9:59                       ` Matthew Auld
2021-08-04  8:00                         ` Thomas Hellström
2021-08-04 14:35                           ` Daniel Vetter
2021-07-15 22:38 ` [PATCH 6/7] drm/i915/gem: Correct the locking and pin pattern for dma-buf (v6) Jason Ekstrand
2021-07-15 22:39 ` [PATCH 7/7] drm/i915/gem: Migrate to system at dma-buf attach time (v6) Jason Ekstrand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAM0jSHMMN6neG5DtiqWb54ZA46gh4iCmB94i7ZJCH=YTS8t=bg@mail.gmail.com' \
    --to=matthew.william.auld@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jason@jlekstrand.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).