openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210602111714.212426-3-christian.koenig@amd.com
This commit is contained in:
Christian König 2021-05-06 14:16:01 +02:00
parent 068d9d754b
commit 0c6b522abc
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/dma-buf/dma-resv.c
View File

@ -208,6 +208,26 @@ int dma_resv_reserve_shared(struct dma_resv *obj, unsigned int num_fences)
} }
EXPORT_SYMBOL(dma_resv_reserve_shared); 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 * dma_resv_add_shared_fence - Add a fence to a shared slot
* @obj: the reservation object * @obj: the reservation object

15
include/linux/dma-resv.h
View File

@ -92,6 +92,12 @@ static inline struct dma_resv_list *dma_resv_get_list(struct dma_resv *obj)
dma_resv_held(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 * dma_resv_lock - lock the reservation object
* @obj: 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) static inline void dma_resv_unlock(struct dma_resv *obj)
{ {
#ifdef CONFIG_DEBUG_MUTEXES dma_resv_reset_shared_max(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
ww_mutex_unlock(&obj->lock); ww_mutex_unlock(&obj->lock);
} }