Commit 0c6b522a authored by Christian König's avatar Christian König
Browse files

dma-buf: cleanup dma-resv shared fence debugging a bit v2 



Make that a function instead of inline.

v2: improve the kerneldoc wording as suggested by Daniel

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210602111714.212426-3-christian.koenig@amd.com
parent 068d9d75

drivers/dma-buf/dma-resv.c

+20 −0
Original line number Diff line number Diff line
@@ -208,6 +208,26 @@ int dma_resv_reserve_shared(struct dma_resv *obj, unsigned int num_fences) 
}

EXPORT_SYMBOL(dma_resv_reserve_shared);



#ifdef CONFIG_DEBUG_MUTEXES

/**

 * dma_resv_reset_shared_max - reset shared fences for debugging

 * @obj: the dma_resv object to reset

 *

 * Reset the number of pre-reserved shared slots to test that drivers do

 * correct slot allocation using dma_resv_reserve_shared(). See also

 * &dma_resv_list.shared_max.

 */

void dma_resv_reset_shared_max(struct dma_resv *obj)

{

	/* Test shared fence slot reservation */

	if (rcu_access_pointer(obj->fence)) {

		struct dma_resv_list *fence = dma_resv_get_list(obj);



		fence->shared_max = fence->shared_count;

	}

}

#endif



/**

 * dma_resv_add_shared_fence - Add a fence to a shared slot

 * @obj: the reservation object

include/linux/dma-resv.h

+7 −8
Original line number Diff line number Diff line
@@ -92,6 +92,12 @@ static inline struct dma_resv_list *dma_resv_get_list(struct dma_resv *obj) 
					 dma_resv_held(obj));

}



#ifdef CONFIG_DEBUG_MUTEXES

void dma_resv_reset_shared_max(struct dma_resv *obj);

#else

static inline void dma_resv_reset_shared_max(struct dma_resv *obj) {}

#endif



/**

 * dma_resv_lock - lock the reservation object

 * @obj: the reservation object
@@ -215,14 +221,7 @@ static inline struct ww_acquire_ctx *dma_resv_locking_ctx(struct dma_resv *obj) 
 */

static inline void dma_resv_unlock(struct dma_resv *obj)

{

#ifdef CONFIG_DEBUG_MUTEXES

	/* Test shared fence slot reservation */

	if (rcu_access_pointer(obj->fence)) {

		struct dma_resv_list *fence = dma_resv_get_list(obj);



		fence->shared_max = fence->shared_count;

	}

#endif

	dma_resv_reset_shared_max(obj);

	ww_mutex_unlock(&obj->lock);

}