Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <a2a439f677254260c3c4dd6369b8b478d3581889.camel@linux.intel.com>
Subject: Re: [PATCH v8 08/10] drm/i915: allow memory region creators to
 alloc and free the region
From:   Thomas =?ISO-8859-1?Q?Hellstr=F6m?= 
        <thomas.hellstrom@linux.intel.com>
To:     Robert Beckett <bob.beckett@collabora.com>,
        dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
        Jani Nikula <jani.nikula@linux.intel.com>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>
Cc:     kernel@collabora.com, Matthew Auld <matthew.auld@intel.com>,
        linux-kernel@vger.kernel.org
Date:   Wed, 22 Jun 2022 13:55:58 +0200
In-Reply-To: <20220621200058.3536182-9-bob.beckett@collabora.com>
References: <20220621200058.3536182-1-bob.beckett@collabora.com>
         <20220621200058.3536182-9-bob.beckett@collabora.com>
Organization: Intel Sweden AB, Registration Number: 556189-6027
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.40.4 (3.40.4-5.fc34) 
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Hi, Bob,

On Tue, 2022-06-21 at 20:00 +0000, Robert Beckett wrote:
> add callbacks for alloc and free.
> this allows region creators to allocate any extra storage they may
> require.
> 
> Signed-off-by: Robert Beckett <bob.beckett@collabora.com>

I think the correct solution here would be to, similar to ttm, export
an alloc_reserved() or alloc_locked() interface, that simply skips the
unlock at bo alloc time.

Then the stolen alloc wrapper could simply pin as/if needed under the
lock.

/Thomas


> ---
>  drivers/gpu/drm/i915/intel_memory_region.c | 16 +++++++++++++---
>  drivers/gpu/drm/i915/intel_memory_region.h |  2 ++
>  2 files changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_memory_region.c
> b/drivers/gpu/drm/i915/intel_memory_region.c
> index e38d2db1c3e3..3da07a712f90 100644
> --- a/drivers/gpu/drm/i915/intel_memory_region.c
> +++ b/drivers/gpu/drm/i915/intel_memory_region.c
> @@ -231,7 +231,10 @@ intel_memory_region_create(struct
> drm_i915_private *i915,
>         struct intel_memory_region *mem;
>         int err;
>  
> -       mem = kzalloc(sizeof(*mem), GFP_KERNEL);
> +       if (ops->alloc)
> +               mem = ops->alloc();
> +       else
> +               mem = kzalloc(sizeof(*mem), GFP_KERNEL);
>         if (!mem)
>                 return ERR_PTR(-ENOMEM);
>  
> @@ -265,7 +268,10 @@ intel_memory_region_create(struct
> drm_i915_private *i915,
>         if (mem->ops->release)
>                 mem->ops->release(mem);
>  err_free:
> -       kfree(mem);
> +       if (mem->ops->free)
> +               mem->ops->free(mem);
> +       else
> +               kfree(mem);
>         return ERR_PTR(err);
>  }
>  
> @@ -288,7 +294,11 @@ void intel_memory_region_destroy(struct
> intel_memory_region *mem)
>  
>         GEM_WARN_ON(!list_empty_careful(&mem->objects.list));
>         mutex_destroy(&mem->objects.lock);
> -       if (!ret)
> +       if (ret)
> +               return;
> +       if (mem->ops->free)
> +               mem->ops->free(mem);
> +       else
>                 kfree(mem);
>  }
>  
> diff --git a/drivers/gpu/drm/i915/intel_memory_region.h
> b/drivers/gpu/drm/i915/intel_memory_region.h
> index 3d8378c1b447..048955b5429f 100644
> --- a/drivers/gpu/drm/i915/intel_memory_region.h
> +++ b/drivers/gpu/drm/i915/intel_memory_region.h
> @@ -61,6 +61,8 @@ struct intel_memory_region_ops {
>                            resource_size_t size,
>                            resource_size_t page_size,
>                            unsigned int flags);
> +       struct intel_memory_region *(*alloc)(void);
> +       void (*free)(struct intel_memory_region *mem);
>  };
>  
>  struct intel_memory_region {