[PATCH 1/4] reservation: sprinkle some WARN_ON()s

Christian König deathsimple at vodafone.de
Fri Apr 1 14:02:06 UTC 2016


Am 31.03.2016 um 22:26 schrieb Rob Clark:
> A bit overkill since, for example, the rcu_dereference_protected() in
> reservation_object_get_list() will WARN.  But this is much less subtle
> for folks reading the code.
>
> Signed-off-by: Rob Clark <robdclark at gmail.com>

Reviewed-by: Christian König <christian.koenig at amd.com> for this one.

One item to purge from my todo list, thanks!

Christian.

> ---
>   drivers/dma-buf/reservation.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c
> index c0bd572..0de3ea6 100644
> --- a/drivers/dma-buf/reservation.c
> +++ b/drivers/dma-buf/reservation.c
> @@ -52,6 +52,8 @@ int reservation_object_reserve_shared(struct reservation_object *obj)
>   	struct reservation_object_list *fobj, *old;
>   	u32 max;
>   
> +	WARN_ON(!ww_mutex_is_locked(&obj->lock));
> +
>   	old = reservation_object_get_list(obj);
>   
>   	if (old && old->shared_max) {
> @@ -189,6 +191,8 @@ void reservation_object_add_shared_fence(struct reservation_object *obj,
>   {
>   	struct reservation_object_list *old, *fobj = obj->staged;
>   
> +	WARN_ON(!ww_mutex_is_locked(&obj->lock));
> +
>   	old = reservation_object_get_list(obj);
>   	obj->staged = NULL;
>   
> @@ -207,6 +211,8 @@ void reservation_object_add_excl_fence(struct reservation_object *obj,
>   	struct reservation_object_list *old;
>   	u32 i = 0;
>   
> +	WARN_ON(!ww_mutex_is_locked(&obj->lock));
> +
>   	old = reservation_object_get_list(obj);
>   	if (old)
>   		i = old->shared_count;



More information about the dri-devel mailing list