diff mbox series

[v3,7/8] drm/etnaviv: provide MMU context to etnaviv_gem_mapping_get

Message ID 20190809120424.32679-7-l.stach@pengutronix.de (mailing list archive)
State New, archived
Headers show
Series [v3,1/8] drm/etnaviv: simplify unbind checks | expand

Commit Message

Lucas Stach Aug. 9, 2019, 12:04 p.m. UTC 
In preparation to having a context per process, etnaviv_gem_mapping_get
should not use the current GPU context, but needs to be told which
context to use.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 drivers/gpu/drm/etnaviv/etnaviv_gem.c        | 22 ++++++++++++--------
 drivers/gpu/drm/etnaviv/etnaviv_gem.h        |  3 ++-
 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c |  3 ++-
 3 files changed, 17 insertions(+), 11 deletions(-)

Comments

Guido Günther Aug. 14, 2019, 9:59 a.m. UTC | #1 
Hi,
On Fri, Aug 09, 2019 at 02:04:23PM +0200, Lucas Stach wrote:
> In preparation to having a context per process, etnaviv_gem_mapping_get
> should not use the current GPU context, but needs to be told which
> context to use.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
> ---
>  drivers/gpu/drm/etnaviv/etnaviv_gem.c        | 22 ++++++++++++--------
>  drivers/gpu/drm/etnaviv/etnaviv_gem.h        |  3 ++-
>  drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c |  3 ++-
>  3 files changed, 17 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> index 0ccc3c4dffc4..04c8170f76cd 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> @@ -248,7 +248,8 @@ void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping)
>  }
>  
>  struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
> -	struct drm_gem_object *obj, struct etnaviv_gpu *gpu)
> +	struct drm_gem_object *obj, struct etnaviv_gpu *gpu,
> +	struct etnaviv_iommu_context *mmu_context)
>  {
>  	struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
>  	struct etnaviv_vram_mapping *mapping;
> @@ -256,7 +257,7 @@ struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
>  	int ret = 0;
>  
>  	mutex_lock(&etnaviv_obj->lock);
> -	mapping = etnaviv_gem_get_vram_mapping(etnaviv_obj, gpu->mmu_context);
> +	mapping = etnaviv_gem_get_vram_mapping(etnaviv_obj, mmu_context);
>  	if (mapping) {
>  		/*
>  		 * Holding the object lock prevents the use count changing
> @@ -265,12 +266,12 @@ struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
>  		 * the MMU owns this mapping to close this race.
>  		 */
>  		if (mapping->use == 0) {
> -			mutex_lock(&gpu->mmu_context->lock);
> -			if (mapping->context == gpu->mmu_context)
> +			mutex_lock(&mmu_context->lock);
> +			if (mapping->context == mmu_context)
>  				mapping->use += 1;
>  			else
>  				mapping = NULL;
> -			mutex_unlock(&gpu->mmu_context->lock);
> +			mutex_unlock(&mmu_context->lock);
>  			if (mapping)
>  				goto out;
>  		} else {
> @@ -303,11 +304,12 @@ struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
>  		list_del(&mapping->obj_node);
>  	}
>  
> -	mapping->context = gpu->mmu_context;
> +	etnaviv_iommu_context_get(mmu_context);
> +	mapping->context = mmu_context;
>  	mapping->use = 1;
>  
> -	ret = etnaviv_iommu_map_gem(gpu->mmu_context, etnaviv_obj,
> -				    gpu->memory_base, mapping);
> +	ret = etnaviv_iommu_map_gem(mmu_context, etnaviv_obj, gpu->memory_base,
> +				    mapping);
>  	if (ret < 0)
>  		kfree(mapping);

Does this error path need a etnaviv_iommu_context_put()?


apart from that

Reviewed-by: Guido Günther <agx@sigxcpu.org> 

 -- Guido

>  	else
> @@ -529,8 +531,10 @@ void etnaviv_gem_free_object(struct drm_gem_object *obj)
>  
>  		WARN_ON(mapping->use);
>  
> -		if (context)
> +		if (context) {
>  			etnaviv_iommu_unmap_gem(context, mapping);
> +			etnaviv_iommu_context_put(context);
> +		}
>  
>  		list_del(&mapping->obj_node);
>  		kfree(mapping);
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.h b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
> index 5a004d5e4eaa..f342560b5938 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.h
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
> @@ -119,7 +119,8 @@ struct page **etnaviv_gem_get_pages(struct etnaviv_gem_object *obj);
>  void etnaviv_gem_put_pages(struct etnaviv_gem_object *obj);
>  
>  struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
> -	struct drm_gem_object *obj, struct etnaviv_gpu *gpu);
> +	struct drm_gem_object *obj, struct etnaviv_gpu *gpu,
> +	struct etnaviv_iommu_context *mmu_context);
>  void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping);
>  
>  #endif /* __ETNAVIV_GEM_H__ */
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
> index 3f4f6ab388de..7929d258daf8 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
> @@ -224,7 +224,8 @@ static int submit_pin_objects(struct etnaviv_gem_submit *submit)
>  		struct etnaviv_vram_mapping *mapping;
>  
>  		mapping = etnaviv_gem_mapping_get(&etnaviv_obj->base,
> -						  submit->gpu);
> +						  submit->gpu,
> +						  submit->gpu->mmu_context);
>  		if (IS_ERR(mapping)) {
>  			ret = PTR_ERR(mapping);
>  			break;
> -- 
> 2.20.1
> 
> _______________________________________________
> etnaviv mailing list
> etnaviv@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/etnaviv
Lucas Stach Aug. 15, 2019, 9:06 a.m. UTC | #2 
Am Mittwoch, den 14.08.2019, 11:59 +0200 schrieb Guido Günther:
> Hi,
> On Fri, Aug 09, 2019 at 02:04:23PM +0200, Lucas Stach wrote:
> > In preparation to having a context per process, etnaviv_gem_mapping_get
> > should not use the current GPU context, but needs to be told which
> > context to use.
> > 
> > > > Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> > > > Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
> > ---
> >  drivers/gpu/drm/etnaviv/etnaviv_gem.c        | 22 ++++++++++++--------
> >  drivers/gpu/drm/etnaviv/etnaviv_gem.h        |  3 ++-
> >  drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c |  3 ++-
> >  3 files changed, 17 insertions(+), 11 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> > index 0ccc3c4dffc4..04c8170f76cd 100644
> > --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> > +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
> > @@ -248,7 +248,8 @@ void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping)
> >  }
> >  
> >  struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
> > > > -	struct drm_gem_object *obj, struct etnaviv_gpu *gpu)
> > > > +	struct drm_gem_object *obj, struct etnaviv_gpu *gpu,
> > > > +	struct etnaviv_iommu_context *mmu_context)
> >  {
> > > >  	struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
> > > >  	struct etnaviv_vram_mapping *mapping;
> > @@ -256,7 +257,7 @@ struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
> > > >  	int ret = 0;
> >  
> > > >  	mutex_lock(&etnaviv_obj->lock);
> > > > -	mapping = etnaviv_gem_get_vram_mapping(etnaviv_obj, gpu->mmu_context);
> > > > +	mapping = etnaviv_gem_get_vram_mapping(etnaviv_obj, mmu_context);
> > > >  	if (mapping) {
> > > >  		/*
> > > >  		 * Holding the object lock prevents the use count changing
> > @@ -265,12 +266,12 @@ struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
> > > >  		 * the MMU owns this mapping to close this race.
> > > >  		 */
> > > >  		if (mapping->use == 0) {
> > > > -			mutex_lock(&gpu->mmu_context->lock);
> > > > -			if (mapping->context == gpu->mmu_context)
> > > > +			mutex_lock(&mmu_context->lock);
> > > > +			if (mapping->context == mmu_context)
> > > >  				mapping->use += 1;
> > > >  			else
> > > >  				mapping = NULL;
> > > > -			mutex_unlock(&gpu->mmu_context->lock);
> > > > +			mutex_unlock(&mmu_context->lock);
> > > >  			if (mapping)
> > > >  				goto out;
> > > >  		} else {
> > @@ -303,11 +304,12 @@ struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
> > > >  		list_del(&mapping->obj_node);
> > > >  	}
> >  
> > > > -	mapping->context = gpu->mmu_context;
> > > > +	etnaviv_iommu_context_get(mmu_context);
> > > > +	mapping->context = mmu_context;
> > > >  	mapping->use = 1;
> >  
> > > > -	ret = etnaviv_iommu_map_gem(gpu->mmu_context, etnaviv_obj,
> > > > -				    gpu->memory_base, mapping);
> > > > +	ret = etnaviv_iommu_map_gem(mmu_context, etnaviv_obj, gpu->memory_base,
> > > > +				    mapping);
> > > >  	if (ret < 0)
> >  		kfree(mapping);
> 
> Does this error path need a etnaviv_iommu_context_put()?

Good catch! Thanks, I'll fix this.

Regards,
Lucas
> 
> apart from that
> 
> > Reviewed-by: Guido Günther <agx@sigxcpu.org> 
> 
>  -- Guido
diff mbox series

Patch

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
index 0ccc3c4dffc4..04c8170f76cd 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -248,7 +248,8 @@  void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping)
 }
 
 struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
-	struct drm_gem_object *obj, struct etnaviv_gpu *gpu)
+	struct drm_gem_object *obj, struct etnaviv_gpu *gpu,
+	struct etnaviv_iommu_context *mmu_context)
 {
 	struct etnaviv_gem_object *etnaviv_obj = to_etnaviv_bo(obj);
 	struct etnaviv_vram_mapping *mapping;
@@ -256,7 +257,7 @@  struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
 	int ret = 0;
 
 	mutex_lock(&etnaviv_obj->lock);
-	mapping = etnaviv_gem_get_vram_mapping(etnaviv_obj, gpu->mmu_context);
+	mapping = etnaviv_gem_get_vram_mapping(etnaviv_obj, mmu_context);
 	if (mapping) {
 		/*
 		 * Holding the object lock prevents the use count changing
@@ -265,12 +266,12 @@  struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
 		 * the MMU owns this mapping to close this race.
 		 */
 		if (mapping->use == 0) {
-			mutex_lock(&gpu->mmu_context->lock);
-			if (mapping->context == gpu->mmu_context)
+			mutex_lock(&mmu_context->lock);
+			if (mapping->context == mmu_context)
 				mapping->use += 1;
 			else
 				mapping = NULL;
-			mutex_unlock(&gpu->mmu_context->lock);
+			mutex_unlock(&mmu_context->lock);
 			if (mapping)
 				goto out;
 		} else {
@@ -303,11 +304,12 @@  struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
 		list_del(&mapping->obj_node);
 	}
 
-	mapping->context = gpu->mmu_context;
+	etnaviv_iommu_context_get(mmu_context);
+	mapping->context = mmu_context;
 	mapping->use = 1;
 
-	ret = etnaviv_iommu_map_gem(gpu->mmu_context, etnaviv_obj,
-				    gpu->memory_base, mapping);
+	ret = etnaviv_iommu_map_gem(mmu_context, etnaviv_obj, gpu->memory_base,
+				    mapping);
 	if (ret < 0)
 		kfree(mapping);
 	else
@@ -529,8 +531,10 @@  void etnaviv_gem_free_object(struct drm_gem_object *obj)
 
 		WARN_ON(mapping->use);
 
-		if (context)
+		if (context) {
 			etnaviv_iommu_unmap_gem(context, mapping);
+			etnaviv_iommu_context_put(context);
+		}
 
 		list_del(&mapping->obj_node);
 		kfree(mapping);
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.h b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
index 5a004d5e4eaa..f342560b5938 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem.h
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.h
@@ -119,7 +119,8 @@  struct page **etnaviv_gem_get_pages(struct etnaviv_gem_object *obj);
 void etnaviv_gem_put_pages(struct etnaviv_gem_object *obj);
 
 struct etnaviv_vram_mapping *etnaviv_gem_mapping_get(
-	struct drm_gem_object *obj, struct etnaviv_gpu *gpu);
+	struct drm_gem_object *obj, struct etnaviv_gpu *gpu,
+	struct etnaviv_iommu_context *mmu_context);
 void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping);
 
 #endif /* __ETNAVIV_GEM_H__ */
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
index 3f4f6ab388de..7929d258daf8 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c
@@ -224,7 +224,8 @@  static int submit_pin_objects(struct etnaviv_gem_submit *submit)
 		struct etnaviv_vram_mapping *mapping;
 
 		mapping = etnaviv_gem_mapping_get(&etnaviv_obj->base,
-						  submit->gpu);
+						  submit->gpu,
+						  submit->gpu->mmu_context);
 		if (IS_ERR(mapping)) {
 			ret = PTR_ERR(mapping);
 			break;